From db28f45f3aa0788536c37db0fbeef8ac365cc313 Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Mon, 19 Nov 2018 00:46:53 +0300
Subject: [PATCH 001/924] [@types/react-table] Change SortingRule

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2e9c14980c..04917fb7d1 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -38,12 +38,10 @@ export interface Filter {
     value: any;
     pivotId?: string;
 }
-/** NOTE: to many configuration ways (only true values are confusing) */
+
 export interface SortingRule {
     id: string;
-    sort?: 'desc' | 'asc';
-    asc?: true;
-    desc?: true;
+    desc: boolean;
 }
 
 export interface TableProps<D = any> extends

From d98923c80cbccfbd5f109d503829f564b00ce0e9 Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 11 Jan 2019 15:27:31 +0300
Subject: [PATCH 002/924] Change react-table version

---
 types/react-table/index.d.ts | 93 ++++++++++++++++++++++++------------
 1 file changed, 62 insertions(+), 31 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 09499e1010..ac0fc16e6d 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-table 6.7
+// Type definitions for react-table 6.6
 // Project: https://github.com/react-tools/react-table
 // Definitions by: Roy Xue <https://github.com/royxue>,
 //                 Pavel Sakalo <https://github.com/psakalo>,
@@ -13,21 +13,53 @@ export type ReactTableFunction = (value?: any) => void;
 export type AccessorFunction<D = any> = (row: D) => any;
 export type Accessor<D = any> = string | string[] | AccessorFunction<D>;
 export type Aggregator = (values: any, rows: any) => any;
-export type TableCellRenderer = ((cellInfo: CellInfo, column: any) => React.ReactNode) | React.ReactNode;
-export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
-export type PivotRenderer = ((cellInfo: CellInfo) => React.ReactNode) | (() => any) | string | React.ReactNode;
+export type TableCellRenderer =
+    | ((cellInfo: CellInfo, column: any) => React.ReactNode)
+    | React.ReactNode;
+export type FilterRender = (
+    params: { column: Column; filter: any; onChange: ReactTableFunction; key?: string }
+) => React.ReactElement<any>;
+export type PivotRenderer =
+    | ((cellInfo: CellInfo) => React.ReactNode)
+    | (() => any)
+    | string
+    | React.ReactNode;
 
-export type ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;
-export type ComponentPropsGetterR = (finalState: any, rowInfo?: RowInfo, column?: undefined, instance?: any) => object | undefined;
-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 ComponentPropsGetter0 = (
+    finalState: any,
+    rowInfo: undefined,
+    column: undefined,
+    instance?: any
+) => object | undefined;
+export type ComponentPropsGetterR = (
+    finalState: any,
+    rowInfo?: RowInfo,
+    column?: undefined,
+    instance?: any
+) => object | undefined;
+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: Filter, row: any, column: any) => boolean;
 export type FilterFunction = (filter: Filter, rows: any[], column: any) => any[];
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;
-export type SortedChangeFunction = (newSorted: SortingRule[], column: any, additive: boolean) => 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: Resize[], event: any) => void;
@@ -48,13 +80,13 @@ export interface SortingRule {
     desc: boolean;
 }
 
-export interface TableProps<D = any, ResolvedData = D> extends
-    Partial<TextProps>,
-    Partial<ComponentDecoratorProps>,
-    Partial<ControlledStateCallbackProps>,
-    Partial<PivotingProps>,
-    Partial<ControlledStateOverrideProps>,
-    Partial<ComponentProps> {
+export interface TableProps<D = any, ResolvedData = D>
+    extends Partial<TextProps>,
+        Partial<ComponentDecoratorProps>,
+        Partial<ControlledStateCallbackProps>,
+        Partial<PivotingProps>,
+        Partial<ControlledStateOverrideProps>,
+        Partial<ComponentProps> {
     /** Default: [] */
     data: D[];
 
@@ -381,13 +413,12 @@ export interface TextProps {
     rowsText: string;
 }
 
-export interface GlobalColumn extends
-    Column.Basics,
-    Column.CellProps,
-    Column.FilterProps,
-    Column.FooterProps,
-    Column.HeaderProps {
-}
+export interface GlobalColumn
+    extends Column.Basics,
+        Column.CellProps,
+        Column.FilterProps,
+        Column.FooterProps,
+        Column.HeaderProps {}
 
 export namespace Column {
     /** Basic column props */
@@ -556,12 +587,12 @@ export interface PivotDefaults {
     render: TableCellRenderer;
 }
 
-export interface Column<D = any> extends
-    Partial<Column.Basics>,
-    Partial<Column.CellProps>,
-    Partial<Column.FilterProps>,
-    Partial<Column.FooterProps>,
-    Partial<Column.HeaderProps> {
+export interface Column<D = any>
+    extends Partial<Column.Basics>,
+        Partial<Column.CellProps>,
+        Partial<Column.FilterProps>,
+        Partial<Column.FooterProps>,
+        Partial<Column.HeaderProps> {
     /**
      * Property name as string or Accessor
      * @example: 'myProperty'
@@ -670,7 +701,7 @@ export interface RowInfo {
     original: any;
 }
 
-export interface CellInfo extends RowInfo, Pick<ControlledStateOverrideProps, "resized"> {
+export interface CellInfo extends RowInfo, Pick<ControlledStateOverrideProps, 'resized'> {
     /* true if this row is expanded */
     isExpanded: boolean;
 
@@ -728,7 +759,7 @@ export interface FinalState<D = any> extends TableProps<D> {
 }
 
 export const ReactTableDefaults: TableProps;
-export default class ReactTable<D> extends React.Component<Partial<TableProps<D>>> { }
+export default class ReactTable<D> extends React.Component<Partial<TableProps<D>>> {}
 
 export interface Instance<D = any> extends ReactTable<D> {
     context: any;

From 05522459752e6eee6c83c5ad8c61b587f7999a74 Mon Sep 17 00:00:00 2001
From: Mihail Novikov <thepocp@gmail.com>
Date: Fri, 11 Jan 2019 15:29:33 +0300
Subject: [PATCH 003/924] Revert code formatting

---
 types/react-table/index.d.ts | 91 ++++++++++++------------------------
 1 file changed, 30 insertions(+), 61 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index ac0fc16e6d..bc6347ae8a 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -13,53 +13,21 @@ export type ReactTableFunction = (value?: any) => void;
 export type AccessorFunction<D = any> = (row: D) => any;
 export type Accessor<D = any> = string | string[] | AccessorFunction<D>;
 export type Aggregator = (values: any, rows: any) => any;
-export type TableCellRenderer =
-    | ((cellInfo: CellInfo, column: any) => React.ReactNode)
-    | React.ReactNode;
-export type FilterRender = (
-    params: { column: Column; filter: any; onChange: ReactTableFunction; key?: string }
-) => React.ReactElement<any>;
-export type PivotRenderer =
-    | ((cellInfo: CellInfo) => React.ReactNode)
-    | (() => any)
-    | string
-    | React.ReactNode;
+export type TableCellRenderer = ((cellInfo: CellInfo, column: any) => React.ReactNode) | React.ReactNode;
+export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
+export type PivotRenderer = ((cellInfo: CellInfo) => React.ReactNode) | (() => any) | string | React.ReactNode;
 
-export type ComponentPropsGetter0 = (
-    finalState: any,
-    rowInfo: undefined,
-    column: undefined,
-    instance?: any
-) => object | undefined;
-export type ComponentPropsGetterR = (
-    finalState: any,
-    rowInfo?: RowInfo,
-    column?: undefined,
-    instance?: any
-) => object | undefined;
-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 ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;
+export type ComponentPropsGetterR = (finalState: any, rowInfo?: RowInfo, column?: undefined, instance?: any) => object | undefined;
+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: Filter, row: any, column: any) => boolean;
 export type FilterFunction = (filter: Filter, rows: any[], column: any) => any[];
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;
-export type SortedChangeFunction = (
-    newSorted: SortingRule[],
-    column: any,
-    additive: boolean
-) => 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: Resize[], event: any) => void;
@@ -80,13 +48,13 @@ export interface SortingRule {
     desc: boolean;
 }
 
-export interface TableProps<D = any, ResolvedData = D>
-    extends Partial<TextProps>,
-        Partial<ComponentDecoratorProps>,
-        Partial<ControlledStateCallbackProps>,
-        Partial<PivotingProps>,
-        Partial<ControlledStateOverrideProps>,
-        Partial<ComponentProps> {
+export interface TableProps<D = any, ResolvedData = D> extends
+    Partial<TextProps>,
+    Partial<ComponentDecoratorProps>,
+    Partial<ControlledStateCallbackProps>,
+    Partial<PivotingProps>,
+    Partial<ControlledStateOverrideProps>,
+    Partial<ComponentProps> {
     /** Default: [] */
     data: D[];
 
@@ -413,12 +381,13 @@ export interface TextProps {
     rowsText: string;
 }
 
-export interface GlobalColumn
-    extends Column.Basics,
-        Column.CellProps,
-        Column.FilterProps,
-        Column.FooterProps,
-        Column.HeaderProps {}
+export interface GlobalColumn extends
+    Column.Basics,
+    Column.CellProps,
+    Column.FilterProps,
+    Column.FooterProps,
+    Column.HeaderProps {
+}
 
 export namespace Column {
     /** Basic column props */
@@ -587,12 +556,12 @@ export interface PivotDefaults {
     render: TableCellRenderer;
 }
 
-export interface Column<D = any>
-    extends Partial<Column.Basics>,
-        Partial<Column.CellProps>,
-        Partial<Column.FilterProps>,
-        Partial<Column.FooterProps>,
-        Partial<Column.HeaderProps> {
+export interface Column<D = any> extends
+    Partial<Column.Basics>,
+    Partial<Column.CellProps>,
+    Partial<Column.FilterProps>,
+    Partial<Column.FooterProps>,
+    Partial<Column.HeaderProps> {
     /**
      * Property name as string or Accessor
      * @example: 'myProperty'
@@ -701,7 +670,7 @@ export interface RowInfo {
     original: any;
 }
 
-export interface CellInfo extends RowInfo, Pick<ControlledStateOverrideProps, 'resized'> {
+export interface CellInfo extends RowInfo, Pick<ControlledStateOverrideProps, "resized"> {
     /* true if this row is expanded */
     isExpanded: boolean;
 
@@ -759,7 +728,7 @@ export interface FinalState<D = any> extends TableProps<D> {
 }
 
 export const ReactTableDefaults: TableProps;
-export default class ReactTable<D> extends React.Component<Partial<TableProps<D>>> {}
+export default class ReactTable<D> extends React.Component<Partial<TableProps<D>>> { }
 
 export interface Instance<D = any> extends ReactTable<D> {
     context: any;

From c2e5d91390ab6a6e52c919bc7c3dfd8b3f126d64 Mon Sep 17 00:00:00 2001
From: Max Bo <max@maxbo.me>
Date: Wed, 16 Jan 2019 11:23:08 +1100
Subject: [PATCH 004/924] Update react-google-recaptcha types

- Added the `onErrored?: () => void;` prop, with description sourced from https://developers.google.com/recaptcha/docs/display
---
 types/react-google-recaptcha/index.d.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/react-google-recaptcha/index.d.ts b/types/react-google-recaptcha/index.d.ts
index 6636e6c5b6..b705aaf8f6 100644
--- a/types/react-google-recaptcha/index.d.ts
+++ b/types/react-google-recaptcha/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React Google Recaptcha 0.10
+// Type definitions for React Google Recaptcha 1.0
 // Project: https://github.com/dozoisch/react-google-recaptcha
 // Definitions by: Koala Human <https://github.com/KoalaHuman>, Tom Sturge <https://github.com/tomsturge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -66,6 +66,12 @@ export interface ReCAPTCHAProps {
 	 *  Optional callback, called when a challenge expires and has to be redone by the user.
 	 */
 	onExpired?: () => void;
+	/**
+	 *  Optional callback, called when reCAPTCHA encounters an error (usually network connectivity)
+	 *  and cannot continue until connectivity is restored. If you specify a function here, you are
+	 *  responsible for informing the user that they should retry.
+	 */
+	onErrored?: () => void;
 	/**
 	 *  Optional set the stoken parameter, which allows the captcha to be used from different domains,
 	 *  @see reCAPTCHA secure-token

From 1cb13b7179f16845d5da3c99e00e06eafcf9eb54 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 4 Feb 2019 11:07:51 +0100
Subject: [PATCH 005/924] Adds elo-rank typings

---
 types/elo-rank/elo-rank-tests.ts |  7 +++++++
 types/elo-rank/index.d.ts        | 14 ++++++++++++++
 types/elo-rank/tsconfig.json     | 22 ++++++++++++++++++++++
 types/elo-rank/tslint.json       |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 types/elo-rank/elo-rank-tests.ts
 create mode 100644 types/elo-rank/index.d.ts
 create mode 100644 types/elo-rank/tsconfig.json
 create mode 100644 types/elo-rank/tslint.json

diff --git a/types/elo-rank/elo-rank-tests.ts b/types/elo-rank/elo-rank-tests.ts
new file mode 100644
index 0000000000..7cf7955a14
--- /dev/null
+++ b/types/elo-rank/elo-rank-tests.ts
@@ -0,0 +1,7 @@
+import EloRank from 'elo-rank';
+
+var test = new EloRank();
+
+test.getKFactor(); // $ExpectType number
+test.getExpected(1200, 1500);  // $ExpectType number
+test.updateRating(test.getExpected(1200, 1500), 1300, 1500); // $ExpectType number
\ No newline at end of file
diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
new file mode 100644
index 0000000000..c2a797cbcb
--- /dev/null
+++ b/types/elo-rank/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for elo-rank 1.0
+// Project: https://github.com/dmamills/elo-rank#readme
+// Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class EloRank {
+	constructor(kFactor?: number);
+	
+	setKFactor(kFactor: number): void;
+	getKFactor(): number;
+	getExpected(a: number, b: number): number;
+	
+	updateRating(expected: number, actual: number, current: number): number;
+}
diff --git a/types/elo-rank/tsconfig.json b/types/elo-rank/tsconfig.json
new file mode 100644
index 0000000000..7ec166bf13
--- /dev/null
+++ b/types/elo-rank/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "elo-rank-tests.ts"
+    ]
+}
diff --git a/types/elo-rank/tslint.json b/types/elo-rank/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/elo-rank/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 04a782f4b0342f452ce09ee8cd39af8563ee1a52 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 4 Feb 2019 12:11:30 +0100
Subject: [PATCH 006/924] strictFunctionTypes set to true

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index c2a797cbcb..d3265cb15b 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export class EloRank {
+export default class EloRank {
 	constructor(kFactor?: number);
 	
 	setKFactor(kFactor: number): void;
diff --git a/types/elo-rank/tsconfig.json b/types/elo-rank/tsconfig.json
index 7ec166bf13..2ebd08f352 100644
--- a/types/elo-rank/tsconfig.json
+++ b/types/elo-rank/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 8ab5b5ff732a1d9a8cc47c3a11c08e2a36c7b31e Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 4 Feb 2019 12:18:03 +0100
Subject: [PATCH 007/924] Fixing lint errors

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

diff --git a/types/elo-rank/elo-rank-tests.ts b/types/elo-rank/elo-rank-tests.ts
index 7cf7955a14..ce5f70dd2e 100644
--- a/types/elo-rank/elo-rank-tests.ts
+++ b/types/elo-rank/elo-rank-tests.ts
@@ -1,6 +1,6 @@
 import EloRank from 'elo-rank';
 
-var test = new EloRank();
+const test = new EloRank();
 
 test.getKFactor(); // $ExpectType number
 test.getExpected(1200, 1500);  // $ExpectType number

From cdd038c9d44acf8f20fe31233c66be4fab8e16f3 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 4 Feb 2019 12:20:24 +0100
Subject: [PATCH 008/924] Fix tslint errors

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

diff --git a/types/elo-rank/elo-rank-tests.ts b/types/elo-rank/elo-rank-tests.ts
index ce5f70dd2e..2d3c40ad14 100644
--- a/types/elo-rank/elo-rank-tests.ts
+++ b/types/elo-rank/elo-rank-tests.ts
@@ -4,4 +4,4 @@ const test = new EloRank();
 
 test.getKFactor(); // $ExpectType number
 test.getExpected(1200, 1500);  // $ExpectType number
-test.updateRating(test.getExpected(1200, 1500), 1300, 1500); // $ExpectType number
\ No newline at end of file
+test.updateRating(test.getExpected(1200, 1500), 1300, 1500); // $ExpectType number
diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index d3265cb15b..b702e6bd9a 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -5,10 +5,8 @@
 
 export default class EloRank {
 	constructor(kFactor?: number);
-	
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;
 	getExpected(a: number, b: number): number;
-	
 	updateRating(expected: number, actual: number, current: number): number;
 }

From 19e524a21c3f8d6cf2ef097b429146e0299d1db7 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Thu, 7 Feb 2019 14:53:54 +0100
Subject: [PATCH 009/924] Fixes export default

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

diff --git a/types/elo-rank/elo-rank-tests.ts b/types/elo-rank/elo-rank-tests.ts
index 2d3c40ad14..2e53764042 100644
--- a/types/elo-rank/elo-rank-tests.ts
+++ b/types/elo-rank/elo-rank-tests.ts
@@ -1,4 +1,4 @@
-import EloRank from 'elo-rank';
+import { EloRank } from "elo-rank";
 
 const test = new EloRank();
 
diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index b702e6bd9a..c9e6178750 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default class EloRank {
+export class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;

From 8b70ba807f8182852d62fdd6aafdfad7f2572c59 Mon Sep 17 00:00:00 2001
From: JMH <jheld135@gmail.com>
Date: Sat, 9 Feb 2019 10:48:29 -0600
Subject: [PATCH 010/924] [detox] remove detox as named export, make it a
 default export instead

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

diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
index 977f32e249..4a81cf3dbc 100644
--- a/types/detox/index.d.ts
+++ b/types/detox/index.d.ts
@@ -434,10 +434,12 @@ declare global {
     }
 }
 
-export { by, detox, device, element, waitFor };
+export { by, device, element, waitFor };
 
 // Not exporting the global `expect` from the top of the file here
 // because `expect` conflicts with the global `expect` of jest and
 // therefore exporting it doesn't work. The global `expect` is kept
 // for backwards compatibility though.
 export const expect: Detox.Expect<Detox.Expect<any>>;
+
+export default detox;

From f794cf4dead09652eae471fd751260dad97bb0a7 Mon Sep 17 00:00:00 2001
From: JMH <jheld135@gmail.com>
Date: Sat, 9 Feb 2019 10:49:44 -0600
Subject: [PATCH 011/924] [detox] Add test for importing default export

---
 types/detox/test/detox-jest-setup-tests.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index 7a2a9a3901..c0b1ea2127 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -2,6 +2,7 @@ declare var beforeAll: (callback: () => void) => void;
 declare var beforeEach: (callback: () => void) => void;
 declare var afterAll: (callback: () => void) => void;
 
+import defaultDetox from "detox";
 import adapter from "detox/runners/jest/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
@@ -18,7 +19,7 @@ beforeAll(async () => {
         initGlobals: false,
         launchApp: false,
     };
-    await detox.init(config, initOptions);
+    await defaultDetox.init(config, initOptions);
 });
 
 beforeEach(async () => {

From 0aaf38806d1838ad54bf9cc4530447650760292a Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Mon, 11 Feb 2019 03:27:17 +0100
Subject: [PATCH 012/924] fix: export default

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

diff --git a/types/animejs/animejs-tests.ts b/types/animejs/animejs-tests.ts
index 697c79f738..926f89acc8 100644
--- a/types/animejs/animejs-tests.ts
+++ b/types/animejs/animejs-tests.ts
@@ -1,4 +1,4 @@
-import * as anime from 'animejs';
+import anime from 'animejs';
 
 const test1 = anime({
 	targets: 'div',
diff --git a/types/animejs/index.d.ts b/types/animejs/index.d.ts
index 069187b15e..bbfb21963b 100644
--- a/types/animejs/index.d.ts
+++ b/types/animejs/index.d.ts
@@ -133,5 +133,4 @@ declare namespace anime {
 
 declare function anime(params: anime.AnimeParams): anime.AnimeInstance;
 
-export = anime;
-export as namespace anime;
+export default anime;

From cc7c708a5b30715c562af232cb5d4096e5e40aec Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 11 Feb 2019 11:14:09 +0100
Subject: [PATCH 013/924] Export changes

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index c9e6178750..2a1f63c7ff 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -3,10 +3,12 @@
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export class EloRank {
+declare class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;
 	getExpected(a: number, b: number): number;
 	updateRating(expected: number, actual: number, current: number): number;
 }
+
+export = EloRank;
\ No newline at end of file

From c748258bfb7000ad864d6d8cb01a30710471938a Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 11 Feb 2019 11:44:28 +0100
Subject: [PATCH 014/924] Fixing build

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index 2a1f63c7ff..df0cd09c9e 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -11,4 +11,4 @@ declare class EloRank {
 	updateRating(expected: number, actual: number, current: number): number;
 }
 
-export = EloRank;
\ No newline at end of file
+export = EloRank;

From 353f6026f11ca58ff2629b8e57d5d2513a3bb654 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 11 Feb 2019 12:21:36 +0100
Subject: [PATCH 015/924] Testing CI

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index df0cd09c9e..541d070394 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class EloRank {
+class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;

From aefa57eaf893873aef0b36b9ec7dbac2a436ed36 Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 11 Feb 2019 12:25:54 +0100
Subject: [PATCH 016/924] Changes needed for exports

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

diff --git a/types/elo-rank/elo-rank-tests.ts b/types/elo-rank/elo-rank-tests.ts
index 2e53764042..4032d46f0a 100644
--- a/types/elo-rank/elo-rank-tests.ts
+++ b/types/elo-rank/elo-rank-tests.ts
@@ -1,4 +1,4 @@
-import { EloRank } from "elo-rank";
+import EloRank from "elo-rank";
 
 const test = new EloRank();
 
diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index 541d070394..df0cd09c9e 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-class EloRank {
+declare class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;
diff --git a/types/elo-rank/tsconfig.json b/types/elo-rank/tsconfig.json
index 2ebd08f352..21cf1d2f88 100644
--- a/types/elo-rank/tsconfig.json
+++ b/types/elo-rank/tsconfig.json
@@ -14,7 +14,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",

From 624cbdaa3e2476934ada28aadf26aec29d813ecc Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Mon, 11 Feb 2019 14:35:42 +0100
Subject: [PATCH 017/924] Typescript 2.7

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index df0cd09c9e..25f046cbd3 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/dmamills/elo-rank#readme
 // Definitions by: Antonio Pavlinovic <https://github.com/apavlinovic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
-declare class EloRank {
+class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;

From 4f37515efcd0647c86a1f88d97a159104f71c774 Mon Sep 17 00:00:00 2001
From: tylerprice1 <33133203+tylerprice1@users.noreply.github.com>
Date: Mon, 11 Feb 2019 17:11:53 -0500
Subject: [PATCH 018/924] Update index.d.ts

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

diff --git a/types/jasmine-data_driven_tests/index.d.ts b/types/jasmine-data_driven_tests/index.d.ts
index 6e6a070eaa..7c9a4d148c 100644
--- a/types/jasmine-data_driven_tests/index.d.ts
+++ b/types/jasmine-data_driven_tests/index.d.ts
@@ -6,6 +6,8 @@
 
 declare var all: JasmineDataDrivenTest;
 declare var xall: JasmineDataDrivenTest;
+declare var using: JasmineDataDrivenTest;
+declare var xusing: JasmineDataDrivenTest;
 
 interface JasmineDataDrivenTest {
     <T, U, V, W, X, Y, Z>(

From d35f65ac1410e3effb48be44de8615c5da53484b Mon Sep 17 00:00:00 2001
From: Antonio Pavlinovic <apavlinovic@neogov.net>
Date: Tue, 12 Feb 2019 11:36:04 +0100
Subject: [PATCH 019/924] Typescript madness

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

diff --git a/types/elo-rank/index.d.ts b/types/elo-rank/index.d.ts
index 25f046cbd3..489be40fdc 100644
--- a/types/elo-rank/index.d.ts
+++ b/types/elo-rank/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
-class EloRank {
+declare class EloRank {
 	constructor(kFactor?: number);
 	setKFactor(kFactor: number): void;
 	getKFactor(): number;

From 3a137a2977475fd4d5b0ce54ec3a9c1ba936ca2c Mon Sep 17 00:00:00 2001
From: lukostry <lukasz.ostrowski85@gmail.com>
Date: Wed, 13 Feb 2019 14:23:38 +0100
Subject: [PATCH 020/924] Add definitions for ink-select-input

---
 types/ink-select-input/index.d.ts             | 23 ++++++++++++++++
 .../ink-select-input-tests.tsx                | 27 +++++++++++++++++++
 types/ink-select-input/tsconfig.json          | 24 +++++++++++++++++
 types/ink-select-input/tslint.json            |  1 +
 4 files changed, 75 insertions(+)
 create mode 100644 types/ink-select-input/index.d.ts
 create mode 100644 types/ink-select-input/ink-select-input-tests.tsx
 create mode 100644 types/ink-select-input/tsconfig.json
 create mode 100644 types/ink-select-input/tslint.json

diff --git a/types/ink-select-input/index.d.ts b/types/ink-select-input/index.d.ts
new file mode 100644
index 0000000000..2dc38d2a86
--- /dev/null
+++ b/types/ink-select-input/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for ink-select-input 2.0
+// Project: https://github.com/vadimdemedes/ink-select-input#readme
+// Definitions by: Łukasz Ostrowski <https://github.com/lukostry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Component, InkComponent } from 'ink';
+
+export interface ItemOfSelectInput {
+    label: string;
+    value: any;
+}
+
+export interface SelectInputProps<T extends ItemOfSelectInput = ItemOfSelectInput> {
+    focus?: boolean;
+    indicatorComponent?: InkComponent;
+    itemComponent?: InkComponent;
+    items?: ReadonlyArray<T>;
+    limit?: number;
+    onSelect?: (item: T) => void;
+}
+
+export default class SelectInput extends Component<SelectInputProps> { }
diff --git a/types/ink-select-input/ink-select-input-tests.tsx b/types/ink-select-input/ink-select-input-tests.tsx
new file mode 100644
index 0000000000..4120cbf43e
--- /dev/null
+++ b/types/ink-select-input/ink-select-input-tests.tsx
@@ -0,0 +1,27 @@
+/** @jsx h */
+import { h, InkComponent } from 'ink';
+import SelectInput from 'ink-select-input';
+
+interface DemoItem {
+  label: string;
+  value: string;
+}
+
+const items: ReadonlyArray<DemoItem> = [{
+  label: 'First',
+  value: 'first'
+}, {
+  label: 'Second',
+  value: 'second'
+}, {
+  label: 'Third',
+  value: 'third'
+}];
+
+const Demo: InkComponent = () => {
+  const handleSelect = (item: DemoItem) => {
+    console.log(item);
+  };
+
+  return <SelectInput items={items} onSelect={handleSelect} />;
+};
diff --git a/types/ink-select-input/tsconfig.json b/types/ink-select-input/tsconfig.json
new file mode 100644
index 0000000000..4ae1e800aa
--- /dev/null
+++ b/types/ink-select-input/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ink-select-input-tests.tsx"
+    ]
+}
diff --git a/types/ink-select-input/tslint.json b/types/ink-select-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ink-select-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 206498123c51310a97798a8bfdfbe309c20173ac Mon Sep 17 00:00:00 2001
From: Walter Barbagallo <brb.walter@gmail.com>
Date: Wed, 13 Feb 2019 14:31:27 +0100
Subject: [PATCH 021/924] Removed wrong type reference to FormData

FormData is ambiguous.
It can be resolved with [lib.dom FormData interface](https://github.com/Microsoft/TypeScript/blob/v3.3.1/lib/lib.dom.d.ts#L5196),
or it can break the compiler if the dom lib is not included in the compilerOptions lib.
---
 types/redux-form/index.d.ts       | 1 +
 types/redux-form/lib/actions.d.ts | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 8997d682a8..b0229791dd 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -13,6 +13,7 @@
 //                 Kamil Wojcik <https://github.com/smifun>
 //                 Mohamed Shaaban <https://github.com/mshaaban088>
 //                 Ethan Setnik <https://github.com/esetnik>
+//                 Walter Barbagallo <https://github.com/bwlt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 import {
diff --git a/types/redux-form/lib/actions.d.ts b/types/redux-form/lib/actions.d.ts
index 955d3d3f5e..85fec56908 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -36,11 +36,11 @@ export declare function registerField(form: string, name: string, type: FieldTyp
 export declare function reset(form: string): FormAction;
 export declare function resetSection(form: string, ...sections: string[]): FormAction;
 export declare function startAsyncValidation(form: string): FormAction;
-export declare function stopAsyncValidation(form: string, errors?: FormErrors<FormData, any>): FormAction;
+export declare function stopAsyncValidation(form: string, errors?: FormErrors<any, any>): FormAction;
 export declare function setSubmitFailed(form: string, ...fields: string[]): FormAction;
 export declare function setSubmitSucceeded(form: string, ...fields: string[]): FormAction;
 export declare function startSubmit(form: string): FormAction;
-export declare function stopSubmit(form: string, errors?: FormErrors<FormData, any>): FormAction;
+export declare function stopSubmit(form: string, errors?: FormErrors<any, any>): FormAction;
 export declare function submit(form: string): FormAction;
 export declare function clearSubmit(form: string): FormAction;
 export declare function clearSubmitErrors(form: string): FormAction;
@@ -49,8 +49,8 @@ export declare function clearFields(form: string, keepTouched: boolean, persiste
 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;
-export declare function updateSyncErrors<T = any>(from: string, syncErrors: FormErrors<FormData, T>, error: T): FormAction;
-export declare function updateSyncWarnings<T = any>(form: string, syncWarnings: FormWarnings<FormData, T>, warning: T): FormAction;
+export declare function updateSyncErrors<T = any>(from: string, syncErrors: FormErrors<any, T>, error: T): FormAction;
+export declare function updateSyncWarnings<T = any>(form: string, syncWarnings: FormWarnings<any, T>, warning: T): FormAction;
 
 declare const actions: {
     arrayInsert: typeof arrayInsert,

From e3262d7e9ed71b754aeb032d2b4caa8e48b8e09c Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 12:37:59 -0600
Subject: [PATCH 022/924] Update to version 2.8 and fix _.get

---
 types/lodash-es/index.d.ts                | 2 +-
 types/lodash.add/index.d.ts               | 2 +-
 types/lodash.after/index.d.ts             | 2 +-
 types/lodash.ary/index.d.ts               | 2 +-
 types/lodash.assign/index.d.ts            | 2 +-
 types/lodash.assignin/index.d.ts          | 2 +-
 types/lodash.assigninwith/index.d.ts      | 2 +-
 types/lodash.assignwith/index.d.ts        | 2 +-
 types/lodash.at/index.d.ts                | 2 +-
 types/lodash.attempt/index.d.ts           | 2 +-
 types/lodash.before/index.d.ts            | 2 +-
 types/lodash.bind/index.d.ts              | 2 +-
 types/lodash.bindall/index.d.ts           | 2 +-
 types/lodash.bindkey/index.d.ts           | 2 +-
 types/lodash.camelcase/index.d.ts         | 2 +-
 types/lodash.capitalize/index.d.ts        | 2 +-
 types/lodash.castarray/index.d.ts         | 2 +-
 types/lodash.ceil/index.d.ts              | 2 +-
 types/lodash.chunk/index.d.ts             | 2 +-
 types/lodash.clamp/index.d.ts             | 2 +-
 types/lodash.clone/index.d.ts             | 2 +-
 types/lodash.clonedeep/index.d.ts         | 2 +-
 types/lodash.clonedeepwith/index.d.ts     | 2 +-
 types/lodash.clonewith/index.d.ts         | 2 +-
 types/lodash.compact/index.d.ts           | 2 +-
 types/lodash.concat/index.d.ts            | 2 +-
 types/lodash.cond/index.d.ts              | 2 +-
 types/lodash.constant/index.d.ts          | 2 +-
 types/lodash.countby/index.d.ts           | 2 +-
 types/lodash.create/index.d.ts            | 2 +-
 types/lodash.curry/index.d.ts             | 2 +-
 types/lodash.curryright/index.d.ts        | 2 +-
 types/lodash.debounce/index.d.ts          | 2 +-
 types/lodash.deburr/index.d.ts            | 2 +-
 types/lodash.defaults/index.d.ts          | 2 +-
 types/lodash.defaultsdeep/index.d.ts      | 2 +-
 types/lodash.defer/index.d.ts             | 2 +-
 types/lodash.delay/index.d.ts             | 2 +-
 types/lodash.difference/index.d.ts        | 2 +-
 types/lodash.differenceby/index.d.ts      | 2 +-
 types/lodash.differencewith/index.d.ts    | 2 +-
 types/lodash.divide/index.d.ts            | 2 +-
 types/lodash.drop/index.d.ts              | 2 +-
 types/lodash.dropright/index.d.ts         | 2 +-
 types/lodash.droprightwhile/index.d.ts    | 2 +-
 types/lodash.dropwhile/index.d.ts         | 2 +-
 types/lodash.endswith/index.d.ts          | 2 +-
 types/lodash.eq/index.d.ts                | 2 +-
 types/lodash.escape/index.d.ts            | 2 +-
 types/lodash.escaperegexp/index.d.ts      | 2 +-
 types/lodash.every/index.d.ts             | 2 +-
 types/lodash.fill/index.d.ts              | 2 +-
 types/lodash.filter/index.d.ts            | 2 +-
 types/lodash.find/index.d.ts              | 2 +-
 types/lodash.findindex/index.d.ts         | 2 +-
 types/lodash.findkey/index.d.ts           | 2 +-
 types/lodash.findlast/index.d.ts          | 2 +-
 types/lodash.findlastindex/index.d.ts     | 2 +-
 types/lodash.findlastkey/index.d.ts       | 2 +-
 types/lodash.first/index.d.ts             | 2 +-
 types/lodash.flatmap/index.d.ts           | 2 +-
 types/lodash.flatmapdeep/index.d.ts       | 2 +-
 types/lodash.flatmapdepth/index.d.ts      | 2 +-
 types/lodash.flatten/index.d.ts           | 2 +-
 types/lodash.flattendeep/index.d.ts       | 2 +-
 types/lodash.flattendepth/index.d.ts      | 2 +-
 types/lodash.flip/index.d.ts              | 2 +-
 types/lodash.floor/index.d.ts             | 2 +-
 types/lodash.flow/index.d.ts              | 2 +-
 types/lodash.flowright/index.d.ts         | 2 +-
 types/lodash.foreach/index.d.ts           | 2 +-
 types/lodash.foreachright/index.d.ts      | 2 +-
 types/lodash.forin/index.d.ts             | 2 +-
 types/lodash.forinright/index.d.ts        | 2 +-
 types/lodash.forown/index.d.ts            | 2 +-
 types/lodash.forownright/index.d.ts       | 2 +-
 types/lodash.frompairs/index.d.ts         | 2 +-
 types/lodash.functions/index.d.ts         | 2 +-
 types/lodash.functionsin/index.d.ts       | 2 +-
 types/lodash.get/index.d.ts               | 2 +-
 types/lodash.groupby/index.d.ts           | 2 +-
 types/lodash.gt/index.d.ts                | 2 +-
 types/lodash.gte/index.d.ts               | 2 +-
 types/lodash.has/index.d.ts               | 2 +-
 types/lodash.hasin/index.d.ts             | 2 +-
 types/lodash.head/index.d.ts              | 2 +-
 types/lodash.identity/index.d.ts          | 2 +-
 types/lodash.includes/index.d.ts          | 2 +-
 types/lodash.indexof/index.d.ts           | 2 +-
 types/lodash.initial/index.d.ts           | 2 +-
 types/lodash.inrange/index.d.ts           | 2 +-
 types/lodash.intersection/index.d.ts      | 2 +-
 types/lodash.intersectionby/index.d.ts    | 2 +-
 types/lodash.intersectionwith/index.d.ts  | 2 +-
 types/lodash.invert/index.d.ts            | 2 +-
 types/lodash.invertby/index.d.ts          | 2 +-
 types/lodash.invoke/index.d.ts            | 2 +-
 types/lodash.invokemap/index.d.ts         | 2 +-
 types/lodash.isarguments/index.d.ts       | 2 +-
 types/lodash.isarray/index.d.ts           | 2 +-
 types/lodash.isarraybuffer/index.d.ts     | 2 +-
 types/lodash.isarraylike/index.d.ts       | 2 +-
 types/lodash.isarraylikeobject/index.d.ts | 2 +-
 types/lodash.isboolean/index.d.ts         | 2 +-
 types/lodash.isbuffer/index.d.ts          | 2 +-
 types/lodash.isdate/index.d.ts            | 2 +-
 types/lodash.iselement/index.d.ts         | 2 +-
 types/lodash.isempty/index.d.ts           | 2 +-
 types/lodash.isequal/index.d.ts           | 2 +-
 types/lodash.isequalwith/index.d.ts       | 2 +-
 types/lodash.iserror/index.d.ts           | 2 +-
 types/lodash.isfinite/index.d.ts          | 2 +-
 types/lodash.isfunction/index.d.ts        | 2 +-
 types/lodash.isinteger/index.d.ts         | 2 +-
 types/lodash.islength/index.d.ts          | 2 +-
 types/lodash.ismap/index.d.ts             | 2 +-
 types/lodash.ismatch/index.d.ts           | 2 +-
 types/lodash.ismatchwith/index.d.ts       | 2 +-
 types/lodash.isnan/index.d.ts             | 2 +-
 types/lodash.isnative/index.d.ts          | 2 +-
 types/lodash.isnil/index.d.ts             | 2 +-
 types/lodash.isnull/index.d.ts            | 2 +-
 types/lodash.isnumber/index.d.ts          | 2 +-
 types/lodash.isobject/index.d.ts          | 2 +-
 types/lodash.isobjectlike/index.d.ts      | 2 +-
 types/lodash.isplainobject/index.d.ts     | 2 +-
 types/lodash.isregexp/index.d.ts          | 2 +-
 types/lodash.issafeinteger/index.d.ts     | 2 +-
 types/lodash.isset/index.d.ts             | 2 +-
 types/lodash.isstring/index.d.ts          | 2 +-
 types/lodash.issymbol/index.d.ts          | 2 +-
 types/lodash.istypedarray/index.d.ts      | 2 +-
 types/lodash.isundefined/index.d.ts       | 2 +-
 types/lodash.isweakmap/index.d.ts         | 2 +-
 types/lodash.isweakset/index.d.ts         | 2 +-
 types/lodash.iteratee/index.d.ts          | 2 +-
 types/lodash.join/index.d.ts              | 2 +-
 types/lodash.kebabcase/index.d.ts         | 2 +-
 types/lodash.keyby/index.d.ts             | 2 +-
 types/lodash.keys/index.d.ts              | 2 +-
 types/lodash.keysin/index.d.ts            | 2 +-
 types/lodash.last/index.d.ts              | 2 +-
 types/lodash.lastindexof/index.d.ts       | 2 +-
 types/lodash.lowercase/index.d.ts         | 2 +-
 types/lodash.lowerfirst/index.d.ts        | 2 +-
 types/lodash.lt/index.d.ts                | 2 +-
 types/lodash.lte/index.d.ts               | 2 +-
 types/lodash.mapkeys/index.d.ts           | 2 +-
 types/lodash.mapvalues/index.d.ts         | 2 +-
 types/lodash.matches/index.d.ts           | 2 +-
 types/lodash.matchesproperty/index.d.ts   | 2 +-
 types/lodash.max/index.d.ts               | 2 +-
 types/lodash.maxby/index.d.ts             | 2 +-
 types/lodash.mean/index.d.ts              | 2 +-
 types/lodash.meanby/index.d.ts            | 2 +-
 types/lodash.memoize/index.d.ts           | 2 +-
 types/lodash.merge/index.d.ts             | 2 +-
 types/lodash.mergewith/index.d.ts         | 2 +-
 types/lodash.method/index.d.ts            | 2 +-
 types/lodash.methodof/index.d.ts          | 2 +-
 types/lodash.min/index.d.ts               | 2 +-
 types/lodash.minby/index.d.ts             | 2 +-
 types/lodash.mixin/index.d.ts             | 2 +-
 types/lodash.negate/index.d.ts            | 2 +-
 types/lodash.noop/index.d.ts              | 2 +-
 types/lodash.now/index.d.ts               | 2 +-
 types/lodash.nth/index.d.ts               | 2 +-
 types/lodash.ntharg/index.d.ts            | 2 +-
 types/lodash.omit/index.d.ts              | 2 +-
 types/lodash.omitby/index.d.ts            | 2 +-
 types/lodash.once/index.d.ts              | 2 +-
 types/lodash.orderby/index.d.ts           | 2 +-
 types/lodash.over/index.d.ts              | 2 +-
 types/lodash.overargs/index.d.ts          | 2 +-
 types/lodash.overevery/index.d.ts         | 2 +-
 types/lodash.oversome/index.d.ts          | 2 +-
 types/lodash.pad/index.d.ts               | 2 +-
 types/lodash.padend/index.d.ts            | 2 +-
 types/lodash.padstart/index.d.ts          | 2 +-
 types/lodash.parseint/index.d.ts          | 2 +-
 types/lodash.partial/index.d.ts           | 2 +-
 types/lodash.partialright/index.d.ts      | 2 +-
 types/lodash.partition/index.d.ts         | 2 +-
 types/lodash.pick/index.d.ts              | 2 +-
 types/lodash.pickby/index.d.ts            | 2 +-
 types/lodash.property/index.d.ts          | 2 +-
 types/lodash.propertyof/index.d.ts        | 2 +-
 types/lodash.pull/index.d.ts              | 2 +-
 types/lodash.pullall/index.d.ts           | 2 +-
 types/lodash.pullallby/index.d.ts         | 2 +-
 types/lodash.pullallwith/index.d.ts       | 2 +-
 types/lodash.pullat/index.d.ts            | 2 +-
 types/lodash.random/index.d.ts            | 2 +-
 types/lodash.range/index.d.ts             | 2 +-
 types/lodash.rangeright/index.d.ts        | 2 +-
 types/lodash.rearg/index.d.ts             | 2 +-
 types/lodash.reduce/index.d.ts            | 2 +-
 types/lodash.reduceright/index.d.ts       | 2 +-
 types/lodash.reject/index.d.ts            | 2 +-
 types/lodash.remove/index.d.ts            | 2 +-
 types/lodash.repeat/index.d.ts            | 2 +-
 types/lodash.replace/index.d.ts           | 2 +-
 types/lodash.rest/index.d.ts              | 2 +-
 types/lodash.result/index.d.ts            | 2 +-
 types/lodash.reverse/index.d.ts           | 2 +-
 types/lodash.round/index.d.ts             | 2 +-
 types/lodash.sample/index.d.ts            | 2 +-
 types/lodash.samplesize/index.d.ts        | 2 +-
 types/lodash.set/index.d.ts               | 2 +-
 types/lodash.setwith/index.d.ts           | 2 +-
 types/lodash.shuffle/index.d.ts           | 2 +-
 types/lodash.size/index.d.ts              | 2 +-
 types/lodash.slice/index.d.ts             | 2 +-
 types/lodash.snakecase/index.d.ts         | 2 +-
 types/lodash.some/index.d.ts              | 2 +-
 types/lodash.sortby/index.d.ts            | 2 +-
 types/lodash.sortedindex/index.d.ts       | 2 +-
 types/lodash.sortedindexby/index.d.ts     | 2 +-
 types/lodash.sortedindexof/index.d.ts     | 2 +-
 types/lodash.sortedlastindex/index.d.ts   | 2 +-
 types/lodash.sortedlastindexby/index.d.ts | 2 +-
 types/lodash.sortedlastindexof/index.d.ts | 2 +-
 types/lodash.sorteduniq/index.d.ts        | 2 +-
 types/lodash.sorteduniqby/index.d.ts      | 2 +-
 types/lodash.split/index.d.ts             | 2 +-
 types/lodash.spread/index.d.ts            | 2 +-
 types/lodash.startcase/index.d.ts         | 2 +-
 types/lodash.startswith/index.d.ts        | 2 +-
 types/lodash.subtract/index.d.ts          | 2 +-
 types/lodash.sum/index.d.ts               | 2 +-
 types/lodash.sumby/index.d.ts             | 2 +-
 types/lodash.tail/index.d.ts              | 2 +-
 types/lodash.take/index.d.ts              | 2 +-
 types/lodash.takeright/index.d.ts         | 2 +-
 types/lodash.takerightwhile/index.d.ts    | 2 +-
 types/lodash.takewhile/index.d.ts         | 2 +-
 types/lodash.template/index.d.ts          | 2 +-
 types/lodash.throttle/index.d.ts          | 2 +-
 types/lodash.times/index.d.ts             | 2 +-
 types/lodash.toarray/index.d.ts           | 2 +-
 types/lodash.tofinite/index.d.ts          | 2 +-
 types/lodash.tointeger/index.d.ts         | 2 +-
 types/lodash.tolength/index.d.ts          | 2 +-
 types/lodash.tolower/index.d.ts           | 2 +-
 types/lodash.tonumber/index.d.ts          | 2 +-
 types/lodash.topairs/index.d.ts           | 2 +-
 types/lodash.topairsin/index.d.ts         | 2 +-
 types/lodash.topath/index.d.ts            | 2 +-
 types/lodash.toplainobject/index.d.ts     | 2 +-
 types/lodash.tosafeinteger/index.d.ts     | 2 +-
 types/lodash.tostring/index.d.ts          | 2 +-
 types/lodash.toupper/index.d.ts           | 2 +-
 types/lodash.transform/index.d.ts         | 2 +-
 types/lodash.trim/index.d.ts              | 2 +-
 types/lodash.trimend/index.d.ts           | 2 +-
 types/lodash.trimstart/index.d.ts         | 2 +-
 types/lodash.truncate/index.d.ts          | 2 +-
 types/lodash.unary/index.d.ts             | 2 +-
 types/lodash.unescape/index.d.ts          | 2 +-
 types/lodash.union/index.d.ts             | 2 +-
 types/lodash.unionby/index.d.ts           | 2 +-
 types/lodash.unionwith/index.d.ts         | 2 +-
 types/lodash.uniq/index.d.ts              | 2 +-
 types/lodash.uniqby/index.d.ts            | 2 +-
 types/lodash.uniqueid/index.d.ts          | 2 +-
 types/lodash.uniqwith/index.d.ts          | 2 +-
 types/lodash.unset/index.d.ts             | 2 +-
 types/lodash.unzip/index.d.ts             | 2 +-
 types/lodash.unzipwith/index.d.ts         | 2 +-
 types/lodash.update/index.d.ts            | 2 +-
 types/lodash.updatewith/index.d.ts        | 2 +-
 types/lodash.uppercase/index.d.ts         | 2 +-
 types/lodash.upperfirst/index.d.ts        | 2 +-
 types/lodash.values/index.d.ts            | 2 +-
 types/lodash.valuesin/index.d.ts          | 2 +-
 types/lodash.without/index.d.ts           | 2 +-
 types/lodash.words/index.d.ts             | 2 +-
 types/lodash.wrap/index.d.ts              | 2 +-
 types/lodash.xor/index.d.ts               | 2 +-
 types/lodash.xorby/index.d.ts             | 2 +-
 types/lodash.xorwith/index.d.ts           | 2 +-
 types/lodash.zip/index.d.ts               | 2 +-
 types/lodash.zipobject/index.d.ts         | 2 +-
 types/lodash.zipobjectdeep/index.d.ts     | 2 +-
 types/lodash.zipwith/index.d.ts           | 2 +-
 types/lodash/common/object.d.ts           | 4 ++--
 types/lodash/index.d.ts                   | 2 +-
 types/lodash/scripts/generate-modules.ts  | 2 +-
 288 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 61eb6016ee..1b1aefab48 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/, https://lodash.com/custom-builds
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 export { default as add } from "./add";
 export { default as after } from "./after";
diff --git a/types/lodash.add/index.d.ts b/types/lodash.add/index.d.ts
index 742a2fc000..772346a2d0 100644
--- a/types/lodash.add/index.d.ts
+++ b/types/lodash.add/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.after/index.d.ts b/types/lodash.after/index.d.ts
index 48adaf8994..6656fce6bb 100644
--- a/types/lodash.after/index.d.ts
+++ b/types/lodash.after/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ary/index.d.ts b/types/lodash.ary/index.d.ts
index d442d3ad4d..989aa725a5 100644
--- a/types/lodash.ary/index.d.ts
+++ b/types/lodash.ary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assign/index.d.ts b/types/lodash.assign/index.d.ts
index 549fb7af74..0630a711ff 100644
--- a/types/lodash.assign/index.d.ts
+++ b/types/lodash.assign/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignin/index.d.ts b/types/lodash.assignin/index.d.ts
index 34e644c6b9..1c816068a1 100644
--- a/types/lodash.assignin/index.d.ts
+++ b/types/lodash.assignin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assigninwith/index.d.ts b/types/lodash.assigninwith/index.d.ts
index ba48574c0d..0068b84dd0 100644
--- a/types/lodash.assigninwith/index.d.ts
+++ b/types/lodash.assigninwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignwith/index.d.ts b/types/lodash.assignwith/index.d.ts
index b88032631e..609055f4c1 100644
--- a/types/lodash.assignwith/index.d.ts
+++ b/types/lodash.assignwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.at/index.d.ts b/types/lodash.at/index.d.ts
index a307f84553..d2b42c712b 100644
--- a/types/lodash.at/index.d.ts
+++ b/types/lodash.at/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.attempt/index.d.ts b/types/lodash.attempt/index.d.ts
index 71b89a092f..380c968a6a 100644
--- a/types/lodash.attempt/index.d.ts
+++ b/types/lodash.attempt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.before/index.d.ts b/types/lodash.before/index.d.ts
index f19139a5ee..d3709654fe 100644
--- a/types/lodash.before/index.d.ts
+++ b/types/lodash.before/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bind/index.d.ts b/types/lodash.bind/index.d.ts
index e90ebaa4c1..cab39bbda7 100644
--- a/types/lodash.bind/index.d.ts
+++ b/types/lodash.bind/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindall/index.d.ts b/types/lodash.bindall/index.d.ts
index 4a4cb0de76..82e411a336 100644
--- a/types/lodash.bindall/index.d.ts
+++ b/types/lodash.bindall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindkey/index.d.ts b/types/lodash.bindkey/index.d.ts
index 86c9c13672..039ed71905 100644
--- a/types/lodash.bindkey/index.d.ts
+++ b/types/lodash.bindkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.camelcase/index.d.ts b/types/lodash.camelcase/index.d.ts
index 6fbedc08d6..a9beabf396 100644
--- a/types/lodash.camelcase/index.d.ts
+++ b/types/lodash.camelcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.capitalize/index.d.ts b/types/lodash.capitalize/index.d.ts
index fbe1b177ee..61843a4996 100644
--- a/types/lodash.capitalize/index.d.ts
+++ b/types/lodash.capitalize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.castarray/index.d.ts b/types/lodash.castarray/index.d.ts
index 41e53aecff..733fb69735 100644
--- a/types/lodash.castarray/index.d.ts
+++ b/types/lodash.castarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ceil/index.d.ts b/types/lodash.ceil/index.d.ts
index d6e055af91..cb8fd23386 100644
--- a/types/lodash.ceil/index.d.ts
+++ b/types/lodash.ceil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.chunk/index.d.ts b/types/lodash.chunk/index.d.ts
index c85c5c988c..652c83f8c1 100644
--- a/types/lodash.chunk/index.d.ts
+++ b/types/lodash.chunk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clamp/index.d.ts b/types/lodash.clamp/index.d.ts
index 7bc75b42e9..796172867c 100644
--- a/types/lodash.clamp/index.d.ts
+++ b/types/lodash.clamp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clone/index.d.ts b/types/lodash.clone/index.d.ts
index 62da74b22d..810ff9158b 100644
--- a/types/lodash.clone/index.d.ts
+++ b/types/lodash.clone/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeep/index.d.ts b/types/lodash.clonedeep/index.d.ts
index 5f25f0cfa7..9eb31632f4 100644
--- a/types/lodash.clonedeep/index.d.ts
+++ b/types/lodash.clonedeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeepwith/index.d.ts b/types/lodash.clonedeepwith/index.d.ts
index 9725303ac2..3ceef35da9 100644
--- a/types/lodash.clonedeepwith/index.d.ts
+++ b/types/lodash.clonedeepwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonewith/index.d.ts b/types/lodash.clonewith/index.d.ts
index b02127620c..fa57374c7a 100644
--- a/types/lodash.clonewith/index.d.ts
+++ b/types/lodash.clonewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.compact/index.d.ts b/types/lodash.compact/index.d.ts
index 48b4bbd7e1..3155457aa3 100644
--- a/types/lodash.compact/index.d.ts
+++ b/types/lodash.compact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.concat/index.d.ts b/types/lodash.concat/index.d.ts
index 576dd6aa6b..7c31abca34 100644
--- a/types/lodash.concat/index.d.ts
+++ b/types/lodash.concat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.cond/index.d.ts b/types/lodash.cond/index.d.ts
index 633e40809e..18aa811fd1 100644
--- a/types/lodash.cond/index.d.ts
+++ b/types/lodash.cond/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.constant/index.d.ts b/types/lodash.constant/index.d.ts
index 5122739117..d928f61e6f 100644
--- a/types/lodash.constant/index.d.ts
+++ b/types/lodash.constant/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.countby/index.d.ts b/types/lodash.countby/index.d.ts
index 1f569be971..b3194f1f47 100644
--- a/types/lodash.countby/index.d.ts
+++ b/types/lodash.countby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.create/index.d.ts b/types/lodash.create/index.d.ts
index 173f439a2f..562121278b 100644
--- a/types/lodash.create/index.d.ts
+++ b/types/lodash.create/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curry/index.d.ts b/types/lodash.curry/index.d.ts
index d569ccb852..660782b829 100644
--- a/types/lodash.curry/index.d.ts
+++ b/types/lodash.curry/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curryright/index.d.ts b/types/lodash.curryright/index.d.ts
index 0d13c7d705..706da25049 100644
--- a/types/lodash.curryright/index.d.ts
+++ b/types/lodash.curryright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.debounce/index.d.ts b/types/lodash.debounce/index.d.ts
index 4babb92e45..d337350c38 100644
--- a/types/lodash.debounce/index.d.ts
+++ b/types/lodash.debounce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.deburr/index.d.ts b/types/lodash.deburr/index.d.ts
index 103ae6f0b9..3325320abc 100644
--- a/types/lodash.deburr/index.d.ts
+++ b/types/lodash.deburr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaults/index.d.ts b/types/lodash.defaults/index.d.ts
index 9d92dd3021..8e5745fe18 100644
--- a/types/lodash.defaults/index.d.ts
+++ b/types/lodash.defaults/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaultsdeep/index.d.ts b/types/lodash.defaultsdeep/index.d.ts
index d1f1e1aa4e..8dffb26c17 100644
--- a/types/lodash.defaultsdeep/index.d.ts
+++ b/types/lodash.defaultsdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defer/index.d.ts b/types/lodash.defer/index.d.ts
index 12247d6273..d09ea8f6f2 100644
--- a/types/lodash.defer/index.d.ts
+++ b/types/lodash.defer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.delay/index.d.ts b/types/lodash.delay/index.d.ts
index 2ad1ff79d3..0b8ee66e74 100644
--- a/types/lodash.delay/index.d.ts
+++ b/types/lodash.delay/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.difference/index.d.ts b/types/lodash.difference/index.d.ts
index 9843b97496..09b032c1bb 100644
--- a/types/lodash.difference/index.d.ts
+++ b/types/lodash.difference/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differenceby/index.d.ts b/types/lodash.differenceby/index.d.ts
index 24d95da85a..be5647692c 100644
--- a/types/lodash.differenceby/index.d.ts
+++ b/types/lodash.differenceby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differencewith/index.d.ts b/types/lodash.differencewith/index.d.ts
index 32f51678ab..c353d4319a 100644
--- a/types/lodash.differencewith/index.d.ts
+++ b/types/lodash.differencewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.divide/index.d.ts b/types/lodash.divide/index.d.ts
index 7abbafd7bd..61f5234af6 100644
--- a/types/lodash.divide/index.d.ts
+++ b/types/lodash.divide/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.drop/index.d.ts b/types/lodash.drop/index.d.ts
index 9eaf528d73..33d3e19039 100644
--- a/types/lodash.drop/index.d.ts
+++ b/types/lodash.drop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropright/index.d.ts b/types/lodash.dropright/index.d.ts
index 73056b73a4..3cf5d6649a 100644
--- a/types/lodash.dropright/index.d.ts
+++ b/types/lodash.dropright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.droprightwhile/index.d.ts b/types/lodash.droprightwhile/index.d.ts
index a145e956ee..8321da6b6d 100644
--- a/types/lodash.droprightwhile/index.d.ts
+++ b/types/lodash.droprightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropwhile/index.d.ts b/types/lodash.dropwhile/index.d.ts
index 7be29abfc4..4f8b336310 100644
--- a/types/lodash.dropwhile/index.d.ts
+++ b/types/lodash.dropwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.endswith/index.d.ts b/types/lodash.endswith/index.d.ts
index d27aea64c5..6626ffd52a 100644
--- a/types/lodash.endswith/index.d.ts
+++ b/types/lodash.endswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.eq/index.d.ts b/types/lodash.eq/index.d.ts
index 1e577a2dac..14d17ed08a 100644
--- a/types/lodash.eq/index.d.ts
+++ b/types/lodash.eq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escape/index.d.ts b/types/lodash.escape/index.d.ts
index 3b9b0845ad..c357bee3c3 100644
--- a/types/lodash.escape/index.d.ts
+++ b/types/lodash.escape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escaperegexp/index.d.ts b/types/lodash.escaperegexp/index.d.ts
index 5d508bf40f..17f67d618f 100644
--- a/types/lodash.escaperegexp/index.d.ts
+++ b/types/lodash.escaperegexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.every/index.d.ts b/types/lodash.every/index.d.ts
index d4443355a4..2a05255eec 100644
--- a/types/lodash.every/index.d.ts
+++ b/types/lodash.every/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.fill/index.d.ts b/types/lodash.fill/index.d.ts
index 21eca6cb70..59208388f6 100644
--- a/types/lodash.fill/index.d.ts
+++ b/types/lodash.fill/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.filter/index.d.ts b/types/lodash.filter/index.d.ts
index b7eaf4d001..cf8134b740 100644
--- a/types/lodash.filter/index.d.ts
+++ b/types/lodash.filter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.find/index.d.ts b/types/lodash.find/index.d.ts
index a4723afa63..09a5a0c21d 100644
--- a/types/lodash.find/index.d.ts
+++ b/types/lodash.find/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findindex/index.d.ts b/types/lodash.findindex/index.d.ts
index 04045617e0..6b237ba285 100644
--- a/types/lodash.findindex/index.d.ts
+++ b/types/lodash.findindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findkey/index.d.ts b/types/lodash.findkey/index.d.ts
index 151b5e28d8..f102aa20d3 100644
--- a/types/lodash.findkey/index.d.ts
+++ b/types/lodash.findkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlast/index.d.ts b/types/lodash.findlast/index.d.ts
index e06477e488..92a91432e1 100644
--- a/types/lodash.findlast/index.d.ts
+++ b/types/lodash.findlast/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastindex/index.d.ts b/types/lodash.findlastindex/index.d.ts
index 982b1d3880..9bf1b1eddb 100644
--- a/types/lodash.findlastindex/index.d.ts
+++ b/types/lodash.findlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastkey/index.d.ts b/types/lodash.findlastkey/index.d.ts
index 7ce6837eb7..4563f2b91e 100644
--- a/types/lodash.findlastkey/index.d.ts
+++ b/types/lodash.findlastkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.first/index.d.ts b/types/lodash.first/index.d.ts
index cd48bdc4bf..4bd8f1e059 100644
--- a/types/lodash.first/index.d.ts
+++ b/types/lodash.first/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmap/index.d.ts b/types/lodash.flatmap/index.d.ts
index 11cd11337b..22222c405a 100644
--- a/types/lodash.flatmap/index.d.ts
+++ b/types/lodash.flatmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdeep/index.d.ts b/types/lodash.flatmapdeep/index.d.ts
index d4f10edf3e..55c43f881e 100644
--- a/types/lodash.flatmapdeep/index.d.ts
+++ b/types/lodash.flatmapdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdepth/index.d.ts b/types/lodash.flatmapdepth/index.d.ts
index 91fb6bd576..812fa36c8a 100644
--- a/types/lodash.flatmapdepth/index.d.ts
+++ b/types/lodash.flatmapdepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatten/index.d.ts b/types/lodash.flatten/index.d.ts
index 3689f19e15..e1d21df7fe 100644
--- a/types/lodash.flatten/index.d.ts
+++ b/types/lodash.flatten/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendeep/index.d.ts b/types/lodash.flattendeep/index.d.ts
index 791f2b384f..79cee1753f 100644
--- a/types/lodash.flattendeep/index.d.ts
+++ b/types/lodash.flattendeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendepth/index.d.ts b/types/lodash.flattendepth/index.d.ts
index 443cdc0cd0..7de6a821a2 100644
--- a/types/lodash.flattendepth/index.d.ts
+++ b/types/lodash.flattendepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flip/index.d.ts b/types/lodash.flip/index.d.ts
index 6adfc21057..d492ebad75 100644
--- a/types/lodash.flip/index.d.ts
+++ b/types/lodash.flip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.floor/index.d.ts b/types/lodash.floor/index.d.ts
index 27cfda6f21..b99f1ec111 100644
--- a/types/lodash.floor/index.d.ts
+++ b/types/lodash.floor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flow/index.d.ts b/types/lodash.flow/index.d.ts
index e6be4df9cc..5a1fe32a7b 100644
--- a/types/lodash.flow/index.d.ts
+++ b/types/lodash.flow/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flowright/index.d.ts b/types/lodash.flowright/index.d.ts
index aa53e08fff..13e7b524a6 100644
--- a/types/lodash.flowright/index.d.ts
+++ b/types/lodash.flowright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreach/index.d.ts b/types/lodash.foreach/index.d.ts
index 464cb0e867..c865bb8f27 100644
--- a/types/lodash.foreach/index.d.ts
+++ b/types/lodash.foreach/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreachright/index.d.ts b/types/lodash.foreachright/index.d.ts
index 9ad225ae54..978db0e694 100644
--- a/types/lodash.foreachright/index.d.ts
+++ b/types/lodash.foreachright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forin/index.d.ts b/types/lodash.forin/index.d.ts
index 54669de7f9..f2a1a3eca6 100644
--- a/types/lodash.forin/index.d.ts
+++ b/types/lodash.forin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forinright/index.d.ts b/types/lodash.forinright/index.d.ts
index cfa0a1843a..68973aff3b 100644
--- a/types/lodash.forinright/index.d.ts
+++ b/types/lodash.forinright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forown/index.d.ts b/types/lodash.forown/index.d.ts
index e1df00c22a..bad9b72cfd 100644
--- a/types/lodash.forown/index.d.ts
+++ b/types/lodash.forown/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forownright/index.d.ts b/types/lodash.forownright/index.d.ts
index 1a349592fd..4f4a2177aa 100644
--- a/types/lodash.forownright/index.d.ts
+++ b/types/lodash.forownright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.frompairs/index.d.ts b/types/lodash.frompairs/index.d.ts
index f73cb2b9dd..3789bbb735 100644
--- a/types/lodash.frompairs/index.d.ts
+++ b/types/lodash.frompairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functions/index.d.ts b/types/lodash.functions/index.d.ts
index 40abae2872..e885cd4bb7 100644
--- a/types/lodash.functions/index.d.ts
+++ b/types/lodash.functions/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functionsin/index.d.ts b/types/lodash.functionsin/index.d.ts
index 17cca60180..0ffe3755ab 100644
--- a/types/lodash.functionsin/index.d.ts
+++ b/types/lodash.functionsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.get/index.d.ts b/types/lodash.get/index.d.ts
index 7ad640da93..37aade43bd 100644
--- a/types/lodash.get/index.d.ts
+++ b/types/lodash.get/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.groupby/index.d.ts b/types/lodash.groupby/index.d.ts
index 9363e47b41..9c2279c767 100644
--- a/types/lodash.groupby/index.d.ts
+++ b/types/lodash.groupby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gt/index.d.ts b/types/lodash.gt/index.d.ts
index 6a973547b0..2ef5f7aab9 100644
--- a/types/lodash.gt/index.d.ts
+++ b/types/lodash.gt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gte/index.d.ts b/types/lodash.gte/index.d.ts
index f968e8bb20..543e8894d1 100644
--- a/types/lodash.gte/index.d.ts
+++ b/types/lodash.gte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.has/index.d.ts b/types/lodash.has/index.d.ts
index 4f917d5187..39347aa215 100644
--- a/types/lodash.has/index.d.ts
+++ b/types/lodash.has/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.hasin/index.d.ts b/types/lodash.hasin/index.d.ts
index ca286c6cd9..fd9674ec9d 100644
--- a/types/lodash.hasin/index.d.ts
+++ b/types/lodash.hasin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.head/index.d.ts b/types/lodash.head/index.d.ts
index e26f114bf0..055cd0ac90 100644
--- a/types/lodash.head/index.d.ts
+++ b/types/lodash.head/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.identity/index.d.ts b/types/lodash.identity/index.d.ts
index 986c039d2e..53593f2f97 100644
--- a/types/lodash.identity/index.d.ts
+++ b/types/lodash.identity/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.includes/index.d.ts b/types/lodash.includes/index.d.ts
index 1b490f7aed..3efd02ba00 100644
--- a/types/lodash.includes/index.d.ts
+++ b/types/lodash.includes/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.indexof/index.d.ts b/types/lodash.indexof/index.d.ts
index 8102c6a697..8d6dc6dbdf 100644
--- a/types/lodash.indexof/index.d.ts
+++ b/types/lodash.indexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.initial/index.d.ts b/types/lodash.initial/index.d.ts
index 9fa9218416..62d5c9dc61 100644
--- a/types/lodash.initial/index.d.ts
+++ b/types/lodash.initial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.inrange/index.d.ts b/types/lodash.inrange/index.d.ts
index 3a817d9d2d..db7dc74a0e 100644
--- a/types/lodash.inrange/index.d.ts
+++ b/types/lodash.inrange/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersection/index.d.ts b/types/lodash.intersection/index.d.ts
index 044cd6949d..35dfe76821 100644
--- a/types/lodash.intersection/index.d.ts
+++ b/types/lodash.intersection/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionby/index.d.ts b/types/lodash.intersectionby/index.d.ts
index a1d01a7c5d..f66da889fa 100644
--- a/types/lodash.intersectionby/index.d.ts
+++ b/types/lodash.intersectionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionwith/index.d.ts b/types/lodash.intersectionwith/index.d.ts
index ff7cba542d..ae5e281b33 100644
--- a/types/lodash.intersectionwith/index.d.ts
+++ b/types/lodash.intersectionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invert/index.d.ts b/types/lodash.invert/index.d.ts
index 112bbee8e6..024a4f6a97 100644
--- a/types/lodash.invert/index.d.ts
+++ b/types/lodash.invert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invertby/index.d.ts b/types/lodash.invertby/index.d.ts
index f7c8ef8ee7..9ad74a615c 100644
--- a/types/lodash.invertby/index.d.ts
+++ b/types/lodash.invertby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invoke/index.d.ts b/types/lodash.invoke/index.d.ts
index fb979c2079..aee1886286 100644
--- a/types/lodash.invoke/index.d.ts
+++ b/types/lodash.invoke/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invokemap/index.d.ts b/types/lodash.invokemap/index.d.ts
index 7cefb18454..6acb2bdf4b 100644
--- a/types/lodash.invokemap/index.d.ts
+++ b/types/lodash.invokemap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarguments/index.d.ts b/types/lodash.isarguments/index.d.ts
index 9f8704e327..d5f8290412 100644
--- a/types/lodash.isarguments/index.d.ts
+++ b/types/lodash.isarguments/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarray/index.d.ts b/types/lodash.isarray/index.d.ts
index 60299a147c..efaac7606b 100644
--- a/types/lodash.isarray/index.d.ts
+++ b/types/lodash.isarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraybuffer/index.d.ts b/types/lodash.isarraybuffer/index.d.ts
index ddeee837b6..5fcf63deb6 100644
--- a/types/lodash.isarraybuffer/index.d.ts
+++ b/types/lodash.isarraybuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylike/index.d.ts b/types/lodash.isarraylike/index.d.ts
index 761e226f3d..a96f1d5085 100644
--- a/types/lodash.isarraylike/index.d.ts
+++ b/types/lodash.isarraylike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylikeobject/index.d.ts b/types/lodash.isarraylikeobject/index.d.ts
index 8a3562ef04..ffa5d3db69 100644
--- a/types/lodash.isarraylikeobject/index.d.ts
+++ b/types/lodash.isarraylikeobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isboolean/index.d.ts b/types/lodash.isboolean/index.d.ts
index 60d3b863a8..888c9da1da 100644
--- a/types/lodash.isboolean/index.d.ts
+++ b/types/lodash.isboolean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isbuffer/index.d.ts b/types/lodash.isbuffer/index.d.ts
index e39e927ff1..1b0e57db15 100644
--- a/types/lodash.isbuffer/index.d.ts
+++ b/types/lodash.isbuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isdate/index.d.ts b/types/lodash.isdate/index.d.ts
index cba12e469a..f1cfb78cbb 100644
--- a/types/lodash.isdate/index.d.ts
+++ b/types/lodash.isdate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iselement/index.d.ts b/types/lodash.iselement/index.d.ts
index 751b675421..7a54b5c77e 100644
--- a/types/lodash.iselement/index.d.ts
+++ b/types/lodash.iselement/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isempty/index.d.ts b/types/lodash.isempty/index.d.ts
index 92bf9b2168..736796c517 100644
--- a/types/lodash.isempty/index.d.ts
+++ b/types/lodash.isempty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequal/index.d.ts b/types/lodash.isequal/index.d.ts
index 0a00fb83ce..c2ad0dff8c 100644
--- a/types/lodash.isequal/index.d.ts
+++ b/types/lodash.isequal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequalwith/index.d.ts b/types/lodash.isequalwith/index.d.ts
index 05eaecdbd0..5703d53f84 100644
--- a/types/lodash.isequalwith/index.d.ts
+++ b/types/lodash.isequalwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iserror/index.d.ts b/types/lodash.iserror/index.d.ts
index 5e31aa33de..5bdb9e5a7a 100644
--- a/types/lodash.iserror/index.d.ts
+++ b/types/lodash.iserror/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfinite/index.d.ts b/types/lodash.isfinite/index.d.ts
index 7d4874cd4a..b22a988b59 100644
--- a/types/lodash.isfinite/index.d.ts
+++ b/types/lodash.isfinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfunction/index.d.ts b/types/lodash.isfunction/index.d.ts
index b0876bfe82..7fd82f56e3 100644
--- a/types/lodash.isfunction/index.d.ts
+++ b/types/lodash.isfunction/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isinteger/index.d.ts b/types/lodash.isinteger/index.d.ts
index e42d7bb1ac..381e14831f 100644
--- a/types/lodash.isinteger/index.d.ts
+++ b/types/lodash.isinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.islength/index.d.ts b/types/lodash.islength/index.d.ts
index 86c63fd45b..7e503fa682 100644
--- a/types/lodash.islength/index.d.ts
+++ b/types/lodash.islength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismap/index.d.ts b/types/lodash.ismap/index.d.ts
index 10ebdf8fe4..fb3f9c1c7c 100644
--- a/types/lodash.ismap/index.d.ts
+++ b/types/lodash.ismap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatch/index.d.ts b/types/lodash.ismatch/index.d.ts
index 6439efb285..c19458f06e 100644
--- a/types/lodash.ismatch/index.d.ts
+++ b/types/lodash.ismatch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatchwith/index.d.ts b/types/lodash.ismatchwith/index.d.ts
index 322b329308..6c80c60c84 100644
--- a/types/lodash.ismatchwith/index.d.ts
+++ b/types/lodash.ismatchwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnan/index.d.ts b/types/lodash.isnan/index.d.ts
index 3f2067314f..ef81584b37 100644
--- a/types/lodash.isnan/index.d.ts
+++ b/types/lodash.isnan/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnative/index.d.ts b/types/lodash.isnative/index.d.ts
index eb00733bee..102f340608 100644
--- a/types/lodash.isnative/index.d.ts
+++ b/types/lodash.isnative/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnil/index.d.ts b/types/lodash.isnil/index.d.ts
index fed4d9b833..1de6260b05 100644
--- a/types/lodash.isnil/index.d.ts
+++ b/types/lodash.isnil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnull/index.d.ts b/types/lodash.isnull/index.d.ts
index 73ebb73e1b..9f8dfeda80 100644
--- a/types/lodash.isnull/index.d.ts
+++ b/types/lodash.isnull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnumber/index.d.ts b/types/lodash.isnumber/index.d.ts
index 28132eb6a9..58b64fef97 100644
--- a/types/lodash.isnumber/index.d.ts
+++ b/types/lodash.isnumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobject/index.d.ts b/types/lodash.isobject/index.d.ts
index e1e05723b8..5a25a3afab 100644
--- a/types/lodash.isobject/index.d.ts
+++ b/types/lodash.isobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobjectlike/index.d.ts b/types/lodash.isobjectlike/index.d.ts
index 6ad791127f..b81bfe36a8 100644
--- a/types/lodash.isobjectlike/index.d.ts
+++ b/types/lodash.isobjectlike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isplainobject/index.d.ts b/types/lodash.isplainobject/index.d.ts
index c76bc92a64..b285500c3c 100644
--- a/types/lodash.isplainobject/index.d.ts
+++ b/types/lodash.isplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isregexp/index.d.ts b/types/lodash.isregexp/index.d.ts
index 65669eed68..1a79d6b965 100644
--- a/types/lodash.isregexp/index.d.ts
+++ b/types/lodash.isregexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issafeinteger/index.d.ts b/types/lodash.issafeinteger/index.d.ts
index 62bf5880c3..efc8de999e 100644
--- a/types/lodash.issafeinteger/index.d.ts
+++ b/types/lodash.issafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isset/index.d.ts b/types/lodash.isset/index.d.ts
index 76a6789d52..44d01fc904 100644
--- a/types/lodash.isset/index.d.ts
+++ b/types/lodash.isset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isstring/index.d.ts b/types/lodash.isstring/index.d.ts
index 81bcc8236a..7835175fd1 100644
--- a/types/lodash.isstring/index.d.ts
+++ b/types/lodash.isstring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issymbol/index.d.ts b/types/lodash.issymbol/index.d.ts
index 51a1313671..9837ca6d48 100644
--- a/types/lodash.issymbol/index.d.ts
+++ b/types/lodash.issymbol/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.istypedarray/index.d.ts b/types/lodash.istypedarray/index.d.ts
index 5721a94c58..4d81b5ecfa 100644
--- a/types/lodash.istypedarray/index.d.ts
+++ b/types/lodash.istypedarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isundefined/index.d.ts b/types/lodash.isundefined/index.d.ts
index a0f2f068fc..a9a516f63c 100644
--- a/types/lodash.isundefined/index.d.ts
+++ b/types/lodash.isundefined/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakmap/index.d.ts b/types/lodash.isweakmap/index.d.ts
index 28dc1febf5..cd754e9608 100644
--- a/types/lodash.isweakmap/index.d.ts
+++ b/types/lodash.isweakmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakset/index.d.ts b/types/lodash.isweakset/index.d.ts
index 72465044fd..124a9f588d 100644
--- a/types/lodash.isweakset/index.d.ts
+++ b/types/lodash.isweakset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iteratee/index.d.ts b/types/lodash.iteratee/index.d.ts
index 29e1cc29fd..5c641bbaa1 100644
--- a/types/lodash.iteratee/index.d.ts
+++ b/types/lodash.iteratee/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.join/index.d.ts b/types/lodash.join/index.d.ts
index 7769af5a06..e2c58c2536 100644
--- a/types/lodash.join/index.d.ts
+++ b/types/lodash.join/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.kebabcase/index.d.ts b/types/lodash.kebabcase/index.d.ts
index 70ca258fe0..0223fc8eb1 100644
--- a/types/lodash.kebabcase/index.d.ts
+++ b/types/lodash.kebabcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keyby/index.d.ts b/types/lodash.keyby/index.d.ts
index e02a4dd3f5..67e5902601 100644
--- a/types/lodash.keyby/index.d.ts
+++ b/types/lodash.keyby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keys/index.d.ts b/types/lodash.keys/index.d.ts
index 177620ea0c..9d804e483c 100644
--- a/types/lodash.keys/index.d.ts
+++ b/types/lodash.keys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keysin/index.d.ts b/types/lodash.keysin/index.d.ts
index 98dd57b500..f00b24fcbd 100644
--- a/types/lodash.keysin/index.d.ts
+++ b/types/lodash.keysin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.last/index.d.ts b/types/lodash.last/index.d.ts
index dc2fadedb3..b2279e60d2 100644
--- a/types/lodash.last/index.d.ts
+++ b/types/lodash.last/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lastindexof/index.d.ts b/types/lodash.lastindexof/index.d.ts
index 891d2ca084..7e714b06bb 100644
--- a/types/lodash.lastindexof/index.d.ts
+++ b/types/lodash.lastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowercase/index.d.ts b/types/lodash.lowercase/index.d.ts
index 05a5a0a20e..b816bde588 100644
--- a/types/lodash.lowercase/index.d.ts
+++ b/types/lodash.lowercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowerfirst/index.d.ts b/types/lodash.lowerfirst/index.d.ts
index 05f3e6d760..1619781afe 100644
--- a/types/lodash.lowerfirst/index.d.ts
+++ b/types/lodash.lowerfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lt/index.d.ts b/types/lodash.lt/index.d.ts
index c9ef9da1b9..e2d1dc8d22 100644
--- a/types/lodash.lt/index.d.ts
+++ b/types/lodash.lt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lte/index.d.ts b/types/lodash.lte/index.d.ts
index 7361ef610e..be320a60df 100644
--- a/types/lodash.lte/index.d.ts
+++ b/types/lodash.lte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapkeys/index.d.ts b/types/lodash.mapkeys/index.d.ts
index 145fe41b89..cba5ab4abb 100644
--- a/types/lodash.mapkeys/index.d.ts
+++ b/types/lodash.mapkeys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapvalues/index.d.ts b/types/lodash.mapvalues/index.d.ts
index 86fb63ed4d..2c13c37ee8 100644
--- a/types/lodash.mapvalues/index.d.ts
+++ b/types/lodash.mapvalues/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matches/index.d.ts b/types/lodash.matches/index.d.ts
index ebdc90e017..0c265e0e21 100644
--- a/types/lodash.matches/index.d.ts
+++ b/types/lodash.matches/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matchesproperty/index.d.ts b/types/lodash.matchesproperty/index.d.ts
index 533656be56..36c628043c 100644
--- a/types/lodash.matchesproperty/index.d.ts
+++ b/types/lodash.matchesproperty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.max/index.d.ts b/types/lodash.max/index.d.ts
index 99aa8e2ffc..322203fc10 100644
--- a/types/lodash.max/index.d.ts
+++ b/types/lodash.max/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.maxby/index.d.ts b/types/lodash.maxby/index.d.ts
index 9362902bf4..8279522ee0 100644
--- a/types/lodash.maxby/index.d.ts
+++ b/types/lodash.maxby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mean/index.d.ts b/types/lodash.mean/index.d.ts
index 2edd6adb1b..afadecc5c9 100644
--- a/types/lodash.mean/index.d.ts
+++ b/types/lodash.mean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.meanby/index.d.ts b/types/lodash.meanby/index.d.ts
index a4305a0560..22670d65cf 100644
--- a/types/lodash.meanby/index.d.ts
+++ b/types/lodash.meanby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.memoize/index.d.ts b/types/lodash.memoize/index.d.ts
index 869ae4ba7d..81ecaa8bd4 100644
--- a/types/lodash.memoize/index.d.ts
+++ b/types/lodash.memoize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.merge/index.d.ts b/types/lodash.merge/index.d.ts
index a757f0694e..e64484c886 100644
--- a/types/lodash.merge/index.d.ts
+++ b/types/lodash.merge/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mergewith/index.d.ts b/types/lodash.mergewith/index.d.ts
index ea3ceda237..fc5915711b 100644
--- a/types/lodash.mergewith/index.d.ts
+++ b/types/lodash.mergewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.method/index.d.ts b/types/lodash.method/index.d.ts
index 6d36760961..b9c0ee7168 100644
--- a/types/lodash.method/index.d.ts
+++ b/types/lodash.method/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.methodof/index.d.ts b/types/lodash.methodof/index.d.ts
index 057ef55108..8eb4aeb235 100644
--- a/types/lodash.methodof/index.d.ts
+++ b/types/lodash.methodof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.min/index.d.ts b/types/lodash.min/index.d.ts
index e8a613f17f..15a5331e7e 100644
--- a/types/lodash.min/index.d.ts
+++ b/types/lodash.min/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.minby/index.d.ts b/types/lodash.minby/index.d.ts
index d9b6a58bfe..a900c32f9d 100644
--- a/types/lodash.minby/index.d.ts
+++ b/types/lodash.minby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mixin/index.d.ts b/types/lodash.mixin/index.d.ts
index ff0a8975da..6ef86909af 100644
--- a/types/lodash.mixin/index.d.ts
+++ b/types/lodash.mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.negate/index.d.ts b/types/lodash.negate/index.d.ts
index 3043694532..e28d931810 100644
--- a/types/lodash.negate/index.d.ts
+++ b/types/lodash.negate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.noop/index.d.ts b/types/lodash.noop/index.d.ts
index 30a76c63ce..98decb3a5f 100644
--- a/types/lodash.noop/index.d.ts
+++ b/types/lodash.noop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.now/index.d.ts b/types/lodash.now/index.d.ts
index 1cb3ed1cea..e8ba1e9ccd 100644
--- a/types/lodash.now/index.d.ts
+++ b/types/lodash.now/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.nth/index.d.ts b/types/lodash.nth/index.d.ts
index 5368fd7dee..940e4e06d8 100644
--- a/types/lodash.nth/index.d.ts
+++ b/types/lodash.nth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ntharg/index.d.ts b/types/lodash.ntharg/index.d.ts
index d444e2cbee..2fcbd89332 100644
--- a/types/lodash.ntharg/index.d.ts
+++ b/types/lodash.ntharg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omit/index.d.ts b/types/lodash.omit/index.d.ts
index 38d60f8538..efa2526c38 100644
--- a/types/lodash.omit/index.d.ts
+++ b/types/lodash.omit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omitby/index.d.ts b/types/lodash.omitby/index.d.ts
index 5946e410ac..aa258237f7 100644
--- a/types/lodash.omitby/index.d.ts
+++ b/types/lodash.omitby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.once/index.d.ts b/types/lodash.once/index.d.ts
index fbe506150b..7fca8f4016 100644
--- a/types/lodash.once/index.d.ts
+++ b/types/lodash.once/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.orderby/index.d.ts b/types/lodash.orderby/index.d.ts
index 2e8c5c5da4..02a4de9edf 100644
--- a/types/lodash.orderby/index.d.ts
+++ b/types/lodash.orderby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.over/index.d.ts b/types/lodash.over/index.d.ts
index 2d078c4853..1c77a3d71b 100644
--- a/types/lodash.over/index.d.ts
+++ b/types/lodash.over/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overargs/index.d.ts b/types/lodash.overargs/index.d.ts
index 18b7024397..5ca77279e4 100644
--- a/types/lodash.overargs/index.d.ts
+++ b/types/lodash.overargs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overevery/index.d.ts b/types/lodash.overevery/index.d.ts
index 7ca277f428..d2d142abc2 100644
--- a/types/lodash.overevery/index.d.ts
+++ b/types/lodash.overevery/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.oversome/index.d.ts b/types/lodash.oversome/index.d.ts
index abf71cb967..a2f48b5d3f 100644
--- a/types/lodash.oversome/index.d.ts
+++ b/types/lodash.oversome/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pad/index.d.ts b/types/lodash.pad/index.d.ts
index 516d851dec..c7ffc0da65 100644
--- a/types/lodash.pad/index.d.ts
+++ b/types/lodash.pad/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padend/index.d.ts b/types/lodash.padend/index.d.ts
index fdaf51da25..044163e4d0 100644
--- a/types/lodash.padend/index.d.ts
+++ b/types/lodash.padend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padstart/index.d.ts b/types/lodash.padstart/index.d.ts
index a91cd5339e..f5e01e7136 100644
--- a/types/lodash.padstart/index.d.ts
+++ b/types/lodash.padstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.parseint/index.d.ts b/types/lodash.parseint/index.d.ts
index 727c8d66c7..6c34469a8c 100644
--- a/types/lodash.parseint/index.d.ts
+++ b/types/lodash.parseint/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partial/index.d.ts b/types/lodash.partial/index.d.ts
index 18d68aa00a..1849abe6e4 100644
--- a/types/lodash.partial/index.d.ts
+++ b/types/lodash.partial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partialright/index.d.ts b/types/lodash.partialright/index.d.ts
index b005408404..c8fe88b0c0 100644
--- a/types/lodash.partialright/index.d.ts
+++ b/types/lodash.partialright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partition/index.d.ts b/types/lodash.partition/index.d.ts
index 8abce2b57f..7fbe400757 100644
--- a/types/lodash.partition/index.d.ts
+++ b/types/lodash.partition/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pick/index.d.ts b/types/lodash.pick/index.d.ts
index e2f2df3d30..7a71bc2c30 100644
--- a/types/lodash.pick/index.d.ts
+++ b/types/lodash.pick/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pickby/index.d.ts b/types/lodash.pickby/index.d.ts
index fdf61e9468..ae4e2f3581 100644
--- a/types/lodash.pickby/index.d.ts
+++ b/types/lodash.pickby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.property/index.d.ts b/types/lodash.property/index.d.ts
index 0701c0ef8b..979d95c2af 100644
--- a/types/lodash.property/index.d.ts
+++ b/types/lodash.property/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.propertyof/index.d.ts b/types/lodash.propertyof/index.d.ts
index 5c22792ce8..521dd2b560 100644
--- a/types/lodash.propertyof/index.d.ts
+++ b/types/lodash.propertyof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pull/index.d.ts b/types/lodash.pull/index.d.ts
index c9f543ff15..c07b0e40c9 100644
--- a/types/lodash.pull/index.d.ts
+++ b/types/lodash.pull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullall/index.d.ts b/types/lodash.pullall/index.d.ts
index 7cce80257d..4fafdb508c 100644
--- a/types/lodash.pullall/index.d.ts
+++ b/types/lodash.pullall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallby/index.d.ts b/types/lodash.pullallby/index.d.ts
index 77adee2864..dc8848cfee 100644
--- a/types/lodash.pullallby/index.d.ts
+++ b/types/lodash.pullallby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallwith/index.d.ts b/types/lodash.pullallwith/index.d.ts
index f11192ffbe..c636aa8fa0 100644
--- a/types/lodash.pullallwith/index.d.ts
+++ b/types/lodash.pullallwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullat/index.d.ts b/types/lodash.pullat/index.d.ts
index 4b04d54fac..64a9117c48 100644
--- a/types/lodash.pullat/index.d.ts
+++ b/types/lodash.pullat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.random/index.d.ts b/types/lodash.random/index.d.ts
index 48147b1b5a..6d922d9092 100644
--- a/types/lodash.random/index.d.ts
+++ b/types/lodash.random/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.range/index.d.ts b/types/lodash.range/index.d.ts
index 9ca85ee30c..66dabf2396 100644
--- a/types/lodash.range/index.d.ts
+++ b/types/lodash.range/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rangeright/index.d.ts b/types/lodash.rangeright/index.d.ts
index f17168e479..7340a99329 100644
--- a/types/lodash.rangeright/index.d.ts
+++ b/types/lodash.rangeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rearg/index.d.ts b/types/lodash.rearg/index.d.ts
index bdde2bd4af..77055518df 100644
--- a/types/lodash.rearg/index.d.ts
+++ b/types/lodash.rearg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduce/index.d.ts b/types/lodash.reduce/index.d.ts
index f7f58198eb..e3be80b931 100644
--- a/types/lodash.reduce/index.d.ts
+++ b/types/lodash.reduce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduceright/index.d.ts b/types/lodash.reduceright/index.d.ts
index 4fc2a4d54a..94d81edcce 100644
--- a/types/lodash.reduceright/index.d.ts
+++ b/types/lodash.reduceright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reject/index.d.ts b/types/lodash.reject/index.d.ts
index b183695eec..32586896cd 100644
--- a/types/lodash.reject/index.d.ts
+++ b/types/lodash.reject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.remove/index.d.ts b/types/lodash.remove/index.d.ts
index 449e9d62de..2b8ccd14ab 100644
--- a/types/lodash.remove/index.d.ts
+++ b/types/lodash.remove/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.repeat/index.d.ts b/types/lodash.repeat/index.d.ts
index fcd29d00f0..3f3c7f5968 100644
--- a/types/lodash.repeat/index.d.ts
+++ b/types/lodash.repeat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.replace/index.d.ts b/types/lodash.replace/index.d.ts
index b3421ff41a..6a4f26ecf1 100644
--- a/types/lodash.replace/index.d.ts
+++ b/types/lodash.replace/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rest/index.d.ts b/types/lodash.rest/index.d.ts
index bcc5c5e083..3990959f1e 100644
--- a/types/lodash.rest/index.d.ts
+++ b/types/lodash.rest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.result/index.d.ts b/types/lodash.result/index.d.ts
index 684c213eea..dd84bf8c63 100644
--- a/types/lodash.result/index.d.ts
+++ b/types/lodash.result/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reverse/index.d.ts b/types/lodash.reverse/index.d.ts
index 72dbe9e2fe..d9dcb45151 100644
--- a/types/lodash.reverse/index.d.ts
+++ b/types/lodash.reverse/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.round/index.d.ts b/types/lodash.round/index.d.ts
index 7311d157ce..f0b0e6265e 100644
--- a/types/lodash.round/index.d.ts
+++ b/types/lodash.round/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sample/index.d.ts b/types/lodash.sample/index.d.ts
index 2eb8119f0e..877558ce2f 100644
--- a/types/lodash.sample/index.d.ts
+++ b/types/lodash.sample/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.samplesize/index.d.ts b/types/lodash.samplesize/index.d.ts
index 1df16efad5..5f15be7673 100644
--- a/types/lodash.samplesize/index.d.ts
+++ b/types/lodash.samplesize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.set/index.d.ts b/types/lodash.set/index.d.ts
index 686e1588bc..ee2b863bc0 100644
--- a/types/lodash.set/index.d.ts
+++ b/types/lodash.set/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.setwith/index.d.ts b/types/lodash.setwith/index.d.ts
index b61d8ae119..c18a224f15 100644
--- a/types/lodash.setwith/index.d.ts
+++ b/types/lodash.setwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.shuffle/index.d.ts b/types/lodash.shuffle/index.d.ts
index d9374b5072..6f51221766 100644
--- a/types/lodash.shuffle/index.d.ts
+++ b/types/lodash.shuffle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.size/index.d.ts b/types/lodash.size/index.d.ts
index 18c18eeced..3182d16b2c 100644
--- a/types/lodash.size/index.d.ts
+++ b/types/lodash.size/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.slice/index.d.ts b/types/lodash.slice/index.d.ts
index c2381806b5..17521a280d 100644
--- a/types/lodash.slice/index.d.ts
+++ b/types/lodash.slice/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.snakecase/index.d.ts b/types/lodash.snakecase/index.d.ts
index 7b468103ae..1f60bb6ea5 100644
--- a/types/lodash.snakecase/index.d.ts
+++ b/types/lodash.snakecase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.some/index.d.ts b/types/lodash.some/index.d.ts
index 9fb21515a8..747c615db4 100644
--- a/types/lodash.some/index.d.ts
+++ b/types/lodash.some/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortby/index.d.ts b/types/lodash.sortby/index.d.ts
index 14de9ae556..cf6bccdd9b 100644
--- a/types/lodash.sortby/index.d.ts
+++ b/types/lodash.sortby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindex/index.d.ts b/types/lodash.sortedindex/index.d.ts
index 23a331e64a..d428632316 100644
--- a/types/lodash.sortedindex/index.d.ts
+++ b/types/lodash.sortedindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexby/index.d.ts b/types/lodash.sortedindexby/index.d.ts
index 6fa690eb63..dc421df6fc 100644
--- a/types/lodash.sortedindexby/index.d.ts
+++ b/types/lodash.sortedindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexof/index.d.ts b/types/lodash.sortedindexof/index.d.ts
index 1905dc923c..373c81d67f 100644
--- a/types/lodash.sortedindexof/index.d.ts
+++ b/types/lodash.sortedindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindex/index.d.ts b/types/lodash.sortedlastindex/index.d.ts
index 8759590288..498ff7b018 100644
--- a/types/lodash.sortedlastindex/index.d.ts
+++ b/types/lodash.sortedlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexby/index.d.ts b/types/lodash.sortedlastindexby/index.d.ts
index d513d18674..8cc6c8a025 100644
--- a/types/lodash.sortedlastindexby/index.d.ts
+++ b/types/lodash.sortedlastindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexof/index.d.ts b/types/lodash.sortedlastindexof/index.d.ts
index 14d5656d62..4b178fd7f4 100644
--- a/types/lodash.sortedlastindexof/index.d.ts
+++ b/types/lodash.sortedlastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniq/index.d.ts b/types/lodash.sorteduniq/index.d.ts
index 04af0325a0..6be5df9a27 100644
--- a/types/lodash.sorteduniq/index.d.ts
+++ b/types/lodash.sorteduniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniqby/index.d.ts b/types/lodash.sorteduniqby/index.d.ts
index 26c838a01d..895c8a34a1 100644
--- a/types/lodash.sorteduniqby/index.d.ts
+++ b/types/lodash.sorteduniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.split/index.d.ts b/types/lodash.split/index.d.ts
index 5400e2345a..2202c761e6 100644
--- a/types/lodash.split/index.d.ts
+++ b/types/lodash.split/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.spread/index.d.ts b/types/lodash.spread/index.d.ts
index d96b12d1ba..a3113af5c9 100644
--- a/types/lodash.spread/index.d.ts
+++ b/types/lodash.spread/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startcase/index.d.ts b/types/lodash.startcase/index.d.ts
index 2c00230290..8f1ab25a26 100644
--- a/types/lodash.startcase/index.d.ts
+++ b/types/lodash.startcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startswith/index.d.ts b/types/lodash.startswith/index.d.ts
index fbd92b4c40..4001dbe382 100644
--- a/types/lodash.startswith/index.d.ts
+++ b/types/lodash.startswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.subtract/index.d.ts b/types/lodash.subtract/index.d.ts
index 676efb6f17..7d2c052c8b 100644
--- a/types/lodash.subtract/index.d.ts
+++ b/types/lodash.subtract/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sum/index.d.ts b/types/lodash.sum/index.d.ts
index b19d67a4ce..f8affc3248 100644
--- a/types/lodash.sum/index.d.ts
+++ b/types/lodash.sum/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sumby/index.d.ts b/types/lodash.sumby/index.d.ts
index a5f6ac015a..6ad30c02c5 100644
--- a/types/lodash.sumby/index.d.ts
+++ b/types/lodash.sumby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tail/index.d.ts b/types/lodash.tail/index.d.ts
index 51c89ef6b9..f6a7a4432c 100644
--- a/types/lodash.tail/index.d.ts
+++ b/types/lodash.tail/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.take/index.d.ts b/types/lodash.take/index.d.ts
index dffe621124..54c6f0aeec 100644
--- a/types/lodash.take/index.d.ts
+++ b/types/lodash.take/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takeright/index.d.ts b/types/lodash.takeright/index.d.ts
index 637926a744..33b8e9fa89 100644
--- a/types/lodash.takeright/index.d.ts
+++ b/types/lodash.takeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takerightwhile/index.d.ts b/types/lodash.takerightwhile/index.d.ts
index 376124310a..2acf63e0ed 100644
--- a/types/lodash.takerightwhile/index.d.ts
+++ b/types/lodash.takerightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takewhile/index.d.ts b/types/lodash.takewhile/index.d.ts
index 8e5e2958b5..0b14c3bfa7 100644
--- a/types/lodash.takewhile/index.d.ts
+++ b/types/lodash.takewhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.template/index.d.ts b/types/lodash.template/index.d.ts
index 9060d5e979..e9acd12f83 100644
--- a/types/lodash.template/index.d.ts
+++ b/types/lodash.template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.throttle/index.d.ts b/types/lodash.throttle/index.d.ts
index 0e5e2c3d79..08eaa2b832 100644
--- a/types/lodash.throttle/index.d.ts
+++ b/types/lodash.throttle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.times/index.d.ts b/types/lodash.times/index.d.ts
index dfbfcb0425..1cf2a01684 100644
--- a/types/lodash.times/index.d.ts
+++ b/types/lodash.times/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toarray/index.d.ts b/types/lodash.toarray/index.d.ts
index ea13431aa1..49638ccaaa 100644
--- a/types/lodash.toarray/index.d.ts
+++ b/types/lodash.toarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tofinite/index.d.ts b/types/lodash.tofinite/index.d.ts
index 5639c9ba0f..941862c1cf 100644
--- a/types/lodash.tofinite/index.d.ts
+++ b/types/lodash.tofinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tointeger/index.d.ts b/types/lodash.tointeger/index.d.ts
index d662ff0695..ee777f9d05 100644
--- a/types/lodash.tointeger/index.d.ts
+++ b/types/lodash.tointeger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolength/index.d.ts b/types/lodash.tolength/index.d.ts
index a198d6cb5f..7052ee2311 100644
--- a/types/lodash.tolength/index.d.ts
+++ b/types/lodash.tolength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolower/index.d.ts b/types/lodash.tolower/index.d.ts
index a056bef4ae..70449618ca 100644
--- a/types/lodash.tolower/index.d.ts
+++ b/types/lodash.tolower/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tonumber/index.d.ts b/types/lodash.tonumber/index.d.ts
index 85587a3563..55628f487b 100644
--- a/types/lodash.tonumber/index.d.ts
+++ b/types/lodash.tonumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairs/index.d.ts b/types/lodash.topairs/index.d.ts
index dec1a83e18..ffe09c636b 100644
--- a/types/lodash.topairs/index.d.ts
+++ b/types/lodash.topairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairsin/index.d.ts b/types/lodash.topairsin/index.d.ts
index 580cd15f14..204174fa67 100644
--- a/types/lodash.topairsin/index.d.ts
+++ b/types/lodash.topairsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topath/index.d.ts b/types/lodash.topath/index.d.ts
index 5778b4a5a8..013f65f9c9 100644
--- a/types/lodash.topath/index.d.ts
+++ b/types/lodash.topath/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toplainobject/index.d.ts b/types/lodash.toplainobject/index.d.ts
index 26f7eb62b3..d16b64795f 100644
--- a/types/lodash.toplainobject/index.d.ts
+++ b/types/lodash.toplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tosafeinteger/index.d.ts b/types/lodash.tosafeinteger/index.d.ts
index 5429fe3a24..b9fe0a892a 100644
--- a/types/lodash.tosafeinteger/index.d.ts
+++ b/types/lodash.tosafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tostring/index.d.ts b/types/lodash.tostring/index.d.ts
index d7aec37cf9..b60288c45b 100644
--- a/types/lodash.tostring/index.d.ts
+++ b/types/lodash.tostring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toupper/index.d.ts b/types/lodash.toupper/index.d.ts
index a19a7f2293..33838721bb 100644
--- a/types/lodash.toupper/index.d.ts
+++ b/types/lodash.toupper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.transform/index.d.ts b/types/lodash.transform/index.d.ts
index 524dcce29d..a7e1105053 100644
--- a/types/lodash.transform/index.d.ts
+++ b/types/lodash.transform/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trim/index.d.ts b/types/lodash.trim/index.d.ts
index 634b4f5843..2114ce53d6 100644
--- a/types/lodash.trim/index.d.ts
+++ b/types/lodash.trim/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimend/index.d.ts b/types/lodash.trimend/index.d.ts
index 5931c425c1..68c43e43ce 100644
--- a/types/lodash.trimend/index.d.ts
+++ b/types/lodash.trimend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimstart/index.d.ts b/types/lodash.trimstart/index.d.ts
index 6e9ff19aae..e875ff46d7 100644
--- a/types/lodash.trimstart/index.d.ts
+++ b/types/lodash.trimstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.truncate/index.d.ts b/types/lodash.truncate/index.d.ts
index 640143ae7d..cf8c3e0463 100644
--- a/types/lodash.truncate/index.d.ts
+++ b/types/lodash.truncate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unary/index.d.ts b/types/lodash.unary/index.d.ts
index c1cab16bf4..a378016527 100644
--- a/types/lodash.unary/index.d.ts
+++ b/types/lodash.unary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unescape/index.d.ts b/types/lodash.unescape/index.d.ts
index 1a6c126529..c14e2e9ce1 100644
--- a/types/lodash.unescape/index.d.ts
+++ b/types/lodash.unescape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.union/index.d.ts b/types/lodash.union/index.d.ts
index f8e1c3982b..53ad3cd971 100644
--- a/types/lodash.union/index.d.ts
+++ b/types/lodash.union/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionby/index.d.ts b/types/lodash.unionby/index.d.ts
index ec59f1b5c6..ee22897482 100644
--- a/types/lodash.unionby/index.d.ts
+++ b/types/lodash.unionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionwith/index.d.ts b/types/lodash.unionwith/index.d.ts
index a724b6ed00..cbbb33d10e 100644
--- a/types/lodash.unionwith/index.d.ts
+++ b/types/lodash.unionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniq/index.d.ts b/types/lodash.uniq/index.d.ts
index d3fcc99bf8..46f82b7c46 100644
--- a/types/lodash.uniq/index.d.ts
+++ b/types/lodash.uniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqby/index.d.ts b/types/lodash.uniqby/index.d.ts
index fdf318f2cc..7588831282 100644
--- a/types/lodash.uniqby/index.d.ts
+++ b/types/lodash.uniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqueid/index.d.ts b/types/lodash.uniqueid/index.d.ts
index f0b38f23ed..57ed8587d5 100644
--- a/types/lodash.uniqueid/index.d.ts
+++ b/types/lodash.uniqueid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqwith/index.d.ts b/types/lodash.uniqwith/index.d.ts
index 65f00cc772..d312905e57 100644
--- a/types/lodash.uniqwith/index.d.ts
+++ b/types/lodash.uniqwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unset/index.d.ts b/types/lodash.unset/index.d.ts
index 4308337560..654f468535 100644
--- a/types/lodash.unset/index.d.ts
+++ b/types/lodash.unset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzip/index.d.ts b/types/lodash.unzip/index.d.ts
index a0d6e933c1..4738306fe4 100644
--- a/types/lodash.unzip/index.d.ts
+++ b/types/lodash.unzip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzipwith/index.d.ts b/types/lodash.unzipwith/index.d.ts
index 0f95c0377f..16bbed9242 100644
--- a/types/lodash.unzipwith/index.d.ts
+++ b/types/lodash.unzipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.update/index.d.ts b/types/lodash.update/index.d.ts
index 165804f25f..42c7338066 100644
--- a/types/lodash.update/index.d.ts
+++ b/types/lodash.update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.updatewith/index.d.ts b/types/lodash.updatewith/index.d.ts
index 3ae0594188..45f319a1d6 100644
--- a/types/lodash.updatewith/index.d.ts
+++ b/types/lodash.updatewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uppercase/index.d.ts b/types/lodash.uppercase/index.d.ts
index fb25f87be6..fcc0bd2431 100644
--- a/types/lodash.uppercase/index.d.ts
+++ b/types/lodash.uppercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.upperfirst/index.d.ts b/types/lodash.upperfirst/index.d.ts
index f58a6853f3..3c10682234 100644
--- a/types/lodash.upperfirst/index.d.ts
+++ b/types/lodash.upperfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.values/index.d.ts b/types/lodash.values/index.d.ts
index 9bba06f1a2..695f2edcdc 100644
--- a/types/lodash.values/index.d.ts
+++ b/types/lodash.values/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.valuesin/index.d.ts b/types/lodash.valuesin/index.d.ts
index 3da65eabb7..3d1a489783 100644
--- a/types/lodash.valuesin/index.d.ts
+++ b/types/lodash.valuesin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.without/index.d.ts b/types/lodash.without/index.d.ts
index 624fdd8918..059ad9cd74 100644
--- a/types/lodash.without/index.d.ts
+++ b/types/lodash.without/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.words/index.d.ts b/types/lodash.words/index.d.ts
index 304f7c3145..d27c6304fc 100644
--- a/types/lodash.words/index.d.ts
+++ b/types/lodash.words/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.wrap/index.d.ts b/types/lodash.wrap/index.d.ts
index 410c955027..753d51ffd3 100644
--- a/types/lodash.wrap/index.d.ts
+++ b/types/lodash.wrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xor/index.d.ts b/types/lodash.xor/index.d.ts
index 0426670d24..7556c23b6e 100644
--- a/types/lodash.xor/index.d.ts
+++ b/types/lodash.xor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorby/index.d.ts b/types/lodash.xorby/index.d.ts
index d1ebbbd9fa..527c871371 100644
--- a/types/lodash.xorby/index.d.ts
+++ b/types/lodash.xorby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorwith/index.d.ts b/types/lodash.xorwith/index.d.ts
index 6adaa16d35..59f2c2c830 100644
--- a/types/lodash.xorwith/index.d.ts
+++ b/types/lodash.xorwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zip/index.d.ts b/types/lodash.zip/index.d.ts
index 3ad6804c4f..c101c378ae 100644
--- a/types/lodash.zip/index.d.ts
+++ b/types/lodash.zip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobject/index.d.ts b/types/lodash.zipobject/index.d.ts
index a4c0d0e444..3fa098f79a 100644
--- a/types/lodash.zipobject/index.d.ts
+++ b/types/lodash.zipobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobjectdeep/index.d.ts b/types/lodash.zipobjectdeep/index.d.ts
index b942a3e4c6..6391b92bd8 100644
--- a/types/lodash.zipobjectdeep/index.d.ts
+++ b/types/lodash.zipobjectdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipwith/index.d.ts b/types/lodash.zipwith/index.d.ts
index 39c39005d7..2f123f19b1 100644
--- a/types/lodash.zipwith/index.d.ts
+++ b/types/lodash.zipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index b136e9469b..d36b603f42 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -1685,8 +1685,8 @@ declare module "../index" {
         get<TObject extends object, TKey extends keyof TObject, TDefault>(
             object: TObject | null | undefined,
             path: TKey | [TKey],
-            defaultValue: TDefault
-        ): TObject[TKey] | TDefault;
+            defaultValue: TDefault,
+        ): Exclude<TObject[TKey], undefined> | TDefault;
 
         /**
          * @see _.get
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 94cabd0f37..45fb97d010 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -10,7 +10,7 @@
 //                 Jack Moore <https://github.com/jtmthf>,
 //                 Dominique Rau <https://github.com/DomiR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference path="./common/common.d.ts" />
 /// <reference path="./common/array.d.ts" />
diff --git a/types/lodash/scripts/generate-modules.ts b/types/lodash/scripts/generate-modules.ts
index 28d5e585c3..523f23e6e6 100644
--- a/types/lodash/scripts/generate-modules.ts
+++ b/types/lodash/scripts/generate-modules.ts
@@ -56,7 +56,7 @@ async function globalDefinitionText(moduleName: string): Promise<string> {
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// Typescript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 

From ff6ca21aa5c6addcc7c99abd3e2c20e0860178d2 Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 14 Feb 2019 12:40:30 -0600
Subject: [PATCH 023/924] Use export = instead of export default

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

diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
index 4a81cf3dbc..7ac69c1e1f 100644
--- a/types/detox/index.d.ts
+++ b/types/detox/index.d.ts
@@ -442,4 +442,4 @@ export { by, device, element, waitFor };
 // for backwards compatibility though.
 export const expect: Detox.Expect<Detox.Expect<any>>;
 
-export default detox;
+export = detox;

From ca8d73dbc9d57342b5dfec6fa745e1509c7d03fe Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 12:40:39 -0600
Subject: [PATCH 024/924] Fix TypeScript version header

---
 types/jest-image-snapshot/jest-image-snapshot-tests.ts | 2 +-
 types/lodash-es/index.d.ts                             | 2 +-
 types/lodash.add/index.d.ts                            | 2 +-
 types/lodash.after/index.d.ts                          | 2 +-
 types/lodash.ary/index.d.ts                            | 2 +-
 types/lodash.assign/index.d.ts                         | 2 +-
 types/lodash.assignin/index.d.ts                       | 2 +-
 types/lodash.assigninwith/index.d.ts                   | 2 +-
 types/lodash.assignwith/index.d.ts                     | 2 +-
 types/lodash.at/index.d.ts                             | 2 +-
 types/lodash.attempt/index.d.ts                        | 2 +-
 types/lodash.before/index.d.ts                         | 2 +-
 types/lodash.bind/index.d.ts                           | 2 +-
 types/lodash.bindall/index.d.ts                        | 2 +-
 types/lodash.bindkey/index.d.ts                        | 2 +-
 types/lodash.camelcase/index.d.ts                      | 2 +-
 types/lodash.capitalize/index.d.ts                     | 2 +-
 types/lodash.castarray/index.d.ts                      | 2 +-
 types/lodash.ceil/index.d.ts                           | 2 +-
 types/lodash.chunk/index.d.ts                          | 2 +-
 types/lodash.clamp/index.d.ts                          | 2 +-
 types/lodash.clone/index.d.ts                          | 2 +-
 types/lodash.clonedeep/index.d.ts                      | 2 +-
 types/lodash.clonedeepwith/index.d.ts                  | 2 +-
 types/lodash.clonewith/index.d.ts                      | 2 +-
 types/lodash.compact/index.d.ts                        | 2 +-
 types/lodash.concat/index.d.ts                         | 2 +-
 types/lodash.cond/index.d.ts                           | 2 +-
 types/lodash.constant/index.d.ts                       | 2 +-
 types/lodash.countby/index.d.ts                        | 2 +-
 types/lodash.create/index.d.ts                         | 2 +-
 types/lodash.curry/index.d.ts                          | 2 +-
 types/lodash.curryright/index.d.ts                     | 2 +-
 types/lodash.debounce/index.d.ts                       | 2 +-
 types/lodash.deburr/index.d.ts                         | 2 +-
 types/lodash.defaults/index.d.ts                       | 2 +-
 types/lodash.defaultsdeep/index.d.ts                   | 2 +-
 types/lodash.defer/index.d.ts                          | 2 +-
 types/lodash.delay/index.d.ts                          | 2 +-
 types/lodash.difference/index.d.ts                     | 2 +-
 types/lodash.differenceby/index.d.ts                   | 2 +-
 types/lodash.differencewith/index.d.ts                 | 2 +-
 types/lodash.divide/index.d.ts                         | 2 +-
 types/lodash.drop/index.d.ts                           | 2 +-
 types/lodash.dropright/index.d.ts                      | 2 +-
 types/lodash.droprightwhile/index.d.ts                 | 2 +-
 types/lodash.dropwhile/index.d.ts                      | 2 +-
 types/lodash.endswith/index.d.ts                       | 2 +-
 types/lodash.eq/index.d.ts                             | 2 +-
 types/lodash.escape/index.d.ts                         | 2 +-
 types/lodash.escaperegexp/index.d.ts                   | 2 +-
 types/lodash.every/index.d.ts                          | 2 +-
 types/lodash.fill/index.d.ts                           | 2 +-
 types/lodash.filter/index.d.ts                         | 2 +-
 types/lodash.find/index.d.ts                           | 2 +-
 types/lodash.findindex/index.d.ts                      | 2 +-
 types/lodash.findkey/index.d.ts                        | 2 +-
 types/lodash.findlast/index.d.ts                       | 2 +-
 types/lodash.findlastindex/index.d.ts                  | 2 +-
 types/lodash.findlastkey/index.d.ts                    | 2 +-
 types/lodash.first/index.d.ts                          | 2 +-
 types/lodash.flatmap/index.d.ts                        | 2 +-
 types/lodash.flatmapdeep/index.d.ts                    | 2 +-
 types/lodash.flatmapdepth/index.d.ts                   | 2 +-
 types/lodash.flatten/index.d.ts                        | 2 +-
 types/lodash.flattendeep/index.d.ts                    | 2 +-
 types/lodash.flattendepth/index.d.ts                   | 2 +-
 types/lodash.flip/index.d.ts                           | 2 +-
 types/lodash.floor/index.d.ts                          | 2 +-
 types/lodash.flow/index.d.ts                           | 2 +-
 types/lodash.flowright/index.d.ts                      | 2 +-
 types/lodash.foreach/index.d.ts                        | 2 +-
 types/lodash.foreachright/index.d.ts                   | 2 +-
 types/lodash.forin/index.d.ts                          | 2 +-
 types/lodash.forinright/index.d.ts                     | 2 +-
 types/lodash.forown/index.d.ts                         | 2 +-
 types/lodash.forownright/index.d.ts                    | 2 +-
 types/lodash.frompairs/index.d.ts                      | 2 +-
 types/lodash.functions/index.d.ts                      | 2 +-
 types/lodash.functionsin/index.d.ts                    | 2 +-
 types/lodash.get/index.d.ts                            | 2 +-
 types/lodash.groupby/index.d.ts                        | 2 +-
 types/lodash.gt/index.d.ts                             | 2 +-
 types/lodash.gte/index.d.ts                            | 2 +-
 types/lodash.has/index.d.ts                            | 2 +-
 types/lodash.hasin/index.d.ts                          | 2 +-
 types/lodash.head/index.d.ts                           | 2 +-
 types/lodash.identity/index.d.ts                       | 2 +-
 types/lodash.includes/index.d.ts                       | 2 +-
 types/lodash.indexof/index.d.ts                        | 2 +-
 types/lodash.initial/index.d.ts                        | 2 +-
 types/lodash.inrange/index.d.ts                        | 2 +-
 types/lodash.intersection/index.d.ts                   | 2 +-
 types/lodash.intersectionby/index.d.ts                 | 2 +-
 types/lodash.intersectionwith/index.d.ts               | 2 +-
 types/lodash.invert/index.d.ts                         | 2 +-
 types/lodash.invertby/index.d.ts                       | 2 +-
 types/lodash.invoke/index.d.ts                         | 2 +-
 types/lodash.invokemap/index.d.ts                      | 2 +-
 types/lodash.isarguments/index.d.ts                    | 2 +-
 types/lodash.isarray/index.d.ts                        | 2 +-
 types/lodash.isarraybuffer/index.d.ts                  | 2 +-
 types/lodash.isarraylike/index.d.ts                    | 2 +-
 types/lodash.isarraylikeobject/index.d.ts              | 2 +-
 types/lodash.isboolean/index.d.ts                      | 2 +-
 types/lodash.isbuffer/index.d.ts                       | 2 +-
 types/lodash.isdate/index.d.ts                         | 2 +-
 types/lodash.iselement/index.d.ts                      | 2 +-
 types/lodash.isempty/index.d.ts                        | 2 +-
 types/lodash.isequal/index.d.ts                        | 2 +-
 types/lodash.isequalwith/index.d.ts                    | 2 +-
 types/lodash.iserror/index.d.ts                        | 2 +-
 types/lodash.isfinite/index.d.ts                       | 2 +-
 types/lodash.isfunction/index.d.ts                     | 2 +-
 types/lodash.isinteger/index.d.ts                      | 2 +-
 types/lodash.islength/index.d.ts                       | 2 +-
 types/lodash.ismap/index.d.ts                          | 2 +-
 types/lodash.ismatch/index.d.ts                        | 2 +-
 types/lodash.ismatchwith/index.d.ts                    | 2 +-
 types/lodash.isnan/index.d.ts                          | 2 +-
 types/lodash.isnative/index.d.ts                       | 2 +-
 types/lodash.isnil/index.d.ts                          | 2 +-
 types/lodash.isnull/index.d.ts                         | 2 +-
 types/lodash.isnumber/index.d.ts                       | 2 +-
 types/lodash.isobject/index.d.ts                       | 2 +-
 types/lodash.isobjectlike/index.d.ts                   | 2 +-
 types/lodash.isplainobject/index.d.ts                  | 2 +-
 types/lodash.isregexp/index.d.ts                       | 2 +-
 types/lodash.issafeinteger/index.d.ts                  | 2 +-
 types/lodash.isset/index.d.ts                          | 2 +-
 types/lodash.isstring/index.d.ts                       | 2 +-
 types/lodash.issymbol/index.d.ts                       | 2 +-
 types/lodash.istypedarray/index.d.ts                   | 2 +-
 types/lodash.isundefined/index.d.ts                    | 2 +-
 types/lodash.isweakmap/index.d.ts                      | 2 +-
 types/lodash.isweakset/index.d.ts                      | 2 +-
 types/lodash.iteratee/index.d.ts                       | 2 +-
 types/lodash.join/index.d.ts                           | 2 +-
 types/lodash.kebabcase/index.d.ts                      | 2 +-
 types/lodash.keyby/index.d.ts                          | 2 +-
 types/lodash.keys/index.d.ts                           | 2 +-
 types/lodash.keysin/index.d.ts                         | 2 +-
 types/lodash.last/index.d.ts                           | 2 +-
 types/lodash.lastindexof/index.d.ts                    | 2 +-
 types/lodash.lowercase/index.d.ts                      | 2 +-
 types/lodash.lowerfirst/index.d.ts                     | 2 +-
 types/lodash.lt/index.d.ts                             | 2 +-
 types/lodash.lte/index.d.ts                            | 2 +-
 types/lodash.mapkeys/index.d.ts                        | 2 +-
 types/lodash.mapvalues/index.d.ts                      | 2 +-
 types/lodash.matches/index.d.ts                        | 2 +-
 types/lodash.matchesproperty/index.d.ts                | 2 +-
 types/lodash.max/index.d.ts                            | 2 +-
 types/lodash.maxby/index.d.ts                          | 2 +-
 types/lodash.mean/index.d.ts                           | 2 +-
 types/lodash.meanby/index.d.ts                         | 2 +-
 types/lodash.memoize/index.d.ts                        | 2 +-
 types/lodash.merge/index.d.ts                          | 2 +-
 types/lodash.mergewith/index.d.ts                      | 2 +-
 types/lodash.method/index.d.ts                         | 2 +-
 types/lodash.methodof/index.d.ts                       | 2 +-
 types/lodash.min/index.d.ts                            | 2 +-
 types/lodash.minby/index.d.ts                          | 2 +-
 types/lodash.mixin/index.d.ts                          | 2 +-
 types/lodash.negate/index.d.ts                         | 2 +-
 types/lodash.noop/index.d.ts                           | 2 +-
 types/lodash.now/index.d.ts                            | 2 +-
 types/lodash.nth/index.d.ts                            | 2 +-
 types/lodash.ntharg/index.d.ts                         | 2 +-
 types/lodash.omit/index.d.ts                           | 2 +-
 types/lodash.omitby/index.d.ts                         | 2 +-
 types/lodash.once/index.d.ts                           | 2 +-
 types/lodash.orderby/index.d.ts                        | 2 +-
 types/lodash.over/index.d.ts                           | 2 +-
 types/lodash.overargs/index.d.ts                       | 2 +-
 types/lodash.overevery/index.d.ts                      | 2 +-
 types/lodash.oversome/index.d.ts                       | 2 +-
 types/lodash.pad/index.d.ts                            | 2 +-
 types/lodash.padend/index.d.ts                         | 2 +-
 types/lodash.padstart/index.d.ts                       | 2 +-
 types/lodash.parseint/index.d.ts                       | 2 +-
 types/lodash.partial/index.d.ts                        | 2 +-
 types/lodash.partialright/index.d.ts                   | 2 +-
 types/lodash.partition/index.d.ts                      | 2 +-
 types/lodash.pick/index.d.ts                           | 2 +-
 types/lodash.pickby/index.d.ts                         | 2 +-
 types/lodash.property/index.d.ts                       | 2 +-
 types/lodash.propertyof/index.d.ts                     | 2 +-
 types/lodash.pull/index.d.ts                           | 2 +-
 types/lodash.pullall/index.d.ts                        | 2 +-
 types/lodash.pullallby/index.d.ts                      | 2 +-
 types/lodash.pullallwith/index.d.ts                    | 2 +-
 types/lodash.pullat/index.d.ts                         | 2 +-
 types/lodash.random/index.d.ts                         | 2 +-
 types/lodash.range/index.d.ts                          | 2 +-
 types/lodash.rangeright/index.d.ts                     | 2 +-
 types/lodash.rearg/index.d.ts                          | 2 +-
 types/lodash.reduce/index.d.ts                         | 2 +-
 types/lodash.reduceright/index.d.ts                    | 2 +-
 types/lodash.reject/index.d.ts                         | 2 +-
 types/lodash.remove/index.d.ts                         | 2 +-
 types/lodash.repeat/index.d.ts                         | 2 +-
 types/lodash.replace/index.d.ts                        | 2 +-
 types/lodash.rest/index.d.ts                           | 2 +-
 types/lodash.result/index.d.ts                         | 2 +-
 types/lodash.reverse/index.d.ts                        | 2 +-
 types/lodash.round/index.d.ts                          | 2 +-
 types/lodash.sample/index.d.ts                         | 2 +-
 types/lodash.samplesize/index.d.ts                     | 2 +-
 types/lodash.set/index.d.ts                            | 2 +-
 types/lodash.setwith/index.d.ts                        | 2 +-
 types/lodash.shuffle/index.d.ts                        | 2 +-
 types/lodash.size/index.d.ts                           | 2 +-
 types/lodash.slice/index.d.ts                          | 2 +-
 types/lodash.snakecase/index.d.ts                      | 2 +-
 types/lodash.some/index.d.ts                           | 2 +-
 types/lodash.sortby/index.d.ts                         | 2 +-
 types/lodash.sortedindex/index.d.ts                    | 2 +-
 types/lodash.sortedindexby/index.d.ts                  | 2 +-
 types/lodash.sortedindexof/index.d.ts                  | 2 +-
 types/lodash.sortedlastindex/index.d.ts                | 2 +-
 types/lodash.sortedlastindexby/index.d.ts              | 2 +-
 types/lodash.sortedlastindexof/index.d.ts              | 2 +-
 types/lodash.sorteduniq/index.d.ts                     | 2 +-
 types/lodash.sorteduniqby/index.d.ts                   | 2 +-
 types/lodash.split/index.d.ts                          | 2 +-
 types/lodash.spread/index.d.ts                         | 2 +-
 types/lodash.startcase/index.d.ts                      | 2 +-
 types/lodash.startswith/index.d.ts                     | 2 +-
 types/lodash.subtract/index.d.ts                       | 2 +-
 types/lodash.sum/index.d.ts                            | 2 +-
 types/lodash.sumby/index.d.ts                          | 2 +-
 types/lodash.tail/index.d.ts                           | 2 +-
 types/lodash.take/index.d.ts                           | 2 +-
 types/lodash.takeright/index.d.ts                      | 2 +-
 types/lodash.takerightwhile/index.d.ts                 | 2 +-
 types/lodash.takewhile/index.d.ts                      | 2 +-
 types/lodash.template/index.d.ts                       | 2 +-
 types/lodash.throttle/index.d.ts                       | 2 +-
 types/lodash.times/index.d.ts                          | 2 +-
 types/lodash.toarray/index.d.ts                        | 2 +-
 types/lodash.tofinite/index.d.ts                       | 2 +-
 types/lodash.tointeger/index.d.ts                      | 2 +-
 types/lodash.tolength/index.d.ts                       | 2 +-
 types/lodash.tolower/index.d.ts                        | 2 +-
 types/lodash.tonumber/index.d.ts                       | 2 +-
 types/lodash.topairs/index.d.ts                        | 2 +-
 types/lodash.topairsin/index.d.ts                      | 2 +-
 types/lodash.topath/index.d.ts                         | 2 +-
 types/lodash.toplainobject/index.d.ts                  | 2 +-
 types/lodash.tosafeinteger/index.d.ts                  | 2 +-
 types/lodash.tostring/index.d.ts                       | 2 +-
 types/lodash.toupper/index.d.ts                        | 2 +-
 types/lodash.transform/index.d.ts                      | 2 +-
 types/lodash.trim/index.d.ts                           | 2 +-
 types/lodash.trimend/index.d.ts                        | 2 +-
 types/lodash.trimstart/index.d.ts                      | 2 +-
 types/lodash.truncate/index.d.ts                       | 2 +-
 types/lodash.unary/index.d.ts                          | 2 +-
 types/lodash.unescape/index.d.ts                       | 2 +-
 types/lodash.union/index.d.ts                          | 2 +-
 types/lodash.unionby/index.d.ts                        | 2 +-
 types/lodash.unionwith/index.d.ts                      | 2 +-
 types/lodash.uniq/index.d.ts                           | 2 +-
 types/lodash.uniqby/index.d.ts                         | 2 +-
 types/lodash.uniqueid/index.d.ts                       | 2 +-
 types/lodash.uniqwith/index.d.ts                       | 2 +-
 types/lodash.unset/index.d.ts                          | 2 +-
 types/lodash.unzip/index.d.ts                          | 2 +-
 types/lodash.unzipwith/index.d.ts                      | 2 +-
 types/lodash.update/index.d.ts                         | 2 +-
 types/lodash.updatewith/index.d.ts                     | 2 +-
 types/lodash.uppercase/index.d.ts                      | 2 +-
 types/lodash.upperfirst/index.d.ts                     | 2 +-
 types/lodash.values/index.d.ts                         | 2 +-
 types/lodash.valuesin/index.d.ts                       | 2 +-
 types/lodash.without/index.d.ts                        | 2 +-
 types/lodash.words/index.d.ts                          | 2 +-
 types/lodash.wrap/index.d.ts                           | 2 +-
 types/lodash.xor/index.d.ts                            | 2 +-
 types/lodash.xorby/index.d.ts                          | 2 +-
 types/lodash.xorwith/index.d.ts                        | 2 +-
 types/lodash.zip/index.d.ts                            | 2 +-
 types/lodash.zipobject/index.d.ts                      | 2 +-
 types/lodash.zipobjectdeep/index.d.ts                  | 2 +-
 types/lodash.zipwith/index.d.ts                        | 2 +-
 types/lodash/scripts/generate-modules.ts               | 2 +-
 types/office-runtime/index.d.ts                        | 2 +-
 types/websocket-async/index.d.ts                       | 2 +-
 289 files changed, 289 insertions(+), 289 deletions(-)

diff --git a/types/jest-image-snapshot/jest-image-snapshot-tests.ts b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
index 07f6debed7..402e505bb0 100644
--- a/types/jest-image-snapshot/jest-image-snapshot-tests.ts
+++ b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
@@ -1,4 +1,4 @@
-// Typescript Version: 2.3
+// TypeScript Version: 2.3
 import { toMatchImageSnapshot, configureToMatchImageSnapshot, MatchImageSnapshotOptions } from 'jest-image-snapshot';
 
 it('should be able to use toMatchImageSnapshot in a test', () => {
diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 1b1aefab48..3e9fcfa69c 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/, https://lodash.com/custom-builds
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 export { default as add } from "./add";
 export { default as after } from "./after";
diff --git a/types/lodash.add/index.d.ts b/types/lodash.add/index.d.ts
index 772346a2d0..baddebd61a 100644
--- a/types/lodash.add/index.d.ts
+++ b/types/lodash.add/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.after/index.d.ts b/types/lodash.after/index.d.ts
index 6656fce6bb..fc56217da5 100644
--- a/types/lodash.after/index.d.ts
+++ b/types/lodash.after/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ary/index.d.ts b/types/lodash.ary/index.d.ts
index 989aa725a5..1d44bac65a 100644
--- a/types/lodash.ary/index.d.ts
+++ b/types/lodash.ary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assign/index.d.ts b/types/lodash.assign/index.d.ts
index 0630a711ff..439ca018b5 100644
--- a/types/lodash.assign/index.d.ts
+++ b/types/lodash.assign/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignin/index.d.ts b/types/lodash.assignin/index.d.ts
index 1c816068a1..33c31dbc31 100644
--- a/types/lodash.assignin/index.d.ts
+++ b/types/lodash.assignin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assigninwith/index.d.ts b/types/lodash.assigninwith/index.d.ts
index 0068b84dd0..17d76a4304 100644
--- a/types/lodash.assigninwith/index.d.ts
+++ b/types/lodash.assigninwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignwith/index.d.ts b/types/lodash.assignwith/index.d.ts
index 609055f4c1..d95702fd18 100644
--- a/types/lodash.assignwith/index.d.ts
+++ b/types/lodash.assignwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.at/index.d.ts b/types/lodash.at/index.d.ts
index d2b42c712b..278854bab6 100644
--- a/types/lodash.at/index.d.ts
+++ b/types/lodash.at/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.attempt/index.d.ts b/types/lodash.attempt/index.d.ts
index 380c968a6a..9db30b6fd0 100644
--- a/types/lodash.attempt/index.d.ts
+++ b/types/lodash.attempt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.before/index.d.ts b/types/lodash.before/index.d.ts
index d3709654fe..482c458fd4 100644
--- a/types/lodash.before/index.d.ts
+++ b/types/lodash.before/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bind/index.d.ts b/types/lodash.bind/index.d.ts
index cab39bbda7..bf22c45a09 100644
--- a/types/lodash.bind/index.d.ts
+++ b/types/lodash.bind/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindall/index.d.ts b/types/lodash.bindall/index.d.ts
index 82e411a336..135c532028 100644
--- a/types/lodash.bindall/index.d.ts
+++ b/types/lodash.bindall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindkey/index.d.ts b/types/lodash.bindkey/index.d.ts
index 039ed71905..12553e21b8 100644
--- a/types/lodash.bindkey/index.d.ts
+++ b/types/lodash.bindkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.camelcase/index.d.ts b/types/lodash.camelcase/index.d.ts
index a9beabf396..8f01a3bf38 100644
--- a/types/lodash.camelcase/index.d.ts
+++ b/types/lodash.camelcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.capitalize/index.d.ts b/types/lodash.capitalize/index.d.ts
index 61843a4996..5e0ffdced3 100644
--- a/types/lodash.capitalize/index.d.ts
+++ b/types/lodash.capitalize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.castarray/index.d.ts b/types/lodash.castarray/index.d.ts
index 733fb69735..f27ca127a6 100644
--- a/types/lodash.castarray/index.d.ts
+++ b/types/lodash.castarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ceil/index.d.ts b/types/lodash.ceil/index.d.ts
index cb8fd23386..f49a415e20 100644
--- a/types/lodash.ceil/index.d.ts
+++ b/types/lodash.ceil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.chunk/index.d.ts b/types/lodash.chunk/index.d.ts
index 652c83f8c1..0591152d32 100644
--- a/types/lodash.chunk/index.d.ts
+++ b/types/lodash.chunk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clamp/index.d.ts b/types/lodash.clamp/index.d.ts
index 796172867c..38624c2214 100644
--- a/types/lodash.clamp/index.d.ts
+++ b/types/lodash.clamp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clone/index.d.ts b/types/lodash.clone/index.d.ts
index 810ff9158b..333915a404 100644
--- a/types/lodash.clone/index.d.ts
+++ b/types/lodash.clone/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeep/index.d.ts b/types/lodash.clonedeep/index.d.ts
index 9eb31632f4..369942bf05 100644
--- a/types/lodash.clonedeep/index.d.ts
+++ b/types/lodash.clonedeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeepwith/index.d.ts b/types/lodash.clonedeepwith/index.d.ts
index 3ceef35da9..9d37cbea6d 100644
--- a/types/lodash.clonedeepwith/index.d.ts
+++ b/types/lodash.clonedeepwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonewith/index.d.ts b/types/lodash.clonewith/index.d.ts
index fa57374c7a..0a099fd494 100644
--- a/types/lodash.clonewith/index.d.ts
+++ b/types/lodash.clonewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.compact/index.d.ts b/types/lodash.compact/index.d.ts
index 3155457aa3..553668fcb3 100644
--- a/types/lodash.compact/index.d.ts
+++ b/types/lodash.compact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.concat/index.d.ts b/types/lodash.concat/index.d.ts
index 7c31abca34..f96ec742b9 100644
--- a/types/lodash.concat/index.d.ts
+++ b/types/lodash.concat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.cond/index.d.ts b/types/lodash.cond/index.d.ts
index 18aa811fd1..83fa5ef27a 100644
--- a/types/lodash.cond/index.d.ts
+++ b/types/lodash.cond/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.constant/index.d.ts b/types/lodash.constant/index.d.ts
index d928f61e6f..03c2713bdf 100644
--- a/types/lodash.constant/index.d.ts
+++ b/types/lodash.constant/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.countby/index.d.ts b/types/lodash.countby/index.d.ts
index b3194f1f47..24b895f079 100644
--- a/types/lodash.countby/index.d.ts
+++ b/types/lodash.countby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.create/index.d.ts b/types/lodash.create/index.d.ts
index 562121278b..dca4287417 100644
--- a/types/lodash.create/index.d.ts
+++ b/types/lodash.create/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curry/index.d.ts b/types/lodash.curry/index.d.ts
index 660782b829..f24b40caed 100644
--- a/types/lodash.curry/index.d.ts
+++ b/types/lodash.curry/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curryright/index.d.ts b/types/lodash.curryright/index.d.ts
index 706da25049..b10ea20902 100644
--- a/types/lodash.curryright/index.d.ts
+++ b/types/lodash.curryright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.debounce/index.d.ts b/types/lodash.debounce/index.d.ts
index d337350c38..02f0bfc874 100644
--- a/types/lodash.debounce/index.d.ts
+++ b/types/lodash.debounce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.deburr/index.d.ts b/types/lodash.deburr/index.d.ts
index 3325320abc..f1c22579cc 100644
--- a/types/lodash.deburr/index.d.ts
+++ b/types/lodash.deburr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaults/index.d.ts b/types/lodash.defaults/index.d.ts
index 8e5745fe18..b369cbbed2 100644
--- a/types/lodash.defaults/index.d.ts
+++ b/types/lodash.defaults/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaultsdeep/index.d.ts b/types/lodash.defaultsdeep/index.d.ts
index 8dffb26c17..4cafcffe76 100644
--- a/types/lodash.defaultsdeep/index.d.ts
+++ b/types/lodash.defaultsdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defer/index.d.ts b/types/lodash.defer/index.d.ts
index d09ea8f6f2..9a015ee473 100644
--- a/types/lodash.defer/index.d.ts
+++ b/types/lodash.defer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.delay/index.d.ts b/types/lodash.delay/index.d.ts
index 0b8ee66e74..9fb968dc1f 100644
--- a/types/lodash.delay/index.d.ts
+++ b/types/lodash.delay/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.difference/index.d.ts b/types/lodash.difference/index.d.ts
index 09b032c1bb..53d2f688e0 100644
--- a/types/lodash.difference/index.d.ts
+++ b/types/lodash.difference/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differenceby/index.d.ts b/types/lodash.differenceby/index.d.ts
index be5647692c..11b877c8bd 100644
--- a/types/lodash.differenceby/index.d.ts
+++ b/types/lodash.differenceby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differencewith/index.d.ts b/types/lodash.differencewith/index.d.ts
index c353d4319a..7bcaf0e374 100644
--- a/types/lodash.differencewith/index.d.ts
+++ b/types/lodash.differencewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.divide/index.d.ts b/types/lodash.divide/index.d.ts
index 61f5234af6..87b705f72b 100644
--- a/types/lodash.divide/index.d.ts
+++ b/types/lodash.divide/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.drop/index.d.ts b/types/lodash.drop/index.d.ts
index 33d3e19039..0bdebee18c 100644
--- a/types/lodash.drop/index.d.ts
+++ b/types/lodash.drop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropright/index.d.ts b/types/lodash.dropright/index.d.ts
index 3cf5d6649a..305d9185ad 100644
--- a/types/lodash.dropright/index.d.ts
+++ b/types/lodash.dropright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.droprightwhile/index.d.ts b/types/lodash.droprightwhile/index.d.ts
index 8321da6b6d..f93a0e2bf8 100644
--- a/types/lodash.droprightwhile/index.d.ts
+++ b/types/lodash.droprightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropwhile/index.d.ts b/types/lodash.dropwhile/index.d.ts
index 4f8b336310..c319c28cad 100644
--- a/types/lodash.dropwhile/index.d.ts
+++ b/types/lodash.dropwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.endswith/index.d.ts b/types/lodash.endswith/index.d.ts
index 6626ffd52a..08da3f984e 100644
--- a/types/lodash.endswith/index.d.ts
+++ b/types/lodash.endswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.eq/index.d.ts b/types/lodash.eq/index.d.ts
index 14d17ed08a..2108d43241 100644
--- a/types/lodash.eq/index.d.ts
+++ b/types/lodash.eq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escape/index.d.ts b/types/lodash.escape/index.d.ts
index c357bee3c3..7fc4195d57 100644
--- a/types/lodash.escape/index.d.ts
+++ b/types/lodash.escape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escaperegexp/index.d.ts b/types/lodash.escaperegexp/index.d.ts
index 17f67d618f..790be82ef5 100644
--- a/types/lodash.escaperegexp/index.d.ts
+++ b/types/lodash.escaperegexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.every/index.d.ts b/types/lodash.every/index.d.ts
index 2a05255eec..c1daeeaf8b 100644
--- a/types/lodash.every/index.d.ts
+++ b/types/lodash.every/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.fill/index.d.ts b/types/lodash.fill/index.d.ts
index 59208388f6..b80b6f3766 100644
--- a/types/lodash.fill/index.d.ts
+++ b/types/lodash.fill/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.filter/index.d.ts b/types/lodash.filter/index.d.ts
index cf8134b740..620b5afa5f 100644
--- a/types/lodash.filter/index.d.ts
+++ b/types/lodash.filter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.find/index.d.ts b/types/lodash.find/index.d.ts
index 09a5a0c21d..2e872ac18f 100644
--- a/types/lodash.find/index.d.ts
+++ b/types/lodash.find/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findindex/index.d.ts b/types/lodash.findindex/index.d.ts
index 6b237ba285..d809dc25c1 100644
--- a/types/lodash.findindex/index.d.ts
+++ b/types/lodash.findindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findkey/index.d.ts b/types/lodash.findkey/index.d.ts
index f102aa20d3..d3d190c961 100644
--- a/types/lodash.findkey/index.d.ts
+++ b/types/lodash.findkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlast/index.d.ts b/types/lodash.findlast/index.d.ts
index 92a91432e1..82c796b516 100644
--- a/types/lodash.findlast/index.d.ts
+++ b/types/lodash.findlast/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastindex/index.d.ts b/types/lodash.findlastindex/index.d.ts
index 9bf1b1eddb..07fcecb2aa 100644
--- a/types/lodash.findlastindex/index.d.ts
+++ b/types/lodash.findlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastkey/index.d.ts b/types/lodash.findlastkey/index.d.ts
index 4563f2b91e..538349029a 100644
--- a/types/lodash.findlastkey/index.d.ts
+++ b/types/lodash.findlastkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.first/index.d.ts b/types/lodash.first/index.d.ts
index 4bd8f1e059..c4e173b32e 100644
--- a/types/lodash.first/index.d.ts
+++ b/types/lodash.first/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmap/index.d.ts b/types/lodash.flatmap/index.d.ts
index 22222c405a..376fa4dde5 100644
--- a/types/lodash.flatmap/index.d.ts
+++ b/types/lodash.flatmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdeep/index.d.ts b/types/lodash.flatmapdeep/index.d.ts
index 55c43f881e..b6173e3aa4 100644
--- a/types/lodash.flatmapdeep/index.d.ts
+++ b/types/lodash.flatmapdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdepth/index.d.ts b/types/lodash.flatmapdepth/index.d.ts
index 812fa36c8a..748e76f598 100644
--- a/types/lodash.flatmapdepth/index.d.ts
+++ b/types/lodash.flatmapdepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatten/index.d.ts b/types/lodash.flatten/index.d.ts
index e1d21df7fe..7ce8c0b8b6 100644
--- a/types/lodash.flatten/index.d.ts
+++ b/types/lodash.flatten/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendeep/index.d.ts b/types/lodash.flattendeep/index.d.ts
index 79cee1753f..aeff806101 100644
--- a/types/lodash.flattendeep/index.d.ts
+++ b/types/lodash.flattendeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendepth/index.d.ts b/types/lodash.flattendepth/index.d.ts
index 7de6a821a2..439b417f7d 100644
--- a/types/lodash.flattendepth/index.d.ts
+++ b/types/lodash.flattendepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flip/index.d.ts b/types/lodash.flip/index.d.ts
index d492ebad75..bd2c9ab212 100644
--- a/types/lodash.flip/index.d.ts
+++ b/types/lodash.flip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.floor/index.d.ts b/types/lodash.floor/index.d.ts
index b99f1ec111..1824957522 100644
--- a/types/lodash.floor/index.d.ts
+++ b/types/lodash.floor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flow/index.d.ts b/types/lodash.flow/index.d.ts
index 5a1fe32a7b..7423e07409 100644
--- a/types/lodash.flow/index.d.ts
+++ b/types/lodash.flow/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flowright/index.d.ts b/types/lodash.flowright/index.d.ts
index 13e7b524a6..b81ad62b46 100644
--- a/types/lodash.flowright/index.d.ts
+++ b/types/lodash.flowright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreach/index.d.ts b/types/lodash.foreach/index.d.ts
index c865bb8f27..cc2b19c167 100644
--- a/types/lodash.foreach/index.d.ts
+++ b/types/lodash.foreach/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreachright/index.d.ts b/types/lodash.foreachright/index.d.ts
index 978db0e694..7508ed4471 100644
--- a/types/lodash.foreachright/index.d.ts
+++ b/types/lodash.foreachright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forin/index.d.ts b/types/lodash.forin/index.d.ts
index f2a1a3eca6..c84824f65b 100644
--- a/types/lodash.forin/index.d.ts
+++ b/types/lodash.forin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forinright/index.d.ts b/types/lodash.forinright/index.d.ts
index 68973aff3b..62ff91a3e4 100644
--- a/types/lodash.forinright/index.d.ts
+++ b/types/lodash.forinright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forown/index.d.ts b/types/lodash.forown/index.d.ts
index bad9b72cfd..15623c7360 100644
--- a/types/lodash.forown/index.d.ts
+++ b/types/lodash.forown/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forownright/index.d.ts b/types/lodash.forownright/index.d.ts
index 4f4a2177aa..13e34be0dd 100644
--- a/types/lodash.forownright/index.d.ts
+++ b/types/lodash.forownright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.frompairs/index.d.ts b/types/lodash.frompairs/index.d.ts
index 3789bbb735..580e3182a8 100644
--- a/types/lodash.frompairs/index.d.ts
+++ b/types/lodash.frompairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functions/index.d.ts b/types/lodash.functions/index.d.ts
index e885cd4bb7..cf107f3212 100644
--- a/types/lodash.functions/index.d.ts
+++ b/types/lodash.functions/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functionsin/index.d.ts b/types/lodash.functionsin/index.d.ts
index 0ffe3755ab..c3cb89d7cd 100644
--- a/types/lodash.functionsin/index.d.ts
+++ b/types/lodash.functionsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.get/index.d.ts b/types/lodash.get/index.d.ts
index 37aade43bd..991f9fee99 100644
--- a/types/lodash.get/index.d.ts
+++ b/types/lodash.get/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.groupby/index.d.ts b/types/lodash.groupby/index.d.ts
index 9c2279c767..1e784cc320 100644
--- a/types/lodash.groupby/index.d.ts
+++ b/types/lodash.groupby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gt/index.d.ts b/types/lodash.gt/index.d.ts
index 2ef5f7aab9..ca969f2462 100644
--- a/types/lodash.gt/index.d.ts
+++ b/types/lodash.gt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gte/index.d.ts b/types/lodash.gte/index.d.ts
index 543e8894d1..2f6a589c46 100644
--- a/types/lodash.gte/index.d.ts
+++ b/types/lodash.gte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.has/index.d.ts b/types/lodash.has/index.d.ts
index 39347aa215..4fc7c51bec 100644
--- a/types/lodash.has/index.d.ts
+++ b/types/lodash.has/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.hasin/index.d.ts b/types/lodash.hasin/index.d.ts
index fd9674ec9d..3789cda6fa 100644
--- a/types/lodash.hasin/index.d.ts
+++ b/types/lodash.hasin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.head/index.d.ts b/types/lodash.head/index.d.ts
index 055cd0ac90..3a9f3883c1 100644
--- a/types/lodash.head/index.d.ts
+++ b/types/lodash.head/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.identity/index.d.ts b/types/lodash.identity/index.d.ts
index 53593f2f97..66b66ab307 100644
--- a/types/lodash.identity/index.d.ts
+++ b/types/lodash.identity/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.includes/index.d.ts b/types/lodash.includes/index.d.ts
index 3efd02ba00..34096d9006 100644
--- a/types/lodash.includes/index.d.ts
+++ b/types/lodash.includes/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.indexof/index.d.ts b/types/lodash.indexof/index.d.ts
index 8d6dc6dbdf..64ac787a5d 100644
--- a/types/lodash.indexof/index.d.ts
+++ b/types/lodash.indexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.initial/index.d.ts b/types/lodash.initial/index.d.ts
index 62d5c9dc61..49c86bb7c9 100644
--- a/types/lodash.initial/index.d.ts
+++ b/types/lodash.initial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.inrange/index.d.ts b/types/lodash.inrange/index.d.ts
index db7dc74a0e..1f3c456d3a 100644
--- a/types/lodash.inrange/index.d.ts
+++ b/types/lodash.inrange/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersection/index.d.ts b/types/lodash.intersection/index.d.ts
index 35dfe76821..b79e8b9050 100644
--- a/types/lodash.intersection/index.d.ts
+++ b/types/lodash.intersection/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionby/index.d.ts b/types/lodash.intersectionby/index.d.ts
index f66da889fa..e57c36bfa4 100644
--- a/types/lodash.intersectionby/index.d.ts
+++ b/types/lodash.intersectionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionwith/index.d.ts b/types/lodash.intersectionwith/index.d.ts
index ae5e281b33..561a2ad538 100644
--- a/types/lodash.intersectionwith/index.d.ts
+++ b/types/lodash.intersectionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invert/index.d.ts b/types/lodash.invert/index.d.ts
index 024a4f6a97..905632930b 100644
--- a/types/lodash.invert/index.d.ts
+++ b/types/lodash.invert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invertby/index.d.ts b/types/lodash.invertby/index.d.ts
index 9ad74a615c..181970a286 100644
--- a/types/lodash.invertby/index.d.ts
+++ b/types/lodash.invertby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invoke/index.d.ts b/types/lodash.invoke/index.d.ts
index aee1886286..82ddb56083 100644
--- a/types/lodash.invoke/index.d.ts
+++ b/types/lodash.invoke/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invokemap/index.d.ts b/types/lodash.invokemap/index.d.ts
index 6acb2bdf4b..28ed42e42b 100644
--- a/types/lodash.invokemap/index.d.ts
+++ b/types/lodash.invokemap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarguments/index.d.ts b/types/lodash.isarguments/index.d.ts
index d5f8290412..1f9b59f548 100644
--- a/types/lodash.isarguments/index.d.ts
+++ b/types/lodash.isarguments/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarray/index.d.ts b/types/lodash.isarray/index.d.ts
index efaac7606b..96a64836d4 100644
--- a/types/lodash.isarray/index.d.ts
+++ b/types/lodash.isarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraybuffer/index.d.ts b/types/lodash.isarraybuffer/index.d.ts
index 5fcf63deb6..3c44819f19 100644
--- a/types/lodash.isarraybuffer/index.d.ts
+++ b/types/lodash.isarraybuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylike/index.d.ts b/types/lodash.isarraylike/index.d.ts
index a96f1d5085..a56d9bbfa6 100644
--- a/types/lodash.isarraylike/index.d.ts
+++ b/types/lodash.isarraylike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylikeobject/index.d.ts b/types/lodash.isarraylikeobject/index.d.ts
index ffa5d3db69..545d6a3519 100644
--- a/types/lodash.isarraylikeobject/index.d.ts
+++ b/types/lodash.isarraylikeobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isboolean/index.d.ts b/types/lodash.isboolean/index.d.ts
index 888c9da1da..cf84173cd1 100644
--- a/types/lodash.isboolean/index.d.ts
+++ b/types/lodash.isboolean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isbuffer/index.d.ts b/types/lodash.isbuffer/index.d.ts
index 1b0e57db15..34b164cfa3 100644
--- a/types/lodash.isbuffer/index.d.ts
+++ b/types/lodash.isbuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isdate/index.d.ts b/types/lodash.isdate/index.d.ts
index f1cfb78cbb..3023be1957 100644
--- a/types/lodash.isdate/index.d.ts
+++ b/types/lodash.isdate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iselement/index.d.ts b/types/lodash.iselement/index.d.ts
index 7a54b5c77e..9e83bcacc3 100644
--- a/types/lodash.iselement/index.d.ts
+++ b/types/lodash.iselement/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isempty/index.d.ts b/types/lodash.isempty/index.d.ts
index 736796c517..b0516dca34 100644
--- a/types/lodash.isempty/index.d.ts
+++ b/types/lodash.isempty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequal/index.d.ts b/types/lodash.isequal/index.d.ts
index c2ad0dff8c..0bae99d588 100644
--- a/types/lodash.isequal/index.d.ts
+++ b/types/lodash.isequal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequalwith/index.d.ts b/types/lodash.isequalwith/index.d.ts
index 5703d53f84..2c00d66f7c 100644
--- a/types/lodash.isequalwith/index.d.ts
+++ b/types/lodash.isequalwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iserror/index.d.ts b/types/lodash.iserror/index.d.ts
index 5bdb9e5a7a..ae18901b11 100644
--- a/types/lodash.iserror/index.d.ts
+++ b/types/lodash.iserror/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfinite/index.d.ts b/types/lodash.isfinite/index.d.ts
index b22a988b59..398f037e5b 100644
--- a/types/lodash.isfinite/index.d.ts
+++ b/types/lodash.isfinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfunction/index.d.ts b/types/lodash.isfunction/index.d.ts
index 7fd82f56e3..4dd84dbde7 100644
--- a/types/lodash.isfunction/index.d.ts
+++ b/types/lodash.isfunction/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isinteger/index.d.ts b/types/lodash.isinteger/index.d.ts
index 381e14831f..8ea23c1c00 100644
--- a/types/lodash.isinteger/index.d.ts
+++ b/types/lodash.isinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.islength/index.d.ts b/types/lodash.islength/index.d.ts
index 7e503fa682..1567bba3f5 100644
--- a/types/lodash.islength/index.d.ts
+++ b/types/lodash.islength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismap/index.d.ts b/types/lodash.ismap/index.d.ts
index fb3f9c1c7c..bebdcf2c6b 100644
--- a/types/lodash.ismap/index.d.ts
+++ b/types/lodash.ismap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatch/index.d.ts b/types/lodash.ismatch/index.d.ts
index c19458f06e..64f40ce6a9 100644
--- a/types/lodash.ismatch/index.d.ts
+++ b/types/lodash.ismatch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatchwith/index.d.ts b/types/lodash.ismatchwith/index.d.ts
index 6c80c60c84..382c6d6253 100644
--- a/types/lodash.ismatchwith/index.d.ts
+++ b/types/lodash.ismatchwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnan/index.d.ts b/types/lodash.isnan/index.d.ts
index ef81584b37..9e5c35cce4 100644
--- a/types/lodash.isnan/index.d.ts
+++ b/types/lodash.isnan/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnative/index.d.ts b/types/lodash.isnative/index.d.ts
index 102f340608..e374f644c2 100644
--- a/types/lodash.isnative/index.d.ts
+++ b/types/lodash.isnative/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnil/index.d.ts b/types/lodash.isnil/index.d.ts
index 1de6260b05..6120f80ea6 100644
--- a/types/lodash.isnil/index.d.ts
+++ b/types/lodash.isnil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnull/index.d.ts b/types/lodash.isnull/index.d.ts
index 9f8dfeda80..4c42cf8e06 100644
--- a/types/lodash.isnull/index.d.ts
+++ b/types/lodash.isnull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnumber/index.d.ts b/types/lodash.isnumber/index.d.ts
index 58b64fef97..722da3ade2 100644
--- a/types/lodash.isnumber/index.d.ts
+++ b/types/lodash.isnumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobject/index.d.ts b/types/lodash.isobject/index.d.ts
index 5a25a3afab..3490c30643 100644
--- a/types/lodash.isobject/index.d.ts
+++ b/types/lodash.isobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobjectlike/index.d.ts b/types/lodash.isobjectlike/index.d.ts
index b81bfe36a8..a475ce9b0e 100644
--- a/types/lodash.isobjectlike/index.d.ts
+++ b/types/lodash.isobjectlike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isplainobject/index.d.ts b/types/lodash.isplainobject/index.d.ts
index b285500c3c..087f9aeba9 100644
--- a/types/lodash.isplainobject/index.d.ts
+++ b/types/lodash.isplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isregexp/index.d.ts b/types/lodash.isregexp/index.d.ts
index 1a79d6b965..1ffd065e36 100644
--- a/types/lodash.isregexp/index.d.ts
+++ b/types/lodash.isregexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issafeinteger/index.d.ts b/types/lodash.issafeinteger/index.d.ts
index efc8de999e..f3f5fe9c3a 100644
--- a/types/lodash.issafeinteger/index.d.ts
+++ b/types/lodash.issafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isset/index.d.ts b/types/lodash.isset/index.d.ts
index 44d01fc904..a39e705480 100644
--- a/types/lodash.isset/index.d.ts
+++ b/types/lodash.isset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isstring/index.d.ts b/types/lodash.isstring/index.d.ts
index 7835175fd1..bc54bf85ea 100644
--- a/types/lodash.isstring/index.d.ts
+++ b/types/lodash.isstring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issymbol/index.d.ts b/types/lodash.issymbol/index.d.ts
index 9837ca6d48..b59db2a3ef 100644
--- a/types/lodash.issymbol/index.d.ts
+++ b/types/lodash.issymbol/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.istypedarray/index.d.ts b/types/lodash.istypedarray/index.d.ts
index 4d81b5ecfa..76ca43e3b0 100644
--- a/types/lodash.istypedarray/index.d.ts
+++ b/types/lodash.istypedarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isundefined/index.d.ts b/types/lodash.isundefined/index.d.ts
index a9a516f63c..e893f5c4da 100644
--- a/types/lodash.isundefined/index.d.ts
+++ b/types/lodash.isundefined/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakmap/index.d.ts b/types/lodash.isweakmap/index.d.ts
index cd754e9608..651c976447 100644
--- a/types/lodash.isweakmap/index.d.ts
+++ b/types/lodash.isweakmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakset/index.d.ts b/types/lodash.isweakset/index.d.ts
index 124a9f588d..bf5ed2716e 100644
--- a/types/lodash.isweakset/index.d.ts
+++ b/types/lodash.isweakset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iteratee/index.d.ts b/types/lodash.iteratee/index.d.ts
index 5c641bbaa1..cecd754bf7 100644
--- a/types/lodash.iteratee/index.d.ts
+++ b/types/lodash.iteratee/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.join/index.d.ts b/types/lodash.join/index.d.ts
index e2c58c2536..357d8d151c 100644
--- a/types/lodash.join/index.d.ts
+++ b/types/lodash.join/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.kebabcase/index.d.ts b/types/lodash.kebabcase/index.d.ts
index 0223fc8eb1..307f821ce9 100644
--- a/types/lodash.kebabcase/index.d.ts
+++ b/types/lodash.kebabcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keyby/index.d.ts b/types/lodash.keyby/index.d.ts
index 67e5902601..93626ab4d2 100644
--- a/types/lodash.keyby/index.d.ts
+++ b/types/lodash.keyby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keys/index.d.ts b/types/lodash.keys/index.d.ts
index 9d804e483c..3db0980f97 100644
--- a/types/lodash.keys/index.d.ts
+++ b/types/lodash.keys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keysin/index.d.ts b/types/lodash.keysin/index.d.ts
index f00b24fcbd..1e3f0bbcfa 100644
--- a/types/lodash.keysin/index.d.ts
+++ b/types/lodash.keysin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.last/index.d.ts b/types/lodash.last/index.d.ts
index b2279e60d2..8403d5af99 100644
--- a/types/lodash.last/index.d.ts
+++ b/types/lodash.last/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lastindexof/index.d.ts b/types/lodash.lastindexof/index.d.ts
index 7e714b06bb..e991ef92b6 100644
--- a/types/lodash.lastindexof/index.d.ts
+++ b/types/lodash.lastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowercase/index.d.ts b/types/lodash.lowercase/index.d.ts
index b816bde588..dc349eeb90 100644
--- a/types/lodash.lowercase/index.d.ts
+++ b/types/lodash.lowercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowerfirst/index.d.ts b/types/lodash.lowerfirst/index.d.ts
index 1619781afe..6bd7aa96ff 100644
--- a/types/lodash.lowerfirst/index.d.ts
+++ b/types/lodash.lowerfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lt/index.d.ts b/types/lodash.lt/index.d.ts
index e2d1dc8d22..b4ccae8b22 100644
--- a/types/lodash.lt/index.d.ts
+++ b/types/lodash.lt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lte/index.d.ts b/types/lodash.lte/index.d.ts
index be320a60df..e3a61cfaa0 100644
--- a/types/lodash.lte/index.d.ts
+++ b/types/lodash.lte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapkeys/index.d.ts b/types/lodash.mapkeys/index.d.ts
index cba5ab4abb..c5b4cae952 100644
--- a/types/lodash.mapkeys/index.d.ts
+++ b/types/lodash.mapkeys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapvalues/index.d.ts b/types/lodash.mapvalues/index.d.ts
index 2c13c37ee8..a6c2eaac45 100644
--- a/types/lodash.mapvalues/index.d.ts
+++ b/types/lodash.mapvalues/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matches/index.d.ts b/types/lodash.matches/index.d.ts
index 0c265e0e21..415a6d2738 100644
--- a/types/lodash.matches/index.d.ts
+++ b/types/lodash.matches/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matchesproperty/index.d.ts b/types/lodash.matchesproperty/index.d.ts
index 36c628043c..3e84c8decb 100644
--- a/types/lodash.matchesproperty/index.d.ts
+++ b/types/lodash.matchesproperty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.max/index.d.ts b/types/lodash.max/index.d.ts
index 322203fc10..5957bcde74 100644
--- a/types/lodash.max/index.d.ts
+++ b/types/lodash.max/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.maxby/index.d.ts b/types/lodash.maxby/index.d.ts
index 8279522ee0..a7a06208c4 100644
--- a/types/lodash.maxby/index.d.ts
+++ b/types/lodash.maxby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mean/index.d.ts b/types/lodash.mean/index.d.ts
index afadecc5c9..59c53c0dde 100644
--- a/types/lodash.mean/index.d.ts
+++ b/types/lodash.mean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.meanby/index.d.ts b/types/lodash.meanby/index.d.ts
index 22670d65cf..b0374e7d20 100644
--- a/types/lodash.meanby/index.d.ts
+++ b/types/lodash.meanby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.memoize/index.d.ts b/types/lodash.memoize/index.d.ts
index 81ecaa8bd4..efe1a8b04b 100644
--- a/types/lodash.memoize/index.d.ts
+++ b/types/lodash.memoize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.merge/index.d.ts b/types/lodash.merge/index.d.ts
index e64484c886..898750eb58 100644
--- a/types/lodash.merge/index.d.ts
+++ b/types/lodash.merge/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mergewith/index.d.ts b/types/lodash.mergewith/index.d.ts
index fc5915711b..e35006bc36 100644
--- a/types/lodash.mergewith/index.d.ts
+++ b/types/lodash.mergewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.method/index.d.ts b/types/lodash.method/index.d.ts
index b9c0ee7168..8168f96211 100644
--- a/types/lodash.method/index.d.ts
+++ b/types/lodash.method/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.methodof/index.d.ts b/types/lodash.methodof/index.d.ts
index 8eb4aeb235..ba2dfb7012 100644
--- a/types/lodash.methodof/index.d.ts
+++ b/types/lodash.methodof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.min/index.d.ts b/types/lodash.min/index.d.ts
index 15a5331e7e..b5b52fe095 100644
--- a/types/lodash.min/index.d.ts
+++ b/types/lodash.min/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.minby/index.d.ts b/types/lodash.minby/index.d.ts
index a900c32f9d..8c3d8dfcdb 100644
--- a/types/lodash.minby/index.d.ts
+++ b/types/lodash.minby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mixin/index.d.ts b/types/lodash.mixin/index.d.ts
index 6ef86909af..fd9e480f31 100644
--- a/types/lodash.mixin/index.d.ts
+++ b/types/lodash.mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.negate/index.d.ts b/types/lodash.negate/index.d.ts
index e28d931810..d771f63eb4 100644
--- a/types/lodash.negate/index.d.ts
+++ b/types/lodash.negate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.noop/index.d.ts b/types/lodash.noop/index.d.ts
index 98decb3a5f..963f951c93 100644
--- a/types/lodash.noop/index.d.ts
+++ b/types/lodash.noop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.now/index.d.ts b/types/lodash.now/index.d.ts
index e8ba1e9ccd..508d07e777 100644
--- a/types/lodash.now/index.d.ts
+++ b/types/lodash.now/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.nth/index.d.ts b/types/lodash.nth/index.d.ts
index 940e4e06d8..66cda782a2 100644
--- a/types/lodash.nth/index.d.ts
+++ b/types/lodash.nth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ntharg/index.d.ts b/types/lodash.ntharg/index.d.ts
index 2fcbd89332..e7bd831879 100644
--- a/types/lodash.ntharg/index.d.ts
+++ b/types/lodash.ntharg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omit/index.d.ts b/types/lodash.omit/index.d.ts
index efa2526c38..7e15b2f9f9 100644
--- a/types/lodash.omit/index.d.ts
+++ b/types/lodash.omit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omitby/index.d.ts b/types/lodash.omitby/index.d.ts
index aa258237f7..209ff398bf 100644
--- a/types/lodash.omitby/index.d.ts
+++ b/types/lodash.omitby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.once/index.d.ts b/types/lodash.once/index.d.ts
index 7fca8f4016..4dc4c566ae 100644
--- a/types/lodash.once/index.d.ts
+++ b/types/lodash.once/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.orderby/index.d.ts b/types/lodash.orderby/index.d.ts
index 02a4de9edf..485075ca90 100644
--- a/types/lodash.orderby/index.d.ts
+++ b/types/lodash.orderby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.over/index.d.ts b/types/lodash.over/index.d.ts
index 1c77a3d71b..0e4d238680 100644
--- a/types/lodash.over/index.d.ts
+++ b/types/lodash.over/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overargs/index.d.ts b/types/lodash.overargs/index.d.ts
index 5ca77279e4..bcaa606780 100644
--- a/types/lodash.overargs/index.d.ts
+++ b/types/lodash.overargs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overevery/index.d.ts b/types/lodash.overevery/index.d.ts
index d2d142abc2..85c5b82167 100644
--- a/types/lodash.overevery/index.d.ts
+++ b/types/lodash.overevery/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.oversome/index.d.ts b/types/lodash.oversome/index.d.ts
index a2f48b5d3f..b0ccb5950d 100644
--- a/types/lodash.oversome/index.d.ts
+++ b/types/lodash.oversome/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pad/index.d.ts b/types/lodash.pad/index.d.ts
index c7ffc0da65..cd276e2958 100644
--- a/types/lodash.pad/index.d.ts
+++ b/types/lodash.pad/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padend/index.d.ts b/types/lodash.padend/index.d.ts
index 044163e4d0..d2729c4daf 100644
--- a/types/lodash.padend/index.d.ts
+++ b/types/lodash.padend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padstart/index.d.ts b/types/lodash.padstart/index.d.ts
index f5e01e7136..6a6d76247a 100644
--- a/types/lodash.padstart/index.d.ts
+++ b/types/lodash.padstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.parseint/index.d.ts b/types/lodash.parseint/index.d.ts
index 6c34469a8c..f47f64bf23 100644
--- a/types/lodash.parseint/index.d.ts
+++ b/types/lodash.parseint/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partial/index.d.ts b/types/lodash.partial/index.d.ts
index 1849abe6e4..102f0e9f63 100644
--- a/types/lodash.partial/index.d.ts
+++ b/types/lodash.partial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partialright/index.d.ts b/types/lodash.partialright/index.d.ts
index c8fe88b0c0..0c340fcd04 100644
--- a/types/lodash.partialright/index.d.ts
+++ b/types/lodash.partialright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partition/index.d.ts b/types/lodash.partition/index.d.ts
index 7fbe400757..6c825236ee 100644
--- a/types/lodash.partition/index.d.ts
+++ b/types/lodash.partition/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pick/index.d.ts b/types/lodash.pick/index.d.ts
index 7a71bc2c30..50b68a2861 100644
--- a/types/lodash.pick/index.d.ts
+++ b/types/lodash.pick/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pickby/index.d.ts b/types/lodash.pickby/index.d.ts
index ae4e2f3581..611f6236fc 100644
--- a/types/lodash.pickby/index.d.ts
+++ b/types/lodash.pickby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.property/index.d.ts b/types/lodash.property/index.d.ts
index 979d95c2af..f1a42f651b 100644
--- a/types/lodash.property/index.d.ts
+++ b/types/lodash.property/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.propertyof/index.d.ts b/types/lodash.propertyof/index.d.ts
index 521dd2b560..2124d0d9a3 100644
--- a/types/lodash.propertyof/index.d.ts
+++ b/types/lodash.propertyof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pull/index.d.ts b/types/lodash.pull/index.d.ts
index c07b0e40c9..e39449666f 100644
--- a/types/lodash.pull/index.d.ts
+++ b/types/lodash.pull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullall/index.d.ts b/types/lodash.pullall/index.d.ts
index 4fafdb508c..b7bff17877 100644
--- a/types/lodash.pullall/index.d.ts
+++ b/types/lodash.pullall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallby/index.d.ts b/types/lodash.pullallby/index.d.ts
index dc8848cfee..3a565c123a 100644
--- a/types/lodash.pullallby/index.d.ts
+++ b/types/lodash.pullallby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallwith/index.d.ts b/types/lodash.pullallwith/index.d.ts
index c636aa8fa0..8199b47fd9 100644
--- a/types/lodash.pullallwith/index.d.ts
+++ b/types/lodash.pullallwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullat/index.d.ts b/types/lodash.pullat/index.d.ts
index 64a9117c48..de603648e1 100644
--- a/types/lodash.pullat/index.d.ts
+++ b/types/lodash.pullat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.random/index.d.ts b/types/lodash.random/index.d.ts
index 6d922d9092..f30cdd73cc 100644
--- a/types/lodash.random/index.d.ts
+++ b/types/lodash.random/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.range/index.d.ts b/types/lodash.range/index.d.ts
index 66dabf2396..2faa2e0de0 100644
--- a/types/lodash.range/index.d.ts
+++ b/types/lodash.range/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rangeright/index.d.ts b/types/lodash.rangeright/index.d.ts
index 7340a99329..eb21ac069a 100644
--- a/types/lodash.rangeright/index.d.ts
+++ b/types/lodash.rangeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rearg/index.d.ts b/types/lodash.rearg/index.d.ts
index 77055518df..8c1c349117 100644
--- a/types/lodash.rearg/index.d.ts
+++ b/types/lodash.rearg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduce/index.d.ts b/types/lodash.reduce/index.d.ts
index e3be80b931..3e87301a13 100644
--- a/types/lodash.reduce/index.d.ts
+++ b/types/lodash.reduce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduceright/index.d.ts b/types/lodash.reduceright/index.d.ts
index 94d81edcce..7143b8545a 100644
--- a/types/lodash.reduceright/index.d.ts
+++ b/types/lodash.reduceright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reject/index.d.ts b/types/lodash.reject/index.d.ts
index 32586896cd..fcf24925ee 100644
--- a/types/lodash.reject/index.d.ts
+++ b/types/lodash.reject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.remove/index.d.ts b/types/lodash.remove/index.d.ts
index 2b8ccd14ab..9e1c0e7cff 100644
--- a/types/lodash.remove/index.d.ts
+++ b/types/lodash.remove/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.repeat/index.d.ts b/types/lodash.repeat/index.d.ts
index 3f3c7f5968..c594a58bdf 100644
--- a/types/lodash.repeat/index.d.ts
+++ b/types/lodash.repeat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.replace/index.d.ts b/types/lodash.replace/index.d.ts
index 6a4f26ecf1..1a41363950 100644
--- a/types/lodash.replace/index.d.ts
+++ b/types/lodash.replace/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rest/index.d.ts b/types/lodash.rest/index.d.ts
index 3990959f1e..1313395b60 100644
--- a/types/lodash.rest/index.d.ts
+++ b/types/lodash.rest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.result/index.d.ts b/types/lodash.result/index.d.ts
index dd84bf8c63..aba9c14ee5 100644
--- a/types/lodash.result/index.d.ts
+++ b/types/lodash.result/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reverse/index.d.ts b/types/lodash.reverse/index.d.ts
index d9dcb45151..738afb06bd 100644
--- a/types/lodash.reverse/index.d.ts
+++ b/types/lodash.reverse/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.round/index.d.ts b/types/lodash.round/index.d.ts
index f0b0e6265e..d105a69013 100644
--- a/types/lodash.round/index.d.ts
+++ b/types/lodash.round/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sample/index.d.ts b/types/lodash.sample/index.d.ts
index 877558ce2f..9bd7983185 100644
--- a/types/lodash.sample/index.d.ts
+++ b/types/lodash.sample/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.samplesize/index.d.ts b/types/lodash.samplesize/index.d.ts
index 5f15be7673..8046278ed6 100644
--- a/types/lodash.samplesize/index.d.ts
+++ b/types/lodash.samplesize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.set/index.d.ts b/types/lodash.set/index.d.ts
index ee2b863bc0..d2628e2f35 100644
--- a/types/lodash.set/index.d.ts
+++ b/types/lodash.set/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.setwith/index.d.ts b/types/lodash.setwith/index.d.ts
index c18a224f15..3c4aa25a69 100644
--- a/types/lodash.setwith/index.d.ts
+++ b/types/lodash.setwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.shuffle/index.d.ts b/types/lodash.shuffle/index.d.ts
index 6f51221766..1961d9f44c 100644
--- a/types/lodash.shuffle/index.d.ts
+++ b/types/lodash.shuffle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.size/index.d.ts b/types/lodash.size/index.d.ts
index 3182d16b2c..84aedf70cb 100644
--- a/types/lodash.size/index.d.ts
+++ b/types/lodash.size/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.slice/index.d.ts b/types/lodash.slice/index.d.ts
index 17521a280d..e17a0e5c62 100644
--- a/types/lodash.slice/index.d.ts
+++ b/types/lodash.slice/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.snakecase/index.d.ts b/types/lodash.snakecase/index.d.ts
index 1f60bb6ea5..5276593906 100644
--- a/types/lodash.snakecase/index.d.ts
+++ b/types/lodash.snakecase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.some/index.d.ts b/types/lodash.some/index.d.ts
index 747c615db4..cad1fb59df 100644
--- a/types/lodash.some/index.d.ts
+++ b/types/lodash.some/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortby/index.d.ts b/types/lodash.sortby/index.d.ts
index cf6bccdd9b..5cef6f1b8f 100644
--- a/types/lodash.sortby/index.d.ts
+++ b/types/lodash.sortby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindex/index.d.ts b/types/lodash.sortedindex/index.d.ts
index d428632316..4ca2706774 100644
--- a/types/lodash.sortedindex/index.d.ts
+++ b/types/lodash.sortedindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexby/index.d.ts b/types/lodash.sortedindexby/index.d.ts
index dc421df6fc..42abb67d25 100644
--- a/types/lodash.sortedindexby/index.d.ts
+++ b/types/lodash.sortedindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexof/index.d.ts b/types/lodash.sortedindexof/index.d.ts
index 373c81d67f..194731d861 100644
--- a/types/lodash.sortedindexof/index.d.ts
+++ b/types/lodash.sortedindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindex/index.d.ts b/types/lodash.sortedlastindex/index.d.ts
index 498ff7b018..f7781aaa66 100644
--- a/types/lodash.sortedlastindex/index.d.ts
+++ b/types/lodash.sortedlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexby/index.d.ts b/types/lodash.sortedlastindexby/index.d.ts
index 8cc6c8a025..08fdf6553b 100644
--- a/types/lodash.sortedlastindexby/index.d.ts
+++ b/types/lodash.sortedlastindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexof/index.d.ts b/types/lodash.sortedlastindexof/index.d.ts
index 4b178fd7f4..6032e69d64 100644
--- a/types/lodash.sortedlastindexof/index.d.ts
+++ b/types/lodash.sortedlastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniq/index.d.ts b/types/lodash.sorteduniq/index.d.ts
index 6be5df9a27..692a046d7c 100644
--- a/types/lodash.sorteduniq/index.d.ts
+++ b/types/lodash.sorteduniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniqby/index.d.ts b/types/lodash.sorteduniqby/index.d.ts
index 895c8a34a1..d986fe8827 100644
--- a/types/lodash.sorteduniqby/index.d.ts
+++ b/types/lodash.sorteduniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.split/index.d.ts b/types/lodash.split/index.d.ts
index 2202c761e6..361aa0e316 100644
--- a/types/lodash.split/index.d.ts
+++ b/types/lodash.split/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.spread/index.d.ts b/types/lodash.spread/index.d.ts
index a3113af5c9..7cc9d2ca08 100644
--- a/types/lodash.spread/index.d.ts
+++ b/types/lodash.spread/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startcase/index.d.ts b/types/lodash.startcase/index.d.ts
index 8f1ab25a26..39c5dba0ba 100644
--- a/types/lodash.startcase/index.d.ts
+++ b/types/lodash.startcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startswith/index.d.ts b/types/lodash.startswith/index.d.ts
index 4001dbe382..8604081e3c 100644
--- a/types/lodash.startswith/index.d.ts
+++ b/types/lodash.startswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.subtract/index.d.ts b/types/lodash.subtract/index.d.ts
index 7d2c052c8b..ca4600978b 100644
--- a/types/lodash.subtract/index.d.ts
+++ b/types/lodash.subtract/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sum/index.d.ts b/types/lodash.sum/index.d.ts
index f8affc3248..072c2250e3 100644
--- a/types/lodash.sum/index.d.ts
+++ b/types/lodash.sum/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sumby/index.d.ts b/types/lodash.sumby/index.d.ts
index 6ad30c02c5..d6acf8b452 100644
--- a/types/lodash.sumby/index.d.ts
+++ b/types/lodash.sumby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tail/index.d.ts b/types/lodash.tail/index.d.ts
index f6a7a4432c..424d68fc32 100644
--- a/types/lodash.tail/index.d.ts
+++ b/types/lodash.tail/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.take/index.d.ts b/types/lodash.take/index.d.ts
index 54c6f0aeec..6b2449057e 100644
--- a/types/lodash.take/index.d.ts
+++ b/types/lodash.take/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takeright/index.d.ts b/types/lodash.takeright/index.d.ts
index 33b8e9fa89..dffd09a240 100644
--- a/types/lodash.takeright/index.d.ts
+++ b/types/lodash.takeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takerightwhile/index.d.ts b/types/lodash.takerightwhile/index.d.ts
index 2acf63e0ed..1cd4db0751 100644
--- a/types/lodash.takerightwhile/index.d.ts
+++ b/types/lodash.takerightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takewhile/index.d.ts b/types/lodash.takewhile/index.d.ts
index 0b14c3bfa7..ce92968a1d 100644
--- a/types/lodash.takewhile/index.d.ts
+++ b/types/lodash.takewhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.template/index.d.ts b/types/lodash.template/index.d.ts
index e9acd12f83..0506d0c968 100644
--- a/types/lodash.template/index.d.ts
+++ b/types/lodash.template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.throttle/index.d.ts b/types/lodash.throttle/index.d.ts
index 08eaa2b832..260ec7a7c5 100644
--- a/types/lodash.throttle/index.d.ts
+++ b/types/lodash.throttle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.times/index.d.ts b/types/lodash.times/index.d.ts
index 1cf2a01684..1811ac4ae2 100644
--- a/types/lodash.times/index.d.ts
+++ b/types/lodash.times/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toarray/index.d.ts b/types/lodash.toarray/index.d.ts
index 49638ccaaa..2f48f2ffde 100644
--- a/types/lodash.toarray/index.d.ts
+++ b/types/lodash.toarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tofinite/index.d.ts b/types/lodash.tofinite/index.d.ts
index 941862c1cf..86cbf6e544 100644
--- a/types/lodash.tofinite/index.d.ts
+++ b/types/lodash.tofinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tointeger/index.d.ts b/types/lodash.tointeger/index.d.ts
index ee777f9d05..b1cabaecdd 100644
--- a/types/lodash.tointeger/index.d.ts
+++ b/types/lodash.tointeger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolength/index.d.ts b/types/lodash.tolength/index.d.ts
index 7052ee2311..5e6277f4f2 100644
--- a/types/lodash.tolength/index.d.ts
+++ b/types/lodash.tolength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolower/index.d.ts b/types/lodash.tolower/index.d.ts
index 70449618ca..d31706fdc7 100644
--- a/types/lodash.tolower/index.d.ts
+++ b/types/lodash.tolower/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tonumber/index.d.ts b/types/lodash.tonumber/index.d.ts
index 55628f487b..5898db9932 100644
--- a/types/lodash.tonumber/index.d.ts
+++ b/types/lodash.tonumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairs/index.d.ts b/types/lodash.topairs/index.d.ts
index ffe09c636b..940e3107ca 100644
--- a/types/lodash.topairs/index.d.ts
+++ b/types/lodash.topairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairsin/index.d.ts b/types/lodash.topairsin/index.d.ts
index 204174fa67..f5a79e3da6 100644
--- a/types/lodash.topairsin/index.d.ts
+++ b/types/lodash.topairsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topath/index.d.ts b/types/lodash.topath/index.d.ts
index 013f65f9c9..c66f4ed4aa 100644
--- a/types/lodash.topath/index.d.ts
+++ b/types/lodash.topath/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toplainobject/index.d.ts b/types/lodash.toplainobject/index.d.ts
index d16b64795f..b716e2cfa4 100644
--- a/types/lodash.toplainobject/index.d.ts
+++ b/types/lodash.toplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tosafeinteger/index.d.ts b/types/lodash.tosafeinteger/index.d.ts
index b9fe0a892a..7f8fb0b640 100644
--- a/types/lodash.tosafeinteger/index.d.ts
+++ b/types/lodash.tosafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tostring/index.d.ts b/types/lodash.tostring/index.d.ts
index b60288c45b..0bb36b6600 100644
--- a/types/lodash.tostring/index.d.ts
+++ b/types/lodash.tostring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toupper/index.d.ts b/types/lodash.toupper/index.d.ts
index 33838721bb..46bc736e52 100644
--- a/types/lodash.toupper/index.d.ts
+++ b/types/lodash.toupper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.transform/index.d.ts b/types/lodash.transform/index.d.ts
index a7e1105053..0a0cfbfb55 100644
--- a/types/lodash.transform/index.d.ts
+++ b/types/lodash.transform/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trim/index.d.ts b/types/lodash.trim/index.d.ts
index 2114ce53d6..84c1772922 100644
--- a/types/lodash.trim/index.d.ts
+++ b/types/lodash.trim/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimend/index.d.ts b/types/lodash.trimend/index.d.ts
index 68c43e43ce..f788678328 100644
--- a/types/lodash.trimend/index.d.ts
+++ b/types/lodash.trimend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimstart/index.d.ts b/types/lodash.trimstart/index.d.ts
index e875ff46d7..d80dfde5ee 100644
--- a/types/lodash.trimstart/index.d.ts
+++ b/types/lodash.trimstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.truncate/index.d.ts b/types/lodash.truncate/index.d.ts
index cf8c3e0463..49ed223a34 100644
--- a/types/lodash.truncate/index.d.ts
+++ b/types/lodash.truncate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unary/index.d.ts b/types/lodash.unary/index.d.ts
index a378016527..2b5956b22f 100644
--- a/types/lodash.unary/index.d.ts
+++ b/types/lodash.unary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unescape/index.d.ts b/types/lodash.unescape/index.d.ts
index c14e2e9ce1..9dd615040f 100644
--- a/types/lodash.unescape/index.d.ts
+++ b/types/lodash.unescape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.union/index.d.ts b/types/lodash.union/index.d.ts
index 53ad3cd971..1e5de3029e 100644
--- a/types/lodash.union/index.d.ts
+++ b/types/lodash.union/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionby/index.d.ts b/types/lodash.unionby/index.d.ts
index ee22897482..97c57d7820 100644
--- a/types/lodash.unionby/index.d.ts
+++ b/types/lodash.unionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionwith/index.d.ts b/types/lodash.unionwith/index.d.ts
index cbbb33d10e..0951988b75 100644
--- a/types/lodash.unionwith/index.d.ts
+++ b/types/lodash.unionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniq/index.d.ts b/types/lodash.uniq/index.d.ts
index 46f82b7c46..a000cdc57e 100644
--- a/types/lodash.uniq/index.d.ts
+++ b/types/lodash.uniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqby/index.d.ts b/types/lodash.uniqby/index.d.ts
index 7588831282..430cc78f6b 100644
--- a/types/lodash.uniqby/index.d.ts
+++ b/types/lodash.uniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqueid/index.d.ts b/types/lodash.uniqueid/index.d.ts
index 57ed8587d5..13ce1ddaf5 100644
--- a/types/lodash.uniqueid/index.d.ts
+++ b/types/lodash.uniqueid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqwith/index.d.ts b/types/lodash.uniqwith/index.d.ts
index d312905e57..852bd06e8e 100644
--- a/types/lodash.uniqwith/index.d.ts
+++ b/types/lodash.uniqwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unset/index.d.ts b/types/lodash.unset/index.d.ts
index 654f468535..778cba5f35 100644
--- a/types/lodash.unset/index.d.ts
+++ b/types/lodash.unset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzip/index.d.ts b/types/lodash.unzip/index.d.ts
index 4738306fe4..c82e6e4240 100644
--- a/types/lodash.unzip/index.d.ts
+++ b/types/lodash.unzip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzipwith/index.d.ts b/types/lodash.unzipwith/index.d.ts
index 16bbed9242..de997d4c80 100644
--- a/types/lodash.unzipwith/index.d.ts
+++ b/types/lodash.unzipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.update/index.d.ts b/types/lodash.update/index.d.ts
index 42c7338066..a9dc9ae88e 100644
--- a/types/lodash.update/index.d.ts
+++ b/types/lodash.update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.updatewith/index.d.ts b/types/lodash.updatewith/index.d.ts
index 45f319a1d6..578de0a19b 100644
--- a/types/lodash.updatewith/index.d.ts
+++ b/types/lodash.updatewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uppercase/index.d.ts b/types/lodash.uppercase/index.d.ts
index fcc0bd2431..0433e10190 100644
--- a/types/lodash.uppercase/index.d.ts
+++ b/types/lodash.uppercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.upperfirst/index.d.ts b/types/lodash.upperfirst/index.d.ts
index 3c10682234..a95e6a2325 100644
--- a/types/lodash.upperfirst/index.d.ts
+++ b/types/lodash.upperfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.values/index.d.ts b/types/lodash.values/index.d.ts
index 695f2edcdc..5712010b17 100644
--- a/types/lodash.values/index.d.ts
+++ b/types/lodash.values/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.valuesin/index.d.ts b/types/lodash.valuesin/index.d.ts
index 3d1a489783..0168a046d0 100644
--- a/types/lodash.valuesin/index.d.ts
+++ b/types/lodash.valuesin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.without/index.d.ts b/types/lodash.without/index.d.ts
index 059ad9cd74..72cb11a8d8 100644
--- a/types/lodash.without/index.d.ts
+++ b/types/lodash.without/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.words/index.d.ts b/types/lodash.words/index.d.ts
index d27c6304fc..d635b02bbe 100644
--- a/types/lodash.words/index.d.ts
+++ b/types/lodash.words/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.wrap/index.d.ts b/types/lodash.wrap/index.d.ts
index 753d51ffd3..52d0eb754e 100644
--- a/types/lodash.wrap/index.d.ts
+++ b/types/lodash.wrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xor/index.d.ts b/types/lodash.xor/index.d.ts
index 7556c23b6e..ce8257b1be 100644
--- a/types/lodash.xor/index.d.ts
+++ b/types/lodash.xor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorby/index.d.ts b/types/lodash.xorby/index.d.ts
index 527c871371..3d15668d8a 100644
--- a/types/lodash.xorby/index.d.ts
+++ b/types/lodash.xorby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorwith/index.d.ts b/types/lodash.xorwith/index.d.ts
index 59f2c2c830..8120a73dea 100644
--- a/types/lodash.xorwith/index.d.ts
+++ b/types/lodash.xorwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zip/index.d.ts b/types/lodash.zip/index.d.ts
index c101c378ae..3aca9880f9 100644
--- a/types/lodash.zip/index.d.ts
+++ b/types/lodash.zip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobject/index.d.ts b/types/lodash.zipobject/index.d.ts
index 3fa098f79a..b76f341e3e 100644
--- a/types/lodash.zipobject/index.d.ts
+++ b/types/lodash.zipobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobjectdeep/index.d.ts b/types/lodash.zipobjectdeep/index.d.ts
index 6391b92bd8..b2b3a82dd2 100644
--- a/types/lodash.zipobjectdeep/index.d.ts
+++ b/types/lodash.zipobjectdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipwith/index.d.ts b/types/lodash.zipwith/index.d.ts
index 2f123f19b1..fe58ffb360 100644
--- a/types/lodash.zipwith/index.d.ts
+++ b/types/lodash.zipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://lodash.com
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash/scripts/generate-modules.ts b/types/lodash/scripts/generate-modules.ts
index 523f23e6e6..6965242937 100644
--- a/types/lodash/scripts/generate-modules.ts
+++ b/types/lodash/scripts/generate-modules.ts
@@ -56,7 +56,7 @@ async function globalDefinitionText(moduleName: string): Promise<string> {
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.8
+// TypeScript Version: 2.8
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/office-runtime/index.d.ts b/types/office-runtime/index.d.ts
index 7fb265c57e..6eb156efc5 100644
--- a/types/office-runtime/index.d.ts
+++ b/types/office-runtime/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/OfficeDev/office-js
 // Definitions by: Michael Zlatskovsky <https://github.com/Zlatkovsky>, Michelle Scharlock <https://github.com/mscharlock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.4
+// TypeScript Version: 2.4
 
 /*
 office-runtime
diff --git a/types/websocket-async/index.d.ts b/types/websocket-async/index.d.ts
index 36bb12e08e..8cb73a9e93 100644
--- a/types/websocket-async/index.d.ts
+++ b/types/websocket-async/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jcao219/websocket-async
 // Definitions by: Ben O'Sullivan <https://github.com/bigbeno37>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Typescript Version: 2.7
+// TypeScript Version: 2.7
 
 /**
  * An asynchronous WebSocket client.

From 5041e306a2f35e51eb64cf983ae8261100d20b33 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 12:57:34 -0600
Subject: [PATCH 025/924] Revert some changes made during find/replace

---
 types/jest-image-snapshot/jest-image-snapshot-tests.ts | 2 +-
 types/lodash-es/index.d.ts                             | 2 +-
 types/office-runtime/index.d.ts                        | 2 +-
 types/websocket-async/index.d.ts                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/jest-image-snapshot/jest-image-snapshot-tests.ts b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
index 402e505bb0..07f6debed7 100644
--- a/types/jest-image-snapshot/jest-image-snapshot-tests.ts
+++ b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
@@ -1,4 +1,4 @@
-// TypeScript Version: 2.3
+// Typescript Version: 2.3
 import { toMatchImageSnapshot, configureToMatchImageSnapshot, MatchImageSnapshotOptions } from 'jest-image-snapshot';
 
 it('should be able to use toMatchImageSnapshot in a test', () => {
diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 3e9fcfa69c..61eb6016ee 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/, https://lodash.com/custom-builds
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.6
 
 export { default as add } from "./add";
 export { default as after } from "./after";
diff --git a/types/office-runtime/index.d.ts b/types/office-runtime/index.d.ts
index 6eb156efc5..7fb265c57e 100644
--- a/types/office-runtime/index.d.ts
+++ b/types/office-runtime/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/OfficeDev/office-js
 // Definitions by: Michael Zlatskovsky <https://github.com/Zlatkovsky>, Michelle Scharlock <https://github.com/mscharlock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// Typescript Version: 2.4
 
 /*
 office-runtime
diff --git a/types/websocket-async/index.d.ts b/types/websocket-async/index.d.ts
index 8cb73a9e93..36bb12e08e 100644
--- a/types/websocket-async/index.d.ts
+++ b/types/websocket-async/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jcao219/websocket-async
 // Definitions by: Ben O'Sullivan <https://github.com/bigbeno37>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
+// Typescript Version: 2.7
 
 /**
  * An asynchronous WebSocket client.

From c94d9908e12ab4ceea1d7fe7b960bd3821aab802 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 12:59:26 -0600
Subject: [PATCH 026/924] One more change that wasn't supposed to be added.

---
 types/lodash/common/object.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index d36b603f42..29ab78bed4 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -1685,7 +1685,7 @@ declare module "../index" {
         get<TObject extends object, TKey extends keyof TObject, TDefault>(
             object: TObject | null | undefined,
             path: TKey | [TKey],
-            defaultValue: TDefault,
+            defaultValue: TDefault
         ): Exclude<TObject[TKey], undefined> | TDefault;
 
         /**

From 1b08ca997e9af3ac39404e7b4457496381dc9c9e Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 13:32:39 -0600
Subject: [PATCH 027/924] Update adone to use TypeScript 2.8

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

diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index 521bdf6e03..f7249c00b4 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ciferox/adone
 // Definitions by: am <https://github.com/s0m3on3>, Maximus <https://github.com/maxveres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference path="./adone.d.ts" />
 /// <reference path="./glosses/app.d.ts" />

From 4535063cb12d3f916ca2b1ec8fc376fb58c9cf17 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 13:33:48 -0600
Subject: [PATCH 028/924] Update gulp-template

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

diff --git a/types/gulp-template/index.d.ts b/types/gulp-template/index.d.ts
index a2270eb387..f325cfb9c1 100644
--- a/types/gulp-template/index.d.ts
+++ b/types/gulp-template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sindresorhus/gulp-template#readme
 // Definitions by: Peter Safranek <https://github.com/pe8ter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 

From b23e09d323d53a3b582df1265b7f3a5880be6888 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 13:35:16 -0600
Subject: [PATCH 029/924] Bump lodash-es version to 2.8

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

diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 61eb6016ee..3e9fcfa69c 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/, https://lodash.com/custom-builds
 // Definitions by: Stephen Lautier <https://github.com/stephenlautier>, e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export { default as add } from "./add";
 export { default as after } from "./after";

From 2df6f925924d0397a22b9f7334845ffee598dc34 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 13:36:53 -0600
Subject: [PATCH 030/924] Bump version for lowdb

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

diff --git a/types/lowdb/index.d.ts b/types/lowdb/index.d.ts
index a8146ef8a2..3663b35823 100644
--- a/types/lowdb/index.d.ts
+++ b/types/lowdb/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: typicode <https://github.com/typicode>
 //                 Bazyli Brzóska <https://github.com/niieani>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference path="./_lodash.d.ts" />
 

From 766ba9902395d29e364db10760af57694b085fcb Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 13:38:09 -0600
Subject: [PATCH 031/924] Bump yog2-kernel version

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

diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts
index 0a6d1abc1e..dfe474b0b1 100644
--- a/types/yog2-kernel/index.d.ts
+++ b/types/yog2-kernel/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/fex-team/yog2-kernel
 // Definitions by: ssddi456 <https://github.com/ssddi456>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as express from "express";
 import * as _ from "lodash";

From c281b9c020d197e7dede009cfff52a31544d7460 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Thu, 14 Feb 2019 14:26:51 -0600
Subject: [PATCH 032/924] Update project for sequelizejs based on travis
 failure

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 5d1131684c..458929e298 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sequelize 4.27.11
-// Project: http://sequelizejs.com
+// Project: https://github.com/sequelize/sequelize
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Ivan Drinchev <https://github.com/drinchev>
diff --git a/types/sequelize/v3/index.d.ts b/types/sequelize/v3/index.d.ts
index 484edd089d..4d2ea38efc 100644
--- a/types/sequelize/v3/index.d.ts
+++ b/types/sequelize/v3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sequelize 3.30.4
-// Project: http://sequelizejs.com
+// Project: https://github.com/sequelize/sequelize
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Ivan Drinchev <https://github.com/drinchev>

From 5adceb834ffbfbdf8e5879e07dec5893cdac76e9 Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Thu, 14 Feb 2019 16:00:53 -0600
Subject: [PATCH 033/924] [detox] use export = instead of export default for
 test runners

---
 types/detox/runners/jest/adapter/index.d.ts  | 2 +-
 types/detox/runners/mocha/adapter/index.d.ts | 2 +-
 types/detox/test/detox-jest-setup-tests.ts   | 3 +--
 types/detox/test/detox-mocha-setup-tests.ts  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/detox/runners/jest/adapter/index.d.ts b/types/detox/runners/jest/adapter/index.d.ts
index f479eda256..ca64f30820 100644
--- a/types/detox/runners/jest/adapter/index.d.ts
+++ b/types/detox/runners/jest/adapter/index.d.ts
@@ -9,4 +9,4 @@ interface DetoxJestAdapter {
 
 declare const adapter: DetoxJestAdapter;
 
-export default adapter;
+export = adapter;
diff --git a/types/detox/runners/mocha/adapter/index.d.ts b/types/detox/runners/mocha/adapter/index.d.ts
index 8e13b3bc01..3249031eee 100644
--- a/types/detox/runners/mocha/adapter/index.d.ts
+++ b/types/detox/runners/mocha/adapter/index.d.ts
@@ -6,4 +6,4 @@ interface DetoxMochaAdapter {
 
 declare const adapter: DetoxMochaAdapter;
 
-export default adapter;
+export = adapter;
diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index c0b1ea2127..dbc892afd8 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -2,8 +2,7 @@ declare var beforeAll: (callback: () => void) => void;
 declare var beforeEach: (callback: () => void) => void;
 declare var afterAll: (callback: () => void) => void;
 
-import defaultDetox from "detox";
-import adapter from "detox/runners/jest/adapter";
+import * as adapter from "detox/runners/jest/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
 // const config = require("./package.json").detox;
diff --git a/types/detox/test/detox-mocha-setup-tests.ts b/types/detox/test/detox-mocha-setup-tests.ts
index c415eed696..9d0e9fd02f 100644
--- a/types/detox/test/detox-mocha-setup-tests.ts
+++ b/types/detox/test/detox-mocha-setup-tests.ts
@@ -5,7 +5,7 @@ declare var beforeEach: (callback: () => void) => void;
 declare var after: (callback: () => void) => void;
 declare var afterEach: (callback: () => void) => void;
 
-import adapter from "detox/runners/mocha/adapter";
+import * as adapter from "detox/runners/mocha/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
 // const config = require("./package.json").detox;

From 7d31fcf21767920d8281cf1f762308a2eecd25cb Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Fri, 15 Feb 2019 03:47:33 +0100
Subject: [PATCH 034/924] Revert "fix: export default"

This reverts commit 0aaf38806d1838ad54bf9cc4530447650760292a.
---
 types/animejs/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/animejs/index.d.ts b/types/animejs/index.d.ts
index bbfb21963b..069187b15e 100644
--- a/types/animejs/index.d.ts
+++ b/types/animejs/index.d.ts
@@ -133,4 +133,5 @@ declare namespace anime {
 
 declare function anime(params: anime.AnimeParams): anime.AnimeInstance;
 
-export default anime;
+export = anime;
+export as namespace anime;

From 2a263af346572a7ff4dd3a5b12d80c749e9495b2 Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Fri, 15 Feb 2019 03:48:31 +0100
Subject: [PATCH 035/924] fix: enable allowSyntheticDefaultImports

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

diff --git a/types/animejs/tsconfig.json b/types/animejs/tsconfig.json
index 02c5552371..9ed0aa7d69 100644
--- a/types/animejs/tsconfig.json
+++ b/types/animejs/tsconfig.json
@@ -14,6 +14,7 @@
             "../"
         ],
         "types": [],
+        "allowSyntheticDefaultImports": true,
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 04efe5f37356157060efffd4b2aa48dd4b706535 Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Fri, 15 Feb 2019 04:01:30 +0100
Subject: [PATCH 036/924] fix: add timelineOffset

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

diff --git a/types/animejs/index.d.ts b/types/animejs/index.d.ts
index 069187b15e..ad2d73fb2b 100644
--- a/types/animejs/index.d.ts
+++ b/types/animejs/index.d.ts
@@ -110,7 +110,7 @@ declare namespace anime {
 	}
 
 	interface AnimeTimelineInstance extends AnimeInstance {
-		add(params: AnimeAnimParams): AnimeTimelineInstance;
+		add(params: AnimeAnimParams, timelineOffset?: string | number): AnimeTimelineInstance;
 	}
 
 	// Helpers

From c0b82cd8f294de928d3a180e52c518909dd33f87 Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Fri, 15 Feb 2019 04:03:01 +0100
Subject: [PATCH 037/924] chore: add contributor

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

diff --git a/types/animejs/index.d.ts b/types/animejs/index.d.ts
index ad2d73fb2b..607872039f 100644
--- a/types/animejs/index.d.ts
+++ b/types/animejs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for animejs 2.0
 // Project: http://animejs.com
-// Definitions by: Andrew Babin <https://github.com/A-Babin>
+// Definitions by: Andrew Babin     <https://github.com/A-Babin>
+//                 supaiku0         <https://github.com/supaiku0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

From 85f9770c78cf1dad526bc7046355710c117f5cfc Mon Sep 17 00:00:00 2001
From: supaiku <supaiku@protonmail.com>
Date: Fri, 15 Feb 2019 04:10:27 +0100
Subject: [PATCH 038/924] test: timelineOffset

---
 types/animejs/animejs-tests.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/animejs/animejs-tests.ts b/types/animejs/animejs-tests.ts
index 926f89acc8..8ed6fccf8e 100644
--- a/types/animejs/animejs-tests.ts
+++ b/types/animejs/animejs-tests.ts
@@ -17,9 +17,9 @@ const test2 = anime({
 	},
 	translateY: '40px',
 	color: [
-		{value: '#FF0000', duration: 2000},
-		{value: '#00FF00', duration: 2000},
-		{value: '#0000FF', duration: 2000},
+		{ value: '#FF0000', duration: 2000 },
+		{ value: '#00FF00', duration: 2000 },
+		{ value: '#0000FF', duration: 2000 },
 	],
 	duration: () => {
 		return 1000000000000;
@@ -69,3 +69,9 @@ const bezier = anime.bezier(0, 0, 100, 100);
 anime.easings['hello'] = anime.bezier(0, 0, 1900, 3020);
 const runningAnims = anime.running;
 anime.remove(".tiny-divvy-div");
+
+anime.timeline().add({
+	targets: [],
+	duration: 1000,
+	easing: "linear",
+}, 0);

From 658091f2ec553677cd44d23467696f6316a03096 Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Fri, 15 Feb 2019 22:34:02 +0800
Subject: [PATCH 039/924] Add package: gun

---
 types/gun/gun-tests.ts  |  56 +++++++
 types/gun/index.d.ts    | 318 ++++++++++++++++++++++++++++++++++++++++
 types/gun/tsconfig.json |  22 +++
 types/gun/tslint.json   |   1 +
 4 files changed, 397 insertions(+)
 create mode 100644 types/gun/gun-tests.ts
 create mode 100644 types/gun/index.d.ts
 create mode 100644 types/gun/tsconfig.json
 create mode 100644 types/gun/tslint.json

diff --git a/types/gun/gun-tests.ts b/types/gun/gun-tests.ts
new file mode 100644
index 0000000000..2f65781bac
--- /dev/null
+++ b/types/gun/gun-tests.ts
@@ -0,0 +1,56 @@
+import GunServer = require('gun');
+import Gun = require('gun/gun');
+import 'gun/lib/path.js';
+import 'gun/lib/not.js';
+import 'gun/lib/open.js';
+import 'gun/lib/load.js';
+import 'gun/lib/then.js';
+import 'gun/lib/bye.js';
+import 'gun/lib/later.js';
+import 'gun/lib/unset.js';
+import 'gun/lib/time.js';
+
+Gun('http://yourdomain.com/gun');
+Gun(['http://server1.com/gun', 'http://server2.com/gun']);
+Gun({
+    s3: {
+        key: '',
+        secret: '',
+        bucket: ''
+    },
+    file: 'file/path.json',
+    uuid() {
+        return 'xxxxxx';
+    }
+});
+
+interface AppState {
+    object: {
+        num: number;
+        str: string;
+        bool: boolean;
+        obj: {
+            arr2: Array<{ foo: number; bar: string; }>
+        }
+    };
+    chatRoom: Array<{ by: string; message: string; }>;
+}
+
+const app = new Gun<AppState>();
+app.get('object').get('bool').put(true);
+app.get('object').get('num').put(1);
+app.get('object').get('obj').get('arr2').set({ foo: 1, bar: '2' });
+
+app.get('object').on((data) => {
+    data.bool;
+});
+app.get('object').off();
+app.get('object').once((data) => {
+    if (data) data.bool;
+});
+async function name() {
+    const data = await app.get('object').promise!();
+    data.put.bool;
+}
+app.get('chatRoom').time!({ by: 'A', message: 'Hello' });
+app.get('chatRoom').time!((msg) => { msg.by; }, 20);
diff --git a/types/gun/index.d.ts b/types/gun/index.d.ts
new file mode 100644
index 0000000000..0c9063b4ed
--- /dev/null
+++ b/types/gun/index.d.ts
@@ -0,0 +1,318 @@
+// Type definitions for gun 0.9
+// Project: https://github.com/amark/gun#readme
+// Definitions by: Jack Works <https://github.com/Jack-Works>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'gun' {
+    const Gun: Gun.Constructor
+    export = Gun
+}
+
+declare module 'gun/gun' {
+    const cons: typeof import('gun')
+    export = cons
+}
+
+declare namespace Gun {
+    type ArrayOf<T> = T extends Array<infer U> ? U : never
+    /** Gun does not accept Array value, so we need extract to make types correct */
+    type AllowArray<T> = ArrayOf<T> extends never ? T : ArrayOf<T>
+    type DisallowArray<T> = ArrayOf<T> extends never ? T : never
+    type ArrayAsRecord<DataType> = ArrayOf<DataType> extends never ? DataType : Record<string, any>
+    /**
+     * options['module name'] allows you to pass options to a 3rd party module.
+     * Their project README will likely list the exposed options
+     * https://github.com/amark/gun/wiki/Modules
+     */
+    type ConstructorOptions = Partial<{
+        /** Undocumented but mentioned. Write data to a JSON. */
+        file: string
+        /** Undocumented but mentioned. Create a websocket server */
+        web: any
+        /** Undocumented but mentioned. Amazon S3 */
+        s3: {
+            key: any
+            secret: any
+            bucket: any
+        }
+        /** the URLs are properties, and the value is an empty object. */
+        peers: Record<string, {}>
+        /** default: true, creates and persists local (nodejs) data using Radisk. */
+        radisk: boolean
+        /** default: true, persists local (browser) data to localStorage. */
+        localStorage: boolean
+        /** uuid allows you to override the default 24 random alphanumeric soul generator with your own function. */
+        uuid(): string
+        /**
+         * allows you to pass options to a 3rd party module. Their project README will likely list the exposed options
+         * @see https://github.com/amark/gun/wiki/Modules
+         */
+        [key: string]: any
+    }>
+    type Saveable<DataType> = Partial<DataType> | string | number | boolean | null | ChainReference<DataType>
+    type AckCallback = (ack: { err: Error; ok: any } | { err: undefined; ok: string }) => void
+    interface ChainReference<DataType = any, ReferenceKey = any> {
+        /**
+         * Save data into gun, syncing it with your connected peers.
+         *
+         * * You cannot save primitive values at the root level.
+         *
+         * @param data You do not need to re-save the entire object every time,
+         * gun will automatically merge your data into what already exists as a "partial" update.
+         *
+         * * `undefined`, `NaN`, `Infinity`, `array`, will be rejected.
+         * * Traditional arrays are dangerous in real-time apps. Use `gun.set` instead.
+         *
+         * @param callback invoked on each acknowledgment
+         */
+        put(data: DisallowArray<DataType>, callback?: AckCallback): ChainReference<DataType, ReferenceKey>
+        /**
+         * Where to read data from.
+         * @param key The key is the ID or property name of the data that you saved from earlier
+         *  (or that will be saved later).
+         * * Note that if you use .put at any depth after a get it first reads the data and then writes, merging the data as a partial update.
+         * @param callback You will usually be using gun.on or gun.once to actually retrieve your data,
+         * not this callback (it is intended for more low level control, for module and extensions).
+         *
+         * **Avoid use callback. The type in the document may be wrong.**
+         *
+         * **Here the type of callback respect to the actual behavior**
+         */
+        get<K extends keyof DataType>(
+            key: ArrayOf<DataType> extends never ? K : never,
+            callback?: (
+                /** the raw data. Internal node of gun. Will not typed here. */
+                paramA: Record<
+                    'gun' | '$' | 'root' | 'id' | 'back' | 'on' | 'tag' | 'get' | 'soul' | 'ack' | 'put',
+                    any
+                >,
+                /** the key, ID, or property name of the data. */
+                paramB: Record<'off' | 'to' | 'next' | 'the' | 'on' | 'as' | 'back' | 'rid' | 'id', any>
+            ) => void
+        ): ChainReference<DataType[K], K>
+        /**
+         * Change the configuration of the gun database instance.
+         * @param options The options argument is the same object you pass to the constructor.
+         *
+         * The options's properties replace those in the instance's configuration but options.peers are **added** to peers known to the gun instance.
+         * @returns No mention in the document, behavior as `ChainReference<DataType, ReferenceKey>`
+         */
+        opt(options: ConstructorOptions): ChainReference<DataType, ReferenceKey>
+        /**
+         * Move up to the parent context on the chain.
+         *
+         * Every time a new chain is created, a reference to the old context is kept to go back to.
+         * @param amount The number of times you want to go back up the chain.
+         * `-1` or `Infinity` will take you to the root.
+         * @returns Impossible to determinate final type. You must cast it by yourself.
+         */
+        back(amount?: number): ChainReference<unknown>
+
+        // Main API
+        /**
+         * Subscribe to updates and changes on a node or property in realtime.
+         * @param option Currently, the only option is to filter out old data, and just be given the changes.
+         * If you're listening to a node with 100 fields, and just one changes,
+         * you'll instead be passed a node with a single property representing that change rather than the full node every time.
+         * @param callback
+         * Once initially and whenever the property or node you're focused on changes, this callback is immediately fired with the data as it is at that point in time.
+         *
+         * Since gun streams data, the callback will probably be called multiple times as new chunk comes in.
+         * To remove a listener call .off() on the same property or node.
+         */
+        on(
+            callback: (data: ArrayAsRecord<DataType>, key: ReferenceKey) => void,
+            option?: { change: boolean } | boolean
+        ): ChainReference<DataType, ReferenceKey>
+        /**
+         * Get the current data without subscribing to updates. Or `undefined` if it cannot be found.
+         * @returns In the document, it said the return value may change in the future. Don't rely on it.
+         */
+        once(
+            callback?: (data: (ArrayAsRecord<DataType>) | undefined, key: ReferenceKey) => void,
+            option?: { wait: number }
+        ): ChainReference<DataType, ReferenceKey>
+        /**
+         * **.set does not means 'set data', it means a Mathematical Set**
+         *
+         * Add a unique item to an unordered list.
+         * `gun.set` works like a mathematical set, where each item in the list is unique.
+         * If the item is added twice, it will be merged.
+         *
+         * **This means only objects, for now, are supported.**
+         */
+        set(
+            data: DataType extends Array<infer U>
+                ? U extends { [key: string]: any; [key: number]: any }
+                    ? ArrayOf<DataType>
+                    : never
+                : never,
+            callback?: AckCallback
+        ): ChainReference<ArrayOf<DataType>>
+        /**
+         * Map iterates over each property and item on a node, passing it down the chain,
+         * behaving like a forEach on your data.
+         * It also subscribes to every item as well and listens for newly inserted items.
+         */
+        map(
+            callback?: (value: ArrayOf<DataType>, key: DataType) => ArrayOf<DataType> | undefined
+        ): ChainReference<ArrayOf<DataType>, ReferenceKey>
+        /**
+         * Undocumented, but extremely useful and mentioned in the document
+         *
+         * Remove **all** listener on this node.
+         */
+        off(): void
+
+        // Extended API
+        /**
+         *
+         * Path does the same thing as `.get` but has some conveniences built in.
+         * @deprecated This is not friendly with type system.
+         *
+         * **Warning**: This extension was removed from core, you probably shouldn't be using it!
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/path.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/path.js"></script>`!
+         */
+        path?(path: string | string[]): ChainReference
+        /**
+         * Handle cases where data can't be found.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/not.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/not.js"></script>`!
+         */
+        not?(callback: (key: ReferenceKey) => void): ChainReference<DataType, ReferenceKey>
+        /**
+         * Open behaves very similarly to gun.on, except it gives you the **full depth of a document** on every update.
+         * It also works with graphs, tables, or other data structures. Think of it as opening up a live connection to a document.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/open.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/open.js"></script>`!
+         */
+        open?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>
+        /**
+         * Loads the full object once. It is the same as `open` but with the behavior of `once`.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/load.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/load.js"></script>`!
+         */
+        load?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>
+        /**
+         * Returns a promise for you to use.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/then.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/then.js"></script>`!
+         */
+        then?<TResult1 = ArrayAsRecord<DataType>, TResult2 = never>(
+            onfulfilled?: ((value: TResult1) => TResult1 | PromiseLike<TResult1>) | undefined | null
+        ): Promise<TResult1 | TResult2>
+        /**
+         * Returns a promise for you to use.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/then.js')` or
+         *  `<script src="https://cdn.jsdelivr.net/npm/gun/lib/then.js"></script>`!
+         */
+        promise?<
+            TResult1 = { put: ArrayAsRecord<DataType>; key: ReferenceKey; gun: ChainReference<DataType, ReferenceKey> },
+            TResult2 = never
+        >(
+            onfulfilled?: ((value: TResult1) => TResult1 | PromiseLike<TResult1>) | undefined | null
+        ): Promise<TResult1 | TResult2>
+        /**
+         * bye lets you change data after that browser peer disconnects.
+         * This is useful for games and status messages,
+         * that if a player leaves you can remove them from the game or set a user's status to "away".
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/bye.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/bye.js"></script>`!
+         */
+        bye?(): {
+            put(data: DisallowArray<Saveable<DataType>>): void
+        }
+        /**
+         * Say you save some data, but want to do something with it later, like expire it or refresh it.
+         * Well, then `later` is for you! You could use this to easily implement a TTL or similar behavior.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/later.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/later.js"></script>`!
+         */
+        later?(
+            callback: (
+                this: ChainReference<DataType, ReferenceKey>,
+                data: ArrayAsRecord<DataType>,
+                key: ReferenceKey
+            ) => void,
+            seconds: number
+        ): ChainReference<DataType, ReferenceKey>
+        /**
+         * After you save some data in an unordered list, you may need to remove it.
+         *
+         * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/unset.js')` or
+         * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/unset.js"></script>`!
+         */
+        unset?(data: ArrayOf<DataType>): ChainReference<DataType, ReferenceKey>
+        /**
+         * Subscribes to all future events that occur on the Timegraph and retrieve a specified number of old events
+         *
+         * **Warning**: The Timegraph extension isn't required by default, you would need to include at "gun/lib/time.js"
+         */
+        time?(
+            callback: (data: ArrayOf<DataType>, key: ReferenceKey, time: number) => void,
+            alsoReceiveNOldEvents?: number
+        ): ChainReference<DataType, ReferenceKey>
+        /** Pushes data to a Timegraph with it's time set to Gun.state()'s time */
+        time?(data: ArrayOf<DataType>): void
+    }
+
+    interface GunSEA {
+        // There is no the only content in the api document.
+        user: {
+            create(alias: string, passphrase: string, callback: (...args: any[]) => void): any
+        }
+    }
+
+    interface Constructor {
+        /**
+         * @description
+         * no parameters creates a local datastore using the default persistence layer, either localStorage or Radisk.
+         */
+        <DataType = any>(): ChainReference<DataType> & GunSEA
+        new <DataType = any>(): ChainReference<DataType> & GunSEA
+
+        /**
+         * @param url
+         * passing a URL creates the above local datastore that also tries to sync with the URL.
+         *
+         * or you can pass in an array of URLs to sync with multiple peers.
+         */
+        <DataType = any>(url: string | string[]): ChainReference<DataType> & GunSEA
+        new <DataType = any>(url: string | string[]): ChainReference<DataType> & GunSEA
+        <DataType = any>(option: ConstructorOptions): ChainReference<DataType> & GunSEA
+        new <DataType = any>(option: ConstructorOptions): ChainReference<DataType> & GunSEA
+        node: {
+            /** Returns true if data is a gun node, otherwise false. */
+            is(anything: any): anything is ChainReference
+            /** Returns data's gun ID (instead of manually grabbing its metadata i.e. data["_"]["#"], which is faster but could change in the future)
+             *
+             * Returns undefined if data is not correct gun data. */
+            soul(data: ChainReference): string
+            /** Returns a "gun-ified" variant of the json input by injecting a new gun ID into the metadata field. */
+            ify(json: any): any
+        }
+        /** @see https://gun.eco/docs/SEA */
+        SEA: any
+    }
+}
+
+// Following modules does not export anything, but extends the gun prototype
+declare module 'gun/lib/path.js'
+declare module 'gun/lib/not.js'
+declare module 'gun/lib/open.js'
+declare module 'gun/lib/load.js'
+declare module 'gun/lib/then.js'
+declare module 'gun/lib/bye.js'
+declare module 'gun/lib/later.js'
+declare module 'gun/lib/unset.js'
+declare module 'gun/lib/time.js'
+declare const Gun: typeof import('gun')
diff --git a/types/gun/tsconfig.json b/types/gun/tsconfig.json
new file mode 100644
index 0000000000..7b7490d14c
--- /dev/null
+++ b/types/gun/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gun-tests.ts"
+    ]
+}
diff --git a/types/gun/tslint.json b/types/gun/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gun/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f779a756cf874c68072427a00501f20c992eddbc Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Fri, 15 Feb 2019 23:18:29 +0800
Subject: [PATCH 040/924] Fix errors

---
 types/gun/gun-tests.ts  |  36 +++++++---
 types/gun/gun.d.ts      |   3 +
 types/gun/index.d.ts    | 145 +++++++++++++++++-----------------------
 types/gun/tsconfig.json |   1 +
 types/gun/tslint.json   |   2 +-
 5 files changed, 92 insertions(+), 95 deletions(-)
 create mode 100644 types/gun/gun.d.ts

diff --git a/types/gun/gun-tests.ts b/types/gun/gun-tests.ts
index 2f65781bac..d196fba695 100644
--- a/types/gun/gun-tests.ts
+++ b/types/gun/gun-tests.ts
@@ -10,7 +10,7 @@ import 'gun/lib/later.js';
 import 'gun/lib/unset.js';
 import 'gun/lib/time.js';
 
-Gun('http://yourdomain.com/gun');
+GunServer('http://yourdomain.com/gun');
 Gun(['http://server1.com/gun', 'http://server2.com/gun']);
 Gun({
     s3: {
@@ -30,22 +30,34 @@ interface AppState {
         str: string;
         bool: boolean;
         obj: {
-            arr2: Array<{ foo: number; bar: string; }>
-        }
+            arr2: Array<{ foo: number; bar: string }>;
+        };
     };
-    chatRoom: Array<{ by: string; message: string; }>;
+    chatRoom: Array<{ by: string; message: string }>;
 }
 
 const app = new Gun<AppState>();
-app.get('object').get('bool').put(true);
-app.get('object').get('num').put(1);
-app.get('object').get('obj').get('arr2').set({ foo: 1, bar: '2' });
+app.get('object')
+    .get('bool')
+    .put(true);
+app.get('object')
+    .get('num')
+    .put(1);
+app.get('object')
+    .get('obj')
+    .get('arr2')
+    .set({ foo: 1, bar: '2' });
 
-app.get('object').on((data) => {
+app.get('object')
+    .get('bool')
+    // $ExpectError
+    .put(1);
+
+app.get('object').on(data => {
     data.bool;
 });
 app.get('object').off();
-app.get('object').once((data) => {
+app.get('object').once(data => {
     if (data) data.bool;
 });
 async function name() {
@@ -53,4 +65,8 @@ async function name() {
     data.put.bool;
 }
 app.get('chatRoom').time!({ by: 'A', message: 'Hello' });
-app.get('chatRoom').time!((msg) => { msg.by; }, 20);
+app.get('chatRoom').time!(msg => {
+    msg.by;
+}, 20);
+// $ExpectError
+app.get('object').time!({ a: 1 });
diff --git a/types/gun/gun.d.ts b/types/gun/gun.d.ts
new file mode 100644
index 0000000000..841dfa34a9
--- /dev/null
+++ b/types/gun/gun.d.ts
@@ -0,0 +1,3 @@
+
+declare const cons: typeof import('gun')
+export = cons
diff --git a/types/gun/index.d.ts b/types/gun/index.d.ts
index 0c9063b4ed..51d02b68d5 100644
--- a/types/gun/index.d.ts
+++ b/types/gun/index.d.ts
@@ -2,23 +2,17 @@
 // Project: https://github.com/amark/gun#readme
 // Definitions by: Jack Works <https://github.com/Jack-Works>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
 
-declare module 'gun' {
-    const Gun: Gun.Constructor
-    export = Gun
-}
-
-declare module 'gun/gun' {
-    const cons: typeof import('gun')
-    export = cons
-}
+declare const cons: Gun.Constructor;
+export = cons;
 
 declare namespace Gun {
-    type ArrayOf<T> = T extends Array<infer U> ? U : never
+    type ArrayOf<T> = T extends Array<infer U> ? U : never;
     /** Gun does not accept Array value, so we need extract to make types correct */
-    type AllowArray<T> = ArrayOf<T> extends never ? T : ArrayOf<T>
-    type DisallowArray<T> = ArrayOf<T> extends never ? T : never
-    type ArrayAsRecord<DataType> = ArrayOf<DataType> extends never ? DataType : Record<string, any>
+    type AllowArray<T> = ArrayOf<T> extends never ? T : ArrayOf<T>;
+    type DisallowArray<T> = ArrayOf<T> extends never ? T : never;
+    type ArrayAsRecord<DataType> = ArrayOf<DataType> extends never ? DataType : Record<string, any>;
     /**
      * options['module name'] allows you to pass options to a 3rd party module.
      * Their project README will likely list the exposed options
@@ -26,31 +20,31 @@ declare namespace Gun {
      */
     type ConstructorOptions = Partial<{
         /** Undocumented but mentioned. Write data to a JSON. */
-        file: string
+        file: string;
         /** Undocumented but mentioned. Create a websocket server */
-        web: any
+        web: any;
         /** Undocumented but mentioned. Amazon S3 */
         s3: {
-            key: any
-            secret: any
-            bucket: any
-        }
+            key: any;
+            secret: any;
+            bucket: any;
+        };
         /** the URLs are properties, and the value is an empty object. */
-        peers: Record<string, {}>
+        peers: Record<string, {}>;
         /** default: true, creates and persists local (nodejs) data using Radisk. */
-        radisk: boolean
+        radisk: boolean;
         /** default: true, persists local (browser) data to localStorage. */
-        localStorage: boolean
+        localStorage: boolean;
         /** uuid allows you to override the default 24 random alphanumeric soul generator with your own function. */
-        uuid(): string
+        uuid(): string;
         /**
          * allows you to pass options to a 3rd party module. Their project README will likely list the exposed options
          * @see https://github.com/amark/gun/wiki/Modules
          */
-        [key: string]: any
-    }>
-    type Saveable<DataType> = Partial<DataType> | string | number | boolean | null | ChainReference<DataType>
-    type AckCallback = (ack: { err: Error; ok: any } | { err: undefined; ok: string }) => void
+        [key: string]: any;
+    }>;
+    type Saveable<DataType> = Partial<DataType> | string | number | boolean | null | ChainReference<DataType>;
+    type AckCallback = (ack: { err: Error; ok: any } | { err: undefined; ok: string }) => void;
     interface ChainReference<DataType = any, ReferenceKey = any> {
         /**
          * Save data into gun, syncing it with your connected peers.
@@ -65,7 +59,7 @@ declare namespace Gun {
          *
          * @param callback invoked on each acknowledgment
          */
-        put(data: DisallowArray<DataType>, callback?: AckCallback): ChainReference<DataType, ReferenceKey>
+        put(data: DisallowArray<DataType>, callback?: AckCallback): ChainReference<DataType, ReferenceKey>;
         /**
          * Where to read data from.
          * @param key The key is the ID or property name of the data that you saved from earlier
@@ -89,7 +83,7 @@ declare namespace Gun {
                 /** the key, ID, or property name of the data. */
                 paramB: Record<'off' | 'to' | 'next' | 'the' | 'on' | 'as' | 'back' | 'rid' | 'id', any>
             ) => void
-        ): ChainReference<DataType[K], K>
+        ): ChainReference<DataType[K], K>;
         /**
          * Change the configuration of the gun database instance.
          * @param options The options argument is the same object you pass to the constructor.
@@ -97,7 +91,7 @@ declare namespace Gun {
          * The options's properties replace those in the instance's configuration but options.peers are **added** to peers known to the gun instance.
          * @returns No mention in the document, behavior as `ChainReference<DataType, ReferenceKey>`
          */
-        opt(options: ConstructorOptions): ChainReference<DataType, ReferenceKey>
+        opt(options: ConstructorOptions): ChainReference<DataType, ReferenceKey>;
         /**
          * Move up to the parent context on the chain.
          *
@@ -106,7 +100,7 @@ declare namespace Gun {
          * `-1` or `Infinity` will take you to the root.
          * @returns Impossible to determinate final type. You must cast it by yourself.
          */
-        back(amount?: number): ChainReference<unknown>
+        back(amount?: number): ChainReference;
 
         // Main API
         /**
@@ -123,7 +117,7 @@ declare namespace Gun {
         on(
             callback: (data: ArrayAsRecord<DataType>, key: ReferenceKey) => void,
             option?: { change: boolean } | boolean
-        ): ChainReference<DataType, ReferenceKey>
+        ): ChainReference<DataType, ReferenceKey>;
         /**
          * Get the current data without subscribing to updates. Or `undefined` if it cannot be found.
          * @returns In the document, it said the return value may change in the future. Don't rely on it.
@@ -131,7 +125,7 @@ declare namespace Gun {
         once(
             callback?: (data: (ArrayAsRecord<DataType>) | undefined, key: ReferenceKey) => void,
             option?: { wait: number }
-        ): ChainReference<DataType, ReferenceKey>
+        ): ChainReference<DataType, ReferenceKey>;
         /**
          * **.set does not means 'set data', it means a Mathematical Set**
          *
@@ -148,7 +142,7 @@ declare namespace Gun {
                     : never
                 : never,
             callback?: AckCallback
-        ): ChainReference<ArrayOf<DataType>>
+        ): ChainReference<ArrayOf<DataType>>;
         /**
          * Map iterates over each property and item on a node, passing it down the chain,
          * behaving like a forEach on your data.
@@ -156,13 +150,13 @@ declare namespace Gun {
          */
         map(
             callback?: (value: ArrayOf<DataType>, key: DataType) => ArrayOf<DataType> | undefined
-        ): ChainReference<ArrayOf<DataType>, ReferenceKey>
+        ): ChainReference<ArrayOf<DataType>, ReferenceKey>;
         /**
          * Undocumented, but extremely useful and mentioned in the document
          *
          * Remove **all** listener on this node.
          */
-        off(): void
+        off(): void;
 
         // Extended API
         /**
@@ -175,14 +169,14 @@ declare namespace Gun {
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/path.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/path.js"></script>`!
          */
-        path?(path: string | string[]): ChainReference
+        path?(path: string | string[]): ChainReference;
         /**
          * Handle cases where data can't be found.
          *
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/not.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/not.js"></script>`!
          */
-        not?(callback: (key: ReferenceKey) => void): ChainReference<DataType, ReferenceKey>
+        not?(callback: (key: ReferenceKey) => void): ChainReference<DataType, ReferenceKey>;
         /**
          * Open behaves very similarly to gun.on, except it gives you the **full depth of a document** on every update.
          * It also works with graphs, tables, or other data structures. Think of it as opening up a live connection to a document.
@@ -190,23 +184,23 @@ declare namespace Gun {
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/open.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/open.js"></script>`!
          */
-        open?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>
+        open?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>;
         /**
          * Loads the full object once. It is the same as `open` but with the behavior of `once`.
          *
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/load.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/load.js"></script>`!
          */
-        load?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>
+        load?(callback: (data: ArrayAsRecord<DataType>) => void): ChainReference<DataType, ReferenceKey>;
         /**
          * Returns a promise for you to use.
          *
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/then.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/then.js"></script>`!
          */
-        then?<TResult1 = ArrayAsRecord<DataType>, TResult2 = never>(
-            onfulfilled?: ((value: TResult1) => TResult1 | PromiseLike<TResult1>) | undefined | null
-        ): Promise<TResult1 | TResult2>
+        then?<TResult1 = ArrayAsRecord<DataType>>(
+            onfulfilled?: (value: TResult1) => TResult1 | PromiseLike<TResult1>
+        ): Promise<TResult1>;
         /**
          * Returns a promise for you to use.
          *
@@ -214,11 +208,10 @@ declare namespace Gun {
          *  `<script src="https://cdn.jsdelivr.net/npm/gun/lib/then.js"></script>`!
          */
         promise?<
-            TResult1 = { put: ArrayAsRecord<DataType>; key: ReferenceKey; gun: ChainReference<DataType, ReferenceKey> },
-            TResult2 = never
+            TResult1 = { put: ArrayAsRecord<DataType>; key: ReferenceKey; gun: ChainReference<DataType, ReferenceKey> }
         >(
-            onfulfilled?: ((value: TResult1) => TResult1 | PromiseLike<TResult1>) | undefined | null
-        ): Promise<TResult1 | TResult2>
+            onfulfilled?: (value: TResult1) => TResult1 | PromiseLike<TResult1>
+        ): Promise<TResult1>;
         /**
          * bye lets you change data after that browser peer disconnects.
          * This is useful for games and status messages,
@@ -228,8 +221,8 @@ declare namespace Gun {
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/bye.js"></script>`!
          */
         bye?(): {
-            put(data: DisallowArray<Saveable<DataType>>): void
-        }
+            put(data: DisallowArray<Saveable<DataType>>): void;
+        };
         /**
          * Say you save some data, but want to do something with it later, like expire it or refresh it.
          * Well, then `later` is for you! You could use this to easily implement a TTL or similar behavior.
@@ -244,14 +237,14 @@ declare namespace Gun {
                 key: ReferenceKey
             ) => void,
             seconds: number
-        ): ChainReference<DataType, ReferenceKey>
+        ): ChainReference<DataType, ReferenceKey>;
         /**
          * After you save some data in an unordered list, you may need to remove it.
          *
          * **Warning**: Not included by default! You must include it yourself via `require('gun/lib/unset.js')` or
          * `<script src="https://cdn.jsdelivr.net/npm/gun/lib/unset.js"></script>`!
          */
-        unset?(data: ArrayOf<DataType>): ChainReference<DataType, ReferenceKey>
+        unset?(data: ArrayOf<DataType>): ChainReference<DataType, ReferenceKey>;
         /**
          * Subscribes to all future events that occur on the Timegraph and retrieve a specified number of old events
          *
@@ -260,59 +253,43 @@ declare namespace Gun {
         time?(
             callback: (data: ArrayOf<DataType>, key: ReferenceKey, time: number) => void,
             alsoReceiveNOldEvents?: number
-        ): ChainReference<DataType, ReferenceKey>
+        ): ChainReference<DataType, ReferenceKey>;
         /** Pushes data to a Timegraph with it's time set to Gun.state()'s time */
-        time?(data: ArrayOf<DataType>): void
+        time?(data: ArrayOf<DataType>): void;
     }
 
     interface GunSEA {
         // There is no the only content in the api document.
         user: {
-            create(alias: string, passphrase: string, callback: (...args: any[]) => void): any
-        }
+            create(alias: string, passphrase: string, callback: (...args: any[]) => void): any;
+        };
     }
 
     interface Constructor {
         /**
          * @description
          * no parameters creates a local datastore using the default persistence layer, either localStorage or Radisk.
-         */
-        <DataType = any>(): ChainReference<DataType> & GunSEA
-        new <DataType = any>(): ChainReference<DataType> & GunSEA
-
-        /**
-         * @param url
+         * @param options
          * passing a URL creates the above local datastore that also tries to sync with the URL.
          *
          * or you can pass in an array of URLs to sync with multiple peers.
          */
-        <DataType = any>(url: string | string[]): ChainReference<DataType> & GunSEA
-        new <DataType = any>(url: string | string[]): ChainReference<DataType> & GunSEA
-        <DataType = any>(option: ConstructorOptions): ChainReference<DataType> & GunSEA
-        new <DataType = any>(option: ConstructorOptions): ChainReference<DataType> & GunSEA
+        <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<DataType> & GunSEA;
+        new <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<DataType> & GunSEA;
         node: {
             /** Returns true if data is a gun node, otherwise false. */
-            is(anything: any): anything is ChainReference
-            /** Returns data's gun ID (instead of manually grabbing its metadata i.e. data["_"]["#"], which is faster but could change in the future)
+            is(anything: any): anything is ChainReference;
+            /**
+             * Returns data's gun ID (instead of manually grabbing its metadata i.e. data["_"]["#"], which is faster but could change in the future)
              *
-             * Returns undefined if data is not correct gun data. */
-            soul(data: ChainReference): string
+             * Returns undefined if data is not correct gun data.
+             */
+            soul(data: ChainReference): string;
             /** Returns a "gun-ified" variant of the json input by injecting a new gun ID into the metadata field. */
-            ify(json: any): any
-        }
+            ify(json: any): any;
+        };
         /** @see https://gun.eco/docs/SEA */
-        SEA: any
+        SEA: any;
     }
 }
-
-// Following modules does not export anything, but extends the gun prototype
-declare module 'gun/lib/path.js'
-declare module 'gun/lib/not.js'
-declare module 'gun/lib/open.js'
-declare module 'gun/lib/load.js'
-declare module 'gun/lib/then.js'
-declare module 'gun/lib/bye.js'
-declare module 'gun/lib/later.js'
-declare module 'gun/lib/unset.js'
-declare module 'gun/lib/time.js'
-declare const Gun: typeof import('gun')
+declare const Gun: Gun.Constructor;
diff --git a/types/gun/tsconfig.json b/types/gun/tsconfig.json
index 7b7490d14c..10fe933ba8 100644
--- a/types/gun/tsconfig.json
+++ b/types/gun/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/gun/tslint.json b/types/gun/tslint.json
index 3db14f85ea..982ecfcd14 100644
--- a/types/gun/tslint.json
+++ b/types/gun/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint/dt.json" }
+{ "extends": "dtslint/dt.json", "rules": { "no-unnecessary-generics": false } }

From 61dfce36a732890a0c9f5f15548b5e3d792943cd Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Fri, 15 Feb 2019 17:34:26 -0600
Subject: [PATCH 041/924] [detox] add DetoxExport type for exported object

---
 types/detox/index.d.ts                      | 20 ++++++++++++--------
 types/detox/test/detox-jest-setup-tests.ts  |  3 ++-
 types/detox/test/detox-mocha-setup-tests.ts |  1 +
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
index 7ac69c1e1f..e89e73a794 100644
--- a/types/detox/index.d.ts
+++ b/types/detox/index.d.ts
@@ -42,6 +42,16 @@ declare global {
              */
             cleanup(): Promise<void>;
         }
+
+        // Detox exports all methods from detox global and all of the global constants.
+        interface DetoxExport extends Detox {
+            device: Device;
+            element: Element;
+            waitFor: WaitFor;
+            expect: Expect<Expect<any>>;
+            by: Matchers;
+        }
+
         interface Device {
             /**
              * Launch the app
@@ -434,12 +444,6 @@ declare global {
     }
 }
 
-export { by, device, element, waitFor };
+declare const detoxExport: Detox.DetoxExport;
 
-// Not exporting the global `expect` from the top of the file here
-// because `expect` conflicts with the global `expect` of jest and
-// therefore exporting it doesn't work. The global `expect` is kept
-// for backwards compatibility though.
-export const expect: Detox.Expect<Detox.Expect<any>>;
-
-export = detox;
+export = detoxExport;
diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index dbc892afd8..94ddc3eb1e 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -2,6 +2,7 @@ declare var beforeAll: (callback: () => void) => void;
 declare var beforeEach: (callback: () => void) => void;
 declare var afterAll: (callback: () => void) => void;
 
+import * as detox from "detox";
 import * as adapter from "detox/runners/jest/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:
@@ -18,7 +19,7 @@ beforeAll(async () => {
         initGlobals: false,
         launchApp: false,
     };
-    await defaultDetox.init(config, initOptions);
+    await detox.init(config, initOptions);
 });
 
 beforeEach(async () => {
diff --git a/types/detox/test/detox-mocha-setup-tests.ts b/types/detox/test/detox-mocha-setup-tests.ts
index 9d0e9fd02f..42e955ab4f 100644
--- a/types/detox/test/detox-mocha-setup-tests.ts
+++ b/types/detox/test/detox-mocha-setup-tests.ts
@@ -5,6 +5,7 @@ declare var beforeEach: (callback: () => void) => void;
 declare var after: (callback: () => void) => void;
 declare var afterEach: (callback: () => void) => void;
 
+import * as detox from "detox";
 import * as adapter from "detox/runners/mocha/adapter";
 
 // Normally the Detox configuration from the project's package.json like so:

From 1e890e9ef3845744399885d8a4a04f2c20d86b81 Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Fri, 15 Feb 2019 17:29:11 -0800
Subject: [PATCH 042/924] fixed linewidth attribute

---
 types/three/index.d.ts      | 75 +++++++++++++++++++------------------
 types/three/three-core.d.ts |  2 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 08b64250c8..21783efc40 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -25,46 +25,47 @@
 //                 Zhang Hao <https://github.com/devilsparta>
 //                 Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
 //                 Daniel Yim <https://github.com/danyim>
+//                 Saransh Kataria <https://github.com/saranshkataria>
 // Definitions: https://github.com//DefinitelyTyped
 // TypeScript Version: 2.8
 
-export * from "./three-core";
+export * from './three-core';
 
-export * from "./three-canvasrenderer";
-export * from "./three-colladaLoader";
-export * from "./three-copyshader";
-export * from "./three-css3drenderer";
-export * from "./three-ctmloader";
-export * from "./three-ddsloader";
-export * from "./three-tdsloader";
-export * from "./three-dragcontrols";
-export * from "./three-editorcontrols";
-export * from "./three-effectcomposer";
-export * from "./three-examples";
-export * from "./three-fbxloader";
-export * from "./three-FirstPersonControls";
-export * from "./three-gltfexporter";
-export * from "./three-gltfloader";
-export * from "./three-lensflare";
-export * from "./three-mapcontrols";
-export * from "./three-maskpass";
-export * from "./three-mtlloader";
-export * from "./three-objloader";
-export * from "./three-octree";
-export * from "./three-orbitcontrols";
-export * from "./three-orthographictrackballcontrols";
-export * from "./three-outlinepass";
-export * from "./three-projector";
-export * from "./three-renderpass";
-export * from "./three-shaderpass";
-export * from "./three-smaapass";
-export * from "./three-ssaapass";
-export * from "./three-filmpass";
-export * from "./three-tgaloader";
-export * from "./three-trackballcontrols";
-export * from "./three-transformcontrols";
-export * from "./three-unrealbloompass";
-export * from "./three-vrcontrols";
-export * from "./three-vreffect";
+export * from './three-canvasrenderer';
+export * from './three-colladaLoader';
+export * from './three-copyshader';
+export * from './three-css3drenderer';
+export * from './three-ctmloader';
+export * from './three-ddsloader';
+export * from './three-tdsloader';
+export * from './three-dragcontrols';
+export * from './three-editorcontrols';
+export * from './three-effectcomposer';
+export * from './three-examples';
+export * from './three-fbxloader';
+export * from './three-FirstPersonControls';
+export * from './three-gltfexporter';
+export * from './three-gltfloader';
+export * from './three-lensflare';
+export * from './three-mapcontrols';
+export * from './three-maskpass';
+export * from './three-mtlloader';
+export * from './three-objloader';
+export * from './three-octree';
+export * from './three-orbitcontrols';
+export * from './three-orthographictrackballcontrols';
+export * from './three-outlinepass';
+export * from './three-projector';
+export * from './three-renderpass';
+export * from './three-shaderpass';
+export * from './three-smaapass';
+export * from './three-ssaapass';
+export * from './three-filmpass';
+export * from './three-tgaloader';
+export * from './three-trackballcontrols';
+export * from './three-transformcontrols';
+export * from './three-unrealbloompass';
+export * from './three-vrcontrols';
+export * from './three-vreffect';
 
 export as namespace THREE;
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 7d871cae58..a70bed59ab 100755
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -3115,7 +3115,7 @@ export interface ShaderMaterialParameters extends MaterialParameters {
     uniforms?: any;
     vertexShader?: string;
     fragmentShader?: string;
-    lineWidth?: number;
+    linewidth?: number;
     wireframe?: boolean;
     wireframeLinewidth?: number;
     lights?: boolean;

From cc0204331ad27c1521dfe843bcbdcc7cc07ab643 Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Sat, 16 Feb 2019 10:23:06 +0800
Subject: [PATCH 043/924] Add a file

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

diff --git a/types/gun/tsconfig.json b/types/gun/tsconfig.json
index 10fe933ba8..0b6beab5e6 100644
--- a/types/gun/tsconfig.json
+++ b/types/gun/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "gun.d.ts",
         "gun-tests.ts"
     ]
 }

From 3608c2b445f0880da1dd8b5f9f1ecc6f2b9e15be Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Sat, 16 Feb 2019 10:53:32 +0800
Subject: [PATCH 044/924] Fix error

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

diff --git a/types/gun/gun.d.ts b/types/gun/gun.d.ts
index 841dfa34a9..47b40a68f7 100644
--- a/types/gun/gun.d.ts
+++ b/types/gun/gun.d.ts
@@ -1,3 +1,2 @@
-
-declare const cons: typeof import('gun')
-export = cons
+declare const cons: typeof import('./index');
+export = cons;

From 4c289f20b316db92b0cb4750ce20ebe82596dc28 Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Sun, 17 Feb 2019 12:31:18 +0100
Subject: [PATCH 045/924] Updated definition for Tween callback property. Now
 tslint won't show error if I pass a function with parameteres to callback in
 TweenMax/TweenLite/TimelineMax/TimelineLite.

---
 types/gsap/Animation.d.ts   |  4 ++--
 types/gsap/Ease.d.ts        |  2 +-
 types/gsap/Timeline.d.ts    | 14 +++++++-------
 types/gsap/Tween.d.ts       | 14 +++++++-------
 types/gsap/TweenConfig.d.ts | 12 ++++++------
 types/gsap/gsap-tests.ts    | 18 ++++++++++++++++--
 types/gsap/index.d.ts       |  1 +
 7 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/types/gsap/Animation.d.ts b/types/gsap/Animation.d.ts
index 8744e205bf..c5f4449ea3 100644
--- a/types/gsap/Animation.d.ts
+++ b/types/gsap/Animation.d.ts
@@ -29,8 +29,8 @@ declare namespace gsap {
          * Gets or sets an event callback like "onComplete", "onUpdate", "onStart", "onReverseComplete" or "onRepeat" (onRepeat only applies to TweenMax or TimelineMax instances) along with any
          * parameters that should be passed to that callback.
          */
-        eventCallback(type: string): () => void;
-        eventCallback(type: string, callback: () => void, params?: any[], scope?: any): Animation;
+        eventCallback(type: string): (...args: any) => void;
+        eventCallback(type: string, callback: (...args: any) => void, params?: any[], scope?: any): Animation;
 
         /**
          * Clears any initialization data (like starting/ending values in tweens) which can be useful if, for example, you want to restart a tween without reverting to any previously recorded
diff --git a/types/gsap/Ease.d.ts b/types/gsap/Ease.d.ts
index 56603b5ed1..fe25a11c74 100644
--- a/types/gsap/Ease.d.ts
+++ b/types/gsap/Ease.d.ts
@@ -1,6 +1,6 @@
 declare namespace gsap {
     class Ease {
-        constructor(func?: () => void, extraParams?: any[], type?: number, power?: number);
+        constructor(func?: (...args: any) => void, extraParams?: any[], type?: number, power?: number);
 
         /** Translates the tween's progress ratio into the corresponding ease ratio. */
         getRatio(p: number): number;
diff --git a/types/gsap/Timeline.d.ts b/types/gsap/Timeline.d.ts
index 232d2ed9a3..b859a2e803 100644
--- a/types/gsap/Timeline.d.ts
+++ b/types/gsap/Timeline.d.ts
@@ -31,13 +31,13 @@ declare namespace gsap {
         addLabel(label: string, position: any): TimelineLite;
 
         /** Inserts a special callback that pauses playback of the timeline at a particular time or label. */
-        addPause(position?: any, callback?: () => void, params?: any[], scope?: any): TimelineLite;
+        addPause(position?: any, callback?: (...args: any) => void, params?: any[], scope?: any): TimelineLite;
 
         /**
          * Adds a callback to the end of the timeline (or elsewhere using the "position" parameter) - this is a convenience method that accomplishes exactly the same thing as
          * add( TweenLite.delayedCall(...) ) but with less code.
          */
-        call(callback: () => void, params?: any[], scope?: any, position?: any): TimelineLite;
+        call(callback: (...args: any) => void, params?: any[], scope?: any, position?: any): TimelineLite;
 
         /** Empties the timeline of all tweens, timelines, and callbacks (and optionally labels too). */
         clear(labels?: boolean): TimelineLite;
@@ -106,7 +106,7 @@ declare namespace gsap {
             vars: {},
             stagger?: number,
             position?: any,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteScope?: any
         ): TimelineLite;
@@ -122,7 +122,7 @@ declare namespace gsap {
             toVars: {},
             stagger?: number,
             position?: any,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): TimelineLite;
@@ -137,7 +137,7 @@ declare namespace gsap {
             vars: {},
             stagger: number,
             position?: any,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): TimelineLite;
@@ -156,14 +156,14 @@ declare namespace gsap {
     class TimelineMax extends TimelineLite {
         constructor(vars?: {});
 
-        addCallback(callback: () => void, position: any, params?: any[], scope?: any): TimelineMax;
+        addCallback(callback: (...args: any) => void, position: any, params?: any[], scope?: any): TimelineMax;
         currentLabel(): string;
         currentLabel(value: string): TimelineMax;
         getActive(nested?: boolean, tweens?: boolean, timelines?: boolean): Tween | Timeline[];
         getLabelAfter(time: number): string;
         getLabelBefore(time: number): string;
         getLabelsArray(): Array<{ name: string; time: number }>;
-        removeCallback(callback: () => void, timeOrLabel?: any): TimelineMax;
+        removeCallback(callback: (...args: any) => void, timeOrLabel?: any): TimelineMax;
         removePause(position: any): TimelineMax;
         repeat(): number;
         repeat(value: number): TimelineMax;
diff --git a/types/gsap/Tween.d.ts b/types/gsap/Tween.d.ts
index 11de164f00..404daef039 100644
--- a/types/gsap/Tween.d.ts
+++ b/types/gsap/Tween.d.ts
@@ -22,7 +22,7 @@ declare namespace gsap {
         static ticker: any;
 
         /** Provides a simple way to call a () => void after a set amount of time (or frames). */
-        static delayedCall(delay: number, callback: () => void, params?: any[], scope?: any, useFrames?: boolean): TweenLite;
+        static delayedCall(delay: number, callback: (...args: any) => void, params?: any[], scope?: any, useFrames?: boolean): TweenLite;
 
         /**
          * Static method for creating a TweenLite instance that tweens backwards - you define the BEGINNING values and the current values are used as the destination values which is great for doing
@@ -49,7 +49,7 @@ declare namespace gsap {
         invalidate(): TweenLite;
 
         /** Immediately kills all of the delayedCalls to a particular () => void. */
-        static killDelayedCallsTo(func: () => void): void;
+        static killDelayedCallsTo(func: (...args: any) => void): void;
 
         /** Kills all the tweens (or specific tweening properties) of a particular object or delayedCalls to a particular () => void. */
         static killTweensOf(target: any, onlyActive?: boolean, vars?: any): void;
@@ -74,7 +74,7 @@ declare namespace gsap {
         constructor(target: {}, duration: number, vars: {});
 
         /** Provides a simple way to call a () => void after a set amount of time (or frames). */
-        static delayedCall(delay: number, callback: () => void, params?: any[], scope?: {}, useFrames?: boolean): TweenMax;
+        static delayedCall(delay: number, callback: (...args: any) => void, params?: any[], scope?: {}, useFrames?: boolean): TweenMax;
 
         /**
          * Static method for creating a TweenMax instance that tweens backwards - you define the BEGINNING values and the current values are used as the destination values which is great for
@@ -110,7 +110,7 @@ declare namespace gsap {
         static killChildTweensOf(parent: any, complete?: boolean): void;
 
         /** Immediately kills all of the delayedCalls to a particular () => void. */
-        static killDelayedCallsTo(func: () => void): void;
+        static killDelayedCallsTo(func: (...args: any) => void): void;
 
         /** Kills all the tweens (or specific tweening properties) of a particular object or the delayedCalls to a particular () => void. */
         static killTweensOf(target: {}, vars?: {}): void;
@@ -144,7 +144,7 @@ declare namespace gsap {
             duration: number,
             vars: {},
             stagger: number,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
@@ -159,7 +159,7 @@ declare namespace gsap {
             fromVars: {},
             toVars: {},
             stagger: number,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
@@ -173,7 +173,7 @@ declare namespace gsap {
             duration: number,
             vars: {},
             stagger: number,
-            onCompleteAll?: () => void,
+            onCompleteAll?: (...args: any) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
diff --git a/types/gsap/TweenConfig.d.ts b/types/gsap/TweenConfig.d.ts
index 38b00404e6..8a1698efaa 100644
--- a/types/gsap/TweenConfig.d.ts
+++ b/types/gsap/TweenConfig.d.ts
@@ -23,7 +23,7 @@ declare namespace gsap {
         overwrite?: string | number;
 
         /**  A () => void that should be called when the animation has completed. */
-        onComplete?: () => void;
+        onComplete?: (...args: any) => void;
 
         /** An Array of parameters to pass the onComplete () => void */
         onCompleteParams?: any[];
@@ -39,7 +39,7 @@ declare namespace gsap {
         immediateRender?: boolean;
 
         /** A () => void that should be called when the tween has reached its beginning again from the reverse direction. */
-        onReverseComplete?: () => void;
+        onReverseComplete?: (...args: any) => void;
 
         /** An Array of parameters to pass the onReverseComplete () => void. */
         onReverseCompleteParams?: any[];
@@ -48,7 +48,7 @@ declare namespace gsap {
         onReverseCompleteScope?: {};
 
         /** A () => void that should be called when the tween begins (when its time changes from 0 to some other value which can happen more than once if the tween is restarted multiple times). */
-        onStart?: () => void;
+        onStart?: (...args: any) => void;
 
         /** An Array of parameters to pass the onStart () => void. */
         onStartParams?: any[];
@@ -57,7 +57,7 @@ declare namespace gsap {
         onStartScope?: {};
 
         /** A () => void that should be called every time the animation updates (on every frame while the animation is active). */
-        onUpdate?: () => void;
+        onUpdate?: (...args: any) => void;
 
         /** An Array of parameters to pass the onUpdate () => void. */
         onUpdateParams?: any[];
@@ -81,7 +81,7 @@ declare namespace gsap {
         lazy?: boolean;
 
         /** A () => void that should be called when the tween gets overwritten by another tween. */
-        onOverwrite?: () => void;
+        onOverwrite?: (...args: any) => void;
 
         /** If true atuomatically populates the css property for tween on DOM elements */
         autoCSS?: boolean;
@@ -95,7 +95,7 @@ declare namespace gsap {
 
         repeatDelay?: number;
 
-        onRepeat?: () => void;
+        onRepeat?: (...args: any) => void;
 
         onRepeatScope?: {};
     }
diff --git a/types/gsap/gsap-tests.ts b/types/gsap/gsap-tests.ts
index 36192141be..63a06e10b8 100644
--- a/types/gsap/gsap-tests.ts
+++ b/types/gsap/gsap-tests.ts
@@ -1,11 +1,22 @@
 import { TweenLite, TweenMax } from 'gsap';
 
+const callbackWithoutParams = () => {
+    console.log('I Have No Parameters.')
+}
+
+const callbackWithParams = (...args: any) => {
+    console.log('I Have Parameters.')
+    console.log(args);
+}
+
+
 const tweenLiteExample = TweenLite
     .to(document.getElementById('some-div'), 1, {
         width: '200px',
         height: '200px',
         x: '100px',
-        y: '200px'
+        y: '200px',
+        onComplete: callbackWithoutParams
     })
     .seek(0.5);
 
@@ -14,6 +25,9 @@ const tweenMaxExample = TweenMax
     width: '200px',
     height: '200px',
     x: '100px',
-    y: '200px'
+    y: '200px',
+    onComplete: callbackWithParams,
+    onCompleteParams: ['foo', 'bar']
   })
   .seek(0.5);
+
diff --git a/types/gsap/index.d.ts b/types/gsap/index.d.ts
index 5e3081cc6a..5f1a20a17d 100644
--- a/types/gsap/index.d.ts
+++ b/types/gsap/index.d.ts
@@ -5,6 +5,7 @@
 //                  Richard Fox <https://github.com/ProbablePrime>,
 //                  Philip Bulley <https://github.com/philipbulley>,
 //                  Leonardo Melo <https://github.com/leomeloxp>
+//                  Adem Hodzic <https://github.com/AdemHodzic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="Animation.d.ts"/>

From 503ba49983bed8c7221d080807eba97df2864d87 Mon Sep 17 00:00:00 2001
From: Hodzic Adem <athos.blade@gmail.com>
Date: Sun, 17 Feb 2019 14:43:09 +0100
Subject: [PATCH 046/924] Fixed error where I declared ...args as type any
 instead of any[]

---
 types/gsap/Animation.d.ts   |  4 ++--
 types/gsap/Ease.d.ts        |  2 +-
 types/gsap/Timeline.d.ts    | 14 +++++++-------
 types/gsap/Tween.d.ts       | 14 +++++++-------
 types/gsap/TweenConfig.d.ts | 12 ++++++------
 types/gsap/gsap-tests.ts    | 11 +++++------
 6 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/types/gsap/Animation.d.ts b/types/gsap/Animation.d.ts
index c5f4449ea3..1c26798810 100644
--- a/types/gsap/Animation.d.ts
+++ b/types/gsap/Animation.d.ts
@@ -29,8 +29,8 @@ declare namespace gsap {
          * Gets or sets an event callback like "onComplete", "onUpdate", "onStart", "onReverseComplete" or "onRepeat" (onRepeat only applies to TweenMax or TimelineMax instances) along with any
          * parameters that should be passed to that callback.
          */
-        eventCallback(type: string): (...args: any) => void;
-        eventCallback(type: string, callback: (...args: any) => void, params?: any[], scope?: any): Animation;
+        eventCallback(type: string): (...args: any[]) => void;
+        eventCallback(type: string, callback: (...args: any[]) => void, params?: any[], scope?: any): Animation;
 
         /**
          * Clears any initialization data (like starting/ending values in tweens) which can be useful if, for example, you want to restart a tween without reverting to any previously recorded
diff --git a/types/gsap/Ease.d.ts b/types/gsap/Ease.d.ts
index fe25a11c74..a7c594ef41 100644
--- a/types/gsap/Ease.d.ts
+++ b/types/gsap/Ease.d.ts
@@ -1,6 +1,6 @@
 declare namespace gsap {
     class Ease {
-        constructor(func?: (...args: any) => void, extraParams?: any[], type?: number, power?: number);
+        constructor(func?: (...args: any[]) => void, extraParams?: any[], type?: number, power?: number);
 
         /** Translates the tween's progress ratio into the corresponding ease ratio. */
         getRatio(p: number): number;
diff --git a/types/gsap/Timeline.d.ts b/types/gsap/Timeline.d.ts
index b859a2e803..74b9e50396 100644
--- a/types/gsap/Timeline.d.ts
+++ b/types/gsap/Timeline.d.ts
@@ -31,13 +31,13 @@ declare namespace gsap {
         addLabel(label: string, position: any): TimelineLite;
 
         /** Inserts a special callback that pauses playback of the timeline at a particular time or label. */
-        addPause(position?: any, callback?: (...args: any) => void, params?: any[], scope?: any): TimelineLite;
+        addPause(position?: any, callback?: (...args: any[]) => void, params?: any[], scope?: any): TimelineLite;
 
         /**
          * Adds a callback to the end of the timeline (or elsewhere using the "position" parameter) - this is a convenience method that accomplishes exactly the same thing as
          * add( TweenLite.delayedCall(...) ) but with less code.
          */
-        call(callback: (...args: any) => void, params?: any[], scope?: any, position?: any): TimelineLite;
+        call(callback: (...args: any[]) => void, params?: any[], scope?: any, position?: any): TimelineLite;
 
         /** Empties the timeline of all tweens, timelines, and callbacks (and optionally labels too). */
         clear(labels?: boolean): TimelineLite;
@@ -106,7 +106,7 @@ declare namespace gsap {
             vars: {},
             stagger?: number,
             position?: any,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteScope?: any
         ): TimelineLite;
@@ -122,7 +122,7 @@ declare namespace gsap {
             toVars: {},
             stagger?: number,
             position?: any,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): TimelineLite;
@@ -137,7 +137,7 @@ declare namespace gsap {
             vars: {},
             stagger: number,
             position?: any,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): TimelineLite;
@@ -156,14 +156,14 @@ declare namespace gsap {
     class TimelineMax extends TimelineLite {
         constructor(vars?: {});
 
-        addCallback(callback: (...args: any) => void, position: any, params?: any[], scope?: any): TimelineMax;
+        addCallback(callback: (...args: any[]) => void, position: any, params?: any[], scope?: any): TimelineMax;
         currentLabel(): string;
         currentLabel(value: string): TimelineMax;
         getActive(nested?: boolean, tweens?: boolean, timelines?: boolean): Tween | Timeline[];
         getLabelAfter(time: number): string;
         getLabelBefore(time: number): string;
         getLabelsArray(): Array<{ name: string; time: number }>;
-        removeCallback(callback: (...args: any) => void, timeOrLabel?: any): TimelineMax;
+        removeCallback(callback: (...args: any[]) => void, timeOrLabel?: any): TimelineMax;
         removePause(position: any): TimelineMax;
         repeat(): number;
         repeat(value: number): TimelineMax;
diff --git a/types/gsap/Tween.d.ts b/types/gsap/Tween.d.ts
index 404daef039..3dd15ca685 100644
--- a/types/gsap/Tween.d.ts
+++ b/types/gsap/Tween.d.ts
@@ -22,7 +22,7 @@ declare namespace gsap {
         static ticker: any;
 
         /** Provides a simple way to call a () => void after a set amount of time (or frames). */
-        static delayedCall(delay: number, callback: (...args: any) => void, params?: any[], scope?: any, useFrames?: boolean): TweenLite;
+        static delayedCall(delay: number, callback: (...args: any[]) => void, params?: any[], scope?: any, useFrames?: boolean): TweenLite;
 
         /**
          * Static method for creating a TweenLite instance that tweens backwards - you define the BEGINNING values and the current values are used as the destination values which is great for doing
@@ -49,7 +49,7 @@ declare namespace gsap {
         invalidate(): TweenLite;
 
         /** Immediately kills all of the delayedCalls to a particular () => void. */
-        static killDelayedCallsTo(func: (...args: any) => void): void;
+        static killDelayedCallsTo(func: (...args: any[]) => void): void;
 
         /** Kills all the tweens (or specific tweening properties) of a particular object or delayedCalls to a particular () => void. */
         static killTweensOf(target: any, onlyActive?: boolean, vars?: any): void;
@@ -74,7 +74,7 @@ declare namespace gsap {
         constructor(target: {}, duration: number, vars: {});
 
         /** Provides a simple way to call a () => void after a set amount of time (or frames). */
-        static delayedCall(delay: number, callback: (...args: any) => void, params?: any[], scope?: {}, useFrames?: boolean): TweenMax;
+        static delayedCall(delay: number, callback: (...args: any[]) => void, params?: any[], scope?: {}, useFrames?: boolean): TweenMax;
 
         /**
          * Static method for creating a TweenMax instance that tweens backwards - you define the BEGINNING values and the current values are used as the destination values which is great for
@@ -110,7 +110,7 @@ declare namespace gsap {
         static killChildTweensOf(parent: any, complete?: boolean): void;
 
         /** Immediately kills all of the delayedCalls to a particular () => void. */
-        static killDelayedCallsTo(func: (...args: any) => void): void;
+        static killDelayedCallsTo(func: (...args: any[]) => void): void;
 
         /** Kills all the tweens (or specific tweening properties) of a particular object or the delayedCalls to a particular () => void. */
         static killTweensOf(target: {}, vars?: {}): void;
@@ -144,7 +144,7 @@ declare namespace gsap {
             duration: number,
             vars: {},
             stagger: number,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
@@ -159,7 +159,7 @@ declare namespace gsap {
             fromVars: {},
             toVars: {},
             stagger: number,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
@@ -173,7 +173,7 @@ declare namespace gsap {
             duration: number,
             vars: {},
             stagger: number,
-            onCompleteAll?: (...args: any) => void,
+            onCompleteAll?: (...args: any[]) => void,
             onCompleteAllParams?: any[],
             onCompleteAllScope?: any
         ): any[];
diff --git a/types/gsap/TweenConfig.d.ts b/types/gsap/TweenConfig.d.ts
index 8a1698efaa..9912613694 100644
--- a/types/gsap/TweenConfig.d.ts
+++ b/types/gsap/TweenConfig.d.ts
@@ -23,7 +23,7 @@ declare namespace gsap {
         overwrite?: string | number;
 
         /**  A () => void that should be called when the animation has completed. */
-        onComplete?: (...args: any) => void;
+        onComplete?: (...args: any[]) => void;
 
         /** An Array of parameters to pass the onComplete () => void */
         onCompleteParams?: any[];
@@ -39,7 +39,7 @@ declare namespace gsap {
         immediateRender?: boolean;
 
         /** A () => void that should be called when the tween has reached its beginning again from the reverse direction. */
-        onReverseComplete?: (...args: any) => void;
+        onReverseComplete?: (...args: any[]) => void;
 
         /** An Array of parameters to pass the onReverseComplete () => void. */
         onReverseCompleteParams?: any[];
@@ -48,7 +48,7 @@ declare namespace gsap {
         onReverseCompleteScope?: {};
 
         /** A () => void that should be called when the tween begins (when its time changes from 0 to some other value which can happen more than once if the tween is restarted multiple times). */
-        onStart?: (...args: any) => void;
+        onStart?: (...args: any[]) => void;
 
         /** An Array of parameters to pass the onStart () => void. */
         onStartParams?: any[];
@@ -57,7 +57,7 @@ declare namespace gsap {
         onStartScope?: {};
 
         /** A () => void that should be called every time the animation updates (on every frame while the animation is active). */
-        onUpdate?: (...args: any) => void;
+        onUpdate?: (...args: any[]) => void;
 
         /** An Array of parameters to pass the onUpdate () => void. */
         onUpdateParams?: any[];
@@ -81,7 +81,7 @@ declare namespace gsap {
         lazy?: boolean;
 
         /** A () => void that should be called when the tween gets overwritten by another tween. */
-        onOverwrite?: (...args: any) => void;
+        onOverwrite?: (...args: any[]) => void;
 
         /** If true atuomatically populates the css property for tween on DOM elements */
         autoCSS?: boolean;
@@ -95,7 +95,7 @@ declare namespace gsap {
 
         repeatDelay?: number;
 
-        onRepeat?: (...args: any) => void;
+        onRepeat?: (...args: any[]) => void;
 
         onRepeatScope?: {};
     }
diff --git a/types/gsap/gsap-tests.ts b/types/gsap/gsap-tests.ts
index 63a06e10b8..411ca19d0c 100644
--- a/types/gsap/gsap-tests.ts
+++ b/types/gsap/gsap-tests.ts
@@ -1,13 +1,13 @@
 import { TweenLite, TweenMax } from 'gsap';
 
 const callbackWithoutParams = () => {
-    console.log('I Have No Parameters.')
-}
+    console.log('I Have No Parameters.');
+};
 
-const callbackWithParams = (...args: any) => {
-    console.log('I Have Parameters.')
+const callbackWithParams = (...args: any[]) => {
+    console.log('I Have Parameters.');
     console.log(args);
-}
+};
 
 
 const tweenLiteExample = TweenLite
@@ -30,4 +30,3 @@ const tweenMaxExample = TweenMax
     onCompleteParams: ['foo', 'bar']
   })
   .seek(0.5);
-

From 9a862d8342ebee85959cf03e676631171059c13a Mon Sep 17 00:00:00 2001
From: nulladdict <nulladdict@ya.ru>
Date: Mon, 18 Feb 2019 14:45:02 +0500
Subject: [PATCH 047/924] fix(rc-slider): add tabIndex to Handle props

---
 types/rc-slider/index.d.ts          | 6 ++++++
 types/rc-slider/rc-slider-tests.tsx | 1 +
 2 files changed, 7 insertions(+)

diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index ba40bc0d7d..1f16fbe267 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -6,6 +6,7 @@
 //                 Jacob Froman <https://github.com/j-fro>
 //                 Deanna Veale <https://github.com/Deanna2>
 //                 Nick Maddren <https://github.com/nicholasmaddren>
+//                 Roman Nevolin <https://github.com/nulladdict>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -204,6 +205,11 @@ export interface HandleProps extends CommonApiProps {
      * Styling option offset
      */
     offset: number;
+   /**
+    * Set the tabIndex of the slider handle.
+    * @default 0
+    */
+    tabIndex?: number;
 }
 
 export interface WithTooltipProps {
diff --git a/types/rc-slider/rc-slider-tests.tsx b/types/rc-slider/rc-slider-tests.tsx
index 5b246dd7ab..15aea1ff4c 100644
--- a/types/rc-slider/rc-slider-tests.tsx
+++ b/types/rc-slider/rc-slider-tests.tsx
@@ -15,6 +15,7 @@ ReactDOM.render(
         className="bottom"
         vertical={true}
         offset={10}
+        tabIndex={-1}
     />,
     document.querySelector('.another-app')
 );

From 0dd0e94685778cf1e1c3c4e091d6bf4c8fb58dee Mon Sep 17 00:00:00 2001
From: lukostry <lukasz.ostrowski85@gmail.com>
Date: Mon, 18 Feb 2019 12:44:53 +0100
Subject: [PATCH 048/924] Do not use default export, align indentation

---
 types/ink-select-input/index.d.ts             |  8 +++--
 .../ink-select-input-tests.tsx                | 33 +++++++++++--------
 types/ink-select-input/tsconfig.json          |  1 +
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/types/ink-select-input/index.d.ts b/types/ink-select-input/index.d.ts
index 2dc38d2a86..2654084e25 100644
--- a/types/ink-select-input/index.d.ts
+++ b/types/ink-select-input/index.d.ts
@@ -6,12 +6,12 @@
 
 import { Component, InkComponent } from 'ink';
 
-export interface ItemOfSelectInput {
+interface ItemOfSelectInput {
     label: string;
     value: any;
 }
 
-export interface SelectInputProps<T extends ItemOfSelectInput = ItemOfSelectInput> {
+interface SelectInputProps<T extends ItemOfSelectInput = ItemOfSelectInput> {
     focus?: boolean;
     indicatorComponent?: InkComponent;
     itemComponent?: InkComponent;
@@ -20,4 +20,6 @@ export interface SelectInputProps<T extends ItemOfSelectInput = ItemOfSelectInpu
     onSelect?: (item: T) => void;
 }
 
-export default class SelectInput extends Component<SelectInputProps> { }
+declare class SelectInput extends Component<SelectInputProps> { }
+
+export = SelectInput;
diff --git a/types/ink-select-input/ink-select-input-tests.tsx b/types/ink-select-input/ink-select-input-tests.tsx
index 4120cbf43e..da29f9918e 100644
--- a/types/ink-select-input/ink-select-input-tests.tsx
+++ b/types/ink-select-input/ink-select-input-tests.tsx
@@ -1,27 +1,32 @@
 /** @jsx h */
 import { h, InkComponent } from 'ink';
 import SelectInput from 'ink-select-input';
+// NOTE: `import SelectInput = require('ink-select-input');` will work as well.
+// If importing using ES6 default import as above,
+// `allowSyntheticDefaultImports` flag in compiler options needs to be set to `true`
 
 interface DemoItem {
-  label: string;
-  value: string;
+    label: string;
+     value: string;
 }
 
 const items: ReadonlyArray<DemoItem> = [{
-  label: 'First',
-  value: 'first'
-}, {
-  label: 'Second',
-  value: 'second'
-}, {
-  label: 'Third',
-  value: 'third'
+    label: 'First',
+    value: 'first'
+},
+{
+    label: 'Second',
+    value: 'second'
+},
+{
+    label: 'Third',
+    value: 'third'
 }];
 
 const Demo: InkComponent = () => {
-  const handleSelect = (item: DemoItem) => {
-    console.log(item);
-  };
+    const handleSelect = (item: DemoItem) => {
+        console.log(item);
+    };
 
-  return <SelectInput items={items} onSelect={handleSelect} />;
+    return <SelectInput items={items} onSelect={handleSelect} />;
 };
diff --git a/types/ink-select-input/tsconfig.json b/types/ink-select-input/tsconfig.json
index 4ae1e800aa..a3a689e150 100644
--- a/types/ink-select-input/tsconfig.json
+++ b/types/ink-select-input/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
         "jsx": "react",
         "module": "commonjs",
         "lib": [

From 5da9f8e32520cc1412548d53d7232cb2df678df0 Mon Sep 17 00:00:00 2001
From: Ulrik Strid <ulrik.strid@xenit.se>
Date: Mon, 18 Feb 2019 15:13:54 +0100
Subject: [PATCH 049/924] Update to new ParameterizedContext

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

diff --git a/types/koa-send/index.d.ts b/types/koa-send/index.d.ts
index a4b090e1ea..bf6ddae297 100644
--- a/types/koa-send/index.d.ts
+++ b/types/koa-send/index.d.ts
@@ -6,17 +6,17 @@
 // TypeScript Version: 2.3
 
 import {
-    Context,
+    ParameterizedContext,
 } from "koa";
 
 import {
     Stats,
 } from "fs";
 
-declare function send(ctx: Context, path: string, opts?: send.SendOptions): Promise<string>;
+declare function send(ctx: ParameterizedContext, path: string, opts?: send.SendOptions): Promise<string>;
 
 declare namespace send {
-    type SetHeaders = (res: Context["res"], path: string, stats: Stats) => any;
+    type SetHeaders = (res: ParameterizedContext["res"], path: string, stats: Stats) => any;
 
     interface SendOptions {
         /** Browser cache max-age in milliseconds. (defaults to 0) */

From d6f5a4028604ae5b82a0a39e6e45cd0099f937ef Mon Sep 17 00:00:00 2001
From: Ulf Jaenicke-Roessler <ujr@insynergie.de>
Date: Mon, 18 Feb 2019 17:21:52 +0100
Subject: [PATCH 050/924] utils.parseKey now conforms to current API

keyParser had been rewritten - see new documentation at https://github.com/mscdex/ssh2-streams#utility-methods
---
 types/ssh2-streams/index.d.ts            | 18 ++++++------------
 types/ssh2-streams/ssh2-streams-tests.ts |  4 +---
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/types/ssh2-streams/index.d.ts b/types/ssh2-streams/index.d.ts
index 54d6359538..8b2530edb0 100644
--- a/types/ssh2-streams/index.d.ts
+++ b/types/ssh2-streams/index.d.ts
@@ -1686,23 +1686,17 @@ export interface Stats extends Attributes {
 }
 
 export namespace utils {
-    export function parseKey(keyData: string | Buffer): ParsedKey | Error;
-    export function genPublicKey(privKeyInfo: ParsedKey): ParsedKey;
-    export function decryptKey(privKeyInfo: ParsedKey, passphrase: string): void;
+    export function parseKey(keyData: string | Buffer, passphrase?: string): ParsedKey | {}[];
 }
 
 export interface ParsedKey {
-    fulltype: string;
     type: string;
-    extra: string;
     comment: string;
-    encryption: string;
-    private: Buffer;
-    privateOrig: Buffer;
-    public: Buffer;
-    publicOrig: Buffer;
-    ppk?: boolean;
-    privateMAC?: string;
+    getPrivatePEM(): string;
+    getPublicPEM(): string;
+    getPublicSSH(): string;
+    sign(data: string | Buffer): Buffer | Error;
+    verify(data: string | Buffer, signature: Buffer): boolean | Error;
 }
 
 export interface ReadFileOptions {
diff --git a/types/ssh2-streams/ssh2-streams-tests.ts b/types/ssh2-streams/ssh2-streams-tests.ts
index 7fd73756d5..c813d4eeb4 100644
--- a/types/ssh2-streams/ssh2-streams-tests.ts
+++ b/types/ssh2-streams/ssh2-streams-tests.ts
@@ -87,9 +87,7 @@ server.forwardedTcpip(0, 0, 0, { bindAddr: "bindAddr", bindPort: 8080, remoteAdd
 server.x11(0, 0, 0, { originAddr: "originAddr", originPort: 0 });
 server.openssh_forwardedStreamLocal(0, 0, 0, { socketPath: "socketPath" });
 
-const maybeParsedKey = ssh2.utils.parseKey("keyData");
-ssh2.utils.decryptKey(parsedKey, "passphrase");
-const publicKey = ssh2.utils.genPublicKey(parsedKey);
+const maybeParsedKey = ssh2.utils.parseKey("keyData", "passphrase");
 
 
 declare const attrs: ssh2.Attributes;

From b1ec3f67daaa011aaeeb21cda312ed2305123ac1 Mon Sep 17 00:00:00 2001
From: Ulf Jaenicke-Roessler <ujr@insynergie.de>
Date: Mon, 18 Feb 2019 17:54:38 +0100
Subject: [PATCH 051/924] Fix ssh2 tests

---
 types/ssh2/ssh2-tests.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/ssh2/ssh2-tests.ts b/types/ssh2/ssh2-tests.ts
index b3364cd489..bcf31a493b 100644
--- a/types/ssh2/ssh2-tests.ts
+++ b/types/ssh2/ssh2-tests.ts
@@ -313,7 +313,8 @@ var buffersEqual = require('buffer-equal-constant-time'),
     //ssh2 = require('ssh2'),
     utils = ssh2.utils;
 
-var pubKey = utils.genPublicKey(utils.parseKey(fs.readFileSync('user.pub')) as ssh2_streams.ParsedKey);
+var pubKey = utils.parseKey(fs.readFileSync('user.pub')) as ssh2_streams.ParsedKey;
+var pubKeySSH = Buffer.from(pubKey.getPublicSSH());
 
 new ssh2.Server({
     hostKeys: [fs.readFileSync('host.key')]
@@ -326,15 +327,14 @@ new ssh2.Server({
             && ctx.password === 'bar')
             ctx.accept();
         else if (ctx.method === 'publickey'
-            && ctx.key.algo === pubKey.fulltype
-            && buffersEqual(ctx.key.data, pubKey.public)) {
+            && ctx.key.algo === pubKey.type
+            && buffersEqual(ctx.key.data, pubKeySSH)) {
             if (ctx.signature) {
-                var verifier = crypto.createVerify(ctx.sigAlgo);
-                verifier.update(ctx.blob);
-                if (verifier.verify(pubKey.publicOrig.toString("utf8"), ctx.signature))
+                if (pubKey.verify(ctx.blob, ctx.signature)) {
                     ctx.accept();
-                else
+                } else {
                     ctx.reject();
+                }
             } else {
                 // if no signature present, that means the client is just checking
                 // the validity of the given public key

From b57d44c4c9bfff531b35a9210b9d2d3a84d24aba Mon Sep 17 00:00:00 2001
From: Olga Isakova <penumbral@yandex.ru>
Date: Tue, 19 Feb 2019 02:02:28 +0500
Subject: [PATCH 052/924] Adjust the export to work with esModuleInterop

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

diff --git a/types/mongo-sanitize/index.d.ts b/types/mongo-sanitize/index.d.ts
index 44c5d04a7d..1c5308d55c 100644
--- a/types/mongo-sanitize/index.d.ts
+++ b/types/mongo-sanitize/index.d.ts
@@ -1,9 +1,9 @@
 // Type definitions for mongo-sanitize 1.0
 // Project: https://github.com/vkarpov15/mongo-sanitize
-// Definitions by: Cedric Cazin <https://github.com/CedricCazin>
+// Definitions by: Cedric Cazin <https://github.com/CedricCazin>, Olga Isakova <https://github.com/penumbra1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-export function sanitize<T extends object>(v: T): T;
+declare function sanitize<T>(v: T): T;
 
-export as namespace mongoSanitize;
+export = sanitize;

From 5bf116d71b09273334b70f5e96a272ad5fa4c104 Mon Sep 17 00:00:00 2001
From: Olga Isakova <penumbral@yandex.ru>
Date: Tue, 19 Feb 2019 02:19:33 +0500
Subject: [PATCH 053/924] Tests, TS version

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

diff --git a/types/mongo-sanitize/index.d.ts b/types/mongo-sanitize/index.d.ts
index 1c5308d55c..aedff46b0b 100644
--- a/types/mongo-sanitize/index.d.ts
+++ b/types/mongo-sanitize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/vkarpov15/mongo-sanitize
 // Definitions by: Cedric Cazin <https://github.com/CedricCazin>, Olga Isakova <https://github.com/penumbra1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.3
 
 declare function sanitize<T>(v: T): T;
 
diff --git a/types/mongo-sanitize/mongo-sanitize-tests.ts b/types/mongo-sanitize/mongo-sanitize-tests.ts
index 4d4534bbeb..3f86dc256e 100644
--- a/types/mongo-sanitize/mongo-sanitize-tests.ts
+++ b/types/mongo-sanitize/mongo-sanitize-tests.ts
@@ -1,11 +1,11 @@
-import * as mongoSanitize from 'mongo-sanitize';
+import sanitize from "mongo-sanitize";
 
-const objectSanitized = mongoSanitize.sanitize({ $gt: 5, a: 1 });
+const objectSanitized = sanitize({ $gt: 5, a: 1 });
 
-const arraySanitized = mongoSanitize.sanitize([1, 2, 3]);
+const arraySanitized = sanitize([1, 2, 3]);
 
 class Clazz {
     $gt = 5;
     a = 1;
 }
-const classSanitized = mongoSanitize.sanitize(new Clazz());
+const classSanitized = sanitize(new Clazz());

From 4892ced5f9f1d162d7a5de00159cfec77f9a724c Mon Sep 17 00:00:00 2001
From: Colin Doig <colindoig@gmail.com>
Date: Tue, 19 Feb 2019 11:52:28 +1300
Subject: [PATCH 054/924] all fields except "name" optional in PlaceResult

---
 types/googlemaps/googlemaps-tests.ts |  7 ++++-
 types/googlemaps/index.d.ts          | 45 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/types/googlemaps/googlemaps-tests.ts b/types/googlemaps/googlemaps-tests.ts
index ac7217dd17..f0d3249942 100644
--- a/types/googlemaps/googlemaps-tests.ts
+++ b/types/googlemaps/googlemaps-tests.ts
@@ -124,7 +124,7 @@ data.setStyle({
     cursor: "pointer",
     fillColor: "#79B55B",
     fillOpacity: 1,
-    icon: <google.maps.Icon>{ url: "//maps.google.com/mapfiles/ms/icons/blue.png" },
+    icon: { url: "//maps.google.com/mapfiles/ms/icons/blue.png" } as google.maps.Icon,
     shape: { coords: [1, 2, 3], type: "circle" },
     strokeColor: "#79B55B",
     strokeOpacity: 1,
@@ -449,3 +449,8 @@ service.findPlaceFromPhoneNumber({
 
     results[0].name; // $ExpectType string
 });
+
+/***** google.maps.places.Autocomplete *****/
+const autocomplete = new google.maps.places.Autocomplete(document.createElement('input'));
+const placeResult = autocomplete.getPlace();
+placeResult.name; // $ExpectType string
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 099bb9ef68..8cefde2426 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -11,6 +11,7 @@
 //                  Sven Kreiss <https://github.com/svenkreiss>
 //                  Umar Bolatov <https://github.com/bolatovumar>
 //                  Michael Gauthier <https://github.com/gauthierm>
+//                  Colin Doig <https://github.com/captain-igloo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -2726,29 +2727,29 @@ declare namespace google.maps {
     }
 
     export interface PlaceResult {
-      address_components: GeocoderAddressComponent[];
-      adr_address: string;
-      aspects: PlaceAspectRating[];
-      formatted_address: string;
-      formatted_phone_number: string;
-      geometry: PlaceGeometry;
-      html_attributions: string[];
-      icon: string;
-      id: string;
-      international_phone_number: string;
+      address_components?: GeocoderAddressComponent[];
+      adr_address?: string;
+      aspects?: PlaceAspectRating[];
+      formatted_address?: string;
+      formatted_phone_number?: string;
+      geometry?: PlaceGeometry;
+      html_attributions?: string[];
+      icon?: string;
+      id?: string;
+      international_phone_number?: string;
       name: string;
-      opening_hours: OpeningHours;
-      permanently_closed: boolean;
-      photos: PlacePhoto[];
-      place_id: string;
-      price_level: number;
-      rating: number;
-      reviews: PlaceReview[];
-      types: string[];
-      url: string;
-      utc_offset: number;
-      vicinity: string;
-      website: string;
+      opening_hours?: OpeningHours;
+      permanently_closed?: boolean;
+      photos?: PlacePhoto[];
+      place_id?: string;
+      price_level?: number;
+      rating?: number;
+      reviews?: PlaceReview[];
+      types?: string[];
+      url?: string;
+      utc_offset?: number;
+      vicinity?: string;
+      website?: string;
     }
 
     export interface PlaceReview {

From 6fe9d46a90802a7d69b2af5476edb96a1c77fe17 Mon Sep 17 00:00:00 2001
From: Lydie Danet <lydie.danet@springload.co.nz>
Date: Tue, 19 Feb 2019 16:01:54 +1300
Subject: [PATCH 055/924] react-lazyload: Improve typing of children

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

diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index 3fd9b075e4..669169351e 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Component } from "react";
+import { Component, ReactNode } from "react";
 
 export interface LazyLoadProps {
     once?: boolean;
@@ -13,7 +13,7 @@ export interface LazyLoadProps {
     overflow?: boolean;
     resize?: boolean;
     scroll?: boolean;
-    children?: JSX.Element;
+    children?: ReactNode;
     throttle?: number | boolean;
     debounce?: number | boolean;
     placeholder?: any;

From 3e98e8cdb15fceee9e4db55c47f585a9b689d4df Mon Sep 17 00:00:00 2001
From: Lydie Danet <lydie.danet@springload.co.nz>
Date: Tue, 19 Feb 2019 16:14:04 +1300
Subject: [PATCH 056/924] react-lazyload: Improve typing of placeholder

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

diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index 669169351e..9d7453188a 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -16,7 +16,7 @@ export interface LazyLoadProps {
     children?: ReactNode;
     throttle?: number | boolean;
     debounce?: number | boolean;
-    placeholder?: any;
+    placeholder?: ReactNode;
     unmountIfInvisible?: boolean;
 }
 

From 1d0f83bf4bcd3e4b4e7010e5590b54cf2c223f6f Mon Sep 17 00:00:00 2001
From: Flexmonster <github@flexmonster.com>
Date: Mon, 18 Feb 2019 23:43:09 -0500
Subject: [PATCH 057/924] flexmonster d.ts update

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

diff --git a/types/flexmonster/index.d.ts b/types/flexmonster/index.d.ts
index 00a6c49bcb..a215a5ba3b 100644
--- a/types/flexmonster/index.d.ts
+++ b/types/flexmonster/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for flexmonster 2.6
-// Project: https://www.flexmonster.com/
+// Project: https://flexmonster.com/
 // Definitions by:  Flexmonster <https://github.com/flexmonster>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -135,6 +135,7 @@ declare namespace Flexmonster {
         showGridAndCharts(type?: string, position?: string, multiple?: boolean): void;
         sortingMethod(hierarchyName: string, compareFunction: (a: string, b: string) => boolean): void;
         sortValues(axisName: string, type: string, tuple: number[], measure: MeasureObject): void;
+        toolbar: Toolbar;
         updateData(object: DataSource | object[]): void;
         version: string;
         fusioncharts?: {
@@ -463,6 +464,34 @@ declare namespace Flexmonster {
 
     interface Toolbar {
         getTabs: () => ToolbarTab[];
+        // Connect tab
+        connectLocalCSVHandler: () => void;
+        connectLocalJSONHandler: () => void;
+        connectRemoteCSV: () => void;
+        connectRemoteJSON: () => void;
+        connectOLAP: () => void;
+        // Open tab
+        openLocalReport: () => void;
+        openRemoteReport: () => void;
+        // Save tab
+        saveHandler: () => void;
+        // Export tab
+        printHandler: () => void;
+        exportHandler: (type: string) => void;
+        // Grid tab
+        gridHandler: () => void;
+        // Charts tab
+        chartsHandler: (type: string) => void;
+        chartsMultipleHandler: () => void;
+        // Format tab
+        formatCellsHandler: () => void;
+        conditionalFormattingHandler: () => void;
+        // Options tab
+        optionsHandler: () => void;
+        // Fields tab
+        fieldsHandler: () => void;
+        // Fullscreen tab
+        fullscreenHandler: () => void;
     }
 
     interface ToolbarTab {

From 791191b8241bcf786bcbcdad5f8d477ff2226815 Mon Sep 17 00:00:00 2001
From: WalterEbbers <11156526+WalterEbbers@users.noreply.github.com>
Date: Tue, 19 Feb 2019 12:23:27 +0100
Subject: [PATCH 058/924] Update to Calender.selectDates()

somehow the same interface got implemented twice which are the same
kendo-ui supports date selection(https://docs.telerik.com/kendo-ui/knowledge-base/calendar-select-range-of-dates)
---
 types/kendo-ui/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 7ea79365ee..17c186697e 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -1883,7 +1883,9 @@ declare namespace kendo.ui {
         navigateToPast(): void;
         navigateUp(): void;
         selectDates(): void;
-        selectDates(): void;
+        selectDates(datesToSelect : any): void;
+        //somehow the same interface got implemented twice which are the same
+        //kendo-ui supports date selection(https://docs.telerik.com/kendo-ui/knowledge-base/calendar-select-range-of-dates)
         value(): Date;
         value(value: Date): void;
         value(value: string): void;

From 3298532c5b070daf567b9202498035f7ff04fd4e Mon Sep 17 00:00:00 2001
From: sucotronic <sucotronic@gmail.com>
Date: Tue, 19 Feb 2019 13:01:13 +0100
Subject: [PATCH 059/924] Add new property 'controlSize'

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

diff --git a/types/googlemaps/googlemaps-tests.ts b/types/googlemaps/googlemaps-tests.ts
index ac7217dd17..410fa1a41d 100644
--- a/types/googlemaps/googlemaps-tests.ts
+++ b/types/googlemaps/googlemaps-tests.ts
@@ -4,6 +4,7 @@ let mapOptions: google.maps.MapOptions = {
     backgroundColor: "#fff",
     center: { lat: -25.363, lng: 131.044 },
     clickableIcons: true,
+    controlSize: 30,
     draggable: true,
     fullscreenControl: true,
     fullscreenControlOptions: {
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 099bb9ef68..6c4bb07fcf 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -93,6 +93,14 @@ declare namespace google.maps {
      * interest, also known as a POI. By default map icons are clickable.
      */
     clickableIcons?: boolean
+    /**
+     * Size in pixels of the controls appearing on the map. This value must be
+     * supplied directly when creating the Map, updating this value later may
+     * bring the controls into an undefined state. Only governs the controls
+     * made by the Maps API itself. Does not scale developer created custom
+     * controls.
+     */
+    controlSize?: number;
     /** Enables/disables all default UI. May be overridden individually. */
     disableDefaultUI?: boolean;
     /** Enables/disables zoom and center on double click. Enabled by default. */

From 92ea4066e25c45856c36a107bcc707b5b0cefa29 Mon Sep 17 00:00:00 2001
From: Nils Knappmeier <github@knappi.org>
Date: Fri, 8 Feb 2019 13:03:42 +0100
Subject: [PATCH 060/924] [@types/handlebars]: Remove package, types are now
 integrated in handlebars

---
 notNeededPackages.json                |   6 +
 types/ember/package.json              |   6 +
 types/ember__string/package.json      |   6 +
 types/handlebars-helpers/package.json |   6 +
 types/handlebars/handlebars-tests.ts  |  87 -------
 types/handlebars/index.d.ts           | 349 --------------------------
 types/handlebars/tsconfig.json        |  23 --
 types/handlebars/tslint.json          |  79 ------
 types/handlebars/v1/index.d.ts        | 184 --------------
 types/handlebars/v1/tsconfig.json     |  27 --
 types/handlebars/v1/tslint.json       |  79 ------
 types/vision/package.json             |   6 +
 12 files changed, 30 insertions(+), 828 deletions(-)
 create mode 100644 types/ember/package.json
 create mode 100644 types/ember__string/package.json
 create mode 100644 types/handlebars-helpers/package.json
 delete mode 100644 types/handlebars/handlebars-tests.ts
 delete mode 100644 types/handlebars/index.d.ts
 delete mode 100644 types/handlebars/tsconfig.json
 delete mode 100644 types/handlebars/tslint.json
 delete mode 100644 types/handlebars/v1/index.d.ts
 delete mode 100644 types/handlebars/v1/tsconfig.json
 delete mode 100644 types/handlebars/v1/tslint.json
 create mode 100644 types/vision/package.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index be57d76a49..2ddb69b9ed 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -702,6 +702,12 @@
             "sourceRepoURL": "https://github.com/ivogabe/gulp-typescript",
             "asOfVersion": "2.13.0"
         },
+        {
+            "libraryName": "handlebars",
+            "typingsPackageName": "handlebars",
+            "sourceRepoURL": "https://github.com/wycats/handlebars.js",
+            "asOfVersion": "4.1.0"
+        },
         {
             "libraryName": "handsontable",
             "typingsPackageName": "handsontable",
diff --git a/types/ember/package.json b/types/ember/package.json
new file mode 100644
index 0000000000..b6f5204c9a
--- /dev/null
+++ b/types/ember/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
\ No newline at end of file
diff --git a/types/ember__string/package.json b/types/ember__string/package.json
new file mode 100644
index 0000000000..b6f5204c9a
--- /dev/null
+++ b/types/ember__string/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
\ No newline at end of file
diff --git a/types/handlebars-helpers/package.json b/types/handlebars-helpers/package.json
new file mode 100644
index 0000000000..b6f5204c9a
--- /dev/null
+++ b/types/handlebars-helpers/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
\ No newline at end of file
diff --git a/types/handlebars/handlebars-tests.ts b/types/handlebars/handlebars-tests.ts
deleted file mode 100644
index 340bbde590..0000000000
--- a/types/handlebars/handlebars-tests.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-
-//import Handlebars = require('handlebars');
-import * as Handlebars from 'handlebars';
-
-const context = {
-    author: { firstName: 'Alan', lastName: 'Johnson' },
-    body: 'I Love Handlebars',
-    comments: [{
-        author: { firstName: 'Yehuda', lastName: 'Katz' },
-        body: 'Me too!'
-    }]
-};
-Handlebars.registerHelper('fullName', (person: typeof context.author) => {
-    return person.firstName + ' ' + person.lastName;
-});
-
-Handlebars.registerHelper('agree_button', function() {
-    return new Handlebars.SafeString(
-      '<button>I agree. I ' + this.emotion + ' ' + this.name + '</button>'
-    );
-});
-
-const source1 = '<p>Hello, my name is {{name}}. I am from {{hometown}}. I have ' +
-             '{{kids.length}} kids:</p>' +
-             '<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>';
-const template1 = Handlebars.compile(source1);
-template1({ name: "Alan", hometown: "Somewhere, TX", kids: [{name: "Jimmy", age: 12}, {name: "Sally", age: 4}]});
-
-Handlebars.registerHelper('link_to', (context: typeof post) => {
-    return '<a href="' + context.url + '">' + context.body + '</a>';
-});
-const post = { url: "/hello-world", body: "Hello World!" };
-const context2 = { posts: [post] };
-const source2 = '<ul>{{#posts}}<li>{{{link_to this}}}</li>{{/posts}}</ul>';
-const template2: HandlebarsTemplateDelegate<{ posts: { url: string, body: string }[] }> = Handlebars.compile(source2);
-template2(context2);
-
-Handlebars.registerHelper('link_to', (title: string, context: typeof post) => {
-    return '<a href="/posts' + context.url + '">' + title + '!</a>';
-});
-const context3 = { posts: [{url: '/hello-world', body: 'Hello World!'}] };
-const source3 = '<ul>{{#posts}}<li>{{{link_to "Post" this}}}</li>{{/posts}}</ul>';
-const template3 = Handlebars.compile<typeof context3>(source3);
-template3(context3);
-
-const source4 = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
-Handlebars.registerHelper('link', function(context: any) {
-    return '<a href="/people/' + this.id + '">' + context.fn(this) + '</a>';
-});
-const template4 = Handlebars.compile<{ people: { name: string, id: number }[] }>(source4);
-const data2 = { 'people': [
-    { 'name': 'Alan', 'id': 1 },
-    { 'name': 'Yehuda', 'id': 2 }
-]};
-template4(data2);
-
-const source5 = '<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>';
-Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>');
-const template5 = Handlebars.compile(source5);
-const data3 = { 'people': [
-    { 'name': 'Alan', 'id': 1 },
-    { 'name': 'Yehuda', 'id': 2 }
-]};
-template5(data3);
-
-const source6 = '{{#list nav}}<a href="{{url}}">{{title}}</a>{{/list}}';
-const template6 = Handlebars.compile(source6);
-Handlebars.registerHelper('list', (context, options: Handlebars.HelperOptions) => {
-  let ret = "<ul>";
-  for(let i=0, j=context.length; i<j; i++) {
-    ret = ret + "<li>" + options.fn(context[i]) + "</li>";
-  }
-  return ret + "</ul>";
-});
-template6([{url:"", title:""}])
-
-
-const escapedExpression = Handlebars.Utils.escapeExpression('<script>alert(\'xss\');</script>');
-
-Handlebars.helpers !== undefined;
-
-const parsedTmpl = Handlebars.parse('<p>Hello, my name is {{name}}.</p>', {
-  srcName: "/foo/bar/baz.hbs",
-  ignoreStandalone: true
-});
-
-const parsedTmplWithoutOptions = Handlebars.parse('<p>Hello, my name is {{name}}.</p>');
diff --git a/types/handlebars/index.d.ts b/types/handlebars/index.d.ts
deleted file mode 100644
index d6bebcb457..0000000000
--- a/types/handlebars/index.d.ts
+++ /dev/null
@@ -1,349 +0,0 @@
-// Type definitions for Handlebars v4.0.11
-// Project: http://handlebarsjs.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>, Sergei Dorogin <https://github.com/evil-shrike>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-declare namespace Handlebars {
-    export interface TemplateDelegate<T = any> {
-        (context: T, options?: RuntimeOptions): string;
-    }
-
-    export type Template<T = any> = TemplateDelegate<T>|string;
-
-    export interface RuntimeOptions {
-        partial?: boolean;
-        depths?: any[];
-        helpers?: { [name: string]: Function };
-        partials?: { [name: string]: HandlebarsTemplateDelegate };
-        decorators?: { [name: string]: Function };
-        data?: any;
-        blockParams?: any[];
-    }
-
-    export interface HelperOptions {
-        fn: TemplateDelegate;
-        inverse: TemplateDelegate;
-        hash: any;
-        data?: any;
-    }
-
-    export interface HelperDelegate {
-        (context?: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, options?: HelperOptions): any;
-    }
-    export interface HelperDeclareSpec {
-        [key: string]: HelperDelegate;
-    }
-
-    export interface ParseOptions {
-        srcName?: string,
-        ignoreStandalone?: boolean
-    }
-
-    export function registerHelper(name: string, fn: HelperDelegate): void;
-    export function registerHelper(name: HelperDeclareSpec): void;
-    export function unregisterHelper(name: string): void;
-
-    export function registerPartial(name: string, fn: Template): void;
-    export function registerPartial(spec: { [name: string]: HandlebarsTemplateDelegate }): void;
-    export function unregisterPartial(name: string): void;
-
-    // TODO: replace Function with actual signature
-    export function registerDecorator(name: string, fn: Function): void;
-    export function unregisterDecorator(name: string): void;
-
-    export function K(): void;
-    export function createFrame(object: any): any;
-    export function blockParams(obj: any[], ids: any[]): any[];
-    export function Exception(message: string): void;
-    export function log(level: number, obj: any): void;
-    export function parse(input: string, options?: ParseOptions): hbs.AST.Program;
-    export function compile<T = any>(input: any, options?: CompileOptions): HandlebarsTemplateDelegate<T>;
-    export function precompile(input: any, options?: PrecompileOptions): TemplateSpecification;
-    export function template<T = any>(precompilation: TemplateSpecification): HandlebarsTemplateDelegate<T>;
-
-    export function create(): typeof Handlebars;
-
-    export const escapeExpression: typeof Utils.escapeExpression;
-    //export const Utils: typeof hbs.Utils;
-    export const logger: Logger;
-    export const templates: HandlebarsTemplates;
-    export const helpers: { [name: string]: HelperDelegate };
-    export const partials: { [name: string]: any };
-    // TODO: replace Function with actual signature
-    export const decorators: { [name: string]: Function };
-
-    export function noConflict(): typeof Handlebars;
-
-    export class SafeString {
-        constructor(str: string);
-        toString(): string;
-        toHTML(): string;
-    }
-
-    export namespace Utils {
-        export function escapeExpression(str: string): string;
-        export function createFrame(object: any): any;
-        export function blockParams(obj: any[], ids: any[]): any[];
-        export function isEmpty(obj: any) : boolean;
-        export function extend(obj: any, ...source: any[]): any;
-        export function toString(obj: any): string;
-        export function isArray(obj: any): boolean;
-        export function isFunction(obj: any): boolean;
-    }
-
-    export namespace AST {
-        export const helpers: hbs.AST.helpers;
-    }
-
-    interface ICompiler {
-        accept(node: hbs.AST.Node): void;
-        Program(program: hbs.AST.Program): void;
-        BlockStatement(block: hbs.AST.BlockStatement): void;
-        PartialStatement(partial: hbs.AST.PartialStatement): void;
-        PartialBlockStatement(partial: hbs.AST.PartialBlockStatement): void;
-        DecoratorBlock(decorator: hbs.AST.DecoratorBlock): void;
-        Decorator(decorator: hbs.AST.Decorator): void;
-        MustacheStatement(mustache: hbs.AST.MustacheStatement): void;
-        ContentStatement(content: hbs.AST.ContentStatement): void;
-        CommentStatement(comment?: hbs.AST.CommentStatement): void;
-        SubExpression(sexpr: hbs.AST.SubExpression): void;
-        PathExpression(path: hbs.AST.PathExpression): void;
-        StringLiteral(str: hbs.AST.StringLiteral): void;
-        NumberLiteral(num: hbs.AST.NumberLiteral): void;
-        BooleanLiteral(bool: hbs.AST.BooleanLiteral): void;
-        UndefinedLiteral(): void;
-        NullLiteral(): void;
-        Hash(hash: hbs.AST.Hash): void;
-    }
-
-    export class Visitor implements ICompiler {
-        accept(node: hbs.AST.Node): void;
-        acceptKey(node: hbs.AST.Node, name: string): void;
-        acceptArray(arr: hbs.AST.Expression[]): void;
-        Program(program: hbs.AST.Program): void;
-        BlockStatement(block: hbs.AST.BlockStatement): void;
-        PartialStatement(partial: hbs.AST.PartialStatement): void;
-        PartialBlockStatement(partial: hbs.AST.PartialBlockStatement): void;
-        DecoratorBlock(decorator: hbs.AST.DecoratorBlock): void;
-        Decorator(decorator: hbs.AST.Decorator): void;
-        MustacheStatement(mustache: hbs.AST.MustacheStatement): void;
-        ContentStatement(content: hbs.AST.ContentStatement): void;
-        CommentStatement(comment?: hbs.AST.CommentStatement): void;
-        SubExpression(sexpr: hbs.AST.SubExpression): void;
-        PathExpression(path: hbs.AST.PathExpression): void;
-        StringLiteral(str: hbs.AST.StringLiteral): void;
-        NumberLiteral(num: hbs.AST.NumberLiteral): void;
-        BooleanLiteral(bool: hbs.AST.BooleanLiteral): void;
-        UndefinedLiteral(): void;
-        NullLiteral(): void;
-        Hash(hash: hbs.AST.Hash): void;
-    }
-}
-
-/**
-* Implement this interface on your MVW/MVVM/MVC views such as Backbone.View
-**/
-interface HandlebarsTemplatable {
-    template: HandlebarsTemplateDelegate;
-}
-
-// NOTE: for backward compatibility of this typing
-type HandlebarsTemplateDelegate<T = any> = Handlebars.TemplateDelegate<T>;
-
-interface HandlebarsTemplates {
-    [index: string]: HandlebarsTemplateDelegate;
-}
-
-interface TemplateSpecification {
-
-}
-
-// for backward compatibility of this typing
-type RuntimeOptions = Handlebars.RuntimeOptions;
-
-interface CompileOptions {
-    data?: boolean;
-    compat?: boolean;
-    knownHelpers?: {
-        helperMissing?: boolean;
-        blockHelperMissing?: boolean;
-        each?: boolean;
-        if?: boolean;
-        unless?: boolean;
-        with?: boolean;
-        log?: boolean;
-        lookup?: boolean;
-    };
-    knownHelpersOnly?: boolean;
-    noEscape?: boolean;
-    strict?: boolean;
-    assumeObjects?: boolean;
-    preventIndent?: boolean;
-    ignoreStandalone?: boolean;
-    explicitPartialContext?: boolean;
-}
-
-interface PrecompileOptions extends CompileOptions {
-    srcName?: string;
-    destName?: string;
-}
-
-declare namespace hbs {
-    // for backward compatibility of this typing
-    type SafeString = Handlebars.SafeString;
-
-    type Utils = typeof Handlebars.Utils;
-}
-
-interface Logger {
-    DEBUG: number;
-    INFO: number;
-    WARN: number;
-    ERROR: number;
-    level: number;
-
-    methodMap: { [level: number]: string };
-
-    log(level: number, obj: string): void;
-}
-
-declare namespace hbs {
-    namespace AST {
-        interface Node {
-            type: string;
-            loc: SourceLocation;
-        }
-
-        interface SourceLocation {
-            source: string;
-            start: Position;
-            end: Position;
-        }
-
-        interface Position {
-            line: number;
-            column: number;
-        }
-
-        interface Program extends Node {
-            body: Statement[];
-            blockParams: string[];
-        }
-
-        interface Statement extends Node {}
-
-        interface MustacheStatement extends Statement {
-            path: PathExpression | Literal;
-            params: Expression[];
-            hash: Hash;
-            escaped: boolean;
-            strip: StripFlags;
-        }
-
-        interface Decorator extends MustacheStatement { }
-
-        interface BlockStatement extends Statement {
-            path: PathExpression;
-            params: Expression[];
-            hash: Hash;
-            program: Program;
-            inverse: Program;
-            openStrip: StripFlags;
-            inverseStrip: StripFlags;
-            closeStrip: StripFlags;
-        }
-
-        interface DecoratorBlock extends BlockStatement { }
-
-        interface PartialStatement extends Statement {
-            name: PathExpression | SubExpression;
-            params: Expression[];
-            hash: Hash;
-            indent: string;
-            strip: StripFlags;
-        }
-
-        interface PartialBlockStatement extends Statement {
-            name: PathExpression | SubExpression;
-            params: Expression[];
-            hash: Hash;
-            program: Program;
-            openStrip: StripFlags;
-            closeStrip: StripFlags;
-        }
-
-        interface ContentStatement extends Statement {
-            value: string;
-            original: StripFlags;
-        }
-
-        interface CommentStatement extends Statement {
-            value: string;
-            strip: StripFlags;
-        }
-
-        interface Expression extends Node {}
-
-        interface SubExpression extends Expression {
-            path: PathExpression;
-            params: Expression[];
-            hash: Hash;
-        }
-
-        interface PathExpression extends Expression {
-            data: boolean;
-            depth: number;
-            parts: string[];
-            original: string;
-        }
-
-        interface Literal extends Expression {}
-        interface StringLiteral extends Literal {
-            value: string;
-            original: string;
-        }
-
-        interface BooleanLiteral extends Literal {
-            value: boolean;
-            original: boolean;
-        }
-
-        interface NumberLiteral extends Literal {
-            value: number;
-            original: number;
-        }
-
-        interface UndefinedLiteral extends Literal {}
-
-        interface NullLiteral extends Literal {}
-
-        interface Hash extends Node {
-            pairs: HashPair[];
-        }
-
-        interface HashPair extends Node {
-            key: string;
-            value: Expression;
-        }
-
-        interface StripFlags {
-            open: boolean;
-            close: boolean;
-        }
-
-        interface helpers {
-            helperExpression(node: Node): boolean;
-            scopeId(path: PathExpression): boolean;
-            simpleId(path: PathExpression): boolean;
-        }
-    }
-}
-
-declare module "handlebars" {
-    export = Handlebars;
-}
-
-declare module "handlebars/runtime" {
-    export = Handlebars;
-}
diff --git a/types/handlebars/tsconfig.json b/types/handlebars/tsconfig.json
deleted file mode 100644
index 0008e2154e..0000000000
--- a/types/handlebars/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "files": [
-        "index.d.ts",
-        "handlebars-tests.ts"
-    ],
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    }
-}
diff --git a/types/handlebars/tslint.json b/types/handlebars/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/handlebars/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/types/handlebars/v1/index.d.ts b/types/handlebars/v1/index.d.ts
deleted file mode 100644
index a66c8f7ee6..0000000000
--- a/types/handlebars/v1/index.d.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-// Type definitions for Handlebars 1.0
-// Project: http://handlebarsjs.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-
-// Use either HandlebarsStatic or HandlebarsRuntimeStatic
-declare var Handlebars: HandlebarsStatic;
-//declare var Handlebars: HandlebarsRuntimeStatic;
-
-/**
-* Implement this interface on your MVW/MVVM/MVC views such as Backbone.View
-**/
-interface HandlebarsTemplatable {
-    template: HandlebarsTemplateDelegate;
-}
-
-interface HandlebarsTemplateDelegate {
-    (context: any, options?: any): string;
-}
-
-interface HandlebarsCommon {
-    registerHelper(name: string, fn: Function, inverse?: boolean): void;
-    registerPartial(name: string, str: any): void;
-    K(): void;
-    createFrame(object: any): any;
-
-    Exception(message: string): void;
-    SafeString: typeof hbs.SafeString;
-    Utils: typeof hbs.Utils;
-
-    logger: Logger;
-    log(level: number, obj: any): void;
-}
-
-interface HandlebarsStatic extends HandlebarsCommon {
-    parse(input: string): hbs.AST.ProgramNode;
-    compile(input: any, options?: any): HandlebarsTemplateDelegate;
-}
-
-interface HandlebarsTemplates {
-    [index: string]: HandlebarsTemplateDelegate;
-}
-
-interface HandlebarsRuntimeStatic extends HandlebarsCommon {
-    // Handlebars.templates is the default template namespace in precompiler.
-    templates: HandlebarsTemplates;
-}
-
-declare namespace hbs {
-    class SafeString {
-        constructor(str: string);
-        static toString(): string;
-    }
-
-    namespace Utils {
-        function escapeExpression(str: string): string;
-    }
-}
-
-interface Logger {
-    DEBUG: number;
-    INFO: number;
-    WARN: number;
-    ERROR: number;
-    level: number;
-
-    methodMap: { [level: number]: string };
-
-    log(level: number, obj: string): void;
-}
-
-declare namespace hbs {
-    namespace AST {
-        interface IStripInfo {
-            left?: boolean;
-            right?: boolean;
-            inlineStandalone?: boolean;
-        }
-
-        class NodeBase {
-            firstColumn: number;
-            firstLine: number;
-            lastColumn: number;
-            lastLine: number;
-            type: string;
-        }
-
-        class ProgramNode extends NodeBase {
-            statements: NodeBase[];
-        }
-
-        class IdNode extends NodeBase {
-            original: string;
-            parts: string[];
-            string: string;
-            depth: number;
-            idName: string;
-            isSimple: boolean;
-            stringModeValue: string;
-        }
-
-        class HashNode extends NodeBase {
-            pairs: {0: string;
-                    1: NodeBase}[];
-        }
-
-        class SexprNode extends NodeBase {
-            hash: HashNode;
-            id: NodeBase;
-            params: NodeBase[];
-            isHelper: boolean;
-            eligibleHelper: boolean;
-        }
-
-        class MustacheNode extends NodeBase {
-            strip: IStripInfo;
-            escaped: boolean;
-            sexpr: SexprNode;
-
-        }
-
-        class BlockNode extends NodeBase {
-            mustache: MustacheNode;
-            program: ProgramNode;
-            inverse: ProgramNode;
-            strip: IStripInfo;
-            isInverse: boolean;
-        }
-
-        class PartialNameNode extends NodeBase {
-            name: string;
-        }
-
-        class PartialNode extends NodeBase {
-            partialName: PartialNameNode;
-            context: NodeBase;
-            hash: HashNode;
-            strip: IStripInfo;
-        }
-
-        class RawBlockNode extends NodeBase {
-            mustache: MustacheNode;
-            program: ProgramNode;
-        }
-
-        class ContentNode extends NodeBase {
-            original: string;
-            string: string;
-        }
-
-        class DataNode extends NodeBase {
-            id: IdNode;
-            stringModeValue: string;
-            idName: string;
-        }
-
-        class StringNode extends NodeBase {
-            original: string;
-            string: string;
-            stringModeValue: string;
-        }
-
-        class NumberNode extends NodeBase {
-            original: string;
-            number: string;
-            stringModeValue: number;
-        }
-
-        class BooleanNode extends NodeBase {
-            bool: string;
-            stringModeValue: boolean;
-        }
-
-        class CommentNode extends NodeBase {
-            comment: string;
-            strip: IStripInfo;
-        }
-    }
-}
-
-declare module "handlebars" {
-    export = Handlebars;
-}
diff --git a/types/handlebars/v1/tsconfig.json b/types/handlebars/v1/tsconfig.json
deleted file mode 100644
index 96818b903b..0000000000
--- a/types/handlebars/v1/tsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "types": [],
-        "paths": {
-            "handlebars": [
-                "handlebars/v1"
-            ]
-        },
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/handlebars/v1/tslint.json b/types/handlebars/v1/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/handlebars/v1/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/types/vision/package.json b/types/vision/package.json
new file mode 100644
index 0000000000..b6f5204c9a
--- /dev/null
+++ b/types/vision/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
\ No newline at end of file

From 0b75a04407a0a562bf4f46251def6c3f8e787f9f Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Tue, 19 Feb 2019 17:03:30 +0100
Subject: [PATCH 061/924] Infer parameter and return types for sinon.spy()

---
 types/sinon/ts3.1/index.d.ts     |  4 +--
 types/sinon/ts3.1/sinon-tests.ts | 44 ++++++++++++++++++++++++--------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 7123e75d49..6b7830722c 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -211,7 +211,7 @@ declare namespace Sinon {
         returnValues: TReturnValue[];
 
         // Methods
-        (...args: any[]): any;
+        (...args: TArgs): TReturnValue;
         /**
          * Returns true if the spy was called before @param anotherSpy
          * @param anotherSpy
@@ -338,7 +338,7 @@ declare namespace Sinon {
         /**
          * Spies on the provided function
          */
-        (func: Function): SinonSpy;
+        <F extends (...args: any[]) => any>(func: F): SinonSpy<Parameters<F>, ReturnType<F>>;
         /**
          * Creates a spy for object.method and replaces the original method with the spy.
          * An exception is thrown if the property is not already a function.
diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
index 2db25348ae..d27d03c230 100644
--- a/types/sinon/ts3.1/sinon-tests.ts
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -83,8 +83,8 @@ function testSandbox() {
     const privateFooStubbedInstance = sb.createStubInstance(PrivateFoo);
     stubInstance.foo.calledWith('foo', 1);
     privateFooStubbedInstance.foo.calledWith();
-    const clsFoo: sinon.SinonStub = stubInstance.foo;
-    const privateFooFoo: sinon.SinonStub = privateFooStubbedInstance.foo;
+    const clsFoo: sinon.SinonStub<[string, number], number> = stubInstance.foo;
+    const privateFooFoo: sinon.SinonStub<[], void> = privateFooStubbedInstance.foo;
     const clsBar: number = stubInstance.bar;
     const privateFooBar: number = privateFooStubbedInstance.bar;
 }
@@ -325,7 +325,7 @@ function testTypedSpy() {
 }
 
 function testSpy() {
-    const fn = () => { };
+    let fn = (arg: string, arg2: number): boolean => true;
     const obj = class {
         foo() { }
         set bar(val: number) { }
@@ -333,12 +333,11 @@ function testSpy() {
     };
     const instance = new obj();
 
-    let spy = sinon.spy();
+    const spy = sinon.spy(); // $ExpectType SinonSpy<any[], any>
     const spyTwo = sinon.spy().named('spyTwo');
 
-    spy = sinon.spy(fn);
-    spy = sinon.spy(instance, 'foo');
-    spy = sinon.spy(instance, 'bar', ['set', 'get']);
+    const methodSpy = sinon.spy(instance, 'foo');
+    const methodSpy2 = sinon.spy(instance, 'bar', ['set', 'get']);
 
     let count = 0;
     count = spy.callCount;
@@ -356,7 +355,12 @@ function testSpy() {
     arr = spy.exceptions;
     arr = spy.returnValues;
 
-    spy('a', 'b');
+    const fnSpy = sinon.spy(fn); // $ExpectType SinonSpy<[string, number], boolean>
+    fn = fnSpy; // Should be assignable to original function
+    fnSpy('a', 1); // $ExpectType boolean
+    fnSpy.args; // $ExpectType [string, number][]
+    fnSpy.returnValues; // $ExpectType boolean[]
+
     spy(1, 2);
     spy(true);
 
@@ -420,13 +424,12 @@ function testSpy() {
 
 function testStub() {
     const obj = class {
-        foo() { }
+        foo(arg: string): number { return 1; }
         promiseFunc() { return Promise.resolve('foo'); }
     };
     const instance = new obj();
 
-    let stub = sinon.stub();
-    stub = sinon.stub(instance, 'foo').named('namedStub');
+    const stub = sinon.stub();
 
     const spy: sinon.SinonSpy = stub;
 
@@ -485,6 +488,25 @@ function testStub() {
     stub.yieldsToAsync('foo', 'a', 2);
     stub.yieldsToOnAsync('foo', instance, 'a', 2);
     stub.withArgs('a', 2).returns(true);
+
+    // Type-safe stubs
+    const stub2 = sinon.stub(instance, 'foo').named('namedStub');
+    instance.foo = stub2; // Should be assignable to original
+    stub2.returns(true); // $ExpectError
+    stub2.returns(5);
+    stub2.returns('foo'); // $ExpectError
+    stub2.callsFake((arg: string) => 1);
+    stub2.callsFake((arg: number) => 1); // $ExpectError
+    stub2.callsFake((arg: string) => 'a'); // $ExpectError
+    stub2.onCall(1).returns(2);
+    stub2.withArgs('a', 2).returns('true'); // $ExpectError
+    stub2.withArgs('a').returns(1);
+    stub2.withArgs('a').returns('a'); // $ExpectError
+
+    const pStub = sinon.stub(instance, 'promiseFunc');
+    pStub.resolves();
+    pStub.resolves('foo');
+    pStub.resolves(1); // $ExpectError
 }
 
 function testTypedStub() {

From a5c1bdeb29beb19061a44d772e560ca702595d35 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 10:40:00 -0600
Subject: [PATCH 062/924] Add old URL back to project

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 458929e298..5d1131684c 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sequelize 4.27.11
-// Project: https://github.com/sequelize/sequelize
+// Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Ivan Drinchev <https://github.com/drinchev>

From 59814c662fa9f8fb8a50e862fbd7c99c01da36a8 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 10:54:25 -0600
Subject: [PATCH 063/924] Add tests. Let sequelize have two project URLs

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 64d445c65a..87105eaa88 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5151,6 +5151,8 @@ fp.now(); // $ExpectType number
     _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
+    _.get({ a: undefined }, 'a'); // $ExpectType undefined
+    _.get({ a: undefined }, 'a', 'default'); // $ExpectType string
 
     _("abc").get(1); // $ExpectType string
     _("abc").get(["0"], "_");
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 5d1131684c..8fb0c16503 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sequelize 4.27.11
-// Project: http://sequelizejs.com
+// Project: http://sequelizejs.com, https://github.com/sequelize/sequelize
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Ivan Drinchev <https://github.com/drinchev>

From 038d5e69b5bb71e87c20834def72199a6347200e Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 10:56:59 -0600
Subject: [PATCH 064/924] Fix failing get test

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 87105eaa88..5bac79044c 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5152,7 +5152,7 @@ fp.now(); // $ExpectType number
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
     _.get({ a: undefined }, 'a'); // $ExpectType undefined
-    _.get({ a: undefined }, 'a', 'default'); // $ExpectType string
+    _.get({ a: undefined }, 'a', 'default'); // $ExpectType 'default'
 
     _("abc").get(1); // $ExpectType string
     _("abc").get(["0"], "_");

From 1c2e51ca7c5e0782ac0da78dec98a11e1d8c78bd Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 11:24:38 -0600
Subject: [PATCH 065/924] Using boolean instead since TS wants to use the
 literal value for string

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 5bac79044c..95f0bcff0e 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5152,7 +5152,7 @@ fp.now(); // $ExpectType number
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
     _.get({ a: undefined }, 'a'); // $ExpectType undefined
-    _.get({ a: undefined }, 'a', 'default'); // $ExpectType 'default'
+    _.get({ a: undefined }, 'a', false); // $ExpectType boolean
 
     _("abc").get(1); // $ExpectType string
     _("abc").get(["0"], "_");

From e78b8138a57a21ad2bc25f35128de415a3bce104 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 11:31:50 -0600
Subject: [PATCH 066/924] Added additional test and followed similar pattern to
 above

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 95f0bcff0e..b8c2a53e8d 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5142,6 +5142,9 @@ fp.now(); // $ExpectType number
 
 // _.get
 {
+    const value: string | undefined = anything;
+    const defValue: boolean = anything;
+
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
 
@@ -5151,8 +5154,9 @@ fp.now(); // $ExpectType number
     _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
-    _.get({ a: undefined }, 'a'); // $ExpectType undefined
-    _.get({ a: undefined }, 'a', false); // $ExpectType boolean
+    _.get({ a: undefined }, "a"); // $ExpectType undefined
+    _.get({ a: value }, "a", defValue); // $ExpectType string | boolean
+    _.get({ a: undefined }, "a", defValue); // $ExpectType boolean
 
     _("abc").get(1); // $ExpectType string
     _("abc").get(["0"], "_");

From e098885ccded0f5204a28dbc2170a13251945c18 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 11:42:54 -0600
Subject: [PATCH 067/924] Add to implicit and explicit wrapper

---
 types/lodash/common/object.d.ts | 4 ++--
 types/lodash/lodash-tests.ts    | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 29ab78bed4..2342a18a06 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -1763,7 +1763,7 @@ declare module "../index" {
             this: LoDashImplicitWrapper<TObject | null | undefined>,
             path: TKey | [TKey],
             defaultValue: TDefault
-        ): TObject[TKey] | TDefault;
+        ): Exclude<TObject[TKey], undefined> | TDefault;
 
         /**
          * @see _.get
@@ -1839,7 +1839,7 @@ declare module "../index" {
             this: LoDashExplicitWrapper<TObject | null | undefined>,
             path: TKey | [TKey],
             defaultValue: TDefault
-        ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
+        ): LoDashExplicitWrapper<Exclude<TObject[TKey], undefined> | TDefault>;
 
         /**
          * @see _.get
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index b8c2a53e8d..0809cd15f3 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5164,6 +5164,9 @@ fp.now(); // $ExpectType number
     _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get(["a", "b"]); // $ExpectType any
+    _({ a: undefined }).get("a"); // $ExpectType undefined
+    _({ a: value }).get("a", defValue); // $ExpectType string | boolean
+    _({ a: undefined }).get("a", defValue); // $ExpectType boolean
 
     _.chain("abc").get(1); // $ExpectType LoDashExplicitWrapper<string>
     _.chain("abc").get(["0"], "_");
@@ -5171,6 +5174,9 @@ fp.now(); // $ExpectType number
     _.chain({ a: { b: true } }).get("a"); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
     _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
     _.chain({ a: { b: true } }).get(["a", "b"]); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain({ a: undefined }).get("a"); // $ExpectType LoDashExplicitWrapper<undefined>
+    _.chain({ a: value }).get("a", defValue); // $ExpectType LoDashExplicitWrapper<string | boolean>
+    _.chain({ a: undefined }).get("a", defValue); // $ExpectType LoDashExplicitWrapper<boolean>
 
     fp.get(Symbol.iterator, []); // $ExpectType any
     fp.get(Symbol.iterator)([]); // $ExpectType any

From 3a169638946899e188e8d2dcce02c0191875dca5 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 11:46:25 -0600
Subject: [PATCH 068/924] Run npm run generate

---
 types/lodash/fp.d.ts     | 42 ++++++++++++++++++++--------------------
 types/lowdb/_lodash.d.ts |  4 ++--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
index 68084f1c8d..c26cedeb10 100644
--- a/types/lodash/fp.d.ts
+++ b/types/lodash/fp.d.ts
@@ -1494,7 +1494,7 @@ declare namespace _ {
         <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashGetOr1x4<TObject>;
         <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashGetOr1x5<TObject, TDefault>;
         <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashGetOr1x6<TObject, TKey>;
-        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (defaultValue: lodash.__, path: number): LodashGetOr2x2;
         <TDefault>(defaultValue: TDefault, path: number): LodashGetOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x4<T>;
@@ -1517,7 +1517,7 @@ declare namespace _ {
     interface LodashGetOr1x1<TDefault> {
         <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashGetOr1x3<TObject, TKey, TDefault>;
         <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashGetOr1x5<TObject, TDefault>;
-        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (path: number): LodashGetOr2x3<TDefault>;
         <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x5<T, TDefault>;
         <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
@@ -1528,16 +1528,16 @@ declare namespace _ {
     interface LodashGetOr1x2<TObject, TKey extends keyof TObject> {
         <TDefault>(defaultValue: TDefault): LodashGetOr1x3<TObject, TKey, TDefault>;
         (defaultValue: lodash.__, object: TObject | null | undefined): LodashGetOr1x6<TObject, TKey>;
-        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashGetOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    type LodashGetOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashGetOr1x4<TObject> {
         <TDefault>(defaultValue: TDefault): LodashGetOr1x5<TObject, TDefault>;
         <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashGetOr1x6<TObject, TKey>;
-        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashGetOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
-    type LodashGetOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    type LodashGetOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => Exclude<TObject[TKey], undefined> | TDefault;
+    type LodashGetOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashGetOr2x2 {
         <TDefault>(defaultValue: TDefault): LodashGetOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x6<T>;
@@ -2756,7 +2756,7 @@ declare namespace _ {
         <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashPathOr1x4<TObject>;
         <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashPathOr1x5<TObject, TDefault>;
         <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashPathOr1x6<TObject, TKey>;
-        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (defaultValue: lodash.__, path: number): LodashPathOr2x2;
         <TDefault>(defaultValue: TDefault, path: number): LodashPathOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x4<T>;
@@ -2779,7 +2779,7 @@ declare namespace _ {
     interface LodashPathOr1x1<TDefault> {
         <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPathOr1x3<TObject, TKey, TDefault>;
         <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPathOr1x5<TObject, TDefault>;
-        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (path: number): LodashPathOr2x3<TDefault>;
         <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x5<T, TDefault>;
         <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
@@ -2790,16 +2790,16 @@ declare namespace _ {
     interface LodashPathOr1x2<TObject, TKey extends keyof TObject> {
         <TDefault>(defaultValue: TDefault): LodashPathOr1x3<TObject, TKey, TDefault>;
         (defaultValue: lodash.__, object: TObject | null | undefined): LodashPathOr1x6<TObject, TKey>;
-        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashPathOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    type LodashPathOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashPathOr1x4<TObject> {
         <TDefault>(defaultValue: TDefault): LodashPathOr1x5<TObject, TDefault>;
         <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPathOr1x6<TObject, TKey>;
-        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashPathOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
-    type LodashPathOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    type LodashPathOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => Exclude<TObject[TKey], undefined> | TDefault;
+    type LodashPathOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashPathOr2x2 {
         <TDefault>(defaultValue: TDefault): LodashPathOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x6<T>;
@@ -2996,7 +2996,7 @@ declare namespace _ {
         <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashPropOr1x4<TObject>;
         <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashPropOr1x5<TObject, TDefault>;
         <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashPropOr1x6<TObject, TKey>;
-        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (defaultValue: lodash.__, path: number): LodashPropOr2x2;
         <TDefault>(defaultValue: TDefault, path: number): LodashPropOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x4<T>;
@@ -3019,7 +3019,7 @@ declare namespace _ {
     interface LodashPropOr1x1<TDefault> {
         <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPropOr1x3<TObject, TKey, TDefault>;
         <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPropOr1x5<TObject, TDefault>;
-        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
         (path: number): LodashPropOr2x3<TDefault>;
         <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x5<T, TDefault>;
         <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
@@ -3030,16 +3030,16 @@ declare namespace _ {
     interface LodashPropOr1x2<TObject, TKey extends keyof TObject> {
         <TDefault>(defaultValue: TDefault): LodashPropOr1x3<TObject, TKey, TDefault>;
         (defaultValue: lodash.__, object: TObject | null | undefined): LodashPropOr1x6<TObject, TKey>;
-        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashPropOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    type LodashPropOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashPropOr1x4<TObject> {
         <TDefault>(defaultValue: TDefault): LodashPropOr1x5<TObject, TDefault>;
         <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPropOr1x6<TObject, TKey>;
-        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Exclude<TObject[TKey], undefined> | TDefault;
     }
-    type LodashPropOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
-    type LodashPropOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    type LodashPropOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => Exclude<TObject[TKey], undefined> | TDefault;
+    type LodashPropOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => Exclude<TObject[TKey], undefined> | TDefault;
     interface LodashPropOr2x2 {
         <TDefault>(defaultValue: TDefault): LodashPropOr2x3<TDefault>;
         <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x6<T>;
diff --git a/types/lowdb/_lodash.d.ts b/types/lowdb/_lodash.d.ts
index 7267aab0d9..c24e2f1c08 100644
--- a/types/lowdb/_lodash.d.ts
+++ b/types/lowdb/_lodash.d.ts
@@ -1132,7 +1132,7 @@ declare module "./index" {
             this: LoDashExplicitSyncWrapper<TObject | null | undefined>,
             path: TKey | [TKey],
             defaultValue: TDefault
-        ): LoDashExplicitSyncWrapper<TObject[TKey] | TDefault>;
+        ): LoDashExplicitSyncWrapper<Exclude<TObject[TKey], undefined> | TDefault>;
         get<T>(
             this: LoDashExplicitSyncWrapper<_.NumericDictionary<T>>,
             path: number
@@ -2728,7 +2728,7 @@ declare module "./index" {
             this: LoDashExplicitAsyncWrapper<TObject | null | undefined>,
             path: TKey | [TKey],
             defaultValue: TDefault
-        ): LoDashExplicitAsyncWrapper<TObject[TKey] | TDefault>;
+        ): LoDashExplicitAsyncWrapper<Exclude<TObject[TKey], undefined> | TDefault>;
         get<T>(
             this: LoDashExplicitAsyncWrapper<_.NumericDictionary<T>>,
             path: number

From 915b48e7668704604a3c93b69b4ce962d9db485b Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 19 Feb 2019 12:35:22 -0600
Subject: [PATCH 069/924] Oops, add sequelizejs.com back to v3 project as well

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

diff --git a/types/sequelize/v3/index.d.ts b/types/sequelize/v3/index.d.ts
index 4d2ea38efc..6acc528bc0 100644
--- a/types/sequelize/v3/index.d.ts
+++ b/types/sequelize/v3/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Sequelize 3.30.4
-// Project: https://github.com/sequelize/sequelize
+// Project: http://sequelizejs.com, https://github.com/sequelize/sequelize
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
 //                 Ivan Drinchev <https://github.com/drinchev>

From a437cfbec7735ba0c930a8a21ae20833adedb3ad Mon Sep 17 00:00:00 2001
From: Michal Miszczyszyn <michal@mmiszy.pl>
Date: Tue, 19 Feb 2019 19:52:34 +0100
Subject: [PATCH 070/924] Make connect-mongo compatible with newer mongodb and
 mongoose

---
 types/connect-mongo/connect-mongo-tests.ts | 4 ++--
 types/connect-mongo/tsconfig.json          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/connect-mongo/connect-mongo-tests.ts b/types/connect-mongo/connect-mongo-tests.ts
index 351975d84c..4e3c7f8381 100644
--- a/types/connect-mongo/connect-mongo-tests.ts
+++ b/types/connect-mongo/connect-mongo-tests.ts
@@ -45,8 +45,8 @@ app.use(session({
 
 // NativeMongoPromiseOptions
 var Client = mongodb.MongoClient;
-var mongoDbPromise = Client.connect('mongodb://localhost/test');
+var mongoDbPromise = Client.connect('mongodb://localhost/test').then(client => client.db())
 app.use(session({
     secret: 'secret',
-    store: new MongoStore({ dbPromise: mongoDbPromise})
+    store: new MongoStore({ dbPromise: mongoDbPromise })
 }));
diff --git a/types/connect-mongo/tsconfig.json b/types/connect-mongo/tsconfig.json
index c0c9ab3043..45b5d1d665 100644
--- a/types/connect-mongo/tsconfig.json
+++ b/types/connect-mongo/tsconfig.json
@@ -6,10 +6,10 @@
         ],
         "paths": {
             "mongodb": [
-                "mongodb/v2"
+                "mongodb"
             ],
             "mongoose": [
-                "mongoose/v4" 
+                "mongoose" 
              ]
         },
         "noImplicitAny": true,

From 4257e8e1cd57626ee3f0e0aec1f2303cf733a8a7 Mon Sep 17 00:00:00 2001
From: Michal Miszczyszyn <michal@mmiszy.pl>
Date: Tue, 19 Feb 2019 20:29:52 +0100
Subject: [PATCH 071/924] Fix mappings

---
 types/connect-mongo/tsconfig.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/types/connect-mongo/tsconfig.json b/types/connect-mongo/tsconfig.json
index 45b5d1d665..dc0b76551d 100644
--- a/types/connect-mongo/tsconfig.json
+++ b/types/connect-mongo/tsconfig.json
@@ -4,14 +4,6 @@
         "lib": [
             "es6"
         ],
-        "paths": {
-            "mongodb": [
-                "mongodb"
-            ],
-            "mongoose": [
-                "mongoose" 
-             ]
-        },
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,

From e5d64542ce7dcacbdc2f55cf153d5c77c3d6aafe Mon Sep 17 00:00:00 2001
From: David Pritchard <davidp@mentalcanvas.com>
Date: Tue, 19 Feb 2019 15:40:45 -0500
Subject: [PATCH 072/924] Added definition for options type. Removed
 MTLLoader.materials - there is only MaterialCreator.materials, judging from
 the source code.

---
 types/three/three-mtlloader.d.ts | 46 ++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/types/three/three-mtlloader.d.ts b/types/three/three-mtlloader.d.ts
index 33b4822432..e5151c66c5 100644
--- a/types/three/three-mtlloader.d.ts
+++ b/types/three/three-mtlloader.d.ts
@@ -5,14 +5,44 @@ import { Material } from "./three-core";
 import {LoadingManager} from "./three-core";
 import {EventDispatcher} from "./three-core";
 import {BufferGeometry} from "./three-core";
+import {Side} from "./three-core";
 import {Texture} from "./three-core";
+import {Wrapping} from "./three-core";
+
+export interface MaterialCreatorOptions {
+    /**
+     * side: Which side to apply the material
+     * THREE.FrontSide (default), THREE.BackSide, THREE.DoubleSide
+     */
+    side?: Side;
+    /*
+     * wrap: What type of wrapping to apply for textures
+     * THREE.RepeatWrapping (default), THREE.ClampToEdgeWrapping, THREE.MirroredRepeatWrapping
+     */
+    wrap?: Wrapping;
+    /*
+     * normalizeRGB: RGBs need to be normalized to 0-1 from 0-255
+     * Default: false, assumed to be already normalized
+     */
+    normalizeRGB?: boolean;
+    /*
+     * ignoreZeroRGBs: Ignore values of RGBs (Ka,Kd,Ks) that are all 0's
+     * Default: false
+     */
+    ignoreZeroRGBs?: boolean;
+    /*
+     * invertTrProperty: Use values 1 of Tr field for fully opaque. This option is useful for obj
+     * exported from 3ds MAX, vcglib or meshlab.
+     * Default: false
+     */
+    invertTrProperty?: boolean;
+}
 
 export class MTLLoader extends EventDispatcher {
 
     constructor(manager?: LoadingManager);
     manager: LoadingManager;
-    materialOptions: {};
-    materials: Material[];
+    materialOptions: MaterialCreatorOptions;
     path: string;
     texturePath: string;
     crossOrigin: boolean;
@@ -23,26 +53,26 @@ export class MTLLoader extends EventDispatcher {
     setTexturePath(path: string) : void;
     setBaseUrl(path: string) : void;
     setCrossOrigin(value: boolean) : void;
-    setMaterialOptions(value: any) : void;
+    setMaterialOptions(value: MaterialCreatorOptions) : void;
 }
 
 export class MaterialCreator {
 
-    constructor(baseUrl?: string, options?: any);
+    constructor(baseUrl?: string, options?: MaterialCreatorOptions);
 
     baseUrl : string;
-    options : any;
     materialsInfo : any;
     materials : any;
     materialsArray : Material[];
     nameLookup : any;
-    side : number;
-    wrap : number;
+    options : MaterialCreatorOptions;
+    side : Side;
+    wrap : Wrapping;
 
     setCrossOrigin( value: boolean ) : void;
-    setManager( value: any ) : void;
     setMaterials( materialsInfo: any ) : void;
     convert( materialsInfo: any ) : any;
+    setManager( value: LoadingManager ) : void;
     preload() : void;
     getIndex( materialName: string ) : Material;
     getAsArray() : Material[];

From f0f4c9fa698886c372f3e58d08d1d115854c2794 Mon Sep 17 00:00:00 2001
From: David Pritchard <davidp@mentalcanvas.com>
Date: Tue, 19 Feb 2019 15:45:50 -0500
Subject: [PATCH 073/924] Specified several "any" types within MaterialCreator;
 made a few loadTexture params optional.

---
 types/three/three-mtlloader.d.ts | 40 +++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/types/three/three-mtlloader.d.ts b/types/three/three-mtlloader.d.ts
index e5151c66c5..c2dbd40c84 100644
--- a/types/three/three-mtlloader.d.ts
+++ b/types/three/three-mtlloader.d.ts
@@ -3,10 +3,12 @@
 
 import { Material } from "./three-core";
 import {LoadingManager} from "./three-core";
+import {Mapping} from "./three-core";
 import {EventDispatcher} from "./three-core";
 import {BufferGeometry} from "./three-core";
 import {Side} from "./three-core";
 import {Texture} from "./three-core";
+import {Vector2} from "./three-core";
 import {Wrapping} from "./three-core";
 
 export interface MaterialCreatorOptions {
@@ -56,29 +58,51 @@ export class MTLLoader extends EventDispatcher {
     setMaterialOptions(value: MaterialCreatorOptions) : void;
 }
 
+export interface MaterialInfo {
+    ks?: number[];
+    kd?: number[];
+    ke?: number[];
+    map_kd?: string;
+    map_ks?: string;
+    map_ke?: string;
+    norm?: string;
+    map_bump?: string;
+    bump?: string;
+    map_d?: string;
+    ns?: number;
+    d?: number;
+    tr?: number;
+}
+
+export interface TexParams {
+    scale: Vector2;
+    offset: Vector2;
+    url: string;
+}
+
 export class MaterialCreator {
 
     constructor(baseUrl?: string, options?: MaterialCreatorOptions);
 
     baseUrl : string;
-    materialsInfo : any;
-    materials : any;
-    materialsArray : Material[];
-    nameLookup : any;
     options : MaterialCreatorOptions;
+    materialsInfo : {[key: string]: MaterialInfo};
+    materials : {[key: string]: Material};
+    private materialsArray : Material[];
+    nameLookup : {[key: string]: number};
     side : Side;
     wrap : Wrapping;
 
     setCrossOrigin( value: boolean ) : void;
-    setMaterials( materialsInfo: any ) : void;
-    convert( materialsInfo: any ) : any;
     setManager( value: LoadingManager ) : void;
+    setMaterials( materialsInfo: {[key: string]: MaterialInfo} ) : void;
+    convert( materialsInfo: {[key: string]: MaterialInfo} ) : {[key: string]: MaterialInfo};
     preload() : void;
     getIndex( materialName: string ) : Material;
     getAsArray() : Material[];
     create( materialName: string ) : Material;
     createMaterial_( materialName: string ) : Material;
-    getTextureParams( value: string, matParams: any ) : any;
-    loadTexture(url: string, mapping: any, onLoad: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): Texture;
+    getTextureParams( value: string, matParams: any ) : TexParams;
+    loadTexture(url: string, mapping?: Mapping, onLoad?: (bufferGeometry: BufferGeometry) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): Texture;
 
 }

From 34b2e5e53acf5aa3993c3fa84a912b9affd35370 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Tue, 19 Feb 2019 23:14:41 +0100
Subject: [PATCH 074/924] Fix and improve sinon.assert() with new types, add
 tests

---
 types/sinon/ts3.1/index.d.ts     | 56 ++++++++++++++++----------------
 types/sinon/ts3.1/sinon-tests.ts | 44 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 6b7830722c..3898097278 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1155,129 +1155,129 @@ declare namespace Sinon {
          * Passes if spy was never called
          * @param spy
          */
-        notCalled(spy: SinonSpy): void;
+        notCalled(spy: SinonSpy<any>): void;
         /**
          * Passes if spy was called at least once.
          */
-        called(spy: SinonSpy): void;
+        called(spy: SinonSpy<any>): void;
         /**
          * Passes if spy was called once and only once.
          */
-        calledOnce(spy: SinonSpy): void;
+        calledOnce(spy: SinonSpy<any>): void;
         /**
          * Passes if spy was called exactly twice.
          */
-        calledTwice(spy: SinonSpy): void;
+        calledTwice(spy: SinonSpy<any>): void;
         /**
          * Passes if spy was called exactly three times.
          */
-        calledThrice(spy: SinonSpy): void;
+        calledThrice(spy: SinonSpy<any>): void;
         /**
          * Passes if spy was called exactly num times.
          */
-        callCount(spy: SinonSpy, count: number): void;
+        callCount(spy: SinonSpy<any>, count: number): void;
         /**
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder(...spies: SinonSpy[]): void;
+        callOrder(...spies: SinonSpy<any>[]): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.
          */
-        calledOn(spyOrSpyCall: SinonSpy | SinonSpyCall, obj: any): void;
+        calledOn(spyOrSpyCall: SinonSpy<any> | SinonSpyCall, obj: any): void;
         /**
          * Passes if spy was always called with obj as its this value.
          */
-        alwaysCalledOn(spy: SinonSpy, obj: any): void;
+        alwaysCalledOn(spy: SinonSpy<any>, obj: any): void;
         /**
          * Passes if spy was called with the provided arguments.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWith(spy.firstCall, arg1, arg2, ...);.
          * @param spyOrSpyCall
          * @param args
          */
-        calledWith(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        calledWith<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was always called with the provided arguments.
          * @param spy
          * @param args
          */
-        alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWith<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was never called with the provided arguments.
          * @param spy
          * @param args
          */
-        neverCalledWith(spy: SinonSpy, ...args: any[]): void;
+        neverCalledWith<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was called with the provided arguments and no others.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithExactly(spy.getCall(1), arg1, arg2, ...);.
          * @param spyOrSpyCall
          * @param args
          */
-        calledWithExactly(
-            spyOrSpyCall: SinonSpy | SinonSpyCall,
-            ...args: any[]
+        calledWithExactly<TArgs extends any[]>(
+            spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>,
+            ...args: MatchArguments<TArgs>
         ): void;
         /**
          * Passes if spy was always called with the provided arguments and no others.
          */
-        alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWithExactly<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was called with matching arguments.
          * This behaves the same way as sinon.assert.calledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithMatch(spy.secondCall, arg1, arg2, ...);.
          */
-        calledWithMatch(
-            spyOrSpyCall: SinonSpy | SinonSpyCall,
-            ...args: any[]
+        calledWithMatch<TArgs extends any[]>(
+            spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>,
+            ...args: TArgs
         ): void;
         /**
          * Passes if spy was always called with matching arguments.
          * This behaves the same way as sinon.assert.alwaysCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          */
-        alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        alwaysCalledWithMatch<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: TArgs): void;
         /**
          * Passes if spy was never called with matching arguments.
          * This behaves the same way as sinon.assert.neverCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          * @param spy
          * @param args
          */
-        neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        neverCalledWithMatch<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: TArgs): void;
         /**
          * Passes if spy was called with the new operator.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithNew(spy.secondCall, arg1, arg2, ...);.
          * @param spyOrSpyCall
          */
-        calledWithNew(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        calledWithNew(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>): void;
         /**
          * Passes if spy threw any exception.
          */
-        threw(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is an actual object.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: string): void;
+        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>, exception: string): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is a String denoting its type.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: any): void;
+        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>, exception: any): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy): void;
+        alwaysThrew(spy: SinonSpy<any>): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy, exception: string): void;
+        alwaysThrew(spy: SinonSpy<any>, exception: string): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy, exception: any): void;
+        alwaysThrew(spy: SinonSpy<any>, exception: any): void;
         /**
          * Uses sinon.match to test if the arguments can be considered a match.
          */
diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
index d27d03c230..3fc046eb96 100644
--- a/types/sinon/ts3.1/sinon-tests.ts
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -287,6 +287,50 @@ function testAssert() {
     sinon.assert.expose(obj);
     sinon.assert.expose(obj, { prefix: 'blah' });
     sinon.assert.expose(obj, { includeFail: true });
+
+    const typedSpy = sinon.spy((arg1: string, arg2: boolean) => 123);
+    sinon.assert.notCalled(typedSpy);
+    sinon.assert.called(typedSpy);
+    sinon.assert.calledOnce(typedSpy);
+    sinon.assert.calledTwice(typedSpy);
+    sinon.assert.calledThrice(typedSpy);
+    sinon.assert.callCount(typedSpy, 3);
+    sinon.assert.callOrder(typedSpy, spyTwo);
+    sinon.assert.calledOn(typedSpy, obj);
+    sinon.assert.calledOn(typedSpy.firstCall, obj);
+    sinon.assert.alwaysCalledOn(typedSpy, obj);
+    sinon.assert.alwaysCalledWith(typedSpy, 'a', 'b', 'c'); // $ExpectError
+    sinon.assert.alwaysCalledWith(typedSpy, 'a', true);
+    sinon.assert.neverCalledWith(typedSpy, 'a', false);
+    sinon.assert.neverCalledWith(typedSpy, 'a', 'b'); // $ExpectError
+    sinon.assert.calledWithExactly(typedSpy, 'a', true);
+    sinon.assert.calledWithExactly(typedSpy, 'a', 'b'); // $ExpectError
+    sinon.assert.alwaysCalledWithExactly(typedSpy, 'a', true);
+    sinon.assert.alwaysCalledWithExactly(typedSpy, 'a', 1); // $ExpectError
+    sinon.assert.calledWithMatch(typedSpy, 'a', true);
+    sinon.assert.calledWithMatch(typedSpy.firstCall, 'a', true);
+    sinon.assert.calledWithMatch(typedSpy.firstCall, 'a', 2); // $ExpectError
+    sinon.assert.alwaysCalledWithMatch(typedSpy, 'a', true);
+    sinon.assert.alwaysCalledWithMatch(typedSpy, 'a', 2); // $ExpectError
+    sinon.assert.neverCalledWithMatch(typedSpy, 'a', true);
+    sinon.assert.neverCalledWithMatch(typedSpy, 'a', 2); // $ExpectError
+    sinon.assert.calledWithNew(typedSpy);
+    sinon.assert.calledWithNew(typedSpy.firstCall);
+    sinon.assert.threw(typedSpy);
+    sinon.assert.threw(typedSpy.firstCall);
+    sinon.assert.threw(typedSpy, 'foo error');
+    sinon.assert.threw(typedSpy.firstCall, 'foo error');
+    sinon.assert.threw(typedSpy, new Error('foo'));
+    sinon.assert.threw(typedSpy.firstCall, new Error('foo'));
+    sinon.assert.alwaysThrew(typedSpy);
+    sinon.assert.alwaysThrew(typedSpy, 'foo error');
+    sinon.assert.alwaysThrew(typedSpy, new Error('foo'));
+    sinon.assert.match('a', 'b');
+    sinon.assert.match(1, 1 + 1);
+    sinon.assert.match({ a: 1 }, { b: 2, c: 'abc' });
+    sinon.assert.expose(obj);
+    sinon.assert.expose(obj, { prefix: 'blah' });
+    sinon.assert.expose(obj, { includeFail: true });
 }
 
 function testTypedSpy() {

From aae346fe6e88be2931eeddf03dca99aa78dc2aa5 Mon Sep 17 00:00:00 2001
From: Stephen Niedzielski <stephen@niedzielski.com>
Date: Tue, 19 Feb 2019 19:02:05 -0700
Subject: [PATCH 075/924] [jest-each] Update: templatize .each()

- Replace `any` with templates.

- Update Jest website to fix failing test.

fix #33079
---
 types/jest/index.d.ts | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 29b3210cc2..b5ee488b2b 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Jest 24.0
-// Project: http://facebook.github.io/jest/
+// Project: https://jestjs.io
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>
 //                 jwbay <https://github.com/jwbay>
@@ -263,7 +263,20 @@ declare namespace jest {
     }
 
     interface Each {
-        (cases: any[]): (name: string, fn: (...args: any[]) => any) => void;
+        // Exclusively arrays.
+        <T extends any[]>(cases: ReadonlyArray<T>): (
+            name: string,
+            fn: (...args: T) => any
+        ) => void;
+        // Not arrays.
+        <T>(cases: ReadonlyArray<T>): (
+            name: string,
+            fn: (...args: T[]) => any
+        ) => void;
+        (cases: ReadonlyArray<ReadonlyArray<any>>): (
+            name: string,
+            fn: (...args: any[]) => any
+        ) => void;
         (strings: TemplateStringsArray, ...placeholders: any[]): (
             name: string,
             fn: (arg: any) => any

From e50e51a73ab644ca2be9783807fd199caa373521 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Wed, 20 Feb 2019 10:35:23 +0100
Subject: [PATCH 076/924] Fix TSLint

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

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 3898097278..b491b3cf88 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1180,7 +1180,7 @@ declare namespace Sinon {
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder(...spies: SinonSpy<any>[]): void;
+        callOrder(...spies: Array<SinonSpy<any>>): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.

From 1f9582f217990e222ae52256495b9b706f414557 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Wed, 20 Feb 2019 12:53:26 +0100
Subject: [PATCH 077/924] Remove any

---
 types/sinon/ts3.1/index.d.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index b491b3cf88..8307b9782d 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1155,41 +1155,41 @@ declare namespace Sinon {
          * Passes if spy was never called
          * @param spy
          */
-        notCalled(spy: SinonSpy<any>): void;
+        notCalled<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Passes if spy was called at least once.
          */
-        called(spy: SinonSpy<any>): void;
+        called<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Passes if spy was called once and only once.
          */
-        calledOnce(spy: SinonSpy<any>): void;
+        calledOnce<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Passes if spy was called exactly twice.
          */
-        calledTwice(spy: SinonSpy<any>): void;
+        calledTwice<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Passes if spy was called exactly three times.
          */
-        calledThrice(spy: SinonSpy<any>): void;
+        calledThrice<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Passes if spy was called exactly num times.
          */
-        callCount(spy: SinonSpy<any>, count: number): void;
+        callCount<TArgs extends any[]>(spy: SinonSpy<TArgs>, count: number): void;
         /**
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder(...spies: Array<SinonSpy<any>>): void;
+        callOrder<TArgs extends any[]>(...spies: Array<SinonSpy<TArgs>>): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.
          */
-        calledOn(spyOrSpyCall: SinonSpy<any> | SinonSpyCall, obj: any): void;
+        calledOn<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall, obj: any): void;
         /**
          * Passes if spy was always called with obj as its this value.
          */
-        alwaysCalledOn(spy: SinonSpy<any>, obj: any): void;
+        alwaysCalledOn<TArgs extends any[]>(spy: SinonSpy<TArgs>, obj: any): void;
         /**
          * Passes if spy was called with the provided arguments.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWith(spy.firstCall, arg1, arg2, ...);.
@@ -1249,35 +1249,35 @@ declare namespace Sinon {
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithNew(spy.secondCall, arg1, arg2, ...);.
          * @param spyOrSpyCall
          */
-        calledWithNew(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>): void;
+        calledWithNew<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>): void;
         /**
          * Passes if spy threw any exception.
          */
-        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>): void;
+        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is an actual object.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>, exception: string): void;
+        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>, exception: string): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is a String denoting its type.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw(spyOrSpyCall: SinonSpy<any> | SinonSpyCall<any>, exception: any): void;
+        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>, exception: any): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy<any>): void;
+        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy<any>, exception: string): void;
+        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>, exception: string): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew(spy: SinonSpy<any>, exception: any): void;
+        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>, exception: any): void;
         /**
          * Uses sinon.match to test if the arguments can be considered a match.
          */

From cd4db81e36a23af91718487a2cc60d133e8df44d Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Wed, 20 Feb 2019 12:57:09 +0100
Subject: [PATCH 078/924] Leave any for callOrder()

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

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 8307b9782d..aefc93f624 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1180,7 +1180,7 @@ declare namespace Sinon {
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder<TArgs extends any[]>(...spies: Array<SinonSpy<TArgs>>): void;
+        callOrder(...spies: Array<SinonSpy<any>>): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.

From efbf4f4d1dd5338f4a04877d40ccc0fba46f7ff5 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Wed, 20 Feb 2019 12:21:34 +0000
Subject: [PATCH 079/924] Lodash: `isObject`: user-defined type guard

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

diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
index 68084f1c8d..c2c983ca6e 100644
--- a/types/lodash/fp.d.ts
+++ b/types/lodash/fp.d.ts
@@ -1984,7 +1984,7 @@ declare namespace _ {
     type LodashIsNil = (value: any) => value is null | undefined;
     type LodashIsNull = (value: any) => value is null;
     type LodashIsNumber = (value: any) => value is number;
-    type LodashIsObject = (value: any) => boolean;
+    type LodashIsObject = (value: any) => value is object;
     type LodashIsObjectLike = (value: any) => boolean;
     type LodashIsPlainObject = (value: any) => boolean;
     type LodashIsRegExp = (value: any) => value is RegExp;
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 64d445c65a..b3b5910401 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4291,6 +4291,10 @@ fp.now(); // $ExpectType number
     _(42).isObject(); // $ExpectType boolean
     _.chain([]).isObject(); // $ExpectType LoDashExplicitWrapper<boolean>
     fp.isObject(anything); // $ExpectType boolean
+    if (fp.isObject(anything)) {
+        // $ExpectType object
+        anything
+    };
 }
 
 // _.isObjectLike

From 1603c4f4a8de0142d0d7b5be9f98f983cd8cea11 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Wed, 20 Feb 2019 12:41:56 +0000
Subject: [PATCH 080/924] Format

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index b3b5910401..fa5c0ad439 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4293,8 +4293,8 @@ fp.now(); // $ExpectType number
     fp.isObject(anything); // $ExpectType boolean
     if (fp.isObject(anything)) {
         // $ExpectType object
-        anything
-    };
+        anything;
+    }
 }
 
 // _.isObjectLike

From e72f9cdacfa4193f92a8c3b2e116d98d52fa4851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= <me@jiripudil.cz>
Date: Wed, 20 Feb 2019 15:42:51 +0100
Subject: [PATCH 081/924] Fix a few incorrect types

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

diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index b38d96d45c..e50feb0b5d 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -394,7 +394,7 @@ export class Editor extends util.Observable {
 
   addCommand(name: string, callback: (ui: boolean, value: {}) => boolean, scope?: {}): void;
 
-  addContextToolbar(predicate: () => void, items: string): void;
+  addContextToolbar(predicate: () => boolean, items: string): void;
 
   addMenuItem(name: string, settings: {}): void;
 
@@ -414,7 +414,7 @@ export class Editor extends util.Observable {
 
   execCallback(name: string): {};
 
-  execCommand(cmd: string, ui: boolean, value?: any, args?: {}): void;
+  execCommand(cmd: string, ui?: boolean, value?: any, args?: {}): void;
 
   focus(skipFocus: boolean): void;
 
@@ -838,7 +838,7 @@ export namespace dom {
 
     insertAfter<T>(node: Element, referenceNode: Element): Element | T[];
 
-    is(elm: Node, selector: string): void;
+    is(elm: Node, selector: string): boolean;
 
     isBlock(node: Node): boolean;
 
@@ -1072,7 +1072,7 @@ export namespace dom {
 
     setContent(content: string, args?: {}): void;
 
-    setCursorLocation(node?: html.Node, offset?: number): void;
+    setCursorLocation(node?: Node, offset?: number): void;
 
     setNode(elm: Element): Element;
 

From 49d632d31a54df67dc4747b386c64315701fd322 Mon Sep 17 00:00:00 2001
From: Thomas Stenberg Oddsund <thomasoddsund att bekk>
Date: Wed, 20 Feb 2019 20:51:27 +0100
Subject: [PATCH 082/924] Throttle and debounce enhance the function it wraps
 as of 2.1.0

---
 types/throttle-debounce/index.d.ts            | 30 ++++++++++++++-----
 .../throttle-debounce-tests.ts                | 28 +++++++++++------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/types/throttle-debounce/index.d.ts b/types/throttle-debounce/index.d.ts
index 34bfbbdb5b..5b1f197a31 100644
--- a/types/throttle-debounce/index.d.ts
+++ b/types/throttle-debounce/index.d.ts
@@ -1,8 +1,17 @@
 // Type definitions for throttle-debounce 1.1
 // Project: https://github.com/niksy/throttle-debounce
-// Definitions by: Marek Buchar <https://github.com/czbuchi>, Frank Li <https://github.com/franklixuefei>
+// Definitions by: Marek Buchar <https://github.com/czbuchi>, Frank Li <https://github.com/franklixuefei>, Thomas Oddsund <https://github.com/oddsund>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export {};
+
+interface Cancel {
+    cancel: () => void;
+}
+
+export type throttle<T> = T & Cancel;
+export type debounce<T> = throttle<T>;
+
 /**
  * Throttle execution of a function. Especially useful for rate limiting
  * execution of handlers on events like resize and scroll.
@@ -34,8 +43,8 @@ export function throttle<T extends (...args: any[]) => any>(
     delay: number,
     noTrailing: boolean,
     callback: T,
-    debounceMode?: boolean,
-): T;
+    debounceMode?: boolean
+): throttle<T>;
 
 /**
  * Throttle execution of a function. Especially useful for rate limiting
@@ -60,8 +69,8 @@ export function throttle<T extends (...args: any[]) => any>(
 export function throttle<T extends (...args: any[]) => any>(
     delay: number,
     callback: T,
-    debounceMode?: boolean,
-): T;
+    debounceMode?: boolean
+): throttle<T>;
 
 /**
  * Debounce execution of a function. Debouncing, unlike throttling,
@@ -87,7 +96,11 @@ export function throttle<T extends (...args: any[]) => any>(
  * @return
  * A new, debounced function.
  */
-export function debounce<T extends (...args: any[]) => any>(delay: number, atBegin: boolean, callback: T): T;
+export function debounce<T extends (...args: any[]) => any>(
+    delay: number,
+    atBegin: boolean,
+    callback: T
+): debounce<T>;
 
 /**
  * Debounce execution of a function. Debouncing, unlike throttling,
@@ -106,4 +119,7 @@ export function debounce<T extends (...args: any[]) => any>(delay: number, atBeg
  * @return
  * A new, debounced function.
  */
-export function debounce<T extends (...args: any[]) => any>(delay: number, callback: T): T;
+export function debounce<T extends (...args: any[]) => any>(
+    delay: number,
+    callback: T
+): debounce<T>;
diff --git a/types/throttle-debounce/throttle-debounce-tests.ts b/types/throttle-debounce/throttle-debounce-tests.ts
index 0090eb1039..506d3742ad 100644
--- a/types/throttle-debounce/throttle-debounce-tests.ts
+++ b/types/throttle-debounce/throttle-debounce-tests.ts
@@ -1,15 +1,25 @@
-import throttleDebounce = require('throttle-debounce');
-
-const { throttle, debounce } = throttleDebounce;
+import { throttle, debounce } from "throttle-debounce";
 
 type Func = () => void;
 
 const func: Func = () => {};
 
-const throttle1: Func = throttle(42, true, func, true);
-const throttle2: Func = throttle(42, true, func);
-const throttle3: Func = throttle(42, func, true);
-const throttle4: Func = throttle(42, func);
+const throttleWithoutCancel1: Func = throttle(42, true, func, true);
+const throttleWithoutCancel2: Func = throttle(42, true, func);
+const throttleWithoutCancel3: Func = throttle(42, func, true);
+const throttleWithoutCancel4: Func = throttle(42, func);
+// $ExpectError
+throttleWithoutCancel1.cancel();
+const throttleWithCancel1: throttle<Func> = throttle(42, true, func, true);
+const throttleWithCancel2: throttle<Func> = throttle(42, true, func);
+const throttleWithCancel3: throttle<Func> = throttle(42, func, true);
+const throttleWithCancel4: throttle<Func> = throttle(42, func);
+throttleWithCancel1.cancel();
 
-const debounce1: Func = debounce(42, true, func);
-const debounce2: Func = debounce(42, func);
+const debounceWithoutCancel1: Func = debounce(42, true, func);
+const debounceWithoutCancel2: Func = debounce(42, func);
+// $ExpectError
+debounceWithoutCancel1.cancel();
+const debounceWithCancel1: debounce<Func> = debounce(42, true, func);
+const debounceWithCancel2: debounce<Func> = debounce(42, func);
+debounceWithCancel1.cancel();

From 851667c52342e5671609d5edc9859136daa310a5 Mon Sep 17 00:00:00 2001
From: Thomas Stenberg Oddsund <thomasoddsund att bekk>
Date: Wed, 20 Feb 2019 23:45:22 +0100
Subject: [PATCH 083/924] Added tests where the wrapped function is called.

---
 types/throttle-debounce/throttle-debounce-tests.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/throttle-debounce/throttle-debounce-tests.ts b/types/throttle-debounce/throttle-debounce-tests.ts
index 506d3742ad..ff4f757dbc 100644
--- a/types/throttle-debounce/throttle-debounce-tests.ts
+++ b/types/throttle-debounce/throttle-debounce-tests.ts
@@ -8,18 +8,23 @@ const throttleWithoutCancel1: Func = throttle(42, true, func, true);
 const throttleWithoutCancel2: Func = throttle(42, true, func);
 const throttleWithoutCancel3: Func = throttle(42, func, true);
 const throttleWithoutCancel4: Func = throttle(42, func);
+
+throttleWithoutCancel1();
 // $ExpectError
 throttleWithoutCancel1.cancel();
 const throttleWithCancel1: throttle<Func> = throttle(42, true, func, true);
 const throttleWithCancel2: throttle<Func> = throttle(42, true, func);
 const throttleWithCancel3: throttle<Func> = throttle(42, func, true);
 const throttleWithCancel4: throttle<Func> = throttle(42, func);
+throttleWithCancel1();
 throttleWithCancel1.cancel();
 
 const debounceWithoutCancel1: Func = debounce(42, true, func);
 const debounceWithoutCancel2: Func = debounce(42, func);
+debounceWithoutCancel1();
 // $ExpectError
 debounceWithoutCancel1.cancel();
 const debounceWithCancel1: debounce<Func> = debounce(42, true, func);
 const debounceWithCancel2: debounce<Func> = debounce(42, func);
+debounceWithCancel1();
 debounceWithCancel1.cancel();

From 0e2352b545e4337c1cc738c7770a3259af8df700 Mon Sep 17 00:00:00 2001
From: WaiKit <wkit23@yahoo.com>
Date: Thu, 21 Feb 2019 12:50:06 +0800
Subject: [PATCH 084/924] Added $parent

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

diff --git a/types/bpmn-moddle/index.d.ts b/types/bpmn-moddle/index.d.ts
index f4411e05fa..43a6431308 100644
--- a/types/bpmn-moddle/index.d.ts
+++ b/types/bpmn-moddle/index.d.ts
@@ -25,6 +25,7 @@ declare namespace BPMNModdle {
 
     interface TypeDerived {
         $type: ElementType;
+        $parent: TypeDerived;
     }
     interface BaseElement extends TypeDerived {
         /**

From de1439e667d0def34a98c49d6cc73b7bae2309b0 Mon Sep 17 00:00:00 2001
From: Joan Karadimov <joan@profuzdigital.com>
Date: Wed, 20 Feb 2019 18:07:42 +0200
Subject: [PATCH 085/924] Add parameters to callbacks for bootstrap-notify

---
 .../bootstrap-notify-tests.ts                 | 19 ++++++++++++++++++-
 types/bootstrap-notify/index.d.ts             | 10 +++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/types/bootstrap-notify/bootstrap-notify-tests.ts b/types/bootstrap-notify/bootstrap-notify-tests.ts
index 2977d39abf..4b288b2ca0 100644
--- a/types/bootstrap-notify/bootstrap-notify-tests.ts
+++ b/types/bootstrap-notify/bootstrap-notify-tests.ts
@@ -46,4 +46,21 @@ $.notify({
 		'</div>' +
 		'<a href="{3}" target="{4}" data-notify="url"></a>' +
 	'</div>'
-});
\ No newline at end of file
+});
+
+const notifyResult = $.notify({
+	message: 'Callbacks have the popup element as an argument',
+},{
+	onShow: function($ele) {
+		notifyResult.$ele === $ele;
+	},
+	onShown: function($ele) {
+		notifyResult.$ele === $ele;
+	},
+	onClose: function($ele) {
+		notifyResult.$ele === $ele;
+	},
+	onClosed: function($ele) {
+		notifyResult.$ele === $ele;
+	},
+});
diff --git a/types/bootstrap-notify/index.d.ts b/types/bootstrap-notify/index.d.ts
index 540f200d9c..75994ad365 100644
--- a/types/bootstrap-notify/index.d.ts
+++ b/types/bootstrap-notify/index.d.ts
@@ -48,16 +48,16 @@ interface NotifySettings {
 		enter?: string;
 		exit?: string;
 	};
-	onShow?: () => void;
-	onShown?: () => void;
-	onClose?: () => void;
-	onClosed?: () => void;
+	onShow?: ($ele: JQuery) => void;
+	onShown?: ($ele: JQuery) => void;
+	onClose?: ($ele: JQuery) => void;
+	onClosed?: ($ele: JQuery) => void;
 	icon_type?: string;
 	template?: string;
 }
 
 interface NotifyReturn {
-	$ele: JQueryStatic;
+	$ele: JQuery;
 	close: () => void;
 	update: (command: string, update: any) => void;
 }

From 948ae3f83060686315277ff34c1bcc11cd3244c3 Mon Sep 17 00:00:00 2001
From: Christian Petrov <cpetrov@eclipsesource.com>
Date: Thu, 21 Feb 2019 14:41:23 +0100
Subject: [PATCH 086/924] [tabris-plugin-firebase] Remove not needed package

The typings are now included in the project.

Change-Id: Id552650efca3566360a2d2dbd4ec6450f4dde98b
---
 notNeededPackages.json                        |   6 +
 types/tabris-plugin-firebase/index.d.ts       | 147 ------------------
 .../tabris-plugin-firebase-tests.ts           |  67 --------
 types/tabris-plugin-firebase/tsconfig.json    |  23 ---
 types/tabris-plugin-firebase/tslint.json      |   6 -
 5 files changed, 6 insertions(+), 243 deletions(-)
 delete mode 100644 types/tabris-plugin-firebase/index.d.ts
 delete mode 100644 types/tabris-plugin-firebase/tabris-plugin-firebase-tests.ts
 delete mode 100644 types/tabris-plugin-firebase/tsconfig.json
 delete mode 100644 types/tabris-plugin-firebase/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 1521fd7426..23477f0cca 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1650,6 +1650,12 @@
             "sourceRepoURL": "http://tabrisjs.com",
             "asOfVersion": "1.8.0"
         },
+        {
+            "libraryName": "tabris-plugin-firebase",
+            "typingsPackageName": "tabris-plugin-firebase",
+            "sourceRepoURL": "https://github.com/eclipsesource/tabris-plugin-firebase",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "tcomb",
             "typingsPackageName": "tcomb",
diff --git a/types/tabris-plugin-firebase/index.d.ts b/types/tabris-plugin-firebase/index.d.ts
deleted file mode 100644
index 0ade0c9dcf..0000000000
--- a/types/tabris-plugin-firebase/index.d.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-// Type definitions for tabris-plugin-firebase 1.0
-// Project: https://github.com/eclipsesource/tabris-plugin-firebase/
-// Definitions by: EclipseSource <https://github.com/eclipsesource>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-declare global {
-    namespace firebase {
-        const Analytics: Analytics;
-        const Messaging: Messaging;
-        const MessagingEvents: MessagingEvents;
-        const MessageEvent: MessageEvent;
-        type AnalyticsProperties = Partial<PropertyMixins.Analytics>;
-
-        interface Analytics extends NativeObject, PropertyMixins.Analytics {
-            logEvent(eventName: string, parameters?: {[key: string]: string}): void;
-            setUserProperty(propertyName: string, value: string): void;
-            set(properties: AnalyticsProperties): this;
-            set(property: string, value: any): this;
-        }
-
-        interface Messaging extends NativeObject {
-            readonly instanceId: string;
-            readonly token: string;
-            readonly launchData: object;
-            resetInstanceId(): void;
-            on(type: string, listener: (event: any) => void, context?: object): this;
-            on(listeners: MessagingEvents): this;
-            off(type: string, listener: (event: any) => void, context?: object): this;
-            off(listeners: MessagingEvents): this;
-            once(type: string, listener: (event: any) => void, context?: object): this;
-            once(listeners: MessagingEvents): this;
-        }
-
-        interface MessagingEvents {
-            instanceIdChanged?(event: PropertyChangedEvent<Messaging, string>): void;
-            tokenChanged?(event: PropertyChangedEvent<Messaging, string>): void;
-            message?(event: MessageEvent): void;
-        }
-
-        interface MessageEvent extends EventObject<Messaging> {
-            data: any;
-        }
-
-        namespace PropertyMixins {
-            interface Analytics {
-                analyticsCollectionEnabled: boolean;
-                screenName: string;
-                userId: string;
-            }
-        }
-    }
-}
-
-// Tabris.js interfaces
-
-interface EventObject<T> {
-    readonly target: T;
-    readonly timeStamp: number;
-    readonly type: string;
-}
-
-/**
- * Base class for all objects with a native implementation.
- */
-declare class NativeObject {
-    protected constructor(properties?: object);
-
-    /**
-     * Gets the current value of the given *property*.
-     */
-    get(property: string): any;
-
-    /**
-     * Removes all occurrences of *listener* that are bound to *type* and *context* from this widget.
-     * @param type The type of events to remove listeners for.
-     * @param listener The listener function to remove.
-     * @param context The context of the bound listener to remove.
-     */
-    off(type: string, listener: (event: any) => void, context?: object): this;
-
-    /**
-     * Removes all listeners in the given object from the event type indicated by their key.
-     * @param listeners A key-value map where the keys are event types and the values are the listeners to deregister from these events, e.g. `{tap: onTap, scroll: onScroll}`.
-     */
-    off(listeners: object): this;
-
-    /**
-     * Registers a *listener* function to be notified of events of the given *type*.
-     * @param type The type of events to listen for.
-     * @param listener The listener function to register. This function will be called with an event object.
-     * @param context In the listener function, `this` will point to this object. If not present, the listener will be called in the context of this object.
-     */
-    on(type: string, listener: (event: any) => void, context?: object): this;
-
-    /**
-     * Registers all listeners in the given object for the event type indicated by their key.
-     * @param listeners A key-value map where the keys are event types and the values are the listeners to register for these events, e.g. `{tap: onTap, scroll: onScroll}`.
-     */
-    on(listeners: object): this;
-
-    /**
-     * Same as `on`, but removes the listener after it has been invoked by an event.
-     * @param type The type of the event to listen for.
-     * @param listener The listener function to register. This function will be called with an event object.
-     * @param context In the listener function, `this` will point to this object. If not present, the listener will be called in the context of this object.
-     */
-    once(type: string, listener: (event: any) => void, context?: object): this;
-
-    /**
-     * Same as `on`, but removes the listener after it has been invoked by an event.
-     * @param listeners A key-value map where the keys are event types and the values are the listeners to register for these events, e.g. `{tap: onTap, scroll: onScroll}`.
-     */
-    once(listeners: object): this;
-
-    /**
-     * Sets the given property.
-     */
-    set(property: string, value: any): this;
-
-    /**
-     * Sets all key-value pairs in the properties object as widget properties.
-     */
-    set(properties: object): this;
-
-    /**
-     * Notifies all registered listeners for the given *type* and passes the *event* object to the
-     * listeners.
-     * @param type The type of event to trigger
-     * @param event The event object to pass to listener functions.
-     */
-    trigger(type: string, event: EventObject<this>): this;
-
-    /**
-     * An application-wide unique identifier automatically assigned to all native objects on creation.
-     */
-    static readonly cid: string;
-}
-
-interface PropertyChangedEvent<T, U> {
-    readonly target: T;
-    readonly timeStamp: number;
-    readonly type: string;
-    readonly value: U;
-}
-
-export {};
diff --git a/types/tabris-plugin-firebase/tabris-plugin-firebase-tests.ts b/types/tabris-plugin-firebase/tabris-plugin-firebase-tests.ts
deleted file mode 100644
index 8dff4f34a8..0000000000
--- a/types/tabris-plugin-firebase/tabris-plugin-firebase-tests.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-function testAnalytics() {
-    // Properties
-    let analyticsCollectionEnabled: boolean;
-    let screenName: string;
-    let userId: string;
-
-    analyticsCollectionEnabled = firebase.Analytics.analyticsCollectionEnabled;
-    screenName = firebase.Analytics.screenName;
-    userId = firebase.Analytics.userId;
-
-    firebase.Analytics.analyticsCollectionEnabled = analyticsCollectionEnabled;
-    firebase.Analytics.screenName = screenName;
-    firebase.Analytics.userId = userId;
-
-    const properties: firebase.AnalyticsProperties = {analyticsCollectionEnabled, screenName, userId};
-    const partialProperties: firebase.AnalyticsProperties = {};
-    firebase.Analytics.set(properties);
-    firebase.Analytics.set(partialProperties);
-
-    // Methods
-    let thisReturnValue: firebase.Analytics;
-    const name = '';
-    const property = '';
-
-    thisReturnValue = firebase.Analytics.set({analyticsCollectionEnabled, screenName, userId});
-    firebase.Analytics.logEvent(name, {foo: property});
-    firebase.Analytics.logEvent(name);
-    firebase.Analytics.setUserProperty(name, property);
-}
-
-function testMessaging() {
-    // Properties
-    let instanceId: string;
-    let token: string;
-    let launchData: object;
-
-    instanceId = firebase.Messaging.instanceId;
-    token = firebase.Messaging.token;
-    launchData = firebase.Messaging.launchData;
-
-    // Methods
-    firebase.Messaging.resetInstanceId();
-
-    // Events
-    const target: firebase.Messaging = firebase.Messaging;
-    const timeStamp = 0;
-    const type = 'foo';
-    const value = 'bar';
-    const data: any = {};
-
-    const instanceIdChangedEvent: PropertyChangedEvent<firebase.Messaging, string> = {target, timeStamp, type, value};
-    const tokenChangedEvent: PropertyChangedEvent<firebase.Messaging, string> = {target, timeStamp, type, value};
-    const messageEvent: firebase.MessageEvent = {target, timeStamp, type, data};
-
-    firebase.Messaging.on({
-        instanceIdChanged: (event: PropertyChangedEvent<firebase.Messaging, string>) => {},
-        tokenChanged: (event: PropertyChangedEvent<firebase.Messaging, string>) => {},
-        message: (event: firebase.MessageEvent) => {}
-    });
-}
-
-interface PropertyChangedEvent<T, U> {
-    readonly target: T;
-    readonly timeStamp: number;
-    readonly type: string;
-    readonly value: U;
-}
diff --git a/types/tabris-plugin-firebase/tsconfig.json b/types/tabris-plugin-firebase/tsconfig.json
deleted file mode 100644
index cac6477844..0000000000
--- a/types/tabris-plugin-firebase/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "tabris-plugin-firebase-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/tabris-plugin-firebase/tslint.json b/types/tabris-plugin-firebase/tslint.json
deleted file mode 100644
index 4c4fc86ace..0000000000
--- a/types/tabris-plugin-firebase/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "strict-export-declare-modifiers": false
-    }
-}

From d9be19a2b23bdb291fd56372686241a958389164 Mon Sep 17 00:00:00 2001
From: Michael Louis Thaler <mthaler@managedbyq.com>
Date: Thu, 21 Feb 2019 09:52:32 -0500
Subject: [PATCH 087/924] Fix Superagent 4.x Request.end() method

The Superagent 4.x end() method on Request doesn't return anything, as
documented on their upgrade instructions. This bit us in prod.
---
 types/superagent/index.d.ts            | 2 +-
 types/supertest-as-promised/index.d.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 7915277b37..ae607c3c34 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -128,7 +128,7 @@ declare namespace request {
         ca(cert: Buffer): this;
         cert(cert: Buffer | string): this;
         clearTimeout(): this;
-        end(callback?: CallbackHandler): this;
+        end(callback?: CallbackHandler): void;
         field(name: string, val: MultipartValue): this;
         field(fields: { [fieldName: string]: MultipartValue }): this;
         get(field: string): string;
diff --git a/types/supertest-as-promised/index.d.ts b/types/supertest-as-promised/index.d.ts
index 1b12d57b0f..18047870a7 100644
--- a/types/supertest-as-promised/index.d.ts
+++ b/types/supertest-as-promised/index.d.ts
@@ -18,9 +18,11 @@ declare namespace supertestAsPromised {
     interface Response extends supertest.Response {
     }
 
+    type CallbackHandler = (err: any, res: Response) => void;
     interface Test extends supertest.Test, superagent.Request {
         toPromise(): PromiseBluebird<Response>;
         timeout(): Promise<Response> & this;
+        end(callback?: CallbackHandler): this;
     }
 
     function agent(app?: any): SuperTest<Test>;

From 7ba0d48ec9bb168b7f8ffbd47ec738c509e884ba Mon Sep 17 00:00:00 2001
From: Vahid Shirvani <vahid.shirvani@tele2.com>
Date: Thu, 21 Feb 2019 17:37:54 +0100
Subject: [PATCH 088/924] Case matters in linux

---
 types/ol/{assertionerror => AssertionError}/index.d.ts            | 0
 types/ol/{attribution => Attribution}/index.d.ts                  | 0
 types/ol/{collection => Collection}/index.d.ts                    | 0
 types/ol/{disposable => Disposable}/index.d.ts                    | 0
 types/ol/{feature => Feature}/index.d.ts                          | 0
 types/ol/{geolocation => Geolocation}/index.d.ts                  | 0
 types/ol/{graticule => Graticule}/index.d.ts                      | 0
 types/ol/{image => Image}/index.d.ts                              | 0
 types/ol/{imagebase => ImageBase}/index.d.ts                      | 0
 types/ol/{imagetile => ImageTile}/index.d.ts                      | 0
 types/ol/{kinetic => Kinetic}/index.d.ts                          | 0
 types/ol/{map => Map}/index.d.ts                                  | 0
 types/ol/{mapbrowserevent => MapBrowserEvent}/index.d.ts          | 0
 .../{mapbrowserpointerevent => MapBrowserPointerEvent}/index.d.ts | 0
 types/ol/{mapevent => MapEvent}/index.d.ts                        | 0
 types/ol/{object => Object}/index.d.ts                            | 0
 types/ol/{observable => Observable}/index.d.ts                    | 0
 types/ol/{overlay => Overlay}/index.d.ts                          | 0
 types/ol/{tile => Tile}/index.d.ts                                | 0
 types/ol/{vectortile => VectorTile}/index.d.ts                    | 0
 types/ol/{view => View}/index.d.ts                                | 0
 types/ol/control/{attribution.d.ts => Attribution.d.ts}           | 0
 types/ol/control/{control.d.ts => Control.d.ts}                   | 0
 types/ol/control/{fullscreen.d.ts => Fullscreen.d.ts}             | 0
 types/ol/control/{mouseposition.d.ts => MousePosition.d.ts}       | 0
 types/ol/control/{overviewmap.d.ts => OverviewMap.d.ts}           | 0
 types/ol/control/{rotate.d.ts => Rotate.d.ts}                     | 0
 types/ol/control/{scaleline.d.ts => ScaleLine.d.ts}               | 0
 types/ol/control/{zoom.d.ts => Zoom.d.ts}                         | 0
 types/ol/control/{zoomslider.d.ts => ZoomSlider.d.ts}             | 0
 types/ol/control/{zoomtoextent.d.ts => ZoomToExtent.d.ts}         | 0
 types/ol/events/{event.d.ts => Event.d.ts}                        | 0
 types/ol/events/{eventtarget.d.ts => EventTarget.d.ts}            | 0
 types/ol/format/{esrijson.d.ts => EsriJSON.d.ts}                  | 0
 types/ol/format/{feature.d.ts => Feature.d.ts}                    | 0
 types/ol/format/{gml2.d.ts => GML2.d.ts}                          | 0
 types/ol/format/{gml3.d.ts => GML3.d.ts}                          | 0
 types/ol/format/{gmlbase.d.ts => GMLBase.d.ts}                    | 0
 types/ol/format/{gpx.d.ts => GPX.d.ts}                            | 0
 types/ol/format/{geojson.d.ts => GeoJSON.d.ts}                    | 0
 types/ol/format/{igc.d.ts => IGC.d.ts}                            | 0
 types/ol/format/{jsonfeature.d.ts => JSONFeature.d.ts}            | 0
 types/ol/format/{kml.d.ts => KML.d.ts}                            | 0
 types/ol/format/{mvt.d.ts => MVT.d.ts}                            | 0
 types/ol/format/{osmxml.d.ts => OSMXML.d.ts}                      | 0
 types/ol/format/{polyline.d.ts => Polyline.d.ts}                  | 0
 types/ol/format/{textfeature.d.ts => TextFeature.d.ts}            | 0
 types/ol/format/{topojson.d.ts => TopoJSON.d.ts}                  | 0
 types/ol/format/{wfs.d.ts => WFS.d.ts}                            | 0
 types/ol/format/{wkt.d.ts => WKT.d.ts}                            | 0
 types/ol/format/{wmscapabilities.d.ts => WMSCapabilities.d.ts}    | 0
 .../ol/format/{wmsgetfeatureinfo.d.ts => WMSGetFeatureInfo.d.ts}  | 0
 types/ol/format/{wmtscapabilities.d.ts => WMTSCapabilities.d.ts}  | 0
 types/ol/format/{xml.d.ts => XML.d.ts}                            | 0
 types/ol/format/{xmlfeature.d.ts => XMLFeature.d.ts}              | 0
 types/ol/geom/{circle.d.ts => Circle.d.ts}                        | 0
 types/ol/geom/{geometry.d.ts => Geometry.d.ts}                    | 0
 .../ol/geom/{geometrycollection.d.ts => GeometryCollection.d.ts}  | 0
 types/ol/geom/{linestring.d.ts => LineString.d.ts}                | 0
 types/ol/geom/{linearring.d.ts => LinearRing.d.ts}                | 0
 types/ol/geom/{multipoint.d.ts => MultiPoint.d.ts}                | 0
 types/ol/geom/{multipolygon.d.ts => MultiPolygon.d.ts}            | 0
 types/ol/geom/{multilinestring.d.ts => MultilineString.d.ts}      | 0
 types/ol/geom/{point.d.ts => Point.d.ts}                          | 0
 types/ol/geom/{polygon.d.ts => Polygon.d.ts}                      | 0
 types/ol/geom/{simplegeometry.d.ts => SimpleGeometry.d.ts}        | 0
 .../ol/interaction/{doubleclickzoom.d.ts => DoubleClickZoom.d.ts} | 0
 types/ol/interaction/{draganddrop.d.ts => DragAndDrop.d.ts}       | 0
 types/ol/interaction/{dragbox.d.ts => DragBox.d.ts}               | 0
 types/ol/interaction/{dragpan.d.ts => DragPan.d.ts}               | 0
 types/ol/interaction/{dragrotate.d.ts => DragRotate.d.ts}         | 0
 .../{dragrotateandzoom.d.ts => DragRotateAndZoom.d.ts}            | 0
 types/ol/interaction/{dragzoom.d.ts => DragZoom.d.ts}             | 0
 types/ol/interaction/{draw.d.ts => Draw.d.ts}                     | 0
 types/ol/interaction/{extent.d.ts => Extent.d.ts}                 | 0
 types/ol/interaction/{interaction.d.ts => Interaction.d.ts}       | 0
 types/ol/interaction/{keyboardpan.d.ts => KeyboardPan.d.ts}       | 0
 types/ol/interaction/{keyboardzoom.d.ts => KeyboardZoom.d.ts}     | 0
 types/ol/interaction/{modify.d.ts => Modify.d.ts}                 | 0
 types/ol/interaction/{mousewheelzoom.d.ts => MouseWheelZoom.d.ts} | 0
 types/ol/interaction/{pinchrotate.d.ts => PinchRotate.d.ts}       | 0
 types/ol/interaction/{pinchzoom.d.ts => PinchZoom.d.ts}           | 0
 types/ol/interaction/{pointer.d.ts => Pointer.d.ts}               | 0
 types/ol/interaction/{select.d.ts => Select.d.ts}                 | 0
 types/ol/interaction/{snap.d.ts => Snap.d.ts}                     | 0
 types/ol/interaction/{translate.d.ts => Translate.d.ts}           | 0
 types/ol/layer/{base.d.ts => Base.d.ts}                           | 0
 types/ol/layer/{group.d.ts => Group.d.ts}                         | 0
 types/ol/layer/{heatmap.d.ts => Heatmap.d.ts}                     | 0
 types/ol/layer/{image.d.ts => Image.d.ts}                         | 0
 types/ol/layer/{layer.d.ts => Layer.d.ts}                         | 0
 types/ol/layer/{tile.d.ts => Tile.d.ts}                           | 0
 types/ol/layer/{vector.d.ts => Vector.d.ts}                       | 0
 types/ol/layer/{vectortile.d.ts => VectorTile.d.ts}               | 0
 types/ol/pointer/{pointerevent.d.ts => PointerEvent.d.ts}         | 0
 types/ol/proj/{projection.d.ts => Projection.d.ts}                | 0
 types/ol/render/{event.d.ts => Event.d.ts}                        | 0
 types/ol/render/{feature.d.ts => Feature.d.ts}                    | 0
 types/ol/render/{vectorcontext.d.ts => VectorContext.d.ts}        | 0
 types/ol/source/{bingmaps.d.ts => BingMaps.d.ts}                  | 0
 types/ol/source/{cartodb.d.ts => CartoDB.d.ts}                    | 0
 types/ol/source/{cluster.d.ts => Cluster.d.ts}                    | 0
 types/ol/source/{image.d.ts => Image.d.ts}                        | 0
 types/ol/source/{imagearcgisrest.d.ts => ImageArcGISRest.d.ts}    | 0
 types/ol/source/{imagecanvas.d.ts => ImageCanvas.d.ts}            | 0
 types/ol/source/{imagemapguide.d.ts => ImageMapGuide.d.ts}        | 0
 types/ol/source/{imagestatic.d.ts => ImageStatic.d.ts}            | 0
 types/ol/source/{imagevector.d.ts => ImageVector.d.ts}            | 0
 types/ol/source/{imagewms.d.ts => ImageWMS.d.ts}                  | 0
 types/ol/source/{osm.d.ts => OSM.d.ts}                            | 0
 types/ol/source/{raster.d.ts => Raster.d.ts}                      | 0
 types/ol/source/{source.d.ts => Source.d.ts}                      | 0
 types/ol/source/{stamen.d.ts => Stamen.d.ts}                      | 0
 types/ol/source/{tile.d.ts => Tile.d.ts}                          | 0
 types/ol/source/{tilearcgisrest.d.ts => TileArcGISRest.d.ts}      | 0
 types/ol/source/{tiledebug.d.ts => TileDebug.d.ts}                | 0
 types/ol/source/{tileimage.d.ts => TileImage.d.ts}                | 0
 types/ol/source/{tilejson.d.ts => TileJSON.d.ts}                  | 0
 types/ol/source/{tileutfgrid.d.ts => TileUTFGrid.d.ts}            | 0
 types/ol/source/{tilewms.d.ts => TileWMS.d.ts}                    | 0
 types/ol/source/{urltile.d.ts => UrlTile.d.ts}                    | 0
 types/ol/source/{vector.d.ts => Vector.d.ts}                      | 0
 types/ol/source/{vectortile.d.ts => VectorTile.d.ts}              | 0
 types/ol/source/{wmts.d.ts => WMTS.d.ts}                          | 0
 types/ol/source/{xyz.d.ts => XYZ.d.ts}                            | 0
 types/ol/source/{zoomify.d.ts => Zoomify.d.ts}                    | 0
 types/ol/style/{atlasmanager.d.ts => AtlasManager.d.ts}           | 0
 types/ol/style/{circle.d.ts => Circle.d.ts}                       | 0
 types/ol/style/{fill.d.ts => Fill.d.ts}                           | 0
 types/ol/style/{icon.d.ts => Icon.d.ts}                           | 0
 types/ol/style/{image.d.ts => Image.d.ts}                         | 0
 types/ol/style/{regularshape.d.ts => RegularShape.d.ts}           | 0
 types/ol/style/{stroke.d.ts => Stroke.d.ts}                       | 0
 types/ol/style/{style.d.ts => Style.d.ts}                         | 0
 types/ol/style/{text.d.ts => Text.d.ts}                           | 0
 types/ol/tilegrid/{tilegrid.d.ts => TileGrid.d.ts}                | 0
 types/ol/tilegrid/{wmts.d.ts => WMTS.d.ts}                        | 0
 137 files changed, 0 insertions(+), 0 deletions(-)
 rename types/ol/{assertionerror => AssertionError}/index.d.ts (100%)
 rename types/ol/{attribution => Attribution}/index.d.ts (100%)
 rename types/ol/{collection => Collection}/index.d.ts (100%)
 rename types/ol/{disposable => Disposable}/index.d.ts (100%)
 rename types/ol/{feature => Feature}/index.d.ts (100%)
 rename types/ol/{geolocation => Geolocation}/index.d.ts (100%)
 rename types/ol/{graticule => Graticule}/index.d.ts (100%)
 rename types/ol/{image => Image}/index.d.ts (100%)
 rename types/ol/{imagebase => ImageBase}/index.d.ts (100%)
 rename types/ol/{imagetile => ImageTile}/index.d.ts (100%)
 rename types/ol/{kinetic => Kinetic}/index.d.ts (100%)
 rename types/ol/{map => Map}/index.d.ts (100%)
 rename types/ol/{mapbrowserevent => MapBrowserEvent}/index.d.ts (100%)
 rename types/ol/{mapbrowserpointerevent => MapBrowserPointerEvent}/index.d.ts (100%)
 rename types/ol/{mapevent => MapEvent}/index.d.ts (100%)
 rename types/ol/{object => Object}/index.d.ts (100%)
 rename types/ol/{observable => Observable}/index.d.ts (100%)
 rename types/ol/{overlay => Overlay}/index.d.ts (100%)
 rename types/ol/{tile => Tile}/index.d.ts (100%)
 rename types/ol/{vectortile => VectorTile}/index.d.ts (100%)
 rename types/ol/{view => View}/index.d.ts (100%)
 rename types/ol/control/{attribution.d.ts => Attribution.d.ts} (100%)
 rename types/ol/control/{control.d.ts => Control.d.ts} (100%)
 rename types/ol/control/{fullscreen.d.ts => Fullscreen.d.ts} (100%)
 rename types/ol/control/{mouseposition.d.ts => MousePosition.d.ts} (100%)
 rename types/ol/control/{overviewmap.d.ts => OverviewMap.d.ts} (100%)
 rename types/ol/control/{rotate.d.ts => Rotate.d.ts} (100%)
 rename types/ol/control/{scaleline.d.ts => ScaleLine.d.ts} (100%)
 rename types/ol/control/{zoom.d.ts => Zoom.d.ts} (100%)
 rename types/ol/control/{zoomslider.d.ts => ZoomSlider.d.ts} (100%)
 rename types/ol/control/{zoomtoextent.d.ts => ZoomToExtent.d.ts} (100%)
 rename types/ol/events/{event.d.ts => Event.d.ts} (100%)
 rename types/ol/events/{eventtarget.d.ts => EventTarget.d.ts} (100%)
 rename types/ol/format/{esrijson.d.ts => EsriJSON.d.ts} (100%)
 rename types/ol/format/{feature.d.ts => Feature.d.ts} (100%)
 rename types/ol/format/{gml2.d.ts => GML2.d.ts} (100%)
 rename types/ol/format/{gml3.d.ts => GML3.d.ts} (100%)
 rename types/ol/format/{gmlbase.d.ts => GMLBase.d.ts} (100%)
 rename types/ol/format/{gpx.d.ts => GPX.d.ts} (100%)
 rename types/ol/format/{geojson.d.ts => GeoJSON.d.ts} (100%)
 rename types/ol/format/{igc.d.ts => IGC.d.ts} (100%)
 rename types/ol/format/{jsonfeature.d.ts => JSONFeature.d.ts} (100%)
 rename types/ol/format/{kml.d.ts => KML.d.ts} (100%)
 rename types/ol/format/{mvt.d.ts => MVT.d.ts} (100%)
 rename types/ol/format/{osmxml.d.ts => OSMXML.d.ts} (100%)
 rename types/ol/format/{polyline.d.ts => Polyline.d.ts} (100%)
 rename types/ol/format/{textfeature.d.ts => TextFeature.d.ts} (100%)
 rename types/ol/format/{topojson.d.ts => TopoJSON.d.ts} (100%)
 rename types/ol/format/{wfs.d.ts => WFS.d.ts} (100%)
 rename types/ol/format/{wkt.d.ts => WKT.d.ts} (100%)
 rename types/ol/format/{wmscapabilities.d.ts => WMSCapabilities.d.ts} (100%)
 rename types/ol/format/{wmsgetfeatureinfo.d.ts => WMSGetFeatureInfo.d.ts} (100%)
 rename types/ol/format/{wmtscapabilities.d.ts => WMTSCapabilities.d.ts} (100%)
 rename types/ol/format/{xml.d.ts => XML.d.ts} (100%)
 rename types/ol/format/{xmlfeature.d.ts => XMLFeature.d.ts} (100%)
 rename types/ol/geom/{circle.d.ts => Circle.d.ts} (100%)
 rename types/ol/geom/{geometry.d.ts => Geometry.d.ts} (100%)
 rename types/ol/geom/{geometrycollection.d.ts => GeometryCollection.d.ts} (100%)
 rename types/ol/geom/{linestring.d.ts => LineString.d.ts} (100%)
 rename types/ol/geom/{linearring.d.ts => LinearRing.d.ts} (100%)
 rename types/ol/geom/{multipoint.d.ts => MultiPoint.d.ts} (100%)
 rename types/ol/geom/{multipolygon.d.ts => MultiPolygon.d.ts} (100%)
 rename types/ol/geom/{multilinestring.d.ts => MultilineString.d.ts} (100%)
 rename types/ol/geom/{point.d.ts => Point.d.ts} (100%)
 rename types/ol/geom/{polygon.d.ts => Polygon.d.ts} (100%)
 rename types/ol/geom/{simplegeometry.d.ts => SimpleGeometry.d.ts} (100%)
 rename types/ol/interaction/{doubleclickzoom.d.ts => DoubleClickZoom.d.ts} (100%)
 rename types/ol/interaction/{draganddrop.d.ts => DragAndDrop.d.ts} (100%)
 rename types/ol/interaction/{dragbox.d.ts => DragBox.d.ts} (100%)
 rename types/ol/interaction/{dragpan.d.ts => DragPan.d.ts} (100%)
 rename types/ol/interaction/{dragrotate.d.ts => DragRotate.d.ts} (100%)
 rename types/ol/interaction/{dragrotateandzoom.d.ts => DragRotateAndZoom.d.ts} (100%)
 rename types/ol/interaction/{dragzoom.d.ts => DragZoom.d.ts} (100%)
 rename types/ol/interaction/{draw.d.ts => Draw.d.ts} (100%)
 rename types/ol/interaction/{extent.d.ts => Extent.d.ts} (100%)
 rename types/ol/interaction/{interaction.d.ts => Interaction.d.ts} (100%)
 rename types/ol/interaction/{keyboardpan.d.ts => KeyboardPan.d.ts} (100%)
 rename types/ol/interaction/{keyboardzoom.d.ts => KeyboardZoom.d.ts} (100%)
 rename types/ol/interaction/{modify.d.ts => Modify.d.ts} (100%)
 rename types/ol/interaction/{mousewheelzoom.d.ts => MouseWheelZoom.d.ts} (100%)
 rename types/ol/interaction/{pinchrotate.d.ts => PinchRotate.d.ts} (100%)
 rename types/ol/interaction/{pinchzoom.d.ts => PinchZoom.d.ts} (100%)
 rename types/ol/interaction/{pointer.d.ts => Pointer.d.ts} (100%)
 rename types/ol/interaction/{select.d.ts => Select.d.ts} (100%)
 rename types/ol/interaction/{snap.d.ts => Snap.d.ts} (100%)
 rename types/ol/interaction/{translate.d.ts => Translate.d.ts} (100%)
 rename types/ol/layer/{base.d.ts => Base.d.ts} (100%)
 rename types/ol/layer/{group.d.ts => Group.d.ts} (100%)
 rename types/ol/layer/{heatmap.d.ts => Heatmap.d.ts} (100%)
 rename types/ol/layer/{image.d.ts => Image.d.ts} (100%)
 rename types/ol/layer/{layer.d.ts => Layer.d.ts} (100%)
 rename types/ol/layer/{tile.d.ts => Tile.d.ts} (100%)
 rename types/ol/layer/{vector.d.ts => Vector.d.ts} (100%)
 rename types/ol/layer/{vectortile.d.ts => VectorTile.d.ts} (100%)
 rename types/ol/pointer/{pointerevent.d.ts => PointerEvent.d.ts} (100%)
 rename types/ol/proj/{projection.d.ts => Projection.d.ts} (100%)
 rename types/ol/render/{event.d.ts => Event.d.ts} (100%)
 rename types/ol/render/{feature.d.ts => Feature.d.ts} (100%)
 rename types/ol/render/{vectorcontext.d.ts => VectorContext.d.ts} (100%)
 rename types/ol/source/{bingmaps.d.ts => BingMaps.d.ts} (100%)
 rename types/ol/source/{cartodb.d.ts => CartoDB.d.ts} (100%)
 rename types/ol/source/{cluster.d.ts => Cluster.d.ts} (100%)
 rename types/ol/source/{image.d.ts => Image.d.ts} (100%)
 rename types/ol/source/{imagearcgisrest.d.ts => ImageArcGISRest.d.ts} (100%)
 rename types/ol/source/{imagecanvas.d.ts => ImageCanvas.d.ts} (100%)
 rename types/ol/source/{imagemapguide.d.ts => ImageMapGuide.d.ts} (100%)
 rename types/ol/source/{imagestatic.d.ts => ImageStatic.d.ts} (100%)
 rename types/ol/source/{imagevector.d.ts => ImageVector.d.ts} (100%)
 rename types/ol/source/{imagewms.d.ts => ImageWMS.d.ts} (100%)
 rename types/ol/source/{osm.d.ts => OSM.d.ts} (100%)
 rename types/ol/source/{raster.d.ts => Raster.d.ts} (100%)
 rename types/ol/source/{source.d.ts => Source.d.ts} (100%)
 rename types/ol/source/{stamen.d.ts => Stamen.d.ts} (100%)
 rename types/ol/source/{tile.d.ts => Tile.d.ts} (100%)
 rename types/ol/source/{tilearcgisrest.d.ts => TileArcGISRest.d.ts} (100%)
 rename types/ol/source/{tiledebug.d.ts => TileDebug.d.ts} (100%)
 rename types/ol/source/{tileimage.d.ts => TileImage.d.ts} (100%)
 rename types/ol/source/{tilejson.d.ts => TileJSON.d.ts} (100%)
 rename types/ol/source/{tileutfgrid.d.ts => TileUTFGrid.d.ts} (100%)
 rename types/ol/source/{tilewms.d.ts => TileWMS.d.ts} (100%)
 rename types/ol/source/{urltile.d.ts => UrlTile.d.ts} (100%)
 rename types/ol/source/{vector.d.ts => Vector.d.ts} (100%)
 rename types/ol/source/{vectortile.d.ts => VectorTile.d.ts} (100%)
 rename types/ol/source/{wmts.d.ts => WMTS.d.ts} (100%)
 rename types/ol/source/{xyz.d.ts => XYZ.d.ts} (100%)
 rename types/ol/source/{zoomify.d.ts => Zoomify.d.ts} (100%)
 rename types/ol/style/{atlasmanager.d.ts => AtlasManager.d.ts} (100%)
 rename types/ol/style/{circle.d.ts => Circle.d.ts} (100%)
 rename types/ol/style/{fill.d.ts => Fill.d.ts} (100%)
 rename types/ol/style/{icon.d.ts => Icon.d.ts} (100%)
 rename types/ol/style/{image.d.ts => Image.d.ts} (100%)
 rename types/ol/style/{regularshape.d.ts => RegularShape.d.ts} (100%)
 rename types/ol/style/{stroke.d.ts => Stroke.d.ts} (100%)
 rename types/ol/style/{style.d.ts => Style.d.ts} (100%)
 rename types/ol/style/{text.d.ts => Text.d.ts} (100%)
 rename types/ol/tilegrid/{tilegrid.d.ts => TileGrid.d.ts} (100%)
 rename types/ol/tilegrid/{wmts.d.ts => WMTS.d.ts} (100%)

diff --git a/types/ol/assertionerror/index.d.ts b/types/ol/AssertionError/index.d.ts
similarity index 100%
rename from types/ol/assertionerror/index.d.ts
rename to types/ol/AssertionError/index.d.ts
diff --git a/types/ol/attribution/index.d.ts b/types/ol/Attribution/index.d.ts
similarity index 100%
rename from types/ol/attribution/index.d.ts
rename to types/ol/Attribution/index.d.ts
diff --git a/types/ol/collection/index.d.ts b/types/ol/Collection/index.d.ts
similarity index 100%
rename from types/ol/collection/index.d.ts
rename to types/ol/Collection/index.d.ts
diff --git a/types/ol/disposable/index.d.ts b/types/ol/Disposable/index.d.ts
similarity index 100%
rename from types/ol/disposable/index.d.ts
rename to types/ol/Disposable/index.d.ts
diff --git a/types/ol/feature/index.d.ts b/types/ol/Feature/index.d.ts
similarity index 100%
rename from types/ol/feature/index.d.ts
rename to types/ol/Feature/index.d.ts
diff --git a/types/ol/geolocation/index.d.ts b/types/ol/Geolocation/index.d.ts
similarity index 100%
rename from types/ol/geolocation/index.d.ts
rename to types/ol/Geolocation/index.d.ts
diff --git a/types/ol/graticule/index.d.ts b/types/ol/Graticule/index.d.ts
similarity index 100%
rename from types/ol/graticule/index.d.ts
rename to types/ol/Graticule/index.d.ts
diff --git a/types/ol/image/index.d.ts b/types/ol/Image/index.d.ts
similarity index 100%
rename from types/ol/image/index.d.ts
rename to types/ol/Image/index.d.ts
diff --git a/types/ol/imagebase/index.d.ts b/types/ol/ImageBase/index.d.ts
similarity index 100%
rename from types/ol/imagebase/index.d.ts
rename to types/ol/ImageBase/index.d.ts
diff --git a/types/ol/imagetile/index.d.ts b/types/ol/ImageTile/index.d.ts
similarity index 100%
rename from types/ol/imagetile/index.d.ts
rename to types/ol/ImageTile/index.d.ts
diff --git a/types/ol/kinetic/index.d.ts b/types/ol/Kinetic/index.d.ts
similarity index 100%
rename from types/ol/kinetic/index.d.ts
rename to types/ol/Kinetic/index.d.ts
diff --git a/types/ol/map/index.d.ts b/types/ol/Map/index.d.ts
similarity index 100%
rename from types/ol/map/index.d.ts
rename to types/ol/Map/index.d.ts
diff --git a/types/ol/mapbrowserevent/index.d.ts b/types/ol/MapBrowserEvent/index.d.ts
similarity index 100%
rename from types/ol/mapbrowserevent/index.d.ts
rename to types/ol/MapBrowserEvent/index.d.ts
diff --git a/types/ol/mapbrowserpointerevent/index.d.ts b/types/ol/MapBrowserPointerEvent/index.d.ts
similarity index 100%
rename from types/ol/mapbrowserpointerevent/index.d.ts
rename to types/ol/MapBrowserPointerEvent/index.d.ts
diff --git a/types/ol/mapevent/index.d.ts b/types/ol/MapEvent/index.d.ts
similarity index 100%
rename from types/ol/mapevent/index.d.ts
rename to types/ol/MapEvent/index.d.ts
diff --git a/types/ol/object/index.d.ts b/types/ol/Object/index.d.ts
similarity index 100%
rename from types/ol/object/index.d.ts
rename to types/ol/Object/index.d.ts
diff --git a/types/ol/observable/index.d.ts b/types/ol/Observable/index.d.ts
similarity index 100%
rename from types/ol/observable/index.d.ts
rename to types/ol/Observable/index.d.ts
diff --git a/types/ol/overlay/index.d.ts b/types/ol/Overlay/index.d.ts
similarity index 100%
rename from types/ol/overlay/index.d.ts
rename to types/ol/Overlay/index.d.ts
diff --git a/types/ol/tile/index.d.ts b/types/ol/Tile/index.d.ts
similarity index 100%
rename from types/ol/tile/index.d.ts
rename to types/ol/Tile/index.d.ts
diff --git a/types/ol/vectortile/index.d.ts b/types/ol/VectorTile/index.d.ts
similarity index 100%
rename from types/ol/vectortile/index.d.ts
rename to types/ol/VectorTile/index.d.ts
diff --git a/types/ol/view/index.d.ts b/types/ol/View/index.d.ts
similarity index 100%
rename from types/ol/view/index.d.ts
rename to types/ol/View/index.d.ts
diff --git a/types/ol/control/attribution.d.ts b/types/ol/control/Attribution.d.ts
similarity index 100%
rename from types/ol/control/attribution.d.ts
rename to types/ol/control/Attribution.d.ts
diff --git a/types/ol/control/control.d.ts b/types/ol/control/Control.d.ts
similarity index 100%
rename from types/ol/control/control.d.ts
rename to types/ol/control/Control.d.ts
diff --git a/types/ol/control/fullscreen.d.ts b/types/ol/control/Fullscreen.d.ts
similarity index 100%
rename from types/ol/control/fullscreen.d.ts
rename to types/ol/control/Fullscreen.d.ts
diff --git a/types/ol/control/mouseposition.d.ts b/types/ol/control/MousePosition.d.ts
similarity index 100%
rename from types/ol/control/mouseposition.d.ts
rename to types/ol/control/MousePosition.d.ts
diff --git a/types/ol/control/overviewmap.d.ts b/types/ol/control/OverviewMap.d.ts
similarity index 100%
rename from types/ol/control/overviewmap.d.ts
rename to types/ol/control/OverviewMap.d.ts
diff --git a/types/ol/control/rotate.d.ts b/types/ol/control/Rotate.d.ts
similarity index 100%
rename from types/ol/control/rotate.d.ts
rename to types/ol/control/Rotate.d.ts
diff --git a/types/ol/control/scaleline.d.ts b/types/ol/control/ScaleLine.d.ts
similarity index 100%
rename from types/ol/control/scaleline.d.ts
rename to types/ol/control/ScaleLine.d.ts
diff --git a/types/ol/control/zoom.d.ts b/types/ol/control/Zoom.d.ts
similarity index 100%
rename from types/ol/control/zoom.d.ts
rename to types/ol/control/Zoom.d.ts
diff --git a/types/ol/control/zoomslider.d.ts b/types/ol/control/ZoomSlider.d.ts
similarity index 100%
rename from types/ol/control/zoomslider.d.ts
rename to types/ol/control/ZoomSlider.d.ts
diff --git a/types/ol/control/zoomtoextent.d.ts b/types/ol/control/ZoomToExtent.d.ts
similarity index 100%
rename from types/ol/control/zoomtoextent.d.ts
rename to types/ol/control/ZoomToExtent.d.ts
diff --git a/types/ol/events/event.d.ts b/types/ol/events/Event.d.ts
similarity index 100%
rename from types/ol/events/event.d.ts
rename to types/ol/events/Event.d.ts
diff --git a/types/ol/events/eventtarget.d.ts b/types/ol/events/EventTarget.d.ts
similarity index 100%
rename from types/ol/events/eventtarget.d.ts
rename to types/ol/events/EventTarget.d.ts
diff --git a/types/ol/format/esrijson.d.ts b/types/ol/format/EsriJSON.d.ts
similarity index 100%
rename from types/ol/format/esrijson.d.ts
rename to types/ol/format/EsriJSON.d.ts
diff --git a/types/ol/format/feature.d.ts b/types/ol/format/Feature.d.ts
similarity index 100%
rename from types/ol/format/feature.d.ts
rename to types/ol/format/Feature.d.ts
diff --git a/types/ol/format/gml2.d.ts b/types/ol/format/GML2.d.ts
similarity index 100%
rename from types/ol/format/gml2.d.ts
rename to types/ol/format/GML2.d.ts
diff --git a/types/ol/format/gml3.d.ts b/types/ol/format/GML3.d.ts
similarity index 100%
rename from types/ol/format/gml3.d.ts
rename to types/ol/format/GML3.d.ts
diff --git a/types/ol/format/gmlbase.d.ts b/types/ol/format/GMLBase.d.ts
similarity index 100%
rename from types/ol/format/gmlbase.d.ts
rename to types/ol/format/GMLBase.d.ts
diff --git a/types/ol/format/gpx.d.ts b/types/ol/format/GPX.d.ts
similarity index 100%
rename from types/ol/format/gpx.d.ts
rename to types/ol/format/GPX.d.ts
diff --git a/types/ol/format/geojson.d.ts b/types/ol/format/GeoJSON.d.ts
similarity index 100%
rename from types/ol/format/geojson.d.ts
rename to types/ol/format/GeoJSON.d.ts
diff --git a/types/ol/format/igc.d.ts b/types/ol/format/IGC.d.ts
similarity index 100%
rename from types/ol/format/igc.d.ts
rename to types/ol/format/IGC.d.ts
diff --git a/types/ol/format/jsonfeature.d.ts b/types/ol/format/JSONFeature.d.ts
similarity index 100%
rename from types/ol/format/jsonfeature.d.ts
rename to types/ol/format/JSONFeature.d.ts
diff --git a/types/ol/format/kml.d.ts b/types/ol/format/KML.d.ts
similarity index 100%
rename from types/ol/format/kml.d.ts
rename to types/ol/format/KML.d.ts
diff --git a/types/ol/format/mvt.d.ts b/types/ol/format/MVT.d.ts
similarity index 100%
rename from types/ol/format/mvt.d.ts
rename to types/ol/format/MVT.d.ts
diff --git a/types/ol/format/osmxml.d.ts b/types/ol/format/OSMXML.d.ts
similarity index 100%
rename from types/ol/format/osmxml.d.ts
rename to types/ol/format/OSMXML.d.ts
diff --git a/types/ol/format/polyline.d.ts b/types/ol/format/Polyline.d.ts
similarity index 100%
rename from types/ol/format/polyline.d.ts
rename to types/ol/format/Polyline.d.ts
diff --git a/types/ol/format/textfeature.d.ts b/types/ol/format/TextFeature.d.ts
similarity index 100%
rename from types/ol/format/textfeature.d.ts
rename to types/ol/format/TextFeature.d.ts
diff --git a/types/ol/format/topojson.d.ts b/types/ol/format/TopoJSON.d.ts
similarity index 100%
rename from types/ol/format/topojson.d.ts
rename to types/ol/format/TopoJSON.d.ts
diff --git a/types/ol/format/wfs.d.ts b/types/ol/format/WFS.d.ts
similarity index 100%
rename from types/ol/format/wfs.d.ts
rename to types/ol/format/WFS.d.ts
diff --git a/types/ol/format/wkt.d.ts b/types/ol/format/WKT.d.ts
similarity index 100%
rename from types/ol/format/wkt.d.ts
rename to types/ol/format/WKT.d.ts
diff --git a/types/ol/format/wmscapabilities.d.ts b/types/ol/format/WMSCapabilities.d.ts
similarity index 100%
rename from types/ol/format/wmscapabilities.d.ts
rename to types/ol/format/WMSCapabilities.d.ts
diff --git a/types/ol/format/wmsgetfeatureinfo.d.ts b/types/ol/format/WMSGetFeatureInfo.d.ts
similarity index 100%
rename from types/ol/format/wmsgetfeatureinfo.d.ts
rename to types/ol/format/WMSGetFeatureInfo.d.ts
diff --git a/types/ol/format/wmtscapabilities.d.ts b/types/ol/format/WMTSCapabilities.d.ts
similarity index 100%
rename from types/ol/format/wmtscapabilities.d.ts
rename to types/ol/format/WMTSCapabilities.d.ts
diff --git a/types/ol/format/xml.d.ts b/types/ol/format/XML.d.ts
similarity index 100%
rename from types/ol/format/xml.d.ts
rename to types/ol/format/XML.d.ts
diff --git a/types/ol/format/xmlfeature.d.ts b/types/ol/format/XMLFeature.d.ts
similarity index 100%
rename from types/ol/format/xmlfeature.d.ts
rename to types/ol/format/XMLFeature.d.ts
diff --git a/types/ol/geom/circle.d.ts b/types/ol/geom/Circle.d.ts
similarity index 100%
rename from types/ol/geom/circle.d.ts
rename to types/ol/geom/Circle.d.ts
diff --git a/types/ol/geom/geometry.d.ts b/types/ol/geom/Geometry.d.ts
similarity index 100%
rename from types/ol/geom/geometry.d.ts
rename to types/ol/geom/Geometry.d.ts
diff --git a/types/ol/geom/geometrycollection.d.ts b/types/ol/geom/GeometryCollection.d.ts
similarity index 100%
rename from types/ol/geom/geometrycollection.d.ts
rename to types/ol/geom/GeometryCollection.d.ts
diff --git a/types/ol/geom/linestring.d.ts b/types/ol/geom/LineString.d.ts
similarity index 100%
rename from types/ol/geom/linestring.d.ts
rename to types/ol/geom/LineString.d.ts
diff --git a/types/ol/geom/linearring.d.ts b/types/ol/geom/LinearRing.d.ts
similarity index 100%
rename from types/ol/geom/linearring.d.ts
rename to types/ol/geom/LinearRing.d.ts
diff --git a/types/ol/geom/multipoint.d.ts b/types/ol/geom/MultiPoint.d.ts
similarity index 100%
rename from types/ol/geom/multipoint.d.ts
rename to types/ol/geom/MultiPoint.d.ts
diff --git a/types/ol/geom/multipolygon.d.ts b/types/ol/geom/MultiPolygon.d.ts
similarity index 100%
rename from types/ol/geom/multipolygon.d.ts
rename to types/ol/geom/MultiPolygon.d.ts
diff --git a/types/ol/geom/multilinestring.d.ts b/types/ol/geom/MultilineString.d.ts
similarity index 100%
rename from types/ol/geom/multilinestring.d.ts
rename to types/ol/geom/MultilineString.d.ts
diff --git a/types/ol/geom/point.d.ts b/types/ol/geom/Point.d.ts
similarity index 100%
rename from types/ol/geom/point.d.ts
rename to types/ol/geom/Point.d.ts
diff --git a/types/ol/geom/polygon.d.ts b/types/ol/geom/Polygon.d.ts
similarity index 100%
rename from types/ol/geom/polygon.d.ts
rename to types/ol/geom/Polygon.d.ts
diff --git a/types/ol/geom/simplegeometry.d.ts b/types/ol/geom/SimpleGeometry.d.ts
similarity index 100%
rename from types/ol/geom/simplegeometry.d.ts
rename to types/ol/geom/SimpleGeometry.d.ts
diff --git a/types/ol/interaction/doubleclickzoom.d.ts b/types/ol/interaction/DoubleClickZoom.d.ts
similarity index 100%
rename from types/ol/interaction/doubleclickzoom.d.ts
rename to types/ol/interaction/DoubleClickZoom.d.ts
diff --git a/types/ol/interaction/draganddrop.d.ts b/types/ol/interaction/DragAndDrop.d.ts
similarity index 100%
rename from types/ol/interaction/draganddrop.d.ts
rename to types/ol/interaction/DragAndDrop.d.ts
diff --git a/types/ol/interaction/dragbox.d.ts b/types/ol/interaction/DragBox.d.ts
similarity index 100%
rename from types/ol/interaction/dragbox.d.ts
rename to types/ol/interaction/DragBox.d.ts
diff --git a/types/ol/interaction/dragpan.d.ts b/types/ol/interaction/DragPan.d.ts
similarity index 100%
rename from types/ol/interaction/dragpan.d.ts
rename to types/ol/interaction/DragPan.d.ts
diff --git a/types/ol/interaction/dragrotate.d.ts b/types/ol/interaction/DragRotate.d.ts
similarity index 100%
rename from types/ol/interaction/dragrotate.d.ts
rename to types/ol/interaction/DragRotate.d.ts
diff --git a/types/ol/interaction/dragrotateandzoom.d.ts b/types/ol/interaction/DragRotateAndZoom.d.ts
similarity index 100%
rename from types/ol/interaction/dragrotateandzoom.d.ts
rename to types/ol/interaction/DragRotateAndZoom.d.ts
diff --git a/types/ol/interaction/dragzoom.d.ts b/types/ol/interaction/DragZoom.d.ts
similarity index 100%
rename from types/ol/interaction/dragzoom.d.ts
rename to types/ol/interaction/DragZoom.d.ts
diff --git a/types/ol/interaction/draw.d.ts b/types/ol/interaction/Draw.d.ts
similarity index 100%
rename from types/ol/interaction/draw.d.ts
rename to types/ol/interaction/Draw.d.ts
diff --git a/types/ol/interaction/extent.d.ts b/types/ol/interaction/Extent.d.ts
similarity index 100%
rename from types/ol/interaction/extent.d.ts
rename to types/ol/interaction/Extent.d.ts
diff --git a/types/ol/interaction/interaction.d.ts b/types/ol/interaction/Interaction.d.ts
similarity index 100%
rename from types/ol/interaction/interaction.d.ts
rename to types/ol/interaction/Interaction.d.ts
diff --git a/types/ol/interaction/keyboardpan.d.ts b/types/ol/interaction/KeyboardPan.d.ts
similarity index 100%
rename from types/ol/interaction/keyboardpan.d.ts
rename to types/ol/interaction/KeyboardPan.d.ts
diff --git a/types/ol/interaction/keyboardzoom.d.ts b/types/ol/interaction/KeyboardZoom.d.ts
similarity index 100%
rename from types/ol/interaction/keyboardzoom.d.ts
rename to types/ol/interaction/KeyboardZoom.d.ts
diff --git a/types/ol/interaction/modify.d.ts b/types/ol/interaction/Modify.d.ts
similarity index 100%
rename from types/ol/interaction/modify.d.ts
rename to types/ol/interaction/Modify.d.ts
diff --git a/types/ol/interaction/mousewheelzoom.d.ts b/types/ol/interaction/MouseWheelZoom.d.ts
similarity index 100%
rename from types/ol/interaction/mousewheelzoom.d.ts
rename to types/ol/interaction/MouseWheelZoom.d.ts
diff --git a/types/ol/interaction/pinchrotate.d.ts b/types/ol/interaction/PinchRotate.d.ts
similarity index 100%
rename from types/ol/interaction/pinchrotate.d.ts
rename to types/ol/interaction/PinchRotate.d.ts
diff --git a/types/ol/interaction/pinchzoom.d.ts b/types/ol/interaction/PinchZoom.d.ts
similarity index 100%
rename from types/ol/interaction/pinchzoom.d.ts
rename to types/ol/interaction/PinchZoom.d.ts
diff --git a/types/ol/interaction/pointer.d.ts b/types/ol/interaction/Pointer.d.ts
similarity index 100%
rename from types/ol/interaction/pointer.d.ts
rename to types/ol/interaction/Pointer.d.ts
diff --git a/types/ol/interaction/select.d.ts b/types/ol/interaction/Select.d.ts
similarity index 100%
rename from types/ol/interaction/select.d.ts
rename to types/ol/interaction/Select.d.ts
diff --git a/types/ol/interaction/snap.d.ts b/types/ol/interaction/Snap.d.ts
similarity index 100%
rename from types/ol/interaction/snap.d.ts
rename to types/ol/interaction/Snap.d.ts
diff --git a/types/ol/interaction/translate.d.ts b/types/ol/interaction/Translate.d.ts
similarity index 100%
rename from types/ol/interaction/translate.d.ts
rename to types/ol/interaction/Translate.d.ts
diff --git a/types/ol/layer/base.d.ts b/types/ol/layer/Base.d.ts
similarity index 100%
rename from types/ol/layer/base.d.ts
rename to types/ol/layer/Base.d.ts
diff --git a/types/ol/layer/group.d.ts b/types/ol/layer/Group.d.ts
similarity index 100%
rename from types/ol/layer/group.d.ts
rename to types/ol/layer/Group.d.ts
diff --git a/types/ol/layer/heatmap.d.ts b/types/ol/layer/Heatmap.d.ts
similarity index 100%
rename from types/ol/layer/heatmap.d.ts
rename to types/ol/layer/Heatmap.d.ts
diff --git a/types/ol/layer/image.d.ts b/types/ol/layer/Image.d.ts
similarity index 100%
rename from types/ol/layer/image.d.ts
rename to types/ol/layer/Image.d.ts
diff --git a/types/ol/layer/layer.d.ts b/types/ol/layer/Layer.d.ts
similarity index 100%
rename from types/ol/layer/layer.d.ts
rename to types/ol/layer/Layer.d.ts
diff --git a/types/ol/layer/tile.d.ts b/types/ol/layer/Tile.d.ts
similarity index 100%
rename from types/ol/layer/tile.d.ts
rename to types/ol/layer/Tile.d.ts
diff --git a/types/ol/layer/vector.d.ts b/types/ol/layer/Vector.d.ts
similarity index 100%
rename from types/ol/layer/vector.d.ts
rename to types/ol/layer/Vector.d.ts
diff --git a/types/ol/layer/vectortile.d.ts b/types/ol/layer/VectorTile.d.ts
similarity index 100%
rename from types/ol/layer/vectortile.d.ts
rename to types/ol/layer/VectorTile.d.ts
diff --git a/types/ol/pointer/pointerevent.d.ts b/types/ol/pointer/PointerEvent.d.ts
similarity index 100%
rename from types/ol/pointer/pointerevent.d.ts
rename to types/ol/pointer/PointerEvent.d.ts
diff --git a/types/ol/proj/projection.d.ts b/types/ol/proj/Projection.d.ts
similarity index 100%
rename from types/ol/proj/projection.d.ts
rename to types/ol/proj/Projection.d.ts
diff --git a/types/ol/render/event.d.ts b/types/ol/render/Event.d.ts
similarity index 100%
rename from types/ol/render/event.d.ts
rename to types/ol/render/Event.d.ts
diff --git a/types/ol/render/feature.d.ts b/types/ol/render/Feature.d.ts
similarity index 100%
rename from types/ol/render/feature.d.ts
rename to types/ol/render/Feature.d.ts
diff --git a/types/ol/render/vectorcontext.d.ts b/types/ol/render/VectorContext.d.ts
similarity index 100%
rename from types/ol/render/vectorcontext.d.ts
rename to types/ol/render/VectorContext.d.ts
diff --git a/types/ol/source/bingmaps.d.ts b/types/ol/source/BingMaps.d.ts
similarity index 100%
rename from types/ol/source/bingmaps.d.ts
rename to types/ol/source/BingMaps.d.ts
diff --git a/types/ol/source/cartodb.d.ts b/types/ol/source/CartoDB.d.ts
similarity index 100%
rename from types/ol/source/cartodb.d.ts
rename to types/ol/source/CartoDB.d.ts
diff --git a/types/ol/source/cluster.d.ts b/types/ol/source/Cluster.d.ts
similarity index 100%
rename from types/ol/source/cluster.d.ts
rename to types/ol/source/Cluster.d.ts
diff --git a/types/ol/source/image.d.ts b/types/ol/source/Image.d.ts
similarity index 100%
rename from types/ol/source/image.d.ts
rename to types/ol/source/Image.d.ts
diff --git a/types/ol/source/imagearcgisrest.d.ts b/types/ol/source/ImageArcGISRest.d.ts
similarity index 100%
rename from types/ol/source/imagearcgisrest.d.ts
rename to types/ol/source/ImageArcGISRest.d.ts
diff --git a/types/ol/source/imagecanvas.d.ts b/types/ol/source/ImageCanvas.d.ts
similarity index 100%
rename from types/ol/source/imagecanvas.d.ts
rename to types/ol/source/ImageCanvas.d.ts
diff --git a/types/ol/source/imagemapguide.d.ts b/types/ol/source/ImageMapGuide.d.ts
similarity index 100%
rename from types/ol/source/imagemapguide.d.ts
rename to types/ol/source/ImageMapGuide.d.ts
diff --git a/types/ol/source/imagestatic.d.ts b/types/ol/source/ImageStatic.d.ts
similarity index 100%
rename from types/ol/source/imagestatic.d.ts
rename to types/ol/source/ImageStatic.d.ts
diff --git a/types/ol/source/imagevector.d.ts b/types/ol/source/ImageVector.d.ts
similarity index 100%
rename from types/ol/source/imagevector.d.ts
rename to types/ol/source/ImageVector.d.ts
diff --git a/types/ol/source/imagewms.d.ts b/types/ol/source/ImageWMS.d.ts
similarity index 100%
rename from types/ol/source/imagewms.d.ts
rename to types/ol/source/ImageWMS.d.ts
diff --git a/types/ol/source/osm.d.ts b/types/ol/source/OSM.d.ts
similarity index 100%
rename from types/ol/source/osm.d.ts
rename to types/ol/source/OSM.d.ts
diff --git a/types/ol/source/raster.d.ts b/types/ol/source/Raster.d.ts
similarity index 100%
rename from types/ol/source/raster.d.ts
rename to types/ol/source/Raster.d.ts
diff --git a/types/ol/source/source.d.ts b/types/ol/source/Source.d.ts
similarity index 100%
rename from types/ol/source/source.d.ts
rename to types/ol/source/Source.d.ts
diff --git a/types/ol/source/stamen.d.ts b/types/ol/source/Stamen.d.ts
similarity index 100%
rename from types/ol/source/stamen.d.ts
rename to types/ol/source/Stamen.d.ts
diff --git a/types/ol/source/tile.d.ts b/types/ol/source/Tile.d.ts
similarity index 100%
rename from types/ol/source/tile.d.ts
rename to types/ol/source/Tile.d.ts
diff --git a/types/ol/source/tilearcgisrest.d.ts b/types/ol/source/TileArcGISRest.d.ts
similarity index 100%
rename from types/ol/source/tilearcgisrest.d.ts
rename to types/ol/source/TileArcGISRest.d.ts
diff --git a/types/ol/source/tiledebug.d.ts b/types/ol/source/TileDebug.d.ts
similarity index 100%
rename from types/ol/source/tiledebug.d.ts
rename to types/ol/source/TileDebug.d.ts
diff --git a/types/ol/source/tileimage.d.ts b/types/ol/source/TileImage.d.ts
similarity index 100%
rename from types/ol/source/tileimage.d.ts
rename to types/ol/source/TileImage.d.ts
diff --git a/types/ol/source/tilejson.d.ts b/types/ol/source/TileJSON.d.ts
similarity index 100%
rename from types/ol/source/tilejson.d.ts
rename to types/ol/source/TileJSON.d.ts
diff --git a/types/ol/source/tileutfgrid.d.ts b/types/ol/source/TileUTFGrid.d.ts
similarity index 100%
rename from types/ol/source/tileutfgrid.d.ts
rename to types/ol/source/TileUTFGrid.d.ts
diff --git a/types/ol/source/tilewms.d.ts b/types/ol/source/TileWMS.d.ts
similarity index 100%
rename from types/ol/source/tilewms.d.ts
rename to types/ol/source/TileWMS.d.ts
diff --git a/types/ol/source/urltile.d.ts b/types/ol/source/UrlTile.d.ts
similarity index 100%
rename from types/ol/source/urltile.d.ts
rename to types/ol/source/UrlTile.d.ts
diff --git a/types/ol/source/vector.d.ts b/types/ol/source/Vector.d.ts
similarity index 100%
rename from types/ol/source/vector.d.ts
rename to types/ol/source/Vector.d.ts
diff --git a/types/ol/source/vectortile.d.ts b/types/ol/source/VectorTile.d.ts
similarity index 100%
rename from types/ol/source/vectortile.d.ts
rename to types/ol/source/VectorTile.d.ts
diff --git a/types/ol/source/wmts.d.ts b/types/ol/source/WMTS.d.ts
similarity index 100%
rename from types/ol/source/wmts.d.ts
rename to types/ol/source/WMTS.d.ts
diff --git a/types/ol/source/xyz.d.ts b/types/ol/source/XYZ.d.ts
similarity index 100%
rename from types/ol/source/xyz.d.ts
rename to types/ol/source/XYZ.d.ts
diff --git a/types/ol/source/zoomify.d.ts b/types/ol/source/Zoomify.d.ts
similarity index 100%
rename from types/ol/source/zoomify.d.ts
rename to types/ol/source/Zoomify.d.ts
diff --git a/types/ol/style/atlasmanager.d.ts b/types/ol/style/AtlasManager.d.ts
similarity index 100%
rename from types/ol/style/atlasmanager.d.ts
rename to types/ol/style/AtlasManager.d.ts
diff --git a/types/ol/style/circle.d.ts b/types/ol/style/Circle.d.ts
similarity index 100%
rename from types/ol/style/circle.d.ts
rename to types/ol/style/Circle.d.ts
diff --git a/types/ol/style/fill.d.ts b/types/ol/style/Fill.d.ts
similarity index 100%
rename from types/ol/style/fill.d.ts
rename to types/ol/style/Fill.d.ts
diff --git a/types/ol/style/icon.d.ts b/types/ol/style/Icon.d.ts
similarity index 100%
rename from types/ol/style/icon.d.ts
rename to types/ol/style/Icon.d.ts
diff --git a/types/ol/style/image.d.ts b/types/ol/style/Image.d.ts
similarity index 100%
rename from types/ol/style/image.d.ts
rename to types/ol/style/Image.d.ts
diff --git a/types/ol/style/regularshape.d.ts b/types/ol/style/RegularShape.d.ts
similarity index 100%
rename from types/ol/style/regularshape.d.ts
rename to types/ol/style/RegularShape.d.ts
diff --git a/types/ol/style/stroke.d.ts b/types/ol/style/Stroke.d.ts
similarity index 100%
rename from types/ol/style/stroke.d.ts
rename to types/ol/style/Stroke.d.ts
diff --git a/types/ol/style/style.d.ts b/types/ol/style/Style.d.ts
similarity index 100%
rename from types/ol/style/style.d.ts
rename to types/ol/style/Style.d.ts
diff --git a/types/ol/style/text.d.ts b/types/ol/style/Text.d.ts
similarity index 100%
rename from types/ol/style/text.d.ts
rename to types/ol/style/Text.d.ts
diff --git a/types/ol/tilegrid/tilegrid.d.ts b/types/ol/tilegrid/TileGrid.d.ts
similarity index 100%
rename from types/ol/tilegrid/tilegrid.d.ts
rename to types/ol/tilegrid/TileGrid.d.ts
diff --git a/types/ol/tilegrid/wmts.d.ts b/types/ol/tilegrid/WMTS.d.ts
similarity index 100%
rename from types/ol/tilegrid/wmts.d.ts
rename to types/ol/tilegrid/WMTS.d.ts

From bfbd1ac4fc8376bd99946db7c012234bea7b9cec Mon Sep 17 00:00:00 2001
From: Antoine Rousseau <antoine@rousseau.im>
Date: Thu, 21 Feb 2019 17:48:20 +0100
Subject: [PATCH 089/924] add IndexSettings.queryLanguages to
 @types/algoliasearch

---
 types/algoliasearch/algoliasearch-tests.ts |  1 +
 types/algoliasearch/index.d.ts             | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index fdd0f395fe..1d588f2090 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -98,6 +98,7 @@ let _algoliaIndexSettings: IndexSettings = {
   placeholders: { '': [''] },
   camelCaseAttributes: [''],
   sortFacetValuesBy: 'count',
+  queryLanguages: ['fr', 'es'],
 };
 
 let _algoliaQueryParameters: QueryParameters = {
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 8e3ba4c5ab..a5597bc835 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -6,6 +6,7 @@
 //                 Samuel Vaillant <https://github.com/samouss>
 //                 Kai Eichinger <https://github.com/keichinger>
 //                 Nery Ortez <https://github.com/neryortez>
+//                 Antoine Rousseau <https://github.com/antoinerousseau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1778,12 +1779,20 @@ declare namespace algoliasearch {
     };
     /**
      * List of attributes on which to do a decomposition of camel case words.
-     *
-     https://www.algolia.com/doc/api-reference/api-parameters/camelCaseAttributes/
+     * https://www.algolia.com/doc/api-reference/api-parameters/camelCaseAttributes/
      */
     camelCaseAttributes?: string[];
-
+    /**
+     * Controls how facet values are sorted.
+     * https://www.algolia.com/doc/api-reference/api-parameters/sortFacetValuesBy/
+     */
     sortFacetValuesBy?: 'count' | 'alpha';
+    /**
+     * Sets the languages to be used by language-specific settings and functionalities
+     * such as ignorePlurals, removeStopWords, and CJK word-detection.
+     * https://www.algolia.com/doc/api-reference/api-parameters/queryLanguages/
+     */
+    queryLanguages?: string[];
   }
 
   interface Response<T=any> {

From 6b6f292c346e65f24b52dbeca0e00d9053d6cf44 Mon Sep 17 00:00:00 2001
From: Michael Louis Thaler <mthaler@managedbyq.com>
Date: Thu, 21 Feb 2019 16:06:30 -0500
Subject: [PATCH 090/924] Update referenced Superagent version

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index ae607c3c34..f44f8acb85 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SuperAgent 3.8
+// Type definitions for SuperAgent 4.1
 // Project: https://github.com/visionmedia/superagent
 // Definitions by: Nico Zelaya <https://github.com/NicoZelaya>
 //                 Michael Ledin <https://github.com/mxl>

From 0de529dbcd9e8daf7e523ffc4c3aceb58a4cbe5e Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.esteves@fr.clara.net>
Date: Fri, 22 Feb 2019 12:12:35 +0100
Subject: [PATCH 091/924] fix(mongodb): add collation option to
 findOneAndReplace and FindOneAndDelete

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index a3725382e4..dac421a22a 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -879,8 +879,8 @@ export interface Collection<TSchema = Default> {
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options: FindOneOptions, callback: MongoCallback<T | null>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
     findOneAndDelete(filter: FilterQuery<TSchema>, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndDelete(filter: FilterQuery<TSchema>, options?: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndDelete(filter: FilterQuery<TSchema>, options: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndDelete(filter: FilterQuery<TSchema>, options?: FindOneAndDeleteOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndDelete(filter: FilterQuery<TSchema>, options: FindOneAndDeleteOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndReplace */
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
@@ -1292,7 +1292,7 @@ export interface CollectionAggregationOptions {
      * Allow driver to bypass schema validation in MongoDB 3.2 or higher.
      */
     bypassDocumentValidation?: boolean;
-    hint?: string | object;   
+    hint?: string | object;
     raw?: boolean;
     promoteLongs?: boolean;
     promoteValues?: boolean;
@@ -1407,6 +1407,7 @@ export interface FindOneAndReplaceOption extends CommonOptions {
     maxTimeMS?: number;
     upsert?: boolean;
     returnOriginal?: boolean;
+    collation?: CollationDocument;
 }
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndUpdate */
@@ -1414,6 +1415,17 @@ export interface FindOneAndUpdateOption extends FindOneAndReplaceOption {
     arrayFilters?: Object[];
 }
 
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
+export interface FindOneAndDeleteOption {
+    projection?: Object;
+    sort?: Object;
+    maxTimeMS?: number;
+    session?: ClientSession;
+    collation?: CollationDocument;
+}
+
+
+
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoHaystackSearch */
 export interface GeoHaystackSearchOptions {
     readPreference?: ReadPreference | string;

From 01eb1074ef408fd416ba4574c73a3638677d3518 Mon Sep 17 00:00:00 2001
From: Vahid Shirvani <vahid.shirvani@tele2.com>
Date: Fri, 22 Feb 2019 14:21:14 +0100
Subject: [PATCH 092/924] fix files in tsconfig

---
 types/ol/tsconfig.json | 276 ++++++++++++++++++++---------------------
 1 file changed, 138 insertions(+), 138 deletions(-)

diff --git a/types/ol/tsconfig.json b/types/ol/tsconfig.json
index 186bb605e0..8751d240da 100644
--- a/types/ol/tsconfig.json
+++ b/types/ol/tsconfig.json
@@ -20,159 +20,159 @@
     "files": [
         "index.d.ts",
         "ol-tests.ts",
-        "control/attribution.d.ts",
-        "control/control.d.ts",
-        "control/fullscreen.d.ts",
-        "control/mouseposition.d.ts",
-        "control/overviewmap.d.ts",
-        "control/rotate.d.ts",
-        "control/scaleline.d.ts",
-        "control/zoom.d.ts",
-        "control/zoomslider.d.ts",
-        "control/zoomtoextent.d.ts",
+        "control/Attribution.d.ts",
+        "control/Control.d.ts",
+        "control/Fullscreen.d.ts",
+        "control/MousePosition.d.ts",
+        "control/OverviewMap.d.ts",
+        "control/Rotate.d.ts",
+        "control/ScaleLine.d.ts",
+        "control/Zoom.d.ts",
+        "control/ZoomSlider.d.ts",
+        "control/ZoomToExtent.d.ts",
         "events/condition.d.ts",
-        "events/event.d.ts",
-        "events/eventtarget.d.ts",
-        "format/esrijson.d.ts",
-        "format/feature.d.ts",
+        "events/Event.d.ts",
+        "events/EventTarget.d.ts",
+        "format/EsriJSON.d.ts",
+        "format/Feature.d.ts",
         "format/filter.d.ts",
-        "format/geojson.d.ts",
-        "format/gml2.d.ts",
-        "format/gml3.d.ts",
-        "format/gmlbase.d.ts",
-        "format/gpx.d.ts",
-        "format/igc.d.ts",
-        "format/jsonfeature.d.ts",
-        "format/kml.d.ts",
-        "format/mvt.d.ts",
-        "format/osmxml.d.ts",
-        "format/polyline.d.ts",
-        "format/textfeature.d.ts",
-        "format/topojson.d.ts",
-        "format/wfs.d.ts",
-        "format/wkt.d.ts",
-        "format/wmscapabilities.d.ts",
-        "format/wmsgetfeatureinfo.d.ts",
-        "format/wmtscapabilities.d.ts",
-        "format/xml.d.ts",
-        "format/xmlfeature.d.ts",
-        "geom/circle.d.ts",
-        "geom/geometry.d.ts",
-        "geom/geometrycollection.d.ts",
-        "geom/linearring.d.ts",
-        "geom/linestring.d.ts",
-        "geom/multilinestring.d.ts",
-        "geom/multipoint.d.ts",
-        "geom/multipolygon.d.ts",
-        "geom/point.d.ts",
-        "geom/polygon.d.ts",
-        "geom/simplegeometry.d.ts",
-        "interaction/doubleclickzoom.d.ts",
-        "interaction/draganddrop.d.ts",
-        "interaction/dragbox.d.ts",
-        "interaction/dragpan.d.ts",
-        "interaction/dragrotate.d.ts",
-        "interaction/dragrotateandzoom.d.ts",
-        "interaction/dragzoom.d.ts",
-        "interaction/draw.d.ts",
-        "interaction/extent.d.ts",
-        "interaction/interaction.d.ts",
-        "interaction/keyboardpan.d.ts",
-        "interaction/keyboardzoom.d.ts",
-        "interaction/modify.d.ts",
-        "interaction/mousewheelzoom.d.ts",
-        "interaction/pinchrotate.d.ts",
-        "interaction/pinchzoom.d.ts",
-        "interaction/pointer.d.ts",
-        "interaction/select.d.ts",
-        "interaction/snap.d.ts",
-        "interaction/translate.d.ts",
-        "layer/base.d.ts",
-        "layer/group.d.ts",
-        "layer/heatmap.d.ts",
-        "layer/image.d.ts",
-        "layer/layer.d.ts",
-        "layer/tile.d.ts",
-        "layer/vector.d.ts",
-        "layer/vectortile.d.ts",
-        "pointer/pointerevent.d.ts",
+        "format/GeoJSON.d.ts",
+        "format/GML2.d.ts",
+        "format/GML3.d.ts",
+        "format/GMLBase.d.ts",
+        "format/GPX.d.ts",
+        "format/IGC.d.ts",
+        "format/JSONFeature.d.ts",
+        "format/KML.d.ts",
+        "format/MVT.d.ts",
+        "format/OSMXML.d.ts",
+        "format/Polyline.d.ts",
+        "format/TextFeature.d.ts",
+        "format/TopoJSON.d.ts",
+        "format/WFS.d.ts",
+        "format/WKT.d.ts",
+        "format/WMSCapabilities.d.ts",
+        "format/WMSGetFeatureInfo.d.ts",
+        "format/WMTSCapabilities.d.ts",
+        "format/XML.d.ts",
+        "format/XMLFeature.d.ts",
+        "geom/Circle.d.ts",
+        "geom/GeometryCollection.d.ts",
+        "geom/Geometry.d.ts",
+        "geom/LinearRing.d.ts",
+        "geom/LineString.d.ts",
+        "geom/MultilineString.d.ts",
+        "geom/MultiPoint.d.ts",
+        "geom/MultiPolygon.d.ts",
+        "geom/Point.d.ts",
+        "geom/Polygon.d.ts",
+        "geom/SimpleGeometry.d.ts",
+        "interaction/DoubleClickZoom.d.ts",
+        "interaction/DragAndDrop.d.ts",
+        "interaction/DragBox.d.ts",
+        "interaction/DragPan.d.ts",
+        "interaction/DragRotateAndZoom.d.ts",
+        "interaction/DragRotate.d.ts",
+        "interaction/DragZoom.d.ts",
+        "interaction/Draw.d.ts",
+        "interaction/Extent.d.ts",
+        "interaction/Interaction.d.ts",
+        "interaction/KeyboardPan.d.ts",
+        "interaction/KeyboardZoom.d.ts",
+        "interaction/Modify.d.ts",
+        "interaction/MouseWheelZoom.d.ts",
+        "interaction/PinchRotate.d.ts",
+        "interaction/PinchZoom.d.ts",
+        "interaction/Pointer.d.ts",
+        "interaction/Select.d.ts",
+        "interaction/Snap.d.ts",
+        "interaction/Translate.d.ts",
+        "layer/Base.d.ts",
+        "layer/Group.d.ts",
+        "layer/Heatmap.d.ts",
+        "layer/Image.d.ts",
+        "layer/Layer.d.ts",
+        "layer/Tile.d.ts",
+        "layer/Vector.d.ts",
+        "layer/VectorTile.d.ts",
+        "pointer/PointerEvent.d.ts",
         "proj/index.d.ts",
-        "proj/projection.d.ts",
+        "proj/Projection.d.ts",
         "render/canvas.d.ts",
-        "render/event.d.ts",
-        "render/feature.d.ts",
-        "render/vectorcontext.d.ts",
-        "source/bingmaps.d.ts",
-        "source/cartodb.d.ts",
-        "source/cluster.d.ts",
-        "source/image.d.ts",
-        "source/imagearcgisrest.d.ts",
-        "source/imagecanvas.d.ts",
-        "source/imagemapguide.d.ts",
-        "source/imagestatic.d.ts",
-        "source/imagevector.d.ts",
-        "source/imagewms.d.ts",
-        "source/osm.d.ts",
-        "source/raster.d.ts",
-        "source/source.d.ts",
-        "source/stamen.d.ts",
-        "source/tile.d.ts",
-        "source/tilearcgisrest.d.ts",
-        "source/tiledebug.d.ts",
-        "source/tileimage.d.ts",
-        "source/tilejson.d.ts",
-        "source/tileutfgrid.d.ts",
-        "source/tilewms.d.ts",
-        "source/urltile.d.ts",
-        "source/vector.d.ts",
-        "source/vectortile.d.ts",
-        "source/wmts.d.ts",
-        "source/xyz.d.ts",
-        "source/zoomify.d.ts",
-        "style/atlasmanager.d.ts",
-        "style/circle.d.ts",
-        "style/fill.d.ts",
-        "style/icon.d.ts",
-        "style/image.d.ts",
-        "style/regularshape.d.ts",
-        "style/stroke.d.ts",
-        "style/style.d.ts",
-        "style/text.d.ts",
-        "tilegrid/tilegrid.d.ts",
-        "tilegrid/wmts.d.ts",
-        "assertionerror/index.d.ts",
-        "attribution/index.d.ts",
-        "collection/index.d.ts",
+        "render/Event.d.ts",
+        "render/Feature.d.ts",
+        "render/VectorContext.d.ts",
+        "source/BingMaps.d.ts",
+        "source/CartoDB.d.ts",
+        "source/Cluster.d.ts",
+        "source/ImageArcGISRest.d.ts",
+        "source/ImageCanvas.d.ts",
+        "source/Image.d.ts",
+        "source/ImageMapGuide.d.ts",
+        "source/ImageStatic.d.ts",
+        "source/ImageVector.d.ts",
+        "source/ImageWMS.d.ts",
+        "source/OSM.d.ts",
+        "source/Raster.d.ts",
+        "source/Source.d.ts",
+        "source/Stamen.d.ts",
+        "source/TileArcGISRest.d.ts",
+        "source/TileDebug.d.ts",
+        "source/Tile.d.ts",
+        "source/TileImage.d.ts",
+        "source/TileJSON.d.ts",
+        "source/TileUTFGrid.d.ts",
+        "source/TileWMS.d.ts",
+        "source/UrlTile.d.ts",
+        "source/Vector.d.ts",
+        "source/VectorTile.d.ts",
+        "source/WMTS.d.ts",
+        "source/XYZ.d.ts",
+        "source/Zoomify.d.ts",
+        "style/AtlasManager.d.ts",
+        "style/Circle.d.ts",
+        "style/Fill.d.ts",
+        "style/Icon.d.ts",
+        "style/Image.d.ts",
+        "style/RegularShape.d.ts",
+        "style/Stroke.d.ts",
+        "style/Style.d.ts",
+        "style/Text.d.ts",
+        "tilegrid/TileGrid.d.ts",
+        "tilegrid/WMTS.d.ts",
+        "AssertionError/index.d.ts",
+        "Attribution/index.d.ts",
+        "Collection/index.d.ts",
         "color/index.d.ts",
         "colorlike/index.d.ts",
         "control/index.d.ts",
         "coordinate/index.d.ts",
         "deviceorientation/index.d.ts",
-        "disposable/index.d.ts",
+        "Disposable/index.d.ts",
         "easing/index.d.ts",
         "events/index.d.ts",
         "extent/index.d.ts",
-        "feature/index.d.ts",
+        "Feature/index.d.ts",
         "featureloader/index.d.ts",
-        "geolocation/index.d.ts",
-        "graticule/index.d.ts",
-        "image/index.d.ts",
-        "imagebase/index.d.ts",
-        "imagetile/index.d.ts",
+        "Geolocation/index.d.ts",
+        "Graticule/index.d.ts",
+        "ImageBase/index.d.ts",
+        "Image/index.d.ts",
+        "ImageTile/index.d.ts",
         "interaction/index.d.ts",
-        "kinetic/index.d.ts",
+        "Kinetic/index.d.ts",
         "loadingstrategy/index.d.ts",
-        "map/index.d.ts",
-        "mapbrowserevent/index.d.ts",
-        "mapbrowserpointerevent/index.d.ts",
-        "mapevent/index.d.ts",
-        "object/index.d.ts",
-        "observable/index.d.ts",
-        "overlay/index.d.ts",
+        "MapBrowserEvent/index.d.ts",
+        "MapBrowserPointerEvent/index.d.ts",
+        "MapEvent/index.d.ts",
+        "Map/index.d.ts",
+        "Object/index.d.ts",
+        "Observable/index.d.ts",
+        "Overlay/index.d.ts",
         "sphere/index.d.ts",
-        "tile/index.d.ts",
+        "Tile/index.d.ts",
         "tilegrid/index.d.ts",
-        "vectortile/index.d.ts",
-        "view/index.d.ts"
+        "VectorTile/index.d.ts",
+        "View/index.d.ts"
     ]
-}
\ No newline at end of file
+}

From 401e9d47d92b0b9df04871b5bf50340a951292ff Mon Sep 17 00:00:00 2001
From: Vahid Shirvani <vahid.shirvani@tele2.com>
Date: Fri, 22 Feb 2019 14:55:29 +0100
Subject: [PATCH 093/924] Fix ol-test

---
 types/ol/ol-tests.ts | 460 ++++++++++++++-----------------------------
 1 file changed, 153 insertions(+), 307 deletions(-)

diff --git a/types/ol/ol-tests.ts b/types/ol/ol-tests.ts
index be19e61a2b..f8117f43ac 100644
--- a/types/ol/ol-tests.ts
+++ b/types/ol/ol-tests.ts
@@ -1,317 +1,163 @@
-import ControlAttribution from 'ol/control/attribution';
-
-import ControlControl from 'ol/control/control';
-
-import ControlFullScreen from 'ol/control/fullscreen';
-
-import ControlMousePosition from 'ol/control/mouseposition';
-
-import ControlOverviewMap from 'ol/control/overviewmap';
-
-import ControlRotate from 'ol/control/rotate';
-
-import ControlScaleLine from 'ol/control/scaleline';
-
-import ControlZoom from 'ol/control/zoom';
-
-import ControlZoomSlider from 'ol/control/zoomslider';
-
-import ControlZoomToExtent from 'ol/control/zoomtoextent';
-
-import Eventscondition from 'ol/events/condition';
-
-import EventsEvent from 'ol/events/event';
-
-import EventsEventTarget from 'ol/events/eventtarget';
-
-import FormatEsriJSON from 'ol/format/esrijson';
-
-import FormatFeature from 'ol/format/feature';
-
-import Formatfilter from 'ol/format/filter';
-
-import FormatGeoJSON from 'ol/format/geojson';
-
-import FormatGML2 from 'ol/format/gml2';
-
-import FormatGML3 from 'ol/format/gml3';
-
-import FormatGMLBase from 'ol/format/gmlbase';
-
-import FormatGPX from 'ol/format/gpx';
-
-import FormatIGC from 'ol/format/igc';
-
-import FormatJSONFeature from 'ol/format/jsonfeature';
-
-import FormatKML from 'ol/format/kml';
-
-import FormatMVT from 'ol/format/mvt';
-
-import FormatOSMXML from 'ol/format/osmxml';
-
-import FormatPolyline from 'ol/format/polyline';
-
-import FormatTextFeature from 'ol/format/textfeature';
-
-import FormatTopoJSON from 'ol/format/topojson';
-
-import FormatWFS from 'ol/format/wfs';
-
-import FormatWKT from 'ol/format/wkt';
-
-import FormatWMSCapabilities from 'ol/format/wmscapabilities';
-
-import FormatWMSGetFeatureInfo from 'ol/format/wmsgetfeatureinfo';
-
-import FormatWMTSCapabilities from 'ol/format/wmtscapabilities';
-
-import FormatXML from 'ol/format/xml';
-
-import FormatXMLFeature from 'ol/format/xmlfeature';
-
-import GeomCircle from 'ol/geom/circle';
-
-import GeomGeometry from 'ol/geom/geometry';
-
-import GeomGeometryCollection from 'ol/geom/geometrycollection';
-
-import GeomLinearRing from 'ol/geom/linearring';
-
-import GeomLineString from 'ol/geom/linestring';
-
-import GeomMultiLineString from 'ol/geom/multilinestring';
-
-import GeomMultiPoint from 'ol/geom/multipoint';
-
-import GeomMultiPolygon from 'ol/geom/multipolygon';
-
-import GeomPoint from 'ol/geom/point';
-
-import GeomPolygon from 'ol/geom/polygon';
-
-import GeomSimpleGeometry from 'ol/geom/simplegeometry';
-
-import InteractionDoubleClickZoom from 'ol/interaction/doubleclickzoom';
-
-import InteractionDragAndDrop from 'ol/interaction/draganddrop';
-
-import InteractionDragBox from 'ol/interaction/dragbox';
-
-import InteractionDragPan from 'ol/interaction/dragpan';
-
-import InteractionDragRotate from 'ol/interaction/dragrotate';
-
-import InteractionDragRotateAndZoom from 'ol/interaction/dragrotateandzoom';
-
-import InteractionDragZoom from 'ol/interaction/dragzoom';
-
-import InteractionDraw from 'ol/interaction/draw';
-
-import InteractionInteraction from 'ol/interaction/interaction';
-
-import InteractionKeyboardPan from 'ol/interaction/keyboardpan';
-
-import InteractionKeyboardZoom from 'ol/interaction/keyboardzoom';
-
-import InteractionModify from 'ol/interaction/modify';
-
-import InteractionMouseWheelZoom from 'ol/interaction/mousewheelzoom';
-
-import InteractionPinchRotate from 'ol/interaction/pinchrotate';
-
-import InteractionPinchZoom from 'ol/interaction/pinchzoom';
-
-import InteractionPointer from 'ol/interaction/pointer';
-
-import InteractionSelect from 'ol/interaction/select';
-
-import InteractionSnap from 'ol/interaction/snap';
-
-import InteractionTranslate from 'ol/interaction/translate';
-
-import LayerBase from 'ol/layer/base';
-
-import LayerGroup from 'ol/layer/group';
-
-import LayerHeatmap from 'ol/layer/heatmap';
-
-import LayerImage from 'ol/layer/image';
-
-import LayerLayer from 'ol/layer/layer';
-
-import LayerTile from 'ol/layer/tile';
-
-import LayerVector from 'ol/layer/vector';
-
-import LayerVectorTile from 'ol/layer/vectortile';
-
-import PointerPointerEvent from 'ol/pointer/pointerevent';
-
-import Proj from 'ol/proj';
-
-import ProjProjection from 'ol/proj/projection';
-
-import Rendercanvas from 'ol/render/canvas';
-
-import RenderEvent from 'ol/render/event';
-
-import RenderFeature from 'ol/render/feature';
-
-import RenderVectorContext from 'ol/render/vectorcontext';
-
-import SourceBingMaps from 'ol/source/bingmaps';
-
-import SourceCartoDB from 'ol/source/cartodb';
-
-import SourceCluster from 'ol/source/cluster';
-
-import SourceImage from 'ol/source/image';
-
-import SourceImageArcGISRest from 'ol/source/imagearcgisrest';
-
-import SourceImageCanvas from 'ol/source/imagecanvas';
-
-import SourceImageMapGuide from 'ol/source/imagemapguide';
-
-import SourceImageStatic from 'ol/source/imagestatic';
-
-import SourceImageVector from 'ol/source/imagevector';
-
-import SourceImageWMS from 'ol/source/imagewms';
-
-import SourceOSM from 'ol/source/osm';
-
-import SourceRaster from 'ol/source/raster';
-
-import SourceSource from 'ol/source/source';
-
-import SourceStamen from 'ol/source/stamen';
-
-import SourceTile from 'ol/source/tile';
-
-import SourceTileArcGISRest from 'ol/source/tilearcgisrest';
-
-import SourceTileDebug from 'ol/source/tiledebug';
-
-import SourceTileImage from 'ol/source/tileimage';
-
-import SourceTileJSON from 'ol/source/tilejson';
-
-import SourceTileUTFGrid from 'ol/source/tileutfgrid';
-
-import SourceTileWMS from 'ol/source/tilewms';
-
-import SourceUrlTile from 'ol/source/urltile';
-
-import SourceVector from 'ol/source/vector';
-
-import SourceVectorTile from 'ol/source/vectortile';
-
-import SourceWMTS from 'ol/source/wmts';
-
-import SourceXYZ from 'ol/source/xyz';
-
-import SourceZoomify from 'ol/source/zoomify';
-
-import StyleAtlasManager from 'ol/style/atlasmanager';
-
-import StyleCircle from 'ol/style/circle';
-
-import StyleFill from 'ol/style/fill';
-
-import StyleIcon from 'ol/style/icon';
-
-import StyleImage from 'ol/style/image';
-
-import StyleRegularShape from 'ol/style/regularshape';
-
-import StyleStroke from 'ol/style/stroke';
-
-import StyleStyle from 'ol/style/style';
-
-import StyleText from 'ol/style/text';
-
-import TilegridTileGrid from 'ol/tilegrid/tilegrid';
-
-import TilegridWMTS from 'ol/tilegrid/wmts';
-
-import AssertionError from 'ol/assertionerror';
-
-import Attribution from 'ol/attribution';
-
-import Collection from 'ol/collection';
-
-import Color from 'ol/color';
-
-import Colorlike from 'ol/colorlike';
-
-import Control from 'ol/control';
-
+import AssertionError from 'ol/AssertionError';
+import AtlasManager from 'ol/style/AtlasManager';
+// import Attribution from 'ol/Attribution';
+import Attribution from 'ol/control/Attribution';
+import Base from 'ol/layer/Base';
+import BingMaps from 'ol/source/BingMaps';
+import canvas from 'ol/render/canvas';
+import CartoDB from 'ol/source/CartoDB';
+import Circle from 'ol/geom/Circle';
+// import Circle from 'ol/style/Circle';
+import Cluster from 'ol/source/Cluster';
+import Collection from 'ol/Collection';
+import color from 'ol/color';
+import colorlike from 'ol/colorlike';
+import condition from 'ol/events/condition';
+import control from 'ol/control';
+import Control from 'ol/control/Control';
+// import coordinate from 'ol/coordinate';
 import DeviceOrientation from 'ol/deviceorientation';
-
-import Disposable from 'ol/disposable';
-
-import Easing from 'ol/easing';
-
-import Events from 'ol/events';
-
-import Extent from 'ol/extent';
-
-import Feature from 'ol/feature';
-
-import FeatureLoader from 'ol/featureloader';
-
-import Geolocation from 'ol/geolocation';
-
-import Graticule from 'ol/graticule';
-
-import Image from 'ol/image';
-
-import ImageBase from 'ol/imagebase';
-
-import ImageTile from 'ol/imagetile';
-
-import Interaction from 'ol/interaction';
-
-import Kinetic from 'ol/kinetic';
-
-import Loadingstrategy from 'ol/loadingstrategy';
-
-import Map from 'ol/map';
-
-import MapBrowserEvent from 'ol/mapbrowserevent';
-
-import MapBrowserPointerEvent from 'ol/mapbrowserpointerevent';
-
-import MapEvent from 'ol/mapevent';
-
-import Object from 'ol/object';
-
-import Observable from 'ol/observable';
-
-import Overlay from 'ol/overlay';
-
+import Disposable from 'ol/Disposable';
+import DoubleClickZoom from 'ol/interaction/DoubleClickZoom';
+import DragAndDrop from 'ol/interaction/DragAndDrop';
+import DragBox from 'ol/interaction/DragBox';
+import DragPan from 'ol/interaction/DragPan';
+import DragRotateAndZoom from 'ol/interaction/DragRotateAndZoom';
+import DragRotate from 'ol/interaction/DragRotate';
+import DragZoom from 'ol/interaction/DragZoom';
+import Draw from 'ol/interaction/Draw';
+import easing from 'ol/easing';
+import EsriJSON from 'ol/format/EsriJSON';
+// import Event from 'ol/events/Event';
+import Event from 'ol/render/Event';
+import events from 'ol/events';
+import EventTarget from 'ol/events/EventTarget';
+import extent from 'ol/extent';
+import Extent from 'ol/interaction/Extent';
+// import Feature from 'ol/Feature';
+import Feature from 'ol/format/Feature';
+// import Feature from 'ol/render/Feature';
+import featureloader from 'ol/featureloader';
+import Fill from 'ol/style/Fill';
+import filter from 'ol/format/filter';
+import FullScreen from 'ol/control/Fullscreen';
+import GeoJSON from 'ol/format/GeoJSON';
+import Geolocation from 'ol/Geolocation';
+import GeometryCollection from 'ol/geom/GeometryCollection';
+import Geometry from 'ol/geom/Geometry';
+import GML2 from 'ol/format/GML2';
+import GML3 from 'ol/format/GML3';
+import GMLBase from 'ol/format/GMLBase';
+import GPX from 'ol/format/GPX';
+import Graticule from 'ol/Graticule';
+import Group from 'ol/layer/Group';
+import Heatmap from 'ol/layer/Heatmap';
+import Icon from 'ol/style/Icon';
+import IGC from 'ol/format/IGC';
+import ImageArcGISRest from 'ol/source/ImageArcGISRest';
+import ImageBase from 'ol/ImageBase';
+import ImageCanvas from 'ol/source/ImageCanvas';
+// import Image from 'ol/Image';
+import Image from 'ol/layer/Image';
+// import Image from 'ol/source/Image';
+// import Image from 'ol/style/Image';
+import ImageMapGuide from 'ol/source/ImageMapGuide';
+import ImageStatic from 'ol/source/ImageStatic';
+import ImageTile from 'ol/ImageTile';
+import ImageVector from 'ol/source/ImageVector';
+import ImageWMS from 'ol/source/ImageWMS';
+import interaction from 'ol/interaction';
+import Interaction from 'ol/interaction/Interaction';
+import JSONFeature from 'ol/format/JSONFeature';
+import KeyboardPan from 'ol/interaction/KeyboardPan';
+import KeyboardZoom from 'ol/interaction/KeyboardZoom';
+import Kinetic from 'ol/Kinetic';
+import KML from 'ol/format/KML';
+import Layer from 'ol/layer/Layer';
+import LinearRing from 'ol/geom/LinearRing';
+import LineString from 'ol/geom/LineString';
+import loadingstrategy from 'ol/loadingstrategy';
+import MapBrowserEvent from 'ol/MapBrowserEvent';
+import MapBrowserPointerEvent from 'ol/MapBrowserPointerEvent';
+import MapEvent from 'ol/MapEvent';
+import Map from 'ol/Map';
+import Modify from 'ol/interaction/Modify';
+import MousePosition from 'ol/control/MousePosition';
+import MouseWheelZoom from 'ol/interaction/MouseWheelZoom';
+import MultiLineString from 'ol/geom/MultilineString';
+import MultiPoint from 'ol/geom/MultiPoint';
+import MultiPolygon from 'ol/geom/MultiPolygon';
+import MVT from 'ol/format/MVT';
+import Object from 'ol/Object';
+import Observable from 'ol/Observable';
+import ol from 'ol';
+import OSM from 'ol/source/OSM';
+import OSMXML from 'ol/format/OSMXML';
+import Overlay from 'ol/Overlay';
+import OverviewMap from 'ol/control/OverviewMap';
+import PinchRotate from 'ol/interaction/PinchRotate';
+import PinchZoom from 'ol/interaction/PinchZoom';
+import PointerEvent from 'ol/pointer/PointerEvent';
+import Pointer from 'ol/interaction/Pointer';
+import Point from 'ol/geom/Point';
+import Polygon from 'ol/geom/Polygon';
+import Polyline from 'ol/format/Polyline';
+import Projection from 'ol/proj/Projection';
+import proj from 'ol/proj';
+import Raster from 'ol/source/Raster';
+import RegularShape from 'ol/style/RegularShape';
+import Rotate from 'ol/control/Rotate';
+import ScaleLine from 'ol/control/ScaleLine';
+import Select from 'ol/interaction/Select';
+import SimpleGeometry from 'ol/geom/SimpleGeometry';
+import Snap from 'ol/interaction/Snap';
+import Source from 'ol/source/Source';
 import Sphere from 'ol/sphere';
-
-import Tile from 'ol/tile';
-
-import Tilegrid from 'ol/tilegrid';
-
-import VectorTile from 'ol/vectortile';
-
-import View from 'ol/view';
+import Stamen from 'ol/source/Stamen';
+import Stroke from 'ol/style/Stroke';
+import Style from 'ol/style/Style';
+import TextFeature from 'ol/format/TextFeature';
+import Text from 'ol/style/Text';
+import TileArcGISRest from 'ol/source/TileArcGISRest';
+import TileDebug from 'ol/source/TileDebug';
+import Tile from 'ol/layer/Tile';
+// import Tile from 'ol/source/Tile';
+// import Tile from 'ol/Tile';
+import tilegrid from 'ol/tilegrid';
+import TileGrid from 'ol/tilegrid/TileGrid';
+import TileImage from 'ol/source/TileImage';
+import TileJSON from 'ol/source/TileJSON';
+import TileUTFGrid from 'ol/source/TileUTFGrid';
+import TileWMS from 'ol/source/TileWMS';
+import TopoJSON from 'ol/format/TopoJSON';
+import Translate from 'ol/interaction/Translate';
+import UrlTile from 'ol/source/UrlTile';
+import VectorContext from 'ol/render/VectorContext';
+import Vector from 'ol/layer/Vector';
+// import Vector from 'ol/source/Vector';
+// import VectorTile from 'ol/layer/VectorTile';
+// import VectorTile from 'ol/source/VectorTile';
+import VectorTile from 'ol/VectorTile';
+import View from 'ol/View';
+import WFS from 'ol/format/WFS';
+import WKT from 'ol/format/WKT';
+import WMSCapabilities from 'ol/format/WMSCapabilities';
+import WMSGetFeatureInfo from 'ol/format/WMSGetFeatureInfo';
+import WMTSCapabilities from 'ol/format/WMTSCapabilities';
+import WMTS from 'ol/source/WMTS';
+// import WMTS from 'ol/tilegrid/WMTS';
+import XMLFeature from 'ol/format/XMLFeature';
+import XML from 'ol/format/XML';
+import XYZ from 'ol/source/XYZ';
+import Zoom from 'ol/control/Zoom';
+import Zoomify from 'ol/source/Zoomify';
+import ZoomSlider from 'ol/control/ZoomSlider';
+import ZoomToExtent from 'ol/control/ZoomToExtent';
 
 // Map
 const map: ol.Map = new Map({} as any);
 declare const mapView: View;
-declare const layerBase: LayerBase;
-declare const control: ControlControl;
-declare const interaction: InteractionInteraction;
 map.setView(mapView);
-map.addLayer(layerBase);
-map.addControl(control);
-map.addInteraction(interaction);
 
 // View
 let view: View;

From 67b4fb2b9c9f3a617ab2d2d207d5bd9ad9e0241d Mon Sep 17 00:00:00 2001
From: Olivier Adam <olivier.adam@m4x.org>
Date: Fri, 22 Feb 2019 15:32:58 +0100
Subject: [PATCH 094/924] fix ObjectColumnRender

You can either pass a property name or a FunctionColumnRender
---
 types/datatables.net/index.d.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 845fd2f2c2..f367d5bf40 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1150,10 +1150,6 @@ declare namespace DataTables {
         ext: ExtSettings;
     }
 
-    interface ObjectColumnRender {
-        display(d?: number | string | object): string | object;
-    }
-
     interface ObjectOrderFixed {
         /**
          * Two-element array:
@@ -1686,15 +1682,23 @@ declare namespace DataTables {
     }
 
     interface ObjectColumnData {
-        _: string;
-        filter?: string;
-        display?: string;
-        type?: string;
-        sort?: string;
+        _: string | FunctionColumnData;
+        filter?: string | FunctionColumnData;
+        display?: string | FunctionColumnData;
+        type?: string | FunctionColumnData;
+        sort?: string | FunctionColumnData;
     }
 
     type FunctionColumnRender = (data: any, type: any, row: any, meta: CellMetaSettings) => any;
 
+    interface ObjectColumnRender {
+        _?: string | FunctionColumnRender;
+        filter?: string | FunctionColumnRender;
+        display?: string | FunctionColumnRender;
+        type?: string | FunctionColumnRender;
+        sort?: string | FunctionColumnRender;
+    }
+
     interface CellMetaSettings {
         row: number;
         col: number;

From f83f842d8608dc743408112bab948edc2c7b8122 Mon Sep 17 00:00:00 2001
From: Emil Marklund <Eeemil@users.noreply.github.com>
Date: Fri, 22 Feb 2019 16:47:44 +0100
Subject: [PATCH 095/924] added catchAll

catchAll is a method for replying to messages which does not match any messages matched by hear or respond
---
 types/hubot/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/hubot/index.d.ts b/types/hubot/index.d.ts
index 656c492df6..b0f465719a 100644
--- a/types/hubot/index.d.ts
+++ b/types/hubot/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/hubotio/hubot
 // Definitions by: Dirk Gadsden <https://github.com/dirk>
 //                 Kees C. Bakker <https://github.com/KeesCBakker>
+//                 Emil Marklund <https://github.com/eeemil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Hubot {
@@ -40,6 +41,8 @@ declare namespace Hubot {
         readonly adapter: A;
 
         constructor(adapterPath: string, adapter: string, httpd: boolean, name: string, alias?: string);
+        catchAll(callback: ListenerCallback<this>): void;
+        catchAll(options: any, callback: ListenerCallback<this>): void;
         hear(regex: RegExp, callback: ListenerCallback<this>): void;
         hear(regex: RegExp, options: any, callback: ListenerCallback<this>): void;
         helpCommands(): string[];

From a7fa1098d53d363688fd874854bb82c1daae0cc5 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 11:03:30 -0500
Subject: [PATCH 096/924] Added type definitions for dragscroll

---
 dragscroll/dragscroll-tests.ts | 3 +++
 dragscroll/dragscroll.d.ts     | 7 +++++++
 2 files changed, 10 insertions(+)
 create mode 100644 dragscroll/dragscroll-tests.ts
 create mode 100644 dragscroll/dragscroll.d.ts

diff --git a/dragscroll/dragscroll-tests.ts b/dragscroll/dragscroll-tests.ts
new file mode 100644
index 0000000000..de6b8060a4
--- /dev/null
+++ b/dragscroll/dragscroll-tests.ts
@@ -0,0 +1,3 @@
+import dragscroll from "dragscroll";
+
+dragscroll.reset();
\ No newline at end of file
diff --git a/dragscroll/dragscroll.d.ts b/dragscroll/dragscroll.d.ts
new file mode 100644
index 0000000000..dbef7bf897
--- /dev/null
+++ b/dragscroll/dragscroll.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for dragscroll v 0.0.8
+// Project: https://github.com/asvd/dragscroll
+// Definitions by: Sean Kelly <https://github.com/spkellydev/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare module "dragscroll" {
+  function reset(i?: number, el?: HTMLElement[]): void
+}
\ No newline at end of file

From dc4bfe4928669a2f45db1ba5558861e5e1334b85 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 11:10:21 -0500
Subject: [PATCH 097/924] Added type definitions for dragscroll

---
 dragscroll/tsconfig.json       | 23 +++++++++++++++++++++++
 dragscroll/tslint.json         |  1 +
 types/dragscroll/tsconfig.json | 23 +++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 dragscroll/tsconfig.json
 create mode 100644 dragscroll/tslint.json
 create mode 100644 types/dragscroll/tsconfig.json

diff --git a/dragscroll/tsconfig.json b/dragscroll/tsconfig.json
new file mode 100644
index 0000000000..f43363abe3
--- /dev/null
+++ b/dragscroll/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "base64-js-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/dragscroll/tslint.json b/dragscroll/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/dragscroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/dragscroll/tsconfig.json b/types/dragscroll/tsconfig.json
new file mode 100644
index 0000000000..f43363abe3
--- /dev/null
+++ b/types/dragscroll/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "base64-js-tests.ts"
+  ]
+}
\ No newline at end of file

From 8ebb426b6ab2bb78eea99d9617e70d4b974ac6cf Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 11:19:42 -0500
Subject: [PATCH 098/924] Added Dragscroll to @types

---
 dragscroll/dragscroll-tests.ts                |  3 --
 dragscroll/tsconfig.json                      | 23 ----------
 dragscroll/tslint.json                        |  1 -
 types/dragscroll/dragscroll-tests.ts          |  3 ++
 .../dragscroll/index.d.ts                     |  6 +--
 types/dragscroll/tsconfig.json                | 43 +++++++++----------
 types/dragscroll/tslint.json                  |  1 +
 7 files changed, 28 insertions(+), 52 deletions(-)
 delete mode 100644 dragscroll/dragscroll-tests.ts
 delete mode 100644 dragscroll/tsconfig.json
 delete mode 100644 dragscroll/tslint.json
 create mode 100644 types/dragscroll/dragscroll-tests.ts
 rename dragscroll/dragscroll.d.ts => types/dragscroll/index.d.ts (65%)
 create mode 100644 types/dragscroll/tslint.json

diff --git a/dragscroll/dragscroll-tests.ts b/dragscroll/dragscroll-tests.ts
deleted file mode 100644
index de6b8060a4..0000000000
--- a/dragscroll/dragscroll-tests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import dragscroll from "dragscroll";
-
-dragscroll.reset();
\ No newline at end of file
diff --git a/dragscroll/tsconfig.json b/dragscroll/tsconfig.json
deleted file mode 100644
index f43363abe3..0000000000
--- a/dragscroll/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "base64-js-tests.ts"
-  ]
-}
\ No newline at end of file
diff --git a/dragscroll/tslint.json b/dragscroll/tslint.json
deleted file mode 100644
index 2750cc0197..0000000000
--- a/dragscroll/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/dragscroll/dragscroll-tests.ts b/types/dragscroll/dragscroll-tests.ts
new file mode 100644
index 0000000000..4158b6c9da
--- /dev/null
+++ b/types/dragscroll/dragscroll-tests.ts
@@ -0,0 +1,3 @@
+import * as dragscroll from "dragscroll";
+
+dragscroll.reset();
\ No newline at end of file
diff --git a/dragscroll/dragscroll.d.ts b/types/dragscroll/index.d.ts
similarity index 65%
rename from dragscroll/dragscroll.d.ts
rename to types/dragscroll/index.d.ts
index dbef7bf897..4598f31bd5 100644
--- a/dragscroll/dragscroll.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for dragscroll v 0.0.8
-// Project: https://github.com/asvd/dragscroll
+// Project: https://github.com/asvd/dragscroll#readme
 // Definitions by: Sean Kelly <https://github.com/spkellydev/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare module "dragscroll" {
-  function reset(i?: number, el?: HTMLElement[]): void
-}
\ No newline at end of file
+    function reset(i?: number, el?: any[]): void;
+}
diff --git a/types/dragscroll/tsconfig.json b/types/dragscroll/tsconfig.json
index f43363abe3..14917b2a74 100644
--- a/types/dragscroll/tsconfig.json
+++ b/types/dragscroll/tsconfig.json
@@ -1,23 +1,22 @@
 {
-  "compilerOptions": {
-      "module": "commonjs",
-      "lib": [
-          "es6"
-      ],
-      "noImplicitAny": true,
-      "noImplicitThis": true,
-      "strictNullChecks": true,
-      "strictFunctionTypes": true,
-      "baseUrl": "../",
-      "typeRoots": [
-          "../"
-      ],
-      "types": [],
-      "noEmit": true,
-      "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-      "index.d.ts",
-      "base64-js-tests.ts"
-  ]
-}
\ No newline at end of file
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dragscroll-tests.ts"
+    ]
+}
diff --git a/types/dragscroll/tslint.json b/types/dragscroll/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dragscroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 63b91c6efbc87ebffa6e8355c9ca8b036466fe77 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 11:27:09 -0500
Subject: [PATCH 099/924] Added strictFunctionTypes to Dragscroll

---
 types/dragscroll/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/dragscroll/tsconfig.json b/types/dragscroll/tsconfig.json
index 14917b2a74..bc17d2f0c7 100644
--- a/types/dragscroll/tsconfig.json
+++ b/types/dragscroll/tsconfig.json
@@ -13,7 +13,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": false
     },
     "files": [
         "index.d.ts",

From 12d17c2b36c8f24ec11baa5e64b1552cebd3a66a Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 11:36:12 -0500
Subject: [PATCH 100/924] lint

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

diff --git a/types/dragscroll/dragscroll-tests.ts b/types/dragscroll/dragscroll-tests.ts
index 4158b6c9da..fcf4818bf4 100644
--- a/types/dragscroll/dragscroll-tests.ts
+++ b/types/dragscroll/dragscroll-tests.ts
@@ -1,3 +1,3 @@
 import * as dragscroll from "dragscroll";
 
-dragscroll.reset();
\ No newline at end of file
+dragscroll.reset();

From e10db0f11b9a784426fb54dcff67f0119cc8ba79 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 12:02:36 -0500
Subject: [PATCH 101/924] lint

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

diff --git a/types/dragscroll/index.d.ts b/types/dragscroll/index.d.ts
index 4598f31bd5..5270b2e82a 100644
--- a/types/dragscroll/index.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dragscroll v 0.0.8
+// Type definitions for dragscroll v 0.0
 // Project: https://github.com/asvd/dragscroll#readme
 // Definitions by: Sean Kelly <https://github.com/spkellydev/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 837128adf0f83b000e13bcc03c7862eef7e43860 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 22 Feb 2019 22:46:15 +0500
Subject: [PATCH 102/924] feat(unsplash-js): initialize types

---
 types/unsplash-js/index.d.ts           | 232 +++++++++++++++++++++++++
 types/unsplash-js/tsconfig.json        |  22 +++
 types/unsplash-js/tslint.json          |   1 +
 types/unsplash-js/unsplash-js-tests.ts |   0
 4 files changed, 255 insertions(+)
 create mode 100644 types/unsplash-js/index.d.ts
 create mode 100644 types/unsplash-js/tsconfig.json
 create mode 100644 types/unsplash-js/tslint.json
 create mode 100644 types/unsplash-js/unsplash-js-tests.ts

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
new file mode 100644
index 0000000000..de2272c422
--- /dev/null
+++ b/types/unsplash-js/index.d.ts
@@ -0,0 +1,232 @@
+// Type definitions for unsplash-js 5.0
+// Project: https://github.com/unsplash/unsplash-js#readme
+// Definitions by: My Self <https://github.com/markupcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default class Unsplash {
+    public auth: Auth;
+    public categories: CategoriesApi;
+    public collections: CollectionApi;
+    public currentUser: CurrentUserApi;
+    public users: UserApi;
+    public photos: PhotoApi;
+    public search: SearchApi;
+    public stats: StatsApi;
+
+    constructor(options: {
+        apiUrl: string;
+        apiVersion: string;
+        applicationId: string;
+        secret: string;
+        callbackUrl?: string;
+        bearerToken?: string;
+        headers?: { [key: string]: string };
+    });
+
+    private request(requestOptions: {
+        url: string;
+        method: string;
+        query: object;
+        headers: object;
+        body: object;
+        oauth: boolean;
+    }): Promise<any>;
+}
+
+export function toJson(response: any): any;
+
+export class PhotoApi {
+    public listPhotos(
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public listCuratedPhotos(
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public searchPhotos(
+        query: string,
+        categories: ReadonlyArray<string>,
+        page: number,
+        perPage: number
+    ): Promise<any>;
+
+    public getPhoto(
+        id: string,
+        width?: number,
+        height?: number,
+        rectangle?: ReadonlyArray<number>
+    ): Promise<any>;
+
+    public getPhotoStats(id: string): Promise<any>;
+
+    public getRandomPhoto(options: {
+        width?: number;
+        height?: number;
+        query?: string;
+        username?: string;
+        featured?: boolean;
+        collections?: ReadonlyArray<string>;
+        count?: number;
+    }): Promise<any>;
+
+    public uploadPhoto(photo: object): void;
+
+    public likePhoto(id: string): Promise<any>;
+
+    public unlikePhoto(id: string): Promise<any>;
+
+    public downloadPhoto(photo: {
+        links: { download_location: string };
+    }): Promise<any>;
+}
+
+export class CollectionApi {
+    public listCollections(
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public listCuratedCollections(
+        page?: number,
+        perPage?: number
+    ): Promise<any>;
+    public listFeaturedCollections(
+        page?: number,
+        perPage?: number
+    ): Promise<any>;
+    public getCollection(id: number): Promise<any>;
+
+    public getCollectionPhotos(
+        id: number,
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public getCuratedCollectionPhotos(
+        id: number,
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public createCollection(
+        title: string,
+        description?: string,
+        private?: boolean
+    ): Promise<any>;
+
+    public updateCollection(
+        id: number,
+        title?: string,
+        description?: string,
+        private?: boolean
+    ): Promise<any>;
+
+    public deleteCollection(id: number): Promise<any>;
+
+    public addPhotoToCollection(
+        collectionId: number,
+        photoId: string
+    ): Promise<any>;
+
+    public removePhotoFromCollection(
+        collectionId: number,
+        photoId: string
+    ): Promise<any>;
+
+    public listRelatedCollections(collectionId: number): Promise<any>;
+}
+
+export class SearchApi {
+    public photos(
+        keyword: string,
+        page?: number,
+        per_page?: number
+    ): Promise<any>;
+
+    public users(
+        keyword: string,
+        page?: number,
+        per_page?: number
+    ): Promise<any>;
+
+    public collections(
+        keyword: string,
+        page?: number,
+        per_page?: number
+    ): Promise<any>;
+}
+
+export class StatsApi {
+    public total(): Promise<any>;
+}
+
+export class CurrentUserApi {
+    public profile(): Promise<any>;
+
+    public updateProfile(options: {
+        username: string;
+        firstName: string;
+        lastName: string;
+        email: string;
+        url: string;
+        location: string;
+        bio: string;
+        instagramUsername: string;
+    }): Promise<any>;
+}
+
+export class UserApi {
+    public profile(username: string): Promise<any>;
+
+    public statistics(
+        username: string,
+        resolution?: string,
+        quantity?: string
+    ): Promise<any>;
+
+    public photos(
+        username: string,
+        page?: number,
+        perPage?: number,
+        orderBy?: string,
+        stats?: boolean
+    ): Promise<any>;
+
+    public likes(
+        username: string,
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+
+    public collections(
+        username: string,
+        page?: number,
+        perPage?: number,
+        orderBy?: string
+    ): Promise<any>;
+}
+
+export class CategoriesApi {
+    public listCategories(): Promise<any>;
+    public category(id: any): Promise<any>;
+    public categoryPhotos(
+        id: any,
+        page?: number,
+        perPage?: number
+    ): Promise<any>;
+}
+
+export class Auth {
+    public getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
+    public userAuthentication(code: string): object;
+    public setBearerToken(accessToken: string): void;
+}
diff --git a/types/unsplash-js/tsconfig.json b/types/unsplash-js/tsconfig.json
new file mode 100644
index 0000000000..79f45318aa
--- /dev/null
+++ b/types/unsplash-js/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "unsplash-js-tests.ts"
+    ]
+}
diff --git a/types/unsplash-js/tslint.json b/types/unsplash-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/unsplash-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/unsplash-js/unsplash-js-tests.ts b/types/unsplash-js/unsplash-js-tests.ts
new file mode 100644
index 0000000000..e69de29bb2

From 01227c77e87b0d9b33b235e0eaf10b55a8561644 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 13:09:16 -0500
Subject: [PATCH 103/924] link

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

diff --git a/types/dragscroll/index.d.ts b/types/dragscroll/index.d.ts
index 5270b2e82a..1a90b53761 100644
--- a/types/dragscroll/index.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for dragscroll v 0.0
 // Project: https://github.com/asvd/dragscroll#readme
-// Definitions by: Sean Kelly <https://github.com/spkellydev/>
+// Definitions by: Sean Kelly<https://github.com/spkellydev/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare module "dragscroll" {
     function reset(i?: number, el?: any[]): void;

From e9101940b93a76db98185299ada0cbb24dc5d213 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 13:13:38 -0500
Subject: [PATCH 104/924] link

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

diff --git a/types/dragscroll/index.d.ts b/types/dragscroll/index.d.ts
index 1a90b53761..5270b2e82a 100644
--- a/types/dragscroll/index.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for dragscroll v 0.0
 // Project: https://github.com/asvd/dragscroll#readme
-// Definitions by: Sean Kelly<https://github.com/spkellydev/>
+// Definitions by: Sean Kelly <https://github.com/spkellydev/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare module "dragscroll" {
     function reset(i?: number, el?: any[]): void;

From 79bde2d2a407f19afe7e41e3b4cfa54de2c478d5 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 13:19:24 -0500
Subject: [PATCH 105/924] link

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

diff --git a/types/dragscroll/index.d.ts b/types/dragscroll/index.d.ts
index 5270b2e82a..ebf6cb6815 100644
--- a/types/dragscroll/index.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for dragscroll v 0.0
 // Project: https://github.com/asvd/dragscroll#readme
-// Definitions by: Sean Kelly <https://github.com/spkellydev/>
+// Definitions by: Sean Kelly <https://github.com/spkellydev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare module "dragscroll" {
     function reset(i?: number, el?: any[]): void;

From c31d394c731e00895e7f9b4486f316237b2e1763 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Fri, 22 Feb 2019 13:26:20 -0500
Subject: [PATCH 106/924] single module

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

diff --git a/types/dragscroll/index.d.ts b/types/dragscroll/index.d.ts
index ebf6cb6815..cd125c6591 100644
--- a/types/dragscroll/index.d.ts
+++ b/types/dragscroll/index.d.ts
@@ -2,6 +2,4 @@
 // Project: https://github.com/asvd/dragscroll#readme
 // Definitions by: Sean Kelly <https://github.com/spkellydev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "dragscroll" {
-    function reset(i?: number, el?: any[]): void;
-}
+export function reset(i ?: number, el ?: any): void;

From 1ea6c02b39b8ff413deb1b7c079c5266169e47cd Mon Sep 17 00:00:00 2001
From: romka <romka@newtonideas.com>
Date: Fri, 22 Feb 2019 21:07:59 +0000
Subject: [PATCH 107/924] flexmonster d.ts update

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

diff --git a/types/flexmonster/index.d.ts b/types/flexmonster/index.d.ts
index a215a5ba3b..192e8f2d93 100644
--- a/types/flexmonster/index.d.ts
+++ b/types/flexmonster/index.d.ts
@@ -180,6 +180,7 @@ declare namespace Flexmonster {
         dataSourceInfo?: string;
         dataSourceType?: string;
         fieldSeparator?: string;
+        thousandSeparator?: string;
         filename?: string;
         ignoreQuotedLineBreaks?: boolean;
         proxyUrl?: string;

From 8d0a6d8bbc1beac9d935e438a41c880b201272bf Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Sat, 23 Feb 2019 21:39:43 +0800
Subject: [PATCH 108/924] Adding types for amap-js-api

---
 types/amap-js-api/array-bounds.d.ts           |  10 +
 types/amap-js-api/bounds.d.ts                 |  12 +
 types/amap-js-api/browser.d.ts                |  51 +++
 types/amap-js-api/common.d.ts                 |  22 ++
 types/amap-js-api/convert-from.d.ts           |  15 +
 types/amap-js-api/dom-util.d.ts               |  31 ++
 types/amap-js-api/event.d.ts                  |  59 +++
 types/amap-js-api/geometry-util.d.ts          | 122 +++++++
 types/amap-js-api/index.d.ts                  |  48 +++
 types/amap-js-api/layer/building.d.ts         |  30 ++
 types/amap-js-api/layer/flexible.d.ts         |  20 ++
 types/amap-js-api/layer/layer.d.ts            |  20 ++
 types/amap-js-api/layer/layerGroup.d.ts       |  21 ++
 types/amap-js-api/layer/massMarks.d.ts        |  47 +++
 types/amap-js-api/layer/mediaLayer.d.ts       |  35 ++
 types/amap-js-api/layer/tileLayer.d.ts        |  37 ++
 types/amap-js-api/layer/wms.d.ts              |  29 ++
 types/amap-js-api/layer/wmts.d.ts             |  25 ++
 types/amap-js-api/lngLat.d.ts                 |  17 +
 types/amap-js-api/map.d.ts                    | 187 ++++++++++
 types/amap-js-api/overlay/bezierCurve.d.ts    |  22 ++
 types/amap-js-api/overlay/circle.d.ts         |  49 +++
 types/amap-js-api/overlay/circleMarker.d.ts   |   4 +
 types/amap-js-api/overlay/contextMenu.d.ts    |  23 ++
 types/amap-js-api/overlay/ellipse.d.ts        |  27 ++
 types/amap-js-api/overlay/geoJSON.d.ts        |  43 +++
 types/amap-js-api/overlay/icon.d.ts           |  16 +
 types/amap-js-api/overlay/infoWindow.d.ts     |  37 ++
 types/amap-js-api/overlay/marker.d.ts         | 103 ++++++
 types/amap-js-api/overlay/markerShape.d.ts    |  21 ++
 types/amap-js-api/overlay/overlay.d.ts        |  37 ++
 types/amap-js-api/overlay/overlayGroup.d.ts   |  30 ++
 types/amap-js-api/overlay/pathOverlay.d.ts    |  20 ++
 types/amap-js-api/overlay/polygon.d.ts        |  32 ++
 types/amap-js-api/overlay/polyline.d.ts       |  46 +++
 types/amap-js-api/overlay/rectangle.d.ts      |  21 ++
 types/amap-js-api/overlay/shapeOverlay.d.ts   |  30 ++
 types/amap-js-api/overlay/text.d.ts           |  19 +
 types/amap-js-api/pixel.d.ts                  |  17 +
 types/amap-js-api/size.d.ts                   |  10 +
 types/amap-js-api/test/arryBounds.ts          |  18 +
 types/amap-js-api/test/bounds.ts              |  30 ++
 types/amap-js-api/test/browser.ts             | 141 ++++++++
 types/amap-js-api/test/convert-from.ts        |  25 ++
 types/amap-js-api/test/dom-util.ts            |  47 +++
 types/amap-js-api/test/event.ts               |  75 ++++
 types/amap-js-api/test/geometry-util.ts       | 158 ++++++++
 types/amap-js-api/test/layer/buildings.ts     |  40 +++
 types/amap-js-api/test/layer/canvasLayer.ts   |  53 +++
 types/amap-js-api/test/layer/flexible.ts      |  54 +++
 types/amap-js-api/test/layer/imageLayer.ts    |  51 +++
 types/amap-js-api/test/layer/layer.ts         |  34 ++
 types/amap-js-api/test/layer/layerGroup.ts    | 115 ++++++
 types/amap-js-api/test/layer/massMarks.ts     |  83 +++++
 types/amap-js-api/test/layer/tileLayer.ts     |  60 ++++
 types/amap-js-api/test/layer/videoLayer.ts    |  51 +++
 types/amap-js-api/test/layer/wms.ts           |  89 +++++
 types/amap-js-api/test/layer/wmts.ts          |  69 ++++
 types/amap-js-api/test/lnglat.ts              |  48 +++
 types/amap-js-api/test/map.ts                 | 338 ++++++++++++++++++
 types/amap-js-api/test/overlay/bezierCurve.ts | 155 ++++++++
 types/amap-js-api/test/overlay/circle.ts      | 150 ++++++++
 types/amap-js-api/test/overlay/contextMenu.ts |  48 +++
 types/amap-js-api/test/overlay/ellipse.ts     | 117 ++++++
 types/amap-js-api/test/overlay/geoJSON.ts     | 106 ++++++
 types/amap-js-api/test/overlay/icon.ts        |  32 ++
 types/amap-js-api/test/overlay/infoWindow.ts  |  81 +++++
 types/amap-js-api/test/overlay/marker.ts      | 195 ++++++++++
 types/amap-js-api/test/overlay/markerShape.ts |  26 ++
 types/amap-js-api/test/overlay/overlay.ts     |  27 ++
 .../amap-js-api/test/overlay/overlayGroup.ts  | 108 ++++++
 types/amap-js-api/test/overlay/polygon.ts     | 123 +++++++
 types/amap-js-api/test/overlay/polyline.ts    | 139 +++++++
 types/amap-js-api/test/overlay/rectangle.ts   | 121 +++++++
 types/amap-js-api/test/overlay/text.ts        | 169 +++++++++
 types/amap-js-api/test/pixel.ts               |  42 +++
 types/amap-js-api/test/preset.ts              |  29 ++
 types/amap-js-api/test/size.ts                |  16 +
 types/amap-js-api/test/util.ts                |  79 ++++
 types/amap-js-api/test/view2d.ts              |  22 ++
 types/amap-js-api/tsconfig.json               |  20 ++
 types/amap-js-api/tslint.json                 |  10 +
 types/amap-js-api/type-util.d.ts              |  12 +
 types/amap-js-api/util.d.ts                   |  37 ++
 types/amap-js-api/view2D.d.ts                 |  13 +
 85 files changed, 4901 insertions(+)
 create mode 100644 types/amap-js-api/array-bounds.d.ts
 create mode 100644 types/amap-js-api/bounds.d.ts
 create mode 100644 types/amap-js-api/browser.d.ts
 create mode 100644 types/amap-js-api/common.d.ts
 create mode 100644 types/amap-js-api/convert-from.d.ts
 create mode 100644 types/amap-js-api/dom-util.d.ts
 create mode 100644 types/amap-js-api/event.d.ts
 create mode 100644 types/amap-js-api/geometry-util.d.ts
 create mode 100644 types/amap-js-api/index.d.ts
 create mode 100644 types/amap-js-api/layer/building.d.ts
 create mode 100644 types/amap-js-api/layer/flexible.d.ts
 create mode 100644 types/amap-js-api/layer/layer.d.ts
 create mode 100644 types/amap-js-api/layer/layerGroup.d.ts
 create mode 100644 types/amap-js-api/layer/massMarks.d.ts
 create mode 100644 types/amap-js-api/layer/mediaLayer.d.ts
 create mode 100644 types/amap-js-api/layer/tileLayer.d.ts
 create mode 100644 types/amap-js-api/layer/wms.d.ts
 create mode 100644 types/amap-js-api/layer/wmts.d.ts
 create mode 100644 types/amap-js-api/lngLat.d.ts
 create mode 100644 types/amap-js-api/map.d.ts
 create mode 100644 types/amap-js-api/overlay/bezierCurve.d.ts
 create mode 100644 types/amap-js-api/overlay/circle.d.ts
 create mode 100644 types/amap-js-api/overlay/circleMarker.d.ts
 create mode 100644 types/amap-js-api/overlay/contextMenu.d.ts
 create mode 100644 types/amap-js-api/overlay/ellipse.d.ts
 create mode 100644 types/amap-js-api/overlay/geoJSON.d.ts
 create mode 100644 types/amap-js-api/overlay/icon.d.ts
 create mode 100644 types/amap-js-api/overlay/infoWindow.d.ts
 create mode 100644 types/amap-js-api/overlay/marker.d.ts
 create mode 100644 types/amap-js-api/overlay/markerShape.d.ts
 create mode 100644 types/amap-js-api/overlay/overlay.d.ts
 create mode 100644 types/amap-js-api/overlay/overlayGroup.d.ts
 create mode 100644 types/amap-js-api/overlay/pathOverlay.d.ts
 create mode 100644 types/amap-js-api/overlay/polygon.d.ts
 create mode 100644 types/amap-js-api/overlay/polyline.d.ts
 create mode 100644 types/amap-js-api/overlay/rectangle.d.ts
 create mode 100644 types/amap-js-api/overlay/shapeOverlay.d.ts
 create mode 100644 types/amap-js-api/overlay/text.d.ts
 create mode 100644 types/amap-js-api/pixel.d.ts
 create mode 100644 types/amap-js-api/size.d.ts
 create mode 100644 types/amap-js-api/test/arryBounds.ts
 create mode 100644 types/amap-js-api/test/bounds.ts
 create mode 100644 types/amap-js-api/test/browser.ts
 create mode 100644 types/amap-js-api/test/convert-from.ts
 create mode 100644 types/amap-js-api/test/dom-util.ts
 create mode 100644 types/amap-js-api/test/event.ts
 create mode 100644 types/amap-js-api/test/geometry-util.ts
 create mode 100644 types/amap-js-api/test/layer/buildings.ts
 create mode 100644 types/amap-js-api/test/layer/canvasLayer.ts
 create mode 100644 types/amap-js-api/test/layer/flexible.ts
 create mode 100644 types/amap-js-api/test/layer/imageLayer.ts
 create mode 100644 types/amap-js-api/test/layer/layer.ts
 create mode 100644 types/amap-js-api/test/layer/layerGroup.ts
 create mode 100644 types/amap-js-api/test/layer/massMarks.ts
 create mode 100644 types/amap-js-api/test/layer/tileLayer.ts
 create mode 100644 types/amap-js-api/test/layer/videoLayer.ts
 create mode 100644 types/amap-js-api/test/layer/wms.ts
 create mode 100644 types/amap-js-api/test/layer/wmts.ts
 create mode 100644 types/amap-js-api/test/lnglat.ts
 create mode 100644 types/amap-js-api/test/map.ts
 create mode 100644 types/amap-js-api/test/overlay/bezierCurve.ts
 create mode 100644 types/amap-js-api/test/overlay/circle.ts
 create mode 100644 types/amap-js-api/test/overlay/contextMenu.ts
 create mode 100644 types/amap-js-api/test/overlay/ellipse.ts
 create mode 100644 types/amap-js-api/test/overlay/geoJSON.ts
 create mode 100644 types/amap-js-api/test/overlay/icon.ts
 create mode 100644 types/amap-js-api/test/overlay/infoWindow.ts
 create mode 100644 types/amap-js-api/test/overlay/marker.ts
 create mode 100644 types/amap-js-api/test/overlay/markerShape.ts
 create mode 100644 types/amap-js-api/test/overlay/overlay.ts
 create mode 100644 types/amap-js-api/test/overlay/overlayGroup.ts
 create mode 100644 types/amap-js-api/test/overlay/polygon.ts
 create mode 100644 types/amap-js-api/test/overlay/polyline.ts
 create mode 100644 types/amap-js-api/test/overlay/rectangle.ts
 create mode 100644 types/amap-js-api/test/overlay/text.ts
 create mode 100644 types/amap-js-api/test/pixel.ts
 create mode 100644 types/amap-js-api/test/preset.ts
 create mode 100644 types/amap-js-api/test/size.ts
 create mode 100644 types/amap-js-api/test/util.ts
 create mode 100644 types/amap-js-api/test/view2d.ts
 create mode 100644 types/amap-js-api/tsconfig.json
 create mode 100644 types/amap-js-api/tslint.json
 create mode 100644 types/amap-js-api/type-util.d.ts
 create mode 100644 types/amap-js-api/util.d.ts
 create mode 100644 types/amap-js-api/view2D.d.ts

diff --git a/types/amap-js-api/array-bounds.d.ts b/types/amap-js-api/array-bounds.d.ts
new file mode 100644
index 0000000000..419d8e4b1d
--- /dev/null
+++ b/types/amap-js-api/array-bounds.d.ts
@@ -0,0 +1,10 @@
+declare namespace AMap {
+    class ArrayBounds {
+        constructor(bounds: LocationValue[]);
+        bounds: LngLat[];
+        contains(point: LocationValue): boolean;
+        // internal
+        toBounds(): Bounds;
+        getCenter(): LngLat;
+    }
+}
diff --git a/types/amap-js-api/bounds.d.ts b/types/amap-js-api/bounds.d.ts
new file mode 100644
index 0000000000..63e880fe65
--- /dev/null
+++ b/types/amap-js-api/bounds.d.ts
@@ -0,0 +1,12 @@
+declare namespace AMap {
+    class Bounds {
+        constructor(southWest: LngLat, northEast: LngLat);
+        contains(point: LocationValue): boolean;
+        getCenter(): LngLat;
+        getSouthWest(): LngLat;
+        getSouthEast(): LngLat;
+        getNorthEast(): LngLat;
+        getNorthWest(): LngLat;
+        toString(): string;
+    }
+}
diff --git a/types/amap-js-api/browser.d.ts b/types/amap-js-api/browser.d.ts
new file mode 100644
index 0000000000..71bfaa8fea
--- /dev/null
+++ b/types/amap-js-api/browser.d.ts
@@ -0,0 +1,51 @@
+declare namespace AMap {
+    namespace Browser {
+        const ua: string;
+        const mobile: boolean;
+        const plat: 'android' | 'ios' | 'windows' | 'mac' | 'other';
+        const mac: boolean;
+        const windows: boolean;
+        const ios: boolean;
+        const iPad: boolean;
+        const iPhone: boolean;
+        const android: boolean;
+        const android23: boolean;
+        const chrome: boolean;
+        const firefox: boolean;
+        const safari: boolean;
+        const wechat: boolean;
+        const uc: boolean;
+        const qq: boolean;
+        const ie: boolean;
+        const ie6: boolean;
+        const ie7: boolean;
+        const ie8: boolean;
+        const ie9: boolean;
+        const ie10: boolean;
+        const ie11: boolean;
+        const edge: boolean;
+        const ielt9: boolean;
+        const baidu: boolean;
+        const isLocalStorage: boolean;
+        const isGeolocation: boolean;
+        const mobileWebkit: boolean;
+        const mobileWebkit3d: boolean;
+        const mobileOpera: boolean;
+        const retina: boolean;
+        const touch: boolean;
+        const msPointer: boolean;
+        const pointer: boolean;
+        const webkit: boolean;
+        const ie3d: boolean;
+        const webkit3d: boolean;
+        const gecko3d: boolean;
+        const opera3d: boolean;
+        const any3d: boolean;
+        const isCanvas: boolean;
+        const isSvg: boolean;
+        const isVML: boolean;
+        const isWorker: boolean;
+        const isWebsocket: boolean;
+        function isWebGL(): boolean;
+    }
+}
diff --git a/types/amap-js-api/common.d.ts b/types/amap-js-api/common.d.ts
new file mode 100644
index 0000000000..3d51dc719e
--- /dev/null
+++ b/types/amap-js-api/common.d.ts
@@ -0,0 +1,22 @@
+declare namespace AMap {
+    type SizeValue = Size | [number, number];
+    type LocationValue = LngLat | [number, number];
+    type Lang = 'zh_cn' | 'en' | 'zh_en';
+
+    type Event<N extends string = string, V = undefined> = { type: N } &
+        (V extends HTMLElement ? { value: V }
+            : V extends object ? V
+            : V extends undefined ? {}
+            : { value: V });
+    type MapsEvent<N extends string, I> = Event<N, {
+        lnglat: LngLat;
+        pixel: Pixel;
+        target: I
+    }>;
+
+    type StrokeLineJoin = 'miter' | 'round' | 'bevel';
+    type StrokeLineCap = 'butt' | 'round' | 'square';
+    type StrokeStyle = 'dashed' | 'solid';
+
+    type AnimationName = 'AMAP_ANIMATION_NONE' | 'AMAP_ANIMATION_DROP' | 'AMAP_ANIMATION_BOUNCE';
+}
diff --git a/types/amap-js-api/convert-from.d.ts b/types/amap-js-api/convert-from.d.ts
new file mode 100644
index 0000000000..9fe1f1e76d
--- /dev/null
+++ b/types/amap-js-api/convert-from.d.ts
@@ -0,0 +1,15 @@
+declare namespace AMap {
+    namespace convertFrom {
+        interface Result {
+            info: string; // 'ok'
+            locations: LngLat[];
+        }
+        type Type = 'gps' | 'baidu' | 'mapbar';
+        type SearchStatus = 'complete' | 'error';
+    }
+    function convertFrom(
+        lnglat: LocationValue | LocationValue[],
+        type: convertFrom.Type | null,
+        callback: (status: convertFrom.SearchStatus, result: string | convertFrom.Result) => void
+    ): void;
+}
diff --git a/types/amap-js-api/dom-util.d.ts b/types/amap-js-api/dom-util.d.ts
new file mode 100644
index 0000000000..d83a2ca69a
--- /dev/null
+++ b/types/amap-js-api/dom-util.d.ts
@@ -0,0 +1,31 @@
+declare namespace AMap {
+    namespace DomUtil {
+        function getViewport(dom: HTMLElement): Size;
+
+        function getViewportOffset(dom: HTMLElement): Pixel;
+
+        function create<K extends keyof HTMLElementTagNameMap>(
+            tagName: K,
+            parent?: HTMLElement,
+            className?: string
+        ): HTMLElementTagNameMap[K];
+
+        function setClass(dom: HTMLElement, className?: string): void;
+
+        function hasClass(dom: HTMLElement, className: string): boolean;
+
+        function addClass(dom: HTMLElement, className: string): void;
+
+        function removeClass(dom: HTMLElement, className: string): void;
+
+        function setOpacity(dom: HTMLElement, opacity: number): void;
+
+        function rotate(dom: HTMLElement, deg: number, origin?: { x: number, y: number }): void;
+
+        function setCss(dom: HTMLElement | HTMLElement[], style: Partial<CSSStyleDeclaration>): typeof DomUtil; // this
+
+        function empty(dom: HTMLElement): void;
+
+        function remove(dom: HTMLElement): void;
+    }
+}
diff --git a/types/amap-js-api/event.d.ts b/types/amap-js-api/event.d.ts
new file mode 100644
index 0000000000..d8ff5753c9
--- /dev/null
+++ b/types/amap-js-api/event.d.ts
@@ -0,0 +1,59 @@
+declare namespace AMap {
+    abstract class EventEmitter {
+        on<E extends Event, C = this>(
+            eventName: string,
+            // tslint:disable-next-line:no-unnecessary-generics
+            handler: (this: C, event: E) => void,
+            context?: C,
+            once?: boolean,
+            unshift?: boolean
+        ): this;
+
+        off<E extends Event, C = this>(
+            eventName: string,
+            // tslint:disable-next-line
+            handler: ((this: C, event: E) => void) | 'mv',
+            context?: C
+        ): this;
+
+        emit(eventName: string, data?: any): this;
+    }
+
+    namespace event {
+        interface EventListener<T extends 0 | 1> {
+            type: T;
+        }
+
+        function addDomListener<N extends keyof HTMLElementTagNameMap, E extends keyof HTMLElementEventMap, C = HTMLElementTagNameMap[N]>(
+            // tslint:disable-next-line: no-unnecessary-generics
+            instance: HTMLElementTagNameMap[N],
+            eventName: E,
+            handler: (this: C, event: HTMLElementEventMap[E]) => void,
+            context?: C
+        ): EventListener<0>;
+
+        function addListener<I extends EventEmitter, E extends Event, C = I>(
+            // tslint:disable-next-line: no-unnecessary-generics
+            instance: I,
+            eventName: string,
+            // tslint:disable-next-line: no-unnecessary-generics
+            handler: (this: C, event: E) => void,
+            // tslint:disable-next-line: no-unnecessary-generics
+            context?: C
+        ): EventListener<1>;
+
+        function addListenerOnce<I extends EventEmitter, E extends Event, C = I>(
+            // tslint:disable-next-line: no-unnecessary-generics
+            instance: I,
+            eventName: string,
+            // tslint:disable-next-line: no-unnecessary-generics
+            handler: (this: C, event: E) => void,
+            // tslint:disable-next-line: no-unnecessary-generics
+            context?: C
+        ): EventListener<1>;
+
+        function removeListener(listener: EventListener<0 | 1>): void;
+
+        function trigger(instance: EventEmitter, eventName: string, data?: any): void;
+    }
+}
diff --git a/types/amap-js-api/geometry-util.d.ts b/types/amap-js-api/geometry-util.d.ts
new file mode 100644
index 0000000000..03f6800088
--- /dev/null
+++ b/types/amap-js-api/geometry-util.d.ts
@@ -0,0 +1,122 @@
+declare namespace AMap {
+    namespace GeometryUtil {
+        function distance(
+            point1: LocationValue,
+            point2: LocationValue | LocationValue[]
+        ): number;
+
+        function ringArea(ring: LocationValue[]): number;
+
+        function isClockwise(path: LocationValue[]): boolean;
+
+        function distanceOfLine(line: LocationValue[]): number;
+
+        function ringRingClip(
+            ring1: LocationValue[],
+            ring2: LocationValue[]
+        ): Array<[number, number]>;
+
+        function doesRingRingIntersect(
+            ring1: LocationValue[],
+            ring2: LocationValue[]
+        ): boolean;
+
+        function doesLineRingIntersect(
+            line: LocationValue[],
+            ring: LocationValue[]
+        ): boolean;
+
+        function doesLineLineIntersect(
+            line1: LocationValue[],
+            line2: LocationValue[]
+        ): boolean;
+
+        function doesSegmentPolygonIntersect(
+            point1: LocationValue,
+            point2: LocationValue,
+            polygon: LocationValue[][]
+        ): boolean;
+
+        function doesSegmentRingIntersect(
+            point1: LocationValue,
+            point2: LocationValue,
+            ring: LocationValue[]
+        ): boolean;
+
+        function doesSegmentLineIntersect(
+            point1: LocationValue,
+            point2: LocationValue,
+            line: LocationValue[]
+        ): boolean;
+
+        function doesSegmentsIntersect(
+            point1: LocationValue,
+            point2: LocationValue,
+            point3: LocationValue,
+            point4: LocationValue
+        ): boolean;
+
+        function isPointInRing(point: LocationValue, ring: LocationValue[]): boolean;
+
+        function isRingInRing(ring1: LocationValue[], ring2: LocationValue[]): boolean;
+
+        function isPointInPolygon(point: LocationValue, polygon: LocationValue[][]): boolean;
+
+        function makesureClockwise(path: Array<[number, number]>): Array<[number, number]>;
+
+        function makesureAntiClockwise(path: Array<[number, number]>): Array<[number, number]>;
+
+        function closestOnSegment(
+            point1: LocationValue,
+            point2: LocationValue,
+            point3: LocationValue
+        ): [number, number];
+
+        function closestOnLine(point: LocationValue, line: LocationValue[]): [number, number];
+
+        function distanceToSegment(
+            point1: LocationValue,
+            point2: LocationValue,
+            point3: LocationValue
+        ): number;
+
+        function distanceToLine(point: LocationValue, line: LocationValue[]): number;
+
+        function isPointOnSegment(
+            point1: LocationValue,
+            point2: LocationValue,
+            point3: LocationValue,
+            tolerance?: number
+        ): boolean;
+
+        function isPointOnLine(
+            point: LocationValue,
+            line: LocationValue[],
+            tolerance?: number
+        ): boolean;
+
+        function isPointOnRing(
+            point: LocationValue,
+            ring: LocationValue[],
+            tolerance?: number
+        ): boolean;
+
+        function isPointOnPolygon(
+            point: LocationValue,
+            polygon: LocationValue[][],
+            tolerance?: number
+        ): boolean;
+
+        function doesPolygonPolygonIntersect(
+            polygon1: LocationValue[],
+            polygon2: LocationValue[]
+        ): boolean;
+
+        function distanceToPolygon(point: LocationValue, polygon: LocationValue[]): number;
+
+        function triangulateShape(
+            shape1: LngLat[] | Pixel[] | [number, number],
+            shape2: LngLat[] | Pixel[] | [number, number]
+        ): number[];
+    }
+}
diff --git a/types/amap-js-api/index.d.ts b/types/amap-js-api/index.d.ts
new file mode 100644
index 0000000000..54f79c08ea
--- /dev/null
+++ b/types/amap-js-api/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for non-npm package amap-js-sdk 1.4
+// Project: https://lbs.amap.com/api/javascript-api/summary
+// Definitions by: breeze9527 <https://github.com/breeze9527>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference path="array-bounds.d.ts" />
+/// <reference path="bounds.d.ts" />
+/// <reference path="browser.d.ts" />
+/// <reference path="common.d.ts" />
+/// <reference path="convert-from.d.ts" />
+/// <reference path="dom-util.d.ts" />
+/// <reference path="event.d.ts" />
+/// <reference path="geometry-util.d.ts" />
+/// <reference path="lngLat.d.ts" />
+/// <reference path="map.d.ts" />
+/// <reference path="pixel.d.ts" />
+/// <reference path="size.d.ts" />
+/// <reference path="type-util.d.ts" />
+/// <reference path="util.d.ts" />
+/// <reference path="view2D.d.ts" />
+/// <reference path="layer/building.d.ts" />
+/// <reference path="layer/flexible.d.ts" />
+/// <reference path="layer/layer.d.ts" />
+/// <reference path="layer/layerGroup.d.ts" />
+/// <reference path="layer/massMarks.d.ts" />
+/// <reference path="layer/mediaLayer.d.ts" />
+/// <reference path="layer/tileLayer.d.ts" />
+/// <reference path="layer/wms.d.ts" />
+/// <reference path="layer/wmts.d.ts" />
+/// <reference path="overlay/bezierCurve.d.ts" />
+/// <reference path="overlay/circle.d.ts" />
+/// <reference path="overlay/circleMarker.d.ts" />
+/// <reference path="overlay/contextMenu.d.ts" />
+/// <reference path="overlay/ellipse.d.ts" />
+/// <reference path="overlay/geoJSON.d.ts" />
+/// <reference path="overlay/icon.d.ts" />
+/// <reference path="overlay/infoWindow.d.ts" />
+/// <reference path="overlay/marker.d.ts" />
+/// <reference path="overlay/markerShape.d.ts" />
+/// <reference path="overlay/overlay.d.ts" />
+/// <reference path="overlay/overlayGroup.d.ts" />
+/// <reference path="overlay/pathOverlay.d.ts" />
+/// <reference path="overlay/polygon.d.ts" />
+/// <reference path="overlay/polyline.d.ts" />
+/// <reference path="overlay/rectangle.d.ts" />
+/// <reference path="overlay/shapeOverlay.d.ts" />
+/// <reference path="overlay/text.d.ts" />
diff --git a/types/amap-js-api/layer/building.d.ts b/types/amap-js-api/layer/building.d.ts
new file mode 100644
index 0000000000..30dd7c4092
--- /dev/null
+++ b/types/amap-js-api/layer/building.d.ts
@@ -0,0 +1,30 @@
+declare namespace AMap {
+    namespace Buildings {
+        interface Options extends Layer.Options {
+            zooms?: [number, number];
+            opacity?: number;
+            heightFactor?: number;
+            visible?: boolean;
+            zIndex?: number;
+            // inner
+            merge?: boolean;
+            sort?: boolean;
+        }
+        interface AreaStyle {
+            color1: string;
+            path: LocationValue[];
+            color2?: string;
+            visible?: boolean;
+            rejectTexture?: boolean;
+        }
+        interface Style {
+            hideWithoutStyle?: boolean;
+            areas: AreaStyle[];
+        }
+    }
+
+    class Buildings extends Layer {
+        constructor(opts?: Buildings.Options);
+        setStyle(style: Buildings.Style): void;
+    }
+}
diff --git a/types/amap-js-api/layer/flexible.d.ts b/types/amap-js-api/layer/flexible.d.ts
new file mode 100644
index 0000000000..bdb4001a7c
--- /dev/null
+++ b/types/amap-js-api/layer/flexible.d.ts
@@ -0,0 +1,20 @@
+declare namespace AMap {
+    namespace TileLayer {
+        namespace Flexible {
+            interface Options extends TileLayer.Options {
+                createTile?(
+                    x: number,
+                    y: number,
+                    z: number,
+                    success: (tile: HTMLImageElement | HTMLCanvasElement) => void,
+                    fail: () => void
+                ): void;
+                cacheSize?: number;
+                visible?: boolean;
+            }
+        }
+        class Flexible extends TileLayer {
+            constructor(options?: Flexible.Options);
+        }
+    }
+}
diff --git a/types/amap-js-api/layer/layer.d.ts b/types/amap-js-api/layer/layer.d.ts
new file mode 100644
index 0000000000..8f35d949fd
--- /dev/null
+++ b/types/amap-js-api/layer/layer.d.ts
@@ -0,0 +1,20 @@
+declare namespace AMap {
+    namespace Layer {
+        interface Options {
+            map?: Map;
+        }
+    }
+
+    abstract class Layer extends EventEmitter {
+        getContainer(): HTMLDivElement | undefined;
+        getZooms(): [number, number];
+        setOpacity(alpha: number): void;
+        getOpacity(): number;
+        show(): void;
+        hide(): void;
+        setMap(map?: Map | null): void;
+        getMap(): Map | null | undefined;
+        setzIndex(index: number): void;
+        getzIndex(): number;
+    }
+}
diff --git a/types/amap-js-api/layer/layerGroup.d.ts b/types/amap-js-api/layer/layerGroup.d.ts
new file mode 100644
index 0000000000..4cc463eef7
--- /dev/null
+++ b/types/amap-js-api/layer/layerGroup.d.ts
@@ -0,0 +1,21 @@
+declare namespace AMap {
+    class LayerGroup<L = any> extends Layer {
+        constructor(layers: L | L[]);
+        addLayer(layer: L | L[]): this;
+        addLayers(layers: L | L[]): this;
+        getLayers(): L[];
+        getLayer(finder: (this: null, item: L, index: number, list: L[]) => boolean): L | null;
+        hasLayer(layer: L | ((this: null, item: L, index: number, list: L[]) => boolean)): boolean;
+        removeLayer(layer: L | L[]): this;
+        removeLayers(layer: L | L[]): this;
+        clearLayers(): this;
+        eachLayer<C = L>(iterator: (this: C, layer: L, index: number, list: L[]) => void, context?: C): void;
+
+        // overwrite
+        setMap(map?: Map): this;
+        hide(): this;
+        show(): this;
+        reload(): this;
+        setOptions(options: any): this;
+    }
+}
diff --git a/types/amap-js-api/layer/massMarks.d.ts b/types/amap-js-api/layer/massMarks.d.ts
new file mode 100644
index 0000000000..1ab5464a5b
--- /dev/null
+++ b/types/amap-js-api/layer/massMarks.d.ts
@@ -0,0 +1,47 @@
+declare namespace AMap {
+    namespace MassMarks {
+        interface EventMap<I = MassMarks> {
+            click: UIEvent<'click', I>;
+            dblclick: UIEvent<'dblclick', I>;
+            mousedown: UIEvent<'mousedown', I>;
+            mouseup: UIEvent<'mouseup', I>;
+            mouseover: UIEvent<'mouseover', I>;
+            mouseout: UIEvent<'mouseout', I>;
+            touchstart: UIEvent<'touchstart', I>;
+            touchend: UIEvent<'touchend', I>;
+        }
+
+        interface Style {
+            anchor: Pixel;
+            url: string;
+            size: Size;
+            rotation?: number;
+        }
+
+        type UIEvent<N extends string, I> = Event<N, {
+            target: I;
+            data: I extends MassMarks<infer D> ? D : Data;
+        }>;
+
+        interface Options extends Layer.Options {
+            zIndex?: number;
+            cursor?: string;
+            alwayRender?: boolean;
+            style: Style | Style[];
+            // rejectMapMask
+        }
+        interface Data {
+            lnglat: LocationValue;
+            style?: number;
+        }
+    }
+
+    class MassMarks<D extends MassMarks.Data = MassMarks.Data> extends Layer {
+        constructor(data: D[] | string, opts: MassMarks.Options);
+        setStyle(style: MassMarks.Style | MassMarks.Style[]): void;
+        getStyle(): MassMarks.Style | MassMarks.Style[];
+        setData(data: D[] | string): void;
+        getData(): Array<Pick<D, Exclude<keyof D, 'lnglat'>> & { lnglat: LngLat }>;
+        clear(): void;
+    }
+}
diff --git a/types/amap-js-api/layer/mediaLayer.d.ts b/types/amap-js-api/layer/mediaLayer.d.ts
new file mode 100644
index 0000000000..a38f5ba025
--- /dev/null
+++ b/types/amap-js-api/layer/mediaLayer.d.ts
@@ -0,0 +1,35 @@
+declare namespace AMap {
+    namespace MediaLayer {
+        interface Options extends Layer.Options {
+            bounds?: Bounds;
+            visible?: boolean;
+            zooms?: [number, number];
+            opacity?: number;
+        }
+    }
+
+    abstract class MediaLayer<E extends HTMLElement> extends Layer {
+        constructor(options?: MediaLayer.Options);
+        setBounds(bounds: Bounds): void;
+        getBounds(): Bounds;
+        setOptions(options: Partial<MediaLayer.Options>): void;
+        getOptions(): Partial<MediaLayer.Options>;
+        getElement(): E | null;
+    }
+
+    class ImageLayer extends MediaLayer<HTMLImageElement> {
+        setImageUrl(url: string): void;
+        getImageUrl(): string | undefined;
+    }
+
+    class VideoLayer extends MediaLayer<HTMLVideoElement> {
+        setVideoUrl(source: string | string[]): void;
+        getVideoUrl(): string | string[] | undefined;
+    }
+
+    class CanvasLayer extends MediaLayer<HTMLCanvasElement> {
+        setCanvas(canvas: HTMLCanvasElement): void;
+        getCanvas(): HTMLCanvasElement | undefined;
+        reFresh(): void;
+    }
+}
diff --git a/types/amap-js-api/layer/tileLayer.d.ts b/types/amap-js-api/layer/tileLayer.d.ts
new file mode 100644
index 0000000000..7576a70664
--- /dev/null
+++ b/types/amap-js-api/layer/tileLayer.d.ts
@@ -0,0 +1,37 @@
+declare namespace AMap {
+    namespace TileLayer {
+        interface EventMap {
+            complete: Event<'complete'>;
+        }
+
+        interface Options extends Layer.Options {
+            tileSize?: number;
+            tileUrl?: string;
+            errorUrl?: string;
+            getTileUrl?: string | ((x: number, y: number, level: number) => string);
+            zIndex?: number;
+            opacity?: number;
+            zooms?: [number, number];
+            detectRetina?: boolean;
+        }
+        class Satellite extends TileLayer { }
+        class RoadNet extends TileLayer { }
+
+        namespace Traffic {
+            interface Options extends TileLayer.Options {
+                autoRefresh?: boolean;
+                interval?: number;
+            }
+        }
+        class Traffic extends TileLayer {
+            constructor(options?: Traffic.Options);
+        }
+    }
+
+    class TileLayer extends Layer {
+        constructor(options?: TileLayer.Options);
+        getTiles(): string[];
+        reload(): void;
+        setTileUrl(url: string | ((x: number, y: number, level: number) => string)): void;
+    }
+}
diff --git a/types/amap-js-api/layer/wms.d.ts b/types/amap-js-api/layer/wms.d.ts
new file mode 100644
index 0000000000..c4561ddf14
--- /dev/null
+++ b/types/amap-js-api/layer/wms.d.ts
@@ -0,0 +1,29 @@
+declare namespace AMap {
+    namespace TileLayer {
+        namespace WMS {
+            interface Params {
+                VERSION?: string;
+                LAYERS?: string;
+                STYLES?: string;
+                FORMAT?: string;
+                TRANSPARENT?: 'TRUE' | 'FALSE';
+                BGCOLOR?: string;
+                EXCEPTIONS?: string;
+                TIME?: string;
+                ELEVATION?: string;
+            }
+            interface Options extends Flexible.Options {
+                url: string;
+                params: Params;
+                blend?: boolean;
+            }
+        }
+        class WMS extends Flexible {
+            constructor(options: WMS.Options);
+            setUrl(url: string): void;
+            getUrl(): string;
+            setParams(params: WMS.Params): void;
+            getParams(): WMS.Params;
+        }
+    }
+}
diff --git a/types/amap-js-api/layer/wmts.d.ts b/types/amap-js-api/layer/wmts.d.ts
new file mode 100644
index 0000000000..5d85e5df48
--- /dev/null
+++ b/types/amap-js-api/layer/wmts.d.ts
@@ -0,0 +1,25 @@
+declare namespace AMap {
+    namespace TileLayer {
+        namespace WMTS {
+            interface Params {
+                Version?: string;
+                Layer?: string;
+                Style?: string;
+                Format?: string;
+            }
+            interface Options extends Flexible.Options {
+                url: string;
+                params: Params;
+                blend?: boolean;
+            }
+        }
+
+        class WMTS extends Flexible {
+            constructor(options: WMTS.Options);
+            setUrl(url: string): void;
+            getUrl(): string;
+            setParams(params: WMTS.Params): void;
+            getParams(): WMTS.Params;
+        }
+    }
+}
diff --git a/types/amap-js-api/lngLat.d.ts b/types/amap-js-api/lngLat.d.ts
new file mode 100644
index 0000000000..4247002b2b
--- /dev/null
+++ b/types/amap-js-api/lngLat.d.ts
@@ -0,0 +1,17 @@
+declare namespace AMap {
+    class LngLat {
+        constructor(lng: number, lat: number, noAutofix?: boolean);
+        offset(east: number, north: number): LngLat;
+        distance(lnglat: LngLat | LngLat[]): number;
+        getLng(): number;
+        getLat(): number;
+        equals(lnglat: LngLat): boolean;
+        toString(): string;
+
+        // internal
+        add(lnglat: LngLat, noAutofix?: boolean): LngLat;
+        subtract(lnglat: LngLat, noAutofix?: boolean): LngLat;
+        divideBy(num: number, noAutofix?: boolean): LngLat;
+        multiplyBy(num: number, noAutofix?: boolean): LngLat;
+    }
+}
diff --git a/types/amap-js-api/map.d.ts b/types/amap-js-api/map.d.ts
new file mode 100644
index 0000000000..46edc68577
--- /dev/null
+++ b/types/amap-js-api/map.d.ts
@@ -0,0 +1,187 @@
+declare namespace AMap {
+    namespace Map {
+        type Feature = 'bg' | 'point' | 'road' | 'building';
+        type ViewMode = '2D' | '3D';
+        interface Options {
+            view?: View2D;
+            layers?: Layer[];
+            zoom?: number;
+            center?: LocationValue;
+            labelzIndex?: number;
+            zooms?: [number, number];
+            lang?: Lang;
+            defaultCursor?: string;
+            crs?: 'EPSG3857' | 'EPSG3395' | 'EPSG4326';
+            animateEnable?: boolean;
+            isHotspot?: boolean;
+            defaultLayer?: TileLayer;
+            rotateEnable?: boolean;
+            resizeEnable?: boolean;
+            showIndoorMap?: boolean;
+            expandZoomRange?: boolean;
+            dragEnable?: boolean;
+            zoomEnable?: boolean;
+            doubleClickZoom?: boolean;
+            keyboardEnable?: boolean;
+            jogEnable?: boolean;
+            scrollWheel?: boolean;
+            touchZoom?: boolean;
+            touchZoomCenter?: number;
+            mapStyle?: string;
+            features?: Feature[] | 'all' | Feature;
+            showBuildingBlock?: boolean;
+            viewMode?: ViewMode;
+            pitch?: number;
+            pitchEnable?: boolean;
+            buildingAnimation?: boolean;
+            skyColor?: string;
+            preloadMode?: boolean;
+            mask?: Array<[number, number]> | Array<Array<[number, number]>> | Array<Array<Array<[number, number]>>>;
+            maxPitch?: number;
+            rotation?: number;
+            forceVector?: boolean;
+
+            // internal
+            baseRender?: 'vw' | 'd' | 'dv' | 'v';
+            overlayRender?: 'c' | 'd';
+            showLabel?: boolean;
+            gridMapForeign?: boolean;
+            logoUrl?: string;
+            logoUrlRetina?: string;
+            copyright?: string;
+            turboMode?: boolean;
+            workerMode?: boolean;
+            // continuousZoomEnable?: boolean;
+            // showFog: boolean;
+            // yaw: number;
+            // scale: number;
+            // detectRetina: number;
+        }
+        interface Status {
+            animateEnable: boolean;
+            doubleClickZoom: boolean;
+            dragEnable: boolean;
+            isHotspot: boolean;
+            jogEnable: boolean;
+            keyboardEnable: boolean;
+            pitchEnable: boolean;
+            resizeEnable: boolean;
+            rotateEnable: boolean;
+            scrollWheel: boolean;
+            touchZoom: boolean;
+            zoomEnable: boolean;
+        }
+        type HotspotEvent<N extends string> = Event<N, {
+            lnglat: LngLat;
+            name: string;
+            id: string;
+            // internal
+            isIndoorPOI: boolean;
+        }>;
+        interface EventMap {
+            click: MapsEvent<'click', Map>;
+            dblclick: MapsEvent<'dblclick', Map>;
+            rightclick: MapsEvent<'rightclick', Map>;
+            rdblclick: MapsEvent<'rdblclick', Map>;
+            mouseup: MapsEvent<'mouseup', Map>;
+            mousedown: MapsEvent<'mousedown', Map>;
+            mousemove: MapsEvent<'mousemove', Map>;
+            mousewheel: MapsEvent<'mousewheel', Map>;
+            mouseover: MapsEvent<'mouseover', Map>;
+            mouseout: MapsEvent<'mouseout', Map>;
+            touchstart: MapsEvent<'touchstart', Map>;
+            touchmove: MapsEvent<'touchmove', Map>;
+            touchend: MapsEvent<'touchend', Map>;
+            contextmenu: MapsEvent<'contextmenu', Map>;
+
+            hotspotclick: HotspotEvent<'hotspotclick'>;
+            hotspotover: HotspotEvent<'hotspotover'>;
+            hotspotout: HotspotEvent<'hotspotout'>;
+
+            complete: Event<'complete'>;
+            mapmove: Event<'mapmove'>;
+            movestart: Event<'movestart'>;
+            moveend: Event<'moveend'>;
+            zoomchange: Event<'zoomchange'>;
+            zoomstart: Event<'zoomstart'>;
+            zoomend: Event<'zoomend'>;
+            dragstart: Event<'dragstart'>;
+            dragging: Event<'dragging'>;
+            dragend: Event<'dragend'>;
+            resize: Event<'resize'>;
+        }
+    }
+
+    class Map extends EventEmitter {
+        constructor(container: string | HTMLElement, opts?: Map.Options);
+        poiOnAMAP(obj: { id: string; location?: LocationValue; name?: string }): void;
+        detailOnAMAP(obj: { id: string; location?: LocationValue; name?: string }): void;
+        getZoom(): number;
+        getLayers(): Layer[];
+        getCenter(): LngLat;
+        getContainer(): HTMLElement | null;
+        getCity(callback: (cityData: {
+            city: string;
+            citycode: string;
+            district: string;
+            province: string | never[]; // province is empty array when getCity fail
+        }) => void): void;
+        getBounds(): Bounds;
+        getLabelzIndex(): number;
+        getLimitBounds(): Bounds;
+        getLang(): Lang;
+        getSize(): Size;
+        getRotation(): number;
+        getStatus(): Map.Status;
+        getDefaultCursor(): string;
+        getResolution(point?: LocationValue): number;
+        getScale(dpi?: number): number;
+        setZoom(level: number): void;
+        setLabelzIndex(index: number): void;
+        setLayers(layers: Layer[]): void;
+        add(overlay: Overlay | Overlay[]): void;
+        remove(overlay: Overlay | Overlay[]): void;
+        getAllOverlays(type?: 'marker' | 'circle' | 'polyline' | 'polygon'): Overlay[];
+        setCenter(center: LocationValue): void;
+        setZoomAndCenter(zoomLevel: number, center: LocationValue): void;
+        setCity(city: string, callback: (this: this, coord: [string, string], zoom: number) => void): void;
+        setBounds(bound: Bounds): Bounds;
+        setLimitBounds(bound: Bounds): void;
+        clearLimitBounds(): void;
+        setLang(lang: Lang): void;
+        setRotation(rotation: number): void;
+        setStatus(status: Partial<Map.Status>): void;
+        setDefaultCursor(cursor: string): void;
+        zoomIn(): void;
+        zoomOut(): void;
+        panTo(position: LocationValue): void;
+        panBy(x: number, y: number): void;
+        setFitView(
+            overlayList?: Overlay | Overlay[],
+            immediately?: boolean,
+            avoid?: [number, number, number, number],
+            maxZoom?: number
+        ): Bounds | false | undefined;
+        clearMap(): void;
+        destroy(): void;
+        plugin(name: string | string[], callback: () => void): this;
+        addControl(control: {}): void; // TODO
+        removeControl(control: {}): void; // TODO
+        clearInfoWindow(): void;
+        pixelToLngLat(pixel: Pixel, level?: number): LngLat;
+        lnglatToPixel(lnglat: LocationValue, level?: number): Pixel;
+        containerToLngLat(pixel: Pixel): LngLat;
+        lngLatToContainer(lnglat: LocationValue): Pixel;
+        lnglatTocontainer(lnglat: LocationValue): Pixel;
+        setMapStyle(style: string): void;
+        getMapStyle(): string;
+        setFeatures(feature: Map.Feature | Map.Feature[] | 'all'): void;
+        getFeatures(): Map.Feature | Map.Feature[] | 'all';
+        setDefaultLayer(layer: TileLayer): void;
+        setPitch(pitch: number): void;
+        getPitch(): number;
+        getViewMode_(): Map.ViewMode;
+        lngLatToGeodeticCoord(lnglat: LocationValue): Pixel;
+        geodeticCoordToLngLat(pixel: Pixel): LngLat;
+    }
+}
diff --git a/types/amap-js-api/overlay/bezierCurve.d.ts b/types/amap-js-api/overlay/bezierCurve.d.ts
new file mode 100644
index 0000000000..5778cb72a6
--- /dev/null
+++ b/types/amap-js-api/overlay/bezierCurve.d.ts
@@ -0,0 +1,22 @@
+declare namespace AMap {
+    namespace BezierCurve {
+        interface EventMap<I = BezierCurve> extends Polyline.EventMap<I> { }
+        type Options<ExtraData = any> = Merge<Polyline.Options<ExtraData>, {
+            // internal
+            path: Array<Array<number | string | Array<string | number>>>;
+            tolerance?: number;
+            interpolateNumLimit?: [number | number];
+        }>;
+
+        interface GetOptionsResult<ExtraData = any> extends Polyline.GetOptionsResult<ExtraData> {
+            path: Array<LngLat & { controlPoints: LngLat[] }>;
+        }
+    }
+    class BezierCurve<ExtraData = any> extends Polyline<ExtraData> {
+        constructor(options: BezierCurve.Options<ExtraData>);
+        getOptions(): Partial<BezierCurve.GetOptionsResult<ExtraData>>;
+        // internal
+        getInterpolateLngLats(): LngLat[];
+        getSerializedPath(): number[][];
+    }
+}
diff --git a/types/amap-js-api/overlay/circle.d.ts b/types/amap-js-api/overlay/circle.d.ts
new file mode 100644
index 0000000000..2a1cbd9020
--- /dev/null
+++ b/types/amap-js-api/overlay/circle.d.ts
@@ -0,0 +1,49 @@
+declare namespace AMap {
+    namespace Circle {
+        interface EventMap<I = Circle> extends ShapeOverlay.EventMap<I> {
+            setCenter: Event<'setCenter'>;
+            setRadius: Event<'setRadius'>;
+        }
+
+        interface Options<ExtraData = any> {
+            map?: Map;
+            zIndex?: number;
+            center?: LocationValue;
+            bubble?: boolean;
+            cursor?: string;
+            radius?: number;
+            strokeColor?: string;
+            strokeOpcity?: number;
+            strokeWeight?: number;
+            fillColor?: string;
+            fillOpacity?: number;
+            strokeStyle?: StrokeStyle;
+            extData?: ExtraData;
+            strokeDasharray?: number[];
+
+            // internal
+            visible?: boolean;
+            unit?: 'meter' | 'px'; // 'might be typo'
+        }
+
+        type GetOptionsResult<ExtraData = any> = Merge<Polygon.GetOptionsResult<ExtraData>, {
+            path: LngLat[];
+            center: LngLat;
+            radius: number;
+        }>;
+    }
+
+    class Circle<ExtraData = any> extends ShapeOverlay<ExtraData> {
+        constructor(options?: Circle.Options<ExtraData>);
+        setCenter(center: LocationValue, preventEvent?: boolean): void;
+        getCenter(): LngLat | undefined;
+        getBounds(): Bounds | null;
+        setRadius(radius: number, preventEvent?: boolean): void;
+        getRadius(): number;
+        setOptions(options?: Circle.Options<ExtraData>): void;
+        getOptions(): Partial<Circle.GetOptionsResult<ExtraData>>;
+        contains(point: LocationValue): boolean;
+        // internal
+        getPath(count?: number): LngLat[];
+    }
+}
diff --git a/types/amap-js-api/overlay/circleMarker.d.ts b/types/amap-js-api/overlay/circleMarker.d.ts
new file mode 100644
index 0000000000..13e4162f46
--- /dev/null
+++ b/types/amap-js-api/overlay/circleMarker.d.ts
@@ -0,0 +1,4 @@
+declare namespace AMap {
+    // tslint:disable-next-line;
+    class CircleMarker<ExtraData = any> extends Circle<ExtraData> {}
+}
diff --git a/types/amap-js-api/overlay/contextMenu.d.ts b/types/amap-js-api/overlay/contextMenu.d.ts
new file mode 100644
index 0000000000..72c7fc2852
--- /dev/null
+++ b/types/amap-js-api/overlay/contextMenu.d.ts
@@ -0,0 +1,23 @@
+declare namespace AMap {
+    namespace ContextMenu {
+        interface Options {
+            content?: string | HTMLElement;
+            // internal
+            visible?: boolean;
+        }
+
+        interface EventMap<I> {
+            items: Event<'items'>;
+            open: Event<'open', { target: I }>;
+            close: Event<'close', { target: I }>;
+        }
+    }
+
+    class ContextMenu<ExtraData = any> extends Overlay<ExtraData> {
+        constructor(options?: ContextMenu.Options);
+        addItem(text: string, fn: (this: HTMLLIElement) => void, num?: number): void;
+        removeItem(test: string, fn: (this: HTMLLIElement) => void): void;
+        open(map: Map, position: LocationValue): void;
+        close(): void;
+    }
+}
diff --git a/types/amap-js-api/overlay/ellipse.d.ts b/types/amap-js-api/overlay/ellipse.d.ts
new file mode 100644
index 0000000000..55feaf3112
--- /dev/null
+++ b/types/amap-js-api/overlay/ellipse.d.ts
@@ -0,0 +1,27 @@
+declare namespace AMap {
+    namespace Ellipse {
+        interface EventMap<I = Ellipse> extends ShapeOverlay.EventMap<I> {
+            setPath: Event<'setPath'>;
+            setCenter: Event<'setCenter'>;
+        }
+
+        interface Options<ExtraData = any> extends Polygon.Options<ExtraData> {
+            center?: LocationValue;
+            radius?: [number, number];
+        }
+        type GetOptionsResult<ExtraData = any> = Merge<Circle.GetOptionsResult<ExtraData>, {
+            radius: [number, number];
+        }>;
+    }
+
+    class Ellipse<ExtraData = any> extends Polygon<ExtraData> {
+        constructor(options?: Ellipse.Options<ExtraData>);
+        getCenter(): LngLat | undefined;
+        setCenter(center: LocationValue, preventEvent?: boolean): void;
+        setOptions(options: Ellipse.Options<ExtraData>): void;
+
+        // internal
+        setRadius(radius: [number, number], preventEvent?: boolean): void;
+        getRadius(): [number, number];
+    }
+}
diff --git a/types/amap-js-api/overlay/geoJSON.d.ts b/types/amap-js-api/overlay/geoJSON.d.ts
new file mode 100644
index 0000000000..75098a59f0
--- /dev/null
+++ b/types/amap-js-api/overlay/geoJSON.d.ts
@@ -0,0 +1,43 @@
+declare namespace AMap {
+    namespace GeoJSON {
+        type Geometry = {
+            type: 'Point';
+            coordinates: [number, number];
+        } | {
+            type: 'MultiPoint' | 'LineString' | 'Polygon';
+            coordinates: Array<[number, number]>;
+        } | {
+            type: 'MultiLineString' | 'MultiPolygon';
+            coordinates: Array<Array<[number, number]>>;
+        } | {
+            type: 'GeometryCollection';
+            geometries: Geometry[];
+        };
+
+        type GeoJSONObject = {
+            type: 'Feature';
+            properties: any;
+            geometry: Geometry;
+        } | {
+            type: 'FeatureCollection',
+            properties: any;
+            features: GeoJSONObject[];
+        };
+        interface Options {
+            geoJSON?: GeoJSONObject | GeoJSONObject[];
+            getMarker?(obj: GeoJSONObject, lnglat: LngLat): Marker;
+            getPolyline?(obj: GeoJSONObject, lnglats: LngLat[]): Polyline;
+            getPolygon?(obj: GeoJSONObject, lnglats: LngLat[]): Polygon;
+            coordsToLatLng?(lnglat: LngLat): LngLat;
+
+            // internal
+            coordsToLatLngs?(lnglats: LngLat[]): LngLat[];
+        }
+    }
+
+    class GeoJSON<ExtraData = any> extends OverlayGroup<Overlay, ExtraData> {
+        constructor(options?: GeoJSON.Options);
+        importData(obj: GeoJSON.GeoJSONObject | GeoJSON.GeoJSONObject[]): void;
+        toGeoJSON(): GeoJSON.GeoJSONObject[];
+    }
+}
diff --git a/types/amap-js-api/overlay/icon.d.ts b/types/amap-js-api/overlay/icon.d.ts
new file mode 100644
index 0000000000..be300feef3
--- /dev/null
+++ b/types/amap-js-api/overlay/icon.d.ts
@@ -0,0 +1,16 @@
+declare namespace AMap {
+    namespace Icon {
+        interface Options {
+            size?: SizeValue;
+            imageOffset?: Pixel;
+            image?: string;
+            imageSize?: SizeValue;
+        }
+    }
+
+    class Icon extends EventEmitter {
+        constructor(options?: Icon.Options);
+        setImageSize(size: SizeValue): void;
+        getImageSize(): Size;
+    }
+}
diff --git a/types/amap-js-api/overlay/infoWindow.d.ts b/types/amap-js-api/overlay/infoWindow.d.ts
new file mode 100644
index 0000000000..54bedd95a8
--- /dev/null
+++ b/types/amap-js-api/overlay/infoWindow.d.ts
@@ -0,0 +1,37 @@
+declare namespace AMap {
+    namespace InfoWindow {
+        interface EventMap<I> {
+            change: Event<'change', { target: I }>;
+            open: Event<'open', { target: I }>;
+            close: Event<'close', { target: I }>;
+        }
+
+        interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            isCustom?: boolean;
+            autoMove?: boolean;
+            closeWhenClickMap?: boolean;
+            content?: string | HTMLElement;
+            size?: SizeValue;
+            offset?: Pixel;
+            position?: LocationValue;
+            showShadow?: boolean;
+            // internal
+            height?: number;
+        }
+    }
+
+    class InfoWindow<ExtraData = any> extends Overlay<ExtraData> {
+        constructor(options?: InfoWindow.Options);
+        open(map: Map, position?: LocationValue): void;
+        close(): void;
+        getIsOpen(): boolean;
+        setContent(content: string | HTMLElement): void;
+        getContent(): string | HTMLElement | undefined;
+        setPosition(lnglat: LocationValue): void;
+        getPosition(): LngLat | undefined;
+        setSize(size: SizeValue): void;
+        getSize(): Size | undefined;
+        // internal
+        setOffset(offset: Pixel): void;
+    }
+}
diff --git a/types/amap-js-api/overlay/marker.d.ts b/types/amap-js-api/overlay/marker.d.ts
new file mode 100644
index 0000000000..e24ce7be8f
--- /dev/null
+++ b/types/amap-js-api/overlay/marker.d.ts
@@ -0,0 +1,103 @@
+declare namespace AMap {
+    namespace Marker {
+        interface EventMap<I = Marker> {
+            click: MapsEvent<'click', I>;
+            dblclick: MapsEvent<'dblclick', I>;
+            rightclick: MapsEvent<'rightclick', I>;
+            mousemove: MapsEvent<'mousemove', I>;
+            mouseover: MapsEvent<'mouseover', I>;
+            mouseout: MapsEvent<'mouseout', I>;
+            mousedown: MapsEvent<'mousedown', I>;
+            mouseup: MapsEvent<'mouseup', I>;
+            dragstart: MapsEvent<'dragstart', I>;
+            dragging: MapsEvent<'dragging', I>;
+            dragend: MapsEvent<'dragend', I>;
+            moving: Event<'moving', { passwdPath: LngLat[]; }>;
+            moveend: Event<'moveend'>;
+            movealong: Event<'movealong'>;
+            touchstart: MapsEvent<'touchstart', I>;
+            touchmove: MapsEvent<'touchmove', I>;
+            touchend: MapsEvent<'touchend', I>;
+        }
+
+        interface Label {
+            content?: string;
+            offset?: Pixel;
+        }
+
+        interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            position?: LocationValue;
+            offset?: Pixel;
+            icon?: string | Icon;
+            content?: string | HTMLElement;
+            topWhenClick?: boolean;
+            bubble?: boolean;
+            draggable?: boolean;
+            raiseOnDrag?: boolean;
+            cursor?: string;
+            visible?: boolean;
+            zIndex?: number;
+            angle?: number;
+            autoRotation?: boolean;
+            animation?: AnimationName;
+            shadow?: Icon | string;
+            title?: string;
+            shape?: MarkerShape;
+            label?: Label;
+            zooms?: [number, number];
+
+            // internal
+            topWhenMouseOver?: boolean;
+            height?: number;
+        }
+    }
+
+    class Marker<ExtraData = any> extends Overlay<ExtraData> {
+        constructor(options?: Marker.Options<ExtraData>);
+        markOnAMAP(obj?: { name?: string, position?: LocationValue }): void;
+        getOffset(): Pixel;
+        setOffset(offset: Pixel): void;
+        setAnimation(animate: AnimationName, prevent?: boolean): void;
+        getAnimation(): AnimationName;
+        setClickable(cilckable: boolean): void;
+        getClickable(): boolean;
+        getPosition(): LngLat | undefined;
+        setPosition(position: LocationValue): void;
+        setAngle(angle: number): void;
+        setLabel(label?: Marker.Label): void;
+        getLabel(): Marker.Label | undefined;
+        getAngle(): number;
+        setzIndex(index: number): void;
+        getzIndex(): number;
+        setIcon(content: string | Icon): void;
+        getIcon(): string | Icon | undefined;
+        setDraggable(draggable: boolean): void;
+        getDraggable(): boolean;
+        setCursor(cursor: string): void;
+        setContent(content: string | HTMLElement): void;
+        getContent(): string | HTMLElement;
+        moveAlong(
+            path: LngLat[],
+            speed: number,
+            timingFunction?: (t: number) => number,
+            circleable?: boolean
+        ): void;
+        moveTo(
+            path: LocationValue,
+            speed: number,
+            timingFunction?: (t: number) => number
+        ): void;
+        stopMove(): void;
+        pauseMove(): boolean;
+        resumeMove(): boolean;
+        setMap(map: null | Map): void;
+        setTitle(title: string): void;
+        getTitle(): string | undefined;
+        setTop(isTop: boolean): void;
+        getTop(): boolean;
+        setShadow(icon?: Icon | string): void;
+        getShadow(): Icon | undefined | string;
+        setShape(shape?: MarkerShape): void;
+        getShape(): MarkerShape | undefined;
+    }
+}
diff --git a/types/amap-js-api/overlay/markerShape.d.ts b/types/amap-js-api/overlay/markerShape.d.ts
new file mode 100644
index 0000000000..c8efd93850
--- /dev/null
+++ b/types/amap-js-api/overlay/markerShape.d.ts
@@ -0,0 +1,21 @@
+declare namespace AMap {
+    namespace MarkerShape {
+        interface CircleOptions {
+            type: 'circle';
+            coords: [number, number, number];
+        }
+        interface PolyOptions {
+            type: 'poly';
+            coords: number[];
+        }
+        interface RectOptions {
+            type: 'rect';
+            coords: [number, number, number, number];
+        }
+        type Options = CircleOptions | PolyOptions | RectOptions;
+    }
+
+    class MarkerShape {
+        constructor(options: MarkerShape.Options);
+    }
+}
diff --git a/types/amap-js-api/overlay/overlay.d.ts b/types/amap-js-api/overlay/overlay.d.ts
new file mode 100644
index 0000000000..1726b39c3e
--- /dev/null
+++ b/types/amap-js-api/overlay/overlay.d.ts
@@ -0,0 +1,37 @@
+declare namespace AMap {
+    namespace Overlay {
+        interface EventMap<I> {
+            touchstart: MapsEvent<'touchstart', I>;
+            touchmove: MapsEvent<'touchmove', I>;
+            touchend: MapsEvent<'touchend', I>;
+            click: MapsEvent<'click', I>;
+            rightclick: MapsEvent<'rightclick', I>;
+            dblclick: MapsEvent<'dblclick', I>;
+            mousemove: MapsEvent<'mousemove', I>;
+            mouseover: MapsEvent<'mouseover', I>;
+            mousedown: MapsEvent<'mousedown', I>;
+            mouseup: MapsEvent<'mouseup', I>;
+        }
+        interface Options<ExtraData = any> {
+            map?: Map;
+            cursor?: string;
+            extData?: ExtraData;
+            bubble?: boolean;
+            clickable?: boolean;
+            draggable?: boolean;
+        }
+    }
+    abstract class Overlay<ExtraData = any> extends EventEmitter {
+        constructor(options?: Overlay.Options);
+        show(): void;
+        hide(): void;
+        getMap(): Map | null | undefined;
+        setMap(map: Map | null): void;
+        setExtData(extData: ExtraData): void;
+        getExtData(): ExtraData | {};
+
+        // internal
+        setHeight(height?: number | string): void;
+        getHeight(): number | string;
+    }
+}
diff --git a/types/amap-js-api/overlay/overlayGroup.d.ts b/types/amap-js-api/overlay/overlayGroup.d.ts
new file mode 100644
index 0000000000..d397505b04
--- /dev/null
+++ b/types/amap-js-api/overlay/overlayGroup.d.ts
@@ -0,0 +1,30 @@
+type ReferOverlayOptions<O> =
+    O extends AMap.BezierCurve ? AMap.BezierCurve.Options
+    : O extends AMap.Polyline ? AMap.Polyline.Options
+    : O extends AMap.Circle ? AMap.Circle.Options
+    : O extends AMap.Ellipse ? AMap.Ellipse.Options
+    : O extends AMap.Polygon ? AMap.Polygon.Options
+    : O extends AMap.Text ? AMap.Text.Options
+    : O extends AMap.Marker ? AMap.Marker.Options
+    : O extends AMap.Rectangle ? AMap.Rectangle.Options
+    : any;
+
+declare namespace AMap {
+    class OverlayGroup<O extends Overlay = Overlay, ExtraData = any> extends Overlay<ExtraData> {
+        constructor(overlays?: O | O[]);
+        addOverlay(overlay: O | O[]): this;
+        addOverlays(overlay: O | O[]): this;
+        getOverlays(): O[];
+        hasOverlay(overlay: O | ((this: null, item: O, index: number, list: O[]) => boolean)): boolean;
+        removeOverlay(overlay: O | O[]): this;
+        removeOverlays(overlay: O | O[]): this;
+        clearOverlays(): this;
+        eachOverlay<C = O>(iterator: (this: C, overlay: O, index: number, overlays: O[]) => void, context?: C): this;
+        setMap(map: null | Map): this;
+        setOptions(options: ReferOverlayOptions<O>): this;
+        show(): this;
+        hide(): this;
+
+        getOverlay(finder: ((this: null, item: O, index: number, list: O[]) => boolean) | O): O | null;
+    }
+}
diff --git a/types/amap-js-api/overlay/pathOverlay.d.ts b/types/amap-js-api/overlay/pathOverlay.d.ts
new file mode 100644
index 0000000000..de21aa35a7
--- /dev/null
+++ b/types/amap-js-api/overlay/pathOverlay.d.ts
@@ -0,0 +1,20 @@
+declare namespace AMap {
+    namespace PathOverlay {
+        interface EventMap<I = PathOverlay> extends ShapeOverlay.EventMap<I> { }
+        interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            visible?: boolean;
+            zIndex?: number;
+            strokeColor?: string;
+            strokeOpacity?: number;
+            strokeWeight?: number;
+            strokeStyle?: StrokeStyle;
+            strokeDasharray?: number[];
+            lineJoin?: StrokeLineJoin;
+            lineCap?: StrokeLineCap;
+        }
+    }
+    abstract class PathOverlay<ExtraData = any> extends ShapeOverlay<ExtraData> {
+        constructor(options?: PathOverlay.Options<ExtraData>);
+        getBounds(): Bounds | (this extends Rectangle ? undefined : null);
+    }
+}
diff --git a/types/amap-js-api/overlay/polygon.d.ts b/types/amap-js-api/overlay/polygon.d.ts
new file mode 100644
index 0000000000..8792e0e135
--- /dev/null
+++ b/types/amap-js-api/overlay/polygon.d.ts
@@ -0,0 +1,32 @@
+declare namespace AMap {
+    namespace Polygon {
+        interface EventMap<I = Polygon> extends PathOverlay.EventMap<I> { }
+        interface Options<ExtraData = any> extends PathOverlay.Options<ExtraData> {
+            path?: LocationValue[] | LocationValue[][];
+            fillColor?: string;
+            fillOpacity?: number;
+        }
+
+        interface GetOptionsResult<ExtraData = any> extends ShapeOverlay.GetOptionsResult<ExtraData> {
+            fillColor: string;
+            fillOpacity: number;
+            path: LngLat[] | LngLat[][];
+            lineJoin: StrokeLineJoin;
+            texture: string;
+        }
+    }
+
+    class Polygon<ExtraData = any> extends PathOverlay<ExtraData> {
+        constructor(options?: Polygon.Options<ExtraData>);
+        setPath(path: LocationValue[] | LocationValue[][]): void;
+        getPath(): LngLat[] | LngLat[][];
+        setOptions(options: Polygon.Options<ExtraData>): void;
+        getOptions(): Partial<
+            this extends Omit<Ellipse, keyof Polygon> ? Ellipse.GetOptionsResult<ExtraData> :
+            this extends Omit<Rectangle, keyof Polygon> ? Rectangle.GetOptionsResult<ExtraData> :
+            Polygon.GetOptionsResult<ExtraData>
+        >;
+        getArea(): number;
+        contains(point: LocationValue): boolean;
+    }
+}
diff --git a/types/amap-js-api/overlay/polyline.d.ts b/types/amap-js-api/overlay/polyline.d.ts
new file mode 100644
index 0000000000..207279b208
--- /dev/null
+++ b/types/amap-js-api/overlay/polyline.d.ts
@@ -0,0 +1,46 @@
+declare namespace AMap {
+    namespace Polyline {
+        interface EventMap<I = Polyline> extends PathOverlay.EventMap<I> { }
+        interface GetOptionsResult<ExtraData = any> extends ShapeOverlay.GetOptionsResult<ExtraData> {
+            isOutline: boolean;
+            outlineColor: string;
+            geodesic: boolean;
+            path: LngLat[];
+            lineJoin: StrokeLineJoin;
+            lineCap: StrokeLineCap;
+            borderWeight: number;
+            showDir: boolean;
+            dirColor: string;
+            dirImg: string;
+        }
+
+        interface Options<ExtraData = any> extends PathOverlay.Options<ExtraData> {
+            isOutline?: boolean;
+            outlineColor?: string;
+            geodesic?: boolean;
+            dirColor?: string;
+            borderWeight?: number;
+            showDir?: boolean;
+            // internal
+            path?: LocationValue[];
+        }
+    }
+
+    class Polyline<ExtraData = any> extends PathOverlay<ExtraData> {
+        constructor(options?: BezierCurve.Options<ExtraData> | Polyline.Options<ExtraData>);
+        setPath(
+            path: this extends Omit<BezierCurve, keyof Polyline> ?
+                Array<Array<number | string | Array<string | number>>>
+                : LocationValue[]
+        ): void;
+        getPath(): this extends Omit<BezierCurve, keyof Polyline> ?
+            Array<LngLat & { controlPoints: LngLat[] }>
+            : LngLat[];
+        getLength(): number;
+        setOptions(options: this extends Omit<BezierCurve, keyof Polyline> ?
+            Partial<BezierCurve.Options<ExtraData>>
+            : Polyline.Options<ExtraData>
+        ): void;
+        getOptions(): Partial<Polyline.GetOptionsResult<ExtraData>>;
+    }
+}
diff --git a/types/amap-js-api/overlay/rectangle.d.ts b/types/amap-js-api/overlay/rectangle.d.ts
new file mode 100644
index 0000000000..259e2072de
--- /dev/null
+++ b/types/amap-js-api/overlay/rectangle.d.ts
@@ -0,0 +1,21 @@
+declare namespace AMap {
+    namespace Rectangle {
+        interface EventMap<I = Rectangle> extends Polygon.EventMap<I> {
+            setBounds: Event<'setBounds'>;
+        }
+
+        interface Options<ExtraData = any> extends Polygon.Options<ExtraData> {
+            bounds?: Bounds;
+        }
+        type GetOptionsResult<ExtraData = any> = Merge<Polygon.GetOptionsResult<ExtraData>, {
+            path: LngLat[];
+            bounds: Bounds;
+            texture: string;
+        }>;
+    }
+    class Rectangle<ExtraData = any> extends Polygon<ExtraData> {
+        constructor(options?: Rectangle.Options<ExtraData>);
+        setBounds(bounds: Bounds, preventEvent?: boolean): void;
+        setOptions(options: Partial<Rectangle.Options>): void;
+    }
+}
diff --git a/types/amap-js-api/overlay/shapeOverlay.d.ts b/types/amap-js-api/overlay/shapeOverlay.d.ts
new file mode 100644
index 0000000000..b8f239aac1
--- /dev/null
+++ b/types/amap-js-api/overlay/shapeOverlay.d.ts
@@ -0,0 +1,30 @@
+declare namespace AMap {
+    namespace ShapeOverlay {
+        interface EventMap<I = ShapeOverlay> extends Overlay.EventMap<I> {
+            show: Event<'show', { target: I }>;
+            hide: Event<'hide', { target: I }>;
+            options: Event<'options'>;
+            change: Event<'change', { target: I }>;
+        }
+        interface GetOptionsResult<ExtraData = any> {
+            map: Map;
+            zIndex: number;
+            strokeColor: string;
+            strokeOpacity: number;
+            strokeWeight: number;
+            strokeStyle: StrokeStyle;
+            strokeDasharray: number[];
+            extData: ExtraData | {};
+            bubble: boolean;
+            clickable: boolean;
+        }
+    }
+    abstract class ShapeOverlay<ExtraData = any> extends Overlay<ExtraData> {
+        abstract setOptions(options: {}): void;
+        abstract getOptions(): {};
+        getzIndex(): number;
+        setzIndex(zIndex: number): void;
+        getVisible(): boolean;
+        setDraggable(draggable: boolean): void;
+    }
+}
diff --git a/types/amap-js-api/overlay/text.d.ts b/types/amap-js-api/overlay/text.d.ts
new file mode 100644
index 0000000000..db15ae08ce
--- /dev/null
+++ b/types/amap-js-api/overlay/text.d.ts
@@ -0,0 +1,19 @@
+declare namespace AMap {
+    namespace Text {
+        type TextAlign = 'left' | 'right' | 'center';
+        type VerticalAlign = 'top' | 'middle' | 'bottom';
+        interface EventMap<I = Text> extends Marker.EventMap<I> { }
+        interface Options extends Marker.Options {
+            text?: string;
+            textAlign?: TextAlign;
+            verticalAlign?: VerticalAlign;
+        }
+    }
+
+    class Text<ExtraData = any> extends Marker<ExtraData> {
+        constructor(options?: Text.Options);
+        getText(): string;
+        setText(text: string): void;
+        setStyle(style: object): void;
+    }
+}
diff --git a/types/amap-js-api/pixel.d.ts b/types/amap-js-api/pixel.d.ts
new file mode 100644
index 0000000000..fab4605b7a
--- /dev/null
+++ b/types/amap-js-api/pixel.d.ts
@@ -0,0 +1,17 @@
+declare namespace AMap {
+    class Pixel {
+        constructor(x: number, y: number, round?: boolean);
+        getX(): number;
+        getY(): number;
+        equals(point: Pixel): boolean;
+        toString(): string;
+
+        // internal
+        add(offset: {x: number; y: number}, round?: boolean): Pixel;
+        round(): Pixel;
+        floor(): Pixel;
+        length(): number;
+        direction(): null | number;
+        toFixed(decimals?: number): this;
+    }
+}
diff --git a/types/amap-js-api/size.d.ts b/types/amap-js-api/size.d.ts
new file mode 100644
index 0000000000..12a1e25423
--- /dev/null
+++ b/types/amap-js-api/size.d.ts
@@ -0,0 +1,10 @@
+declare namespace AMap {
+    class Size {
+        constructor(width: number, height: number);
+        getWidth(): number;
+        getHeight(): number;
+        toString(): string;
+        // internal
+        contains(size: { x: number; y: number }): boolean;
+    }
+}
diff --git a/types/amap-js-api/test/arryBounds.ts b/types/amap-js-api/test/arryBounds.ts
new file mode 100644
index 0000000000..1ccc4d0488
--- /dev/null
+++ b/types/amap-js-api/test/arryBounds.ts
@@ -0,0 +1,18 @@
+import {
+    lnglat
+} from './preset';
+
+// $ExpectType ArrayBounds
+const arrayBounds = new AMap.ArrayBounds([lnglat, lnglat, lnglat]);
+
+// $ExpectType LngLat[]
+arrayBounds.bounds;
+
+// $ExpectType boolean
+arrayBounds.contains(lnglat);
+
+// $ExpectType Bounds
+arrayBounds.toBounds();
+
+// $ExpectType LngLat
+arrayBounds.getCenter();
diff --git a/types/amap-js-api/test/bounds.ts b/types/amap-js-api/test/bounds.ts
new file mode 100644
index 0000000000..d22ba697f9
--- /dev/null
+++ b/types/amap-js-api/test/bounds.ts
@@ -0,0 +1,30 @@
+import {
+    lnglat,
+    lnglatTuple
+} from './preset';
+
+// $ExpectType Bounds
+const bounds = new AMap.Bounds(lnglat, lnglat);
+
+// $ExpectType boolean
+bounds.contains(lnglat);
+// $ExpectType boolean
+bounds.contains(lnglatTuple);
+
+// $ExpectType LngLat
+bounds.getCenter();
+
+// $ExpectType LngLat
+bounds.getSouthWest();
+
+// $ExpectType LngLat
+bounds.getSouthEast();
+
+// $ExpectType LngLat
+bounds.getNorthEast();
+
+// $ExpectType LngLat
+bounds.getNorthWest();
+
+// $ExpectType string
+bounds.toString();
diff --git a/types/amap-js-api/test/browser.ts b/types/amap-js-api/test/browser.ts
new file mode 100644
index 0000000000..b80d8cd3ff
--- /dev/null
+++ b/types/amap-js-api/test/browser.ts
@@ -0,0 +1,141 @@
+const brwoser = AMap.Browser;
+
+// $ExpectType string
+brwoser.ua;
+
+// $ExpectType boolean
+brwoser.mobile;
+
+const plat: 'android' | 'ios' | 'windows' | 'mac' | 'other' = brwoser.plat;
+
+// $ExpectType boolean
+brwoser.mac;
+
+// $ExpectType boolean
+brwoser.windows;
+
+// $ExpectType boolean
+brwoser.ios;
+
+// $ExpectType boolean
+brwoser.iPad;
+
+// $ExpectType boolean
+brwoser.iPhone;
+
+// $ExpectType boolean
+brwoser.android;
+
+// $ExpectType boolean
+brwoser.android23;
+
+// $ExpectType boolean
+brwoser.chrome;
+
+// $ExpectType boolean
+brwoser.firefox;
+
+// $ExpectType boolean
+brwoser.safari;
+
+// $ExpectType boolean
+brwoser.wechat;
+
+// $ExpectType boolean
+brwoser.uc;
+
+// $ExpectType boolean
+brwoser.qq;
+
+// $ExpectType boolean
+brwoser.ie;
+
+// $ExpectType boolean
+brwoser.ie6;
+
+// $ExpectType boolean
+brwoser.ie7;
+
+// $ExpectType boolean
+brwoser.ie8;
+
+// $ExpectType boolean
+brwoser.ie9;
+
+// $ExpectType boolean
+brwoser.ie10;
+
+// $ExpectType boolean
+brwoser.ie11;
+
+// $ExpectType boolean
+brwoser.edge;
+
+// $ExpectType boolean
+brwoser.ielt9;
+
+// $ExpectType boolean
+brwoser.baidu;
+
+// $ExpectType boolean
+brwoser.isLocalStorage;
+
+// $ExpectType boolean
+brwoser.isGeolocation;
+
+// $ExpectType boolean
+brwoser.mobileWebkit;
+
+// $ExpectType boolean
+brwoser.mobileWebkit3d;
+
+// $ExpectType boolean
+brwoser.mobileOpera;
+
+// $ExpectType boolean
+brwoser.retina;
+
+// $ExpectType boolean
+brwoser.touch;
+
+// $ExpectType boolean
+brwoser.msPointer;
+
+// $ExpectType boolean
+brwoser.pointer;
+
+// $ExpectType boolean
+brwoser.webkit;
+
+// $ExpectType boolean
+brwoser.ie3d;
+
+// $ExpectType boolean
+brwoser.webkit3d;
+
+// $ExpectType boolean
+brwoser.gecko3d;
+
+// $ExpectType boolean
+brwoser.opera3d;
+
+// $ExpectType boolean
+brwoser.any3d;
+
+// $ExpectType boolean
+brwoser.isCanvas;
+
+// $ExpectType boolean
+brwoser.isSvg;
+
+// $ExpectType boolean
+brwoser.isVML;
+
+// $ExpectType boolean
+brwoser.isWorker;
+
+// $ExpectType boolean
+brwoser.isWebsocket;
+
+// $ExpectType boolean
+brwoser.isWebGL();
diff --git a/types/amap-js-api/test/convert-from.ts b/types/amap-js-api/test/convert-from.ts
new file mode 100644
index 0000000000..8cb9b8502c
--- /dev/null
+++ b/types/amap-js-api/test/convert-from.ts
@@ -0,0 +1,25 @@
+import {
+    lnglat,
+    lnglatTuple
+} from './preset';
+
+declare const convertType: 'baidu' | 'mapbar' | 'gps' | null;
+// $ExpectType void
+AMap.convertFrom(lnglat, convertType, (status, result) => {
+    const temp: 'complete' | 'error' = status;
+    if (typeof result !== 'string') {
+        // $ExpectType string
+        result.info;
+        // $ExpectType LngLat[]
+        result.locations;
+    } else {
+        // $ExpectType string
+        result;
+    }
+});
+// $ExpectType void
+AMap.convertFrom([lnglat], null, () => { });
+// $ExpectType void
+AMap.convertFrom(lnglatTuple, null, () => { });
+// $ExpectType void
+AMap.convertFrom([lnglatTuple], null, () => { });
diff --git a/types/amap-js-api/test/dom-util.ts b/types/amap-js-api/test/dom-util.ts
new file mode 100644
index 0000000000..6cb0bce511
--- /dev/null
+++ b/types/amap-js-api/test/dom-util.ts
@@ -0,0 +1,47 @@
+import { div } from './preset';
+
+const util = AMap.DomUtil;
+
+// $ExpectType Size
+util.getViewport(div);
+
+// $ExpectType Pixel
+util.getViewportOffset(div);
+
+// $ExpectType HTMLDivElement
+util.create('div');
+// $ExpectType HTMLAnchorElement
+util.create('a');
+// $ExpectType HTMLDivElement
+util.create('div', div);
+// $ExpectType HTMLDivElement
+util.create('div', div, 'className');
+
+// $ExpectType void
+util.setClass(div);
+// $ExpectType void
+util.setClass(div, 'className');
+
+// $ExpectType boolean
+util.hasClass(div, 'className');
+
+// $ExpectType void
+util.removeClass(div, 'className');
+
+// $ExpectType void
+util.setOpacity(div, 1);
+
+// $ExpectType void
+util.rotate(div, 10);
+// $ExpectType void
+util.rotate(div, 10, { x: 10, y: 10 });
+
+const util2: typeof AMap.DomUtil = util.setCss(div, { textAlign: 'left' });
+// $ExpectError
+util.setCss(div, { textAlign: 10 });
+
+// $ExpectType void
+util.empty(div);
+
+// $ExpectType void
+util.remove(div);
diff --git a/types/amap-js-api/test/event.ts b/types/amap-js-api/test/event.ts
new file mode 100644
index 0000000000..8678045158
--- /dev/null
+++ b/types/amap-js-api/test/event.ts
@@ -0,0 +1,75 @@
+import {
+    lnglat,
+    pixel,
+    map
+} from './preset';
+declare var div: HTMLDivElement;
+declare var input: HTMLInputElement;
+
+// $ExpectType Map
+map.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+});
+
+// $ExpectType EventListener<0>
+AMap.event.addDomListener(div, 'click', event => {
+    // $ExpectType number
+    event.clientX;
+});
+
+// $ExpectType EventListener<1>
+AMap.event.addListener(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+AMap.event.addListener(map, 'click', (event: AMap.Map.EventMap['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType Map
+    event.target;
+});
+
+// $ExpectType EventListener<1>
+AMap.event.addListenerOnce(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+declare const eventListener: AMap.event.EventListener<0>;
+// $ExpectType void
+AMap.event.removeListener(eventListener);
+
+// $ExpectType void
+AMap.event.trigger(map, 'click', {
+    lnglat,
+    pixel,
+    target: map
+});
+// $ExpectType void
+AMap.event.trigger(map, 'hotspotclick', {
+    lnglat,
+    name: 'name',
+    id: 'id',
+    isIndoorPOI: true
+});
+// $ExpectType void
+AMap.event.trigger(map, 'complete');
diff --git a/types/amap-js-api/test/geometry-util.ts b/types/amap-js-api/test/geometry-util.ts
new file mode 100644
index 0000000000..98a8263fb0
--- /dev/null
+++ b/types/amap-js-api/test/geometry-util.ts
@@ -0,0 +1,158 @@
+import {
+    lnglat as point,
+    lnglatTuple as pointTuple
+} from './preset';
+
+const line = [point];
+const lineTuple = [pointTuple];
+const ring = [point];
+const ringTuple = [pointTuple];
+const polygon = [ring];
+const polygonTuple = [ringTuple];
+const util = AMap.GeometryUtil;
+
+// $ExpectType number
+util.distance(point, point);
+// $ExpectType number
+util.distance(pointTuple, pointTuple);
+// $ExpectType number
+util.distance(point, line);
+// $ExpectType number
+util.distance(pointTuple, lineTuple);
+
+// $ExpectType number
+util.ringArea(ring);
+// $ExpectType number
+util.ringArea(ringTuple);
+
+// $ExpectType boolean
+util.isClockwise(ring);
+// $ExpectType boolean
+util.isClockwise(ringTuple);
+
+// $ExpectType number
+util.distanceOfLine(line);
+// $ExpectType number
+util.distanceOfLine(lineTuple);
+
+// $ExpectType [number, number][]
+util.ringRingClip(ring, ring);
+// $ExpectType [number, number][]
+util.ringRingClip(ringTuple, ringTuple);
+
+// $ExpectType boolean
+util.doesRingRingIntersect(ring, ring);
+// $ExpectType boolean
+util.doesRingRingIntersect(ringTuple, ringTuple);
+
+// $ExpectType boolean
+util.doesLineRingIntersect(line, ring);
+// $ExpectType boolean
+util.doesLineRingIntersect(lineTuple, ringTuple);
+
+// $ExpectType boolean
+util.doesLineLineIntersect(line, line);
+// $ExpectType boolean
+util.doesLineLineIntersect(lineTuple, lineTuple);
+
+// $ExpectType boolean
+util.doesSegmentPolygonIntersect(point, point, polygon);
+// $ExpectType boolean
+util.doesSegmentPolygonIntersect(pointTuple, pointTuple, polygonTuple);
+
+// $ExpectType boolean
+util.doesSegmentRingIntersect(point, point, ring);
+// $ExpectType boolean
+util.doesSegmentRingIntersect(pointTuple, pointTuple, ringTuple);
+
+// $ExpectType boolean
+util.doesSegmentLineIntersect(point, point, line);
+// $ExpectType boolean
+util.doesSegmentLineIntersect(pointTuple, pointTuple, lineTuple);
+
+// $ExpectType boolean
+util.doesSegmentsIntersect(point, point, point, point);
+// $ExpectType boolean
+util.doesSegmentsIntersect(pointTuple, pointTuple, pointTuple, pointTuple);
+
+// $ExpectType boolean
+util.isPointInRing(point, ring);
+// $ExpectType boolean
+util.isPointInRing(pointTuple, ringTuple);
+
+// $ExpectType boolean
+util.isRingInRing(ring, ring);
+// $ExpectType boolean
+util.isRingInRing(ringTuple, ringTuple);
+
+// $ExpectType boolean
+util.isPointInPolygon(point, polygon);
+// $ExpectType boolean
+util.isPointInPolygon(pointTuple, polygonTuple);
+
+// $ExpectType [number, number][]
+util.makesureClockwise(lineTuple);
+
+// $ExpectType [number, number][]
+util.makesureAntiClockwise(lineTuple);
+
+// $ExpectType [number, number]
+util.closestOnSegment(point, point, point);
+// $ExpectType [number, number]
+util.closestOnSegment(pointTuple, pointTuple, pointTuple);
+
+// $ExpectType [number, number]
+util.closestOnSegment(point, point, point);
+// $ExpectType [number, number]
+util.closestOnSegment(pointTuple, pointTuple, pointTuple);
+
+// $ExpectType [number, number]
+util.closestOnLine(point, line);
+// $ExpectType [number, number]
+util.closestOnLine(pointTuple, lineTuple);
+
+// $ExpectType number
+util.distanceToSegment(point, point, point);
+// $ExpectType number
+util.distanceToSegment(pointTuple, pointTuple, pointTuple);
+
+// $ExpectType number
+util.distanceToLine(point, line);
+// $ExpectType number
+util.distanceToLine(pointTuple, lineTuple);
+
+// $ExpectType boolean
+util.isPointOnSegment(point, point, point);
+// $ExpectType boolean
+util.isPointOnSegment(point, point, point, 1);
+// $ExpectType boolean
+util.isPointOnSegment(pointTuple, pointTuple, pointTuple);
+// $ExpectType boolean
+util.isPointOnSegment(pointTuple, pointTuple, pointTuple, 1);
+
+// $ExpectType boolean
+util.isPointOnLine(point, line);
+// $ExpectType boolean
+util.isPointOnLine(point, line, 1);
+// $ExpectType boolean
+util.isPointOnLine(pointTuple, lineTuple);
+// $ExpectType boolean
+util.isPointOnLine(pointTuple, lineTuple, 1);
+
+// $ExpectType boolean
+util.isPointOnRing(point, ring);
+// $ExpectType boolean
+util.isPointOnRing(point, ring, 1);
+// $ExpectType boolean
+util.isPointOnRing(pointTuple, ringTuple);
+// $ExpectType boolean
+util.isPointOnRing(pointTuple, ringTuple, 1);
+
+// $ExpectType boolean
+util.isPointOnPolygon(point, polygon);
+// $ExpectType boolean
+util.isPointOnPolygon(point, polygon, 1);
+// $ExpectType boolean
+util.isPointOnPolygon(pointTuple, polygonTuple);
+// $ExpectType boolean
+util.isPointOnPolygon(pointTuple, polygonTuple, 1);
diff --git a/types/amap-js-api/test/layer/buildings.ts b/types/amap-js-api/test/layer/buildings.ts
new file mode 100644
index 0000000000..209b3c490b
--- /dev/null
+++ b/types/amap-js-api/test/layer/buildings.ts
@@ -0,0 +1,40 @@
+declare var map: AMap.Map;
+declare var lnglat: AMap.LngLat;
+
+// $ExpectType Buildings
+var buildings = new AMap.Buildings();
+// $ExpectType Buildings
+new AMap.Buildings();
+// $ExpectType Buildings
+new AMap.Buildings({
+    zooms: [1, 18],
+    opacity: 0.8,
+    heightFactor: 1,
+    visible: true,
+    zIndex: 10,
+    map
+});
+
+buildings.setStyle({
+    hideWithoutStyle: false,
+    areas: [
+        {
+            visible: true,
+            rejectTexture: true,
+            color1: 'ffffff00',
+            color2: 'ffffcc00',
+            path: [[1, 2]]
+        },
+        {
+            visible: true,
+            rejectTexture: true,
+            color1: 'ffffff00',
+            color2: 'ffffcc00',
+            path: [lnglat]
+        },
+        {
+            color1: 'ff99ff00',
+            path: [lnglat]
+        },
+    ]
+});
diff --git a/types/amap-js-api/test/layer/canvasLayer.ts b/types/amap-js-api/test/layer/canvasLayer.ts
new file mode 100644
index 0000000000..577d032b2c
--- /dev/null
+++ b/types/amap-js-api/test/layer/canvasLayer.ts
@@ -0,0 +1,53 @@
+import {
+    map,
+    bounds
+} from '../preset';
+
+declare const canvas: HTMLCanvasElement;
+
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer();
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer({});
+// $ExpectType CanvasLayer
+const canvasLayer = new AMap.CanvasLayer({
+    bounds
+});
+
+// $ExpectType void
+canvasLayer.setMap(null);
+// $ExpectType void
+canvasLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+canvasLayer.getMap();
+
+// $ExpectType void
+canvasLayer.show();
+
+// $ExpectType void
+canvasLayer.hide();
+
+// $ExpectType number
+canvasLayer.getzIndex();
+
+// $ExpectType void
+canvasLayer.setzIndex(10);
+
+// $ExpectType HTMLCanvasElement | null
+canvasLayer.getElement();
+
+// $ExpectType void
+canvasLayer.setCanvas(canvas);
+
+// $ExpectType HTMLCanvasElement | undefined
+canvasLayer.getCanvas();
diff --git a/types/amap-js-api/test/layer/flexible.ts b/types/amap-js-api/test/layer/flexible.ts
new file mode 100644
index 0000000000..5a0e3f7aa7
--- /dev/null
+++ b/types/amap-js-api/test/layer/flexible.ts
@@ -0,0 +1,54 @@
+import {
+    map
+} from '../preset';
+
+const img = document.createElement('img');
+const canvas = document.createElement('canvas');
+
+// $ExpectType Flexible
+new AMap.TileLayer.Flexible();
+// $ExpectType Flexible
+new AMap.TileLayer.Flexible({});
+// $ExpectType Flexible
+const flexible = new AMap.TileLayer.Flexible({
+    createTile(x, y, z, success, fail) {
+        // $ExpectType number
+        x;
+        // $ExpectType number
+        y;
+        // $ExpectType number
+        z;
+        // $ExpectType void
+        success(img);
+        // $ExpectType void
+        success(canvas);
+        // $ExpectType void
+        fail();
+    },
+    cacheSize: 10,
+    opacity: 1,
+    visible: true,
+    map,
+    zIndex: 1,
+    zooms: [1, 2]
+});
+
+// $ExpectType void
+flexible.setMap(null);
+// $ExpectType void
+flexible.setMap(map);
+
+// $ExpectType Map | null | undefined
+flexible.getMap();
+
+// $ExpectType void
+flexible.show();
+
+// $ExpectType void
+flexible.hide();
+
+// $ExpectType void
+flexible.setzIndex(10);
+
+// $ExpectType number
+flexible.getzIndex();
diff --git a/types/amap-js-api/test/layer/imageLayer.ts b/types/amap-js-api/test/layer/imageLayer.ts
new file mode 100644
index 0000000000..06b9fc076e
--- /dev/null
+++ b/types/amap-js-api/test/layer/imageLayer.ts
@@ -0,0 +1,51 @@
+import {
+    map,
+    bounds
+} from '../preset';
+
+// $ExpectType ImageLayer
+new AMap.ImageLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType ImageLayer
+new AMap.ImageLayer();
+// $ExpectType ImageLayer
+new AMap.ImageLayer({});
+// $ExpectType ImageLayer
+const imageLayer = new AMap.ImageLayer({
+    bounds
+});
+
+// $ExpectType void
+imageLayer.setMap(null);
+// $ExpectType void
+imageLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+imageLayer.getMap();
+
+// $ExpectType void
+imageLayer.show();
+
+// $ExpectType void
+imageLayer.hide();
+
+// $ExpectType number
+imageLayer.getzIndex();
+
+// $ExpectType void
+imageLayer.setzIndex(10);
+
+// $ExpectType HTMLImageElement | null
+imageLayer.getElement();
+
+// $ExpectType void
+imageLayer.setImageUrl('url');
+
+// $ExpectType string | undefined
+imageLayer.getImageUrl();
diff --git a/types/amap-js-api/test/layer/layer.ts b/types/amap-js-api/test/layer/layer.ts
new file mode 100644
index 0000000000..921c90e52d
--- /dev/null
+++ b/types/amap-js-api/test/layer/layer.ts
@@ -0,0 +1,34 @@
+declare var layer: AMap.Layer;
+declare var map: AMap.Map;
+
+// $ExpectError
+new AMap.Layer();
+
+// $ExpectType HTMLDivElement | undefined
+layer.getContainer();
+
+// $ExpectType [number, number]
+layer.getZooms();
+
+// $ExpectType void
+layer.setOpacity(1);
+
+// $ExpectType number
+layer.getOpacity();
+
+// $ExpectType void
+layer.show();
+
+// $ExpectType void
+layer.hide();
+
+// $ExpectType void
+layer.setMap();
+// $ExpectType void
+layer.setMap(map);
+
+// $ExpectType void
+layer.setzIndex(1);
+
+// $ExpectType number
+layer.getzIndex();
diff --git a/types/amap-js-api/test/layer/layerGroup.ts b/types/amap-js-api/test/layer/layerGroup.ts
new file mode 100644
index 0000000000..bcad7d6f50
--- /dev/null
+++ b/types/amap-js-api/test/layer/layerGroup.ts
@@ -0,0 +1,115 @@
+declare var map: AMap.Map;
+declare var tileLayer: AMap.TileLayer;
+declare var massMarksLayer: AMap.MassMarks;
+declare var layer: AMap.Layer;
+
+// $ExpectError
+new AMap.LayerGroup();
+
+// $ExpectType LayerGroup<TileLayer>
+new AMap.LayerGroup(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+new AMap.LayerGroup([tileLayer]);
+
+declare var layerGruop: AMap.LayerGroup<AMap.TileLayer>;
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.addLayer(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.addLayer([tileLayer]);
+// $ExpectError
+layerGruop.addLayer(massMarksLayer);
+
+// $ExpectType TileLayer[]
+layerGruop.getLayers();
+
+// $ExpectType TileLayer | null
+layerGruop.getLayer(function (item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType null
+    this;
+
+    return true;
+});
+
+layerGruop.hasLayer(function (item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType null
+    this;
+
+    return true;
+});
+layerGruop.hasLayer(tileLayer);
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.removeLayer(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.removeLayer([tileLayer]);
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.clearLayers();
+
+layerGruop.eachLayer(function (item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType TileLayer
+    this;
+});
+layerGruop.eachLayer(function (item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.setMap(map);
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.hide();
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.show();
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.reload();
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.setOptions({});
+
+// $ExpectType LayerGroup<TileLayer>
+layerGruop.setOptions({
+    tileSize: 256
+});
+// layerGruop.setOptions({
+//     // $ExpectError
+//     interval: 1
+// });
+
+declare var layerGroup2: AMap.LayerGroup;
+
+layerGroup2.addLayer(tileLayer);
+
+layerGroup2.addLayer(massMarksLayer);
+
+layerGroup2.setOptions({
+    test: 1
+});
diff --git a/types/amap-js-api/test/layer/massMarks.ts b/types/amap-js-api/test/layer/massMarks.ts
new file mode 100644
index 0000000000..5f4bfbf455
--- /dev/null
+++ b/types/amap-js-api/test/layer/massMarks.ts
@@ -0,0 +1,83 @@
+declare var pixel: AMap.Pixel;
+declare var size: AMap.Size;
+declare var lnglat: AMap.LngLat;
+var massMarksStyle1 = {
+    anchor: pixel,
+    url: '',
+    size,
+    rotation: 1
+};
+var massMarksStyle2 = {
+    anchor: pixel,
+    url: '',
+    size
+};
+var massMarksData1 = {
+    lnglat
+};
+
+interface CustomData extends AMap.MassMarks.Data {
+    name: string;
+    id: string;
+}
+var massMarksCustomData: CustomData = {
+    lnglat: [1, 2],
+    style: 1,
+    name: '',
+    id: ''
+};
+
+// $ExpectError
+new AMap.MassMarks();
+// $ExpectError
+new AMap.MassMarks([], {});
+
+new AMap.MassMarks([], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+new AMap.MassMarks([massMarksData1], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+
+// $ExpectType MassMarks<CustomData>
+var massMarks = new AMap.MassMarks<CustomData>([massMarksCustomData], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+
+// $ExpectType void
+massMarks.setStyle(massMarksStyle1);
+// $ExpectType void
+massMarks.setStyle([massMarksStyle1]);
+
+// $ExpectType Style | Style[]
+massMarks.getStyle();
+
+// $ExpectType void
+massMarks.setData('');
+
+// $ExpectError
+massMarks.setData(massMarksData1);
+// $ExpectError
+massMarks.setData(massMarksCustomData);
+
+var _customData = massMarks.getData()[0];
+// $ExpectType string
+_customData.name;
+// $ExpectType string
+_customData.id;
+// $ExpectType LngLat
+_customData.lnglat;
+
+// $ExpectType void
+massMarks.clear();
+
+massMarks.on('click', (event: AMap.MassMarks.EventMap<typeof massMarks>['click']) => {
+    // $ExpectType "click"
+    event.type;
+
+    // $ExpectType CustomData
+    event.data;
+
+    // $ExpectType MassMarks<CustomData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/layer/tileLayer.ts b/types/amap-js-api/test/layer/tileLayer.ts
new file mode 100644
index 0000000000..7e4e2dc2e4
--- /dev/null
+++ b/types/amap-js-api/test/layer/tileLayer.ts
@@ -0,0 +1,60 @@
+declare var map: AMap.Map;
+
+// $ExpectType TileLayer
+var tileLayer = new AMap.TileLayer();
+
+// $ExpectType TileLayer
+new AMap.TileLayer({});
+
+// $ExpectType TileLayer
+new AMap.TileLayer({
+    map,
+    tileSize: 256,
+    tileUrl: '',
+    errorUrl: '',
+    getTileUrl: (x, y, z) => '',
+    zIndex: 1,
+    opacity: 0.1,
+    zooms: [3, 18],
+    detectRetina: true
+});
+
+// $ExpectType string[]
+tileLayer.getTiles();
+
+// $ExpectType void
+tileLayer.reload();
+
+// $ExpectType void
+tileLayer.setTileUrl('');
+// $ExpectType void
+tileLayer.setTileUrl((x, y, level) => {
+    // $ExpectType number
+    x;
+    // $ExpectType number
+    y;
+    // $ExpectType number
+    level;
+    return '';
+});
+
+// Traffic
+
+// $ExpectType Traffic
+let trafficLayer = new AMap.TileLayer.Traffic();
+// $ExpectType Traffic
+new AMap.TileLayer.Traffic({});
+// $ExpectType Traffic
+new AMap.TileLayer.Traffic({
+    autoRefresh: true,
+    interval: 180
+});
+
+// $ExpectType TileLayer
+tileLayer.on('complete', () => { });
+
+tileLayer.off('complete', () => { });
+
+tileLayer.emit('complete');
+
+trafficLayer.on('complete', () => { });
diff --git a/types/amap-js-api/test/layer/videoLayer.ts b/types/amap-js-api/test/layer/videoLayer.ts
new file mode 100644
index 0000000000..e34718193c
--- /dev/null
+++ b/types/amap-js-api/test/layer/videoLayer.ts
@@ -0,0 +1,51 @@
+import {
+    map,
+    bounds
+} from '../preset';
+
+// $ExpectType VideoLayer
+new AMap.VideoLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType VideoLayer
+new AMap.VideoLayer();
+// $ExpectType VideoLayer
+new AMap.VideoLayer({});
+// $ExpectType VideoLayer
+const videoLayer = new AMap.VideoLayer({
+    bounds
+});
+
+// $ExpectType void
+videoLayer.setMap(null);
+// $ExpectType void
+videoLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+videoLayer.getMap();
+
+// $ExpectType void
+videoLayer.show();
+
+// $ExpectType void
+videoLayer.hide();
+
+// $ExpectType number
+videoLayer.getzIndex();
+
+// $ExpectType void
+videoLayer.setzIndex(10);
+
+// $ExpectType HTMLVideoElement | null
+videoLayer.getElement();
+
+// $ExpectType void
+videoLayer.setVideoUrl('url');
+
+// $ExpectType string | string[] | undefined
+videoLayer.getVideoUrl();
diff --git a/types/amap-js-api/test/layer/wms.ts b/types/amap-js-api/test/layer/wms.ts
new file mode 100644
index 0000000000..255affa216
--- /dev/null
+++ b/types/amap-js-api/test/layer/wms.ts
@@ -0,0 +1,89 @@
+import {
+    map
+} from '../preset';
+
+// $ExpectType WMS
+new AMap.TileLayer.WMS({
+    url: 'url',
+    params: {}
+});
+// $ExpectType WMS
+const wms = new AMap.TileLayer.WMS({
+    url: 'url',
+    blend: true,
+    params: {
+        VERSION: 'version',
+        LAYERS: 'layers',
+        STYLES: 'styles',
+        FORMAT: 'format',
+        TRANSPARENT: 'TRUE',
+        BGCOLOR: '#000',
+        EXCEPTIONS: 'exceptions',
+        TIME: 'time',
+        ELEVATION: 'elevation'
+    },
+    zooms: [1, 2],
+    tileSize: 256,
+    opacity: 1,
+    zIndex: 10,
+    visible: true
+});
+
+// $ExpectType void
+wms.setMap(map);
+// $ExpectType void
+wms.setMap(null);
+
+// $ExpectType Map | null | undefined
+wms.getMap();
+
+// $ExpectType void
+wms.show();
+
+// $ExpectType void
+wms.hide();
+
+// $ExpectType void
+wms.setzIndex(10);
+
+// $ExpectType number
+wms.getzIndex();
+
+// $ExpectType void
+wms.setUrl('url');
+
+// $ExpectType string
+wms.getUrl();
+
+// $ExpectType void
+wms.setParams({
+    VERSION: 'version',
+    LAYERS: 'layers',
+    STYLES: 'styles',
+    FORMAT: 'format',
+    TRANSPARENT: 'TRUE',
+    BGCOLOR: '#000',
+    EXCEPTIONS: 'exceptions',
+    TIME: 'time',
+    ELEVATION: 'elevation'
+});
+
+const params = wms.getParams();
+// $ExpectType string | undefined
+params.VERSION;
+// $ExpectType string | undefined
+params.LAYERS;
+// $ExpectType string | undefined
+params.STYLES;
+// $ExpectType string | undefined
+params.FORMAT;
+// $ExpectType "TRUE" | "FALSE" | undefined
+params.TRANSPARENT;
+// $ExpectType string | undefined
+params.BGCOLOR;
+// $ExpectType string | undefined
+params.EXCEPTIONS;
+// $ExpectType string | undefined
+params.TIME;
+// $ExpectType string | undefined
+params.ELEVATION;
diff --git a/types/amap-js-api/test/layer/wmts.ts b/types/amap-js-api/test/layer/wmts.ts
new file mode 100644
index 0000000000..bc167c1189
--- /dev/null
+++ b/types/amap-js-api/test/layer/wmts.ts
@@ -0,0 +1,69 @@
+import {
+    map
+} from '../preset';
+
+// $ExpectType WMTS
+new AMap.TileLayer.WMTS({
+    url: 'url',
+    params: {}
+});
+// $ExpectType WMTS
+const wmts = new AMap.TileLayer.WMTS({
+    url: 'url',
+    blend: true,
+    tileSize: 256,
+    zooms: [1, 2],
+    opacity: 1,
+    zIndex: 10,
+    visible: true,
+    params: {
+        Version: 'version',
+        Layer: 'layers',
+        Style: 'style',
+        Format: 'format'
+    }
+});
+
+// $ExpectType void
+wmts.setMap(map);
+// $ExpectType void
+wmts.setMap(null);
+
+// $ExpectType Map | null | undefined
+wmts.getMap();
+
+// $ExpectType void
+wmts.show();
+
+// $ExpectType void
+wmts.hide();
+
+// $ExpectType void
+wmts.setzIndex(10);
+
+// $ExpectType number
+wmts.getzIndex();
+
+// $ExpectType void
+wmts.setUrl('url');
+
+// $ExpectType string
+wmts.getUrl();
+
+// $ExpectType void
+wmts.setParams({
+    Version: 'version',
+    Layer: 'layers',
+    Style: 'style',
+    Format: 'format'
+});
+
+const params = wmts.getParams();
+// $ExpectType string | undefined
+params.Version;
+// $ExpectType string | undefined
+params.Layer;
+// $ExpectType string | undefined
+params.Style;
+// $ExpectType string | undefined
+params.Format;
diff --git a/types/amap-js-api/test/lnglat.ts b/types/amap-js-api/test/lnglat.ts
new file mode 100644
index 0000000000..92057953ee
--- /dev/null
+++ b/types/amap-js-api/test/lnglat.ts
@@ -0,0 +1,48 @@
+import {
+    lnglat
+} from './preset';
+
+// $ExpectType LngLat
+new AMap.LngLat(114, 22);
+// $ExpectType LngLat
+new AMap.LngLat(113, 21);
+
+// $ExpectType LngLat
+lnglat.offset(1, 2);
+
+// $ExpectType number
+lnglat.distance(lnglat);
+// $ExpectType number
+lnglat.distance([lnglat]);
+
+// $ExpectType number
+lnglat.getLng();
+
+// $ExpectType number
+lnglat.getLat();
+
+// $ExpectType boolean
+lnglat.equals(lnglat);
+
+// $ExpectType string
+lnglat.toString();
+
+// $ExpectType LngLat
+lnglat.add(lnglat);
+// $ExpectType LngLat
+lnglat.add(lnglat, true);
+
+// $ExpectType LngLat
+lnglat.subtract(lnglat);
+// $ExpectType LngLat
+lnglat.subtract(lnglat, true);
+
+// $ExpectType LngLat
+lnglat.divideBy(1);
+// $ExpectType LngLat
+lnglat.divideBy(1, true);
+
+// $ExpectType LngLat
+lnglat.multiplyBy(1);
+// $ExpectType LngLat
+lnglat.multiplyBy(1, true);
diff --git a/types/amap-js-api/test/map.ts b/types/amap-js-api/test/map.ts
new file mode 100644
index 0000000000..6f2b027e60
--- /dev/null
+++ b/types/amap-js-api/test/map.ts
@@ -0,0 +1,338 @@
+import {
+    lnglat,
+    bounds,
+    lnglatTuple,
+    pixel
+} from './preset';
+
+declare const container: HTMLDivElement;
+declare const tileLayer: AMap.TileLayer;
+
+// declare var indoorMap: AMap.IndoorMap
+
+// $ExpectType Map
+new AMap.Map('map');
+// $ExpectType Map
+new AMap.Map(container);
+
+// $ExpectType Map
+new AMap.Map(container, {});
+
+// $ExpectType Map
+const map = new AMap.Map(container, {
+    layers: [tileLayer],
+    zoom: 15,
+    center: [1, 2],
+    labelzIndex: 110,
+    zooms: [5, 15],
+    lang: 'zh_cn',
+    defaultCursor: 'default',
+    crs: 'EPSG4326',
+    animateEnable: true,
+    isHotspot: false,
+    defaultLayer: tileLayer,
+    rotateEnable: true,
+    resizeEnable: true,
+    showIndoorMap: true,
+    // indoorMap, // TODO
+    expandZoomRange: true,
+    dragEnable: true,
+    zoomEnable: true,
+    doubleClickZoom: true,
+    keyboardEnable: true,
+    jogEnable: true,
+    scrollWheel: true,
+    touchZoom: true,
+    mapStyle: '',
+    features: ['road'],
+    showBuildingBlock: true,
+    skyColor: '#fff',
+    preloadMode: true,
+    mask: [[1, 2], [2, 3], [3, 4]]
+});
+
+// $ExpectType number
+map.getZoom();
+
+// $ExpectType Layer[]
+map.getLayers();
+
+// $ExpectType LngLat
+map.getCenter();
+
+// $ExpectType HTMLElement | null
+map.getContainer();
+
+map.getCity(city => {
+    // $ExpectType string
+    city.city;
+    // $ExpectType string
+    city.citycode;
+    // $ExpectType string
+    city.district;
+    // $ExpectType string | never[]
+    city.province;
+});
+
+// $ExpectType Bounds
+map.getBounds();
+
+// $ExpectType number
+map.getLabelzIndex();
+
+// $ExpectType Lang
+map.getLang();
+
+// $ExpectType Size
+map.getSize();
+
+// $ExpectType number
+map.getRotation();
+
+// $ExpectType Status
+const mapStatus = map.getStatus();
+// $ExpectType boolean
+mapStatus.animateEnable;
+// $ExpectType boolean
+mapStatus.doubleClickZoom;
+// $ExpectType boolean
+mapStatus.dragEnable;
+// $ExpectType boolean
+mapStatus.isHotspot;
+// $ExpectType boolean
+mapStatus.jogEnable;
+// $ExpectType boolean
+mapStatus.keyboardEnable;
+// $ExpectType boolean
+mapStatus.pitchEnable;
+// $ExpectType boolean
+mapStatus.resizeEnable;
+// $ExpectType boolean
+mapStatus.rotateEnable;
+// $ExpectType boolean
+mapStatus.scrollWheel;
+// $ExpectType boolean
+mapStatus.touchZoom;
+// $ExpectType boolean
+mapStatus.zoomEnable;
+
+// $ExpectType string
+map.getDefaultCursor();
+
+// $ExpectType number
+map.getResolution();
+
+// $ExpectType number
+map.getScale();
+// $ExpectType number
+map.getScale(1);
+
+// $ExpectType void
+map.setZoom(1);
+
+// $ExpectType void
+map.setLabelzIndex(1);
+
+// $ExpectType void
+map.setLayers([tileLayer]);
+
+// $ExpectType void
+map.setCenter(lnglat);
+// $ExpectType void
+map.setCenter([1, 2]);
+
+// $ExpectType void
+map.setZoomAndCenter(13, lnglat);
+// $ExpectType void
+map.setZoomAndCenter(13, [1, 2]);
+
+// $ExpectType void
+map.setCity('city', (coord, zoom) => {
+    // $ExpectType string
+    coord[0];
+    // $ExpectType string
+    coord[1];
+    // $ExpectType number
+    zoom;
+});
+
+// $ExpectType Bounds
+map.setBounds(bounds);
+
+// $ExpectType void
+map.setLimitBounds(bounds);
+
+// $ExpectType void
+map.clearLimitBounds();
+
+// $ExpectType void
+map.setLang('zh_cn');
+
+// $ExpectType void
+map.setRotation(1);
+
+// $ExpectType void
+map.setStatus({});
+// $ExpectType void
+map.setStatus({
+    animateEnable: true,
+    doubleClickZoom: true,
+    dragEnable: true,
+    isHotspot: true,
+    jogEnable: true,
+    keyboardEnable: true,
+    pitchEnable: false,
+    resizeEnable: false,
+    rotateEnable: false,
+    scrollWheel: true,
+    touchZoom: true,
+    zoomEnable: true
+});
+
+// $ExpectType void
+map.setDefaultCursor('default');
+
+// $ExpectType void
+map.zoomIn();
+
+// $ExpectType void
+map.zoomOut();
+
+// $ExpectType void
+map.panTo([1, 2]);
+// $ExpectType void
+map.panTo(lnglat);
+
+// $ExpectType void
+map.panBy(1, 2);
+
+// $ExpectType void
+map.clearMap();
+
+// $ExpectType Map
+map.plugin('plugin name', () => { });
+// $ExpectType Map
+map.plugin(['plugin name'], () => { });
+
+// $ExpectType void
+map.clearInfoWindow();
+
+// $ExpectType LngLat
+map.pixelToLngLat(pixel);
+// $ExpectType LngLat
+map.pixelToLngLat(pixel, 1);
+
+// $ExpectType Pixel
+map.lnglatToPixel(lnglat);
+// $ExpectType Pixel
+map.lnglatToPixel(lnglat, 1);
+
+// $ExpectType LngLat
+map.containerToLngLat(pixel);
+
+// $ExpectType Pixel
+map.lngLatToContainer(lnglat);
+// $ExpectType Pixel
+map.lnglatTocontainer(lnglat);
+
+// $ExpectType void
+map.setMapStyle('');
+// $ExpectType string
+map.getMapStyle();
+
+// $ExpectType void
+map.setFeatures('all');
+// $ExpectType void
+map.setFeatures(['bg']);
+
+const feature: 'all' | 'bg' | 'point' | 'road' | 'building' | AMap.Map.Feature[] = map.getFeatures();
+
+// $ExpectType void
+map.setDefaultLayer(tileLayer);
+
+// $ExpectType void
+map.setPitch(1);
+// $ExpectType number
+map.getPitch();
+
+// $ExpectType ViewMode
+map.getViewMode_();
+
+// $ExpectType Pixel
+map.lngLatToGeodeticCoord(lnglat);
+// $ExpectType Pixel
+map.lngLatToGeodeticCoord(lnglatTuple);
+
+// $ExpectType LngLat
+map.geodeticCoordToLngLat(pixel);
+
+// $ExpectType void
+map.destroy();
+
+declare function dblClickHandler(this: AMap.Map, event: AMap.Map.EventMap['dblclick']): void;
+
+// $ExpectType Map
+map.on('click', (event: AMap.Map.EventMap['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Pixel
+    event.pixel;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType Map
+    event.target;
+});
+// $ExpectType Map
+map.on('dblclick', dblClickHandler);
+// $ExpectType Map
+map.on('complete', (event: AMap.Map.EventMap['complete']) => {
+    // $ExpectType "complete"
+    event.type;
+    // $ExpectError
+    event.value;
+});
+// $ExpectType Map
+map.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType string
+    event.name;
+    // $ExpectType "hotspotclick"
+    event.type;
+});
+// $ExpectType Map
+map.on('custom', (event: AMap.Event<'custom', { test: string }>) => {
+    // $ExpectType "custom"
+    event.type;
+    // $ExpectType string
+    event.test;
+});
+
+// $ExpectType Map
+map.off('dblclick', dblClickHandler);
+// $ExpectType Map
+map.off('click', 'mv');
+
+// $ExpectType Map
+map.emit('click', {
+    target: map,
+    lnglat,
+    pixel
+});
+
+map.emit('complete');
+// $ExpectType Map
+map.emit('hotspotclick', {
+    lnglat,
+    name: '123',
+    id: '123',
+    isIndoorPOI: true
+});
+// $ExpectType Map
+map.emit('custom', {
+    test: 1
+});
+// $ExpectType Map
+map.emit('custom', undefined);
diff --git a/types/amap-js-api/test/overlay/bezierCurve.ts b/types/amap-js-api/test/overlay/bezierCurve.ts
new file mode 100644
index 0000000000..abf0640fc9
--- /dev/null
+++ b/types/amap-js-api/test/overlay/bezierCurve.ts
@@ -0,0 +1,155 @@
+import {
+    map,
+    lnglat
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+const path = [
+    [1, 2, 3, 4],
+    [1, 2, 3],
+    [
+        [1, 2, 3],
+        [1, 2]
+    ],
+    [1, 2]
+];
+
+// $ExpectError
+new AMap.BezierCurve();
+// $ExpectError
+new AMap.BezierCurve({});
+// $ExpectType BezierCurve<ExtraData>
+const bezierCurve = new AMap.BezierCurve<ExtraData>({
+    map,
+    path,
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.6,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [1, 5],
+    zIndex: 10,
+    bubble: false,
+    showDir: true,
+    cursor: 'pointer',
+    isOutline: true,
+    outlineColor: '#00FF00',
+    borderWeight: 2
+});
+
+// $ExpectType void
+bezierCurve.setPath(path);
+
+// $ExpectType void
+bezierCurve.setPath(path);
+
+// $ExpectType void
+bezierCurve.setOptions({});
+bezierCurve.setOptions({
+    map,
+    path,
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.6,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [1, 5],
+    zIndex: 10,
+    bubble: false,
+    showDir: true,
+    cursor: 'pointer',
+    isOutline: true,
+    outlineColor: '#00FF00',
+    borderWeight: 2
+});
+
+const options = bezierCurve.getOptions();
+
+// $ExpectType number | undefined
+options.borderWeight;
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType string | undefined
+options.dirColor;
+// $ExpectType string | undefined
+options.dirImg;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType boolean | undefined
+options.geodesic;
+// $ExpectType boolean | undefined
+options.isOutline;
+// $ExpectType "round" | "butt" | "square" | undefined
+options.lineCap;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType string | undefined
+options.outlineColor;
+// $ExpectType (LngLat & { controlPoints: LngLat[]; })[] | undefined
+options.path;
+// $ExpectType boolean | undefined
+options.showDir;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType number
+bezierCurve.getLength();
+
+// $ExpectType Bounds | null
+bezierCurve.getBounds();
+
+// $ExpectType void
+bezierCurve.show();
+
+// $ExpectType void
+bezierCurve.hide();
+
+// $ExpectType void
+bezierCurve.setMap(null);
+bezierCurve.setMap(map);
+
+// $ExpectType void
+bezierCurve.setExtData({ test: 1 });
+// $ExpectError
+bezierCurve.setExtData({ test: '123' });
+
+// $ExpectType {} | ExtraData
+bezierCurve.getExtData();
+
+bezierCurve.on('click', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType BezierCurve<ExtraData>
+    event.target;
+});
+
+bezierCurve.on('show', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['show']) => {
+    // $ExpectType "show"
+    event.type;
+    // $ExpectType BezierCurve<ExtraData>
+    event.target;
+});
+
+bezierCurve.on('options', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['options']) => {
+    // $ExpectType "options"
+    event.type;
+    // $ExpectError
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/circle.ts b/types/amap-js-api/test/overlay/circle.ts
new file mode 100644
index 0000000000..28822b9ec9
--- /dev/null
+++ b/types/amap-js-api/test/overlay/circle.ts
@@ -0,0 +1,150 @@
+import {
+    map,
+    lnglat,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType Circle<any>
+new AMap.Circle();
+new AMap.Circle({});
+// $ExpectType Circle<ExtraData>
+const circle = new AMap.Circle<ExtraData>({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    bubble: true,
+    cursor: 'pointer',
+    radius: 1000,
+    strokeColor: '#FF0000',
+    strokeOpcity: 0.8,
+    strokeWeight: 3,
+    fillColor: '#00FF00',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [2, 4]
+});
+
+// $ExpectType void
+circle.setCenter(lnglat);
+// $ExpectType void
+circle.setCenter(lnglatTuple);
+
+// $ExpectType LngLat | undefined
+circle.getCenter();
+
+// $ExpectType Bounds | null
+circle.getBounds();
+
+// $ExpectType void
+circle.setRadius(100);
+
+// $ExpectType number
+circle.getRadius();
+
+// $ExpectType void
+circle.setOptions({});
+circle.setOptions({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    bubble: true,
+    cursor: 'pointer',
+    radius: 1000,
+    strokeColor: '#FF0000',
+    strokeOpcity: 0.8,
+    strokeWeight: 3,
+    fillColor: '#00FF00',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [2, 4]
+});
+
+const options = circle.getOptions();
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType LngLat | undefined
+options.center;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType string | undefined
+options.fillColor;
+// $ExpectType number | undefined
+options.fillOpacity;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType LngLat[] | undefined
+options.path;
+// $ExpectType number | undefined
+options.radius;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType string | undefined
+options.texture;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType Bounds | null
+circle.getBounds();
+
+// $ExpectType void
+circle.hide();
+
+// $ExpectType void
+circle.show();
+
+// $ExpectType void
+circle.setMap(null);
+// $ExpectType void
+circle.setMap(map);
+
+// $ExpectType void
+circle.setExtData({ test: 2 });
+// $ExpectError
+circle.setExtData({ test: '1' });
+
+// $ExpectType {} | ExtraData
+circle.getExtData();
+
+// $ExpectType boolean
+circle.contains(lnglat);
+// $ExpectType boolean
+circle.contains(lnglatTuple);
+
+circle.on('click', (event: AMap.Circle.EventMap<typeof circle>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Circle<ExtraData>
+    event.target;
+});
+
+circle.on('setCenter', (event: AMap.Circle.EventMap<typeof circle>['setCenter']) => {
+    // $ExpectType "setCenter"
+    event.type;
+    // $ExpectError
+    event.target;
+});
+
+circle.on('change', (event: AMap.Circle.EventMap<typeof circle>['change']) => {
+    // $ExpectType "change"
+    event.type;
+    // $ExpectType Circle<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/contextMenu.ts b/types/amap-js-api/test/overlay/contextMenu.ts
new file mode 100644
index 0000000000..5c7173d26b
--- /dev/null
+++ b/types/amap-js-api/test/overlay/contextMenu.ts
@@ -0,0 +1,48 @@
+import {
+    map,
+    lnglat,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+// $ExpectType ContextMenu<any>
+new AMap.ContextMenu();
+// $ExpectType ContextMenu<any>
+new AMap.ContextMenu({});
+// $ExpectType ContextMenu<ExtraData>
+const contextMenu = new AMap.ContextMenu<ExtraData>({
+    content: '<div>content</div>',
+});
+
+// $ExpectType void
+contextMenu.addItem('item', function () {
+    // $ExpectType HTMLLIElement
+    this;
+});
+// $ExpectType void
+contextMenu.addItem('item', () => { }, 1);
+
+// $ExpectType void
+contextMenu.removeItem('item', () => {});
+
+// $ExpectType void
+contextMenu.open(map, lnglatTuple);
+// $ExpectType void
+contextMenu.open(map, lnglat);
+
+// $ExpectType void
+contextMenu.close();
+
+contextMenu.on('items', (event: AMap.ContextMenu.EventMap<typeof contextMenu>['items']) => {
+    // $ExpectType "items"
+    event.type;
+});
+
+contextMenu.on('open', (event: AMap.ContextMenu.EventMap<typeof contextMenu>['open']) => {
+    // $ExpectType "open"
+    event.type;
+    // $ExpectType ContextMenu<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/ellipse.ts b/types/amap-js-api/test/overlay/ellipse.ts
new file mode 100644
index 0000000000..c5205d9915
--- /dev/null
+++ b/types/amap-js-api/test/overlay/ellipse.ts
@@ -0,0 +1,117 @@
+import {
+    map,
+    lnglat,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+// $ExpectType Ellipse<any>
+new AMap.Ellipse();
+// $ExpectType Ellipse<any>
+new AMap.Ellipse({});
+// $ExpectType Ellipse<ExtraData>
+const ellipse = new AMap.Ellipse<ExtraData>({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    radius: [10000, 15000],
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+// $ExpectType LngLat | undefined
+ellipse.getCenter();
+
+// $ExpectType void
+ellipse.setCenter(lnglat);
+// $ExpectType void
+ellipse.setCenter(lnglatTuple);
+
+// $ExpectType Bounds | null
+ellipse.getBounds();
+
+// $ExpectType void
+ellipse.setOptions({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    radius: [10000, 15000],
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+const options = ellipse.getOptions();
+
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType LngLat | undefined
+options.center;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType string | undefined
+options.fillColor;
+// $ExpectType number | undefined
+options.fillOpacity;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType LngLat[] | undefined
+options.path;
+// $ExpectType [number, number] | undefined
+options.radius;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType string | undefined
+options.texture;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType void
+ellipse.hide();
+
+// $ExpectType void
+ellipse.show();
+
+// $ExpectType void
+ellipse.setMap(null);
+// $ExpectType void
+ellipse.setMap(map);
+
+// $ExpectType void
+ellipse.setExtData({test: 2});
+// $ExpectType {} | ExtraData
+ellipse.getExtData();
+
+// $ExpectType boolean
+ellipse.contains(lnglat);
+// $ExpectType boolean
+ellipse.contains(lnglatTuple);
diff --git a/types/amap-js-api/test/overlay/geoJSON.ts b/types/amap-js-api/test/overlay/geoJSON.ts
new file mode 100644
index 0000000000..ee8c501472
--- /dev/null
+++ b/types/amap-js-api/test/overlay/geoJSON.ts
@@ -0,0 +1,106 @@
+import {
+    map,
+    lnglatTuple
+} from '../preset';
+
+declare const marker: AMap.Marker;
+declare const polyline: AMap.Polyline;
+declare const polygon: AMap.Polygon;
+
+interface ExtraData {
+    test: number;
+}
+
+const geoJSONObject: AMap.GeoJSON.GeoJSONObject[] = [
+    {
+        type: 'Feature',
+        properties: {},
+        geometry: {
+            type: 'Point',
+            coordinates: lnglatTuple
+        }
+    },
+    {
+        type: 'Feature',
+        properties: { test: 1 },
+        geometry: {
+            type: 'LineString',
+            coordinates: [lnglatTuple, lnglatTuple]
+        }
+    }
+];
+
+// $ExpectType GeoJSON<any>
+new AMap.GeoJSON();
+// $ExpectType GeoJSON<any>
+new AMap.GeoJSON({});
+// $ExpectType GeoJSON<ExtraData>
+const geoJSON = new AMap.GeoJSON<ExtraData>({
+    geoJSON: geoJSONObject,
+    getMarker(obj, lnglat) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat
+        lnglat;
+        return marker;
+    },
+    getPolyline(obj, lnglats) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat[]
+        lnglats;
+        return polyline;
+    },
+    getPolygon(obj, lnglats) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat[]
+        lnglats;
+        return polygon;
+    },
+    coordsToLatLng(coord) {
+        // $ExpectType LngLat
+        coord;
+        return coord;
+    }
+});
+
+// $ExpectType void
+geoJSON.importData(geoJSONObject);
+
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.removeOverlay(marker);
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.removeOverlay([marker]);
+
+// $ExpectType boolean
+geoJSON.hasOverlay(marker);
+// $ExpectType boolean
+geoJSON.hasOverlay(m => m === marker);
+
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.addOverlay(marker);
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.addOverlay([marker]);
+
+// $ExpectType GeoJSONObject[]
+geoJSON.toGeoJSON();
+
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.setMap(null);
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.setMap(map);
+
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.hide();
+
+// $ExpectType GeoJSON<ExtraData>
+geoJSON.show();
+
+type ClickEvent = AMap.MapsEvent<'click', AMap.Overlay>;
+geoJSON.on('click', (event: ClickEvent) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Overlay<any>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/icon.ts b/types/amap-js-api/test/overlay/icon.ts
new file mode 100644
index 0000000000..8576685b8a
--- /dev/null
+++ b/types/amap-js-api/test/overlay/icon.ts
@@ -0,0 +1,32 @@
+import {
+    size,
+    pixel,
+    icon
+} from '../preset';
+
+// $ExpectType Icon
+new AMap.Icon();
+// $ExpectType Icon
+new AMap.Icon({});
+// $ExpectType Icon
+new AMap.Icon({
+    size,
+    imageOffset: pixel,
+    image: 'image uri',
+    imageSize: size
+});
+// $ExpectType Icon
+new AMap.Icon({
+    size: [1, 2],
+    imageOffset: pixel,
+    image: 'image uri',
+    imageSize: [1, 2]
+});
+
+// $ExpectType Size
+icon.getImageSize();
+
+// $ExpectType void
+icon.setImageSize(size);
+// $ExpectType void
+icon.setImageSize([1, 2]);
diff --git a/types/amap-js-api/test/overlay/infoWindow.ts b/types/amap-js-api/test/overlay/infoWindow.ts
new file mode 100644
index 0000000000..3fa4b0e656
--- /dev/null
+++ b/types/amap-js-api/test/overlay/infoWindow.ts
@@ -0,0 +1,81 @@
+import {
+    map,
+    lnglat,
+    size,
+    pixel,
+    div,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType InfoWindow<any>
+new AMap.InfoWindow();
+// $ExpectType InfoWindow<any>
+new AMap.InfoWindow({});
+// $ExpectType InfoWindow<ExtraData>
+const infoWindow = new AMap.InfoWindow<ExtraData>({
+    isCustom: false,
+    autoMove: false,
+    closeWhenClickMap: false,
+    content: 'content',
+    size: [100, 100],
+    offset: new AMap.Pixel(10, 10),
+    position: lnglat,
+    showShadow: true
+});
+
+// $ExpectType void
+infoWindow.open(map);
+// $ExpectType void
+infoWindow.open(map, lnglat);
+// $ExpectType void
+infoWindow.open(map, lnglatTuple);
+
+// $ExpectType void
+infoWindow.close();
+
+// $ExpectType boolean
+infoWindow.getIsOpen();
+
+// $ExpectType void
+infoWindow.setContent('content');
+// $ExpectType void
+infoWindow.setContent(div);
+
+// $ExpectType string | HTMLElement | undefined
+infoWindow.getContent();
+
+// $ExpectType void
+infoWindow.setPosition(lnglat);
+// $ExpectType void
+infoWindow.setPosition(lnglatTuple);
+
+// $ExpectType LngLat | undefined
+infoWindow.getPosition();
+
+// $ExpectType Size | undefined
+infoWindow.getSize();
+
+infoWindow.on('change', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['change']) => {
+    // $ExpectType "change"
+    event.type;
+    // $ExpectType InfoWindow<ExtraData>
+    event.target;
+});
+
+infoWindow.on('close', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['close']) => {
+    // $ExpectType "close"
+    event.type;
+    // $ExpectType InfoWindow<ExtraData>
+    event.target;
+});
+
+infoWindow.on('open', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['open']) => {
+    // $ExpectType "open"
+    event.type;
+    // $ExpectType InfoWindow<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/marker.ts b/types/amap-js-api/test/overlay/marker.ts
new file mode 100644
index 0000000000..635ce724c8
--- /dev/null
+++ b/types/amap-js-api/test/overlay/marker.ts
@@ -0,0 +1,195 @@
+import {
+    map,
+    lnglat
+} from '../preset';
+
+declare var pixel: AMap.Pixel;
+declare var domEle: HTMLElement;
+declare var markerShape: AMap.MarkerShape;
+declare var icon: AMap.Icon;
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType Marker<ExtraData>
+new AMap.Marker<ExtraData>();
+// $ExpectType Marker<any>
+new AMap.Marker();
+// $ExpectType Marker<any>
+new AMap.Marker({});
+// $ExpectType Marker<ExtraData>
+const marker = new AMap.Marker<ExtraData>({
+    map,
+    position: lnglat,
+    offset: pixel,
+    icon: 'iconUrl',
+    content: 'htmlString',
+    topWhenClick: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 10,
+    angle: 10,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: icon,
+    title: '123',
+    clickable: true,
+    shape: markerShape,
+    extData: {
+        test: 123
+    }
+});
+
+// $ExpectType void
+marker.markOnAMAP({
+    name: '123',
+    position: [1, 2]
+});
+// $ExpectType void
+marker.markOnAMAP();
+// $ExpectType void
+marker.markOnAMAP({});
+// $ExpectType void
+marker.markOnAMAP({
+    position: [1, 2],
+    name: '123'
+});
+
+// $ExpectType Pixel
+marker.getOffset();
+
+// $ExpectType void
+marker.setOffset(pixel);
+
+// $ExpectType void
+marker.setAnimation('AMAP_ANIMATION_BOUNCE');
+
+// $ExpectType AnimationName
+marker.getAnimation();
+
+// $ExpectType void
+marker.setClickable(true);
+
+// $ExpectType boolean
+marker.getClickable();
+
+// $ExpectType LngLat | undefined
+marker.getPosition();
+
+// $ExpectType void
+marker.setPosition(lnglat);
+
+// $ExpectType void
+marker.setAngle(0);
+
+// $ExpectType void
+marker.setLabel();
+// $ExpectType void
+marker.setLabel({});
+// $ExpectType void
+marker.setLabel({
+    content: 'label content',
+    offset: pixel
+});
+
+// $ExpectType Label | undefined
+marker.getLabel();
+
+// $ExpectType number
+marker.getAngle();
+
+// $ExpectType void
+marker.setzIndex(100);
+
+// $ExpectType number
+marker.getzIndex();
+
+// $ExpectType void
+marker.setIcon('icon uri');
+// $ExpectType void
+marker.setIcon(icon);
+
+// $ExpectType string | Icon | undefined
+marker.getIcon();
+
+// $ExpectType void
+marker.setDraggable(true);
+
+// $ExpectType boolean
+marker.getDraggable();
+
+// $ExpectType void
+marker.setCursor('default');
+
+// $ExpectType void
+marker.setContent('content');
+// $ExpectType void
+marker.setContent(domEle);
+
+// $ExpectType string | HTMLElement
+marker.getContent();
+
+// $ExpectType void
+marker.moveAlong([lnglat], 100);
+// $ExpectError
+marker.moveAlong([[1, 2]], 100);
+// $ExpectType void
+marker.moveAlong([lnglat], 100, t => t, false);
+
+// $ExpectType void
+marker.moveTo(lnglat, 100);
+// $ExpectType void
+marker.moveTo([1, 2], 100);
+// $ExpectType void
+marker.moveTo([1, 2], 100, t => t);
+
+// $ExpectType void
+marker.stopMove();
+
+// $ExpectType boolean
+marker.pauseMove();
+
+// $ExpectType boolean
+marker.resumeMove();
+
+// $ExpectType void
+marker.setMap(map);
+
+// $ExpectType void
+marker.setTitle('title');
+// $ExpectError
+marker.setTitle();
+
+// $ExpectType string | undefined
+marker.getTitle();
+
+// $ExpectType void
+marker.setTop(true);
+
+// $ExpectType boolean
+marker.getTop();
+
+// $ExpectType void
+marker.setShadow();
+// $ExpectType void
+marker.setShadow(icon);
+// $ExpectType void
+marker.setShadow('shadow url');
+
+// $ExpectType string | Icon | undefined
+marker.getShadow();
+
+// $ExpectType void
+marker.setShape();
+// $ExpectType void
+marker.setShape(markerShape);
+
+// $ExpectType MarkerShape | undefined
+marker.getShape();
+
+marker.on('click', (event: AMap.Marker.EventMap<typeof marker>['click']) => {
+    // $ExpectType {} | ExtraData
+    event.target.getExtData();
+});
diff --git a/types/amap-js-api/test/overlay/markerShape.ts b/types/amap-js-api/test/overlay/markerShape.ts
new file mode 100644
index 0000000000..259b68cf20
--- /dev/null
+++ b/types/amap-js-api/test/overlay/markerShape.ts
@@ -0,0 +1,26 @@
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'circle',
+    coords: [1, 1, 1]
+});
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'rect',
+    coords: [1, 1, 1, 2]
+});
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'poly',
+    coords: [1, 2, 3, 4, 5]
+});
+
+// $ExpectError
+new AMap.MarkerShape({
+    type: 'circle',
+    coords: [1, 1]
+});
+// $ExpectError
+new AMap.MarkerShape({
+    type: 'rect',
+    coords: [1, 1, 1, 2, 2]
+});
diff --git a/types/amap-js-api/test/overlay/overlay.ts b/types/amap-js-api/test/overlay/overlay.ts
new file mode 100644
index 0000000000..6a301e7091
--- /dev/null
+++ b/types/amap-js-api/test/overlay/overlay.ts
@@ -0,0 +1,27 @@
+import {
+    map
+} from '../preset';
+interface ExtraData {
+    test: number;
+}
+declare const overlay: AMap.Overlay<ExtraData>;
+
+// $ExpectType void
+overlay.show();
+
+// $ExpectType void
+overlay.hide();
+
+// $ExpectType Map | null | undefined
+overlay.getMap();
+
+// $ExpectType void
+overlay.setMap(map);
+// $ExpectType void
+overlay.setMap(null);
+
+// $ExpectError
+overlay.setExtData({ any: 123 });
+
+// $ExpectError ExtraData
+overlay.getExtData();
diff --git a/types/amap-js-api/test/overlay/overlayGroup.ts b/types/amap-js-api/test/overlay/overlayGroup.ts
new file mode 100644
index 0000000000..11e04f91cf
--- /dev/null
+++ b/types/amap-js-api/test/overlay/overlayGroup.ts
@@ -0,0 +1,108 @@
+import {
+    map,
+    lnglat,
+    pixel,
+    circle,
+    marker,
+    markerShape,
+    icon
+} from '../preset';
+
+// $ExpectType OverlayGroup<Overlay<any>, any>
+const overlayGroup2 = new AMap.OverlayGroup();
+// $ExpectType OverlayGroup<Marker<any>, any>
+new AMap.OverlayGroup<AMap.Marker, any>(marker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+const overlayGroup = new AMap.OverlayGroup<AMap.Marker>([marker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.addOverlay(marker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.addOverlay([marker]);
+// $ExpectError
+overlayGroup.addOverlay([circle]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.addOverlays(marker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.addOverlays([marker]);
+
+// $ExpectType Marker<any>[]
+overlayGroup.getOverlays();
+
+// $ExpectType boolean
+overlayGroup.hasOverlay(marker);
+// $ExpectType boolean
+overlayGroup.hasOverlay(o => o === marker);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.removeOverlay(marker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.removeOverlay([marker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.removeOverlays(marker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.removeOverlays([marker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.clearOverlays();
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.eachOverlay(function(overlay, index, overlays) {
+    // $ExpectType Marker<any>
+    overlay;
+    // $ExpectType number
+    index;
+    // $ExpectType Marker<any>[]
+    overlays;
+    // $ExpectType Marker<any>
+    this;
+});
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.setMap(null);
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.setMap(map);
+
+// $ExpectType OverlayGroup<Overlay<any>, any>
+overlayGroup2.setOptions({
+    test: 1
+});
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.setOptions({
+    map,
+    position: lnglat,
+    offset: pixel,
+    icon: 'iconUrl',
+    content: 'htmlString',
+    topWhenClick: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 10,
+    angle: 10,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: icon,
+    title: '123',
+    clickable: true,
+    shape: markerShape,
+    extData: {
+        test: 123
+    }
+});
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.show();
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+overlayGroup.hide();
+
+type ClickEvent = AMap.MapsEvent<'click', AMap.Overlay>;
+overlayGroup.on('click', (event: ClickEvent) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Overlay<any>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/polygon.ts b/types/amap-js-api/test/overlay/polygon.ts
new file mode 100644
index 0000000000..d41a597d45
--- /dev/null
+++ b/types/amap-js-api/test/overlay/polygon.ts
@@ -0,0 +1,123 @@
+import {
+    map,
+    lnglat,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+const path1 = [lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple];
+const path2 = [lnglat, lnglat, lnglat, lnglat, lnglat];
+
+// $ExpectType Polygon<any>
+new AMap.Polygon();
+// $ExpectType Polygon<any>
+new AMap.Polygon({});
+// $ExpectType Polygon<ExtraData>
+const polygon = new AMap.Polygon<ExtraData>({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.3,
+    strokeWeight: 5,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    draggable: true,
+    extData: { test: 1 },
+    strokeStyle: 'dashed',
+    strokeDasharray: [2, 4],
+    path: path1
+});
+
+// $ExpectType void
+polygon.setPath(path1);
+// $ExpectType void
+polygon.setPath(path2);
+// $ExpectType void
+polygon.setPath([path1, path2]);
+
+// $ExpectType LngLat[] | LngLat[][]
+polygon.getPath();
+
+// $ExpectType void
+polygon.setOptions({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 5,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    draggable: true,
+    extData: { test: 1 },
+    strokeStyle: 'dashed',
+    strokeDasharray: [4, 2],
+    path: [path2, path1]
+});
+
+const options = polygon.getOptions();
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType string | undefined
+options.fillColor;
+// $ExpectType number | undefined
+options.fillOpacity;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType LngLat[] | LngLat[][] | undefined
+options.path;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType string | undefined
+options.texture;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType Bounds | null
+polygon.getBounds();
+
+// $ExpectType number
+polygon.getArea();
+
+// $ExpectType void
+polygon.setMap(null);
+// $ExpectType void
+polygon.setMap(map);
+
+// $ExpectType void
+polygon.setExtData({ test: 1 });
+
+// $ExpectType {} | ExtraData
+polygon.getExtData();
+
+// $ExpectType boolean
+polygon.contains(lnglat);
+// $ExpectType boolean
+polygon.contains(lnglatTuple);
+
+polygon.on('click', (event: AMap.Polygon.EventMap<typeof polygon>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Polygon<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/polyline.ts b/types/amap-js-api/test/overlay/polyline.ts
new file mode 100644
index 0000000000..fc8d52b058
--- /dev/null
+++ b/types/amap-js-api/test/overlay/polyline.ts
@@ -0,0 +1,139 @@
+import {
+    map,
+    lnglat,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType Polyline<any>
+new AMap.Polyline();
+// $ExpectType Polyline<any>
+new AMap.Polyline({});
+// $ExpectType Polyline<ExtraData>
+const polyline = new AMap.Polyline<ExtraData>({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'default',
+    geodesic: true,
+    isOutline: true,
+    borderWeight: 1,
+    outlineColor: '#AA0000',
+    path: [lnglat],
+    strokeColor: '#0000AA',
+    strokeOpacity: 0.5,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [20, 10, 20],
+    lineJoin: 'bevel',
+    lineCap: 'butt',
+    draggable: true,
+    extData: { test: 1 },
+    showDir: true
+});
+// Polyline<ExtraData>
+
+// $ExpectType void
+polyline.setPath([lnglat]);
+// $ExpectType void
+polyline.setPath([lnglatTuple]);
+
+// $ExpectType void
+polyline.setOptions({});
+// $ExpectType void
+polyline.setOptions({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'default',
+    geodesic: true,
+    isOutline: true,
+    borderWeight: 1,
+    outlineColor: '#AA0000',
+    path: [lnglat, lnglat],
+    strokeColor: '#0000AA',
+    strokeOpacity: 0.5,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [20, 10, 20],
+    lineJoin: 'bevel',
+    lineCap: 'butt',
+    draggable: true,
+    extData: { test: 1 },
+    showDir: true
+});
+
+const options = polyline.getOptions();
+// $ExpectType number | undefined
+options.borderWeight;
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType string | undefined
+options.dirColor;
+// $ExpectType string | undefined
+options.dirImg;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType boolean | undefined
+options.geodesic;
+// $ExpectType boolean | undefined
+options.isOutline;
+// $ExpectType "round" | "butt" | "square" | undefined
+options.lineCap;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType string | undefined
+options.outlineColor;
+// $ExpectType LngLat[] | undefined
+options.path;
+// $ExpectType boolean | undefined
+options.showDir;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType number
+polyline.getLength();
+
+// $ExpectType Bounds | null
+polyline.getBounds();
+
+// $ExpectType void
+polyline.hide();
+
+// $ExpectType void
+polyline.show();
+
+// $ExpectType void
+polyline.setMap(null);
+// $ExpectType void
+polyline.setMap(map);
+
+// $ExpectType void
+polyline.setExtData({test: 1});
+
+// $ExpectType {} | ExtraData
+polyline.getExtData();
+
+polyline.on('click', (event: AMap.Polyline.EventMap<typeof polyline>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Polyline<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/rectangle.ts b/types/amap-js-api/test/overlay/rectangle.ts
new file mode 100644
index 0000000000..d2cafa8f09
--- /dev/null
+++ b/types/amap-js-api/test/overlay/rectangle.ts
@@ -0,0 +1,121 @@
+import {
+    map,
+    lnglat,
+    bounds,
+    lnglatTuple
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType Rectangle<any>
+new AMap.Rectangle();
+// $ExpectType Rectangle<any>
+new AMap.Rectangle({});
+// $ExpectType Rectangle<ExtraData>
+const rectangle = new AMap.Rectangle<ExtraData>({
+    map,
+    zIndex: 10,
+    bounds,
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'solid',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+// $ExpectType Bounds | undefined
+rectangle.getBounds();
+
+// $ExpectType void
+rectangle.setBounds(bounds);
+
+// $ExpectType void
+rectangle.setOptions({});
+// $ExpectType void
+rectangle.setOptions({
+    map,
+    zIndex: 10,
+    bounds,
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'solid',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+const options = rectangle.getOptions();
+// $ExpectType Bounds | undefined
+options.bounds;
+// $ExpectType boolean | undefined
+options.bubble;
+// $ExpectType boolean | undefined
+options.clickable;
+// $ExpectType {} | ExtraData | undefined
+options.extData;
+// $ExpectType string | undefined
+options.fillColor;
+// $ExpectType number | undefined
+options.fillOpacity;
+// $ExpectType "miter" | "round" | "bevel" | undefined
+options.lineJoin;
+// $ExpectType Map | undefined
+options.map;
+// $ExpectType LngLat[] | undefined
+options.path;
+// $ExpectType string | undefined
+options.strokeColor;
+// $ExpectType number[] | undefined
+options.strokeDasharray;
+// $ExpectType number | undefined
+options.strokeOpacity;
+// $ExpectType "dashed" | "solid" | undefined
+options.strokeStyle;
+// $ExpectType number | undefined
+options.strokeWeight;
+// $ExpectType string | undefined
+options.texture;
+// $ExpectType number | undefined
+options.zIndex;
+
+// $ExpectType void
+rectangle.hide();
+
+// $ExpectType void
+rectangle.show();
+
+// $ExpectType void
+rectangle.setExtData({test: 2});
+
+// $ExpectType {} | ExtraData
+rectangle.getExtData();
+
+// $ExpectType boolean
+rectangle.contains(lnglat);
+// $ExpectType boolean
+rectangle.contains(lnglatTuple);
+
+rectangle.on('click', (event: AMap.Rectangle.EventMap<typeof rectangle>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Rectangle<ExtraData>
+    event.target;
+});
+
+rectangle.on('setBounds', (event: AMap.Rectangle.EventMap<typeof rectangle>['setBounds']) => {
+    // $ExpectType "setBounds"
+    event.type;
+    // $ExpectError
+    event.target;
+});
diff --git a/types/amap-js-api/test/overlay/text.ts b/types/amap-js-api/test/overlay/text.ts
new file mode 100644
index 0000000000..c4d678493c
--- /dev/null
+++ b/types/amap-js-api/test/overlay/text.ts
@@ -0,0 +1,169 @@
+import {
+    map,
+    marker,
+    lnglat,
+    pixel,
+    lnglatTuple,
+    icon
+} from '../preset';
+
+interface ExtraData {
+    test: number;
+}
+
+// $ExpectType Text<any>
+new AMap.Text();
+// $ExpectType Text<any>
+new AMap.Text({});
+// $ExpectType Text<ExtraData>
+const text = new AMap.Text<ExtraData>({
+    text: 'content',
+    textAlign: 'center',
+    verticalAlign: 'top',
+    map,
+    position: lnglat,
+    offset: pixel,
+    topWhenClick: true,
+    bubble: true,
+    draggable: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 100,
+    angle: 45,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: 'https://webapi.amap.com/theme/v1.3/markers/0.png',
+    title: 'title',
+    clickable: true,
+    extData: { test: 1 }
+});
+
+// $ExpectType string
+text.getText();
+
+// $ExpectType void
+text.setText('123');
+
+// $ExpectType void
+text.setStyle({
+    background: 'red',
+    width: '200px'
+});
+
+// $ExpectType void
+text.markOnAMAP({
+    name: '123',
+    position: lnglatTuple
+});
+
+// $ExpectType Pixel
+text.getOffset();
+
+// $ExpectType void
+text.setOffset(pixel);
+
+// $ExpectType void
+text.setAnimation('AMAP_ANIMATION_BOUNCE');
+
+// $ExpectType AnimationName
+text.getAnimation();
+
+// $ExpectType void
+text.setClickable(true);
+
+// $ExpectType boolean
+text.getClickable();
+
+// $ExpectType LngLat | undefined
+text.getPosition();
+
+// $ExpectType void
+text.setAngle(10);
+
+// $ExpectType number
+text.getAngle();
+
+// $ExpectType void
+text.setzIndex(1);
+
+// $ExpectType number
+text.getzIndex();
+
+// $ExpectType void
+text.setDraggable(true);
+
+// $ExpectType boolean
+text.getDraggable();
+
+// $ExpectType void
+text.hide();
+
+// $ExpectType void
+text.show();
+
+// $ExpectType void
+text.setCursor('default');
+
+// $ExpectType void
+text.moveAlong([lnglat], 100);
+
+// $ExpectType void
+text.moveAlong([lnglat], 100);
+// $ExpectError
+text.moveAlong([[1, 2]], 100);
+// $ExpectType void
+text.moveAlong([lnglat], 100, t => t, false);
+
+// $ExpectType void
+text.moveTo(lnglat, 100);
+// $ExpectType void
+text.moveTo([1, 2], 100);
+// $ExpectType void
+text.moveTo([1, 2], 100, t => t);
+
+// $ExpectType void
+text.stopMove();
+
+// $ExpectType boolean
+text.pauseMove();
+
+// $ExpectType boolean
+text.resumeMove();
+
+// $ExpectType void
+text.setMap(map);
+
+// $ExpectType void
+text.setTitle('title');
+// $ExpectError
+text.setTitle();
+
+// $ExpectType string | undefined
+text.getTitle();
+
+// $ExpectType void
+text.setTop(true);
+
+// $ExpectType boolean
+text.getTop();
+
+// $ExpectType void
+text.setShadow();
+// $ExpectType void
+text.setShadow(icon);
+// $ExpectType void
+text.setShadow('shadow url');
+
+// $ExpectType void
+text.setExtData({test: 1});
+
+// $ExpectType {} | ExtraData
+text.getExtData();
+
+text.on('click', (event: AMap.Text.EventMap<typeof text>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Text<ExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/test/pixel.ts b/types/amap-js-api/test/pixel.ts
new file mode 100644
index 0000000000..bcb96e4b77
--- /dev/null
+++ b/types/amap-js-api/test/pixel.ts
@@ -0,0 +1,42 @@
+import {
+    pixel
+} from './preset';
+
+// $ExpectType Pixel
+new AMap.Pixel(10, 20);
+// $ExpectType Pixel
+new AMap.Pixel(10, 20);
+
+// $ExpectType number
+pixel.getX();
+
+// $ExpectType number
+pixel.getY();
+
+// $ExpectType boolean
+pixel.equals(pixel);
+
+// $ExpectType string
+pixel.toString();
+
+// $ExpectType Pixel
+pixel.add({ x: 1, y: 2 });
+// $ExpectType Pixel
+pixel.add({ x: 1, y: 2 }, false);
+
+// $ExpectType Pixel
+pixel.round();
+
+// $ExpectType Pixel
+pixel.floor();
+
+// $ExpectType number
+pixel.length();
+
+// $ExpectType number | null
+pixel.direction();
+
+// $ExpectType Pixel
+pixel.toFixed();
+// $ExpectType Pixel
+pixel.toFixed(2);
diff --git a/types/amap-js-api/test/preset.ts b/types/amap-js-api/test/preset.ts
new file mode 100644
index 0000000000..2c7bb37d59
--- /dev/null
+++ b/types/amap-js-api/test/preset.ts
@@ -0,0 +1,29 @@
+declare const map: AMap.Map;
+declare const lnglat: AMap.LngLat;
+declare const size: AMap.Size;
+declare const lnglatTuple: [number, number];
+declare const pixel: AMap.Pixel;
+declare const marker: AMap.Marker;
+declare const circle: AMap.Circle;
+declare const markerShape: AMap.MarkerShape;
+declare const icon: AMap.Icon;
+declare const bounds: AMap.Bounds;
+declare const div: HTMLDivElement;
+declare const polygon: AMap.Polygon;
+declare const lang: AMap.Lang;
+
+export {
+    map,
+    lnglat,
+    size,
+    lnglatTuple,
+    pixel,
+    marker,
+    circle,
+    markerShape,
+    icon,
+    bounds,
+    div,
+    polygon,
+    lang
+};
diff --git a/types/amap-js-api/test/size.ts b/types/amap-js-api/test/size.ts
new file mode 100644
index 0000000000..bdd700f532
--- /dev/null
+++ b/types/amap-js-api/test/size.ts
@@ -0,0 +1,16 @@
+import { size } from './preset';
+
+// $ExpectType Size
+new AMap.Size(10, 20);
+
+// $ExpectType number
+size.getHeight();
+
+// $ExpectType number
+size.getWidth();
+
+// $ExpectType string
+size.toString();
+
+// $ExpectType boolean
+size.contains({ x: 10, y: 10 });
diff --git a/types/amap-js-api/test/util.ts b/types/amap-js-api/test/util.ts
new file mode 100644
index 0000000000..c238070e21
--- /dev/null
+++ b/types/amap-js-api/test/util.ts
@@ -0,0 +1,79 @@
+import * as preset from './preset';
+
+const util = AMap.Util;
+
+// $ExpectType string
+util.colorNameToHex('colorName');
+
+// $ExpectType string
+util.rgbHex2Rgba('rgbHex');
+
+// $ExpectType string
+util.argbHex2Rgba('argbHex');
+
+// $ExpectType boolean
+util.isEmpty({});
+// $ExpectError
+util.isEmpty(1);
+
+// $ExpectType number[]
+util.deleteItemFromArray([1], 1);
+
+// $ExpectType number[]
+util.deleteItemFromArrayByIndex([1], 1);
+
+// $ExpectType number
+util.indexOf([1], 1);
+// $ExpectError
+util.indexOf([1], '1');
+
+// $ExpectType number
+util.format(1);
+// $ExpectType number
+util.format(1, 1);
+
+declare const value1: number | number[];
+// $ExpectType boolean
+util.isArray(value1);
+if (util.isArray(value1)) {
+    // $ExpectType number[]
+    value1;
+} else {
+    // $ExpectType number
+    value1;
+}
+
+declare const value2: number | HTMLElement;
+// $ExpectType boolean
+util.isDOM(value2);
+if (util.isDOM(value2)) {
+    // $ExpectType HTMLElement
+    value2;
+} else {
+    // $ExpectType number
+    value2;
+}
+
+// $ExpectType boolean
+util.includes([1], 1);
+// $ExpectError
+util.includes([1], '1');
+
+// $ExpectType number
+util.requestIdleCallback(() => { });
+// $ExpectType number
+const idleCallbackHandle = util.requestIdleCallback(() => { }, { timeout: 1 });
+
+// $ExpectType void
+util.cancelIdleCallback(idleCallbackHandle);
+
+// $ExpectType number
+util.requestAnimFrame(() => { });
+// $ExpectType number
+const animFrameHandle = util.requestAnimFrame(function () {
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+// $ExpectType void
+util.cancelAnimFrame(animFrameHandle);
diff --git a/types/amap-js-api/test/view2d.ts b/types/amap-js-api/test/view2d.ts
new file mode 100644
index 0000000000..2560922a5a
--- /dev/null
+++ b/types/amap-js-api/test/view2d.ts
@@ -0,0 +1,22 @@
+import { lnglat } from './preset';
+
+// $ExpectType View2D
+new AMap.View2D();
+// $ExpectType View2D
+new AMap.View2D({});
+
+// $ExpectType View2D
+new AMap.View2D({
+    center: [1, 2],
+    rotation: 1,
+    zoom: 10,
+    crs: 'EPGS3395'
+});
+
+// $ExpectType View2D
+const view2d = new AMap.View2D({
+    center: lnglat
+});
+
+// $ExpectType View2D
+view2d.on('complete', () => { });
diff --git a/types/amap-js-api/tsconfig.json b/types/amap-js-api/tsconfig.json
new file mode 100644
index 0000000000..3e8b8b3282
--- /dev/null
+++ b/types/amap-js-api/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/amap-js-api/tslint.json b/types/amap-js-api/tslint.json
new file mode 100644
index 0000000000..ab1e56673f
--- /dev/null
+++ b/types/amap-js-api/tslint.json
@@ -0,0 +1,10 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "only-arrow-functions": false,
+        "space-before-function-paren": false,
+        "no-var-keyword": false,
+        "no-unnecessary-class": false,
+        "file-name-casing": false
+    }
+}
diff --git a/types/amap-js-api/type-util.d.ts b/types/amap-js-api/type-util.d.ts
new file mode 100644
index 0000000000..1ced3d69c1
--- /dev/null
+++ b/types/amap-js-api/type-util.d.ts
@@ -0,0 +1,12 @@
+type Omit<T, E extends keyof T> = {
+    [K in Exclude<keyof T, E>]: T[K]
+};
+
+type OptionalKey<T> = { [K in keyof T]-?: undefined extends T[K] ? K : never }[keyof T];
+// type OmitUndefined<M> = Omit<M, { [K in keyof M]: M[K] extends undefined ? K : never }[keyof M]>;
+// type PickUndefined<M> = Omit<M, keyof OmitUndefined<M>>;
+
+type Merge<O, T> =
+    { [K in Exclude<keyof O, keyof T | OptionalKey<O>>]-?: O[K]; } &
+    { [K in Extract<Exclude<keyof O, keyof T>, OptionalKey<O>>]?: O[K]; } &
+    T;
diff --git a/types/amap-js-api/util.d.ts b/types/amap-js-api/util.d.ts
new file mode 100644
index 0000000000..70b48c31d1
--- /dev/null
+++ b/types/amap-js-api/util.d.ts
@@ -0,0 +1,37 @@
+declare namespace AMap {
+    namespace Util {
+        function colorNameToHex(colorName: string): string;
+
+        function rgbHex2Rgba(hex: string): string;
+
+        function argbHex2Rgba(hex: string): string;
+
+        function isEmpty(obj: object): boolean;
+
+        function deleteItemFromArray<T = any>(array: T[], item: T): T[];
+
+        function deleteItemFromArrayByIndex<T = any>(array: T[], index: number): T[];
+
+        function indexOf<T = any>(array: T[], item: T): number;
+
+        function format(floatNumber: number, digits?: number): number;
+
+        function isArray(data: any): data is any[];
+
+        function isDOM(data: any): data is HTMLElement;
+
+        function includes<T = any>(array: T[], item: T): boolean;
+
+        function requestIdleCallback(callback: (...args: any[]) => any, options?: { timeout?: number }): number;
+
+        function cancelIdleCallback(handle: number): void;
+
+        function requestAnimFrame<C = undefined>(callback: (this: C, ...args: any[]) => any, context?: C): number;
+
+        function cancelAnimFrame(handle: number): void;
+
+        function color2RgbaArray(color: string | number[]): [number, number, number, number];
+
+        function color2Rgba(color: string | number[]): string;
+    }
+}
diff --git a/types/amap-js-api/view2D.d.ts b/types/amap-js-api/view2D.d.ts
new file mode 100644
index 0000000000..d662b4c50e
--- /dev/null
+++ b/types/amap-js-api/view2D.d.ts
@@ -0,0 +1,13 @@
+declare namespace AMap {
+    namespace View2D {
+        interface Options {
+            center?: LocationValue;
+            rotation?: number;
+            zoom?: number;
+            crs?: 'EPGS3857' | 'EPGS3395' | 'EPGS4326';
+        }
+    }
+    class View2D extends EventEmitter {
+        constructor(options?: View2D.Options);
+    }
+}

From f13a292ddfa9f976b5310dc6f06f66d74e666108 Mon Sep 17 00:00:00 2001
From: Antoine Rousseau <antoine@rousseau.im>
Date: Sat, 23 Feb 2019 14:40:54 +0100
Subject: [PATCH 109/924] update "lite" version too

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

diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index 11e22f5ccf..0ef8cd9e8c 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -7,6 +7,7 @@
 //                 Claas Brüggemann <https://github.com/ClaasBrueggemann>
 //                 Kai Eichinger <https://github.com/keichinger>
 //                 Nery Ortez <https://github.com/neryortez>
+//                 Antoine Rousseau <https://github.com/antoinerousseau>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -534,9 +535,16 @@ declare namespace algoliasearch {
     userData?: string | object;
 
     /**
+     * Controls how facet values are sorted.
      * https://www.algolia.com/doc/api-reference/api-parameters/sortFacetValuesBy/
      */
     sortFacetValuesBy?: 'count' | 'alpha';
+    /**
+     * Sets the languages to be used by language-specific settings and functionalities
+     * such as ignorePlurals, removeStopWords, and CJK word-detection.
+     * https://www.algolia.com/doc/api-reference/api-parameters/queryLanguages/
+     */
+    queryLanguages?: string[];
   }
 
   namespace SearchForFacetValues {

From 0dd2283a1c9b9c7784c26ea5530592c120ec63ce Mon Sep 17 00:00:00 2001
From: David Ruisinger <david.ruisinger@gmail.com>
Date: Sat, 23 Feb 2019 16:14:42 +0100
Subject: [PATCH 110/924] Added interface to re-export module with theme
 interface

---
 types/styled-components/index.d.ts  |  1 +
 types/styled-components/native.d.ts | 27 ++++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index a7dea63e06..2ade6848ec 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -5,6 +5,7 @@
 //                 Adam Lavin <https://github.com/lavoaster>
 //                 Jessica Franco <https://github.com/Jessidhia>
 //                 Jason Killian <https://github.com/jkillian>
+//                 David Ruisinger <https:/>/github.com/flavordaaave>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
diff --git a/types/styled-components/native.d.ts b/types/styled-components/native.d.ts
index 0c1c520270..71e361af26 100644
--- a/types/styled-components/native.d.ts
+++ b/types/styled-components/native.d.ts
@@ -2,24 +2,27 @@ import * as ReactNative from 'react-native';
 import * as React from 'react';
 
 export {
-  DefaultTheme,
   css,
+  DefaultTheme,
   isStyledComponent,
-  ThemeProps,
-  ThemeProvider,
   ThemeConsumer,
   ThemeContext,
+  ThemeProps,
+  ThemeProvider,
   withTheme,
 } from './index';
 
 import {
   AnyStyledComponent,
+  DefaultTheme,
+  StyledComponentInnerAttrs,
   StyledComponentInnerComponent,
   StyledComponentInnerOtherProps,
-  StyledComponentInnerAttrs,
+  ThemedCssFunction,
   ThemedStyledFunction,
   ThemedStyledInterface,
-  DefaultTheme
+  ThemeProviderComponent,
+  WithThemeFnInterface
 } from './index';
 
 type AnyIfEmpty<T extends object> = keyof T extends never ? any : T;
@@ -211,6 +214,20 @@ export interface ReactNativeStyledInterface<T extends object> extends ReactNativ
   >;
 }
 
+export interface ReactNativeThemedStyledComponentsModule<
+  T extends object,
+  U extends object = T
+> {
+  default: ReactNativeStyledInterface<T>
+
+  css: ThemedCssFunction<T>
+
+  withTheme: WithThemeFnInterface<T>
+  ThemeProvider: ThemeProviderComponent<T, U>
+  ThemeConsumer: React.Consumer<T>
+  ThemeContext: React.Context<T>
+}
+
 declare const styled: ReactNativeStyledInterface<DefaultTheme>;
 
 export default styled;

From e652c53a432ca75776bfad9a370c93260a2ae99e Mon Sep 17 00:00:00 2001
From: David Ruisinger <david.ruisinger@gmail.com>
Date: Sat, 23 Feb 2019 21:22:56 +0100
Subject: [PATCH 111/924] Fixed typo

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

diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
index 2ade6848ec..00735dd469 100644
--- a/types/styled-components/index.d.ts
+++ b/types/styled-components/index.d.ts
@@ -5,7 +5,7 @@
 //                 Adam Lavin <https://github.com/lavoaster>
 //                 Jessica Franco <https://github.com/Jessidhia>
 //                 Jason Killian <https://github.com/jkillian>
-//                 David Ruisinger <https:/>/github.com/flavordaaave>
+//                 David Ruisinger <https://github.com/flavordaaave>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 

From 14d234420f67d83246e99a92f67b3e0f16106e29 Mon Sep 17 00:00:00 2001
From: David Ruisinger <david.ruisinger@gmail.com>
Date: Sat, 23 Feb 2019 21:36:39 +0100
Subject: [PATCH 112/924] Fix linting errors

---
 types/styled-components/native.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/styled-components/native.d.ts b/types/styled-components/native.d.ts
index 71e361af26..c67df4d7a1 100644
--- a/types/styled-components/native.d.ts
+++ b/types/styled-components/native.d.ts
@@ -218,14 +218,14 @@ export interface ReactNativeThemedStyledComponentsModule<
   T extends object,
   U extends object = T
 > {
-  default: ReactNativeStyledInterface<T>
+  default: ReactNativeStyledInterface<T>;
 
-  css: ThemedCssFunction<T>
+  css: ThemedCssFunction<T>;
 
-  withTheme: WithThemeFnInterface<T>
-  ThemeProvider: ThemeProviderComponent<T, U>
-  ThemeConsumer: React.Consumer<T>
-  ThemeContext: React.Context<T>
+  withTheme: WithThemeFnInterface<T>;
+  ThemeProvider: ThemeProviderComponent<T, U>;
+  ThemeConsumer: React.Consumer<T>;
+  ThemeContext: React.Context<T>;
 }
 
 declare const styled: ReactNativeStyledInterface<DefaultTheme>;

From 1d6edf7767d0d01bc66aa6a0b447b0e436cb4e16 Mon Sep 17 00:00:00 2001
From: David Ruisinger <david.ruisinger@gmail.com>
Date: Sat, 23 Feb 2019 22:31:07 +0100
Subject: [PATCH 113/924] Added isStyledComponent

---
 types/styled-components/native.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/styled-components/native.d.ts b/types/styled-components/native.d.ts
index c67df4d7a1..189e284525 100644
--- a/types/styled-components/native.d.ts
+++ b/types/styled-components/native.d.ts
@@ -15,6 +15,7 @@ export {
 import {
   AnyStyledComponent,
   DefaultTheme,
+  isStyledComponent,
   StyledComponentInnerAttrs,
   StyledComponentInnerComponent,
   StyledComponentInnerOtherProps,
@@ -226,6 +227,9 @@ export interface ReactNativeThemedStyledComponentsModule<
   ThemeProvider: ThemeProviderComponent<T, U>;
   ThemeConsumer: React.Consumer<T>;
   ThemeContext: React.Context<T>;
+
+  // This could be made to assert `target is StyledComponent<any, T>` instead, but that feels not type safe
+  isStyledComponent: typeof isStyledComponent;
 }
 
 declare const styled: ReactNativeStyledInterface<DefaultTheme>;

From 93fb2ef1ffc278fc22272ab6419576e7809ece68 Mon Sep 17 00:00:00 2001
From: David Ruisinger <david.ruisinger@gmail.com>
Date: Sat, 23 Feb 2019 22:56:48 +0100
Subject: [PATCH 114/924] Adds tests for
 ReactNativeThemedStyledComponentsModule

---
 types/styled-components/test/native.tsx | 139 ++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/types/styled-components/test/native.tsx b/types/styled-components/test/native.tsx
index 66b0f975ce..da2ba83390 100644
--- a/types/styled-components/test/native.tsx
+++ b/types/styled-components/test/native.tsx
@@ -9,6 +9,7 @@ import styled, {
     ThemeProvider,
     withTheme,
     ThemeConsumer,
+    ReactNativeThemedStyledComponentsModule,
 } from "styled-components/native";
 import {} from "styled-components/cssprop";
 
@@ -57,3 +58,141 @@ const TomatoButton = styled(MyButton)`
 
 // needs name prop, but not theme prop
 const tomatoElement = <TomatoButton name="needed" />;
+
+async function typedThemes() {
+  const theme = {
+      color: "green"
+  };
+
+  // abuse "await import(...)" to be able to reference the styled-components namespace
+  // without actually doing a top level namespace import
+  const {
+      default: styled,
+      css,
+      ThemeProvider,
+      ThemeConsumer
+  } = (await import("styled-components/native")) as any as ReactNativeThemedStyledComponentsModule<
+      typeof theme
+  >;
+
+  const ThemedView = styled.View`
+      background: ${props => {
+          // $ExpectType string
+          props.theme.color;
+          // $ExpectType string | undefined
+          props.testID;
+          return props.theme.color;
+      }};
+  `;
+  const ThemedView2 = styled.View(props => {
+    // $ExpectType string
+    props.theme.color;
+    // $ExpectType string | undefined
+    props.testID;
+
+    return {
+        background: props.theme.color
+    };
+  });
+  const ThemedView3 = styled.View(props => {
+    // $ExpectType string
+    props.theme.color;
+    // $ExpectType string | undefined
+    props.testID;
+
+    return css`
+        background: ${props.theme.color};
+    `;
+});
+const themedCss = css`
+    background: ${props => {
+        // $ExpectType string
+        props.theme.color;
+        // $ExpectType "theme"
+        type Keys = keyof typeof props;
+        return props.theme.color;
+    }};
+`;
+//  can't use a FlattenInterpolation as the first argument, would make broken css
+// $ExpectError
+const ThemedView4 = styled.View(themedCss);
+
+const themedCssWithNesting = css(props => ({
+    color: props.theme.color,
+    [ThemedView3]: {
+        color: "green"
+    }
+}));
+
+return (
+    <ThemeProvider theme={theme}>
+        <>
+            <ThemedView />
+            <ThemedView2 />
+            <ThemedView3 />
+            <ThemeConsumer>
+                {theme => {
+                    // $ExpectType string
+                    theme.color;
+                    return theme.color;
+                }}
+            </ThemeConsumer>
+        </>
+    </ThemeProvider>
+  );
+}
+
+async function reexportCompatibility() {
+  const sc = await import("styled-components/native");
+  const themed = sc as ReactNativeThemedStyledComponentsModule<any>;
+
+  let { ...scExports } = sc;
+  let { ...themedExports } = themed;
+  // both branches must be assignable to each other
+  if (Math.random()) {
+      scExports = themedExports;
+  } else {
+      themedExports = scExports;
+  }
+}
+
+async function themeAugmentation() {
+  interface BaseTheme {
+      background: string;
+  }
+  interface ExtraTheme extends BaseTheme {
+      accent: string;
+  }
+
+  const base = (await import("styled-components/native")) as any as ReactNativeThemedStyledComponentsModule<
+      BaseTheme
+  >;
+  const extra = (await import("styled-components/native")) as any as ReactNativeThemedStyledComponentsModule<
+      ExtraTheme,
+      BaseTheme
+  >;
+
+  return (
+      <base.ThemeProvider
+          theme={{
+              background: "black"
+          }}
+      >
+          <>
+              <extra.ThemeProvider
+                  theme={base => base} // $ExpectError
+              >
+                  <extra.ThemeConsumer>{() => null}</extra.ThemeConsumer>
+              </extra.ThemeProvider>
+              <extra.ThemeProvider
+                  theme={base => ({
+                      ...base,
+                      accent: "blue"
+                  })}
+              >
+                  <extra.ThemeConsumer>{() => null}</extra.ThemeConsumer>
+              </extra.ThemeProvider>
+          </>
+      </base.ThemeProvider>
+  );
+}

From 7f35e862fd54d457dcdb5e7300f4f2ab21695c8d Mon Sep 17 00:00:00 2001
From: Alcedo Nathaniel De Guzman Jr <natealcedo@gmail.com>
Date: Sun, 24 Feb 2019 09:16:16 +0800
Subject: [PATCH 115/924] Update source-map-support to include type definition
 for resetRetrieveHandlers

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

diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index f92a8383b5..f6533dc1d8 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -37,6 +37,7 @@ export function wrapCallSite(frame: any /* StackFrame */): any /* StackFrame */;
 export function getErrorSource(error: Error): string | null;
 export function mapSourcePosition(position: Position): Position;
 export function retrieveSourceMap(source: string): UrlAndMap | null;
+export function resetRetrieveHandlers(): void;
 
 /**
  * Install SourceMap support.

From 0001ebd8bb91b91c59c50347cecf9cb879ade6c4 Mon Sep 17 00:00:00 2001
From: Alcedo Nathaniel De Guzman Jr <natealcedo@gmail.com>
Date: Sun, 24 Feb 2019 09:27:43 +0800
Subject: [PATCH 116/924] Update header version

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

diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index f6533dc1d8..e1256d8ddb 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for source-map-support 0.4
+// Type definitions for source-map-support 0.5
 // Project: https://github.com/evanw/node-source-map-support
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Jason Cheatham <https://github.com/jason0x43>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 44fa413f1ec2327ed9e2b514b5ff1abd518db7d0 Mon Sep 17 00:00:00 2001
From: Alcedo Nathaniel De Guzman Jr <natealcedo@gmail.com>
Date: Sun, 24 Feb 2019 09:27:52 +0800
Subject: [PATCH 117/924] Add test

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

diff --git a/types/source-map-support/source-map-support-tests.ts b/types/source-map-support/source-map-support-tests.ts
index 7b07c2970f..cb773b9958 100644
--- a/types/source-map-support/source-map-support-tests.ts
+++ b/types/source-map-support/source-map-support-tests.ts
@@ -41,3 +41,5 @@ p = sms.mapSourcePosition(p);
 
 let u: sms.UrlAndMap | null;
 u = retrieveSourceMap("foo");
+
+sms.resetRetrieveHandlers();

From 257469f5ffeb7a6bb24dcd26d27b03fcfe8acc3e Mon Sep 17 00:00:00 2001
From: Alcedo Nathaniel De Guzman Jr <natealcedo@gmail.com>
Date: Sun, 24 Feb 2019 09:42:37 +0800
Subject: [PATCH 118/924] Add myself to definitions by

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

diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index e1256d8ddb..00ad396b9e 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for source-map-support 0.5
 // Project: https://github.com/evanw/node-source-map-support
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Jason Cheatham <https://github.com/jason0x43>
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Jason Cheatham <https://github.com/jason0x43>, Alcedo Nathaniel De Guzman Jr <https://github.com/natealcedo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From de311e73230feec314863e9a133fa843426b8caf Mon Sep 17 00:00:00 2001
From: DavidMarquezF <32216320+DavidMarquezF@users.noreply.github.com>
Date: Sun, 24 Feb 2019 13:44:04 +0100
Subject: [PATCH 119/924] Added data parameter in filter Callback (Chart.js)

Chart.js can pass the data parameter in the filter callback.

You can see this in the source code of Chart.js:
https://github.com/chartjs/Chart.js/blob/317cae11dc3358e816528229d05bea7c835c4ad3/src/core/core.tooltip.js#L616
---
 types/chart.js/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 7745713c84..0c9726d400 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -357,7 +357,7 @@ declare namespace Chart {
         cornerRadius?: number;
         multiKeyBackground?: string;
         callbacks?: ChartTooltipCallback;
-        filter?(item: ChartTooltipItem): boolean;
+        filter?(item: ChartTooltipItem, data: ChartData): boolean;
         itemSort?(itemA: ChartTooltipItem, itemB: ChartTooltipItem): number;
         position?: string;
         caretPadding?: number;

From 6fd150e94c0949c512b8454099dfd66a927ae32c Mon Sep 17 00:00:00 2001
From: Spencer Miskoviak <smiskoviak@gmail.com>
Date: Sun, 24 Feb 2019 13:39:13 -0800
Subject: [PATCH 120/924] Deprecate @types/chokidar

npm run not-needed -- chokidar 2.1.2 https://github.com/paulmillr/chokidar chokidar
---
 notNeededPackages.json           |   6 ++
 types/chokidar/chokidar-tests.ts |  57 -----------
 types/chokidar/index.d.ts        | 170 -------------------------------
 types/chokidar/tsconfig.json     |  23 -----
 types/chokidar/tslint.json       |   1 -
 5 files changed, 6 insertions(+), 251 deletions(-)
 delete mode 100644 types/chokidar/chokidar-tests.ts
 delete mode 100644 types/chokidar/index.d.ts
 delete mode 100644 types/chokidar/tsconfig.json
 delete mode 100644 types/chokidar/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index d78bb569ad..22f1c44784 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -240,6 +240,12 @@
             "sourceRepoURL": "https://github.com/mapbox/cheap-ruler",
             "asOfVersion": "2.5.0"
         },
+        {
+            "libraryName": "chokidar",
+            "typingsPackageName": "chokidar",
+            "sourceRepoURL": "https://github.com/paulmillr/chokidar",
+            "asOfVersion": "2.1.2"
+        },
         {
             "libraryName": "chunked-dc",
             "typingsPackageName": "chunked-dc",
diff --git a/types/chokidar/chokidar-tests.ts b/types/chokidar/chokidar-tests.ts
deleted file mode 100644
index 13e5fe6a90..0000000000
--- a/types/chokidar/chokidar-tests.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import * as fs from 'fs';
-import chokidar = require('chokidar');
-
-const watcher = chokidar.watch('file, dir, or glob', {
-    ignored: /[\/\\]\./, persistent: true
-});
-
-const log = console.log.bind(console);
-
-watcher
-    .on('add', (path: string) => {
-        log('File', path, 'has been added');
-    })
-    .on('addDir', (path: string) => {
-        log('Directory', path, 'has been added');
-    })
-    .on('change', (path: string) => {
-        log('File', path, 'has been changed');
-    })
-    .on('unlink', (path: string) => {
-        log('File', path, 'has been removed');
-    })
-    .on('unlinkDir', (path: string) => {
-        log('Directory', path, 'has been removed');
-    })
-    .on('error', (error: any) => {
-        log('Error happened', error);
-    })
-    .on('ready', () => {
-        log('Initial scan complete. Ready for changes.');
-    })
-    .on('raw', (event: string, path: string, details: any) => {
-        log('Raw event info:', event, path, details);
-    });
-
-// 'add', 'addDir' and 'change' events also receive stat() results as second
-// argument when available: http://nodejs.org/api/fs.html#fs_class_fs_stats
-watcher.on('change', (path: string, stats: fs.Stats) => {
-    if (stats) {
-        console.log('File', path, 'changed size to', stats.size);
-    }
-});
-
-// Watch new files.
-watcher.add('new-file');
-watcher.add(['new-file-2', 'new-file-3', '**/other-file*']);
-
-// Un-watch some files.
-watcher.unwatch('new-file*');
-
-// Only needed if watching is `persistent: true`.
-watcher.close();
-
-// One-liner
-chokidar.watch('.', { ignored: /[\/\\]\./ }).on('all', (event: string, path: string) => {
-    console.log(event, path);
-});
diff --git a/types/chokidar/index.d.ts b/types/chokidar/index.d.ts
deleted file mode 100644
index 6acc9af265..0000000000
--- a/types/chokidar/index.d.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-// Type definitions for chokidar 1.7
-// Project: https://github.com/paulmillr/chokidar
-// Definitions by: Stefan Steinhart <https://github.com/reppners>
-//                 Felix Becker <https://github.com/felixfbecker>
-//                 Zach Cardoza <https://github.com/bayssmekanique>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-import * as fs from 'fs';
-import { EventEmitter } from 'events';
-
-/**
- * The object's keys are all the directories (using absolute paths unless the `cwd` option was
- * used), and the values are arrays of the names of the items contained in each directory.
- */
-export interface WatchedPaths {
-    [directory: string]: string[];
-}
-
-export class FSWatcher extends EventEmitter implements fs.FSWatcher {
-    /**
-     * Constructs a new FSWatcher instance with optional WatchOptions parameter.
-     */
-    constructor(options?: WatchOptions);
-
-    /**
-     * Add files, directories, or glob patterns for tracking. Takes an array of strings or just one
-     * string.
-     */
-    add(paths: string | string[]): void;
-
-    /**
-     * Stop watching files, directories, or glob patterns. Takes an array of strings or just one
-     * string.
-     */
-    unwatch(paths: string | string[]): void;
-
-    /**
-     * Returns an object representing all the paths on the file system being watched by this
-     * `FSWatcher` instance. The object's keys are all the directories (using absolute paths unless
-     * the `cwd` option was used), and the values are arrays of the names of the items contained in
-     * each directory.
-     */
-    getWatched(): WatchedPaths;
-
-    /**
-     * Removes all listeners from watched files.
-     */
-    close(): void;
-}
-
-export interface WatchOptions {
-    /**
-     * Indicates whether the process should continue to run as long as files are being watched. If
-     * set to `false` when using `fsevents` to watch, no more events will be emitted after `ready`,
-     * even if the process continues to run.
-     */
-    persistent?: boolean;
-
-    /**
-     * ([anymatch](https://github.com/es128/anymatch)-compatible definition) Defines files/paths to
-     * be ignored. The whole relative or absolute path is tested, not just filename. If a function
-     * with two arguments is provided, it gets called twice per path - once with a single argument
-     * (the path), second time with two arguments (the path and the
-     * [`fs.Stats`](http://nodejs.org/api/fs.html#fs_class_fs_stats) object of that path).
-     */
-    ignored?: any;
-
-    /**
-     * If set to `false` then `add`/`addDir` events are also emitted for matching paths while
-     * instantiating the watching as chokidar discovers these file paths (before the `ready` event).
-     */
-    ignoreInitial?: boolean;
-
-    /**
-     * When `false`, only the symlinks themselves will be watched for changes instead of following
-     * the link references and bubbling events through the link's path.
-     */
-    followSymlinks?: boolean;
-
-    /**
-     * The base directory from which watch `paths` are to be derived. Paths emitted with events will
-     * be relative to this.
-     */
-    cwd?: string;
-
-    /**
-     *  If set to true then the strings passed to .watch() and .add() are treated as literal path
-     *  names, even if they look like globs. Default: false.
-     */
-    disableGlobbing?: boolean;
-
-    /**
-     * Whether to use fs.watchFile (backed by polling), or fs.watch. If polling leads to high CPU
-     * utilization, consider setting this to `false`. It is typically necessary to **set this to
-     * `true` to successfully watch files over a network**, and it may be necessary to successfully
-     * watch files in other non-standard situations. Setting to `true` explicitly on OS X overrides
-     * the `useFsEvents` default.
-     */
-    usePolling?: boolean;
-
-    /**
-     * Whether to use the `fsevents` watching interface if available. When set to `true` explicitly
-     * and `fsevents` is available this supercedes the `usePolling` setting. When set to `false` on
-     * OS X, `usePolling: true` becomes the default.
-     */
-    useFsEvents?: boolean;
-
-    /**
-     * If relying upon the [`fs.Stats`](http://nodejs.org/api/fs.html#fs_class_fs_stats) object that
-     * may get passed with `add`, `addDir`, and `change` events, set this to `true` to ensure it is
-     * provided even in cases where it wasn't already available from the underlying watch events.
-     */
-    alwaysStat?: boolean;
-
-    /**
-     * If set, limits how many levels of subdirectories will be traversed.
-     */
-    depth?: number;
-
-    /**
-     * Interval of file system polling.
-     */
-    interval?: number;
-
-    /**
-     * Interval of file system polling for binary files. ([see list of binary extensions](https://gi
-     * thub.com/sindresorhus/binary-extensions/blob/master/binary-extensions.json))
-     */
-    binaryInterval?: number;
-
-    /**
-     *  Indicates whether to watch files that don't have read permissions if possible. If watching
-     *  fails due to `EPERM` or `EACCES` with this set to `true`, the errors will be suppressed
-     *  silently.
-     */
-    ignorePermissionErrors?: boolean;
-
-    /**
-     * `true` if `useFsEvents` and `usePolling` are `false`). Automatically filters out artifacts
-     * that occur when using editors that use "atomic writes" instead of writing directly to the
-     * source file. If a file is re-added within 100 ms of being deleted, Chokidar emits a `change`
-     * event rather than `unlink` then `add`. If the default of 100 ms does not work well for you,
-     * you can override it by setting `atomic` to a custom value, in milliseconds.
-     */
-    atomic?: boolean | number;
-
-    /**
-     * can be set to an object in order to adjust timing params:
-     */
-    awaitWriteFinish?: AwaitWriteFinishOptions | boolean;
-}
-
-export interface AwaitWriteFinishOptions {
-    /**
-     * Amount of time in milliseconds for a file size to remain constant before emitting its event.
-     */
-    stabilityThreshold?: number;
-
-    /**
-     * File size polling interval.
-     */
-    pollInterval?: number;
-}
-
-/**
- * produces an instance of `FSWatcher`.
- */
-export function watch(paths: string | string[], options?: WatchOptions): FSWatcher;
diff --git a/types/chokidar/tsconfig.json b/types/chokidar/tsconfig.json
deleted file mode 100644
index 77a34a3964..0000000000
--- a/types/chokidar/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "chokidar-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/chokidar/tslint.json b/types/chokidar/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/chokidar/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 243bd2d1bcec585e930c6ef50c8ec2928aae8951 Mon Sep 17 00:00:00 2001
From: Spencer Miskoviak <smiskoviak@gmail.com>
Date: Sun, 24 Feb 2019 14:00:18 -0800
Subject: [PATCH 121/924] Add chokidar as a dependency for packages that rely
 on chokidar types

---
 types/browser-sync/index.d.ts    | 1 -
 types/browser-sync/package.json  | 6 ++++++
 types/gulp/package.json          | 6 ++++++
 types/hexo-fs/package.json       | 6 ++++++
 types/sc-hot-reboot/package.json | 6 ++++++
 types/watchpack/package.json     | 6 ++++++
 6 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 types/browser-sync/package.json
 create mode 100644 types/gulp/package.json
 create mode 100644 types/hexo-fs/package.json
 create mode 100644 types/sc-hot-reboot/package.json
 create mode 100644 types/watchpack/package.json

diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index 72399f1618..58b85e09f3 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -7,7 +7,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-/// <reference types="chokidar"/>
 /// <reference types="node" />
 /// <reference types="serve-static" />
 
diff --git a/types/browser-sync/package.json b/types/browser-sync/package.json
new file mode 100644
index 0000000000..a0e2ec3c5c
--- /dev/null
+++ b/types/browser-sync/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "chokidar": "^2.1.2"
+  }
+}
diff --git a/types/gulp/package.json b/types/gulp/package.json
new file mode 100644
index 0000000000..a0e2ec3c5c
--- /dev/null
+++ b/types/gulp/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "chokidar": "^2.1.2"
+  }
+}
diff --git a/types/hexo-fs/package.json b/types/hexo-fs/package.json
new file mode 100644
index 0000000000..a0e2ec3c5c
--- /dev/null
+++ b/types/hexo-fs/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "chokidar": "^2.1.2"
+  }
+}
diff --git a/types/sc-hot-reboot/package.json b/types/sc-hot-reboot/package.json
new file mode 100644
index 0000000000..a0e2ec3c5c
--- /dev/null
+++ b/types/sc-hot-reboot/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "chokidar": "^2.1.2"
+  }
+}
diff --git a/types/watchpack/package.json b/types/watchpack/package.json
new file mode 100644
index 0000000000..a0e2ec3c5c
--- /dev/null
+++ b/types/watchpack/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "chokidar": "^2.1.2"
+  }
+}

From 2551b4d500e26c18172f1e5a077f38edab4c4608 Mon Sep 17 00:00:00 2001
From: Sebastian Frysztak <sebfry@gmail.com>
Date: Sun, 24 Feb 2019 22:52:38 +0100
Subject: [PATCH 122/924] Add (data, active) alternative to VictoryScatter

---
 types/victory/index.d.ts        |  2 +-
 types/victory/victory-tests.tsx | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index f5c67995da..549e3823da 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -2057,7 +2057,7 @@ declare module "victory" {
       /**
        * The size prop determines how to scale each data point
        */
-      size?: number | { (data: any): number };
+      size?: number | { (data: any): number } | { (data: any, active: boolean): number };
       /**
        * The style prop specifies styles for your VictoryScatter. Any valid inline style properties
        * will be applied. Height, width, and padding should be specified via the height,
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index fcd18571e3..eb3b7bda40 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -642,6 +642,32 @@ test = (
     />
 );
 
+test = (
+    <VictoryScatter
+        data={[
+          {x: 1, y: 3},
+          {x: 2, y: 5},
+          {x: 3, y: 4},
+          {x: 4, y: 2},
+          {x: 5, y: 5}
+        ]}
+        size={(d: any) => 5}
+    />
+);
+
+test = (
+    <VictoryScatter
+        data={[
+          {x: 1, y: 3},
+          {x: 2, y: 5},
+          {x: 3, y: 4},
+          {x: 4, y: 2},
+          {x: 5, y: 5}
+        ]}
+        size={(d, a) => (a ? 5 : 3)}
+    />
+);
+
 // VictoryPie test
 test = (
     <VictoryPie

From c77d6dad5e37018c8ec14f99b3e2188fd1de9990 Mon Sep 17 00:00:00 2001
From: Jonathan Ly <jonathanlyhv@gmail.com>
Date: Mon, 18 Feb 2019 13:25:13 +1100
Subject: [PATCH 123/924] [react-scroll-into-view-if-needed] add types

---
 .../index.d.ts                                | 21 ++++++++
 ...react-scroll-into-view-if-needed-tests.tsx | 52 +++++++++++++++++++
 .../tsconfig.json                             | 17 ++++++
 .../tslint.json                               |  1 +
 4 files changed, 91 insertions(+)
 create mode 100644 types/react-scroll-into-view-if-needed/index.d.ts
 create mode 100644 types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
 create mode 100644 types/react-scroll-into-view-if-needed/tsconfig.json
 create mode 100644 types/react-scroll-into-view-if-needed/tslint.json

diff --git a/types/react-scroll-into-view-if-needed/index.d.ts b/types/react-scroll-into-view-if-needed/index.d.ts
new file mode 100644
index 0000000000..2522833fbd
--- /dev/null
+++ b/types/react-scroll-into-view-if-needed/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for react-scroll-into-view-if-needed 2.1
+// Project: https://github.com/icd2k3/react-scroll-into-view-if-needed#readme
+// Definitions by: Angus Fretwell <https://github.com/angusfretwell>
+//                 Allan Pope <https://github.com/allanpope>
+//                 Jonathan Ly <https://github.com/jonathanly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import * as React from 'react';
+import * as ScrollIntoViewIfNeeded from 'scroll-into-view-if-needed';
+
+export interface ReactScrollIntoViewIfNeededProps
+    extends React.HTMLProps<HTMLElement> {
+    options?: ScrollIntoViewIfNeeded.Options;
+    active?: boolean;
+    elementType?: keyof JSX.IntrinsicElements;
+}
+
+export default class ReactScrollIntoViewIfNeeded extends React.Component<
+    ReactScrollIntoViewIfNeededProps
+> {}
diff --git a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
new file mode 100644
index 0000000000..d9845582e7
--- /dev/null
+++ b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react';
+import ReactScrollIntoViewIfNeeded from 'react-scroll-into-view-if-needed';
+
+const validOptions = {
+    block: 'start',
+    scrollMode: 'if-needed',
+    skipOverflowHiddenElements: true
+};
+
+const invalidOptions = {
+    invalidOption: 'foobar'
+};
+
+() => (
+    <ReactScrollIntoViewIfNeeded
+        active={true}
+        options={validOptions}
+        elementType="h1"
+    >
+        Children
+    </ReactScrollIntoViewIfNeeded>
+);
+
+() => (
+    <ReactScrollIntoViewIfNeeded
+        active={true}
+        options={invalidOptions}
+        elementType="h1"
+    >
+        Children
+    </ReactScrollIntoViewIfNeeded>
+);
+
+() => (
+    <ReactScrollIntoViewIfNeeded
+        active={5} // $ExpectError
+        options={validOptions}
+        elementType="h1"
+    >
+        Children
+    </ReactScrollIntoViewIfNeeded>
+);
+
+() => (
+    <ReactScrollIntoViewIfNeeded
+        active={true}
+        options={validOptions}
+        elementType="h8" // $ExpectError
+    >
+        Children
+    </ReactScrollIntoViewIfNeeded>
+);
diff --git a/types/react-scroll-into-view-if-needed/tsconfig.json b/types/react-scroll-into-view-if-needed/tsconfig.json
new file mode 100644
index 0000000000..cfa539dc78
--- /dev/null
+++ b/types/react-scroll-into-view-if-needed/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-scroll-into-view-if-needed-tests.tsx"]
+}
diff --git a/types/react-scroll-into-view-if-needed/tslint.json b/types/react-scroll-into-view-if-needed/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-scroll-into-view-if-needed/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 81751f0f784d112ecabc0fc33518092f9dc27501 Mon Sep 17 00:00:00 2001
From: Jonathan Ly <jonathanlyhv@gmail.com>
Date: Mon, 18 Feb 2019 14:15:50 +1100
Subject: [PATCH 124/924] [react-scroll-into-view-if-needed] add package.json
 with required dependencies listed

---
 types/react-scroll-into-view-if-needed/package.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 types/react-scroll-into-view-if-needed/package.json

diff --git a/types/react-scroll-into-view-if-needed/package.json b/types/react-scroll-into-view-if-needed/package.json
new file mode 100644
index 0000000000..7a6b32f755
--- /dev/null
+++ b/types/react-scroll-into-view-if-needed/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "'scroll-into-view-if-needed'": "*"
+  }
+}
\ No newline at end of file

From 288129a409f99592b928b97f9569a68a9a5bfae5 Mon Sep 17 00:00:00 2001
From: Jonathan Ly <jonathanlyhv@gmail.com>
Date: Mon, 25 Feb 2019 09:30:41 +1100
Subject: [PATCH 125/924] Fix typo in package.json

---
 types/react-scroll-into-view-if-needed/package.json    | 10 +++++-----
 .../react-scroll-into-view-if-needed-tests.tsx         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/react-scroll-into-view-if-needed/package.json b/types/react-scroll-into-view-if-needed/package.json
index 7a6b32f755..bc0a926e27 100644
--- a/types/react-scroll-into-view-if-needed/package.json
+++ b/types/react-scroll-into-view-if-needed/package.json
@@ -1,6 +1,6 @@
 {
-  "private": true,
-  "dependencies": {
-    "'scroll-into-view-if-needed'": "*"
-  }
-}
\ No newline at end of file
+    "private": true,
+    "dependencies": {
+        "scroll-into-view-if-needed": "*"
+    }
+}
diff --git a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
index d9845582e7..7c5f15c769 100644
--- a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
+++ b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
@@ -24,7 +24,7 @@ const invalidOptions = {
 () => (
     <ReactScrollIntoViewIfNeeded
         active={true}
-        options={invalidOptions}
+        options={invalidOptions} // $ExpectError
         elementType="h1"
     >
         Children

From a4300b74f24773ef3ef5986420097eb1c7b07d3f Mon Sep 17 00:00:00 2001
From: Jonathan Ly <jonathanlyhv@gmail.com>
Date: Mon, 25 Feb 2019 13:36:32 +1100
Subject: [PATCH 126/924] [react-scroll-into-view-if-needed] Fix specs

---
 ...react-scroll-into-view-if-needed-tests.tsx | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
index 7c5f15c769..388a96fa1b 100644
--- a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
+++ b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
@@ -1,20 +1,14 @@
 import * as React from 'react';
 import ReactScrollIntoViewIfNeeded from 'react-scroll-into-view-if-needed';
 
-const validOptions = {
-    block: 'start',
-    scrollMode: 'if-needed',
-    skipOverflowHiddenElements: true
-};
-
-const invalidOptions = {
-    invalidOption: 'foobar'
-};
-
 () => (
     <ReactScrollIntoViewIfNeeded
         active={true}
-        options={validOptions}
+        options={{
+            block: 'start',
+            scrollMode: 'if-needed',
+            skipOverflowHiddenElements: true
+        }}
         elementType="h1"
     >
         Children
@@ -23,9 +17,7 @@ const invalidOptions = {
 
 () => (
     <ReactScrollIntoViewIfNeeded
-        active={true}
         options={invalidOptions} // $ExpectError
-        elementType="h1"
     >
         Children
     </ReactScrollIntoViewIfNeeded>
@@ -34,8 +26,6 @@ const invalidOptions = {
 () => (
     <ReactScrollIntoViewIfNeeded
         active={5} // $ExpectError
-        options={validOptions}
-        elementType="h1"
     >
         Children
     </ReactScrollIntoViewIfNeeded>
@@ -43,8 +33,6 @@ const invalidOptions = {
 
 () => (
     <ReactScrollIntoViewIfNeeded
-        active={true}
-        options={validOptions}
         elementType="h8" // $ExpectError
     >
         Children

From 5dcfc57e4f868bd24abcfbd3aee1d741c25e631e Mon Sep 17 00:00:00 2001
From: Jonathan Ly <jonathanlyhv@gmail.com>
Date: Mon, 25 Feb 2019 13:45:35 +1100
Subject: [PATCH 127/924] [react-scroll-into-view-if-needed] Write better
 failing options test

---
 .../react-scroll-into-view-if-needed-tests.tsx     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
index 388a96fa1b..562615e74c 100644
--- a/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
+++ b/types/react-scroll-into-view-if-needed/react-scroll-into-view-if-needed-tests.tsx
@@ -1,6 +1,16 @@
 import * as React from 'react';
 import ReactScrollIntoViewIfNeeded from 'react-scroll-into-view-if-needed';
 
+const validOptions = {
+    block: 'start',
+    scrollMode: 'if-needed',
+    skipOverflowHiddenElements: true
+};
+
+const invalidOptions = {
+    invalidOption: 'foobar'
+};
+
 () => (
     <ReactScrollIntoViewIfNeeded
         active={true}
@@ -17,7 +27,9 @@ import ReactScrollIntoViewIfNeeded from 'react-scroll-into-view-if-needed';
 
 () => (
     <ReactScrollIntoViewIfNeeded
-        options={invalidOptions} // $ExpectError
+        options={{
+            invalidOption: 'foobar' // $ExpectError
+        }}
     >
         Children
     </ReactScrollIntoViewIfNeeded>

From 4024ad1b37fe5b8839e8151b6b1d703ae4d8da5f Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Mon, 25 Feb 2019 14:40:45 +1100
Subject: [PATCH 128/924] Added type defs for CipherBase

---
 types/cipher-base/cipher-base-tests.ts | 17 +++++++++++++++++
 types/cipher-base/index.d.ts           | 14 ++++++++++++++
 types/cipher-base/tsconfig.json        | 25 +++++++++++++++++++++++++
 types/cipher-base/tslint.json          |  3 +++
 4 files changed, 59 insertions(+)
 create mode 100644 types/cipher-base/cipher-base-tests.ts
 create mode 100644 types/cipher-base/index.d.ts
 create mode 100644 types/cipher-base/tsconfig.json
 create mode 100644 types/cipher-base/tslint.json

diff --git a/types/cipher-base/cipher-base-tests.ts b/types/cipher-base/cipher-base-tests.ts
new file mode 100644
index 0000000000..173a72b7f6
--- /dev/null
+++ b/types/cipher-base/cipher-base-tests.ts
@@ -0,0 +1,17 @@
+import CipherBase from "cipher-base";
+
+const buf = new Buffer(1);
+
+class CipherTest extends CipherBase {
+    constructor() {
+        super();
+    }
+
+    final() {
+        return buf;
+    }
+
+    update(testBuffer: Buffer) {
+        return testBuffer;
+    }
+}
diff --git a/types/cipher-base/index.d.ts b/types/cipher-base/index.d.ts
new file mode 100644
index 0000000000..228920ac91
--- /dev/null
+++ b/types/cipher-base/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for cipher-base 1.0
+// Project: https://github.com/crypto-browserify/cipher-base
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare abstract class CipherBase {
+    constructor(hashMode?: string);
+    abstract final(): Buffer;
+    abstract update(value: Buffer, inputEnc?: string, outputEnc?: string): Buffer;
+}
+
+export default CipherBase;
diff --git a/types/cipher-base/tsconfig.json b/types/cipher-base/tsconfig.json
new file mode 100644
index 0000000000..217193ea64
--- /dev/null
+++ b/types/cipher-base/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "cipher-base-tests.ts"
+    ]
+}
diff --git a/types/cipher-base/tslint.json b/types/cipher-base/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/cipher-base/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 4a5ac1ec5722b64c65137c6d864c1199d7222462 Mon Sep 17 00:00:00 2001
From: VincentBel <buaazqh@gmail.com>
Date: Mon, 25 Feb 2019 12:01:33 +0800
Subject: [PATCH 129/924] [redux-form] copy files to v7 directory

---
 types/redux-form/v7/immutable/index.d.ts      |  30 ++
 types/redux-form/v7/index.d.ts                |  62 +++
 types/redux-form/v7/lib/Field.d.ts            | 103 ++++
 types/redux-form/v7/lib/FieldArray.d.ts       |  61 +++
 types/redux-form/v7/lib/Fields.d.ts           |  31 ++
 types/redux-form/v7/lib/Form.d.ts             |  12 +
 types/redux-form/v7/lib/FormName.d.ts         |   9 +
 types/redux-form/v7/lib/FormSection.d.ts      |  10 +
 types/redux-form/v7/lib/SubmissionError.d.ts  |   7 +
 types/redux-form/v7/lib/actionTypes.d.ts      |  39 ++
 types/redux-form/v7/lib/actions.d.ts          |  92 ++++
 .../redux-form/v7/lib/formValueSelector.d.ts  |   8 +
 types/redux-form/v7/lib/formValues.d.ts       |  13 +
 types/redux-form/v7/lib/reducer.d.ts          |  42 ++
 types/redux-form/v7/lib/reduxForm.d.ts        | 164 +++++++
 types/redux-form/v7/lib/selectors.d.ts        |  25 +
 types/redux-form/v7/package.json              |   6 +
 types/redux-form/v7/redux-form-tests.tsx      | 464 ++++++++++++++++++
 types/redux-form/v7/tsconfig.json             |  40 ++
 types/redux-form/v7/tslint.json               |   7 +
 20 files changed, 1225 insertions(+)
 create mode 100644 types/redux-form/v7/immutable/index.d.ts
 create mode 100644 types/redux-form/v7/index.d.ts
 create mode 100644 types/redux-form/v7/lib/Field.d.ts
 create mode 100644 types/redux-form/v7/lib/FieldArray.d.ts
 create mode 100644 types/redux-form/v7/lib/Fields.d.ts
 create mode 100644 types/redux-form/v7/lib/Form.d.ts
 create mode 100644 types/redux-form/v7/lib/FormName.d.ts
 create mode 100644 types/redux-form/v7/lib/FormSection.d.ts
 create mode 100644 types/redux-form/v7/lib/SubmissionError.d.ts
 create mode 100644 types/redux-form/v7/lib/actionTypes.d.ts
 create mode 100644 types/redux-form/v7/lib/actions.d.ts
 create mode 100644 types/redux-form/v7/lib/formValueSelector.d.ts
 create mode 100644 types/redux-form/v7/lib/formValues.d.ts
 create mode 100644 types/redux-form/v7/lib/reducer.d.ts
 create mode 100644 types/redux-form/v7/lib/reduxForm.d.ts
 create mode 100644 types/redux-form/v7/lib/selectors.d.ts
 create mode 100644 types/redux-form/v7/package.json
 create mode 100644 types/redux-form/v7/redux-form-tests.tsx
 create mode 100644 types/redux-form/v7/tsconfig.json
 create mode 100644 types/redux-form/v7/tslint.json

diff --git a/types/redux-form/v7/immutable/index.d.ts b/types/redux-form/v7/immutable/index.d.ts
new file mode 100644
index 0000000000..2ce6164232
--- /dev/null
+++ b/types/redux-form/v7/immutable/index.d.ts
@@ -0,0 +1,30 @@
+export {
+    Field,
+    FieldArray,
+    Fields,
+    Form,
+    FormName,
+    FormSection,
+    reduxForm,
+    reducer,
+    formValueSelector,
+    getFormAsyncErrors,
+    getFormInitialValues,
+    getFormMeta,
+    getFormNames,
+    getFormSubmitErrors,
+    getFormSyncErrors,
+    getFormSyncWarnings,
+    getFormValues,
+    hasSubmitFailed,
+    hasSubmitSucceeded,
+    isDirty,
+    isInvalid,
+    isPristine,
+    isSubmitting,
+    isAsyncValidating,
+    isValid,
+    SubmissionError,
+    startSubmit,
+    stopSubmit,
+} from '../';
diff --git a/types/redux-form/v7/index.d.ts b/types/redux-form/v7/index.d.ts
new file mode 100644
index 0000000000..08d077875a
--- /dev/null
+++ b/types/redux-form/v7/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for redux-form 7.5
+// Project: https://github.com/erikras/redux-form, https://redux-form.com
+// Definitions by: Carson Full <https://github.com/carsonf>
+//                 Daniel Lytkin <https://github.com/aikoven>
+//                 Karol Janyst <https://github.com/LKay>
+//                 Luka Zakrajsek <https://github.com/bancek>
+//                 Alex Young <https://github.com/alsiola>
+//                 Anton Novik <https://github.com/tehbi4>
+//                 Huw Martin <https://github.com/huwmartin>
+//                 Ethan Resnick <https://github.com/ethanresnick>
+//                 Tim de Koning <https://github.com/reggino>
+//                 Maddi Joyce <https://github.com/maddijoyce>
+//                 Kamil Wojcik <https://github.com/smifun>
+//                 Mohamed Shaaban <https://github.com/mshaaban088>
+//                 Ethan Setnik <https://github.com/esetnik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+import {
+  ComponentClass,
+  StatelessComponent,
+  ReactElement
+} from "react";
+
+export type FieldType = "Field" | "FieldArray";
+
+export interface ErrorOther<T = string> {
+    _error?: T;
+}
+
+export type FormErrors<FormData = {}, T = string> = {
+    [P in keyof FormData]?: ReactElement | T;
+} & ErrorOther<T>;
+
+export interface WarningOther<T = void> {
+    _warning?: T;
+}
+
+export type FormWarnings<FormData = {}, T = void> = {
+    [P in keyof FormData]?: ReactElement | string | WarningOther<T>;
+};
+
+export interface RegisteredFieldState {
+    name: string;
+    type: FieldType;
+}
+
+export type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
+
+export * from "./lib/reduxForm";
+export * from "./lib/Field";
+export * from "./lib/Fields";
+export * from "./lib/FieldArray";
+export * from "./lib/Form";
+export * from "./lib/FormName";
+export * from "./lib/FormSection";
+export * from "./lib/formValues";
+export * from "./lib/formValueSelector";
+export * from "./lib/reducer";
+export * from "./lib/SubmissionError";
+export * from "./lib/actions";
+export * from "./lib/actionTypes";
+export * from "./lib/selectors";
diff --git a/types/redux-form/v7/lib/Field.d.ts b/types/redux-form/v7/lib/Field.d.ts
new file mode 100644
index 0000000000..194a322408
--- /dev/null
+++ b/types/redux-form/v7/lib/Field.d.ts
@@ -0,0 +1,103 @@
+import {
+    Component,
+    ComponentType,
+    ReactElement,
+    ChangeEvent,
+    DragEvent,
+    FocusEvent,
+    InputHTMLAttributes,
+    SelectHTMLAttributes,
+    TextareaHTMLAttributes
+} from "react";
+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, name?: any) => any;
+
+export type EventHandler<Event> = (event: Event, name?: string) => void;
+export type EventWithDataHandler<Event> = (event?: Event, newValue?: any, previousValue?: any, name?: string) => void;
+
+export interface EventOrValueHandler<Event> extends EventHandler<Event> {
+    (value: any): void;
+}
+
+export interface CommonFieldInputProps {
+    name: string;
+    onDragStart: EventHandler<DragEvent<any>>;
+    onDrop: EventHandler<DragEvent<any>>;
+    onFocus: EventHandler<FocusEvent<any>>;
+}
+
+export interface CommonFieldProps extends CommonFieldInputProps {
+    onBlur: EventWithDataHandler<FocusEvent<any>>;
+    onChange: EventWithDataHandler<ChangeEvent<any>>;
+}
+
+export interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
+    name: string;
+    component?: ComponentType<WrappedFieldProps & P> | "input" | "select" | "textarea";
+    format?: Formatter | null;
+    normalize?: Normalizer;
+    props?: P;
+    parse?: Parser;
+    validate?: Validator | Validator[];
+    warn?: Validator | Validator[];
+    withRef?: boolean;
+    immutableProps?: string[];
+}
+
+export interface GenericField<P> extends Component<BaseFieldProps<P> & P> {
+    dirty: boolean;
+    name: string;
+    pristine: boolean;
+    value: any;
+    getRenderedComponent(): Component<WrappedFieldProps & P>;
+}
+
+export type GenericFieldHTMLAttributes =
+    InputHTMLAttributes<HTMLInputElement> |
+    SelectHTMLAttributes<HTMLSelectElement> |
+    TextareaHTMLAttributes<HTMLTextAreaElement>;
+
+export class Field<P extends GenericFieldHTMLAttributes | BaseFieldProps = GenericFieldHTMLAttributes | BaseFieldProps> extends Component<P> {
+    dirty: boolean;
+    name: string;
+    pristine: boolean;
+    value: any;
+    getRenderedComponent(): Component<WrappedFieldProps & P>;
+}
+
+export interface WrappedFieldProps {
+    input: WrappedFieldInputProps;
+    meta: WrappedFieldMetaProps;
+}
+
+export interface WrappedFieldInputProps extends CommonFieldInputProps {
+    checked?: boolean;
+    value: any;
+    onBlur: EventOrValueHandler<FocusEvent<any>>;
+    onChange: EventOrValueHandler<ChangeEvent<any>>;
+}
+
+export interface WrappedFieldMetaProps {
+    active?: boolean;
+    autofilled: boolean;
+    asyncValidating: boolean;
+    dirty: boolean;
+    dispatch: Dispatch<any>;
+    error?: any;
+    form: string;
+    initial: any;
+    invalid: boolean;
+    pristine: boolean;
+    submitting: boolean;
+    submitFailed: boolean;
+    touched: boolean;
+    valid: boolean;
+    visited: boolean;
+    warning?: any;
+}
+
+export default Field;
diff --git a/types/redux-form/v7/lib/FieldArray.d.ts b/types/redux-form/v7/lib/FieldArray.d.ts
new file mode 100644
index 0000000000..a4599b5e97
--- /dev/null
+++ b/types/redux-form/v7/lib/FieldArray.d.ts
@@ -0,0 +1,61 @@
+import { Component, ComponentType } from "react";
+import { Validator } from "../index";
+
+export interface BaseFieldArrayProps<P = {}> {
+    name: string;
+    component: ComponentType<P>;
+    validate?: Validator | Validator[];
+    warn?: Validator | Validator[];
+    withRef?: boolean;
+    props?: P;
+    rerenderOnEveryChange?: boolean;
+}
+
+export interface GenericFieldArray<Field, P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> {
+    name: string;
+    valid: boolean;
+    getRenderedComponent(): Component<WrappedFieldArrayProps<Field> & P>;
+}
+
+export class FieldArray<P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> implements GenericFieldArray<any, P> {
+    name: string;
+    valid: boolean;
+    getRenderedComponent(): Component<WrappedFieldArrayProps<any> & P>;
+}
+
+export interface WrappedFieldArrayProps<FieldValue> {
+    fields: FieldArrayFieldsProps<FieldValue>;
+    meta: FieldArrayMetaProps;
+}
+
+export type FieldIterate<FieldValue, R = void> = (name: string, index: number, fields: FieldArrayFieldsProps<FieldValue>) => R;
+
+export interface FieldArrayFieldsProps<FieldValue> {
+    forEach(callback: FieldIterate<FieldValue>): void;
+    get(index: number): FieldValue;
+    getAll(): FieldValue[];
+    removeAll(): void;
+    insert(index: number, value: FieldValue): void;
+    name: string;
+    length: number;
+    map<R>(callback: FieldIterate<FieldValue, R>): R[];
+    pop(): FieldValue;
+    push(value: FieldValue): void;
+    remove(index: number): void;
+    shift(): FieldValue;
+    swap(indexA: number, indexB: number): void;
+    move(from: number, to: number): void;
+    unshift(value: FieldValue): void;
+}
+
+export interface FieldArrayMetaProps {
+    dirty: boolean;
+    error?: any;
+    form: string;
+    invalid: boolean;
+    pristine: boolean;
+    submitFailed: boolean;
+    submitting: boolean;
+    valid: boolean;
+    warning?: any;
+}
diff --git a/types/redux-form/v7/lib/Fields.d.ts b/types/redux-form/v7/lib/Fields.d.ts
new file mode 100644
index 0000000000..f5ec106852
--- /dev/null
+++ b/types/redux-form/v7/lib/Fields.d.ts
@@ -0,0 +1,31 @@
+import { Component, ComponentType } from "react";
+import { Formatter, Parser, WrappedFieldProps } from "../index";
+
+interface BaseFieldsProps<P = {}> {
+    names: string[];
+    component?: ComponentType<any>;
+    format?: Formatter | null;
+    props?: P;
+    parse?: Parser;
+    withRef?: boolean;
+}
+
+export interface GenericFields<P> extends Component<BaseFieldsProps<P> & P> {
+    dirty: boolean;
+    names: string[];
+    pristine: boolean;
+    values: { [name: string]: any };
+    getRenderedComponent(): Component<BaseFieldsProps & WrappedFieldsProps & P>;
+}
+
+export class Fields<P = {}> extends Component<BaseFieldsProps<P> & P> implements GenericFields<P> {
+    dirty: boolean;
+    names: string[];
+    pristine: boolean;
+    values: { [name: string]: any };
+    getRenderedComponent(): Component<BaseFieldsProps & WrappedFieldsProps & P>;
+}
+
+interface WrappedFieldsProps {
+    [name: string]: WrappedFieldsProps & WrappedFieldProps;
+}
diff --git a/types/redux-form/v7/lib/Form.d.ts b/types/redux-form/v7/lib/Form.d.ts
new file mode 100644
index 0000000000..0eee944be5
--- /dev/null
+++ b/types/redux-form/v7/lib/Form.d.ts
@@ -0,0 +1,12 @@
+import { Component, FormHTMLAttributes, FormEvent, FormEventHandler } from "react";
+import { FormProps, FormErrors, FormSubmitHandler, Omit } from "../index";
+
+interface FormSubmitProp<FormData = {}, P = {}, ErrorType = string> {
+    onSubmit?: FormSubmitHandler<FormData, P, ErrorType>;
+}
+
+export type FormProps<FormData, P, ErrorType = string> = Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> & FormSubmitProp<FormData, P, ErrorType>;
+
+export class GenericForm<FormData, P, ErrorType> extends Component<FormProps<FormData, P, ErrorType>> {}
+
+export class Form<FormData = {}, P = {}, ErrorType = string> extends Component<FormProps<FormData, P, ErrorType>> implements GenericForm<FormData, P, ErrorType> {}
diff --git a/types/redux-form/v7/lib/FormName.d.ts b/types/redux-form/v7/lib/FormName.d.ts
new file mode 100644
index 0000000000..6cfc6f3708
--- /dev/null
+++ b/types/redux-form/v7/lib/FormName.d.ts
@@ -0,0 +1,9 @@
+import { ReactNode, StatelessComponent } from "react";
+
+export interface FormNameProps {
+    children: (props: { form: string }) => ReactNode;
+}
+
+export const FormName: StatelessComponent<FormNameProps>;
+
+export default FormName;
diff --git a/types/redux-form/v7/lib/FormSection.d.ts b/types/redux-form/v7/lib/FormSection.d.ts
new file mode 100644
index 0000000000..bed9ba765b
--- /dev/null
+++ b/types/redux-form/v7/lib/FormSection.d.ts
@@ -0,0 +1,10 @@
+import { Component, ComponentType } from "react";
+
+export interface FormSectionProps<P> {
+    name: string;
+    component?: ComponentType<P>;
+}
+
+export declare class FormSection<P = {}> extends Component<FormSectionProps<P> & P> {}
+
+export default FormSection;
diff --git a/types/redux-form/v7/lib/SubmissionError.d.ts b/types/redux-form/v7/lib/SubmissionError.d.ts
new file mode 100644
index 0000000000..50695f34d0
--- /dev/null
+++ b/types/redux-form/v7/lib/SubmissionError.d.ts
@@ -0,0 +1,7 @@
+import { FormErrors } from "../index";
+
+export declare class SubmissionError<FormData = {}, ErrorType = string> extends Error {
+  constructor(errors?: FormErrors<FormData, ErrorType>);
+}
+
+export default SubmissionError;
diff --git a/types/redux-form/v7/lib/actionTypes.d.ts b/types/redux-form/v7/lib/actionTypes.d.ts
new file mode 100644
index 0000000000..7718ba74ab
--- /dev/null
+++ b/types/redux-form/v7/lib/actionTypes.d.ts
@@ -0,0 +1,39 @@
+export interface ActionTypes {
+    ARRAY_INSERT: string;
+    ARRAY_MOVE: string;
+    ARRAY_POP: string;
+    ARRAY_PUSH: string;
+    ARRAY_REMOVE: string;
+    ARRAY_REMOVE_ALL: string;
+    ARRAY_SHIFT: string;
+    ARRAY_SPLICE: string;
+    ARRAY_UNSHIFT: string;
+    ARRAY_SWAP: string;
+    AUTOFILL: string;
+    BLUR: string;
+    CHANGE: string;
+    CLEAR_SUBMIT: string;
+    CLEAR_SUBMIT_ERRORS: string;
+    CLEAR_ASYNC_ERROR: string;
+    CLEAR_FIELDS: string;
+    DESTROY: string;
+    FOCUS: string;
+    INITIALIZE: string;
+    REGISTER_FIELD: string;
+    RESET: string;
+    RESET_SECTION: string;
+    SET_SUBMIT_FAILED: string;
+    SET_SUBMIT_SUCCEEDED: string;
+    START_ASYNC_VALIDATION: string;
+    START_SUBMIT: string;
+    STOP_ASYNC_VALIDATION: string;
+    STOP_SUBMIT: string;
+    SUBMIT: string;
+    TOUCH: string;
+    UNREGISTER_FIELD: string;
+    UNTOUCH: string;
+    UPDATE_SYNC_ERRORS: string;
+    UPDATE_SYNC_WARNINGS: string;
+}
+
+export const actionTypes: ActionTypes;
diff --git a/types/redux-form/v7/lib/actions.d.ts b/types/redux-form/v7/lib/actions.d.ts
new file mode 100644
index 0000000000..955d3d3f5e
--- /dev/null
+++ b/types/redux-form/v7/lib/actions.d.ts
@@ -0,0 +1,92 @@
+import { Action } from "redux";
+import { FormErrors, FormWarnings, FieldType } from "../index";
+
+export interface FormAction extends Action {
+    meta?: any;
+    payload?: any;
+    error?: any;
+}
+
+export declare function arrayInsert(form: string, field: string, index: number, value: any): FormAction;
+export declare function arrayMove(form: string, field: string, from: number, to: number): FormAction;
+export declare function arrayPop(form: string, field: string): FormAction;
+export declare function arrayPush(form: string, field: string, value: any): FormAction;
+export declare function arrayRemove(form: string, field: string, index: number): FormAction;
+export declare function arrayRemoveAll(form: string, field: string): FormAction;
+export declare function arrayShift(form: string, field: string): FormAction;
+export declare function arraySplice(form: string, field: string, index: number, removeNum: number, value: any): FormAction;
+export declare function arraySwap(form: string, field: string, indexA: number, indexB: number): FormAction;
+export declare function arrayUnshift(form: string, field: string, value: any): FormAction;
+export declare function autofill(form: string, field: string, value: any): FormAction;
+export declare function blur(form: string, field: string, value: any, touch?: boolean): FormAction;
+export declare function change(form: string, field: string, value: any, touch?: boolean, persistentSubmitErrors?: boolean): FormAction;
+export declare function destroy(...form: string[]): FormAction;
+export declare function focus(form: string, field: string): FormAction;
+
+export interface InitializeOptions {
+    keepDirty: boolean;
+    keepSubmitSucceeded: boolean;
+    updateUnregisteredFields: boolean;
+    keepValues: boolean;
+}
+
+export declare function initialize(form: string, data: any, keepDirty?: boolean, options?: Partial<InitializeOptions>): FormAction;
+export declare function initialize(form: string, data: any, options?: Partial<InitializeOptions>): FormAction;
+export declare function registerField(form: string, name: string, type: FieldType): FormAction;
+export declare function reset(form: string): FormAction;
+export declare function resetSection(form: string, ...sections: string[]): FormAction;
+export declare function startAsyncValidation(form: string): FormAction;
+export declare function stopAsyncValidation(form: string, errors?: FormErrors<FormData, any>): FormAction;
+export declare function setSubmitFailed(form: string, ...fields: string[]): FormAction;
+export declare function setSubmitSucceeded(form: string, ...fields: string[]): FormAction;
+export declare function startSubmit(form: string): FormAction;
+export declare function stopSubmit(form: string, errors?: FormErrors<FormData, any>): FormAction;
+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;
+export declare function updateSyncErrors<T = any>(from: string, syncErrors: FormErrors<FormData, T>, error: T): FormAction;
+export declare function updateSyncWarnings<T = any>(form: string, syncWarnings: FormWarnings<FormData, T>, warning: T): FormAction;
+
+declare const actions: {
+    arrayInsert: typeof arrayInsert,
+    arrayMove: typeof arrayMove,
+    arrayPop: typeof arrayPop,
+    arrayPush: typeof arrayPush,
+    arrayRemove: typeof arrayRemove,
+    arrayRemoveAll: typeof arrayRemoveAll,
+    arrayShift: typeof arrayShift,
+    arraySplice: typeof arraySplice,
+    arraySwap: typeof arraySwap,
+    arrayUnshift: typeof arrayUnshift,
+    autofill: typeof autofill,
+    blur: typeof blur,
+    change: typeof change,
+    clearSubmit: typeof clearSubmit,
+    clearSubmitErrors: typeof clearSubmitErrors,
+    clearAsyncError: typeof clearAsyncError,
+    clearFields: typeof clearFields,
+    destroy: typeof destroy,
+    focus: typeof focus,
+    initialize: typeof initialize,
+    registerField: typeof registerField,
+    reset: typeof reset,
+    startAsyncValidation: typeof startAsyncValidation,
+    startSubmit: typeof startSubmit,
+    stopAsyncValidation: typeof stopAsyncValidation,
+    stopSubmit: typeof stopSubmit,
+    submit: typeof submit,
+    setSubmitFailed: typeof setSubmitFailed,
+    setSubmitSucceeded: typeof setSubmitSucceeded,
+    touch: typeof touch,
+    unregisterField: typeof unregisterField,
+    untouch: typeof untouch,
+    updateSyncErrors: typeof updateSyncErrors,
+    updateSyncWarnings: typeof updateSyncWarnings
+};
+
+export default actions;
diff --git a/types/redux-form/v7/lib/formValueSelector.d.ts b/types/redux-form/v7/lib/formValueSelector.d.ts
new file mode 100644
index 0000000000..e13ffd3c5d
--- /dev/null
+++ b/types/redux-form/v7/lib/formValueSelector.d.ts
@@ -0,0 +1,8 @@
+import { FormStateMap } from "../index";
+
+export function formValueSelector<State = {}>(
+    form: string,
+    getFormState?: (state: State) => FormStateMap
+): (state: State, ...field: string[]) => any;
+
+export default formValueSelector;
diff --git a/types/redux-form/v7/lib/formValues.d.ts b/types/redux-form/v7/lib/formValues.d.ts
new file mode 100644
index 0000000000..1052f8533e
--- /dev/null
+++ b/types/redux-form/v7/lib/formValues.d.ts
@@ -0,0 +1,13 @@
+import { ComponentClass, ComponentType } from "react";
+import { InjectedFormProps } from "../index";
+
+export function formValues<
+    Values,
+    P = {}
+>(obj: Values): (component: ComponentType<P & { [K in keyof Values]: any }>) => ComponentClass<P & { [K in keyof Values]: any }>;
+
+export function formValues<
+    FormData = {},
+    K extends keyof FormData = keyof FormData,
+    P = {}
+>(...names: K[]): (component: ComponentType<P & Pick<FormData, K>>) => ComponentClass<P & Pick<FormData, K>>;
diff --git a/types/redux-form/v7/lib/reducer.d.ts b/types/redux-form/v7/lib/reducer.d.ts
new file mode 100644
index 0000000000..f2ee374cf2
--- /dev/null
+++ b/types/redux-form/v7/lib/reducer.d.ts
@@ -0,0 +1,42 @@
+import { Reducer } from "redux";
+import { FieldType } from "../index";
+
+export interface FormReducer extends Reducer<FormStateMap> {
+    plugin(reducers: FormReducerMapObject): Reducer<FormStateMap>;
+}
+
+export const reducer: FormReducer;
+
+export interface FormReducerMapObject {
+    // and `<any>` to make it compatible with redux@3
+    // tslint:disable-next-line use-default-type-parameter
+    [formName: string]: Reducer<any>;
+}
+
+export interface FormStateMap {
+    [formName: string]: FormState;
+}
+
+export interface FormState {
+    registeredFields: RegisteredFieldState[];
+    fields?: {[name: string]: FieldState};
+    values?: { [fieldName: string]: any };
+    active?: string;
+    anyTouched?: boolean;
+    submitting?: boolean;
+    submitErrors?: { [fieldName: string]: string };
+    submitFailed?: boolean;
+}
+
+export interface RegisteredFieldState {
+    name: string;
+    type: FieldType;
+}
+
+export interface FieldState {
+    active?: boolean;
+    touched?: boolean;
+    visited?: boolean;
+}
+
+export default reducer;
diff --git a/types/redux-form/v7/lib/reduxForm.d.ts b/types/redux-form/v7/lib/reduxForm.d.ts
new file mode 100644
index 0000000000..e37214f5d0
--- /dev/null
+++ b/types/redux-form/v7/lib/reduxForm.d.ts
@@ -0,0 +1,164 @@
+import {
+    Component,
+    ComponentClass,
+    ComponentType,
+    ReactElement,
+    SyntheticEvent,
+    StatelessComponent,
+    FormEventHandler
+} from "react";
+import { Dispatch } from "redux";
+import {
+    FormErrors,
+    ErrorOther,
+    FormWarnings,
+    WarningOther,
+    RegisteredFieldState,
+    FormStateMap
+} from "../index";
+
+export type FormSubmitHandler<FormData = {}, P = {}, ErrorType = string> =
+    (values: FormData, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData, ErrorType> | Promise<any>;
+
+export type GetFormState = (state: any) => FormStateMap;
+export interface SubmitHandler<FormData = {}, P = {}, ErrorType = string> {
+    (
+        submit: FormSubmitHandler<FormData, P, ErrorType>,
+        props?: InjectedFormProps<FormData, P, ErrorType>,
+        valid?: boolean,
+        asyncValidate?: any,
+        fields?: string[]
+    ): any;
+    (event: SyntheticEvent<any>): void;
+}
+
+export interface ValidateCallback<FormData, P, ErrorType> {
+    values: FormData;
+    nextProps: P & InjectedFormProps<FormData, P, ErrorType>;
+    props: P & InjectedFormProps<FormData, P, ErrorType>;
+    initialRender: boolean;
+    structure: any;
+}
+
+export interface AsyncValidateCallback<FormData, ErrorType> {
+    asyncErrors?: FormErrors<FormData, ErrorType>;
+    initialized: boolean;
+    trigger: "blur" | "submit";
+    blurredField?: string;
+    pristine: boolean;
+    syncValidationPasses: boolean;
+}
+
+export interface InjectedArrayProps {
+    insert(field: string, index: number, value: any): void;
+    move(field: string, from: number, to: number): void;
+    pop(field: string): void;
+    push(field: string, value: any): void;
+    remove(field: string, index: number): void;
+    removeAll(field: string): void;
+    shift(field: string): void;
+    splice(field: string, index: number, removeNum: number, value: any): void;
+    swap(field: string, indexA: number, indexB: number): void;
+    unshift(field: string, value: any): void;
+}
+
+export interface RegisteredField {
+    count: number;
+    name: string;
+    type: "Field" | "FieldArray";
+}
+
+export interface InjectedFormProps<FormData = {}, P = {}, ErrorType = string> {
+    anyTouched: boolean;
+    array: InjectedArrayProps;
+    asyncValidate(): void;
+    asyncValidating: string | boolean;
+    autofill(field: string, value: any): void;
+    blur(field: string, value: any): void;
+    change(field: string, value: any): void;
+    clearAsyncError(field: string): void;
+    destroy(): void;
+    dirty: boolean;
+    error: ErrorType;
+    form: string;
+    handleSubmit: SubmitHandler<FormData, P, ErrorType>;
+    initialize(data: Partial<FormData>): void;
+    initialized: boolean;
+    initialValues: Partial<FormData>;
+    invalid: boolean;
+    pristine: boolean;
+    reset(): void;
+    submitFailed: boolean;
+    submitSucceeded: boolean;
+    submitting: boolean;
+    touch(...field: string[]): void;
+    untouch(...field: string[]): void;
+    valid: boolean;
+    warning: any;
+    registeredFields: { [name: string]: RegisteredField };
+}
+
+export interface ConfigProps<FormData = {}, P = {}, ErrorType = string> {
+    form: string;
+    asyncBlurFields?: string[];
+    asyncChangeFields?: string[];
+    asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>, blurredField: string): Promise<any>;
+    destroyOnUnmount?: boolean;
+    enableReinitialize?: boolean;
+    forceUnregisterOnUnmount?: boolean;
+    getFormState?: GetFormState;
+    immutableProps?: string[];
+    initialValues?: Partial<FormData>;
+    keepDirtyOnReinitialize?: boolean;
+    updateUnregisteredFields?: boolean;
+    onChange?(values: Partial<FormData>, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>, previousValues: Partial<FormData>): void;
+    onSubmit?: FormSubmitHandler<FormData, P & InjectedFormProps<FormData, P, ErrorType>, ErrorType> | SubmitHandler<FormData, P & InjectedFormProps<FormData, P, ErrorType>, ErrorType>;
+    onSubmitFail?(
+        errors: FormErrors<FormData, ErrorType> | undefined,
+        dispatch: Dispatch<any>,
+        submitError: any,
+        props: P & InjectedFormProps<FormData, P, ErrorType>
+    ): void;
+    onSubmitSuccess?(result: any, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>): void;
+    propNamespace?: string;
+    pure?: boolean;
+    shouldValidate?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldError?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldWarn?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldAsyncValidate?(params: AsyncValidateCallback<FormData, ErrorType>): boolean;
+    touchOnBlur?: boolean;
+    touchOnChange?: boolean;
+    persistentSubmitErrors?: boolean;
+    validate?(values: FormData, props: P & InjectedFormProps<FormData, P, ErrorType>): FormErrors<FormData, ErrorType>;
+    warn?(values: FormData, props: P & InjectedFormProps<FormData, P, ErrorType>): FormWarnings<FormData>;
+}
+
+export interface FormInstance<FormData, P, ErrorType> extends Component<P> {
+    dirty: boolean;
+    invalid: boolean;
+    pristine: boolean;
+    registeredFields: RegisteredFieldState[];
+    reset(): void;
+    resetSection(...sections: string[]): void;
+    submit(): Promise<any>;
+    valid: boolean;
+    values: Partial<FormData>;
+    wrappedInstance: ReactElement<P & InjectedFormProps<FormData, P, ErrorType>>;
+}
+
+export interface DecoratedComponentClass<FormData, P, ErrorType> {
+    new(props?: P, context?: any): FormInstance<FormData, P, ErrorType>;
+}
+
+export type FormDecorator<FormData, P, Config, ErrorType = string> =
+    (component: ComponentType<P & InjectedFormProps<FormData, P, ErrorType>>) => DecoratedComponentClass<FormData, P & Config, ErrorType>;
+
+export declare function reduxForm<FormData = {}, P = {}, ErrorType = string>(
+    config: ConfigProps<FormData, P, ErrorType>
+): FormDecorator<FormData, P, Partial<ConfigProps<FormData, P, ErrorType>>, ErrorType>;
+
+export declare function reduxForm<FormData = {}, P = {}, ErrorType = string>(
+    config: Partial<ConfigProps<FormData, P, ErrorType>>
+): FormDecorator<FormData, P, ConfigProps<FormData, P, ErrorType>, ErrorType>;
+
+export default reduxForm;
diff --git a/types/redux-form/v7/lib/selectors.d.ts b/types/redux-form/v7/lib/selectors.d.ts
new file mode 100644
index 0000000000..c97d99859b
--- /dev/null
+++ b/types/redux-form/v7/lib/selectors.d.ts
@@ -0,0 +1,25 @@
+import { FormErrors, GetFormState } from "../index";
+
+export type DataSelector<FormData = {}, State = {}> = (formName: string, getFormState?: GetFormState) => (state: State) => FormData;
+export type ErrorSelector<FormData = {}, State = {}, ErrorType = string> = (formName: string, getFormState?: GetFormState) => (state: State) => FormErrors<FormData, ErrorType>;
+export type BooleanSelector<State = {}> = (formName: string, getFormState?: GetFormState) => (state: State) => boolean;
+export type NamesSelector<State = {}> = (getFormState?: GetFormState) => (state: State) => string[];
+export type FormOrFieldsBooleanSelector<State = {}> = (formName: string, getFormState?: GetFormState) => (state: State, ...fields: string[]) => boolean;
+
+export const getFormValues: DataSelector;
+export const getFormInitialValues: DataSelector;
+export const getFormSyncErrors: ErrorSelector;
+export const getFormMeta: DataSelector;
+export const getFormAsyncErrors: ErrorSelector;
+export const getFormSyncWarnings: ErrorSelector;
+export const getFormSubmitErrors: ErrorSelector;
+export const getFormError: ErrorSelector;
+export const getFormNames: NamesSelector;
+export const isDirty: FormOrFieldsBooleanSelector;
+export const isPristine: FormOrFieldsBooleanSelector;
+export const isValid: BooleanSelector;
+export const isInvalid: BooleanSelector;
+export const isSubmitting: BooleanSelector;
+export const isAsyncValidating: BooleanSelector;
+export const hasSubmitSucceeded: BooleanSelector;
+export const hasSubmitFailed: BooleanSelector;
diff --git a/types/redux-form/v7/package.json b/types/redux-form/v7/package.json
new file mode 100644
index 0000000000..998f8e9b38
--- /dev/null
+++ b/types/redux-form/v7/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0 || ^4.0.0"
+    }
+}
diff --git a/types/redux-form/v7/redux-form-tests.tsx b/types/redux-form/v7/redux-form-tests.tsx
new file mode 100644
index 0000000000..8ad71bbc42
--- /dev/null
+++ b/types/redux-form/v7/redux-form-tests.tsx
@@ -0,0 +1,464 @@
+import * as React from 'react';
+import { Action, Dispatch } from "redux";
+import {
+    reduxForm,
+    InjectedFormProps,
+    Form,
+    FormName,
+    GenericForm,
+    FormSection,
+    formValues,
+    formValueSelector,
+    Field,
+    GenericField,
+    WrappedFieldProps,
+    Fields,
+    GenericFields,
+    WrappedFieldsProps,
+    FieldArray,
+    GenericFieldArray,
+    WrappedFieldArrayProps,
+    BaseFieldProps,
+    reducer,
+    FormAction,
+    actionTypes,
+    submit,
+    SubmissionError,
+    FieldArrayFieldsProps
+} from "redux-form";
+
+import {
+    Field as ImmutableField,
+    reduxForm as immutableReduxForm,
+    startSubmit as immutableStartSubmit,
+    stopSubmit as immutableStopSubmit
+} from "redux-form/immutable";
+
+import LibField, {
+    WrappedFieldProps as LibWrappedFieldProps
+} from "redux-form/lib/Field";
+import libReducer from "redux-form/lib/reducer";
+import LibFormSection from "redux-form/lib/FormSection";
+import libFormValueSelector from "redux-form/lib/formValueSelector";
+import libReduxForm from "redux-form/lib/reduxForm";
+import libActions from "redux-form/lib/actions";
+import LibSubmissionError from "redux-form/lib/SubmissionError";
+
+/* Decorated components */
+interface TestFormData {
+    foo: string;
+}
+
+/* Some tests only make sense with multiple values */
+interface MultivalueFormData {
+    foo: string;
+    bar?: string;
+    fizz: string;
+}
+
+interface TestFormComponentProps {
+    baz: string;
+}
+
+type InjectedProps = InjectedFormProps<TestFormData, TestFormComponentProps>;
+
+class TestFormComponent extends React.Component<TestFormComponentProps & InjectedProps> {
+    render() {
+        const { form, initialValues, error } = this.props;
+        const foo = initialValues.foo;
+        const errorIsString = error + 'test';
+        return null;
+    }
+}
+
+const TestFormRequired = reduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestForm = reduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
+const TestFormImmRequired = immutableReduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestFormImm = immutableReduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
+
+const TestFormStatelessComponent: React.StatelessComponent<TestFormComponentProps & InjectedProps> = ({ form, initialValues }) => {
+    const foo = initialValues.foo;
+    return null;
+};
+
+const TestFormStatelessRequired = reduxForm<TestFormData, TestFormComponentProps>({})(TestFormStatelessComponent);
+const TestFormStateless = reduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormStatelessComponent);
+
+/* formValues decorator */
+
+const ItemList = formValues<TestFormData>("foo")(
+    ({ foo }) => {
+        return null;
+    }
+);
+
+const ItemListObj = formValues({ fooBar : "foo" })(
+    ({ fooBar }) => {
+        return null;
+    }
+);
+
+/* Custom FormSection */
+
+interface MyFormSectionProps {
+    foo: string;
+}
+
+const MyFormSection: React.StatelessComponent<MyFormSectionProps> = ({ children, foo }) => null;
+
+/* Custom Field */
+
+interface MyFieldCustomProps {
+    foo: string;
+}
+type MyFieldProps = MyFieldCustomProps & WrappedFieldProps;
+const MyField: React.StatelessComponent<MyFieldProps> = ({
+    children,
+    input,
+    meta,
+    foo
+}) => {
+    input.onBlur("value");
+    input.onBlur({} as React.SyntheticEvent<HTMLDivElement>);
+
+    input.onChange("value");
+    input.onChange({} as React.SyntheticEvent<HTMLDivElement>);
+
+    input.onDragStart({} as React.DragEvent<HTMLDivElement>);
+
+    input.onDrop({} as React.DragEvent<HTMLDivElement>);
+
+    input.onFocus({} as React.FocusEvent<HTMLDivElement>);
+    return null;
+};
+const FieldCustom = Field as new () => GenericField<MyFieldCustomProps>;
+
+type FieldProps = BaseFieldProps<MyFieldCustomProps> & MyFieldCustomProps;
+const FieldCustomComp: React.StatelessComponent<FieldProps> = props => (
+    <FieldCustom {...props} component={MyField} />
+);
+
+const MyFieldImm: React.StatelessComponent<MyFieldProps> = ({
+    children,
+    input,
+    meta,
+    foo
+}) => null;
+const FieldImmutableCustom = ImmutableField as new () => GenericField<MyFieldCustomProps>;
+
+/* Custom Fields */
+
+interface MyFieldsCustomProps {
+    foo: string;
+}
+type MyFieldsProps = MyFieldsCustomProps & WrappedFieldsProps;
+const MyFields: React.StatelessComponent<MyFieldsCustomProps> = ({
+    children,
+    foo
+}) => null;
+const FieldsCustom = Fields as new () => GenericFields<MyFieldsCustomProps>;
+
+/* FieldArray */
+
+const MyArrayField: React.StatelessComponent = ({
+    children
+}) => null;
+
+/* Custom FieldArray */
+
+interface MyFieldValue {
+    num: number;
+}
+interface MyFieldArrayCustomProps {
+    foo: string;
+}
+
+const MyCustomArrayField: React.StatelessComponent<MyFieldArrayCustomProps> = ({
+    children,
+    foo
+}) => null;
+
+type MyFieldArrayProps = MyFieldArrayCustomProps & WrappedFieldArrayProps<MyFieldValue>;
+const MyFieldArray: React.StatelessComponent<MyFieldArrayProps> = ({
+    children,
+    fields
+}) => null;
+const FieldArrayCustom = FieldArray as new () => GenericFieldArray<MyFieldValue, MyFieldArrayCustomProps>;
+
+/* Tests */
+const TestForms: React.StatelessComponent = () => {
+    return (
+        <div>
+            <TestFormRequired form="test" baz='baz' />
+            <TestForm initialValues={ { foo : "test" } } baz='baz' />
+
+            <TestFormImmRequired form="test" baz='baz' />
+            <TestFormImm initialValues={ { foo : "test" } } baz='baz' />
+
+            <TestFormStatelessRequired form="test" baz='baz' />
+            <TestFormStateless baz='baz' />
+        </div>
+    );
+};
+
+// Specifying form data type is not required here, but is recommended to avoid confusion
+const testFormWithValidationDecorator = reduxForm<MultivalueFormData>({
+    form: "testWithValidation",
+    validate: (values, props) => {
+        return {
+            foo: "Bad foo"
+        };
+    }
+});
+
+// Specifying form data type is not required here, but is recommended to avoid confusion
+const testFormWithInitialValuesDecorator = reduxForm<MultivalueFormData>({
+    form: "testWithValidation",
+    initialValues: {
+        foo: "A Foo is here"
+    }
+});
+
+// Specifying form data type *is* required here, because type inference will guess the type of
+// the form data type parameter to be {foo: string}. The result of validate does not contain "foo"
+const testFormWithInitialValuesAndValidationDecorator = reduxForm<MultivalueFormData>({
+    form: "testWithValidation",
+    initialValues: {
+        foo: "A Foo is here"
+    },
+    validate: (values, props) => {
+        return {
+            bar: "Bad foo"
+        };
+    }
+});
+
+const testFormWithChangeFunctionDecorator = reduxForm<TestFormData, TestFormComponentProps>({
+    form: "testWithValidation",
+    onChange: (values: Partial<TestFormData>,
+        dispatch: Dispatch<any>,
+        props: TestFormComponentProps & InjectedFormProps<TestFormData, TestFormComponentProps>,
+        previousValues: Partial<TestFormData>) => {}
+});
+
+type TestProps = {} & InjectedFormProps<TestFormData>;
+const Test = reduxForm<TestFormData>({
+    form : "test"
+})(
+    class Test extends React.Component<TestProps> {
+        handleSubmitForm = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: {}) => {};
+
+        render() {
+            const { handleSubmit } = this.props;
+            const FormCustom = Form as new () => GenericForm<TestFormData, {}, string>;
+
+            return (
+                <div>
+                    <FormCustom onSubmit={ handleSubmit(this.handleSubmitForm) }>
+                        <FormSection<MyFormSectionProps>
+                            name="my-section"
+                            component={MyFormSection}
+                            foo="hello"
+                        />
+
+                        <FormSection name="test2">
+                            <Field
+                                name="field1"
+                                type="email"
+                                component="input"
+                            />
+
+                            <Field
+                                name="field2"
+                                component="textarea"
+                            />
+
+                            <Field
+                                name="field3"
+                                component="select"
+                            />
+
+                            <Field
+                                name="field4"
+                                component="input"
+                                onChange={(event, newValue, previousValue, fieldName) => {}}
+                                onBlur={(event, newValue, previousValue, fieldName) => {}}
+                            />
+
+                            <ImmutableField
+                                name="field3im"
+                                component="select"
+                            />
+
+                            <Field
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
+                            <FieldCustom
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
+                            <FieldCustomComp
+                                name="field_4_comp"
+                                foo="bar"
+                            />
+
+                            <FieldImmutableCustom
+                                name="field4"
+                                component={ MyField }
+                                foo="bar"
+                            />
+
+                            <Fields
+                                names={ ["field5", "field6"] }
+                                component={ () => null }
+                            />
+
+                            <FieldsCustom
+                                names={ ["field7", "field8"] }
+                                component={ () => null }
+                                foo="bar"
+                            />
+
+                            <FieldArray<{}>
+                                name="field9"
+                                component={ MyArrayField }
+                            />
+
+                            <FieldArrayCustom
+                                name="field10"
+                                component={ MyCustomArrayField }
+                                foo="bar"
+                            />
+                        </FormSection>
+                    </FormCustom>
+                </div>
+            );
+        }
+    }
+);
+
+reducer({}, {
+    type: "ACTION"
+});
+
+reducer.plugin({
+    myForm: (state: any, action: FormAction) => {
+        if (action.type === actionTypes.CHANGE && action.meta.form === "securitySettings") {
+            return {
+                ...state,
+                values: {
+                    ...state.values,
+                    downloadLinkAutoPassword: true,
+                },
+            };
+        } else {
+            return state;
+        }
+    }
+});
+
+try {
+    throw new SubmissionError({_error: "Submission failed."});
+} catch (error) {
+    if (!(error instanceof SubmissionError)) {
+        throw new Error("SubmissionError not imported correctly");
+    }
+}
+
+/* Test using versions imported directly/as defaults from lib */
+const DefaultField = (
+    <LibField
+        name="defaultfield"
+        component="input"
+        type="text"
+    />
+);
+
+libReducer({}, {
+    type: "ACTION"
+});
+
+const DefaultFormSection = (
+    <LibFormSection
+        name="defaultformsection"
+    />
+);
+
+const TestLibFormRequired = libReduxForm<TestFormData, TestFormComponentProps>({})(TestFormComponent);
+const TestLibForm = libReduxForm<TestFormData, TestFormComponentProps>({ form : "test" })(TestFormComponent);
+
+const testSubmit = submit("test");
+const testLibSubmit = libActions.submit("test");
+
+try {
+    throw new LibSubmissionError({_error: "Submission failed."});
+} catch (error) {
+    if (!(error instanceof LibSubmissionError)) {
+        throw new Error("SubmissionError from lib not imported correctly");
+    }
+}
+
+/* Test handleSubmit prop using as onSubmit handler */
+type HandleSubmitTestProps = {} & InjectedFormProps<TestFormData>;
+const HandleSubmitTestForm = reduxForm<TestFormData>({
+    form : "test"
+})(
+    (props: HandleSubmitTestProps) => <form onSubmit={ props.handleSubmit } />
+);
+
+class HandleSubmitTest extends React.Component {
+    handleSubmit = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: {}) => {};
+    render() {
+        return <HandleSubmitTestForm onSubmit={this.handleSubmit} />;
+    }
+}
+
+class FormNameTest extends React.Component {
+    render() {
+        return (
+            <FormName>
+                {({ form }) => <span>Form Name is: {form}</span>}
+            </FormName>
+        );
+    }
+}
+
+// Test SubmissionError with custom error format
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26494
+// Note: explicit parameters not needed in TS 2.7
+new LibSubmissionError<{ myField: any }, string[]>({
+    _error: ["First form-level error", "Second form-level error"],
+    myField: ["Field-level error"]
+});
+
+new SubmissionError({
+    _error: ["First form-level error", "Second form-level error"]
+});
+
+// Test forms with custom error format.
+const HandleSubmitTestForm2 = reduxForm<TestFormData, {}, string[]>({ form : "test" })(
+    (props: InjectedFormProps<TestFormData, {}, string[]>) => <form onSubmit={ props.handleSubmit } />
+);
+
+class HandleSubmitTest2 extends React.Component {
+    handleSubmit = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: {}) => {};
+    render() {
+        return <HandleSubmitTestForm2 onSubmit={this.handleSubmit} />;
+    }
+}
+
+type InjectedProps2 = InjectedFormProps<TestFormData, TestFormComponentProps, string[]>;
+class TestFormComponent2 extends React.Component<TestFormComponentProps & InjectedProps2> {
+    render() {
+        const { error, initialValues, handleSubmit } = this.props;
+        error.concat(['error is a string array']);
+
+        handleSubmit((values) => ({ foo: ['string'], _error: [] }));
+        return null;
+    }
+}
diff --git a/types/redux-form/v7/tsconfig.json b/types/redux-form/v7/tsconfig.json
new file mode 100644
index 0000000000..f106f20d16
--- /dev/null
+++ b/types/redux-form/v7/tsconfig.json
@@ -0,0 +1,40 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "experimentalDecorators": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-form-tests.tsx",
+        "immutable/index.d.ts",
+        "lib/actions.d.ts",
+        "lib/actionTypes.d.ts",
+        "lib/Field.d.ts",
+        "lib/Fields.d.ts",
+        "lib/FieldArray.d.ts",
+        "lib/Form.d.ts",
+        "lib/FormSection.d.ts",
+        "lib/formValues.d.ts",
+        "lib/formValueSelector.d.ts",
+        "lib/reducer.d.ts",
+        "lib/reduxForm.d.ts",
+        "lib/selectors.d.ts",
+        "lib/SubmissionError.d.ts"
+    ]
+}
diff --git a/types/redux-form/v7/tslint.json b/types/redux-form/v7/tslint.json
new file mode 100644
index 0000000000..f3568a0139
--- /dev/null
+++ b/types/redux-form/v7/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-object-literal-type-assertion": false,
+        "strict-export-declare-modifiers": false
+    }
+}

From ba755ce6a7b8bc72e05301757cb66c2d73ae14e6 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Mon, 25 Feb 2019 13:31:45 +0800
Subject: [PATCH 130/924] [amap-js-api] list files in tsconfig.json

---
 types/amap-js-api/tsconfig.json | 89 ++++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/types/amap-js-api/tsconfig.json b/types/amap-js-api/tsconfig.json
index 3e8b8b3282..8d2306a1a6 100644
--- a/types/amap-js-api/tsconfig.json
+++ b/types/amap-js-api/tsconfig.json
@@ -16,5 +16,92 @@
         ],
         "types": [],
         "forceConsistentCasingInFileNames": true
-    }
+    },
+    "files": [
+        "array-bounds.d.ts",
+        "bounds.d.ts",
+        "browser.d.ts",
+        "common.d.ts",
+        "convert-from.d.ts",
+        "dom-util.d.ts",
+        "event.d.ts",
+        "geometry-util.d.ts",
+        "index.d.ts",
+        "layer/building.d.ts",
+        "layer/flexible.d.ts",
+        "layer/layer.d.ts",
+        "layer/layerGroup.d.ts",
+        "layer/massMarks.d.ts",
+        "layer/mediaLayer.d.ts",
+        "layer/tileLayer.d.ts",
+        "layer/wms.d.ts",
+        "layer/wmts.d.ts",
+        "lngLat.d.ts",
+        "map.d.ts",
+        "overlay/bezierCurve.d.ts",
+        "overlay/circle.d.ts",
+        "overlay/circleMarker.d.ts",
+        "overlay/contextMenu.d.ts",
+        "overlay/ellipse.d.ts",
+        "overlay/geoJSON.d.ts",
+        "overlay/icon.d.ts",
+        "overlay/infoWindow.d.ts",
+        "overlay/marker.d.ts",
+        "overlay/markerShape.d.ts",
+        "overlay/overlay.d.ts",
+        "overlay/overlayGroup.d.ts",
+        "overlay/pathOverlay.d.ts",
+        "overlay/polygon.d.ts",
+        "overlay/polyline.d.ts",
+        "overlay/rectangle.d.ts",
+        "overlay/shapeOverlay.d.ts",
+        "overlay/text.d.ts",
+        "pixel.d.ts",
+        "size.d.ts",
+        "test/arryBounds.ts",
+        "test/bounds.ts",
+        "test/browser.ts",
+        "test/convert-from.ts",
+        "test/dom-util.ts",
+        "test/event.ts",
+        "test/geometry-util.ts",
+        "test/layer/buildings.ts",
+        "test/layer/canvasLayer.ts",
+        "test/layer/flexible.ts",
+        "test/layer/imageLayer.ts",
+        "test/layer/layer.ts",
+        "test/layer/layerGroup.ts",
+        "test/layer/massMarks.ts",
+        "test/layer/tileLayer.ts",
+        "test/layer/videoLayer.ts",
+        "test/layer/wms.ts",
+        "test/layer/wmts.ts",
+        "test/lnglat.ts",
+        "test/map.ts",
+        "test/overlay/bezierCurve.ts",
+        "test/overlay/circle.ts",
+        "test/overlay/contextMenu.ts",
+        "test/overlay/ellipse.ts",
+        "test/overlay/geoJSON.ts",
+        "test/overlay/icon.ts",
+        "test/overlay/infoWindow.ts",
+        "test/overlay/marker.ts",
+        "test/overlay/markerShape.ts",
+        "test/overlay/overlay.ts",
+        "test/overlay/overlayGroup.ts",
+        "test/overlay/polygon.ts",
+        "test/overlay/polyline.ts",
+        "test/overlay/rectangle.ts",
+        "test/overlay/text.ts",
+        "test/pixel.ts",
+        "test/preset.ts",
+        "test/size.ts",
+        "test/util.ts",
+        "test/view2d.ts",
+        "tsconfig.json",
+        "tslint.json",
+        "type-util.d.ts",
+        "util.d.ts",
+        "view2D.d.ts"
+    ]
 }

From 264b33318697a9c2269c0ae1bd690d161995f6d6 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Mon, 25 Feb 2019 13:44:27 +0800
Subject: [PATCH 131/924] [amap-js-api] remove .json in files in tsconfig.json

---
 types/amap-js-api/tsconfig.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/amap-js-api/tsconfig.json b/types/amap-js-api/tsconfig.json
index 8d2306a1a6..e63a35d326 100644
--- a/types/amap-js-api/tsconfig.json
+++ b/types/amap-js-api/tsconfig.json
@@ -98,8 +98,6 @@
         "test/size.ts",
         "test/util.ts",
         "test/view2d.ts",
-        "tsconfig.json",
-        "tslint.json",
         "type-util.d.ts",
         "util.d.ts",
         "view2D.d.ts"

From b39156db9fb2a4ae5fb9b8a2b4c2aaa706b2e414 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Mon, 25 Feb 2019 14:49:36 +0800
Subject: [PATCH 132/924] [amap-js-api] no-restricted-globals

---
 types/amap-js-api/test/event.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/amap-js-api/test/event.ts b/types/amap-js-api/test/event.ts
index 8678045158..8061b0d747 100644
--- a/types/amap-js-api/test/event.ts
+++ b/types/amap-js-api/test/event.ts
@@ -43,7 +43,7 @@ AMap.event.addListener(map, 'click', (event: AMap.Map.EventMap['click']) => {
 });
 
 // $ExpectType EventListener<1>
-AMap.event.addListenerOnce(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
+const eventListener = AMap.event.addListenerOnce(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
     // $ExpectType "hotspotclick"
     event.type;
     // $ExpectType string
@@ -54,7 +54,6 @@ AMap.event.addListenerOnce(map, 'hotspotclick', function (event: AMap.Map.EventM
     this.test;
 }, { test: 1 });
 
-declare const eventListener: AMap.event.EventListener<0>;
 // $ExpectType void
 AMap.event.removeListener(eventListener);
 

From fa8122b0709e3aba144c3af2a5ab5befed9c0dae Mon Sep 17 00:00:00 2001
From: JGeppert <julian.geppert@logmein.com>
Date: Mon, 25 Feb 2019 09:22:04 +0100
Subject: [PATCH 133/924] Add missing doFetch type to react-request RenderProps

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

diff --git a/types/react-request/index.d.ts b/types/react-request/index.d.ts
index 0806dda260..3134825fbe 100644
--- a/types/react-request/index.d.ts
+++ b/types/react-request/index.d.ts
@@ -15,6 +15,7 @@ export interface RenderProps<T> {
   response: Response | null;
   url: string;
   data: T | null;
+  doFetch: (options?: FetchRequestProps) => Promise<void>;
 }
 
 export interface FetchRequestProps extends RequestInit {
diff --git a/types/react-request/react-request-tests.tsx b/types/react-request/react-request-tests.tsx
index 6a4ff71212..5e5edf31d2 100644
--- a/types/react-request/react-request-tests.tsx
+++ b/types/react-request/react-request-tests.tsx
@@ -8,13 +8,16 @@ interface ServerResponse {
 export default class BasicReactRequest extends React.Component {
   render() {
     return <Fetch<ServerResponse> url='/api/server'>
-      {({ fetching, failed, data, response }) => {
+      {({ fetching, failed, data, response, doFetch }) => {
         if (fetching || !response) {
           return <p>Loading...</p>;
         }
         if (failed) {
           return <h2>Failed to load</h2>;
         }
+        if (!data) {
+            doFetch();
+        }
         return <p>{data ? data.foo : 'data was null'}</p>;
       }}
     </Fetch>;

From 39de9c1f8407279e80cdaadde5b44a10a0186283 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 08:35:45 +0000
Subject: [PATCH 134/924] Fix style nit

---
 types/lodash/lodash-tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index fa5c0ad439..f3089b4289 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4292,8 +4292,7 @@ fp.now(); // $ExpectType number
     _.chain([]).isObject(); // $ExpectType LoDashExplicitWrapper<boolean>
     fp.isObject(anything); // $ExpectType boolean
     if (fp.isObject(anything)) {
-        // $ExpectType object
-        anything;
+        anything; // $ExpectType object
     }
 }
 

From d055d9a889640fdc839a0b703632bd49ac41067a Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.esteves@fr.clara.net>
Date: Mon, 25 Feb 2019 09:38:10 +0100
Subject: [PATCH 135/924] fix(mongo): change Object in object

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index dac421a22a..9fb58dbfc4 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1424,8 +1424,6 @@ export interface FindOneAndDeleteOption {
     collation?: CollationDocument;
 }
 
-
-
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoHaystackSearch */
 export interface GeoHaystackSearchOptions {
     readPreference?: ReadPreference | string;

From c8b56a0ca413a0bb6991dbbfc9bcb2c5eec6d2ce Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 08:40:29 +0000
Subject: [PATCH 136/924] Update source, not compiled

---
 types/lodash/common/lang.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/lodash/common/lang.d.ts b/types/lodash/common/lang.d.ts
index 723388c9cc..cbfe0e56bb 100644
--- a/types/lodash/common/lang.d.ts
+++ b/types/lodash/common/lang.d.ts
@@ -1224,7 +1224,7 @@ declare module "../index" {
          * @param value The value to check.
          * @return Returns true if value is an object, else false.
          */
-        isObject(value?: any): boolean;
+        isObject(value?: any): value is object;
     }
 
     interface LoDashImplicitWrapper<TValue> {

From 21ca8c60dde00b71b711b88147a20e56ec23da56 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 08:40:37 +0000
Subject: [PATCH 137/924] Add remaining tests

---
 types/lodash/lodash-tests.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index f3089b4289..bef3f510f3 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4294,6 +4294,15 @@ fp.now(); // $ExpectType number
     if (fp.isObject(anything)) {
         anything; // $ExpectType object
     }
+    if (_.isObject(anything)) {
+        anything; // $ExpectType object
+    }
+    if (_(anything).isObject()) {
+        anything; // $ExpectType any
+    }
+    if (_.chain(anything).isObject()) {
+        anything; // $ExpectType any
+    }
 }
 
 // _.isObjectLike

From 3bd113c6b8af103d53112faa320543b290ec4102 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.esteves@fr.clara.net>
Date: Mon, 25 Feb 2019 09:41:54 +0100
Subject: [PATCH 138/924] fix(mongodb): change Object in object

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 9fb58dbfc4..51393a8d25 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1417,8 +1417,8 @@ export interface FindOneAndUpdateOption extends FindOneAndReplaceOption {
 
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
 export interface FindOneAndDeleteOption {
-    projection?: Object;
-    sort?: Object;
+    projection?: object;
+    sort?: object;
     maxTimeMS?: number;
     session?: ClientSession;
     collation?: CollationDocument;

From 0caff1966ba7dbc0f62ef19f999d3db78e5f2a77 Mon Sep 17 00:00:00 2001
From: VincentBel <buaazqh@gmail.com>
Date: Mon, 25 Feb 2019 12:03:18 +0800
Subject: [PATCH 139/924] [redux-form] update v7 relative paths & path mapping

---
 types/redux-form/v7/tsconfig.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/redux-form/v7/tsconfig.json b/types/redux-form/v7/tsconfig.json
index f106f20d16..19b1709823 100644
--- a/types/redux-form/v7/tsconfig.json
+++ b/types/redux-form/v7/tsconfig.json
@@ -10,12 +10,20 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "jsx": "react",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
+        "paths": {
+            "redux-form": [
+                "redux-form/v7"
+            ],
+            "redux-form/*": [
+                "redux-form/v7/*"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From e7f0f8216ea71443219999a10159313cc0b68f49 Mon Sep 17 00:00:00 2001
From: VincentBel <buaazqh@gmail.com>
Date: Mon, 25 Feb 2019 14:10:26 +0800
Subject: [PATCH 140/924] [redux-form] add v8 typings

---
 types/redux-form/index.d.ts           |  2 +-
 types/redux-form/lib/Field.d.ts       |  2 +-
 types/redux-form/lib/FieldArray.d.ts  |  2 +-
 types/redux-form/lib/Fields.d.ts      | 11 +++++++++--
 types/redux-form/lib/FormName.d.ts    |  2 +-
 types/redux-form/redux-form-tests.tsx |  6 +++++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 08d077875a..9f62354a8e 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.5
+// Type definitions for redux-form 8.1
 // Project: https://github.com/erikras/redux-form, https://redux-form.com
 // Definitions by: Carson Full <https://github.com/carsonf>
 //                 Daniel Lytkin <https://github.com/aikoven>
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 194a322408..f0e1c0a6cc 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -44,7 +44,7 @@ export interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
     parse?: Parser;
     validate?: Validator | Validator[];
     warn?: Validator | Validator[];
-    withRef?: boolean;
+    forwardRef?: boolean;
     immutableProps?: string[];
 }
 
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index a4599b5e97..b84d04ad5a 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -6,7 +6,7 @@ export interface BaseFieldArrayProps<P = {}> {
     component: ComponentType<P>;
     validate?: Validator | Validator[];
     warn?: Validator | Validator[];
-    withRef?: boolean;
+    forwardRef?: boolean;
     props?: P;
     rerenderOnEveryChange?: boolean;
 }
diff --git a/types/redux-form/lib/Fields.d.ts b/types/redux-form/lib/Fields.d.ts
index f5ec106852..93b7fbcc74 100644
--- a/types/redux-form/lib/Fields.d.ts
+++ b/types/redux-form/lib/Fields.d.ts
@@ -1,5 +1,10 @@
 import { Component, ComponentType } from "react";
-import { Formatter, Parser, WrappedFieldProps } from "../index";
+import { Formatter, Parser, WrappedFieldProps, Validator } from "../index";
+
+export type FieldsWarnerOrValidator =
+    | Validator
+    | Validator[]
+    | { [name: string]: Validator | Validator[] };
 
 interface BaseFieldsProps<P = {}> {
     names: string[];
@@ -7,7 +12,9 @@ interface BaseFieldsProps<P = {}> {
     format?: Formatter | null;
     props?: P;
     parse?: Parser;
-    withRef?: boolean;
+    forwardRef?: boolean;
+    validate?: FieldsWarnerOrValidator;
+    warn?: FieldsWarnerOrValidator;
 }
 
 export interface GenericFields<P> extends Component<BaseFieldsProps<P> & P> {
diff --git a/types/redux-form/lib/FormName.d.ts b/types/redux-form/lib/FormName.d.ts
index 6cfc6f3708..501035fdf4 100644
--- a/types/redux-form/lib/FormName.d.ts
+++ b/types/redux-form/lib/FormName.d.ts
@@ -1,7 +1,7 @@
 import { ReactNode, StatelessComponent } from "react";
 
 export interface FormNameProps {
-    children: (props: { form: string }) => ReactNode;
+    children: (props: { form: string, sectionPrefix?: string }) => ReactNode;
 }
 
 export const FormName: StatelessComponent<FormNameProps>;
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 8ad71bbc42..2fa2e8efa1 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -422,7 +422,11 @@ class FormNameTest extends React.Component {
     render() {
         return (
             <FormName>
-                {({ form }) => <span>Form Name is: {form}</span>}
+                {({ form, sectionPrefix }) => (
+                    <span>
+                        Form name is {form} and section prefix is {sectionPrefix}
+                    </span>
+                )}
             </FormName>
         );
     }

From d3a647e3d8dc89a6e7612ae428066b3b0d7505fb Mon Sep 17 00:00:00 2001
From: VincentBel <buaazqh@gmail.com>
Date: Mon, 25 Feb 2019 14:24:16 +0800
Subject: [PATCH 141/924] add `FormName.d.ts` to `files` of `tsconfig.json`

---
 types/redux-form/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/redux-form/tsconfig.json b/types/redux-form/tsconfig.json
index ea57d2a38a..a7c3f2ede4 100644
--- a/types/redux-form/tsconfig.json
+++ b/types/redux-form/tsconfig.json
@@ -29,6 +29,7 @@
         "lib/Fields.d.ts",
         "lib/FieldArray.d.ts",
         "lib/Form.d.ts",
+        "lib/FormName.d.ts",
         "lib/FormSection.d.ts",
         "lib/formValues.d.ts",
         "lib/formValueSelector.d.ts",
@@ -37,4 +38,4 @@
         "lib/selectors.d.ts",
         "lib/SubmissionError.d.ts"
     ]
-}
\ No newline at end of file
+}

From f108386f078f6777f9022d4d56f05d8cf1be2f7f Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 12:14:57 +0000
Subject: [PATCH 142/924] Fix tests

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index bef3f510f3..9435ab16da 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4300,7 +4300,7 @@ fp.now(); // $ExpectType number
     if (_(anything).isObject()) {
         anything; // $ExpectType any
     }
-    if (_.chain(anything).isObject()) {
+    if (_.chain(anything).isObject().value()) {
         anything; // $ExpectType any
     }
 }

From 8318525edb8ddb232f0f309c8107536dd71ff3e5 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 12:15:24 +0000
Subject: [PATCH 143/924] Apply to implicit wrapper

---
 types/lodash/common/lang.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/lodash/common/lang.d.ts b/types/lodash/common/lang.d.ts
index cbfe0e56bb..14b00747a0 100644
--- a/types/lodash/common/lang.d.ts
+++ b/types/lodash/common/lang.d.ts
@@ -1231,7 +1231,7 @@ declare module "../index" {
         /**
          * see _.isObject
          */
-        isObject(): boolean;
+        isObject(): this is LoDashImplicitWrapper<object>;
     }
 
     interface LoDashExplicitWrapper<TValue> {

From ee2c0d0d07561ebede56ae0b43e7ad4d0a30a524 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 25 Feb 2019 12:45:58 +0000
Subject: [PATCH 144/924] Remove redundant tests

---
 types/lodash/lodash-tests.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 9435ab16da..05c1a20215 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -4297,12 +4297,6 @@ fp.now(); // $ExpectType number
     if (_.isObject(anything)) {
         anything; // $ExpectType object
     }
-    if (_(anything).isObject()) {
-        anything; // $ExpectType any
-    }
-    if (_.chain(anything).isObject().value()) {
-        anything; // $ExpectType any
-    }
 }
 
 // _.isObjectLike

From 5cf2cac315357c424d79eb89c0fcb1a601cfcb57 Mon Sep 17 00:00:00 2001
From: Antoine Rousseau <antoine@rousseau.im>
Date: Mon, 25 Feb 2019 15:10:07 +0100
Subject: [PATCH 145/924] set languages list

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

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index a5597bc835..1dc50603c7 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1792,7 +1792,7 @@ declare namespace algoliasearch {
      * such as ignorePlurals, removeStopWords, and CJK word-detection.
      * https://www.algolia.com/doc/api-reference/api-parameters/queryLanguages/
      */
-    queryLanguages?: string[];
+    queryLanguages?: Array<'af' | 'ar' | 'az' | 'bg' | 'bn' | 'ca' | 'cs' | 'cy' | 'da' | 'de' | 'el' | 'en' | 'eo' | 'es' | 'et' | 'eu' | 'fa' | 'fi' | 'fo' | 'fr' | 'ga' | 'gl' | 'he' | 'hi' | 'hu' | 'hy' | 'id' | 'is' | 'it' | 'ja' | 'ka' | 'kk' | 'ko' | 'ku' | 'ky' | 'lt' | 'lv' | 'mi' | 'mn' | 'mr' | 'ms' | 'mt' | 'nb' | 'nl' | 'no' | 'ns' | 'pl' | 'ps' | 'pt' | 'pt-br' | 'qu' | 'ro' | 'ru' | 'sk' | 'sq' | 'sv' | 'sw' | 'ta' | 'te' | 'th' | 'tl' | 'tn' | 'tr' | 'tt' | 'uk' | 'ur' | 'uz' | 'zh'>;
   }
 
   interface Response<T=any> {
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index 0ef8cd9e8c..74c4b1bf15 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -544,7 +544,7 @@ declare namespace algoliasearch {
      * such as ignorePlurals, removeStopWords, and CJK word-detection.
      * https://www.algolia.com/doc/api-reference/api-parameters/queryLanguages/
      */
-    queryLanguages?: string[];
+    queryLanguages?: Array<'af' | 'ar' | 'az' | 'bg' | 'bn' | 'ca' | 'cs' | 'cy' | 'da' | 'de' | 'el' | 'en' | 'eo' | 'es' | 'et' | 'eu' | 'fa' | 'fi' | 'fo' | 'fr' | 'ga' | 'gl' | 'he' | 'hi' | 'hu' | 'hy' | 'id' | 'is' | 'it' | 'ja' | 'ka' | 'kk' | 'ko' | 'ku' | 'ky' | 'lt' | 'lv' | 'mi' | 'mn' | 'mr' | 'ms' | 'mt' | 'nb' | 'nl' | 'no' | 'ns' | 'pl' | 'ps' | 'pt' | 'pt-br' | 'qu' | 'ro' | 'ru' | 'sk' | 'sq' | 'sv' | 'sw' | 'ta' | 'te' | 'th' | 'tl' | 'tn' | 'tr' | 'tt' | 'uk' | 'ur' | 'uz' | 'zh'>;
   }
 
   namespace SearchForFacetValues {

From ee7c5c62ee95fe245bae4ed3e95668cc7e457837 Mon Sep 17 00:00:00 2001
From: Asaf Algawi <asaf.algawi@gmail.com>
Date: Mon, 25 Feb 2019 21:31:44 +0200
Subject: [PATCH 146/924] changed DocumentArray discriminator to allow
 recieving both document and model templates

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index fde5e91372..d09ba19079 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2409,6 +2409,13 @@ declare module "mongoose" {
          */
         discriminator<U extends Document>(name: string, schema: Schema): Model<U>;
 
+        /**
+         * Adds a discriminator type.
+         * @param name discriminator model name
+         * @param schema discriminator model schema
+         */
+        discriminator<U extends Document, M extends Model<U>>(name: string, schema: Schema): M;
+
       }
 
       /*

From f82f720bb3c47859a3f2ff53546ee69ebec3f120 Mon Sep 17 00:00:00 2001
From: Michael Heasell <michael.heasell@gmail.com>
Date: Fri, 15 Feb 2019 11:31:52 +0000
Subject: [PATCH 147/924] Fix wrongly-defined return type for _.matches,
 _.matcher

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

diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 72498e3591..1b89408ab3 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -69,6 +69,10 @@ declare module _ {
         [index: string]: T;
     }
 
+    interface Predicate<T> {
+        (value: T): boolean;
+    }
+
     interface ListIterator<T, TResult> {
         (value: T, index: number, list: List<T>): TResult;
     }
@@ -3782,7 +3786,7 @@ declare module _ {
         * @param attrs Object with key values pair
         * @return Predicate function
         **/
-        matches<T>(attrs: T): _.ListIterator<T, boolean>;
+        matches<T>(attrs: T): _.Predicate<T>;
 
         /**
         * Returns a predicate function that will tell you if a passed in object contains all of the key/value properties present in attrs.
@@ -3790,7 +3794,7 @@ declare module _ {
         * @param attrs Object with key values pair
         * @return Predicate function
         **/
-        matcher<T>(attrs: T): _.ListIterator<T, boolean>;
+        matcher<T>(attrs: T): _.Predicate<T>;
 
         /**
         * Returns a function that will itself return the key property of any passed-in object.
diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
index 6175c1874b..13bc542b28 100644
--- a/types/underscore/underscore-tests.ts
+++ b/types/underscore/underscore-tests.ts
@@ -216,6 +216,8 @@ interface Family {
 }
 var isUncleMoe = _.matches<Family>({ name: 'moe', relation: 'uncle' });
 _.filter([{ name: 'larry', relation: 'father' }, { name: 'moe', relation: 'uncle' }], isUncleMoe);
+var uncleMoe: Family = { name: 'moe', relation: 'uncle' };
+isUncleMoe(uncleMoe);
 
 
 

From 8f38b13a4c99dcf185b48cf0e88fa58114508444 Mon Sep 17 00:00:00 2001
From: Brian Putnam <bkputnam@gmail.com>
Date: Mon, 25 Feb 2019 19:05:15 -0700
Subject: [PATCH 148/924] sqlite3: Add constants for file open

These were added in https://github.com/mapbox/node-sqlite3/pull/1078
---
 types/sqlite3/index.d.ts       |  6 ++++++
 types/sqlite3/sqlite3-tests.ts | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 3ed7c96a51..531d49a3b3 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -12,6 +12,9 @@ import events = require("events");
 export const OPEN_READONLY: number;
 export const OPEN_READWRITE: number;
 export const OPEN_CREATE: number;
+export const OPEN_SHAREDCACHE: number;
+export const OPEN_PRIVATECACHE: number;
+export const OPEN_URI: number;
 
 export const cached: {
     Database(filename: string, callback?: (this: Database, err: Error | null) => void): Database;
@@ -94,6 +97,9 @@ export interface sqlite3 {
     OPEN_READONLY: number;
     OPEN_READWRITE: number;
     OPEN_CREATE: number;
+    OPEN_SHAREDCACHE: number;
+    OPEN_PRIVATECACHE: number;
+    OPEN_URI: number;
     cached: typeof cached;
     RunResult: RunResult;
     Statement: typeof Statement;
diff --git a/types/sqlite3/sqlite3-tests.ts b/types/sqlite3/sqlite3-tests.ts
index 19a7edae66..f364158fc6 100644
--- a/types/sqlite3/sqlite3-tests.ts
+++ b/types/sqlite3/sqlite3-tests.ts
@@ -53,6 +53,17 @@ function runChainExample() {
 
 runChainExample();
 
+function runMemoryChainExample() {
+    console.log(`createDb chain - in-memory database`);
+    db = new sqlite3.Database(
+        ':memory:',
+        sqlite3. OPEN_CREATE | sqlite3.OPEN_READWRITE | sqlite3.OPEN_SHAREDCACHE,
+        createTable);
+    db.configure("busyTimeout", 1000);
+}
+
+runMemoryChainExample();
+
 db.serialize(() => {
   db.run("CREATE TABLE lorem (info TEXT)");
 

From 7ab7f2ace5ae9254f95056071e73d18f84c53533 Mon Sep 17 00:00:00 2001
From: 4c656f6e <leonng@live.com>
Date: Tue, 26 Feb 2019 14:31:56 +1000
Subject: [PATCH 149/924] Update recharts/index.d.ts

Update BarProps label to include LabelProps
Change instances of React.ReactElement to React.ReactElement<any> for backwards compatibility
---
 types/recharts/index.d.ts | 81 ++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 44f97c933b..ac42b06667 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -13,6 +13,7 @@
 //                 Andrew Palugniok <https://github.com/apalugniok>
 //                 Robert Stigsson <https://github.com/RobertStigsson>
 //                 Kosaku Kurino <https://github.com/kousaku-maron>
+//                 Leon Ng <https://github.com/iflp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -171,9 +172,9 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     stackId?: string | number;
     legendType?: LegendType;
     connectNulls?: boolean;
-    activeDot?: boolean | object | React.ReactElement | ContentRenderer<any>;
-    dot?: boolean | object | React.ReactElement | ContentRenderer<DotProps>;
-    label?: boolean | object | ContentRenderer<any> | React.ReactElement;
+    activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any>;
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -215,11 +216,11 @@ export interface BarProps extends EventAttributes, Partial<PresentationAttribute
     minPointSize?: number;
     maxBarSize?: number;
     hide?: boolean;
-    shape?: React.ReactElement | ContentRenderer<RectangleProps>;
+    shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
     data?: BarData[];
-    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     // see label section at http://recharts.org/#/en-US/api/Bar
-    label?: boolean | Label | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
+    label?: boolean | Label | LabelProps | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
 }
 
 export class Bar extends React.Component<BarProps> { }
@@ -259,7 +260,7 @@ export interface CartesianAxisProps extends EventAttributes, Partial<Presentatio
     height?: number;
     orientation?: 'top' | 'bottom' | 'left' | 'right';
     viewBox?: ViewBox;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     mirror?: boolean;
@@ -285,8 +286,8 @@ export interface CartesianGridProps extends Partial<PresentationAttributes> {
     y?: number;
     width?: number;
     height?: number;
-    horizontal?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
-    vertical?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    horizontal?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    vertical?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
     horizontalPoints?: number[];
     verticalPoints?: number[];
     horizontalCoordinatesGenerator?: CoordinatesGenerator;
@@ -376,7 +377,7 @@ export interface LegendPayload {
 export type BBoxUpdateCallback = (box: { width: number; height: number; }) => void;
 
 export interface LegendProps {
-    content?: React.ReactElement | ContentRenderer<LegendProps>;
+    content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
     wrapperStyle?: object;
     chartWidth?: number;
     chartHeight?: number;
@@ -411,15 +412,15 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     layout?: LayoutType;
     connectNulls?: boolean;
     hide?: boolean;
-    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
     top?: number;
     left?: number;
     width?: number;
     height?: number;
     data?: object[];
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement | ContentRenderer<any>;
+    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     points?: Point[];
 }
 
@@ -450,11 +451,11 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     maxRadius?: number;
     sectors?: object[];
     hide?: boolean;
-    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement | boolean;
+    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
     label?: {
         offsetRadius: number;
-    } | React.ReactElement | ContentRenderer<PieLabelRenderProps> | boolean;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement;
+    } | React.ReactElement<any> | ContentRenderer<PieLabelRenderProps> | boolean;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
     activeIndex?: number | number[];
     blendStroke?: boolean;
 }
@@ -501,7 +502,7 @@ export interface PolarAngleAxisProps extends EventAttributes, Partial<Presentati
     axisLine?: boolean | object;
     axisLineType?: 'polygon' | 'circle';
     tickLine?: boolean | object;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
     ticks?: PolarAngleAxisTick[];
     stroke?: string;
     orientation?: 'inner' | 'outer';
@@ -540,7 +541,7 @@ export interface PolarRadiusAxisProps extends EventAttributes, Partial<Presentat
     ticks?: PolarRadiusAxisTick[];
     orientation?: "left" | "right" | "middle";
     axisLine?: boolean | object;
-    tick?: boolean | object | React.ReactElement | ContentRenderer<any>;
+    tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     stroke?: string;
     tickFormatter?: TickFormatterFunction;
     domain?: [PolarRadiusAxisDomain, PolarRadiusAxisDomain];
@@ -577,10 +578,10 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     className?: string;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     points?: RadarPoint[];
-    shape?: React.ReactElement | ContentRenderer<RadarProps>;
-    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement | ContentRenderer<any> | boolean;
+    shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
+    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    label?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
@@ -612,15 +613,15 @@ export interface RadialBarProps extends EventAttributes, Partial<PresentationAtt
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     angleAxisId?: string | number;
     radiusAxisId?: string | number;
-    shape?: ContentRenderer<any> | React.ReactElement;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement;
+    shape?: ContentRenderer<any> | React.ReactElement<any>;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
     cornerRadius?: number | string;
     minPointSize?: number;
     maxBarSize?: number;
     data?: RadialBarData[];
     legendType?: LegendType;
-    label?: boolean | React.ReactElement | ContentRenderer<any> | object;
-    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
+    label?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
     hide?: boolean;
 }
 
@@ -662,7 +663,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     y2?: number | string;
     xAxisId?: string | number;
     yAxisId?: string | number;
-    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement;
+    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement<any>;
 }
 
 export class ReferenceArea extends React.Component<ReferenceAreaProps> { }
@@ -688,7 +689,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { cx: number; cy: number; }
-    > | React.ReactElement;
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceDot extends React.Component<ReferenceDotProps> { }
@@ -703,14 +704,14 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     ifOverflow?: IfOverflowType;
     x?: number | string;
     y?: number | string;
-    label?: string | number | ContentRenderer<any> | React.ReactElement;
+    label?: string | number | ContentRenderer<any> | React.ReactElement<any>;
     xAxisId?: string | number;
     yAxisId?: string | number;
     shape?: ContentRenderer<
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { x1: number; y1: number; x2: number; y2: number; }
-    > | React.ReactElement;
+    > | React.ReactElement<any>;
 }
 
 export class ReferenceLine extends React.Component<ReferenceLineProps> { }
@@ -746,13 +747,13 @@ export interface ScatterProps extends EventAttributes, Partial<PresentationAttri
     xAxisId?: string | number;
     yAxisId?: string | number;
     zAxisId?: string | number;
-    line?: boolean | object | RechartsFunction | React.ReactElement;
+    line?: boolean | object | RechartsFunction | React.ReactElement<any>;
     lineType?: 'joint' | 'fitting';
     lineJointType?: LineType;
     legendType?: LegendType;
     activeIndex?: number;
-    activeShape?: object | RechartsFunction | React.ReactElement;
-    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement | ContentRenderer<any>;
+    activeShape?: object | RechartsFunction | React.ReactElement<any>;
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
     points?: ScatterPoint[];
     hide?: boolean;
     data?: object[];
@@ -824,7 +825,7 @@ export interface TooltipPayload {
 }
 
 export interface TooltipProps extends Animatable {
-    content?: React.ReactElement | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
+    content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
     viewBox?: ViewBox;
     active?: boolean;
     separator?: string;
@@ -833,7 +834,7 @@ export interface TooltipProps extends Animatable {
     itemStyle?: object;
     labelStyle?: object;
     wrapperStyle?: object;
-    cursor?: boolean | object | React.ReactElement | React.StatelessComponent<any>;
+    cursor?: boolean | object | React.ReactElement<any> | React.StatelessComponent<any>;
     coordinate?: Coordinate;
     position?: Coordinate;
     label?: string | number;
@@ -852,7 +853,7 @@ export interface TreemapProps extends EventAttributes, Animatable {
     data?: any[];
     style?: object;
     aspectRatio?: number;
-    content?: React.ReactElement | ContentRenderer<any>;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
     fill?: string;
     stroke?: string;
     className?: string;
@@ -874,7 +875,7 @@ export interface LabelProps extends Partial<PresentationAttributes> {
     position?: PositionType;
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
-    content?: React.ReactElement | ContentRenderer<any>;
+    content?: React.ReactElement<any> | ContentRenderer<any>;
 }
 
 export class LabelList extends React.Component<LabelListProps> { }
@@ -884,7 +885,7 @@ export interface LabelListProps {
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
     clockWise?: boolean;
-    content?: React.ReactElement | ContentRenderer<LabelProps>;
+    content?: React.ReactElement<any> | ContentRenderer<LabelProps>;
     data?: number;
     dataKey: string | number | RechartsFunction;
     formatter?: LabelFormatter;
@@ -935,7 +936,7 @@ export interface XAxisProps extends EventAttributes {
     padding?: XPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;
@@ -989,7 +990,7 @@ export interface YAxisProps extends EventAttributes {
     padding?: YPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;

From 698c95aed6dca4c300eb1d19f0e62da2ccec2a57 Mon Sep 17 00:00:00 2001
From: Carles Capellas <capellas.carles@gmail.com>
Date: Tue, 26 Feb 2019 12:57:56 +0100
Subject: [PATCH 150/924] Add draft-js missing ReactElement generic type
 argument

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

diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 2f58d64a52..1a3eb0e39a 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -623,7 +623,7 @@ declare namespace Draft {
 
             interface DraftBlockRenderConfig {
                 element: string;
-                wrapper?: React.ReactElement;
+                wrapper?: React.ReactNode;
             }
 
             class EditorState extends Record {

From 0727cf8474f5a449b43b75ce29cf3bae457a1ed5 Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Tue, 26 Feb 2019 13:28:49 +0000
Subject: [PATCH 151/924] HKP types

---
 types/openpgp/common/index.d.ts    |  5 +++++
 types/openpgp/common/tsconfig.json | 22 ++++++++++++++++++++++
 types/openpgp/index.d.ts           |  2 ++
 types/openpgp/openpgp-tests.ts     | 17 +++++++++++++++++
 types/openpgp/ts3.2/index.d.ts     |  2 ++
 5 files changed, 48 insertions(+)
 create mode 100644 types/openpgp/common/index.d.ts
 create mode 100644 types/openpgp/common/tsconfig.json

diff --git a/types/openpgp/common/index.d.ts b/types/openpgp/common/index.d.ts
new file mode 100644
index 0000000000..88796dea9d
--- /dev/null
+++ b/types/openpgp/common/index.d.ts
@@ -0,0 +1,5 @@
+export class HKP {
+    constructor(keyServerUrl?: string);
+    lookup(options: {keyId?: string, query?: string }): Promise<string>;
+    upload(publicKeyArmored: string): Promise<Response>;
+}
diff --git a/types/openpgp/common/tsconfig.json b/types/openpgp/common/tsconfig.json
new file mode 100644
index 0000000000..f7e7d1970b
--- /dev/null
+++ b/types/openpgp/common/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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"
+    ]
+}
diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index d564c6df6d..6558e26eb2 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -10,6 +10,8 @@
 
 export as namespace openpgp;
 
+export * from './common';
+
 export interface UserId {
     name?: string,
     email?: string,
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 19e305cb26..3c8f19681f 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -193,3 +193,20 @@ openpgp.util.shiftRight("", 1);
 openpgp.util.str2bin("");
 openpgp.util.str2Uint8Array("");
 openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
+
+async () => {
+    let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string
+
+    let hkpOptions = {
+        query: 'alice@example.com'
+    };
+
+    let armoredPubkey = await hkp.lookup(hkpOptions);
+    await openpgp.key.readArmored(armoredPubkey);
+
+    hkp = new openpgp.HKP('https://pgp.mit.edu');
+
+    let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
+
+    await hkp.upload(pubkey);
+}
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index 428f785dbe..7342f5f928 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -9,6 +9,8 @@
 
 export as namespace openpgp;
 
+export * from '../common';
+
 export interface UserId {
     name?: string,
     email?: string,

From f3c884d79d4291a20090609c7cc92955f66db395 Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Tue, 26 Feb 2019 13:59:40 +0000
Subject: [PATCH 152/924] move definitions

---
 types/openpgp/index.d.ts       |  2 +-
 types/openpgp/openpgp-tests.ts | 34 +++++++++++++++++-----------------
 types/openpgp/ts3.2/index.d.ts |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 6558e26eb2..628663a9ec 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for openpgp 4.0.1
+// Type definitions for openpgp 4.4.8
 // Project: http://openpgpjs.org/
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 //                 Errietta Kostala <https://github.com/errietta>
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 3c8f19681f..09795ce630 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -135,6 +135,23 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
     return verified.signatures[0].valid;
 })();
 
+async () => {
+    let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string
+
+    let hkpOptions = {
+        query: 'alice@example.com'
+    };
+
+    let armoredPubkey = await hkp.lookup(hkpOptions);
+    await openpgp.key.readArmored(armoredPubkey);
+
+    hkp = new openpgp.HKP('https://pgp.mit.edu');
+
+    let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
+
+    await hkp.upload(pubkey);
+}
+
 // Open PGP Tests
 
 
@@ -193,20 +210,3 @@ openpgp.util.shiftRight("", 1);
 openpgp.util.str2bin("");
 openpgp.util.str2Uint8Array("");
 openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
-
-async () => {
-    let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string
-
-    let hkpOptions = {
-        query: 'alice@example.com'
-    };
-
-    let armoredPubkey = await hkp.lookup(hkpOptions);
-    await openpgp.key.readArmored(armoredPubkey);
-
-    hkp = new openpgp.HKP('https://pgp.mit.edu');
-
-    let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
-
-    await hkp.upload(pubkey);
-}
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index 7342f5f928..e7f8cdd714 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for openpgp 4.0.1
+// Type definitions for openpgp 4.4.8
 // Project: http://openpgpjs.org/
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 //                 Errietta Kostala <https://github.com/errietta>

From e6787c6405df266fe49d94bf8330a519c016a70d Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Tue, 26 Feb 2019 14:02:06 +0000
Subject: [PATCH 153/924] unused file

---
 types/openpgp/common/tsconfig.json | 22 ----------------------
 types/openpgp/openpgp-tests.ts     |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 types/openpgp/common/tsconfig.json

diff --git a/types/openpgp/common/tsconfig.json b/types/openpgp/common/tsconfig.json
deleted file mode 100644
index f7e7d1970b..0000000000
--- a/types/openpgp/common/tsconfig.json
+++ /dev/null
@@ -1,22 +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"
-    ]
-}
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 09795ce630..98e326b876 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -136,7 +136,7 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 })();
 
 async () => {
-    let hkp = new openpgp.HKP(); // Defaults to https://keyserver.ubuntu.com, or pass another keyserver URL as a string
+    let hkp = new openpgp.HKP();
 
     let hkpOptions = {
         query: 'alice@example.com'

From 31a924b4f32f5dd6842d24d866df46241596fc59 Mon Sep 17 00:00:00 2001
From: Errietta Kostala <errietta@errietta.me>
Date: Tue, 26 Feb 2019 18:54:37 +0000
Subject: [PATCH 154/924] use const

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

diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 98e326b876..100941074a 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -138,16 +138,16 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 async () => {
     let hkp = new openpgp.HKP();
 
-    let hkpOptions = {
+    const hkpOptions = {
         query: 'alice@example.com'
     };
 
-    let armoredPubkey = await hkp.lookup(hkpOptions);
+    const armoredPubkey = await hkp.lookup(hkpOptions);
     await openpgp.key.readArmored(armoredPubkey);
 
     hkp = new openpgp.HKP('https://pgp.mit.edu');
 
-    let pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
+    const pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
 
     await hkp.upload(pubkey);
 }

From 1f1aefb128fb69e8c4e08f04147fe16adc3e2e4e Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 26 Feb 2019 13:09:22 -0600
Subject: [PATCH 155/924] Add server properties to connection object

---
 types/amqplib/callback_api.d.ts | 106 ++++++++++++++++++++++++++------
 1 file changed, 88 insertions(+), 18 deletions(-)

diff --git a/types/amqplib/callback_api.d.ts b/types/amqplib/callback_api.d.ts
index 9fca3972e4..5d92376606 100644
--- a/types/amqplib/callback_api.d.ts
+++ b/types/amqplib/callback_api.d.ts
@@ -2,36 +2,92 @@ import events = require('events');
 import { Replies, Options, Message } from './properties';
 export * from './properties';
 
+export interface ServerProperties {
+    host: string;
+    product: string;
+    version: string;
+    platform?: string;
+    copyright?: string;
+    information?: string;
+}
+
 export interface Connection extends events.EventEmitter {
     close(callback?: (err: any) => void): void;
     createChannel(callback: (err: any, channel: Channel) => void): void;
     createConfirmChannel(callback: (err: any, confirmChannel: ConfirmChannel) => void): void;
+    serverProperties: ServerProperties;
 }
 
 export interface Channel extends events.EventEmitter {
     close(callback: (err: any) => void): void;
 
-    assertQueue(queue?: string, options?: Options.AssertQueue, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
+    assertQueue(
+        queue?: string,
+        options?: Options.AssertQueue,
+        callback?: (err: any, ok: Replies.AssertQueue) => void
+    ): void;
     checkQueue(queue: string, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
 
-    deleteQueue(queue: string, options?: Options.DeleteQueue, callback?: (err: any, ok: Replies.DeleteQueue) => void): void;
+    deleteQueue(
+        queue: string,
+        options?: Options.DeleteQueue,
+        callback?: (err: any, ok: Replies.DeleteQueue) => void
+    ): void;
     purgeQueue(queue: string, callback?: (err: any, ok: Replies.PurgeQueue) => void): void;
 
-    bindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-    unbindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+    bindQueue(
+        queue: string,
+        source: string,
+        pattern: string,
+        args?: any,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): void;
+    unbindQueue(
+        queue: string,
+        source: string,
+        pattern: string,
+        args?: any,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): void;
 
-    assertExchange(exchange: string, type: string, options?: Options.AssertExchange, callback?: (err: any, ok: Replies.AssertExchange) => void): void;
+    assertExchange(
+        exchange: string,
+        type: string,
+        options?: Options.AssertExchange,
+        callback?: (err: any, ok: Replies.AssertExchange) => void
+    ): void;
     checkExchange(exchange: string, callback?: (err: any, ok: Replies.Empty) => void): void;
 
-    deleteExchange(exchange: string, options?: Options.DeleteExchange, callback?: (err: any, ok: Replies.Empty) => void): void;
+    deleteExchange(
+        exchange: string,
+        options?: Options.DeleteExchange,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): void;
 
-    bindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
-    unbindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+    bindExchange(
+        destination: string,
+        source: string,
+        pattern: string,
+        args?: any,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): void;
+    unbindExchange(
+        destination: string,
+        source: string,
+        pattern: string,
+        args?: any,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): void;
 
     publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
     sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
 
-    consume(queue: string, onMessage: (msg: Message | null) => any, options?: Options.Consume, callback?: (err: any, ok: Replies.Consume) => void): void;
+    consume(
+        queue: string,
+        onMessage: (msg: Message | null) => any,
+        options?: Options.Consume,
+        callback?: (err: any, ok: Replies.Consume) => void
+    ): void;
 
     cancel(consumerTag: string, callback?: (err: any, ok: Replies.Empty) => void): void;
     get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | false) => void): void;
@@ -48,22 +104,36 @@ export interface Channel extends events.EventEmitter {
 }
 
 export interface ConfirmChannel extends Channel {
-    publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
-    sendToQueue(queue: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
+    publish(
+        exchange: string,
+        routingKey: string,
+        content: Buffer,
+        options?: Options.Publish,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): boolean;
+    sendToQueue(
+        queue: string,
+        content: Buffer,
+        options?: Options.Publish,
+        callback?: (err: any, ok: Replies.Empty) => void
+    ): boolean;
 
     waitForConfirms(callback?: (err: any) => void): void;
 }
 
 export const credentials: {
     external(): {
-      mechanism: string;
-      response(): Buffer;
+        mechanism: string;
+        response(): Buffer;
     };
-    plain(username: string, password: string): {
-      mechanism: string;
-      response(): Buffer;
-      username: string;
-      password: string;
+    plain(
+        username: string,
+        password: string
+    ): {
+        mechanism: string;
+        response(): Buffer;
+        username: string;
+        password: string;
     };
 };
 

From 219fd7573e818f3b54030c92ec13a1ec342a5c04 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 26 Feb 2019 13:27:55 -0600
Subject: [PATCH 156/924] Make sure both callback and promise Connection have
 serverProperties field.  Add test.

---
 types/amqplib/amqplib-tests.ts  | 14 ++++++++++++++
 types/amqplib/callback_api.d.ts | 11 +----------
 types/amqplib/index.d.ts        |  3 ++-
 types/amqplib/properties.d.ts   |  9 +++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/types/amqplib/amqplib-tests.ts b/types/amqplib/amqplib-tests.ts
index ef448d5b36..97844f3b50 100644
--- a/types/amqplib/amqplib-tests.ts
+++ b/types/amqplib/amqplib-tests.ts
@@ -14,6 +14,13 @@ amqp.connect('amqp://localhost')
 
 amqp.connect('amqp://localhost')
     .then(connection => {
+        connection.serverProperties.copyright; // $ExpectType string | undefined
+        connection.serverProperties.platform; // $ExpectType string | undefined
+        connection.serverProperties.information; // $ExpectType string | undefined
+        connection.serverProperties.host; // $ExpectType string
+        connection.serverProperties.product; // $ExpectType string
+        connection.serverProperties.version; // $ExpectType string
+
         return connection.createChannel()
             .tap(channel => channel.checkQueue('myQueue'))
             .then(channel => {
@@ -37,6 +44,13 @@ import amqpcb = require('amqplib/callback_api');
 
 amqpcb.connect('amqp://localhost', (err, connection) => {
     if (!err) {
+        connection.serverProperties.copyright; // $ExpectType string | undefined
+        connection.serverProperties.platform; // $ExpectType string | undefined
+        connection.serverProperties.information; // $ExpectType string | undefined
+        connection.serverProperties.host; // $ExpectType string
+        connection.serverProperties.product; // $ExpectType string
+        connection.serverProperties.version; // $ExpectType string
+
         connection.createChannel((err, channel) => {
           if (!err) {
               channel.assertQueue('myQueue', {}, (err, ok) => {
diff --git a/types/amqplib/callback_api.d.ts b/types/amqplib/callback_api.d.ts
index 5d92376606..4fcc0b5309 100644
--- a/types/amqplib/callback_api.d.ts
+++ b/types/amqplib/callback_api.d.ts
@@ -1,16 +1,7 @@
 import events = require('events');
-import { Replies, Options, Message } from './properties';
+import { Replies, Options, Message, ServerProperties } from './properties';
 export * from './properties';
 
-export interface ServerProperties {
-    host: string;
-    product: string;
-    version: string;
-    platform?: string;
-    copyright?: string;
-    information?: string;
-}
-
 export interface Connection extends events.EventEmitter {
     close(callback?: (err: any) => void): void;
     createChannel(callback: (err: any, channel: Channel) => void): void;
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 7087d74edc..77e5d19ca9 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -8,13 +8,14 @@
 
 import * as Promise from 'bluebird';
 import * as events from 'events';
-import { Replies, Options, Message, GetMessage, ConsumeMessage } from './properties';
+import { Replies, Options, Message, GetMessage, ConsumeMessage, ServerProperties } from './properties';
 export * from './properties';
 
 export interface Connection extends events.EventEmitter {
     close(): Promise<void>;
     createChannel(): Promise<Channel>;
     createConfirmChannel(): Promise<ConfirmChannel>;
+    serverProperties: ServerProperties;
 }
 
 export interface Channel extends events.EventEmitter {
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index 97dc8ac393..7e9198ac7a 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -210,3 +210,12 @@ export interface XDeath {
     "original-expiration"?: any;
     "routing-keys": string[];
 }
+
+export interface ServerProperties {
+    host: string;
+    product: string;
+    version: string;
+    platform?: string;
+    copyright?: string;
+    information?: string;
+}

From 6fde3e12581a1e0861c8d013e5c56df143841a23 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 26 Feb 2019 13:34:27 -0600
Subject: [PATCH 157/924] I read the original spec incorrectly.  Updated it
 accordingly.

---
 types/amqplib/amqplib-tests.ts | 10 ++++++----
 types/amqplib/properties.d.ts  |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/types/amqplib/amqplib-tests.ts b/types/amqplib/amqplib-tests.ts
index 97844f3b50..a42d2f717d 100644
--- a/types/amqplib/amqplib-tests.ts
+++ b/types/amqplib/amqplib-tests.ts
@@ -15,11 +15,12 @@ amqp.connect('amqp://localhost')
 amqp.connect('amqp://localhost')
     .then(connection => {
         connection.serverProperties.copyright; // $ExpectType string | undefined
-        connection.serverProperties.platform; // $ExpectType string | undefined
-        connection.serverProperties.information; // $ExpectType string | undefined
+        connection.serverProperties.platform; // $ExpectType string
+        connection.serverProperties.information; // $ExpectType string
         connection.serverProperties.host; // $ExpectType string
         connection.serverProperties.product; // $ExpectType string
         connection.serverProperties.version; // $ExpectType string
+        connection.serverProperties.customField; // $ExpectType string | undefined
 
         return connection.createChannel()
             .tap(channel => channel.checkQueue('myQueue'))
@@ -45,11 +46,12 @@ import amqpcb = require('amqplib/callback_api');
 amqpcb.connect('amqp://localhost', (err, connection) => {
     if (!err) {
         connection.serverProperties.copyright; // $ExpectType string | undefined
-        connection.serverProperties.platform; // $ExpectType string | undefined
-        connection.serverProperties.information; // $ExpectType string | undefined
+        connection.serverProperties.platform; // $ExpectType string
+        connection.serverProperties.information; // $ExpectType string
         connection.serverProperties.host; // $ExpectType string
         connection.serverProperties.product; // $ExpectType string
         connection.serverProperties.version; // $ExpectType string
+        connection.serverProperties.customField; // $ExpectType string | undefined
 
         connection.createChannel((err, channel) => {
           if (!err) {
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index 7e9198ac7a..4c7a210c6f 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -215,7 +215,8 @@ export interface ServerProperties {
     host: string;
     product: string;
     version: string;
-    platform?: string;
+    platform: string;
     copyright?: string;
-    information?: string;
+    information: string;
+    [key: string]: string | undefined;
 }

From 3649fccf5794e24b502df0e96731f8c2957f67db Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Tue, 26 Feb 2019 13:37:13 -0600
Subject: [PATCH 158/924] Remove prettier formatting

---
 types/amqplib/callback_api.d.ts | 96 +++++++--------------------------
 1 file changed, 18 insertions(+), 78 deletions(-)

diff --git a/types/amqplib/callback_api.d.ts b/types/amqplib/callback_api.d.ts
index 4fcc0b5309..56842abc26 100644
--- a/types/amqplib/callback_api.d.ts
+++ b/types/amqplib/callback_api.d.ts
@@ -12,73 +12,27 @@ export interface Connection extends events.EventEmitter {
 export interface Channel extends events.EventEmitter {
     close(callback: (err: any) => void): void;
 
-    assertQueue(
-        queue?: string,
-        options?: Options.AssertQueue,
-        callback?: (err: any, ok: Replies.AssertQueue) => void
-    ): void;
+    assertQueue(queue?: string, options?: Options.AssertQueue, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
     checkQueue(queue: string, callback?: (err: any, ok: Replies.AssertQueue) => void): void;
 
-    deleteQueue(
-        queue: string,
-        options?: Options.DeleteQueue,
-        callback?: (err: any, ok: Replies.DeleteQueue) => void
-    ): void;
+    deleteQueue(queue: string, options?: Options.DeleteQueue, callback?: (err: any, ok: Replies.DeleteQueue) => void): void;
     purgeQueue(queue: string, callback?: (err: any, ok: Replies.PurgeQueue) => void): void;
 
-    bindQueue(
-        queue: string,
-        source: string,
-        pattern: string,
-        args?: any,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): void;
-    unbindQueue(
-        queue: string,
-        source: string,
-        pattern: string,
-        args?: any,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): void;
+    bindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+    unbindQueue(queue: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
 
-    assertExchange(
-        exchange: string,
-        type: string,
-        options?: Options.AssertExchange,
-        callback?: (err: any, ok: Replies.AssertExchange) => void
-    ): void;
+    assertExchange(exchange: string, type: string, options?: Options.AssertExchange, callback?: (err: any, ok: Replies.AssertExchange) => void): void;
     checkExchange(exchange: string, callback?: (err: any, ok: Replies.Empty) => void): void;
 
-    deleteExchange(
-        exchange: string,
-        options?: Options.DeleteExchange,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): void;
+    deleteExchange(exchange: string, options?: Options.DeleteExchange, callback?: (err: any, ok: Replies.Empty) => void): void;
 
-    bindExchange(
-        destination: string,
-        source: string,
-        pattern: string,
-        args?: any,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): void;
-    unbindExchange(
-        destination: string,
-        source: string,
-        pattern: string,
-        args?: any,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): void;
+    bindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
+    unbindExchange(destination: string, source: string, pattern: string, args?: any, callback?: (err: any, ok: Replies.Empty) => void): void;
 
     publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish): boolean;
     sendToQueue(queue: string, content: Buffer, options?: Options.Publish): boolean;
 
-    consume(
-        queue: string,
-        onMessage: (msg: Message | null) => any,
-        options?: Options.Consume,
-        callback?: (err: any, ok: Replies.Consume) => void
-    ): void;
+    consume(queue: string, onMessage: (msg: Message | null) => any, options?: Options.Consume, callback?: (err: any, ok: Replies.Consume) => void): void;
 
     cancel(consumerTag: string, callback?: (err: any, ok: Replies.Empty) => void): void;
     get(queue: string, options?: Options.Get, callback?: (err: any, ok: Message | false) => void): void;
@@ -95,36 +49,22 @@ export interface Channel extends events.EventEmitter {
 }
 
 export interface ConfirmChannel extends Channel {
-    publish(
-        exchange: string,
-        routingKey: string,
-        content: Buffer,
-        options?: Options.Publish,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): boolean;
-    sendToQueue(
-        queue: string,
-        content: Buffer,
-        options?: Options.Publish,
-        callback?: (err: any, ok: Replies.Empty) => void
-    ): boolean;
+    publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
+    sendToQueue(queue: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): boolean;
 
     waitForConfirms(callback?: (err: any) => void): void;
 }
 
 export const credentials: {
     external(): {
-        mechanism: string;
-        response(): Buffer;
+      mechanism: string;
+      response(): Buffer;
     };
-    plain(
-        username: string,
-        password: string
-    ): {
-        mechanism: string;
-        response(): Buffer;
-        username: string;
-        password: string;
+    plain(username: string, password: string): {
+      mechanism: string;
+      response(): Buffer;
+      username: string;
+      password: string;
     };
 };
 

From b05a9c505287d197568eee0558cf87f0f22e7821 Mon Sep 17 00:00:00 2001
From: Lucas Garron <code@garron.net>
Date: Fri, 15 Feb 2019 16:11:38 -0800
Subject: [PATCH 159/924] Allow `FederatedCredential` to be passed to `fetch()`

Per MDN, either `PasswordCredential` *or* `FederatedCredential` can be passed as the `credentials` field in the fetch `init` argument:

https://developer.mozilla.org/en-US/docs/Web/API/FederatedCredential

Note:  I actually can't find anywhere in the `fetch` or credential management
API that says you can pass `PasswordCredential` (or `FederatedCredential`)
instead a string. I've asked at
https://github.com/w3c/webappsec-credential-management/issues/133 for
clarification.
---
 types/webappsec-credential-management/index.d.ts         | 2 +-
 .../webappsec-credential-management-tests.ts             | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/webappsec-credential-management/index.d.ts b/types/webappsec-credential-management/index.d.ts
index 580f86facb..7fc8c73d37 100644
--- a/types/webappsec-credential-management/index.d.ts
+++ b/types/webappsec-credential-management/index.d.ts
@@ -42,7 +42,7 @@ interface CMRequestInit {
     referrer?: string;
     referrerPolicy?: string;
     mode?: string;
-    credentials?: PasswordCredential|string;
+    credentials?: PasswordCredential|FederatedCredential|string;
     cache?: string;
     redirect?: string;
     integrity?: string;
diff --git a/types/webappsec-credential-management/webappsec-credential-management-tests.ts b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
index 15ae1c6b9e..e9d8540e4f 100644
--- a/types/webappsec-credential-management/webappsec-credential-management-tests.ts
+++ b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
@@ -135,6 +135,9 @@ function federatedSignIn() {
                     // ... any other providers you care about ...
 
                     default:
+                        fetch(
+                            'https://example.com/loginEndpoint',
+                            { credentials: credential, method: 'POST' });
                         break;
                 }
             } else {
@@ -206,6 +209,12 @@ function formEncodedPost(credential: PasswordCredential, token: string) {
         { credentials: credential, method: 'POST' });
 }
 
+function federatedCredentialPost(credential: FederatedCredential) {
+    fetch(
+        'https://example.com/loginEndpoint',
+        { credentials: credential, method: 'POST' });
+}
+
 // requireUserMediation example: not included in the spec, but included here
 // to ensure it typechecks correctly.
 function signOutDeprecated() {

From 43e056c43e460793ba9f517696bd220b619f0f46 Mon Sep 17 00:00:00 2001
From: 4c656f6e <leonng@live.com>
Date: Wed, 27 Feb 2019 14:37:16 +1000
Subject: [PATCH 160/924] Update recharts/index.d.ts

---
 types/recharts/index.d.ts | 78 +++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index ac42b06667..56ffd20265 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -172,9 +172,9 @@ export interface AreaProps extends EventAttributes, Partial<PresentationAttribut
     stackId?: string | number;
     legendType?: LegendType;
     connectNulls?: boolean;
-    activeDot?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
-    dot?: boolean | object | React.ReactElement<any> | ContentRenderer<DotProps>;
-    label?: boolean | object | ContentRenderer<any> | React.ReactElement<any>;
+    activeDot?: boolean | object | React.ReactElement | ContentRenderer<any>;
+    dot?: boolean | object | React.ReactElement | ContentRenderer<DotProps>;
+    label?: boolean | object | ContentRenderer<any> | React.ReactElement;
     hide?: boolean;
     layout?: LayoutType;
     baseLine?: number | any[];
@@ -216,9 +216,9 @@ export interface BarProps extends EventAttributes, Partial<PresentationAttribute
     minPointSize?: number;
     maxBarSize?: number;
     hide?: boolean;
-    shape?: React.ReactElement<any> | ContentRenderer<RectangleProps>;
+    shape?: React.ReactElement | ContentRenderer<RectangleProps>;
     data?: BarData[];
-    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
     // see label section at http://recharts.org/#/en-US/api/Bar
     label?: boolean | Label | LabelProps | React.SFC<LabelProps> | React.ReactElement<LabelProps> | ContentRenderer<any>;
 }
@@ -260,7 +260,7 @@ export interface CartesianAxisProps extends EventAttributes, Partial<Presentatio
     height?: number;
     orientation?: 'top' | 'bottom' | 'left' | 'right';
     viewBox?: ViewBox;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     mirror?: boolean;
@@ -286,8 +286,8 @@ export interface CartesianGridProps extends Partial<PresentationAttributes> {
     y?: number;
     width?: number;
     height?: number;
-    horizontal?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
-    vertical?: object | React.ReactElement<any> | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    horizontal?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
+    vertical?: object | React.ReactElement | ContentRenderer<LineProps & CartesianGridProps> | boolean;
     horizontalPoints?: number[];
     verticalPoints?: number[];
     horizontalCoordinatesGenerator?: CoordinatesGenerator;
@@ -377,7 +377,7 @@ export interface LegendPayload {
 export type BBoxUpdateCallback = (box: { width: number; height: number; }) => void;
 
 export interface LegendProps {
-    content?: React.ReactElement<any> | ContentRenderer<LegendProps>;
+    content?: React.ReactElement | ContentRenderer<LegendProps>;
     wrapperStyle?: object;
     chartWidth?: number;
     chartHeight?: number;
@@ -412,15 +412,15 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     layout?: LayoutType;
     connectNulls?: boolean;
     hide?: boolean;
-    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
+    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
     top?: number;
     left?: number;
     width?: number;
     height?: number;
     data?: object[];
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
-    label?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    label?: boolean | object | React.ReactElement | ContentRenderer<any>;
     points?: Point[];
 }
 
@@ -451,11 +451,11 @@ export interface PieProps extends EventAttributes, Partial<PresentationAttribute
     maxRadius?: number;
     sectors?: object[];
     hide?: boolean;
-    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement<any> | boolean;
+    labelLine?: object | ContentRenderer<LineProps & any> | React.ReactElement | boolean;
     label?: {
         offsetRadius: number;
-    } | React.ReactElement<any> | ContentRenderer<PieLabelRenderProps> | boolean;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    } | React.ReactElement | ContentRenderer<PieLabelRenderProps> | boolean;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement;
     activeIndex?: number | number[];
     blendStroke?: boolean;
 }
@@ -502,7 +502,7 @@ export interface PolarAngleAxisProps extends EventAttributes, Partial<Presentati
     axisLine?: boolean | object;
     axisLineType?: 'polygon' | 'circle';
     tickLine?: boolean | object;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     ticks?: PolarAngleAxisTick[];
     stroke?: string;
     orientation?: 'inner' | 'outer';
@@ -541,7 +541,7 @@ export interface PolarRadiusAxisProps extends EventAttributes, Partial<Presentat
     ticks?: PolarRadiusAxisTick[];
     orientation?: "left" | "right" | "middle";
     axisLine?: boolean | object;
-    tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
+    tick?: boolean | object | React.ReactElement | ContentRenderer<any>;
     stroke?: string;
     tickFormatter?: TickFormatterFunction;
     domain?: [PolarRadiusAxisDomain, PolarRadiusAxisDomain];
@@ -578,10 +578,10 @@ export interface RadarProps extends EventAttributes, Partial<PresentationAttribu
     className?: string;
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     points?: RadarPoint[];
-    shape?: React.ReactElement<any> | ContentRenderer<RadarProps>;
-    activeDot?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
-    dot?: object | React.ReactElement<any> | ContentRenderer<DotProps> | boolean;
-    label?: object | React.ReactElement<any> | ContentRenderer<any> | boolean;
+    shape?: React.ReactElement | ContentRenderer<RadarProps>;
+    activeDot?: object | React.ReactElement | ContentRenderer<any> | boolean;
+    dot?: object | React.ReactElement | ContentRenderer<DotProps> | boolean;
+    label?: object | React.ReactElement | ContentRenderer<any> | boolean;
     legendType?: LegendType;
     hide?: boolean;
 }
@@ -613,15 +613,15 @@ export interface RadialBarProps extends EventAttributes, Partial<PresentationAtt
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     angleAxisId?: string | number;
     radiusAxisId?: string | number;
-    shape?: ContentRenderer<any> | React.ReactElement<any>;
-    activeShape?: object | ContentRenderer<any> | React.ReactElement<any>;
+    shape?: ContentRenderer<any> | React.ReactElement;
+    activeShape?: object | ContentRenderer<any> | React.ReactElement;
     cornerRadius?: number | string;
     minPointSize?: number;
     maxBarSize?: number;
     data?: RadialBarData[];
     legendType?: LegendType;
-    label?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
-    background?: boolean | React.ReactElement<any> | ContentRenderer<any> | object;
+    label?: boolean | React.ReactElement | ContentRenderer<any> | object;
+    background?: boolean | React.ReactElement | ContentRenderer<any> | object;
     hide?: boolean;
 }
 
@@ -663,7 +663,7 @@ export interface ReferenceAreaProps extends Partial<PresentationAttributes> {
     y2?: number | string;
     xAxisId?: string | number;
     yAxisId?: string | number;
-    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement<any>;
+    shape?: ContentRenderer<ReferenceAreaProps & RectangleProps> | React.ReactElement;
 }
 
 export class ReferenceArea extends React.Component<ReferenceAreaProps> { }
@@ -689,7 +689,7 @@ export interface ReferenceDotProps extends EventAttributes, Partial<Presentation
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { cx: number; cy: number; }
-    > | React.ReactElement<any>;
+    > | React.ReactElement;
 }
 
 export class ReferenceDot extends React.Component<ReferenceDotProps> { }
@@ -704,14 +704,14 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     ifOverflow?: IfOverflowType;
     x?: number | string;
     y?: number | string;
-    label?: string | number | ContentRenderer<any> | React.ReactElement<any>;
+    label?: string | number | ContentRenderer<any> | React.ReactElement;
     xAxisId?: string | number;
     yAxisId?: string | number;
     shape?: ContentRenderer<
         EventAttributes
         & Partial<PresentationAttributes<number | string, number | string>>
         & { x1: number; y1: number; x2: number; y2: number; }
-    > | React.ReactElement<any>;
+    > | React.ReactElement;
 }
 
 export class ReferenceLine extends React.Component<ReferenceLineProps> { }
@@ -747,13 +747,13 @@ export interface ScatterProps extends EventAttributes, Partial<PresentationAttri
     xAxisId?: string | number;
     yAxisId?: string | number;
     zAxisId?: string | number;
-    line?: boolean | object | RechartsFunction | React.ReactElement<any>;
+    line?: boolean | object | RechartsFunction | React.ReactElement;
     lineType?: 'joint' | 'fitting';
     lineJointType?: LineType;
     legendType?: LegendType;
     activeIndex?: number;
-    activeShape?: object | RechartsFunction | React.ReactElement<any>;
-    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
+    activeShape?: object | RechartsFunction | React.ReactElement;
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement | ContentRenderer<any>;
     points?: ScatterPoint[];
     hide?: boolean;
     data?: object[];
@@ -825,7 +825,7 @@ export interface TooltipPayload {
 }
 
 export interface TooltipProps extends Animatable {
-    content?: React.ReactElement<any> | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
+    content?: React.ReactElement | React.StatelessComponent<any> | ContentRenderer<TooltipProps>;
     viewBox?: ViewBox;
     active?: boolean;
     separator?: string;
@@ -834,7 +834,7 @@ export interface TooltipProps extends Animatable {
     itemStyle?: object;
     labelStyle?: object;
     wrapperStyle?: object;
-    cursor?: boolean | object | React.ReactElement<any> | React.StatelessComponent<any>;
+    cursor?: boolean | object | React.ReactElement | React.StatelessComponent<any>;
     coordinate?: Coordinate;
     position?: Coordinate;
     label?: string | number;
@@ -853,7 +853,7 @@ export interface TreemapProps extends EventAttributes, Animatable {
     data?: any[];
     style?: object;
     aspectRatio?: number;
-    content?: React.ReactElement<any> | ContentRenderer<any>;
+    content?: React.ReactElement | ContentRenderer<any>;
     fill?: string;
     stroke?: string;
     className?: string;
@@ -875,7 +875,7 @@ export interface LabelProps extends Partial<PresentationAttributes> {
     position?: PositionType;
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
-    content?: React.ReactElement<any> | ContentRenderer<any>;
+    content?: React.ReactElement | ContentRenderer<any>;
 }
 
 export class LabelList extends React.Component<LabelListProps> { }
@@ -885,7 +885,7 @@ export interface LabelListProps {
     children?: React.ReactNode[] | React.ReactNode;
     className?: string;
     clockWise?: boolean;
-    content?: React.ReactElement<any> | ContentRenderer<LabelProps>;
+    content?: React.ReactElement | ContentRenderer<LabelProps>;
     data?: number;
     dataKey: string | number | RechartsFunction;
     formatter?: LabelFormatter;
@@ -936,7 +936,7 @@ export interface XAxisProps extends EventAttributes {
     padding?: XPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;
@@ -990,7 +990,7 @@ export interface YAxisProps extends EventAttributes {
     padding?: YPadding;
     allowDataOverflow?: boolean;
     scale?: ScaleType | RechartsFunction;
-    tick?: boolean | ContentRenderer<any> | object | React.ReactElement<any>;
+    tick?: boolean | ContentRenderer<any> | object | React.ReactElement;
     axisLine?: boolean | object;
     tickLine?: boolean | object;
     minTickGap?: number;

From 97a5249a59ea5b0994f73fbcb5066bb5828a882f Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Wed, 27 Feb 2019 10:13:13 -0600
Subject: [PATCH 161/924] defValue => defaultValue

---
 types/lodash/lodash-tests.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 0809cd15f3..befe845f94 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5143,7 +5143,7 @@ fp.now(); // $ExpectType number
 // _.get
 {
     const value: string | undefined = anything;
-    const defValue: boolean = anything;
+    const defaultValue: boolean = anything;
 
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
@@ -5155,8 +5155,8 @@ fp.now(); // $ExpectType number
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
     _.get({ a: undefined }, "a"); // $ExpectType undefined
-    _.get({ a: value }, "a", defValue); // $ExpectType string | boolean
-    _.get({ a: undefined }, "a", defValue); // $ExpectType boolean
+    _.get({ a: value }, "a", defaultValue); // $ExpectType string | boolean
+    _.get({ a: undefined }, "a", defaultValue); // $ExpectType boolean
 
     _("abc").get(1); // $ExpectType string
     _("abc").get(["0"], "_");
@@ -5165,8 +5165,8 @@ fp.now(); // $ExpectType number
     _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get(["a", "b"]); // $ExpectType any
     _({ a: undefined }).get("a"); // $ExpectType undefined
-    _({ a: value }).get("a", defValue); // $ExpectType string | boolean
-    _({ a: undefined }).get("a", defValue); // $ExpectType boolean
+    _({ a: value }).get("a", defaultValue); // $ExpectType string | boolean
+    _({ a: undefined }).get("a", defaultValue); // $ExpectType boolean
 
     _.chain("abc").get(1); // $ExpectType LoDashExplicitWrapper<string>
     _.chain("abc").get(["0"], "_");
@@ -5175,8 +5175,8 @@ fp.now(); // $ExpectType number
     _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
     _.chain({ a: { b: true } }).get(["a", "b"]); // $ExpectType LoDashExplicitWrapper<any>
     _.chain({ a: undefined }).get("a"); // $ExpectType LoDashExplicitWrapper<undefined>
-    _.chain({ a: value }).get("a", defValue); // $ExpectType LoDashExplicitWrapper<string | boolean>
-    _.chain({ a: undefined }).get("a", defValue); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain({ a: value }).get("a", defaultValue); // $ExpectType LoDashExplicitWrapper<string | boolean>
+    _.chain({ a: undefined }).get("a", defaultValue); // $ExpectType LoDashExplicitWrapper<boolean>
 
     fp.get(Symbol.iterator, []); // $ExpectType any
     fp.get(Symbol.iterator)([]); // $ExpectType any

From 75b239e424d82b77331eab99aa0cb2e67cac8f0a Mon Sep 17 00:00:00 2001
From: Josh Gachnang <josh@nang.io>
Date: Wed, 27 Feb 2019 08:30:07 -0800
Subject: [PATCH 162/924] [gestalt] Fix SegmentedControlProps

SegmentedControl was pointed at the wrong interface.
---
 types/gestalt/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/gestalt/index.d.ts b/types/gestalt/index.d.ts
index 77c88b6d35..a38b1d94d1 100644
--- a/types/gestalt/index.d.ts
+++ b/types/gestalt/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for gestalt 0.75
 // Project: https://github.com/pinterest/gestalt, https://pinterest.github.io/gestalt
 // Definitions by: Nicolás Serrano Arévalo <https://github.com/serranoarevalo>
+//                 Josh Gachnang <https://github.com/joshgachnang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -938,7 +939,7 @@ export class Pog extends React.Component<PogProps, any> {}
 export class Pulsar extends React.Component<PulsarProps, any> {}
 export class RadioButton extends React.Component<RadioButtonProps, any> {}
 export class SearchField extends React.Component<SearchFieldProps, any> {}
-export class SegmentedControl extends React.Component<SearchFieldProps, any> {}
+export class SegmentedControl extends React.Component<SegmentedControlProps, any> {}
 export class SelectList extends React.Component<SelectListProps, any> {}
 export class Spinner extends React.Component<SpinnerProps, any> {}
 export class Sticky extends React.Component<StickyProps, any> {}

From 83f5cbe1e56d0c1fc8edb6fa2350c9eac26881aa Mon Sep 17 00:00:00 2001
From: Jeff Held <jheld135@gmail.com>
Date: Wed, 27 Feb 2019 10:50:22 -0600
Subject: [PATCH 163/924] [detox] Use `import = require` in jest setup tests

---
 types/detox/test/detox-jest-setup-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/detox/test/detox-jest-setup-tests.ts b/types/detox/test/detox-jest-setup-tests.ts
index 94ddc3eb1e..1c38c3658f 100644
--- a/types/detox/test/detox-jest-setup-tests.ts
+++ b/types/detox/test/detox-jest-setup-tests.ts
@@ -2,8 +2,8 @@ declare var beforeAll: (callback: () => void) => void;
 declare var beforeEach: (callback: () => void) => void;
 declare var afterAll: (callback: () => void) => void;
 
-import * as detox from "detox";
-import * as adapter from "detox/runners/jest/adapter";
+import detox = require("detox");
+import adapter = require("detox/runners/jest/adapter");
 
 // Normally the Detox configuration from the project's package.json like so:
 // const config = require("./package.json").detox;

From d593bf739a2448ca9be6061887d657bc26cebec8 Mon Sep 17 00:00:00 2001
From: Jacob Gardner <jacob.v.gardner@gmail.com>
Date: Wed, 27 Feb 2019 11:21:55 -0600
Subject: [PATCH 164/924] Disable no-restricted-globals for adone as adone has
 'event' as part of its API

---
 types/adone/tslint.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/adone/tslint.json b/types/adone/tslint.json
index 8c265eebb4..177bd33372 100644
--- a/types/adone/tslint.json
+++ b/types/adone/tslint.json
@@ -13,6 +13,7 @@
         "no-unnecessary-qualifier": false,
         "unified-signatures": false,
         "space-before-function-paren": false,
-        "await-promise": false
+        "await-promise": false,
+        "no-restricted-globals": false
     }
-}
\ No newline at end of file
+}

From 9f6f861222d2fc5fc2bf3ff9299af15b14100202 Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Tue, 26 Feb 2019 10:59:04 +0000
Subject: [PATCH 165/924] jsonwebtoken: Allow audience to be verified with
 regular expressions

See https://github.com/auth0/node-jsonwebtoken/pull/398
---
 types/jsonwebtoken/index.d.ts            | 2 +-
 types/jsonwebtoken/jsonwebtoken-tests.ts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index d1c3aeee5f..33d4f7b999 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -59,7 +59,7 @@ export interface SignOptions {
 
 export interface VerifyOptions {
     algorithms?: string[];
-    audience?: string | string[];
+    audience?: string | RegExp | Array<string | RegExp>;
     clockTimestamp?: number;
     clockTolerance?: number;
     issuer?: string | string[];
diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index 5884ff6d63..924f95e2d4 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -101,6 +101,12 @@ cert = fs.readFileSync("public.pem"); // get public key
 jwt.verify(token, cert, { audience: "urn:foo" }, (err, decoded) => {
     // if audience mismatch, err == invalid audience
 });
+jwt.verify(token, cert, { audience: /urn:f[o]{2}/ }, (err, decoded) => {
+    // if audience mismatch, err == invalid audience
+});
+jwt.verify(token, cert, { audience: [/urn:f[o]{2}/, "urn:bar"] }, (err, decoded) => {
+    // if audience mismatch, err == invalid audience
+});
 
 // verify issuer
 cert = fs.readFileSync("public.pem"); // get public key

From bd7e00b17a500dcf1bc38b288a65111195e9aeb6 Mon Sep 17 00:00:00 2001
From: James Reggio <james.reggio@gmail.com>
Date: Wed, 27 Feb 2019 11:06:33 -0800
Subject: [PATCH 166/924] [hoist-non-react-statics] Expose NonReactStatics type
 alias

---
 .../hoist-non-react-statics-tests.tsx         | 16 +++++++++++++
 types/hoist-non-react-statics/index.d.ts      | 24 ++++++++++++-------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
index 0e1beed2e9..05f282cc0c 100644
--- a/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
+++ b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
@@ -23,6 +23,10 @@ class B extends React.Component {
         n: PropTypes.number.isRequired,
     };
 
+    static defaultProps = {
+        n: 42,
+    };
+
     getB() {
         return B.b;
     }
@@ -36,11 +40,23 @@ C.propTypes.x;
 C.prototype.getA();
 
 C.propTypes.n; // $ExpectError
+C.defaultProps; // $ExpectError
 C.prototype.getB(); // $ExpectError
 
 <C x={1} />;
 
+const CWithType: hoistNonReactStatics.NonReactStatics<typeof B> = C;
+
+CWithType.propTypes; // $ExpectError
+CWithType.defaultProps; // $ExpectError
+CWithType.prototype.getB(); // $ExpectError
+
 const D = hoistNonReactStatics(A, B, { a: true, b: true });
 
 D.a;
 D.b; // $ExpectError
+
+const DWithType: hoistNonReactStatics.NonReactStatics<typeof B, { a: true; b: true }> = D;
+const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof B> = D; // $ExpectError
+
+DWithType.b; // $ExpectError
diff --git a/types/hoist-non-react-statics/index.d.ts b/types/hoist-non-react-statics/index.d.ts
index 414c4c41f0..8c874483ac 100644
--- a/types/hoist-non-react-statics/index.d.ts
+++ b/types/hoist-non-react-statics/index.d.ts
@@ -28,6 +28,21 @@ interface KNOWN_STATICS {
     arity: true;
 }
 
+declare namespace hoistNonReactStatics {
+    type NonReactStatics<
+        S extends React.ComponentType<any>,
+        C extends {
+            [key: string]: true
+        } = {}
+    > = {
+        [key in Exclude<
+            keyof S,
+            // only extends static properties, exclude instance properties and known react statics
+            keyof REACT_STATICS | keyof KNOWN_STATICS | keyof C
+        >]: S[key]
+    };
+}
+
 declare function hoistNonReactStatics<
     T extends React.ComponentType<any>,
     S extends React.ComponentType<any>,
@@ -38,13 +53,6 @@ declare function hoistNonReactStatics<
     TargetComponent: T,
     SourceComponent: S,
     customStatic?: C,
-): T &
-    {
-        [key in Exclude<
-            keyof S,
-            // only extends static properties, exclude instance properties and known react statics
-            keyof REACT_STATICS | keyof KNOWN_STATICS | keyof C
-        >]: S[key]
-    };
+): T & hoistNonReactStatics.NonReactStatics<S, C>;
 
 export = hoistNonReactStatics;

From 825dfd2e0835e35526043462e7e80d7da2057825 Mon Sep 17 00:00:00 2001
From: Sagie Maoz <sagie@google.com>
Date: Wed, 27 Feb 2019 17:05:29 -0500
Subject: [PATCH 167/924] fix(@types/select2): Add missing $.fn.select2 typing

As per bottom of docs at http://select2.github.io/select2/
---
 types/select2/v3/index.d.ts       | 8 ++++++++
 types/select2/v3/select2-tests.ts | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/types/select2/v3/index.d.ts b/types/select2/v3/index.d.ts
index f4a0c01efb..a74c294906 100644
--- a/types/select2/v3/index.d.ts
+++ b/types/select2/v3/index.d.ts
@@ -168,6 +168,14 @@ interface Select2Plugin {
     (method: 'search'): JQuery;
 
     (options: Select2Options): JQuery;
+
+    /**
+     * Select2 exposes its default options via the $.fn.select2.defaults
+     * object. Properties changed in this object (same properties configurable
+     * through the constructor) will take effect for every instance created
+     * after the change.
+     */
+    defaults: Partial<Select2Options>;
 }
 
 interface JQuery {
diff --git a/types/select2/v3/select2-tests.ts b/types/select2/v3/select2-tests.ts
index 4a0a496e13..af2bdfd583 100644
--- a/types/select2/v3/select2-tests.ts
+++ b/types/select2/v3/select2-tests.ts
@@ -1,3 +1,8 @@
+$.extend($.fn.select2.defaults, {
+  width: 'copy',
+  minimumInputLength: 12
+});
+
 $("#e9").select2();
 $("#e2").select2({
     placeholder: "Select a State",

From c2b2ef863e96f0072b8883a089c25e726dcf0a3e Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 27 Feb 2019 21:36:24 -0800
Subject: [PATCH 168/924] added declaration for tmi.js

---
 types/tmi.js/index.d.ts     | 299 ++++++++++++++++++++++++++++++++++++
 types/tmi.js/package.json   |   6 +
 types/tmi.js/tmijs-tests.ts | 110 +++++++++++++
 types/tmi.js/tsconfig.json  |  14 ++
 types/tmi.js/tslint.json    |   1 +
 5 files changed, 430 insertions(+)
 create mode 100644 types/tmi.js/index.d.ts
 create mode 100644 types/tmi.js/package.json
 create mode 100644 types/tmi.js/tmijs-tests.ts
 create mode 100644 types/tmi.js/tsconfig.json
 create mode 100644 types/tmi.js/tslint.json

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
new file mode 100644
index 0000000000..dab0ce635b
--- /dev/null
+++ b/types/tmi.js/index.d.ts
@@ -0,0 +1,299 @@
+// Type definitions for tmi.js v1.3.1
+// Project: https://docs.tmijs.org/v1.3.0/index.html
+// Definitions by: William Papsco <https://github.com/wpapsco>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Twitch IRC docs: https://dev.twitch.tv/docs/irc/
+// Last updated: 2019/2/27
+
+declare module 'tmi.js' {
+    import { StrictEventEmitter } from "strict-event-emitter-types"
+
+    interface Actions {
+        action(channel: string, message: string): Promise<[string]>,
+        ban(channel: string, username: string, reason?: string): Promise<[string, string, string]>,
+        clear(channel: string): Promise<[string]>,
+        color(color: string): Promise<[string]>,
+        commercial(channel: string, seconds: number): Promise<[string, number]>,
+        connect(): Promise<[string, number]>,
+        disconnect(): Promise<[string, number]>,
+        emoteonly(channel: string): Promise<[string]>,
+        emoteonlyoff(channel: string): Promise<[string]>,
+        followersonly(channel: string, length?: number): Promise<[string, number]>,
+        followersonlyoff(channel: string): Promise<[string]>,
+        host(channel: string, target: string): Promise<[string, string]>,
+        join(channel: string): Promise<[string]>,
+        mod(channel: string, username: string): Promise<[string, string]>,
+        mods(channel: string): Promise<string[]>,
+        part(channel: string): Promise<[string]>,
+        ping(): Promise<[number]>,
+        r9kbeta(channel: string): Promise<[string]>,
+        r9kbetaoff(channel: string): Promise<[string]>,
+        raw(message: string): Promise<[string]>,
+        say(channel: string, message: string): Promise<[string]>,
+        slow(channel: string, length?: number): Promise<[string]>,
+        slowoff(channel: string): Promise<[string]>,
+        subscribers(channel: string): Promise<[string]>,
+        subscribersoff(channel: string): Promise<[string]>,
+        timeout(channel: string, username: string, length?: number, reason?: string): Promise<[string, string, number, string]>
+        unban(channel: string, username: string): Promise<[string, string]>,
+        unhost(channel: string): Promise<[string]>,
+        unmod(channel: string, username: string): Promise<[string, string]>,
+        whisper(username: string, message: string): Promise<[string, string]>
+    }
+
+    interface Events {
+        action(channel: string, userstate: ChatUserstate, message: string, self: boolean): void
+        ban(channel: string, username: string, reason: string): void,
+        chat(channel: string, userstate: ChatUserstate, message: string, self: boolean): void,
+        cheer(channel: string, userstate: ChatUserstate, message: string): void,
+        clearchat(channel: string): void,
+        connected(address: string, port: number): void,
+        connecting(address: string, port: number): void,
+        disconnected(reason: string): void,
+        emoteonly(channel: string, enabled: boolean): void,
+        emotesets(sets: string, obj: EmoteObj): void,
+        followersonly(channel: string, enabled: boolean, length: number): void,
+        hosted(channel: string, username: string, viewers: number, autohost: boolean): void,
+        hosting(channel: string, target: string, viewers: number): void,
+        join(channel: string, username: string, self: boolean): void,
+        logon(): void,
+        message(channel: string, userstate: ChatUserstate, message: string, self: boolean): void,
+        mod(channel: string, username: string): void,
+        mods(channel: string, mods: string[]): void,
+        notice(channel: string, msgid: MsgID, message: string): void,
+        part(channel: string, username: string, self: boolean): void,
+        ping(): void,
+        pong(latency: number): void,
+        r9kbeta(channel: string, enabled: boolean): void,
+        reconnect(): void,
+        resub(channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: ResubMethod): void,
+        roomstate(channel: string, state: RoomState): void,
+        serverchange(channel: string): void,
+        slowmode(channel: string, enabled: boolean, length: number): void,
+        subscribers(channel: string, enabled: boolean): void,
+        subscription(channel: string, username: string, method: ResubMethod, message: string, userstate: SubUserstate): void,
+        timeout(channel: string, username: string, reason: string, duration: number): void,
+        unhost(channel: string, viewers: number): void,
+        unmod(channel: string, username: string): void,
+        whisper(from: string, userstate: ChatUserstate, message: string, self: boolean): void
+    }
+
+    interface ClientBase {
+        getChannels(): string[],
+        getOptions(): Options,
+        getUsername(): string,
+        isMod(channel: string, username: string): boolean,
+        readyState(): "CONNECTING" | "OPEN" | "CLOSING" | "CLOSED",
+        on(event: any, listener: any): Client,
+        addListener(event: any, listener: any): Client,
+        removeListener(event: any, listener: any): Client,
+        removeAllListeners<P extends keyof Events>(event?: P): Client,
+        setMaxListeners(n: number): Client,
+        emits(events: (keyof Events)[], values: any[][]): void, //wish this could work better but either I'm just not smart enough or it's not possible
+        emit: (event: any) => boolean,
+        once(event: any, listener: any): Client,
+        listenerCount<P extends keyof Events>(event: P): number,
+    }
+
+    interface Badges {
+        admin?: string,
+        bits?: string,
+        broadcaster?: string,
+        global_mod?: string,
+        moderator?: string,
+        subscriber?: string,
+        staff?: string,
+        turbo?: string,
+        premium?: string
+    }
+
+    interface CommonUserstate {
+        badges?: Badges,
+        color?: string,
+        "display-name"?: string,
+        emotes?: { [emoteid: string]: string[] },
+        id?: string,
+        mod?: boolean,
+        turbo?: boolean,
+        'emotes-raw'?: string,
+        'badges-raw'?: string,
+        "room-id"?: string,
+        subscriber?: boolean,
+        'user-type'?: "" | "mod" | "global_mod" | "admin" | "staff",
+        "user-id"?: string,
+        "tmi-sent-ts"?: string,
+        flags?: string,
+    }
+
+    interface UserNoticeState extends CommonUserstate {
+        login?: string,
+        message?: string,
+        "system-msg"?: string,
+    }
+
+    interface CommonSubUserstate extends UserNoticeState {
+        "msg-param-sub-plan"?: ResubMethod,
+        "msg-param-sub-plan-name"?: string
+    }
+
+    interface ChatUserstate extends CommonUserstate {
+        'message-type'?: "chat" | "action" | "whisper",
+        username?: string,
+        bits?: string,
+    }
+
+    interface SubUserstate extends CommonSubUserstate {
+        'message-type'?: "sub" | "resub",
+        "msg-param-cumulative-months"?: string | boolean,
+        "msg-param-should-share-streak"?: boolean,
+        "msg-param-streak-months"?: string | boolean,
+    }
+
+    interface SubGiftUserstate extends CommonSubUserstate {
+        'message-type'?: "subgift" | "anonsubgift",
+        "msg-param-recipient-display-name"?: string,
+        "msg-param-recipient-id"?: string,
+        "msg-param-recipient-user-name"?: string,
+    }
+
+    interface RaidUserstate extends UserNoticeState {
+        "message-type"?: "raid"
+        "msg-param-displayName"?: string,
+        "msg-param-login"?: string,
+        "msg-param-viewerCount"?: string,
+    }
+
+    interface RitualUserstate extends UserNoticeState {
+        "message-type"?: "ritual"
+        "msg-param-ritual-name"?: "new_chatter"
+    }
+
+    type Userstate = ChatUserstate | SubGiftUserstate | SubUserstate | RaidUserstate | RitualUserstate
+
+    interface EmoteObj {
+        [id: string]: [{
+            code: string,
+            id: number
+        }]
+    }
+
+    type MsgID = "already_banned" |
+        "already_emote_only_on" |
+        "already_emote_only_off" |
+        "already_subs_on" |
+        "already_subs_off" |
+        "bad_ban_admin" |
+        "bad_ban_broadcaster" |
+        "bad_ban_global_mod" |
+        "bad_ban_self" |
+        "bad_ban_staff" |
+        "bad_commercial_error" |
+        "bad_host_hosting" |
+        "bad_host_rate_exceeded" |
+        "bad_mod_mod" |
+        "bad_mod_banned" |
+        "bad_timeout_admin" |
+        "bad_timeout_global_mod" |
+        "bad_timeout_self" |
+        "bad_timeout_staff" |
+        "bad_unban_no_ban" |
+        "bad_unmod_mod" |
+        "ban_success" |
+        "cmds_available" |
+        "color_changed" |
+        "commercial_success" |
+        "emote_only_on" |
+        "emote_only_off" |
+        "hosts_remaining" |
+        "host_target_went_offline" |
+        "mod_success" |
+        "msg_banned" |
+        "msg_censored_broadcaster" |
+        "msg_channel_suspended" |
+        "msg_duplicate" |
+        "msg_emoteonly" |
+        "msg_ratelimit" |
+        "msg_subsonly" |
+        "msg_timedout" |
+        "msg_verified_email" |
+        "no_help" |
+        "no_permission" |
+        "not_hosting" |
+        "timeout_success" |
+        "unban_success" |
+        "unmod_success" |
+        "unrecognized_cmd" |
+        "usage_ban" |
+        "usage_clear" |
+        "usage_color" |
+        "usage_commercial" |
+        "usage_disconnect" |
+        "usage_emote_only_on" |
+        "usage_emote_only_off" |
+        "usage_help" |
+        "usage_host" |
+        "usage_me" |
+        "usage_mod" |
+        "usage_mods" |
+        "usage_r9k_on" |
+        "usage_r9k_off" |
+        "usage_slow_on" |
+        "usage_slow_off" |
+        "usage_subs_on" |
+        "usage_subs_off" |
+        "usage_timeout" |
+        "usage_unban" |
+        "usage_unhost" |
+        "usage_unmod" |
+        "whisper_invalid_self" |
+        "whisper_limit_per_min" |
+        "whisper_limit_per_sec" |
+        "whisper_restricted_recipient"
+
+    type ResubMethod = "Prime" | "1000" | "2000" | "3000"
+
+    interface RoomState {
+        "broadcaster-lang"?: string,
+        "emote-only"?: boolean,
+        "followers-only"?: string | boolean,
+        "r9k"?: boolean,
+        "rituals"?: boolean,
+        "room-id"?: string
+        "slow"?: string | boolean,
+        "subs-only"?: boolean,
+        "channel"?: string
+    }
+
+    type Client = StrictEventEmitter<ClientBase, Events> & Actions
+
+    interface Options {
+        options?: {
+            clientId?: string,
+            debug?: boolean
+        },
+        connection?: {
+            server?: string,
+            port?: number,
+            reconnect?: boolean,
+            maxReconnectAttempts?: number,
+            maxReconnectInverval?: number,
+            reconnectDecay?: number,
+            reconnectInterval?: number,
+            secure?: boolean,
+            timeout?: number
+        },
+        identity?: {
+            username?: string,
+            password?: string
+        },
+        channels?: string[],
+        logger?: {
+            info?: (message: string) => any,
+            warn?: (message: string) => any,
+            error?: (message: string) => any
+        }
+    }
+
+    export function client(opts: Options): Client
+    export function Client(opts: Options): Client
+}
\ No newline at end of file
diff --git a/types/tmi.js/package.json b/types/tmi.js/package.json
new file mode 100644
index 0000000000..dd5c6e4363
--- /dev/null
+++ b/types/tmi.js/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "strict-event-emitter-types": "^2.0.0"
+    }
+}
\ No newline at end of file
diff --git a/types/tmi.js/tmijs-tests.ts b/types/tmi.js/tmijs-tests.ts
new file mode 100644
index 0000000000..e80ad43915
--- /dev/null
+++ b/types/tmi.js/tmijs-tests.ts
@@ -0,0 +1,110 @@
+import * as tmi from "tmi.js"
+
+const options: tmi.Options = {
+    channels: ['#channel1', '#channel2'],
+    connection: {
+        maxReconnectAttempts: 2,
+        maxReconnectInverval: 10,
+        port: 100,
+        reconnect: true,
+        reconnectDecay: 20,
+        reconnectInterval: 10,
+        secure: true,
+        timeout: 20
+    },
+    identity: {
+        password: "oauth:xxxOAuthIDHerexxx",
+        username: "yourusernamehere"
+    },
+    logger: {
+        warn: console.log,
+        error: console.log,
+        info: console.log,
+    },
+    options: {
+        clientId: "xxxapiidherexxx",
+        debug: true
+    }
+}
+
+const client: tmi.Client = tmi.Client(options)
+
+client.connect().then(() => {
+    client.on("subscription", (channel: string, username: string, method: tmi.ResubMethod, msg: string, userstate: tmi.SubUserstate) => {
+        client.say(channel, "Thank you to " + userstate["display-name"] + "for subscribing!")
+        client.ping()
+        client.r9kbeta(channel)
+        client.r9kbetaoff(channel)
+        client.raw("xxxRawIRCHere")
+        switch (client.readyState()) {
+            case "CLOSED":
+            case "CLOSING":
+            case "CONNECTING":
+            case "OPEN":
+                break
+        }
+        client.slow(channel, 5)
+        client.slowoff(channel)
+        client.subscribers(channel)
+        client.subscribersoff(channel)
+        client.timeout(channel, username, 600, "timeoutreason")
+        client.ban(channel, username, "reason")
+        client.unban(channel, username)
+        client.host(channel, "tohost")
+        client.unhost(channel)
+        client.mod(channel, username)
+        client.unmod(channel, username)
+        client.whisper(username, "whisper")
+        client.part(channel)
+        switch (method) {
+            case "1000":
+            case "2000":
+            case "3000":
+            case "Prime":
+                break
+        }
+        const { badges, color, emotes, flags, id, login, message, mod, subscriber, turbo } = userstate
+        if (emotes) {
+            emotes.test.forEach(element => {
+                console.log(element)
+            })
+        }
+        if (badges) {
+            const { admin, turbo, subscriber, bits, broadcaster, global_mod, moderator, premium, staff } = badges
+        }
+        userstate["display-name"]
+        userstate["emotes-raw"]
+        userstate["badges-raw"]
+        userstate["message-type"]
+        userstate["msg-param-cumulative-months"]
+        userstate["msg-param-should-share-streak"]
+        userstate["msg-param-streak-months"]
+        userstate["msg-param-sub-plan"]
+        userstate["msg-param-sub-plan-name"]
+        userstate["room-id"]
+        userstate["system-msg"]
+        userstate["tmi-sent-ts"]
+        userstate["user-id"]
+        userstate["user-type"]
+    }).on("roomstate", (chnl: string, roomstate: tmi.RoomState) => {
+        const { channel, r9k, rituals, slow } = roomstate
+        roomstate["broadcaster-lang"]
+        roomstate["emote-only"]
+        roomstate["followers-only"]
+        roomstate["room-id"]
+        roomstate["subs-only"]
+    }).once("chat", (channel: string, userstate: tmi.ChatUserstate, message: string, self: boolean) => {
+        const { badges, bits, color, emotes, flags, id, mod, subscriber, turbo, username } = userstate
+        userstate["badges-raw"]
+        userstate["display-name"]
+        userstate["emotes-raw"]
+        userstate["message-type"]
+        userstate["room-id"]
+        userstate["tmi-sent-ts"]
+        userstate["user-id"]
+        userstate["user-type"]
+    }).once("emotesets", (sets, emotes) => {
+        emotes.test[0].code
+        emotes.test[0].id
+    })
+})
\ No newline at end of file
diff --git a/types/tmi.js/tsconfig.json b/types/tmi.js/tsconfig.json
new file mode 100644
index 0000000000..da2062714c
--- /dev/null
+++ b/types/tmi.js/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    "strictNullChecks": true,              /* Enable strict null checks. */
+    "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+  }
+}
\ No newline at end of file
diff --git a/types/tmi.js/tslint.json b/types/tmi.js/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/tmi.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 3ca57c4672f85a2d480160cfdd27c2bdfad930ec Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 27 Feb 2019 21:42:18 -0800
Subject: [PATCH 169/924] added 'strictFunctionTypes: true' to tsconfig.json as
 recommended

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

diff --git a/types/tmi.js/tsconfig.json b/types/tmi.js/tsconfig.json
index da2062714c..b8bbb67694 100644
--- a/types/tmi.js/tsconfig.json
+++ b/types/tmi.js/tsconfig.json
@@ -9,6 +9,7 @@
     "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
     "strictNullChecks": true,              /* Enable strict null checks. */
     "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "strictFunctionTypes": true,
     "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
   }
 }
\ No newline at end of file

From 82d73ce92b864b180defcc7d12e3307865edf3e6 Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 27 Feb 2019 22:41:28 -0800
Subject: [PATCH 170/924] modified code to pass lint checks.

---
 types/tmi.js/index.d.ts      | 549 +++++++++++++++++------------------
 types/tmi.js/package.json    |   2 +-
 types/tmi.js/tmi.js-tests.ts | 108 +++++++
 types/tmi.js/tmijs-tests.ts  | 110 -------
 types/tmi.js/tsconfig.json   |  36 ++-
 types/tmi.js/tslint.json     |   2 +-
 6 files changed, 406 insertions(+), 401 deletions(-)
 create mode 100644 types/tmi.js/tmi.js-tests.ts
 delete mode 100644 types/tmi.js/tmijs-tests.ts

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
index dab0ce635b..95ca92edfa 100644
--- a/types/tmi.js/index.d.ts
+++ b/types/tmi.js/index.d.ts
@@ -1,299 +1,298 @@
-// Type definitions for tmi.js v1.3.1
-// Project: https://docs.tmijs.org/v1.3.0/index.html
+// Type definitions for tmi.js 1.3
+// Project: https://github.com/tmijs/tmi.js
 // Definitions by: William Papsco <https://github.com/wpapsco>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
 // Twitch IRC docs: https://dev.twitch.tv/docs/irc/
 // Last updated: 2019/2/27
+import { StrictEventEmitter } from "strict-event-emitter-types";
 
-declare module 'tmi.js' {
-    import { StrictEventEmitter } from "strict-event-emitter-types"
+export interface Actions {
+    action(channel: string, message: string): Promise<[string]>;
+    ban(channel: string, username: string, reason?: string): Promise<[string, string, string]>;
+    clear(channel: string): Promise<[string]>;
+    color(color: string): Promise<[string]>;
+    commercial(channel: string, seconds: number): Promise<[string, number]>;
+    connect(): Promise<[string, number]>;
+    disconnect(): Promise<[string, number]>;
+    emoteonly(channel: string): Promise<[string]>;
+    emoteonlyoff(channel: string): Promise<[string]>;
+    followersonly(channel: string, length?: number): Promise<[string, number]>;
+    followersonlyoff(channel: string): Promise<[string]>;
+    host(channel: string, target: string): Promise<[string, string]>;
+    join(channel: string): Promise<[string]>;
+    mod(channel: string, username: string): Promise<[string, string]>;
+    mods(channel: string): Promise<string[]>;
+    part(channel: string): Promise<[string]>;
+    ping(): Promise<[number]>;
+    r9kbeta(channel: string): Promise<[string]>;
+    r9kbetaoff(channel: string): Promise<[string]>;
+    raw(message: string): Promise<[string]>;
+    say(channel: string, message: string): Promise<[string]>;
+    slow(channel: string, length?: number): Promise<[string]>;
+    slowoff(channel: string): Promise<[string]>;
+    subscribers(channel: string): Promise<[string]>;
+    subscribersoff(channel: string): Promise<[string]>;
+    timeout(channel: string, username: string, length?: number, reason?: string): Promise<[string, string, number, string]>;
+    unban(channel: string, username: string): Promise<[string, string]>;
+    unhost(channel: string): Promise<[string]>;
+    unmod(channel: string, username: string): Promise<[string, string]>;
+    whisper(username: string, message: string): Promise<[string, string]>;
+}
 
-    interface Actions {
-        action(channel: string, message: string): Promise<[string]>,
-        ban(channel: string, username: string, reason?: string): Promise<[string, string, string]>,
-        clear(channel: string): Promise<[string]>,
-        color(color: string): Promise<[string]>,
-        commercial(channel: string, seconds: number): Promise<[string, number]>,
-        connect(): Promise<[string, number]>,
-        disconnect(): Promise<[string, number]>,
-        emoteonly(channel: string): Promise<[string]>,
-        emoteonlyoff(channel: string): Promise<[string]>,
-        followersonly(channel: string, length?: number): Promise<[string, number]>,
-        followersonlyoff(channel: string): Promise<[string]>,
-        host(channel: string, target: string): Promise<[string, string]>,
-        join(channel: string): Promise<[string]>,
-        mod(channel: string, username: string): Promise<[string, string]>,
-        mods(channel: string): Promise<string[]>,
-        part(channel: string): Promise<[string]>,
-        ping(): Promise<[number]>,
-        r9kbeta(channel: string): Promise<[string]>,
-        r9kbetaoff(channel: string): Promise<[string]>,
-        raw(message: string): Promise<[string]>,
-        say(channel: string, message: string): Promise<[string]>,
-        slow(channel: string, length?: number): Promise<[string]>,
-        slowoff(channel: string): Promise<[string]>,
-        subscribers(channel: string): Promise<[string]>,
-        subscribersoff(channel: string): Promise<[string]>,
-        timeout(channel: string, username: string, length?: number, reason?: string): Promise<[string, string, number, string]>
-        unban(channel: string, username: string): Promise<[string, string]>,
-        unhost(channel: string): Promise<[string]>,
-        unmod(channel: string, username: string): Promise<[string, string]>,
-        whisper(username: string, message: string): Promise<[string, string]>
-    }
+export interface Events {
+    action(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
+    ban(channel: string, username: string, reason: string): void;
+    chat(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
+    cheer(channel: string, userstate: ChatUserstate, message: string): void;
+    clearchat(channel: string): void;
+    connected(address: string, port: number): void;
+    connecting(address: string, port: number): void;
+    disconnected(reason: string): void;
+    emoteonly(channel: string, enabled: boolean): void;
+    emotesets(sets: string, obj: EmoteObj): void;
+    followersonly(channel: string, enabled: boolean, length: number): void;
+    hosted(channel: string, username: string, viewers: number, autohost: boolean): void;
+    hosting(channel: string, target: string, viewers: number): void;
+    join(channel: string, username: string, self: boolean): void;
+    logon(): void;
+    message(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
+    mod(channel: string, username: string): void;
+    mods(channel: string, mods: string[]): void;
+    notice(channel: string, msgid: MsgID, message: string): void;
+    part(channel: string, username: string, self: boolean): void;
+    ping(): void;
+    pong(latency: number): void;
+    r9kbeta(channel: string, enabled: boolean): void;
+    reconnect(): void;
+    resub(channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: ResubMethod): void;
+    roomstate(channel: string, state: RoomState): void;
+    serverchange(channel: string): void;
+    slowmode(channel: string, enabled: boolean, length: number): void;
+    subscribers(channel: string, enabled: boolean): void;
+    subscription(channel: string, username: string, method: ResubMethod, message: string, userstate: SubUserstate): void;
+    timeout(channel: string, username: string, reason: string, duration: number): void;
+    unhost(channel: string, viewers: number): void;
+    unmod(channel: string, username: string): void;
+    whisper(from: string, userstate: ChatUserstate, message: string, self: boolean): void;
+}
 
-    interface Events {
-        action(channel: string, userstate: ChatUserstate, message: string, self: boolean): void
-        ban(channel: string, username: string, reason: string): void,
-        chat(channel: string, userstate: ChatUserstate, message: string, self: boolean): void,
-        cheer(channel: string, userstate: ChatUserstate, message: string): void,
-        clearchat(channel: string): void,
-        connected(address: string, port: number): void,
-        connecting(address: string, port: number): void,
-        disconnected(reason: string): void,
-        emoteonly(channel: string, enabled: boolean): void,
-        emotesets(sets: string, obj: EmoteObj): void,
-        followersonly(channel: string, enabled: boolean, length: number): void,
-        hosted(channel: string, username: string, viewers: number, autohost: boolean): void,
-        hosting(channel: string, target: string, viewers: number): void,
-        join(channel: string, username: string, self: boolean): void,
-        logon(): void,
-        message(channel: string, userstate: ChatUserstate, message: string, self: boolean): void,
-        mod(channel: string, username: string): void,
-        mods(channel: string, mods: string[]): void,
-        notice(channel: string, msgid: MsgID, message: string): void,
-        part(channel: string, username: string, self: boolean): void,
-        ping(): void,
-        pong(latency: number): void,
-        r9kbeta(channel: string, enabled: boolean): void,
-        reconnect(): void,
-        resub(channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: ResubMethod): void,
-        roomstate(channel: string, state: RoomState): void,
-        serverchange(channel: string): void,
-        slowmode(channel: string, enabled: boolean, length: number): void,
-        subscribers(channel: string, enabled: boolean): void,
-        subscription(channel: string, username: string, method: ResubMethod, message: string, userstate: SubUserstate): void,
-        timeout(channel: string, username: string, reason: string, duration: number): void,
-        unhost(channel: string, viewers: number): void,
-        unmod(channel: string, username: string): void,
-        whisper(from: string, userstate: ChatUserstate, message: string, self: boolean): void
-    }
+export interface ClientBase {
+    getChannels(): string[];
+    getOptions(): Options;
+    getUsername(): string;
+    isMod(channel: string, username: string): boolean;
+    readyState(): "CONNECTING" | "OPEN" | "CLOSING" | "CLOSED";
+    on(event: any, listener: any): Client;
+    addListener(event: any, listener: any): Client;
+    removeListener(event: any, listener: any): Client;
+    removeAllListeners(event?: keyof Events): Client;
+    setMaxListeners(n: number): Client;
+    emits(events: Array<keyof Events>, values: any[][]): void; // wish this could work better but either I'm just not smart enough or it's not possible
+    emit: (event: any) => boolean;
+    once(event: any, listener: any): Client;
+    listenerCount(event: keyof Events): number;
+}
 
-    interface ClientBase {
-        getChannels(): string[],
-        getOptions(): Options,
-        getUsername(): string,
-        isMod(channel: string, username: string): boolean,
-        readyState(): "CONNECTING" | "OPEN" | "CLOSING" | "CLOSED",
-        on(event: any, listener: any): Client,
-        addListener(event: any, listener: any): Client,
-        removeListener(event: any, listener: any): Client,
-        removeAllListeners<P extends keyof Events>(event?: P): Client,
-        setMaxListeners(n: number): Client,
-        emits(events: (keyof Events)[], values: any[][]): void, //wish this could work better but either I'm just not smart enough or it's not possible
-        emit: (event: any) => boolean,
-        once(event: any, listener: any): Client,
-        listenerCount<P extends keyof Events>(event: P): number,
-    }
+export interface Badges {
+    admin?: string;
+    bits?: string;
+    broadcaster?: string;
+    global_mod?: string;
+    moderator?: string;
+    subscriber?: string;
+    staff?: string;
+    turbo?: string;
+    premium?: string;
+}
 
-    interface Badges {
-        admin?: string,
-        bits?: string,
-        broadcaster?: string,
-        global_mod?: string,
-        moderator?: string,
-        subscriber?: string,
-        staff?: string,
-        turbo?: string,
-        premium?: string
-    }
+export interface CommonUserstate {
+    badges?: Badges;
+    color?: string;
+    "display-name"?: string;
+    emotes?: { [emoteid: string]: string[] };
+    id?: string;
+    mod?: boolean;
+    turbo?: boolean;
+    'emotes-raw'?: string;
+    'badges-raw'?: string;
+    "room-id"?: string;
+    subscriber?: boolean;
+    'user-type'?: "" | "mod" | "global_mod" | "admin" | "staff";
+    "user-id"?: string;
+    "tmi-sent-ts"?: string;
+    flags?: string;
+}
 
-    interface CommonUserstate {
-        badges?: Badges,
-        color?: string,
-        "display-name"?: string,
-        emotes?: { [emoteid: string]: string[] },
-        id?: string,
-        mod?: boolean,
-        turbo?: boolean,
-        'emotes-raw'?: string,
-        'badges-raw'?: string,
-        "room-id"?: string,
-        subscriber?: boolean,
-        'user-type'?: "" | "mod" | "global_mod" | "admin" | "staff",
-        "user-id"?: string,
-        "tmi-sent-ts"?: string,
-        flags?: string,
-    }
+export interface UserNoticeState extends CommonUserstate {
+    login?: string;
+    message?: string;
+    "system-msg"?: string;
+}
 
-    interface UserNoticeState extends CommonUserstate {
-        login?: string,
-        message?: string,
-        "system-msg"?: string,
-    }
+export interface CommonSubUserstate extends UserNoticeState {
+    "msg-param-sub-plan"?: ResubMethod;
+    "msg-param-sub-plan-name"?: string;
+}
 
-    interface CommonSubUserstate extends UserNoticeState {
-        "msg-param-sub-plan"?: ResubMethod,
-        "msg-param-sub-plan-name"?: string
-    }
+export interface ChatUserstate extends CommonUserstate {
+    'message-type'?: "chat" | "action" | "whisper";
+    username?: string;
+    bits?: string;
+}
 
-    interface ChatUserstate extends CommonUserstate {
-        'message-type'?: "chat" | "action" | "whisper",
-        username?: string,
-        bits?: string,
-    }
+export interface SubUserstate extends CommonSubUserstate {
+    'message-type'?: "sub" | "resub";
+    "msg-param-cumulative-months"?: string | boolean;
+    "msg-param-should-share-streak"?: boolean;
+    "msg-param-streak-months"?: string | boolean;
+}
 
-    interface SubUserstate extends CommonSubUserstate {
-        'message-type'?: "sub" | "resub",
-        "msg-param-cumulative-months"?: string | boolean,
-        "msg-param-should-share-streak"?: boolean,
-        "msg-param-streak-months"?: string | boolean,
-    }
+export interface SubGiftUserstate extends CommonSubUserstate {
+    'message-type'?: "subgift" | "anonsubgift";
+    "msg-param-recipient-display-name"?: string;
+    "msg-param-recipient-id"?: string;
+    "msg-param-recipient-user-name"?: string;
+}
 
-    interface SubGiftUserstate extends CommonSubUserstate {
-        'message-type'?: "subgift" | "anonsubgift",
-        "msg-param-recipient-display-name"?: string,
-        "msg-param-recipient-id"?: string,
-        "msg-param-recipient-user-name"?: string,
-    }
+export interface RaidUserstate extends UserNoticeState {
+    "message-type"?: "raid";
+    "msg-param-displayName"?: string;
+    "msg-param-login"?: string;
+    "msg-param-viewerCount"?: string;
+}
 
-    interface RaidUserstate extends UserNoticeState {
-        "message-type"?: "raid"
-        "msg-param-displayName"?: string,
-        "msg-param-login"?: string,
-        "msg-param-viewerCount"?: string,
-    }
+export interface RitualUserstate extends UserNoticeState {
+    "message-type"?: "ritual";
+    "msg-param-ritual-name"?: "new_chatter";
+}
 
-    interface RitualUserstate extends UserNoticeState {
-        "message-type"?: "ritual"
-        "msg-param-ritual-name"?: "new_chatter"
-    }
+export type Userstate = ChatUserstate | SubGiftUserstate | SubUserstate | RaidUserstate | RitualUserstate;
 
-    type Userstate = ChatUserstate | SubGiftUserstate | SubUserstate | RaidUserstate | RitualUserstate
+export interface EmoteObj {
+    [id: string]: [{
+        code: string;
+        id: number;
+    }];
+}
 
-    interface EmoteObj {
-        [id: string]: [{
-            code: string,
-            id: number
-        }]
-    }
+export type MsgID = "already_banned" |
+    "already_emote_only_on" |
+    "already_emote_only_off" |
+    "already_subs_on" |
+    "already_subs_off" |
+    "bad_ban_admin" |
+    "bad_ban_broadcaster" |
+    "bad_ban_global_mod" |
+    "bad_ban_self" |
+    "bad_ban_staff" |
+    "bad_commercial_error" |
+    "bad_host_hosting" |
+    "bad_host_rate_exceeded" |
+    "bad_mod_mod" |
+    "bad_mod_banned" |
+    "bad_timeout_admin" |
+    "bad_timeout_global_mod" |
+    "bad_timeout_self" |
+    "bad_timeout_staff" |
+    "bad_unban_no_ban" |
+    "bad_unmod_mod" |
+    "ban_success" |
+    "cmds_available" |
+    "color_changed" |
+    "commercial_success" |
+    "emote_only_on" |
+    "emote_only_off" |
+    "hosts_remaining" |
+    "host_target_went_offline" |
+    "mod_success" |
+    "msg_banned" |
+    "msg_censored_broadcaster" |
+    "msg_channel_suspended" |
+    "msg_duplicate" |
+    "msg_emoteonly" |
+    "msg_ratelimit" |
+    "msg_subsonly" |
+    "msg_timedout" |
+    "msg_verified_email" |
+    "no_help" |
+    "no_permission" |
+    "not_hosting" |
+    "timeout_success" |
+    "unban_success" |
+    "unmod_success" |
+    "unrecognized_cmd" |
+    "usage_ban" |
+    "usage_clear" |
+    "usage_color" |
+    "usage_commercial" |
+    "usage_disconnect" |
+    "usage_emote_only_on" |
+    "usage_emote_only_off" |
+    "usage_help" |
+    "usage_host" |
+    "usage_me" |
+    "usage_mod" |
+    "usage_mods" |
+    "usage_r9k_on" |
+    "usage_r9k_off" |
+    "usage_slow_on" |
+    "usage_slow_off" |
+    "usage_subs_on" |
+    "usage_subs_off" |
+    "usage_timeout" |
+    "usage_unban" |
+    "usage_unhost" |
+    "usage_unmod" |
+    "whisper_invalid_self" |
+    "whisper_limit_per_min" |
+    "whisper_limit_per_sec" |
+    "whisper_restricted_recipient";
 
-    type MsgID = "already_banned" |
-        "already_emote_only_on" |
-        "already_emote_only_off" |
-        "already_subs_on" |
-        "already_subs_off" |
-        "bad_ban_admin" |
-        "bad_ban_broadcaster" |
-        "bad_ban_global_mod" |
-        "bad_ban_self" |
-        "bad_ban_staff" |
-        "bad_commercial_error" |
-        "bad_host_hosting" |
-        "bad_host_rate_exceeded" |
-        "bad_mod_mod" |
-        "bad_mod_banned" |
-        "bad_timeout_admin" |
-        "bad_timeout_global_mod" |
-        "bad_timeout_self" |
-        "bad_timeout_staff" |
-        "bad_unban_no_ban" |
-        "bad_unmod_mod" |
-        "ban_success" |
-        "cmds_available" |
-        "color_changed" |
-        "commercial_success" |
-        "emote_only_on" |
-        "emote_only_off" |
-        "hosts_remaining" |
-        "host_target_went_offline" |
-        "mod_success" |
-        "msg_banned" |
-        "msg_censored_broadcaster" |
-        "msg_channel_suspended" |
-        "msg_duplicate" |
-        "msg_emoteonly" |
-        "msg_ratelimit" |
-        "msg_subsonly" |
-        "msg_timedout" |
-        "msg_verified_email" |
-        "no_help" |
-        "no_permission" |
-        "not_hosting" |
-        "timeout_success" |
-        "unban_success" |
-        "unmod_success" |
-        "unrecognized_cmd" |
-        "usage_ban" |
-        "usage_clear" |
-        "usage_color" |
-        "usage_commercial" |
-        "usage_disconnect" |
-        "usage_emote_only_on" |
-        "usage_emote_only_off" |
-        "usage_help" |
-        "usage_host" |
-        "usage_me" |
-        "usage_mod" |
-        "usage_mods" |
-        "usage_r9k_on" |
-        "usage_r9k_off" |
-        "usage_slow_on" |
-        "usage_slow_off" |
-        "usage_subs_on" |
-        "usage_subs_off" |
-        "usage_timeout" |
-        "usage_unban" |
-        "usage_unhost" |
-        "usage_unmod" |
-        "whisper_invalid_self" |
-        "whisper_limit_per_min" |
-        "whisper_limit_per_sec" |
-        "whisper_restricted_recipient"
+export type ResubMethod = "Prime" | "1000" | "2000" | "3000";
 
-    type ResubMethod = "Prime" | "1000" | "2000" | "3000"
+export interface RoomState {
+    "broadcaster-lang"?: string;
+    "emote-only"?: boolean;
+    "followers-only"?: string | boolean;
+    "r9k"?: boolean;
+    "rituals"?: boolean;
+    "room-id"?: string;
+    "slow"?: string | boolean;
+    "subs-only"?: boolean;
+    "channel"?: string;
+}
 
-    interface RoomState {
-        "broadcaster-lang"?: string,
-        "emote-only"?: boolean,
-        "followers-only"?: string | boolean,
-        "r9k"?: boolean,
-        "rituals"?: boolean,
-        "room-id"?: string
-        "slow"?: string | boolean,
-        "subs-only"?: boolean,
-        "channel"?: string
-    }
+export type Client = StrictEventEmitter<ClientBase, Events> & Actions;
 
-    type Client = StrictEventEmitter<ClientBase, Events> & Actions
+export interface Options {
+    options?: {
+        clientId?: string;
+        debug?: boolean;
+    };
+    connection?: {
+        server?: string;
+        port?: number;
+        reconnect?: boolean;
+        maxReconnectAttempts?: number;
+        maxReconnectInverval?: number;
+        reconnectDecay?: number;
+        reconnectInterval?: number;
+        secure?: boolean;
+        timeout?: number;
+    };
+    identity?: {
+        username?: string;
+        password?: string;
+    };
+    channels?: string[];
+    logger?: {
+        info?: (message: string) => any;
+        warn?: (message: string) => any;
+        error?: (message: string) => any;
+    };
+}
 
-    interface Options {
-        options?: {
-            clientId?: string,
-            debug?: boolean
-        },
-        connection?: {
-            server?: string,
-            port?: number,
-            reconnect?: boolean,
-            maxReconnectAttempts?: number,
-            maxReconnectInverval?: number,
-            reconnectDecay?: number,
-            reconnectInterval?: number,
-            secure?: boolean,
-            timeout?: number
-        },
-        identity?: {
-            username?: string,
-            password?: string
-        },
-        channels?: string[],
-        logger?: {
-            info?: (message: string) => any,
-            warn?: (message: string) => any,
-            error?: (message: string) => any
-        }
-    }
-
-    export function client(opts: Options): Client
-    export function Client(opts: Options): Client
-}
\ No newline at end of file
+export function client(opts: Options): Client;
+export function Client(opts: Options): Client;
diff --git a/types/tmi.js/package.json b/types/tmi.js/package.json
index dd5c6e4363..924e8a8bbc 100644
--- a/types/tmi.js/package.json
+++ b/types/tmi.js/package.json
@@ -3,4 +3,4 @@
     "dependencies": {
         "strict-event-emitter-types": "^2.0.0"
     }
-}
\ No newline at end of file
+}
diff --git a/types/tmi.js/tmi.js-tests.ts b/types/tmi.js/tmi.js-tests.ts
new file mode 100644
index 0000000000..6cd2c62629
--- /dev/null
+++ b/types/tmi.js/tmi.js-tests.ts
@@ -0,0 +1,108 @@
+import * as tmi from "tmi.js";
+
+const options: tmi.Options = {
+    channels: ['#channel1', '#channel2'],
+    connection: {
+        maxReconnectAttempts: 2,
+        maxReconnectInverval: 10,
+        port: 100,
+        reconnect: true,
+        reconnectDecay: 20,
+        reconnectInterval: 10,
+        secure: true,
+        timeout: 20
+    },
+    identity: {
+        password: "oauth:xxxOAuthIDHerexxx",
+        username: "yourusernamehere"
+    },
+    logger: {
+        warn: (message) => { },
+        error: (message) => { },
+        info: (message) => { },
+    },
+    options: {
+        clientId: "xxxapiidherexxx",
+        debug: true
+    }
+};
+
+const client: tmi.Client = tmi.Client(options);
+
+client.connect().then(() => {
+    client.on("subscription", (channel: string, username: string, method: tmi.ResubMethod, msg: string, userstate: tmi.SubUserstate) => {
+        client.say(channel, `Thank you to ${userstate["display-name"]} for subscribing!`);
+        client.ping();
+        client.r9kbeta(channel);
+        client.r9kbetaoff(channel);
+        client.raw("xxxRawIRCHere");
+        switch (client.readyState()) {
+            case "CLOSED":
+            case "CLOSING":
+            case "CONNECTING":
+            case "OPEN":
+                break;
+        }
+        client.slow(channel, 5);
+        client.slowoff(channel);
+        client.subscribers(channel);
+        client.subscribersoff(channel);
+        client.timeout(channel, username, 600, "timeoutreason");
+        client.ban(channel, username, "reason");
+        client.unban(channel, username);
+        client.host(channel, "tohost");
+        client.unhost(channel);
+        client.mod(channel, username);
+        client.unmod(channel, username);
+        client.whisper(username, "whisper");
+        client.part(channel);
+        switch (method) {
+            case "1000":
+            case "2000":
+            case "3000":
+            case "Prime":
+                break;
+        }
+        const { badges, color, emotes, flags, id, login, message, mod, subscriber, turbo } = userstate;
+        if (emotes) {
+            emotes.test.forEach(element => { });
+        }
+        if (badges) {
+            const { admin, turbo, subscriber, bits, broadcaster, global_mod, moderator, premium, staff } = badges;
+        }
+        userstate["display-name"];
+        userstate["emotes-raw"];
+        userstate["badges-raw"];
+        userstate["message-type"];
+        userstate["msg-param-cumulative-months"];
+        userstate["msg-param-should-share-streak"];
+        userstate["msg-param-streak-months"];
+        userstate["msg-param-sub-plan"];
+        userstate["msg-param-sub-plan-name"];
+        userstate["room-id"];
+        userstate["system-msg"];
+        userstate["tmi-sent-ts"];
+        userstate["user-id"];
+        userstate["user-type"];
+    }).on("roomstate", (chnl: string, roomstate: tmi.RoomState) => {
+        const { channel, r9k, rituals, slow } = roomstate;
+        roomstate["broadcaster-lang"];
+        roomstate["emote-only"];
+        roomstate["followers-only"];
+        roomstate["room-id"];
+        roomstate["subs-only"];
+    }).once("chat", (channel: string, userstate: tmi.ChatUserstate, message: string, self: boolean) => {
+        const { badges, bits, color, emotes, flags, id, mod, subscriber, turbo, username } = userstate;
+        userstate["badges-raw"];
+        userstate["display-name"];
+        userstate["emotes-raw"];
+        userstate["message-type"];
+        userstate["room-id"];
+        userstate["tmi-sent-ts"];
+        userstate["user-id"];
+        userstate["user-type"];
+    }).once("emotesets", (sets: string, emotes: tmi.EmoteObj) => {
+        emotes.test[0].code;
+        emotes.test[0].id;
+    });
+});
diff --git a/types/tmi.js/tmijs-tests.ts b/types/tmi.js/tmijs-tests.ts
deleted file mode 100644
index e80ad43915..0000000000
--- a/types/tmi.js/tmijs-tests.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import * as tmi from "tmi.js"
-
-const options: tmi.Options = {
-    channels: ['#channel1', '#channel2'],
-    connection: {
-        maxReconnectAttempts: 2,
-        maxReconnectInverval: 10,
-        port: 100,
-        reconnect: true,
-        reconnectDecay: 20,
-        reconnectInterval: 10,
-        secure: true,
-        timeout: 20
-    },
-    identity: {
-        password: "oauth:xxxOAuthIDHerexxx",
-        username: "yourusernamehere"
-    },
-    logger: {
-        warn: console.log,
-        error: console.log,
-        info: console.log,
-    },
-    options: {
-        clientId: "xxxapiidherexxx",
-        debug: true
-    }
-}
-
-const client: tmi.Client = tmi.Client(options)
-
-client.connect().then(() => {
-    client.on("subscription", (channel: string, username: string, method: tmi.ResubMethod, msg: string, userstate: tmi.SubUserstate) => {
-        client.say(channel, "Thank you to " + userstate["display-name"] + "for subscribing!")
-        client.ping()
-        client.r9kbeta(channel)
-        client.r9kbetaoff(channel)
-        client.raw("xxxRawIRCHere")
-        switch (client.readyState()) {
-            case "CLOSED":
-            case "CLOSING":
-            case "CONNECTING":
-            case "OPEN":
-                break
-        }
-        client.slow(channel, 5)
-        client.slowoff(channel)
-        client.subscribers(channel)
-        client.subscribersoff(channel)
-        client.timeout(channel, username, 600, "timeoutreason")
-        client.ban(channel, username, "reason")
-        client.unban(channel, username)
-        client.host(channel, "tohost")
-        client.unhost(channel)
-        client.mod(channel, username)
-        client.unmod(channel, username)
-        client.whisper(username, "whisper")
-        client.part(channel)
-        switch (method) {
-            case "1000":
-            case "2000":
-            case "3000":
-            case "Prime":
-                break
-        }
-        const { badges, color, emotes, flags, id, login, message, mod, subscriber, turbo } = userstate
-        if (emotes) {
-            emotes.test.forEach(element => {
-                console.log(element)
-            })
-        }
-        if (badges) {
-            const { admin, turbo, subscriber, bits, broadcaster, global_mod, moderator, premium, staff } = badges
-        }
-        userstate["display-name"]
-        userstate["emotes-raw"]
-        userstate["badges-raw"]
-        userstate["message-type"]
-        userstate["msg-param-cumulative-months"]
-        userstate["msg-param-should-share-streak"]
-        userstate["msg-param-streak-months"]
-        userstate["msg-param-sub-plan"]
-        userstate["msg-param-sub-plan-name"]
-        userstate["room-id"]
-        userstate["system-msg"]
-        userstate["tmi-sent-ts"]
-        userstate["user-id"]
-        userstate["user-type"]
-    }).on("roomstate", (chnl: string, roomstate: tmi.RoomState) => {
-        const { channel, r9k, rituals, slow } = roomstate
-        roomstate["broadcaster-lang"]
-        roomstate["emote-only"]
-        roomstate["followers-only"]
-        roomstate["room-id"]
-        roomstate["subs-only"]
-    }).once("chat", (channel: string, userstate: tmi.ChatUserstate, message: string, self: boolean) => {
-        const { badges, bits, color, emotes, flags, id, mod, subscriber, turbo, username } = userstate
-        userstate["badges-raw"]
-        userstate["display-name"]
-        userstate["emotes-raw"]
-        userstate["message-type"]
-        userstate["room-id"]
-        userstate["tmi-sent-ts"]
-        userstate["user-id"]
-        userstate["user-type"]
-    }).once("emotesets", (sets, emotes) => {
-        emotes.test[0].code
-        emotes.test[0].id
-    })
-})
\ No newline at end of file
diff --git a/types/tmi.js/tsconfig.json b/types/tmi.js/tsconfig.json
index b8bbb67694..70fffac476 100644
--- a/types/tmi.js/tsconfig.json
+++ b/types/tmi.js/tsconfig.json
@@ -1,15 +1,23 @@
 {
-  "compilerOptions": {
-    /* Basic Options */
-    "target": "es5",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-
-    /* Strict Type-Checking Options */
-    "strict": true,                           /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
-    "strictNullChecks": true,              /* Enable strict null checks. */
-    "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "strictFunctionTypes": true,
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-  }
-}
\ No newline at end of file
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "tmi.js-tests.ts"
+    ]
+}
diff --git a/types/tmi.js/tslint.json b/types/tmi.js/tslint.json
index 2750cc0197..3db14f85ea 100644
--- a/types/tmi.js/tslint.json
+++ b/types/tmi.js/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint/dt.json" }
\ No newline at end of file
+{ "extends": "dtslint/dt.json" }

From 12fdba1ad1af914083b306064fd37fb0dd162245 Mon Sep 17 00:00:00 2001
From: Alan Choi <alan.choi@sendbird.com>
Date: Thu, 28 Feb 2019 14:25:47 +0900
Subject: [PATCH 171/924] Delete SelectValue type

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

diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index d10652dabe..eb148ebbb8 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -50,11 +50,8 @@ export function object<T>(name: string, value: T, groupId?: string): T;
 
 export function radios<T>(name: string, options: { [s: string]: T }, value?: T, groupId?: string): string;
 
-export type SelectValue = string | number;
-export function select<T extends SelectValue>(name: string, options: { [s: string]: T }, value: T | ReadonlyArray<T>, groupId?: string): T;
-export function select<T extends SelectValue>(name: string, options: { [s: string]: ReadonlyArray<T> }, value: ReadonlyArray<T>, groupId?: string): T[];
-export function select<T extends SelectValue>(name: string, options: { [s: string]: T | ReadonlyArray<T> }, value: T | ReadonlyArray<T>, groupId?: string): T | T[];
-export function select<T extends SelectValue>(name: string, options: ReadonlyArray<T>, value: T, groupId?: string): T;
+export function select<T>(name: string, options: { [s: string]: T }, value: T, groupId?: string): T;
+export function select(name: string, options: ReadonlyArray<string>, value: string, groupId?: string): string;
 
 export function date(name: string, value?: Date, groupId?: string): Date;
 

From a8f5422dc22b357968c2edab333e1cd473604355 Mon Sep 17 00:00:00 2001
From: Alan Choi <alan.choi@sendbird.com>
Date: Thu, 28 Feb 2019 14:27:36 +0900
Subject: [PATCH 172/924] Add contributor

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

diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index eb148ebbb8..3aab101f74 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -4,6 +4,7 @@
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
 //                 A.MacLeay <https://github.com/amacleay>
 //                 Michael Loughry <https://github.com/MLoughry>
+//                 Alan Choi <https://github.com/alanhchoi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 

From 0013dcc072912a33b28e4a06c90f4140c9cddc71 Mon Sep 17 00:00:00 2001
From: Alan Choi <alan.choi@sendbird.com>
Date: Thu, 28 Feb 2019 15:53:25 +0900
Subject: [PATCH 173/924] Add test

---
 .../storybook__addon-knobs/storybook__addon-knobs-tests.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index c0c7f325ed..75ab4c79a9 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -96,6 +96,12 @@ stories.add('dynamic knobs', () => {
 const readonlyOptionsArray: ReadonlyArray<string> = ['hi'];
 select('With readonly array', readonlyOptionsArray, readonlyOptionsArray[0]);
 
+const optionsObject = {
+  Apple: { taste: 'sweet', color: 'red' },
+  Lemon: { taste: 'sour', color: 'yellow' }
+};
+select('With object', optionsObject, optionsObject.Apple);
+
 const genericArray = array('With regular array', ['hi', 'there']);
 
 const userInputArray = array('With readonly array', readonlyOptionsArray);

From 4c8bf178adddd6e51a52e319ca6f2aebeb936aeb Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 27 Feb 2019 23:10:52 -0800
Subject: [PATCH 174/924] incoroprated dependency 'strict-event-emitter-types'

---
 types/tmi.js/index.d.ts                    |  2 +-
 types/tmi.js/package.json                  |  6 --
 types/tmi.js/strict-event-emitter-types.ts | 67 ++++++++++++++++++++++
 3 files changed, 68 insertions(+), 7 deletions(-)
 delete mode 100644 types/tmi.js/package.json
 create mode 100644 types/tmi.js/strict-event-emitter-types.ts

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
index 95ca92edfa..b222665660 100644
--- a/types/tmi.js/index.d.ts
+++ b/types/tmi.js/index.d.ts
@@ -6,7 +6,7 @@
 
 // Twitch IRC docs: https://dev.twitch.tv/docs/irc/
 // Last updated: 2019/2/27
-import { StrictEventEmitter } from "strict-event-emitter-types";
+import { StrictEventEmitter } from "./strict-event-emitter-types";
 
 export interface Actions {
     action(channel: string, message: string): Promise<[string]>;
diff --git a/types/tmi.js/package.json b/types/tmi.js/package.json
deleted file mode 100644
index 924e8a8bbc..0000000000
--- a/types/tmi.js/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "strict-event-emitter-types": "^2.0.0"
-    }
-}
diff --git a/types/tmi.js/strict-event-emitter-types.ts b/types/tmi.js/strict-event-emitter-types.ts
new file mode 100644
index 0000000000..d5d09a5d3a
--- /dev/null
+++ b/types/tmi.js/strict-event-emitter-types.ts
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 bterlson <https://github.com/bterlson/strict-event-emitter-types>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any purpose
+ * with or without fee is hereby granted, provided that the above copyright notice
+ * and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+ * THIS SOFTWARE.
+ */
+
+declare const assignmentCompatibilityHack: unique symbol;
+export type MatchingKeys<TRecord, TMatch, K extends keyof TRecord = keyof TRecord> = K extends (TRecord[K] extends TMatch ? K : never) ? K : never;
+export type VoidKeys<Record> = MatchingKeys<Record, void>;
+export interface TypeRecord<T, U, V> {
+    ' _emitterType'?: T;
+    ' _eventsType'?: U;
+    ' _emitType'?: V;
+}
+export type ReturnTypeOfMethod<T> = T extends (...args: any[]) => any ? ReturnType<T> : never;
+export type ReturnTypeOfMethodIfExists<T, S extends string> = S extends keyof T ? ReturnTypeOfMethod<T[S]> : never;
+export type InnerEEMethodReturnType<T, TValue, FValue> = T extends (...args: any[]) => any ? ReturnType<T> extends never | undefined ? FValue : TValue : FValue;
+export type EEMethodReturnType<T, S extends string, TValue, FValue = void> = S extends keyof T ? InnerEEMethodReturnType<T[S], TValue, FValue> : FValue;
+type ListenerType<T> = [T] extends [(...args: infer U) => any] ? U : [T] extends [never] ? [] : [T];
+export interface OverriddenMethods<TEmitter, TEventRecord, TEmitRecord = TEventRecord> {
+    on<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'on', T>;
+    on(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    addListener<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'addListener', T>;
+    addListener(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    addEventListener<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'addEventListener', T>;
+    addEventListener(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    removeListener<T>(this: T, event: keyof TEventRecord, listener: (...args: any[]) => any): EEMethodReturnType<TEmitter, 'removeListener', T>;
+    removeListener(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    removeEventListener<T>(this: T, event: keyof TEventRecord, listener: (...args: any[]) => any): EEMethodReturnType<TEmitter, 'removeEventListener', T>;
+    removeEventListener(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    once<P extends keyof TEventRecord, T>(this: T, event: P, listener: (...args: ListenerType<TEventRecord[P]>) => void): EEMethodReturnType<TEmitter, 'once', T>;
+    once(event: typeof assignmentCompatibilityHack, listener: (...args: any[]) => any): void;
+    emit<P extends keyof TEmitRecord, T>(this: T, event: P, ...args: ListenerType<TEmitRecord[P]>): EEMethodReturnType<TEmitter, 'emit', T>;
+    emit(event: typeof assignmentCompatibilityHack, ...args: any[]): void;
+}
+export type OverriddenKeys = keyof OverriddenMethods<any, any, any>;
+export type StrictEventEmitter<TEmitterType, TEventRecord, TEmitRecord = TEventRecord, UnneededMethods extends Exclude<OverriddenKeys, keyof TEmitterType> =
+    Exclude<OverriddenKeys, keyof TEmitterType>, NeededMethods extends Exclude<OverriddenKeys, UnneededMethods> = Exclude<OverriddenKeys, UnneededMethods>> =
+    TypeRecord<TEmitterType, TEventRecord, TEmitRecord> & Pick<TEmitterType, Exclude<keyof TEmitterType, OverriddenKeys>> &
+    Pick<OverriddenMethods<TEmitterType, TEventRecord, TEmitRecord>, NeededMethods>;
+export default StrictEventEmitter;
+export type NoUndefined<T> = T extends undefined ? never : T;
+export interface StrictBroadcast<TEmitter extends TypeRecord<any, any, any>,
+    TEmitRecord extends NoUndefined<TEmitter[' _emitType']> = NoUndefined<TEmitter[' _emitType']>,
+    VK extends VoidKeys<TEmitRecord> = VoidKeys<TEmitRecord>, NVK extends Exclude<keyof TEmitRecord, VK> = Exclude<keyof TEmitRecord, VK>> {
+    <E extends NVK>(event: E, request: TEmitRecord[E]): any;
+    (event: VK): any;
+}
+export type EventNames<TEmitter extends TypeRecord<any, any, any>,
+    TEventRecord extends NoUndefined<TEmitter[' _eventsType']> = NoUndefined<TEmitter[' _eventsType']>,
+    TEmitRecord extends NoUndefined<TEmitter[' _emitType']> = NoUndefined<TEmitter[' _emitType']>> = keyof TEmitRecord | keyof TEventRecord;
+export type OnEventNames<TEmitter extends TypeRecord<any, any, any>,
+    TEventRecord extends NoUndefined<TEmitter[' _eventsType']> = NoUndefined<TEmitter[' _eventsType']>,
+    TEmitRecord extends NoUndefined<TEmitter[' _emitType']> = NoUndefined<TEmitter[' _emitType']>> = keyof TEventRecord;
+export type EmitEventNames<TEmitter extends TypeRecord<any, any, any>,
+    TEventRecord extends NoUndefined<TEmitter[' _eventsType']> = NoUndefined<TEmitter[' _eventsType']>,
+    TEmitRecord extends NoUndefined<TEmitter[' _emitType']> = NoUndefined<TEmitter[' _emitType']>> = keyof TEmitRecord;

From c29b6c4481786c91677e918d7c22d464faec2bf2 Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 27 Feb 2019 23:27:43 -0800
Subject: [PATCH 175/924] adjusted directory structure for
 strict-event-emitter-types in tmi.js

---
 types/tmi.js/index.d.ts                                          | 1 +
 .../index.d.ts}                                                  | 0
 2 files changed, 1 insertion(+)
 rename types/tmi.js/{strict-event-emitter-types.ts => strict-event-emitter-types/index.d.ts} (100%)

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
index b222665660..86076ce202 100644
--- a/types/tmi.js/index.d.ts
+++ b/types/tmi.js/index.d.ts
@@ -6,6 +6,7 @@
 
 // Twitch IRC docs: https://dev.twitch.tv/docs/irc/
 // Last updated: 2019/2/27
+
 import { StrictEventEmitter } from "./strict-event-emitter-types";
 
 export interface Actions {
diff --git a/types/tmi.js/strict-event-emitter-types.ts b/types/tmi.js/strict-event-emitter-types/index.d.ts
similarity index 100%
rename from types/tmi.js/strict-event-emitter-types.ts
rename to types/tmi.js/strict-event-emitter-types/index.d.ts

From 19ed4efe6f40c3dfc4ccc967a753daca36d548dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Szabo?= <tomas.szabo@deftomat.com>
Date: Thu, 28 Feb 2019 10:22:54 +0100
Subject: [PATCH 176/924] sharp: add "mitchell" kernel option

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

diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index e47418badf..c92495aa69 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -947,6 +947,7 @@ declare namespace sharp {
     interface KernelEnum {
         nearest: "nearest";
         cubic: "cubic";
+        mitchell: "mitchell",
         lanczos2: "lanczos2";
         lanczos3: "lanczos3";
     }

From 724e9807bb899ec42c15455f9620a749c61f9925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Szabo?= <tomas.szabo@deftomat.com>
Date: Thu, 28 Feb 2019 10:36:49 +0100
Subject: [PATCH 177/924] Make linter happy

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

diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index c92495aa69..5fcc47a26d 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -947,7 +947,7 @@ declare namespace sharp {
     interface KernelEnum {
         nearest: "nearest";
         cubic: "cubic";
-        mitchell: "mitchell",
+        mitchell: "mitchell";
         lanczos2: "lanczos2";
         lanczos3: "lanczos3";
     }

From ebf272aface38c11047499fc62dffaf77d989f22 Mon Sep 17 00:00:00 2001
From: Borys Kupar <borys.kupar@ottonova.de>
Date: Thu, 28 Feb 2019 13:32:55 +0100
Subject: [PATCH 178/924] [moment-timezone] Add support for
 "moment-timezone/moment-timezone" import

---
 types/moment-timezone/index.d.ts           | 1 +
 types/moment-timezone/moment-timezone.d.ts | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 types/moment-timezone/moment-timezone.d.ts

diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index 95a8621fdd..9d365f01b4 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Michel Salib <https://github.com/michelsalib>
 //                 Alan Brazil Lins <https://github.com/alanblins>
 //                 Agustin Carrasco <https://github.com/asermax>
+//                 Borys Kupar <https://github.com/borys-kupar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import moment = require('moment');
diff --git a/types/moment-timezone/moment-timezone.d.ts b/types/moment-timezone/moment-timezone.d.ts
new file mode 100644
index 0000000000..4f06f7e4f1
--- /dev/null
+++ b/types/moment-timezone/moment-timezone.d.ts
@@ -0,0 +1,3 @@
+import moment = require('moment');
+
+export = moment;

From e746218ba8915ee395e178e7e30dcbbdda4dfc50 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Thu, 28 Feb 2019 13:38:56 +0100
Subject: [PATCH 179/924] [react-router] Add failing test for union props

---
 types/react-router/test/WithRouter.tsx | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/types/react-router/test/WithRouter.tsx b/types/react-router/test/WithRouter.tsx
index 4db65a32bd..5782b08429 100644
--- a/types/react-router/test/WithRouter.tsx
+++ b/types/react-router/test/WithRouter.tsx
@@ -22,3 +22,31 @@ const WithRouterTestFunction = () => (
     <WithRouterComponentFunction username="John" />
 );
 const WithRouterTestClass = () => <WithRouterComponentClass username="John" />;
+
+// union props
+{
+    interface Book {
+        kind: 'book';
+        author: string;
+    }
+
+    interface Magazine {
+        kind: 'magazine';
+        issue: number;
+    }
+
+    type SomethingToRead = (Book | Magazine) & RouteComponentProps;
+
+    const Readable: React.SFC<SomethingToRead> = props => {
+        if (props.kind === 'magazine') {
+            return <div>magazine #{props.issue}</div>;
+        }
+
+        return <div>magazine #{props.author}</div>;
+    };
+
+    const RoutedReadable = withRouter(Readable);
+
+    <RoutedReadable kind="book" author="Hejlsberg" />;
+    <RoutedReadable kind="magazine" author="Hejlsberg" />; // $ExpectError
+}

From 5b3273643da6ff7cf328b26358aa67fc7d24749d Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Thu, 28 Feb 2019 13:39:08 +0100
Subject: [PATCH 180/924] [react-router] Fix withRouter loosing union type

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

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 6ed1f19bd0..62c80aef8f 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -20,6 +20,7 @@
 //                 Duong Tran <https://github.com/t49tran>
 //                 Ben Smith <https://github.com/8enSmith>
 //                 Wesley Tsai <https://github.com/wezleytsai>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -124,8 +125,8 @@ export interface match<Params extends { [K in keyof Params]?: string } = {}> {
   url: string;
 }
 
-// Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+// Omit taken from https://github.com/Microsoft/TypeScript/issues/28339#issuecomment-467220238
+export type Omit<T, K extends keyof T> = T extends any ? Pick<T, Exclude<keyof T, K>> : never;
 
 export function matchPath<Params extends { [K in keyof Params]?: string }>(pathname: string, props: string | RouteProps, parent?: match<Params> | null): match<Params> | null;
 

From 527ba73ec799dd660cbecaa74d531d294fde2857 Mon Sep 17 00:00:00 2001
From: Borys Kupar <borys.kupar@ottonova.de>
Date: Thu, 28 Feb 2019 14:05:54 +0100
Subject: [PATCH 181/924] Adjust tsconfig

---
 types/moment-timezone/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/moment-timezone/tsconfig.json b/types/moment-timezone/tsconfig.json
index 62cbfb4214..55ec6cf7bb 100644
--- a/types/moment-timezone/tsconfig.json
+++ b/types/moment-timezone/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "moment-timezone.d.ts",
         "moment-timezone-tests.ts"
     ]
-}
\ No newline at end of file
+}

From a5833836270ddc1d21b29c1d6f8f91ccd5d1e690 Mon Sep 17 00:00:00 2001
From: Akash Vishwakarma <14cse031giet@gmail.com>
Date: Thu, 28 Feb 2019 18:42:58 +0530
Subject: [PATCH 182/924] Adding html5-History definition

---
 types/html5-history/html5-history-tests.ts | 10 +++++++++
 types/html5-history/index.d.ts             | 15 ++++++++++++++
 types/html5-history/tsconfig.json          | 24 ++++++++++++++++++++++
 types/html5-history/tslint.json            |  3 +++
 4 files changed, 52 insertions(+)
 create mode 100644 types/html5-history/html5-history-tests.ts
 create mode 100644 types/html5-history/index.d.ts
 create mode 100644 types/html5-history/tsconfig.json
 create mode 100644 types/html5-history/tslint.json

diff --git a/types/html5-history/html5-history-tests.ts b/types/html5-history/html5-history-tests.ts
new file mode 100644
index 0000000000..b492e46366
--- /dev/null
+++ b/types/html5-history/html5-history-tests.ts
@@ -0,0 +1,10 @@
+import * as History from 'html5-history';
+
+History.init();
+History.getState();
+History.getCurrentIndex();
+History.getStateByIndex(1);
+History.getHash(0);
+History.unescapeHash(0);
+History.normalizeHash(0);
+History.setHash(1, 2);
diff --git a/types/html5-history/index.d.ts b/types/html5-history/index.d.ts
new file mode 100644
index 0000000000..d729181fdb
--- /dev/null
+++ b/types/html5-history/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for html5-history 0.1
+// Project: https://github.com/Raynos/html5-history
+// Definitions by: Akash Vishwakarma <https://github.com/akashishu777>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+
+export function init(options?: any): boolean;
+export function getState(friendly?: any,create?: any): any;
+export function getCurrentIndex(): number;
+export function getStateByIndex(index: number): any;
+export function getHash(doc: any): any;
+export function unescapeHash(hash: any): any;
+export function normalizeHash(hash: any): any;
+export function setHash(hash: any, queue: any): boolean;
\ No newline at end of file
diff --git a/types/html5-history/tsconfig.json b/types/html5-history/tsconfig.json
new file mode 100644
index 0000000000..08937c1353
--- /dev/null
+++ b/types/html5-history/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "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",
+        "html5-history-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/html5-history/tslint.json b/types/html5-history/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/html5-history/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 09b944c9cc0bb2e434d75fba4911adcd7b24ba37 Mon Sep 17 00:00:00 2001
From: Akash Vishwakarma <14cse031giet@gmail.com>
Date: Thu, 28 Feb 2019 18:52:44 +0530
Subject: [PATCH 183/924] fixing lint error

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

diff --git a/types/html5-history/index.d.ts b/types/html5-history/index.d.ts
index d729181fdb..614928f79e 100644
--- a/types/html5-history/index.d.ts
+++ b/types/html5-history/index.d.ts
@@ -4,12 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-
 export function init(options?: any): boolean;
-export function getState(friendly?: any,create?: any): any;
+export function getState(friendly?: any, create?: any): any;
 export function getCurrentIndex(): number;
 export function getStateByIndex(index: number): any;
 export function getHash(doc: any): any;
 export function unescapeHash(hash: any): any;
 export function normalizeHash(hash: any): any;
-export function setHash(hash: any, queue: any): boolean;
\ No newline at end of file
+export function setHash(hash: any, queue: any): boolean;

From 68d2c7b85607a7991c7d3e288714cdf48cec532e Mon Sep 17 00:00:00 2001
From: Pierre Vigier <pierre.vigier@ymail.com>
Date: Thu, 28 Feb 2019 14:35:25 +0100
Subject: [PATCH 184/924] Fix some types in nodegit

---
 types/nodegit/commit.d.ts |  2 +-
 types/nodegit/diff.d.ts   | 17 +++++++++--------
 types/nodegit/index.d.ts  |  4 +++-
 types/nodegit/reset.d.ts  |  7 ++++---
 types/nodegit/revert.d.ts |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/types/nodegit/commit.d.ts b/types/nodegit/commit.d.ts
index 57e8c55d87..8152eb8a8d 100644
--- a/types/nodegit/commit.d.ts
+++ b/types/nodegit/commit.d.ts
@@ -25,7 +25,7 @@ export class Commit {
     static lookupPrefix(repo: Repository, id: Oid, len: number): Promise<Commit>;
     static createWithSignature(repo: Repository, commitContent: string, signature: string, signatureField: string): Promise<Oid>;
 
-    amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree): Promise<Oid>;
+    amend(updateRef: string, author: Signature, committer: Signature, messageEncoding: string, message: string, tree: Tree | Oid): Promise<Oid>;
     author(): Signature;
     committer(): Signature;
 
diff --git a/types/nodegit/diff.d.ts b/types/nodegit/diff.d.ts
index 62de0de6c4..2f1abbda62 100644
--- a/types/nodegit/diff.d.ts
+++ b/types/nodegit/diff.d.ts
@@ -132,17 +132,18 @@ export class Diff {
      *
      *
      */
-    static blobToBuffer(oldBlob: Blob, oldAsPath: string,
-                        buffer: string, bufferAsPath: string, opts: DiffOptions, fileCb: Function, binaryCb: Function, hunkCb: Function, lineCb: Function): Promise<any>;
+    static blobToBuffer(oldBlob: Blob | null, oldAsPath: string | null,
+                        buffer: string | null, bufferAsPath: string | null, opts: DiffOptions | null, fileCb: Function | null,
+                        binaryCb: Function | null, hunkCb: Function | null, lineCb: Function): Promise<any>;
     static fromBuffer(content: string, contentLen: number): Promise<Diff>;
-    static indexToWorkdir(repo: Repository, index: Index, opts?: DiffOptions): Promise<Diff>;
+    static indexToWorkdir(repo: Repository, index: Index | null, opts?: DiffOptions): Promise<Diff>;
     static indexToIndex(repo: Repository, oldIndex: Index, newIndex: Index, opts?: DiffOptions): Promise<Diff>;
-    static treeToIndex(repo: Repository, oldTree: Tree, index: Index, opts?: DiffOptions): Promise<Diff>;
-    static treeToTree(repo: Repository, oldTree: Tree, new_tree: Tree, opts?: DiffOptions): Promise<Diff>;
-    static treeToWorkdir(repo: Repository, oldTree: Tree, opts?: DiffOptions): Promise<Diff>;
-    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree, opts?: DiffOptions): Promise<Diff>;
+    static treeToIndex(repo: Repository, oldTree: Tree | null, index: Index | null, opts?: DiffOptions): Promise<Diff>;
+    static treeToTree(repo: Repository, oldTree: Tree | null, new_tree: Tree | null, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdir(repo: Repository, oldTree: Tree | null, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree | null, opts?: DiffOptions): Promise<Diff>;
 
-    findSimilar(options: DiffFindOptions): Promise<number>;
+    findSimilar(options?: DiffFindOptions): Promise<number>;
     getDelta(idx: number): DiffDelta;
     getPerfdata(): Promise<DiffPerfdata>;
     numDeltas(): number;
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index 8f0dd811a0..c0e18853a6 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for nodegit 0.24
 // Project: https://github.com/nodegit/nodegit, http://nodegit.org
-// Definitions by: Dolan Miu <https://github.com/dolanmiu>, Tobias Nießen <https://github.com/tniessen>
+// Definitions by: Dolan Miu <https://github.com/dolanmiu>,
+//                 Tobias Nießen <https://github.com/tniessen>,
+//                 Pierre Vigier <https://github.com/pvigier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export { AnnotatedCommit } from './annotated-commit';
diff --git a/types/nodegit/reset.d.ts b/types/nodegit/reset.d.ts
index 9051fa693b..ca7ff41e86 100644
--- a/types/nodegit/reset.d.ts
+++ b/types/nodegit/reset.d.ts
@@ -1,8 +1,9 @@
 import { AnnotatedCommit } from './annotated-commit';
 import { Repository } from './repository';
-import { Object } from './object';
 import { Strarray } from './str-array';
 import { CheckoutOptions } from './checkout-options';
+import { Commit } from './commit';
+import { Tag } from './tag';
 
 export namespace Reset {
     const enum TYPE {
@@ -16,11 +17,11 @@ export class Reset {
     /**
      * Look up a refs's commit.
      */
-    static reset(repo: Repository, target: Object, resetType: number, checkoutOpts: CheckoutOptions): Promise<number>;
+    static reset(repo: Repository, target: Commit | Tag, resetType: number, checkoutOpts: CheckoutOptions): Promise<number>;
     /**
      * Look up a refs's commit.
      */
-    static default(repo: Repository, target: Object, pathspecs: Strarray | string | string[]): Promise<number>;
+    static default(repo: Repository, target: Commit | Tag, pathspecs: Strarray | string | string[]): Promise<number>;
     /**
      * Sets the current head to the specified commit oid and optionally resets the index and working tree to match.
      * This behaves like reset but takes an annotated commit, which lets you specify which extended sha syntax string was specified by a user, allowing for more exact reflog messages.
diff --git a/types/nodegit/revert.d.ts b/types/nodegit/revert.d.ts
index 1f9d4a2677..df804cbb48 100644
--- a/types/nodegit/revert.d.ts
+++ b/types/nodegit/revert.d.ts
@@ -13,7 +13,7 @@ export interface RevertOptions {
 }
 
 export class Revert {
-    static revert(repo: Repository, commit: Commit, givenOpts: RevertOptions): Promise<number>;
+    static revert(repo: Repository, commit: Commit, givenOpts?: RevertOptions): Promise<number>;
     /**
      * Reverts the given commit against the given "our" commit, producing an index that reflects the result of the revert.
      */

From 741a12130dda2a2db8cf4ac5bf284f034383e3cb Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Thu, 28 Feb 2019 21:41:17 +0500
Subject: [PATCH 185/924] fix(unsplash-js): some types

---
 types/unsplash-js/index.d.ts | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index de2272c422..4fb2fb9175 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -6,9 +6,9 @@
 export default class Unsplash {
     public auth: Auth;
     public categories: CategoriesApi;
-    public collections: CollectionApi;
+    public collections: CollectionsApi;
     public currentUser: CurrentUserApi;
-    public users: UserApi;
+    public users: UsersApi;
     public photos: PhotoApi;
     public search: SearchApi;
     public stats: StatsApi;
@@ -85,7 +85,7 @@ export class PhotoApi {
     }): Promise<any>;
 }
 
-export class CollectionApi {
+export class CollectionsApi {
     public listCollections(
         page?: number,
         perPage?: number,
@@ -96,10 +96,12 @@ export class CollectionApi {
         page?: number,
         perPage?: number
     ): Promise<any>;
+
     public listFeaturedCollections(
         page?: number,
         perPage?: number
     ): Promise<any>;
+
     public getCollection(id: number): Promise<any>;
 
     public getCollectionPhotos(
@@ -145,6 +147,8 @@ export class CollectionApi {
 }
 
 export class SearchApi {
+    public all(keyword: string, page: number, per_page: number): Promise<any>;
+
     public photos(
         keyword: string,
         page?: number,
@@ -172,18 +176,18 @@ export class CurrentUserApi {
     public profile(): Promise<any>;
 
     public updateProfile(options: {
-        username: string;
-        firstName: string;
-        lastName: string;
-        email: string;
-        url: string;
-        location: string;
-        bio: string;
-        instagramUsername: string;
+        username?: string;
+        firstName?: string;
+        lastName?: string;
+        email?: string;
+        url?: string;
+        location?: string;
+        bio?: string;
+        instagramUsername?: string;
     }): Promise<any>;
 }
 
-export class UserApi {
+export class UsersApi {
     public profile(username: string): Promise<any>;
 
     public statistics(
@@ -217,7 +221,9 @@ export class UserApi {
 
 export class CategoriesApi {
     public listCategories(): Promise<any>;
+
     public category(id: any): Promise<any>;
+
     public categoryPhotos(
         id: any,
         page?: number,
@@ -227,6 +233,8 @@ export class CategoriesApi {
 
 export class Auth {
     public getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
-    public userAuthentication(code: string): object;
+
+    public userAuthentication(code: string): Promise<any>;
+
     public setBearerToken(accessToken: string): void;
 }

From af4fcef3bf8b374638827f1a4ae5ce6e970150cd Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Thu, 28 Feb 2019 17:50:59 +0100
Subject: [PATCH 186/924] Update twitch ext definitions with configuration
 feature

---
 types/twitch-ext/index.d.ts | 45 +++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index 4cac514539..fac7ccaad4 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -29,6 +29,11 @@ interface TwitchExt {
 	 */
 	actions: TwitchExtActions;
 
+	/**
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#helper-configuration
+	 */
+	configuration: TwitchExtConfiguration;
+
 	/**
 	 * @see https://dev.twitch.tv/docs/extensions/reference/#twitch-extension-feature-flags
 	 */
@@ -170,6 +175,46 @@ interface TwitchExtActions {
 	requestIdShare(): void;
 }
 
+/**
+ * @see TwitchExt.configuration
+ */
+interface TwitchExtConfiguration {
+	/**
+	 * This property returns the record for the broadcaster segment if one is found; otherwise, undefined.
+	 */
+	broadcaster: { version: string; content: string } | undefined;
+
+	/**
+	 * This property returns the record for the developer segment if one is found; otherwise, undefined.
+	*/
+	developer: { version: string; content: string } | undefined;
+
+	/**
+	 * This property returns the record for the global segment if one is found; otherwise, undefined.
+	 */
+	global: { version: string; content: string } | undefined;
+
+	/**
+	 * This function registers a callback that is called whenever an extension configuration is received.
+	 * The callback function takes no input and returns nothing. After this is called for the first time,
+	 * the records for the global, developer and broadcaster segments will be set if the data is available.
+	 * @param callback The callback that is fired.
+	*/
+	onChanged(
+		callback: () => void
+	): void
+
+
+	/**
+	 * This function can be called by the front end to set an extension configuration.
+	 * @param segment The string-encoded configuration.
+	 * @param version The configuration segment to set.
+	 * @param content The version of configuration with which the segment is stored.
+	 */
+	set(segment: string, version: string, content: string): void;
+}
+
+
 interface TwitchExtFeatureFlags {
 	/**
 	 * If this flag is true, you can send a chat message to the current channel using Send Extension Chat Message

From 3aca920eeba6ab90ad673945cc5209bcf237096b Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Thu, 28 Feb 2019 20:20:00 +0100
Subject: [PATCH 187/924] =?UTF-8?q?feat:=20Add=20`tape=E2=80=91async`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/tape-async/.editorconfig       |   3 +
 types/tape-async/index.d.ts          |  74 +++++++++++
 types/tape-async/tape-async-tests.ts | 186 +++++++++++++++++++++++++++
 types/tape-async/tsconfig.json       |  24 ++++
 types/tape-async/tslint.json         |  83 ++++++++++++
 5 files changed, 370 insertions(+)
 create mode 100644 types/tape-async/.editorconfig
 create mode 100644 types/tape-async/index.d.ts
 create mode 100644 types/tape-async/tape-async-tests.ts
 create mode 100644 types/tape-async/tsconfig.json
 create mode 100644 types/tape-async/tslint.json

diff --git a/types/tape-async/.editorconfig b/types/tape-async/.editorconfig
new file mode 100644
index 0000000000..a0207fa43b
--- /dev/null
+++ b/types/tape-async/.editorconfig
@@ -0,0 +1,3 @@
+# This package uses tabs
+[*]
+indent_style = tab
diff --git a/types/tape-async/index.d.ts b/types/tape-async/index.d.ts
new file mode 100644
index 0000000000..9b5bfdc1d6
--- /dev/null
+++ b/types/tape-async/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for tape-async v2.3
+// Project: https://github.com/parro-it/tape-async
+// Definitions by: ExE Boss <https://github.com/ExE-Boss>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import tapeSync from "tape";
+export = tape;
+
+declare function tape(name: string, cb: tape.TestCase): void
+declare function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
+declare function tape(cb: tape.TestCase): void;
+declare function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
+
+declare namespace tape {
+
+	interface TestCase {
+		(test: Test): void | Generator | PromiseLike<void>;
+	}
+
+	/**
+	 * Available opts options for the tape function.
+	 */
+	interface TestOptions extends tapeSync.TestOptions {
+	}
+
+	/**
+	 * Options for the createStream function.
+	 */
+	interface StreamOptions extends tapeSync.StreamOptions {
+	}
+
+	/**
+	 * Generate a new test that will be skipped over.
+	 */
+	export function skip(name: string, cb: tape.TestCase): void;
+	export function skip(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
+	export function skip(cb: tape.TestCase): void;
+	export function skip(opts: tape.TestOptions, cb: tape.TestCase): void;
+
+	/**
+	 * The onFinish hook will get invoked when ALL tape tests have finished right before tape is about to print the test summary.
+	 */
+	export function onFinish(cb: () => void): void;
+
+	/**
+	 * Like test(name?, opts?, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
+	 */
+	export function only(name: string, cb: tape.TestCase): void;
+	export function only(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
+	export function only(cb: tape.TestCase): void;
+	export function only(opts: tape.TestOptions, cb: tape.TestCase): void;
+
+	/**
+	 * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
+	 */
+	export function createHarness(): typeof tape;
+	/**
+	 * Create a stream of output, bypassing the default output stream that writes messages to console.log().
+	 * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
+	 */
+	export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
+
+	interface Test extends tapeSync.Test {
+		/**
+		 * Create a subtest with a new test handle st from cb(st) inside the current test.
+		 * cb(st) will only fire when t finishes.
+		 * Additional tests queued up after t will not be run until all subtests finish.
+		 */
+		test(name: string, cb: tape.TestCase): void;
+		test(name: string, opts: TestOptions, cb: tape.TestCase): void;
+	}
+}
diff --git a/types/tape-async/tape-async-tests.ts b/types/tape-async/tape-async-tests.ts
new file mode 100644
index 0000000000..835661d6d7
--- /dev/null
+++ b/types/tape-async/tape-async-tests.ts
@@ -0,0 +1,186 @@
+import tape = require("tape-async");
+
+var name: string;
+var cb: (test: tape.Test) => Promise<void>;
+var opts: tape.TestOptions;
+var t: tape.Test;
+
+tape(cb);
+tape(name, cb);
+tape(opts, cb);
+tape(name, opts, cb);
+
+tape(name, async (test: tape.Test) => {
+	t = test;
+});
+
+tape(name, function* (test: tape.Test): IterableIterator<void> {
+	t = test;
+});
+
+tape.skip(cb);
+tape.skip(name, cb);
+tape.skip(opts, cb);
+tape.skip(name, opts, cb);
+
+tape.only(cb);
+tape.only(name, cb);
+tape.only(opts, cb);
+tape.only(name, opts, cb);
+
+tape.onFinish(() => {});
+
+
+var sopts: tape.StreamOptions;
+var rs: NodeJS.ReadableStream;
+rs = tape.createStream();
+rs = tape.createStream(sopts);
+
+
+var htest: typeof tape;
+htest = tape.createHarness();
+
+class CustomException extends Error {
+	constructor(message?: string) {
+		super(message);
+	}
+}
+
+
+tape(name, (test: tape.Test) => {
+
+	var num: number;
+	var ms: number;
+	var value: any;
+	var actual: any;
+	var expected: any;
+	var err: any;
+	var fn = function() {};
+	var msg: string;
+
+	var exceptionExpected: RegExp | (() => void);
+
+	test.plan(num);
+	test.end();
+	test.end(err);
+
+	test.fail(msg);
+	test.pass(msg);
+	test.timeoutAfter(ms);
+	test.skip(msg);
+
+	test.ok(value);
+	test.ok(value, msg);
+	test.true(value);
+	test.true(value, msg);
+	test.assert(value);
+	test.assert(value, msg);
+
+	test.notOk(value);
+	test.notOk(value, msg);
+	test.false(value);
+	test.false(value, msg);
+	test.notok(value);
+	test.notok(value, msg);
+
+	test.error(err, msg);
+	test.ifError(err, msg);
+	test.ifErr(err, msg);
+	test.iferror(err, msg);
+
+	test.equal(actual, expected);
+	test.equal(actual, expected, msg);
+	test.equals(actual, expected);
+	test.equals(actual, expected, msg);
+	test.isEqual(actual, expected);
+	test.isEqual(actual, expected, msg);
+	test.is(actual, expected);
+	test.is(actual, expected, msg);
+	test.strictEqual(actual, expected);
+	test.strictEqual(actual, expected, msg);
+	test.strictEquals(actual, expected);
+	test.strictEquals(actual, expected, msg);
+
+	test.notEqual(actual, expected);
+	test.notEqual(actual, expected, msg);
+	test.notEquals(actual, expected);
+	test.notEquals(actual, expected, msg);
+	test.notStrictEqual(actual, expected);
+	test.notStrictEqual(actual, expected, msg);
+	test.notStrictEquals(actual, expected);
+	test.notStrictEquals(actual, expected, msg);
+	test.isNotEqual(actual, expected);
+	test.isNotEqual(actual, expected, msg);
+	test.isNot(actual, expected);
+	test.isNot(actual, expected, msg);
+	test.not(actual, expected);
+	test.not(actual, expected, msg);
+	test.doesNotEqual(actual, expected);
+	test.doesNotEqual(actual, expected, msg);
+	test.isInequal(actual, expected);
+	test.isInequal(actual, expected, msg);
+
+	test.deepEqual(actual, expected);
+	test.deepEqual(actual, expected, msg);
+	test.deepEquals(actual, expected);
+	test.deepEquals(actual, expected, msg);
+	test.isEquivalent(actual, expected);
+	test.isEquivalent(actual, expected, msg);
+	test.same(actual, expected);
+	test.same(actual, expected, msg);
+
+	test.notDeepEqual(actual, expected);
+	test.notDeepEqual(actual, expected, msg);
+	test.notEquivalent(actual, expected);
+	test.notEquivalent(actual, expected, msg);
+	test.notDeeply(actual, expected);
+	test.notDeeply(actual, expected, msg);
+	test.notSame(actual, expected);
+	test.notSame(actual, expected, msg);
+	test.isNotDeepEqual(actual, expected);
+	test.isNotDeepEqual(actual, expected, msg);
+	test.isNotDeeply(actual, expected);
+	test.isNotDeeply(actual, expected, msg);
+	test.isNotEquivalent(actual, expected);
+	test.isNotEquivalent(actual, expected, msg);
+	test.isInequivalent(actual, expected);
+	test.isInequivalent(actual, expected, msg);
+
+	test.deepLooseEqual(actual, expected);
+	test.deepLooseEqual(actual, expected, msg);
+	test.looseEqual(actual, expected);
+	test.looseEqual(actual, expected, msg);
+	test.looseEquals(actual, expected);
+	test.looseEquals(actual, expected, msg);
+
+	test.notDeepLooseEqual(actual, expected);
+	test.notDeepLooseEqual(actual, expected, msg);
+	test.notLooseEqual(actual, expected);
+	test.notLooseEqual(actual, expected, msg);
+	test.notLooseEquals(actual, expected);
+	test.notLooseEquals(actual, expected, msg);
+
+	test.throws(fn);
+	test.throws(fn, msg);
+	test.throws(fn, exceptionExpected);
+	test.throws(fn, exceptionExpected, msg);
+	test.throws(fn, CustomException);
+	test.throws(fn, CustomException, msg);
+
+	test.doesNotThrow(fn);
+	test.doesNotThrow(fn, msg);
+	test.doesNotThrow(fn, exceptionExpected);
+	test.doesNotThrow(fn, exceptionExpected, msg);
+	test.doesNotThrow(fn, CustomException);
+	test.doesNotThrow(fn, CustomException, msg);
+
+	test.test(name, async (st) => {
+		t = st;
+	});
+
+	test.test(name, opts, async (st) => {
+		t = st;
+	});
+
+	test.comment(msg);
+});
diff --git a/types/tape-async/tsconfig.json b/types/tape-async/tsconfig.json
new file mode 100644
index 0000000000..af0ed451a1
--- /dev/null
+++ b/types/tape-async/tsconfig.json
@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"es6"
+		],
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": false,
+		"strictFunctionTypes": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"allowSyntheticDefaultImports": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"tape-async-tests.ts"
+	]
+}
diff --git a/types/tape-async/tslint.json b/types/tape-async/tslint.json
new file mode 100644
index 0000000000..b5f5694bcd
--- /dev/null
+++ b/types/tape-async/tslint.json
@@ -0,0 +1,83 @@
+{
+	"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,
+		"indent": [
+			true,
+			"tabs"
+		],
+		"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 337b83294138ade3e60dfa59a27c649bca89d823 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Thu, 28 Feb 2019 20:30:00 +0100
Subject: [PATCH 188/924] =?UTF-8?q?fix:=20Use=20`Iterator<any>`=20instead?=
 =?UTF-8?q?=20of=C2=A0`Generator`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/tape-async/index.d.ts    | 4 ++--
 types/tape-async/tsconfig.json | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/tape-async/index.d.ts b/types/tape-async/index.d.ts
index 9b5bfdc1d6..d5b07f37b7 100644
--- a/types/tape-async/index.d.ts
+++ b/types/tape-async/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import tapeSync from "tape";
+import tapeSync = require("tape");
 export = tape;
 
 declare function tape(name: string, cb: tape.TestCase): void
@@ -16,7 +16,7 @@ declare function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
 declare namespace tape {
 
 	interface TestCase {
-		(test: Test): void | Generator | PromiseLike<void>;
+		(test: Test): void | Iterator<any> | PromiseLike<void>;
 	}
 
 	/**
diff --git a/types/tape-async/tsconfig.json b/types/tape-async/tsconfig.json
index af0ed451a1..462155b141 100644
--- a/types/tape-async/tsconfig.json
+++ b/types/tape-async/tsconfig.json
@@ -14,7 +14,6 @@
 		],
 		"types": [],
 		"noEmit": true,
-		"allowSyntheticDefaultImports": true,
 		"forceConsistentCasingInFileNames": true
 	},
 	"files": [

From e63af8d856a7c09ee8e34e21cdb4fc59a4b843c7 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Thu, 28 Feb 2019 20:51:56 +0100
Subject: [PATCH 189/924] Extract inspectable spy API into own interface

---
 types/sinon/ts3.1/index.d.ts | 89 ++++++++++++++++++++----------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index aefc93f624..924fa3936e 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -145,7 +145,32 @@ declare namespace Sinon {
         calledAfter(call: SinonSpyCall): boolean;
     }
 
-    interface SinonSpy<TArgs extends any[] = any[], TReturnValue = any>
+    /**
+     * A test spy is a function that records arguments, return value,
+     * the value of this and exception thrown (if any) for all its calls.
+     */
+    interface SinonSpy<TArgs extends any[] = any[], TReturnValue = any> extends SinonInspectable<TArgs, TReturnValue> {
+        // Methods
+        (...args: TArgs): TReturnValue;
+
+        /**
+         * Creates a spy that only records calls when the received arguments match those passed to withArgs.
+         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
+         * @param args Expected args
+         */
+        withArgs(...args: MatchArguments<TArgs>): SinonSpy<TArgs, TReturnValue>;
+
+        /**
+         * Set the displayName of the spy or stub.
+         * @param name
+         */
+        named(name: string): SinonSpy<TArgs, TReturnValue>;
+    }
+
+    /**
+     * The part of the spy API that allows inspecting the calls made on a spy.
+     */
+    interface SinonInspectable<TArgs extends any[] = any[], TReturnValue = any>
         extends Pick<
                 SinonSpyCallApi<TArgs, TReturnValue>,
                 Exclude<keyof SinonSpyCallApi<TArgs, TReturnValue>, 'args'>
@@ -209,9 +234,6 @@ declare namespace Sinon {
          * If the call did not explicitly return a value, the value at the call’s location in .returnValues will be undefined.
          */
         returnValues: TReturnValue[];
-
-        // Methods
-        (...args: TArgs): TReturnValue;
         /**
          * Returns true if the spy was called before @param anotherSpy
          * @param anotherSpy
@@ -232,12 +254,6 @@ declare namespace Sinon {
          * @param anotherSpy
          */
         calledImmediatelyAfter(anotherSpy: SinonSpy): boolean;
-        /**
-         * Creates a spy that only records calls when the received arguments match those passed to withArgs.
-         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
-         * @param args Expected args
-         */
-        withArgs(...args: MatchArguments<TArgs>): SinonSpy<TArgs, TReturnValue>;
         /**
          * Returns true if the spy was always called with @param obj as this.
          * @param obj
@@ -292,11 +308,6 @@ declare namespace Sinon {
          * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
          */
         invokeCallback(...args: TArgs): void;
-        /**
-         * Set the displayName of the spy or stub.
-         * @param name
-         */
-        named(name: string): SinonSpy<TArgs, TReturnValue>;
         /**
          * Returns the nth call.
          * Accessing individual calls helps with more detailed behavior verification when the spy is called more than once.
@@ -1155,60 +1166,60 @@ declare namespace Sinon {
          * Passes if spy was never called
          * @param spy
          */
-        notCalled<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        notCalled(spy: SinonInspectable): void;
         /**
          * Passes if spy was called at least once.
          */
-        called<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        called(spy: SinonInspectable): void;
         /**
          * Passes if spy was called once and only once.
          */
-        calledOnce<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        calledOnce(spy: SinonInspectable): void;
         /**
          * Passes if spy was called exactly twice.
          */
-        calledTwice<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        calledTwice(spy: SinonInspectable): void;
         /**
          * Passes if spy was called exactly three times.
          */
-        calledThrice<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        calledThrice(spy: SinonInspectable): void;
         /**
          * Passes if spy was called exactly num times.
          */
-        callCount<TArgs extends any[]>(spy: SinonSpy<TArgs>, count: number): void;
+        callCount(spy: SinonInspectable, count: number): void;
         /**
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder(...spies: Array<SinonSpy<any>>): void;
+        callOrder(...spies: Array<SinonSpy>): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.
          */
-        calledOn<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall, obj: any): void;
+        calledOn(spyOrSpyCall: SinonInspectable | SinonSpyCall, obj: any): void;
         /**
          * Passes if spy was always called with obj as its this value.
          */
-        alwaysCalledOn<TArgs extends any[]>(spy: SinonSpy<TArgs>, obj: any): void;
+        alwaysCalledOn(spy: SinonInspectable, obj: any): void;
         /**
          * Passes if spy was called with the provided arguments.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWith(spy.firstCall, arg1, arg2, ...);.
          * @param spyOrSpyCall
          * @param args
          */
-        calledWith<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>, ...args: MatchArguments<TArgs>): void;
+        calledWith<TArgs extends any[]>(spyOrSpyCall: SinonInspectable<TArgs> | SinonSpyCall<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was always called with the provided arguments.
          * @param spy
          * @param args
          */
-        alwaysCalledWith<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
+        alwaysCalledWith<TArgs extends any[]>(spy: SinonInspectable<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was never called with the provided arguments.
          * @param spy
          * @param args
          */
-        neverCalledWith<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
+        neverCalledWith<TArgs extends any[]>(spy: SinonInspectable<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was called with the provided arguments and no others.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithExactly(spy.getCall(1), arg1, arg2, ...);.
@@ -1216,68 +1227,68 @@ declare namespace Sinon {
          * @param args
          */
         calledWithExactly<TArgs extends any[]>(
-            spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>,
+            spyOrSpyCall: SinonInspectable<TArgs> | SinonSpyCall<TArgs>,
             ...args: MatchArguments<TArgs>
         ): void;
         /**
          * Passes if spy was always called with the provided arguments and no others.
          */
-        alwaysCalledWithExactly<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: MatchArguments<TArgs>): void;
+        alwaysCalledWithExactly<TArgs extends any[]>(spy: SinonInspectable<TArgs>, ...args: MatchArguments<TArgs>): void;
         /**
          * Passes if spy was called with matching arguments.
          * This behaves the same way as sinon.assert.calledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithMatch(spy.secondCall, arg1, arg2, ...);.
          */
         calledWithMatch<TArgs extends any[]>(
-            spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<TArgs>,
+            spyOrSpyCall: SinonInspectable<TArgs> | SinonSpyCall<TArgs>,
             ...args: TArgs
         ): void;
         /**
          * Passes if spy was always called with matching arguments.
          * This behaves the same way as sinon.assert.alwaysCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          */
-        alwaysCalledWithMatch<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: TArgs): void;
+        alwaysCalledWithMatch<TArgs extends any[]>(spy: SinonInspectable<TArgs>, ...args: TArgs): void;
         /**
          * Passes if spy was never called with matching arguments.
          * This behaves the same way as sinon.assert.neverCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
          * @param spy
          * @param args
          */
-        neverCalledWithMatch<TArgs extends any[]>(spy: SinonSpy<TArgs>, ...args: TArgs): void;
+        neverCalledWithMatch<TArgs extends any[]>(spy: SinonInspectable<TArgs>, ...args: TArgs): void;
         /**
          * Passes if spy was called with the new operator.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithNew(spy.secondCall, arg1, arg2, ...);.
          * @param spyOrSpyCall
          */
-        calledWithNew<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>): void;
+        calledWithNew(spyOrSpyCall: SinonInspectable | SinonSpyCall): void;
         /**
          * Passes if spy threw any exception.
          */
-        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>): void;
+        threw(spyOrSpyCall: SinonInspectable | SinonSpyCall): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is an actual object.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>, exception: string): void;
+        threw(spyOrSpyCall: SinonInspectable | SinonSpyCall, exception: string): void;
         /**
          * Passes if spy threw the given exception.
          * The exception is a String denoting its type.
          * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
          */
-        threw<TArgs extends any[]>(spyOrSpyCall: SinonSpy<TArgs> | SinonSpyCall<any>, exception: any): void;
+        threw(spyOrSpyCall: SinonInspectable | SinonSpyCall, exception: any): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>): void;
+        alwaysThrew(spy: SinonInspectable): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>, exception: string): void;
+        alwaysThrew(spy: SinonInspectable, exception: string): void;
         /**
          * Like threw, only required for all calls to the spy.
          */
-        alwaysThrew<TArgs extends any[]>(spy: SinonSpy<TArgs>, exception: any): void;
+        alwaysThrew(spy: SinonInspectable, exception: any): void;
         /**
          * Uses sinon.match to test if the arguments can be considered a match.
          */

From 1a5a17ff827c7e4acb4cec9eee66a64bc5c2ad22 Mon Sep 17 00:00:00 2001
From: Lloyd Ho <lloydho@gmail.com>
Date: Thu, 28 Feb 2019 12:33:09 -0800
Subject: [PATCH 190/924] Add useWorkerScheduler into config for cometd

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

diff --git a/types/cometd/index.d.ts b/types/cometd/index.d.ts
index d7103f15cd..ff780cfd42 100644
--- a/types/cometd/index.d.ts
+++ b/types/cometd/index.d.ts
@@ -70,6 +70,15 @@ export interface Configuration {
      * CometD may fail to remain within the max URI length when encoded in JSON.
      */
     maxURILength?: number;
+    /**
+     * Uses the scheduler service available in Web Workers via Worker.setTimeout(fn, delay) rather
+     * than using that available via Window.setTimeout(fn, delay). Browsers are now throttling the
+     * Window scheduler in background tabs to save battery in mobile devices, so the Window scheduler
+     * events are delayed by possibly several seconds, causing CometD sessions to timeout on the
+     * server. The Worker scheduler is not throttled and guarantees that scheduler events happen
+     * on time.
+     */
+    useWorkerScheduler?: boolean;
 }
 
 export interface Message {

From 292e70357c273919f9c1aaa4fb2ae55d2ea08ff7 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Thu, 28 Feb 2019 21:52:39 +0100
Subject: [PATCH 191/924] Fix TSLint

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

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 924fa3936e..4f5a23d450 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1191,7 +1191,7 @@ declare namespace Sinon {
          * Passes if provided spies were called in the specified order.
          * @param spies
          */
-        callOrder(...spies: Array<SinonSpy>): void;
+        callOrder(...spies: SinonInspectable[]): void;
         /**
          * Passes if spy was ever called with obj as its this value.
          * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.

From 345ccdbe9e39f149e2f9684eb233b52e0cb306f2 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Thu, 28 Feb 2019 23:38:54 +0100
Subject: [PATCH 192/924] Fix wrong test

https://github.com/DefinitelyTyped/DefinitelyTyped/pull/33223/files#r261413058
---
 types/sinon/ts3.1/index.d.ts     | 2 +-
 types/sinon/ts3.1/sinon-tests.ts | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index ccd9289ba3..80ec4ee483 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -1725,7 +1725,7 @@ declare namespace Sinon {
         createStubInstance<TType>(
             constructor: StubbableType<TType>,
             overrides?: { [K in keyof TType]?:
-                SinonStubbedMember<TType[K]> | TType[K] extends (...args: any[]) => infer R ? R : TType[K] }
+                SinonStubbedMember<TType[K]> | (TType[K] extends (...args: any[]) => infer R ? R : TType[K]) }
         ): SinonStubbedInstance<TType>;
     }
 
diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
index 24eb5b12b7..a2f8a393d8 100644
--- a/types/sinon/ts3.1/sinon-tests.ts
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -89,9 +89,12 @@ function testSandbox() {
     const clsBar: number = stubInstance.bar;
     const privateFooBar: number = privateFooStubbedInstance.bar;
     sb.createStubInstance(cls, {
-        foo: (arg1: string, arg2: number) => 2,
+        foo: sinon.stub<[string, number], number>().returns(1),
         bar: 1
     });
+    sb.createStubInstance(cls, {
+        foo: 1, // used as return value
+    });
 }
 
 function testFakeServer() {

From 20750ac1262f4f4c76f9c59cf55c7e099c2b159c Mon Sep 17 00:00:00 2001
From: Elizabeth Samuel <elizs@microsoft.com>
Date: Thu, 28 Feb 2019 14:53:35 -0800
Subject: [PATCH 193/924] [office-js] [office-js-preview] AttachmentDetails-Add
 url prop

---
 types/office-js-preview/index.d.ts | 6 ++++++
 types/office-js/index.d.ts         | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 80195cf516..3c5efda4b6 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -10751,6 +10751,12 @@ declare namespace Office {
          * Gets the size of the attachment in bytes.
          */
         size: number;
+        /**
+         * Gets the url of the attachment if its type is `MailboxEnums.AttachmentType.Cloud`.
+         * 
+         * [Api set: Mailbox Preview]
+         */
+        url: string;
     }
     /**
      * The body object provides methods for adding and updating the content of the message or appointment. 
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 43a3bae9b8..076d531250 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -10751,6 +10751,12 @@ declare namespace Office {
          * Gets the size of the attachment in bytes.
          */
         size: number;
+        /**
+         * Gets the url of the attachment if its type is `MailboxEnums.AttachmentType.Cloud`.
+         * 
+         * [Api set: Mailbox Preview]
+         */
+        url: string;
     }
     /**
      * The body object provides methods for adding and updating the content of the message or appointment. 

From cbe9422ac4bbf8bcc9addbdc04c8e317dd4b089a Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Fri, 1 Mar 2019 00:00:00 +0100
Subject: [PATCH 194/924] =?UTF-8?q?test(tape=E2=80=91async):=20Extract=20E?=
 =?UTF-8?q?S2015=C2=A0tests=20into=20separate=C2=A0files?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tape-async/test/tape-async.async.test.ts  | 37 +++++++++++++++++++
 .../test/tape-async.generators.test.ts        | 37 +++++++++++++++++++
 .../tape-async.test.ts}                       | 12 ++----
 types/tape-async/tsconfig.json                |  4 +-
 4 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 types/tape-async/test/tape-async.async.test.ts
 create mode 100644 types/tape-async/test/tape-async.generators.test.ts
 rename types/tape-async/{tape-async-tests.ts => test/tape-async.test.ts} (94%)

diff --git a/types/tape-async/test/tape-async.async.test.ts b/types/tape-async/test/tape-async.async.test.ts
new file mode 100644
index 0000000000..bb8e226009
--- /dev/null
+++ b/types/tape-async/test/tape-async.async.test.ts
@@ -0,0 +1,37 @@
+// TypeScript Version: 2.1
+
+import tape = require("tape-async");
+
+var name: string;
+var cb: (test: tape.Test) => Promise<void>;
+var opts: tape.TestOptions;
+var t: tape.Test;
+
+tape(cb);
+tape(name, cb);
+tape(opts, cb);
+tape(name, opts, cb);
+
+tape(name, async (test: tape.Test) => {
+	t = test;
+});
+
+tape.skip(cb);
+tape.skip(name, cb);
+tape.skip(opts, cb);
+tape.skip(name, opts, cb);
+
+tape.only(cb);
+tape.only(name, cb);
+tape.only(opts, cb);
+tape.only(name, opts, cb);
+
+tape(name, async (test: tape.Test) => {
+	test.test(name, async (st) => {
+		t = st;
+	});
+
+	test.test(name, opts, async (st) => {
+		t = st;
+	});
+});
diff --git a/types/tape-async/test/tape-async.generators.test.ts b/types/tape-async/test/tape-async.generators.test.ts
new file mode 100644
index 0000000000..bf279030ef
--- /dev/null
+++ b/types/tape-async/test/tape-async.generators.test.ts
@@ -0,0 +1,37 @@
+// TypeScript Version: 2.3
+
+import tape = require("tape-async");
+
+var name: string;
+var cb: (test: tape.Test) => IterableIterator<any>;
+var opts: tape.TestOptions;
+var t: tape.Test;
+
+tape(cb);
+tape(name, cb);
+tape(opts, cb);
+tape(name, opts, cb);
+
+tape(name, function* (test: tape.Test): IterableIterator<void> {
+	t = test;
+});
+
+tape.skip(cb);
+tape.skip(name, cb);
+tape.skip(opts, cb);
+tape.skip(name, opts, cb);
+
+tape.only(cb);
+tape.only(name, cb);
+tape.only(opts, cb);
+tape.only(name, opts, cb);
+
+tape(name, function* (test: tape.Test): IterableIterator<void> {
+	test.test(name, function* (st: tape.Test): IterableIterator<void> {
+		t = st;
+	});
+
+	test.test(name, opts, function* (st: tape.Test): IterableIterator<void> {
+		t = st;
+	});
+});
diff --git a/types/tape-async/tape-async-tests.ts b/types/tape-async/test/tape-async.test.ts
similarity index 94%
rename from types/tape-async/tape-async-tests.ts
rename to types/tape-async/test/tape-async.test.ts
index 835661d6d7..060da063be 100644
--- a/types/tape-async/tape-async-tests.ts
+++ b/types/tape-async/test/tape-async.test.ts
@@ -1,7 +1,7 @@
 import tape = require("tape-async");
 
 var name: string;
-var cb: (test: tape.Test) => Promise<void>;
+var cb: (test: tape.Test) => void;
 var opts: tape.TestOptions;
 var t: tape.Test;
 
@@ -10,11 +10,7 @@ tape(name, cb);
 tape(opts, cb);
 tape(name, opts, cb);
 
-tape(name, async (test: tape.Test) => {
-	t = test;
-});
-
-tape(name, function* (test: tape.Test): IterableIterator<void> {
+tape(name, (test: tape.Test) => {
 	t = test;
 });
 
@@ -174,11 +170,11 @@ tape(name, (test: tape.Test) => {
 	test.doesNotThrow(fn, CustomException);
 	test.doesNotThrow(fn, CustomException, msg);
 
-	test.test(name, async (st) => {
+	test.test(name, st => {
 		t = st;
 	});
 
-	test.test(name, opts, async (st) => {
+	test.test(name, opts, st => {
 		t = st;
 	});
 
diff --git a/types/tape-async/tsconfig.json b/types/tape-async/tsconfig.json
index 462155b141..c5b3e90053 100644
--- a/types/tape-async/tsconfig.json
+++ b/types/tape-async/tsconfig.json
@@ -18,6 +18,8 @@
 	},
 	"files": [
 		"index.d.ts",
-		"tape-async-tests.ts"
+		"test/tape-async.async.test.ts",
+		"test/tape-async.generators.test.ts",
+		"test/tape-async.test.ts"
 	]
 }

From ab818540d047bbea8448cac0b4791d4fd81ea480 Mon Sep 17 00:00:00 2001
From: Joe Lencioni <joe.lencioni@gmail.com>
Date: Thu, 28 Feb 2019 16:07:50 -0800
Subject: [PATCH 195/924] Add key to react-router-config RouteConfig

Routes can have an optional `key`.

https://www.npmjs.com/package/react-router-config#route-configuration-shape
---
 types/react-router-config/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 0dc1544ca6..bf719c5760 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -15,6 +15,7 @@ export interface RouteConfigComponentProps<Params extends { [K in keyof Params]?
 }
 
 export interface RouteConfig {
+    key?: React.Key;
     location?: Location;
     component?: React.ComponentType<RouteConfigComponentProps<any>> | React.ComponentType;
     path?: string;

From b826388e52ab7cb43944b9b9047c8170d9f2fd98 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Fri, 1 Mar 2019 14:21:51 +1100
Subject: [PATCH 196/924] Added type defs for html-truncate

---
 types/html-truncate/html-truncate-tests.ts | 13 +++++++++++
 types/html-truncate/index.d.ts             | 20 +++++++++++++++++
 types/html-truncate/tsconfig.json          | 25 ++++++++++++++++++++++
 types/html-truncate/tslint.json            |  3 +++
 4 files changed, 61 insertions(+)
 create mode 100644 types/html-truncate/html-truncate-tests.ts
 create mode 100644 types/html-truncate/index.d.ts
 create mode 100644 types/html-truncate/tsconfig.json
 create mode 100644 types/html-truncate/tslint.json

diff --git a/types/html-truncate/html-truncate-tests.ts b/types/html-truncate/html-truncate-tests.ts
new file mode 100644
index 0000000000..0c46bf560b
--- /dev/null
+++ b/types/html-truncate/html-truncate-tests.ts
@@ -0,0 +1,13 @@
+import Truncate from "html-truncate";
+
+Truncate('hello world', 4);
+
+Truncate('<p><div>hello world</div></p>', 4, {
+    keepImageTag: true,
+    ellipsis: true
+});
+
+Truncate('<p><div>hello world</div></p>', 6, {
+    keepImageTag: false,
+    ellipsis: '---'
+});
diff --git a/types/html-truncate/index.d.ts b/types/html-truncate/index.d.ts
new file mode 100644
index 0000000000..8be4a950a3
--- /dev/null
+++ b/types/html-truncate/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for html-truncate 1.2
+// Project: https://github.com/huang47/nodejs-html-truncate
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface TruncateOptions {
+    /**
+     * Flag to specify if keep image tag, false by default.
+     */
+    keepImageTag: boolean;
+    /**
+     * Omission symbol for truncated string, '...' by default.
+     */
+    ellipsis: boolean|string;
+}
+
+/**
+ * Truncate HTML text and also keep tag safe.
+ */
+export default function truncate(input: string, maxLength: number, options?: TruncateOptions): string;
diff --git a/types/html-truncate/tsconfig.json b/types/html-truncate/tsconfig.json
new file mode 100644
index 0000000000..693d5d17ba
--- /dev/null
+++ b/types/html-truncate/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "html-truncate-tests.ts"
+    ]
+}
diff --git a/types/html-truncate/tslint.json b/types/html-truncate/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/html-truncate/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 64208f26fa7260ec9b49715122d94324caeed548 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Fri, 1 Mar 2019 16:10:22 +1100
Subject: [PATCH 197/924] Added file export type defs

---
 types/mumath/clamp.d.ts      |  6 ++++++
 types/mumath/closest.d.ts    |  6 ++++++
 types/mumath/index.d.ts      |  1 -
 types/mumath/isMultiple.d.ts |  7 +++++++
 types/mumath/len.d.ts        |  6 ++++++
 types/mumath/lerp.d.ts       |  6 ++++++
 types/mumath/mod.d.ts        |  6 ++++++
 types/mumath/mumath-tests.ts | 23 +++++++++++++++++++++++
 types/mumath/order.d.ts      |  6 ++++++
 types/mumath/precision.d.ts  |  6 ++++++
 types/mumath/round.d.ts      |  6 ++++++
 types/mumath/scale.d.ts      |  8 ++++++++
 types/mumath/tsconfig.json   | 11 +++++++++++
 types/mumath/within.d.ts     |  6 ++++++
 14 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 types/mumath/clamp.d.ts
 create mode 100644 types/mumath/closest.d.ts
 create mode 100644 types/mumath/isMultiple.d.ts
 create mode 100644 types/mumath/len.d.ts
 create mode 100644 types/mumath/lerp.d.ts
 create mode 100644 types/mumath/mod.d.ts
 create mode 100644 types/mumath/order.d.ts
 create mode 100644 types/mumath/precision.d.ts
 create mode 100644 types/mumath/round.d.ts
 create mode 100644 types/mumath/scale.d.ts
 create mode 100644 types/mumath/within.d.ts

diff --git a/types/mumath/clamp.d.ts b/types/mumath/clamp.d.ts
new file mode 100644
index 0000000000..fe08302e37
--- /dev/null
+++ b/types/mumath/clamp.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Detects proper clamp min/max.
+ */
+declare function clamp(value: number, left: number, right: number): number;
+
+export default clamp;
diff --git a/types/mumath/closest.d.ts b/types/mumath/closest.d.ts
new file mode 100644
index 0000000000..f2db4ea1ec
--- /dev/null
+++ b/types/mumath/closest.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Get closest value out of a set.
+ */
+declare function closest(value: number, list: number[]): number;
+
+export default closest;
diff --git a/types/mumath/index.d.ts b/types/mumath/index.d.ts
index 8967bafa4f..3dcfccf565 100644
--- a/types/mumath/index.d.ts
+++ b/types/mumath/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/dfcreative/mumath
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3
 
 /**
  * Detects proper clamp min/max.
diff --git a/types/mumath/isMultiple.d.ts b/types/mumath/isMultiple.d.ts
new file mode 100644
index 0000000000..255d0ece72
--- /dev/null
+++ b/types/mumath/isMultiple.d.ts
@@ -0,0 +1,7 @@
+/**
+ * Check if one number is multiple of other
+ * Same as a % b === 0, but with precision check.
+ */
+declare function isMultiple(a: number, b: number, eps?: number): boolean;
+
+export default isMultiple;
diff --git a/types/mumath/len.d.ts b/types/mumath/len.d.ts
new file mode 100644
index 0000000000..2392cff32f
--- /dev/null
+++ b/types/mumath/len.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Return quadratic length of a vector.
+ */
+declare function len(a: number, b: number): number;
+
+export default len;
diff --git a/types/mumath/lerp.d.ts b/types/mumath/lerp.d.ts
new file mode 100644
index 0000000000..3ab8639c0c
--- /dev/null
+++ b/types/mumath/lerp.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Return value interpolated between x and y.
+ */
+declare function lerp(x: number, y: number, ratio: number): number;
+
+export default lerp;
diff --git a/types/mumath/mod.d.ts b/types/mumath/mod.d.ts
new file mode 100644
index 0000000000..6517271e45
--- /dev/null
+++ b/types/mumath/mod.d.ts
@@ -0,0 +1,6 @@
+/**
+ * An enhanced mod-loop, like fmod — loops value within a frame.
+ */
+declare function mod(value: number, max: number, min?: number): number;
+
+export default mod;
diff --git a/types/mumath/mumath-tests.ts b/types/mumath/mumath-tests.ts
index c0fed04336..5a8fd6476f 100644
--- a/types/mumath/mumath-tests.ts
+++ b/types/mumath/mumath-tests.ts
@@ -1,25 +1,48 @@
 import * as mumath from "mumath";
 
+import mumathClamp from "mumath/clamp";
+import mumathClosest from "mumath/closest";
+import mumathIsMultiple from "mumath/isMultiple";
+import mumathLen from "mumath/len";
+import mumathLerp from "mumath/lerp";
+import mumathMod from "mumath/mod";
+import mumathOrder from "mumath/order";
+import mumathPrecision from "mumath/precision";
+import mumathRound from "mumath/round";
+import mumathScale from "mumath/scale";
+import mumathWithin from "mumath/within";
+
 mumath.clamp(1, 2, 3);
+mumathClamp(1, 2, 3);
 
 mumath.closest(5, [1, 7, 3, 6, 10]);
+mumathClosest(5, [1, 7, 3, 6, 10]);
 
 mumath.isMultiple(5, 10, 1.000074);
 mumath.isMultiple(5, 10);
+mumathIsMultiple(5, 10, 1.000074);
 
 mumath.len(15, 1.0);
+mumathLen(15, 1.0);
 
 mumath.lerp(1, 2, 3);
+mumathLerp(1, 2, 3);
 
 mumath.mod(1, 2, 3);
 mumath.mod(1, 2);
+mumathMod(1, 2, 3);
 
 mumath.order(5);
+mumathOrder(5);
 
 mumath.precision(5.0000001);
+mumathPrecision(5.0000001);
 
 mumath.round(0.3, 0.5);
+mumathRound(0.3, 0.5);
 
 mumath.scale(5.93, [1.0, 35, 10, 7.135]);
+mumathScale(5.93, [1.0, 35, 10, 7.135]);
 
 mumath.within(5, 1, 10);
+mumathWithin(5, 1, 10);
diff --git a/types/mumath/order.d.ts b/types/mumath/order.d.ts
new file mode 100644
index 0000000000..6da624f1d3
--- /dev/null
+++ b/types/mumath/order.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Get order of magnitude for a number.
+ */
+declare function order(value: number): number;
+
+export default order;
diff --git a/types/mumath/precision.d.ts b/types/mumath/precision.d.ts
new file mode 100644
index 0000000000..ec94b3a4ed
--- /dev/null
+++ b/types/mumath/precision.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Get precision from float:
+ */
+declare function precision(value: number): number;
+
+export default precision;
diff --git a/types/mumath/round.d.ts b/types/mumath/round.d.ts
new file mode 100644
index 0000000000..09549f14f1
--- /dev/null
+++ b/types/mumath/round.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Rounds value to optional step.
+ */
+declare function round(value: number, step?: number): number;
+
+export default round;
diff --git a/types/mumath/scale.d.ts b/types/mumath/scale.d.ts
new file mode 100644
index 0000000000..2d5487ea10
--- /dev/null
+++ b/types/mumath/scale.d.ts
@@ -0,0 +1,8 @@
+/**
+ * Get first scale out of a list of basic scales, aligned to the power. E. g.
+ * step(.37, [1, 2, 5]) → .5 step(456, [1, 2]) → 1000
+ * Similar to closest, but takes all possible powers of scales.
+ */
+declare function scale(value: number, list: number[]): number;
+
+export default scale;
diff --git a/types/mumath/tsconfig.json b/types/mumath/tsconfig.json
index 67aa9c2b29..e96b912780 100644
--- a/types/mumath/tsconfig.json
+++ b/types/mumath/tsconfig.json
@@ -20,6 +20,17 @@
     },
     "files": [
       "index.d.ts",
+      "clamp.d.ts",
+      "closest.d.ts",
+      "isMultiple.d.ts",
+      "len.d.ts",
+      "lerp.d.ts",
+      "mod.d.ts",
+      "order.d.ts",
+      "precision.d.ts",
+      "round.d.ts",
+      "scale.d.ts",
+      "within.d.ts",
       "mumath-tests.ts"
     ]
 }
diff --git a/types/mumath/within.d.ts b/types/mumath/within.d.ts
new file mode 100644
index 0000000000..47558c73d0
--- /dev/null
+++ b/types/mumath/within.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Whether element is between left & right, including.
+ */
+declare function within(value: number, left: number, right: number): number;
+
+export default within;

From e0cf0c55204ff4d5f4501a57aebb0c302084701d Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 1 Mar 2019 11:00:34 +0500
Subject: [PATCH 198/924] feat(unsplash-js): replace classes with interfaces
 and update fetch types

---
 types/unsplash-js/index.d.ts    | 160 +++++++++++++++-----------------
 types/unsplash-js/tsconfig.json |   3 +-
 2 files changed, 75 insertions(+), 88 deletions(-)

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index 4fb2fb9175..e68a854510 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for unsplash-js 5.0
 // Project: https://github.com/unsplash/unsplash-js#readme
-// Definitions by: My Self <https://github.com/markupcode>
+// Definitions by: Andrew Malikov <https://github.com/markupcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export default class Unsplash {
@@ -13,7 +13,7 @@ export default class Unsplash {
     public search: SearchApi;
     public stats: StatsApi;
 
-    constructor(options: {
+    public constructor(options: {
         apiUrl: string;
         apiVersion: string;
         applicationId: string;
@@ -23,48 +23,48 @@ export default class Unsplash {
         headers?: { [key: string]: string };
     });
 
-    private request(requestOptions: {
+    public request(requestOptions: {
         url: string;
         method: string;
         query: object;
         headers: object;
         body: object;
         oauth: boolean;
-    }): Promise<any>;
+    }): Promise<Response>;
 }
 
 export function toJson(response: any): any;
 
-export class PhotoApi {
-    public listPhotos(
+export interface PhotoApi {
+    listPhotos(
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public listCuratedPhotos(
+    listCuratedPhotos(
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public searchPhotos(
+    searchPhotos(
         query: string,
         categories: ReadonlyArray<string>,
         page: number,
         perPage: number
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public getPhoto(
+    getPhoto(
         id: string,
         width?: number,
         height?: number,
         rectangle?: ReadonlyArray<number>
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public getPhotoStats(id: string): Promise<any>;
+    getPhotoStats(id: string): Promise<Response>;
 
-    public getRandomPhoto(options: {
+    getRandomPhoto(options: {
         width?: number;
         height?: number;
         query?: string;
@@ -72,110 +72,100 @@ export class PhotoApi {
         featured?: boolean;
         collections?: ReadonlyArray<string>;
         count?: number;
-    }): Promise<any>;
+    }): Promise<Response>;
 
-    public uploadPhoto(photo: object): void;
+    uploadPhoto(photo: object): void;
 
-    public likePhoto(id: string): Promise<any>;
+    likePhoto(id: string): Promise<Response>;
 
-    public unlikePhoto(id: string): Promise<any>;
+    unlikePhoto(id: string): Promise<Response>;
 
-    public downloadPhoto(photo: {
+    downloadPhoto(photo: {
         links: { download_location: string };
-    }): Promise<any>;
+    }): Promise<Response>;
 }
 
-export class CollectionsApi {
-    public listCollections(
+export interface CollectionsApi {
+    listCollections(
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public listCuratedCollections(
-        page?: number,
-        perPage?: number
-    ): Promise<any>;
+    listCuratedCollections(page?: number, perPage?: number): Promise<Response>;
 
-    public listFeaturedCollections(
-        page?: number,
-        perPage?: number
-    ): Promise<any>;
+    listFeaturedCollections(page?: number, perPage?: number): Promise<Response>;
 
-    public getCollection(id: number): Promise<any>;
+    getCollection(id: number): Promise<Response>;
 
-    public getCollectionPhotos(
+    getCollectionPhotos(
         id: number,
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public getCuratedCollectionPhotos(
+    getCuratedCollectionPhotos(
         id: number,
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public createCollection(
+    createCollection(
         title: string,
         description?: string,
         private?: boolean
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public updateCollection(
+    updateCollection(
         id: number,
         title?: string,
         description?: string,
         private?: boolean
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public deleteCollection(id: number): Promise<any>;
+    deleteCollection(id: number): Promise<Response>;
 
-    public addPhotoToCollection(
+    addPhotoToCollection(
         collectionId: number,
         photoId: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public removePhotoFromCollection(
+    removePhotoFromCollection(
         collectionId: number,
         photoId: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public listRelatedCollections(collectionId: number): Promise<any>;
+    listRelatedCollections(collectionId: number): Promise<Response>;
 }
 
-export class SearchApi {
-    public all(keyword: string, page: number, per_page: number): Promise<any>;
+export interface SearchApi {
+    all(keyword: string, page: number, per_page: number): Promise<Response>;
 
-    public photos(
+    photos(
         keyword: string,
         page?: number,
         per_page?: number
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public users(
+    users(keyword: string, page?: number, per_page?: number): Promise<Response>;
+
+    collections(
         keyword: string,
         page?: number,
         per_page?: number
-    ): Promise<any>;
-
-    public collections(
-        keyword: string,
-        page?: number,
-        per_page?: number
-    ): Promise<any>;
+    ): Promise<Response>;
 }
 
-export class StatsApi {
-    public total(): Promise<any>;
+export interface StatsApi {
+    total(): Promise<Response>;
 }
 
-export class CurrentUserApi {
-    public profile(): Promise<any>;
+export interface CurrentUserApi {
+    profile(): Promise<Response>;
 
-    public updateProfile(options: {
+    updateProfile(options: {
         username?: string;
         firstName?: string;
         lastName?: string;
@@ -184,57 +174,53 @@ export class CurrentUserApi {
         location?: string;
         bio?: string;
         instagramUsername?: string;
-    }): Promise<any>;
+    }): Promise<Response>;
 }
 
-export class UsersApi {
-    public profile(username: string): Promise<any>;
+export interface UsersApi {
+    profile(username: string): Promise<Response>;
 
-    public statistics(
+    statistics(
         username: string,
         resolution?: string,
         quantity?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public photos(
+    photos(
         username: string,
         page?: number,
         perPage?: number,
         orderBy?: string,
         stats?: boolean
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public likes(
+    likes(
         username: string,
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 
-    public collections(
+    collections(
         username: string,
         page?: number,
         perPage?: number,
         orderBy?: string
-    ): Promise<any>;
+    ): Promise<Response>;
 }
 
-export class CategoriesApi {
-    public listCategories(): Promise<any>;
+export interface CategoriesApi {
+    listCategories(): Promise<Response>;
 
-    public category(id: any): Promise<any>;
+    category(id: any): Promise<Response>;
 
-    public categoryPhotos(
-        id: any,
-        page?: number,
-        perPage?: number
-    ): Promise<any>;
+    categoryPhotos(id: any, page?: number, perPage?: number): Promise<Response>;
 }
 
-export class Auth {
-    public getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
+export interface Auth {
+    getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
 
-    public userAuthentication(code: string): Promise<any>;
+    userAuthentication(code: string): Promise<Response>;
 
-    public setBearerToken(accessToken: string): void;
+    setBearerToken(accessToken: string): void;
 }
diff --git a/types/unsplash-js/tsconfig.json b/types/unsplash-js/tsconfig.json
index 79f45318aa..a76632982c 100644
--- a/types/unsplash-js/tsconfig.json
+++ b/types/unsplash-js/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From a3770d86923cd891fbc77c67b9e5ee5b3afe1a18 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 1 Mar 2019 11:41:53 +0500
Subject: [PATCH 199/924] feat(unsplash-js): add tests

---
 types/unsplash-js/index.d.ts           |   6 +-
 types/unsplash-js/unsplash-js-tests.ts | 100 +++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index e68a854510..92a8eceb8b 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -14,8 +14,8 @@ export default class Unsplash {
     public stats: StatsApi;
 
     public constructor(options: {
-        apiUrl: string;
-        apiVersion: string;
+        apiUrl?: string;
+        apiVersion?: string;
         applicationId: string;
         secret: string;
         callbackUrl?: string;
@@ -183,7 +183,7 @@ export interface UsersApi {
     statistics(
         username: string,
         resolution?: string,
-        quantity?: string
+        quantity?: number
     ): Promise<Response>;
 
     photos(
diff --git a/types/unsplash-js/unsplash-js-tests.ts b/types/unsplash-js/unsplash-js-tests.ts
index e69de29bb2..262d4c5e02 100644
--- a/types/unsplash-js/unsplash-js-tests.ts
+++ b/types/unsplash-js/unsplash-js-tests.ts
@@ -0,0 +1,100 @@
+import Unsplash, { toJson } from "unsplash-js";
+
+const unsplash = new Unsplash({
+    applicationId: "{APP_ACCESS_KEY}",
+    secret: "{APP_SECRET}"
+});
+
+const authenticationUrl = unsplash.auth.getAuthenticationUrl([
+    "public",
+    "read_user",
+    "write_user",
+    "read_photos",
+    "write_photos"
+]);
+
+unsplash.auth
+    .userAuthentication("{OAUTH_CODE}")
+    .then(toJson)
+    .then(json => {
+        unsplash.auth.setBearerToken(json.access_token);
+    });
+
+unsplash.currentUser.profile();
+
+unsplash.currentUser.updateProfile({
+    username: "drizzy",
+    firstName: "Aubrey",
+    lastName: "Graham",
+    email: "drizzy@octobersveryown.com",
+    url: "http://octobersveryown.com",
+    location: "Toronto, Ontario, Canada",
+    bio: "Views from the 6",
+    instagramUsername: "champagnepapi"
+});
+
+unsplash.users.profile("naoufal");
+
+unsplash.users.statistics("naoufal", "days", 30);
+
+unsplash.users.photos("naoufal", 1, 10, "popular", false);
+
+unsplash.users.likes("naoufal", 2, 15, "popular");
+
+unsplash.users.collections("naoufal", 2, 15, "updated");
+
+unsplash.photos.listPhotos(2, 15, "latest");
+
+unsplash.photos.getPhoto("mtNweauBsMQ", 1920, 1080, [0, 0, 1920, 1080]);
+
+unsplash.photos.getPhotoStats("mtNweauBsMQ");
+
+unsplash.photos.getRandomPhoto({ username: "naoufal" });
+
+unsplash.photos.likePhoto("mtNweauBsMQ");
+
+unsplash.photos.unlikePhoto("mtNweauBsMQ");
+
+unsplash.photos
+    .getPhoto("mtNweauBsMQ")
+    .then(toJson)
+    .then(json => {
+        unsplash.photos.downloadPhoto(json);
+    });
+
+unsplash.collections.listCollections(1, 10, "popular");
+
+unsplash.collections.listFeaturedCollections(1, 10);
+
+unsplash.collections.getCollection(123456);
+
+unsplash.collections.getCollectionPhotos(123456, 1, 10, "popular");
+
+unsplash.collections.createCollection(
+    "Birds",
+    "Wild birds from 'round the world",
+    true
+);
+
+unsplash.collections.updateCollection(
+    12345,
+    "Wild Birds",
+    "Wild birds from around the world",
+    false
+);
+
+unsplash.collections.deleteCollection(42);
+
+unsplash.collections.addPhotoToCollection(88, "abc1234");
+
+unsplash.collections.removePhotoFromCollection(88, "abc1234");
+
+unsplash.collections.listRelatedCollections(88);
+
+unsplash.search.photos("dogs", 1);
+
+unsplash.search.users("steve", 1);
+
+unsplash.search.collections("dogs", 1);
+
+unsplash.stats.total();

From f583652711dc5038fa4d3bec0eff75cae7d2f85c Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 1 Mar 2019 12:06:13 +0500
Subject: [PATCH 200/924] feat(unsplash-js): add ts version and remove implicit
 modificators

---
 types/unsplash-js/index.d.ts    | 21 +++++++++++----------
 types/unsplash-js/tsconfig.json |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index 92a8eceb8b..40971248f6 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -2,18 +2,19 @@
 // Project: https://github.com/unsplash/unsplash-js#readme
 // Definitions by: Andrew Malikov <https://github.com/markupcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export default class Unsplash {
-    public auth: Auth;
-    public categories: CategoriesApi;
-    public collections: CollectionsApi;
-    public currentUser: CurrentUserApi;
-    public users: UsersApi;
-    public photos: PhotoApi;
-    public search: SearchApi;
-    public stats: StatsApi;
+    auth: Auth;
+    categories: CategoriesApi;
+    collections: CollectionsApi;
+    currentUser: CurrentUserApi;
+    users: UsersApi;
+    photos: PhotoApi;
+    search: SearchApi;
+    stats: StatsApi;
 
-    public constructor(options: {
+    constructor(options: {
         apiUrl?: string;
         apiVersion?: string;
         applicationId: string;
@@ -23,7 +24,7 @@ export default class Unsplash {
         headers?: { [key: string]: string };
     });
 
-    public request(requestOptions: {
+    request(requestOptions: {
         url: string;
         method: string;
         query: object;
diff --git a/types/unsplash-js/tsconfig.json b/types/unsplash-js/tsconfig.json
index a76632982c..8d04d7480f 100644
--- a/types/unsplash-js/tsconfig.json
+++ b/types/unsplash-js/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 1b6ef0e8f0c6a468d2f2caf070791c52447a9fe2 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 1 Mar 2019 12:26:42 +0500
Subject: [PATCH 201/924] feat(unsplash-js): hide internal API

---
 types/unsplash-js/index.d.ts | 390 ++++++++++++++++++-----------------
 1 file changed, 203 insertions(+), 187 deletions(-)

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index 40971248f6..682eef058b 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -5,14 +5,14 @@
 // TypeScript Version: 2.2
 
 export default class Unsplash {
-    auth: Auth;
-    categories: CategoriesApi;
-    collections: CollectionsApi;
-    currentUser: CurrentUserApi;
-    users: UsersApi;
-    photos: PhotoApi;
-    search: SearchApi;
-    stats: StatsApi;
+    auth: UnsplashApi.Auth;
+    categories: UnsplashApi.Categories;
+    collections: UnsplashApi.Collections;
+    currentUser: UnsplashApi.CurrentUser;
+    users: UnsplashApi.Users;
+    photos: UnsplashApi.Photo;
+    search: UnsplashApi.Search;
+    stats: UnsplashApi.Stats;
 
     constructor(options: {
         apiUrl?: string;
@@ -36,192 +36,208 @@ export default class Unsplash {
 
 export function toJson(response: any): any;
 
-export interface PhotoApi {
-    listPhotos(
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
+declare module UnsplashApi {
+    interface Photo {
+        listPhotos(
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
 
-    listCuratedPhotos(
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
+        listCuratedPhotos(
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
 
-    searchPhotos(
-        query: string,
-        categories: ReadonlyArray<string>,
-        page: number,
-        perPage: number
-    ): Promise<Response>;
+        searchPhotos(
+            query: string,
+            categories: ReadonlyArray<string>,
+            page: number,
+            perPage: number
+        ): Promise<Response>;
 
-    getPhoto(
-        id: string,
-        width?: number,
-        height?: number,
-        rectangle?: ReadonlyArray<number>
-    ): Promise<Response>;
+        getPhoto(
+            id: string,
+            width?: number,
+            height?: number,
+            rectangle?: ReadonlyArray<number>
+        ): Promise<Response>;
 
-    getPhotoStats(id: string): Promise<Response>;
+        getPhotoStats(id: string): Promise<Response>;
 
-    getRandomPhoto(options: {
-        width?: number;
-        height?: number;
-        query?: string;
-        username?: string;
-        featured?: boolean;
-        collections?: ReadonlyArray<string>;
-        count?: number;
-    }): Promise<Response>;
+        getRandomPhoto(options: {
+            width?: number;
+            height?: number;
+            query?: string;
+            username?: string;
+            featured?: boolean;
+            collections?: ReadonlyArray<string>;
+            count?: number;
+        }): Promise<Response>;
 
-    uploadPhoto(photo: object): void;
+        uploadPhoto(photo: object): void;
 
-    likePhoto(id: string): Promise<Response>;
+        likePhoto(id: string): Promise<Response>;
 
-    unlikePhoto(id: string): Promise<Response>;
+        unlikePhoto(id: string): Promise<Response>;
 
-    downloadPhoto(photo: {
-        links: { download_location: string };
-    }): Promise<Response>;
-}
-
-export interface CollectionsApi {
-    listCollections(
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
-
-    listCuratedCollections(page?: number, perPage?: number): Promise<Response>;
-
-    listFeaturedCollections(page?: number, perPage?: number): Promise<Response>;
-
-    getCollection(id: number): Promise<Response>;
-
-    getCollectionPhotos(
-        id: number,
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
-
-    getCuratedCollectionPhotos(
-        id: number,
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
-
-    createCollection(
-        title: string,
-        description?: string,
-        private?: boolean
-    ): Promise<Response>;
-
-    updateCollection(
-        id: number,
-        title?: string,
-        description?: string,
-        private?: boolean
-    ): Promise<Response>;
-
-    deleteCollection(id: number): Promise<Response>;
-
-    addPhotoToCollection(
-        collectionId: number,
-        photoId: string
-    ): Promise<Response>;
-
-    removePhotoFromCollection(
-        collectionId: number,
-        photoId: string
-    ): Promise<Response>;
-
-    listRelatedCollections(collectionId: number): Promise<Response>;
-}
-
-export interface SearchApi {
-    all(keyword: string, page: number, per_page: number): Promise<Response>;
-
-    photos(
-        keyword: string,
-        page?: number,
-        per_page?: number
-    ): Promise<Response>;
-
-    users(keyword: string, page?: number, per_page?: number): Promise<Response>;
-
-    collections(
-        keyword: string,
-        page?: number,
-        per_page?: number
-    ): Promise<Response>;
-}
-
-export interface StatsApi {
-    total(): Promise<Response>;
-}
-
-export interface CurrentUserApi {
-    profile(): Promise<Response>;
-
-    updateProfile(options: {
-        username?: string;
-        firstName?: string;
-        lastName?: string;
-        email?: string;
-        url?: string;
-        location?: string;
-        bio?: string;
-        instagramUsername?: string;
-    }): Promise<Response>;
-}
-
-export interface UsersApi {
-    profile(username: string): Promise<Response>;
-
-    statistics(
-        username: string,
-        resolution?: string,
-        quantity?: number
-    ): Promise<Response>;
-
-    photos(
-        username: string,
-        page?: number,
-        perPage?: number,
-        orderBy?: string,
-        stats?: boolean
-    ): Promise<Response>;
-
-    likes(
-        username: string,
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
-
-    collections(
-        username: string,
-        page?: number,
-        perPage?: number,
-        orderBy?: string
-    ): Promise<Response>;
-}
-
-export interface CategoriesApi {
-    listCategories(): Promise<Response>;
-
-    category(id: any): Promise<Response>;
-
-    categoryPhotos(id: any, page?: number, perPage?: number): Promise<Response>;
-}
-
-export interface Auth {
-    getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
-
-    userAuthentication(code: string): Promise<Response>;
-
-    setBearerToken(accessToken: string): void;
+        downloadPhoto(photo: {
+            links: { download_location: string };
+        }): Promise<Response>;
+    }
+
+    interface Collections {
+        listCollections(
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
+
+        listCuratedCollections(
+            page?: number,
+            perPage?: number
+        ): Promise<Response>;
+
+        listFeaturedCollections(
+            page?: number,
+            perPage?: number
+        ): Promise<Response>;
+
+        getCollection(id: number): Promise<Response>;
+
+        getCollectionPhotos(
+            id: number,
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
+
+        getCuratedCollectionPhotos(
+            id: number,
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
+
+        createCollection(
+            title: string,
+            description?: string,
+            private?: boolean
+        ): Promise<Response>;
+
+        updateCollection(
+            id: number,
+            title?: string,
+            description?: string,
+            private?: boolean
+        ): Promise<Response>;
+
+        deleteCollection(id: number): Promise<Response>;
+
+        addPhotoToCollection(
+            collectionId: number,
+            photoId: string
+        ): Promise<Response>;
+
+        removePhotoFromCollection(
+            collectionId: number,
+            photoId: string
+        ): Promise<Response>;
+
+        listRelatedCollections(collectionId: number): Promise<Response>;
+    }
+
+    interface Search {
+        all(keyword: string, page: number, per_page: number): Promise<Response>;
+
+        photos(
+            keyword: string,
+            page?: number,
+            per_page?: number
+        ): Promise<Response>;
+
+        users(
+            keyword: string,
+            page?: number,
+            per_page?: number
+        ): Promise<Response>;
+
+        collections(
+            keyword: string,
+            page?: number,
+            per_page?: number
+        ): Promise<Response>;
+    }
+
+    interface Stats {
+        total(): Promise<Response>;
+    }
+
+    interface CurrentUser {
+        profile(): Promise<Response>;
+
+        updateProfile(options: {
+            username?: string;
+            firstName?: string;
+            lastName?: string;
+            email?: string;
+            url?: string;
+            location?: string;
+            bio?: string;
+            instagramUsername?: string;
+        }): Promise<Response>;
+    }
+
+    interface Users {
+        profile(username: string): Promise<Response>;
+
+        statistics(
+            username: string,
+            resolution?: string,
+            quantity?: number
+        ): Promise<Response>;
+
+        photos(
+            username: string,
+            page?: number,
+            perPage?: number,
+            orderBy?: string,
+            stats?: boolean
+        ): Promise<Response>;
+
+        likes(
+            username: string,
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
+
+        collections(
+            username: string,
+            page?: number,
+            perPage?: number,
+            orderBy?: string
+        ): Promise<Response>;
+    }
+
+    interface Categories {
+        listCategories(): Promise<Response>;
+
+        category(id: any): Promise<Response>;
+
+        categoryPhotos(
+            id: any,
+            page?: number,
+            perPage?: number
+        ): Promise<Response>;
+    }
+
+    interface Auth {
+        getAuthenticationUrl(scopes?: ReadonlyArray<string>): string;
+
+        userAuthentication(code: string): Promise<Response>;
+
+        setBearerToken(accessToken: string): void;
+    }
 }

From 41ca4ffe36b43a056982cdfac27219a34fd1e385 Mon Sep 17 00:00:00 2001
From: Andrew <andrew.devels@gmail.com>
Date: Fri, 1 Mar 2019 12:38:08 +0500
Subject: [PATCH 202/924] fix(unspash-js): remove deprecated 'module' syntax

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

diff --git a/types/unsplash-js/index.d.ts b/types/unsplash-js/index.d.ts
index 682eef058b..8eb6222778 100644
--- a/types/unsplash-js/index.d.ts
+++ b/types/unsplash-js/index.d.ts
@@ -36,7 +36,7 @@ export default class Unsplash {
 
 export function toJson(response: any): any;
 
-declare module UnsplashApi {
+export namespace UnsplashApi {
     interface Photo {
         listPhotos(
             page?: number,

From 21f65b52987ff81e9bc01c26707ed83bd7b663b8 Mon Sep 17 00:00:00 2001
From: Bryan Huang <dukedhx@hotmail.com>
Date: Fri, 1 Mar 2019 15:57:03 +0800
Subject: [PATCH 203/924] Upgrade to Viewer v6.4

---
 types/forge-viewer/index.d.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/types/forge-viewer/index.d.ts b/types/forge-viewer/index.d.ts
index bff0c637a0..878a3926fa 100644
--- a/types/forge-viewer/index.d.ts
+++ b/types/forge-viewer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Forge Viewer 6.3
+// Type definitions for Forge Viewer 6.4
 // Project: https://forge.autodesk.com/en/docs/viewer/v6/reference/javascript/viewer3d/
 // Definitions by: Autodesk Forge Partner Development <https://github.com/Autodesk-Forge>, Alan Smith <https://github.com/alansmithnbs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -238,10 +238,14 @@ declare namespace Autodesk {
           [key: string]: any;
         }
 
+        const AGGREGATE_FIT_TO_VIEW_EVENT = 'aggregateFitToView';
+        const AGGREGATE_ISOLATION_CHANGED_EVENT = 'aggregateIsolation';
         const AGGREGATE_SELECTION_CHANGED_EVENT = 'aggregateSelection';
         const ANIMATION_READY_EVENT = 'animationReady';
         const CAMERA_CHANGE_EVENT = 'cameraChanged';
+        const CAMERA_TRANSITION_COMPLETED = 'cameraTransitionCompleted';
         const CUTPLANES_CHANGE_EVENT = 'cutplanesChanged';
+        const CANCEL_LEAFLET_SCREENSHOT = 'cancelLeafletScreenshot';
         const ESCAPE_EVENT = 'escape';
         const EXPLODE_CHANGE_EVENT = 'explodeChanged';
         const EXTENSION_LOADED_EVENT = 'extensionLoaded';
@@ -251,12 +255,17 @@ declare namespace Autodesk {
         const FRAGMENTS_LOADED_EVENT = 'fragmentsLoaded';
         const FULLSCREEN_MODE_EVENT = 'fullscreenMode';
         const GEOMETRY_LOADED_EVENT = 'geometryLoaded';
+        const GEOMETRY_DOWNLOAD_COMPLETE_EVENT = 'geometryDownloadComplete';
         const HIDE_EVENT = 'hide';
         const HYPERLINK_EVENT = 'hyperlink';
         const ISOLATE_EVENT = 'isolate';
         const LAYER_VISIBILITY_CHANGED_EVENT = 'layerVisibilityChanged';
+        const LOAD_GEOMETRY_EVENT = 'loadGeometry';
         const LOAD_MISSING_GEOMETRY = 'loadMissingGeometry';
+        const MODEL_ADDED_EVENT = 'modelAdded';
         const MODEL_ROOT_LOADED_EVENT = 'modelRootLoaded';
+        const MODEL_REMOVED_EVENT = 'modelRemoved';
+        const MODEL_LAYERS_LOADED_EVENT = 'modelLayersLoaded';
         const MODEL_UNLOADED_EVENT = 'modelUnloaded';
         const NAVIGATION_MODE_CHANGED_EVENT = 'navigationModeChanged';
         const OBJECT_TREE_CREATED_EVENT = 'objectTreeCreated';
@@ -277,6 +286,7 @@ declare namespace Autodesk {
         const VIEWER_RESIZE_EVENT = 'viewerResize';
         const VIEWER_STATE_RESTORED_EVENT = 'viewerStateRestored';
         const VIEWER_UNINITIALIZED = 'viewerUninitialized';
+        const WEBGL_CONTEXT_LOST_EVENT = 'webGlContextLost';
 
         interface ViewerEventArgs {
           target?: Viewer3D;
@@ -333,6 +343,7 @@ declare namespace Autodesk {
           setTag(tag: string, value: any): void;
           traverse(cb: () => void): boolean;
           urn(searchParent: boolean): string;
+          useAsDefault(): boolean;
         }
 
         let theExtensionManager: ExtensionManager;
@@ -850,11 +861,15 @@ declare namespace Autodesk {
                 hitTestViewport(vpVec: THREE.Vector3, ignoreTransparent: boolean): HitTestResult;
                 initialize(): void;
                 setLightPreset(index: number, force?: boolean): void;
+
                 viewportToClient(viewportX: number, viewportY: number): THREE.Vector3;
 
                 getMaterials(): any;
+                getScreenShotProgressive(w: number, h: number, onFinished?: () => void, options?: any): any;
+
                 getRenderProxy(model: Model, fragId: number): any;
                 sceneUpdated(param: boolean): void;
+                setViewFromCamera(camera: THREE.Camera, skipTransition?: boolean, useExactCamera?: boolean): void;
             }
 
             class VisibilityManager {

From 5941e3481c703daf85efaa1e083a9d8e04af2913 Mon Sep 17 00:00:00 2001
From: Akihiro Uchida <uchida@turbare.net>
Date: Fri, 1 Mar 2019 15:05:09 +0900
Subject: [PATCH 204/924] Add definitions for puppeteer BrowserFetcher

---
 types/puppeteer/index.d.ts         | 28 ++++++++++++++++++++++++++++
 types/puppeteer/puppeteer-tests.ts |  8 ++++++++
 2 files changed, 36 insertions(+)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 1b9428392a..a4bf6e0d73 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2195,3 +2195,31 @@ export function defaultArgs(options?: ChromeArgOptions): string[];
 export function executablePath(): string;
 /** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
 export function launch(options?: LaunchOptions): Promise<Browser>;
+
+/** This methods attaches Puppeteer to an existing Chromium instance. */
+export function createBrowserFetcher(options?: LaunchOptions): BrowserFetcher;
+
+/** BrowserFetcher can download and manage different versions of Chromium. */
+export interface BrowserFetcher {
+  /** The method initiates a HEAD request to check if the revision is available. */
+  canDownload(revision: string): Promise<boolean>;
+  /** The method initiates a GET request to download the revision from the host. */
+  download(revision: string, progressCallback?: (downloadBytes: number, totalBytes: number) => any): Promise<RevisionInfo>;
+  localRevisions(): Promise<string[]>;
+  platform(): string;
+  remove(revision: string): Promise<void>;
+  revisionInfo(revision: string): RevisionInfo;
+}
+
+export interface RevisionInfo {
+  /** The revision the info was created from */
+  revision: string;
+  /** Path to the extracted revision folder */
+  folderPath: string;
+  /** Path to the revision executable */
+  executablePath: string;
+  /** URL this revision can be downloaded from */
+  url: string;
+  /** whether the revision is locally available on disk */
+  local: boolean;
+}
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index e5c287b6ee..e62be5b7d5 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -618,3 +618,11 @@ puppeteer.launch().then(async browser => {
   );
   console.log('there are', numMatchingEls, 'banana paragaphs');
 });
+
+(async () => {
+  const rev = '630727';
+  const browserFetcher = puppeteer.createBrowserFetcher();
+  await browserFetcher.canDownload(rev);
+  const revisionInfo = await browserFetcher.download(rev);
+  await browserFetcher.remove(rev);
+});

From 80b5ecb0821f57cb96890431dd31d8fd1d7ce2aa Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 09:23:11 +0100
Subject: [PATCH 205/924] fix linting issues

---
 types/twitch-ext/index.d.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index fac7ccaad4..2aa518fb43 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -186,7 +186,7 @@ interface TwitchExtConfiguration {
 
 	/**
 	 * This property returns the record for the developer segment if one is found; otherwise, undefined.
-	*/
+	 */
 	developer: { version: string; content: string } | undefined;
 
 	/**
@@ -199,11 +199,10 @@ interface TwitchExtConfiguration {
 	 * The callback function takes no input and returns nothing. After this is called for the first time,
 	 * the records for the global, developer and broadcaster segments will be set if the data is available.
 	 * @param callback The callback that is fired.
-	*/
+	 */
 	onChanged(
 		callback: () => void
-	): void
-
+	): void;
 
 	/**
 	 * This function can be called by the front end to set an extension configuration.
@@ -214,7 +213,6 @@ interface TwitchExtConfiguration {
 	set(segment: string, version: string, content: string): void;
 }
 
-
 interface TwitchExtFeatureFlags {
 	/**
 	 * If this flag is true, you can send a chat message to the current channel using Send Extension Chat Message

From 4853a9065b484a47c33a56eb3cc29c48ab144f39 Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 10:04:20 +0100
Subject: [PATCH 206/924] add twitch-ext configuration test

---
 types/twitch-ext/twitch-ext-tests.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/types/twitch-ext/twitch-ext-tests.ts b/types/twitch-ext/twitch-ext-tests.ts
index f6a70f86cb..f3b16517d2 100644
--- a/types/twitch-ext/twitch-ext-tests.ts
+++ b/types/twitch-ext/twitch-ext-tests.ts
@@ -36,6 +36,28 @@ window.Twitch.ext.actions.minimize();
 window.Twitch.ext.actions.followChannel("hearthsim");
 window.Twitch.ext.actions.requestIdShare();
 
+// Twitch Extension Configuration
+window.Twitch.ext.configuration.onChanged(() => {
+	console.log('Configuration changed');
+	if (window.Twitch.ext.configuration.broadcaster) {
+		console.log('Caster configuration');
+		console.log('version: ', window.Twitch.ext.configuration.broadcaster.version);
+		console.log('content: ', window.Twitch.ext.configuration.broadcaster.content);
+	}
+	if (window.Twitch.ext.configuration.developer) {
+		console.log('Developer configuration');
+		console.log('version:', window.Twitch.ext.configuration.developer.version);
+		console.log('content: ', window.Twitch.ext.configuration.developer.content);
+	}
+	if (window.Twitch.ext.configuration.global) {
+		console.log('Global configuration');
+		console.log('version: ', window.Twitch.ext.configuration.global.version);
+		console.log('content: ', window.Twitch.ext.configuration.global.content);
+	}
+});
+
+window.Twitch.ext.configuration.set('broadcaster', '0.0.1', '{"test": "test"}');
+
 // Twitch Extension Feature flags
 window.Twitch.ext.features.onChanged(changed => {
 	if (changed.indexOf("isChatEnabled") !== -1) {

From 4158bbc44beb3cbce3bd584cdc3a28a2d430ec66 Mon Sep 17 00:00:00 2001
From: Bryan Huang <dukedhx@hotmail.com>
Date: Fri, 1 Mar 2019 17:09:43 +0800
Subject: [PATCH 207/924] Merging in contributions from Norconsult

---
 types/forge-viewer/index.d.ts | 52 +++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/types/forge-viewer/index.d.ts b/types/forge-viewer/index.d.ts
index 878a3926fa..8bb90b6d59 100644
--- a/types/forge-viewer/index.d.ts
+++ b/types/forge-viewer/index.d.ts
@@ -150,6 +150,13 @@ declare namespace Autodesk {
 
         interface ViewerConfig {
           disableBrowserContextMenu?: boolean;
+          disabledExtensions?: {
+            bimwalk?: boolean;
+            hyperlink?: boolean;
+            measure?: boolean;
+            scalarisSimulation?: boolean;
+            section?: boolean;
+          };
           extensions?: string[];
           useConsolidation?: boolean;
           consolidationMemoryLimit?: number;
@@ -356,6 +363,7 @@ declare namespace Autodesk {
             language?: string;
             accessToken?: string;
             useADP?: boolean;
+            useConsolidation?: boolean;
             [key: string]: any;
         }
 
@@ -449,16 +457,42 @@ declare namespace Autodesk {
         }
 
         class Model {
-            getBoundingBox(): THREE.Box3;
+            fetchTopology(maxSizeMB: number): Promise<object>;
             getBulkProperties(dbIds: number[], propFilter?: string[], successCallback?: (r: any) => void, errorCallback?: (err: any) => void): void;
             getData(): any;
             getFragmentList(): any;
             getObjectTree(successCallback?: (result: InstanceTree) => void, errorCallback?: (err: any) => void): void;
             getProperties(dbId: number, successCallback?: (r: PropertyResult) => void, errorCallback?: (err: any) => void): void;
+            geomPolyCount(): number;
+            getDefaultCamera(): THREE.Camera;
+            getDisplayUnit(): string;
+            getDocumentNode(): object;
+            getExternalIdMapping(onSuccessCallback: () => void, onErrorCallback: () => void): any;
+            getFastLoadList(): any;
+            getFragmentMap(): any; // DbidFragmentMap|InstanceTree;
+            getLayersRoot(): object;
+            getMetadata(itemName: string, subitemName?: string, defaultValue?: any): any;
+            getRoot(): object;
+            getRootId(): number;
+            getTopoIndex(fragId: number): number;
+            getTopology(index: number): object;
+            getUnitData(unit: string): object;
             getUnitScale(): number;
-            getUnitString(): number;
-
-            search(text: string, successCallback: (r: number[]) => void, errorCallback?: (err: any) => void, attributeNames?: string[]): void;
+            getUnitString(): string;
+            getUpVector(): any;
+            hasTopology(): boolean;
+            instancePolyCount(): number;
+            is2d(): boolean;
+            is3d(): boolean;
+            isAEC(): boolean;
+            isLoadDone(): boolean;
+            isObjectTreeCreated(): boolean;
+            isObjectTreeLoaded(): boolean;
+            pageToModel(): void;
+            pointInClip(): void;
+            search(text: string, onSuccessCallback: () => void, onErrorCallback: () => void, attributeNames?: string[]): void;
+            setData(data: object): void;
+            setUUID(urn: string): void;
             clearThemingColors(): void;
 
             getInstanceTree(): InstanceTree;
@@ -771,6 +805,13 @@ declare namespace Autodesk {
             getHitPoint(x: number, y: number): THREE.Vector3;
         }
 
+        namespace Extensions {
+          class ViewerPropertyPanel extends UI.PropertyPanel {
+            constructor(viewer: Private.GuiViewer3D);
+            currentNodeIds: object[];
+          }
+        }
+
         namespace Private {
             function getHtmlTemplate(url: string, callback: (error: string, content: string) => void): void;
 
@@ -863,7 +904,8 @@ declare namespace Autodesk {
                 setLightPreset(index: number, force?: boolean): void;
 
                 viewportToClient(viewportX: number, viewportY: number): THREE.Vector3;
-
+                modelqueue(): any;
+                matman(): any;
                 getMaterials(): any;
                 getScreenShotProgressive(w: number, h: number, onFinished?: () => void, options?: any): any;
 

From d730f94be2975694dca164e13c98fb6f05ad4627 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Fri, 1 Mar 2019 20:12:40 +1100
Subject: [PATCH 208/924] Added type defs for repeat-string

---
 types/repeat-string/index.d.ts             |  9 ++++++++
 types/repeat-string/repeat-string-tests.ts |  3 +++
 types/repeat-string/tsconfig.json          | 25 ++++++++++++++++++++++
 types/repeat-string/tslint.json            |  3 +++
 4 files changed, 40 insertions(+)
 create mode 100644 types/repeat-string/index.d.ts
 create mode 100644 types/repeat-string/repeat-string-tests.ts
 create mode 100644 types/repeat-string/tsconfig.json
 create mode 100644 types/repeat-string/tslint.json

diff --git a/types/repeat-string/index.d.ts b/types/repeat-string/index.d.ts
new file mode 100644
index 0000000000..e593a62b68
--- /dev/null
+++ b/types/repeat-string/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for repeat-string 1.6
+// Project: https://github.com/jonschlinkert/repeat-string
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Repeat the given `string` the specified `number` of times.
+ */
+export default function(str: string, num: number): string;
diff --git a/types/repeat-string/repeat-string-tests.ts b/types/repeat-string/repeat-string-tests.ts
new file mode 100644
index 0000000000..7095ea672b
--- /dev/null
+++ b/types/repeat-string/repeat-string-tests.ts
@@ -0,0 +1,3 @@
+import Repeat from "repeat-string";
+
+Repeat('A', 5);
diff --git a/types/repeat-string/tsconfig.json b/types/repeat-string/tsconfig.json
new file mode 100644
index 0000000000..a56114d84f
--- /dev/null
+++ b/types/repeat-string/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "repeat-string-tests.ts"
+    ]
+}
diff --git a/types/repeat-string/tslint.json b/types/repeat-string/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/repeat-string/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 129237bb3c8098e4b013233ea2ce9484d9d3e37d Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 10:23:01 +0100
Subject: [PATCH 209/924] add contribution sign

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index 2aa518fb43..cb02f14538 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for non-npm package twitch-ext 1.15
 // Project: https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
 // Definitions by: Benedict Etzel <https://github.com/beheh>
+//                 Federico Della Rovere <https://github.com/FedeDR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

From 3796d81ce2f6df3e1dcc839245881086c8d10c1a Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 10:33:24 +0100
Subject: [PATCH 210/924] increase twitch-ext version

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index cb02f14538..a9e2a648d9 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package twitch-ext 1.15
+// Type definitions for non-npm package twitch-ext 1.16
 // Project: https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
 // Definitions by: Benedict Etzel <https://github.com/beheh>
 //                 Federico Della Rovere <https://github.com/FedeDR>

From 017b8bdd70cc40d68698fe948eb8c983cfc90161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <daniel.mueller@surnet.ch>
Date: Fri, 1 Mar 2019 11:16:20 +0100
Subject: [PATCH 211/924] Fix spelling of a setting

The "D" of "Domains" should be written in uppercase according to the docs: https://helmetjs.github.io/docs/hsts/
---
 types/helmet/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index b0a50c901e..82ad12929b 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -134,7 +134,7 @@ declare namespace helmet {
     export interface IHelmetHpkpConfiguration {
         maxAge: number;
         sha256s: string[];
-        includeSubdomains?: boolean;
+        includeSubDomains?: boolean;
         reportUri?: string;
         reportOnly?: boolean;
         setIf?: IHelmetSetIfFunction;

From f257e0ca0fb86fa449fdb52ad7d5e9961afcf28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20M=C3=BCller?= <daniel.mueller@surnet.ch>
Date: Fri, 1 Mar 2019 11:35:26 +0100
Subject: [PATCH 212/924] Add blameable person

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

diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index 82ad12929b..565dda9ebf 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for helmet
 // Project: https://github.com/helmetjs/helmet
-// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Evan Hahn <https://github.com/EvanHahn>, Elliot Blackburn <https://github.com/bluehatbrit>
+// Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>, Evan Hahn <https://github.com/EvanHahn>, Elliot Blackburn <https://github.com/bluehatbrit>, Daniel Müller <https://github.com/chdanielmueller>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From ca6acc7eb2a594e5dd70fc203dd34f667789dbc6 Mon Sep 17 00:00:00 2001
From: chdanielmueller <daniel.mueller@surnet.ch>
Date: Fri, 1 Mar 2019 11:43:05 +0100
Subject: [PATCH 213/924] Fix Tests

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

diff --git a/types/helmet/helmet-tests.ts b/types/helmet/helmet-tests.ts
index 8b4c5634ac..f73095b714 100644
--- a/types/helmet/helmet-tests.ts
+++ b/types/helmet/helmet-tests.ts
@@ -122,13 +122,13 @@ function hpkpTest() {
     app.use(helmet.hpkp({
         maxAge: 7776000000,
         sha256s: ['AbCdEf123=', 'ZyXwVu456='],
-        includeSubdomains: false
+        includeSubDomains: false
     }));
 
     app.use(helmet.hpkp({
         maxAge: 7776000000,
         sha256s: ['AbCdEf123=', 'ZyXwVu456='],
-        includeSubdomains: true
+        includeSubDomains: true
     }));
 
     app.use(helmet.hpkp({
@@ -164,7 +164,7 @@ function hstsTest() {
 
     app.use(helmet.hsts({
       maxAge: 7776000000,
-      includeSubdomains: true
+      includeSubDomains: true
     }));
 
     app.use(helmet.hsts({
diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index 565dda9ebf..573395831b 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -142,7 +142,7 @@ declare namespace helmet {
 
     export interface IHelmetHstsConfiguration {
         maxAge?: number;
-        includeSubdomains?: boolean;
+        includeSubDomains?: boolean;
         preload?: boolean;
         setIf?: IHelmetSetIfFunction;
         force?: boolean;

From 2203ddb799a7581e69b7f1a0693be7891c810d42 Mon Sep 17 00:00:00 2001
From: chdanielmueller <daniel.mueller@surnet.ch>
Date: Fri, 1 Mar 2019 11:49:56 +0100
Subject: [PATCH 214/924] Koa Tests

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

diff --git a/types/koa-helmet/koa-helmet-tests.ts b/types/koa-helmet/koa-helmet-tests.ts
index 2290ab07fa..34bca1958a 100644
--- a/types/koa-helmet/koa-helmet-tests.ts
+++ b/types/koa-helmet/koa-helmet-tests.ts
@@ -95,13 +95,13 @@ function hpkpTest() {
     app.use(helmet.hpkp({
         maxAge: 7776000000,
         sha256s: ['AbCdEf123=', 'ZyXwVu456='],
-        includeSubdomains: false
+        includeSubDomains: false
     }));
 
     app.use(helmet.hpkp({
         maxAge: 7776000000,
         sha256s: ['AbCdEf123=', 'ZyXwVu456='],
-        includeSubdomains: true
+        includeSubDomains: true
     }));
 
     app.use(helmet.hpkp({
@@ -137,7 +137,7 @@ function hstsTest() {
 
     app.use(helmet.hsts({
       maxAge: 7776000000,
-      includeSubdomains: true
+      includeSubDomains: true
     }));
 
     app.use(helmet.hsts({

From 480b1438e0049ea087e78ff35842e35c0391c9af Mon Sep 17 00:00:00 2001
From: zy410419243 <zy410419243@gmail.com>
Date: Fri, 1 Mar 2019 19:04:28 +0800
Subject: [PATCH 215/924] fix: Cesium3DTilesetItem

---
 types/cesium/index.d.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 398d05ad33..7cb7752223 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cesium 1.47
+// Type definitions for cesium 1.54
 // Project: http://cesiumjs.org
 // Definitions by: Aigars Zeiza <https://github.com/Zuzon>
 //                 Harry Nicholls <https://github.com/hnipps>
@@ -1393,7 +1393,7 @@ declare namespace Cesium {
 
     class ScreenSpaceEventHandler {
         constructor(element?: HTMLCanvasElement);
-        setInputAction(action: () => void, type: number, modifier?: number): void;
+        setInputAction(action: (click: { position: Cartesian2 }) => void, type: number, modifier?: number): void;
         getInputAction(type: number, modifier?: number): () => void;
         removeInputAction(type: number, modifier?: number): void;
         isDestroyed(): boolean;
@@ -3134,6 +3134,16 @@ declare namespace Cesium {
         static clone(hpr: HeadingPitchRange, result?: HeadingPitchRange): HeadingPitchRange;
     }
 
+    class Cesium3DTilesetItem {
+      url: string;
+      maximumScreenSpaceError: number;
+      maximumNumberOfLoadedTiles: number;
+    }
+
+    class Cesium3DTileset {
+      constructor (Cesium3DTilesetItem: Cesium3DTilesetItem)
+    }
+
     class ImageryLayer {
         alpha: number;
         brightness: number;

From 52748754cf41c58a00a0a4a8311555fbda59253b Mon Sep 17 00:00:00 2001
From: zy410419243 <zy410419243@gmail.com>
Date: Fri, 1 Mar 2019 19:28:11 +0800
Subject: [PATCH 216/924] pref: disable tslint rule => no-unnecessary-class

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

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 7cb7752223..497c763ebf 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -3134,14 +3134,13 @@ declare namespace Cesium {
         static clone(hpr: HeadingPitchRange, result?: HeadingPitchRange): HeadingPitchRange;
     }
 
-    class Cesium3DTilesetItem {
-      url: string;
-      maximumScreenSpaceError: number;
-      maximumNumberOfLoadedTiles: number;
-    }
-
+    // tslint:disable-next-line:no-unnecessary-class
     class Cesium3DTileset {
-      constructor (Cesium3DTilesetItem: Cesium3DTilesetItem)
+      constructor(Cesium3DTilesetItem: {
+        url: string;
+        maximumScreenSpaceError: number;
+        maximumNumberOfLoadedTiles: number;
+      })
     }
 
     class ImageryLayer {

From b269c7cfcb6ead375fc10a8a165f151dfa936da3 Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 15:07:44 +0100
Subject: [PATCH 217/924] fix with more natural syntax

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index a9e2a648d9..5e1c9bfc74 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -183,17 +183,17 @@ interface TwitchExtConfiguration {
 	/**
 	 * This property returns the record for the broadcaster segment if one is found; otherwise, undefined.
 	 */
-	broadcaster: { version: string; content: string } | undefined;
+	broadcaster?: { version: string; content: string };
 
 	/**
 	 * This property returns the record for the developer segment if one is found; otherwise, undefined.
 	 */
-	developer: { version: string; content: string } | undefined;
+	developer?: { version: string; content: string };
 
 	/**
 	 * This property returns the record for the global segment if one is found; otherwise, undefined.
 	 */
-	global: { version: string; content: string } | undefined;
+	global?: { version: string; content: string };
 
 	/**
 	 * This function registers a callback that is called whenever an extension configuration is received.

From b98bcdf2e2be48ded1d34f2c9007bb92acd0071e Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 15:11:03 +0100
Subject: [PATCH 218/924] enforce segment's only valid value

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index 5e1c9bfc74..b603c8aa92 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -211,7 +211,7 @@ interface TwitchExtConfiguration {
 	 * @param version The configuration segment to set.
 	 * @param content The version of configuration with which the segment is stored.
 	 */
-	set(segment: string, version: string, content: string): void;
+	set(segment: "broadcaster", version: string, content: string): void;
 }
 
 interface TwitchExtFeatureFlags {

From b48449e7839db521b06deb9a2ff579440ab35ecf Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Fri, 1 Mar 2019 15:14:53 +0100
Subject: [PATCH 219/924] update version according to twitch-ext javascript
 helper

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index b603c8aa92..b8d29c5818 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package twitch-ext 1.16
+// Type definitions for non-npm package twitch-ext 1.20
 // Project: https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
 // Definitions by: Benedict Etzel <https://github.com/beheh>
 //                 Federico Della Rovere <https://github.com/FedeDR>

From 4587a70f1392222049dffba832ac0abde1485040 Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <nikolaj.kappler@sap.com>
Date: Fri, 1 Mar 2019 15:39:37 +0100
Subject: [PATCH 220/924] added and improved declarations that were
 missing/incomplete/incorrect

workstream:
---
 types/tern/index.d.ts           |  5 ++--
 types/tern/lib/infer/index.d.ts | 44 +++++++++++++++++++++++++--------
 types/tern/lib/tern/index.d.ts  | 11 +++++++--
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/types/tern/index.d.ts b/types/tern/index.d.ts
index ef01c0e289..ae5a793383 100644
--- a/types/tern/index.d.ts
+++ b/types/tern/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for tern 0.22
+// Type definitions for tern 0.23
 // Project: https://github.com/ternjs/tern
 // Definitions by: Nikolaj Kappler <https://github.com/nkappler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,5 +11,6 @@
 // thus if you want to use undocumented APIs, you should extends these definitions with
 // ambient declaration merging: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
 
-export * from "./lib/tern";
 export * from "./lib/infer";
+export * from "./lib/tern";
+
diff --git a/types/tern/lib/infer/index.d.ts b/types/tern/lib/infer/index.d.ts
index 58e83ea1c7..25bb7ab0d9 100644
--- a/types/tern/lib/infer/index.d.ts
+++ b/types/tern/lib/infer/index.d.ts
@@ -1,12 +1,14 @@
 import * as ESTree from "estree";
+import { Server } from "../tern";
 export { };
 
 // #### Context ####
 interface ContextConstructor {
-    new(defs: any[]): Context;
+    new(defs: any[], parent: Server): Context;
 }
 export const Context: ContextConstructor;
 export interface Context {
+    parent?: Server;
     topScope: Scope;
     /** The primitive number type. */
     num: Type;
@@ -15,8 +17,10 @@ export interface Context {
     /** The primitive boolean type. */
     bool: Type;
 }
+/** Returns the current context object. */
 export function cx(): Context;
-export function withContext(context: Context, f: () => void): void;
+/** Calls f with the current context bound to context. Basically, all code that does something with the inference engine should be wrapped in such a call. */
+export function withContext<R>(context: Context, f: () => R): R;
 
 // #### Analysis ####
 /** Parse a piece of code for use by Tern. Will automatically fall back to the error-tolerant parser if the regular parser can’t parse the code. */
@@ -59,6 +63,7 @@ export interface Obj extends Type {
     hasProp(prop: string): AVal | null;
     /** Looks up the given property, or defines it if it did not yet exist (in which case it will be associated with the given AST node). */
     defProp(prop: string, originNode?: ESTree.Node): AVal;
+    getType(): Obj;
 }
 
 interface FnConstructor {
@@ -66,18 +71,27 @@ interface FnConstructor {
 }
 /** Constructor for the type that implements functions. Inherits from `Obj`. The `AVal` types are used to track the input and output types of the function. */
 export const Fn: FnConstructor;
-export type Fn = Obj;
+export interface Fn extends Obj {
+    readonly args?: AVal[];
+    readonly argNames?: string[];
+    self?: Type;
+    readonly retval: AVal;
+    isArrowFn(): boolean;
+    getType(): Fn;
+}
 
 interface ArrConstructor {
     /** Constructor that creates an array type with the given content type. */
-    new(contentType: AVal): Arr;
+    new(contentType?: AVal): Arr;
 }
 export const Arr: ArrConstructor;
-export type Arr = Obj;
+export interface Arr extends Obj {
+    getType(): Arr;
+}
 
 export interface Type extends AVal {
     /** The name of the type, if any. */
-    name: string;
+    name: string | undefined;
     /** The origin file of the type. */
     origin: string;
     /**
@@ -88,10 +102,9 @@ export interface Type extends AVal {
     originNode?: ESTree.Node;
     /** Return a string that describes the type. maxDepth indicates the depth to which inner types should be shown. */
     toString(maxDepth: number): string;
-    /** Get an `AVal` that represents the named property of this type. */
-    getProp(prop: string): AVal;
     /** Call the given function for all properties of the object, including properties that are added in the future. */
     forAllProps(f: (prop: string, val: AVal, local: boolean) => void): void;
+    getType(): Type;
 }
 
 // #### Abstract Values ####
@@ -131,13 +144,23 @@ export interface AVal {
      * Asks the AVal if it contains a function type. Useful when
      * you aren’t interested in other kinds of types.
      */
-    getFunctionType(): Type | undefined;
+    getFunctionType(): Fn | undefined;
+    /** Get an `AVal` that represents the named property of this type. */
+    getProp(prop: string): AVal;
+    /**
+     * Asks the AVal if it contains an Object type. Useful when
+     * you aren’t interested in other kinds of types.
+     */
+    getObjType(): Obj | null;
     /**
      * Abstract values that are used to represent variables
      * or properties will have, when possible, an `originNode`
      * property pointing to an AST node.
      */
     originNode?: ESTree.Node;
+
+    readonly types: Type[];
+    readonly propertyOf?: Obj;
 }
 
 export const ANull: ANull;
@@ -171,6 +194,7 @@ export interface Constraint extends AVal {
 // #### Scopes ####
 interface ScopeConstructor {
     new(parent?: Scope): Scope;
+    new(parent: Scope, originNode: ESTree.Node): Scope;
 }
 export const Scope: ScopeConstructor;
 export interface Scope extends Obj {
@@ -199,7 +223,7 @@ export function findExpressionAround(ast: ESTree.Program, start: number | undefi
 /** Similar to `findExpressionAround`, except that it use the same AST walker as `findExpressionAt`. */
 export function findClosestExpression(ast: ESTree.Program, start: number | undefined, end: number, scope?: Scope): { node: ESTree.Node, state: Scope } | null;
 /** Determine an expression for the given node and scope (as returned by the functions above). Will return an `AVal` or plain `Type`. */
-export function expressionType(expr: { node: ESTree.Node, state: Scope }): AVal | Type;
+export function expressionType(expr: { node: ESTree.Node, state: Scope | null }): AVal | Type;
 /** Find the scope at a given position in the syntax tree. The `scope` parameter can be used to override the scope used for code that isn’t wrapped in any function. */
 export function scopeAt(ast: ESTree.Program, pos: number, scope?: Scope): Scope;
 /**
diff --git a/types/tern/lib/tern/index.d.ts b/types/tern/lib/tern/index.d.ts
index 7ecb4ac73e..22001ed075 100644
--- a/types/tern/lib/tern/index.d.ts
+++ b/types/tern/lib/tern/index.d.ts
@@ -1,5 +1,5 @@
 import * as ESTree from "estree";
-import { Scope, Type } from "../infer";
+import { Context, Scope, Type } from "../infer";
 
 export { };
 
@@ -48,6 +48,10 @@ interface TernConstructor {
 export const Server: TernConstructor;
 
 export interface Server {
+    readonly cx: Context;
+    readonly options: ConstructorOptions;
+    readonly files: File[];
+    readonly plugins: any;
     /**
      * Add a set of type definitions to the server. If `atFront` is true, they will be added before all other
      * existing definitions. Otherwise, they are added at the back.
@@ -93,10 +97,12 @@ export interface Server {
     request<Q extends Query, D extends Document>(
         doc: D & { query?: Q },
         callback: (
-            error: Error | undefined,
+            error: string | null,
             response: (D extends { query: undefined } ? {} : D extends { query: Query } ? QueryResult<Q> : {}) | undefined
         ) => void
     ): void;
+    reset(): void;
+    signal(event: keyof Events, file: File): void;
 }
 
 // #### JSON Protocol ####
@@ -156,6 +162,7 @@ export interface File {
     scope: Scope;
     ast: ESTree.Program;
     type?: "full" | "part" | "delete";
+    asLineChar?(nodePosition: number): Position;
 }
 
 export interface BaseQuery {

From f7cb1d4bd030f16bdb594b2c1d17fe620508a30c Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <nikolaj.kappler@sap.com>
Date: Fri, 1 Mar 2019 15:39:37 +0100
Subject: [PATCH 221/924] added and improved declarations that were
 missing/incomplete/incorrect

workstream:
---
 types/tern/index.d.ts           |  5 ++--
 types/tern/lib/infer/index.d.ts | 44 +++++++++++++++++++++++++--------
 types/tern/lib/tern/index.d.ts  | 11 +++++++--
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/types/tern/index.d.ts b/types/tern/index.d.ts
index ef01c0e289..ae5a793383 100644
--- a/types/tern/index.d.ts
+++ b/types/tern/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for tern 0.22
+// Type definitions for tern 0.23
 // Project: https://github.com/ternjs/tern
 // Definitions by: Nikolaj Kappler <https://github.com/nkappler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,5 +11,6 @@
 // thus if you want to use undocumented APIs, you should extends these definitions with
 // ambient declaration merging: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
 
-export * from "./lib/tern";
 export * from "./lib/infer";
+export * from "./lib/tern";
+
diff --git a/types/tern/lib/infer/index.d.ts b/types/tern/lib/infer/index.d.ts
index 58e83ea1c7..25bb7ab0d9 100644
--- a/types/tern/lib/infer/index.d.ts
+++ b/types/tern/lib/infer/index.d.ts
@@ -1,12 +1,14 @@
 import * as ESTree from "estree";
+import { Server } from "../tern";
 export { };
 
 // #### Context ####
 interface ContextConstructor {
-    new(defs: any[]): Context;
+    new(defs: any[], parent: Server): Context;
 }
 export const Context: ContextConstructor;
 export interface Context {
+    parent?: Server;
     topScope: Scope;
     /** The primitive number type. */
     num: Type;
@@ -15,8 +17,10 @@ export interface Context {
     /** The primitive boolean type. */
     bool: Type;
 }
+/** Returns the current context object. */
 export function cx(): Context;
-export function withContext(context: Context, f: () => void): void;
+/** Calls f with the current context bound to context. Basically, all code that does something with the inference engine should be wrapped in such a call. */
+export function withContext<R>(context: Context, f: () => R): R;
 
 // #### Analysis ####
 /** Parse a piece of code for use by Tern. Will automatically fall back to the error-tolerant parser if the regular parser can’t parse the code. */
@@ -59,6 +63,7 @@ export interface Obj extends Type {
     hasProp(prop: string): AVal | null;
     /** Looks up the given property, or defines it if it did not yet exist (in which case it will be associated with the given AST node). */
     defProp(prop: string, originNode?: ESTree.Node): AVal;
+    getType(): Obj;
 }
 
 interface FnConstructor {
@@ -66,18 +71,27 @@ interface FnConstructor {
 }
 /** Constructor for the type that implements functions. Inherits from `Obj`. The `AVal` types are used to track the input and output types of the function. */
 export const Fn: FnConstructor;
-export type Fn = Obj;
+export interface Fn extends Obj {
+    readonly args?: AVal[];
+    readonly argNames?: string[];
+    self?: Type;
+    readonly retval: AVal;
+    isArrowFn(): boolean;
+    getType(): Fn;
+}
 
 interface ArrConstructor {
     /** Constructor that creates an array type with the given content type. */
-    new(contentType: AVal): Arr;
+    new(contentType?: AVal): Arr;
 }
 export const Arr: ArrConstructor;
-export type Arr = Obj;
+export interface Arr extends Obj {
+    getType(): Arr;
+}
 
 export interface Type extends AVal {
     /** The name of the type, if any. */
-    name: string;
+    name: string | undefined;
     /** The origin file of the type. */
     origin: string;
     /**
@@ -88,10 +102,9 @@ export interface Type extends AVal {
     originNode?: ESTree.Node;
     /** Return a string that describes the type. maxDepth indicates the depth to which inner types should be shown. */
     toString(maxDepth: number): string;
-    /** Get an `AVal` that represents the named property of this type. */
-    getProp(prop: string): AVal;
     /** Call the given function for all properties of the object, including properties that are added in the future. */
     forAllProps(f: (prop: string, val: AVal, local: boolean) => void): void;
+    getType(): Type;
 }
 
 // #### Abstract Values ####
@@ -131,13 +144,23 @@ export interface AVal {
      * Asks the AVal if it contains a function type. Useful when
      * you aren’t interested in other kinds of types.
      */
-    getFunctionType(): Type | undefined;
+    getFunctionType(): Fn | undefined;
+    /** Get an `AVal` that represents the named property of this type. */
+    getProp(prop: string): AVal;
+    /**
+     * Asks the AVal if it contains an Object type. Useful when
+     * you aren’t interested in other kinds of types.
+     */
+    getObjType(): Obj | null;
     /**
      * Abstract values that are used to represent variables
      * or properties will have, when possible, an `originNode`
      * property pointing to an AST node.
      */
     originNode?: ESTree.Node;
+
+    readonly types: Type[];
+    readonly propertyOf?: Obj;
 }
 
 export const ANull: ANull;
@@ -171,6 +194,7 @@ export interface Constraint extends AVal {
 // #### Scopes ####
 interface ScopeConstructor {
     new(parent?: Scope): Scope;
+    new(parent: Scope, originNode: ESTree.Node): Scope;
 }
 export const Scope: ScopeConstructor;
 export interface Scope extends Obj {
@@ -199,7 +223,7 @@ export function findExpressionAround(ast: ESTree.Program, start: number | undefi
 /** Similar to `findExpressionAround`, except that it use the same AST walker as `findExpressionAt`. */
 export function findClosestExpression(ast: ESTree.Program, start: number | undefined, end: number, scope?: Scope): { node: ESTree.Node, state: Scope } | null;
 /** Determine an expression for the given node and scope (as returned by the functions above). Will return an `AVal` or plain `Type`. */
-export function expressionType(expr: { node: ESTree.Node, state: Scope }): AVal | Type;
+export function expressionType(expr: { node: ESTree.Node, state: Scope | null }): AVal | Type;
 /** Find the scope at a given position in the syntax tree. The `scope` parameter can be used to override the scope used for code that isn’t wrapped in any function. */
 export function scopeAt(ast: ESTree.Program, pos: number, scope?: Scope): Scope;
 /**
diff --git a/types/tern/lib/tern/index.d.ts b/types/tern/lib/tern/index.d.ts
index 7ecb4ac73e..22001ed075 100644
--- a/types/tern/lib/tern/index.d.ts
+++ b/types/tern/lib/tern/index.d.ts
@@ -1,5 +1,5 @@
 import * as ESTree from "estree";
-import { Scope, Type } from "../infer";
+import { Context, Scope, Type } from "../infer";
 
 export { };
 
@@ -48,6 +48,10 @@ interface TernConstructor {
 export const Server: TernConstructor;
 
 export interface Server {
+    readonly cx: Context;
+    readonly options: ConstructorOptions;
+    readonly files: File[];
+    readonly plugins: any;
     /**
      * Add a set of type definitions to the server. If `atFront` is true, they will be added before all other
      * existing definitions. Otherwise, they are added at the back.
@@ -93,10 +97,12 @@ export interface Server {
     request<Q extends Query, D extends Document>(
         doc: D & { query?: Q },
         callback: (
-            error: Error | undefined,
+            error: string | null,
             response: (D extends { query: undefined } ? {} : D extends { query: Query } ? QueryResult<Q> : {}) | undefined
         ) => void
     ): void;
+    reset(): void;
+    signal(event: keyof Events, file: File): void;
 }
 
 // #### JSON Protocol ####
@@ -156,6 +162,7 @@ export interface File {
     scope: Scope;
     ast: ESTree.Program;
     type?: "full" | "part" | "delete";
+    asLineChar?(nodePosition: number): Position;
 }
 
 export interface BaseQuery {

From 1c297422251c19d2eff70985738f47f04b4fa94d Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <nikolaj.kappler@sap.com>
Date: Fri, 1 Mar 2019 16:17:29 +0100
Subject: [PATCH 222/924] fixed failing test

workstream:
---
 types/tern/index.d.ts           | 1 -
 types/tern/lib/infer/index.d.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/tern/index.d.ts b/types/tern/index.d.ts
index ae5a793383..7ef634e6a6 100644
--- a/types/tern/index.d.ts
+++ b/types/tern/index.d.ts
@@ -13,4 +13,3 @@
 
 export * from "./lib/infer";
 export * from "./lib/tern";
-
diff --git a/types/tern/lib/infer/index.d.ts b/types/tern/lib/infer/index.d.ts
index 25bb7ab0d9..b8cc01e68f 100644
--- a/types/tern/lib/infer/index.d.ts
+++ b/types/tern/lib/infer/index.d.ts
@@ -193,7 +193,7 @@ export interface Constraint extends AVal {
 
 // #### Scopes ####
 interface ScopeConstructor {
-    new(parent?: Scope): Scope;
+    new(): Scope;
     new(parent: Scope, originNode: ESTree.Node): Scope;
 }
 export const Scope: ScopeConstructor;

From 0bcf782f9dc132cba866ffacbdbe6753279c2869 Mon Sep 17 00:00:00 2001
From: Eric Musgrave <emusgrave@tricerat.com>
Date: Fri, 1 Mar 2019 11:14:03 -0500
Subject: [PATCH 223/924] Fix/add more zeromq types

---
 types/zeromq/index.d.ts | 75 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index d1088aba8f..29bc442723 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -1,3 +1,5 @@
+import { EventEmitter } from "events";
+
 // Type definitions for zeromq 4.6
 // Project: https://github.com/zeromq/zeromq.js
 // Definitions by: Dave McKeown <https://github.com/davemckeown>
@@ -58,21 +60,79 @@ export interface SocketOptions {
     zap_domain: number;
 }
 
-export class Socket {
+/**
+ * Export all option names at the global level
+ */
+export const ZMQ_HWM: number;
+export const ZMQ_SWAP: number;
+export const ZMQ_AFFINITY: number;
+export const ZMQ_IDENTITY: number;
+export const ZMQ_SUBSCRIBE: number;
+export const ZMQ_UNSUBSCRIBE: number;
+export const ZMQ_RATE: number;
+export const ZMQ_RECOVERY_IVL: number;
+export const ZMQ_MCAST_LOOP: number;
+export const ZMQ_SNDBUF: number;
+export const ZMQ_RCVBUF: number;
+export const ZMQ_RCVMORE: number;
+export const ZMQ_FD: number;
+export const ZMQ_EVENTS: number;
+export const ZMQ_TYPE: number;
+export const ZMQ_LINGER: number;
+export const ZMQ_RECONNECT_IVL: number;
+export const ZMQ_BACKLOG: number;
+export const ZMQ_RECOVERY_IVL_MSEC: number;
+export const ZMQ_RECONNECT_IVL_MAX: number;
+export const ZMQ_MAXMSGSIZE: number;
+export const ZMQ_SNDHWM: number;
+export const ZMQ_RCVHWM: number;
+export const ZMQ_MULTICAST_HOPS: number;
+export const ZMQ_RCVTIMEO: number;
+export const ZMQ_SNDTIMEO: number;
+export const ZMQ_IPV4ONLY: number;
+export const ZMQ_LAST_ENDPOINT: number;
+export const ZMQ_ROUTER_MANDATORY: number;
+export const ZMQ_TCP_KEEPALIVE: number;
+export const ZMQ_TCP_KEEPALIVE_CNT: number;
+export const ZMQ_TCP_KEEPALIVE_IDLE: number;
+export const ZMQ_TCP_KEEPALIVE_INTVL: number;
+export const ZMQ_TCP_ACCEPT_FILTER: number;
+export const ZMQ_DELAY_ATTACH_ON_CONNECT: number;
+export const ZMQ_XPUB_VERBOSE: number;
+export const ZMQ_ROUTER_RAW: number;
+export const ZMQ_IPV6: number;
+export const ZMQ_MECHANISM: number;
+export const ZMQ_PLAIN_SERVER: number;
+export const ZMQ_PLAIN_USERNAME: number;
+export const ZMQ_PLAIN_PASSWORD: number;
+export const ZMQ_CURVE_SERVER: number;
+export const ZMQ_CURVE_PUBLICKEY: number;
+export const ZMQ_CURVE_SECRETKEY: number;
+export const ZMQ_CURVE_SERVERKEY: number;
+export const ZMQ_ZAP_DOMAIN: number;
+export const ZMQ_HEARTBEAT_IVL: number;
+export const ZMQ_HEARTBEAT_TTL: number;
+export const ZMQ_HEARTBEAT_TIMEOUT: number;
+export const ZMQ_CONNECT_TIMEOUT: number;
+export const ZMQ_IO_THREADS: number;
+export const ZMQ_MAX_SOCKETS: number;
+export const ZMQ_ROUTER_HANDOVER: number;
+
+export class Socket extends EventEmitter {
     /**
      * Set `opt` to `val`.
      *
      * @param opt Option
      * @param val Value
      */
-    setsocketopt(opt: number|string, val: any): Socket;
+    setsockopt(opt: number|string, val: any): Socket;
 
     /**
      * Get socket `opt`.
      *
      * @param opt Option number
      */
-    getsocketopt(opt: number|string): any;
+    getsockopt(opt: number|string): any;
 
     /**
      * Async bind.
@@ -156,6 +216,15 @@ export class Socket {
      */
     monitor(interval?: number, numOfEvents?: number): Socket;
 
+    /**
+     * Disable monitoring of a Socket release idle handler
+     * and close the socket
+     *
+     * @return {Socket} for chaining
+     * @api public
+     */
+    unmonitor(): Socket;
+
     /**
      * Close the socket.
      *

From 1a3a185d97a1ed0edf2d84684f75c63f7a6be043 Mon Sep 17 00:00:00 2001
From: Eric <emusgrave@tricerat.com>
Date: Fri, 1 Mar 2019 12:35:56 -0500
Subject: [PATCH 224/924] Remove `on` definition

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

diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index 29bc442723..7f9573555e 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -231,11 +231,6 @@ export class Socket extends EventEmitter {
      */
     close(): Socket;
 
-    /**
-     * Socket event - 'message'
-     */
-    on(eventName: string, callback: (...buffer: Buffer[]) => void): void;
-
     pause(): void;
     resume(): void;
 

From 9623d61290fb9ded402ecd6f3de40fac17b2c60c Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 1 Mar 2019 19:13:17 +0100
Subject: [PATCH 225/924] Add offscreencanvas types

---
 types/offscreencanvas/index.d.ts              | 50 +++++++++++++++++++
 .../offscreencanvas/offscreencanvas-tests.ts  | 29 +++++++++++
 types/offscreencanvas/tsconfig.json           | 23 +++++++++
 types/offscreencanvas/tslint.json             |  1 +
 4 files changed, 103 insertions(+)
 create mode 100644 types/offscreencanvas/index.d.ts
 create mode 100644 types/offscreencanvas/offscreencanvas-tests.ts
 create mode 100644 types/offscreencanvas/tsconfig.json
 create mode 100644 types/offscreencanvas/tslint.json

diff --git a/types/offscreencanvas/index.d.ts b/types/offscreencanvas/index.d.ts
new file mode 100644
index 0000000000..395af42f16
--- /dev/null
+++ b/types/offscreencanvas/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for the W3C OffscreenCanvas
+// Project: https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
+// Definitions by: Klaus Reimer <https://github.com/kayahr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare global {
+    // https://html.spec.whatwg.org/multipage/canvas.html#canvasdrawimage
+    interface CanvasDrawImage {
+        drawImage(image: OffscreenCanvas, dx: number, dy: number): void;
+        drawImage(image: OffscreenCanvas, dx: number, dy: number, dw: number, dh: number): void;
+        drawImage(image: OffscreenCanvas, sx: number, sy: number, sw: number, sh: number,
+            dx: number, dy: number, dw: number, dh: number): void;
+    }
+
+    // https://html.spec.whatwg.org/multipage/canvas.html#dom-canvas-transfercontroltooffscreen
+    interface HTMLCanvasElement extends HTMLElement {
+        transferControlToOffscreen(): OffscreenCanvas;
+    }
+
+    // https://html.spec.whatwg.org/multipage/canvas.html#offscreencanvasrenderingcontext2d
+    interface OffscreenCanvasRenderingContext2D extends CanvasState, CanvasTransform, CanvasCompositing,
+            CanvasImageSmoothing, CanvasFillStrokeStyles, CanvasShadowStyles, CanvasFilters, CanvasRect,
+            CanvasDrawPath, CanvasText, CanvasDrawImage, CanvasImageData, CanvasPathDrawingStyles,
+            CanvasTextDrawingStyles, CanvasPath {
+        readonly canvas: OffscreenCanvas;
+    }
+    var OffscreenCanvasRenderingContext2D: {
+        prototype: OffscreenCanvasRenderingContext2D;
+        new (): OffscreenCanvasRenderingContext2D;
+    }
+
+    // https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
+    interface OffscreenCanvas extends EventTarget {
+        width: number;
+        height: number;
+        getContext(contextId: "2d", contextAttributes?: CanvasRenderingContext2DSettings):
+            OffscreenCanvasRenderingContext2D | null;
+        getContext(contextId: "webgl", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
+        getContext(contextId: string, contextAttributes?: {}): OffscreenCanvasRenderingContext2D
+            | WebGLRenderingContext | null;
+        transferToImageBitmap(): ImageBitmap;
+        convertToBlob(options?: { type?: string, quality?: number }): Promise<Blob>;
+    }
+    var OffscreenCanvas: {
+        prototype: OffscreenCanvas;
+        new (width: number, height: number): OffscreenCanvas;
+    }
+}
+
+export { };
diff --git a/types/offscreencanvas/offscreencanvas-tests.ts b/types/offscreencanvas/offscreencanvas-tests.ts
new file mode 100644
index 0000000000..f74690ad9a
--- /dev/null
+++ b/types/offscreencanvas/offscreencanvas-tests.ts
@@ -0,0 +1,29 @@
+// Test constructor
+const offscreenCanvas: OffscreenCanvas = new OffscreenCanvas(20, 10);
+
+// Test OffscreenCanvas properties
+let width: number = offscreenCanvas.width;
+let height: number = offscreenCanvas.height;
+
+// Test OffscreenCanvas methods
+const context2D: OffscreenCanvasRenderingContext2D | null = offscreenCanvas.getContext("2d");
+const webglContext: WebGLRenderingContext | null = offscreenCanvas.getContext("webgl");
+const otherContext: OffscreenCanvasRenderingContext2D | WebGLRenderingContext | null =
+    offscreenCanvas.getContext("foobar");
+const imageBitmap: ImageBitmap = offscreenCanvas.transferToImageBitmap();
+const blob1: Promise<Blob> = offscreenCanvas.convertToBlob();
+const blob2: Promise<Blob> = offscreenCanvas.convertToBlob({ type: "image/jpeg" });
+const blob3: Promise<Blob> = offscreenCanvas.convertToBlob({ type: "image/jpeg", quality: 0.92 });
+
+// Test OffscreenCanvasRenderingContext2D properties
+const canvasRef: OffscreenCanvas = context2D!.canvas;
+
+// Test HTMLCanvasElement methods
+const canvas: HTMLCanvasElement = document.createElement("canvas");
+const transferredCanvas: OffscreenCanvas = canvas.transferControlToOffscreen();
+
+// Test CanvasRenderingContext2D methods
+const ctx = canvas.getContext("2d")!;
+ctx.drawImage(offscreenCanvas, 0, 0);
+ctx.drawImage(offscreenCanvas, 0, 0, 20, 10);
+ctx.drawImage(offscreenCanvas, 0, 0, 20, 10, 0, 0, 20, 10);
diff --git a/types/offscreencanvas/tsconfig.json b/types/offscreencanvas/tsconfig.json
new file mode 100644
index 0000000000..3bb1ca90b4
--- /dev/null
+++ b/types/offscreencanvas/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "offscreencanvas-tests.ts"
+    ]
+}
diff --git a/types/offscreencanvas/tslint.json b/types/offscreencanvas/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/offscreencanvas/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 749f6eaf2e2164380eeb9e5db8fd68ed103dd487 Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 1 Mar 2019 19:46:08 +0100
Subject: [PATCH 226/924] Fix createImageBitmap and drawImage

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

diff --git a/types/offscreencanvas/index.d.ts b/types/offscreencanvas/index.d.ts
index 395af42f16..810ba7a5f5 100644
--- a/types/offscreencanvas/index.d.ts
+++ b/types/offscreencanvas/index.d.ts
@@ -6,12 +6,17 @@
 declare global {
     // https://html.spec.whatwg.org/multipage/canvas.html#canvasdrawimage
     interface CanvasDrawImage {
-        drawImage(image: OffscreenCanvas, dx: number, dy: number): void;
-        drawImage(image: OffscreenCanvas, dx: number, dy: number, dw: number, dh: number): void;
-        drawImage(image: OffscreenCanvas, sx: number, sy: number, sw: number, sh: number,
+        drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number): void;
+        drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number, dw: number, dh: number): void;
+        drawImage(image: CanvasImageSource | OffscreenCanvas, sx: number, sy: number, sw: number, sh: number,
             dx: number, dy: number, dw: number, dh: number): void;
     }
 
+    // https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#dom-createimagebitmap
+    function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas): Promise<ImageBitmap>;
+    function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas, sx: number, sy: number,
+        sw: number, sh: number): Promise<ImageBitmap>;
+
     // https://html.spec.whatwg.org/multipage/canvas.html#dom-canvas-transfercontroltooffscreen
     interface HTMLCanvasElement extends HTMLElement {
         transferControlToOffscreen(): OffscreenCanvas;
diff --git a/types/offscreencanvas/offscreencanvas-tests.ts b/types/offscreencanvas/offscreencanvas-tests.ts
index f74690ad9a..9f89e374b3 100644
--- a/types/offscreencanvas/offscreencanvas-tests.ts
+++ b/types/offscreencanvas/offscreencanvas-tests.ts
@@ -27,3 +27,7 @@ const ctx = canvas.getContext("2d")!;
 ctx.drawImage(offscreenCanvas, 0, 0);
 ctx.drawImage(offscreenCanvas, 0, 0, 20, 10);
 ctx.drawImage(offscreenCanvas, 0, 0, 20, 10, 0, 0, 20, 10);
+
+// Test createImageBitmap function with offscreen canvas
+const imageBitmap1 = createImageBitmap(offscreenCanvas);
+const imageBitmap2 = createImageBitmap(offscreenCanvas, 1, 2, 3, 4);

From cb32368e03397703ce9741a8b064b6616b7b0700 Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 1 Mar 2019 19:46:21 +0100
Subject: [PATCH 227/924] Add strictFunctionTypes option

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

diff --git a/types/offscreencanvas/tsconfig.json b/types/offscreencanvas/tsconfig.json
index 3bb1ca90b4..12d786084f 100644
--- a/types/offscreencanvas/tsconfig.json
+++ b/types/offscreencanvas/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 5c448bba7fe3a96e0f472f1e32ecb8c568e74174 Mon Sep 17 00:00:00 2001
From: Eric <emusgrave@tricerat.com>
Date: Fri, 1 Mar 2019 13:48:11 -0500
Subject: [PATCH 228/924] Use NodeJS.EventEmitter instead of importing event

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

diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index 7f9573555e..cb21200253 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -1,5 +1,3 @@
-import { EventEmitter } from "events";
-
 // Type definitions for zeromq 4.6
 // Project: https://github.com/zeromq/zeromq.js
 // Definitions by: Dave McKeown <https://github.com/davemckeown>
@@ -118,7 +116,7 @@ export const ZMQ_IO_THREADS: number;
 export const ZMQ_MAX_SOCKETS: number;
 export const ZMQ_ROUTER_HANDOVER: number;
 
-export class Socket extends EventEmitter {
+export class Socket extends NodeJS.EventEmitter {
     /**
      * Set `opt` to `val`.
      *

From dd14243978af5beb48a230d93f94932d9c821e5e Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 1 Mar 2019 19:52:52 +0100
Subject: [PATCH 229/924] Fix header format

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

diff --git a/types/offscreencanvas/index.d.ts b/types/offscreencanvas/index.d.ts
index 810ba7a5f5..a5940042d8 100644
--- a/types/offscreencanvas/index.d.ts
+++ b/types/offscreencanvas/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for the W3C OffscreenCanvas
+// Type definitions for non-npm package offscreencanvas-browser
 // Project: https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
 // Definitions by: Klaus Reimer <https://github.com/kayahr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 3764aa01952e399c9c4e876df4c9fd47e2fefae1 Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k@ailis.de>
Date: Fri, 1 Mar 2019 20:00:41 +0100
Subject: [PATCH 230/924] Fix liniting errors

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

diff --git a/types/offscreencanvas/index.d.ts b/types/offscreencanvas/index.d.ts
index a5940042d8..de3b3a7fe3 100644
--- a/types/offscreencanvas/index.d.ts
+++ b/types/offscreencanvas/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for non-npm package offscreencanvas-browser
+// Type definitions for non-npm package offscreencanvas-browser 2019.3
 // Project: https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
 // Definitions by: Klaus Reimer <https://github.com/kayahr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 3.1
+
 declare global {
     // https://html.spec.whatwg.org/multipage/canvas.html#canvasdrawimage
     interface CanvasDrawImage {
@@ -32,7 +34,7 @@ declare global {
     var OffscreenCanvasRenderingContext2D: {
         prototype: OffscreenCanvasRenderingContext2D;
         new (): OffscreenCanvasRenderingContext2D;
-    }
+    };
 
     // https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
     interface OffscreenCanvas extends EventTarget {
@@ -49,7 +51,7 @@ declare global {
     var OffscreenCanvas: {
         prototype: OffscreenCanvas;
         new (width: number, height: number): OffscreenCanvas;
-    }
+    };
 }
 
 export { };

From 112076b653608455c1cd658a9e3140ba5b4556e3 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 11:42:23 -0800
Subject: [PATCH 231/924] [ember] remove dependency on handlebars types

---
 types/ember-data/tsconfig.json               | 1 +
 types/ember-feature-flags/tsconfig.json      | 1 +
 types/ember-mocha/tsconfig.json              | 1 +
 types/ember-modal-dialog/tsconfig.json       | 1 +
 types/ember-qunit/tsconfig.json              | 1 +
 types/ember-resolver/tsconfig.json           | 1 +
 types/ember-test-helpers/tsconfig.json       | 1 +
 types/ember/index.d.ts                       | 7 +++++--
 types/ember/package.json                     | 6 ------
 types/ember/test/ember-tests.ts              | 4 ++--
 types/ember/test/string.ts                   | 2 +-
 types/ember/tsconfig.json                    | 1 +
 types/ember__string/-private/handlebars.d.ts | 5 +++++
 types/ember__string/ember__string-tests.ts   | 4 ++--
 types/ember__string/index.d.ts               | 2 +-
 types/ember__string/package.json             | 6 ------
 types/ember__string/tsconfig.json            | 4 +++-
 types/ember__test-helpers/tsconfig.json      | 1 +
 types/ember__test/tsconfig.json              | 1 +
 19 files changed, 29 insertions(+), 21 deletions(-)
 delete mode 100644 types/ember/package.json
 create mode 100644 types/ember__string/-private/handlebars.d.ts
 delete mode 100644 types/ember__string/package.json

diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index f476362aaf..aadbbe7f5f 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-feature-flags/tsconfig.json b/types/ember-feature-flags/tsconfig.json
index 957a7a00f8..dc3260af3a 100644
--- a/types/ember-feature-flags/tsconfig.json
+++ b/types/ember-feature-flags/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-mocha/tsconfig.json b/types/ember-mocha/tsconfig.json
index 4e9b406e2e..c6c6a09f65 100644
--- a/types/ember-mocha/tsconfig.json
+++ b/types/ember-mocha/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-modal-dialog/tsconfig.json b/types/ember-modal-dialog/tsconfig.json
index 0b0b6f91fb..8fc7a37808 100644
--- a/types/ember-modal-dialog/tsconfig.json
+++ b/types/ember-modal-dialog/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-qunit/tsconfig.json b/types/ember-qunit/tsconfig.json
index df4899b37c..92a555a59f 100644
--- a/types/ember-qunit/tsconfig.json
+++ b/types/ember-qunit/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-resolver/tsconfig.json b/types/ember-resolver/tsconfig.json
index bc476c5723..7263220f71 100644
--- a/types/ember-resolver/tsconfig.json
+++ b/types/ember-resolver/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-test-helpers/tsconfig.json b/types/ember-test-helpers/tsconfig.json
index 2e0ddf49b1..ca139535f3 100644
--- a/types/ember-test-helpers/tsconfig.json
+++ b/types/ember-test-helpers/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index fbe058a643..d0f9896eb9 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -38,15 +38,17 @@ import {
     ComputedPropertyCallback,
     ObserverMethod
 } from '@ember/object/-private/types';
-import * as HandlebarsNamespace from 'handlebars';
+
 // Capitalization is intentional: this makes it much easier to re-export RSVP on
 // the Ember namespace.
 import Rsvp from 'rsvp';
+
 import { TemplateFactory } from 'htmlbars-inline-precompile';
 
 import { Registry as ServiceRegistry } from '@ember/service';
 import { Registry as ControllerRegistry } from '@ember/controller';
 import * as EmberStringNs from '@ember/string';
+import * as EmberStringHandlebarsNs from '@ember/string/-private/handlebars';
 // tslint:disable-next-line:no-duplicate-imports
 import * as EmberServiceNs from '@ember/service';
 import * as EmberPolyfillsNs from '@ember/polyfills';
@@ -424,11 +426,12 @@ export namespace Ember {
         function K(): any;
         function createFrame(objec: any): any;
         function Exception(message: string): void;
-        const SafeString: typeof HandlebarsNamespace.SafeString;
+        class SafeString extends EmberStringHandlebarsNs.SafeString {}
         function parse(string: string): any;
         function print(ast: any): void;
         const logger: typeof Logger;
         function log(level: string, str: string): void;
+        function registerHelper(name: string, helper: any): void;
     }
     namespace String {
         const camelize: typeof EmberStringNs.camelize;
diff --git a/types/ember/package.json b/types/ember/package.json
deleted file mode 100644
index b6f5204c9a..0000000000
--- a/types/ember/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "handlebars": "^4.1.0"
-    }
-}
\ No newline at end of file
diff --git a/types/ember/test/ember-tests.ts b/types/ember/test/ember-tests.ts
index 01aaab7452..eb317c3ab1 100755
--- a/types/ember/test/ember-tests.ts
+++ b/types/ember/test/ember-tests.ts
@@ -92,10 +92,10 @@ App.userController = Ember.Object.create({
     }),
 });
 
-Handlebars.registerHelper(
+Ember.Handlebars.registerHelper(
     'highlight',
     (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+        new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
 const coolView = App.CoolView.create();
diff --git a/types/ember/test/string.ts b/types/ember/test/string.ts
index 4363b375f3..d812a52dd5 100644
--- a/types/ember/test/string.ts
+++ b/types/ember/test/string.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { SafeString } from 'handlebars';
+import { SafeString } from '@ember/string/-private/handlebars';
 
 const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w } = Ember.String;
 
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index be47225e72..6e494f5a03 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -36,6 +36,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember__string/-private/handlebars.d.ts b/types/ember__string/-private/handlebars.d.ts
new file mode 100644
index 0000000000..8d8dce118c
--- /dev/null
+++ b/types/ember__string/-private/handlebars.d.ts
@@ -0,0 +1,5 @@
+export class SafeString {
+    constructor(str: string);
+    toString(): string;
+    toHTML(): string;
+}
diff --git a/types/ember__string/ember__string-tests.ts b/types/ember__string/ember__string-tests.ts
index 500c67546e..c6474cd266 100644
--- a/types/ember__string/ember__string-tests.ts
+++ b/types/ember__string/ember__string-tests.ts
@@ -1,5 +1,5 @@
 import { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w, isHTMLSafe } from '@ember/string';
-import { SafeString } from 'handlebars';
+import { SafeString } from '@ember/string/-private/handlebars';
 
 dasherize(); // $ExpectError
 dasherize('blue man group'); // $ExpectType string
@@ -37,7 +37,7 @@ const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
 htmlSafe('lorem ipsum...'); // $ExpectType SafeString
 const regularString: string = htmlSafe('lorem ipsum...'); // $ExpectError
 
-function isSafeTest(a: string|Handlebars.SafeString) {
+function isSafeTest(a: string | SafeString) {
   if (isHTMLSafe(a)) {
       a = a.toString();
   }
diff --git a/types/ember__string/index.d.ts b/types/ember__string/index.d.ts
index c25da1f823..2a65c9b5df 100644
--- a/types/ember__string/index.d.ts
+++ b/types/ember__string/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { SafeString } from 'handlebars';
+import { SafeString } from "./-private/handlebars";
 
 export function camelize(str: string): string;
 export function capitalize(str: string): string;
diff --git a/types/ember__string/package.json b/types/ember__string/package.json
deleted file mode 100644
index b6f5204c9a..0000000000
--- a/types/ember__string/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "handlebars": "^4.1.0"
-    }
-}
\ No newline at end of file
diff --git a/types/ember__string/tsconfig.json b/types/ember__string/tsconfig.json
index 100fad10f5..a5a7ecc944 100644
--- a/types/ember__string/tsconfig.json
+++ b/types/ember__string/tsconfig.json
@@ -15,13 +15,15 @@
             "../"
         ],
         "paths": {
-            "@ember/string": ["ember__string"]
+            "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"]
         },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
+        "-private/handlebars.d.ts",
         "index.d.ts",
         "ember__string-tests.ts"
     ]
diff --git a/types/ember__test-helpers/tsconfig.json b/types/ember__test-helpers/tsconfig.json
index 7b167f14d5..35638865d8 100644
--- a/types/ember__test-helpers/tsconfig.json
+++ b/types/ember__test-helpers/tsconfig.json
@@ -38,6 +38,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember__test/tsconfig.json b/types/ember__test/tsconfig.json
index da00f05337..bb95710392 100644
--- a/types/ember__test/tsconfig.json
+++ b/types/ember__test/tsconfig.json
@@ -36,6 +36,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],

From 465aea12e4ecf7692d8d4e6e4f77bc7a032945f6 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 11 Feb 2019 20:40:23 +0100
Subject: [PATCH 232/924] [ember] Fix wrongly deprecated Ember.assign

---
 types/ember/index.d.ts            | 1 -
 types/ember/v2/index.d.ts         | 3 +--
 types/ember__polyfills/index.d.ts | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index d0f9896eb9..d7aaa35b36 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -498,7 +498,6 @@ export namespace Ember {
     // TODO: replace with an es6 reexport when declare module 'ember' is removed
     /**
      * Copy properties from a source object to a target object.
-     * @deprecated Use Object.assign
      */
     const assign: typeof EmberPolyfillsNs.assign;
     /**
diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 54b6d2e4a9..1734ee6a14 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -3131,7 +3131,7 @@ declare module 'ember' {
         function isPresent(obj: any): boolean;
         /**
          * Merge the contents of two objects together into the first object.
-         * @deprecated Use Object.assign
+         * @deprecated Use Ember.assign
          */
         function merge<T, U>(original: T, updates: U): T & U;
         /**
@@ -3284,7 +3284,6 @@ declare module 'ember' {
         function typeOf(item: any): string;
         /**
          * Copy properties from a source object to a target object.
-         * @deprecated Use Object.assign
          */
         function assign<T, U>(target: T, source: U): T & U;
         function assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
diff --git a/types/ember__polyfills/index.d.ts b/types/ember__polyfills/index.d.ts
index e5ace0fe2e..01820351e5 100644
--- a/types/ember__polyfills/index.d.ts
+++ b/types/ember__polyfills/index.d.ts
@@ -8,7 +8,6 @@ import { Mix, Mix3, Mix4 } from './types';
 
 /**
  * Copy properties from a source object to a target object.
- * @deprecated Use Object.assign
  */
 export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
 export function assign<T extends object, U extends object, V extends object>(target: T, source1: U, source2: V): Mix3<T, U, V>;
@@ -17,6 +16,6 @@ export function assign(target: object, ...sources: object[]): any;
 
 /**
  * Merge the contents of two objects together into the first object.
- * @deprecated Use Object.assign
+ * @deprecated Use Ember.assign
  */
 export function merge<T extends object, U extends object>(original: T, updates: U): Mix<T, U>;

From d55ea815de1b8d4aeca766cccd4ca74f114dd467 Mon Sep 17 00:00:00 2001
From: tylerprice1 <33133203+tylerprice1@users.noreply.github.com>
Date: Fri, 1 Mar 2019 14:55:07 -0500
Subject: [PATCH 233/924] Add tests for using and xusing

---
 .../jasmine-data_driven_tests-tests.ts        | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
index 6689159b58..be3c43a7e6 100644
--- a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
+++ b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
@@ -1,5 +1,44 @@
 /// <reference types="jasmine" />
 
+using("A suite",
+      [
+          [1, 2, 3],
+          [2, 4, 6]
+      ],
+      function (a, b, c) {
+          it("can be data driven", function () {
+              expect(c).toBe(a + b);
+          });
+      }
+);
+
+xusing("A data driven suite",
+      [
+          [1, 2, 3],
+          [2, 4, 6]
+      ],
+      function (a, b, c) {
+          it("can be pending", function () {
+              expect(c).toBe(a + b);
+          });
+      }
+);
+
+using("A data driven suite",
+      [ 'a', 'b', 'c' ],
+      (lhs) => {
+          beforeEach(() => {
+              console.log(`lhs = ${lhs}`);
+          });
+          all("can contain data driven tests",
+              [ 'd', 'e', 'f' ],
+              (rhs) => {
+                  expect(lhs).not.toBe(rhs);
+              }
+          );
+      }
+);
+
 all("A data driven test is a suite with multiple specs",
     ['a', 'b', 'c'],
     value => {

From 4245ec91060834381448443e347f7bb751e74855 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 11:57:56 -0800
Subject: [PATCH 234/924] [ember/v2] remove dependency on handlebars types

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

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 1734ee6a14..cfc95ed691 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -12,7 +12,6 @@
 // TypeScript Version: 2.4
 
 /// <reference types="jquery" />
-/// <reference types="handlebars" />
 
 declare module 'ember' {
     // Capitalization is intentional: this makes it much easier to re-export RSVP on

From 9ecdc820da5e79c24a6d9abcf6336ff459e05a0b Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 12:00:16 -0800
Subject: [PATCH 235/924] [ember/v2] add limited handlebars types to old ember
 types

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

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index cfc95ed691..b414a6f79b 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -2414,6 +2414,7 @@ declare module 'ember' {
             function print(ast: any): void;
             const logger: typeof Ember.Logger;
             function log(level: string, str: string): void;
+            function registerHelper(name: string, helper: any): void;
         }
         namespace String {
             function camelize(str: string): string;
diff --git a/types/ember/v2/test/ember-tests.ts b/types/ember/v2/test/ember-tests.ts
index c049512eb0..892c9ed9a8 100755
--- a/types/ember/v2/test/ember-tests.ts
+++ b/types/ember/v2/test/ember-tests.ts
@@ -92,10 +92,10 @@ App.userController = Ember.Object.create({
     }),
 });
 
-Handlebars.registerHelper(
+Ember.Handlebars.registerHelper(
     'highlight',
     (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+        new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
 const coolView = App.CoolView.create();

From 6f902f72236853917a57173919cfa2a893aff1f6 Mon Sep 17 00:00:00 2001
From: tylerprice1 <33133203+tylerprice1@users.noreply.github.com>
Date: Fri, 1 Mar 2019 15:01:33 -0500
Subject: [PATCH 236/924] Style fixes

---
 .../jasmine-data_driven_tests-tests.ts               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
index be3c43a7e6..511d687420 100644
--- a/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
+++ b/types/jasmine-data_driven_tests/jasmine-data_driven_tests-tests.ts
@@ -5,8 +5,8 @@ using("A suite",
           [1, 2, 3],
           [2, 4, 6]
       ],
-      function (a, b, c) {
-          it("can be data driven", function () {
+      (a, b, c) => {
+          it("can be data driven", () => {
               expect(c).toBe(a + b);
           });
       }
@@ -17,8 +17,8 @@ xusing("A data driven suite",
           [1, 2, 3],
           [2, 4, 6]
       ],
-      function (a, b, c) {
-          it("can be pending", function () {
+      (a, b, c) => {
+          it("can be pending", () => {
               expect(c).toBe(a + b);
           });
       }
@@ -26,13 +26,13 @@ xusing("A data driven suite",
 
 using("A data driven suite",
       [ 'a', 'b', 'c' ],
-      (lhs) => {
+      lhs => {
           beforeEach(() => {
               console.log(`lhs = ${lhs}`);
           });
           all("can contain data driven tests",
               [ 'd', 'e', 'f' ],
-              (rhs) => {
+              rhs => {
                   expect(lhs).not.toBe(rhs);
               }
           );

From 12c7576fedcdd83e51fde9561f5c7b71cbe3de78 Mon Sep 17 00:00:00 2001
From: Jonathan Viney <jonathan.viney@gmail.com>
Date: Tue, 5 Feb 2019 17:41:32 +1300
Subject: [PATCH 237/924] [@ember/object]: Make ObjectProxy content generic.
 Add type checks for EmberObject getters.

---
 types/ember__object/proxy.d.ts    | 24 +++++++++++++++++--
 types/ember__object/test/proxy.ts | 38 +++++++++++++++++++++++++++++++
 types/ember__object/tsconfig.json |  1 +
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 types/ember__object/test/proxy.ts

diff --git a/types/ember__object/proxy.d.ts b/types/ember__object/proxy.d.ts
index 841b211e49..38c690fe72 100644
--- a/types/ember__object/proxy.d.ts
+++ b/types/ember__object/proxy.d.ts
@@ -1,12 +1,32 @@
 import EmberObject from "@ember/object";
+import {
+    UnwrapComputedPropertyGetter,
+    UnwrapComputedPropertyGetters
+} from "@ember/object/-private/types";
 
 /**
  * `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
  * to a proxied `content` object.
  */
-export default class ObjectProxy extends EmberObject {
+export default class ObjectProxy<T extends object = object> extends EmberObject {
     /**
      * The object whose properties will be forwarded.
      */
-    content: object;
+    content: T | undefined;
+
+    get<K extends keyof this>(key: K): UnwrapComputedPropertyGetter<this[K]>;
+    get<K extends keyof T>(key: K): UnwrapComputedPropertyGetter<T[K]> | undefined;
+
+    getProperties<K extends keyof this>(
+        list: K[]
+    ): Pick<UnwrapComputedPropertyGetters<this>, K>;
+    getProperties<K extends keyof this>(
+        ...list: K[]
+    ): Pick<UnwrapComputedPropertyGetters<this>, K>;
+    getProperties<K extends keyof T>(
+        list: K[]
+    ): Pick<Partial<UnwrapComputedPropertyGetters<T>>, K>;
+    getProperties<K extends keyof T>(
+        ...list: K[]
+    ): Pick<Partial<UnwrapComputedPropertyGetters<T>>, K>;
 }
diff --git a/types/ember__object/test/proxy.ts b/types/ember__object/test/proxy.ts
new file mode 100644
index 0000000000..bacfd013f1
--- /dev/null
+++ b/types/ember__object/test/proxy.ts
@@ -0,0 +1,38 @@
+import ObjectProxy from "@ember/object/proxy";
+
+interface Book {
+  title: string;
+  subtitle: string;
+  chapters: Array<{ title: string }>;
+}
+
+class DefaultProxy extends ObjectProxy {}
+DefaultProxy.create().content; // $ExpectType object | undefined
+
+class BookProxy extends ObjectProxy<Book> {
+  private readonly baz = 'baz';
+
+  getTitle() {
+    return this.get('title');
+  }
+
+  getPropertiesTitleSubtitle() {
+    return this.getProperties('title', 'subtitle');
+  }
+}
+
+const book = BookProxy.create();
+book.content; // $ExpectType Book | undefined
+
+book.get("unknownProperty"); // $ExpectError
+book.get("title"); // $ExpectType string | undefined
+book.getTitle(); // $ExpectType string | undefined
+
+book.getProperties("title", "unknownProperty"); // $ExpectError
+book.getProperties("title", "subtitle"); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
+book.getPropertiesTitleSubtitle(); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
+
+book.getProperties(["subtitle", "chapters"]); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "subtitle" | "chapters">
+book.getProperties(["title", "unknownProperty"]); // $ExpectError
+
+book.get("baz"); // $ExpectError
diff --git a/types/ember__object/tsconfig.json b/types/ember__object/tsconfig.json
index 5ed61a24d3..deeb128e7b 100644
--- a/types/ember__object/tsconfig.json
+++ b/types/ember__object/tsconfig.json
@@ -49,6 +49,7 @@
         "test/extend.ts",
         "test/object.ts",
         "test/observable.ts",
+        "test/proxy.ts",
         "test/reopen.ts"
     ]
 }

From e065fec3902500ac044320b984b44bea07a54980 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 27 Jan 2019 20:42:18 +0100
Subject: [PATCH 238/924] Add url property to deprecation options

See https://github.com/emberjs/ember.js/blob/56d60eac537933e20ef66e735299b81dba9a1788/packages/%40ember/debug/lib/deprecate.ts#L16
---
 types/ember/v2/index.d.ts    | 16 +++++++++++-----
 types/ember/v2/test/utils.ts |  8 ++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index 54b6d2e4a9..bdea9c24f8 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -274,6 +274,12 @@ declare module 'ember' {
         triggerAction(opts: TriggerActionOptions): boolean;
     }
 
+    interface DeprecationOptions {
+        id: string;
+        until: string;
+        url?: string;
+    }
+
     export namespace Ember {
         interface FunctionPrototypeExtensions {
             /**
@@ -2574,14 +2580,14 @@ declare module 'ember' {
              */
             deprecatingAlias(
                 dependentKey: string,
-                options: { id: string; until: string }
+                options: DeprecationOptions
             ): ComputedProperty<any>;
             /**
              * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
              */
             deprecatingAlias(
                 dependentKey: string,
-                options?: { id?: string; until?: string }
+                options?: Partial<DeprecationOptions>
             ): ComputedProperty<any>;
             /**
              * A computed property that returns the sum of the values
@@ -2977,7 +2983,7 @@ declare module 'ember' {
         function deprecate(
             message: string,
             test: boolean,
-            options: { id: string; until: string }
+            options: DeprecationOptions
         ): any;
         /**
          * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
@@ -2985,7 +2991,7 @@ declare module 'ember' {
         function deprecate(
             message: string,
             test: boolean,
-            options?: { id?: string; until?: string }
+            options?: Partial<DeprecationOptions>
         ): any;
         /**
          * Define an assertion that will throw an exception if the condition is not met.
@@ -3012,7 +3018,7 @@ declare module 'ember' {
          */
         function deprecateFunc<Func extends ((...args: any[]) => any)>(
             message: string,
-            options: { id: string; until: string },
+            options: DeprecationOptions,
             func: Func
         ): Func;
         /**
diff --git a/types/ember/v2/test/utils.ts b/types/ember/v2/test/utils.ts
index d729d472b8..72d55184ab 100755
--- a/types/ember/v2/test/utils.ts
+++ b/types/ember/v2/test/utils.ts
@@ -50,6 +50,14 @@ function testDeprecateFunc() {
     assertType<string>(oldMethod('first', 123));
 }
 
+function testDeprecate() {
+  Ember.deprecate('This has been deprecated', false, {
+    id: 'some.id',
+    until: '1.0.0',
+    url: 'http://www.emberjs.com'
+  });
+}
+
 function testDefineProperty() {
     const contact = {};
 

From 8cfa0ed3349d02128424dbe9dd112c8f85e11ff8 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 1 Feb 2019 14:17:49 +0100
Subject: [PATCH 239/924] Add url property to deprecation options in
 ember/application/deprecations

---
 types/ember__application/deprecations.d.ts    | 11 +++++++++--
 types/ember__application/test/deprecations.ts |  7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/types/ember__application/deprecations.d.ts b/types/ember__application/deprecations.d.ts
index 8509e2f69d..ddc5af5019 100644
--- a/types/ember__application/deprecations.d.ts
+++ b/types/ember__application/deprecations.d.ts
@@ -1,3 +1,10 @@
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface DeprecationOptions {
+  id: string;
+  until: string;
+  url?: string;
+}
+
 /**
  * Display a deprecation warning with the provided message and a stack trace
  * (Chrome and Firefox only).
@@ -5,7 +12,7 @@
 export function deprecate(
     message: string,
     test: boolean,
-    options: { id: string; until: string }
+    options: DeprecationOptions
 ): any;
 
 /**
@@ -13,6 +20,6 @@ export function deprecate(
  */
 export function deprecateFunc<Func extends ((...args: any[]) => any)>(
     message: string,
-    options: { id: string; until: string },
+    options: DeprecationOptions,
     func: Func
 ): Func;
diff --git a/types/ember__application/test/deprecations.ts b/types/ember__application/test/deprecations.ts
index 30d1e8a075..c5db468535 100644
--- a/types/ember__application/test/deprecations.ts
+++ b/types/ember__application/test/deprecations.ts
@@ -1,8 +1,13 @@
 import { deprecate, deprecateFunc } from '@ember/application/deprecations';
 
+deprecate('this is no longer advised', false, {
+  id: 'no-longer-advised',
+  until: 'v4.0'
+});
 deprecate('this is no longer advised', false, {
     id: 'no-longer-advised',
-    until: 'v4.0'
+    until: 'v4.0',
+    url: 'https://emberjs.com'
 });
 deprecate('this is no longer advised', false); // $ExpectError
 

From 3bf06f2894dd547e71ddd817a55d1f6802982d01 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 12:00:16 -0800
Subject: [PATCH 240/924] [ember/v2] add limited handlebars types to old ember
 types

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

diff --git a/types/ember/v2/index.d.ts b/types/ember/v2/index.d.ts
index bdea9c24f8..1875f23eca 100755
--- a/types/ember/v2/index.d.ts
+++ b/types/ember/v2/index.d.ts
@@ -12,7 +12,6 @@
 // TypeScript Version: 2.4
 
 /// <reference types="jquery" />
-/// <reference types="handlebars" />
 
 declare module 'ember' {
     // Capitalization is intentional: this makes it much easier to re-export RSVP on
@@ -2421,6 +2420,7 @@ declare module 'ember' {
             function print(ast: any): void;
             const logger: typeof Ember.Logger;
             function log(level: string, str: string): void;
+            function registerHelper(name: string, helper: any): void;
         }
         namespace String {
             function camelize(str: string): string;
diff --git a/types/ember/v2/test/ember-tests.ts b/types/ember/v2/test/ember-tests.ts
index c049512eb0..892c9ed9a8 100755
--- a/types/ember/v2/test/ember-tests.ts
+++ b/types/ember/v2/test/ember-tests.ts
@@ -92,10 +92,10 @@ App.userController = Ember.Object.create({
     }),
 });
 
-Handlebars.registerHelper(
+Ember.Handlebars.registerHelper(
     'highlight',
     (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+        new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
 const coolView = App.CoolView.create();

From 431fd2a147a4a1e2188dafb208983b8639dded74 Mon Sep 17 00:00:00 2001
From: Elizabeth Samuel <elizs@microsoft.com>
Date: Fri, 1 Mar 2019 13:09:03 -0800
Subject: [PATCH 241/924] [office-js] [office-js-preview] (Outlook)
 Event.completed preview

---
 types/office-js-preview/index.d.ts | 12 ++++++------
 types/office-js/index.d.ts         | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 80195cf516..431e9e76e7 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -962,11 +962,11 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-             *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
-             *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><th>                             </th><th> Office for Windows desktop                                       </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without options<br>Mailbox Preview: with options)</td><td>                            </td><td>                 </td></tr>
+             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Word       </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
              *  </table>
              * 
              * @param options Optional. An object literal that contains one or more of the following properties.
@@ -974,7 +974,7 @@ declare namespace Office {
              *                    this value indicates of the handled event should continue execution or be canceled. 
              *                    For example, an add-in that handles the ItemSend event can set allowEvent = false to cancel sending of the message.
              */
-            completed(options?: any): void;
+            completed(options?: { allowEvent: boolean }): void;
         }
 
         /**
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 43a3bae9b8..e2bf496488 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -962,11 +962,11 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                             </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-             *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
-             *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><th>                             </th><th> Office for Windows desktop                                       </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without options<br>Mailbox Preview: with options)</td><td>                            </td><td>                 </td></tr>
+             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Word       </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
              *  </table>
              * 
              * @param options Optional. An object literal that contains one or more of the following properties.
@@ -974,7 +974,7 @@ declare namespace Office {
              *                    this value indicates of the handled event should continue execution or be canceled. 
              *                    For example, an add-in that handles the ItemSend event can set allowEvent = false to cancel sending of the message.
              */
-            completed(options?: any): void;
+            completed(options?: { allowEvent: boolean }): void;
         }
 
         /**

From bdad98eff86a701b05256c1f8720ff631ebdd5c8 Mon Sep 17 00:00:00 2001
From: Ron Newcomb <pscion@yahoo.com>
Date: Fri, 1 Mar 2019 13:19:06 -0800
Subject: [PATCH 242/924] VictoryVoronoiContainer for tooltips on Line chart

VictoryVoronoiContainer for tooltips on Line chart
---
 types/victory/index.d.ts | 75 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index f5c67995da..f70e8f7bf9 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -420,6 +420,81 @@ declare module "victory" {
 
   export class VictoryBrushContainer extends React.Component<VictoryBrushContainerProps, any> {}
 
+	export interface VictoryVoronoiContainerProps extends VictoryContainerProps {
+		/**
+		 * When the activateData prop is set to true, the active prop will be set to true on all
+		 * data components within a voronoi area. When this prop is set to false, the onActivated 
+		 * and onDeactivated callbacks will still fire, but no mutations to data components will
+		 * occur via Victory’s event system.
+		 */
+		activateData?: boolean;
+		/**
+		 * When the activateLabels prop is set to true, the active prop will be set to true on all
+		 * labels corresponding to points within a voronoi area. When this prop is set to false,
+		 * the onActivated and onDeactivated callbacks will still fire, but no mutations to label 
+		 * components will occur via Victory’s event system. Labels defined directly on 
+		 * VictoryVoronoiContainer via the labels prop will still appear when this prop is set to false.
+		 */
+		activateLabels?: boolean;
+		/**
+		 * When the disable prop is set to true, VictoryVoronoiContainer events will not fire.
+		 */
+		disable?: boolean;
+		/**
+		 * When a labels prop is provided to VictoryVoronoiContainer it will render a label component 
+		 * rather than activating labels on the child components it renders. This is useful for 
+		 * creating multi- point tooltips. This prop should be given as a function which will be called
+		 * once for each active point. The labels function will be called with the arguments point,
+		 * index, and points, where point refers to a single active point, index refers to the position
+		 * of that point in the array of active points, and points is an array of all active points.
+		 */
+		labels?: (point: any, index: number, points: any[]) => string;
+		/**
+		 * The labelComponent prop specified the component that will be rendered when labels are defined
+		 * on VictoryVoronoiContainer. If the labels prop is omitted, no label component will be rendered.
+		 */
+		labelComponent?: React.ReactElement;
+		/**
+		 * The onActivated prop accepts a function to be called whenever new data points are activated. 
+		 * The function is called with the parameters points (an array of active data objects) and props
+		 * (the props used by VictoryVoronoiContainer).
+		 */
+		onActivated?: (points: any[], props: VictoryVoronoiContainerProps) => void;
+		/**
+		 * The onDeactivated prop accepts a function to be called whenever points are deactivated. The
+		 * function is called with the parameters points (an array of the newly-deactivated data objects)
+		 * and props (the props used by VictoryVoronoiContainer).
+		 */
+		onDeactivated?: (points: any[], props: VictoryVoronoiContainerProps) => void;
+		/**
+		 * When the radius prop is set, the voronoi areas associated with each data point will be no larger
+		 * than the given radius. This prop should be given as a number.
+		 */
+		radius?: number;
+		/**
+		 * The voronoiBlacklist prop is used to specify a list of components to ignore when calculating a
+		 * shared voronoi diagram. Components with a name prop matching an element in the voronoiBlacklist
+		 * array will be ignored by VictoryVoronoiContainer. Ignored components will never be flagged as 
+		 * active, and will not contribute date to shared tooltips or labels.
+		 */
+		voronoiBlacklist?: string[];
+		/**
+		 *When the voronoiDimension prop is set, voronoi selection will only take the given dimension into 
+		 * account. For example, when dimension is set to “x”, all data points matching a particular x mouse
+		 * position will be activated regardless of y value. When this prop is not given, voronoi selection 
+		 * is determined by both x any y values.
+		 */
+		voronoiDimension?: "x" | "y";
+		/**
+		 * When the voronoiPadding prop is given, the area of the chart that will trigger voronoi events is
+		 * reduced by the given padding on every side. By default, no padding is applied, and the entire range
+		 * of a given chart may trigger voronoi events. This prop should be given as a number.
+		 */
+		voronoiPadding?: number;
+	}
+
+	export class VictoryVoronoiContainer extends React.Component<VictoryVoronoiContainerProps, any> { }
+
   export interface VictoryZoomContainerProps extends VictoryContainerProps {
     /**
      * The optional allowPan prop accepts a boolean that enables the panning

From 9ea4c0ba6048ceb5435345b2598fdee6652d70d4 Mon Sep 17 00:00:00 2001
From: Eric <emusgrave@tricerat.com>
Date: Fri, 1 Mar 2019 16:35:43 -0500
Subject: [PATCH 243/924] Remove JSDoc type annotation

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

diff --git a/types/zeromq/index.d.ts b/types/zeromq/index.d.ts
index cb21200253..e40e5cc3aa 100644
--- a/types/zeromq/index.d.ts
+++ b/types/zeromq/index.d.ts
@@ -218,8 +218,7 @@ export class Socket extends NodeJS.EventEmitter {
      * Disable monitoring of a Socket release idle handler
      * and close the socket
      *
-     * @return {Socket} for chaining
-     * @api public
+     * @return for chaining
      */
     unmonitor(): Socket;
 

From 1717bac2515339ca81bbed35ba1a588bfa3bc7c1 Mon Sep 17 00:00:00 2001
From: Ron Newcomb <pscion@yahoo.com>
Date: Fri, 1 Mar 2019 14:47:33 -0800
Subject: [PATCH 244/924] VictoryVoronoiContainer for tooltips on Line chart

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

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index f70e8f7bf9..e6443c37d8 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -423,7 +423,7 @@ declare module "victory" {
 	export interface VictoryVoronoiContainerProps extends VictoryContainerProps {
 		/**
 		 * When the activateData prop is set to true, the active prop will be set to true on all
-		 * data components within a voronoi area. When this prop is set to false, the onActivated 
+		 * data components within a voronoi area. When this prop is set to false, the onActivated
 		 * and onDeactivated callbacks will still fire, but no mutations to data components will
 		 * occur via Victory’s event system.
 		 */
@@ -431,8 +431,8 @@ declare module "victory" {
 		/**
 		 * When the activateLabels prop is set to true, the active prop will be set to true on all
 		 * labels corresponding to points within a voronoi area. When this prop is set to false,
-		 * the onActivated and onDeactivated callbacks will still fire, but no mutations to label 
-		 * components will occur via Victory’s event system. Labels defined directly on 
+		 * the onActivated and onDeactivated callbacks will still fire, but no mutations to label
+		 * components will occur via Victory’s event system. Labels defined directly on
 		 * VictoryVoronoiContainer via the labels prop will still appear when this prop is set to false.
 		 */
 		activateLabels?: boolean;
@@ -441,8 +441,8 @@ declare module "victory" {
 		 */
 		disable?: boolean;
 		/**
-		 * When a labels prop is provided to VictoryVoronoiContainer it will render a label component 
-		 * rather than activating labels on the child components it renders. This is useful for 
+		 * When a labels prop is provided to VictoryVoronoiContainer it will render a label component
+		 * rather than activating labels on the child components it renders. This is useful for
 		 * creating multi- point tooltips. This prop should be given as a function which will be called
 		 * once for each active point. The labels function will be called with the arguments point,
 		 * index, and points, where point refers to a single active point, index refers to the position
@@ -455,7 +455,7 @@ declare module "victory" {
 		 */
 		labelComponent?: React.ReactElement;
 		/**
-		 * The onActivated prop accepts a function to be called whenever new data points are activated. 
+		 * The onActivated prop accepts a function to be called whenever new data points are activated.
 		 * The function is called with the parameters points (an array of active data objects) and props
 		 * (the props used by VictoryVoronoiContainer).
 		 */
@@ -474,14 +474,14 @@ declare module "victory" {
 		/**
 		 * The voronoiBlacklist prop is used to specify a list of components to ignore when calculating a
 		 * shared voronoi diagram. Components with a name prop matching an element in the voronoiBlacklist
-		 * array will be ignored by VictoryVoronoiContainer. Ignored components will never be flagged as 
+		 * array will be ignored by VictoryVoronoiContainer. Ignored components will never be flagged as
 		 * active, and will not contribute date to shared tooltips or labels.
 		 */
 		voronoiBlacklist?: string[];
 		/**
-		 *When the voronoiDimension prop is set, voronoi selection will only take the given dimension into 
+		 * When the voronoiDimension prop is set, voronoi selection will only take the given dimension into
 		 * account. For example, when dimension is set to “x”, all data points matching a particular x mouse
-		 * position will be activated regardless of y value. When this prop is not given, voronoi selection 
+		 * position will be activated regardless of y value. When this prop is not given, voronoi selection
 		 * is determined by both x any y values.
 		 */
 		voronoiDimension?: "x" | "y";

From 328c85b59a52f21ba75ff3f001b9799af3490dc3 Mon Sep 17 00:00:00 2001
From: Jordan Abreu <jordan@abreu.nyc>
Date: Fri, 1 Mar 2019 15:13:04 -0800
Subject: [PATCH 245/924] Add missing property boolean `followRedirects`

Add missing boolean property `followRedirects ` to ServerOptions interface
---
 types/http-proxy/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/http-proxy/index.d.ts b/types/http-proxy/index.d.ts
index 2560b0a38d..535c12ab8a 100644
--- a/types/http-proxy/index.d.ts
+++ b/types/http-proxy/index.d.ts
@@ -207,6 +207,8 @@ declare namespace Server {
     headers?: {[header: string]: string};
     /** Timeout (in milliseconds) when proxy receives no response from target. Default: 120000 (2 minutes) */
     proxyTimeout?: number;
+    /** Specify whether you want to follow redirects. Default: false */
+    followRedirects?: boolean;
     /** If set to true, none of the webOutgoing passes are called and it's your responsibility to appropriately return the response by listening and acting on the proxyRes event */
     selfHandleResponse?: boolean;
   }

From 46c8b18ad68ffc0f4a973f4339b9e4bee060ff4f Mon Sep 17 00:00:00 2001
From: Jordan Abreu <jordan@abreu.nyc>
Date: Fri, 1 Mar 2019 15:42:41 -0800
Subject: [PATCH 246/924] Updates ServerOptions interface

Bumps version
Adds timeout and cookiePathRewite to ServerOptions interface
reorders ServerOptions interface to reflect order in http-proxy readme
---
 types/http-proxy/index.d.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/http-proxy/index.d.ts b/types/http-proxy/index.d.ts
index 535c12ab8a..80e09de68f 100644
--- a/types/http-proxy/index.d.ts
+++ b/types/http-proxy/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for node-http-proxy 1.16
+// Type definitions for node-http-proxy 1.17
 // Project: https://github.com/nodejitsu/node-http-proxy
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 //                 Florian Oellerich <https://github.com/Raigen>
 //                 Daniel Schmidt <https://github.com/DanielMSchmidt>
+//                 Jordan Abreu <https://github.com/jabreu610>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -165,8 +166,6 @@ declare class Server extends events.EventEmitter {
 
 declare namespace Server {
   interface ServerOptions {
-    /** Buffer */
-    buffer?: stream.Stream;
     /** URL string to be parsed with the url module. */
     target?: ProxyTargetUrl;
     /** URL string to be parsed with the url module. */
@@ -203,14 +202,20 @@ declare namespace Server {
     protocolRewrite?: string;
     /** rewrites domain of set-cookie headers. */
     cookieDomainRewrite?: false | string | {[oldDomain: string]: string};
+    /** rewrites path of set-cookie headers. Default: false */
+    cookiePathRewrite?: false | string | {[oldPath: string]: string};
     /** object with extra headers to be added to target requests. */
     headers?: {[header: string]: string};
     /** Timeout (in milliseconds) when proxy receives no response from target. Default: 120000 (2 minutes) */
     proxyTimeout?: number;
+    /** Timeout (in milliseconds) for incoming requests */
+    timeout?: number;
     /** Specify whether you want to follow redirects. Default: false */
     followRedirects?: boolean;
     /** If set to true, none of the webOutgoing passes are called and it's your responsibility to appropriately return the response by listening and acting on the proxyRes event */
     selfHandleResponse?: boolean;
+    /** Buffer */
+    buffer?: stream.Stream;
   }
 }
 

From 16499663766496af9ce29ebd6687886fb79751ba Mon Sep 17 00:00:00 2001
From: Thanik Bhongbhibhat <email@thanik.me>
Date: Sun, 24 Feb 2019 11:16:10 -0800
Subject: [PATCH 247/924] [@types/node]: Add argument types for
 net.Server.close callback

---
 types/node/index.d.ts        |  1 +
 types/node/net.d.ts          |  2 +-
 types/node/test/net.ts       |  8 +++++---
 types/node/v10/index.d.ts    |  1 +
 types/node/v10/net.d.ts      |  2 +-
 types/node/v10/node-tests.ts | 15 +++++++++------
 types/node/v8/index.d.ts     |  3 ++-
 types/node/v8/node-tests.ts  | 15 +++++++++------
 types/node/v9/index.d.ts     |  3 ++-
 types/node/v9/node-tests.ts  | 15 +++++++++------
 10 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 41bfd02671..23b53a5f0d 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -36,6 +36,7 @@
 //                 Samuel Ainsworth <https://github.com/samuela>
 //                 Kyle Uehlein <https://github.com/kuehlein>
 //                 Jordi Oliveras Rovira <https://github.com/j-oliveras>
+//                 Thanik Bhongbhibhat <https://github.com/bhongy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // NOTE: These definitions support NodeJS and TypeScript 3.2.
diff --git a/types/node/net.d.ts b/types/node/net.d.ts
index 33858de8df..d011f6297c 100644
--- a/types/node/net.d.ts
+++ b/types/node/net.d.ts
@@ -178,7 +178,7 @@ declare module "net" {
         listen(options: ListenOptions, listeningListener?: Function): this;
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
-        close(callback?: Function): this;
+        close(callback?: (err?: Error) => void): this;
         address(): AddressInfo | string | null;
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
diff --git a/types/node/test/net.ts b/types/node/test/net.ts
index a2276654c8..f2c212d1fc 100644
--- a/types/node/test/net.ts
+++ b/types/node/test/net.ts
@@ -26,9 +26,11 @@ import { LookupOneOptions } from 'dns';
         ipv6Only: true,
     });
 
-    // close has an optional callback function. No callback parameters are
-    // specified, so any callback function is permissible.
-    server = server.close((...args: any[]) => { });
+    // close callback parameter can be either nothing (undefined) or an error
+    server = server.close(() => { });
+    server = server.close((err) => {
+        if (typeof err !== 'undefined') { const _err: Error = err; }
+    });
 
     // test the types of the address object fields
     const address: net.AddressInfo | string | null = server.address();
diff --git a/types/node/v10/index.d.ts b/types/node/v10/index.d.ts
index 65f057b262..cf67202129 100644
--- a/types/node/v10/index.d.ts
+++ b/types/node/v10/index.d.ts
@@ -34,6 +34,7 @@
 //                 Samuel Ainsworth <https://github.com/samuela>
 //                 Kyle Uehlein <https://github.com/kuehlein>
 //                 Jordi Oliveras Rovira <https://github.com/j-oliveras>
+//                 Thanik Bhongbhibhat <https://github.com/bhongy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // NOTE: These definitions support NodeJS and TypeScript 3.1.
diff --git a/types/node/v10/net.d.ts b/types/node/v10/net.d.ts
index 27804375aa..056cdec17a 100644
--- a/types/node/v10/net.d.ts
+++ b/types/node/v10/net.d.ts
@@ -174,7 +174,7 @@ declare module "net" {
         listen(options: ListenOptions, listeningListener?: Function): this;
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
-        close(callback?: Function): this;
+        close(callback?: (err?: Error) => void): this;
         address(): AddressInfo | string;
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
index 6602ce7af2..6ae1c52bde 100644
--- a/types/node/v10/node-tests.ts
+++ b/types/node/v10/node-tests.ts
@@ -1826,10 +1826,11 @@ async function asyncStreamPipelineFinished() {
         // close callback parameter is optional
         _server = _server.close();
 
-        // close callback parameter doesn't specify any arguments, so any
-        // function is acceptable
+        // close callback parameter can be either nothing (undefined) or an error
         _server = _server.close(() => { });
-        _server = _server.close((...args: any[]) => { });
+        _server = _server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
     }
 
     {
@@ -3502,9 +3503,11 @@ import * as p from "process";
             .ref()
             .unref();
 
-        // close has an optional callback function. No callback parameters are
-        // specified, so any callback function is permissible.
-        server = server.close((...args: any[]) => { });
+        // close callback parameter can be either nothing (undefined) or an error
+        server = server.close(() => { });
+        server = server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
 
         // test the types of the address object fields
         const address: net.AddressInfo | string = server.address();
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 9728ade03f..83deb05d33 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -23,6 +23,7 @@
 //                 Lishude <https://github.com/islishude>
 //                 Andrew Makarov <https://github.com/r3nya>
 //                 Jordi Oliveras Rovira <https://github.com/j-oliveras>
+//                 Thanik Bhongbhibhat <https://github.com/bhongy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -2901,7 +2902,7 @@ declare module "net" {
         listen(options: ListenOptions, listeningListener?: Function): this;
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
-        close(callback?: Function): this;
+        close(callback?: (err?: Error) => void): this;
         address(): { port: number; family: string; address: string; };
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 706b39600a..0ca392ab33 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -1299,10 +1299,11 @@ namespace tls_tests {
         // close callback parameter is optional
         _server = _server.close();
 
-        // close callback parameter doesn't specify any arguments, so any
-        // function is acceptable
+        // close callback parameter can be either nothing (undefined) or an error
         _server = _server.close(() => { });
-        _server = _server.close((...args: any[]) => { });
+        _server = _server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
     }
 
     {
@@ -2788,9 +2789,11 @@ namespace net_tests {
             .ref()
             .unref();
 
-        // close has an optional callback function. No callback parameters are
-        // specified, so any callback function is permissible.
-        server = server.close((...args: any[]) => { });
+        // close callback parameter can be either nothing (undefined) or an error
+        server = server.close(() => { });
+        server = server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
 
         // test the types of the address object fields
         let address = server.address();
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 9934b38eb4..ce36ad42d0 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -27,6 +27,7 @@
 //                 Andrew Makarov <https://github.com/r3nya>
 //                 Eugene Y. Q. Shen <https://github.com/eyqs>
 //                 Jordi Oliveras Rovira <https://github.com/j-oliveras>
+//                 Thanik Bhongbhibhat <https://github.com/bhongy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -3316,7 +3317,7 @@ declare module "net" {
         listen(options: ListenOptions, listeningListener?: Function): this;
         listen(handle: any, backlog?: number, listeningListener?: Function): this;
         listen(handle: any, listeningListener?: Function): this;
-        close(callback?: Function): this;
+        close(callback?: (err?: Error) => void): this;
         address(): AddressInfo | string;
         getConnections(cb: (error: Error | null, count: number) => void): void;
         ref(): this;
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index 4d0b5407c7..7d29ffbf95 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -1327,10 +1327,11 @@ namespace tls_tests {
         // close callback parameter is optional
         _server = _server.close();
 
-        // close callback parameter doesn't specify any arguments, so any
-        // function is acceptable
+        // close callback parameter can be either nothing (undefined) or an error
         _server = _server.close(() => { });
-        _server = _server.close((...args: any[]) => { });
+        _server = _server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
     }
 
     {
@@ -2826,9 +2827,11 @@ namespace net_tests {
             .ref()
             .unref();
 
-        // close has an optional callback function. No callback parameters are
-        // specified, so any callback function is permissible.
-        server = server.close((...args: any[]) => { });
+        // close callback parameter can be either nothing (undefined) or an error
+        server = server.close(() => { });
+        server = server.close((err) => {
+            if (typeof err !== 'undefined') { const _err: Error = err; }
+        });
 
         // test the types of the address object fields
         let address: net.AddressInfo | string = server.address();

From e5f8ae32346b7574f264ecc366914c8459fe4751 Mon Sep 17 00:00:00 2001
From: Ori Livni <ori@orisomething.com>
Date: Wed, 27 Feb 2019 10:21:44 +0200
Subject: [PATCH 248/924] electron-store - Fix `onDidChange` return value

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

diff --git a/types/electron-store/electron-store-tests.ts b/types/electron-store/electron-store-tests.ts
index f27cd6aca3..318af19f5c 100644
--- a/types/electron-store/electron-store-tests.ts
+++ b/types/electron-store/electron-store-tests.ts
@@ -52,3 +52,7 @@ typedElectronStore.set({
     enabled: true,
     interval: 10000,
 });
+
+const offDidChange = typedElectronStore.onDidChange("enabled", (n: boolean | undefined, p: boolean | undefined) => {});
+
+offDidChange();
diff --git a/types/electron-store/index.d.ts b/types/electron-store/index.d.ts
index 66e579b392..721386de2f 100644
--- a/types/electron-store/index.d.ts
+++ b/types/electron-store/index.d.ts
@@ -8,6 +8,8 @@
 
 /// <reference types="node" />
 
+import EventEmitter = require("events");
+
 type JSONValue = string | number | boolean | JSONObject | JSONArray;
 
 interface JSONObject {
@@ -79,12 +81,12 @@ declare class ElectronStore<T = {}> implements Iterable<[string, JSONValue]> {
      */
     onDidChange<K extends keyof T>(
         key: K,
-        callback: (newValue: T[K], oldValue: T[K]) => void
-    ): void;
+        callback: (newValue: T[K] | undefined, oldValue: T[K] | undefined) => void
+    ): () => EventEmitter;
     onDidChange(
         key: string,
-        callback: (newValue: JSONValue, oldValue: JSONValue) => void
-    ): void;
+        callback: (newValue: JSONValue | undefined, oldValue: JSONValue | undefined) => void
+    ): () => EventEmitter;
 
     /**
      * Get the item count.

From e1f5902b818ca6bad10eb5b1ffba96ec5150ba6f Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Sat, 2 Mar 2019 15:52:56 +1100
Subject: [PATCH 249/924] Added type defs for humanize-ms

---
 types/humanize-ms/humanize-ms-tests.ts |  5 +++++
 types/humanize-ms/index.d.ts           |  6 ++++++
 types/humanize-ms/tsconfig.json        | 25 +++++++++++++++++++++++++
 types/humanize-ms/tslint.json          |  3 +++
 4 files changed, 39 insertions(+)
 create mode 100644 types/humanize-ms/humanize-ms-tests.ts
 create mode 100644 types/humanize-ms/index.d.ts
 create mode 100644 types/humanize-ms/tsconfig.json
 create mode 100644 types/humanize-ms/tslint.json

diff --git a/types/humanize-ms/humanize-ms-tests.ts b/types/humanize-ms/humanize-ms-tests.ts
new file mode 100644
index 0000000000..80b675429a
--- /dev/null
+++ b/types/humanize-ms/humanize-ms-tests.ts
@@ -0,0 +1,5 @@
+import HumanizeMs from "humanize-ms";
+
+HumanizeMs('1s');
+
+HumanizeMs(1000);
diff --git a/types/humanize-ms/index.d.ts b/types/humanize-ms/index.d.ts
new file mode 100644
index 0000000000..ea7e65bc80
--- /dev/null
+++ b/types/humanize-ms/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for humanize-ms 1.2
+// Project: https://github.com/node-modules/humanize-ms
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function(input: string|number): number;
diff --git a/types/humanize-ms/tsconfig.json b/types/humanize-ms/tsconfig.json
new file mode 100644
index 0000000000..2e451381a9
--- /dev/null
+++ b/types/humanize-ms/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "humanize-ms-tests.ts"
+    ]
+}
diff --git a/types/humanize-ms/tslint.json b/types/humanize-ms/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/humanize-ms/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 558d043fd0f9b3e247839d2a09a16accf4e21e09 Mon Sep 17 00:00:00 2001
From: Akihiro Uchida <uchida@turbare.net>
Date: Sat, 2 Mar 2019 14:24:36 +0900
Subject: [PATCH 250/924] put options to createBrowserFetcher test

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

diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index e62be5b7d5..81c23e5b5e 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -621,7 +621,11 @@ puppeteer.launch().then(async browser => {
 
 (async () => {
   const rev = '630727';
-  const browserFetcher = puppeteer.createBrowserFetcher();
+  const browserFetcher = puppeteer.createBrowserFetcher({
+    host: 'https://storage.googleapis.com',
+    path: '/tmp/.local-chromium',
+    platform: 'linux',
+  });
   await browserFetcher.canDownload(rev);
   const revisionInfo = await browserFetcher.download(rev);
   await browserFetcher.remove(rev);

From efaf421de15617c280593b8a45168874896c391f Mon Sep 17 00:00:00 2001
From: Akihiro Uchida <uchida@turbare.net>
Date: Sat, 2 Mar 2019 14:24:47 +0900
Subject: [PATCH 251/924] fixes due to the review comments

---
 types/puppeteer/index.d.ts | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index a4bf6e0d73..aacd54a9d0 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -31,6 +31,8 @@ export interface JSONObject {
 }
 export type SerializableOrJSHandle = Serializable | JSHandle;
 
+export type Platform = "mac" | "win32" | "win64" | "linux";
+
 /** Defines `$eval` and `$$eval` for Page, Frame and ElementHandle. */
 export interface Evalable {
   /**
@@ -2187,26 +2189,14 @@ export interface CoverageEntry {
   ranges: Array<{start: number, end: number}>;
 }
 
-/** Attaches Puppeteer to an existing Chromium instance */
-export function connect(options?: ConnectOptions): Promise<Browser>;
-/** The default flags that Chromium will be launched with */
-export function defaultArgs(options?: ChromeArgOptions): string[];
-/** Path where Puppeteer expects to find bundled Chromium */
-export function executablePath(): string;
-/** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
-export function launch(options?: LaunchOptions): Promise<Browser>;
-
-/** This methods attaches Puppeteer to an existing Chromium instance. */
-export function createBrowserFetcher(options?: LaunchOptions): BrowserFetcher;
-
 /** BrowserFetcher can download and manage different versions of Chromium. */
 export interface BrowserFetcher {
   /** The method initiates a HEAD request to check if the revision is available. */
   canDownload(revision: string): Promise<boolean>;
   /** The method initiates a GET request to download the revision from the host. */
-  download(revision: string, progressCallback?: (downloadBytes: number, totalBytes: number) => any): Promise<RevisionInfo>;
+  download(revision: string, progressCallback?: (downloadBytes: number, totalBytes: number) => void): Promise<RevisionInfo>;
   localRevisions(): Promise<string[]>;
-  platform(): string;
+  platform(): Platform;
   remove(revision: string): Promise<void>;
   revisionInfo(revision: string): RevisionInfo;
 }
@@ -2223,3 +2213,23 @@ export interface RevisionInfo {
   /** whether the revision is locally available on disk */
   local: boolean;
 }
+
+export interface FetcherOptions {
+  /** A download host to be used. Defaults to `https://storage.googleapis.com`. */
+  host: string;
+  /** A path for the downloads folder. Defaults to `<root>/.local-chromium`, where `<root>` is puppeteer's package root. */
+  path: string;
+  /** Possible values are: `mac`, `win32`, `win64`, `linux`. Defaults to the current platform. */
+  platform: Platform;
+}
+
+/** Attaches Puppeteer to an existing Chromium instance */
+export function connect(options?: ConnectOptions): Promise<Browser>;
+/** The default flags that Chromium will be launched with */
+export function defaultArgs(options?: ChromeArgOptions): string[];
+/** Path where Puppeteer expects to find bundled Chromium */
+export function executablePath(): string;
+/** The method launches a browser instance with given arguments. The browser will be closed when the parent node.js process is closed. */
+export function launch(options?: LaunchOptions): Promise<Browser>;
+/** This methods attaches Puppeteer to an existing Chromium instance. */
+export function createBrowserFetcher(options?: FetcherOptions): BrowserFetcher;

From 8057cda1792524316a88ff73ca9054dd97b2888d Mon Sep 17 00:00:00 2001
From: Akihiro Uchida <uchida@turbare.net>
Date: Sat, 2 Mar 2019 17:07:47 +0900
Subject: [PATCH 252/924] make optional properties in FetcherOptions

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

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index aacd54a9d0..e043587e16 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -2216,11 +2216,11 @@ export interface RevisionInfo {
 
 export interface FetcherOptions {
   /** A download host to be used. Defaults to `https://storage.googleapis.com`. */
-  host: string;
+  host?: string;
   /** A path for the downloads folder. Defaults to `<root>/.local-chromium`, where `<root>` is puppeteer's package root. */
-  path: string;
+  path?: string;
   /** Possible values are: `mac`, `win32`, `win64`, `linux`. Defaults to the current platform. */
-  platform: Platform;
+  platform?: Platform;
 }
 
 /** Attaches Puppeteer to an existing Chromium instance */

From 4b389b4092cb2a915f75767823fdbad1947469fc Mon Sep 17 00:00:00 2001
From: Akihiro Uchida <uchida@turbare.net>
Date: Sat, 2 Mar 2019 17:13:58 +0900
Subject: [PATCH 253/924] add some tests to cover methods and properties

---
 types/puppeteer/puppeteer-tests.ts | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index 81c23e5b5e..90006c77d4 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -621,12 +621,25 @@ puppeteer.launch().then(async browser => {
 
 (async () => {
   const rev = '630727';
-  const browserFetcher = puppeteer.createBrowserFetcher({
+  const defaultFetcher = puppeteer.createBrowserFetcher();
+  const options: puppeteer.FetcherOptions = {
     host: 'https://storage.googleapis.com',
     path: '/tmp/.local-chromium',
     platform: 'linux',
-  });
-  await browserFetcher.canDownload(rev);
-  const revisionInfo = await browserFetcher.download(rev);
-  await browserFetcher.remove(rev);
+  };
+  const browserFetcher = puppeteer.createBrowserFetcher(options);
+  const canDownload = await browserFetcher.canDownload(rev);
+  if (canDownload) {
+      const revisionInfo = await browserFetcher.download(rev);
+      const localRevisions = await browserFetcher.localRevisions();
+      const browser = await puppeteer.launch({executablePath: revisionInfo.executablePath});
+      browser.close();
+      if (localRevisions.includes(rev)) {
+        await browserFetcher.remove(rev);
+      }
+      await browserFetcher.download(rev, (download, total) => {
+        console.log('downloadBytes:', download, 'totalBytes:', total);
+      });
+      await browserFetcher.remove(rev);
+    }
 });

From dc452cdb4d335ee6690480cbc6e3f557f51908bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:24:35 +0800
Subject: [PATCH 254/924] Create index.d.ts

retinajs
---
 retinajs/index.d.ts | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 retinajs/index.d.ts

diff --git a/retinajs/index.d.ts b/retinajs/index.d.ts
new file mode 100644
index 0000000000..58b3e3b653
--- /dev/null
+++ b/retinajs/index.d.ts
@@ -0,0 +1,42 @@
+export = retinajs.retina;
+
+export as namespace retinajs;
+
+declare namespace retinajs {
+  var hasWindow: boolean;
+
+  var environment: number;
+
+  var srcReplace: RegExp;
+
+  var inlineReplace: RegExp;
+
+  var selector: string;
+
+  var processedAttr: string;
+
+  var processedAttr: string;
+
+  function arrayify(object: any): HTMLImageElement[];
+
+  function chooseCap(cap: number | string): number;
+
+  function forceOriginalDimensions(image: HTMLImageElement): HTMLImageElement;
+
+  function setSourceIfAvailable(
+    image: HTMLImageElement,
+    retinaURL: string
+  ): void;
+
+  function dynamicSwapImage(image: HTMLImageElement, src: string): void;
+
+  function manualSwapImage(image: HTMLImageElement, hdsrc: string): void;
+
+  function getImages(images: HTMLImageElement[] | null): HTMLImageElement[];
+
+  function cleanBgImg(img: HTMLImageElement): HTMLImageElement;
+
+  function retina(): void;
+
+  function retina(images: any): void;
+}

From ecc222e7529c73a95b95fcac93c990d5040e7a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:47:59 +0800
Subject: [PATCH 255/924] create

---
 retinajs/package.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 retinajs/package.json

diff --git a/retinajs/package.json b/retinajs/package.json
new file mode 100644
index 0000000000..2c3081334e
--- /dev/null
+++ b/retinajs/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@types/retinajs",
+  "version": "2.1.3",
+  "description": "TypeScript definitions for retinajs",
+  "license": "MIT",
+  "contributors": [
+    "senjyouhara (https://github.com/senjyouhara)"
+  ],
+  "main": "",
+  "types": "index",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git"
+  },
+  "scripts": {},
+  "dependencies": {},
+  "typesPublisherContentHash": "4BCEA62CB241C5EA821904599800CBA7A5695E03776CAE7E46CC1FDE98B73069",
+  "typeScriptVersion": ">= 3.2",
+  "bugs": {
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
+  },
+  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped#readme",
+  "keywords": [
+    "retinajs",
+    "retina"
+  ],
+  "author": "senjyouhara"
+}

From 63a3de36cea6484083cc6ce613d3fa95aefee9cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:48:43 +0800
Subject: [PATCH 256/924] create

---
 types/retinajs/package.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 types/retinajs/package.json

diff --git a/types/retinajs/package.json b/types/retinajs/package.json
new file mode 100644
index 0000000000..2c3081334e
--- /dev/null
+++ b/types/retinajs/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@types/retinajs",
+  "version": "2.1.3",
+  "description": "TypeScript definitions for retinajs",
+  "license": "MIT",
+  "contributors": [
+    "senjyouhara (https://github.com/senjyouhara)"
+  ],
+  "main": "",
+  "types": "index",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git"
+  },
+  "scripts": {},
+  "dependencies": {},
+  "typesPublisherContentHash": "4BCEA62CB241C5EA821904599800CBA7A5695E03776CAE7E46CC1FDE98B73069",
+  "typeScriptVersion": ">= 3.2",
+  "bugs": {
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
+  },
+  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped#readme",
+  "keywords": [
+    "retinajs",
+    "retina"
+  ],
+  "author": "senjyouhara"
+}

From 0c8a03cc88985a2ee00cc8cf829263260870535a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:49:11 +0800
Subject: [PATCH 257/924] create

---
 types/retinajs/index.d.ts | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 types/retinajs/index.d.ts

diff --git a/types/retinajs/index.d.ts b/types/retinajs/index.d.ts
new file mode 100644
index 0000000000..58b3e3b653
--- /dev/null
+++ b/types/retinajs/index.d.ts
@@ -0,0 +1,42 @@
+export = retinajs.retina;
+
+export as namespace retinajs;
+
+declare namespace retinajs {
+  var hasWindow: boolean;
+
+  var environment: number;
+
+  var srcReplace: RegExp;
+
+  var inlineReplace: RegExp;
+
+  var selector: string;
+
+  var processedAttr: string;
+
+  var processedAttr: string;
+
+  function arrayify(object: any): HTMLImageElement[];
+
+  function chooseCap(cap: number | string): number;
+
+  function forceOriginalDimensions(image: HTMLImageElement): HTMLImageElement;
+
+  function setSourceIfAvailable(
+    image: HTMLImageElement,
+    retinaURL: string
+  ): void;
+
+  function dynamicSwapImage(image: HTMLImageElement, src: string): void;
+
+  function manualSwapImage(image: HTMLImageElement, hdsrc: string): void;
+
+  function getImages(images: HTMLImageElement[] | null): HTMLImageElement[];
+
+  function cleanBgImg(img: HTMLImageElement): HTMLImageElement;
+
+  function retina(): void;
+
+  function retina(images: any): void;
+}

From 8bd09c0fb42a8508d222aa500ba9a2758f148ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:49:33 +0800
Subject: [PATCH 258/924] create

---
 types/retinajs/LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 types/retinajs/LICENSE

diff --git a/types/retinajs/LICENSE b/types/retinajs/LICENSE
new file mode 100644
index 0000000000..21071075c2
--- /dev/null
+++ b/types/retinajs/LICENSE
@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

From 83f39442eb2dcbb9d1c830f8c827b8cdc5dfa856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 20:49:57 +0800
Subject: [PATCH 259/924] create

---
 types/retinajs/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 types/retinajs/README.md

diff --git a/types/retinajs/README.md b/types/retinajs/README.md
new file mode 100644
index 0000000000..d28dcdd483
--- /dev/null
+++ b/types/retinajs/README.md
@@ -0,0 +1,14 @@
+# Installation
+
+> `npm install --save @types/retinajs`
+
+# Summary
+
+This package contains type definitions for retinajs ( https://github.com/strues/retinajs ).
+
+# Details
+
+Additional Details
+
+- Last updated: Sat Mar 02 2019 15:07:39 GMT+0800
+- Dependencies: none

From d18678b1702f47319cbbf28547d71758f2cbe465 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 2 Mar 2019 13:57:54 +0100
Subject: [PATCH 260/924] Update to bootstrap 4.3

---
 types/bootstrap/bootstrap-tests.ts | 73 ++++++++++++------------------
 types/bootstrap/index.d.ts         | 21 ++++++++-
 2 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index 9344423cfb..01e5d5352f 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -196,6 +196,12 @@ $("#popover").popover({
     offset: 10,
     fallbackPlacement: ["flip", "clockwise"],
     boundary: "scrollParent",
+    sanitize: false,
+    whiteList: {
+        h1: [],
+        img: ['src', 'alt', 'title', 'width', 'height'],
+    },
+    sanitizeFn: (x: string) => x.replace("<", ""),
 });
 
 $("#popover").popover({
@@ -207,6 +213,10 @@ $("#popover").popover({
     },
 });
 
+$("#popover").popover({
+    sanitizeFn: null,
+});
+
 // --------------------------------------------------------------------------------------
 // Scrollspy
 // --------------------------------------------------------------------------------------
@@ -280,10 +290,23 @@ $("#tooltip").on("hide.bs.tooltip", () => {});
 
 $("#tooltip").tooltip({
     animation: false,
-});
-
-$("#tooltip").tooltip({
     container: "#container",
+    delay: {show: 500, hide: 100},
+    html: true,
+    placement: "auto",
+    selector: "[rel=\"tooltip\"]",
+    template: '<div class="tooltip empty" role="tooltip"></div>',
+    title: "Hello world",
+    trigger: "hover focus",
+    offset: 10,
+    fallbackPlacement: ["flip", "clockwise"],
+    boundary: "scrollParent",
+    sanitize: false,
+    whiteList: {
+        h1: [],
+        img: ['src', 'alt', 'title', 'width', 'height'],
+    },
+    sanitizeFn: (x: string) => x.replace("<", ""),
 });
 
 $("#tooltip").tooltip({
@@ -298,18 +321,6 @@ $("#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);
@@ -327,22 +338,10 @@ $("#tooltip").tooltip({
     },
 });
 
-$("#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,
 });
@@ -353,14 +352,6 @@ $("#tooltip").tooltip({
     },
 });
 
-$("#tooltip").tooltip({
-    trigger: "hover focus",
-});
-
-$("#tooltip").tooltip({
-    offset: 10,
-});
-
 $("#tooltip").tooltip({
     offset: "10px",
 });
@@ -369,14 +360,10 @@ $("#tooltip").tooltip({
     fallbackPlacement: "clockwise",
 });
 
-$("#tooltip").tooltip({
-    fallbackPlacement: ["flip", "clockwise"],
-});
-
-$("#tooltip").tooltip({
-    boundary: "scrollParent",
-});
-
 $("#tooltip").tooltip({
     boundary: aHtmlElement,
 });
+
+$("#popover").popover({
+    sanitizeFn: null,
+});
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 2fb473fc29..6dc5f21a28 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Bootstrap 4.2
+// Type definitions for Bootstrap 4.3
 // Project: https://github.com/twbs/bootstrap/, https://getbootstrap.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -352,6 +352,25 @@ export interface TooltipOption {
      * @default "scrollParent"
      */
     boundary?: Popper.Boundary | HTMLElement;
+
+    /**
+     * Enable or disable the sanitization. If activated 'template', 'content' and 'title' options will be sanitized.
+     *
+     * @default true
+     */
+    sanitize?: boolean;
+
+    /**
+     * Object which contains allowed attributes and tags.
+     */
+    whiteList?: {[key: string]: string[]};
+
+    /**
+     * Here you can supply your own sanitize function. This can be useful if you prefer to use a dedicated library to perform sanitization.
+     *
+     * @default null
+     */
+    sanitizeFn?: null | ((input: string) => string);
 }
 
 // --------------------------------------------------------------------------------------

From 96f97bd1ab84dcaaf4e8d1ca9380efd15409a2d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 21:03:24 +0800
Subject: [PATCH 261/924] Delete package.json

---
 retinajs/package.json | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 retinajs/package.json

diff --git a/retinajs/package.json b/retinajs/package.json
deleted file mode 100644
index 2c3081334e..0000000000
--- a/retinajs/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "@types/retinajs",
-  "version": "2.1.3",
-  "description": "TypeScript definitions for retinajs",
-  "license": "MIT",
-  "contributors": [
-    "senjyouhara (https://github.com/senjyouhara)"
-  ],
-  "main": "",
-  "types": "index",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git"
-  },
-  "scripts": {},
-  "dependencies": {},
-  "typesPublisherContentHash": "4BCEA62CB241C5EA821904599800CBA7A5695E03776CAE7E46CC1FDE98B73069",
-  "typeScriptVersion": ">= 3.2",
-  "bugs": {
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
-  },
-  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped#readme",
-  "keywords": [
-    "retinajs",
-    "retina"
-  ],
-  "author": "senjyouhara"
-}

From eed28b1a47cc7ca700d945e196db57e2e8ba736d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 21:17:55 +0800
Subject: [PATCH 262/924] Create index.d.ts

---
 types/retinajs/index.d.ts | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 types/retinajs/index.d.ts

diff --git a/types/retinajs/index.d.ts b/types/retinajs/index.d.ts
new file mode 100644
index 0000000000..58b3e3b653
--- /dev/null
+++ b/types/retinajs/index.d.ts
@@ -0,0 +1,42 @@
+export = retinajs.retina;
+
+export as namespace retinajs;
+
+declare namespace retinajs {
+  var hasWindow: boolean;
+
+  var environment: number;
+
+  var srcReplace: RegExp;
+
+  var inlineReplace: RegExp;
+
+  var selector: string;
+
+  var processedAttr: string;
+
+  var processedAttr: string;
+
+  function arrayify(object: any): HTMLImageElement[];
+
+  function chooseCap(cap: number | string): number;
+
+  function forceOriginalDimensions(image: HTMLImageElement): HTMLImageElement;
+
+  function setSourceIfAvailable(
+    image: HTMLImageElement,
+    retinaURL: string
+  ): void;
+
+  function dynamicSwapImage(image: HTMLImageElement, src: string): void;
+
+  function manualSwapImage(image: HTMLImageElement, hdsrc: string): void;
+
+  function getImages(images: HTMLImageElement[] | null): HTMLImageElement[];
+
+  function cleanBgImg(img: HTMLImageElement): HTMLImageElement;
+
+  function retina(): void;
+
+  function retina(images: any): void;
+}

From 074c39b139ffa668ce24c1dfbc34ad8f3680c998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 21:18:28 +0800
Subject: [PATCH 263/924] create

---
 types/retinajs/package.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 types/retinajs/package.json

diff --git a/types/retinajs/package.json b/types/retinajs/package.json
new file mode 100644
index 0000000000..2c3081334e
--- /dev/null
+++ b/types/retinajs/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@types/retinajs",
+  "version": "2.1.3",
+  "description": "TypeScript definitions for retinajs",
+  "license": "MIT",
+  "contributors": [
+    "senjyouhara (https://github.com/senjyouhara)"
+  ],
+  "main": "",
+  "types": "index",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git"
+  },
+  "scripts": {},
+  "dependencies": {},
+  "typesPublisherContentHash": "4BCEA62CB241C5EA821904599800CBA7A5695E03776CAE7E46CC1FDE98B73069",
+  "typeScriptVersion": ">= 3.2",
+  "bugs": {
+    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
+  },
+  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped#readme",
+  "keywords": [
+    "retinajs",
+    "retina"
+  ],
+  "author": "senjyouhara"
+}

From 0f9be7571c6a0ed2c0f7443c215f0956ebbec12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 21:18:46 +0800
Subject: [PATCH 264/924] create

---
 types/retinajs/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 types/retinajs/README.md

diff --git a/types/retinajs/README.md b/types/retinajs/README.md
new file mode 100644
index 0000000000..d28dcdd483
--- /dev/null
+++ b/types/retinajs/README.md
@@ -0,0 +1,14 @@
+# Installation
+
+> `npm install --save @types/retinajs`
+
+# Summary
+
+This package contains type definitions for retinajs ( https://github.com/strues/retinajs ).
+
+# Details
+
+Additional Details
+
+- Last updated: Sat Mar 02 2019 15:07:39 GMT+0800
+- Dependencies: none

From 4668a6dedf8eb5d411d4ce67394de71d53a88366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=BD=E5=B7=9D=E7=BF=BC?=
 <48148944+senjyouhara@users.noreply.github.com>
Date: Sat, 2 Mar 2019 21:19:06 +0800
Subject: [PATCH 265/924] create

---
 types/retinajs/LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 types/retinajs/LICENSE

diff --git a/types/retinajs/LICENSE b/types/retinajs/LICENSE
new file mode 100644
index 0000000000..21071075c2
--- /dev/null
+++ b/types/retinajs/LICENSE
@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

From 3bc7ca0fdea4ab321fb227cfa20910b68fd557ef Mon Sep 17 00:00:00 2001
From: Flexmonster Pivot Table <github@flexmonster.com>
Date: Sat, 2 Mar 2019 16:39:12 +0200
Subject: [PATCH 266/924] d.ts update

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

diff --git a/types/flexmonster/index.d.ts b/types/flexmonster/index.d.ts
index 192e8f2d93..fad76ca64d 100644
--- a/types/flexmonster/index.d.ts
+++ b/types/flexmonster/index.d.ts
@@ -193,6 +193,8 @@ declare namespace Flexmonster {
         hash?: string;
         username?: string;
         password?: string;
+        requestHeader?: object;
+        subquery?: string;
     }
 
     interface Slice {
@@ -278,6 +280,7 @@ declare namespace Flexmonster {
         saveAllFormats?: boolean;
         showDrillThroughConfigurator?: boolean;
         grouping?: boolean;
+        showAllFieldsDrillThrough?: boolean;
     }
 
     interface PrintOptions {
@@ -345,6 +348,7 @@ declare namespace Flexmonster {
         useOlapFormattingInExcel?: boolean;
         useCustomizeCellForData?: boolean;
         excelExportAll?: boolean;
+        requestHeader?: object;
     }
 
     interface Hierarchy {

From 0a5d7232d4929460ea810688ba78092a1d973fa0 Mon Sep 17 00:00:00 2001
From: Evgeni Zharkov <zharkov.ev.u@yandex.ru>
Date: Sat, 2 Mar 2019 18:31:09 +0300
Subject: [PATCH 267/924] Add typings for tarantool-driver

---
 types/tarantool-driver/index.d.ts             | 58 +++++++++++++++++++
 .../tarantool-driver-tests.ts                 |  3 +
 types/tarantool-driver/tsconfig.json          | 23 ++++++++
 types/tarantool-driver/tslint.json            |  1 +
 4 files changed, 85 insertions(+)
 create mode 100644 types/tarantool-driver/index.d.ts
 create mode 100644 types/tarantool-driver/tarantool-driver-tests.ts
 create mode 100644 types/tarantool-driver/tsconfig.json
 create mode 100644 types/tarantool-driver/tslint.json

diff --git a/types/tarantool-driver/index.d.ts b/types/tarantool-driver/index.d.ts
new file mode 100644
index 0000000000..63b34cb6fa
--- /dev/null
+++ b/types/tarantool-driver/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for tarantool-driver 3.0
+// Project: https://github.com/tarantool/node-tarantool-driver
+// Definitions by: Evgeni Zharkov <https://github.com/zharkov-eu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from "events";
+
+export interface TarantoolOptions {
+  host?: string;
+  port?: number;
+  username?: string;
+  password?: string;
+  reserveHosts?: string[];
+  beforeReserve?: number;
+  timeout?: number;
+  retryStrategy?: (times: number) => number;
+  lazyConnect?: boolean;
+}
+
+export default class TarantoolConnection extends EventEmitter {
+  constructor(options: TarantoolOptions);
+
+  /* Connection */
+
+  connect(): Promise<void>;
+
+  flushQueue(cb: (err: Error) => void): void;
+
+  destroy(): void;
+
+  disconnect(reconnect?: boolean): void;
+
+  /* Commands */
+
+  select(spaceId: number | string,
+                indexId: number | string,
+                limit: number, offset: number,
+                iterator: string, key: string | string[]): Promise<any>;
+
+  delete(spaceId: number | string,
+                indexId: number | string,
+                key: any[]): Promise<any>;
+
+  update(spaceId: number | string,
+                indexId: number | string,
+                key: any[], ops: any[]): Promise<any>;
+
+  upsert(spaceId: number | string,
+                ops: any[], tuple: any[]): Promise<any>;
+
+  eval(expression: string, ...args: any[]): Promise<any>;
+
+  call(functionName: string, ...args: any[]): Promise<any>;
+
+  insert(spaceId: number | string, tuple: any[]): Promise<any>;
+
+  replace(spaceId: number | string, tuple: any[]): Promise<any>;
+}
diff --git a/types/tarantool-driver/tarantool-driver-tests.ts b/types/tarantool-driver/tarantool-driver-tests.ts
new file mode 100644
index 0000000000..cf27d123fb
--- /dev/null
+++ b/types/tarantool-driver/tarantool-driver-tests.ts
@@ -0,0 +1,3 @@
+import TarantoolDriver from "tarantool-driver";
+
+new TarantoolDriver({}).connect(); // $ExpectedType Promise
diff --git a/types/tarantool-driver/tsconfig.json b/types/tarantool-driver/tsconfig.json
new file mode 100644
index 0000000000..c49fafed46
--- /dev/null
+++ b/types/tarantool-driver/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",
+        "tarantool-driver-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/tarantool-driver/tslint.json b/types/tarantool-driver/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/tarantool-driver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 26fe0ed1615538292deb11cbbb7a691dac2fbb46 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 2 Mar 2019 21:18:09 +0100
Subject: [PATCH 268/924] [pkg-conf] Remove types

---
 notNeededPackages.json           |  6 ++++++
 types/pkg-conf/index.d.ts        | 34 --------------------------------
 types/pkg-conf/pkg-conf-tests.ts |  6 ------
 types/pkg-conf/tsconfig.json     | 23 ---------------------
 types/pkg-conf/tslint.json       |  1 -
 5 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 types/pkg-conf/index.d.ts
 delete mode 100644 types/pkg-conf/pkg-conf-tests.ts
 delete mode 100644 types/pkg-conf/tsconfig.json
 delete mode 100644 types/pkg-conf/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..6b24197054 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1230,6 +1230,12 @@
             "sourceRepoURL": "https://github.com/PeculiarVentures/pkcs11js",
             "asOfVersion": "1.0.4"
         },
+        {
+            "libraryName": "pkg-conf",
+            "typingsPackageName": "pkg-conf",
+            "sourceRepoURL": "https://github.com/sindresorhus/pkg-conf",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "plottable",
             "typingsPackageName": "plottable",
diff --git a/types/pkg-conf/index.d.ts b/types/pkg-conf/index.d.ts
deleted file mode 100644
index 6a783c1891..0000000000
--- a/types/pkg-conf/index.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for pkg-conf 2.1
-// Project: https://github.com/sindresorhus/pkg-conf#readme
-// Definitions by: Jorge Gonzalez <https://github.com/jorgegonzalez>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-declare namespace pkgConf {
-    type AnyJson = boolean | number | string | null | JsonArray | JsonMap;
-    interface JsonArray extends Array<AnyJson> { }
-    interface JsonMap {
-        [key: string]: AnyJson;
-    }
-
-    interface Options {
-        // Directory to start looking up for a package.json file.
-        // Default: process.cwd()
-        cwd?: string;
-        // Default config.
-        defaults?: object;
-        // Skip package.json files that have the namespaced config explicitly set to false.
-        skipOnFalse?: boolean;
-    }
-
-    // Returns the config.
-    function sync(namespace: string, options?: Options): JsonMap;
-    // Pass in the config returned from any of the above methods.
-    // Returns the filepath to the package.json file or null when not found.
-    function filepath(config: JsonMap): string | null;
-}
-
-// Returns a Promise for the config.
-declare function pkgConf(namespace: string, options?: pkgConf.Options): Promise<pkgConf.JsonMap>;
-
-export = pkgConf;
diff --git a/types/pkg-conf/pkg-conf-tests.ts b/types/pkg-conf/pkg-conf-tests.ts
deleted file mode 100644
index bf2dee1e2f..0000000000
--- a/types/pkg-conf/pkg-conf-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import pkgConf = require('pkg-conf');
-
-pkgConf('name'); // $ExpectType Promise<JsonMap>
-const config = pkgConf.sync('bugs'); // $ExpectType JsonMap
-pkgConf.filepath(config); // $ExpectType string | null
-config.url; // $ExpectType AnyJson
diff --git a/types/pkg-conf/tsconfig.json b/types/pkg-conf/tsconfig.json
deleted file mode 100644
index 449922d19e..0000000000
--- a/types/pkg-conf/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pkg-conf-tests.ts"
-    ]
-}
diff --git a/types/pkg-conf/tslint.json b/types/pkg-conf/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/pkg-conf/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 41da6031823f34d2c08e276b952d0d110696bc53 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 2 Mar 2019 21:25:36 +0100
Subject: [PATCH 269/924] [p-queue] Remove types

---
 notNeededPackages.json            |   6 ++
 types/p-queue/index.d.ts          | 160 ------------------------------
 types/p-queue/p-queue-tests.ts    |  49 ---------
 types/p-queue/tsconfig.json       |  23 -----
 types/p-queue/tslint.json         |   1 -
 types/p-queue/v2/index.d.ts       | 103 -------------------
 types/p-queue/v2/p-queue-tests.ts |  51 ----------
 types/p-queue/v2/tsconfig.json    |  26 -----
 types/p-queue/v2/tslint.json      |   1 -
 9 files changed, 6 insertions(+), 414 deletions(-)
 delete mode 100644 types/p-queue/index.d.ts
 delete mode 100644 types/p-queue/p-queue-tests.ts
 delete mode 100644 types/p-queue/tsconfig.json
 delete mode 100644 types/p-queue/tslint.json
 delete mode 100644 types/p-queue/v2/index.d.ts
 delete mode 100644 types/p-queue/v2/p-queue-tests.ts
 delete mode 100644 types/p-queue/v2/tsconfig.json
 delete mode 100644 types/p-queue/v2/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..82c50ddaab 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1158,6 +1158,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/p-pipe",
             "asOfVersion": "2.0.1"
         },
+        {
+            "libraryName": "p-queue",
+            "typingsPackageName": "p-queue",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-queue",
+            "asOfVersion": "3.2.0"
+        },
         {
             "libraryName": "p-throttle",
             "typingsPackageName": "p-throttle",
diff --git a/types/p-queue/index.d.ts b/types/p-queue/index.d.ts
deleted file mode 100644
index 96fda8426a..0000000000
--- a/types/p-queue/index.d.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-// Type definitions for p-queue 3.1
-// Project: https://github.com/sindresorhus/p-queue#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-//                 Evan Shortiss <https://github.com/evanshortiss>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-/// <reference types="node" />
-
-import { EventEmitter } from 'events';
-
-export = PQueue;
-
-/**
- * Promise queue with concurrency control.
- */
-declare class PQueue<
-    TEnqueueOptions extends PQueue.QueueAddOptions = PQueue.DefaultAddOptions
-> extends EventEmitter {
-    /**
-     * Size of the queue.
-     */
-    readonly size: number;
-
-    /**
-     * Number of pending promises.
-     */
-    readonly pending: number;
-
-    /**
-     * Whether the queue is currently paused.
-     */
-    readonly isPaused: boolean;
-
-    constructor(opts?: PQueue.Options<TEnqueueOptions>);
-
-    /**
-     * Adds a sync or async task to the queue. Always returns a promise.
-     * @param fn Promise-returning/async function.
-     * @param opts
-     */
-    add<T>(fn: PQueue.Task<T>, opts?: TEnqueueOptions): Promise<T>;
-
-    /**
-     * Same as `.add()`, but accepts an array of sync or async functions
-     * and returns a promise that resolves when all functions are resolved.
-     * @param fn Array of Promise-returning/async functions.
-     */
-    addAll<TAll>(fns: Array<PQueue.Task<TAll>>, opts?: TEnqueueOptions): Promise<TAll[]>;
-
-    /**
-     * Returns a promise that settles when the queue becomes empty.
-     *
-     * Can be called multiple times. Useful if you for example add
-     * additional items at a later time.
-     */
-    onEmpty(): Promise<void>;
-
-    /**
-     * Returns a promise that settles when the queue becomes empty, and all
-     * promises have completed; `queue.size === 0 && queue.pending === 0`.
-     *
-     * The difference with `.onEmpty` is that `.onIdle` guarantees that all work
-     * from the queue has finished. `.onEmpty` merely signals that the queue is
-     * empty, but it could mean that some promises haven't completed yet.
-     */
-    onIdle(): Promise<void>;
-
-    /**
-     * Start (or resume) executing enqueued tasks within concurrency limit.
-     * No need to call this if queue is not paused
-     * (via `options.autoStart = false` or by `.pause()` method.)
-     */
-    start(): void;
-
-    /**
-     * Clear the queue.
-     */
-    clear(): void;
-
-    /**
-     * Put queue execution on hold.
-     */
-    pause(): void;
-
-    addListener(event: 'active', listener: () => void): this;
-    on(event: 'active', listener: () => void): this;
-    once(event: 'active', listener: () => void): this;
-    prependListener(event: 'active', listener: () => void): this;
-    prependOnceListener(event: 'active', listener: () => void): this;
-    removeListener(event: 'active', listener: () => void): this;
-    off(event: 'active', listener: () => void): this;
-    removeAllListeners(event?: 'active'): this;
-    listeners(event: 'active'): Array<() => void>;
-    rawListeners(event: 'active'): Array<() => void>;
-    emit(event: 'active'): boolean;
-    eventNames(): Array<'active'>;
-    listenerCount(type: 'active'): number;
-}
-
-declare namespace PQueue {
-    interface QueueAddOptions {
-        [key: string]: any;
-    }
-
-    interface QueueClassConstructor<TEnqueueOptions extends QueueAddOptions> {
-        new (): QueueClass<TEnqueueOptions>;
-    }
-
-    interface QueueClass<TEnqueueOptions extends QueueAddOptions> {
-        size: number;
-
-        enqueue(run: () => void, options?: TEnqueueOptions): void;
-
-        dequeue(): (() => void) | undefined;
-    }
-
-    interface Options<TEnqueueOptions extends QueueAddOptions> {
-        /**
-         * Concurrency limit. Minimum: `1`.
-         * @default Infinity
-         */
-        concurrency?: number;
-        /**
-         * Whether queue tasks within concurrency limit, are auto-executed as soon as they're added.
-         * @default true
-         */
-        autoStart?: boolean;
-        /**
-         * Class with a `enqueue` and `dequeue` method, and a `size` getter. See the
-         * [Custom QueueClass](https://github.com/sindresorhus/p-queue#custom-queueclass) section.
-         */
-        queueClass?: QueueClassConstructor<TEnqueueOptions>;
-        /**
-         * The max number of runs in the given interval of time. Minimum: `1`.
-         * @default Infinity
-         */
-        intervalCap?: number;
-        /**
-         * The length of time in milliseconds before the interval count resets. Must be finite. Minimum: `0`.
-         * @default 0
-         */
-        interval?: number;
-        /**
-         * Whether the task must finish in the given interval or will be carried over into the next interval count.
-         * @default false
-         */
-        carryoverConcurrencyCount?: boolean;
-    }
-
-    interface DefaultAddOptions {
-        /**
-         * Priority of operation. Operations with greater priority will be scheduled first.
-         * @default 0
-         */
-        priority?: number;
-    }
-
-    type Task<T> = (() => PromiseLike<T>) | (() => T);
-}
diff --git a/types/p-queue/p-queue-tests.ts b/types/p-queue/p-queue-tests.ts
deleted file mode 100644
index 4ce6fbb13e..0000000000
--- a/types/p-queue/p-queue-tests.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import PQueue = require('p-queue');
-
-const queue = new PQueue({ concurrency: 1 });
-new PQueue({ autoStart: false });
-new PQueue({ intervalCap: 1 });
-new PQueue({ interval: 0 });
-new PQueue({ carryoverConcurrencyCount: true });
-
-queue.add(() => Promise.resolve('sindresorhus.com')); // $ExpectType Promise<string>
-queue.add(() => 'sindresorhus.com'); // $ExpectType Promise<string>
-queue.add(() => 'sindresorhus.com', { priority: 1 }); // $ExpectType Promise<string>
-
-queue.addAll([() => Promise.resolve('oh'), () => 'hi']); // $ExpectType Promise<string[]>
-queue.addAll<string | number>([() => Promise.resolve('oh'), () => 1]); // $ExpectType Promise<(string | number)[]>
-queue.addAll([() => Promise.resolve('oh'), () => 'hi'], { priority: 1 }); // $ExpectType Promise<string[]>
-
-queue.onEmpty(); // $ExpectType Promise<void>
-queue.onIdle(); // $ExpectType Promise<void>
-queue.start();
-queue.pause();
-queue.clear();
-
-queue.size; // $ExpectType number
-queue.size = 1; // $ExpectError
-queue.pending; // $ExpectType number
-queue.pending = 5; // $ExpectError
-queue.isPaused; // $ExpectType boolean
-queue.isPaused = true; // $ExpectError
-
-class QueueClass implements PQueue.QueueClass<{ any: string }> {
-    private readonly queue: Array<() => void>;
-
-    size = 0;
-
-    constructor() {
-        this.queue = [];
-    }
-
-    enqueue(run: () => void, options: { any: string }) {
-        this.queue.push(run);
-    }
-
-    dequeue() {
-        return this.queue.shift();
-    }
-}
-
-const queue2 = new PQueue({ queueClass: QueueClass });
-queue2.add(() => Promise.resolve(), { any: 'hi' });
diff --git a/types/p-queue/tsconfig.json b/types/p-queue/tsconfig.json
deleted file mode 100644
index b3dd5e5314..0000000000
--- a/types/p-queue/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-queue-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-queue/tslint.json b/types/p-queue/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-queue/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-queue/v2/index.d.ts b/types/p-queue/v2/index.d.ts
deleted file mode 100644
index 568de0ca1d..0000000000
--- a/types/p-queue/v2/index.d.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Type definitions for p-queue 2.3
-// Project: https://github.com/sindresorhus/p-queue#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-//                 Evan Shortiss <https://github.com/evanshortiss>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = PQueue;
-
-declare class PQueue<O extends PQueue.QueueAddOptions = PQueue.DefaultAddOptions> {
-    /**
-     * Size of the queue.
-     */
-    size: number;
-
-    /**
-     * Number of pending promises.
-     */
-    pending: number;
-
-    /**
-     * Whether the queue is currently paused.
-     */
-    isPaused: boolean;
-
-    constructor(opts?: PQueue.Options<O>);
-
-    /**
-     * Returns the promise returned by calling fn.
-     * @param fn Promise-returning/async function.
-     */
-    add<T>(fn: PQueue.Task<T>, opts?: O): Promise<T>;
-
-    /**
-     * Same as .add(), but accepts an array of async functions and
-     * returns a promise that resolves when all async functions are resolved.
-     * @param fn Array of Promise-returning/async functions.
-     */
-    addAll<TAll>(fns: Array<PQueue.Task<TAll>>, opts?: O): Promise<TAll[]>;
-
-    /**
-     * Returns a promise that settles when the queue becomes empty.
-     * Can be called multiple times. Useful if you for example add
-     * additional items at a later time.
-     */
-    onEmpty(): Promise<void>;
-
-    /**
-     * Returns a promise that settles when the queue becomes empty, and all
-     * promises have completed; queue.size === 0 && queue.pending === 0.
-     * The difference with .onEmpty is that .onIdle guarantees that all work
-     * from the queue has finished. .onEmpty merely signals that the queue is
-     * empty, but it could mean that some promises haven't completed yet.
-     */
-    onIdle(): Promise<void>;
-
-    /**
-     * Start (or resume) executing enqueued tasks within concurrency limit.
-     * No need to call this if queue is not paused (via options.autoStart = false
-     * or by .pause() method.)
-     */
-    start(): void;
-
-    /**
-     * Clear the queue.
-     */
-    clear(): void;
-
-    /**
-     * Put queue execution on hold.
-     */
-    pause(): void;
-}
-
-declare namespace PQueue {
-    interface QueueAddOptions {
-        [key: string]: any;
-    }
-
-    interface QueueClassConstructor<O extends QueueAddOptions> {
-        new(): QueueClass<O>;
-    }
-
-    interface QueueClass<O extends QueueAddOptions> {
-        size: number;
-
-        enqueue(run: () => void, options?: O): void;
-
-        dequeue(): (() => void) | undefined;
-    }
-
-    interface Options<O extends QueueAddOptions> {
-        concurrency?: number;
-        autoStart?: boolean;
-        queueClass?: QueueClassConstructor<O>;
-    }
-
-    interface DefaultAddOptions {
-        priority?: number;
-    }
-
-    type Task<T> = () => Promise<T>;
-}
diff --git a/types/p-queue/v2/p-queue-tests.ts b/types/p-queue/v2/p-queue-tests.ts
deleted file mode 100644
index fcd48c852d..0000000000
--- a/types/p-queue/v2/p-queue-tests.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import PQueue = require("p-queue");
-
-const queue = new PQueue({ concurrency: 1 });
-
-queue
-    .add(() => Promise.resolve("sindresorhus.com"))
-    .then(sindre => {
-        const str: string = sindre;
-    });
-
-queue.addAll([() => Promise.resolve("oh"), () => Promise.resolve("hi")]).then(r => {
-    r.indexOf("h");
-});
-
-Promise.resolve((): Promise<string> => Promise.resolve("unicorn"))
-    .then(task => queue.add(task, { priority: 5 }))
-    .then(unicorn => {
-        const str: string = unicorn;
-    });
-
-queue.onEmpty().then(() => {});
-queue.onIdle().then(() => {});
-queue.start();
-queue.pause();
-queue.clear();
-
-let num: number;
-num = queue.size;
-num = queue.pending;
-const paused = queue.isPaused;
-
-class QueueClass implements PQueue.QueueClass<{ any: string }> {
-    private readonly queue: Array<() => void>;
-
-    size = 0;
-
-    constructor() {
-        this.queue = [];
-    }
-
-    enqueue(run: () => void, options: { any: string }) {
-        this.queue.push(run);
-    }
-
-    dequeue() {
-        return this.queue.shift();
-    }
-}
-
-const queue2 = new PQueue({ queueClass: QueueClass });
-queue2.add(() => Promise.resolve(), { any: "hi" });
diff --git a/types/p-queue/v2/tsconfig.json b/types/p-queue/v2/tsconfig.json
deleted file mode 100644
index 49d979aa06..0000000000
--- a/types/p-queue/v2/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "p-queue": [ "p-queue/v2" ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-queue-tests.ts"
-    ]
-}
diff --git a/types/p-queue/v2/tslint.json b/types/p-queue/v2/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-queue/v2/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 71d5d3eb68861b24546f8d171f7c3a8ef226d778 Mon Sep 17 00:00:00 2001
From: ark120202 <ark120202@gmail.com>
Date: Sun, 3 Mar 2019 01:07:11 +0500
Subject: [PATCH 270/924] Add types for wordwrap

---
 types/wordwrap/index.d.ts        | 51 ++++++++++++++++++++++++++++++++
 types/wordwrap/tsconfig.json     | 23 ++++++++++++++
 types/wordwrap/tslint.json       |  1 +
 types/wordwrap/wordwrap-tests.ts | 19 ++++++++++++
 4 files changed, 94 insertions(+)
 create mode 100644 types/wordwrap/index.d.ts
 create mode 100644 types/wordwrap/tsconfig.json
 create mode 100644 types/wordwrap/tslint.json
 create mode 100644 types/wordwrap/wordwrap-tests.ts

diff --git a/types/wordwrap/index.d.ts b/types/wordwrap/index.d.ts
new file mode 100644
index 0000000000..63f700df13
--- /dev/null
+++ b/types/wordwrap/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for wordwrap 1.0
+// Project: https://github.com/substack/node-wordwrap#readme
+// Definitions by: ark120202 <https://github.com/ark120202>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Wrap = (text: string) => string;
+
+/**
+ * Wrap lines until column `stop`. If a word is longer than `stop` characters
+ * it will overflow.
+ */
+declare function wordwrap(stop: number, params?: { mode?: wordwrap.Mode }): Wrap;
+
+/**
+ * Pad out lines with spaces out to column `start` and then wrap until column
+ * `stop`. If a word is longer than `stop - start` characters it will overflow.
+ */
+declare function wordwrap(start: number, stop: number, params?: { mode?: wordwrap.Mode }): Wrap;
+
+/**
+ * Pad out lines with spaces out to column `start` and then wrap until column
+ * `stop`. If a word is longer than `stop - start` characters it will overflow.
+ */
+declare function wordwrap(params: wordwrap.Options): Wrap;
+
+declare namespace wordwrap {
+    interface Options {
+        stop: number;
+        start: number;
+        mode?: Mode;
+    }
+
+    /**
+     * Wrap lines until column `stop`. Break up chunks longer than `stop`.
+     */
+    function hard(stop: number): Wrap;
+
+    /**
+     * Wrap lines until column `stop`. Break up chunks longer than `stop - start`.
+     */
+    function hard(start: number, stop: number): Wrap; // tslint:disable-line:unified-signatures
+
+    /**
+     * In "soft" mode, split chunks by `/(\S+\s+/` and don't break up chunks
+     * which are longer than `stop - start`, in "hard" mode, split chunks with
+     * `/\b/` and break up chunks longer than `stop - start`.
+     */
+    type Mode = "soft" | "hard";
+}
+
+export = wordwrap;
diff --git a/types/wordwrap/tsconfig.json b/types/wordwrap/tsconfig.json
new file mode 100644
index 0000000000..5444f259f7
--- /dev/null
+++ b/types/wordwrap/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",
+        "wordwrap-tests.ts"
+    ]
+}
diff --git a/types/wordwrap/tslint.json b/types/wordwrap/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wordwrap/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wordwrap/wordwrap-tests.ts b/types/wordwrap/wordwrap-tests.ts
new file mode 100644
index 0000000000..d9661bdac0
--- /dev/null
+++ b/types/wordwrap/wordwrap-tests.ts
@@ -0,0 +1,19 @@
+import wordwrap = require("wordwrap");
+
+// $ExpectType Wrap
+wordwrap(80);
+
+// $ExpectType string
+wordwrap(80)("");
+
+// $ExpectType string
+wordwrap(20, 80)("");
+
+// $ExpectType string
+wordwrap({ start: 20, stop: 80 })("");
+
+// $ExpectType string
+wordwrap(80, { mode: "hard" })("");
+
+// $ExpectType string
+wordwrap.hard(80)("");

From 42525f11d7536811e47362f6fa70b25e99023e7c Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 2 Mar 2019 21:38:57 +0100
Subject: [PATCH 271/924] [p-limit] Remove types

---
 notNeededPackages.json         |  6 +++++
 types/p-limit/index.d.ts       | 43 ----------------------------------
 types/p-limit/p-limit-tests.ts | 23 ------------------
 types/p-limit/tsconfig.json    | 23 ------------------
 types/p-limit/tslint.json      |  1 -
 5 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 types/p-limit/index.d.ts
 delete mode 100644 types/p-limit/p-limit-tests.ts
 delete mode 100644 types/p-limit/tsconfig.json
 delete mode 100644 types/p-limit/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..4f3620d26f 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1146,6 +1146,12 @@
             "sourceRepoURL": "http://onsen.io",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "p-limit",
+            "typingsPackageName": "p-limit",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-limit",
+            "asOfVersion": "2.2.0"
+        },
         {
             "libraryName": "p-map",
             "typingsPackageName": "p-map",
diff --git a/types/p-limit/index.d.ts b/types/p-limit/index.d.ts
deleted file mode 100644
index de7b0a07d9..0000000000
--- a/types/p-limit/index.d.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Type definitions for p-limit 2.1
-// Project: https://github.com/sindresorhus/p-limit#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-//                 Linus Unnebäck <https://github.com/LinusU>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.0
-
-export = pLimit;
-
-/**
- * Run multiple promise-returning & async functions with limited concurrency.
- * @param concurrency Concurrency limit. Minimum: `1`.
- * @returns A `limit` function.
- */
-declare function pLimit(concurrency: number): pLimit.Limit;
-
-declare namespace pLimit {
-    interface Limit {
-        /**
-         * Returns the promise returned by calling `fn(...args)`.
-         *
-         * @param fn Promise-returning/async function.
-         * @param args Any arguments to pass through to `fn`.
-         * Support for passing arguments on to the `fn` is provided in order to be able to avoid
-         * creating unnecessary closures. You probably don't need this optimization unless you're
-         * pushing a lot of functions.
-         */
-        <TArgs extends any[], R>(
-            fn: (...args: TArgs) => PromiseLike<R> | R,
-            ...args: TArgs
-        ): Promise<R>;
-
-        /**
-         * The number of promises that are currently running.
-         */
-        readonly activeCount: number;
-
-        /**
-         * The number of promises that are waiting to run (i.e. their internal `fn` was not called yet).
-         */
-        readonly pendingCount: number;
-    }
-}
diff --git a/types/p-limit/p-limit-tests.ts b/types/p-limit/p-limit-tests.ts
deleted file mode 100644
index 3f9fb51083..0000000000
--- a/types/p-limit/p-limit-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import pLimit = require('p-limit');
-
-const limit = pLimit(1);
-
-const input = [
-    limit(() => Promise.resolve('foo')),
-    limit(() => Promise.resolve('bar')),
-    limit(() => Promise.resolve(undefined)),
-];
-
-Promise.all(input); // $ExpectType Promise<(string | undefined)[]>
-
-limit((a: string) => '', 'test').then(v => {
-    v; // $ExpectType string
-});
-limit((a: string, b: number) => Promise.resolve(''), 'test', 1).then(v => {
-    v; // $ExpectType string
-});
-
-limit.activeCount; // $ExpectType number
-limit.activeCount = 1; // $ExpectError
-limit.pendingCount; // $ExpectType number
-limit.pendingCount = 1; // $ExpectError
diff --git a/types/p-limit/tsconfig.json b/types/p-limit/tsconfig.json
deleted file mode 100644
index 4634bf6300..0000000000
--- a/types/p-limit/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-limit-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-limit/tslint.json b/types/p-limit/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-limit/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From ab4aa16e85e13003fdf5f369525ff81e4c1ec8ed Mon Sep 17 00:00:00 2001
From: alreadyExisted <vit.polyanskiy@gmail.com>
Date: Sat, 2 Mar 2019 22:43:58 +0200
Subject: [PATCH 272/924] #30562 Updated VictoryLegendProps

---
 types/victory/index.d.ts        | 2008 ++++++++++++++++---------------
 types/victory/victory-tests.tsx |   28 +-
 2 files changed, 1036 insertions(+), 1000 deletions(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index f5c67995da..b34b192a65 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 snerks <https://github.com/snerks>
 //                 Krzysztof Cebula <https://github.com/Havret>
-//                 Vitaliy Polyanskiy <https://github.com/alredyExist>
+//                 Vitaliy Polyanskiy <https://github.com/allreadyExisted>
 //                 James Lismore <https://github.com/jlismore>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
@@ -16,7 +16,7 @@ declare module "victory" {
   /**
    * Single animation object to interpolate
    */
-  export type AnimationStyle = { [key: string ]: string | number };
+  export type AnimationStyle = { [key: string]: string | number };
 
   /**
    * Animation styles to interpolate
@@ -32,6 +32,20 @@ declare module "victory" {
     "expIn" | "expOut" | "expInOut" | "poly" | "polyIn" | "polyOut" | "polyInOut" |
     "quad" | "quadIn" | "quadOut" | "quadInOut" | "sin" | "sinIn" | "sinOut" | "sinInOut";
 
+  /**
+   * @see https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
+   */
+  type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+  type BlockProps = {
+    top?: number;
+    bottom?: number;
+    left?: number;
+    right?: number;
+  };
+
+  type PaddingProps = number | BlockProps;
+
   // Many victory components accept string or number or callback which returns string or number
   type StringOrNumberOrCallback =
     | string
@@ -44,9 +58,9 @@ declare module "victory" {
    * Style interface used in components/themeing
    */
   export interface VictoryStyleInterface {
-      parent?: VictoryStyleObject;
-      data?: VictoryStyleObject;
-      labels?: VictoryStyleObject;
+    parent?: VictoryStyleObject;
+    data?: VictoryStyleObject;
+    labels?: VictoryStyleObject;
   }
 
   export interface VictoryAnimationProps {
@@ -774,8 +788,10 @@ declare module "victory" {
      */
     eventHandlers: {
       [key: string]: {
-        (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey> } |
-        { (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey>[]
+        (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey>
+      } |
+      {
+        (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey>[]
       }
     };
   }
@@ -791,8 +807,8 @@ declare module "victory" {
    * Domain padding
    */
   type DomainPaddingPropType = number | {
-    x?: number | [ number, number];
-    y?: number | [ number, number];
+    x?: number | [number, number];
+    y?: number | [number, number];
   };
 
   /**
@@ -858,12 +874,7 @@ declare module "victory" {
      * and right.
      * @default 50
      */
-    padding?: number | {
-      top?: number;
-      bottom?: number;
-      left?: number;
-      right?: number;
-    };
+    padding?: PaddingProps;
     /**
      * The scale prop determines which scales your chart should use. This prop can be
      * given as a string specifying a supported scale ("linear", "time", "log", "sqrt"),
@@ -1030,66 +1041,66 @@ declare module "victory" {
   }
 
   export interface VictoryAreaProps
-      extends VictoryCommonProps,
-          VictoryDatableProps,
-          VictorySingleLabableProps {
-      /**
-       * The event prop take an array of event objects. Event objects are composed of
-       * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, so "data" and "labels" are all valid targets for VictoryArea events.
-       * Since VictoryArea only renders a single element, the eventKey property is not used.
-       * The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey keys,
-       * and a mutation key whose value is a function. The target and eventKey keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. an area), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @example
-       * events={[
-       *   {
-       *     target: "data",
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {fill: "orange"})};
-       *              }
-       *            }, {
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", "all">[];
-      /**
-       * The interpolation prop determines how data points should be connected when plotting a line
-       * @default "linear"
-       */
-      interpolation?: InterpolationPropType;
-      /**
-       * The samples prop specifies how many individual points to plot when plotting
-       * y as a function of x. Samples is ignored if x props are provided instead.
-       * @default 50
-       */
-      samples?: number;
-      /**
-       * The style prop specifies styles for your VictoryArea. Any valid inline style properties
-       * will be applied. Height, width, and padding should be specified via the height,
-       * width, and padding props, as they are used to calculate the alignment of
-       * components within chart.
-       * @example {data: {fill: "red"}, labels: {fontSize: 12}}
-       */
-      style?: VictoryStyleInterface;
+    extends VictoryCommonProps,
+    VictoryDatableProps,
+    VictorySingleLabableProps {
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryArea events.
+     * Since VictoryArea only renders a single element, the eventKey property is not used.
+     * The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. an area), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @example
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", "all">[];
+    /**
+     * The interpolation prop determines how data points should be connected when plotting a line
+     * @default "linear"
+     */
+    interpolation?: InterpolationPropType;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     * @default 50
+     */
+    samples?: number;
+    /**
+     * The style prop specifies styles for your VictoryArea. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart.
+     * @example {data: {fill: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
   }
 
   /**
@@ -1341,13 +1352,13 @@ declare module "victory" {
      */
     cornerRadius?: NumberOrCallback
     | {
-        top?: number | (NumberOrCallback),
-        topLeft?: number | (NumberOrCallback),
-        topRight?: number | (NumberOrCallback),
-        bottom?: number | (NumberOrCallback),
-        bottomLeft?: number | (NumberOrCallback),
-        bottomRight?: number | (NumberOrCallback)
-      };
+      top?: number | (NumberOrCallback),
+      topLeft?: number | (NumberOrCallback),
+      topRight?: number | (NumberOrCallback),
+      bottom?: number | (NumberOrCallback),
+      bottomLeft?: number | (NumberOrCallback),
+      bottomRight?: number | (NumberOrCallback)
+    };
     /**
      * The event prop take an array of event objects. Event objects are composed of
      * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
@@ -1418,917 +1429,924 @@ declare module "victory" {
    */
   export class VictoryBar extends React.Component<VictoryBarProps, any> {}
 
-    export interface VictoryBoxPlotStyleInterface
-        extends VictoryStyleInterface {
-        max?: VictoryStyleObject;
-        maxLabels?: VictoryStyleObject;
-        min?: VictoryStyleObject;
-        minLabels?: VictoryStyleObject;
-        median?: VictoryStyleObject;
-        medianLabels?: VictoryStyleObject;
-        q1?: VictoryStyleObject;
-        q1Labels?: VictoryStyleObject;
-        q3?: VictoryStyleObject;
-        q3Labels?: VictoryStyleObject;
-    }
-
-    export interface VictoryBoxPlotProps
-        extends VictoryCommonProps,
-            VictoryDatableProps {
-        /**
-         * The boxWidth prop specifies how wide each box should be. If the whiskerWidth
-         * prop is not set, this prop will also determine the width of the whisker crosshair.
-         */
-        boxWidth?: number;
-        /**
-         * The domain prop describes the range of values your chart will include. This prop can be
-         * given as a array of the minimum and maximum expected values for your chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The domainPadding prop specifies a number of pixels of padding to add to the
-         * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-         * from the origin to prevent crowding. This prop should be given as an object with
-         * numbers specified for x and y.
-         */
-        domainPadding?: DomainPaddingPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-         * individual child of VictoryChart, either by its name prop, or by index. The eventKey
-         * may optionally be used to select a single element by index or eventKey rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey and childName keys,
-         * and a mutation key whose value is a function. The target and eventKey and childName keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     childName: "firstBar",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              childName: "secondBar",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              childName: "secondBar",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         */
-        events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The horizontal prop determines whether the bars will be laid vertically or
-         * horizontally. The bars will be vertical if this prop is false or unspecified,
-         * or horizontal if the prop is set to true.
-         */
-        horizontal?: boolean;
-        /**
-         * The labelOrientation prop determines where labels are placed relative to their
-         * corresponding data. If this prop is not set, it will be set to “top” for
-         * horizontal charts, and “right” for vertical charts.
-         */
-        labelOrientation?: "top" | "bottom" | "left" | "right";
-        /**
-         * When the boolean labels prop is set to true, the values for min, max, median,
-         * q1, and q3 will be displayed for each box. For more granular label control, use
-         * the individual minLabels, maxLabels, medianLabels, q1Labels, and q3Labels props.
-         */
-        labels?: boolean;
-        /**
-         * Use the max data accessor prop to define the max value of a box plot.
-         */
-        max?: StringOrNumberOrCallback;
-        /**
-         * Use the median data accessor prop to define the median value of a box plot.
-         */
-        median?: StringOrNumberOrCallback;
-        /**
-         * Use the min data accessor prop to define the min value of a box plot.
-         */
-        min?: StringOrNumberOrCallback;
-        /**
-         * Use the q1 data accessor prop to define the q1 value of a box plot.
-         */
-        q1?: StringOrNumberOrCallback;
-        /**
-         * Use the q3 data accessor prop to define the q1 value of a box plot.
-         */
-        q3?: StringOrNumberOrCallback;
-        /**
-         * The style prop defines the style of the component. The style prop
-         * should be given as an object with styles defined for parent, max,
-         * maxLabels, min, minLabels,median, medianLabels,q1, q1Labels,q3,
-         * q3Labels. Any valid svg styles are supported, but width, height, a
-         * nd padding should be specified via props as they determine relative
-         * layout for components in VictoryChart. Functional styles may be
-         * defined for style properties, and they will be evaluated with each datum.
-         */
-        style?: VictoryBoxPlotStyleInterface;
-        /**
-         * The whiskerWidth prop specifies how wide each whisker crosshair should be. If the
-         * whiskerWidth prop is not set, the width of the whisker crosshair will match
-         * the width of the box.
-         */
-        whiskerWidth?: number;
-    }
-
-    /**
-     * VictoryBoxPlot renders a box plot to describe the distribution of a set of data. Data for
-     * VictoryBoxPlot may be given with summary statistics pre-calculated (min, median, max, q1, q3),
-     * or as an array of raw data. VictoryBoxPlot can be composed with VictoryChart to create box plot charts.
-     */
-    export class VictoryBoxPlot extends React.Component<
-        VictoryBoxPlotProps,
-        any
-    > {}
-
-    export interface VictoryChartProps extends VictoryCommonProps {
-        /**
-         * The domain prop describes the range of values your chart will include. This prop can be
-         * given as a array of the minimum and maximum expected values for your chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The domainPadding prop specifies a number of pixels of padding to add to the
-         * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-         * from the origin to prevent crowding. This prop should be given as an object with
-         * numbers specified for x and y.
-         */
-        domainPadding?: DomainPaddingPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-         * individual child of VictoryChart, either by its name prop, or by index. The eventKey
-         * may optionally be used to select a single element by index or eventKey rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey and childName keys,
-         * and a mutation key whose value is a function. The target and eventKey and childName keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     childName: "firstBar",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              childName: "secondBar",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              childName: "secondBar",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         */
-        events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The style prop specifies styles for your chart. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart.
-         * @example {border: "1px solid #ccc", margin: "2%", maxWidth: "40%"}
-         */
-        style?: Pick<VictoryStyleInterface, 'parent'>;
-    }
-
-    /**
-     * A flexible charting component for React.
-     * VictoryChart composes other Victory components into reusable charts.
-     * Acting as a coordinator rather than a stand-alone component, VictoryChart reconciles props such as domain and scale for child components,
-     * and provides a set of sensible defaults. This component works with:
-     * - VictoryAxis
-     * - VictoryLine
-     * - VictoryScatter
-     * - VictoryBar
-     */
-    export class VictoryChart extends React.Component<VictoryChartProps, any> {}
-
-    export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-      /**
-       * The categories prop specifies how categorical data for a chart should be ordered.
-       * This prop should be given as an array of string values, or an object with
-       * these values for x and y. When categories are not given as an object
-       * When this prop is set on a wrapper component, it will dictate the categories of
-       * its the children. If this prop is not set, any categories on child component
-       * or categorical data, will be merged to create a shared set of categories.
-       * @example ["dogs", "cats", "mice"]
-       */
-      categories?: CategoryPropType;
-      /**
-       * The colorScale prop is an optional prop that defines the color scale the chart's bars
-       * will be created on. This prop should be given as an array of CSS colors, or as a string
-       * corresponding to one of the built in color scales. VictoryBar will automatically assign
-       * values from this color scale to the bars unless colors are explicitly provided in the
-       * `dataAttributes` prop.
-       */
-      colorScale?: ColorScalePropType;
-      /**
-       * The domain prop describes the range of values your chart will include. This prop can be
-       * given as a array of the minimum and maximum expected values for your chart,
-       * or as an object that specifies separate arrays for x and y.
-       * If this prop is not provided, a domain will be calculated from data, or other
-       * available information.
-       * @examples: [-1, 1], {x: [0, 100], y: [0, 1]}
-       */
-      domain?: DomainPropType;
-      /**
-       * The domainPadding prop specifies a number of pixels of padding to add to the
-       * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-       * from the origin to prevent crowding. This prop should be given as an object with
-       * numbers specified for x and y.
-       */
-      domainPadding?: DomainPaddingPropType;
-      /**
-       * The event prop take an array of event objects. Event objects are composed of
-       * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-       * individual child of VictoryGroup, either by its name prop, or by index. The eventKey
-       * may optionally be used to select a single element by index or eventKey rather than
-       * an entire set. The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey and childName keys,
-       * and a mutation key whose value is a function. The target and eventKey and childName keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. a single bar), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @examples
-       * events={[
-       *   {
-       *     target: "data",
-       *     childName: "firstBar",
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              childName: "secondBar",
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {fill: "orange"})};
-       *              }
-       *            }, {
-       *              childName: "secondBar",
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-      /**
-       * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-       * assign eventKeys to data
-       */
-      eventKey?: StringOrNumberOrCallback;
-      /**
-       * The horizontal prop determines whether the bars will be laid vertically or
-       * horizontally. The bars will be vertical if this prop is false or unspecified,
-       * or horizontal if the prop is set to true.
-       */
-      horizontal?: boolean;
-      /**
-       * The offset prop determines the number of pixels each element in a group should
-       * be offset from its original position of the on the independent axis. In the
-       * case of groups of bars, this number should be equal to the width of the bar
-       * plus the desired spacing between bars.
-       */
-      offset?: number;
-      /**
-       * The style prop specifies styles for your grouped chart. These styles will be
-       * applied to all grouped children
-       */
-      style?: VictoryStyleInterface;
-    }
-
-    export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
-
-    export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
-      /**
-       * The event prop take an array of event objects. Event objects are composed of
-       * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, so "data" and "labels" are all valid targets for VictoryLine events.
-       * Since VictoryLine only renders a single element, the eventKey property is not used.
-       * The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey keys,
-       * and a mutation key whose value is a function. The target and eventKey keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. a line), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @examples
-       * events={[
-       *   {
-       *     target: "data",
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {stroke: "orange"})};
-       *              }
-       *            }, {
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
-      /**
-       * The interpolation prop determines how data points should be connected
-       * when plotting a line
-       */
-      interpolation?: InterpolationPropType;
-      /**
-       * The samples prop specifies how many individual points to plot when plotting
-       * y as a function of x. Samples is ignored if x props are provided instead.
-       */
-      samples?: number;
-      /**
-       * The labels prop defines the labels that will appear above each point.
-       * This prop should be given as an array or as a function of data.
-       */
-      labels?: string[]|number[]|Function;
-      /**
-       * Use the sortKey prop to indicate how data should be sorted. This prop
-       * is given directly to the lodash sortBy function to be executed on the
-       * final dataset.
-       */
-      sortKey?: string|string[]|Function;
-      /**
-       * The style prop specifies styles for your VictoryLine. Any valid inline style properties
-       * will be applied. Height, width, and padding should be specified via the height,
-       * width, and padding props, as they are used to calculate the alignment of
-       * components within chart. in addition to normal style properties, angle and verticalAnchor
-       * may also be specified via the labels object, and they will be passed as props to
-       * VictoryLabel, or any custom labelComponent.
-       * @examples{data: {stroke: "red"}, labels: {fontSize: 12}}
-       */
-      style?: VictoryStyleInterface;
-    }
-
-    /**
-     * VictoryLine creates a line based on data. VictoryLine is a composable component, so it does not include an axis.
-     * Check out VictoryChart for easy to use line charts and more.
-     */
-    export class VictoryLine extends React.Component<VictoryLineProps, any> {}
-
-    export interface VictoryLegendProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
-      /**
-       * The colorScale prop defines a color scale to be applied to each data
-       * symbol in VictoryLegend. This prop should be given as an array of CSS
-       * colors, or as a string corresponding to one of the built in color
-       * scales: "grayscale", "qualitative", "heatmap", "warm", "cool", "red",
-       * "green", "blue". VictoryLegend will assign a color to each symbol by
-       * index, unless they are explicitly specified in the data object.
-       * Colors will repeat when there are more symbols than colors in the
-       * provided colorScale.
-       */
-      colorScale?: ColorScalePropType;
-      /**
-       * The style prop defines the style of the VictoryLegend component.
-       * The style prop should be given as an object with styles defined for data, labels and
-       * parent. Any valid svg styles are supported, but width, height, and
-       * padding should be specified via props as they determine relative
-       * layout for components in VictoryLegend.
-       */
-      style?: VictoryStyleInterface;
-      /**
-       * The containerComponent prop takes a component instance which will be
-       * used to create a container element for standalone legends. The new
-       * element created from the passed containerComponent will be provided
-       * with the following props: height, width, children (the legend itself)
-       * and style. If a containerComponent is not provided, the default
-       * VictoryContainer component will be used. VictoryContainer supports
-       * title and desc props, which are intended to add accessibility to
-       * Victory components. The more descriptive these props are, the more
-       * accessible your data will be for people using screen readers. These
-       * props may be set by passing them directly to the supplied component.
-       * By default, VictoryContainer renders a responsive svg using the
-       * viewBox attribute. To render a static container, set
-       * responsive={false} directly on the instance of VictoryContainer
-       * supplied via the containerComponent prop. VictoryContainer also
-       * renders a Portal element that may be used in conjunction with
-       * VictoryPortal to force components to render above other children.
-       * @default <VictoryContainer/>
-       */
-      containerComponent?: React.ReactElement;
-      /**
-       * Specify data via the data prop. VictoryLegend expects data as an
-       * array of objects with name (required), symbol, and labels properties.
-       * The data prop must be given as an array.
-       */
-      data?: Array<{
-        name?: string;
-        symbol?: {
-          fill?: string;
-          type?: string;
-        };
-      }>;
-      /**
-       * The itemsPerRow prop determines how many items to render in each row
-       * of a horizontal legend, or in each column of a vertical legend. This
-       * prop should be given as an integer. When this prop is not given,
-       * legend items will be rendered in a single row or column.
-       */
-      itemsPerRow?: number;
-      /**
-       * The dataComponent prop takes a component instance which will be
-       * responsible for rendering a data element used to associate a symbol
-       * or color with each data series. The new element created from the
-       * passed dataComponent will be provided with the following properties
-       * calculated by VictoryLegend: x, y, size, style, and symbol. Any of
-       * these props may be overridden by passing in props to the supplied
-       * component, or modified or ignored within the custom component itself.
-       * If a dataComponent is not provided, VictoryLegend will use its
-       * default Point component.
-       */
-      dataComponent?: React.ReactElement;
-      /**
-       * The groupComponent prop takes an entire component which will be used to
-       * create group elements for use within container elements. This prop defaults
-       * to a <g> tag on web, and a react-native-svg <G> tag on mobile
-       * @default <g/>
-       */
-      groupComponent?: React.ReactElement;
-      /**
-       * The gutter prop defines the number of pixels between legend rows or
-       * columns, depending on orientation. When orientation is horizontal,
-       * gutters are between columns. When orientation is vertical, gutters
-       * are the space between rows.
-       */
-      gutter?: number;
-      /**
-       * The labelComponent prop takes a component instance which will be used
-       * to render each legend label. The new element created from the passed
-       * labelComponent will be supplied with the following properties: x, y,
-       * style, and text. Any of these props may be overridden by passing in
-       * props to the supplied component, or modified or ignored within the
-       * custom component itself. If labelComponent is omitted, a new
-       * VictoryLabel will be created with the props described above.
-       */
-      labelComponent?: React.ReactElement;
-      /**
-       * The orientation prop takes a string that defines whether legend data
-       * are displayed in a row or column. When orientation is "horizontal",
-       * legend items will be displayed in a single row. When orientation is
-       * "vertical", legend items will be displayed in a single column. Line
-       * and text-wrapping is not currently supported, so "vertical"
-       * orientation is both the default setting and recommended for
-       * displaying many series of data.
-       * @default 'vertical'
-       */
-      orientation?: 'horizontal'|'vertical';
-      /**
-       * The padding prop specifies the amount of padding in pixels between
-       * the edge of the legend and any rendered child components. This prop
-       * can be given as a number or as an object with padding specified for
-       * top, bottom, left and right. As with width and height, the absolute
-       * padding will depend on whether the component is rendered in a
-       * responsive container. When a component is nested within
-       * VictoryLegend, setting padding on the child component will have no
-       * effect.
-       */
-      padding?: number | {
-        top?: number;
-        bottom?: number;
-        left?: number;
-        right?: number;
-      };
-      /**
-       * The standalone props specifies whether the component should be
-       * rendered in an independent <svg> element or in a <g> tag. This prop
-       * defaults to true, and renders an svg.
-       */
-      standalone?: boolean;
-      /**
-       * The symbolSpacer prop defines the number of pixels between data
-       * components and label components.
-       */
-      symbolSpacer?: number;
-      /**
-       * The width and height props define the width and height of the legend.
-       * These props may be given as positive numbers or functions of data. If
-       * these props are not set, width and height will be determined based on
-       * an approximate text size calculated from the text and style props
-       * provided to VictoryLegend.
-       */
-      width?: number;
-      height?: number;
-      /**
-       * The x and y props define the base position of the legend element.
-       */
-      x?: number;
-      y?: number;
-    }
-
-    /**
-     * VictoryLegend renders a chart legend component.
-     */
-    export class VictoryLegend extends React.Component<VictoryLegendProps, any> {}
-
-    type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
-
-    export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
-      /**
-       * The bubbleProperty prop indicates which property of the data object should be used
-       * to scale data points in a bubble chart
-       */
-      bubbleProperty?: string;
-      /**
-       * The event prop take an array of event objects. Event objects are composed of
-       * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, so "data" and "labels" are all valid targets for VictoryScatter
-       * events. The eventKey may optionally be used to select a single element by index rather than
-       * an entire set. The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey keys,
-       * and a mutation key whose value is a function. The target and eventKey keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. a single bar), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @examples
-       * events={[
-       *   {
-       *     target: "data",
-       *     eventKey: "thisOne",
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              eventKey: "theOtherOne",
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {fill: "orange"})};
-       *              }
-       *            }, {
-       *              eventKey: "theOtherOne",
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-      /**
-       * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-       * assign eventKeys to data
-       */
-      eventKey?: StringOrNumberOrCallback;
-      /**
-       * The maxBubbleSize prop sets an upper limit for scaling data points in a bubble chart
-       */
-      maxBubbleSize?: number;
-      /**
-       * The samples prop specifies how many individual points to plot when plotting
-       * y as a function of x. Samples is ignored if x props are provided instead.
-       */
-      samples?: number;
-      /**
-       * The size prop determines how to scale each data point
-       */
-      size?: number | { (data: any): number };
-      /**
-       * The style prop specifies styles for your VictoryScatter. Any valid inline style properties
-       * will be applied. Height, width, and padding should be specified via the height,
-       * width, and padding props, as they are used to calculate the alignment of
-       * components within chart. In addition to normal style properties, angle and verticalAnchor
-       * may also be specified via the labels object, and they will be passed as props to
-       * VictoryLabel, or any custom labelComponent.
-       * @example {data: {fill: "red"}, labels: {fontSize: 12}}
-       */
-      style?: VictoryStyleInterface;
-      /**
-       * The symbol prop determines which symbol should be drawn to represent data points.
-       */
-      symbol?: ScatterSymbolType | { (data: any): ScatterSymbolType };
-    }
-
-    /**
-     * VictoryScatter creates a scatter of points from data. VictoryScatter is a composable component, so it does not include an axis.
-     * Check out VictoryChart for easy to use scatter plots and more.
-     */
-    export class VictoryScatter extends React.Component<VictoryScatterProps, any> {}
-
-    export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-      /**
-       * The categories prop specifies how categorical data for a chart should be ordered.
-       * This prop should be given as an array of string values, or an object with
-       * these values for x and y. When categories are not given as an object
-       * When this prop is set on a wrapper component, it will dictate the categories of
-       * its the children. If this prop is not set, any categories on child component
-       * or catigorical data, will be merged to create a shared set of categories.
-       * @example ["dogs", "cats", "mice"]
-       */
-      categories?: CategoryPropType;
-      /**
-       * The colorScale prop is an optional prop that defines the color scale the chart's bars
-       * will be created on. This prop should be given as an array of CSS colors, or as a string
-       * corresponding to one of the built in color scales. VictoryBar will automatically assign
-       * values from this color scale to the bars unless colors are explicitly provided in the
-       * `dataAttributes` prop.
-       */
-      colorScale?: ColorScalePropType;
-      /**
-       * The domain prop describes the range of values your chart will include. This prop can be
-       * given as a array of the minimum and maximum expected values for your chart,
-       * or as an object that specifies separate arrays for x and y.
-       * If this prop is not provided, a domain will be calculated from data, or other
-       * available information.
-       * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
-       */
-      domain?: DomainPropType;
-      /**
-       * The domainPadding prop specifies a number of pixels of padding to add to the
-       * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-       * from the origin to prevent crowding. This prop should be given as an object with
-       * numbers specified for x and y.
-       */
-      domainPadding?: DomainPaddingPropType;
-      /**
-       * The event prop take an array of event objects. Event objects are composed of
-       * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-       * individual child of VictoryStack, either by its name prop, or by index. The eventKey
-       * may optionally be used to select a single element by index or eventKey rather than
-       * an entire set. The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey and childName keys,
-       * and a mutation key whose value is a function. The target and eventKey and childName keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. a single bar), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @examples
-       * events={[
-       *   {
-       *     target: "data",
-       *     childName: "firstBar",
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              childName: "secondBar",
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {fill: "orange"})};
-       *              }
-       *            }, {
-       *              childName: "secondBar",
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-      /**
-       * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-       * assign eventKeys to data
-       */
-      eventKey?: StringOrNumberOrCallback;
-      /**
-       * The horizontal prop determines whether the bars will be laid vertically or
-       * horizontally. The bars will be vertical if this prop is false or unspecified,
-       * or horizontal if the prop is set to true.
-       */
-      horizontal?: boolean;
-      /**
-       * The style prop specifies styles for your grouped chart. These styles will be
-       * applied to all grouped children
-       */
-      style?: VictoryStyleInterface;
-      /**
-       * The xOffset prop is used for grouping stacks of bars. This prop will be set
-       * by the VictoryGroup component wrapper, or can be set manually.
-       */
-      xOffset?: number;
-    }
-
-    export class VictoryStack extends React.Component<VictoryStackProps, any> {}
-
-    export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-      /**
-       * The colorScale prop is an optional prop that defines the color scale the pie
-       * will be created on. This prop should be given as an array of CSS colors, or as a string
-       * corresponding to one of the built in color scales. VictoryPie will automatically assign
-       * values from this color scale to the pie slices unless colors are explicitly provided in the
-       * data object
-       */
-      colorScale?: ColorScalePropType;
-      /**
-       * The data prop specifies the data to be plotted,
-       * where data X-value is the slice label (string or number),
-       * and Y-value is the corresponding number value represented by the slice
-       * Data should be in the form of an array of data points.
-       * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
-       * but by default, an object with x and y properties is expected.
-       * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
-       * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
-       */
-      data?: any[];
-      /**
-       * The dataComponent prop takes an entire, HTML-complete data component which will be used to
-       * create slices for each datum in the pie chart. The new element created from the passed
-       * dataComponent will have the property datum set by the pie chart for the point it renders;
-       * properties style and pathFunction calculated by VictoryPie; an index property set
-       * corresponding to the location of the datum in the data provided to the pie; events bound to
-       * the VictoryPie; and the d3 compatible slice object.
-       * If a dataComponent is not provided, VictoryPie's Slice component will be used.
-       */
-      dataComponent?: React.ReactElement;
-      /**
-       * The labelRadius prop defines the radius of the arc that will be used for positioning each slice label.
-       * If this prop is not set, the label radius will default to the radius of the pie + label padding.
-       */
-      labelRadius?: number;
-      /**
-       * The overall end angle of the pie in degrees. This prop is used in conjunction with
-       * startAngle to create a pie that spans only a segment of a circle.
-       */
-      endAngle?: number;
-      /**
-       * The event prop takes an array of event objects. Event objects are composed of
-       * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-       * for a given component, so "data" and "labels" are all valid targets for VictoryPie
-       * events. The eventKey may optionally be used to select a single element by index rather than
-       * an entire set. The eventHandlers object should be given as an object whose keys are standard
-       * event names (i.e. onClick) and whose values are event callbacks. The return value
-       * of an event handler is used to modify elemnts. The return value should be given
-       * as an object or an array of objects with optional target and eventKey keys,
-       * and a mutation key whose value is a function. The target and eventKey keys
-       * will default to those corresponding to the element the event handler was attached to.
-       * The mutation function will be called with the calculated props for the individual selected
-       * element (i.e. a single bar), and the object returned from the mutation function
-       * will override the props of the selected element via object assignment.
-       * @examples
-       * events={[
-       *   {
-       *     target: "data",
-       *     eventKey: 1,
-       *     eventHandlers: {
-       *       onClick: () => {
-       *         return [
-       *            {
-       *              eventKey: 2,
-       *              mutation: (props) => {
-       *                return {style: merge({}, props.style, {fill: "orange"})};
-       *              }
-       *            }, {
-       *              eventKey: 2,
-       *              target: "labels",
-       *              mutation: () => {
-       *                return {text: "hey"};
-       *              }
-       *            }
-       *          ];
-       *       }
-       *     }
-       *   }
-       * ]}
-       */
-      events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback | string[] | number[]>[];
-      /**
-       * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-       * assign eventKeys to data
-       */
-      eventKey?: StringOrNumberOrCallback;
-      /**
-       * Specifies the radius of the chart. If this property is not provided it is computed
-       * from width, height, and padding props
-       *
-       */
-      radius?: number;
-      /**
-       * When creating a donut chart, this prop determines the number of pixels between
-       * the center of the chart and the inner edge of a donut. When this prop is set to zero
-       * a regular pie chart is rendered.
-       */
-      innerRadius?: number;
-      /**
-       * Set the cornerRadius for every dataComponent (Slice by default) within VictoryPie
-       */
-      cornerRadius?: number;
-      /**
-       * The padAngle prop determines the amount of separation between adjacent data slices
-       * in number of degrees
-       */
-      padAngle?: number;
-      /**
-       * The overall start angle of the pie in degrees. This prop is used in conjunction with
-       * endAngle to create a pie that spans only a segment of a circle.
-       */
-      startAngle?: number;
-      /**
-       * The style prop specifies styles for your pie. VictoryPie relies on Radium,
-       * so valid Radium style objects should work for this prop. Height, width, and
-       * padding should be specified via the height, width, and padding props.
-       * @example {data: {stroke: "black"}, label: {fontSize: 10}}
-       */
-      style?: VictoryStyleInterface;
-      /**
-       * The x prop specifies how to access the X value of each data point.
-       * If given as a function, it will be run on each data point, and returned value will be used.
-       * If given as an integer, it will be used as an array index for array-type data points.
-       * If given as a string, it will be used as a property key for object-type data points.
-       * If given as an array of strings, or a string containing dots or brackets,
-       * it will be used as a nested object property path (for details see Lodash docs for _.get).
-       * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-       * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
-       */
-      x?: DataGetterPropType;
-      /**
-       * The y prop specifies how to access the Y value of each data point.
-       * If given as a function, it will be run on each data point, and returned value will be used.
-       * If given as an integer, it will be used as an array index for array-type data points.
-       * If given as a string, it will be used as a property key for object-type data points.
-       * If given as an array of strings, or a string containing dots or brackets,
-       * it will be used as a nested object property path (for details see Lodash docs for _.get).
-       * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-       * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
-       */
-      y?: DataGetterPropType;
-    }
-
-    /**
-     * victory-pie draws an SVG pie or donut chart with React.
-     * Styles and data can be customized by passing in your own values as properties to the component.
-     * Data changes are animated with VictoryAnimation.
-     */
-    export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+  export interface VictoryBoxPlotStyleInterface extends VictoryStyleInterface {
+    max?: VictoryStyleObject;
+    maxLabels?: VictoryStyleObject;
+    min?: VictoryStyleObject;
+    minLabels?: VictoryStyleObject;
+    median?: VictoryStyleObject;
+    medianLabels?: VictoryStyleObject;
+    q1?: VictoryStyleObject;
+    q1Labels?: VictoryStyleObject;
+    q3?: VictoryStyleObject;
+    q3Labels?: VictoryStyleObject;
   }
+
+  export interface VictoryBoxPlotProps extends VictoryCommonProps, VictoryDatableProps {
+    /**
+     * The boxWidth prop specifies how wide each box should be. If the whiskerWidth
+     * prop is not set, this prop will also determine the width of the whisker crosshair.
+     */
+    boxWidth?: number;
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryChart, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The labelOrientation prop determines where labels are placed relative to their
+     * corresponding data. If this prop is not set, it will be set to “top” for
+     * horizontal charts, and “right” for vertical charts.
+     */
+    labelOrientation?: "top" | "bottom" | "left" | "right";
+    /**
+     * When the boolean labels prop is set to true, the values for min, max, median,
+     * q1, and q3 will be displayed for each box. For more granular label control, use
+     * the individual minLabels, maxLabels, medianLabels, q1Labels, and q3Labels props.
+     */
+    labels?: boolean;
+    /**
+     * Use the max data accessor prop to define the max value of a box plot.
+     */
+    max?: StringOrNumberOrCallback;
+    /**
+     * Use the median data accessor prop to define the median value of a box plot.
+     */
+    median?: StringOrNumberOrCallback;
+    /**
+     * Use the min data accessor prop to define the min value of a box plot.
+     */
+    min?: StringOrNumberOrCallback;
+    /**
+     * Use the q1 data accessor prop to define the q1 value of a box plot.
+     */
+    q1?: StringOrNumberOrCallback;
+    /**
+     * Use the q3 data accessor prop to define the q1 value of a box plot.
+     */
+    q3?: StringOrNumberOrCallback;
+    /**
+     * The style prop defines the style of the component. The style prop
+     * should be given as an object with styles defined for parent, max,
+     * maxLabels, min, minLabels,median, medianLabels,q1, q1Labels,q3,
+     * q3Labels. Any valid svg styles are supported, but width, height, a
+     * nd padding should be specified via props as they determine relative
+     * layout for components in VictoryChart. Functional styles may be
+     * defined for style properties, and they will be evaluated with each datum.
+     */
+    style?: VictoryBoxPlotStyleInterface;
+    /**
+     * The whiskerWidth prop specifies how wide each whisker crosshair should be. If the
+     * whiskerWidth prop is not set, the width of the whisker crosshair will match
+     * the width of the box.
+     */
+    whiskerWidth?: number;
+  }
+
+  /**
+   * VictoryBoxPlot renders a box plot to describe the distribution of a set of data. Data for
+   * VictoryBoxPlot may be given with summary statistics pre-calculated (min, median, max, q1, q3),
+   * or as an array of raw data. VictoryBoxPlot can be composed with VictoryChart to create box plot charts.
+   */
+  export class VictoryBoxPlot extends React.Component<
+    VictoryBoxPlotProps,
+    any
+  > {}
+
+  export interface VictoryChartProps extends VictoryCommonProps {
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryChart, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The style prop specifies styles for your chart. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart.
+     * @example {border: "1px solid #ccc", margin: "2%", maxWidth: "40%"}
+     */
+    style?: Pick<VictoryStyleInterface, 'parent'>;
+  }
+
+  /**
+   * A flexible charting component for React.
+   * VictoryChart composes other Victory components into reusable charts.
+   * Acting as a coordinator rather than a stand-alone component, VictoryChart reconciles props such as domain and scale for child components,
+   * and provides a set of sensible defaults. This component works with:
+   * - VictoryAxis
+   * - VictoryLine
+   * - VictoryScatter
+   * - VictoryBar
+   */
+  export class VictoryChart extends React.Component<VictoryChartProps, any> {}
+
+  export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The categories prop specifies how categorical data for a chart should be ordered.
+     * This prop should be given as an array of string values, or an object with
+     * these values for x and y. When categories are not given as an object
+     * When this prop is set on a wrapper component, it will dictate the categories of
+     * its the children. If this prop is not set, any categories on child component
+     * or categorical data, will be merged to create a shared set of categories.
+     * @example ["dogs", "cats", "mice"]
+     */
+    categories?: CategoryPropType;
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the chart's bars
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryBar will automatically assign
+     * values from this color scale to the bars unless colors are explicitly provided in the
+     * `dataAttributes` prop.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @examples: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryGroup, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The offset prop determines the number of pixels each element in a group should
+     * be offset from its original position of the on the independent axis. In the
+     * case of groups of bars, this number should be equal to the width of the bar
+     * plus the desired spacing between bars.
+     */
+    offset?: number;
+    /**
+     * The style prop specifies styles for your grouped chart. These styles will be
+     * applied to all grouped children
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
+
+  export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryLine events.
+     * Since VictoryLine only renders a single element, the eventKey property is not used.
+     * The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a line), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {stroke: "orange"})};
+     *              }
+     *            }, {
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
+    /**
+     * The interpolation prop determines how data points should be connected
+     * when plotting a line
+     */
+    interpolation?: InterpolationPropType;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     */
+    samples?: number;
+    /**
+     * The labels prop defines the labels that will appear above each point.
+     * This prop should be given as an array or as a function of data.
+     */
+    labels?: string[] | number[] | Function;
+    /**
+     * Use the sortKey prop to indicate how data should be sorted. This prop
+     * is given directly to the lodash sortBy function to be executed on the
+     * final dataset.
+     */
+    sortKey?: string | string[] | Function;
+    /**
+     * The style prop specifies styles for your VictoryLine. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart. in addition to normal style properties, angle and verticalAnchor
+     * may also be specified via the labels object, and they will be passed as props to
+     * VictoryLabel, or any custom labelComponent.
+     * @examples{data: {stroke: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  /**
+   * VictoryLine creates a line based on data. VictoryLine is a composable component, so it does not include an axis.
+   * Check out VictoryChart for easy to use line charts and more.
+   */
+  export class VictoryLine extends React.Component<VictoryLineProps, any> {}
+
+  export interface VictoryLegendProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
+    /**
+     * The borderComponent prop takes a component instance which will be responsible
+     * for rendering a border around the legend. The new element created from the passed
+     * borderComponent will be provided with the following properties calculated by
+     * VictoryLegend: x, y, width, height, and style. Any of these props may be
+     * overridden by passing in props to the supplied component, or modified or ignored
+     * within the custom component itself. If a borderComponent
+     * is not provided, VictoryLegend will use its default Border component.
+     * Please note that the default width and height calculated
+     * for the border component is based on approximated
+     * text measurements, and may need to be adjusted.
+     * @default <Border/>
+     */
+    borderComponent?: React.ReactElement;
+    /**
+     * The borderPadding specifies the amount of padding that should
+     * be added between the legend items and the border. This prop may be given as
+     * a number, or asanobject with values specified for top, bottom, left, and right.
+     * Please note that the default width and height calculated for the border
+     * component is based on approximated text measurements, so padding may need to be adjusted.
+     */
+    borderPadding?: PaddingProps;
+    /**
+     * The centerTitle boolean prop specifies whether a legend title should be centered.
+     */
+    centerTitle?: boolean;
+    /**
+     * The colorScale prop defines a color scale to be applied to each data
+     * symbol in VictoryLegend. This prop should be given as an array of CSS
+     * colors, or as a string corresponding to one of the built in color
+     * scales: "grayscale", "qualitative", "heatmap", "warm", "cool", "red",
+     * "green", "blue". VictoryLegend will assign a color to each symbol by
+     * index, unless they are explicitly specified in the data object.
+     * Colors will repeat when there are more symbols than colors in the
+     * provided colorScale.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * Specify data via the data prop. VictoryLegend expects data as an
+     * array of objects with name (required), symbol, and labels properties.
+     * The data prop must be given as an array.
+     */
+    data?: Array<{
+      name?: string;
+      symbol?: {
+        fill?: string;
+        type?: string;
+      };
+    }>;
+    /**
+     * The dataComponent prop takes a component instance which will be
+     * responsible for rendering a data element used to associate a symbol
+     * or color with each data series. The new element created from the
+     * passed dataComponent will be provided with the following properties
+     * calculated by VictoryLegend: x, y, size, style, and symbol. Any of
+     * these props may be overridden by passing in props to the supplied
+     * component, or modified or ignored within the custom component itself.
+     * If a dataComponent is not provided, VictoryLegend will use its
+     * default Point component.
+     */
+    dataComponent?: React.ReactElement;
+    /**
+     * VictoryLegend uses the standard eventKey prop to specify how event targets
+     * are addressed. This prop is not commonly used.
+     */
+    eventKey?: StringOrNumberOrCallback | string[];
+    /**
+     * VictoryLegend uses the standard events prop.
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * VictoryLegend uses the standard externalEventMutations prop.
+     */
+    externalEventMutations?: any[];
+    /**
+     * The gutter prop defines the number of pixels between legend rows or
+     * columns, depending on orientation. When orientation is horizontal,
+     * gutters are between columns. When orientation is vertical, gutters
+     * are the space between rows.
+     */
+    gutter?: number;
+    /**
+     * The itemsPerRow prop determines how many items to render in each row
+     * of a horizontal legend, or in each column of a vertical legend. This
+     * prop should be given as an integer. When this prop is not given,
+     * legend items will be rendered in a single row or column.
+     */
+    itemsPerRow?: number;
+    /**
+     * The labelComponent prop takes a component instance which will be used
+     * to render each legend label. The new element created from the passed
+     * labelComponent will be supplied with the following properties: x, y,
+     * style, and text. Any of these props may be overridden by passing in
+     * props to the supplied component, or modified or ignored within the
+     * custom component itself. If labelComponent is omitted, a new
+     * VictoryLabel will be created with the props described above.
+     */
+    labelComponent?: React.ReactElement;
+    /**
+     * The orientation prop takes a string that defines whether legend data
+     * are displayed in a row or column. When orientation is "horizontal",
+     * legend items will be displayed in a single row. When orientation is
+     * "vertical", legend items will be displayed in a single column. Line
+     * and text-wrapping is not currently supported, so "vertical"
+     * orientation is both the default setting and recommended for
+     * displaying many series of data.
+     * @default 'vertical'
+     */
+    orientation?: 'horizontal' | 'vertical';
+    /**
+     * The rowGutter prop defines the number of pixels between legend rows.
+     * This prop may be given as a number, or as an object with values
+     * specified for “top” and “bottom” gutters. To set spacing between columns,
+     * use the gutter prop.
+     */
+    rowGutter?: number | Omit<BlockProps, 'left' | 'right'>;
+    /**
+     * The style prop defines the style of the VictoryLegend component.
+     * The style prop should be given as an object with styles defined for data, labels and
+     * parent. Any valid svg styles are supported, but width, height, and
+     * padding should be specified via props as they determine relative
+     * layout for components in VictoryLegend.
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The symbolSpacer prop defines the number of pixels between data
+     * components and label components.
+     */
+    symbolSpacer?: number;
+    /**
+     * The title prop specifies a title to render with the legend.
+     * This prop should be given as a string, or an array of strings for multi-line titles.
+     */
+    title?: string | string[];
+    /**
+     * The titleComponent prop takes a component instance which will be used to render
+     * a title for the component. The new element created from the passed
+     * labelComponent will be supplied with the following properties: x, y, index, data,
+     * datum, verticalAnchor, textAnchor, style, text, and events. Any of these props
+     * may be overridden by passing in props to the supplied component, or modified
+     * or ignored within the custom component itself. If labelComponent is omitted,
+     * a new VictoryLabel will be created with the props described above.
+     */
+    titleComponent?: React.ReactElement;
+    /**
+     * The titleOrientation prop specifies where the a title should be rendered
+     * in relation to the rest of the legend. Possible values
+     * for this prop are “top”, “bottom”, “left”, and “right”.
+     * @default (provided by default theme): titleOrientation="top"
+     */
+    titleOrientation?: OrientationTypes;
+    /**
+     * The x and y props define the base position of the legend element.
+     */
+    x?: number;
+    y?: number;
+  }
+
+  /**
+   * VictoryLegend renders a chart legend component.
+   */
+  export class VictoryLegend extends React.Component<VictoryLegendProps, any> {}
+
+  type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
+
+  export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
+    /**
+     * The bubbleProperty prop indicates which property of the data object should be used
+     * to scale data points in a bubble chart
+     */
+    bubbleProperty?: string;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryScatter
+     * events. The eventKey may optionally be used to select a single element by index rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventKey: "thisOne",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              eventKey: "theOtherOne",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              eventKey: "theOtherOne",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The maxBubbleSize prop sets an upper limit for scaling data points in a bubble chart
+     */
+    maxBubbleSize?: number;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     */
+    samples?: number;
+    /**
+     * The size prop determines how to scale each data point
+     */
+    size?: number | { (data: any): number };
+    /**
+     * The style prop specifies styles for your VictoryScatter. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart. In addition to normal style properties, angle and verticalAnchor
+     * may also be specified via the labels object, and they will be passed as props to
+     * VictoryLabel, or any custom labelComponent.
+     * @example {data: {fill: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The symbol prop determines which symbol should be drawn to represent data points.
+     */
+    symbol?: ScatterSymbolType | { (data: any): ScatterSymbolType };
+  }
+
+  /**
+   * VictoryScatter creates a scatter of points from data. VictoryScatter is a composable component, so it does not include an axis.
+   * Check out VictoryChart for easy to use scatter plots and more.
+   */
+  export class VictoryScatter extends React.Component<VictoryScatterProps, any> {}
+
+  export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The categories prop specifies how categorical data for a chart should be ordered.
+     * This prop should be given as an array of string values, or an object with
+     * these values for x and y. When categories are not given as an object
+     * When this prop is set on a wrapper component, it will dictate the categories of
+     * its the children. If this prop is not set, any categories on child component
+     * or catigorical data, will be merged to create a shared set of categories.
+     * @example ["dogs", "cats", "mice"]
+     */
+    categories?: CategoryPropType;
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the chart's bars
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryBar will automatically assign
+     * values from this color scale to the bars unless colors are explicitly provided in the
+     * `dataAttributes` prop.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryStack, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The style prop specifies styles for your grouped chart. These styles will be
+     * applied to all grouped children
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The xOffset prop is used for grouping stacks of bars. This prop will be set
+     * by the VictoryGroup component wrapper, or can be set manually.
+     */
+    xOffset?: number;
+  }
+
+  export class VictoryStack extends React.Component<VictoryStackProps, any> {}
+
+  export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the pie
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryPie will automatically assign
+     * values from this color scale to the pie slices unless colors are explicitly provided in the
+     * data object
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The data prop specifies the data to be plotted,
+     * where data X-value is the slice label (string or number),
+     * and Y-value is the corresponding number value represented by the slice
+     * Data should be in the form of an array of data points.
+     * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
+     * but by default, an object with x and y properties is expected.
+     * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
+     * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
+     */
+    data?: any[];
+    /**
+     * The dataComponent prop takes an entire, HTML-complete data component which will be used to
+     * create slices for each datum in the pie chart. The new element created from the passed
+     * dataComponent will have the property datum set by the pie chart for the point it renders;
+     * properties style and pathFunction calculated by VictoryPie; an index property set
+     * corresponding to the location of the datum in the data provided to the pie; events bound to
+     * the VictoryPie; and the d3 compatible slice object.
+     * If a dataComponent is not provided, VictoryPie's Slice component will be used.
+     */
+    dataComponent?: React.ReactElement;
+    /**
+     * The labelRadius prop defines the radius of the arc that will be used for positioning each slice label.
+     * If this prop is not set, the label radius will default to the radius of the pie + label padding.
+     */
+    labelRadius?: number;
+    /**
+     * The overall end angle of the pie in degrees. This prop is used in conjunction with
+     * startAngle to create a pie that spans only a segment of a circle.
+     */
+    endAngle?: number;
+    /**
+     * The event prop takes an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryPie
+     * events. The eventKey may optionally be used to select a single element by index rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventKey: 1,
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              eventKey: 2,
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              eventKey: 2,
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback | string[] | number[]>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * Specifies the radius of the chart. If this property is not provided it is computed
+     * from width, height, and padding props
+     *
+     */
+    radius?: number;
+    /**
+     * When creating a donut chart, this prop determines the number of pixels between
+     * the center of the chart and the inner edge of a donut. When this prop is set to zero
+     * a regular pie chart is rendered.
+     */
+    innerRadius?: number;
+    /**
+     * Set the cornerRadius for every dataComponent (Slice by default) within VictoryPie
+     */
+    cornerRadius?: number;
+    /**
+     * The padAngle prop determines the amount of separation between adjacent data slices
+     * in number of degrees
+     */
+    padAngle?: number;
+    /**
+     * The overall start angle of the pie in degrees. This prop is used in conjunction with
+     * endAngle to create a pie that spans only a segment of a circle.
+     */
+    startAngle?: number;
+    /**
+     * The style prop specifies styles for your pie. VictoryPie relies on Radium,
+     * so valid Radium style objects should work for this prop. Height, width, and
+     * padding should be specified via the height, width, and padding props.
+     * @example {data: {stroke: "black"}, label: {fontSize: 10}}
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The x prop specifies how to access the X value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
+     */
+    x?: DataGetterPropType;
+    /**
+     * The y prop specifies how to access the Y value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
+     */
+    y?: DataGetterPropType;
+  }
+
+  /**
+   * victory-pie draws an SVG pie or donut chart with React.
+   * Styles and data can be customized by passing in your own values as properties to the component.
+   * Data changes are animated with VictoryAnimation.
+   */
+  export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+}
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index fcd18571e3..682b8c30d8 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -197,9 +197,9 @@ test = (
     <VictoryAxis
         scale="time"
         style={{
-            grid: { strokeWidth: tick => tick.x },
-            ticks: { stroke: tick => tick.color },
-            tickLabels: { fontSize: tick => tick.y },
+            grid: { strokeWidth: (tick: any) => tick.x },
+            ticks: { stroke: (tick: any) => tick.color },
+            tickLabels: { fontSize: (tick: any) => tick.y },
         }}
         tickValues={[
             new Date(1980, 1, 1),
@@ -611,8 +611,8 @@ test = (
         ]}
         style={{
             data: {
-                fill: d => d.x,
-                stroke: (datum, active) => active ? datum.x : datum.y,
+                fill: (d: any) => d.x,
+                stroke: (datum: any, active: boolean) => active ? datum.x : datum.y,
                 strokeWidth: 3
             }
         }}
@@ -757,6 +757,7 @@ test = (
         ]}
         gutter={10}
         orientation="horizontal"
+        title="Title"
         symbolSpacer={8}
         width={100}
         height={50}
@@ -771,5 +772,22 @@ test = (
         standalone
         padding={{ top: 20, right: 40, bottom: 60, left: 20 }}
         colorScale="heatmap"
+        events={[{
+            target: "data",
+            eventKey: "thisOne",
+            eventHandlers: {
+                onClick: () => ([
+                    {
+                        eventKey: "theOtherOne",
+                        mutation: props => ({ style: { ...props.style, fill: "orange" } })
+                    },
+                    {
+                        eventKey: "theOtherOne",
+                        target: "labels",
+                        mutation: () => ({ text: "hey" })
+                    }
+                ])
+            }
+        }]}
     />
 );

From c49bfdbd027a34049bad66f3740c666c0cd83f45 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 2 Mar 2019 21:45:57 +0100
Subject: [PATCH 273/924] [p-event] Remove types

---
 notNeededPackages.json            |   6 +
 types/p-event/index.d.ts          | 205 ------------------------------
 types/p-event/p-event-tests.ts    | 110 ----------------
 types/p-event/tsconfig.json       |  24 ----
 types/p-event/tslint.json         |   1 -
 types/p-event/v1/index.d.ts       |  36 ------
 types/p-event/v1/p-event-tests.ts |  61 ---------
 types/p-event/v1/tsconfig.json    |  29 -----
 types/p-event/v1/tslint.json      |   1 -
 9 files changed, 6 insertions(+), 467 deletions(-)
 delete mode 100644 types/p-event/index.d.ts
 delete mode 100644 types/p-event/p-event-tests.ts
 delete mode 100644 types/p-event/tsconfig.json
 delete mode 100644 types/p-event/tslint.json
 delete mode 100644 types/p-event/v1/index.d.ts
 delete mode 100644 types/p-event/v1/p-event-tests.ts
 delete mode 100644 types/p-event/v1/tsconfig.json
 delete mode 100644 types/p-event/v1/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..62f6bbb802 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1146,6 +1146,12 @@
             "sourceRepoURL": "http://onsen.io",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "p-event",
+            "typingsPackageName": "p-event",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-event",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "p-map",
             "typingsPackageName": "p-map",
diff --git a/types/p-event/index.d.ts b/types/p-event/index.d.ts
deleted file mode 100644
index 6f76b75748..0000000000
--- a/types/p-event/index.d.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-// Type definitions for p-event 2.3
-// Project: https://github.com/sindresorhus/p-event#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { PCancelable } from 'p-cancelable';
-
-export = pEvent;
-
-/**
- * Promisify an event by waiting for it to be emitted.
- *
- * Returns a `Promise` that is fulfilled when emitter emits an event matching `event`, or rejects if emitter emits
- * any of the events defined in the `rejectionEvents` option.
- *
- * **Note**: `event` is a string for a single event type, for example, `'data'`. To listen on multiple
- * events, pass an array of strings, such as `['started', 'stopped']`.
- *
- * The returned promise has a `.cancel()` method, which when called, removes the event listeners and causes the promise to never be settled.
- *
- * @param emitter Event emitter object. Should have either a `.on()`/`.addListener()`/`.addEventListener()` and
- * `.off()`/`.removeListener()`/`.removeEventListener()` method, like the [Node.js `EventEmitter`](https://nodejs.org/api/events.html) and
- * [DOM events](https://developer.mozilla.org/en-US/docs/Web/Events).
- * @param event Name of the event or events to listen to. If the same event is defined both here and in
- * `rejectionEvents`, this one takes priority.
- */
-declare function pEvent<T, TRest = T>(
-    emitter: pEvent.Emitter<T, TRest>,
-    event: string | symbol | Array<string | symbol>,
-    options: pEvent.MultiArgsOptions<T | TRest>
-): PCancelable<Array<T | TRest>>;
-declare function pEvent<T>(
-    emitter: pEvent.Emitter<T, any>,
-    event: string | symbol | Array<string | symbol>,
-    filter: pEvent.FilterFn<T>
-): PCancelable<T>;
-declare function pEvent<T>(
-    emitter: pEvent.Emitter<T, any>,
-    event: string | symbol | Array<string | symbol>,
-    options?: pEvent.Options<T>
-): PCancelable<T>;
-
-declare namespace pEvent {
-    /**
-     * Wait for multiple event emissions. Returns an array.
-     */
-    function multiple<T, TRest = T>(
-        emitter: Emitter<T, TRest>,
-        event: string | symbol | Array<string | symbol>,
-        options: MultipleMultiArgsOptions<T | TRest>
-    ): PCancelable<Array<Array<T | TRest>>>;
-    function multiple<T>(
-        emitter: Emitter<T, any>,
-        event: string | symbol | Array<string | symbol>,
-        options: MultipleOptions<T>
-    ): PCancelable<T[]>;
-
-    /**
-     * Returns an [async iterator](http://2ality.com/2016/10/asynchronous-iteration.html) that lets you asynchronously
-     * iterate over events of `event` emitted from `emitter`. The iterator ends when `emitter` emits an event matching
-     * any of the events defined in `resolutionEvents`, or rejects if `emitter` emits any of the events defined in
-     * the `rejectionEvents` option.
-     */
-    function iterator<T, TRest = T>(
-        emitter: Emitter<T, TRest>,
-        event: string | symbol | Array<string | symbol>,
-        options: IteratorMultiArgsOptions<T | TRest>
-    ): AsyncIterableIterator<Array<T | TRest>>;
-    function iterator<T>(
-        emitter: Emitter<T, any>,
-        event: string | symbol | Array<string | symbol>,
-        filter: FilterFn<T>
-    ): AsyncIterableIterator<T>;
-    function iterator<T>(
-        emitter: Emitter<T, any>,
-        event: string | symbol | Array<string | symbol>,
-        options?: IteratorOptions<T>
-    ): AsyncIterableIterator<T>;
-
-    interface Emitter<T, TRest> {
-        on?: AddRmListenerFn<T, TRest>;
-        addListener?: AddRmListenerFn<T, TRest>;
-        addEventListener?: AddRmListenerFn<T, TRest>;
-        off?: AddRmListenerFn<T, TRest>;
-        removeListener?: AddRmListenerFn<T, TRest>;
-        removeEventListener?: AddRmListenerFn<T, TRest>;
-    }
-
-    type FilterFn<T> = (el: T) => boolean;
-
-    interface Options<T> {
-        /**
-         * Events that will reject the promise.
-         * @default ['error']
-         */
-        rejectionEvents?: Array<string | symbol>;
-        /**
-         * By default, the promisified function will only return the first argument from the event callback,
-         * which works fine for most APIs. This option can be useful for APIs that return multiple arguments
-         * in the callback. Turning this on will make it return an array of all arguments from the callback,
-         * instead of just the first argument. This also applies to rejections.
-         *
-         * @example
-         * const pEvent = require('p-event');
-         * const emitter = require('./some-event-emitter');
-         *
-         * (async () => {
-         *    const [foo, bar] = await pEvent(emitter, 'finish', {multiArgs: true});
-         * })();
-         *
-         * @default false
-         */
-        multiArgs?: boolean;
-        /**
-         * Time in milliseconds before timing out.
-         * @default Infinity
-         */
-        timeout?: number;
-        /**
-         * Filter function for accepting an event.
-         *
-         * @example
-         * const pEvent = require('p-event');
-         * const emitter = require('./some-event-emitter');
-         *
-         * (async () => {
-         *     const result = await pEvent(emitter, '🦄', value => value > 3);
-         *     // Do something with first 🦄 event with a value greater than 3
-         * })();
-         */
-        filter?: FilterFn<T>;
-    }
-
-    interface MultiArgsOptions<T> extends Options<T> {
-        multiArgs: true;
-    }
-
-    interface MultipleOptions<T> extends Options<T> {
-        /**
-         * The number of times the event needs to be emitted before the promise resolves.
-         */
-        count: number;
-        /**
-         * Whether to resolve the promise immediately. Emitting one of the `rejectionEvents` won't throw an error.
-         *
-         * **Note**: The returned array will be mutated when an event is emitted.
-         *
-         * @example
-         * const emitter = new EventEmitter();
-         *
-         * const promise = pEvent.multiple(emitter, 'hello', {
-         *     resolveImmediately: true,
-         *     count: Infinity
-         * });
-         *
-         * const result = await promise;
-         * console.log(result);
-         * //=> []
-         *
-         * emitter.emit('hello', 'Jack');
-         * console.log(result);
-         * //=> ['Jack']
-         *
-         * emitter.emit('hello', 'Mark');
-         * console.log(result);
-         * //=> ['Jack', 'Mark']
-         *
-         * // Stops listening
-         * emitter.emit('error', new Error('😿'));
-         *
-         * emitter.emit('hello', 'John');
-         * console.log(result);
-         * //=> ['Jack', 'Mark']
-         */
-        resolveImmediately?: boolean;
-    }
-
-    interface MultipleMultiArgsOptions<T> extends MultipleOptions<T> {
-        multiArgs: true;
-    }
-
-    interface IteratorOptions<T> extends Options<T> {
-        /**
-         * Maximum number of events for the iterator before it ends. When the limit is reached, the iterator will be
-         * marked as `done`. This option is useful to paginate events, for example, fetching 10 events per page.
-         * @default Infinity
-         */
-        limit?: number;
-        /**
-         * Events that will end the iterator.
-         * @default []
-         */
-        resolutionEvents?: Array<string | symbol>;
-    }
-
-    interface IteratorMultiArgsOptions<T> extends IteratorOptions<T> {
-        multiArgs: true;
-    }
-}
-
-type AddRmListenerFn<T, TRest> = (
-    event: string | symbol,
-    listener: (arg1: T, ...args: TRest[]) => void
-) => void;
diff --git a/types/p-event/p-event-tests.ts b/types/p-event/p-event-tests.ts
deleted file mode 100644
index dbbe50eee7..0000000000
--- a/types/p-event/p-event-tests.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/// <reference types="node" />
-
-import pEvent = require('p-event');
-import { EventEmitter } from 'events';
-import * as fs from 'fs';
-
-class NodeEmitter extends EventEmitter {
-    on(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-    addListener(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-    addEventListener(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-    off(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-    removeListener(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-    removeEventListener(event: 'finish', listener: (num: number, str: string) => void) {
-        return this;
-    }
-}
-
-class DomEmitter implements EventTarget {
-    addEventListener(
-        type: 'foo',
-        listener: EventListenerOrEventListenerObject,
-        options?: boolean | AddEventListenerOptions
-    ): void {}
-
-    dispatchEvent(event: Event): boolean {
-        return false;
-    }
-
-    removeEventListener(
-        type: 'foo',
-        listener: EventListenerOrEventListenerObject,
-        options?: boolean | AddEventListenerOptions
-    ): void {}
-}
-
-pEvent(new NodeEmitter(), 'finish'); // $ExpectType PCancelable<number>
-pEvent(new NodeEmitter(), '🦄', value => value > 3); // $ExpectType PCancelable<number>
-pEvent(new DomEmitter(), 'finish'); // $ExpectType PCancelable<Event>
-pEvent(document, 'DOMContentLoaded'); // $ExpectType PCancelable<Event>
-
-pEvent(new NodeEmitter(), 'finish', { rejectionEvents: ['error'] }); // $ExpectType PCancelable<number>
-pEvent(new NodeEmitter(), 'finish', { timeout: 1 }); // $ExpectType PCancelable<number>
-pEvent(new NodeEmitter(), 'finish', { filter: value => value > 3 }); // $ExpectType PCancelable<number>
-pEvent(new NodeEmitter(), 'finish', { multiArgs: true }); // $ExpectType PCancelable<(string | number)[]>
-
-pEvent(new NodeEmitter(), 'finish').cancel();
-
-// $ExpectType PCancelable<number[]>
-pEvent.multiple(new NodeEmitter(), 'hello', {
-    count: Infinity,
-});
-// $ExpectType PCancelable<number[]>
-pEvent.multiple(new NodeEmitter(), 'hello', {
-    resolveImmediately: true,
-    count: Infinity,
-});
-// $ExpectType PCancelable<(string | number)[][]>
-pEvent.multiple(new NodeEmitter(), 'hello', {
-    count: Infinity,
-    multiArgs: true,
-});
-// $ExpectError
-pEvent.multiple(new NodeEmitter(), 'hello', {});
-// $ExpectError
-pEvent.multiple(new NodeEmitter(), 'hello');
-
-pEvent.iterator(new NodeEmitter(), 'finish'); // $ExpectType AsyncIterableIterator<number>
-pEvent.iterator(new NodeEmitter(), '🦄', value => value > 3); // $ExpectType AsyncIterableIterator<number>
-
-pEvent.iterator(new NodeEmitter(), 'finish', { limit: 1 }); // $ExpectType AsyncIterableIterator<number>
-pEvent.iterator(new NodeEmitter(), 'finish', { resolutionEvents: ['finish'] }); // $ExpectType AsyncIterableIterator<number>
-pEvent.iterator(new NodeEmitter(), 'finish', { multiArgs: true }); // $ExpectType AsyncIterableIterator<(string | number)[]>
-
-async function getOpenReadStream(file: string) {
-    const stream = fs.createReadStream(file);
-    await pEvent(stream, 'open');
-    return stream;
-}
-
-(async () => {
-    const stream = await getOpenReadStream('unicorn.txt');
-    stream.pipe(process.stdout);
-})().catch(console.error);
-
-(async () => {
-    try {
-        const result = await pEvent(new NodeEmitter(), 'finish');
-
-        if (result === 1) {
-            throw new Error('Emitter finished with an error');
-        }
-
-        // `emitter` emitted a `finish` event with an acceptable value
-        console.log(result);
-    } catch (error) {
-        // `emitter` emitted an `error` event or
-        // emitted a `finish` with 'unwanted result'
-        console.error(error);
-    }
-})();
diff --git a/types/p-event/tsconfig.json b/types/p-event/tsconfig.json
deleted file mode 100644
index dfde34c0e1..0000000000
--- a/types/p-event/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es2016",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-event-tests.ts"
-    ]
-}
diff --git a/types/p-event/tslint.json b/types/p-event/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-event/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-event/v1/index.d.ts b/types/p-event/v1/index.d.ts
deleted file mode 100644
index 0fde40d140..0000000000
--- a/types/p-event/v1/index.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for p-event 1.3
-// Project: https://github.com/sindresorhus/p-event#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = pEvent;
-
-declare function pEvent<T, TRest = T>(emitter: pEvent.Emitter<T, TRest>, event: string | symbol, options: MultiArgsOptions<T | TRest>): Promise<Array<T | TRest>>;
-declare function pEvent<T>(emitter: pEvent.Emitter<T>, event: string | symbol, filter: FilterFn<T>): Promise<T>;
-declare function pEvent<T>(emitter: pEvent.Emitter<T>, event: string | symbol, options?: pEvent.Options<T>): Promise<T>;
-
-declare namespace pEvent {
-    interface Emitter<T = any, TRest = T> {
-        on?: AddRmListenerFn<T, TRest>;
-        addListener?: AddRmListenerFn<T, TRest>;
-        addEventListener?: AddRmListenerFn<T, TRest>;
-        off?: AddRmListenerFn<T, TRest>;
-        removeListener?: AddRmListenerFn<T, TRest>;
-        removeEventListener?: AddRmListenerFn<T, TRest>;
-    }
-
-    interface Options<T> {
-        rejectionEvents?: string[];
-        multiArgs?: boolean;
-        timeout?: number;
-        filter?: FilterFn<T>;
-    }
-}
-
-type AddRmListenerFn<T, TRest> = (event: string | symbol, listener: (arg1: T, ...args: TRest[]) => void) => void;
-type FilterFn<T> = (el: T) => boolean;
-
-interface MultiArgsOptions<T> extends pEvent.Options<T> {
-    multiArgs: true;
-}
diff --git a/types/p-event/v1/p-event-tests.ts b/types/p-event/v1/p-event-tests.ts
deleted file mode 100644
index 0295cdb34b..0000000000
--- a/types/p-event/v1/p-event-tests.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/// <reference types="node" />
-
-import pEvent = require('p-event');
-import * as events from 'events';
-import * as fs from 'fs';
-
-class MyEmitter extends events.EventEmitter {
-}
-
-class MyDomEmitter implements EventTarget {
-    addEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
-    }
-
-    dispatchEvent(event: Event): boolean {
-        return false;
-    }
-
-    removeEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
-    }
-}
-
-pEvent(new MyEmitter(), 'finish')
-    .then(result => {
-        console.log(result);
-    })
-    .catch(error => {
-        console.error(error);
-    });
-
-pEvent<string>(new MyEmitter(), 'finish').then(result => {
-    const str: string = result;
-});
-
-pEvent(new MyDomEmitter(), 'finish').then(result => {
-    const e: Event | undefined = result;
-});
-
-pEvent(document, 'DOMContentLoaded').then(() => {
-    console.log('😎');
-});
-
-pEvent<string>(new MyEmitter(), 'finish', {multiArgs: true}).then(result => {
-    const strArr: string[] = result;
-});
-
-pEvent<number>(new MyEmitter(), '🦄', value => value > 3).then(result => {
-    const num: number = result;
-});
-
-async function getOpenReadStream(file: string) {
-    const stream = fs.createReadStream(file);
-    await pEvent(stream, 'open');
-    return stream;
-}
-
-getOpenReadStream('unicorn.txt')
-    .then(stream => {
-        console.log('Is readable:', stream.readable);
-        stream.pipe(process.stdout);
-    })
-    .catch(console.error);
diff --git a/types/p-event/v1/tsconfig.json b/types/p-event/v1/tsconfig.json
deleted file mode 100644
index e8374c9b9e..0000000000
--- a/types/p-event/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": false,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "p-event": [
-                "p-event/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-event-tests.ts"
-    ]
-}
diff --git a/types/p-event/v1/tslint.json b/types/p-event/v1/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-event/v1/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From fdf8237ec0d49c60f3da62cfc53b911f07ee5224 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Fri, 1 Mar 2019 23:53:00 +0100
Subject: [PATCH 274/924] fix(node): add `Map` forward declare

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 41bfd02671..1e9121044a 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -63,6 +63,7 @@ interface WeakMapConstructor { }
 interface SetConstructor { }
 interface WeakSetConstructor { }
 interface Set<T> {}
+interface Map<K, V> {}
 interface ReadonlySet<T> {}
 interface IteratorResult<T> { }
 interface Iterable<T> { }

From cfb29cc2d2f9525e6b5706eb5b3fa73510e204eb Mon Sep 17 00:00:00 2001
From: Joel Spadin <joelspadin@gmail.com>
Date: Sat, 2 Mar 2019 20:16:38 -0600
Subject: [PATCH 275/924] Add types for plurals-cldr

---
 types/plurals-cldr/index.d.ts            | 53 ++++++++++++++++++++++++
 types/plurals-cldr/plurals-cldr-tests.ts | 15 +++++++
 types/plurals-cldr/tsconfig.json         | 23 ++++++++++
 types/plurals-cldr/tslint.json           |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 types/plurals-cldr/index.d.ts
 create mode 100644 types/plurals-cldr/plurals-cldr-tests.ts
 create mode 100644 types/plurals-cldr/tsconfig.json
 create mode 100644 types/plurals-cldr/tslint.json

diff --git a/types/plurals-cldr/index.d.ts b/types/plurals-cldr/index.d.ts
new file mode 100644
index 0000000000..0d7277b52a
--- /dev/null
+++ b/types/plurals-cldr/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for plurals-cldr 1.0
+// Project: https://github.com/nodeca/plurals-cldr
+// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type Form = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
+
+interface Plural {
+    /**
+     * Returns the form name for a given number. If the locale is not
+     * supported, returns `null`.
+     *
+     * @param locale The locale code.
+     * @param number The number to check. May be passed as a string to keep
+     * 	trailing zeroes.
+     */
+    (locale: string, number: number | string): Form | null;
+
+    /**
+     * Returns an array of available forms for the given locale. If the
+     * locale is not supported, returns `null`.
+     *
+     * @param locale The locale code.
+     */
+    forms(locale: string): Form[] | null;
+
+    /**
+     * Returns the index of the form for a given number. If the locale is
+     * not supported, returns `-1`.
+     *
+     * This is convenient for implementing a lookup from a compact, ordered
+     * list. The order of forms for all locales is `zero`, `one`, `two`,
+     * `few`, `many`, `other`. Remove the forms not used by a locale to get
+     * the indices of each.
+     *
+     * @param locale The locale code.
+     * @param number The number to check. May be passed as a string to keep
+     * 	trailing zeroes.
+     */
+    indexOf(locale: string, number: number | string): number;
+}
+
+/**
+ * Gets the CLDR cardinal plural forms for numbers in different locales.
+ */
+declare const plural: Plural & {
+    /**
+     * Gets the CLDR ordinal plural forms for numbers in different locales.
+     */
+    ordinal: Plural;
+};
+
+export default plural;
diff --git a/types/plurals-cldr/plurals-cldr-tests.ts b/types/plurals-cldr/plurals-cldr-tests.ts
new file mode 100644
index 0000000000..f5aacbd30c
--- /dev/null
+++ b/types/plurals-cldr/plurals-cldr-tests.ts
@@ -0,0 +1,15 @@
+import plural from 'plurals-cldr';
+
+plural('en', 0); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null
+plural('en', ''); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null
+
+plural.forms('en'); // $ExpectType Form[] | null
+plural.indexOf('en', 0); // $ExpectType number
+plural.indexOf('en', ''); // $ExpectType number
+
+plural.ordinal('en', 0); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null
+plural.ordinal('en', ''); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null
+
+plural.ordinal.forms('en'); // $ExpectType Form[] | null
+plural.ordinal.indexOf('en', 0); // $ExpectType number
+plural.ordinal.indexOf('en', ''); // $ExpectType number
diff --git a/types/plurals-cldr/tsconfig.json b/types/plurals-cldr/tsconfig.json
new file mode 100644
index 0000000000..593fbd1545
--- /dev/null
+++ b/types/plurals-cldr/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",
+        "plurals-cldr-tests.ts"
+    ]
+}
diff --git a/types/plurals-cldr/tslint.json b/types/plurals-cldr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/plurals-cldr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 967d0226707f2e69dc83e61ffc89f48a3f835794 Mon Sep 17 00:00:00 2001
From: loli <loli@lolikon.cn>
Date: Sun, 3 Mar 2019 10:37:13 +0800
Subject: [PATCH 276/924] file update

---
 retinajs/index.d.ts             | 42 ---------------------------------
 types/retinajs/LICENSE          | 21 -----------------
 types/retinajs/README.md        | 14 -----------
 types/retinajs/package.json     | 28 ----------------------
 types/retinajs/retinajs-test.ts |  3 +++
 types/retinajs/tsconfig.json    | 23 ++++++++++++++++++
 types/retinajs/tslint.json      |  1 +
 7 files changed, 27 insertions(+), 105 deletions(-)
 delete mode 100644 retinajs/index.d.ts
 delete mode 100644 types/retinajs/LICENSE
 delete mode 100644 types/retinajs/README.md
 delete mode 100644 types/retinajs/package.json
 create mode 100644 types/retinajs/retinajs-test.ts
 create mode 100644 types/retinajs/tsconfig.json
 create mode 100644 types/retinajs/tslint.json

diff --git a/retinajs/index.d.ts b/retinajs/index.d.ts
deleted file mode 100644
index 58b3e3b653..0000000000
--- a/retinajs/index.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export = retinajs.retina;
-
-export as namespace retinajs;
-
-declare namespace retinajs {
-  var hasWindow: boolean;
-
-  var environment: number;
-
-  var srcReplace: RegExp;
-
-  var inlineReplace: RegExp;
-
-  var selector: string;
-
-  var processedAttr: string;
-
-  var processedAttr: string;
-
-  function arrayify(object: any): HTMLImageElement[];
-
-  function chooseCap(cap: number | string): number;
-
-  function forceOriginalDimensions(image: HTMLImageElement): HTMLImageElement;
-
-  function setSourceIfAvailable(
-    image: HTMLImageElement,
-    retinaURL: string
-  ): void;
-
-  function dynamicSwapImage(image: HTMLImageElement, src: string): void;
-
-  function manualSwapImage(image: HTMLImageElement, hdsrc: string): void;
-
-  function getImages(images: HTMLImageElement[] | null): HTMLImageElement[];
-
-  function cleanBgImg(img: HTMLImageElement): HTMLImageElement;
-
-  function retina(): void;
-
-  function retina(images: any): void;
-}
diff --git a/types/retinajs/LICENSE b/types/retinajs/LICENSE
deleted file mode 100644
index 21071075c2..0000000000
--- a/types/retinajs/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-    MIT License
-
-    Copyright (c) Microsoft Corporation. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
diff --git a/types/retinajs/README.md b/types/retinajs/README.md
deleted file mode 100644
index d28dcdd483..0000000000
--- a/types/retinajs/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Installation
-
-> `npm install --save @types/retinajs`
-
-# Summary
-
-This package contains type definitions for retinajs ( https://github.com/strues/retinajs ).
-
-# Details
-
-Additional Details
-
-- Last updated: Sat Mar 02 2019 15:07:39 GMT+0800
-- Dependencies: none
diff --git a/types/retinajs/package.json b/types/retinajs/package.json
deleted file mode 100644
index 2c3081334e..0000000000
--- a/types/retinajs/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "@types/retinajs",
-  "version": "2.1.3",
-  "description": "TypeScript definitions for retinajs",
-  "license": "MIT",
-  "contributors": [
-    "senjyouhara (https://github.com/senjyouhara)"
-  ],
-  "main": "",
-  "types": "index",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git"
-  },
-  "scripts": {},
-  "dependencies": {},
-  "typesPublisherContentHash": "4BCEA62CB241C5EA821904599800CBA7A5695E03776CAE7E46CC1FDE98B73069",
-  "typeScriptVersion": ">= 3.2",
-  "bugs": {
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
-  },
-  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped#readme",
-  "keywords": [
-    "retinajs",
-    "retina"
-  ],
-  "author": "senjyouhara"
-}
diff --git a/types/retinajs/retinajs-test.ts b/types/retinajs/retinajs-test.ts
new file mode 100644
index 0000000000..9795d8922e
--- /dev/null
+++ b/types/retinajs/retinajs-test.ts
@@ -0,0 +1,3 @@
+const retinajs = require("retinajs");
+
+window.addEventListener("load", retinajs);
diff --git a/types/retinajs/tsconfig.json b/types/retinajs/tsconfig.json
new file mode 100644
index 0000000000..a137453eb4
--- /dev/null
+++ b/types/retinajs/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",
+        "retinajs-test.ts"
+    ]
+}
diff --git a/types/retinajs/tslint.json b/types/retinajs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/retinajs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6da7985a2e2700239eec572d76bb35d2625214c5 Mon Sep 17 00:00:00 2001
From: clomie <cclomie@gmail.com>
Date: Sun, 3 Mar 2019 12:33:43 +0900
Subject: [PATCH 277/924] [google.script.client-side] Fix type assertion

---
 .../google.script.client-side-tests.ts             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/google.script.client-side/google.script.client-side-tests.ts b/types/google.script.client-side/google.script.client-side-tests.ts
index 5e3c059c01..b0cb508777 100644
--- a/types/google.script.client-side/google.script.client-side-tests.ts
+++ b/types/google.script.client-side/google.script.client-side-tests.ts
@@ -1,7 +1,7 @@
 google.script.url.getLocation(location => {
-    location.hash; // $ExpectedType string
-    location.parameter; // $ExpectedType { [key: string]: string }
-    location.parameters; // $ExpectedType { [key: string]: ReadonlyArray<string> }
+    location.hash; // $ExpectType string
+    location.parameter; // $ExpectType { [key: string]: string; }
+    location.parameters; // $ExpectType { [key: string]: ReadonlyArray<string>; }
 });
 
 google.script.history.push(null);
@@ -13,10 +13,10 @@ google.script.history.replace({ timestamp: Date.now() }, { foo: 'bar', fiz: 'baz
 google.script.history.replace({ timestamp: Date.now() }, { foo: ['bar', 'cat'], fiz: 'baz' }, 'anchor1');
 
 google.script.history.setChangeHandler(e => {
-    e.state; // $ExpectedType google.script.history.State
-    e.location.hash; // $ExpectedType string
-    e.location.parameter; // $ExpectedType { [key: string]: string }
-    e.location.parameters; // $ExpectedType { [key: string]: ReadonlyArray<string> }
+    e.state; // $ExpectType State
+    e.location.hash; // $ExpectType string
+    e.location.parameter; // $ExpectType { [key: string]: string; }
+    e.location.parameters; // $ExpectType { [key: string]: ReadonlyArray<string>; }
 });
 
 google.script.host.origin; // $ExpectType string

From 601b7987f0ac97e3927a53bb7f6db23d6f8b4453 Mon Sep 17 00:00:00 2001
From: clomie <cclomie@gmail.com>
Date: Sun, 3 Mar 2019 13:02:12 +0900
Subject: [PATCH 278/924] [google.script.client-side] Improve type of
 google.script.run

---
 .../google.script.client-side-tests.ts        | 76 +++++++++++++++++--
 types/google.script.client-side/index.d.ts    | 12 +--
 types/google.script.client-side/tsconfig.json |  3 +-
 3 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/types/google.script.client-side/google.script.client-side-tests.ts b/types/google.script.client-side/google.script.client-side-tests.ts
index b0cb508777..57867f8456 100644
--- a/types/google.script.client-side/google.script.client-side-tests.ts
+++ b/types/google.script.client-side/google.script.client-side-tests.ts
@@ -25,15 +25,79 @@ google.script.host.editor.focus();
 google.script.host.setHeight(450);
 google.script.host.setWidth(300);
 
-google.script.run.withSuccessHandler(() => {}).executeScript({ message: 'test for google.script.run' });
+google.script.run.withSuccessHandler(() => {}); // $ExpectType Runner
+google.script.run.withFailureHandler(() => {}); // $ExpectType Runner
+google.script.run.withUserObject({}); // $ExpectType Runner
 
 google.script.run
     .withSuccessHandler(value => {})
-    .withFailureHandler(error => {})
-    .getEmail();
+    .withFailureHandler(error => {
+        error; // $ExpectType Error
+    });
 
 google.script.run
     .withSuccessHandler((value, userObject) => {})
-    .withFailureHandler((error, userObject) => {})
-    .withUserObject({})
-    .getSomeData(Date.now(), { options: 'none' }, 'anchor1', true, null);
+    .withFailureHandler((error, userObject) => {
+        error; // $ExpectType Error
+    })
+    .withUserObject({});
+
+google.script.run.testFunctionWithoutParameter();
+google.script.run.testFunctionWithNumber(0);
+google.script.run.testFunctionWithBoolean(true);
+google.script.run.testFunctionWithString("");
+google.script.run.testFunctionWithNull(null);
+google.script.run.testFunctionWithArray([
+    0,
+    true,
+    "",
+    null,
+    undefined,
+    [],
+    {
+        number: 0,
+        boolean: true,
+        string: "",
+        nullValue: null,
+        undef: undefined,
+        array: [0, true, "", null, undefined, [], {}],
+        object: {}
+    }
+]);
+google.script.run.testFunctionWithObject({
+    number: 0,
+    boolean: true,
+    string: "",
+    nullValue: null,
+    undef: undefined,
+    array: [0, true, "", null, undefined, [], {}],
+    object: {}
+});
+google.script.run.testFunctionWithMultipleParameters(
+    0,
+    true,
+    "",
+    null,
+    undefined,
+    [
+        0,
+        true,
+        "",
+        null,
+        undefined,
+        [],
+        {}
+    ],
+    {
+        number: 0,
+        boolean: true,
+        string: "",
+        nullValue: null,
+        undef: undefined,
+        array: [0, true, "", null, undefined, [], {}],
+        object: {}
+    }
+);
+google.script.run.testFunctionWithForm(new HTMLFormElement());
+google.script.run.testFunctionWithDateError(new Date()); // $ExpectError
+google.script.run.testFunctionWithFunctionError(() => {}); // $ExpectError
diff --git a/types/google.script.client-side/index.d.ts b/types/google.script.client-side/index.d.ts
index 7d497fd6c2..23e92255a7 100644
--- a/types/google.script.client-side/index.d.ts
+++ b/types/google.script.client-side/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package Google Apps Script Client-side API 0.0
+// Type definitions for non-npm package Google Apps Script Client-side API 0.1
 // Project: https://developers.google.com/apps-script/guides/html/reference/host
 // Definitions by: clomie <https://github.com/clomie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -118,12 +118,14 @@ declare namespace google.script {
 
     const run: Runner;
 
-    interface Runner {
+    type Parameter = number | boolean | string | { [index: number]: Parameter } | { [key: string]: Parameter } | null | undefined;
+
+    type Runner = {
         /**
          * Executes the server-side Apps Script function with the corresponding name.
          */
-        [functionName: string]: (...args: any[]) => void;
-
+        [functionName: string]: (first?: Parameter | HTMLFormElement, ...rest: Parameter[]) => void;
+    } & {
         /**
          * Sets a callback function to run if the server-side function throws an exception.
          * Without a failure handler, failures are logged to the JavaScript console.
@@ -147,5 +149,5 @@ declare namespace google.script {
          * User objects cannot, however, be objects constructed with the new operator
          */
         withUserObject(object: any): Runner;
-    }
+    };
 }
diff --git a/types/google.script.client-side/tsconfig.json b/types/google.script.client-side/tsconfig.json
index 83c99e2f06..e573df04f9 100644
--- a/types/google.script.client-side/tsconfig.json
+++ b/types/google.script.client-side/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From f802af39041b1b02d5d00d20c8cf4333f38e369c Mon Sep 17 00:00:00 2001
From: loli <loli@lolikon.cn>
Date: Sun, 3 Mar 2019 12:03:23 +0800
Subject: [PATCH 279/924] file update

---
 types/retinajs/index.d.ts        | 42 ++++++++++++++++----------------
 types/retinajs/retinajs-test.ts  |  3 ---
 types/retinajs/retinajs-tests.ts |  3 +++
 types/retinajs/tsconfig.json     |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 types/retinajs/retinajs-test.ts
 create mode 100644 types/retinajs/retinajs-tests.ts

diff --git a/types/retinajs/index.d.ts b/types/retinajs/index.d.ts
index 58b3e3b653..7d02ebc90b 100644
--- a/types/retinajs/index.d.ts
+++ b/types/retinajs/index.d.ts
@@ -1,42 +1,42 @@
+// Type definitions for retinajs 2.1
+// Project: https://github.com/strues/retinajs
+// Definitions by: senjyouhara <https://github.com/senjyouhara>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 export = retinajs.retina;
 
 export as namespace retinajs;
 
 declare namespace retinajs {
-  var hasWindow: boolean;
+    // var hasWindow: boolean;
 
-  var environment: number;
+    // var environment: number;
 
-  var srcReplace: RegExp;
+    // var srcReplace: RegExp;
 
-  var inlineReplace: RegExp;
+    // var inlineReplace: RegExp;
 
-  var selector: string;
+    // var selector: string;
 
-  var processedAttr: string;
+    // var processedAttr: string;
 
-  var processedAttr: string;
+    // var processedAttr: string;
 
-  function arrayify(object: any): HTMLImageElement[];
+    // function arrayify(object: any): any[];
 
-  function chooseCap(cap: number | string): number;
+    // function chooseCap(cap: number | string): number;
 
-  function forceOriginalDimensions(image: HTMLImageElement): HTMLImageElement;
+    // function forceOriginalDimensions(image: any): any;
 
-  function setSourceIfAvailable(
-    image: HTMLImageElement,
-    retinaURL: string
-  ): void;
+    // function setSourceIfAvailable(image: any, retinaURL: string): void;
 
-  function dynamicSwapImage(image: HTMLImageElement, src: string): void;
+    // function dynamicSwapImage(image: any, src: string): void;
 
-  function manualSwapImage(image: HTMLImageElement, hdsrc: string): void;
+    // function manualSwapImage(image: any, hdsrc: string): void;
 
-  function getImages(images: HTMLImageElement[] | null): HTMLImageElement[];
+    // function getImages(images: any[] | null): any[];
 
-  function cleanBgImg(img: HTMLImageElement): HTMLImageElement;
+    // function cleanBgImg(img: any): any;
 
-  function retina(): void;
-
-  function retina(images: any): void;
+    function retina(images?: any): void;
 }
diff --git a/types/retinajs/retinajs-test.ts b/types/retinajs/retinajs-test.ts
deleted file mode 100644
index 9795d8922e..0000000000
--- a/types/retinajs/retinajs-test.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const retinajs = require("retinajs");
-
-window.addEventListener("load", retinajs);
diff --git a/types/retinajs/retinajs-tests.ts b/types/retinajs/retinajs-tests.ts
new file mode 100644
index 0000000000..382f843e60
--- /dev/null
+++ b/types/retinajs/retinajs-tests.ts
@@ -0,0 +1,3 @@
+import retina = require("retinajs");
+
+retina();
diff --git a/types/retinajs/tsconfig.json b/types/retinajs/tsconfig.json
index a137453eb4..c022eaf6cc 100644
--- a/types/retinajs/tsconfig.json
+++ b/types/retinajs/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "retinajs-test.ts"
+        "retinajs-tests.ts"
     ]
 }

From bebc13ea5b1babb1bfe55d7f4ff138da7196b3ef Mon Sep 17 00:00:00 2001
From: Justin Hall <justin.r.hall@gmail.com>
Date: Sat, 2 Mar 2019 20:46:25 -0700
Subject: [PATCH 280/924] [cypress-axe] update types for v0.4.0

---
 types/cypress-axe/index.d.ts   | 6 ++++--
 types/cypress-axe/package.json | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 types/cypress-axe/package.json

diff --git a/types/cypress-axe/index.d.ts b/types/cypress-axe/index.d.ts
index 507a5f773d..8231c364be 100644
--- a/types/cypress-axe/index.d.ts
+++ b/types/cypress-axe/index.d.ts
@@ -1,12 +1,14 @@
-// Type definitions for cypress-axe 0.3
+// Type definitions for cypress-axe 0.4
 // Project: https://github.com/avanslaars/cypress-axe#readme
 // Definitions by: Justin Hall <https://github.com/wKovacs64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
+import { ElementContext, RunOptions } from 'axe-core';
 
 declare namespace Cypress {
     interface Chainable<Subject = any> {
         injectAxe(): void;
-        checkA11y(): void;
+        checkA11y(context?: ElementContext, options?: RunOptions): void;
+        configureAxe(options?: RunOptions): void;
     }
 }
diff --git a/types/cypress-axe/package.json b/types/cypress-axe/package.json
new file mode 100644
index 0000000000..71df6dd355
--- /dev/null
+++ b/types/cypress-axe/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "axe-core": "^3.1.2"
+    }
+}

From 1b05c90543db62948cc508199160b9e9c4a134b8 Mon Sep 17 00:00:00 2001
From: Justin Hall <justin.r.hall@gmail.com>
Date: Sat, 2 Mar 2019 21:25:29 -0700
Subject: [PATCH 281/924] [cypress-axe] augment axe-core's Node type

---
 types/cypress-axe/index.d.ts  | 5 +++++
 types/cypress-axe/tslint.json | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/types/cypress-axe/index.d.ts b/types/cypress-axe/index.d.ts
index 8231c364be..c2158fd5ec 100644
--- a/types/cypress-axe/index.d.ts
+++ b/types/cypress-axe/index.d.ts
@@ -3,8 +3,13 @@
 // Definitions by: Justin Hall <https://github.com/wKovacs64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
+
 import { ElementContext, RunOptions } from 'axe-core';
 
+declare module "axe-core" {
+	interface Node {}
+}
+
 declare namespace Cypress {
     interface Chainable<Subject = any> {
         injectAxe(): void;
diff --git a/types/cypress-axe/tslint.json b/types/cypress-axe/tslint.json
index 3db14f85ea..4f44991c3c 100644
--- a/types/cypress-axe/tslint.json
+++ b/types/cypress-axe/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}

From 232ae8a9252d5499d82e74d23ef64d1ae9e22a59 Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack.wilsdon@gmail.com>
Date: Sun, 3 Mar 2019 05:34:01 +0000
Subject: [PATCH 282/924] webpack-env: Make module.hot.accept callback optional

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

diff --git a/types/webpack-env/index.d.ts b/types/webpack-env/index.d.ts
index 705e776c1e..3677523927 100644
--- a/types/webpack-env/index.d.ts
+++ b/types/webpack-env/index.d.ts
@@ -122,13 +122,13 @@ declare namespace __WebpackModuleApi {
          * @param dependencies
          * @param callback
          */
-        accept(dependencies: string[], callback: (updatedDependencies: ModuleId[]) => void): void;
+        accept(dependencies: string[], callback?: (updatedDependencies: ModuleId[]) => void): void;
         /**
          * Accept code updates for the specified dependencies. The callback is called when dependencies were replaced.
          * @param dependency
          * @param callback
          */
-        accept(dependency: string, callback: () => void): void;
+        accept(dependency: string, callback?: () => void): void;
         /**
          * Accept code updates for this module without notification of parents.
          * This should only be used if the module doesn’t export anything.
diff --git a/types/webpack-env/webpack-env-tests.ts b/types/webpack-env/webpack-env-tests.ts
index 61fb3f6c55..b07a3b632a 100644
--- a/types/webpack-env/webpack-env-tests.ts
+++ b/types/webpack-env/webpack-env-tests.ts
@@ -19,6 +19,9 @@ require(['./someModule', './otherModule'], (someModule: SomeModule, otherModule:
 
 // check if HMR is enabled
 if(module.hot) {
+    // accept update of dependency without a callback
+    module.hot.accept("./handler.js");
+
     // accept update of dependency
     module.hot.accept("./handler.js", function() {
         //...

From 6d45563a4a6a896d2c1075bc50b3458500c5a529 Mon Sep 17 00:00:00 2001
From: Justin Hall <justin.r.hall@gmail.com>
Date: Sat, 2 Mar 2019 22:50:39 -0700
Subject: [PATCH 283/924] [cypress-axe] switch to inline import() to reference
 axe-core types

---
 types/cypress-axe/index.d.ts | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/types/cypress-axe/index.d.ts b/types/cypress-axe/index.d.ts
index c2158fd5ec..628ba66397 100644
--- a/types/cypress-axe/index.d.ts
+++ b/types/cypress-axe/index.d.ts
@@ -4,16 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { ElementContext, RunOptions } from 'axe-core';
-
-declare module "axe-core" {
-	interface Node {}
-}
-
 declare namespace Cypress {
     interface Chainable<Subject = any> {
         injectAxe(): void;
-        checkA11y(context?: ElementContext, options?: RunOptions): void;
-        configureAxe(options?: RunOptions): void;
+        checkA11y(
+            context?: import('axe-core').ElementContext,
+            options?: import('axe-core').RunOptions,
+        ): void;
+        configureAxe(options?: import('axe-core').RunOptions): void;
     }
 }

From ed9e9089ca8977534278547934572e6e6006367f Mon Sep 17 00:00:00 2001
From: Justin Hall <justin.r.hall@gmail.com>
Date: Sat, 2 Mar 2019 22:57:34 -0700
Subject: [PATCH 284/924] [cypress-axe] reference dom lib and require
 TypeScript 3.1

---
 types/cypress-axe/index.d.ts  | 4 +++-
 types/cypress-axe/tslint.json | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/types/cypress-axe/index.d.ts b/types/cypress-axe/index.d.ts
index 628ba66397..10fc76e9f5 100644
--- a/types/cypress-axe/index.d.ts
+++ b/types/cypress-axe/index.d.ts
@@ -2,7 +2,9 @@
 // Project: https://github.com/avanslaars/cypress-axe#readme
 // Definitions by: Justin Hall <https://github.com/wKovacs64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.1
+
+/// <reference lib="dom" />
 
 declare namespace Cypress {
     interface Chainable<Subject = any> {
diff --git a/types/cypress-axe/tslint.json b/types/cypress-axe/tslint.json
index 4f44991c3c..3db14f85ea 100644
--- a/types/cypress-axe/tslint.json
+++ b/types/cypress-axe/tslint.json
@@ -1,6 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-empty-interface": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From ca7e81b1f39cca6cb508613455af0eece498dc08 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Sun, 3 Mar 2019 17:16:26 +1100
Subject: [PATCH 285/924] Added type defs for pretty-time

---
 types/pretty-time/index.d.ts           | 40 ++++++++++++++++++++++++++
 types/pretty-time/pretty-time-tests.ts | 13 +++++++++
 types/pretty-time/tsconfig.json        | 25 ++++++++++++++++
 types/pretty-time/tslint.json          |  3 ++
 4 files changed, 81 insertions(+)
 create mode 100644 types/pretty-time/index.d.ts
 create mode 100644 types/pretty-time/pretty-time-tests.ts
 create mode 100644 types/pretty-time/tsconfig.json
 create mode 100644 types/pretty-time/tslint.json

diff --git a/types/pretty-time/index.d.ts b/types/pretty-time/index.d.ts
new file mode 100644
index 0000000000..c46273abaa
--- /dev/null
+++ b/types/pretty-time/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for pretty-time 1.1
+// Project: https://github.com/jonschlinkert/pretty-time
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+export type Increment =
+    | 'ns'
+    | 'nano'
+    | 'nanosecond'
+    | 'nanoseconds'
+    | 'μs'
+    | 'micro'
+    | 'microsecond'
+    | 'microseconds'
+    | 'ms'
+    | 'milli'
+    | 'millisecond'
+    | 'milliseconds'
+    | 's'
+    | 'sec'
+    | 'second'
+    | 'seconds'
+    | 'm'
+    | 'min'
+    | 'minute'
+    | 'minutes'
+    | 'h'
+    | 'hr'
+    | 'hour'
+    | 'hours'
+    | 'd'
+    | 'day'
+    | 'days'
+    | 'w'
+    | 'wk'
+    | 'week'
+    | 'weeks';
+
+export default function(time: number[], smallest?: Increment, digits?: number): string;
diff --git a/types/pretty-time/pretty-time-tests.ts b/types/pretty-time/pretty-time-tests.ts
new file mode 100644
index 0000000000..c6f2e926ae
--- /dev/null
+++ b/types/pretty-time/pretty-time-tests.ts
@@ -0,0 +1,13 @@
+import DateTime from "pretty-time";
+
+DateTime([1200708, 795428088]);
+
+DateTime([0, 795428088]);
+
+DateTime([0, 795428088], 'h');
+
+DateTime([0, 795428088], 'm');
+
+DateTime([0, 795428088], 'μs', 2);
+
+DateTime([0, 795428088], 'ms', 1);
diff --git a/types/pretty-time/tsconfig.json b/types/pretty-time/tsconfig.json
new file mode 100644
index 0000000000..d18e4b1fa1
--- /dev/null
+++ b/types/pretty-time/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "pretty-time-tests.ts"
+    ]
+}
diff --git a/types/pretty-time/tslint.json b/types/pretty-time/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/pretty-time/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 874d94e03314a4b6bbc4faa03bd463bbb291776c Mon Sep 17 00:00:00 2001
From: Joel Spadin <joelspadin@gmail.com>
Date: Sun, 3 Mar 2019 01:21:10 -0600
Subject: [PATCH 286/924] Add types for webpack-watched-glob-entries-plugin

---
 .../index.d.ts                                | 17 +++++++++++
 .../tsconfig.json                             | 23 +++++++++++++++
 .../tslint.json                               |  1 +
 ...bpack-watched-glob-entries-plugin-tests.ts | 29 +++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 types/webpack-watched-glob-entries-plugin/index.d.ts
 create mode 100644 types/webpack-watched-glob-entries-plugin/tsconfig.json
 create mode 100644 types/webpack-watched-glob-entries-plugin/tslint.json
 create mode 100644 types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts

diff --git a/types/webpack-watched-glob-entries-plugin/index.d.ts b/types/webpack-watched-glob-entries-plugin/index.d.ts
new file mode 100644
index 0000000000..6f4c1b4a6a
--- /dev/null
+++ b/types/webpack-watched-glob-entries-plugin/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for webpack-watched-glob-entries-plugin 2.1
+// Project: https://github.com/Milanzor/webpack-watched-glob-entries-plugin#readme
+// Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { IOptions } from 'glob';
+import { EntryFunc, Plugin } from 'webpack';
+
+export interface PluginOptions {
+    basename_as_entry_name?: boolean;
+}
+
+export default class WebpackWatchedGlobEntries extends Plugin {
+    static getEntries(globs: string[], globOptions?: IOptions, pluginOptions?: PluginOptions): EntryFunc;
+    static getFiles(globString: string, globOptions?: IOptions, basename_as_entry_name?: boolean): Record<string, string>;
+}
diff --git a/types/webpack-watched-glob-entries-plugin/tsconfig.json b/types/webpack-watched-glob-entries-plugin/tsconfig.json
new file mode 100644
index 0000000000..20777e1cef
--- /dev/null
+++ b/types/webpack-watched-glob-entries-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-watched-glob-entries-plugin-tests.ts"
+    ]
+}
diff --git a/types/webpack-watched-glob-entries-plugin/tslint.json b/types/webpack-watched-glob-entries-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-watched-glob-entries-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts b/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts
new file mode 100644
index 0000000000..1c87b080a1
--- /dev/null
+++ b/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts
@@ -0,0 +1,29 @@
+import GlobEntriesPlugin from 'webpack-watched-glob-entries-plugin';
+
+new GlobEntriesPlugin(); // $ExpectType WebpackWatchedGlobEntries
+
+GlobEntriesPlugin.getEntries(['']); // $ExpectType EntryFunc
+
+// $ExpectType EntryFunc
+GlobEntriesPlugin.getEntries([''], {
+    ignore: ''
+});
+
+// $ExpectType EntryFunc
+GlobEntriesPlugin.getEntries([''], {
+    ignore: '',
+}, {
+    basename_as_entry_name: true,
+});
+
+GlobEntriesPlugin.getFiles(''); // $ExpectType Record<string, string>
+
+// $ExpectType Record<string, string>
+GlobEntriesPlugin.getFiles('', {
+    ignore: '',
+});
+
+// $ExpectType Record<string, string>
+GlobEntriesPlugin.getFiles('', {
+    ignore: '',
+}, true);

From 2d91880e13bf25f568bb4ac990e401afafa82122 Mon Sep 17 00:00:00 2001
From: Himenon <6715229+Himenon@users.noreply.github.com>
Date: Sun, 3 Mar 2019 17:57:23 +0900
Subject: [PATCH 287/924] webpack-dev-server: add server argument

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

diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index 30fd2482e7..602d23ce13 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -52,11 +52,11 @@ declare namespace WebpackDevServer {
 
     interface Configuration {
         /** Provides the ability to execute custom middleware after all other middleware internally within the server. */
-        after?: (app: express.Application) => void;
+        after?: (app: express.Application, server: WebpackDevServer) => void;
         /** This option allows you to whitelist services that are allowed to access the dev server. */
         allowedHosts?: string[];
         /** Provides the ability to execute custom middleware prior to all other middleware internally within the server. */
-        before?: (app: express.Application) => void;
+        before?: (app: express.Application, server: WebpackDevServer) => void;
         /** This option broadcasts the server via ZeroConf networking on start. */
         bonjour?: boolean;
         /**
@@ -150,7 +150,7 @@ declare namespace WebpackDevServer {
          */
         quiet?: boolean;
         /** @deprecated Here you can access the Express app object and add your own custom middleware to it. */
-        setup?: (app: express.Application) => void;
+        setup?: (app: express.Application, server: WebpackDevServer) => void;
         /** The Unix socket to listen to (instead of a host). */
         socket?: string;
         /** It is possible to configure advanced options for serving static files from contentBase. */
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index 755245b035..dc59d75736 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -46,7 +46,7 @@ const config: WebpackDevServer.Configuration = {
         "**": "http://localhost:9090"
     },
 
-    setup: (app: Application) => {
+    setup: (app: Application, server: WebpackDevServer) => {
         // Here you can access the Express app object and add your own custom middleware to it.
         // For example, to define custom handlers for some paths:
         app.get('/some/path', (req, res) => {

From d1b4d296b7110a5f0b9638fbbf99c2e2a9ab488a Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sun, 3 Mar 2019 10:16:42 +0100
Subject: [PATCH 288/924] [is-online] Remove types

---
 notNeededPackages.json             |  6 ++++++
 types/is-online/index.d.ts         | 34 ------------------------------
 types/is-online/is-online-tests.ts |  6 ------
 types/is-online/tsconfig.json      | 23 --------------------
 types/is-online/tslint.json        |  1 -
 5 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 types/is-online/index.d.ts
 delete mode 100644 types/is-online/is-online-tests.ts
 delete mode 100644 types/is-online/tsconfig.json
 delete mode 100644 types/is-online/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..a82e65f606 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -834,6 +834,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/is-lower-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "is-online",
+            "typingsPackageName": "is-online",
+            "sourceRepoURL": "https://github.com/sindresorhus/is-online",
+            "asOfVersion": "8.1.0"
+        },
         {
             "libraryName": "is-plain-object",
             "typingsPackageName": "is-plain-object",
diff --git a/types/is-online/index.d.ts b/types/is-online/index.d.ts
deleted file mode 100644
index 04fa123c44..0000000000
--- a/types/is-online/index.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for is-online 8.0
-// Project: https://github.com/sindresorhus/is-online#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = isOnline;
-
-/**
- * Check if the internet connection is up.
- *
- * The following checks are run in parallel:
- * - Retrieve [icanhazip.com](https://github.com/major/icanhaz) via HTTPS
- * - Query `myip.opendns.com` on OpenDNS (Node.js only)
- * - Retrieve Apple's Captive Portal test page (Node.js only)
- *
- * When the first check succeeds, the returned Promise is resolved to `true`.
- */
-declare function isOnline(options?: isOnline.Options): Promise<boolean>;
-
-declare namespace isOnline {
-    interface Options {
-        /**
-         * Milliseconds to wait for a server to respond.
-         * @default 5000
-         */
-        timeout?: number;
-        /**
-         * Internet Protocol version to use. This is an advanced option that is usually not necessary to be set,
-         * but it can prove useful to specifically assert IPv6 connectivity.
-         * @default 'v4'
-         */
-        version?: 'v4' | 'v6';
-    }
-}
diff --git a/types/is-online/is-online-tests.ts b/types/is-online/is-online-tests.ts
deleted file mode 100644
index 74dbda5efa..0000000000
--- a/types/is-online/is-online-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import isOnline = require('is-online');
-
-isOnline(); // $ExpectType Promise<boolean>
-isOnline({ timeout: 10 }); // $ExpectType Promise<boolean>
-isOnline({ version: 'v4' }); // $ExpectType Promise<boolean>
-isOnline({ version: 'v6' }); // $ExpectType Promise<boolean>
diff --git a/types/is-online/tsconfig.json b/types/is-online/tsconfig.json
deleted file mode 100644
index 7009c26024..0000000000
--- a/types/is-online/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "is-online-tests.ts"
-    ]
-}
diff --git a/types/is-online/tslint.json b/types/is-online/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/is-online/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 46096ba4f75f6c76d1ea20c02f93e9829508c77b Mon Sep 17 00:00:00 2001
From: Dmitrii Sorin <dsorin@atlassian.com>
Date: Sun, 3 Mar 2019 19:38:04 +1100
Subject: [PATCH 289/924] Change pdfjs-dist typings to reflect the newest major
 version

---
 types/pdfjs-dist/index.d.ts          | 710 +++++++++++++--------------
 types/pdfjs-dist/pdfjs-dist-tests.ts |  10 +-
 2 files changed, 352 insertions(+), 368 deletions(-)

diff --git a/types/pdfjs-dist/index.d.ts b/types/pdfjs-dist/index.d.ts
index 81de4624f9..84d40e926a 100644
--- a/types/pdfjs-dist/index.d.ts
+++ b/types/pdfjs-dist/index.d.ts
@@ -1,487 +1,471 @@
-// Type definitions for PDF.js v0.1.0
+// Type definitions for PDF.js v2.0
 // Project: https://github.com/mozilla/pdf.js
-// Definitions by: Josh Baldwin <https://github.com/jbaldwin>
+// Definitions by: Josh Baldwin <https://github.com/jbaldwin>, Dmitrii Sorin <https://github.com/1999>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
-/*
-Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/pdf.d.ts
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
+/// <reference lib="dom"/>
 
 interface PDFPromise<T> {
-  isResolved(): boolean;
-  isRejected(): boolean;
-  resolve(value: T): void;
-  reject(reason: string): void;
-  then<U>(onResolve: (promise: T) => U, onReject?: (reason: string) => void): PDFPromise<U>;
+    isResolved(): boolean;
+    isRejected(): boolean;
+    resolve(value: T): void;
+    reject(reason: string): void;
+    then<U>(onResolve: (promise: T) => U, onReject?: (reason: string) => void): PDFPromise<U>;
 }
 
 interface PDFTreeNode {
-  title: string;
-  bold: boolean;
-  italic: boolean;
-  color: number[]; // [r,g,b]
-  dest: any;
-  items: PDFTreeNode[];
+    title: string;
+    bold: boolean;
+    italic: boolean;
+    color: number[]; // [r,g,b]
+    dest: any;
+    items: PDFTreeNode[];
 }
 
 interface PDFInfo {
-  PDFFormatVersion: string;
-  IsAcroFormPresent: boolean;
-  IsXFAPresent: boolean;
-  [key: string]: any;	// return type is string, typescript chokes
+    PDFFormatVersion: string;
+    IsAcroFormPresent: boolean;
+    IsXFAPresent: boolean;
+    [key: string]: any;	// return type is string, typescript chokes
 }
 
 interface PDFMetadata {
-  parse(): void;
-  get(name: string): string;
-  has(name: string): boolean;
+    parse(): void;
+    get(name: string): string;
+    has(name: string): boolean;
 }
 
 interface PDFSource {
-  url?: string;
-  data?: Uint8Array;
-  httpHeaders?: any;
-  password?: string;
+    url?: string;
+    data?: Uint8Array;
+    httpHeaders?: any;
+    password?: string;
 }
 
 interface PDFProgressData {
-  loaded: number;
-  total: number;
+    loaded: number;
+    total: number;
 }
 
 interface PDFDocumentProxy {
 
-  /**
-   * Total number of pages the PDF contains.
-   **/
-  numPages: number;
+    /**
+     * Total number of pages the PDF contains.
+     **/
+    numPages: number;
 
-  /**
-   * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
-   **/
-  fingerprint: string;
+    /**
+     * A unique ID to identify a PDF.  Not guaranteed to be unique.  [jbaldwin: haha what]
+     **/
+    fingerprint: string;
 
-  /**
-   * True if embedded document fonts are in use.  Will be set during rendering of the pages.
-   **/
-  embeddedFontsUsed(): boolean;
+    /**
+     * True if embedded document fonts are in use.  Will be set during rendering of the pages.
+     **/
+    embeddedFontsUsed(): boolean;
 
-  /**
-   * @param number The page number to get.  The first page is 1.
-   * @return A promise that is resolved with a PDFPageProxy.
-   **/
-  getPage(number: number): PDFPromise<PDFPageProxy>;
+    /**
+     * @param number The page number to get.  The first page is 1.
+     * @return A promise that is resolved with a PDFPageProxy.
+     **/
+    getPage(number: number): PDFPromise<PDFPageProxy>;
 
-  /**
-   * TODO: return type of Promise<???>
-   *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
-   **/
-  getDestinations(): PDFPromise<any[]>;
+    /**
+     * TODO: return type of Promise<???>
+     *  A promise that is resolved with a lookup table for mapping named destinations to reference numbers.
+     **/
+    getDestinations(): PDFPromise<any[]>;
 
-  /**
-   *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
-   **/
-  getJavaScript(): PDFPromise<string[]>;
+    /**
+     *  A promise that is resolved with an array of all the JavaScript strings in the name tree.
+     **/
+    getJavaScript(): PDFPromise<string[]>;
 
-  /**
-   *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
-   **/
-  getOutline(): PDFPromise<PDFTreeNode[]>;
+    /**
+     *  A promise that is resolved with an array that is a tree outline (if it has one) of the PDF.  @see PDFTreeNode
+     **/
+    getOutline(): PDFPromise<PDFTreeNode[]>;
 
-  /**
-   * A promise that is resolved with the info and metadata of the PDF.
-   **/
-  getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
+    /**
+     * A promise that is resolved with the info and metadata of the PDF.
+     **/
+    getMetadata(): PDFPromise<{ info: PDFInfo; metadata: PDFMetadata }>;
 
-  /**
-   * Is the PDF encrypted?
-   **/
-  isEncrypted(): PDFPromise<boolean>;
+    /**
+     * Is the PDF encrypted?
+     **/
+    isEncrypted(): PDFPromise<boolean>;
 
-  /**
-   * A promise that is resolved with Uint8Array that has the raw PDF data.
-   **/
-  getData(): PDFPromise<Uint8Array>;
+    /**
+     * A promise that is resolved with Uint8Array that has the raw PDF data.
+     **/
+    getData(): PDFPromise<Uint8Array>;
 
-  /**
-   * TODO: return type of Promise<???>
-   * A promise that is resolved when the document's data is loaded.
-   **/
-  dataLoaded(): PDFPromise<any[]>;
+    /**
+     * TODO: return type of Promise<???>
+     * A promise that is resolved when the document's data is loaded.
+     **/
+    dataLoaded(): PDFPromise<any[]>;
 
-  /**
-   *
-   **/
-  destroy(): void;
+    /**
+     *
+     **/
+    destroy(): void;
 }
 
 interface PDFRef {
-  num: number;
-  gen: any; // todo
+    num: number;
+    gen: any; // todo
 }
 
 interface PDFPageViewportOptions {
-  viewBox: any;
-  scale: number;
-  rotation: number;
-  offsetX: number;
-  offsetY: number;
-  dontFlip: boolean;
+    viewBox: any;
+    scale: number;
+    rotation: number;
+    offsetX: number;
+    offsetY: number;
+    dontFlip: boolean;
 }
 
 interface PDFPageViewport {
-  width: number;
-  height: number;
-  fontScale: number;
-  transforms: number[];
+    width: number;
+    height: number;
+    fontScale: number;
+    transforms: number[];
 
-  clone(options: PDFPageViewportOptions): PDFPageViewport;
-  convertToViewportPoint(x: number, y: number): number[]; // [x, y]
-  convertToViewportRectangle(rect: number[]): number[]; // [x1, y1, x2, y2]
-  convertToPdfPoint(x: number, y: number): number[]; // [x, y]
+    clone(options: PDFPageViewportOptions): PDFPageViewport;
+    convertToViewportPoint(x: number, y: number): number[]; // [x, y]
+    convertToViewportRectangle(rect: number[]): number[]; // [x1, y1, x2, y2]
+    convertToPdfPoint(x: number, y: number): number[]; // [x, y]
 }
 
 interface PDFAnnotationData {
-  subtype: string;
-  rect: number[]; // [x1, y1, x2, y2]
-  annotationFlags: any; // todo
-  color: number[]; // [r,g,b]
-  borderWidth: number;
-  hasAppearance: boolean;
+    subtype: string;
+    rect: number[]; // [x1, y1, x2, y2]
+    annotationFlags: any; // todo
+    color: number[]; // [r,g,b]
+    borderWidth: number;
+    hasAppearance: boolean;
 }
 
 interface PDFAnnotations {
-  getData(): PDFAnnotationData;
-  hasHtml(): boolean; // always false
-  getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
-  getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
-  isViewable(): boolean;
-  loadResources(keys: any): PDFPromise<any>;
-  getOperatorList(evaluator: any): PDFPromise<any>;
-  // ... todo
+    getData(): PDFAnnotationData;
+    hasHtml(): boolean; // always false
+    getHtmlElement(commonOjbs: any): HTMLElement; // throw new NotImplementedException()
+    getEmptyContainer(tagName: string, rect: number[]): HTMLElement; // deprecated
+    isViewable(): boolean;
+    loadResources(keys: any): PDFPromise<any>;
+    getOperatorList(evaluator: any): PDFPromise<any>;
+    // ... todo
 }
 
 interface PDFRenderTextLayer {
-  beginLayout(): void;
-  endLayout(): void;
-  appendText(): void;
+    beginLayout(): void;
+    endLayout(): void;
+    appendText(): void;
 }
 
 interface PDFRenderImageLayer {
-  beginLayout(): void;
-  endLayout(): void;
-  appendImage(): void;
+    beginLayout(): void;
+    endLayout(): void;
+    appendImage(): void;
 }
 
 interface PDFRenderParams {
-  canvasContext: CanvasRenderingContext2D;
-  viewport?: PDFPageViewport;
-  textLayer?: PDFRenderTextLayer;
-  imageLayer?: PDFRenderImageLayer;
-  continueCallback?: (_continue: () => void) => void;
+    canvasContext: CanvasRenderingContext2D;
+    viewport?: PDFPageViewport;
+    textLayer?: PDFRenderTextLayer;
+    imageLayer?: PDFRenderImageLayer;
+    continueCallback?: (_continue: () => void) => void;
 }
 
 interface PDFViewerParams {
-  container: HTMLElement;
-  viewer?: HTMLElement;
+    container: HTMLElement;
+    viewer?: HTMLElement;
 }
 
 /**
  * RenderTask is basically a promise but adds a cancel function to termiate it.
  **/
-interface PDFRenderTask extends PDFPromise<PDFPageProxy> {
+interface PDFRenderTask extends PDFLoadingTask<PDFPageProxy> {
 
-  /**
-   * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
-   **/
-  cancel(): void;
+    /**
+     * Cancel the rendering task.  If the task is currently rendering it will not be cancelled until graphics pauses with a timeout.  The promise that this object extends will resolve when cancelled.
+     **/
+    cancel(): void;
 }
 
 interface PDFPageProxy {
 
-  /**
-   * Page number of the page.  First page is 1.
-   **/
-  pageNumber: number;
+    /**
+     * Page number of the page.  First page is 1.
+     **/
+    pageNumber: number;
 
-  /**
-   * The number of degrees the page is rotated clockwise.
-   **/
-  rotate: number;
+    /**
+     * The number of degrees the page is rotated clockwise.
+     **/
+    rotate: number;
 
-  /**
-   * The reference that points to this page.
-   **/
-  ref: PDFRef;
+    /**
+     * The reference that points to this page.
+     **/
+    ref: PDFRef;
 
-  /**
-   * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
-   **/
-  view: number[];
+    /**
+     * @return An array of the visible portion of the PDF page in the user space units - [x1, y1, x2, y2].
+     **/
+    view: number[];
 
-  /**
-   * @param scale The desired scale of the viewport.
-   * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
-   * @return
-   **/
-  getViewport(scale: number, rotate?: number): PDFPageViewport;
+    /**
+     * @param scale The desired scale of the viewport.
+     * @param rotate Degrees to rotate the viewport.  If omitted this defaults to the page rotation.
+     * @param dontFlip
+     * @return
+     **/
+    getViewport(scale: number, rotate?: number, dontFlip?: boolean): PDFPageViewport;
 
-  /**
-   * A promise that is resolved with an array of the annotation objects.
-   **/
-  getAnnotations(): PDFPromise<PDFAnnotations>;
+    /**
+     * A promise that is resolved with an array of the annotation objects.
+     **/
+    getAnnotations(): PDFPromise<PDFAnnotations>;
 
-  /**
-   * Begins the process of rendering a page to the desired context.
-   * @param params Rendering options.
-   * @return An extended promise that is resolved when the page finishes rendering.
-   **/
-  render(params: PDFRenderParams): PDFRenderTask;
+    /**
+     * Begins the process of rendering a page to the desired context.
+     * @param params Rendering options.
+     * @return An extended promise that is resolved when the page finishes rendering.
+     **/
+    render(params: PDFRenderParams): PDFRenderTask;
 
-  /**
-   * A promise that is resolved with the string that is the text content frm the page.
-   **/
-  getTextContent(): PDFPromise<TextContent>;
+    /**
+     * A promise that is resolved with the string that is the text content frm the page.
+     **/
+    getTextContent(): PDFPromise<TextContent>;
 
-  /**
-   * marked as future feature
-   **/
-  //getOperationList(): PDFPromise<>;
+    /**
+     * marked as future feature
+     **/
+    //getOperationList(): PDFPromise<>;
 
-  /**
-   * Destroyes resources allocated by the page.
-   **/
-  destroy(): void;
+    /**
+     * Destroyes resources allocated by the page.
+     **/
+    destroy(): void;
 }
 
 interface TextContentItem {
-  str: string;
-  transform: number[]; // [0..5]   4=x, 5=y
-  width: number;
-  height: number;
-  dir: string; // Left-to-right (ltr), etc
-  fontName: string; // A lookup into the styles map of the owning TextContent
+    str: string;
+    transform: number[]; // [0..5]   4=x, 5=y
+    width: number;
+    height: number;
+    dir: string; // Left-to-right (ltr), etc
+    fontName: string; // A lookup into the styles map of the owning TextContent
 }
 
 interface TextContent {
-  items: TextContentItem[];
-  styles: any;
+    items: TextContentItem[];
+    styles: any;
 }
 
 /**
  * A PDF document and page is built of many objects.  E.g. there are objects for fonts, images, rendering code and such.  These objects might get processed inside of a worker.  The `PDFObjects` implements some basic functions to manage these objects.
  **/
 interface PDFObjects {
-  get(objId: number, callback?: any): any;
-  resolve(objId: number, data: any): any;
-  isResolved(objId: number): boolean;
-  hasData(objId: number): boolean;
-  getData(objId: number): any;
-  clear(): void;
+    get(objId: number, callback?: any): any;
+    resolve(objId: number, data: any): any;
+    isResolved(objId: number): boolean;
+    hasData(objId: number): boolean;
+    getData(objId: number): any;
+    clear(): void;
 }
 
 interface PDFJSUtilStatic {
-  /**
-   * Normalize rectangle so that (x1,y1) < (x2,y2)
-   * @param {number[]} rect - the rectangle with [x1,y1,x2,y2]
-   *
-   * For coordinate systems whose origin lies in the bottom-left, this
-   * means normalization to (BL,TR) ordering. For systems with origin in the
-   * top-left, this means (TL,BR) ordering.
-   **/
-  normalizeRect(rect:number[]): number[];
+    /**
+     * Normalize rectangle so that (x1,y1) < (x2,y2)
+     * @param {number[]} rect - the rectangle with [x1,y1,x2,y2]
+     *
+     * For coordinate systems whose origin lies in the bottom-left, this
+     * means normalization to (BL,TR) ordering. For systems with origin in the
+     * top-left, this means (TL,BR) ordering.
+     **/
+    normalizeRect(rect:number[]): number[];
 }
 
 export const PDFJS: PDFJSStatic;
 
 interface PDFJSStatic {
-  /**
-   * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
-   **/
-  maxImageSize: number;
+    /**
+     * The maximum allowed image size in total pixels e.g. width * height.  Images above this value will not be drawn.  Use -1 for no limit.
+     **/
+    maxImageSize: number;
 
-  /**
-   * The url of where the predefined Adobe CMaps are located. Include trailing
-   * slash.
-   */
-  cMapUrl: string;
+    /**
+     * The url of where the predefined Adobe CMaps are located. Include trailing
+     * slash.
+     */
+    cMapUrl: string;
 
-  /**
-   * Specifies if CMaps are binary packed.
-   */
-  cMapPacked: boolean;
+    /**
+     * Specifies if CMaps are binary packed.
+     */
+    cMapPacked: boolean;
 
-  /**
-   * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
-   **/
-  disableFontFace: boolean;
+    /**
+     * By default fonts are converted to OpenType fonts and loaded via font face rules.  If disabled, the font will be rendered using a built in font renderer that constructs the glyphs with primitive path commands.
+     **/
+    disableFontFace: boolean;
 
-  /**
-   * Path for image resources, mainly for annotation icons. Include trailing
-   * slash.
-   */
-  imageResourcesPath: string;
+    /**
+     * Path for image resources, mainly for annotation icons. Include trailing
+     * slash.
+     */
+    imageResourcesPath: string;
 
-  /**
-   * Disable the web worker and run all code on the main thread. This will happen
-   * automatically if the browser doesn't support workers or sending typed arrays
-   * to workers.
-   */
-  disableWorker: boolean;
+    /**
+     * Disable the web worker and run all code on the main thread. This will happen
+     * automatically if the browser doesn't support workers or sending typed arrays
+     * to workers.
+     */
+    disableWorker: boolean;
 
-  /**
-   * Path and filename of the worker file. Required when the worker is enabled in
-   * development mode. If unspecified in the production build, the worker will be
-   * loaded based on the location of the pdf.js file.
-   */
-  workerSrc: string;
+    /**
+     * Path and filename of the worker file. Required when the worker is enabled in
+     * development mode. If unspecified in the production build, the worker will be
+     * loaded based on the location of the pdf.js file.
+     */
+    workerSrc: string;
 
-  /**
-   * Disable range request loading of PDF files. When enabled and if the server
-   * supports partial content requests then the PDF will be fetched in chunks.
-   * Enabled (false) by default.
-   */
-  disableRange: boolean;
+    /**
+     * Disable range request loading of PDF files. When enabled and if the server
+     * supports partial content requests then the PDF will be fetched in chunks.
+     * Enabled (false) by default.
+     */
+    disableRange: boolean;
 
-  /**
-   * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
-   * in chunks. This default behavior can be disabled.
-   */
-  disableStream: boolean;
+    /**
+     * Disable streaming of PDF file data. By default PDF.js attempts to load PDF
+     * in chunks. This default behavior can be disabled.
+     */
+    disableStream: boolean;
 
-  /**
-   * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
-   * will automatically keep fetching more data even if it isn't needed to display
-   * the current page. This default behavior can be disabled.
-   *
-   * NOTE: It is also necessary to disable streaming, see above,
-   *       in order for disabling of pre-fetching to work correctly.
-   */
-  disableAutoFetch: boolean;
+    /**
+     * Disable pre-fetching of PDF file data. When range requests are enabled PDF.js
+     * will automatically keep fetching more data even if it isn't needed to display
+     * the current page. This default behavior can be disabled.
+     *
+     * NOTE: It is also necessary to disable streaming, see above,
+     *       in order for disabling of pre-fetching to work correctly.
+     */
+    disableAutoFetch: boolean;
 
-  /**
-   * Enables special hooks for debugging PDF.js.
-   */
-  pdfBug: boolean;
+    /**
+     * Enables special hooks for debugging PDF.js.
+     */
+    pdfBug: boolean;
 
-  /**
-   * Enables transfer usage in postMessage for ArrayBuffers.
-   */
-  postMessageTransfers: boolean;
+    /**
+     * Enables transfer usage in postMessage for ArrayBuffers.
+     */
+    postMessageTransfers: boolean;
 
-  /**
-   * Disables URL.createObjectURL usage.
-   */
-  disableCreateObjectURL: boolean;
+    /**
+     * Disables URL.createObjectURL usage.
+     */
+    disableCreateObjectURL: boolean;
 
-  /**
-   * Disables WebGL usage.
-   */
-  disableWebGL: boolean;
+    /**
+     * Disables WebGL usage.
+     */
+    disableWebGL: boolean;
 
-  /**
-   * Disables fullscreen support, and by extension Presentation Mode,
-   * in browsers which support the fullscreen API.
-   */
-  disableFullscreen: boolean;
+    /**
+     * Disables fullscreen support, and by extension Presentation Mode,
+     * in browsers which support the fullscreen API.
+     */
+    disableFullscreen: boolean;
 
-  /**
-   * Disable the text layer of PDF when used PDF.js renders a canvas instead of div elements
-   *
-   */
-  disableTextLayer: boolean;
+    /**
+     * Disable the text layer of PDF when used PDF.js renders a canvas instead of div elements
+     *
+     */
+    disableTextLayer: boolean;
 
-  /**
-   * Enables CSS only zooming.
-   */
-  useOnlyCssZoom: boolean;
+    /**
+     * Enables CSS only zooming.
+     */
+    useOnlyCssZoom: boolean;
 
-  /**
-   * Controls the logging level.
-   * The constants from PDFJS.VERBOSITY_LEVELS should be used:
-   * - errors
-   * - warnings [default]
-   * - infos
-   */
-  verbosity: number;
+    /**
+     * Controls the logging level.
+     * The constants from PDFJS.VERBOSITY_LEVELS should be used:
+     * - errors
+     * - warnings [default]
+     * - infos
+     */
+    verbosity: number;
 
-  /**
-   * The maximum supported canvas size in total pixels e.g. width * height.
-   * The default value is 4096 * 4096. Use -1 for no limit.
-   */
-  maxCanvasPixels: number;
+    /**
+     * The maximum supported canvas size in total pixels e.g. width * height.
+     * The default value is 4096 * 4096. Use -1 for no limit.
+     */
+    maxCanvasPixels: number;
 
-  /**
-   * Opens external links in a new window if enabled. The default behavior opens
-   * external links in the PDF.js window.
-   */
-  openExternalLinksInNewWindow: boolean;
+    /**
+     * Opens external links in a new window if enabled. The default behavior opens
+     * external links in the PDF.js window.
+     */
+    openExternalLinksInNewWindow: boolean;
 
-  /**
-   * Determines if we can eval strings as JS. Primarily used to improve
-   * performance for font rendering.
-   */
-  isEvalSupported: boolean;
+    /**
+     * Determines if we can eval strings as JS. Primarily used to improve
+     * performance for font rendering.
+     */
+    isEvalSupported: boolean;
 
-  Util: PDFJSUtilStatic;
-
-  /**
-   * This is the main entry point for loading a PDF and interacting with it.
-   * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
-   * is used, which means it must follow the same origin rules that any XHR does
-   * e.g. No corss domain requests without CORS.
-   * @param source
-   * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
-   * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
-   * @param progressCallback Progress callback.
-   * @return A promise that is resolved with PDFDocumentProxy object.
-   **/
-  getDocument(
-      source: string,
-      pdfDataRangeTransport?: any,
-      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-      progressCallback?: (progressData: PDFProgressData) => void)
-      : PDFPromise<PDFDocumentProxy>;
-
-  getDocument(
-      source: Uint8Array,
-      pdfDataRangeTransport?: any,
-      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-      progressCallback?: (progressData: PDFProgressData) => void)
-      : PDFPromise<PDFDocumentProxy>;
-
-  getDocument(
-      source: PDFSource,
-      pdfDataRangeTransport?: any,
-      passwordCallback?: (fn: (password: string) => void, reason: string) => string,
-      progressCallback?: (progressData: PDFProgressData) => void)
-      : PDFPromise<PDFDocumentProxy>;
-
-  PDFViewer(params: PDFViewerParams): void;
-  /**
-  * yet another viewer, this will render only one page at the time, reducing rendering time
-  * very important for mobile development
-  * @params {PDFViewerParams}
-  */
-  PDFSinglePageViewer(params: PDFViewerParams): void;
+    PDFViewer(params: PDFViewerParams): void;
+    /**
+    * yet another viewer, this will render only one page at the time, reducing rendering time
+    * very important for mobile development
+    * @params {PDFViewerParams}
+    */
+    PDFSinglePageViewer(params: PDFViewerParams): void;
 }
+
+interface PDFLoadingTask<T> {
+    promise: PDFPromise<T>;
+}
+
+declare const Util: PDFJSUtilStatic;
+
+/**
+ * This is the main entry point for loading a PDF and interacting with it.
+ * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+ * is used, which means it must follow the same origin rules that any XHR does
+ * e.g. No corss domain requests without CORS.
+ * @param source
+ * @param pdfDataRangeTransport Used if you want to manually server range requests for data in the PDF.  @ee viewer.js for an example of pdfDataRangeTransport's interface.
+ * @param passwordCallback Used to request a password if wrong or no password was provided.  The callback receives two parameters: function that needs to be called with new password and the reason.
+ * @param progressCallback Progress callback.
+ * @return A promise that is resolved with PDFDocumentProxy object.
+ **/
+declare function getDocument(
+    source: string,
+    pdfDataRangeTransport?: any,
+    passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+    progressCallback?: (progressData: PDFProgressData) => void
+): PDFLoadingTask<PDFDocumentProxy>;
+
+declare function getDocument(
+    source: Uint8Array,
+    pdfDataRangeTransport?: any,
+    passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+    progressCallback?: (progressData: PDFProgressData) => void
+): PDFLoadingTask<PDFDocumentProxy>;
+
+declare function getDocument(
+    source: PDFSource,
+    pdfDataRangeTransport?: any,
+    passwordCallback?: (fn: (password: string) => void, reason: string) => string,
+    progressCallback?: (progressData: PDFProgressData) => void
+): PDFLoadingTask<PDFDocumentProxy>;
diff --git a/types/pdfjs-dist/pdfjs-dist-tests.ts b/types/pdfjs-dist/pdfjs-dist-tests.ts
index ef569b2fda..cb7be752af 100644
--- a/types/pdfjs-dist/pdfjs-dist-tests.ts
+++ b/types/pdfjs-dist/pdfjs-dist-tests.ts
@@ -1,4 +1,4 @@
-import { PDFJS, PDFDocumentProxy, PDFPromise } from 'pdfjs-dist';
+import { getDocument, PDFDocumentProxy, PDFPromise, Util } from 'pdfjs-dist';
 
 //
 // Fetch the PDF document from the URL using promises
@@ -6,7 +6,7 @@ import { PDFJS, PDFDocumentProxy, PDFPromise } from 'pdfjs-dist';
 var pdfDoc: PDFDocumentProxy;
 var pageNum: number;
 
-PDFJS.getDocument('helloworld.pdf').then(function (pdf) {
+getDocument('helloworld.pdf').promise.then(function (pdf) {
 	// Using promise to fetch the page
 	pdfDoc = pdf;
 	pageNum = 1;
@@ -32,7 +32,7 @@ function renderPage(pageNum: number) {
 		// https://github.com/mozilla/pdf.js/blob/master/examples/acroforms/forms.js
 		//
 		const rect = viewport.convertToViewportRectangle([100,100,0,0]);
-		const normalizedRect = PDFJS.Util.normalizeRect(rect);
+		const normalizedRect = Util.normalizeRect(rect);
 		const point = viewport.convertToViewportPoint(100, 100);
 		const pdfPoint = viewport.convertToPdfPoint(100, 100);
 
@@ -57,6 +57,6 @@ function goNext() {
 //
 // Test PDFPromise allows return value mutation
 //
-var promise: PDFPromise<string> = PDFJS.getDocument('helloworld.pdf').then(pdf => {
+var promise: PDFPromise<string> = getDocument('helloworld.pdf').promise.then(pdf => {
 	return "arbitrary string";
-});
\ No newline at end of file
+});

From 1ccfa15c9a34fa05b08e8515280b8ca22acd013f Mon Sep 17 00:00:00 2001
From: Pierre Vigier <pierre.vigier@ymail.com>
Date: Sun, 3 Mar 2019 16:16:21 +0100
Subject: [PATCH 290/924] Replace nullable by optional

---
 types/nodegit/diff.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/nodegit/diff.d.ts b/types/nodegit/diff.d.ts
index 2f1abbda62..3a02577b98 100644
--- a/types/nodegit/diff.d.ts
+++ b/types/nodegit/diff.d.ts
@@ -132,16 +132,16 @@ export class Diff {
      *
      *
      */
-    static blobToBuffer(oldBlob: Blob | null, oldAsPath: string | null,
-                        buffer: string | null, bufferAsPath: string | null, opts: DiffOptions | null, fileCb: Function | null,
-                        binaryCb: Function | null, hunkCb: Function | null, lineCb: Function): Promise<any>;
+    static blobToBuffer(oldBlob?: Blob, oldAsPath?: string,
+                        buffer?: string, bufferAsPath?: string, opts?: DiffOptions, fileCb?: Function,
+                        binaryCb?: Function, hunkCb?: Function, lineCb?: Function): Promise<any>;
     static fromBuffer(content: string, contentLen: number): Promise<Diff>;
-    static indexToWorkdir(repo: Repository, index: Index | null, opts?: DiffOptions): Promise<Diff>;
+    static indexToWorkdir(repo: Repository, index?: Index, opts?: DiffOptions): Promise<Diff>;
     static indexToIndex(repo: Repository, oldIndex: Index, newIndex: Index, opts?: DiffOptions): Promise<Diff>;
-    static treeToIndex(repo: Repository, oldTree: Tree | null, index: Index | null, opts?: DiffOptions): Promise<Diff>;
-    static treeToTree(repo: Repository, oldTree: Tree | null, new_tree: Tree | null, opts?: DiffOptions): Promise<Diff>;
-    static treeToWorkdir(repo: Repository, oldTree: Tree | null, opts?: DiffOptions): Promise<Diff>;
-    static treeToWorkdirWithIndex(repo: Repository, oldTree: Tree | null, opts?: DiffOptions): Promise<Diff>;
+    static treeToIndex(repo: Repository, oldTree?: Tree, index?: Index, opts?: DiffOptions): Promise<Diff>;
+    static treeToTree(repo: Repository, oldTree?: Tree, new_tree?: Tree, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdir(repo: Repository, oldTree?: Tree, opts?: DiffOptions): Promise<Diff>;
+    static treeToWorkdirWithIndex(repo: Repository, oldTree?: Tree, opts?: DiffOptions): Promise<Diff>;
 
     findSimilar(options?: DiffFindOptions): Promise<number>;
     getDelta(idx: number): DiffDelta;

From aac82565fe94b969a0dd32cf842846cbb73ca297 Mon Sep 17 00:00:00 2001
From: Pierre Vigier <pierre.vigier@ymail.com>
Date: Sun, 3 Mar 2019 16:20:35 +0100
Subject: [PATCH 291/924] Fix types in Time

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

diff --git a/types/nodegit/time.d.ts b/types/nodegit/time.d.ts
index 575c005781..cb42ea6838 100644
--- a/types/nodegit/time.d.ts
+++ b/types/nodegit/time.d.ts
@@ -1,4 +1,4 @@
 export class Time {
-    time: number;
-    offset: number;
+    time(): number;
+    offset(): number;
 }

From 5ea320d9b787f01bd9f2696172a7c9c4bf5f126c Mon Sep 17 00:00:00 2001
From: Sam <ffxsam@users.noreply.github.com>
Date: Sun, 3 Mar 2019 11:22:50 -0600
Subject: [PATCH 292/924] Added locale option to filesize

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

diff --git a/types/filesize/filesize-tests.ts b/types/filesize/filesize-tests.ts
index 6980ac892d..aadc0542fa 100644
--- a/types/filesize/filesize-tests.ts
+++ b/types/filesize/filesize-tests.ts
@@ -15,6 +15,7 @@ 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"
+filesize(265318, {locale: 'de-DE'});  // "259,1 KB"
 
 const size = filesize.partial({standard: "iec"});
 size(265318);
diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index 33d04b66ff..d53fba8641 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -57,6 +57,10 @@ declare namespace Filesize {
          * Array of full form overrides, default is []
          */
         fullforms?: string[];
+        /**
+         * BCP 47 language tag to specify a locale, or true to use default locale, default is ""
+         */
+        locale?: string | boolean;
         /**
          * Output of function (array, exponent, object, or string), default is string
          */

From f5b66cb1740ee4f7afb2d399525a82aace1706bd Mon Sep 17 00:00:00 2001
From: Sam <ffxsam@users.noreply.github.com>
Date: Sun, 3 Mar 2019 11:28:17 -0600
Subject: [PATCH 293/924] Modified file header

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

diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index d53fba8641..cdc9031f22 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for filesize 4.0
+// Type definitions for filesize 4.1.2
 // Project: https://github.com/avoidwork/filesize.js, https://filesizejs.com
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Renaud Chaput <https://github.com/renchap>
 //                 Roman Nuritdinov <https://github.com/Ky6uk>
+//                 Sam Hulick <https://github.com/ffxsam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var fileSize: Filesize.Filesize;

From 3c211fe01dc2c08a41ba77888265180340992c16 Mon Sep 17 00:00:00 2001
From: kouros51 <sboui.houssem@gmail.com>
Date: Sun, 3 Mar 2019 16:45:17 -0500
Subject: [PATCH 294/924] Add enter and exist for a context so we set and get
 values and keys for certain context

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

diff --git a/types/cls-hooked/index.d.ts b/types/cls-hooked/index.d.ts
index 57e6b79c60..c81966970c 100644
--- a/types/cls-hooked/index.d.ts
+++ b/types/cls-hooked/index.d.ts
@@ -12,6 +12,8 @@ export interface Namespace {
 
     set<T>(key: string, value: T): T;
     get(key: string): any;
+    enter(context: any): void;
+    exit(context: any): void;
     run(fn: (...args: any[]) => void): void;
     runAndReturn<T>(fn: (...args: any[]) => T): T;
     runPromise<T>(fn: (...args: any[]) => Promise<T>): Promise<T>;

From dc27067ac0e57e4609ffcaa8f4af841cd56f404a Mon Sep 17 00:00:00 2001
From: Sam <ffxsam@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:46:09 -0600
Subject: [PATCH 295/924] Removed patch part from version

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

diff --git a/types/filesize/index.d.ts b/types/filesize/index.d.ts
index cdc9031f22..958a5e3973 100644
--- a/types/filesize/index.d.ts
+++ b/types/filesize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for filesize 4.1.2
+// Type definitions for filesize 4.1
 // Project: https://github.com/avoidwork/filesize.js, https://filesizejs.com
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Renaud Chaput <https://github.com/renchap>

From 602e04583e74ac8eaead02a1269a9a33192e1c9a Mon Sep 17 00:00:00 2001
From: Ryo Ota <nwtgck@gmail.com>
Date: Mon, 4 Mar 2019 06:50:19 +0900
Subject: [PATCH 296/924] Allow user to use Buffer in load()

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

diff --git a/types/cheerio/cheerio-tests.ts b/types/cheerio/cheerio-tests.ts
index 719c0c70da..89ffb9e28f 100644
--- a/types/cheerio/cheerio-tests.ts
+++ b/types/cheerio/cheerio-tests.ts
@@ -24,6 +24,8 @@ if ($fromElement("ul > li").length !== 3) {
   throw new Error("Expecting 3 elements when passing `CheerioElement` to `load()`");
 }
 
+$ = cheerio.load(Buffer.from(html));
+
 $ = cheerio.load(html, {
     normalizeWhitespace: true,
     xmlMode: true
diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 6c893021a3..f25c978ed0 100644
--- a/types/cheerio/index.d.ts
+++ b/types/cheerio/index.d.ts
@@ -1,8 +1,10 @@
 // Type definitions for Cheerio v0.22.0
 // Project: https://github.com/cheeriojs/cheerio
-// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>, LiJinyao <https://github.com/LiJinyao>, Chennakrishna <https://github.com/chennakrishna8>, AzSiAz <https://github.com/AzSiAz>
+// Definitions by: Bret Little <https://github.com/blittle>, VILIC VANE <http://vilic.info>, Wayne Maurer <https://github.com/wmaurer>, Umar Nizamani <https://github.com/umarniz>, LiJinyao <https://github.com/LiJinyao>, Chennakrishna <https://github.com/chennakrishna8>, AzSiAz <https://github.com/AzSiAz>, Ryo Ota <https://github.com/nwtgck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 interface Cheerio {
     // Document References
     // Cheerio https://github.com/cheeriojs/cheerio
@@ -266,7 +268,7 @@ interface CheerioElement {
 }
 
 interface CheerioAPI extends CheerioSelector, CheerioStatic {
-  load(html: string, options?: CheerioOptionsInterface): CheerioStatic;
+  load(html: string | Buffer, options?: CheerioOptionsInterface): CheerioStatic;
   load(element: CheerioElement, options?: CheerioOptionsInterface): CheerioStatic;
 }
 

From 1c43f86f73ca178bdc96fbd98e8e8c3b6b8219d9 Mon Sep 17 00:00:00 2001
From: kouros51 <sboui.houssem@gmail.com>
Date: Sun, 3 Mar 2019 17:32:17 -0500
Subject: [PATCH 297/924] Add in the test a use case explaining the need to
 expose those too new functions

---
 types/cls-hooked/cls-hooked-tests.ts | 21 +++++++++++++++++++++
 types/cls-hooked/index.d.ts          |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/types/cls-hooked/cls-hooked-tests.ts b/types/cls-hooked/cls-hooked-tests.ts
index affaa6c54a..04c0789e71 100644
--- a/types/cls-hooked/cls-hooked-tests.ts
+++ b/types/cls-hooked/cls-hooked-tests.ts
@@ -21,3 +21,24 @@ bindLater((x: number) => {
 
 const session2 = cls.getNamespace('my session');
 session2.get('user');
+
+const appNamespace = cls.createNamespace('applicationNameSpace');
+const context = appNamespace.createContext();
+
+function bindWithMiddleware(middlewareFn: () => void) {
+    return session.bind(middlewareFn, context);
+}
+
+bindWithMiddleware(()=>{
+    // Some middleware that doing something in the application
+});
+
+// In some place in application, we want to set value to be used elsewhere
+appNamespace.enter(context);
+appNamespace.set('requestId','someId');
+appNamespace.exit(context);
+
+// Retrieve that value set before without losing the context when chaining several middleware
+appNamespace.enter(context);
+appNamespace.get('requestId');
+appNamespace.exit(context);
diff --git a/types/cls-hooked/index.d.ts b/types/cls-hooked/index.d.ts
index c81966970c..4fa385c52f 100644
--- a/types/cls-hooked/index.d.ts
+++ b/types/cls-hooked/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for cls-hooked 4.2
+// Type definitions for cls-hooked 4.3
 // Project: https://github.com/jeff-lewis/cls-hooked
 // Definitions by: Leo Liang <https://github.com/aleung>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,14 +12,14 @@ export interface Namespace {
 
     set<T>(key: string, value: T): T;
     get(key: string): any;
-    enter(context: any): void;
-    exit(context: any): void;
     run(fn: (...args: any[]) => void): void;
     runAndReturn<T>(fn: (...args: any[]) => T): T;
     runPromise<T>(fn: (...args: any[]) => Promise<T>): Promise<T>;
     bind<F extends Function>(fn: F, context?: any): F; // tslint:disable-line: ban-types
     bindEmitter(emitter: EventEmitter): void;
     createContext(): any;
+    enter(context: any): void;
+    exit(context: any): void;
 }
 
 export function createNamespace(name: string): Namespace;

From 405f9855ed3194061579b15253f5a616f52310b2 Mon Sep 17 00:00:00 2001
From: kouros51 <sboui.houssem@gmail.com>
Date: Sun, 3 Mar 2019 17:39:15 -0500
Subject: [PATCH 298/924] Adding missing whitespaces

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

diff --git a/types/cls-hooked/cls-hooked-tests.ts b/types/cls-hooked/cls-hooked-tests.ts
index 04c0789e71..e1552c16e2 100644
--- a/types/cls-hooked/cls-hooked-tests.ts
+++ b/types/cls-hooked/cls-hooked-tests.ts
@@ -29,7 +29,7 @@ function bindWithMiddleware(middlewareFn: () => void) {
     return session.bind(middlewareFn, context);
 }
 
-bindWithMiddleware(()=>{
+bindWithMiddleware(() => {
     // Some middleware that doing something in the application
 });
 

From 047237d00c412b2b5b64b92938645f8ad8dfc4a0 Mon Sep 17 00:00:00 2001
From: kouros51 <sboui.houssem@gmail.com>
Date: Sun, 3 Mar 2019 17:41:08 -0500
Subject: [PATCH 299/924] Adding missing whitespaces

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

diff --git a/types/cls-hooked/cls-hooked-tests.ts b/types/cls-hooked/cls-hooked-tests.ts
index e1552c16e2..9d9e14af1b 100644
--- a/types/cls-hooked/cls-hooked-tests.ts
+++ b/types/cls-hooked/cls-hooked-tests.ts
@@ -35,7 +35,7 @@ bindWithMiddleware(() => {
 
 // In some place in application, we want to set value to be used elsewhere
 appNamespace.enter(context);
-appNamespace.set('requestId','someId');
+appNamespace.set('requestId', 'someId');
 appNamespace.exit(context);
 
 // Retrieve that value set before without losing the context when chaining several middleware

From 1c05fef87ebbaa0fba845af52e0ac5771a130a71 Mon Sep 17 00:00:00 2001
From: kouros51 <sboui.houssem@gmail.com>
Date: Sun, 3 Mar 2019 17:43:23 -0500
Subject: [PATCH 300/924] Fixing typo in comment

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

diff --git a/types/cls-hooked/cls-hooked-tests.ts b/types/cls-hooked/cls-hooked-tests.ts
index 9d9e14af1b..60931e1253 100644
--- a/types/cls-hooked/cls-hooked-tests.ts
+++ b/types/cls-hooked/cls-hooked-tests.ts
@@ -33,7 +33,7 @@ bindWithMiddleware(() => {
     // Some middleware that doing something in the application
 });
 
-// In some place in application, we want to set value to be used elsewhere
+// In some place in the application, we want to set a value to a given key to be used elsewhere
 appNamespace.enter(context);
 appNamespace.set('requestId', 'someId');
 appNamespace.exit(context);

From 5c54b6a4be626ccf5668c324b80cfaf01a70c0b7 Mon Sep 17 00:00:00 2001
From: Roman Paradeev <grumpy@yandex-team.ru>
Date: Mon, 4 Mar 2019 01:23:15 +0500
Subject: [PATCH 301/924] Sinon: replace Bluebird with PromiseLike object

---
 types/sinon/ts3.1/sinon-tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
index 0f07193704..d8f5170aba 100644
--- a/types/sinon/ts3.1/sinon-tests.ts
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -1,5 +1,4 @@
 import sinon = require("sinon");
-import Bluebird = require("bluebird");
 
 function testSandbox() {
     const obj = {};
@@ -427,7 +426,7 @@ function testStub() {
     const obj = class {
         foo() { }
         promiseFunc() { return Promise.resolve('foo'); }
-        promiseLikeFunc() { return {} as any as Bluebird<string>; }
+        promiseLikeFunc() { return Promise.resolve('foo') as PromiseLike<string>; }
     };
     const instance = new obj();
 

From 7df0d1be64bd73c07028fb26493b5a78c589e679 Mon Sep 17 00:00:00 2001
From: Cameron Tacklind <cameron@tacklind.com>
Date: Sun, 3 Mar 2019 17:45:05 -0800
Subject: [PATCH 302/924] Add missing includeDelimiter option to
 SerialPort.parsers.Readline

`Readline`'s arguments are passed to `Delimiter`'s, therefore `includeDelimiter` should be added as an option to `Readline`'s constructor.

https://github.com/node-serialport/node-serialport/blob/a80d0b73a1d8424901ab73b314de344dad798d12/packages/parser-readline/readline.js#L16-L22
---
 types/serialport/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/serialport/index.d.ts b/types/serialport/index.d.ts
index c1a81376fa..2c3cbbf6b9 100644
--- a/types/serialport/index.d.ts
+++ b/types/serialport/index.d.ts
@@ -100,7 +100,7 @@ declare namespace SerialPort {
 			constructor(options: {delimiter: string | Buffer | number[], includeDelimiter?: boolean});
 		}
 		class Readline extends Delimiter {
-			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex'});
+			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex', includeDelimiter?: boolean});
 		}
 		class Ready extends Stream.Transform {
 			constructor(options: {delimiter: string | Buffer | number[]});

From 1136cb28a384d483bfe0eabca24e4c8e6417e918 Mon Sep 17 00:00:00 2001
From: Justin Hall <justin.r.hall@gmail.com>
Date: Sun, 3 Mar 2019 19:06:56 -0700
Subject: [PATCH 303/924] [cypress-axe] fix all the things

---
 types/cypress-axe/index.d.ts  | 23 +++++++++++++----------
 types/cypress-axe/tslint.json |  7 ++++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/types/cypress-axe/index.d.ts b/types/cypress-axe/index.d.ts
index 10fc76e9f5..3ba776e14f 100644
--- a/types/cypress-axe/index.d.ts
+++ b/types/cypress-axe/index.d.ts
@@ -2,17 +2,20 @@
 // Project: https://github.com/avanslaars/cypress-axe#readme
 // Definitions by: Justin Hall <https://github.com/wKovacs64>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.1
+// TypeScript Version: 2.3
 
-/// <reference lib="dom" />
+import { ElementContext, RunOptions } from 'axe-core';
 
-declare namespace Cypress {
-    interface Chainable<Subject = any> {
-        injectAxe(): void;
-        checkA11y(
-            context?: import('axe-core').ElementContext,
-            options?: import('axe-core').RunOptions,
-        ): void;
-        configureAxe(options?: import('axe-core').RunOptions): void;
+declare module 'axe-core' {
+    interface Node {}
+}
+
+declare global {
+    namespace Cypress {
+        interface Chainable<Subject = any> {
+            injectAxe(): void;
+            checkA11y(context?: ElementContext, options?: RunOptions): void;
+            configureAxe(options?: RunOptions): void;
+        }
     }
 }
diff --git a/types/cypress-axe/tslint.json b/types/cypress-axe/tslint.json
index 3db14f85ea..4f44991c3c 100644
--- a/types/cypress-axe/tslint.json
+++ b/types/cypress-axe/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}

From 67b8f8b650837af05111ba8f73b4d709d77a466c Mon Sep 17 00:00:00 2001
From: Cameron Tacklind <cameron@tacklind.com>
Date: Sun, 3 Mar 2019 18:33:48 -0800
Subject: [PATCH 304/924] Update tests

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

diff --git a/types/serialport/serialport-tests.ts b/types/serialport/serialport-tests.ts
index d6541a63c2..476199b506 100644
--- a/types/serialport/serialport-tests.ts
+++ b/types/serialport/serialport-tests.ts
@@ -105,8 +105,8 @@ function test_parsers() {
 
     const ByteLengthParser = new SerialPort.parsers.ByteLength({length: 8});
     const CCTalkParser = new SerialPort.parsers.CCTalk();
-    const DelimiterParser = new SerialPort.parsers.Delimiter({ delimiter: Buffer.from('EOL') });
-    const ReadlineParser = new SerialPort.parsers.Readline({ delimiter: '\r\n' });
+    const DelimiterParser = new SerialPort.parsers.Delimiter({ delimiter: Buffer.from('EOL'), includeDelimiter: true });
+    const ReadlineParser = new SerialPort.parsers.Readline({ delimiter: '\r\n', includeDelimiter: false });
     const ReadyParser = new SerialPort.parsers.Ready({ delimiter: 'READY' });
     const RegexParser = new SerialPort.parsers.Regex({regex: /.*/});
 

From a72ea5ad9e85b8c1fb6f783bfb32b0f63e8c9ce6 Mon Sep 17 00:00:00 2001
From: Cameron Tacklind <cameron@tacklind.com>
Date: Sun, 3 Mar 2019 18:34:39 -0800
Subject: [PATCH 305/924] Add myself to author

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

diff --git a/types/serialport/index.d.ts b/types/serialport/index.d.ts
index 2c3cbbf6b9..73296d82e2 100644
--- a/types/serialport/index.d.ts
+++ b/types/serialport/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/EmergingTechnologyAdvisors/node-serialport
 // Definitions by: Jeremy Foster <https://github.com/codefoster>
 //                 Andrew Pearson <https://github.com/apearson>
+//                 Cameron Tacklind <https://github.com/cinderblock>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From 31d30e337099cc7e9c3818fb9598cfeab17cf7bf Mon Sep 17 00:00:00 2001
From: Cameron Tacklind <cameron@tacklind.com>
Date: Sun, 3 Mar 2019 18:34:53 -0800
Subject: [PATCH 306/924] Update v6 as well

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

diff --git a/types/serialport/v6/index.d.ts b/types/serialport/v6/index.d.ts
index 2f5f8fc55d..2ada54c85f 100644
--- a/types/serialport/v6/index.d.ts
+++ b/types/serialport/v6/index.d.ts
@@ -90,7 +90,7 @@ declare namespace SerialPort {
 			constructor(options: {delimiter: string | Buffer | number[], includeDelimiter?: boolean});
 		}
 		class Readline extends Delimiter {
-			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex'});
+			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex', includeDelimiter?: boolean});
 		}
 		class Ready extends Stream.Transform {
 			constructor(options: {data: string | Buffer | number[]});

From 6233e51f07941c6ac47ee86513f8c592fab56f98 Mon Sep 17 00:00:00 2001
From: Joel Spadin <joelspadin@gmail.com>
Date: Sun, 3 Mar 2019 20:50:48 -0600
Subject: [PATCH 307/924] Change export default to export =

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

diff --git a/types/plurals-cldr/index.d.ts b/types/plurals-cldr/index.d.ts
index 0d7277b52a..a65fc4e2c8 100644
--- a/types/plurals-cldr/index.d.ts
+++ b/types/plurals-cldr/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Joel Spadin <https://github.com/ChaosinaCan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export type Form = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
+type Form = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
 
 interface Plural {
     /**
@@ -50,4 +50,4 @@ declare const plural: Plural & {
     ordinal: Plural;
 };
 
-export default plural;
+export = plural;
diff --git a/types/plurals-cldr/plurals-cldr-tests.ts b/types/plurals-cldr/plurals-cldr-tests.ts
index f5aacbd30c..7927afe761 100644
--- a/types/plurals-cldr/plurals-cldr-tests.ts
+++ b/types/plurals-cldr/plurals-cldr-tests.ts
@@ -1,4 +1,4 @@
-import plural from 'plurals-cldr';
+import plural = require('plurals-cldr');
 
 plural('en', 0); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null
 plural('en', ''); // $ExpectType "zero" | "one" | "two" | "few" | "many" | "other" | null

From b1340a2e6ea4f8cc34f3c1e64ff277e3222dced4 Mon Sep 17 00:00:00 2001
From: Joel Spadin <joelspadin@gmail.com>
Date: Sun, 3 Mar 2019 21:13:02 -0600
Subject: [PATCH 308/924] Change export default to export =

---
 types/webpack-watched-glob-entries-plugin/index.d.ts        | 6 ++++--
 .../webpack-watched-glob-entries-plugin-tests.ts            | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/webpack-watched-glob-entries-plugin/index.d.ts b/types/webpack-watched-glob-entries-plugin/index.d.ts
index 6f4c1b4a6a..7c6110413e 100644
--- a/types/webpack-watched-glob-entries-plugin/index.d.ts
+++ b/types/webpack-watched-glob-entries-plugin/index.d.ts
@@ -7,11 +7,13 @@
 import { IOptions } from 'glob';
 import { EntryFunc, Plugin } from 'webpack';
 
-export interface PluginOptions {
+interface PluginOptions {
     basename_as_entry_name?: boolean;
 }
 
-export default class WebpackWatchedGlobEntries extends Plugin {
+declare class WebpackWatchedGlobEntries extends Plugin {
     static getEntries(globs: string[], globOptions?: IOptions, pluginOptions?: PluginOptions): EntryFunc;
     static getFiles(globString: string, globOptions?: IOptions, basename_as_entry_name?: boolean): Record<string, string>;
 }
+
+export = WebpackWatchedGlobEntries;
diff --git a/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts b/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts
index 1c87b080a1..f689c11c7b 100644
--- a/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts
+++ b/types/webpack-watched-glob-entries-plugin/webpack-watched-glob-entries-plugin-tests.ts
@@ -1,4 +1,4 @@
-import GlobEntriesPlugin from 'webpack-watched-glob-entries-plugin';
+import GlobEntriesPlugin = require('webpack-watched-glob-entries-plugin');
 
 new GlobEntriesPlugin(); // $ExpectType WebpackWatchedGlobEntries
 

From ec26d5ee1235cbfd2e77b17dcbacfd304fc287f5 Mon Sep 17 00:00:00 2001
From: Akash Vishwakarma <14cse031giet@gmail.com>
Date: Mon, 4 Mar 2019 10:40:34 +0530
Subject: [PATCH 309/924] Update tsconfig.json

---
 types/html5-history/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/html5-history/tsconfig.json b/types/html5-history/tsconfig.json
index 08937c1353..b4bc53cbb5 100644
--- a/types/html5-history/tsconfig.json
+++ b/types/html5-history/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",
         "html5-history-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 8fdbc6ef465f678ae4847cd2adc7db8ecc33b290 Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@coblox.tech>
Date: Mon, 4 Mar 2019 16:03:11 +1100
Subject: [PATCH 310/924] Add regtest network constant

Added to the library with bitcoinjs/bitcoinjs-lib#1261
---
 types/bitcoinjs-lib/bitcoinjs-lib-tests.ts | 4 ++++
 types/bitcoinjs-lib/index.d.ts             | 1 +
 2 files changed, 5 insertions(+)

diff --git a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
index cc24c6573b..a2db324e39 100644
--- a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
+++ b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
@@ -20,6 +20,10 @@ keyPair3.toWIF();
 bitcoin.payments.p2pkh({ pubkey: keyPair3.publicKey });
 const network = keyPair3.network;
 
+const keyPair4 = bitcoin.ECPair.makeRandom({network: bitcoin.networks.regtest, rng});
+keyPair4.toWIF();
+bitcoin.payments.p2pkh({ pubkey: keyPair4.publicKey });
+
 // Test TransactionBuilder and Transaction
 const txb = new bitcoin.TransactionBuilder();
 txb.addInput('aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31', 0);
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 4fb1bb16a7..7cedbc822a 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -191,6 +191,7 @@ export class TransactionBuilder {
 export const networks: {
     bitcoin: Network;
     testnet: Network;
+    regtest: Network;
 };
 
 export const opcodes: {

From e5815b2853494e9f8c55e9b76510a22bcdf1b881 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Mon, 4 Mar 2019 14:31:00 +0800
Subject: [PATCH 311/924] Added new types for html5plus

---
 types/html5plus/html5plus-tests.ts |     2 +
 types/html5plus/index.d.ts         | 15476 +++++++++++++++++++++++++++
 types/html5plus/tsconfig.json      |    23 +
 types/html5plus/tslint.json        |    79 +
 4 files changed, 15580 insertions(+)
 create mode 100644 types/html5plus/html5plus-tests.ts
 create mode 100644 types/html5plus/index.d.ts
 create mode 100644 types/html5plus/tsconfig.json
 create mode 100644 types/html5plus/tslint.json

diff --git a/types/html5plus/html5plus-tests.ts b/types/html5plus/html5plus-tests.ts
new file mode 100644
index 0000000000..56dd640498
--- /dev/null
+++ b/types/html5plus/html5plus-tests.ts
@@ -0,0 +1,2 @@
+const webview = plus.webview.currentWebview()
+const style = webview.getStyle()
\ No newline at end of file
diff --git a/types/html5plus/index.d.ts b/types/html5plus/index.d.ts
new file mode 100644
index 0000000000..841a64f6d4
--- /dev/null
+++ b/types/html5plus/index.d.ts
@@ -0,0 +1,15476 @@
+// Type definitions for html5plus 1.0.0
+// Project: https://www.html5plus.org/doc/
+// Definitions by: Dcloud <https://github.com/dcloudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * HTML5+接口，统一浏览器自定义扩展，提供增强的功能、性能扩展规范，使得开发者可开发出跨平台的app，并接近原生的功能和性能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/h5p.html](http://www.html5plus.org/doc/h5p.html)
+ */
+declare const plus: Plus;
+
+/**
+ * HTML5+接口，统一浏览器自定义扩展，提供增强的功能、性能扩展规范，使得开发者可开发出跨平台的app，并接近原生的功能和性能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface Plus {
+    /**
+     * Accelerometer模块管理设备加速度传感器，用于获取设备加速度信息，包括x（屏幕水平方向）、y（垂直屏幕水平方向）、z（垂直屏幕平面方向）三个方向的加速度信息。通过plus.accelerometer获取设备加速度传感器管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    accelerometer: PlusAccelerometer;
+    /**
+     * Native.js for Android封装一条通过JS语法直接调用Native Java接口通道，通过plus.android可调用几乎所有的系统API。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    android: PlusAndroid;
+    /**
+     * Audio模块用于提供音频的录制和播放功能，可调用系统的麦克风设备进行录音操作，也可调用系统的扬声器设备播放音频文件。通过plus.audio获取音频管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    audio: PlusAudio;
+    /**
+     * Bluetooth模块用于管理蓝牙设备，搜索附近蓝牙设备、连接实现数据通信等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    bluetooth: PlusBluetooth;
+    /**
+     * Camera模块管理设备的摄像头，可用于拍照、摄像操作，通过plus.camera获取摄像头管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    camera: PlusCamera;
+    /**
+     * Contacts模块管理系统通讯录，用于可对系统通讯录进行增、删、改、查等操作。通过plus.contacts获取系统通讯录管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    contacts: PlusContacts;
+    /**
+     * Device模块管理设备信息，用于获取手机设备的相关信息，如IMEI、IMSI、型号、厂商等。通过plus.device获取设备信息管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    device: PlusDevice;
+    /**
+     * Screen模块管理设备屏幕信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    screen: PlusScreen;
+    /**
+     * Display模块管理应用可使用的显示区域信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    display: PlusDisplay;
+    /**
+     * networkinfo模块用于获取网络信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    networkinfo: PlusNetworkinfo;
+    /**
+     * OS模块管理操作系统信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    os: PlusOs;
+    /**
+     * Downloader模块管理网络文件下载任务，用于从服务器下载各种文件，并支持跨域访问操作。通过plus.downloader获取下载管理对象。Downloader下载使用HTTP的GET/POST方式请求下载文件，符合标准HTTP/HTTPS传输协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    downloader: PlusDownloader;
+    /**
+     * Fingerprint模块管理指纹识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    fingerprint: PlusFingerprint;
+    /**
+     * Gallery模块管理系统相册，支持从相册中选择图片或视频文件、保存图片或视频文件到相册等功能。通过plus.gallery获取相册管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    gallery: PlusGallery;
+    /**
+     * Geolocation模块管理设备位置信息，用于获取地理位置信息，如经度、纬度等。通过plus.geolocation可获取设备位置管理对象。虽然W3C已经提供标准API获取位置信息，但在某些平台存在差异或未实现，为了保持各平台的统一性，定义此规范接口获取位置信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    geolocation: PlusGeolocation;
+    /**
+     * iBeacon模块用于搜索附件的iBeacon设备（*请使用HBuilderX并更新到最新版本*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    ibeacon: PlusIbeacon;
+    /**
+     * IO模块管理本地文件系统，用于对文件系统的目录浏览、文件的读取、文件的写入等操作。通过plus.io可获取文件系统管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    io: PlusIo;
+    /**
+     * Native.js for iOS封装一条通过JS语法直接调用Native Objective-C接口通道，通过plus.ios可调用几乎所有的系统API。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    ios: PlusIos;
+    /**
+     * Key管理设备按键事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    key: PlusKey;
+    /**
+     * Messaging模块管理设备通讯功能，可用于短信、彩信、邮件发送等。通过plus.messaging可获取设备通讯管理对象。另外也可以直接通过html中的href直接快速发送短信、拨打电话、发送邮件等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    messaging: PlusMessaging;
+    /**
+     * nativeObj管理系统原生对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    nativeObj: PlusNativeObj;
+    /**
+     * nativeUI管理系统原生界面，可用于弹出系统原生提示对话框窗口、时间日期选择对话框、等待对话框等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    nativeUI: PlusNativeUI;
+    /**
+     * navigator用于管理浏览器运行环境信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    navigator: PlusNavigator;
+    /**
+     * Orientation模块管理设备的方向信息，包括alpha、beta、gamma三个方向信息，通过plus.orientation可获取设备方向管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    orientation: PlusOrientation;
+    /**
+     * Proximity模块管理设备距离传感器，可获取当前设备的接近距离信息，通过plus.proximity可获取设备距离传感管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    proximity: PlusProximity;
+    /**
+     * Runtime模块管理运行环境，可用于获取当前运行环境信息、与其它程序进行通讯等。通过plus.runtime可获取运行环境管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    runtime: PlusRuntime;
+    /**
+     * Storage模块管理应用本地数据存储区，用于应用数据的保存和读取。应用本地数据与localStorage、sessionStorage的区别在于数据有效域不同，前者可在应用内跨域操作，数据存储期是持久化的，并且没有容量限制。通过plus.storage可获取应用本地数据管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    storage: PlusStorage;
+    /**
+     * Stream模块操作流应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    stream: PlusStream;
+    /**
+     * Uploader模块管理网络上传任务，用于从本地上传各种文件到服务器，并支持跨域访问操作。通过plus.uploader可获取上传管理对象。Uploader上传使用HTTP的POST方式提交数据，数据格式符合Multipart/form-data规范，即rfc1867（Form-based File Upload in HTML）协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    uploader: PlusUploader;
+    /**
+     * Video模块管理多媒体视频相关能力，可用创建视频播放控件，直播推流控件等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    video: PlusVideo;
+    /**
+     * Webview模块管理应用窗口界面，实现多窗口的逻辑控制管理操作。通过plus.webview可获取应用界面管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    webview: PlusWebview;
+    /**
+     * XMLHttpRequest模块管理网络请求，与标准HTML中的XMLHttpRequest用途一致，差别在于前者可以进行跨域访问。通过plus.net可获取网络请求管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    net: PlusNet;
+    /**
+     * Zip模块管理文件压缩和解压，通过plus.zip可获取压缩管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    zip: PlusZip;
+    /**
+     * Barcode模块管理条码扫描，支持常见的条码（一维码及二维码）的扫描识别功能。可调用设备的摄像头对条码图片扫描进行数据输入，解码后返回码数据及码类型。通过plus.barcode可获取条码码管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    barcode: PlusBarcode;
+    /**
+     * Maps模块管理地图控件，用于在web页面中显示地图控件，提供各种接口操作地图控件，如添加标点、路线等。通过plus.maps可获取地图管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    maps: PlusMaps;
+    /**
+     * OAuth模块管理客户端的用户登录授权验证功能，允许应用访问第三方平台的资源。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    oauth: PlusOauth;
+    /**
+     * Payment模块管理支付功能，用于提供网页安全支付能力，支持通过Web接口进行支付操作。通过plus.payment可获取支付管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    payment: PlusPayment;
+    /**
+     * Push模块管理推送消息功能，可以实现在线、离线的消息推送，通过plus.push可获取推送消息管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    push: PlusPush;
+    /**
+     * Share模块管理客户端的社交分享功能，提供调用终端社交软件的分享能力。通过plus.share可获取社交分享管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    share: PlusShare;
+    /**
+     * Speech模块管理语音输入功能，提供语音识别功能，可支持用户通过麦克风设备进行语音输入内容。通过plus.speech可获取语音输入管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    speech: PlusSpeech;
+    /**
+     * Statistic模块管理统计功能，用于提供应用内统计的能力，支持统计和分析用户属性和用户行为数据。通过plus.statistic可获取统计管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    statistic: PlusStatistic;
+}
+
+/**
+ * Accelerometer模块管理设备加速度传感器，用于获取设备加速度信息，包括x（屏幕水平方向）、y（垂直屏幕水平方向）、z（垂直屏幕平面方向）三个方向的加速度信息。通过plus.accelerometer获取设备加速度传感器管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometer {
+    /**
+     * 设备加速度信息对象
+     * JSON对象，保存获取设备的加速度信息，包括x、y、z三个方向的加速度信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    Acceleration?: PlusAccelerometerAcceleration;
+    /**
+     * 监听设备加速度感应器参数
+     * JSON对象，用于设置获取设备加速度信息的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    AccelerometerOption?: PlusAccelerometerAccelerometerOption;
+    /**
+     * 获取当前设备的加速度信息
+     * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
+     * 	加速度信息可通过successCB回调函数返回。加速度信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    getCurrentAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备加速度变化信息
+     * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
+     * watchAcceleration每隔固定时间就获取一次设备的加速度信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备加速度信息的时间间隔。
+     * 加速度信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    watchAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void, options?: PlusAccelerometerAccelerometerOption): number;
+    /**
+     * 关闭监听设备加速度信息
+     * 关闭监听设备加速度信息，应用关闭调用watchAcceleration方法的开启的监听操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * 设备加速度信息对象
+ * JSON对象，保存获取设备的加速度信息，包括x、y、z三个方向的加速度信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometerAcceleration {
+    /**
+     * x轴方向的加速度
+     * 获取当前设备x轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    xAxis?: number;
+    /**
+     * y轴方向的加速度
+     * 获取当前设备y轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    yAxis?: number;
+    /**
+     * z轴方向的加速度
+     * 获取当前设备z轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    zAxis?: number;
+}
+
+/**
+ * 监听设备加速度感应器参数
+ * JSON对象，用于设置获取设备加速度信息的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometerAccelerometerOption {
+    /**
+     * 更新加速度信息间隔时间
+     * 监听器获取加速度信息的时间间隔，单位为ms，默认值为500ms
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    frequency?: number;
+}
+
+/**
+ * Native.js for Android封装一条通过JS语法直接调用Native Java接口通道，通过plus.android可调用几乎所有的系统API。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroid {
+    /**
+     * Java类对象
+     * Java类对象，可通过其属性获取类的常量，可通过方法来操作类的静态变量和方法，也通过new方法来创建类的实例对象。
+     * 	对于类的常量，则直接通过.后面跟随常量名称调用即可。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    ClassObject?: PlusAndroidClassObject;
+    /**
+     * Java实例对象
+     * Java实例对象，可通过其方法来操作实例的变量和方法。
+     * 	注意：必须通过plusGetAttribute()方法读取实例对象的属性值，通过plusSetAttribute()方法设置实例对象的属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    InstanceObject?: PlusAndroidInstanceObject;
+    /**
+     * 导入Java类对象
+     * 导入类对象后，就可以通过.操作符直接调用对象（类对象/实例对象）的方法。
+     * 	注意：导入类对象将会消耗较多的系统资源，通常不应该导入过多的类对象，可以使用plus.android.invoke()来调用未导入类实例对象的方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    importClass(classname?: string): PlusAndroidClassObject;
+    /**
+     * 创建实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    newObject(classname?: string, args?: any): PlusAndroidInstanceObject;
+    /**
+     * 获取对象（类对象/实例对象）的属性值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    getAttribute(obj?: PlusAndroidInstanceObject, name?: string): any;
+    /**
+     * 设置对象（类对象/实例对象）的属性值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    setAttribute(obj?: PlusAndroidInstanceObject, name?: string, value?: any): void;
+    /**
+     * 调用对象（类对象/实例对象）的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    invoke(obj?: PlusAndroidInstanceObject, name?: string, args?: any): any;
+    /**
+     * 实现Interface的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    implements(name?: string, obj?: any): PlusAndroidInstanceObject;
+    /**
+     * 获取应用主Activity实例对象
+     * Android平台完整Java类名为android.app.Activity，完整API请参考Android开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    runtimeMainActivity(): PlusAndroidInstanceObject;
+    /**
+     * 获取当前Webview窗口对象的native层实例对象
+     * Android平台完整Java类名为android.webkit.Webview，完整API请参考Android开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    currentWebview(): PlusAndroidInstanceObject;
+}
+
+/**
+ * Java类对象
+ * Java类对象，可通过其属性获取类的常量，可通过方法来操作类的静态变量和方法，也通过new方法来创建类的实例对象。
+ * 	对于类的常量，则直接通过.后面跟随常量名称调用即可。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroidClassObject {
+    /**
+     * 获取Java类对象的静态属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Java类对象的静态属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Java实例对象
+ * Java实例对象，可通过其方法来操作实例的变量和方法。
+ * 	注意：必须通过plusGetAttribute()方法读取实例对象的属性值，通过plusSetAttribute()方法设置实例对象的属性值。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroidInstanceObject {
+    /**
+     * 获取Java实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Java实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Audio模块用于提供音频的录制和播放功能，可调用系统的麦克风设备进行录音操作，也可调用系统的扬声器设备播放音频文件。通过plus.audio获取音频管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudio {
+    /**
+     * 录音对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    AudioRecorder?: PlusAudioAudioRecorder;
+    /**
+     * 音频播放对象
+     * 音频播放对象，用于音频文件的播放。不能通过new方法直接创建，只能通过audio.createPlayer方法创建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    AudioPlayer?: PlusAudioAudioPlayer;
+    /**
+     * JSON对象，调用麦克风设备进行录音的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    RecordOptions?: PlusAudioRecordOptions;
+    /**
+     * 设备的扬声器音频输出线路
+     * 音频输出线路常量，值为0。音频播放时在设备的扬声器输出。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    ROUTE_SPEAKER?: number;
+    /**
+     * 设备听筒音频输出线路
+     * 音频输出线路常量，值为1。音频播放时在设备的听筒输出。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    ROUTE_EARPIECE?: number;
+    /**
+     * 获取当前设备的录音对象
+     * 获取当前设备的录音对象，进行录音操作，录音对象是设备的独占资源，在同一时间仅可执行一个录音操作，否则可能会导致操作失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getRecorder(): PlusAudioAudioRecorder;
+    /**
+     * 创建音频播放对象
+     * 创建一个音频文件播放对象，用于打开音频文件并播放。
+     * 	可通过path参数指定要播放的音频文件。创建后返回播放对象，通过Audio.play方法开始播放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    createPlayer(path?: string): PlusAudioAudioPlayer;
+}
+
+/**
+ * 录音对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioAudioRecorder {
+    /**
+     * 数组，设备录音支持的采用率
+     * 属性类型为Array(String)，若不支持此属性则返回空数组对象。支持的录音采样率，字符串格式为“采样频率”，如“8000”；其单位为Hz。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    supportedSamplerates?: string;
+    /**
+     * 数组，设备录音支持的文件格式
+     * 属性类型为Array(String)，若不支持此属性则返回空数组对象。支持的录音文件的格式，字符串格式为文件格式后缀名，如"mp3"、"aac"、"wav"等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    supportedFormats?: string;
+    /**
+     * 调用设备麦克风进行录音操作
+     * 调用设备麦克风开始录音操作，录音完成需调用stop方法停止。录音完成后将通过successCB回调返回录音后的文件数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    record(option?: PlusAudioRecordOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 结束录音操作
+     * 结束录音操作，通知设备完成录音操作。录音完成后将调用record方法中传入的successCB回调返回录音文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    stop(): void;
+}
+
+/**
+ * 音频播放对象
+ * 音频播放对象，用于音频文件的播放。不能通过new方法直接创建，只能通过audio.createPlayer方法创建。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioAudioPlayer {
+    /**
+     * 开始播放音频
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    play(successCB?: Function, errorCB?: (result: any) => void): void;
+    /**
+     * 暂停播放音频
+     * 需先调用createPlayer方法创建音频播放对象，并开始播放。音频播放对象在播放状态才能暂停，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    pause(): void;
+    /**
+     * 恢复播放音频
+     * 音频播放对象在暂停状态才能恢复播放，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    resume(): void;
+    /**
+     * 停止播放音频
+     * 停止播放音频，音频播放对象在播放或暂停状态才能停止播放，在其它状态调用此方法无任何作用。
+     * 	停止播放后如果需要继续播放，则需调用play方法重新开始播放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    stop(): void;
+    /**
+     * 跳到指定位置播放音频
+     * 跳到指定位置播放音频，音频播放对象在播放或暂停状态才能跳到指定播放音频，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    seekTo(position?: number): void;
+    /**
+     * 获取音频流的总长度
+     * 获取音频流的总长度，单位为秒，若长度未知则返回-1。如果还未获取到音频流信息则返回NaN，此时需要延迟获取此信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getDuration(): number;
+    /**
+     * 获取音频流当前播放的位置
+     * 获取音频流当前播放的位置（已播放的长度），单位为s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getPosition(): number;
+    /**
+     * 设置音频输出线路
+     * 可在音频文件开始播放前或播放的过程中改变音频输出线路，默认使用扬声器（plus.audio.ROUTE_SPEAKER）输出线路。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    setRoute(route?: number): void;
+}
+
+/**
+ * JSON对象，调用麦克风设备进行录音的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioRecordOptions {
+    /**
+     * 录音声道
+     * 可取值：
+     * 		"mono" - 单声道录音；
+     * 		"stereo" - 立体声道录音。
+     * 	默认值为"mono"。
+     * - mono: 单声道录音
+     * - stereo: 立体声录音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    channels?: 'mono' | 'stereo';
+    /**
+     * 保存录音文件的路径
+     * 可设置具体文件名，也可只设置路径，如果以“/”结尾则表明是路径，文件名由录音程序自动生成。
+     * 	如未设置则使用默认目录生成随机文件名称，默认目录为应用%APPID%下的documents目录。
+     * - _www/: 应用资源目录
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    filename?: '_www/' | '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 录音文件的采样率
+     * 需通过supportedSamplerates属性获取设备支持的采样率，若设置无效的值，则使用系统默认的采样率。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    samplerate?: string;
+    /**
+     * 录音文件的格式
+     * 需通过supportedFormats属性获取设备支持的录音格式，若设置无效的值，则使用系统默认的录音格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    format?: string;
+}
+
+/**
+ * Bluetooth模块用于管理蓝牙设备，搜索附近蓝牙设备、连接实现数据通信等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetooth {
+    /**
+     * 蓝牙设备信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothDeviceInfo?: PlusBluetoothBluetoothDeviceInfo;
+    /**
+     * 蓝牙设备服务信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothService?: PlusBluetoothBluetoothService;
+    /**
+     * 蓝牙设备特征值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    Bluetoothcharacteristic?: PlusBluetoothBluetoothcharacteristic;
+    /**
+     * 蓝牙设备特征值支持的操作类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothcharacteristicProperties?: PlusBluetoothBluetoothcharacteristicProperties;
+    /**
+     * 关闭蓝牙模块
+     * 断开所有已经建立的连接，释放系统资源，要求在蓝牙功能使用完成后调用（于openBluetoothAdapter成对使用）。
+     * 	关闭成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    closeBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取本机蓝牙适配器状态
+     * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBluetoothAdapterState(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取已搜索到的蓝牙设备
+     * 包括已经和本机处于连接状态的设备。
+     * 	获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBluetoothDevices(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 根据uuid获取处于已连接的设备
+     * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getConnectedBluetoothDevices(services?: any [], success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听蓝牙适配器状态变化事件
+     * 蓝牙适配器状态发生变化时触发回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBluetoothAdapterStateChange(changeCB?: (result: any) => void): void;
+    /**
+     * 监听搜索到新设备的事件
+     * 搜索到新设备时触发回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBluetoothDeviceFound(callback?: (result: any) => void): void;
+    /**
+     * 初始化蓝牙模块
+     * 初始化成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    openBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 开始搜索附近的蓝牙设备
+     * 此操作比较耗费系统资源，请在搜索并连接到设备后调用stopBluetoothDevicesDiscovery方法停止搜索。
+     * 	搜索成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 停止搜寻附近的蓝牙外围设备
+     * 若已经找到需要的蓝牙设备并不需要继续搜索时，应该调用该接口停止蓝牙搜索。
+     * 	停止成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    stopBluetoothDevicesDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 断开与低功耗蓝牙设备的连接
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    closeBLEConnection(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 连接低功耗蓝牙设备
+     * 若之前已有搜索过某个蓝牙设备，并成功建立连接，可直接传入之前搜索获取的deviceId尝试连接该设备，无需进行搜索操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    createBLEConnection(deviceId?: string, timeout?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取蓝牙设备指定服务中所有特征值(characteristic)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取蓝牙设备的所有服务(service)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBLEDeviceServices(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
+     * 蓝牙设备服务的特征值必须支持notify或indicate才可以成功调用。
+     * 另外，必须先启用notifyBLECharacteristicValueChange才能监听到设备characteristicValueChange事件,即特征值发生变化时通过onBLECharacteristicValueChange注册的事件回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听低功耗蓝牙设备的特征值变化事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBLECharacteristicValueChange(callback?: (result: any) => void): void;
+    /**
+     * 监听低功耗蓝牙设备连接状态变化事件
+     * 包括开发者主动连接或断开连接，设备丢失，连接异常断开等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBLEConnectionStateChange(callback?: (result: any) => void): void;
+    /**
+     * 读取低功耗蓝牙设备指定特征值的二进制数据值
+     * 指定的特征值需支持read操作才可以成功调用。
+     * 	并行调用多次可能导致读取失败，读取的数据需要在onBLECharacteristicValueChange方法注册的回调中获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 向低功耗蓝牙设备指定特征值写入二进制数据
+     * 指定的特征值需支持write操作才可以成功调用。
+     * 	并行调用多次可能导致读取失败，系统可能会限制单次传输的数据大小，超过最大字节数后可能会发生写入错误，建议每次写入不超过20字节。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+}
+
+/**
+ * 蓝牙设备信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothDeviceInfo {
+    /**
+     * 蓝牙设备名称
+     * 某些设备可能没有此字段值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    name?: string;
+    /**
+     * 蓝牙设备的id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙设备的信号强度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    RSSI?: string;
+    /**
+     * 蓝牙设备的广播数据段中的ManufacturerData数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    advertisData?: ArrayBuffer;
+    /**
+     * 蓝牙设备的广播数据段中的ServiceUUIDs数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    advertisServiceUUIDs?: any [];
+    /**
+     * 蓝牙设备的广播数据段中的LocalName数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    localName?: string;
+    /**
+     * 蓝牙设备的广播数据段中的ServiceData数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    serviceData?: any;
+}
+
+/**
+ * 蓝牙设备服务信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothService {
+    /**
+     * 蓝牙设备服务的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    uuid?: string;
+    /**
+     * 是否为设备的主服务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    isPrimary?: boolean;
+}
+
+/**
+ * 蓝牙设备特征值
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothcharacteristic {
+    /**
+     * 蓝牙设备特征值的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    uuid?: string;
+    /**
+     * 设备特征值支持的操作类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    properties?: PlusBluetoothBluetoothcharacteristicProperties;
+}
+
+/**
+ * 蓝牙设备特征值支持的操作类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothcharacteristicProperties {
+    /**
+     * 特征值是否支持read操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    read?: boolean;
+    /**
+     * 特征值是否支持write操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    write?: boolean;
+    /**
+     * 特征值是否支持notify操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    notify?: boolean;
+    /**
+     * 特征值是否支持indicate操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    indicate?: boolean;
+}
+
+/**
+ * Camera模块管理设备的摄像头，可用于拍照、摄像操作，通过plus.camera获取摄像头管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCamera {
+    /**
+     * 摄像头对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    Camera?: PlusCameraCamera;
+    /**
+     * JSON对象，调用摄像头的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    CameraOptions?: PlusCameraCameraOptions;
+    /**
+     * JSON对象，弹出拍照或摄像界面指示位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    PopPosition?: PlusCameraPopPosition;
+    /**
+     * 获取摄像头管理对象
+     * 获取需要操作的摄像头对象，如果要进行拍照或摄像操作，需先通过此方法获取摄像头对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    getCamera(index?: number): PlusCameraCamera;
+}
+
+/**
+ * 摄像头对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraCamera {
+    /**
+     * 字符串数组，摄像头支持的拍照分辨率
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的拍照图片分辨率字符串形式“WIDTH*Height”，如“400*800”；如果支持任意自定义分辨率则“*”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedImageResolutions?: any [];
+    /**
+     * 字符串数组，摄像头支持的摄像分辨率
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的视频分辨率字符串形式为“WIDTH*Height”，如“400*800”；如果支持任意自定义分辨率则“*”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedVideoResolutions?: any [];
+    /**
+     * 字符串数组，摄像头支持的拍照文件格式
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的图片文件格式字符串形式为文件格式后缀名，如“jpg”、“png”、“bmp”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedImageFormats?: any [];
+    /**
+     * 字符串数组，摄像头支持的摄像文件格式
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的视频文件格式字符串形式为文件格式后缀名，如“3gp”、“mp4”、“avi”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedVideoFormats?: any [];
+    /**
+     * 进行拍照操作
+     * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
+     * 	拍照操作成功将通过successCB返回拍照获取的图片路径。
+     * 	可通过option设置摄像头的各种属性参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    captureImage(successCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusCameraCameraOptions): void;
+    /**
+     * 调用摄像头进行摄像操作
+     * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
+     * 	拍照操作成功将通过successCB返回摄像获取的视频文件路径。
+     * 	可通过option设置摄像头的各种属性参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    startVideoCapture(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusCameraCameraOptions): void;
+    /**
+     * 结束摄像操作
+     * 开始调用摄像头进行摄像操作后，可在后台结束摄像操作，与用户在界面结束操作效果一致。
+     * 	摄像操作成功将通过startVideoCapture函数中的successCB返回拍照获取的图片路径。
+     * 	用户如果没有进行摄像操作关闭摄像头页面则调用失败回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    stopVideoCapture(): void;
+}
+
+/**
+ * JSON对象，调用摄像头的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraCameraOptions {
+    /**
+     * 拍照或摄像文件保存的路径
+     * 可设置具体文件名（如"_doc/camera/a.jpg"）；也可只设置路径，以"/"结尾则表明是路径（如"_doc/camera/"）。
+     * 	如未设置文件名称或设置的文件名冲突则文件名由程序程序自动生成。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    filename?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 拍照或摄像的文件格式
+     * 可通过Camera对象的supportedImageFormats或supportedVideoFormats获取，如果设置的参数无效则使用系统默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    format?: string;
+    /**
+     * 拍照或摄像默认使用的摄像头
+     * 拍照或摄像界面默认使用的摄像头编号，1表示主摄像头，2表示辅摄像头。
+     * - 1: 使用设备主摄像头
+     * - 2: 使用设备辅摄像头
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    index?: '1' | '2';
+    /**
+     * 视频长度
+     * 单位为秒（s），小于等于0表示不限定视频长度。
+     * 	默认值为0（不限定视频长度）。
+     * 	注意：仅在调用拍摄视频（startVideoCapture）时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    videoMaximumDuration?: number;
+    /**
+     * 是否优化图片
+     * 自动调整图片的方向，在部分设备上可能出现图片方向不正确的问题，此参数将配置是否自动调整图片方向。
+     * 	可取值：
+     * 		true - 自动调整图片方向；
+     * 		false - 不调整。
+     * 	默认值为true。
+     * 	注意：自动调整图片方向将消耗部分系统资源，可能会导致拍照后回调触发时机延迟，将此值设置为false则可避免延迟问题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    optimize?: boolean;
+    /**
+     * 拍照或摄像使用的分辨率
+     * 可通过Camera对象的supportedImageResolutions或supportedVideoResolutions获取，如果设置的参数无效则使用系统默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    resolution?: string;
+    /**
+     * 拍照或摄像界面弹出指示区域
+     * 对于大屏幕设备如iPad，拍照或摄像界面为弹出窗口，此时可通过此参数设置弹出窗口位置，其为JSON对象，格式如{top:"10px",left:"10px",width:"200px",height:"200px"}，默认弹出位置为屏幕居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    popover?: PlusCameraPopPosition;
+}
+
+/**
+ * JSON对象，弹出拍照或摄像界面指示位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraPopPosition {
+    /**
+     * 指示区域距离容器顶部的距离
+     * 弹出拍照或摄像窗口指示区域距离容器顶部的距离，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    top?: string;
+    /**
+     * 指示区域距离容器左侧的距离
+     * 弹出拍照或摄像窗口指示区域距离容器左侧的距离，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    left?: string;
+    /**
+     * 指示区域的宽度
+     * 弹出拍照或摄像窗口指示区域的宽度，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    width?: string;
+    /**
+     * 指示区域的高度
+     * 弹出拍照或摄像窗口指示区域的高度，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    height?: string;
+}
+
+/**
+ * Contacts模块管理系统通讯录，用于可对系统通讯录进行增、删、改、查等操作。通过plus.contacts获取系统通讯录管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContacts {
+    /**
+     * 通讯录对象
+     * 通讯录管理对象，可对系统通讯录进行联系人的增、删、改、查操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    AddressBook?: PlusContactsAddressBook;
+    /**
+     * 联系人对象
+     * 联系人对象，包括联系人的各种信息，如名称、电话号码、地址等。也包括新增、删除联系人的操作方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    Contact?: PlusContactsContact;
+    /**
+     * JSON对象，联系人域数据对象
+     * 联系人域数据对象，保存联系人特定域信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactField?: PlusContactsContactField;
+    /**
+     * JSON对象，联系人名称对象
+     * 联系人名称对象，保存联系人名称信息，如姓、名等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactName?: PlusContactsContactName;
+    /**
+     * JSON对象，联系人地址对象
+     * 联系人地址对象，保存联系人地址信息，如国家、省份、城市等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactAddress?: PlusContactsContactAddress;
+    /**
+     * JSON对象，联系人所属组织信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactOrganization?: PlusContactsContactOrganization;
+    /**
+     * JSON对象，查找联系人参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactFindOption?: PlusContactsContactFindOption;
+    /**
+     * JSON对象，联系人查找过滤器
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactFindFilter?: PlusContactsContactFindFilter;
+    /**
+     * 手机通讯录
+     * 通讯录类型常量，数值类型，固定值为0，用于获取系统的联系人信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ADDRESSBOOK_PHONE?: number;
+    /**
+     * SIM卡通讯录
+     * 通讯录类型常量，数值类型，固定值为1，用于获取SIM卡上的联系人信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ADDRESSBOOK_SIM?: number;
+    /**
+     * 获取通讯录对象
+     * 根据指定通讯录类型获取通讯录对象，获取通讯录对象后可对其进行增、删、改操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    getAddressBook(type?: number, successCB?: (result: PlusContactsAddressBook) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 通讯录对象
+ * 通讯录管理对象，可对系统通讯录进行联系人的增、删、改、查操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsAddressBook {
+    /**
+     * 创建联系人
+     * 创建一个系统联系人，并返回联系人对象，可对联系人对象进行操作设置联系人信息，如名称、地址、电话等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    create(): PlusContactsContact;
+    /**
+     * 在通讯录中查找联系人
+     * 在通讯录中安装指定的规则查找联系人，contactFields可设定查找返回的联系人中包含的字段值，查找联系人成功时通过successCB回调返回，查找联系人失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    find(contactFields?: String[], successCB?: (result: PlusContactsContact) => void, errorCB?: (result: any) => void, findOptions?: PlusContactsContactFindOption): void;
+}
+
+/**
+ * 联系人对象
+ * 联系人对象，包括联系人的各种信息，如名称、电话号码、地址等。也包括新增、删除联系人的操作方法。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContact {
+    /**
+     * 联系人的id
+     * 联系人id由系统分配维护，从系统获取联系人时自动赋值，再次查询时可使用此id值进行检索。
+     * 	注意：此值为只读属性，改写此值可能会导致无法预期的错误。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    id?: string;
+    /**
+     * 联系人显示的名字
+     * 联系人显示的名字通常由其姓和名组合而成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    displayName?: string;
+    /**
+     * 联系人的名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    name?: PlusContactsContactName;
+    /**
+     * 联系人的昵称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    nickname?: string;
+    /**
+     * 数组，联系人的电话
+     * 如果联系人中未保存电话信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    phoneNumbers?: PlusContactsContactField;
+    /**
+     * 数组，联系人的邮箱
+     * 如果联系人中未保存邮箱信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    emails?: PlusContactsContactField;
+    /**
+     * 数组，联系人的地址
+     * 如果联系人中未保存地址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    addresses?: PlusContactsContactAddress;
+    /**
+     * 数组，联系人的即时通讯地址
+     * 如果联系人中未保存即时通讯地址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ims?: PlusContactsContactField;
+    /**
+     * 数组，联系人所属组织信息
+     * 如果联系人中未保存所属组织信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    organizations?: PlusContactsContactOrganization;
+    /**
+     * 联系人的生日
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    birthday?: Date;
+    /**
+     * 联系人的备注
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    note?: string;
+    /**
+     * 数组，联系人的头像
+     * 其值为头像图片url地址或图片数据：
+     * 	url地址：仅支持本地图片地址，可以是绝对路径或相对路径，如“_doc/a.png”；
+     * 	图片数据：必须符合Data URI scheme（RFC2397）格式的数据，如“image/png;base64,XXXX”，其中XXXX为base64编码的图片数据。在获取联系人时默认返回此类型的数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    photos?: PlusContactsContactField;
+    /**
+     * 数组，联系人的组名
+     * 如果联系人中未保存组名信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    categories?: PlusContactsContactField;
+    /**
+     * 数组，联系人的网址
+     * 如果联系人中未保存网址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    urls?: PlusContactsContactField;
+    /**
+     * 克隆联系人
+     * 克隆联系人，创建出一个新的联系人对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    clone(): PlusContactsContact;
+    /**
+     * 删除联系人
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    remove(successCB?: Function, errorCB?: (result: any) => void): void;
+    /**
+     * 保存联系人
+     * 将联系人数据保存到通讯录中，操作成功将通过successCB回调函数返回保存结果，操作失败将通过通过errorCB回调函数返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    save(successCB?: Function, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，联系人域数据对象
+ * 联系人域数据对象，保存联系人特定域信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactField {
+    /**
+     * 联系人域类型，如电话号码中的“mobile”、“home”、“company”
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 联系人域值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    value?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，联系人名称对象
+ * 联系人名称对象，保存联系人名称信息，如姓、名等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactName {
+    /**
+     * 联系人的完整名称，由其它字段组合生成
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    formatted?: string;
+    /**
+     * 联系人的姓
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    familyName?: string;
+    /**
+     * 联系人的名
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    givenName?: string;
+    /**
+     * 联系人的中间名
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    middleName?: string;
+    /**
+     * 联系人的前缀（如Mr.或Dr.）
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    honorificPrefix?: string;
+    /**
+     * 联系人的后缀
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    honorificSuffix?: string;
+}
+
+/**
+ * JSON对象，联系人地址对象
+ * 联系人地址对象，保存联系人地址信息，如国家、省份、城市等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactAddress {
+    /**
+     * 联系人地址类型，如“home”表示家庭地址、“company”表示单位地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 完整地址，由其它字段组合而成
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    formatted?: string;
+    /**
+     * 完整的街道地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    streetAddress?: string;
+    /**
+     * 城市或地区
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    locality?: string;
+    /**
+     * 省或地区
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    region?: string;
+    /**
+     * 国家
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    country?: string;
+    /**
+     * 邮政编码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    postalCode?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，联系人所属组织信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactOrganization {
+    /**
+     * 联系人所属组织类型，如"company"
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 联系人所属组织名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    name?: string;
+    /**
+     * 联系人所属组织部门
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    department?: string;
+    /**
+     * 联系人在组织中的职位
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    title?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，查找联系人参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactFindOption {
+    /**
+     * 数组，查找时的过滤器
+     * 可设置为空，表示不过滤。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    filter?: PlusContactsContactFindFilter;
+    /**
+     * 是否查找多个联系人，默认值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    multiple?: boolean;
+}
+
+/**
+ * JSON对象，联系人查找过滤器
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactFindFilter {
+    /**
+     * 区配的逻辑
+     * 可取“and”、“or”、“not”，默认值为“and”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    logic?: string;
+    /**
+     * 区配的联系人域，可取联系人的属性名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    field?: string;
+    /**
+     * 区配的联系人值，可使用区配符号“?”和“*”
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    value?: string;
+}
+
+/**
+ * Device模块管理设备信息，用于获取手机设备的相关信息，如IMEI、IMSI、型号、厂商等。通过plus.device获取设备信息管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusDevice {
+    /**
+     * 设备的国际移动设备身份码
+     * 调用此属性获取设备的国际移动设备身份码。
+     * 	如果设备不支持则返回空字符串。
+     * 	如果设备存在多个身份码，则以“,”字符分割拼接，如“862470039452950,862470039452943”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    imei?: string;
+    /**
+     * 设备的国际移动用户识别码
+     * 字符串数组类型，获取设备上插入SIM的国际移动设备身份码。
+     * 	如果设备支持多卡模式则返回所有SIM身份码。
+     * 	如果设备不支持或没有插入SIM卡则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    imsi?: any [];
+    /**
+     * 设备的型号
+     * 调用此属性获取设备的型号信息。
+     * 	如果设备不支持则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    model?: string;
+    /**
+     * 设备的生产厂商
+     * 调用此属性获取设备的生产厂商信息。
+     * 	如果设备不支持则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vendor?: string;
+    /**
+     * 设备的唯一标识
+     * 调用此属性获取设备的唯一标识号。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    uuid?: string;
+    /**
+     * 拨打电话
+     * 调用系统程序拨打电话。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dial(number?: string, confirm?: boolean): void;
+    /**
+     * 发出蜂鸣声
+     * 调用此方法使得设备发出蜂鸣声。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    beep(times?: number): void;
+    /**
+     * 设备振动
+     * 调用此方法使得设备振动。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vibrate(milliseconds?: number): void;
+    /**
+     * 设置应用是否保持唤醒（屏幕常亮）状态
+     * 调用此方法设置应用是否一直保持唤醒状态，保持唤醒状态将会导致程序屏幕常亮、系统不会自动锁屏，从而导致消耗更多的电量。若未设置一直保持唤醒状态则会根据系统设置自动锁定屏幕。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setWakelock(lock?: boolean): void;
+    /**
+     * 获取程序是否一直保持唤醒（屏幕常亮）状态
+     * 调用此方法获取程序是否一致保持唤醒状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    isWakelock(): boolean;
+    /**
+     * 设置设备的系统音量
+     * 调用此方法调节设备的系统音量。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setVolume(volume?: number): void;
+    /**
+     * 获取设备的系统音量
+     * 系统音量值范围为0到1，0表示静音，1表示最大音量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getVolume(): number;
+}
+
+/**
+ * Screen模块管理设备屏幕信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusScreen {
+    /**
+     * 设备屏幕高度分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，screen获取的是设备屏幕总区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionHeight?: number;
+    /**
+     * 设备屏幕宽度分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，screen获取的是设备屏幕总区域的分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionWidth?: number;
+    /**
+     * 逻辑分辨率与实际分辨率的比例
+     * 屏幕分辨率分逻辑分辨率率和实际分辨率，在html页面中使用的像素值都是相对于逻辑分辨率，此值就是逻辑分辨率和实际分辨率的比例，实际分辨率=逻辑分辨率*比例。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    scale?: number;
+    /**
+     * 设备屏幕水平方向的密度
+     * 设备屏幕的密度为每英寸所显示的像素点数，密度越高显示清晰度越高，单位为dpi。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dpiX?: number;
+    /**
+     * 设备屏幕垂直方向的密度
+     * 设备屏幕的密度为每英寸所显示的像素点数，密度越高显示清晰度越高，单位为dpi。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dpiY?: number;
+    /**
+     * 设置屏幕亮度
+     * 调用此方法调节设备屏幕亮度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setBrightness(brightness?: number): void;
+    /**
+     * 获取屏幕亮度值
+     * 屏幕亮度值范围为0到1，0表示最低亮度值，1表示最高亮度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getBrightness(): number;
+    /**
+     * 锁定屏幕方向
+     * 锁定屏幕方向后屏幕只能按锁定的屏幕方向显示，关闭当前页面后仍然有效。
+     * 	可再次调用此方法修改屏幕锁定方向或调用unlockOrientation()方法恢复到应用的默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    lockOrientation(orientation?: string): void;
+    /**
+     * 解除锁定屏幕方向
+     * 解除锁定屏幕方向后将恢复应用默认的屏幕显示方向（通常为应用打包发布时设置的方向）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    unlockOrientation(): void;
+}
+
+/**
+ * Display模块管理应用可使用的显示区域信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusDisplay {
+    /**
+     * 应用可使用的屏幕高度逻辑分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，display获取的是应用显示区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionHeight?: number;
+    /**
+     * 应用可使用的屏幕宽度逻辑分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，display获取的是应用显示区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionWidth?: number;
+}
+
+/**
+ * networkinfo模块用于获取网络信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusNetworkinfo {
+    /**
+     * 网络连接状态未知
+     * 网络状态常量，表示当前设备网络状态未知，固定值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_UNKNOW?: number;
+    /**
+     * 未连接网络
+     * 网络状态常量，当前设备网络未连接网络，固定值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_NONE?: number;
+    /**
+     * 有线网络
+     * 网络状态常量，当前设备连接到有线网络，固定值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_ETHERNET?: number;
+    /**
+     * 无线WIFI网络
+     * 网络状态常量，当前设备连接到无线WIFI网络，固定值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_WIFI?: number;
+    /**
+     * 蜂窝移动2G网络
+     * 网络状态常量，当前设备连接到蜂窝移动2G网络，固定值为4。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL2G?: number;
+    /**
+     * 蜂窝移动3G网络
+     * 网络状态常量，当前设备连接到蜂窝移动3G网络，固定值为5。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL3G?: number;
+    /**
+     * 蜂窝移动4G网络
+     * 网络状态常量，当前设备连接到蜂窝移动4G网络，固定值为6。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL4G?: number;
+    /**
+     * 获取设备当前连接的网络类型
+     * 获取当前设备连接的网络类型，返回值为网络类型常量，可取值CONNECTION_*常量。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getCurrentType(): number;
+}
+
+/**
+ * OS模块管理操作系统信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusOs {
+    /**
+     * 系统语言信息
+     * 获取当前操作系统设置的系统语言，字符串类型数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    language?: string;
+    /**
+     * 系统版本信息
+     * 获取当前操作系统的版本信息，字符串类型数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    version?: string;
+    /**
+     * 系统的名称
+     * 获取当前操作系统的名称，字符串类型数据。
+     * - iOS: 
+     * 	iOS系统。
+     * 								
+     * - Android: 
+     * 	Android系统。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    name?: 'iOS' | 'Android';
+    /**
+     * 系统的供应商信息
+     * 获取当前操作系统的供应商名称，字符串类型数据。
+     * - Apple: 
+     * 	iOS设备，包括iPhone、iPad、iTouch。
+     * 								
+     * - Google: 
+     * 	Android设备。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vendor?: 'Apple' | 'Google';
+}
+
+/**
+ * Downloader模块管理网络文件下载任务，用于从服务器下载各种文件，并支持跨域访问操作。通过plus.downloader获取下载管理对象。Downloader下载使用HTTP的GET/POST方式请求下载文件，符合标准HTTP/HTTPS传输协议。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloader {
+    /**
+     * Download对象管理一个下载任务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    Download?: PlusDownloaderDownload;
+    /**
+     * 下载任务事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadEvent?: PlusDownloaderDownloadEvent;
+    /**
+     * 下载任务状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadState?: PlusDownloaderDownloadState;
+    /**
+     * 下载任务参数
+     * 在创建下载任务时设置的参数，如设置下载任务使用的HTTP协议类型、优先级等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadOptions?: PlusDownloaderDownloadOptions;
+    /**
+     * 新建下载任务
+     * 请求下载管理创建新的下载任务，创建成功则返回Download对象，用于管理下载任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: (result0: PlusDownloaderDownload, result1: number) => void): PlusDownloaderDownload;
+    /**
+     * 枚举下载任务
+     * 枚举指定状态的下载任务列表，通过enumCB回调函数返回结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    enumerate(enumCB?: (result: any []) => void, state?: PlusDownloaderDownloadState): void;
+    /**
+     * 清除下载任务
+     * 清除指定状态的下载任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    clear(state?: PlusDownloaderDownloadState): void;
+    /**
+     * 开始所有下载任务
+     * 开始所有处于为开始调度或暂停状态的下载任务。
+     * 	若下载任务数超过可并发处理的总数，超出的任务处于调度状态（等待下载），当有任务完成时根据调度状态任务的优先级选择任务开始下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    startAll(): void;
+}
+
+/**
+ * Download对象管理一个下载任务
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownload {
+    /**
+     * 下载任务的标识
+     * 在创建任务时系统自动分配，用于标识下载任务的唯一性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    id?: string;
+    /**
+     * 下载文件的地址
+     * 调用plus.donwloader.createDownload()方法创建下载任务时设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    url?: string;
+    /**
+     * 任务的状态
+     * 表示当前下载任务的状态，可通过addEventListener()方法监听statechanged事件监听任务状态的变化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    state?: PlusDownloaderDownloadState;
+    /**
+     * 下载任务的参数
+     * 调用plus.donwloader.createDownload()方法创建下载任务时设置的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    options?: PlusDownloaderDownloadOptions;
+    /**
+     * 下载的文件名称
+     * 下载任务在本地保存的文件路径，下载任务完成时更新，可通过此值访问下载的文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    filename?: string;
+    /**
+     * 已完成下载文件的大小
+     * 整数类型，单位为字节（byte），下载任务开始传输数据时，每次触发statechanged事件或下载任务完成时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    downloadedSize?: number;
+    /**
+     * 下载任务文件的总大小
+     * 整数类型，单位为字节（byte），下载任务开始传输数据时更新，在此之前其值为0。
+     * 	此值是从HTTP请求头中获取，如果服务器未返回则此值始终为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    totalSize?: number;
+    /**
+     * 取消下载任务
+     * 如果任务未完成，则终止下载，并从任务列表中删除。
+     * 	如下载未完成，将删除已下载的临时文件，如果下载已完成，将不删除已下载的文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    abort(): void;
+    /**
+     * 添加下载任务事件监听器
+     * 下载任务添加事件监听器后，当监听的事件发生时触发listener回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    addEventListener(type?: string, listener?: (result0: PlusDownloaderDownload, result1: number) => void, capture?: boolean): void;
+    /**
+     * 获取下载请求HTTP响应头部信息
+     * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者下载请求未完成则为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取下载请求指定的HTTP响应头部的值
+     * 其参数是要返回的HTTP响应头部的名称，可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	如果没有接收到这个头部或者下载请求未完成则为空字符串；如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 暂停下载任务
+     * 暂停下载任务，如果任务已经处于初始状态或暂停状态则无任何响应。
+     * 	通常在任务已开始后暂停任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    pause(): void;
+    /**
+     * 恢复暂停的下载任务
+     * 继续暂停的下载任务，如果任务处于非暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    resume(): void;
+    /**
+     * 设置下载请求的HTTP头数据
+     * Http的Header应该包含在通过后续start()调用而发起的请求中，此方法必需在调用start()之前设置才能生效。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+    /**
+     * 开始下载任务
+     * 开始下载任务，如果任务已经处于开始状态则无任何响应。
+     * 	在创建任务或任务下载失败后调用可重新开始下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    start(): void;
+}
+
+/**
+ * 下载任务事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownloadEvent {
+    /**
+     * 下载任务状态变化事件
+     * 当下载任务状态发生变化时触发此事件，事件原型参考DownloadStateChangedCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    statechanged?: string;
+}
+
+/**
+ * 下载任务状态
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+type PlusDownloaderDownloadState = undefined | 0 | 1 | 2 | 3 | 4 | 5 | -1;
+
+/**
+ * 下载任务参数
+ * 在创建下载任务时设置的参数，如设置下载任务使用的HTTP协议类型、优先级等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownloadOptions {
+    /**
+     * 网络请求类型
+     * 支持http协议的“GET”、“POST”，默认为“GET”请求。
+     * - GET: GET请求
+     * - POST: POST请求
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    method?: 'GET' | 'POST';
+    /**
+     * POST请求时提交的数据
+     * 仅在网络请求类型method设置为"POST"时有效，"GET"请求时忽略此数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    data?: string;
+    /**
+     * 下载文件保存的路径
+     * 保存文件路径仅支持以"_downloads/"、"_doc/"、"_documents/"开头的字符串。
+     * 	文件路径以文件后缀名结尾（如"_doc/download/a.doc"）表明指定保存文件目录及名称，以“/”结尾则认为指定保存文件的目录（此时程序自动生成文件名）。
+     * 	如果指定的文件已经存在，则自动在文件名后面加"(i)"，其中i为数字，如果文件名称后面已经是此格式，则数字i递增，如"download(1).doc"。
+     * 	默认保存目录为（"_downloads"），并自动生成文件名称。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    filename?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 下载任务的优先级
+     * 数值类型，数值越大优先级越高，默认优先级值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    priority?: number;
+    /**
+     * 下载任务超时时间
+     * 数值类型，单位为s(秒)，默认值为120s。
+     * 	超时时间为服务器响应请求的时间（不是下载任务完成的总时间），如果设置为0则表示永远不超时。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    timeout?: number;
+    /**
+     * 下载任务重试次数
+     * 数值类型，默认为重试3次。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    retry?: number;
+    /**
+     * 下载任务重试间隔时间
+     * 数值类型，单位为s(秒)，默认值为30s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    retryInterval?: number;
+}
+
+/**
+ * Fingerprint模块管理指纹识别。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprint {
+    /**
+     * JSON对象，指纹识别认证参数
+     * 用于设置指纹识别认证界面显示的提示信息等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AuthenticateOptions?: PlusFingerprintAuthenticateOptions;
+    /**
+     * JSON对象，指纹识别错误信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    FingerprintError?: PlusFingerprintFingerprintError;
+    /**
+     * 当前设备环境是否支持指纹识别
+     * 目前还有很多设备没有指纹识别模块，需要调用此方法判断是否可使用指纹识别功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isSupport(): boolean;
+    /**
+     * 当前设备是否设置密码锁屏
+     * 如果设备没有设置密码锁屏，则无法使用指纹识别功能，建议调用指纹识别前先使用此接口检查。
+     * 	调用plus.fingerprint.authenticate会返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isKeyguardSecure(): boolean;
+    /**
+     * 当前设备是否已经录入指纹
+     * 如果设备没有录入指纹，则无法使用指纹识别功能，建议调用指纹识别前先使用此接口检查。
+     * 	调用plus.fingerprint.authenticate会返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isEnrolledFingerprints(): boolean;
+    /**
+     * 指纹识别认证
+     * 用户可以开始输入指纹进行识别，如果认证成功则触发successCB回调，识别失败则触发errorCB回调返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    authenticate(successCB?: Function, errorCB?: (result: PlusFingerprintFingerprintError) => void, options?: PlusFingerprintAuthenticateOptions): void;
+    /**
+     * 取消指纹识别认证
+     * 取消当前正在处理的指纹识别认证操作。
+     * 	如果当前没有进行指纹识别则不进行任何操作；如果当前正在进行指纹识别则触发错误回调（错误码为“CANCEL”）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    cancel(): void;
+}
+
+/**
+ * JSON对象，指纹识别认证参数
+ * 用于设置指纹识别认证界面显示的提示信息等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprintAuthenticateOptions {
+    /**
+     * 在指纹识别过程中显示在界面上的提示信息
+     * 如果指纹识别认证过程中不显示提示框，则不显示此信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    message?: string;
+}
+
+/**
+ * JSON对象，指纹识别错误信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprintFingerprintError {
+    /**
+     * 不支持指纹识别
+     * 当前设备不支持指纹识别功能时返回此错误，错误代码常量值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    UNSUPPORT?: number;
+    /**
+     * 设备未设置密码锁屏
+     * 当前设备为设置密码锁屏导致无法使用指纹识别功能时返回此错误，错误代码常量值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    KEYGUARD_INSECURE?: number;
+    /**
+     * 未录入指纹识别
+     * 当前设备未录入指纹导致无法使用指纹识别功能时返回此错误，错误代码常量值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    FINGERPRINT_UNENROLLED?: number;
+    /**
+     * 指纹识别不匹配
+     * 用户指纹识别认证不通过时返回此错误，错误代码常量值为4。
+     * 	用户每次尝试指纹识别认证未通过都会触发此错误，此时还可以继续识别认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AUTHENTICATE_MISMATCH?: number;
+    /**
+     * 指纹识别次数超过限制
+     * 用户多次指纹识别认证不通过时返回此错误，错误代码常量值为5。
+     * 	通常出现此错误后系统会锁定一段时间禁止使用指纹识别，如果再次调用指纹识别认证会立即返回此错误，因此出现此错误时应该提示用户使用其它方式进行认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AUTHENTICATE_OVERLIMIT?: number;
+    /**
+     * 取消指纹识别
+     * 用户取消指纹识别认证时返回此错误，错误代码常量值为6。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    CANCEL?: number;
+    /**
+     * 未知错误
+     * 其它未知错误，错误代码常量值为7。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    UNKNOWN_ERROR?: number;
+    /**
+     * 错误代码
+     * 取值范围为FingerprintError对象的错误常量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    code?: number;
+    /**
+     * 错误描述信息
+     * 详细错误描述信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    message?: string;
+}
+
+/**
+ * Gallery模块管理系统相册，支持从相册中选择图片或视频文件、保存图片或视频文件到相册等功能。通过plus.gallery获取相册管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGallery {
+    /**
+     * JSON对象，从相册中选择文件的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GalleryOptions?: PlusGalleryGalleryOptions;
+    /**
+     * 相册选择文件过滤类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GalleryFilter?: PlusGalleryGalleryFilter;
+    /**
+     * 保存图片到相册成功事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GallerySaveEvent?: PlusGalleryGallerySaveEvent;
+    /**
+     * JSON对象，弹出拍照或摄像界面指示位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    PopPosition?: PlusGalleryPopPosition;
+    /**
+     * 从系统相册选择文件（图片或视频）
+     * 从系统相册中选择图片或视频文件。每次仅能选择一个文件，选择后将返回选择的文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    pick(succesCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusGalleryGalleryOptions): void;
+    /**
+     * 保存文件到系统相册中
+     * 保存文件到系统相册中。
+     * 	每次仅能保存一个文件，支持图片类型（jpg/jpeg、png、bmp等格式）和视频文件（3gp、mov等格式）。
+     * 	若保存的文件系统不支持，则通过errorCB返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    save(path  ?: string, succesCB?: (result: PlusGalleryGallerySaveEvent) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，从相册中选择文件的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGalleryOptions {
+    /**
+     * 是否显示系统相册文件选择界面的动画
+     * 可取值true、false，默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    animation?: boolean;
+    /**
+     * 选择文件保存的路径
+     * 某些系统不能直接使用系统相册的路径，这时需要将选择的文件保存到应用可访问的目录中，可通过此参数设置保存文件的路径。
+     * 	如果路径中包括文件后缀名称，则表明指定文件路径及名称，否则仅指定文件保存目录，文件名称自动生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    filename?: string;
+    /**
+     * 相册中选择文件类型过滤器
+     * 系统相册选择器中可选择的文件类型，可设置为仅选择图片文件（“image”）、视频文件（“video”）或所有文件（“none”），默认值为“image”。
+     * - image: 仅可选择图片文件
+     * - video: 仅可选择视频文件
+     * - none: 可选择图片或视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    filter?: 'image' | 'video' | 'none';
+    /**
+     * 最多选择的图片数量
+     * 仅在支持多选时有效，取值范围为1到Infinity，默认值为Infinity，即不限制选择的图片数。
+     * 	如果设置的值非法则使用默认值Infinity。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    maximum?: number;
+    /**
+     * 是否支持多选图片
+     * 可从系统相册中选择多张图片，选择图片后通过GalleryMultiplePickSuccessCallback回调返回选择的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    multiple?: boolean;
+    /**
+     * 超过最多选择图片数量事件
+     * 使用相册多选图片时，可通过maximum属性设置最多选择的图片数量，当用户操作选择的数量大于此时触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    onmaxed?: Function;
+    /**
+     * 相册选择界面弹出指示区域
+     * 对于大屏幕设备如iPad，相册选择界面为弹出窗口，此时可通过此参数设置弹出窗口位置。
+     * 	其为JSON对象，格式如{top:"10px",left:"10px",width:"200px",height:"200px"}，所有值为像素值，左上坐标相对于容器的位置，默认弹出位置为屏幕居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    popover?: PlusGalleryPopPosition;
+    /**
+     * 已选择的图片路径列表
+     * 仅在多图片选择时生效，相册选择界面将选中指定的图片路径列表。
+     * 	如果指定的路径无效，则忽略此项；如果指定的路径数超过maximum属性指定的最大选择数目则超出的图片不选中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    selected?: any [];
+    /**
+     * 是否使用系统相册文件选择界面
+     * multiple属性设置为true时，如果系统自带相册选择控件时则优先使用，否则使用5+统一相册选择控件；设置为false则不使用系统自带相册选择控件，直接使用5+统一相册选择界面。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    system?: boolean;
+}
+
+/**
+ * 相册选择文件过滤类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGalleryFilter {
+    /**
+     * 仅可选择图片文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    image?: string;
+    /**
+     * 仅可选择视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    video?: string;
+    /**
+     * 不过滤，可选择图片或视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    none?: string;
+}
+
+/**
+ * 保存图片到相册成功事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGallerySaveEvent {
+    /**
+     * 保存到相册的图片路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    path?: string;
+}
+
+/**
+ * JSON对象，弹出拍照或摄像界面指示位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryPopPosition {
+    /**
+     * 指示区域距离容器顶部的距离
+     * 弹出拍照或摄像窗口指示区域距离容器顶部的距离，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    top?: string;
+    /**
+     * 指示区域距离容器左侧的距离
+     * 弹出拍照或摄像窗口指示区域距离容器左侧的距离，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    left?: string;
+    /**
+     * 指示区域的宽度
+     * 弹出拍照或摄像窗口指示区域的宽度，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    width?: string;
+    /**
+     * 指示区域的高度
+     * 弹出拍照或摄像窗口指示区域的高度，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    height?: string;
+}
+
+/**
+ * Geolocation模块管理设备位置信息，用于获取地理位置信息，如经度、纬度等。通过plus.geolocation可获取设备位置管理对象。虽然W3C已经提供标准API获取位置信息，但在某些平台存在差异或未实现，为了保持各平台的统一性，定义此规范接口获取位置信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocation {
+    /**
+     * JSON对象，设备位置信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Position?: PlusGeolocationPosition;
+    /**
+     * JSON对象，地址信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Address?: PlusGeolocationAddress;
+    /**
+     * JSON对象，地理坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Coordinates?: PlusGeolocationCoordinates;
+    /**
+     * JSON对象，监听设备位置信息参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    PositionOptions?: PlusGeolocationPositionOptions;
+    /**
+     * JSON对象，定位错误信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    GeolocationError?: PlusGeolocationGeolocationError;
+    /**
+     * 获取当前设备位置信息
+     * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取，由于获取位置信息可能需要较长的时间，当成功获取位置信息后将通过successCB回调函数返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    getCurrentPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, options?: PlusGeolocationPositionOptions): void;
+    /**
+     * 监听设备位置变化信息
+     * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取。
+     * 	当位置信息更新后将通过successCB回调函数返回。
+     * 	位置信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    watchPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, option?: PlusGeolocationPositionOptions): number;
+    /**
+     * 关闭监听设备位置信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * JSON对象，设备位置信息数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationPosition {
+    /**
+     * 地理坐标信息，包括经纬度、海拔、速度等信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coords?: PlusGeolocationCoordinates;
+    /**
+     * 获取到地理坐标信息的坐标系类型
+     * 可取以下坐标系类型：
+     * 	"gps"：表示WGS-84坐标系；
+     * 	"gcj02"：表示国测局经纬度坐标系；
+     * 	"bd09"：表示百度墨卡托坐标系；
+     * 	"bd09ll"：表示百度经纬度坐标系。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coordsType?: string;
+    /**
+     * 获取到地理坐标的时间戳信息
+     * 时间戳值为从1970年1月1日至今的毫秒数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    timestamp?: number;
+    /**
+     * 获取到地理位置对应的地址信息
+     * 获取地址信息需要连接到服务器进行解析，所以会消耗更多的资源，如果不需要获取地址信息可通过设置PositionOptions参数的geocode属性值为false避免获取地址信息。
+     * 	如果没有获取到地址信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    address?: PlusGeolocationAddress;
+    /**
+     * 获取完整地址描述信息
+     * 如果没有获取到地址信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    addresses?: string;
+}
+
+/**
+ * JSON对象，地址信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationAddress {
+    /**
+     * 国家
+     * 如“中国”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    country?: string;
+    /**
+     * 省份名称
+     * 如“北京市”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    province?: string;
+    /**
+     * 城市名称
+     * 如“北京市”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    city?: string;
+    /**
+     * 区（县）名称
+     * 如“朝阳区”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    district?: string;
+    /**
+     * 街道信息
+     * 如“酒仙桥路”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    street?: string;
+    /**
+     * 获取街道门牌号信息
+     * 如“3号”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    streetNum?: string;
+    /**
+     * POI信息
+     * 如“电子城．国际电子总部”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    poiName?: string;
+    /**
+     * 邮政编码
+     * 如“100016”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    postalCode?: string;
+    /**
+     * 城市代码
+     * 如“010”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    cityCode?: string;
+}
+
+/**
+ * JSON对象，地理坐标信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationCoordinates {
+    /**
+     * 坐标纬度值
+     * 数据类型对象，地理坐标中的纬度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    latitude?: number;
+    /**
+     * 坐标经度值
+     * 数据类型对象，地理坐标中的经度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    longitude?: number;
+    /**
+     * 海拔信息
+     * 数据类型对象，如果无法获取此信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    altitude?: number;
+    /**
+     * 地理坐标信息的精确度信息
+     * 数据类型对象，单位为米，其有效值必须大于0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    accuracy?: number;
+    /**
+     * 海拔的精确度信息
+     * 数据类型对象，单位为米，其有效值必须大于0。如果无法获取海拔信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    altitudeAccuracy?: number;
+    /**
+     * 表示设备移动的方向
+     * 数据类型对象，范围为0到360，表示相对于正北方向的角度。如果无法获取此信息，则此值为空（null）。如果设备没有移动则此值为NaN。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    heading?: number;
+    /**
+     * 表示设备移动的速度
+     * 数据类型对象，单位为米每秒（m/s），其有效值必须大于0。如果无法获取速度信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    speed?: number;
+}
+
+/**
+ * JSON对象，监听设备位置信息参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationPositionOptions {
+    /**
+     * 是否高精确度获取位置信息
+     * 高精度获取表示需要使用更多的系统资源，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    enableHighAccuracy?: boolean;
+    /**
+     * 获取位置信息的超时时间
+     * 单位为毫秒（ms），默认值为不超时。如果在指定的时间内没有获取到位置信息则触发错误回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    timeout?: number;
+    /**
+     * 获取位置信息的间隔时间
+     * 单位为毫秒（ms），默认值为5000（即5秒）。调用plus.geolocation.watchPosition时为更新位置信息的间隔时间。
+     * 	注意：在不同定位模块下支持范围值可能不同，如百度定位模块的间隔范围为大于等于1秒，如果设置的值小于最小值则使用最小值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    maximumAge?: number;
+    /**
+     * 优先使用的定位模块
+     * 可取以下供应者：
+     * 	"system"：表示系统定位模块，支持wgs84坐标系；
+     * 	"baidu"：表示百度定位模块，支持gcj02/bd09/bd09ll坐标系；
+     * 	"amap"：表示高德定位模板，支持gcj02坐标系。
+     * 	默认值按以下优先顺序获取（amap&gt;baidu&gt;system），若指定的provider不存在或无效则返回错误回调。
+     * 	注意：百度/高德定位模块需要配置百度/高德地图相关参数才能正常使用。
+     * - system: 优先使用系统定位模块
+     * - baidu: 优先使用百度定位模块
+     * - amap: 优先使用高德定位模块
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    provider?: 'system' | 'baidu' | 'amap';
+    /**
+     * 指定获取的定位数据坐标系类型
+     * 可取以下坐标系类型：
+     * 	"wgs84"：表示WGS-84坐标系；
+     * 	"gcj02"：表示国测局经纬度坐标系；
+     * 	"bd09"：表示百度墨卡托坐标系；
+     * 	"bd09ll"：表示百度经纬度坐标系；
+     * 	provider为"system"时，默认使用"wgs84"坐标系；provider为"baidu"时，默认使用"gcj02"坐标系；provider为"amap"时，默认使用"gcj02"坐标系。
+     * 	如果设置的坐标系类型provider不支持，则返回错误。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coordsType?: string;
+    /**
+     * 是否解析地址信息
+     * 解析的地址信息保存到Position对象的address、addresses属性中，true表示解析地址信息，false表示不解析地址信息，返回的Position对象的address、addresses属性值为undefined，默认值为true。
+     * 	如果解析地址信息失败则返回的Position对象的address、addresses属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    geocode?: boolean;
+}
+
+/**
+ * JSON对象，定位错误信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationGeolocationError {
+    /**
+     * 访问权限被拒绝
+     * 系统不允许程序获取定位功能，错误代码常量值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    PERMISSION_DENIED?: number;
+    /**
+     * 位置信息不可用
+     * 无法获取有效的位置信息，错误代码常量值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    POSITION_UNAVAILABLE?: number;
+    /**
+     * 获取位置信息超时
+     * 无法在指定的时间内获取位置信息，错误代码常量值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    TIMEOUT?: number;
+    /**
+     * 未知错误
+     * 其它未知错误导致无法获取位置信息，错误代码常量值为4。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    UNKNOWN_ERROR?: number;
+    /**
+     * 错误代码
+     * 取值范围为GeolocationError对象的常量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    code?: number;
+    /**
+     * 错误描述信息
+     * 详细错误描述信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    message?: string;
+}
+
+/**
+ * iBeacon模块用于搜索附件的iBeacon设备（*请使用HBuilderX并更新到最新版本*）。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+ */
+interface PlusIbeacon {
+    /**
+     * iBeacon设备信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    IBeaconInfo?: PlusIbeaconIBeaconInfo;
+    /**
+     * 开始搜索附近的iBeacon设备
+     * 搜索成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 停止搜索附近的iBeacon设备
+     * 取消成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    stopBeaconDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取已搜索到的iBeacon设备
+     * 获取成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    getBeacons(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听iBeacon设备更新
+     * iBeacon设备更新后触发updateCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    onBeaconUpdate(updateCB?: (result: any) => void): void;
+    /**
+     * 监听iBeacon服务状态变化
+     * iBeacon服务状态变化时触发changeCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    onBeaconServiceChange(changeCB?: (result: any) => void): void;
+}
+
+/**
+ * iBeacon设备信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+ */
+interface PlusIbeaconIBeaconInfo {
+    /**
+     * iBeacon设备广播的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    uuid?: string;
+    /**
+     * iBeacon设备的主id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    major?: string;
+    /**
+     * iBeacon设备的次id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    minor?: string;
+    /**
+     * iBeacon设备的距离
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    proximity?: number;
+    /**
+     * iBeacon设备的距离精度信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    accuracy?: number;
+    /**
+     * iBeacon设备的信号强度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    rssi?: string;
+}
+
+/**
+ * IO模块管理本地文件系统，用于对文件系统的目录浏览、文件的读取、文件的写入等操作。通过plus.io可获取文件系统管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIo {
+    /**
+     * 文件系统中的目录对象，用于管理特定的本地目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DirectoryEntry?: PlusIoDirectoryEntry;
+    /**
+     * 读取目录信息对象，用于获取目录中包含的文件及子目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DirectoryReader?: PlusIoDirectoryReader;
+    /**
+     * 文件系统中的文件数据对象，用于获取文件的数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    File?: PlusIoFile;
+    /**
+     * 文件系统中的文件对象，用于管理特定的本地文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileEntry?: PlusIoFileEntry;
+    /**
+     * 文件系统中的读取文件对象，用于获取文件的内容
+     * FileReader对象是从设备文件系统读取文件FileReader对象是从设备文件系统读取文件的一种方式，文件以文本或者Base64编码的字符串形式读出来。
+     * 	用户注册自己的事件监听器来接收loadstart、progress、load、loadend、error和abort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileReader?: PlusIoFileReader;
+    /**
+     * 文件系统中的写文件对象，用于写入文件内容
+     * FileWriter对象是从设备文件系统写入文件FileWriter对象是从设备文件系统写入文件的一种方式，用户注册自己的事件监听器来接收writestart、progress、write、writeend、error和abort事件。
+     * 	一个FileWriter对象是为单个文件的操作而创建。你可以使用该对象多次对相应文件进行写入操作。FileWriter维护该文件的指针位置及长度属性，这样你就可以寻找和写入文件的任何地方。
+     * 	默认情况下，FileWriter从文件的开头开始写入（将覆盖现有数据）。FileWriter对象的seek方法可设置文件操作指定位置，如fw.seek(fw.length-1)写入操作就会从文件的末尾开始。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileWriter?: PlusIoFileWriter;
+    /**
+     * 文件系统对象，用于管理特定本地文件目录
+     * 文件系统对象表示一个应用可访问的根目录。name属性用于标识此根目录的名称，与LocalFileSystem中的文件系统类型一一对应。root属性为文件目录对象，用于实际操作文件系统，参考DirectoryEntry。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileSystem?: PlusIoFileSystem;
+    /**
+     * JSON对象，获取文件操作的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    Flags?: PlusIoFlags;
+    /**
+     * JSON对象，保存文件或目录的状态信息对象
+     * 可通过DirectoryEntry或FileEntry对象的getMetaData方法获取
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    Metadata?: PlusIoMetadata;
+    /**
+     * 文件或目录操作事件对象
+     * 所有文件或目录操作事件回调函数中都创建该对象的实例。
+     * 	该对象从DOMEvent继承而来，可通过该其target属性获取事件触发的文件或目录操作对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileEvent?: PlusIoFileEvent;
+    /**
+     * 文件路径类型
+     * 在文件系统中的文件路径需转换成URL格式，已方便runtime快速加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    URLType?: PlusIoURLType;
+    /**
+     * 相对路径URL
+     * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RelativeURL?: PlusIoRelativeURL;
+    /**
+     * 本地路径URL
+     * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+     * 	如示例：“file:///D:/res/hello.html”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LocalURL?: PlusIoLocalURL;
+    /**
+     * 网络路径URL
+     * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+     * 	如示例：“http://localhost:13131/_www/res/icon.png”，其中“_www”字段可支持类型与相对路径URL一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RemoteURL?: PlusIoRemoteURL;
+    /**
+     * 应用运行资源目录常量
+     * 本地文件系统常量，Number类型，固定值1。应用运行资源目录，仅本应用可访问。
+     * 	为了确保应用资源的安全性，此目录只可读。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PRIVATE_WWW?: number;
+    /**
+     * 应用私有文档目录常量
+     * 本地文件系统常量，Number类型，固定值2。应用私有文档目录，仅本应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PRIVATE_DOC?: number;
+    /**
+     * 程序公用文档目录常量
+     * 本地文件系统常量，Number类型，固定值3。程序公用文档目录，所有应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PUBLIC_DOCUMENTS?: number;
+    /**
+     * 程序公用下载目录常量
+     * 本地文件系统常量，Number类型，固定值4。程序公用下载目录，所有应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PUBLIC_DOWNLOADS?: number;
+    /**
+     * 请求本地文件系统对象
+     * 获取指定的文件系统，可通过type指定获取文件系统的类型。
+     * 	获取指定的文件系统对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    requestFileSystem(type?: number, succesCB?: (result: PlusIoFileSystem) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 通过URL参数获取目录对象或文件对象
+     * 快速获取指定的目录或文件操作对象，如通过URL值“_www/test.html”可直接获取文件操作对象。
+     * 	url值可支持相对路径URL、本地路径URL。
+     * 	获取指定的文件或目录操作对象成功通过succesCB回调返回，如果指定URL路径或文件不存在则失败通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    resolveLocalFileSystemURL(url ?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 将本地URL路径转换成平台绝对路径
+     * 绝对路径符合各平台文件路径格式，通常用于Native.JS调用系统原生文件操作API，也可以在前面添加“file://”后在html页面中直接使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    convertLocalFileSystemURL(url?: string): string;
+    /**
+     * 将平台绝对路径转换成本地URL路径
+     * 绝对路径符合各平台文件路径格式，转换后变成RelativeURL类型格式。
+     * 	功能与convertLocalFileSystemURL方法相反，将绝对路径转换成相对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    convertAbsoluteFileSystem(path?: string): string;
+}
+
+/**
+ * 文件系统中的目录对象，用于管理特定的本地目录
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoDirectoryEntry {
+    /**
+     * 操作对象的是否为文件，DirectoryEntry对象固定其值为false
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isFile?: boolean;
+    /**
+     * 操作对象是否为目录，DirectoryEntry对象固定其值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isDirectory?: boolean;
+    /**
+     * 目录操作对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 目录操作对象的完整路径，文件系统的绝对路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fullPath?: string;
+    /**
+     * 文件操作对象所属的文件系统对象，参考FileSystem
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileSystem?: PlusIoFileSystem;
+    /**
+     * 获取目录的属性
+     * 用于获取文件或目录的属性信息。
+     * 	获取属性信息成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void, recursive?: boolean): void;
+    /**
+     * 移动目录
+     * 以下情况移动目录将会导致失败：
+     * 	将父目录移动到子目录中；
+     * 	要移动到的目标目录无效；
+     * 	要移动到的目标路径被文件占用；
+     * 	要移动到的目标目录已经存在并且不为空。
+     * 	移动目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 拷贝目录
+     * 以下情况拷贝目录将会导致失败：
+     * 	将父目录拷贝到子目录中；
+     * 	要拷贝到的目标目录无效；
+     * 	要拷贝到的目标路径被文件占用；
+     * 	要拷贝到的目标目录已经存在并且不为空。
+     * 	拷贝目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取目录路径转换为URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toURL(): string;
+    /**
+     * 获取目录路径转换为本地路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toLocalURL(): string;
+    /**
+     * 获取目录路径转换为网络路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toRemoteURL(): string;
+    /**
+     * 删除目录
+     * 以下情况删除目录将会导致失败：
+     * 	目录中存在文件；
+     * 	删除根目录；
+     * 	删除目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取目录所属的父目录
+     * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 创建目录读取对象
+     * 创建一个目录读取对象，用户读取目下的文件及子目录。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    createReader(): PlusIoDirectoryReader;
+    /**
+     * 创建或打开子目录
+     * 创建或打开当前目录指定的目录。
+     * 	创建或打开目录操作成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 创建或打开文件
+     * 创建或打开当前目录下指定的文件。
+     * 	创建或打开文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getFile(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 递归删除目录
+     * 删除目录将会删除其下的所有文件及子目录
+     * 	不能删除根目录，如果操作删除根目录将会删除目录下的文件及子目录，不会删除根目录自身。
+     * 	删除目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    removeRecursively(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 读取目录信息对象，用于获取目录中包含的文件及子目录
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoDirectoryReader {
+    /**
+     * 获取当前目录中的所有文件和子目录
+     * 获取当前目录下的所有文件和子目录。
+     * 	获取操作成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readEntries(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 文件系统中的文件数据对象，用于获取文件的数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFile {
+    /**
+     * 文件数据对象的数据大小，单位为字节
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    size?: number;
+    /**
+     * 文件数据对象MIME类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    type?: string;
+    /**
+     * 文件数据对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件对象的最后修改时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    lastModifiedDate?: Date;
+    /**
+     * 获取文件指定的数据内容
+     * 获取文件指定的数据内容，其中end必须大于start。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    slice(start?: number, end?: number): PlusIoFile;
+    /**
+     * 关闭文件数据对象
+     * 当文件数据对象不再使用时，可通过此方法关闭，释放系统资源。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    close(): void;
+}
+
+/**
+ * 文件系统中的文件对象，用于管理特定的本地文件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileEntry {
+    /**
+     * 文件操作对象的是否为文件，FileEntry对象固定其值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isFile?: boolean;
+    /**
+     * 文件操作对象是否为目录，FileEntry对象固定其值为false
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isDirectory?: boolean;
+    /**
+     * 文件操作对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件操作对象的完整路径，文件系统的绝对路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fullPath?: string;
+    /**
+     * 文件操作对象所属的文件系统对象，参考FileSystem
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileSystem?: PlusIoFileSystem;
+    /**
+     * 获取文件的属性信息
+     * 用于获取文件的属性信息。
+     * 	获取属性信息成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 移动文件
+     * 以下情况移动目录将会导致失败：
+     * 	要移动到的目标目录无效；
+     * 	要移动到的目标路径被其它文件占用；
+     * 	移动文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 拷贝文件
+     * 以下情况拷贝文件将会导致失败：
+     * 	要拷贝到的目标目录无效；
+     * 	要拷贝到的目标路径被其它文件占用；
+     * 	拷贝文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件路径转换为URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toURL(): string;
+    /**
+     * 获取文件路径转换为本地路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toLocalURL(): string;
+    /**
+     * 获取文件路径转换为网络路径URL地址
+     * URL地址格式为以“http://localhost:13131/”开头的网络路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toRemoteURL(): string;
+    /**
+     * 删除文件
+     * 删除文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件所属的父目录
+     * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件关联的写文件操作对象FileWriter
+     * 获取写文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    createWriter(succesCB?: (result: PlusIoFileWriter) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件数据对象
+     * 获取文件数据对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    file(succesCB?: (result: PlusIoFile) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 文件系统中的读取文件对象，用于获取文件的内容
+ * FileReader对象是从设备文件系统读取文件FileReader对象是从设备文件系统读取文件的一种方式，文件以文本或者Base64编码的字符串形式读出来。
+ * 	用户注册自己的事件监听器来接收loadstart、progress、load、loadend、error和abort事件。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileReader {
+    /**
+     * 值为0，开始读取文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    EMPTY?: number;
+    /**
+     * 值为1，正在读取文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LOADING?: number;
+    /**
+     * 值为2，读文件操作完成状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DONE?: number;
+    /**
+     * 当前读取文件所处的状态
+     * 可取上面定义的常量值，EMPTY（0）、LOADING（1）、DONE（2）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readyState?: number;
+    /**
+     * 已读取文件的内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    result?: string;
+    /**
+     * 文件操作错误代码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    error?: number;
+    /**
+     * 读取文件开始时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onloadstart?: (result: PlusIoFileEvent) => void;
+    /**
+     * 读取文件过程中的回调函数
+     * 用于获取文件读取进度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onprogress?: (result: PlusIoFileEvent) => void;
+    /**
+     * 读取文件成功完成的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onload?: (result: PlusIoFileEvent) => void;
+    /**
+     * 取消读取文件时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onabort?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件读取操作失败时调用的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onerror?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件读取操作完成时的回调函数
+     * 不管成功或失败都会触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onloadend?: (result: PlusIoFileEvent) => void;
+    /**
+     * 终止文件读取操作
+     * 读取文件操作开始后，可通过此方法取消读取文件。
+     * 	调用此方法后将触发文件读取对象的onabort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    abort(): void;
+    /**
+     * 以URL编码格式读取文件数据内容
+     * 读取文件的数据内容，并将数据内容进行URL编码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readAsDataURL(file?: PlusIoFile, encoding ?: string): void;
+    /**
+     * 以文本格式读取文件数据内容
+     * 读取文件的数据内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readAsText(file?: PlusIoFile, encoding ?: string): void;
+}
+
+/**
+ * 文件系统中的写文件对象，用于写入文件内容
+ * FileWriter对象是从设备文件系统写入文件FileWriter对象是从设备文件系统写入文件的一种方式，用户注册自己的事件监听器来接收writestart、progress、write、writeend、error和abort事件。
+ * 	一个FileWriter对象是为单个文件的操作而创建。你可以使用该对象多次对相应文件进行写入操作。FileWriter维护该文件的指针位置及长度属性，这样你就可以寻找和写入文件的任何地方。
+ * 	默认情况下，FileWriter从文件的开头开始写入（将覆盖现有数据）。FileWriter对象的seek方法可设置文件操作指定位置，如fw.seek(fw.length-1)写入操作就会从文件的末尾开始。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileWriter {
+    /**
+     * 值为0，写文件初始化状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    INIT?: number;
+    /**
+     * 值为1，正在写入文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    WRITING?: number;
+    /**
+     * 值为2，写文件操作完成状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DONE?: number;
+    /**
+     * 当前写入文件所处的状态
+     * 可取上面定义的常量值，INIT(0)、WRITING（1）、DONE（2）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readyState?: number;
+    /**
+     * 文件当前的长度，单位为字节
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    length?: number;
+    /**
+     * 文件当前操作的指针位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    position?: number;
+    /**
+     * 文件写入操作错误代码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    error?: number;
+    /**
+     * 写入文件开始时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwritestart?: (result: PlusIoFileEvent) => void;
+    /**
+     * 写入文件过程中的回调函数
+     * 用于获取文件读取进度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onprogress?: (result: PlusIoFileEvent) => void;
+    /**
+     * 写入文件成功完成的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwrite?: (result: PlusIoFileEvent) => void;
+    /**
+     * 取消写入文件时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onabort?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件写入操作失败时调用的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onerror?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件写入操作完成时的回调函数
+     * 不管成功或失败都会触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwriteend?: (result: PlusIoFileEvent) => void;
+    /**
+     * 终止文件写入操作
+     * 写入文件数据操作开始后，可通过此方法取消写入文件数据操作。
+     * 	调用此方法后将触发文件写入对象的onabort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    abort(): void;
+    /**
+     * 定位文件操作位置
+     * 定位文件的操作位置，有效值为0到文件的总长度减1。
+     * 	0表示文件的起始位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    seek(position?: number): void;
+    /**
+     * 按照指定长度截断文件
+     * 从文件当前定位的位置开始，按照指定长度截断文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    truncate(length ?: number): void;
+    /**
+     * 向文件中写入数据
+     * 从文件当前定位的位置开始，写入数据到文件中。
+     * 	如果文件中已经存在数据，新写入的数据将覆盖已有数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    write(data ?: string): void;
+}
+
+/**
+ * 文件系统对象，用于管理特定本地文件目录
+ * 文件系统对象表示一个应用可访问的根目录。name属性用于标识此根目录的名称，与LocalFileSystem中的文件系统类型一一对应。root属性为文件目录对象，用于实际操作文件系统，参考DirectoryEntry。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileSystem {
+    /**
+     * 文件系统的名称
+     * 值为文件系统类型常量值字符串，如“PRIVATE_WWW”、“PRIVATE_DOCUMENTS”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件系统的根目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    root?: PlusIoDirectoryEntry;
+}
+
+/**
+ * JSON对象，获取文件操作的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFlags {
+    /**
+     * 是否创建对象标记
+     * 指示如果文件或目录不存在时是否进行创建，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    create?: boolean;
+    /**
+     * 反向操作标记
+     * 其本身没有任何效果，需与create属性值设置为true时一起使用，如果目标文件或目录已经存在则会导致文件或目录打开失败，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    exclusive?: boolean;
+}
+
+/**
+ * JSON对象，保存文件或目录的状态信息对象
+ * 可通过DirectoryEntry或FileEntry对象的getMetaData方法获取
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoMetadata {
+    /**
+     * 文件或目录的最后修改时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    modificationTime?: Date;
+    /**
+     * 文件的大小
+     * 若获取的是目录对象的属性则值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    size?: number;
+    /**
+     * 包含的子目录数
+     * 若自身是文件则其值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    directoryCount?: number;
+    /**
+     * 目录的文件数
+     * 若自身是文件则其值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileCount?: number;
+}
+
+/**
+ * 文件或目录操作事件对象
+ * 所有文件或目录操作事件回调函数中都创建该对象的实例。
+ * 	该对象从DOMEvent继承而来，可通过该其target属性获取事件触发的文件或目录操作对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileEvent {
+    /**
+     * 文件或目录操作对象
+     * 在不同的回调中指向的对象不同，可指向的对象包括：FileEntry、DirectoryEntry、FileReader、FileWriter。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    target?: PlusIoDirectoryEntry;
+}
+
+/**
+ * 文件路径类型
+ * 在文件系统中的文件路径需转换成URL格式，已方便runtime快速加载。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoURLType {
+    /**
+     * 相对路径URL
+     * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RelativeURL?: PlusIoRelativeURL;
+    /**
+     * 本地路径URL
+     * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LocalURL?: PlusIoLocalURL;
+    /**
+     * 网络路径URL
+     * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RomoteURL?: string;
+}
+
+/**
+ * 相对路径URL
+ * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoRelativeURL {
+    /**
+     * 应用资源目录
+     * 保存应用的所有html、css、js等资源文件，与文件系统中根目录PRIVATE_WWW一致，后面加相对路径如“_www/res/icon.png”。
+     * 	注意：应用资源目录是只读目录，只能读取次目录下的文件，不能修改或新建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _www?: string;
+    /**
+     * 应用私有文档目录
+     * 用于保存应用运行期业务逻辑数据，与文件系统中根目录PRIVATE_DOCUMENTS，如“_doc/userdata.xml”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _doc?: string;
+    /**
+     * 程序公用文档目录
+     * 用于保存程序中各应用间可共享文件的目录，与文件系统中根目录PUBLIC_DOCUMENTS，如“_document/share.doc”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _documents?: string;
+    /**
+     * 程序公用下载目录
+     * 用于保存程序下载文件的目录，与文件系统中根目录PUBLIC_DOWNLOADS，如“_download/mydoc.doc”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _downloads?: string;
+}
+
+/**
+ * 本地路径URL
+ * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+ * 	如示例：“file:///D:/res/hello.html”。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoLocalURL {
+}
+
+/**
+ * 网络路径URL
+ * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+ * 	如示例：“http://localhost:13131/_www/res/icon.png”，其中“_www”字段可支持类型与相对路径URL一致。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoRemoteURL {
+}
+
+/**
+ * Native.js for iOS封装一条通过JS语法直接调用Native Objective-C接口通道，通过plus.ios可调用几乎所有的系统API。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+interface PlusIos {
+    /**
+     * Objective-C类对象
+     * Objective-C类对象，可通过其属性获取类的常量，可通过方法来操作类的静态方法，也通过new方法来创建类的实例对象。
+     * 	对于类的静态方法，则直接通过.后面跟随方法名称调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    ClassObject?: PlusIosClassObject;
+    /**
+     * Objective-C实例对象
+     * Objective-C实例对象，可通过其方法来操作示例的变量和方法。
+     * 	注意：必须通过plusGetAttribute()方法读取示例对象的属性值，通过plusSetAttribute()方法设置示例对象的属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    InstanceObject?: PlusIosInstanceObject;
+    /**
+     * 导入Objective-C类对象
+     * 导入类对象后，就可以通过.操作符直接调用对象（类对象/实例对象）的方法。
+     * 	通过.操作符号调用方法时，不需要使用":"来分割参数。
+     * 	注意：导入类对象将会消耗较多的系统资源，不应该导入过多的类对象，可以使用plus.ios.invoke()来调用未导入类实例对象的方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    importClass(classname?: string): PlusIosClassObject;
+    /**
+     * 创建实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    newObject(classname?: string, args?: any): PlusIosInstanceObject;
+    /**
+     * 销毁实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    deleteObject(obj?: any): void;
+    /**
+     * 调用对象（类对象/示例对象）的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    invoke(obj?: PlusIosInstanceObject, name?: string, args?: any): any;
+    /**
+     * 实现代理的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    implements(name?: string, obj?: any): PlusIosInstanceObject;
+    /**
+     * 获取当前Webview窗口对象的native层UIWebview实例对象
+     * UIWebview对象的API请参考Apple开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    currentWebview(): PlusIosInstanceObject;
+}
+
+/**
+ * Objective-C类对象
+ * Objective-C类对象，可通过其属性获取类的常量，可通过方法来操作类的静态方法，也通过new方法来创建类的实例对象。
+ * 	对于类的静态方法，则直接通过.后面跟随方法名称调用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+interface PlusIosClassObject {
+}
+
+/**
+ * Objective-C实例对象
+ * Objective-C实例对象，可通过其方法来操作示例的变量和方法。
+ * 	注意：必须通过plusGetAttribute()方法读取示例对象的属性值，通过plusSetAttribute()方法设置示例对象的属性值。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+interface PlusIosInstanceObject {
+    /**
+     * 获取Objective-C实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Objective-C示例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Key管理设备按键事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKey {
+    /**
+     * 按键类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    KeyType?: PlusKeyKeyType;
+    /**
+     * 按键事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    KeyEvent?: PlusKeyKeyEvent;
+    /**
+     * 添加按键事件监听器
+     * 添加按键事件监听器，当指定的按键事件发生时，回调函数将触发。
+     * 	应用中存在多个Webview窗口时，按照窗口的显示栈顺序从后往前查找，查找到添加按键事件监听器的窗口后停止（中断前面Webview窗口对按键事件的监听），并向窗口触发执行按键回调事件。
+     * 	在同一Webview窗口中可多次调用此方法对同一事件添加多个监听器，触发时按照添加的顺序先后调用。
+     * 	注意：此方法无法监听软键盘的按键事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    addEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void, capture?: boolean): void;
+    /**
+     * 隐藏软键盘
+     * 隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    hideSoftKeybord(): void;
+    /**
+     * 设置辅助输入类型
+     * input的type类型为text获取焦点时，在软键盘上方显示辅助输入条方便用户快速输入。
+     * 	在页面中input编辑框type类型不为"tel"、"email"时生效（type为tel类型时一定显示tel的辅助输入条，type为email时一定显示email的辅助输入条）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    setAssistantType(type?: string): void;
+    /**
+     * 显示软键盘
+     * 强制显示系统软键盘，如果软键盘已经显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    showSoftKeybord(): void;
+    /**
+     * 移除按键事件监听器
+     * 从窗口移除指定的事件监听器。若没有查找到对应的事件监听器，则无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    removeEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void): void;
+}
+
+/**
+ * 按键类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKeyKeyType {
+    /**
+     * 设备“返回”按钮按键事件
+     * 如果需要改变默认“返回”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"backbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    backbutton?: string;
+    /**
+     * 键按下事件
+     * 如果需要改变默认键按下的处理逻辑，则可通过plus.key.addEventListener来注册监听"keydown"事件。
+     * 	可通过回调函数中KeyEvent对象的keyCode来获取按下的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keydown?: string;
+    /**
+     * 键松开事件
+     * 如果需要改变默认键松开的处理逻辑，则可通过plus.key.addEventListener来注册监听"keyup"事件。
+     * 	可通过回调函数中KeyEvent对象的keyCode来获取松开的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyup?: string;
+    /**
+     * 长按键事件
+     * 如果需要改变默认长按键的处理逻辑，则可通过plus.key.addEventListener来注册监听"longpressed"事件。
+     * 	长按键时会多次触发回调函数，通过回调函数中KeyEvent对象的keyCode来获取长按的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    longpressed?: string;
+    /**
+     * 设备“菜单”按钮按键事件
+     * 如果需要改变默认“菜单”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"menubutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    menubutton?: string;
+    /**
+     * 设备“搜索”按钮按键事件
+     * 如果需要改变默认“搜索”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"searchbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    searchbutton?: string;
+    /**
+     * 设备“音量+”按钮按键事件
+     * 如果需要改变默认“音量+”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"volumeupbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    volumeupbutton?: string;
+    /**
+     * 设备“音量-”按钮按键事件
+     * 如果需要改变默认“音量-”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"volumedownbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    volumedownbutton?: string;
+}
+
+/**
+ * 按键事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKeyKeyEvent {
+    /**
+     * 触发按键事件的键值
+     * 键值由各系统平台定义，一些特殊按键在不同的设备上可能存在差异。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyCode?: number;
+    /**
+     * 按键事件类型
+     * 用于表明触发此按键事件的类型，值为KeyType中定义的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyType?: PlusKeyKeyType;
+}
+
+/**
+ * Messaging模块管理设备通讯功能，可用于短信、彩信、邮件发送等。通过plus.messaging可获取设备通讯管理对象。另外也可以直接通过html中的href直接快速发送短信、拨打电话、发送邮件等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessaging {
+    /**
+     * 消息对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    Message?: PlusMessagingMessage;
+    /**
+     * 消息体内容类型
+     * 用于设定消息的消息体内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    BodyType?: PlusMessagingBodyType;
+    /**
+     * 简单短信类型常量
+     * 消息类型常量，Number类型，固定值为1，用于创建并发送短信。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_SMS?: number;
+    /**
+     * 彩信类型常量
+     * 消息类型常量，Number类型，固定值为2，用于创建并发送多媒体短信（彩信）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_MMS?: number;
+    /**
+     * 邮件类型常量
+     * 消息类型常量，Number类型，固定值为3，用于创建并发送邮件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_EMAIL?: number;
+    /**
+     * 创建消息对象
+     * 创建指定类型的消息，消息类型可取plus.messaging.TYPE_SMS、plus.messaging.TYPE_MMS、plus.messaging.TYPE_EMAIL。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    createMessage(type ?: number): PlusMessagingMessage;
+    /**
+     * 发送消息
+     * 发送消息，发送成功回调successCB函数，发送失败回调errorCB函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    sendMessage(msg?: PlusMessagingMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 消息对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessagingMessage {
+    /**
+     * 收件人信息
+     * 字符串数组类型，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    to?: any [];
+    /**
+     * 抄送人信息
+     * 字符串数组类型，仅发送邮件时有效，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    cc?: any [];
+    /**
+     * 暗送人信息
+     * 字符串数组类型，仅发送邮件时有效，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    bcc?: any [];
+    /**
+     * 发件人信息
+     * 仅在监听接收到的信息时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    from?: string;
+    /**
+     * 发送消息主题
+     * 字符串类型，仅发送邮件时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    subject?: string;
+    /**
+     * 发送消息内容
+     * 字符串类型，要发送的消息体内容，其格式必须与bodyType指定的一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    body?: string;
+    /**
+     * 发送消息内容类型
+     * 要发送消息体内容的类型，可取值"text"表示文本内容，"html"表示为html页面，默认值为"text"。
+     * - text/plain: 纯文本类型消息体内容
+     * - text/html: 网页数据类型消息体内容(用于发送邮件)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    bodyType?: 'text/plain' | 'text/html';
+    /**
+     * 是否采用静默方式发送消息
+     * 布尔类型，可取值为true或false，true表示静默方式发送，不弹出界面；false表示非静默方式发送。默认采用非静默方式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    silent?: boolean;
+    /**
+     * 添加附件
+     * 向消息中添加附件，仅邮件类型消息支持，其它类型消息不支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    addAttachment(url?: string): void;
+}
+
+/**
+ * 消息体内容类型
+ * 用于设定消息的消息体内容。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessagingBodyType {
+    /**
+     * 文本类型
+     * 纯文本类型消息体内容，默认消息体内容类型。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    'text/plain'?: string;
+    /**
+     * Html类型
+     * 网页数据类型消息体内容，可用于发送邮件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    'text/html'?: string;
+}
+
+/**
+ * nativeObj管理系统原生对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObj {
+    /**
+     * 原生动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    AnimationOptions?: PlusNativeObjAnimationOptions;
+    /**
+     * 原生动画窗口样式
+     * 指定动画窗口的样式，如背景图片，绘制的文字等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    AnimationViewStyles?: PlusNativeObjAnimationViewStyles;
+    /**
+     * 原生图片对象
+     * 原生图片对象会占用较大的内存资源，在使用时需谨慎管理，当图片不再使用时应该及时调用clear方法进行销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Bitmap?: PlusNativeObjBitmap;
+    /**
+     * JSON对象，保存图片的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    BitmapSaveOptions?: PlusNativeObjBitmapSaveOptions;
+    /**
+     * 原生图片轮播控件对象
+     * 原生图片轮播控件对象从原生View控件（plus.nativeObj.View）继承而来，用于绘制图片轮播内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSlider?: PlusNativeObjImageSlider;
+    /**
+     * 图片轮播控件样式
+     * 从ViewStyles继承而来，扩展支持轮播图片等配置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSliderStyles?: PlusNativeObjImageSliderStyles;
+    /**
+     * 图片轮播控件中图片项配置参数
+     * 用于指定图片地址等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSliderImageStyles?: PlusNativeObjImageSliderImageStyles;
+    /**
+     * 输入框样式
+     * 用于定义输入框的显示样式，如字体大小，提示内容等信息。
+     * 	输入文本内容在指定区域水平居左，垂直居中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    InputStyles?: PlusNativeObjInputStyles;
+    /**
+     * 区域信息对象
+     * 包括位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Rect?: PlusNativeObjRect;
+    /**
+     * 绘制区域样式对象
+     * 用于定义矩形区域的显示样式，如空心/实心样式、圆角等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    RectStyles?: PlusNativeObjRectStyles;
+    /**
+     * 富文本样式
+     * 用于定义富文本使用的默认使用的字体名称、字体文件路径等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    RichTextStyles?: PlusNativeObjRichTextStyles;
+    /**
+     * 区域信息对象
+     * 包括位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Position?: PlusNativeObjPosition;
+    /**
+     * 绘制文本样式对象
+     * 用于定义文本的显示样式，如字体大小、字体颜色、字体粗细、字体样式、字体名称等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    TextStyles?: PlusNativeObjTextStyles;
+    /**
+     * 原生控件对象
+     * 原生控件对象可用于在屏幕上绘制图片或文本内容，当控件不再使用时需要调用close方法销毁控件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    View?: PlusNativeObjView;
+    /**
+     * View控件动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewAnimationOptions?: PlusNativeObjViewAnimationOptions;
+    /**
+     * View控件绘制元素参数
+     * 指定绘制图片、矩形区域、文本内容等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewDrawTagStyles?: PlusNativeObjViewDrawTagStyles;
+    /**
+     * View控件事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewEvents?: PlusNativeObjViewEvents;
+    /**
+     * JSON对象，View控件的系统状态栏区域样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewStatusbarStyles?: PlusNativeObjViewStatusbarStyles;
+    /**
+     * View控件样式
+     * 包括位置、大小等信息等，其中位置信息相对于父容器控件进行计算。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewStyles?: PlusNativeObjViewStyles;
+}
+
+/**
+ * 原生动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值：
+     * 	"pop-in" - 从右侧平移入栈动画效果（副窗口从右侧向左平移滑出显示，主窗口从当前屏幕区域向左侧平移滑出被遮盖），如果仅传入一个View控件对象则自动降级为slide-in-right动画；
+     * 	"pop-out" - 从右侧平移出栈动画效果（副窗口从当前屏幕区域向右侧平移出可视区域，主窗口从左侧向右平移滑出显示），如果仅出入一个View控件对象则自动降级为slide-out-right动画；
+     * 	"slide-in-right" - 从右侧横向滑动效果（主窗口从当前屏幕右侧外向内横向滑动显示）；
+     * 	"slide-out-right - 横向向右侧滑出屏幕动画（主窗口从屏幕中横向向右侧滑动到屏幕外）。
+     * - pop-in: 
+     * 	从右侧平移入栈动画效果（副窗口从右侧向左平移滑出显示，主窗口从当前屏幕区域向左侧平移滑出被遮盖）。
+     * 								
+     * - pop-out: 
+     * 	从右侧平移出栈动画效果（副窗口从当前屏幕区域向右侧平移出可视区域，主窗口从左侧向右平移滑出显示）。
+     * 								
+     * - slide-in-right: 
+     * 	从右侧横向滑动效果（主窗口从当前屏幕右侧外向内横向滑动显示）。
+     * 								
+     * - slide-out-right: 
+     * 	横向向右侧滑出屏幕动画（主窗口从屏幕中横向向右侧滑动到屏幕外）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'pop-in' | 'pop-out' | 'slide-in-right' | 'slide-out-right';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    duration?: number;
+}
+
+/**
+ * 原生动画窗口样式
+ * 指定动画窗口的样式，如背景图片，绘制的文字等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjAnimationViewStyles {
+    /**
+     * 动画窗口上绘制的背景图片
+     * 图片可以通过Webview对象的draw方法截图，也可以通过Bitmap的API从本地文件中加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bitmap?: PlusNativeObjBitmap;
+    /**
+     * 动画窗口上绘制的文本内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    text?: string;
+    /**
+     * 动画窗口上绘制的文本样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textStyles?: PlusNativeObjTextStyles;
+    /**
+     * 动画窗口上绘制的文本区域
+     * 默认值为{top:'0px',left:'0px',width:'100%',height:'44px'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textRect?: PlusNativeObjRect;
+}
+
+/**
+ * 原生图片对象
+ * 原生图片对象会占用较大的内存资源，在使用时需谨慎管理，当图片不再使用时应该及时调用clear方法进行销毁。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjBitmap {
+    /**
+     * Bitmap对象的标识
+     * 在创建Bitmap对象时设置，如果没有设置标识，此属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 静态方法，获取所有Bitmap图片对象
+     * 获取应用运行期创建的所有Bitmap图片对象，包含所有空Bitmap对象，不包含已经销毁的Bitmap对象。返回的Bitmap对象在数组中按创建的属性排列，及数组中第一个是最先创建的Bitmap对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getItems(): PlusNativeObj [];
+    /**
+     * 静态方法，获取指定标识的Bitmap图片对象
+     * 在应用中已创建的图片对象中查找指定标识的Bitmap对象并返回。
+     * 	若存在多个相同标识的Bitmap图片，则返回第一个创建的Bitmap图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getBitmapById(id?: string): PlusNativeObjBitmap;
+    /**
+     * 销毁Bitmap图片
+     * 释放Bitmap图片占用的内存资源，销毁后图片对象将不可使用，其id属性值为undefined，调用其所有方法操作都会失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clear(): void;
+    /**
+     * 加载Bitmap图片
+     * 从指定的路径（仅支持本地文件系统）中加载图片，此操作将覆盖之前的图片内容，
+     * 	如果加载图片失败则保留之前的图片内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    load(path?: string, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    /**
+     * 加载Base64编码格式图片到Bitmap对象
+     * 从Base64编码格式图片数据中加载图片，此操作将覆盖之前的图片内容，
+     * 	如果加载图片失败则保留之前的图片内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    loadBase64Data(data?: string, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    /**
+     * 回收Bitmap图片内存
+     * 释放Bitmap图片占用的内存资源，但不销毁图片对象，依然可以继续使用图片对象。
+     * 	当图片对象再次被使用时会自动从设置的路径（构造函数或load/save方法设置）加载到内存中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    recycle(): void;
+    /**
+     * 保存图片
+     * 将图片保存到指定的路径（仅支持本地文件系统），如果图片为空或者指定的路径文件已经存在则返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取图片的Base64编码数据
+     * 读取图片的数据内容，并转换为Base64编码格式字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    toBase64Data(): string;
+}
+
+/**
+ * JSON对象，保存图片的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjBitmapSaveOptions {
+    /**
+     * 覆盖保存图片文件
+     * 仅在保存的图片路径文件存在时有效：
+     * 	true表示覆盖存在的文件；
+     * 	false表示不覆盖，如果文件存在，则返回失败。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    overwrite?: boolean;
+    /**
+     * 保存图片的格式
+     * 支持"jpg"、"png"，如果未指定则默认使用指定的保存路径后缀对应的文件格式，如果后缀文件格式无效则使用jpg格式。
+     * - jpg: JPG格式图片
+     * - png: PNG格式图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    format?: 'jpg' | 'png';
+    /**
+     * 保存图片的质量
+     * 取值范围为1-100，1表示使用最低的图片质量（保存后的图片文件最小）、100表示使用最高的图片质量（保存后的图片文件最大）；
+     * 	默认值为50。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    quality?: number;
+    /**
+     * 指定裁剪区域保存图片
+     * 相对于图片的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clip?: PlusNativeObjRect;
+}
+
+/**
+ * 原生图片轮播控件对象
+ * 原生图片轮播控件对象从原生View控件（plus.nativeObj.View）继承而来，用于绘制图片轮播内容。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSlider {
+    /**
+     * 添加图片轮播控件的图片
+     * 动态添加图片轮播控件显示的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    addImages(images?: PlusNativeObj []): void;
+    /**
+     * 获取当前图片轮播控件显示的图片索引值
+     * 索引值从0开始，即0表示图片轮播控件当前显示第一张图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    currentImageIndex(): number;
+    /**
+     * 设置图片轮播控件的图片
+     * 动态更新图片轮播控件显示的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setImages(images?: PlusNativeObj []): void;
+}
+
+/**
+ * 图片轮播控件样式
+ * 从ViewStyles继承而来，扩展支持轮播图片等配置。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSliderStyles {
+    /**
+     * 是否自动播放
+     * 可取值：
+     * 		"true" - 自动播放；
+     * 		"false" - 不自动播放。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    autoplay?: boolean;
+    /**
+     * 是否可全屏显示
+     * 可取值：
+     * 		"true" - 表示可全屏显示，用户点击轮播图片时全屏显示；
+     * 		"false" - 表示不可全屏显示，用户点击轮播图片时无响应。
+     * 	默认值为"true"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fullscreen?: boolean;
+    /**
+     * 是否可循环轮播
+     * 可取值：
+     * 		"true" - 支持循环轮播；
+     * 		"false" - 不支持循环轮播。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    loop?: boolean;
+    /**
+     * 轮播的图片
+     * 至少必须设置一张图片的地址信息，否则可能导致图片轮播控件显示不正常。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    images?: PlusNativeObj [];
+    /**
+     * 自动播放切换时间
+     * 当autoplay属性值为true时生效，单位为毫秒。默认值为3000（3秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    interval?: number;
+}
+
+/**
+ * 图片轮播控件中图片项配置参数
+ * 用于指定图片地址等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSliderImageStyles {
+    /**
+     * 图片地址
+     * 支持本地地址（相对地址、绝对路径、RelativeURL、本地路径URL）；
+     * 	也支持网络地址（http://或https://）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    src?: string;
+    /**
+     * 图片水平对齐方式
+     * 仅在图片显示的宽度与图片轮播控件宽度不一致时有效，可取值：
+     * 		"left" - 图片在轮播控件中水平居左对齐；
+     * 		"center" - 图片在轮播控件中水平居中对齐；
+     * 		"right" - 图片在轮播控件中水平居右对齐。
+     * 	默认值为"center"。
+     * - left: 图片在轮播控件中水平居左对齐
+     * - center: 图片在轮播控件中水平居中对齐
+     * - right: 图片在轮播控件中水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 图片显示的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，现对于图片轮播控件的高度；
+     * 		自动计算"auto"，如果指定图片宽度（width），则按图片实际大小等比缩放图片高度值，如果没有指定宽度（width值为"auto"）则自动缩放图片至可完整显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 图片显示的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于图片轮播控件的宽度；
+     * 		自动计算"auto"，如果指定图片高度（height），则按图片实际大小等比缩放图片宽度值，如果没有指定高度（height值为"auto"）则自动缩放图片至可完整显示。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 图片垂直对齐方式
+     * 仅在图片显示的高度与图片轮播控件宽度不一致时有效，可取值：
+     * 		"top" - 图片在轮播控件中垂直居顶对齐；
+     * 		"middle" - 图片在轮播控件中垂直居中对齐；
+     * 		"bottom" - 图片在轮播控件中垂直居底对齐。
+     * 	默认值为"middle"。
+     * - top: 图片在轮播控件中垂直居顶对齐
+     * - middle: 图片在轮播控件中垂直居中对齐
+     * - bottom: 图片在轮播控件中垂直居底对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    verticalAlign?: 'top' | 'middle' | 'bottom';
+}
+
+/**
+ * 输入框样式
+ * 用于定义输入框的显示样式，如字体大小，提示内容等信息。
+ * 	输入文本内容在指定区域水平居左，垂直居中显示。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjInputStyles {
+    /**
+     * 输入框类型
+     * 可取值：
+     * 		"email" - 邮箱地址输入框；
+     * 		"number" - 数字输入框；
+     * 		"search" - 搜索文本输入框；
+     * 		"tel" - 电话号码输入框；
+     * 		"text" - 普通文本输入框；
+     * 		"url" - URL地址输入框。
+     * 	默认为text（即普通文本输入框）。
+     * - email: 邮箱地址输入框
+     * - number: 数字输入框
+     * - search: 搜索文本输入框
+     * - tel: 电话号码输入框
+     * - text: 普通文本输入框
+     * - url: URL地址输入框
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'email' | 'number' | 'search' | 'tel' | 'text' | 'url';
+    /**
+     * 输入框的提示文本
+     * 当用户未输入内容时显示在编辑框中（灰色文字）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    placeholder?: string;
+    /**
+     * 输入框的字体大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"12px"。 
+     * 	默认值为"16px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSize?: string;
+    /**
+     * 输入框的边框颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示红色边框。默认值为"#000000"（黑色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderColor?: string;
+    /**
+     * 输入框边框圆角半径
+     * 可取值：圆角半径像素值，数字加"px"格式字符串，如"6px"。
+     * 	默认值为"0px"（边框无圆角）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderRadius?: string;
+    /**
+     * 输入框的边框宽度
+     * 可取值：像素值，数字加"px"格式字符串，如"2px"。 默认值为"1px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderWidth?: string;
+    /**
+     * 输入框完成输入事件
+     * 弹出软键盘完成输入后，点击软键盘上的“完成”、“前往”按钮时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onComplete?: (result: any) => void;
+    /**
+     * 输入框获取焦点事件
+     * 当编辑框获取焦点时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onFocus?: (result: any) => void;
+    /**
+     * 输入框失去焦点事件
+     * 当编辑框失去焦点时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onBlur?: (result: any) => void;
+}
+
+/**
+ * 区域信息对象
+ * 包括位置、大小等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRect {
+    /**
+     * 区域左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于作用对象垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的宽度；
+     * 		自动计算，如"auto",根据width值自动计算，相对于作用对象水平居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * 区域的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 区域的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的高度。
+     * 		内容自适应，如"wrap_content"，根据内容计算高度（如调用drawText绘制文本时支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+}
+
+/**
+ * 绘制区域样式对象
+ * 用于定义矩形区域的显示样式，如空心/实心样式、圆角等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRectStyles {
+    /**
+     * 绘制颜色
+     * 矩形填充区域的颜色，可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 矩形区域的圆角半径
+     * 可取值：圆角半径像素值，数字加"px"格式字符串，如"6px"。
+     * 	默认值为"0px"（矩形无圆角）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    radius?: string;
+    /**
+     * 矩形边框颜色
+     * 绘制矩形边框的颜色，可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为矩形填充区域颜色（color属性值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderColor?: string;
+    /**
+     * 矩形边框宽度
+     * 可取值：像素值，数字加"px"格式字符串，如"2px"。
+     * 	默认值为"0px"（无边框）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderWidth?: string;
+}
+
+/**
+ * 富文本样式
+ * 用于定义富文本使用的默认使用的字体名称、字体文件路径等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRichTextStyles {
+    /**
+     * 富文本内容的水平对齐方式
+     * 对整体内容有效，无法单独控制每行的内容。
+     * 	可取值：
+     * 	"left"-字体在指定的区域中水平居左对齐；
+     * 	"center"-字体在指定的区域中水平居中对齐；
+     * 	"right"-字体在指定的区域中水平居右对齐。
+     * 	默认值为"left"。
+     * - left: 富文本内容水平居左对齐
+     * - center: 富文本内容水平居中对齐
+     * - right: 富文本内容水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 富文本默认使用的字体名称
+     * 例如"Times New Roman"，	如果指定名称的字体不存在，则使用系统默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    family?: string;
+    /**
+     * 富文本默认使用的字体文件路径
+     * 加载字体文件路径，必须为本地路径，如果指定的文件路径无效，则使用系统默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSrc?: string;
+    /**
+     * 点击事件回调函数
+     * 如果设置此属性，则表示拦截所有RichText上的点击事件（不透传事件）。
+     * 	如果没有设置此属性，则仅拦截操作包含onclick属性的a/img标签的点击事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onClick?: (result: any) => void;
+}
+
+/**
+ * 区域信息对象
+ * 包括位置、大小等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjPosition {
+    /**
+     * 区域顶部相对于作用对象（或容器）向下的偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于作用对象（或容器）的高度；
+     * 	自动计算，如"auto",根据height值自动计算，相对于作用对象（或容器）垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域左侧相对于作用对象（或容器）向右的偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于作用对象（或容器）的宽度；
+     * 	自动计算，如"auto",根据width值自动计算，相对于作用对象（或容器）水平居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * 区域的宽度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 区域的高度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 区域底部相对于作用对象（或容器）向上的偏移量
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的高度。
+     * 	当设置了top和height值时，忽略此属性值；
+     * 	当未设置top值时，可通过bottom属性值来确定区域的垂直位置；
+     * 	当未设置height值时，可通过top和bottom属性值来确定区域的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bottom?: string;
+    /**
+     * 区域右侧相对于作用对象（或容器）向左的偏移量
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的宽度。
+     * 	当设置了left和width值时，忽略此属性值；
+     * 	当未设置left值时，可通过right属性值来确定区域的水平位置；
+     * 	当未设置width值时，可通过left和right属性值来确定区域的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    right?: string;
+}
+
+/**
+ * 绘制文本样式对象
+ * 用于定义文本的显示样式，如字体大小、字体颜色、字体粗细、字体样式、字体名称等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjTextStyles {
+    /**
+     * 水平对齐方式
+     * 可取值：
+     * 	"left"-字体在指定的区域中水平居左对齐；
+     * 	"center"-字体在指定的区域中水平居中对齐；
+     * 	"right"-字体在指定的区域中水平居右对齐。
+     * 	默认值为"center"。
+     * - left: 字体在指定的区域中水平居左对齐
+     * - center: 字体在指定的区域中水平居中对齐
+     * - right: 字体在指定的区域中水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 字体颜色
+     * 可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#000000"（黑色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 文本装饰
+     * 可取值：
+     * 		"none" - 无装饰效果；
+     * 		"underline" - 文本带下划线效果；
+     * 		"line-through" - 文本带贯穿线（删除线）效果。
+     * 	默认值为"none"。
+     * - none: 
+     * 	无装饰效果
+     * 								
+     * - underline: 
+     * 	文本带下划线效果
+     * 								
+     * - line-through: 
+     * 	文本带贯穿线（删除线）效果
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    decoration?: 'none' | 'underline' | 'line-through';
+    /**
+     * 字体名称
+     * 例如"Times New Roman"，	如果指定名称的字体不存在，则使用默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    family?: string;
+    /**
+     * 字体文件路径
+     * 加载字体文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSrc?: string;
+    /**
+     * 文本的行间距
+     * 可取值：
+     * 	像素值，如"100px"；百分比，如"10%"，相对于字体的高度（size属性）；
+     * 	默认值为"20%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    lineSpacing?: string;
+    /**
+     * 字体的边距
+     * 用于设置字体在绘制目标区域四个方向（top/right/bottom/left）的边距，可取值：像素值，如"10px"；百分比，相对于绘制目标区域，如"5%"；
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    margin?: string;
+    /**
+     * 文本内容超出显示区域时处理方式
+     * 可取值：
+     * 		"clip" - 超出显示区域时内容裁剪；
+     * 		"ellipsis" - 超出显示区域时尾部显示省略标记（...）。
+     * 	默认值为"clip"。
+     * - clip: 
+     * 	
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    overflow?: 'clip';
+    /**
+     * 字体大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"12px"。
+     * 	默认值为"16px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    size?: string;
+    /**
+     * 字体样式
+     * 可取值："normal" - 正常字体样式；"italic" - 斜体样式。默认值为"normal"。
+     * - normal: 正常字体样式
+     * - italic: 斜体样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    style?: 'normal' | 'italic';
+    /**
+     * 垂直对齐方式
+     * 文本内容在指定绘制区域中的垂直对齐方式，可取值：
+     * 		"top" - 垂直居顶对齐；
+     * 		"middle" - 垂直居中对齐；
+     * 		"bottom" - 垂直居底对齐。
+     * 	默认值为"middle"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    verticalAlign?: string;
+    /**
+     * 字体粗细
+     * 可取值："normal" - 普通字体；"bold" - 粗字体。默认值为"normal"。
+     * - normal: 普通字体
+     * - bold: 粗字体
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    weight?: 'normal' | 'bold';
+    /**
+     * 文本换行模式
+     * 可取值：
+     * 		"nowrap" - 不换行，将所有文本在一行中绘制，忽略换行符("\n")；
+     * 		"normal" - 自动换行，当指定的宽度无法绘制所有文本时自动换行绘制，碰到'\n'字符时强制换行。
+     * 	默认值为"nowrap"。
+     * - nowrap: 
+     * 	不换行，将所有文本在一行中绘制，忽略换行符("\n")
+     * 								
+     * - normal: 
+     * 	自动换行，当指定的宽度无法绘制所有文本时自动换行绘制，碰到'\n'字符时强制换行
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    whiteSpace?: 'nowrap' | 'normal';
+}
+
+/**
+ * 原生控件对象
+ * 原生控件对象可用于在屏幕上绘制图片或文本内容，当控件不再使用时需要调用close方法销毁控件。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjView {
+    /**
+     * View对象的标识
+     * 在创建原生控件View对象时设置，如果没有设置标识，此属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 静态方法，开始原生动画
+     * 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    startAnimation(options?: PlusNativeObjAnimationOptions, view?: PlusNativeObjAnimationViewStyles, otherview?: PlusNativeObjAnimationViewStyles, callback?: Function): void;
+    /**
+     * 静态方法，关闭原生动画窗口
+     * 通过plus.nativeObj.View.startAnimation方法开始原生动画后，不会自动关闭原生动画窗口对象，需要调用此方法关闭原生动画。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clearAnimation(type?: string): void;
+    /**
+     * 静态方法，获取指定标识的View控件对象
+     * 如果存在多个指定id标识的View对象，则返回第一个创建的View控件对象。
+     * 	如果不存在指定id标识的View对象，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getViewById(id?: string): PlusNativeObjView;
+    /**
+     * 添加事件监听器
+     * 向View控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。
+     * 		可多次调用此方法向Webview添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 		可通过setTouchEventRect方法指定监听触屏操作的区域。
+     * 		注意：默认View控件拦截处理触屏事件，可调用view.interceptTouchEvent(false)改变为不拦截处理触屏事件（透传）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    addEventListener(event?: PlusNativeObjViewEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * View控件内容动画
+     * 动画后可能会导致View控件显示内容改变，可通过调用restore方法恢复。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    animate(options?: PlusNativeObjViewAnimationOptions, callback?: Function): void;
+    /**
+     * 关闭View控件
+     * 释放View控件资源，View对象不可再操作，如果View控件已经显示则自动隐藏。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    close(): void;
+    /**
+     * 清空矩形区域
+     * 清除指定矩形区域内容，透明显示其后面的内容。
+     * 	可多次调用设置多个区域透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clearRect(position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制内容
+     * 在当前View控件之上绘制指定的内容，可一次指定绘制多个元素，绘制元素可以是图片/矩形区域/文本，
+     * 	即将多次调用drawBitmap/drawRect/drawText方法合并调用一次draw方法来实现，
+     * 	推荐使用draw方法来替换多次调用drawBitmap/drawRect/drawText。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    draw(tags?: PlusNativeObj []): void;
+    /**
+     * 绘制图片
+     * 在当前View控件之上绘制指定的图片，如果图片无效则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawBitmap(src?: string, sprite?: PlusNativeObjPosition, position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制矩形区域
+     * 在当前View控件之上绘制指定颜色的矩形区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawRect(styles?: PlusNativeObjRectStyles, position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制文本
+     * 在当前View控件之上绘制指定的文本内容，如果文本为空则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawText(text?: string, position?: PlusNativeObjPosition, styles?: PlusNativeObjTextStyles, id?: string): void;
+    /**
+     * 绘制富文本
+     * 在当前View控件之上绘制指定的文本内容，如果文本为空则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawRichText(text?: string, position?: PlusNativeObjPosition, styles?: PlusNativeObjRichTextStyles, id?: string): void;
+    /**
+     * 绘制输入框
+     * 在当前View控件之上绘制输入框。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawInput(position?: PlusNativeObjPosition, styles?: PlusNativeObjInputStyles, id?: string): void;
+    /**
+     * 获取编辑框的焦点状态
+     * 通过id查找到指定的编辑框，获取其焦点状态。
+     * 	如果指定的id无效则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getInputFocusById(id?: string): boolean;
+    /**
+     * 获取编辑框的内容
+     * 通过id查找到指定的编辑框，获取其输入的字符串。
+     * 	如果指定的id无效则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getInputValueById(id?: string): string;
+    /**
+     * 重置view控件显示内容
+     * 清除调用drawBitmap、drawText方法绘制的内容，将View控件重置为空内容（透明不可见）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    reset(): void;
+    /**
+     * 恢复View控件显示内容
+     * 恢复调用animate方法改变View控件的内容，更新至动画前的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    restore(): void;
+    /**
+     * 显示View控件
+     * 将View控件显示到屏幕，显示在所有Webview窗口之上。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    show(): void;
+    /**
+     * 设置编辑框的焦点状态
+     * 通过id查找到指定的编辑框，并设置编辑框的焦点状态。
+     * 	如果指定的id无效则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setInputFocusById(id?: string, focusable?: boolean): string;
+    /**
+     * 设置View控件的样式
+     * 动态更新View控件样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setStyle(styles?: PlusNativeObjViewStyles): void;
+    /**
+     * 指定监听触屏事件区域
+     * 当调用addEventListener监听View控件事件时，可调用此方法限定监听事件的区域，仅当用户触屏操作在指定区域时才触发监听事件。
+     * 	非限定监听事件的区域则不拦截，透传给其它窗口处理。
+     * 	注意：此操作覆盖之前设置的区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setTouchEventRect(rect?: PlusNativeObj []): void;
+    /**
+     * 隐藏View控件
+     * 将View控件从屏幕隐藏，如果View控件未显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    hide(): void;
+    /**
+     * 是否拦截View控件的触屏事件
+     * 设置为拦截后View控件上的触屏事件不再传递（即不透传），否则触屏事件将继续传递给View控件下的其它窗口处理（即透传）。
+     * 	注意：View控件默认拦截触屏事件（不透传）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    interceptTouchEvent(intercept?: boolean): void;
+    /**
+     * 获取View控件的显示状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    isVisible(): boolean;
+}
+
+/**
+ * View控件动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值："shrink" - 从上到下分块收缩清除窗口动画。
+     * - shrink: 从上到下分块清除动画
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'shrink';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    duration?: number;
+    /**
+     * 动画帧数
+     * 必须为大于0的整数，默认值为12。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    frames?: number;
+    /**
+     * 动画作用区域
+     * 支持以下属性：
+     * 	top - 区域距离控件顶部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	bottom - 区域距离控件底部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	left - 区域距离控件左侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'；
+     * 	right - 区域距离控件右侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'。
+     * 	如“{top:'44px',bottom:'48px'}”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    region?: PlusNativeObjRect;
+}
+
+/**
+ * View控件绘制元素参数
+ * 指定绘制图片、矩形区域、文本内容等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewDrawTagStyles {
+    /**
+     * 绘制操作标识
+     * 可通过view对象的drawBitmap/drawRect/drawText/clearRect方法进行更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 绘制操作类型
+     * 可取值：
+     * 	"img" - 绘制图片，与drawBitmap操作一致，此时id、src、position、sprite属性值有效；
+     * 	"rect" - 绘制矩形区域，与drawRect操作一致，此时id、color、position、rectStyles属性值有效；
+     * 	"font" - 绘制文本内容，与drawText操作一致，此时id、position、text、textStyles属性值有效；
+     * 	"richtext" - 绘制富文本内容，与drawRichText操作一致，此时id、position、text、richTextStyles属性值有效；
+     * 	"input" - 绘制输入框内容，此时id、position、inputStyles属性值有效。
+     * - img: 绘制图片
+     * - rect: 绘制矩形区域
+     * - font: 绘制文本内容
+     * - richtext: 绘制富文本内容
+     * - input: 绘制输入框内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    tag?: 'img' | 'rect' | 'font' | 'richtext' | 'input';
+    /**
+     * 矩形区域颜色
+     * 不推荐使用（推荐使用rectStyles），可取值：
+     * 	"#RRGGBB"格式字符串，如红色为"#FF0000"。
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	当tag属性值为"rect"时有效，用于指定矩形区域颜色，默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 绘制输入框的样式
+     * 当tag属性值为"input"时有效，用于指定绘制输入框的样式、大小位置等信息。，
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    inputStyles?: PlusNativeObjInputStyles;
+    /**
+     * 绘制内容区域
+     * 当tag属性值为"img"时，用于指定绘制图片的目标区域；
+     * 	当tag属性值为"rect"时，用于指定绘制的矩形区域；
+     * 	当tag属性值为"font"时，用于指定绘制文本的目标区域，此时height属性值支持设置为"wrap_content"，表示文本高度根据内容自动计算，此时通过top来定位文本绘制的起始位置。
+     * 	相对于View控件的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    position?: PlusNativeObjPosition;
+    /**
+     * 绘制区域的样式
+     * 当tag属性值为"rect"时有效，用于指定绘制区域的样式、填充颜色、圆角大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    rectStyles?: PlusNativeObjRectStyles;
+    /**
+     * 绘制的图片资源
+     * 当tag属性值为"img"时有效，可以是图片资源路径（字符串类型）或者图片对象（plus.nativeObj.Bitmap对象）。
+     * 	src路径支持gif图片，但设置的图片路径文件使用".gif"后缀时则认为是gif图片，如"_www/loading.gif"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    src?: string;
+    /**
+     * 图片源的绘制区域
+     * 当tag属性值为"img"时有效，用于指定图片源的绘制区域，相对于图片的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    sprite?: PlusNativeObjPosition;
+    /**
+     * 绘制的文本内容
+     * 当tag属性值为"font"时有效，用于保存绘制的文本内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    text?: string;
+    /**
+     * 绘制文本的样式
+     * 当tag属性值为"font"时有效，用于指定绘制文本内容的字体大小、字体颜色、字体类型等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textStyles?: PlusNativeObjTextStyles;
+    /**
+     * 绘制富文本的样式
+     * 当tag属性值为"richtext"时有效，用于指定绘制富文本内容的默认字体颜色、字体类型等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    richTextStyles?: PlusNativeObjRichTextStyles;
+}
+
+/**
+ * View控件事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewEvents {
+    /**
+     * 双击事件
+     * 双击屏幕时触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    doubleclick?: string;
+    /**
+     * 点击事件
+     * 当手指点击屏幕时触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    click?: string;
+    /**
+     * 开始触屏事件
+     * 当手指触摸屏幕时候触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchstart?: string;
+    /**
+     * 触摸滑屏事件
+     * 当手指在屏幕上滑动的时候连续地触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchmove?: string;
+    /**
+     * 结束触屏事件
+     * 当手指从屏幕上离开的时候触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchend?: string;
+}
+
+/**
+ * JSON对象，View控件的系统状态栏区域样式
+ * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewStatusbarStyles {
+    /**
+     * 系统状态栏区域背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景，默认值为应用manifest.json中plus-&gt;statusbar-&gt;background属性配置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    background?: string;
+}
+
+/**
+ * View控件样式
+ * 包括位置、大小等信息等，其中位置信息相对于父容器控件进行计算。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewStyles {
+    /**
+     * 区域背景颜色
+     * 可取值：
+     * 	#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。 默认值为"#FFFFFF"（白色）。 "rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。 默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    backgroundColor?: string;
+    /**
+     * View控件垂直向上的偏移量
+     * 现对于父容器底部的距离，可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父容器的高度，如果没有父容器则相对于屏幕高度。
+     * 	当设置了top和height值时，忽略此属性值；
+     * 	未设置height值时，可通过top和bottom属性值来确定View控件的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bottom?: string;
+    /**
+     * View控件的停靠方式
+     * 仅当View控件添加到Webview窗口对象中并且position属性值设置为"dock"时才生效，此时View控件挤压Webview窗口的大小。
+     * 	可取值：
+     * 		"top"，控件停靠则页面顶部；
+     * 		"bottom"，控件停靠在页面底部；
+     * 		"right"，控件停靠在页面右侧；
+     * 		"left"，控件停靠在页面左侧。
+     * 	默认值为"top"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    dock?: string;
+    /**
+     * 区域的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父容器的高度，如果没有父容器则相对于屏幕高度；
+     * 		内容自适应，如"wrap_content"，根据内容计算控件的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 区域左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父控件的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父控件水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * View控件的不透明度
+     * 取值范围为0-1，0为全透明，1为不透明，默认值为1，即不透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    opacity?: number;
+    /**
+     * View控件的排版方式
+     * 仅当View控件添加到Webview窗口对象中时才生效。
+     * 	可取值：
+     * 	"static"，View控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动；
+     * 	"absolute"，Veiw控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动；
+     * 	"dock"，View控件在页面中停靠，停靠的位置由dock属性值决定。
+     * 	默认值为"absolute"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    position?: string;
+    /**
+     * View控件的状态栏样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，设置此属性后将自动保留系统状态栏区域不被View控件占用（即View控件非沉浸式样式显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    statusbar?: PlusNativeObjViewStatusbarStyles;
+    /**
+     * View控件左上角的垂直偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于父控件的高度；自动计算，如"auto",根据height值自动计算，相对于父控件垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域的宽度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于父控件的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+}
+
+/**
+ * nativeUI管理系统原生界面，可用于弹出系统原生提示对话框窗口、时间日期选择对话框、等待对话框等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUI {
+    /**
+     * JSON对象，原生选择按钮框上按钮的样式参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ActionButtonStyles?: PlusNativeUIActionButtonStyles;
+    /**
+     * JSON对象，原生选择按钮框的样式参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ActionSheetStyles?: PlusNativeUIActionSheetStyles;
+    /**
+     * 确认对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ConfirmOptions?: PlusNativeUIConfirmOptions;
+    /**
+     * JSON对象，图片预览的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PreviewImageOptions?: PlusNativeUIPreviewImageOptions;
+    /**
+     * 日期选择对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PickDateOption?: PlusNativeUIPickDateOption;
+    /**
+     * JSON对象，时间选择对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PickTimeOption?: PlusNativeUIPickTimeOption;
+    /**
+     * 系统原生界面基类对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    NativeUIObj?: PlusNativeUINativeUIObj;
+    /**
+     * 系统等待对话框对象
+     * 从NativeUIObj对象继承而来，通过plus.nativeUI.showWaiting方法创建时返回。
+     * 	用于控制系统样式等待对话框的操作，如关闭、设置标题内容等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingObj?: PlusNativeUIWaitingObj;
+    /**
+     * JSON对象，原生等待对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingOptions?: PlusNativeUIWaitingOptions;
+    /**
+     * JSON对象，原生等待对话框上loading图标自定义样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingLoadingOptions?: PlusNativeUIWaitingLoadingOptions;
+    /**
+     * JSON对象，系统提示消息框要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ToastOptions?: PlusNativeUIToastOptions;
+    /**
+     * 弹出系统选择按钮框
+     * 从底部动画弹出系统样式选择按钮框，可设置选择框的标题、按钮文字等。
+     * 	弹出的提示框为非阻塞模式，用户点击选择框上的按钮后关闭，并通过actionsheetCallback回调函数通知用户选择的按钮。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: (result: any) => void): PlusNativeUINativeUIObj;
+    /**
+     * 弹出系统提示对话框
+     * 创建并显示系统样式提示对话框，可设置提示对话框的标题、内容、按钮文字等。
+     * 	弹出的提示对话框为非阻塞模式，用户点击提示对话框上的按钮后关闭，并通过alertCB回调函数通知对话框已关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    alert(message?: string, alertCB?: (result: any) => void, title?: string, buttonCapture?: string): void;
+    /**
+     * 弹出系统确认对话框
+     * 创建并显示系统样式确认对话框，可设置确认对话框的标题、内容、按钮数目及其文字。
+     * 	弹出的确认对话框为非阻塞模式，用户点击确认对话框上的按钮后关闭，并通过confirmCB回调函数通知用户点击的按钮索引值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    confirm(message?: string, confirmCB?: (result: any) => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
+    /**
+     * 关闭系统等待对话框
+     * 关闭已经显示的所有系统样式等待对话框，触发Waiting对象的onclose事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    closeWaiting(): void;
+    /**
+     * 关闭自动消失的提示消息
+     * 关闭已经显示的所有自动消失的提示框。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    closeToast(): void;
+    /**
+     * 预览图片
+     * 创建并显示全屏图片预览界面，用户点击图片或返回键退出预览界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    previewImage(urls?: any [], options?: PlusNativeUIPreviewImageOptions): void;
+    /**
+     * 显示系统等待对话框
+     * 创建并显示系统样式等待对话框，并返回等待对话框对象Waiting，显示后需调用其close方法进行关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    showWaiting(title?: string, options?: PlusNativeUIWaitingOptions): PlusNativeUIWaitingObj;
+    /**
+     * 弹出系统日期选择对话框
+     * 创建并显示系统样式日期选择对话框，可进行日期的选择。
+     * 	用户操作确认后通过successCB回调函数返回用户选择的日期，若用户取消选择则通过errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    pickDate(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickDateOption): void;
+    /**
+     * 弹出系统时间选择对话框
+     * 创建并弹出系统样式时间选择对话框，可进行时间的选择。
+     * 	用户操作确认后通过successCB回调函数返回用户选择的时间，若用户取消选择则通过errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    pickTime(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickTimeOption): void;
+    /**
+     * 弹出系统输入对话框
+     * 创建并显示系统样式输入对话框，可设置输入对话框的标题、内容、提示输入信息、按钮数目及其文字。
+     * 	弹出的输入对话框为非阻塞模式，其中包含编辑框供用户输入内容，用户点击输入对话框上的按钮后自动关闭，并通过promptCB回调函数返回用户点击的按钮及输入的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    prompt(message?: string, promptCB?: (result: any) => void, title?: string, tip?: string, buttons?: any []): void;
+    /**
+     * 显示自动消失的提示消息
+     * 创建并显示系统样式提示消息，弹出的提示消息为非阻塞模式，显示指定时间后自动消失。
+     * 	提示消息显示时间可通过options的duration属性控制，长时间提示消息显示时间约为3.5s，短时间提示消息显示时间约为2s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    toast(message?: string, options?: PlusNativeUIToastOptions): void;
+}
+
+/**
+ * JSON对象，原生选择按钮框上按钮的样式参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIActionButtonStyles {
+    /**
+     * 按钮上显示的文字颜色
+     * 可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示文字颜色为红色；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    color?: string;
+    /**
+     * 按钮上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 按钮的样式
+     * 可取值：
+     * 	"destructive" - 表示警示按钮样式，默认文字颜色为红色；
+     * 	"default" - 表示默认按钮样式。
+     * 	默认值为"default"。
+     * - destructive: 
+     * 	警示按钮样式。
+     * 								
+     * - default: 
+     * 	默认按钮样式。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: 'destructive' | 'default';
+}
+
+/**
+ * JSON对象，原生选择按钮框的样式参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIActionSheetStyles {
+    /**
+     * 选择按钮框的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 取消按钮上显示的文字内容
+     * 不设置此属性，则不显示取消按钮。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    cancel?: string;
+    /**
+     * 选择框上的按钮，ActionButtonStyles对象数组
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    buttons?: PlusNativeUI [];
+}
+
+/**
+ * 确认对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIConfirmOptions {
+    /**
+     * 确认对话框显示的标题
+     * 如果不设置此属性值，则不显示标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 确认对话框上显示的按钮
+     * 字符串数组，每项对应在确认对话框上显示一个按钮，用户点击后通过confirmCB返回用户点击按钮的在数组中的索引值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    buttons?: any [];
+    /**
+     * 对话框在屏幕中的垂直分享对齐方式
+     * 可取值：
+     * 		"top" - 表示垂直居顶对齐；
+     * 		"center" - 表示垂直居中对齐；
+     * 		"bottom" - 表示垂直居底对齐。
+     * 	默认值为"center"（垂直居中对齐）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    verticalAlign?: string;
+}
+
+/**
+ * JSON对象，图片预览的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPreviewImageOptions {
+    /**
+     * 图片预览的背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景。
+     * 	默认值为黑色（"#000000"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    background?: string;
+    /**
+     * 默认显示图片的索引值
+     * 索引值从0开始，默认值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    current?: number;
+    /**
+     * 图片指示器样式
+     * 可取值：
+     * 		"default" - 默认指示器（底部圆点样式）；
+     * 		"number" - 顶部数字指示器（顶部居中显示，文字为%当前图片索引值（从1开始）%/%图片总数%）；
+     * 		"none" - 不显示指示器。
+     * 	默认值为"default"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    indicator?: string;
+    /**
+     * 是否可循环预览
+     * 可取值：
+     * 		"true" - 支持循环预览；
+     * 		"false" - 不支持循环预览。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    loop?: boolean;
+}
+
+/**
+ * 日期选择对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPickDateOption {
+    /**
+     * 日期选择对话框显示的标题
+     * 如果未设置标题，则默认显示标题为当前选择的日期。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 日期选择对话框默认显示的日期
+     * 如果未设置默认显示的日期，则显示当前的日期。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    date?: Date;
+    /**
+     * 日期选择对话框可选择的最小日期
+     * Date类型对象，如果未设置可选择的最小日期，则使用系统默认可选择的最小日期值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    minDate?: Date;
+    /**
+     * 日期选择对话框可选择的最大日期
+     * Date类型对象，如果未设置可选择的最大日期，则使用系统默认可选择的最大日期值。
+     * 	其值必须大于minDate设置的值，否则使用系统默认可选择的最大日期值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    maxDate?: Date;
+    /**
+     * 时间选择对话框弹出指示区域
+     * JSON类型对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，其值为相对于容器Webview的位置。
+     * 	如未设置此值，默认在屏幕居中显示。仅在iPad上有效，其它设备忽略此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    popover?: any;
+}
+
+/**
+ * JSON对象，时间选择对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPickTimeOption {
+    /**
+     * 时间选择对话框默认显示的时间
+     * 如果未设置标题，则默认显示标题为当前选择的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    time?: Date;
+    /**
+     * 时间选择对话框显示的标题
+     * 如果未设置标题，则默认显示标题为当前选择的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 是否24小时制模式
+     * true表示使用24小时制模式显示，fale表示使用12小时制模式显示，默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    is24Hour?: boolean;
+    /**
+     * 日期选择对话框弹出指示区域
+     * JSON类型对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，其值相对于容器webview的位置。
+     * 	如未设置此值，默认在屏幕居中显示。仅在iPad上有效，其它设备忽略此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    popover?: any;
+}
+
+/**
+ * 系统原生界面基类对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUINativeUIObj {
+    /**
+     * 关闭显示的系统原生界面
+     * 调用plus.nativeUI.actionSheet方法创建并显示系统界面后，可通过其close方法将原生界面关闭。
+     * 	此情况下触发界面关闭回调函数参数的index属性值为-1。
+     * 	注意：一个系统原生界面只能关闭一次，多次调用将无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    close(): void;
+}
+
+/**
+ * 系统等待对话框对象
+ * 从NativeUIObj对象继承而来，通过plus.nativeUI.showWaiting方法创建时返回。
+ * 	用于控制系统样式等待对话框的操作，如关闭、设置标题内容等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingObj {
+    /**
+     * 等待对话框关闭事件
+     * 等待框关闭时触发，当调用close方法或用户点击返回按钮导致等待框关闭时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    onclose?: Function;
+    /**
+     * 设置等待对话框上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    setTitle(title?: string): void;
+    /**
+     * 关闭显示的系统等待对话框
+     * 调用plus.nativeUI.showWaiting方法创建并显示系统等待界后，可通过其close方法将原生等待控件关闭。
+     * 	一个系统等待对话框只能关闭一次，多次调用将无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    close(): void;
+}
+
+/**
+ * JSON对象，原生等待对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingOptions {
+    /**
+     * 等待框背景区域的宽度
+     * 值支持像素值（"500px"）或百分比（"50%"），百分比相对于屏幕的宽计算，如果不设置则根据内容自动计算合适的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    width?: string;
+    /**
+     * 等待框背景区域的高度
+     * 值支持像素绝对值（"500px"）或百分比（"50%"），如果不设置则根据内容自动计算合适的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    height?: string;
+    /**
+     * 等待框中文字的颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为白色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    color?: string;
+    /**
+     * 等待框中文字的字体大小
+     * 如"14px"表示使用14像素高的文字，未设置则使用系统默认字体大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    size?: string;
+    /**
+     * 等待对话框中标题文字的水平对齐方式
+     * 对齐方式可选值包括："left"：水平居左对齐显示，"center"：水平居中对齐显示，"right"：水平居右对齐显示。默认值为水平居中对齐显示，即"center"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    textalign?: string;
+    /**
+     * 等待对话框的内边距
+     * 值支持像素值（"10px"）和百分比（"5%"），百分比相对于屏幕的宽计算，默认值为"3%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    padding?: string;
+    /**
+     * 等待对话框显示区域的背景色
+     * 背景色的值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为rgba(0,0,0,0.8)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    background?: string;
+    /**
+     * 等待对话框样式
+     * 可取值"black"、"white"，black表示等待框为黑色雪花样式，通常在背景主色为浅色时使用；white表示等待框为白色雪花样式，通常在背景主色为深色时使用。
+     * 	仅在iOS平台有效，其它平台忽略此值，未设置时默认值为white。
+     * - black: 黑色雪花样式，适合浅色界面使用
+     * - white: 白色雪花样式，适合深色界面使用
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: 'black' | 'white';
+    /**
+     * 等待框是否模态显示
+     * 模态显示时用户不可操作直到等待对话框关闭，否则用户在等待对话框显示时也可操作下面的内容，未设置时默认为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    modal?: boolean;
+    /**
+     * 等待框显示区域的圆角
+     * 值支持像素值（"10px"），未设置时使用默认值"10px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    round?: number;
+    /**
+     * 点击等待显示区域是否自动关闭
+     * true表示点击等待对话框显示区域时自动关闭，false则不关闭，未设置时默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    padlock?: boolean;
+    /**
+     * 返回键处理方式
+     * 可取值"none"表示截获处理返回键，但不做任何响应；"close"表示截获处理返回键并关闭等待框；"transmit"表示不截获返回键，向后传递给Webview窗口继续处理（与未显示等待框的情况一致）。
+     * - none: 截获返回键，不做任何响应
+     * - close: 截获返回键并关闭等待框
+     * - transmit: 不截获返回键，继续传递给Webview窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    back?: 'none' | 'close' | 'transmit';
+    /**
+     * 自定义等待框上loading图标样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    loading?: PlusNativeUIWaitingLoadingOptions;
+}
+
+/**
+ * JSON对象，原生等待对话框上loading图标自定义样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingLoadingOptions {
+    /**
+     * loading图标显示样式
+     * 可取值：
+     * 	"block"表示图标与文字分开两行显示，上面显示loading图标，下面显示文字；
+     * 	"inline"表示loading图标与文字在同一行显示，左边显示loading图标，右边显示文字；
+     * 	"none"表示不显示loading图标；
+     * - block: 
+     * 	loading图标与文字分开两行显示，上面显示loading图标，下面显示文字。
+     * 								
+     * - inline: 
+     * 	loading图标与文字在同一行显示，左边显示loading图标，右边显示文字。
+     * 								
+     * - none: 
+     * 	不显示loading图标。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    display?: 'block' | 'inline' | 'none';
+    /**
+     * loading图标高度
+     * 设置loading图标的高度（宽度等比率缩放），取值类型：像素值，如"14px"表示14像素高。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    height?: string;
+    /**
+     * loading图标路径
+     * 自定义loading图标的路径，png格式，并且必须是本地资源地址；
+     * 	loading图要求宽是高的整数倍，显示等待框时按照图片的高横向截取每帧刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    icon?: string;
+    /**
+     * loading图每帧刷新间隔
+     * 单位为ms（毫秒），默认值为100ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    interval?: number;
+}
+
+/**
+ * JSON对象，系统提示消息框要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIToastOptions {
+    /**
+     * 提示消息框在屏幕中的水平位置
+     * 可选值为"left"、"center"、"right"，分别为水平居左、居中、居右，未设置时默认值为"center"。
+     * - left: 水平居左对齐
+     * - center: 水平居中对齐
+     * - right: 水平居左对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 提示消息框显示的时间
+     * 可选值为"long"、"short"，值为"long"时显示时间约为3.5s，值为"short"时显示时间约为2s，未设置时默认值为"short"。
+     * - long: 长显示时间
+     * - short: 短显示时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    duration?: 'long' | 'short';
+    /**
+     * 提示消息框上显示的图标
+     * 仅支持本地图片路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    icon?: string;
+    /**
+     * 图标的宽度
+     * 单位为px（逻辑像素值），默认值为图片的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    iconWidth?: string;
+    /**
+     * 图标的高度
+     * 单位为px（逻辑像素值），默认值为图片的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    iconHeight?: string;
+    /**
+     * 提示消息框上显示的样式
+     * 可取值：
+     * 	"block"表示图标与文字分两行显示，上面显示图标，下面显示文字；
+     * 	"inline"表示图标与文字在同一行显示，左边显示图标，右边显示文字。
+     * 	默认值为"block"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: string;
+    /**
+     * 提示消息框上显示的文本类型
+     * 可取值：
+     * 		"text" - 显示的消息内容为文本字符串；
+     * 		"richtext" - 显示的消息内容为富文本内容。
+     * 	默认值为"text"。
+     * 	当type为"text"时，富文本使用html的部分标签，具体标签如下：
+     * 	图片标签&lt;img src="图片资源url地址" width="图片显示的宽度" height="图片显示的高度" onclick="console.log('clicked img')"&gt;&lt;/img&gt;；
+     * 	字体标签&lt;font color="字体颜色"&gt;&lt;/font&gt;，内容在一行显示不下时自动换行，行高默认为字体的1.2倍；
+     * 	换行标签&lt;br/&gt;；
+     * 	链接标签&lt;a onclick="console.log('clicked a')"&gt;链接地址&lt;/a&gt;。
+     * 	如示例“&lt;img onclick="console.log('clicked img')" src="http://img-cdn-qiniu.dcloud.net.cn/icon2.png"/&gt;&lt;a onclick="console.log(clicked a)"&gt;链接地址&lt;/a&gt;”。
+     * - text: 文本字符串
+     * - richtext: 富文本内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    type?: 'text' | 'richtext';
+    /**
+     * 富文本样式
+     * 当type属性值为"richtext"时有效，用于定义富文本的样式，如其文本对齐方式、使用的字体等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    richTextStyle?: PlusNativeObjRichTextStyles;
+    /**
+     * 提示消息在屏幕中的垂直位置
+     * 可选值为"top"、"center"、"bottom"，分别为垂直居顶、居中、居底，未设置时默认值为"bottom"。
+     * - top: 垂直居顶对齐
+     * - center: 垂直居中对齐
+     * - bottom: 垂直居底对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    verticalAlign?: 'top' | 'center' | 'bottom';
+}
+
+/**
+ * navigator用于管理浏览器运行环境信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigator {
+    /**
+     * 创建应用快捷方式要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    ShortcutOptions?: PlusNavigatorShortcutOptions;
+    /**
+     * 更新应用启动界面要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    SplashscreenOptions?: PlusNavigatorSplashscreenOptions;
+    /**
+     * 运行环境权限类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    PermissionNames?: PlusNavigatorPermissionNames;
+    /**
+     * 检查运行环境的权限
+     * 向系统检查当前程序的权限状态，不触发权限相对应的功能API的调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    checkPermission(permission?: PlusNavigatorPermissionNames): string;
+    /**
+     * 关闭应用启动界面
+     * 很多情况下，应用启动后需要一段时间加载数据，为了避免界面显示空白内容，提高用户体验效果，这时可显示启动界面。
+     * 	等数据加载完成后再关闭启动界面进入应用，通常可在应用首界面加载数据完成并更新显示内容后调用此方法。
+     * 	注意：HBuilder7.1版本后启动界面不调用此方法超过6秒后会自动关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    closeSplashscreen(): void;
+    /**
+     * 查询设备是否为刘海屏
+     * 刘海屏返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasNotchInScreen(): boolean;
+    /**
+     * 查询应用启动界面是否已关闭
+     * 如果启动界面显示返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasSplashscreen(): boolean;
+    /**
+     * 更新程序启动界面
+     * 可设置启动界面显示的图片（仅支持本地文件路径，如果是网络资源可先通过plus.downloader.*下载到本地），
+     * 	更新启动界面后程序下次启动时生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    updateSplashscreen(options?: PlusNavigatorSplashscreenOptions): void;
+    /**
+     * 创建应用快捷方式
+     * 在系统桌面创建应用的快捷方式，点击后可直接启动应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    /**
+     * 查询是否存在应用快捷方式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    /**
+     * 判断当前应用是否切换到后台
+     * 在多应用运行环境（如流应用）中，启动一个新应用时，之前运行的应用将会自动切换到后台运行，此时plus.navigator.isBackground()返回状态只为true。
+     * 	注意：此状态不是5+应用切换到系统后台的状态，而是在同一apk中同时运行多个应用时被切换到后台的状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isBackground(): boolean;
+    /**
+     * 判断应用当前是否全屏模式显示
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isFullscreen(): boolean;
+    /**
+     * 判断应用当前是否输出日志
+     * 日志包括应用原生层内部跟踪日志（ADB、LogCat工具可获取的日志）及JS层跟踪日志（console.log输出的日志）。
+     * 	开启日志在一定程度上会降低程序的性能，通常建议在正式发布时关闭日志输出，在调试时开启日志输出（此时可以通过工具ADB、LogCat获取分析日志）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isLogs(): boolean;
+    /**
+     * 设置应用是否全屏显示
+     * 设置应用在全屏模式显示时，将隐藏系统状态栏，通常游戏类应用才会设置为全屏模式显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setFullscreen(fullscreen?: boolean): void;
+    /**
+     * 设置应用是否输出日志
+     * 设置应用是否输出日志信息，默认关闭输出日志功能。
+     * 	日志包括应用原生层内部跟踪日志（ADB、LogCat工具可获取的日志）及JS层跟踪日志（console.log输出的日志）。
+     * 	开启日志在一定程度上会降低程序的性能，通常建议在正式发布时关闭日志输出，在调试时开启日志输出（此时可以通过工具ADB、LogCat获取分析日志）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setLogs(log?: boolean): void;
+    /**
+     * 设置系统状态栏背景颜色
+     * 设置应用在前台运行时系统状态栏的背景颜色，默认使用系统状态栏默认背景色（有系统状态栏样式决定）。
+     * 	注意：为了有更好的兼容性，避免设置接近白色或黑色的颜色值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setStatusBarBackground(color?: string): void;
+    /**
+     * 获取系统状态栏背景颜色
+     * 获取应用在前台运行时系统状态栏的背景颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusBarBackground(): string;
+    /**
+     * 设置系统状态栏样式
+     * 设置应用在前台运行时系统状态栏的样式，默认值可通过manifest.json文件的plus-&gt;statusbar-&gt;style配置。
+     * 	注意：此操作是应用全局配置，调用的Webview窗口关闭后仍然生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setStatusBarStyle(style?: string): void;
+    /**
+     * 获取系统状态栏样式
+     * 获取应用运行时系统状态栏的样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusBarStyle(): string;
+    /**
+     * 获取系统状态栏高度
+     * 单位为像素（px），值为Webview中的逻辑高度单位，如果要获取真实高度则必须乘以plus.screen.scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusbarHeight(): number;
+    /**
+     * 判断当前是否为沉浸式状态栏模式
+     * 如果当前应用采用沉浸式状态栏则返回true，否则返回false。
+     * 	注意：如果当前系统版本不支持沉浸式状态栏也返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isImmersedStatusbar(): boolean;
+    /**
+     * 设置userAgent值
+     * 设置应用通过navigator.userAgent获取的值，及所有发起Http请求时提交的userAgent值。
+     * 	如果要设置启动页面的userAgent值则需要在manifest.json中进行配置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setUserAgent(useragent?: string, checkplus?: boolean): void;
+    /**
+     * 获取userAgent值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getUserAgent(): string;
+    /**
+     * 设置Cookie值
+     * 设置应用发起Http请求时提交的cookie值，调用此接口后所有的请求都生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setCookie(url?: string, value?: string): void;
+    /**
+     * 获取Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getCookie(url?: string): string;
+    /**
+     * 删除应用所有Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeAllCookie(): void;
+    /**
+     * 删除应用Cookie
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeCookie(url?: string): void;
+    /**
+     * 删除应用所有会话期Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeSessionCookie(): void;
+}
+
+/**
+ * 创建应用快捷方式要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorShortcutOptions {
+    /**
+     * 快捷方式名称
+     * 如果未设置则使用应用的名称，manifest.json中name属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    name?: string;
+    /**
+     * 快捷方式的图标
+     * 如果未设置则优先使用应用中指定的图标（manifest.json中icon节点下对应分辨率的图标），如未区配则使用应用的图标（仅在独立打包时），否则使用runtime提供的默认图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    icon?: string;
+    /**
+     * 创建快捷方式后的提示信息
+     * 快捷方式创建成功后显示，默认提示内容为“"XXXX"已创建桌面快捷方式”，其中"XXXX"为程序的名称，如果不需要提示则设置此值为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    toast?: string;
+    /**
+     * 快捷方式的扩展参数
+     * 其中key和value值都必须是字符串类型。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    extra?: any;
+    /**
+     * 要启动Activity类名
+     * 通常情况下不需要指定此值，仅在5+SDK集成时自定义Activity才用到。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    classname?: string;
+    /**
+     * 是否需要强制创建快捷方式
+     * true表示强制创建，false表示不强制创建，默认值为true。
+     * 	强制创建可能会导致在无法判断快捷方式是否存在的设备上重复创建，如果需要尽可能避免出现重复创建桌面快捷方式则应该设置force属性值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    force?: boolean;
+}
+
+/**
+ * 更新应用启动界面要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorSplashscreenOptions {
+    /**
+     * 启动界面的图片路径
+     * 仅支持本地文件路径，图片必须为png格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    image?: string;
+    /**
+     * 是否自动关闭启动界面
+     * true表示应用启动后自动关闭启动界面，false表示应用启动后不自动关闭启动界面，需要在应用调用plus.navigator.closeSplashscreen()方法关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    autoclose?: boolean;
+    /**
+     * 是否自动关闭启动界面（WAP2APP应用）
+     * 与autoclose属性值作用一致，仅在WAP2APP应用中有效。
+     * 	不推荐设置此值，如果未设置会自动使用autoclose属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    autoclose_w2a?: boolean;
+    /**
+     * 启动界面延时关闭时间
+     * 仅在设置为自动关闭启动界面时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    delay?: number;
+    /**
+     * 启动界面延时关闭时间（WAP2APP应用）
+     * 与delay属性值作用一致，仅在WAP2APP应用中有效。
+     * 	不推荐设置此值，如果未设置会自动使用delay属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    delay_w2a?: number;
+}
+
+/**
+ * 运行环境权限类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorPermissionNames {
+    /**
+     * 访问摄像头权限
+     * 用于调用摄像头（plus.camera.*、plus.barcode.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    CAMERA?: string;
+    /**
+     * 访问系统联系人权限
+     * 用于访问（读、写）系统通讯录（plus.gallery.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    CONTACTS?: string;
+    /**
+     * 访问系统相册权限
+     * 用于访问（读、写）系统相册（plus.gallery.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    GALLERY?: string;
+    /**
+     * 定位权限
+     * 用于获取当前用户位置信息（plus.geolocation.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    LOCATION?: string;
+    /**
+     * 消息通知权限
+     * 用于接收系统消息通知（plus.push.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    NOTIFITION?: string;
+    /**
+     * 录音权限
+     * 用于进行本地录音操作（plus.audio.AudioRecorder）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    RECORD?: string;
+    /**
+     * 创建桌面快捷方式权限
+     * 用于在系统桌面创建快捷方式图标（plus.navigator.createShortcut）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    SHORTCUT?: string;
+}
+
+/**
+ * Orientation模块管理设备的方向信息，包括alpha、beta、gamma三个方向信息，通过plus.orientation可获取设备方向管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientation {
+    /**
+     * JSON对象，监听设备方向感应器参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    OrientationOption?: PlusOrientationOrientationOption;
+    /**
+     * JSON对象，设备方向信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    Rotation?: PlusOrientationRotation;
+    /**
+     * 获取当前设备的方向信息，包括alpha、beta、gamma三个方向信息
+     * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。 方向信息可通过successCB回调函数返回。方向信息获取失败则调用回调函数errorCB
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    getCurrentOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备方向信息的变化
+     * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。watchOrientation每隔固定时间就获取一次设备的方向信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备方向信息的时间间隔。方向信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    watchOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusOrientationOrientationOption): number;
+    /**
+     * 关闭监听设备方向信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * JSON对象，监听设备方向感应器参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientationOrientationOption {
+    /**
+     * 更新方向信息的时间间隔
+     * 数值类型，单位为ms，默认值为500ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    frequency?: number;
+}
+
+/**
+ * JSON对象，设备方向信息数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientationRotation {
+    /**
+     * 以z方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    alpha?: number;
+    /**
+     * 以x方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为-180到180（不等于180）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    beta?: number;
+    /**
+     * 以y方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为-180到180（不等于180）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    gamma?: number;
+    /**
+     * 设备方向与地球磁场北极方向的角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    magneticHeading?: number;
+    /**
+     * 设备方向与地球真实北极方向的角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    trueHeading?: number;
+    /**
+     * 设备方向值的误差值
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    headingAccuracy?: number;
+}
+
+/**
+ * Proximity模块管理设备距离传感器，可获取当前设备的接近距离信息，通过plus.proximity可获取设备距离传感管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+ */
+interface PlusProximity {
+    /**
+     * 获取当前设备的接近距离信息
+     * 获取当前接近设备的距离信息，距离值单位为厘米。如果感应器无法获取准确的距离值，则在接近设备时返回0，否则返回Infinity。 获取成功则调用successCB回调函数返接近回距离值。获取失败则调用errorCB回调函数错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    getCurrentProximity(successCB?: (result: number) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备接近距离的变化
+     * watchProximity将监听设备的接近距离信息变化事件，当接近距离发生变化时通过changeCB回调函数返回距离值。监听距离变化事件失败则通过errorCB回调函数返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    watchProximity(changeCB?: (result: number) => void, errorCB?: (result: any) => void): number;
+    /**
+     * 关闭监听设备接近距离变化
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * Runtime模块管理运行环境，可用于获取当前运行环境信息、与其它程序进行通讯等。通过plus.runtime可获取运行环境管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntime {
+    /**
+     * JSON对象，打开第三方程序参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    ApplicationInf?: PlusRuntimeApplicationInf;
+    /**
+     * JSON对象，应用角标显示需要的通知栏消息的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    BadgeOptions?: PlusRuntimeBadgeOptions;
+    /**
+     * JSON对象，打开文件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    OpenFileOptions?: PlusRuntimeOpenFileOptions;
+    /**
+     * JSON对象，应用信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    WidgetInfo?: PlusRuntimeWidgetInfo;
+    /**
+     * JSON对象，应用安装参数
+     * 可通过对象设置安装的应用是否进行appid校验、版本号校验等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    WidgetOptions?: PlusRuntimeWidgetOptions;
+    /**
+     * 当前应用的APPID
+     * 当前应用的APPID，字符串类型。注意，如果是在HBuilder真机运行获取的是固定值"HBuilder"，需要提交App云端打包后运行才能获取真实的APPID值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    appid?: string;
+    /**
+     * 第三方程序调用时传递给程序的参数
+     * 第三方程序传递过来的参数，字符串格式类型数据。
+     * 	不是由第三方程序调用启动，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    arguments?: string;
+    /**
+     * 应用的市场推广渠道标识
+     * "qihoo:browser"标识360浏览器流应用，"qihoo:appstore "表示360手机助手流应用，"dcloud:streamapps"表示DCloud流应用基座。
+     * 	注意：仅流应用环境中可用（如果没有特殊配置默认返回运行环境的包名），非流应用环境中返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    channel?: string;
+    /**
+     * 应用启动来源
+     * 5+ APP启动类型，可取以下值：
+     * 	"default"：默认启动方式，通常表示应用列表启动（360手助中搜索启动）；
+     * 	"scheme"：通过urlscheme方式触发启动；
+     * 	"push"：通过点击系统通知方式触发启动；
+     * 	"stream"：通过流应用api（plus.stream.open）启动；
+     * 	"shortcut"：通过快捷方式启动，iOS平台表示通过3D Touch快捷方式，Android平台表示通过桌面快捷方式启动；
+     * 	"barcode"：通过二维码扫描启动；
+     * 	"myapp"：通过流应用"我的"应用列表或历史列表中触发启动；
+     * 	"favorite"：通过流应用的"收藏"应用列表启动；
+     * 	"browser"：通过流应用的内置浏览器导流启动的流应用（地址栏输入url启动应用、点击wap页面链接启动应用）；
+     * 	"engines"：通过流应用的浏览器界面作为搜索引擎启动；
+     * 	"search"：通过流应用的应用搜索启动应用（如iOS平台的T9键盘搜索）；
+     * 	"speech"：通过流应用的语音识别启动应用；
+     * 	"miniProgram"：通过微信小程序启动应用。
+     * - default: 
+     * 	默认启动方式，通常表示从系统桌面图标启动
+     * 						
+     * - scheme: 
+     * 	通过urlscheme方式触发启动
+     * 						
+     * - push: 
+     * 	通过点击系统通知方式触发启动
+     * 						
+     * - stream: 
+     * 	通过流应用api（plus.stream.open）启动
+     * 						
+     * - shortcut: 
+     * 	iOS平台表示通过3D Touch快捷方式，Android平台表示通过桌面快捷方式启动
+     * 						
+     * - barcode: 
+     * 	通过二维码扫描启动
+     * 						
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launcher?: 'default' | 'scheme' | 'push' | 'stream' | 'shortcut' | 'barcode';
+    /**
+     * 应用安装来源
+     * 5+应用安装来源，可取以下值：
+     * 	"default"：默认安装来源，apk/ipa安装包内置安装；
+     * 	"stream"：通过流应用api（plus.stream.open）安装，仅流应用环境下支持；
+     * 	"push"：通过点击系统通知方式触发安装，仅流应用环境下支持；
+     * 	"scheme"：通过urlscheme方式触发安装，仅流应用环境下支持；
+     * 	"barcode"：通过二维码扫描触发安装，仅流应用环境下支持；
+     * 	"silent"：通过后台静默方式安装，仅流应用环境下支持；
+     * 	"speech"：通过语音识别方式触发安装，仅流应用环境下支持；
+     * 	"favorite"：通过收藏界面启动触发安装，仅流应用环境下支持。
+     * - default: 
+     * 	默认安装来源，apk/ipa安装包内置安装
+     * 						
+     * - stream: 
+     * 	通过流应用api（plus.stream.open）安装
+     * 						
+     * - push: 
+     * 	通过点击系统通知方式触发安装
+     * 						
+     * - scheme: 
+     * 	通过urlscheme方式触发安装
+     * 						
+     * - barcode: 
+     * 	通过二维码扫描触发安装
+     * 						
+     * - silent: 
+     * 	通过后台静默方式安装
+     * 						
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    origin?: 'default' | 'stream' | 'push' | 'scheme' | 'barcode' | 'silent';
+    /**
+     * 客户端的版本号
+     * 字符串类型，在编译环境中设置的apk/ipa版本号。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    version?: string;
+    /**
+     * 客户端5+运行环境的版本号
+     * 5+运行环境版本号，格式为：[主版本号].[次版本号].[修订版本号].[编译代号]。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    innerVersion?: string;
+    /**
+     * 获取当前应用首页加载的时间
+     * 应用加载首页面的总时间，从开始加载首页面到首页面加载完成，单位为ms。
+     * 	注意，应用首页为网络地址则包括网络传输时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launchLoadedTime?: number;
+    /**
+     * 获取当前应用的进程标识
+     * 当前应用所属系统进程标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    processId?: string;
+    /**
+     * 获取当前应用的启动时间
+     * 应用启动时间戳，距1970年1月1日之间的毫秒数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    startupTime?: number;
+    /**
+     * 获取指定APPID对应的应用信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    getProperty(appid?: string, getPropertyCB?: (result: PlusRuntimeWidgetInfo) => void): void;
+    /**
+     * 安装应用
+     * 支持以下类型安装包：
+     * 	1. 应用资源安装包（wgt），扩展名为'.wgt'；
+     * 	2. 应用资源差量升级包（wgtu），扩展名为'.wgtu'；
+     * 	3. 系统程序安装包（apk），要求使用当前平台支持的安装包格式。
+     * 	注意：仅支持本地地址，调用此方法前需把安装包从网络地址或其他位置放置到运行时环境可以访问的本地目录。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: (result: PlusRuntimeWidgetInfo) => void, installErrorCB?: (result: any) => void): void;
+    /**
+     * 退出客户端程序
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    quit(): void;
+    /**
+     * 重启当前的应用
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    restart(): void;
+    /**
+     * 设置程序快捷方式图标上显示的角标数字
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    setBadgeNumber(number?: number, options?: PlusRuntimeBadgeOptions): void;
+    /**
+     * 调用第三方程序打开指定的URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openURL(url?: string, errorCB?: (result: any) => void, identity?: string): void;
+    /**
+     * 使用内置Webview窗口打开URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openWeb(url?: string): void;
+    /**
+     * 调用第三方程序打开指定的文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: (result: any) => void): void;
+    /**
+     * 处理直达页面链接参数
+     * 通过URL Scheme启动时，可以在?后面添加__direct_page参数自定义直达页面地址，
+     * 	如“streamapp://m3w.cn/s/HelloH5?__direct_page=http%3a%2f%2fm.weibo.cn%2fu%2f3196963860”；
+     * 	在流应用SDK集成时也可以通过direct_page参数（原生调用Intent）设置。
+     * 	注意：仅第一次调用此API时返回直达页面链接地址，再次调用将返回空字符串；如果应用重新被带直达页面链接参数的URL Scheme启动/激活时，可再次调用此方法获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    processDirectPage(): string;
+    /**
+     * 调用第三方程序
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: (result: any) => void): void;
+    /**
+     * 判断第三方程序是否已存在
+     * 如果第三方程序已安装则返回true，未安装则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    isApplicationExist(appInf?: PlusRuntimeApplicationInf): boolean;
+    /**
+     * 判断是否自定义应用启动页面加载地址
+     * 通过URL Scheme启动时，可以在?后面添加__launch_path参数自定义应用启动首页加载的页面地址，
+     * 	如“streamapp://m3w.cn/s/HelloH5?__launch_path=http%3a%2f%2fm.weibo.cn%2fu%2f3196963860”；
+     * 	在流SDK集成时也可以通过launch_path参数（原生调用Intent）设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    isCustomLaunchPath(): boolean;
+}
+
+/**
+ * JSON对象，打开第三方程序参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeApplicationInf {
+    /**
+     * 第三方程序包名
+     * 仅Android平台支持，表示程序的包名，其它平台忽略此属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    pname?: string;
+    /**
+     * 程序的操作行为
+     * Android平台上与系统的action值一致；iOS平台为要调用程序的URLScheme格式字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    action?: string;
+    /**
+     * 新任务模式标记
+     * 可取值：
+     * 		true-使用新任务模式标记（FLAG_ACTIVITY_NEW_TASK）启动应用；
+     * 		false-不使用新任务模式标记（FLAG_ACTIVITY_NEW_TASK）启动应用。
+     * 	默认值为true。
+     * 	注意：由于5+应用配置的launchMode为singleTask，所以另一个5+应用通过plus.runtime.launchApplication启动时如果应用已经在后台运行则不会触发newintent事件，为了避免此问题需要将newTask参数值设置为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    newTask?: boolean;
+    /**
+     * 调用程序的参数
+     * 仅Android平台支持，为JSON格式，用于传递给要调用程序的参数，如extra:{url:"http://www.html5plus.org"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    extra?: any;
+}
+
+/**
+ * JSON对象，应用角标显示需要的通知栏消息的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeBadgeOptions {
+    /**
+     * 消息的标题
+     * 默认值为应用的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    title?: string;
+    /**
+     * 消息的内容
+     * 默认值为“您有x条未读消息"”，其中x未设置的角标数字值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    content?: string;
+}
+
+/**
+ * JSON对象，打开文件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeOpenFileOptions {
+    /**
+     * 优先使用的程序包名
+     * 如果指定包名的程序已经安装，则调用其打开文件，若程序不支持打开文件则触发错误回调。
+     * 	如果指定包名的程序未安装，则弹出系统支持打开此文件的列表，由用户选择程序打开。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    pname?: string;
+    /**
+     * 弹出系统选择程序界面指示区域
+     * JSON对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，左上坐标相对于容器webview的位置。仅在iPad设备平台有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    popover?: any;
+}
+
+/**
+ * JSON对象，应用信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeWidgetInfo {
+    /**
+     * 应用的APPID
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    appid?: string;
+    /**
+     * 应用的版本号
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    version?: string;
+    /**
+     * 应用的名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    name?: string;
+    /**
+     * 应用描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    description?: string;
+    /**
+     * 应用描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    author?: string;
+    /**
+     * 开发者邮箱地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    email?: string;
+    /**
+     * 应用授权描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    license?: string;
+    /**
+     * 应用授权说明链接地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    licensehref?: string;
+    /**
+     * 应用许可特性列表
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    features?: String[];
+}
+
+/**
+ * JSON对象，应用安装参数
+ * 可通过对象设置安装的应用是否进行appid校验、版本号校验等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeWidgetOptions {
+    /**
+     * 是否强制安装
+     * true表示强制安装，不进行版本号的校验；false则需要版本号校验，如果将要安装应用的版本号不高于现有应用的版本号则终止安装，并返回安装失败。
+     * 	仅安装wgt和wgtu时生效，默认值 false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    force?: boolean;
+}
+
+/**
+ * Storage模块管理应用本地数据存储区，用于应用数据的保存和读取。应用本地数据与localStorage、sessionStorage的区别在于数据有效域不同，前者可在应用内跨域操作，数据存储期是持久化的，并且没有容量限制。通过plus.storage可获取应用本地数据管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+ */
+interface PlusStorage {
+    /**
+     * 获取应用存储区中保存的键值对的个数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    getLength(): number;
+    /**
+     * 通过键(key)检索获取应用存储的值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    getItem(key?: string): string;
+    /**
+     * 修改或添加键值(key-value)对数据到应用数据存储中
+     * 如果设置的键在应用数据存储中已经存在，更新存储的键值。
+     * 	存储的键和值没有容量限制，但过多的数据量会导致效率降低，建议单个键值数据不要超过10Kb。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    setItem(key?: string, value?: string): void;
+    /**
+     * 通过key值删除键值对存储的数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    removeItem(key?: string): void;
+    /**
+     * 清除应用所有的键值对存储数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    clear(): void;
+    /**
+     * 获取键值对中指定索引值的key值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    key(index?: number): void;
+}
+
+/**
+ * Stream模块操作流应用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStream {
+    /**
+     * JSON对象，启动流应用参数
+     * 指定要启动的流应用标识、名称、图标、参数等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamOptions?: PlusStreamStreamOptions;
+    /**
+     * JSON对象，流应用恢复运行的参数
+     * 设置流应用恢复运行时的参数、splash、首页等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamRestoreOptions?: PlusStreamStreamRestoreOptions;
+    /**
+     * 流应用恢复运行时启动界面配置参数
+     * 设置流应用恢复运行时启动界面，如是否自动关闭、延时关闭时间、超时时间等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamRestoreSplashscreenOptions?: PlusStreamStreamRestoreSplashscreenOptions;
+    /**
+     * JSON对象，启动流应用的首页窗口属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    LaunchWebviewStyles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * JSON对象，流应用信息
+     * 流应用标识、图标、是否下载完成等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamInfo?: PlusStreamStreamInfo;
+    /**
+     * JSON对象，免流量操作参数
+     * 包含电话号码、验证码等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    FreetrafficOptions?: PlusStreamFreetrafficOptions;
+    /**
+     * 免流量状态变化事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    onfreetrafficStateChange?: any;
+    /**
+     * 启动流应用
+     * 打开指定的流应用，在流应用中通过plus.runtime.launcher获取的值为"stream"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    open(options?: PlusStreamStreamOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 流应用激活统计
+     * 提交统计数据到流应用服务器，表明业务系统激活成功。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    activate(): void;
+    /**
+     * 已下载流应用列表
+     * 获取当前设备上已安装的所有流应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    list(options?: any, successCallback?: any, errorCallback?: any): void;
+    /**
+     * 预加载流应用
+     * 预加载指定的流应用资源，下载应用资源等，并不运行流应用。
+     * 	如果应用资源已经下载，则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    preload(appid?: string): void;
+    /**
+     * 删除流应用
+     * 删除已下载的流应用，清空应用相关运行期保存的资源（如缓存、配置文件等）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    remove(appid?: string): void;
+    /**
+     * 设置流应用恢复运行的参数
+     * 当流应用运行数目超过限制（通常最多运行2个流应用），会自动关闭之前切换到后台运行的应用。
+     * 	可通过此方法设置应用被自动关闭后再次被唤醒恢复运行时的参数，流应用恢复运行流程与第一次启动一致（差别是会使用StreamRestoreOptions中配置的参数）。
+     * 	如果没有调用setRestoreState方法，则恢复运行时使用启动时（调用plus.stream.open方法）传入的参数。
+     * 	注意：如果通过plus.stream.open方法启动应用，则忽略此方法设置的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    setRestoreState(options?: PlusStreamStreamRestoreOptions): void;
+    /**
+     * 请求免流量验证码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    /**
+     * 免流量绑定手机号
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    /**
+     * 解除免流量绑定
+     * 解除当前设备绑定的手机号，如果设备未绑定则不执行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficRelease(): void;
+    /**
+     * 获取免流量状态信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 免流量是否生效
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficIsValid(): boolean;
+}
+
+/**
+ * JSON对象，启动流应用参数
+ * 指定要启动的流应用标识、名称、图标、参数等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamOptions {
+    /**
+     * 流应用运行模式
+     * 可取值："test"表示测试版模式运行，其它值则为正式版本模式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    appmode?: string;
+    /**
+     * 流应用标识
+     * 流应用唯一字符串标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    appid?: string;
+    /**
+     * 启动流应用的直达页面链接地址
+     * 可在应用中通过plus.runtime.processDirectPage()方法获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    direct_page?: string;
+    /**
+     * 流应用运行参数
+     * 启动流应用的扩展参数，可在流应用中通过plus.runtime.arguments获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    extras?: any;
+    /**
+     * 流应用图标
+     * 流应用显示的图标路径（仅支持本地路径），在启动提示界面中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    icon?: string;
+    /**
+     * 流应用启动类型
+     * 流应用的启动类型，可在流应用中通过plus.runtime.launcher获取，默认值为“stream”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    launcher?: string;
+    /**
+     * 应用启动界面样式
+     * 可取值：
+     * 	"auto"：自动选择启动界面，如果splash图片已经下载则显示splash图片，否则使用默认加载流应用界面；
+     * 	"default"：使用默认加载流应用界面（如在360浏览器环境中在标题栏下显示加载进度条）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splash?: string;
+    /**
+     * 流应用首页窗口对象样式
+     * 如果流应用已经运行，从后台激活到前台时忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    styles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * 流应用名称
+     * 流应用显示的标题，在启动提示界面中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    title?: string;
+    /**
+     * 启动流应用的快捷方式逻辑
+     * 可取值：
+     * 		"auto" - 检查并引导用户打开快捷方式权限，自动创建桌面快捷方式，在不支持快捷方式滤重的系统上仅创建一次；
+     *         "force" - 检查并引导用户打开快捷方式权限，自动创建桌面快捷方式，在不支持快捷方式滤重的系统上每次都尝试创建；
+     *         "none" - 不检查快捷方式权限，不创建桌面快捷方式（与从桌面快捷方式启动的流程一致）；
+     *         "query" - 弹出询问提示框（底部显示），用户点击确定后创建桌面快捷方式（检查并引导用户打开快捷方式权限）；
+     *         "tipOnce" - 业务逻辑与"auto"类似，差别是只会引导用户打开快捷方式权限一次、toast提示一次。
+     * 	默认值为"force"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    shortcut?: string;
+    /**
+     * 退出流应用的快捷方式逻辑
+     * 可取值：
+     * 		"query" - 应用退出时检查是否创建桌面快捷方式，如果查询到没有创建则弹出询问框，用户点击确定后创建桌面快捷方式（检查并引导用户打开快捷方式权限）；
+     *         "queryOnce" - 仅应用第一次退出检查，检查逻辑同query；
+     *         "none" - 应用退出时不检查是否创建桌面快捷方式。
+     * 	默认值为"none"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    shortcutQuit?: string;
+}
+
+/**
+ * JSON对象，流应用恢复运行的参数
+ * 设置流应用恢复运行时的参数、splash、首页等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamRestoreOptions {
+    /**
+     * 流应用运行参数
+     * 启动流应用的扩展参数，可在流应用中通过plus.runtime.arguments获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    extras?: any;
+    /**
+     * 应用启动界面样式
+     * 可取值：
+     * 	"auto"：自动选择启动界面，如果流应用自动关闭时截图成功则使用截图，如果splash图片已经下载则显示splash图片，否则使用默认加载流应用界面；
+     * 	"default"：使用默认加载流应用界面（如在360浏览器环境中在标题栏下显示加载进度条）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splash?: string;
+    /**
+     * 流应用首页窗口对象样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    styles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * 流应用恢复运行时启动界面配置参数
+     * 用于流应用自动关闭后恢复运行时调整启动界面配置参数，如将自动关闭splash调整为手动关闭，以便恢复上次运行状态后再进入应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splashscreen?: PlusStreamStreamRestoreSplashscreenOptions;
+}
+
+/**
+ * 流应用恢复运行时启动界面配置参数
+ * 设置流应用恢复运行时启动界面，如是否自动关闭、延时关闭时间、超时时间等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamRestoreSplashscreenOptions {
+    /**
+     * 是否自动关闭启动界面
+     * true表示应用启动后自动关闭启动界面，false表示应用启动后不自动关闭启动界面，需要在应用调用plus.navigator.closeSplashscreen()方法关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    autoclose?: boolean;
+    /**
+     * 启动界面超时时间
+     * 单位为毫秒（ms），当启动界面超过此时间仍然未关闭时（不管autoclose值设置true还是false），应用将自动关闭启动界面。
+     * 	默认值为6000（即6秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    timeout?: number;
+}
+
+/**
+ * JSON对象，启动流应用的首页窗口属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamLaunchWebviewStyles {
+    /**
+     * 流应用首页是否阻塞网络图片的加载
+     * true表示阻塞网络图片的加载，false表示不阻塞网络图片的加载。默认值为false。
+     * 	设置后可通过Webview窗口对象的setBlockNetworkImage(false)方法修改设置来继续加载网络图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    blockNetworkImage?: boolean;
+    /**
+     * 指定流应用首页地址
+     * 可使用网络地址（http://或https://开头），也可使用本地地址（相对应用资源路径）。
+     * 	也可使用特定地址：
+     * 	about:blank - 使用空白首页，仅加载内置注入的脚本（如all.js、wap2app.js、config.js等）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    launch_path?: string;
+    /**
+     * 指定首页Webview的id
+     * 如果未指定id，则使用应用的appid作为首页Webview的id。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    id?: string;
+    /**
+     * 流应用首页是否显示
+     * true表示显示，false表示不显示。默认值为true。
+     * 	注意：流应用首页隐藏后，需要调用首页的setVisible方法显示，如plus.webview.getLaunchWebview().setVisible(true)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    visible?: boolean;
+}
+
+/**
+ * JSON对象，流应用信息
+ * 流应用标识、图标、是否下载完成等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamInfo {
+    /**
+     * 流应用标识
+     * 流应用唯一字符串标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    id?: string;
+    /**
+     * 流应用的图标
+     * 流应用下载的图标路径（本地路径），如果未下载完成则返回空。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    icon?: string;
+    /**
+     * 流应用是否下载完成
+     * true表示流应用下载完成，false表示流应用未下载完成。
+     * 	注意，流应用未下载完成以让可以正常启动运行，启动后会自动下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    complete?: boolean;
+}
+
+/**
+ * JSON对象，免流量操作参数
+ * 包含电话号码、验证码等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamFreetrafficOptions {
+    /**
+     * 电话号码
+     * 免流量请求验证码、绑定设备使用的电话号码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    phone?: string;
+    /**
+     * 验证码
+     * 免流量绑定设备使用的验证码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    code?: string;
+}
+
+/**
+ * Uploader模块管理网络上传任务，用于从本地上传各种文件到服务器，并支持跨域访问操作。通过plus.uploader可获取上传管理对象。Uploader上传使用HTTP的POST方式提交数据，数据格式符合Multipart/form-data规范，即rfc1867（Form-based File Upload in HTML）协议。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploader {
+    /**
+     * Upload对象管理一个上传任务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    Upload?: PlusUploaderUpload;
+    /**
+     * 上传任务事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadEvent?: PlusUploaderUploadEvent;
+    /**
+     * 上传任务的状态，Number类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadState?: PlusUploaderUploadState;
+    /**
+     * JSON对象，创建上传任务的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadOptions?: PlusUploaderUploadOptions;
+    /**
+     * JSON对象，添加上传文件的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadFileOptions?: PlusUploaderUploadFileOptions;
+    /**
+     * 新建上传任务
+     * 请求上传管理创建新的上传任务，创建成功则返回Upload对象，用于管理上传任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: (result0: PlusUploaderUpload, result1: number) => void): PlusUploaderUpload;
+    /**
+     * 枚举上传任务
+     * 枚举指定状态的上传任务列表，通过enumCB回调函数返回结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    enumerate(enumCB?: (result: PlusUploader []) => void, state?: PlusUploaderUploadState): void;
+    /**
+     * 清除上传任务
+     * 清除指定状态的上传任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    clear(state?: PlusUploaderUploadState): void;
+    /**
+     * 开始所有上传任务
+     * 开始所有处于未开始调度或暂停状态的上传任务。
+     * 	若上传任务数超过可并发处理的总数，超出的任务处于调度状态（等待上传），当有任务完成时根据调度状态任务的优先级选择任务开始上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    startAll(): void;
+}
+
+/**
+ * Upload对象管理一个上传任务
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUpload {
+    /**
+     * 上传任务的标识
+     * 在创建任务时系统自动分配，用于标识上传任务的唯一性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    id?: string;
+    /**
+     * 上传文件的服务器地址
+     * 调用plus.uploader.createUpload()方法创建上传任务时设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    url?: string;
+    /**
+     * 任务的状态
+     * 上传任务的状态，参考UploadState，在UploadCompleteCallback事件和UploadStateChangedCallback事件触发时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    state?: number;
+    /**
+     * 上传任务的参数
+     * 上传任务配置的参数，参考UploadOptions。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    options?: PlusUploaderUploadOptions;
+    /**
+     * 上传任务完成后服务器返回的数据
+     * 表示当前上传任务的状态，可通过addEventListener()方法监听statechanged事件监听任务状态的变化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    responseText?: string;
+    /**
+     * 已完成上传数据的大小）
+     * 整数类型，单位为字节（byte），上传任务开始传输数据时，每次触发statechanged事件或上传任务完成更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    uploadedSize?: number;
+    /**
+     * 上传数据的总大小
+     * 整数类型，单位为字节（byte），上传任务开始传输数据时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    totalSize?: number;
+    /**
+     * 添加上传文件
+     * 向上传任务中添加文件，必须在任务开始上传前调用。
+     * 	以下情况会导致添加上传文件失败：
+     * 	1. options参数中指定的key在任务中已经存在，则添加失败返回false；
+     * 	2. path参数指定的文件路径不合法或文件不存在，则添加失败返回false；
+     * 	3. 上传任务已经开始调度，调用此方法则添加失败返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addFile(path?: string, options?: PlusUploaderUploadFileOptions): boolean;
+    /**
+     * 添加上传数据
+     * 向上传任务中添加数据，必须在任务开始上传前调用。
+     * 	以下情况会导致添加上传文件失败：
+     * 	1. key参数中指定的键名在任务中已经存在，则添加失败返回false；
+     * 	2. 上传任务已经开始调度，调用此方法则添加失败返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addData(key?: string, value?: string): boolean;
+    /**
+     * 开始上传任务
+     * 开始调度上传任务，如果任务已经处于开始状态则无任何响应。
+     * 	在创建任务或任务上传失败后调用可重新开始上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    start(): void;
+    /**
+     * 暂停上传任务
+     * 暂停上传任务，如果任务已经处于初始状态或暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    pause(): void;
+    /**
+     * 恢复暂停的上传任务
+     * 继续暂停的上传任务，如果任务处于非暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    resume(): void;
+    /**
+     * 取消上传任务
+     * 如果任务未完成，则终止上传，并从任务列表中删除。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    abort(): void;
+    /**
+     * 添加上传任务事件监听器
+     * 上传任务添加事件监听器后，当监听的事件发生时触发listener回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addEventListener(type?: string, listener?: (result0: PlusUploaderUpload, result1: number) => void, capture?: boolean): void;
+    /**
+     * 获取上传请求HTTP响应头部信息
+     * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者上传请求未完成则为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取上传请求指定的HTTP响应头部的值
+     * 其参数是要返回的HTTP响应头部的名称，可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	如果没有接收到这个头部或者伤处请求未完成则为空字符串；如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 设置上传请求的HTTP头数据
+     * Http的Header应该包含在通过后续start()调用而发起的请求中，此方法必需在调用start()之前设置才能生效。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+}
+
+/**
+ * 上传任务事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadEvent {
+    /**
+     * 上传任务状态变化事件
+     * 当上传任务状态发生变化时触发此事件，事件原型参考UploadStateChangedCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    statechanged?: string;
+}
+
+/**
+ * 上传任务的状态，Number类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+type PlusUploaderUploadState = undefined | 0 | 1 | 2 | 3 | 4 | 5 | -1;
+
+/**
+ * JSON对象，创建上传任务的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadOptions {
+    /**
+     * 网络请求类型
+     * 仅支持http协议的“POST”请求。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    method?: string;
+    /**
+     * 上传任务每次上传的文件块大小（仅在支持断点续传的服务有效）
+     * 数值类型，单位为Byte（字节），默认值为102400，若设置值小于等于0则表示不分块上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    blocksize?: number;
+    /**
+     * 上传任务的优先级
+     * 数值类型，数值越大优先级越高，默认优先级值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    priority?: number;
+    /**
+     * 上传任务超时时间
+     * 数值类型，单位为s(秒)，默认值为120s。
+     * 	超时时间为服务器响应请求的时间（不是上传任务完成的总时间），如果设置为0则表示永远不超时。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    timeout?: number;
+    /**
+     * 上传任务重试次数
+     * 数值类型，默认为重试3次。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    retry?: number;
+    /**
+     * 上传任务重试间隔时间
+     * 数值类型，单位为s(秒)，默认值为30s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    retryInterval?: number;
+}
+
+/**
+ * JSON对象，添加上传文件的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadFileOptions {
+    /**
+     * 文件键名
+     * 上传文件在上传任务中的键名，默认值为为文件名称。
+     * 	上传任务中如果已经存在相同key的上传文件或数据将导致添加文件失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    key?: string;
+    /**
+     * 文件名称
+     * 上传文件的名称，默认值为上传文件路径中的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    name?: string;
+    /**
+     * 文件类型
+     * 上传文件的类型（如图片文件为“image/jpeg”），默认值自动根据文件后缀名称生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    mime?: string;
+}
+
+/**
+ * Video模块管理多媒体视频相关能力，可用创建视频播放控件，直播推流控件等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideo {
+    /**
+     * 视频播放控件对象
+     * VideoPlayer对象表示视频播放控件对象，在窗口中播放视频，可支持本地视频(mp4/flv)，网络视频地址（mp4/flv/m3u8）及流媒体（rtmp/hls/rtsp）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayer?: PlusVideoVideoPlayer;
+    /**
+     * 视频播放控件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayerStyles?: PlusVideoVideoPlayerStyles;
+    /**
+     * 视频播放控件事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayerEvents?: PlusVideoVideoPlayerEvents;
+    /**
+     * 直播推流控件对象
+     * LivePusher对象表示直播推流控件对象，在窗口中显示捕获视频，实时推送到流媒体（RTMP）服务器。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusher?: PlusVideoLivePusher;
+    /**
+     * 直播推流控件配置选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusherStyles?: PlusVideoLivePusherStyles;
+    /**
+     * 直播推流控件事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusherEvents?: PlusVideoLivePusherEvents;
+    /**
+     * 创建VideoPlayer对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    createVideoPlayer(id?: string, styles?: PlusVideoVideoPlayerStyles): PlusVideoVideoPlayer;
+    /**
+     * 创建LivePusher对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    createLivePusher(id?: string, styles?: PlusVideoLivePusherStyles): PlusVideoLivePusher;
+    /**
+     * 查找已经创建的VideoPlayer对象
+     * 查找指定id的VideoPlayer对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    getVideoPlayerById(id?: string): PlusVideoVideoPlayer;
+    /**
+     * 查找已经创建的LivePusher对象
+     * 查找指定id的LivePusher对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    getLivePusherById(id?: string): PlusVideoLivePusher;
+}
+
+/**
+ * 视频播放控件对象
+ * VideoPlayer对象表示视频播放控件对象，在窗口中播放视频，可支持本地视频(mp4/flv)，网络视频地址（mp4/flv/m3u8）及流媒体（rtmp/hls/rtsp）。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayer {
+    /**
+     * 监听视频播放控件事件
+     * 向视频播放控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法向视频播放控件添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 设置视频播放控件参数
+     * 用于动态更新视频播放控件的配置参数。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考VideoPlayerStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setStyles(styles?: PlusVideoVideoPlayerStyles): void;
+    /**
+     * 设置视频播放控件参数（将废弃，使用setStyles）
+     * 用于动态更新视频播放控件的配置选项。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考VideoPlayerStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setOptions(options?: PlusVideoVideoPlayerStyles): void;
+    /**
+     * 播放视频
+     * 如果视频已经处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    play(): void;
+    /**
+     * 暂停视频
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    seek(position?: number): void;
+    /**
+     * 切换到全屏
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    requestFullScreen(direction?: number): void;
+    /**
+     * 退出全屏
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    exitFullScreen(): void;
+    /**
+     * 停止播放视频
+     * 如果视频未处于播放或暂停状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    stop(): void;
+    /**
+     * 隐藏视频播放控件
+     * 隐藏只是控件不可见，控件依然存在并且不改变播放状态。
+     * 	如果控件已经隐藏，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    hide(): void;
+    /**
+     * 显示视频播放控件
+     * 将隐藏的控件显示出来（回复到隐藏前的状态）。
+     * 	如果控件已经显示，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    show(): void;
+    /**
+     * 关闭视频播放控件
+     * 关闭操作将释放控件所有资源，不再可用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    close(): void;
+    /**
+     * 发送弹幕
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    sendDanmu(danmu?: any): void;
+    /**
+     * 设置倍速播放
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    playbackRate(rate?: number): void;
+}
+
+/**
+ * 视频播放控件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayerStyles {
+    /**
+     * 视频资源地址
+     * 支持本地地址，也支持网络地址及直播流（RTMP）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    src?: string;
+    /**
+     * 视频初始播放位置
+     * 单位为秒（s）。
+     * 	注意：仅在视频开始播放前设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'initial-time'?: number;
+    /**
+     * 视频长度
+     * 单位为秒（s）。
+     * 	注意：仅在视频开始播放前设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    duration?: number;
+    /**
+     * 是否显示默认播放控件
+     * 默认值为true。
+     * 	包括播放/暂停按钮、播放进度、时间等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    controls?: boolean;
+    /**
+     * 弹幕列表
+     * 弹幕JSON对象包括属性：text（String类型，弹幕文本类容），color（String类型，弹幕颜色，格式为#RRGGBB），time（Number类型，弹幕出现的时间，单位为秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'danmu-list'?: any [];
+    /**
+     * 是否显示弹幕按钮
+     * 默认值为false。
+     * 	注意：仅在控件构造时设置有效，不能动态更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'danmu-btn'?: boolean;
+    /**
+     * 是否展示弹幕
+     * 默认值为false。
+     * 	注意：仅在控件构造时设置有效，不能动态更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-danmu'?: boolean;
+    /**
+     * 是否自动播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    autoplay?: boolean;
+    /**
+     * 是否循环播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    loop?: boolean;
+    /**
+     * 是否静音播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    muted?: boolean;
+    /**
+     * 设置全屏时视频的方向
+     * 不指定则根据宽高比自动判断。
+     * 	有效值为： 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度）。
+     * 	默认值为-90。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    direction?: number;
+    /**
+     * 是否显示播放进度
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-progress'?: boolean;
+    /**
+     * 是否显示全屏按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-fullscreen-btn'?: boolean;
+    /**
+     * 是否显示视频底部控制栏的播放按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-play-btn'?: boolean;
+    /**
+     * 是否显示视频中间的播放按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-center-play-btn'?: boolean;
+    /**
+     * 是否开启控制进度的手势
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-progress-gesture'?: boolean;
+    /**
+     * 当视频大小与 video 容器大小不一致时，视频的表现形式
+     * 有效值为：contain（包含），fill（填充），cover（覆盖）。
+     * 	默认值为contain。
+     * 	仅Android平台支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    objectFit?: string;
+    /**
+     * 视频封面的图片网络资源地址
+     * 如果 controls 属性值为 false 则设置 poster 无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    poster?: string;
+    /**
+     * VideoPlayer控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    top?: string;
+    /**
+     * VideoPlayer控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    left?: string;
+    /**
+     * VideoPlayer控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    width?: string;
+    /**
+     * VideoPlayer控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    height?: string;
+    /**
+     * VideoPlayer控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    position?: string;
+}
+
+/**
+ * 视频播放控件事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayerEvents {
+    /**
+     * 视频播放事件
+     * 当视频开始/继续播放时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    play?: string;
+    /**
+     * 视频暂停事件
+     * 当视频暂停播放时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause?: string;
+    /**
+     * 视频结束事件
+     * 当视频播放到末尾时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    ended?: string;
+    /**
+     * 视频播放进度更新事件
+     * 当视频播放进度变化时触发，触发频率250ms一次。
+     * 	事件回调函数参数event.detail = {currentTime:"Number类型，当前播放时间（单位为秒）",duration:"Number类型，视频总长度（单位为秒）"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    timeupdate?: string;
+    /**
+     * 视频播放全屏播放状态变化事件
+     * 当视频播放进入或退出全屏时触发。
+     * 	事件回调函数参数event.detail = {fullScreen:"Boolean类型，当前状态是否为全屏", direction:"String类型，vertical或horizontal"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    fullscreenchange?: string;
+    /**
+     * 视频缓冲事件
+     * 当视频播放出现缓冲时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    waiting?: string;
+    /**
+     * 视频错误事件
+     * 当视频播放出错时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    error?: string;
+}
+
+/**
+ * 直播推流控件对象
+ * LivePusher对象表示直播推流控件对象，在窗口中显示捕获视频，实时推送到流媒体（RTMP）服务器。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusher {
+    /**
+     * 监听直播推流控件事件
+     * 向直播推流控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法向直播推流控件添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    addEventListener(event?: PlusVideoLivePusherEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 设置直播推流控件参数
+     * 用于动态更新直播推流控件的配置参数。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考LivePusherStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setStyles(styles?: PlusVideoLivePusherStyles): void;
+    /**
+     * 设置直播推流控件参数（将废弃，使用setStyles）
+     * 用于动态更新直播推流控件的配置选项。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考LivePusherStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setOptions(options?: PlusVideoLivePusherStyles): void;
+    /**
+     * 预览摄像头采集数据
+     * 调用摄像头采集图像数据，并在推流控件中预览（此时不会向服务器推流，需调用start方法才开始推流）。
+     * 	注意：为了确保预览窗口大小正确，应该在创建控件后延时一定的时间（如500ms）进行预览。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    preview(): void;
+    /**
+     * 开始推流
+     * 如果已经处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    start(successCB?: Function, errorCB?: Function): void;
+    /**
+     * 停止推流
+     * 如果未处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    stop(options?: any): void;
+    /**
+     * 暂停推流
+     * 如果未处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause(): void;
+    /**
+     * 恢复推流
+     * 如果未处于暂停状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    resume(): void;
+    /**
+     * 切换前后摄像头
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    switchCamera(): void;
+    /**
+     * 快照
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    snapshot(successCB?: Function, errorCB?: Function): void;
+    /**
+     * 关闭直播推流控件
+     * 关闭操作将释放控件所有资源，不再可用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    close(): void;
+}
+
+/**
+ * 直播推流控件配置选项
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusherStyles {
+    /**
+     * 推流地址
+     * 支持RTMP协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    url?: string;
+    /**
+     * 推流视频模式
+     * 可取值：SD（标清）, HD（高清）, FHD（超清）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    mode?: string;
+    /**
+     * 是否静音
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    muted?: boolean;
+    /**
+     * 开启摄像头
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-camera'?: boolean;
+    /**
+     * 自动聚集
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'auto-focus'?: boolean;
+    /**
+     * 是否美颜
+     * 可取值0、1，其中0表示不使用美颜，1表示不使用美颜。
+     * 	默认值为0(不使用美颜)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    beauty?: number;
+    /**
+     * 是否美白
+     * 可取值0、1、2、3、4、5，其中0表示不使用美白，其余值分别表示美白的程度，值越大美白程度越大。
+     * 	默认值为0（不使用美白）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    whiteness?: number;
+    /**
+     * 宽高比
+     * 可取值：3:4, 9:16。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    aspect?: string;
+    /**
+     * LivePusher控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    top?: string;
+    /**
+     * LivePusher控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    left?: string;
+    /**
+     * LivePusher控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    width?: string;
+    /**
+     * LivePusher控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    height?: string;
+    /**
+     * LivePusher控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    position?: string;
+}
+
+/**
+ * 直播推流控件事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusherEvents {
+    /**
+     * 状态变化事件
+     * 当推流连接服务器状态变化时触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为statechange",target:"触发此事件的直播推流控件对象",detail:{code:"状态码，参考后面状态码说明",message:"描述信息"}}。
+     * 	其中code状态码：
+     * 	1001 - 已经连接推流服务器；
+     * 	1002 - 已经与服务器握手完毕,开始推流；
+     * 	1003 - 打开摄像头成功；
+     * 	1004 - 录屏启动成功；
+     * 	1005 - 推流动态调整分辨率；
+     * 	1006 - 推流动态调整码率；
+     * 	1007 - 首帧画面采集完成；
+     * 	1008 - 编码器启动；
+     * 	-1301 - 打开摄像头失败；
+     * 	-1302 - 打开麦克风失败；
+     * 	-1303 - 视频编码失败；
+     * 	-1304 - 音频编码失败；
+     * 	-1305 - 不支持的视频分辨率；
+     * 	-1306 - 不支持的音频采样率；
+     * 	-1307 - 网络断连，且经多次重连抢救无效，更多重试请自行重启推流；
+     * 	-1308 - 开始录屏失败，可能是被用户拒绝；
+     * 	-1309 - 录屏失败，不支持的Android系统版本，需要5.0以上的系统；
+     * 	-1310 - 录屏被其他应用打断了；
+     * 	-1311 - Android Mic打开成功，但是录不到音频数据；
+     * 	-1312 - 录屏动态切横竖屏失败；
+     * 	1101 - 网络状况不佳：上行带宽太小，上传数据受阻；
+     * 	1102 - 网络断连, 已启动自动重连；
+     * 	1103 - 硬编码启动失败,采用软编码；
+     * 	1104 - 视频编码失败；
+     * 	1105 - 新美颜软编码启动失败，采用老的软编码；
+     * 	1106 - 新美颜软编码启动失败，采用老的软编码；
+     * 	3001 - RTMP -DNS解析失败；
+     * 	3002 - RTMP服务器连接失败；
+     * 	3003 - RTMP服务器握手失败；
+     * 	3004 - RTMP服务器主动断开，请检查推流地址的合法性或防盗链有效期；
+     * 	3005 - RTMP 读/写失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    statechange?: string;
+    /**
+     * 网络状态通知事件
+     * 当推流的网络状态发生变化时触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为netstatus",target:"触发此事件的直播推流控件对象",detail:{videoBitrate:"视频码率",audioBitrate:"音频码率",videoFPS:"视频帧率",netSpeed:"推流网速",videoWidth:"视频宽度",videoHeight:"视频高度"}}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    netstatus?: string;
+    /**
+     * 渲染错误事件
+     * 当推流发生错误是触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为error",target:"触发此事件的直播推流控件对象",detail:{code:"错误编码，参考后面错误码说明",message:"描述信息"}}。
+     * 	其中code错误码：
+     * 	1001 - 用户禁止使用摄像头；
+     * 	1002 - 用户禁止使用录音。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    error?: string;
+}
+
+/**
+ * Webview模块管理应用窗口界面，实现多窗口的逻辑控制管理操作。通过plus.webview可获取应用界面管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebview {
+    /**
+     * 一组用于定义页面或控件显示动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    AnimationTypeShow?: PlusWebviewAnimationTypeShow;
+    /**
+     * 一组用于定义页面或控件关闭的动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    AnimationTypeClose?: PlusWebviewAnimationTypeClose;
+    /**
+     * Webview窗口对象，用于操作加载HTML页面的窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewObject?: PlusWebviewWebviewObject;
+    /**
+     * Webview窗口动画参数
+     * 用于指定动画目标窗口，起始位置、目标位置等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewAnimationOptions?: PlusWebviewWebviewAnimationOptions;
+    /**
+     * Webview窗口动画样式
+     * 用于指定动画窗口的起始位置、目标位置等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewAnimationStyles?: PlusWebviewWebviewAnimationStyles;
+    /**
+     * Webview窗口回弹样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewBounceStyle?: PlusWebviewWebviewBounceStyle;
+    /**
+     * Webview窗口内容动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewContentAnimationOptions?: PlusWebviewWebviewContentAnimationOptions;
+    /**
+     * 原生控件在窗口中停靠的方式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDock?: PlusWebviewWebviewDock;
+    /**
+     * Webview窗口滑动事件数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragEvent?: PlusWebviewWebviewDragEvent;
+    /**
+     * 窗口手势操作参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragOptions?: PlusWebviewWebviewDragOptions;
+    /**
+     * 手势操作关联对象参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragOtherViewOptions?: PlusWebviewWebviewDragOtherViewOptions;
+    /**
+     * 截屏绘制操作参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDrawOptions?: PlusWebviewWebviewDrawOptions;
+    /**
+     * 窗口收藏参数
+     * 在流应用环境中调用收藏功能时使用的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewFavoriteOptions?: PlusWebviewWebviewFavoriteOptions;
+    /**
+     * 创建加载HTML数据参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewLoadDataOptions?: PlusWebviewWebviewLoadDataOptions;
+    /**
+     * 窗口的分享参数
+     * 在流应用环境中调用分享功能时使用的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewShareOptions?: PlusWebviewWebviewShareOptions;
+    /**
+     * 窗口原生子View控件样式
+     * 可设置原生控件的标识、大小、位置以及绘制的内容等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewSubNViewStyles?: PlusWebviewWebviewSubNViewStyles;
+    /**
+     * 窗口标题栏控件样式
+     * 标题栏控件固定高度为44px,可通过Webview窗口对象的getTitleNView方法获取标题栏原生控件对象动态绘制内容。
+     * 	可以通过WebviewObject对象的getTitleNView()获取标题栏的NView对象，然后调用其setStyle方法更新样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTitleNViewStyles?: PlusWebviewWebviewTitleNViewStyles;
+    /**
+     * 窗口标题栏自定义按钮样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTitleNViewButtonStyles?: PlusWebviewWebviewTitleNViewButtonStyles;
+    /**
+     * 标题栏控件的进度条样式
+     * 显示在标题栏控件底部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewProgressStyles?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 窗口标题栏控件的分割线样式
+     * 显示在标题栏控件底部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewSplitLineStyles?: PlusWebviewWebviewSplitLineStyles;
+    /**
+     * Webview窗口事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewEvent?: PlusWebviewWebviewEvent;
+    /**
+     * JSON对象，原生窗口扩展参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewExtraOptions?: PlusWebviewWebviewExtraOptions;
+    /**
+     * 原生控件在窗口中显示的位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewPosition?: PlusWebviewWebviewPosition;
+    /**
+     * Webview窗口下拉刷新样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewPullToRefreshStyles?: PlusWebviewWebviewPullToRefreshStyles;
+    /**
+     * Webview窗口rendered事件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewRenderedEventOptions?: PlusWebviewWebviewRenderedEventOptions;
+    /**
+     * 替换H5标准API配置信息
+     * 目前仅支持替换H5标准定位接口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewReplaceWebApiOptions?: PlusWebviewWebviewReplaceWebApiOptions;
+    /**
+     * JSON对象，Webview窗口的系统状态栏区域样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewStatusbarStyles?: PlusWebviewWebviewStatusbarStyles;
+    /**
+     * JSON对象，Webview窗口对象的样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewStyles?: PlusWebviewWebviewStyles;
+    /**
+     * 一组用于定义页面或控件变形的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTransform?: PlusWebviewWebviewTransform;
+    /**
+     * 一组用于定义页面或控件转换效果的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTransition?: PlusWebviewWebviewTransition;
+    /**
+     * 拦截Webview窗口资源请求的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewOverrideResourceOptions?: PlusWebviewWebviewOverrideResourceOptions;
+    /**
+     * 拦截Webview窗口URL请求的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewOverrideUrlOptions?: PlusWebviewWebviewOverrideUrlOptions;
+    /**
+     * 监听Webview窗口资源加载的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewListenResourceOptions?: PlusWebviewWebviewListenResourceOptions;
+    /**
+     * 获取所有Webview窗口
+     * 获取应用中已创建的所有Webview窗口，包括所有未显示的Webview窗口。
+     * 	返回WebviewObject对象在数组中按创建的先后顺序排列，即数组中第一个WebviewObject对象用是加载应用的入口页面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    all(): PlusWebview [];
+    /**
+     * 关闭Webview窗口
+     * 关闭已经打开的Webview窗口，需先获取窗口对象或窗口id，并可指定关闭窗口的动画及动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close(id_wvobj?: string, aniClose?: string, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 创建新的Webview窗口
+     * 创建Webview窗口，用于加载新的HTML页面，可通过styles设置Webview窗口的样式，创建完成后需要调用show方法才能将Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    create(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, extras?: any): PlusWebviewWebviewObject;
+    /**
+     * 获取当前窗口的WebviewObject对象
+     * 获取当前页面所属的Webview窗口对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    currentWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取屏幕所有可视的Webview窗口
+     * 仅在屏幕区域显示的Webview窗口，如果Webview窗口显示了但被其它Webview窗口盖住则认为不可视。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getDisplayWebview(): PlusWebview [];
+    /**
+     * 查找指定标识的WebviewObject窗口
+     * 在已创建的窗口列表中查找指定标识的Webview窗口并返回。
+     * 	若没有查找到指定标识的窗口则返回null，若存在多个相同标识的Webview窗口，则返回第一个创建的Webview窗口。
+     * 	如果要获取应用入口页面所属的Webview窗口，其标识为应用的%APPID%，可通过plus.runtime.appid获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getWebviewById(id?: string): PlusWebviewWebviewObject;
+    /**
+     * 获取应用首页WebviewObject窗口对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getLaunchWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取应用第二个首页WebviewObject窗口对象
+     * 在双首页模式下（在manifest.json的plus-&gt;secondwebview节点下配置），应用会自动创建两个首页Webview，通过getLaunchWebview()可获取第一个首页窗口对象，通过getSecondWebview()可获取第二个首页窗口对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getSecondWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取应用显示栈顶的WebviewObject窗口对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTopWebview(): PlusWebviewWebviewObject;
+    /**
+     * 隐藏Webview窗口
+     * 根据指定的WebviewObject对象或id隐藏Webview窗口，使得窗口不可见。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide(id_wvobj?: string, aniHide?: string, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 创建并打开Webview窗口
+     * 创建并显示Webview窗口，用于加载新的HTML页面，可通过styles设置Webview窗口的样式，创建完成后自动将Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    open(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, aniShow?: string, duration?: number, showedCB?: Function): PlusWebviewWebviewObject;
+    /**
+     * 预载网络页面
+     * 预载网络页面会向服务器发起http/https请求获取html页面内容，
+     * 	待Webview窗口加载此url页面时会则根据缓存机制优先使用预载的页面内容(加快页面显示速度)。
+     * 	注意：预载网络页面仅在运行期生效，为了节省内存仅保留最后5个预载页面数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    prefetchURL(url?: string): void;
+    /**
+     * 预载网络页面（多个地址）
+     * 预载网络页面会向服务器发起http/https请求获取html页面内容，
+     * 	待Webview窗口加载此url页面时会则根据缓存机制优先使用预载的页面内容(加快页面显示速度)。
+     * 	注意：预载网络页面仅在运行期生效，为了节省内存仅保留最后5个预载页面数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    prefetchURLs(urls?: any []): void;
+    /**
+     * 显示Webview窗口
+     * 显示已创建或隐藏的Webview窗口，需先获取窗口对象或窗口id，并可指定显示窗口的动画及动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show(id_wvobj?: string, aniShow?: string, duration?: number, showedCB?: Function, extras?: PlusWebviewWebviewExtraOptions): PlusWebviewWebviewObject;
+    /**
+     * Webview窗口组合动画
+     * 同步组合两个Webview窗口动画，动画完成后窗口的位置会发生变化，一次需要在动画属性参数中设置动画起始位置、结束位置等。
+     * 	注意：此动画操作会改变窗口位置（如left值等），再次调用show方法时需要确保其位置是否在可视区域，如果不在可视区域则需要调用窗口的setStyle方法设置其位置到可视区域内，如setStyle({left:'0px'});。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: (result: any) => void): void;
+    /**
+     * 获取Webview默认是否开启硬件加速
+     * 由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，	因此5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速。
+     * 	关闭硬件加速则可能会导致Webview页面无法支持Video标签播放视频等问题，如果在特定情况下需要调整修改默认开启硬件加速的行为，则可通过plus.webview.defaultHardwareAccelerated()方法获取当前设备默认是否开启硬件加速状态，从而决定是否需要显式开启或关闭指定Webview的硬件加速功能（通过WebviewStyles的hardwareAccelerated属性设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    defaultHardwareAccelerated(): boolean;
+}
+
+/**
+ * 一组用于定义页面或控件显示动画效果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewAnimationTypeShow {
+    /**
+     * 自动选择动画效果
+     * 自动选择动画效果，使用上次显示窗口设置的动画效果，如果是第一次显示则默认动画效果“none”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    auto?: string;
+    /**
+     * 无动画效果
+     * 立即显示页面，无任何动画效果，页面显示默认的动画效果。
+     * 	此效果忽略动画时间参数，立即显示。
+     * 	对应关闭动画"none"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    none?: string;
+    /**
+     * 从右侧横向滑动效果
+     * 页面从屏幕右侧外向内横向滑动显示。
+     * 	对应关闭动画"slide-out-right"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-right'?: string;
+    /**
+     * 从左侧横向滑动效果
+     * 页面从屏幕左侧向右横向滑动显示。
+     * 	对应关闭动画"slide-out-left"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-left'?: string;
+    /**
+     * 从上侧竖向滑动效果
+     * 页面从屏幕上侧向下竖向滑动显示。
+     * 	对应关闭动画"slide-out-top"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-top'?: string;
+    /**
+     * 从下侧竖向滑动效果
+     * 页面从屏幕下侧向上竖向滑动显示。
+     * 	对应关闭动画"slide-out-bottom"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-bottom'?: string;
+    /**
+     * 从透明到不透明逐渐显示效果
+     * 页面从完全透明到不透明逐渐显示。
+     * 	对应关闭动画"fade-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'fade-in'?: string;
+    /**
+     * 从小到大逐渐放大显示效果
+     * 页面在屏幕中间从小到大逐渐放大显示。
+     * 	对应关闭动画"zoom-in"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-out'?: string;
+    /**
+     * 从小到大逐渐放大并且从透明到不透明逐渐显示效果
+     * 页面在屏幕中间从小到大逐渐放大并且从透明到不透明逐渐显示。
+     * 	对应关闭动画"zoom-fade-in"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-fade-out'?: string;
+    /**
+     * 从右侧平移入栈动画效果
+     * 页面从屏幕右侧滑入显示，同时上一个页面带阴影效果从屏幕左侧滑出隐藏。
+     * 	对应关闭动画"pop-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'pop-in'?: string;
+}
+
+/**
+ * 一组用于定义页面或控件关闭的动画效果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewAnimationTypeClose {
+    /**
+     * 自动选择动画效果
+     * 自动选择显示窗口相对于的动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    auto?: string;
+    /**
+     * 无动画
+     * 立即关闭页面，无任何动画效果。
+     * 	此效果忽略动画时间参数，立即关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    none?: string;
+    /**
+     * 横向向右侧滑出屏幕动画
+     * 页面从屏幕中横向向右侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-right'?: string;
+    /**
+     * 横向向左侧滑出屏幕动画
+     * 页面从屏幕中横向向左侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-left'?: string;
+    /**
+     * 竖向向上侧滑出屏幕动画
+     * 页面从屏幕中竖向向上侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-top'?: string;
+    /**
+     * 竖向向下侧滑出屏幕动画
+     * 页面从屏幕中竖向向下侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-bottom'?: string;
+    /**
+     * 从不透明到透明逐渐隐藏动画
+     * 页面从不透明到透明逐渐隐藏关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'fade-out'?: string;
+    /**
+     * 从大逐渐缩小关闭动画
+     * 页面逐渐向页面中心缩小关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-in'?: string;
+    /**
+     * 从大逐渐缩小并且从不透明到透明逐渐隐藏关闭动画
+     * 页面逐渐向页面中心缩小并且从不透明到透明逐渐隐藏关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-fade-in'?: string;
+    /**
+     * 从右侧平移出栈动画效果
+     * 页面从屏幕右侧滑出消失，同时上一个页面带阴影效果从屏幕左侧滑入显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'pop-out'?: string;
+}
+
+/**
+ * Webview窗口对象，用于操作加载HTML页面的窗口
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewObject {
+    /**
+     * Webview窗口的标识
+     * 在打开或创建Webview窗口时设置，如果没有设置窗口标识，此属性值为undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * Webview窗口关闭事件
+     * 当Webview窗口关闭时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onclose?: (result: any) => void;
+    /**
+     * Webview窗口错误事件
+     * 当Webview窗口加载错误时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onerror?: PlusWebviewWebviewEvent;
+    /**
+     * Webview窗口页面加载完成事件
+     * 当Webview窗口页面加载完成时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onloaded?: PlusWebviewWebviewEvent;
+    /**
+     * Webview窗口页面开始加载事件
+     * 当Webview窗口开始加载新页面时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onloading?: PlusWebviewWebviewEvent;
+    /**
+     * 添加事件监听器
+     * 向Webview窗口添加事件监听器，当指定的事件发生时，将触发listener函数的执行。
+     * 		可多次调用此方法向Webview添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    addEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 在Webview窗口中添加子窗口
+     * 将另一个Webview窗口作为子窗口添加到当前Webview窗口中，添加后其所有权归父Webview窗口，当父窗口关闭时子窗口自动关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    append(webview?: PlusNativeObjView): void;
+    /**
+     * 添加Webview窗口预加载js文件
+     * 对于一些网络HTML页面，在无法修改HTML页面时可通过此方法自动加载本地js文件。
+     * 	当Webview窗口跳转到新页面时也会自动加载指定的js执行，添加多个js文件将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    appendJsFile(file?: string): void;
+    /**
+     * Webview窗口内容动画
+     * 动画后可能会导致Webview窗口显示内容改变，可通过调用restore方法恢复。
+     * 	当Webview窗口内容动画引起内容不可见（透明），将显示此窗口后面的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    animate(options?: PlusWebviewWebviewContentAnimationOptions, callback?: Function): void;
+    /**
+     * 后退到上次加载的页面
+     * Webview窗口历史记录操作，后退到窗口上次加载的HTML页面。
+     * 	如果窗口历史记录中没有可后退的页面则不触发任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    back(): void;
+    /**
+     * 开始Webview窗口的下拉刷新
+     * 开始触发下拉刷新效果，与用户操作下拉刷新行为一致（有动画效果）。
+     * 	触发setPullTorefresh方法设置的下拉刷新事件回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    beginPullToRefresh(): void;
+    /**
+     * 查询Webview窗口是否可后退
+     * Webview窗口历史记录查询操作，获取Webview是否可后退到历史加载的页面，结果通过queryCallback回调方法返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    canBack(queryCallback?: (result: any) => void): void;
+    /**
+     * 查询Webview窗口是否可前进
+     * Webview窗口历史记录查询操作，获取Webview是否可前进到历史加载的页面，结果通过queryCallback回调方法返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    canForward(queryCallback?: (result: any) => void): void;
+    /**
+     * 检测Webview窗口是否渲染完成
+     * 检测方式为判断的Webview窗口内容是否为白屏，如果非白屏则认为渲染完成，否则认为渲染未完成。
+     * 	通过successCallback回调函数返回结果，如果检测过程中发生错误则触发errorCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取Webview窗口的所有子Webview窗口
+     * 获取添加到Webview窗口中的所有子Webview窗口，如果没有子Webview窗口则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    children(): PlusWebview [];
+    /**
+     * 清空原生Webview窗口加载的内容
+     * 清除原生窗口的内容，用于重置原生窗口加载的内容，清除其加载的历史记录等内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    clear(): void;
+    /**
+     * 关闭Webview窗口
+     * 关闭并销毁Webview窗口，可设置关闭动画和动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close(aniClose?: PlusWebviewAnimationTypeClose, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 设置Webview窗口的滑屏操作手势
+     * 将Webview窗口的左右滑动手势关联到其它Webview窗口，可实现滑动切换显示Webview的动画效果（如Tab页面切换效果）。
+     * 	注意：滑屏操作会改变窗口位置（如left值等），如果不在可视区域则需要调用窗口的setStyle方法设置其位置到可视区域内，如setStyle({left:'0px'});。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: (result: PlusWebviewWebviewDragEvent) => void): void;
+    /**
+     * 截屏绘制
+     * 将Webview窗口的可视区域截屏并绘制到Bitmap图片对象中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    draw(bitmap?: PlusNativeObjBitmap, successCallback?: Function, errorCallback?: (result: any) => void, options?: PlusWebviewWebviewDrawOptions): void;
+    /**
+     * 结束Webview窗口的下拉刷新
+     * 关闭下拉刷新效果，恢复到开始下拉刷新之前的效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    endPullToRefresh(): void;
+    /**
+     * 在Webview窗口中执行JS脚本
+     * 将JS脚本发送到Webview窗口中运行，可用于实现Webview窗口间的数据通讯。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    evalJS(js?: string): void;
+    /**
+     * 前进到上次加载的页面
+     * Webview窗口历史记录操作，前进到窗口上次加载的HTML页面。
+     * 	如果窗口历史记录中没有可前进的页面则不触发任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    forward(): void;
+    /**
+     * 获取Webview窗口的收藏参数
+     * 获取Webview窗口的收藏参数，如收藏页面的标题、图标、地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getFavoriteOptions(): PlusWebviewWebviewFavoriteOptions;
+    /**
+     * 获取Webview窗口的分享参数
+     * 获取Webview窗口的分享参数，如分享的标题、图标、链接地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getShareOptions(): PlusWebviewWebviewShareOptions;
+    /**
+     * 获取Webview窗口的样式
+     * 获取Webview窗口的样式属性，如窗口位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getStyle(): PlusWebviewWebviewStyles;
+    /**
+     * 获取Webview窗口的原生子View控件对象
+     * 创建Webview窗口的所有原生子View控件。
+     * 	可以在创建窗口时设置其subNViews属性自动创建（应用首页可通过manfest.json中的plus-&gt;launchwebview-&gt;subNNViews节点配置创建）；
+     * 	也可以通过Webview窗口的append方法将已经创建的原生View控件添加为其子。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getSubNViews(): any [];
+    /**
+     * 获取Webview窗口加载HTML页面的标题
+     * 标题为HTML页面head节点下title节点中的文本内容，当窗口内容发生页面内跳转时可通过窗口触发的“loaded”事件中调用此方法来获取跳转后页面的标题。
+     * 	如果HTML页面没有使用title节点来设置标题，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTitle(): string;
+    /**
+     * 获取Webview窗口的标题栏控件对象
+     * 创建Webview窗口时设置其titleNView属性时则自动创建标题栏控件，应用首页可通过manfest.json中的plus-&gt;launchwebview-&gt;titleNView节点配置创建标题栏控件。
+     * 	可通过此方法获取Webview窗口创建的标题栏控件，对象类型为plus.nativeObj.View，可通过调用其drawBitmap/drawRect/drawText方法绘制更新内容来实现自定义样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTitleNView(): PlusNativeObjView;
+    /**
+     * 获取Webview窗口加载HTML页面的地址
+     * 当窗口内容发生页面内跳转时可通过窗口触发的“loaded”事件中调用此方法来获取跳转后页面的地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getURL(): string;
+    /**
+     * 隐藏Webview窗口
+     * 隐藏Webview窗口可保存已加载HTML页面的上下文数据，能降低应用使用的系统资源，通过show方法可将隐藏的Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide(aniHide?: PlusWebviewAnimationTypeClose, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 隐藏标题栏上按钮的红点
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hideTitleNViewButtonRedDot(index?: number): void;
+    /**
+     * 是否拦截Webview窗口的触屏事件
+     * 拦截后触屏事件不再传递，否则传递给View控件下的其它窗口处理。
+     * 	Webview窗口默认拦截所有触屏事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    interceptTouchEvent(intercept?: boolean): void;
+    /**
+     * 查询Webview窗口是否开启硬件加速
+     * 若Webview窗口已经开启硬件加速则返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    isHardwareAccelerated(): boolean;
+    /**
+     * 查询Webview窗口是否可见
+     * 若Webview窗口已经显示（调用过show方法，即使被其它窗口挡住了也认为已显示）则返回true，若Webview窗口被隐藏则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    isVisible(): boolean;
+    /**
+     * 监听页面开始加载资源
+     * Webview加载资源时，如果满足options参数中定义的条件，则触发callback回调。
+     * 	此方法仅触发回调事件，不会阻止资源的加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: (result: any) => void): void;
+    /**
+     * 加载新HTML数据
+     * 触发Webview窗口加载HTML页面数据，如果HTML数据无效将导致页面加载失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loadData(data?: string, options?: PlusWebviewWebviewLoadDataOptions): void;
+    /**
+     * 加载新URL页面
+     * 触发Webview窗口从新的URL地址加载页面，如果url地址无效将导致页面显示失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loadURL(url?: string, additionalHttpHeaders?: any): void;
+    /**
+     * 获取Webview窗口对象的原生（Native.JS）实例对象
+     * Android平台返回Webview窗口对象的android.webkit.Webview实例对象，
+     * 	iOS平台返回Webview窗口对象的UIWebview实例对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    nativeInstanceObject(): PlusAndroidInstanceObject | PlusIosInstanceObject;
+    /**
+     * 获取在当前Webview窗口中创建的所有窗口
+     * 返回从当前Webview中调用plus.webview.open或plus.webview.create创建的所有Webview窗口数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opened(): PlusWebview [];
+    /**
+     * 获取当前Webview窗口的创建者
+     * 创建者为调用plus.webview.open或plus.webview.create方法创建当前窗口的Webview窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opener(): PlusWebviewWebviewObject;
+    /**
+     * 拦截Webview窗口的资源加载
+     * 根据区配规则拦截Webview窗口加载资源的URL地址，重定向到其它资源地址（暂仅支持本地地址）。
+     * 	注意：多次调用overrideResourceRequest时仅以最后一次调用设置的参数值生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    overrideResourceRequest(options?: PlusWebview []): void;
+    /**
+     * 拦截Webview窗口的URL请求
+     * 拦截URL请求后，Webview窗口将不会跳转到新的URL地址，此时将通过callback回调方法返回拦截的URL地址（可新开Webview窗口加载URL页面等）。
+     * 	此方法只能拦截窗口的网络超链接跳转（包括调用loadURL方法触发的跳转），不可拦截页面请求资源请求（如加载css/js/png等资源的请求）。
+     * 	注意：多次调用overrideUrlLoading时仅以最后一次调用设置的参数值生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: (result: any) => void): void;
+    /**
+     * 获取当前Webview窗口的父窗口
+     * Webview窗口作为子窗口添加（Webview.append）到其它Webview窗口中时有效，这时其它Webview窗口为父窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    parent(): PlusWebviewWebviewObject;
+    /**
+     * 重新加载Webview窗口显示的HTML页面
+     * 触发Webview窗口重新加载当前显示的页面内容。
+     * 	如果当前HTML页面未加载完则停止并重新加载，如果当前Webview窗口没有加载任何页面则无响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    reload(force?: boolean): void;
+    /**
+     * 重置Webview窗口的回弹位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，松开后自动回弹到停靠位置。
+     * 	这时需要调用此方法来重置窗口的回弹位置，窗口将采用动画方式回弹到其初始显示的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    resetBounce(): void;
+    /**
+     * 恢复Webview控件显示内容
+     * 恢复调用animate方法改变Webview控件的内容，更新至动画前显示的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    restore(): void;
+    /**
+     * 移除子Webview窗口
+     * 从当前Webview窗口移除指定的子Webview窗口，若指定的webview对象不是当前窗口的子窗口则无任何作用。
+     * 	移除后子Webview窗口不会关闭，需要调用其close方法才能真正关闭并销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    remove(webview?: PlusNativeObjView): void;
+    /**
+     * 移除Webview窗口事件监听器
+     * 从Webview窗口移除通过addEventListener方法添加的事件监听器，若没有查找到对应的事件监听器，则无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void): void;
+    /**
+     * 从父窗口中移除
+     * 从所属的父Webview窗口移除，如果没有父窗口，则无任何作用。
+     * 	从父窗口中移除后子Webview窗口不会关闭，需要调用其close方法才能真正关闭并销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeFromParent(): void;
+    /**
+     * 移除标题栏上按钮的角标
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeTitleNViewButtonBadge(index?: number): void;
+    /**
+     * 设置Webview窗口的回弹效果
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，松开后自动回弹到停靠位置（可通过style设置）。
+     * 	拖拽窗口内容时页面显示Webview窗口的背景色，默认为透明，此时显示Webview下面的内容，利用这个特点可以实现自定下拉刷新特效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setBounce(style?: PlusWebviewWebviewBounceStyle): void;
+    /**
+     * 设置Webview窗口是否阻塞加载页面中使用的网络图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setBlockNetworkImage(block?: boolean): void;
+    /**
+     * 设置HTML内容是否可见
+     * 设置HTML内容不可见后，将显示Webview窗口的背景色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setContentVisible(visible?: boolean): void;
+    /**
+     * 设置预加载的CSS文件
+     * 预加载CSS文件不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的CSS文件后将清空之前设置的值（包括调用setCssText设置的值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setCssFile(file?: string): void;
+    /**
+     * 设置预加载的CSS内容
+     * 预加载CSS内容不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的CSS内容后将清空之前设置的值（包括调用setCssFile设置的值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setCssText(text?: string): void;
+    /**
+     * 设置Webview窗口的收藏参数
+     * 仅在流应用环境（流应用/5+浏览器）中有效：用户点击流应用环境的收藏按钮时使用的参数，如设置收藏页面标题，图标、页面地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setFavoriteOptions(options?: PlusWebviewWebviewFavoriteOptions): void;
+    /**
+     * 设置Webview窗口底部修复区域高度
+     * 如果Webview加载页面中存在底部停靠区域（如“蘑菇街”WAP页面的底部Tab栏），在页面滚动时动态改变Webview高度可能会出现底部停靠区域抖动的现象（如360浏览器中向上滑顶部标题栏自动消失引起Webview变高）。
+     * 	此时可以调用此方法来指定底部停靠区域（通常是底部Tab栏）进行优化修复抖动效果，高度值为底部停靠区域的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setFixBottom(height?: number): void;
+    /**
+     * 设置预加载的JS文件
+     * 预加载JS文件不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的JS文件后将清空之前设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setJsFile(file?: string): void;
+    /**
+     * 设置Webview窗口的下拉刷新效果
+     * 开启Webview窗口的下拉刷新功能，显示窗口内置的下拉刷新控件样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setPullToRefresh(style?: PlusWebviewWebviewPullToRefreshStyles, refreshCB?: Function): void;
+    /**
+     * 设置Webview窗口rendered事件参数
+     * 可设置页面渲染完成的判断标准，如判断页面顶部区域、中间区域、或底部区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setRenderedEventOptions(options?: PlusWebviewWebviewRenderedEventOptions): void;
+    /**
+     * 设置Webview窗口的样式
+     * 更新Webview窗口的样式，如窗口位置、大小、背景色等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setStyle(styles?: PlusWebviewWebviewStyles): void;
+    /**
+     * 设置Webview窗口的分享参数
+     * 仅在流应用环境（流应用/5+浏览器）中有效：用户点击流应用环境的分享按钮时使用的参数，如设置分享的标题、链接地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setShareOptions(options?: PlusWebviewWebviewShareOptions): void;
+    /**
+     * 设置标题栏上按钮的角标
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setTitleNViewButtonBadge(index?: number, text?: string): void;
+    /**
+     * 设置Webview窗口是否可见
+     * 修改窗口是否可见并不影响窗口的显示栈顺序，窗口显示与隐藏也不会有动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setVisible(visible?: boolean): void;
+    /**
+     * 显示Webview窗口
+     * 当调用plus.webview.create方法创建Webview窗口后，需要调用其show方法才能显示，并可设置窗口显示动画及动画时间。
+     * 	Webview窗口被隐藏后也可调用此方法来重新显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show(aniShow?: PlusWebviewAnimationTypeShow, duration?: number, showedCB?: Function, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 在指定Webview窗口后显示
+     * 当调用plus.webview.create方法创建Webview窗口后，可调用其showBehind方法显示在指定Webview窗口之后。
+     * 	这种显示方式不会出现动画效果，当指定的Webview窗口关闭后，则自身窗口自动显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    showBehind(webview?: PlusWebviewWebviewObject): void;
+    /**
+     * 设置标题栏上按钮的红点
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 	注意：设置显示按钮的角标后红点不显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    showTitleNViewButtonRedDot(index?: number): void;
+    /**
+     * 停止加载HTML页面内容
+     * 触发Webview窗口停止加载页面内容，如果已经加载部分内容则显示部分内容，如果加载完成则显示全部内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    stop(): void;
+    /**
+     * 更新Webview窗口的原生子View控件对象
+     * 通过WebviewSubNViewStyles中的id属性值匹配子View控件更新绘制内容，如果没有查找到对应id的子View控件则忽略。
+     * 	此操作仅更新子View控件上绘制的内容，不会添加或删除原生子View控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    updateSubNViews(styles?: PlusWebview []): void;
+}
+
+/**
+ * Webview窗口动画参数
+ * 用于指定动画目标窗口，起始位置、目标位置等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewAnimationOptions {
+    /**
+     * 执行动画的窗口对象
+     * 可取值Webview窗口对象、Webview窗口的id（String类型）、原生View窗口对象（plus.nativeObj.View）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    view?: PlusWebviewWebviewObject;
+    /**
+     * 动画样式
+     * 用于指定动画窗口的起始位置，目标位置等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    styles?: PlusWebviewWebviewAnimationStyles;
+    /**
+     * 窗口动画完成后的行为
+     * 可取值：
+     * 	"none" - 动画完成后不做任何操作；
+     * 	"hide" - 动画完成后隐藏窗口；
+     * 	"close" - 动画完成后关闭窗口。
+     * 	默认值为"none"。
+     * - none: 动画完成后不做任何操作
+     * - hide: 动画完成后隐藏窗口
+     * - close: 动画完成后关闭窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    action?: 'none' | 'hide' | 'close';
+}
+
+/**
+ * Webview窗口动画样式
+ * 用于指定动画窗口的起始位置、目标位置等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewAnimationStyles {
+    /**
+     * 画窗口的起始左侧位置
+     * 支持百分比、像素值，默认值为当前窗口的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fromLeft?: string;
+    /**
+     * 画窗口的目标左侧位置
+     * 持百分比、像素值。
+     * 	注意：如果设置的位置与起始位置一直，则无动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    toLeft?: string;
+}
+
+/**
+ * Webview窗口回弹样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewBounceStyle {
+    /**
+     * Webview窗口支持回弹效果的方向
+     * 可通过此参数设置开启Webview哪个方向支持回弹效果。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部支持回弹效果；
+     * 	left：表示窗口左侧支持回弹效果；
+     * 	right：表示窗口右侧支持回弹效果；
+     * 	bottom：表示窗口底部支持回弹效果。
+     * 	**目前仅支持top属性**
+     * 	属性值：用于指定可拖拽的范围，可取百分比，如"10%"；像素值，如"100px"；自动计算值，如"auto"；无回弹效果值，如"none"；
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    position?: any;
+    /**
+     * Webview窗口回弹时停靠的位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，拖拽过程中将触发"dragBounce"事件，松开后自动回弹到停靠位置。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部回弹时停靠的位置。
+     * 	属性值：用于指定窗口回弹的位置，可取百分比，如"5%"；像素值，如"100px"；自动计算值，如"auto"，默认为可拖拽的范围值的一半；
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    changeoffset?: any;
+    /**
+     * Webview窗口侧滑时停靠的位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（左侧或右侧）时，在拖拽时窗口整体内容将跟随移动，松开后自动停靠的侧滑位置，并触发"slideBounce"事件。
+     * 	支持以下属性：
+     * 	left：表示窗口左侧侧滑的位置；
+     * 	right：表示窗口右侧侧滑的位置。
+     * 	属性值：用于指定滑动后停靠的距离，可取百分比（left/right相对于窗口的宽度，top/bottom相对于窗口的高度），如"30%"；像素值，如"100px"；自动计算值，为可拖拽范围，如"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    slideoffset?: any;
+    /**
+     * Webview窗口拖拽偏移的位置
+     * 开启窗口回弹效果后，可以通过此属性值来主动设置拖拽的偏移位置，与手动操作拖拽至此偏移位置松开后的逻辑一致。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部偏移的位置；
+     * 	left：表示窗口左侧偏移的位置；
+     * 	right：表示窗口右侧偏移的位置；
+     * 	bottom：表示窗口底部偏移的位置。
+     * 	属性值：用于指定偏移的位置，可取百分比，如"5%"；像素值，如"100px"；有效值范围为0到position属性定义的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    offset?: any;
+    /**
+     * Webview窗口是否阻止touch事件传递给DOM元素
+     * 设置为true表示阻止touch事件，设置为false表示不阻止touch事件。当开启侧滑功能（左侧滑和右侧滑）时默认值为true，否则为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    preventTouchEvent?: boolean;
+}
+
+/**
+ * Webview窗口内容动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewContentAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值："shrink" - 从上到下分块收缩清除窗口动画。
+     * - shrink: 从上到下分块清除动画
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'shrink';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    duration?: number;
+    /**
+     * 动画帧数
+     * 必须为大于0的整数，默认值为12。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    frames?: number;
+    /**
+     * 动画作用区域
+     * 支持以下属性：
+     * 	top - 区域距离控件顶部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	bottom - 区域距离控件底部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	left - 区域距离控件左侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'；
+     * 	right - 区域距离控件右侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'。
+     * 	如“{top:'44px',bottom:'48px'}”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    region?: any;
+}
+
+/**
+ * 原生控件在窗口中停靠的方式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDock {
+    /**
+     * 控件停靠则页面顶部
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    top?: string;
+    /**
+     * 控件停靠在页面底部
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bottom?: string;
+    /**
+     * 控件停靠在页面右侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    right?: string;
+    /**
+     * 控件停靠在页面左侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    left?: string;
+}
+
+/**
+ * Webview窗口滑动事件数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragEvent {
+    /**
+     * 手势类型
+     * 可取值：
+     * 	"rtl" - 从右向左滑动手势；
+     * 	"left" - 向左滑动手势，与rtl一致；
+     * 	"ltr" - 从左向右滑动手势；
+     * 	"right" - 向右滑动手势，与ltr一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    direction?: string;
+    /**
+     * 窗口滑动类型
+     * 可取值：
+     * 	"start" - 表示开始滑动操作；
+     * 	"move" - 表示正在滑动；
+     * 	"end" - 表示滑动操作结束。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: string;
+    /**
+     * 窗口滑动结果
+     * 可取值：
+     * 	"true" - 表示滑动操作成功；
+     * 	"false" - 表示滑动操作失败（恢复到滑动前的状态）；
+     * 	"undefined" - 无状态值（当type值为"end"时返回此值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    result?: string;
+    /**
+     * 当前操作窗口标识
+     * 当type值为"start"/"move"时，保存当前操作窗口（或View控件）的标识；
+     * 	当type值为"end"时保存滑动操作后显示窗口（或View控件）的标识（即result值为"true"则认为关联窗口显示，result值为false则认为主窗口显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * 关联窗口标识
+     * 滑动操作关联窗口（或View控件）的标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    otherId?: string;
+    /**
+     * 主窗口标识
+     * 滑动操作主窗口（或View控件）的标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    targetId?: string;
+    /**
+     * 滑动进度
+     * 滑动进度位置信息，取值范围为0-100，如20表示滑动了总距离的20%：
+     * 	当type值为"start"时progress值为0；
+     * 	当type值为"end"时如果result为true则progress值为0，如果result为false则progress值为100；
+     * 	当type值为"move"时，保存当前滑动的进度信息（注：多次触发move事件）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: number;
+}
+
+/**
+ * 窗口手势操作参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragOptions {
+    /**
+     * 滑屏操作回调事件触发步长
+     * 用于设置滑屏回调事件触发频率，取值范围为1-100，值越小触发频率越高，值越大触发频率越小，默认值为20。
+     * 	如设置值为20，则表示滑屏操作移动距离超过可移动范围的20%则触发一次回调事件，可通过回调函数参数（WebviewDragEvent）的progress属性获取。
+     * 	注意：触发频率过大会影响效率，开发者需谨慎设置此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    callbackStep?: number;
+    /**
+     * 设置的手势类型
+     * 可取值：
+     * 	可取值：
+     * 	"rtl" - 从右向左滑动手势；
+     * 	"left" - 向左滑动手势，与rtl一致；
+     * 	"ltr" - 从左向右滑动手势；
+     * 	"right" - 向右滑动手势，与ltr一致。
+     * - rtl: 从右向左滑动手势
+     * - left: 向左滑动手势，与rtl一致
+     * - ltr: 从左向右滑动手势
+     * - right: 向右滑动手势，与ltr一致
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    direction?: 'rtl' | 'left' | 'ltr' | 'right';
+    /**
+     * 滑动手势模式
+     * 可取值：
+     * 	"followFinger" - 当前Webview窗口跟随手指滑动；
+     * 	"silent" - 当前Webview窗口不跟随手指滑动；
+     * 	"bounce" - 当前Webview窗口自动回弹（松手后窗口恢复到拖动前的位置）,通常可通过设置此模式来实现Tab项无法继续滑动切换自动回弹效果。
+     * - followFinger: 当前Webview窗口跟随手指滑动
+     * - silent: 当前Webview窗口不跟随手指滑动
+     * - bounce: 当前Webview窗口自动回弹
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    moveMode?: 'followFinger' | 'silent' | 'bounce';
+}
+
+/**
+ * 手势操作关联对象参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragOtherViewOptions {
+    /**
+     * 手势关联对象
+     * 可取值Webview窗口的id（String类型）、Webview窗口对象、原生View窗口对象（plus.nativeObj.View）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    view?: string;
+    /**
+     * 滑动模式
+     * 可取值：
+     * 	"follow" - 同步跟随主Webview窗口滑动；
+     * 	"silent" - 不跟随主Webview窗口滑动。
+     * - follow: 同步跟随主Webview窗口滑动
+     * - silent: 不跟随主Webview窗口滑动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    moveMode?: 'follow' | 'silent';
+}
+
+/**
+ * 截屏绘制操作参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDrawOptions {
+    /**
+     * 截屏图片的位深
+     * 可取值：
+     * 		"RGB565" - RGB565彩色模式,一个像素占两个字节；
+     * 		"ARGB" - ARGB彩色模式,保存透明度信息。
+     * - RGB565: 
+     * 	RGB565彩色模式,一个像素占两个字节。
+     * 								
+     * - ARGB: 
+     * 	ARGB彩色模式,保存透明度信息。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bit?: 'RGB565' | 'ARGB';
+    /**
+     * 是否检测截屏图片是否为空白
+     * 可取值：
+     * 		true - 表示检测到截屏到空白图片时认为操作失败（触发错误回调函数）；
+     * 		false - 表示不检测，即使为空白图片仍然返回成功。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    check?: boolean;
+    /**
+     * 设置截屏区域
+     * 相对于Webview窗口的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    clip?: PlusNativeObj;
+    /**
+     * 是否检测当前是否弹出软键盘
+     * 可取值：
+     * 		true - 表示检测到弹出软键盘是认为截屏操作失败（触发错误回调函数）；
+     * 		false - 表示不检测软键盘状态，直接截屏。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    checkKeyboard?: boolean;
+}
+
+/**
+ * 窗口收藏参数
+ * 在流应用环境中调用收藏功能时使用的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewFavoriteOptions {
+    /**
+     * 收藏时显示的图标
+     * 在收藏列表中显示的图标，默认使用应用图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    icon?: string;
+    /**
+     * 收藏时显示的标题
+     * 在收藏列表中显示的标题字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    title?: string;
+    /**
+     * 收藏的页面地址
+     * 必须是网络地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    href?: string;
+}
+
+/**
+ * 创建加载HTML数据参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewLoadDataOptions {
+    /**
+     * 页面的Base URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    baseURL?: string;
+    /**
+     * HTML数据的数据类型
+     * 默认值为"text/html"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mimeType?: string;
+    /**
+     * HTML数据的编码类型
+     * 默认值为"utf-8"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    encoding?: string;
+}
+
+/**
+ * 窗口的分享参数
+ * 在流应用环境中调用分享功能时使用的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewShareOptions {
+    /**
+     * 分享时使用的图标
+     * 默认使用应用图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    icon?: string;
+    /**
+     * 分享时使用的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    title?: string;
+    /**
+     * 分享时使用的链接地址
+     * 必须是网络地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    href?: string;
+}
+
+/**
+ * 窗口原生子View控件样式
+ * 可设置原生控件的标识、大小、位置以及绘制的内容等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewSubNViewStyles {
+    /**
+     * 原生子View控件的标识
+     * 可通过plus.nativeObj.View.getViewById(id)方法传入此标识来获取子View控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * 原生子View控件类型
+     * 可取值：
+     * 		"NView" - 原生子View控件（plus.nativeObj.NView）；
+     * 		"ImageSlider" - 原生图片轮播控件（plus.nativeObj.ImageSlider）。
+     * 	默认值为"NView"。
+     * - NView: 
+     * 	原生子View控件（plus.nativeObj.NView）
+     * 								
+     * - ImageSlider: 
+     * 	原生图片轮播控件（plus.nativeObj.ImageSlider）							
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'NView' | 'ImageSlider';
+    /**
+     * 原生子View控件的样式
+     * 可设置原生控件的位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    styles?: PlusNativeObjViewStyles;
+    /**
+     * 原生子View控件初始绘制内容
+     * 可设置绘制图片、矩形区域、文本等内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    tags?: any [];
+}
+
+/**
+ * 窗口标题栏控件样式
+ * 标题栏控件固定高度为44px,可通过Webview窗口对象的getTitleNView方法获取标题栏原生控件对象动态绘制内容。
+ * 	可以通过WebviewObject对象的getTitleNView()获取标题栏的NView对象，然后调用其setStyle方法更新样式。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTitleNViewStyles {
+    /**
+     * 标题栏控件是否显示左侧返回按钮
+     * 可取值：
+     * 		"true" - 显示返回按钮；
+     * 		"false" - 不显示返回按钮。
+     * 	默认值为"false"。
+     * 	返回按钮的颜色为窗口标题文字颜色，按下时颜色自动调整透明度为0.3。
+     * 	点击返回按钮的逻辑与按下系统返回键逻辑一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    autoBackButton?: boolean;
+    /**
+     * 标题栏控件的背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景，默认值为"#F7F7F7"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColor?: string;
+    /**
+     * 标题栏上的自定义按钮
+     * 创建的自定义按钮数目不限制，实际应用中建议最多设置4个按钮（包括左侧返回按钮）。
+     * 	注意：此属性不支持动态修改，仅在创建titleNView时设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    buttons?: PlusWebview [];
+    /**
+     * 标题栏控件变化作用范围
+     * 仅在type值为transparent时有效，页面滚动时标题栏背景透明度将发生变化。
+     * 	当页面滚动到指定偏移量时标题栏背景变为完全不透明。
+     * 	支持百分比、像素值，默认为'132px'。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    coverage?: string;
+    /**
+     * 标题栏控件是否显示Home按钮
+     * 可取值：
+     * 		"true" - 显示Home按钮；
+     * 		"false" - 不显示Home按钮。
+     * 	默认值为"false"。
+     * 	Home按钮的颜色为窗口标题文字颜色，按下时颜色自动调整透明度为0.3。
+     * 	点击Home按钮的逻辑为关闭所有非首页窗口，显示首页窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    homeButton?: boolean;
+    /**
+     * 内边距
+     * 标题栏左右的内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    padding?: string;
+    /**
+     * 右内边距
+     * 标题栏右侧内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"，优先级padding-right &gt; padding。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'padding-right'?: string;
+    /**
+     * 左内边距
+     * 标题栏左侧内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"，优先级padding-left &gt; padding。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'padding-left'?: string;
+    /**
+     * 标题栏控件的进度条样式
+     * 设置此属性则在标题栏控件的底部显示进度条，可配置进度条颜色值即高度。
+     * 	设置此属性值为undefined或null则隐藏进度条。
+     * 	默认不显示底部进度条。
+     * 	注意：此属性将废弃，推荐使用WebviewStyles的progress。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 标题栏控件的底部分割线
+     * 设置此属性则在标题栏控件的底部显示分割线，可配置颜色值及高度。
+     * 	设置此属性值为undefined或null则隐藏分割线。
+     * 	默认不显示底部分割线。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    splitLine?: PlusWebviewWebviewSplitLineStyles;
+    /**
+     * 标题栏上初始自定义绘制内容
+     * 可用于设置自定义绘制图片、矩形区域、文本等内容。
+     * 	注意：此属性不支持动态修改，仅在创建titleNView时设置有效，如果需要更新绘制内容可根据tags的id调用draw方法操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    tags?: any [];
+    /**
+     * 标题栏控件的标题文字颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示标题文字颜色为红色，默认值为"#000000"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleColor?: string;
+    /**
+     * 标题栏控件的标题文字超出显示区域时处理方式
+     * 可取值：
+     * 		"clip" - 超出显示区域时内容裁剪；
+     * 		"ellipsis" - 超出显示区域时尾部显示省略标记（...）。
+     * 	默认值为"ellipsis"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleOverflow?: string;
+    /**
+     * 标题栏控件的标题文字内容
+     * 在标题栏控件居中（水平和垂直）显示，左右边距为88px，如果文本过长则尾部裁剪（加三个点"..."）显示。
+     * 	当不设置titleText属性或属性值为undefined/null时，使用当前Webview窗口加载页面的标题，并自动同步更新页面的标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleText?: string;
+    /**
+     * 标题栏控件的标题文字字体大小
+     * 字体大小单位为像素，如"20px"表示字体大小为20像素，默认值为17像素。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleSize?: string;
+    /**
+     * 标题栏控件样式
+     * 可取值：
+     * 		"default" - 默认样式，顶部停靠显示，挤压Webview页面内容显示区域；
+     * 		"transparent" - 透明样式，顶部沉浸式显示覆盖Webview页面内容，标题栏上内容（除按钮外）全部透明，当页面滚动时透明度逐渐变化，直到不透明显示。
+     * 	默认值为"default"。
+     * 	注意：此属性不支持动态更新。
+     * - default: 
+     * 	默认样式，顶部停靠显示，挤压Webview页面内容显示区域
+     * 								
+     * - transparent: 
+     * 	透明样式，顶部沉浸式显示覆盖Webview页面内容，标题栏上内容（除按钮外）全部透明，当页面滚动时透明度逐渐变化，直到不透明显示							
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'default' | 'transparent';
+}
+
+/**
+ * 窗口标题栏自定义按钮样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTitleNViewButtonStyles {
+    /**
+     * 按钮样式
+     * 运行环境中内置按钮样式直接使用，内置样式忽略fontSrc和text属性。
+     * 	可取值：
+     * 		"forward" - 前进按钮；
+     * 		"back" - 后退按钮；
+     * 		"share" - 分享按钮；
+     * 		"favorite" - 收藏按钮；
+     * 		"home" - 主页按钮；
+     * 		"menu" - 菜单按钮；
+     * 		"close" - 关闭按钮；
+     * 		"none" - 无样式。
+     * 	默认值为无样式（"none"），需通过text属性设置按钮上显示的内容、通过fontSrc属性设置使用的字体库。
+     * - forward: 前进按钮
+     * - back: 后退按钮
+     * - share: 分享按钮
+     * - favorite: 收藏按钮
+     * - home: 主页按钮
+     * - menu: 菜单按钮
+     * - close: 关闭按钮
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'forward' | 'back' | 'share' | 'favorite' | 'home' | 'menu' | 'close';
+    /**
+     * 按钮的背景颜色
+     * 仅在标题栏type=transparent时生效，当标题栏透明时按钮显示的背景颜色。
+     * 	可取值#RRGGBB和rgba格式颜色字符串，默认值为灰色半透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+    /**
+     * 按钮上显示的角标文本
+     * 最多显示3个字符，超过则显示为...。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    badgeText?: string;
+    /**
+     * 按钮上文字颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色返回键；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为窗口标题栏控件的标题文字颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 按下状态按钮文字颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色返回键；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为color属性值自动调整透明度为0.3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    colorPressed?: string;
+    /**
+     * 按钮在标题栏上的显示位置
+     * 可取值：
+     * 		"right" - 在标题栏中靠右排列显示；
+     * 		"left" - 在标题栏中靠左侧排列显示（在返回键后）。
+     * 		默认值为"right"。
+     * - right: 
+     * 	在标题栏中靠右排列显示
+     * 								
+     * - left: 
+     * 	在标题栏中靠左侧排列显示（在返回键后）
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    float?: 'right' | 'left';
+    /**
+     * 按钮上文字的粗细
+     * 可取值：
+     * 		"normal" - 标准字体；
+     * 		"bold" - 加粗字体。
+     * 	默认值为"normal"。
+     * - normal: 
+     * 	标准字体
+     * 								
+     * - bold: 
+     * 	加粗字体
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontWeight?: 'normal' | 'bold';
+    /**
+     * 按钮上文字大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"22px"。 
+     * 	窗口标题栏为透明样式（type="transparent"）时，默认值为"22px"；
+     * 	窗口标题栏为默认样式（type="default"）时，默认值为"27px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontSize?: string;
+    /**
+     * 按钮上文字使用的字体文件路径
+     * 字体文件路径支持以下类型：
+     * 		相对路径 - 相对于当前页面的host位置，如"a.ttf"，注意当前页面为网络地址则不支持；
+     * 		绝对路径 - 系统绝对路径，如Android平台"/sdcard/a.ttf"，此类路径通常通过其它5+ API获取的；
+     * 		扩展相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.ttf"；
+     * 		本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontSrc?: string;
+    /**
+     * 按钮点击后触发的回调函数
+     * 回调函数中将返回此JSON对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onclick?: (result: any) => void;
+    /**
+     * 按钮上是否显示红点
+     * 设置为true则显示红点，false则不显示红点。默认值为false。
+     * 	注意：当设置了角标文本时红点不显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    redDot?: boolean;
+    /**
+     * 是否显示选择指示图标
+     * 设置为true则显示选择指示图标（向下箭头），颜色与文字颜色一致；
+     * 	false则不显示。默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    select?: boolean;
+    /**
+     * 按钮上显示的文字
+     * 推荐使用一个字符，超过一个字符可能无法正常显示，使用字体图标时unicode字符表示必须'\u'开头，如"\ue123"（注意不能写成"\e123"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    text?: string;
+    /**
+     * 按钮的宽度
+     * 可取值：
+     * 		"*px" - 逻辑像素值，如"10px"表示10逻辑像素值，按钮的内容居中显示；
+     * 		"auto" - 自定计算宽度，根据内容自动调整按钮宽度。
+     * 	默认值为"44px"（适合字体图标）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    width?: string;
+}
+
+/**
+ * 标题栏控件的进度条样式
+ * 显示在标题栏控件底部。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewProgressStyles {
+    /**
+     * 进度条颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色分割线；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#00FF00"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 进度条高度
+     * 可取值：像素值（逻辑像素），支持小数点，如"1px"表示1像素高；百分比，如"1%"，相对于标题栏控件的高度。
+     * 	默认值为"2px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+}
+
+/**
+ * 窗口标题栏控件的分割线样式
+ * 显示在标题栏控件底部。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewSplitLineStyles {
+    /**
+     * 底部分割线颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色分割线；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#CCCCCC"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 底部分割线高度
+     * 可取值：像素值（逻辑像素），支持小数点，如"1px"表示1像素高；百分比，如"1%"，相对于标题栏控件的高度。
+     * 	默认值为"1px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+}
+
+/**
+ * Webview窗口事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewEvent {
+    /**
+     * Webview窗口关闭事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口关闭时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close?: string;
+    /**
+     * Webview窗口回弹事件
+     * 通过WebviewObject对象的setBounce方法开启回弹效果设置顶部下拉回弹changeoffset属性后，当用户向下拖拽窗口时触发发此事件，回调函数类型为BounceEventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dragBounce?: string;
+    /**
+     * Webview窗口回弹事件
+     * 通过WebviewObject对象的setBounce方法开启回弹效果设置左右侧侧滑slideoffset属性后，当用户向左右侧拖拽窗口侧滑时触发发此事件，回调函数类型为BounceEventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    slideBounce?: string;
+    /**
+     * Webview窗口加载错误事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载错误时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    error?: string;
+    /**
+     * Webview窗口隐藏事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口隐藏（窗口动画完成后）时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide?: string;
+    /**
+     * Webview窗口页面开始加载事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口开始加载新页面时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loading?: string;
+    /**
+     * Webview窗口页面加载完成事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口页面加载完成时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loaded?: string;
+    /**
+     * Webview窗口显示遮罩层时点击事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口通过mask属性设置显示遮罩层并且点击时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    maskClick?: string;
+    /**
+     * Webview窗口开始渲染事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口开始渲染内容时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rendering?: string;
+    /**
+     * Webview窗口渲染完成事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口渲染完成时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rendered?: string;
+    /**
+     * Webview窗口显示事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口显示（窗口动画完成后）时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show?: string;
+    /**
+     * Webview加载页面标题更新事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载新页面更新标题时触发此事件，回调函数类型为SuccessCallback。
+     * 	注意：此事件会先于loaded事件触发，通常在加载网络页面时通过此事件可更快获取到页面的标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleUpdate?: string;
+    /**
+     * Webview窗口接收到触屏事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当用户操作按下到Webview窗口时触发此事件，回调函数类型为SuccessCallback。
+     * 	注意：每按下屏幕触发一次此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    touchstart?: string;
+    /**
+     * Webview窗口侧滑返回事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口侧滑返回时触发此事件，回调函数类型为PopGestureCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    popGesture?: string;
+    /**
+     * Webview窗口加载进度变化事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载页面进度变化时触发此事件。
+     * 	回调函数原型为void PorgressCandedCallback(Event e),可通过e.progress获取窗口加载进度，取值范围为0-100。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progressChanged?: string;
+    /**
+     * Webview窗口下拉刷新事件
+     * Webview窗口打开下拉刷新功能后，用户操作下拉刷新时或调用beginPullToRefresh方法时触发，用于通知业务逻辑可以开始执行刷新操作。
+     * 	更新操作完成后调用窗口的endPullToRefresh方法结束下拉刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    pullToRefresh?: string;
+}
+
+/**
+ * JSON对象，原生窗口扩展参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewExtraOptions {
+    /**
+     * 窗口动画加速
+     * 开启窗口动画加速功能可优化窗口动画效果，提升动画流程度，可避免部分设备上打开（关闭）窗口闪屏的问题。
+     * 	可取值：
+     * 	"auto" - 自动优化窗口动画；
+     * 	"none" - 关闭窗口动画加速功能；
+     * 	"capture" - 使用截屏方式加速窗口动画。
+     * 	默认值为"auto"。
+     * - auto: 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    acceleration?: 'auto';
+    /**
+     * 窗口动画加速时使用的图片
+     * 当使用截屏方式加速窗口动画时，可设置已经创建好的截屏图片，此时不会进行实时截屏操作，加速窗口动画响应时间，提升用户体验。
+     * 	如果未指定截屏图片，则实时截取当前Webview窗口对象的图片进行动画操作。
+     * 	如果窗口未使用截屏方式加速动画，则忽略此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    capture?: PlusNativeObjBitmap;
+    /**
+     * 关联窗口动画使用的图片
+     * 当使用截屏方式加速窗口动画时，可设置已经创建好的截屏图片，此时不会进行实时截屏操作，加速关联窗口动画响应时间，提升用户体验。
+     * 	如果未指定截屏图片，则实时截取关联Webview窗口对象的图片进行动画操作。
+     * 	如果窗口未使用截屏方式加速动画，则忽略此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    otherCapture?: PlusNativeObjBitmap;
+}
+
+/**
+ * 原生控件在窗口中显示的位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewPosition {
+    /**
+     * 控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    static?: string;
+    /**
+     * 控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    absolute?: string;
+    /**
+     * 控件在页面中停靠，停靠的位置通过dock属性进行定义
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dock?: string;
+}
+
+/**
+ * Webview窗口下拉刷新样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewPullToRefreshStyles {
+    /**
+     * 是否开启Webview窗口的下拉刷新功能
+     * true表示开启窗口的下拉刷新功能；
+     * 	false表示关闭窗口的下拉刷新功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    support?: boolean;
+    /**
+     * 下拉刷新控件颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"为设置下拉属性控件为红色，默认值为"#2BD009"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 下拉刷新样式
+     * 用于定义下拉刷新风格样式，可取值：
+     * 	"default" - 经典下拉刷新样式（下拉拖动时页面内容跟随）；
+     * 	"circle" - 圆圈样式下拉刷新控件样式（下拉拖动时仅刷新控件跟随）。
+     * 	默认值为"default"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    style?: string;
+    /**
+     * 窗口的下拉刷新控件进入刷新状态的拉拽高度
+     * 支持百分比，如"10%"；像素值，如"50px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+    /**
+     * 窗口可下拉拖拽的范围
+     * 支持百分比，如"10%"；像素值，如"50px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    range?: string;
+    /**
+     * 下拉刷新控件的起始位置
+     * 仅对"circle"样式下拉刷新控件有效，用于定义刷新控件下拉时的起始位置。
+     * 	相对于Webview的顶部偏移量，支持百分比，如"10%"；像素值，如"50px"。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    offset?: string;
+    /**
+     * 在下拉可刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在下拉可刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentdown?: any;
+    /**
+     * 在释放可刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在释放可刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentover?: any;
+    /**
+     * 在正在刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在正在刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentrefresh?: any;
+}
+
+/**
+ * Webview窗口rendered事件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewRenderedEventOptions {
+    /**
+     * 判断窗口渲染完成类型
+     * 可取值：
+     * 	"top"-从顶部向下偏移22px横线截屏检测渲染是否完成；
+     * 	"bottom"-从底部向上偏移25px横线检测渲染是否完成；
+     * 	"center"-从中间横线检测渲染是否完成；
+     * 	"auto"为全屏检测（左、中、右三条竖线）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: string;
+    /**
+     * 判断窗口渲染完成间隔时间
+     * 单位为ms（毫秒），默认值为150ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    interval?: number;
+}
+
+/**
+ * 替换H5标准API配置信息
+ * 目前仅支持替换H5标准定位接口
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewReplaceWebApiOptions {
+    /**
+     * 替换H5标准定位接口(navigator.geolocation.*)
+     * 由于网络原因，在部分手机上可能无法调用标准H5定位接口(navigator.geolocation.*)获取定位数据，此时可以通过此属性配置使用原生定位模块替换标准H5定位接口，可取值：
+     * 		"alldevice" - 在所有设备上替换标准H5定位接口(navigator.geolocation.*)；
+     * 		"auto" - 自动替换H5标准定位接口，仅在调用标准H5定位接口无法获取数据的设备上替换；
+     * 		"none" - 不替换H5标准定位接口(navigator.geolocation.*)。
+     * 	默认值为"none"。
+     * 	注意：替换H5标准定位接口，会导致页面加载速度延迟100ms左右，推荐使用"auto"模式。
+     * - alldevice: 
+     * 	强制替换H5标准定位接口(navigator.geolocation.*)		
+     * 								
+     * - auto: 
+     * 	自动替换标准H5定位接口，仅在调用标准H5定位接口无法获取数据的设备上替换
+     * 								
+     * - none: 
+     * 	不替换标准H5定位接口(navigator.geolocation.*)
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    geolocation?: 'alldevice' | 'auto' | 'none';
+}
+
+/**
+ * JSON对象，Webview窗口的系统状态栏区域样式
+ * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewStatusbarStyles {
+    /**
+     * 系统状态栏区域背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景。
+     * 	默认值为应用manifest.json中plus-&gt;statusbar-&gt;background属性配置的值，如果未配置此属性值，则使用系统默认状态栏的背景颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+}
+
+/**
+ * JSON对象，Webview窗口对象的样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewStyles {
+    /**
+     * 窗口加载页面时额外添加的HTTP请求头数据
+     * 仅在Webview窗口第一次加载页面时使用，如用户点击的触发的链接跳转则不再添加此额外请求头数据。
+     * 	如果Webview窗口非第一次加载页面时也需要额外添加HTTP请求头数据，可通过loadURL()方法的参数设置。
+     * 	如果HTTP请求头中已经包含需要额外添加的头数据，则添加的请求数据覆盖默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    additionalHttpHeaders?: any;
+    /**
+     * 窗口动画优化方式
+     * 可取值：
+     * 		"auto" - 如果窗口中存在titleNView或subNViews，窗口动画时真实Webview控件从动画窗口中移除加速（避免真实Webview渲染影响动画效率）；
+     * 		"none" - 窗口动画不使用优化。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    animationOptimization?: string;
+    /**
+     * 窗口的缓存模式
+     * 可取值：
+     * 	"default" - 根据cache-control决定是否使用缓存数据，如果存在缓存并且没有过期则使用本地缓存资源，否则从网络获取；
+     * 	"cacheElseNetwork" - 只要存在缓存（即使过期）数据则使用，否则从网络获取；
+     * 	"noCache" - 不使用缓存数据，全部从网络获取；
+     * 	"cacheOnly" - 仅使用缓存数据，不从网络获取（注：如果没有缓存数据则会导致加载失败）。
+     * 	默认使用"default"。
+     * - default: 
+     * 	根据cache-control决定是否使用缓存数据，如果存在缓存并且没有过期则使用本地缓存资源，否则从网络获取。
+     * 								
+     * - cacheElseNetwork: 
+     * 	只要存在缓存（即使过期）数据则使用，否则从网络获取。
+     * 								
+     * - noCache: 
+     * 	不使用缓存数据，全部从网络获取。
+     * 								
+     * - cacheOnly: 
+     * 	仅使用缓存数据，不从网络获取（注：如果没有缓存数据则会导致加载失败）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    cachemode?: 'default' | 'cacheElseNetwork' | 'noCache' | 'cacheOnly';
+    /**
+     * Webview窗口自动处理返回键逻辑
+     * 当Webview窗口在显示栈顶，并且Webview窗口中没有调用JS监听返回键（plus.key.addEventListener('backbutton',...)）时按下返回键响应行为。
+     * 	可取值：
+     * 		"hide" - 隐藏Webview窗口，隐藏动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）；
+     * 		"close" - 关闭Webview窗口，关闭动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”） ；
+     * 		"none" - 不做操作，将返回键传递给下一Webview窗口处理；
+     * 		"quit" - 退出应用。
+     * - hide: 
+     * 	隐藏Webview窗口，隐藏动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）。
+     * 								
+     * - close: 
+     * 	关闭Webview窗口，关闭动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）。
+     * 								
+     * - none: 
+     * 	不做操作，将返回键传递给下一Webview窗口处理。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backButtonAutoControl?: 'hide' | 'close' | 'none';
+    /**
+     * 窗口的背景颜色
+     * 窗口空白区域的背景模式，设置background为颜色值(参考CSS Color Names，可取值/十六进制值/rgb值/rgba值)，窗口为独占模式显示（占整个屏幕区域）；
+     * 	设置background为“transparent”，则表示窗口背景透明，为非独占模式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+    /**
+     * 窗口顶部背景颜色值
+     * 窗口内容滚动到顶部下拉时可见。
+     * 	可取值：
+     * 		"#RRGGBB"格式字符串，如"#FF0000"表示红色；
+     * 		"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColorTop?: string;
+    /**
+     * 窗口底部背景颜色
+     * 窗口内容滚动到底部上拉时可见。
+     * 	可取值：
+     * 		"#RRGGBB"格式字符串，如"#FF0000"表示红色；
+     * 		"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColorBottom?: string;
+    /**
+     * 是否阻塞网络图片的加载
+     * 布尔类型，true表示阻塞，false表示不阻塞，默认值为false。
+     * 	阻塞后Webview窗口将不加载页面中使用的所有网络图片，可通过Webview窗口对象的setBlockNetWorkImage()方法动态修改此状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    blockNetworkImage?: boolean;
+    /**
+     * 窗口垂直向上的偏移量
+     * 支持百分比、像素值，默认值无值（根据top和height属性值来自动计算）。
+     * 	当同时设置了top和height值时，忽略此属性值；
+     * 	当未设置height值时，可通过top和bottom属性值来确定窗口的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bottom?: string;
+    /**
+     * 窗口遇到边框是否有反弹效果
+     * 可取值：
+     * 		"none" - 表示没有反弹效果；
+     * 		"vertical" - 表示垂直方向有反弹效果；
+     * 		"horizontal" - 表示水平方向有反弹效果；
+     * 		"all" - 表示垂直和水平方向都有反弹效果。
+     * 	默认值为"none"。
+     * - none: 没有反弹效果
+     * - vertical: 垂直方向有反弹效果
+     * - horizontal: 水平方向有反弹效果
+     * - all: 垂直和水平方向都有反弹效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bounce?: 'none' | 'vertical' | 'horizontal' | 'all';
+    /**
+     * 窗口回弹效果区域的背景
+     * 窗口回弹效果区域背景可支持颜色值或图片：
+     * 		颜色值格式为"#RRGGBB"，如"#FFFFFF"为设置白色背景；
+     * 		背景图为"url(%image path%)"，如"url(./icon.png)"为设置icon.png为背景图，图片采用平铺模式绘制。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bounceBackground?: string;
+    /**
+     * 窗口内容停止滑动的减速度
+     * 当Webview加载的内容超过其高度时，可以拖拽滑动内容，decelerationRate属性控制手指松开后页面滑动的速度。
+     * 	设置值越大手指松开后的滑动速度越快（滑动距离越长），其值域范围为0.0-1.0，默认值为0.989。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    decelerationRate?: number;
+    /**
+     * 窗口的停靠方式
+     * 当Webview窗口添加到另外一个窗口中时，停靠方式才会生效，采用停靠方式添加会导致原Webview窗口自动调整其大小避免其内容被子窗口盖住。
+     * 	可取值："top"，控件停靠则页面顶部；"bottom"，控件停靠在页面底部；"right"，控件停靠在页面右侧；"left"，控件停靠在页面左侧。
+     * 	默认值为"bottom"。
+     * - top: 控件停靠则页面顶部
+     * - bottom: 控件停靠在页面底部
+     * - right: 控件停靠在页面右侧
+     * - left: 控件停靠在页面左侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dock?: 'top' | 'bottom' | 'right' | 'left';
+    /**
+     * 窗口加载错误时跳转的页面地址
+     * 当Webview窗口无法加载指定的url地址时（如本地页面不存在，或者无法访问的网络地址），此时会自动跳转到指定的错误页面地址（仅支持本地页面地址）。
+     * 	设置为“none”则关闭跳转到错误页面功能，此时页面显示Webview默认的错误页面内容。默认使用5+ Runtime内置的错误页面。
+     * - none: 关闭加载页面错误自动跳转功能
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    errorPage?: 'none';
+    /**
+     * 替换H5标准API
+     * 用于解决在部分设备上调用H5标准定位接口可能无法获取定位数据的问题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    replacewebapi?: PlusWebviewWebviewReplaceWebApiOptions;
+    /**
+     * 窗口是否开启硬件加速
+     * 布尔类型，true表示开启硬件加速，false表示不开启硬件加速，默认情况5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速，可以通过plus.webview.defaultHardwareAccelerated()方法获取默认Webview是否开启硬件加速。
+     * 	由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，因此在特定设备的特定页面如果出现以上问题需要手动设置关闭硬件加速来避免。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hardwareAccelerated?: boolean;
+    /**
+     * 窗口的高度
+     * 支持百分比、像素值，默认为100%。
+     * 	当未设置height属性值时，优先通过top和bottom属性值来计算窗口的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+    /**
+     * 窗口使用的内核
+     * 可取值：
+     * 	"WKWebview" - 在iOS8.0及以上系统使用WKWebview内核，低版本下仍然使用UIWebview内核；
+     *     "UIWebview" - 在所有版本上都使用UIWebview内核。
+     *     默认值为"UIWebview"。
+     *     WKWebview内核的优势是：
+     * 		1. 滚动时懒加载的图片也可以实时渲染，UIWebview在滚动停止后才能渲染；
+     * 		2. WKWebview的video支持AirPlay。
+     * 	但WKWebview也有些限制和不足，目前已知的问题有：
+     * 		1. 不支持跨域设置cookie，即plus.navigator.setCookie()API无法使用；
+     * 		2. 本地的HTML页面中的XHR不支持跨域访问，需使用plus.net.XMLHttpRequest来替换；
+     * 		3. 不支持使用WebSQL，需使用indexDB来替换；
+     * 		4. 不支持js原生混淆功能，需使用前端js混淆来替换；
+     * 		5. 内存不足时会白屏。
+     * 	首页的Webview的kernel在manifest中配置（plus-&gt;kernel-&gt;ios）。
+     * - WKWebview: 
+     * 	使用"WKWebview"内核。
+     * 								
+     * - UIWebview: 
+     * 	使用"UIWebview"内核。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    kernel?: 'WKWebview' | 'UIWebview';
+    /**
+     * 窗口水平向右的偏移量
+     * 支持百分比、像素值，默认值为0px。
+     * 	未设置left属性值时，优先通过right和width属性值来计算窗口的left位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    left?: string;
+    /**
+     * 窗口的边距
+     * 用于定位窗口的位置，支持auto，auto表示居中。若设置了left、right、top、bottom则对应的边距值失效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    margin?: string;
+    /**
+     * 窗口的遮罩
+     * 用于设置Webview窗口的遮罩层样式，遮罩层会覆盖Webview中所有内容，包括子webview，并且截获webview的所有触屏事件，此时Webview窗口的点击操作会触发maskClick事件。
+     * 	字符串类型，可取值：
+     * 	rgba格式字符串，定义纯色遮罩层样式，如"rgba(0,0,0,0.5)"，表示黑色半透明；
+     * 	"none"，表示不使用遮罩层；
+     * 	默认值为"none"，即无遮罩层。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mask?: string;
+    /**
+     * 窗口的不透明度
+     * 0为全透明，1为不透明，默认值为1，即不透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opacity?: number;
+    /**
+     * 控制Webview注入5+ API时机
+     * 可取值：
+     *         "ahead" - 尽量提前，拦截页面中网络js请求实现提前注入，如果没有拦截到js请求则在页面loaded时注入；
+     *         "normal" - 页面loaded时注入；
+     *         "later" - 较晚在注入，在loaded事件发生后2s再注入，plusready事件同样延迟；
+     *         "none" - 不注入，页面无法调用5+ API，不触发plusready事件。
+     *         默认值为"normal"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    plusrequire?: string;
+    /**
+     * 窗口的进度条样式
+     * 设置此属性则在Webview窗口的顶部显示进度条，可配置进度条颜色及高度。
+     * 	设置此属性值为undefined或null则隐藏进度条。
+     * 	默认不显示进度条。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 窗口的侧滑返回功能
+     * 可取值：
+     * 		"none"-无侧滑返回功能；
+     * 		"close"-侧滑返回关闭Webview窗口；
+     * 		"hide"-侧滑返回隐藏webview窗口。
+     * - none: 无侧滑返回功能
+     * - close: 侧滑返回关闭Webview窗口
+     * - hide: 侧滑返回隐藏webview窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    popGesture?: 'none' | 'close' | 'hide';
+    /**
+     * 窗口下拉刷新配置
+     * 设置窗口是否开启下拉刷新功能及样式。
+     * 	开启下拉刷新后可通过监听窗口的"pullToRefresh"事件处理下拉刷新业务逻辑，更新操作完成后调用窗口的endPullToRefresh方法结束下拉刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    pullToRefresh?: PlusWebviewWebviewPullToRefreshStyles;
+    /**
+     * 窗口渲染模式
+     * 支持以下属性值：
+     * 		"onscreen" - Webview窗口在屏幕区可见时渲染，不可见时不进行渲染，此时能减少内存使用量；
+     * 		"always" - Webview在任何时候都渲染，在内存较大的设备上使用，被遮挡的窗口在此中模式下显示的时候会有更流畅的效果。
+     * 	默认值为"onscreen"。
+     * 	仅Android平台支持。
+     * - onscreen: Webview窗口在屏幕区可见时渲染，不可见时不进行渲染，此时能减少内存使用量
+     * - always: Webview在任何时候都渲染，在内存较大的设备上使用，被遮挡的窗口在此中模式下显示的时候会有更流畅的效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    render?: 'onscreen' | 'always';
+    /**
+     * 窗口水平向左的偏移量
+     * 支持百分比、像素值，默认无值（根据left和width属性值来自动计算）。
+     * 	当设置了left和width值时，忽略此属性值；
+     * 	当未设置width值时，可通过left和bottom属性值来确定窗口的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    right?: string;
+    /**
+     * 窗口是否可缩放
+     * 窗口设置为可缩放（scalable:true）时，用户可通过双指操作放大或缩小页面，此时html页面可通过meta节点设置“name="viewport" content="user-scalable=no"”来限制页面不可缩放。
+     * 	窗口设置为不可缩放（scalable:false）时，用户不可通过双指操作放大或缩小页面，即使页面中的meta节点也无法开启可缩放功能。
+     * 	默认值为false，即不可缩放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scalable?: boolean;
+    /**
+     * 窗口是否显示滚动条
+     * 用于控制窗口滚动条样式，可取值：
+     * 	"all"：垂直和水平滚动条都显示；
+     * 	"vertical"：仅显示垂直滚动条；
+     * 	"horizontal"：仅显示水平滚动条；
+     * 	"none"：垂直和水平滚动条都不显示。
+     * 	默认值为"all"，即垂直和水平滚动条都显示。
+     * 	注意：显示滚动条的前提条件是窗口中的内容超过窗口显示的宽或高。
+     * - all: 垂直和水平滚动条都显示
+     * - vertical: 仅显示垂直滚动条
+     * - horizontal: 仅显示水平滚动条
+     * - none: 垂直和水平滚动条都不显示
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scrollIndicator?: 'all' | 'vertical' | 'horizontal' | 'none';
+    /**
+     * 点击设备的状态栏时是否滚动返回至顶部
+     * true表示点击设备的状态栏可以滚动返回至顶部，false表示点击设备的状态栏不可以，默认值为true。
+     * 	此功能仅iOS平台支持，在iPhone上有且只有一个Webview窗口的scrollsToTop属性值为true时才生效，所以在显示和关闭Webview窗口时需动态更新所有Webview的scrollsToTop值，已确保此功能生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scrollsToTop?: boolean;
+    /**
+     * 是否可分享窗口加载的链接地址
+     * 在流应用环境（流应用/5+浏览器）中可通过分享按钮分享页面链接地址，
+     * 	可取值：
+     * 		true - 可分享窗口加载页面链接地址；
+     * 		false - 不可分享窗口加载的页面链接地址，此时分享的是应用。
+     * 	默认值值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    shareable?: boolean;
+    /**
+     * 弹出系统软键盘模式
+     * 可选值：“adjustPan”- 弹出软键盘时Webview窗口自动上移，以保证当前输入框可见；“adjustResize”- 自动调整Webview窗口大小（屏幕区域减去软键盘区域），同时自动滚动Webview保证输入框可见。
+     * 	默认值为“adjustPan”。
+     * - adjustPan: 弹出软键盘时Webview窗口自动上移，以保证当前输入框可见
+     * - adjustResize: 自动调整Webview窗口大小（屏幕区域减去软键盘区域），同时自动滚动Webview保证输入框可见
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    softinputMode?: 'adjustPan' | 'adjustResize';
+    /**
+     * 窗口状态栏样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，设置此属性后将自动保留系统状态栏区域不被Webview窗口占用（即Webview窗口非沉浸式样式显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    statusbar?: PlusWebviewWebviewStatusbarStyles;
+    /**
+     * 定义窗口的原生子View控件
+     * 数组类型，可通过配置项设置原生子View控件，每个配置项对应添加一个原生子View控件。
+     * 	通过Webview窗口的getSubNViews()方法可获取原生子View控件对象数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    subNViews?: PlusWebview [];
+    /**
+     * 定义窗口的标题栏控件样式
+     * 设置此属性值则表明创建Webview窗口的标题栏控件，并可通过其属性值设置背景颜色、文本内容、文本颜色等。
+     * 	通过Webview窗口的getTitleNView()方法可获取标题栏控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleNView?: PlusWebviewWebviewTitleNViewStyles;
+    /**
+     * 窗口垂直向下的偏移量
+     * 支持百分比、像素值，默认值为0px。
+     * 	未设置top属性值时，优先通过bottom和height属性值来计算窗口的top位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    top?: string;
+    /**
+     * 窗口定义窗口变换的动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    transition?: PlusWebviewWebviewTransition;
+    /**
+     * 窗口定义窗口变形效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    transform?: PlusWebviewWebviewTransform;
+    /**
+     * Webview窗口的排版位置
+     * 当Webview窗口添加到另外一个窗口中时，排版位置才会生效，排版位置决定子窗口在父窗口中的定位方式。
+     * 	可取值："static"，控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动；"absolute"，控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动；"dock"，控件在页面中停靠，停靠的位置由dock属性值决定。
+     * 	默认值为"absolute"。
+     * - static: 控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动
+     * - absolute: 控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动
+     * - dock: 控件在页面中停靠，停靠的位置由dock属性值决定
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    position?: 'static' | 'absolute' | 'dock';
+    /**
+     * 用户是否可选择内容
+     * 可取值：
+     * 	true - 表示可选择内容，用户可通过长按来选择页面内容，如文本内容选择后可以弹出系统复制粘贴菜单；
+     * 	false - 表示不可选择内容，用户不可通过长按来选择页面内容。
+     * 	默认值为true。
+     * 	注意：在Web页面中可通过CSS的user-select对单个页面元素进行控制，前提是Webview对象的userSelect设置为true，否则CSS设置的user-select失效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    userSelect?: boolean;
+    /**
+     * 视频全屏播放时的显示方向
+     * 可取值：
+     * 	"auto": 自动适配，如果当前页面竖屏，则竖屏显示；如果当前页面横盘显示，则横屏；如果当前页面自动感应，则自动感应横竖屏切换。
+     * 	"portrait-primary": 竖屏正方向； 
+     * 	"portrait-secondary": 竖屏反方向，屏幕正方向按顺时针旋转180°； 
+     * 	"landscape-primary": 横屏正方向，屏幕正方向按顺时针旋转90°； 
+     * 	"landscape-secondary": 横屏方向，屏幕正方向按顺时针旋转270°； 
+     * 	"landscape": 横屏正方向或反方向，根据设备重力感应器自动调整；
+     * 	默认值为“auto”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    videoFullscreen?: string;
+    /**
+     * 窗口的宽度
+     * 支持百分比、像素值，默认为100%。未设置width属性值时，可同时设置left和right属性值改变窗口的默认宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    width?: string;
+    /**
+     * 窗口的堆叠顺序值
+     * 拥有更高堆叠顺序的窗口总是会处于堆叠顺序较低的窗口的前面，拥有相同堆叠顺序的窗口后调用show方法则在前面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    zindex?: number;
+}
+
+/**
+ * 一组用于定义页面或控件变形的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTransform {
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rotate?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    translate?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scale?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    skew?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    matrix?: string;
+}
+
+/**
+ * 一组用于定义页面或控件转换效果的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTransition {
+    /**
+     * 产生变换效果的属性
+     * 默认值为"all"，暂不支持其它值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    property?: string;
+    /**
+     * 变换持续的时间
+     * 默认值为0，即无动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    duration?: string;
+    /**
+     * 窗口变换效果
+     * 可取值：
+     * 	"linear"：匀速变化，匀速动画效果；
+     * 	"ease-in"：匀加速变化，逐渐变快的动画效果；
+     * 	"ease-out"：匀减速变化，逐渐变慢的动画效果；
+     * 	"ease-in-out"：先加速后减速变化，先变快后变慢的动画效果。
+     * 	默认值为"ease-in-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    timingfunction?: string;
+}
+
+/**
+ * 拦截Webview窗口资源请求的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewOverrideResourceOptions {
+    /**
+     * 区配需要拦截请求资源的URL地址
+     * 支持正则表达式，默认值为空字符串（即不拦截）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+    /**
+     * 拦截重定向的资源地址
+     * 仅支持本地资源地址，如"_www"、"_doc"、"_downloads"、"_documents"等开头的路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    redirect?: string;
+    /**
+     * 重定向的资源数据类型
+     * RFC2045/RFC2046/RFC2047/RFC2048/RFC2049规范中定义的数据类型。
+     * 	如普通文本（text/plain）、PNG图像(image/png)、GIF图形(image/gif)、JPEG图形(image/jpeg)。
+     * 	如果未指定mime类型，则根据重定向资源路径自动区配。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mime?: string;
+    /**
+     * 重定向的资源数据编码
+     * 如未设置，则使用默认值"UTF-8"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    encoding?: string;
+    /**
+     * 设置重定向资源数据的http头数据
+     * 可设置标注http头数据（如Content-type）,也可设置自定义数据。
+     * 	通常可通过此属性来设置拦截资源的缓存策略（如Cache-control）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    header?: any;
+}
+
+/**
+ * 拦截Webview窗口URL请求的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewOverrideUrlOptions {
+    /**
+     * 拦截URL请求生效时机
+     * 可取值：
+     * 		"instant" - 表示立即生效，即调用overrideUrlLoading方法后立即生效；
+     * 		"touchstart" - 表示用户操作Webview窗口（触发touchstart事件）后生效，如果用户没有操作Webview窗口则不对URL请求操作进行拦截处理。
+     * 	默认值为"instant"。
+     * - instant: 
+     * 	立即生效，即调用overrideUrlLoading方法后立即生效。
+     * 								
+     * - : 
+     * 	表示用户操作Webview窗口（触发touchstart事件）后生效。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    effect?: 'instant' | '';
+    /**
+     * 拦截模式
+     * 可取值：
+     * 	"allow"表示满足match属性定义的条件时不拦截url继续加载，不满足match属性定义的条件时拦截url跳转并触发callback回调；
+     * 	"reject"表示满足match属性定义的提交时拦截url跳转并触发callback回调，不满足match属性定义的条件时不拦截url继续加载。
+     * 	默认值为"reject"。
+     * - allow: 
+     * 	满足match属性定义的条件时不拦截url继续加载，不满足match属性定义的条件时拦截url跳转并触发callback回调。
+     * 								
+     * - reject: 
+     * 	满足match属性定义的提交时拦截url跳转并触发callback回调，不满足match属性定义的条件时不拦截url继续加载。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mode?: 'allow' | 'reject';
+    /**
+     * 区配是否需要处理的URL请求
+     * 支持正则表达式，默认值为对所有URL地址生效（相当于正则表达式“.*”）。
+     * 	如果mode值为"allow"则允许区配的URL请求跳转，mode值为"reject"则拦截区配的URL请求。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+    /**
+     * 排除拦截处理请求类型
+     * 不拦截处理指定类型的URL请求，直接使用系统默认处理逻辑。
+     * 	可取值：
+     * 	"none"表示不排除任何URL请求（即拦截处理所有URL请求）；
+     * 	"redirect"表示排除拦截处理301/302跳转的请求（谨慎使用，非a标签的href触发的URL请求可能会误判断为302跳转）。
+     * 	默认值为"none"。
+     * - none: 
+     * 	不排除任何URL请求（即拦截处理所有URL请求）。
+     * 								
+     * - redirect: 
+     * 	排除拦截处理301/302跳转的请求（谨慎使用，非a标签的href触发的URL请求可能会误判断为302跳转）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    exclude?: 'none' | 'redirect';
+}
+
+/**
+ * 监听Webview窗口资源加载的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewListenResourceOptions {
+    /**
+     * 区配是否需要处理的URL资源
+     * 支持正则表达式，默认值为对所有URL资源请求生效（相当于正则表达式“.*”）。
+     * 	如果Webview加载的资源区配条件，则触发回调事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+}
+
+/**
+ * XMLHttpRequest模块管理网络请求，与标准HTML中的XMLHttpRequest用途一致，差别在于前者可以进行跨域访问。通过plus.net可获取网络请求管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNet {
+    /**
+     * 跨域网络请求对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    XMLHttpRequest?: PlusNetXMLHttpRequest;
+    /**
+     * HTTP请求进度事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    ProgressEvent?: PlusNetProgressEvent;
+}
+
+/**
+ * 跨域网络请求对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNetXMLHttpRequest {
+    /**
+     * HTTP 请求的状态
+     * 当一个 XMLHttpRequest 初次创建时，这个属性的值从 0 开始，直到接收到完整的 HTTP 响应，这个值增加到 4。
+     * 	5 个状态中每一个都有一个相关联的非正式的名称，下表列出了状态、名称和含义：
+     * 		0 Uninitialized，未初始化状态。XMLHttpRequest对象已创建或已被abort()方法重置。
+     * 		1 Open，open()方法已调用，但是send()方法未调用。请求还没有被发送。
+     * 		2 Sent，send()方法已调用，HTTP 请求已发送到Web服务器。未接收到响应。
+     * 		3 Receiving，所有响应头部都已经接收到。响应体开始接收但未完成。
+     * 		4 Loaded，HTTP响应已经完全接收。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    readyState?: number;
+    /**
+     * 请求从服务器接收到的响应数据
+     * 如果没有从服务器接收到数据，则为null；
+     * 	否则根据responseType类型决定：
+     * 		如果responseType设置为空字符串或"text"，则返回空字符串；
+     * 		如果responseType设置为"document"，则返回Document对象；
+     * 		如果responseType设置为"json"，则返回JSON对象；
+     * 	若服务器返回的数据与设置的responseType类型不区配，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    response?: string;
+    /**
+     * 请求从服务器接收到的响应数据（字符串数据）
+     * 如果还没有接收到数据的话，此属性值为空字符串；
+     * 	如果readyState小于3，此属性值为空字符串；
+     * 	如果readyState为3，此属性值返回目前已经接收的HTTP响应部分数据值；
+     * 	如果readyState为4，此属性值保存了完整的HTTP响应数据体。
+     * 	如果HTTP请求返回的数据头中包含了Content-Type值中指定字符编码，就使用该编码，否则，使用UTF-8字符集。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseText?: string;
+    /**
+     * 请求响应数据response的类型
+     * 默认值为空字符串，即reponse为String，类型可设置："document"表示Document对象，"json"表示JSON对象，"text"表示字符串。
+     * 	此值必须在调用send方法之前设置，否则设置的值不生效，仍使用之前设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseType?: string;
+    /**
+     * 请求响应的Document对象
+     * 对请求的响应，解析为 XML 并作为 Document 对象返回。
+     * 	如果请求未成功，或响应的数据无法被解析为XML，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseXML?: string;
+    /**
+     * 服务器返回的HTTP状态代码
+     * 服务器返回的HTTP状态代码，如200表示成功，而404表示"Not Found"错误；
+     * 	当readyState小于3的时候此属性值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    status?: number;
+    /**
+     * 服务器返回的HTTP状态描述
+     * 此属性值用名称而不是数字指定了请求的HTTP的状态代码。
+     * 	也就是说，当状态为200的时候它是"OK"；当状态为404的时候它是"Not Found"。
+     * 	和status属性类似，当readyState小于3的时候读取这一属性会返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    statusText?: string;
+    /**
+     * 请求服务器的超时时间，单位为毫秒（ms）
+     * 数值类型，单位为ms，其默认值为120秒。
+     * 	超时时间为服务器响应请求的时间（不是Http请求完成的总时间），如果设置为0则表示永远不超时。
+     * 	必须在请求发起前设置，否则当前请求将不生效，在当前请求完成后重新发起新请求时生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    timeout?: number;
+    /**
+     * 是否支持跨域请求
+     * 此对象创建的HTTP请求都支持跨域，所以永远返回true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    withCredentials?: boolean;
+    /**
+     * 网络请求状态发生变化事件
+     * 网络请求状态发生变化时触发，通常在函数中判断对象的state属性值来获取当前请求的状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onreadystatechange?: Function;
+    /**
+     * 网络请求开始事件
+     * 通常在调用send方法开始发起HTTP请求时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onloadstart?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求传输数据事件
+     * 通常在HTTP请求链接已经建立，开始传输数据时触发，在数据传输的过程中可能多次触发，此事件与onreadystatechange事件触发状态3类似。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onprogress?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求取消事件
+     * 通常在调用abort方法取消HTTP请求时触发。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onabort?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求错误事件
+     * 通常在HTTP请求发生错误时触发，如无法连接到服务器等各种错误都触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onerror?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求成功事件
+     * 通常在HTTP请求成功完成时触发，如果HTTP请求发生错误则不触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onload?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求超时事件
+     * 通常在HTTP请求超时时触发，此时不会触发onerror事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    ontimeout?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求结束事件
+     * 通常在HTTP请求结束时触发，不管是HTTP请求失败、成功、或超时之后都会触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onloadend?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 取消当前响应，关闭连接并且结束任何未决的网络活动
+     * 此方法把XMLHttpRequest对象重置为readyState为0的状态，并且取消所有未决的网络活动。
+     * 	调用此方法后将停止触发XMLHttpRequest对象的所有事件。
+     * 	例如，如果请求用了太长时间，而且响应不再必要的时候，可以调用这个方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    abort(): void;
+    /**
+     * 获取HTTP响应头部信息
+     * 把HTTP响应头部作为未解析的字符串返回。 如果readyState小于3，这个方法返回null。
+     * 	否则，它返回服务器发送的所有 HTTP 响应的头部。头部作为单个的字符串返回，一行一个头部。每行用换行符"\r\n"隔开。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取指定的HTTP响应头部的值
+     * 其参数是要返回的 HTTP 响应头部的名称。可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	该方法的返回值是指定的 HTTP 响应头部的值，如果没有接收到这个头部或者readyState小于3则为空字符串。
+     * 	如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 初始化HTTP请求参数，例如URL和HTTP方法，但是并不发送请求
+     * 这个方法初始化请求参数以供 send() 方法稍后使用。它把readyState设置为1，删除之前指定的所有请求头部，以及之前接收的所有响应头部，并且把responseText、responseXML、status 以及 statusText 参数设置为它们的默认值。
+     * 	当readyState为0的时候（当XMLHttpRequest对象刚创建或者abort()方法调用后）以及当readyState为4时（已经接收响应时），调用这个方法是安全的。
+     * 	当针对任何其他状态调用的时候，open()方法的行为是为指定的。
+     * 	除了保存供send()方法使用的请求参数，以及重置 XMLHttpRequest 对象以便复用，open()方法没有其他的行为。
+     * 	要特别注意，当这个方法调用的时候，实现通常不会打开一个到Web服务器的网络连接。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    open(method?: string, url?: string, username?: string, password?: string): void;
+    /**
+     * 重写服务器返回的MIME类型
+     * 此方法覆盖HTTP请求返回数据头"Content-Type"字段值中包含的IMIE类型，如果设置的MIME类型无效则继续使用"Content-Type"字段值中包含的IMIE类型。
+     * 	如果MIME类型中指定了字符集类型（charset），则需按照指定的字符集类型对接收到的数据体（respose）进行处理，否则默认为UTF-8字符集。
+     * 	注意：此方法需在send方法前调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    overrideMimeType(mime?: string): void;
+    /**
+     * 发送HTTP请求
+     * 此方法触发HTTP请求发送，如果之前没有调用open()，或者更具体地说，如果readyState不是1，send()抛出一个异常。否则，将发送HTTP请求，该请求由以下几部分组成：	
+     * 	之前调用open()时指定的HTTP方法、URL；
+     * 	之前调用setRequestHeader()时指定的请求头部（如果有的话）；
+     * 	传递给这个方法的body参数。
+     * 	一旦请求发送了，send()把readyState设置为2，并触发onreadystatechange事件；
+     * 	如果服务器响应带有一个HTTP重定向，send()方法在后台线程自动遵从重定向；
+     * 	当所有的HTTP响应头部已经接收，send()或后台线程把readyState设置为3并触发onreadystatechange事件；
+     * 	如果响应较长，send()或后台线程可能在状态3中触发多次onreadystatechange事件；
+     * 	最后，当响应完成，send()或后台线程把readyState设置为4，并最后一次触发onreadystatechange事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    send(body?: string): void;
+    /**
+     * 指定一个HTTP请求的Header
+     * Http的Header应该包含在通过后续send()调用而发起的请求中。
+     * 	此方法只有当readyState为1的时候才能调用，例如，在调用了open()之后，但在调用send()之前。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 	如果Web服务器已经保存了和传递给open()的URL相关联的cookie，适当的Cookie或Cookie2头部也自动地包含到请求中，可以通过调用setRequestHeader()来把这些cookie添加到头部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+}
+
+/**
+ * HTTP请求进度事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNetProgressEvent {
+    /**
+     * 事件的目标对象
+     * 通知HTTP请求进度事件的XMLHttpRequest对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    target?: PlusNetXMLHttpRequest;
+    /**
+     * 进度信息是否可计算
+     * HTTP请求进度信息是否有效，如果HTTP请求头中包含Content-Length头信息则为true，否则为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    lengthComputable?: number;
+    /**
+     * 当前已经接收到的数据长度
+     * HTTP请求接收到的数据长度，单位为字节。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    loaded?: number;
+    /**
+     * 总数据长度
+     * HTTP请求返回的总数据长度，单位为字节。
+     * 	如果无法获取则设置为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    total?: number;
+}
+
+/**
+ * Zip模块管理文件压缩和解压，通过plus.zip可获取压缩管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZip {
+    /**
+     * JSON对象，配置图片压缩转换的参数
+     * 设置width/height属性则表示需对图片进行缩放转换操作；
+     * 	设置rotate属性则表示需对图片进行旋转转换操作；
+     * 	设置clip属性则表示需对图片进行裁剪转换操作；
+     * 	如同时设置了多个转换操作，则按缩放、旋转、裁剪顺序进行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    CompressImageOptions?: PlusZipCompressImageOptions;
+    /**
+     * JSON对象，图片裁剪区域的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    ClipImageOptions?: PlusZipClipImageOptions;
+    /**
+     * 压缩生成Zip文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    compress(src?: string, zipfile?: string, successCB?: Function, errorCB?: (result: any) => void): void;
+    /**
+     * 解压缩Zip文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    decompress(zipfile?: string, target?: string, successCB?: Function, errorCB?: (result: any) => void): void;
+    /**
+     * 图片压缩转换
+     * 可用于图片的质量压缩、大小缩放、方向旋转、区域裁剪、格式转换等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    compressImage(options?: PlusZipCompressImageOptions, successCB?: (result: any) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，配置图片压缩转换的参数
+ * 设置width/height属性则表示需对图片进行缩放转换操作；
+ * 	设置rotate属性则表示需对图片进行旋转转换操作；
+ * 	设置clip属性则表示需对图片进行裁剪转换操作；
+ * 	如同时设置了多个转换操作，则按缩放、旋转、裁剪顺序进行操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZipCompressImageOptions {
+    /**
+     * 压缩转换原始图片的路径
+     * 支持以下图片路径：
+     * 	相对路径 - 相对于当前页面的host位置，如"a.jpg"，注意当前页面为网络地址则不支持；
+     * 	绝对路径 - 系统绝对路径，如Android平台"/storage/sdcard0/Android/data/io.dcloud.HBuilder/.HBuilder/apps/HBuilder/www/ａ.jpg"，iOS平台"/var/mobile/Containers/Data/Application/757966CF-345C-4348-B07F-EEF83CF9A369/Library/Pandora/apps/HBuilder/www/a.png"；
+     * 	相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.jpg"、"_doc/b.jpg"、"_documents/c.jpg"、"_downloads/d.jpg"；
+     * 	本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * - _www/: 应用资源目录
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    src?: '_www/' | '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 压缩转换目标图片的路径
+     * 支持以下图片路径：
+     * 	绝对路径 - 系统绝对路径，如Android平台"/storage/sdcard0/Android/data/io.dcloud.HBuilder/.HBuilder/apps/HBuilder/doc/ａ.jpg"，iOS平台"/var/mobile/Containers/Data/Application/757966CF-345C-4348-B07F-EEF83CF9A369/Library/Pandora/apps/HBuilder/doc/a.png"；
+     * 	相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_doc/b.jpg"、"_documents/c.jpg"、"_downloads/d.jpg"，注意不支持"_www"开头的路径；
+     * 	本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 	注意：如果设置的路径无权限访问，则返回失败。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    dst?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 覆盖生成新文件
+     * 仅在dst制定的路径文件存在时有效：
+     * 	true表示覆盖存在的文件；
+     * 	false表示不覆盖，如果文件存在，则返回失败。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    overwrite?: boolean;
+    /**
+     * 压缩转换后的图片格式
+     * 支持"jpg"、"png",如果未指定则使用源图片的格式。
+     * - jpg: JPG格式图片
+     * - png: PNG格式图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    format?: 'jpg' | 'png';
+    /**
+     * 压缩图片的质量
+     * 取值范围为1-100，1表示使用最低的图片质量（转换后的图片文件最小）、100表示使用最高的图片质量（转换后的图片文件最大）；
+     * 	默认值为50。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    quality?: number;
+    /**
+     * 缩放图片的宽度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即根据height与源图高的缩放比例计算，若未设置height则使用源图高度）；
+     * 	默认值为"auto"。
+     * 	注意：若设置了width属性值不合法（如"0px"），则不对图片进行缩放操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    width?: string;
+    /**
+     * 缩放图片的高度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即根据width与源图宽的缩放比例计算，若未设置width则使用源图高度）；
+     * 	默认值为"auto"。
+     * 	注意：若设置了height属性值不合法（如"0px"），则不对图片进行缩放操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    height?: string;
+    /**
+     * 旋转图片的角度
+     * 支持值：90-表示旋转90度；180-表示旋转180度；270-表示旋转270度。
+     * 	注意：若设置rotate属性值不合法，则不对图片进行旋转操作。
+     * - 90: 旋转90度
+     * - 180: 旋转180度
+     * - 270: 旋转270度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    rotate?: '90' | '180' | '270';
+    /**
+     * 裁剪图片的区域
+     * 值参考ClipImageOptions定义，若设置clip属性值不合法，则不对图片进行裁剪操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    clip?: PlusZipClipImageOptions;
+}
+
+/**
+ * JSON对象，图片裁剪区域的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZipClipImageOptions {
+    /**
+     * 图片裁剪区域与原图片上边界的偏移距离
+     * 支持像素值（如"10px"）、百分比（如"10%"）；默认值为"0px"。
+     * 	注意：如果top值超出原图片高度，则图片裁剪失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    top?: string;
+    /**
+     * 图片裁剪区域与原图片左边界的偏移距离
+     * 支持像素值（如"10px"）、百分比（如"10%"）；默认值为"0px"。
+     * 	注意：如果left值超出原图片宽度，则图片裁剪失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    left?: string;
+    /**
+     * 图片裁剪区域的宽度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即从left位置到图片右边界的宽度）；默认值为"auto"。
+     * 	注意：如果left值加width值超出原图片宽度，则使用"auto"值进行裁剪。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    width?: string;
+    /**
+     * 图片裁剪区域的高度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即从top位置到图片下边界的高度）；默认值为"auto"。
+     * 	注意：如果top值加height值超出原图片高度，则使用"auto"值进行裁剪。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    height?: string;
+}
+
+/**
+ * Barcode模块管理条码扫描，支持常见的条码（一维码及二维码）的扫描识别功能。可调用设备的摄像头对条码图片扫描进行数据输入，解码后返回码数据及码类型。通过plus.barcode可获取条码码管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcode {
+    /**
+     * Barcode扫码控件对象
+     * Barcode对象表示条码识别控件对象，在窗口中显示条码识别控件，使用此对象可自定义条码识别界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    Barcode?: PlusBarcodeBarcode;
+    /**
+     * Barcode扫码控件样式
+     * 设置Barcode扫码控件的样式，如扫码框、扫码条的颜色等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    BarcodeStyles?: PlusBarcodeBarcodeStyles;
+    /**
+     * 条码识别控件扫描参数
+     * 设置Barcode扫码控件的扫码识别参数，如是否保存扫码功时的截图等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    BarcodeOptions?: PlusBarcodeBarcodeOptions;
+    /**
+     * QR二维码，数值为0
+     * 1994年由日本Denso-Wave公司发明，QR来自英文Quick Response的缩写，即快速反应的意思，源自发明者希望QR码可让其内容快速被解码。
+     * 	目前使用最广泛的二维码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    QR?: number;
+    /**
+     * EAN条形码标准版，数值为1
+     * 国际物品编码协会在全球推广应用的商品条码，是由13位数字组成。
+     * 	目前使用最广泛的一维条形码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    EAN13?: number;
+    /**
+     * ENA条形码简版，数值为2
+     * 国际物品编码协会在全球推广应用的商品条码，是由8位数字组成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    EAN8?: number;
+    /**
+     * Aztec二维码，数值为3
+     * Andrew Longacre发明于1995年，该代码是用于国际出版。最小的Aztec码符号编码13个数字或12个英文字母。最大的Aztec码符号编码3832数字或3067英文字母或1914字节的数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    AZTEC?: number;
+    /**
+     * Data Matrix二维码，数值为4
+     * Data Matrix原名Data code，由美国国际资料公司(International Data Matrix, 简称IDMatrix)于1989年发明。可编码字元集包括全部的ASCII字元及扩充ASCII字元，容量可包含2235个英文数字资料、1556个8位元资料，3116个数字资料。由于Data Matrix二维条码只需要读取资料的20%即可精确辨读，因此很适合应用在条码容易受损的场所。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    DATAMATRIX?: number;
+    /**
+     * UPC条形码标准版，数值为5
+     * UPC码是美国统一代码委员会制定的一种商品用条码，主要用于美国和加拿大地区，常在美国进口的商品上可以看到。UPC码标准版由12位数字构成，故其字码集为数字0~9。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    UPCA?: number;
+    /**
+     * UPC条形码缩短版，数值为6
+     * UPC码是美国统一代码委员会制定的一种商品用条码，主要用于美国和加拿大地区，常在美国进口的商品上可以看到。UPC码缩短版由8位数字构成，故其字码集为数字0~9。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    UPCE?: number;
+    /**
+     * Codabar条形码，数值为7
+     * Codabar码最初是为零售价格标签系统而研制开发的。1975年，National Retail Merchants Association（NRMA）选择了其它符号类型作为标准后，Codabar开始在多个方面用于非零售应用领域，如图书馆、货运和医药业。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODABAR?: number;
+    /**
+     * Code39条形码，数值为8
+     * Code 39码是Intermec公司于1975年推出的一维条码， 39码是一种可供使用者双向扫瞄的分散式条码，也就是说相临两资料码之间，39码必须包含一个不具任何意义的空白(或细白，其逻辑值为0)，且 39码具有支援文数字的能力，编码规则简单、误码率低、所能表示字符个数多等特点，39码在各个领域有着极为广泛的应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE39?: number;
+    /**
+     * Code93条形码，数值为9
+     * Code 93码的条码符号是由Intermec公司于1982年设计的 提供更高的密度和数据安全增强code39 。它是一个字母，长度可变符号。代码93主要用于由加拿大邮政编码补充提供的资料。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE93?: number;
+    /**
+     * Code128条形码，数值为10
+     * CODE128码是1981年引入的一种高密度条码，CODE128 码可表示从 ASCII 0 到ASCII 127 共128个字符，故称128码。CODE128码是广泛应用在企业内部管理、生产流程、物流控制系统方面的条码码制，由于其优良的特性在管理信息系统的设计中被广泛使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE128?: number;
+    /**
+     * ITF条形码，数值为11
+     * ITF条码，又称交叉二五条码，由14位数字字符代表组成。主要用于运输包装，是印刷条件较差，不允许印刷EAN-13和UPC-A条码时应选用的一种条码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    ITF?: number;
+    /**
+     * MaxiCode二维码，数值为12
+     * 1996年时，美国自动辨识协会（AIMUSA）制定统一的符号规格，称为Maxicode二维条码，也有人称USS-Maxicode二维条码（Uniform Symbology Specification-Maxicode）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    MAXICODE?: number;
+    /**
+     * PDF 417二维条码，数值为13
+     * PDF417条码是由美国SYMBOL公司发明的，PDF（Portable Data File）意思是“便携数据文件”。组成条码的每一个条码字符由4个条和4个空共17个模块构成，故称为PDF417条码。PDF417条码最大的优势在于其庞大的数据容量和极强的纠错能力。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    PDF417?: number;
+    /**
+     * RSS 14条形组合码，数值为14
+     * RSS条码是有国际物品编码协会EAN和美国统一代码委员会UCC开发的RSS（Reduced Space Symbology）条码符号。它是一种一维码和二维码的组合码。和其它线性条码相比，RSS系列码制具有更高的密度，因为它可以表示更多的字符。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    RSS14?: number;
+    /**
+     * 扩展式RSS条形组合码，数值为15
+     * RSS条码是有国际物品编码协会EAN和美国统一代码委员会UCC开发的RSS（Reduced Space Symbology）条码符号。它是一种一维码和二维码的组合码。和其它线性条码相比，RSS系列码制具有更高的密度，因为它可以表示更多的字符。扩展式RSS码是长度可以变化的线性码制，能够对74个数字字符或41个字母字符的AI单元数据传数据进行编码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    RSSEXPANDED?: number;
+    /**
+     * 通过图片扫码识别
+     * 直接输入图片扫码识别，成功扫描到条码数据后通过successCallback回调返回，失败则通过errorCallback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    scan(path?: string, successCB?: (result0: number, result1: string, result2: string) => void, errorCB?: (result: any) => void, filters?: any []): void;
+    /**
+     * 创建Barcode对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    create(id?: string, filters?: any [], styles?: PlusBarcodeBarcodeStyles): PlusBarcodeBarcode;
+    /**
+     * 查找已经创建的Barcode对象
+     * 调用此方法查找指定id的Barcode对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    getBarcodeById(id?: string): PlusBarcodeBarcode;
+}
+
+/**
+ * Barcode扫码控件对象
+ * Barcode对象表示条码识别控件对象，在窗口中显示条码识别控件，使用此对象可自定义条码识别界面。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcode {
+    /**
+     * 条码识别成功事件
+     * Barcode扫码控件识别到有效的条码数据时触发的成功事件，并返回扫码结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    onmarked?: (result0: number, result1: string, result2: string) => void;
+    /**
+     * 条码识别错误事件
+     * 描控件识别过程中发生错误时触发的失败事件，并返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    onerror?: (result: any) => void;
+    /**
+     * 开始条码识别
+     * 开始调用系统摄像头获取图片数据进行扫码识别，当识别出条码数据时通过onmarked回调函数返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    start(optons?: PlusBarcodeBarcodeOptions): void;
+    /**
+     * 结束条码识别
+     * 结束对摄像头获取图片数据进行条码识别操作，同时关闭摄像头的视频捕获。
+     * 	结束后可调用start方法重新开始识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    cancel(): void;
+    /**
+     * 关闭条码识别控件
+     * 释放控件占用系统资源，调用close方法后控件对象将不可使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    close(): void;
+    /**
+     * 是否开启闪光灯
+     * 设置Barcode扫码控件在扫码时是否开启摄像头的闪光灯，默认值为不开启闪光灯。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    setFlash(open?: boolean): void;
+    /**
+     * 设置Barcode扫码控件的配置参数
+     * 用于动态更新Barcode扫码控件的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    setStyles(styles?: PlusBarcodeBarcodeStyles): void;
+}
+
+/**
+ * Barcode扫码控件样式
+ * 设置Barcode扫码控件的样式，如扫码框、扫码条的颜色等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcodeStyles {
+    /**
+     * 条码识别控件背景颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    background?: string;
+    /**
+     * 扫码框颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    frameColor?: string;
+    /**
+     * 扫码条颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    scanbarColor?: string;
+    /**
+     * Barcode扫码控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    top?: string;
+    /**
+     * Barcode扫码控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    left?: string;
+    /**
+     * Barcode扫码控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    width?: string;
+    /**
+     * Barcode扫码控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    height?: string;
+    /**
+     * Barcode扫码控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    position?: string;
+}
+
+/**
+ * 条码识别控件扫描参数
+ * 设置Barcode扫码控件的扫码识别参数，如是否保存扫码功时的截图等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcodeOptions {
+    /**
+     * 是否保存扫码成功时的截图
+     * 如果设置为true则在扫码成功时将图片保存，并通过onmarked回调函数的file参数返回保存文件的路径。
+     * 	默认值为false，不保存截图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    conserve?: boolean;
+    /**
+     * 保存扫码成功时图片保存路径
+     * 可通过此参数设置保存截图的路径和名称，如果设置图片文件名称则必须指定文件的后缀名（必须是.png），否则认为是指定目录，文件名称则自动生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    filename?: string;
+    /**
+     * 扫码成功时是否需要震动提醒
+     * 如果设置为true则在扫码成功时震动设备，false则不震动。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    vibrate?: boolean;
+    /**
+     * 扫码成功时播放的提示音
+     * 可取值：
+     * 	"none" - 不播放提示音；
+     * 	"default" - 播放默认提示音（5+引擎内置）。
+     * 	默认值为"default"。
+     * - none: 扫码成功时不播放提示音
+     * - default: 扫码成功时播放默认提示音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    sound?: 'none' | 'default';
+}
+
+/**
+ * Maps模块管理地图控件，用于在web页面中显示地图控件，提供各种接口操作地图控件，如添加标点、路线等。通过plus.maps可获取地图管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMaps {
+    /**
+     * 地图控件对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Map?: PlusMapsMap;
+    /**
+     * 地图控件对象的参数
+     * 设置地图对象显示时使用的参数，如地图的中心位置、缩放级别等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MapStyles?: PlusMapsMapStyles;
+    /**
+     * 地理编码转换的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    GeocodeOptions?: PlusMapsGeocodeOptions;
+    /**
+     * 地图坐标转换的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    CoordinateConvertOptions?: PlusMapsCoordinateConvertOptions;
+    /**
+     * Point对象用于表示地图元素的坐标
+     * 常用语对地图上元素进行定位时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Point?: PlusMapsPoint;
+    /**
+     * 地理区域
+     * 有西南及东北坐标点数据组成的矩形区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Bounds?: PlusMapsBounds;
+    /**
+     * 地图视图类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MapType?: PlusMapsMapType;
+    /**
+     * 地图覆盖物基类对象
+     * Overlay是地图上显示元素的基类，用于抽象地图元素，不用于实例化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Overlay?: PlusMapsOverlay;
+    /**
+     * 地图上显示的标点对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Marker?: PlusMapsMarker;
+    /**
+     * 地图上显示的气泡对象
+     * 此对象不能直接添加到地图上显示，只可关联到地图标点覆盖物上，用户点击标点时弹出显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Bubble?: PlusMapsBubble;
+    /**
+     * 地图上显示的圆圈对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Circle?: PlusMapsCircle;
+    /**
+     * 地图上显示的折线对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Polyline?: PlusMapsPolyline;
+    /**
+     * 地图上显示的多边形对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Polygon?: PlusMapsPolygon;
+    /**
+     * 地图检索对象
+     * Search对象用于管理地图上的检索功能，包括位置检索、周边检索和范围检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Search?: PlusMapsSearch;
+    /**
+     * 检索策略类型
+     * 在线路检索时设置检索策略时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchPolicy?: PlusMapsSearchPolicy;
+    /**
+     * 保存位置检索、周边检索和范围检索返回的结果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchPoiResult?: PlusMapsSearchPoiResult;
+    /**
+     * 保存位置检索、周边检索和范围检索返回的结果
+     * 不可通过new操作符创建SearchRouteResult对象，在触发onRouteSearchComplete()时自动创建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchRouteResult?: PlusMapsSearchRouteResult;
+    /**
+     * 检索结果的位置点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Position?: PlusMapsPosition;
+    /**
+     * 地图中的路线对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Route?: PlusMapsRoute;
+    /**
+     * 调用系统第三方程序进行导航
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    openSysMap(dst?: PlusMapsPoint, des?: string, src?: PlusMapsPoint): void;
+    /**
+     * 创建Map对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    create(id?: string, styles?: PlusMapsMapStyles): PlusMapsMap;
+    /**
+     * 查找已经创建的Map对象
+     * 调用此方法查找指定id的Map对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getMapById(id?: string): PlusMapsMap;
+}
+
+/**
+ * 地图控件对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMap {
+    /**
+     * 用户点击地图事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsPoint) => void;
+    /**
+     * 地图状态改变事件
+     * 用户拖动、缩放地图等操作完成后触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onstatuschanged?: (result: any) => void;
+    /**
+     * 静态方法，计算面积
+     * 计算指定地理区域的面积，单位为平方米。
+     * 	注：此功能仅百度地图支持，高德地图暂不支持此功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    calculateArea(bounds?: PlusMapsBounds, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，计算距离
+     * 计算从pointStart坐标点到pointEnd坐标的实际直线距离，单位为米（m）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，坐标转换
+     * 将第三方坐标系坐标转换成当前地图的坐标系坐标。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，地理编码
+     * 将地理位置信息转换为坐标点。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，反向地理编码
+     * 将坐标点转换为地理位置信息。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 向地图中添加覆盖物
+     * 此方法用于向地图中添加覆盖物。
+     * 	支持各种从maps.Overlay对象继承的各种覆盖物对象；
+     * 	如果添加不支持的对象则直接返回false；
+     * 	同一覆盖物对象只能添加到地图中一次，已在地图中的覆盖物再次添加时则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    addOverlay(overlay?: PlusMapsOverlay): boolean;
+    /**
+     * 设置地图初始中心点和缩放级别
+     * 用于设置地图的初始中心点和缩放级别，通常在创建地图后立即调用。
+     * 	默认中心点为天安门，默认缩放级别为12；
+     * 	该方法设置的中心点和缩放级别可通过reset()方法恢复；
+     * 	如果在地图显示后调用将改变地图的中心点和缩放级别并立即更新，并将初始值更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    centerAndZoom(center?: PlusMapsPoint, zoom?: number): void;
+    /**
+     * 清除地图中所有覆盖物对象
+     * 此方法用于清除地图中所有覆盖物对象。
+     * 	清除地图中的覆盖物对象后会自动更新地图视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    clearOverlays(): void;
+    /**
+     * 关闭地图控件
+     * 关闭地图控件将会销毁地图使用的资源，不可再使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    close(): void;
+    /**
+     * 获取当前地图可视范围的地理区域
+     * 当旋转或俯视时，是当前地图可视范围的最大外接矩形地理区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getBounds(): PlusMapsBounds;
+    /**
+     * 获取地图中心点位置
+     * 此方法用于获取设置的地图中心点位置（centerAndZoom/setCenter）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+    /**
+     * 获取当前地图显示的地图中心点位置
+     * 此方法用于获取当前地图显示的地图中心点位置，获取成功后通过callback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCurrentCenter(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    /**
+     * 获取地图的显示类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getMapType(): PlusMapsMapType;
+    /**
+     * 获取用户的当前位置信息
+     * 此方法用于获取用户的当前位置信息，获取成功后通过callback回调返回。
+     * 	获取用户当前位置信息将打开定位设备。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getUserLocation(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    /**
+     * 获取地图的缩放级别
+     * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
+     * 	该方法改变缩放级别后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示区域，以当前地图显示的中心点位置来缩放地图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getZoom(): number;
+    /**
+     * 隐藏地图控件
+     * 此方法用于隐藏地图控件，通常在显示后调用此方法来隐藏。
+     * 	如果地图已经隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hide(): void;
+    /**
+     * 获取是否显示用户位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isShowUserLocation(): boolean;
+    /**
+     * 获取是否显示地图内置缩放控件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isShowZoomControls(): boolean;
+    /**
+     * 获取是否打开地图交通信息图层
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isTraffic(): boolean;
+    /**
+     * 从地图中删除覆盖物对象
+     * 此方法用于从地图中删除覆盖物对象。
+     * 	支持各种从maps.Overlay对象继承的各种覆盖物对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    removeOverlay(overlay?: PlusMapsOverlay): void;
+    /**
+     * 重置地图
+     * 此方法用于重新设置地图，恢复地图的初始化时的中心点和缩放级别。
+     * 	该方法将导致显示内容将立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    reset(): void;
+    /**
+     * 重设地图控件大小
+     * 此方法用于重新计算地图控件大小，保持与构造时传入DOM元素的大小及位置一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    resize(): void;
+    /**
+     * 设置地图的中心点
+     * 此方法用于设置地图的中心点，用于切换当前显示地图位置。
+     * 	该方法改变中心点后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示的缩放级别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setCenter(center?: PlusMapsPoint): void;
+    /**
+     * 设置地图的视图类型
+     * 此方法用于设置地图类型，默认为普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setMapType(type?: PlusMapsMapType): void;
+    /**
+     * 设置地图控件的配置参数
+     * 用于动态更新地图控件的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStyles(styles?: PlusMapsMapStyles): void;
+    /**
+     * 是否打开地图交通信息图层
+     * 此方法用于设置是否打开地图交通信息图层，默认不显示。
+     * 	该方法改变是否显示交通图层后地图显示内容将立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setTraffic(traffic?: boolean): void;
+    /**
+     * 设置地图的缩放级别
+     * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
+     * 	该方法改变缩放级别后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示区域，以当前地图显示的中心点位置来缩放地图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setZoom(zoom?: number): void;
+    /**
+     * 显示地图控件
+     * 此方法用于显示地图控件，通常在隐藏后调用此方法来显示。
+     * 	如果地图已经显示再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    show(): void;
+    /**
+     * 显示用户位置
+     * 此方法将在地图上显示用户位置信息。
+     * 	显示用户位置将打开定位设备。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    showUserLocation(display?: boolean): void;
+    /**
+     * 设置是否显示地图内置缩放控件
+     * 此方法将在地图上显示内置缩放控件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    showZoomControls(display?: boolean): void;
+}
+
+/**
+ * 地图控件对象的参数
+ * 设置地图对象显示时使用的参数，如地图的中心位置、缩放级别等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMapStyles {
+    /**
+     * 地图的中心位置
+     * 未设置则使用地图的默认中心点（由地图供应商确定）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    center?: PlusMapsPoint;
+    /**
+     * 地图的缩放级别
+     * 有效范围为1-22，默认值为12，设置无效的值则使用默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    zoom?: number;
+    /**
+     * 地图的视图类型
+     * 可设置普通街道视图、卫星视图，默认值为普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    type?: PlusMapsMapType;
+    /**
+     * 地图的是否显示交通信息
+     * true表示显示地图的交通信息图层，false则不显示，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    traffic?: boolean;
+    /**
+     * 是否显示地图的内置缩放控件
+     * true表示显示地图的内置缩放控件，false则不显示，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    zoomControls?: boolean;
+    /**
+     * 地图控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    top?: string;
+    /**
+     * 地图控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    left?: string;
+    /**
+     * 地图控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    width?: string;
+    /**
+     * 地图控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    height?: string;
+    /**
+     * 地图控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    position?: string;
+}
+
+/**
+ * 地理编码转换的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsGeocodeOptions {
+    /**
+     * 源数据的坐标系类型
+     * 仅在反向地理编码转换时生效。
+     * 	“wgs84”：表示WGS-84坐标系； “gcj02”：表示国测局经纬度坐标系； “bd09”：表示百度墨卡托坐标系； “bd09ll”：表示百度经纬度坐标系；
+     * 	默认使用wgs84坐标系。
+     * - wgs84: WGS-84坐标系，即GPS设备采集的原始GPS坐标
+     * - gcj02: 国测局经纬度坐标系，soso地图、aliyun地图、mapabc地图和amap地图所用的坐标系
+     * - bd09: 百度墨卡托坐标系
+     * - bd09ll: 百度经纬度坐标系
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    coordType?: 'wgs84' | 'gcj02' | 'bd09' | 'bd09ll';
+    /**
+     * 源地址所属的城市
+     * 仅在地理编码转换时生效，如果不指定则在全国范围内区配转换。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    city?: string;
+}
+
+/**
+ * 地图坐标转换的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsCoordinateConvertOptions {
+    /**
+     * 源数据的坐标系类型
+     * “wgs84”：表示WGS-84坐标系； “gcj02”：表示国测局经纬度坐标系； “bd09”：表示百度墨卡托坐标系； “bd09ll”：表示百度经纬度坐标系；
+     * 	默认使用wgs84坐标系。
+     * - wgs84: WGS-84坐标系，即GPS设备采集的原始GPS坐标
+     * - gcj02: 国测局经纬度坐标系，soso地图、aliyun地图、mapabc地图和amap地图所用的坐标系
+     * - bd09: 百度墨卡托坐标系
+     * - bd09ll: 百度经纬度坐标系
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    coordType?: 'wgs84' | 'gcj02' | 'bd09' | 'bd09ll';
+}
+
+/**
+ * Point对象用于表示地图元素的坐标
+ * 常用语对地图上元素进行定位时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPoint {
+    /**
+     * 设置坐标点的经度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLng(lng?: number): void;
+    /**
+     * 获取坐标的经度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLng(): number;
+    /**
+     * 设置坐标的纬度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLat(): void;
+    /**
+     * 获取坐标的纬度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLat(): number;
+    /**
+     * 判断两个坐标点是否相等
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    equals(pt?: PlusMapsPoint): boolean;
+}
+
+/**
+ * 地理区域
+ * 有西南及东北坐标点数据组成的矩形区域。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsBounds {
+    /**
+     * 设置地理区域的东北坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setNorthEase(point?: PlusMapsPoint): void;
+    /**
+     * 地理区域的东北坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getNorthEase(): PlusMapsPoint;
+    /**
+     * 设置地理区域的西南坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setSouthWest(point?: PlusMapsPoint): void;
+    /**
+     * 地理区域的西南坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getSouthWest(): PlusMapsPoint;
+    /**
+     * 判断制定的坐标是否在地理区域中
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    contains(point?: PlusMapsPoint): boolean;
+    /**
+     * 判断两个地理区域是否相等
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    equals(bounds?: PlusMapsBounds): boolean;
+    /**
+     * 获取地理区域的中心点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+}
+
+/**
+ * 地图视图类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMapType {
+    /**
+     * 普通街道视图类型
+     * 地图视图类型常量，普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MAPTYPE_NORMAL?: number;
+    /**
+     * 卫星视图
+     * 地图视图类型常量，卫星视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MAPTYPE_SATELLITE?: number;
+}
+
+/**
+ * 地图覆盖物基类对象
+ * Overlay是地图上显示元素的基类，用于抽象地图元素，不用于实例化。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsOverlay {
+    /**
+     * 判断地图覆盖物是否可见
+     * 地图覆盖物对象默认为可见；地图覆盖物对象是否可见由其自身状态决定，不管其是否被添加到地图层中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isVisible(): boolean;
+    /**
+     * 显示地图上的覆盖物
+     * 常用于地图覆盖物在隐藏后调用此方法来显示。
+     * 	只有添加到地图上的覆盖物才能看到效果；
+     * 	如果覆盖物对象已经在地图上显示再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    show(): void;
+    /**
+     * 隐藏地图上的覆盖物
+     * 常用于地图覆盖物在显示后调用此方法来隐藏。
+     * 		只有添加到地图上的覆盖物才能看到效果；
+     * 		如果覆盖物对象已经在地图上隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hide(): void;
+}
+
+/**
+ * 地图上显示的标点对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMarker {
+    /**
+     * 用户点击地图标点事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsOverlay) => void;
+    /**
+     * 用户拖拽标点事件
+     * 可调用标点对象的markObj.setDraggable(true)方法设置标点允许拖拽，当用户拖拽标点对象时触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onDrag?: (result: any) => void;
+    /**
+     * 覆盖物显示到最上层
+     * 常用于覆盖物相互覆盖时调整覆盖物的显示顺序。
+     * 	只有添加到地图上的覆盖物才能看到效果；
+     * 	如果覆盖物对象已经在地图上隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    bringToTop(): void;
+    /**
+     * 设置标点对象的坐标
+     * 标点在设置新坐标后将在地图上立即更新标点位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPoint(point?: PlusMapsPoint): void;
+    /**
+     * 获取标点的坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPoint(): PlusMapsPoint;
+    /**
+     * 设置标点上显示的图标
+     * 若未设置则显示默认标点图标，已添加的标点在设置新值后将在地图上立即更新标点内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcon(icon?: string): void;
+    /**
+     * 设置标点上显示的图标数组
+     * 设置图标数组后则按照指定的间隔时间轮播数组中图标。
+     * 	设置图标数组后将忽略setIcon方法设置的图标，未设置则显示setIcon设置的图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcons(icons?: any []): void;
+    /**
+     * 设置标点上显示的文本标注
+     * 若未设置则不显示标注（默认为空字符串），已添加的标点在设置新值后将在地图上立即更新标点内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLabel(label?: string): void;
+    /**
+     * 获取标点上显示的文本标注
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLabel(): string;
+    /**
+     * 设置标点的气泡内容
+     * 设置气泡内容后，用户点击标点时弹出则弹出气泡。
+     * 	注意：用户点击标点时先弹出标点关联的气泡，再响应标点的onclick事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setBubble(buuble?: PlusMapsBubble, pop?: boolean): void;
+    /**
+     * 获取标点上显示的文本标注
+     * 如果没有设置关联的气泡对象则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getBubble(): PlusMapsBubble;
+    /**
+     * 隐藏标点上显示的气泡
+     * 如果没有设置关联的气泡对象或者气泡对象没有弹出显示，则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hideBubble(): void;
+    /**
+     * 设置标点的是否允许拖拽
+     * 设置标点可拖拽后，用户按住标点后拖动，标点会跟随手的拖拽而移动。
+     * 	拖拽后会更新标点的坐标信息。
+     * 	注：拖动前需要先在标点上长按。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setDraggable(draggable?: boolean): void;
+    /**
+     * 获取标点是否允许拖拽
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isDraggable(): boolean;
+}
+
+/**
+ * 地图上显示的气泡对象
+ * 此对象不能直接添加到地图上显示，只可关联到地图标点覆盖物上，用户点击标点时弹出显示。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsBubble {
+    /**
+     * 用户点击气泡事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsOverlay) => void;
+    /**
+     * 设置气泡上显示的图标
+     * 若为设置则无默认图标，已添加的显示的气泡在设置新值后将在地图上立即更新内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcon(icon?: string): void;
+    /**
+     * 设置气泡上显示的文字内容
+     * 若未设置则不显示文字（默认为空字符串），已添加的显示的气泡在设置新值后将在地图上立即更新内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLabel(label?: string): void;
+    /**
+     * 获取气泡上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLabel(): string;
+    /**
+     * 获取气泡所属的标点对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    belongMarker(): PlusMapsMarker;
+    /**
+     * 从图片加载气泡显示的内容
+     * 通过加载图片来自定义气泡显示的内容，加载图片后将清空气泡使用的图标及文字内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    loadImage(path?: string): void;
+    /**
+     * 从图片数据加载气泡显示的内容
+     * 通过加载图片数据来自定义气泡显示的内容，加载图片后将清空气泡使用的图标及文字内容。
+     * 	图片数据可通过Canvas自定义绘制后调用toDataURL来获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    loadImageDataURL(data?: string): void;
+}
+
+/**
+ * 地图上显示的圆圈对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsCircle {
+    /**
+     * 设置圆圈中心点的经纬度坐标
+     * 该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setCenter(point?: PlusMapsPoint): void;
+    /**
+     * 获取圆圈中心点的坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+    /**
+     * 设置圆圈的半径，单位为米
+     * 该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setRadius(radius?: number): void;
+    /**
+     * 获取圆圈的半径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getRadius(): number;
+    /**
+     * 设置圆圈的边框颜色
+     * 圆圈默认的圆圈边框颜色为黑色"#000000"，该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取圆圈的边框颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设置圆圈的边框颜色
+     * 圆圈默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取圆圈边框的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置圆圈的填充颜色
+     * 圆圈默认的圆圈填充颜色为无色，该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillColor(color?: string): void;
+    /**
+     * 获取圆圈的填充颜色
+     * 如果填充颜色为无色，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillColor(): string;
+    /**
+     * 设置圆圈填充颜色的透明度
+     * 圆圈默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillOpacity(opacity?: number): void;
+    /**
+     * 获取圆圈填充色的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillOpacity(): number;
+    /**
+     * 设置圆圈边框的线条宽度
+     * 圆圈边框的默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取圆圈边框的线条宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图上显示的折线对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPolyline {
+    /**
+     * 设置折线的顶点坐标
+     * 该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPath(points?: any []): void;
+    /**
+     * 获取折线的顶点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPath(): any [];
+    /**
+     * 设置折线的颜色
+     * 折线默认的颜色为黑色"#000000"，该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取折线的颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设设置折线的透明度
+     * 折线默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取折线的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置折线的线条宽度
+     * 折线线条的宽度默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取折线的线条宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图上显示的多边形对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPolygon {
+    /**
+     * 设置多边形的顶点坐标
+     * 该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPath(points?: any []): void;
+    /**
+     * 获取多边形的顶点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPath(): any [];
+    /**
+     * 设置多边形的颜色
+     * 多边形边框默认的颜色为黑色"#000000"，该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取多边形边框的颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设置多边形的透明度
+     * 多边形边框默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取多边形边框的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置多边形的填充颜色
+     * 多边形默认填充颜色为无色，该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillColor(color?: string): void;
+    /**
+     * 获取多边形的填充色
+     * 如果填充色为无色，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillColor(): string;
+    /**
+     * 设置多边形填充色的透明度
+     * 多边形填充色默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillOpacity(opacity?: number): void;
+    /**
+     * 获取多边形填充色的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillOpacity(): number;
+    /**
+     * 设置多边形的边框宽度
+     * 多边形边框的宽度默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取多边形边框的宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图检索对象
+ * Search对象用于管理地图上的检索功能，包括位置检索、周边检索和范围检索。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearch {
+    /**
+     * 兴趣点检索完成事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onPoiSearchComplete?: (result0: number, result1: PlusMapsSearchPoiResult) => void;
+    /**
+     * 线路检索完成事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onRouteSearchComplete?: (result0: number, result1: PlusMapsSearchRouteResult) => void;
+    /**
+     * 设置检索返回结果每页的信息数目
+     * 地图检索结果是按页返回的，默认检索每页返回10条信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPageCapacity(capacity?: number): void;
+    /**
+     * 获取检索返回结果每页的信息数目
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPageCapacity(): number;
+    /**
+     * 城市兴趣点检索
+     * 检索结果将通过onPoiSearchComplete事件返回。
+     * 	如果调用此方法时已经处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchInCity(city?: string, key?: string, index?: number): boolean;
+    /**
+     * 周边检索
+     * 周边检索根据中心点、半径与检索词进行检索，检索完成后触发onPoiSearchComplete()事件。
+     * 	若调用此方法时对象处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchNearBy(key?: string, pt?: PlusMapsPoint, radius?: number, index?: number): boolean;
+    /**
+     * 指定范围检索
+     * 根据范围和检索词进行检索，检索完成后触发onPoiSearchComplete()事件。
+     * 	若调用此方法时对象处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchInbounds(): boolean;
+    /**
+     * 设置公交路线检索策略
+     * 默认采用maps.SearchPolicy.TRANSIT_TIME_FIRST策略。
+     * 	需在调用transitSearch()方法前设置的策略才生效；
+     * 	如果设置非法值则认为设置失败，采用上次设置的检索策略并返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setTransitPolicy(policy?: PlusMapsSearchPolicy): boolean;
+    /**
+     * 公交路线检索
+     * 检索完成后触发onRouteSearchComplete()事件。
+     * 	若调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    transitSearch(start?: string, end?: string, city?: string): boolean;
+    /**
+     * 设置驾车路线检索策略
+     * 设置驾车路线检索策略，默认采用maps.SearchPolicy.DRIVING_TIME_FIRST策略。
+     * 	如果设置非法值则认为设置失败，采用上次设置的检索策略并返回false；需在调用drivingSearch()方法前设置的策略才生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setDrivingPolicy(policy?: PlusMapsSearchPolicy): boolean;
+    /**
+     * 驾车路线检索
+     * 用于驾车路线检索，检索完成后触发onRouteSearchComplete()事件。
+     * 	调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    drivingSearch(start?: string, startCity?: string, end?: string, endCity?: string): boolean;
+    /**
+     * 步行路线检索
+     * 用于步行路线检索，检索完成后触发onRouteSearchComplete()事件。
+     * 	调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    walkingSearch(start?: string, startCity?: string, end?: string, endCity?: string): boolean;
+}
+
+/**
+ * 检索策略类型
+ * 在线路检索时设置检索策略时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchPolicy {
+    /**
+     * 时间优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_TIME_FIRST?: number;
+    /**
+     * 最少换乘优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_TRANSFER_FIRST?: number;
+    /**
+     * 最少步行距离优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_WALK_FIRST?: number;
+    /**
+     * 选择车票花销最少优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_FEE_FIRST?: number;
+    /**
+     * 最短距离优先
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_DIS_FIRST?: number;
+    /**
+     * 无高速公路线路
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_NO_EXPRESSWAY?: number;
+    /**
+     * 最少费用优先
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_FEE_FIRST?: number;
+}
+
+/**
+ * 保存位置检索、周边检索和范围检索返回的结果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchPoiResult {
+    /**
+     * POI检索总结果数
+     * POI检索总结果数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    totalNumber?: number;
+    /**
+     * 当前页的POI检索结果数
+     * 当前页POI检索结果数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    currentNumber?: number;
+    /**
+     * 本次POI检索的总页数
+     * 本次POI检索的总页数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pageNumber?: number;
+    /**
+     * 获取当前页的索引
+     * 当前页的索引值，从0开始，即0表示第一页。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pageIndex?: number;
+    /**
+     * 本次POI检索结果数组
+     * POI检索结果数组，Array数组对象，数组内容为Position对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiList?: any [];
+    /**
+     * 获取指定索引的检索结果
+     * 如果index值超出范围则返回null对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPosition(): PlusMapsPosition;
+}
+
+/**
+ * 保存位置检索、周边检索和范围检索返回的结果
+ * 不可通过new操作符创建SearchRouteResult对象，在触发onRouteSearchComplete()时自动创建。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchRouteResult {
+    /**
+     * 线路的起点位置
+     * 线路检索结果的起始位置点对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    startPosition?: PlusMapsPosition;
+    /**
+     * 线路的终点位置
+     * 线路检索结果的终点位置点对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    endPosition?: PlusMapsPosition;
+    /**
+     * 本次线路检索的总方案数
+     * 线路检索结果的方案数目，若未检索到有效结果则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeNumber?: number;
+    /**
+     * 线路检索结果数组
+     * 线路检索结果数组，Array数组对象，数组内容为Route对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeList?: any [];
+    /**
+     * 获取指定索引的线路方案
+     * 如果index值超出范围则返回null对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getRoute(index?: number): PlusMapsRoute;
+}
+
+/**
+ * 检索结果的位置点
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPosition {
+    /**
+     * 位置点的经纬度坐标
+     * 如果没有经纬度坐标信息（如果公交、地铁路线数据等），则其值为undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    point?: PlusMapsPoint;
+    /**
+     * 位置点的地址信息
+     * 如果没有位置点的地址信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    address?: string;
+    /**
+     * 位置点的所属城市信息
+     * 如果没有位置点的所属城市信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    city?: string;
+    /**
+     * 位置点的名称
+     * 如果没有位置点的名称则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    name?: string;
+    /**
+     * 位置点的电话信息
+     * 如果没有位置点的电话信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    phone?: string;
+    /**
+     * 位置点的邮编信息
+     * 如果没有位置点的邮编信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    postcode?: string;
+}
+
+/**
+ * 地图中的路线对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsRoute {
+    /**
+     * 路线起点地理坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    startPoint?: PlusMapsPoint;
+    /**
+     * 路线终点地理坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    endPoint?: PlusMapsPoint;
+    /**
+     * 路线坐标点段数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pointCount?: PlusMapsPoint;
+    /**
+     * 路线的地理坐标点数组
+     * 路线的地理坐标点数组，数组中保存Point对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pointList?: any [];
+    /**
+     * 路线总距离
+     * 路线从起始点到终点的距离，单位为米。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    distance?: number;
+    /**
+     * 线路的提示信息
+     * 线路提示信息，没有提示信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeTip?: string;
+}
+
+/**
+ * OAuth模块管理客户端的用户登录授权验证功能，允许应用访问第三方平台的资源。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauth {
+    /**
+     * 登录授权认证服务对象
+     * AuthService对象用于表示登录授权认证服务，在JS中为对象，用于向系统进行登录授权认证操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthService?: PlusOauthAuthService;
+    /**
+     * JSON对象，授权认证参数选项
+     * 此对象支持的属性值由登录授权认证服务定义。
+     * 	例如“微信”，则可配置以下参数：
+     * 	scope - 应用授权作用域；
+     * 	state - 用于保持请求和回调的状态参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthOptions?: PlusOauthAuthOptions;
+    /**
+     * 登录授权认证信息
+     * 此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+     * 	例如“微信”登录授权服务，则包括以下数据：
+     * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthInfo?: PlusOauthAuthInfo;
+    /**
+     * 登录授权用户信息
+     * 用于保存登录授权用户的信息。
+     * 	此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+     * 	例如“微信”登录授权服务，可能包括以下自定义数据：
+     * 	privilege - 用户特权信息，json数组，如微信沃卡用户为（chinaunicom）；
+     * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    UserInfo?: PlusOauthUserInfo;
+    /**
+     * 获取登录授权认证服务列表
+     * 获取终端支持的权登录认证服务列表，可用于提示用户进行登录平台的选择。获取登录授权认证服务成功后通过successCB回调返回支持的所有服务列表，获取服务失败则通过errorCB回调返回失败信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    getServices(successCB?: (result: PlusOauth []) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 登录授权认证服务对象
+ * AuthService对象用于表示登录授权认证服务，在JS中为对象，用于向系统进行登录授权认证操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthService {
+    /**
+     * 登录授权认证服务标识
+     * 用于表示登录授权认证服务标识：
+     * 		"weixin" - 表示微信登录授权；
+     * 		"qq" - 表示QQ登录授权；
+     * 		"sinaweibo" - 表示新浪微博登录授权；
+     * 		"qihoo" - 表示360账号登录（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    id?: string;
+    /**
+     * 登录授权认证服务描述
+     * 用于描述登录授权认证服务的信息：
+     * 		"微信" - 表示微信登录授权；
+     * 		"QQ" - 表示QQ登录授权；
+     * 		"新浪微博" - 表示新浪微博登录授权；
+     * 		"360账号" - 表示360账号登录（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    description?: string;
+    /**
+     * 授权认证结果数据
+     * 用于保存登录授权认证获取的认证信息，如果值为"undefined"则表示未进行授权认证或者是授权认证失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    authResult?: PlusOauthAuthInfo;
+    /**
+     * 登录授权认证用户信息
+     * 用于保存登录授权认证获取的用户信息，如果值为"undefined"则表示未获取过用户信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    userInfo?: PlusOauthUserInfo;
+    /**
+     * 登录授权认证扩展信息
+     * 用于保存登录授权认证服务返回的扩展信息，具体内容由各登录平台决定，如果没有扩展信息则为undefined。
+     * 	例如“微信”，则可保存以下数据：
+     * 	state - 用于保持请求和回调的状态参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    extra?: any;
+    /**
+     * 请求授权认证
+     * 向开放平台请求进行授权认证，需提供授权域（scope），用户在终端确认后通过成功回调返回授权临时票据（code）。
+     * 	开发者可以将授权临时票据（code）提交到业务服务器，又业务服务器从微信开放平台获取授权登录等相关信息，避免将appsecret等信息保存在客户端可能引起泄露的问题。
+     * 	注意：目前仅微信平台支持请求授权认证，其它平台调用此方法将返回错误回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    authorize(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    /**
+     * 请求登录授权认证操作
+     * 对指定的登录授权认证服务进行登录认证操作，在登录前可通过对象的authResult属性判断是否已经登录认证过，通常只需要对没有进行过登录认证的服务进行登录认证操作。
+     * 	授权认证操作成功后通过successCB回调函数通知，失败则通过errorCB回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    login(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    /**
+     * 注销登录授权认证
+     * 对指定的登录授权认证服务注销登录认证操作，注销授权认证后，再次操作时需重新进行登录认证操作。
+     * 	如果第三方平台不需要注销操作，则情况保存的相关登录认证等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    logout(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取登录授权用户信息
+     * 获取登录授权认证的用户信息，在获取前可通过对象的userInfo属性判断是否已经获取过，通常只需要对没有获取过用户信息的服务进行操作。
+     * 	获取用户信息操作成功后通过successCallback回调函数通知，失败则通过errorCallback回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    getUserInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 添加用户手机号信息
+     * 打开登录授权服务的添加用户手机号界面进行操作，添加用户手机号操作成功后通过successCallback回调函数通知，否则通过errorCallback回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    addPhoneNumber(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，授权认证参数选项
+ * 此对象支持的属性值由登录授权认证服务定义。
+ * 	例如“微信”，则可配置以下参数：
+ * 	scope - 应用授权作用域；
+ * 	state - 用于保持请求和回调的状态参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthOptions {
+    /**
+     * 申请的权限作用范围
+     * 如果存在多个权限，则以","符号分割。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    scope?: string;
+    /**
+     * 客户端的当前状态，可以指定任意值，登录认证后原封不动的返回保存到AuthService对象的extra中
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    state?: string;
+    /**
+     * 登录授权认证服务平台申请的appid
+     * 动态设置登录授权服务中需要使用的appid，仅需要此参数的登录授权服务（如“微信登录”、“QQ登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appid值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appid?: string;
+    /**
+     * 登录授权认证服务平台申请的appkey
+     * 动态设置登录授权服务中需要使用的appkey，仅需要此参数的登录授权服务（如“新浪微博登录”、“360登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appkey?: string;
+    /**
+     * 登录授权认证服务平台申请的appsecret
+     * 动态设置登录授权服务中需要使用的appsecret，仅需要此参数的登录授权服务（如“微信登录”、“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）；当开放平台申请的appsecret值涉及到安全问题时，可在应用运行时从服务器获取，然后通过此api动态设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appsecret?: string;
+    /**
+     * 登录授权认证服务平台申请的redirect_url
+     * 动态设置登录授权服务中需要使用的redirect_url，仅需要此参数的登录授权服务（如“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的redirect_url值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    redirect_url?: string;
+}
+
+/**
+ * 登录授权认证信息
+ * 此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+ * 	例如“微信”登录授权服务，则包括以下数据：
+ * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthInfo {
+    /**
+     * 登录授权的访问令牌
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    access_token?: string;
+    /**
+     * 登录授权用户的唯一标识
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    openid?: string;
+    /**
+     * 登录授权访问令牌过期时间
+     * 单位为秒，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    expires_in?: string;
+    /**
+     * 登录授权的更新令牌
+     * 用来获取下一次的访问令牌，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    refresh_token?: string;
+    /**
+     * 登录授权的权限范围
+     * 如果存在多个权限，则以","符号分割。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    scope?: string;
+}
+
+/**
+ * 登录授权用户信息
+ * 用于保存登录授权用户的信息。
+ * 	此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+ * 	例如“微信”登录授权服务，可能包括以下自定义数据：
+ * 	privilege - 用户特权信息，json数组，如微信沃卡用户为（chinaunicom）；
+ * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthUserInfo {
+    /**
+     * 登录授权用户的唯一标识
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    openid?: string;
+    /**
+     * 登录授权用户的头像图片地址
+     * 要求为"http://"或"https://"开头的地址，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    headimgurl?: string;
+    /**
+     * 登录授权用户的昵称
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    nickname?: string;
+    /**
+     * 登录授权用户的邮箱地址
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    email?: string;
+    /**
+     * 登录授权用户的电话号码
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    phonenumber?: string;
+    /**
+     * 登录授权用户的性别
+     * 1为男性，2为女性。
+     * 	如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    sex?: string;
+    /**
+     * 登录授权用户注册的省份信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    province?: string;
+    /**
+     * 登录授权用户注册的城市信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    city?: string;
+    /**
+     * 登录授权用户注册的国家信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    country?: string;
+}
+
+/**
+ * Payment模块管理支付功能，用于提供网页安全支付能力，支持通过Web接口进行支付操作。通过plus.payment可获取支付管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPayment {
+    /**
+     * 支付通道对象
+     * PaymentChannel对象表示特定的支付通道，用于向系统请求支付操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    PaymentChannel?: PlusPaymentPaymentChannel;
+    /**
+     * IAP订单数据对象
+     * 描述IAP商品订单信息，如标识、数量等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    OrderStatementIAP?: PlusPaymentOrderStatementIAP;
+    /**
+     * 支付操作结果对象
+     * PaymentResult对象表示支付操作返回结果，用于确认支付操作成功。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    PaymentResult?: PlusPaymentPaymentResult;
+    /**
+     * IAP商品对象
+     * 描述IAP商品详细信息，如标识、价格、标题、描述信息等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPProduct?: PlusPaymentIAPProduct;
+    /**
+     * 购买IAP商品对象
+     * 描述购买的IAP商品详细信息，如标识、数量等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPProductInfo?: PlusPaymentIAPProductInfo;
+    /**
+     * 购买IAP商品交易信息对象
+     * 描述购买的IAP商品交易详细信息，如购买商品信息、交易日期、订单标识等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPTransaction?: PlusPaymentIAPTransaction;
+    /**
+     * 获取支付通道
+     * 在进行支付操作前需获取终端支持的支付通道列表，用于提示用户进行选择。
+     * 	获取支付通道成功后通过successCB回调返回支持的所有通道列表，获取支付通道列表失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    getChannels(successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 请求支付操作
+     * 调用指定的支付通道进行支付操作，其中statement包含支付操作的相关信息，支付模块将弹出支付界面供用户进行支付信息的输入确认操作。
+     * 	用户支付操作成功后通过successCB回调返回支付操作结果，支付操作失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: (result: PlusPaymentPaymentResult) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 支付通道对象
+ * PaymentChannel对象表示特定的支付通道，用于向系统请求支付操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentPaymentChannel {
+    /**
+     * 支付通道标识
+     * 用于标识支付通道：
+     * 		"alipay" - 表示支付宝；
+     * 		"wxpay" - 表示微信支付；
+     * 		"appleiap" - 表示苹果应用内支付；
+     * 		"qhpay" - 表示360聚合支付（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    id?: string;
+    /**
+     * 支付通道描述
+     * 支付通道的描述信息，如“支付宝”、“微信”、“In-App Purchase”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: string;
+    /**
+     * 支付通道服务是否安装
+     * 通常特定的支付通道依赖系统安装相关的服务，此属性用于标识其服务是否安装，如果没有安装则为false，否则为true。
+     * 	若系统环境中没有安装相关的服务，则可能导致调用支付操作失败，这时可以调用installService方法进行安装。
+     * 	注意：如果支付通道不需要依赖系统安装服务，则永远返回true。例如支付宝，如果设备上未安装支付宝客户端则调用Wap页面进行支付，因此值固定返回true；
+     * 	而微信支付则依赖微信客户端，如果设备上未安装微信客户端则serviceReady值为false，此时应该提示用户安装微信客户端才能进行支付操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    serviceReady?: boolean;
+    /**
+     * 安装支付通道依赖的服务
+     * 对于某些支付通道，通常特定的支付通道依赖系统安装相关的服务，调用此方法将安装其依赖的支付服务。
+     * 	如支付宝，则在系统中安装支付宝客户端程序。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    installService(): void;
+    /**
+     * 向IAP服务器请求支付订单
+     * IAP支付在调用plus.payment.request方法支付前须先向服务器请求获取商品的详细信息，否则会支付失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    requestOrder(ids?: any [], successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 向IAP服务器请求已经购买的非消耗性商品和订阅商品
+     * 注意：不能获取已购买的消耗性商品。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    restoreComplateRequest(options?: any, successCB?: (result: PlusPayment []) => void): void;
+}
+
+/**
+ * IAP订单数据对象
+ * 描述IAP商品订单信息，如标识、数量等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentOrderStatementIAP {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productid?: string;
+    /**
+     * 购买用户名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    username?: string;
+    /**
+     * 商品数量
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    quantity?: string;
+}
+
+/**
+ * 支付操作结果对象
+ * PaymentResult对象表示支付操作返回结果，用于确认支付操作成功。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentPaymentResult {
+    /**
+     * 支付通道对象
+     * 用于发起支付操作的支付通道对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    channel?: PlusPaymentPaymentChannel;
+    /**
+     * 交易编号信息
+     * 如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    tradeno?: string;
+    /**
+     * 交易描述信息
+     * 如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: boolean;
+    /**
+     * 查找支付交易信息地址
+     * 用于向支付平台查询交易信息，如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    url?: boolean;
+    /**
+     * 支付操作指纹信息
+     * 用于向支付平台查询支付订单信息，如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    signature?: string;
+    /**
+     * 支付平台返回的原始数据
+     * 如果支付平台返回key-value类型字符串，则组合成符合JSON格式的字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    rawdata?: string;
+}
+
+/**
+ * IAP商品对象
+ * 描述IAP商品详细信息，如标识、价格、标题、描述信息等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPProduct {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productid?: string;
+    /**
+     * 商品的价格
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    price?: string;
+    /**
+     * 商品标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    title?: string;
+    /**
+     * 商品的描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: string;
+}
+
+/**
+ * 购买IAP商品对象
+ * 描述购买的IAP商品详细信息，如标识、数量等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPProductInfo {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productIdentifier?: string;
+    /**
+     * 商品的数量
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    quantity?: string;
+}
+
+/**
+ * 购买IAP商品交易信息对象
+ * 描述购买的IAP商品交易详细信息，如购买商品信息、交易日期、订单标识等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPTransaction {
+    /**
+     * 购买商品的信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    payment?: string;
+    /**
+     * 购买商品的交易日期
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionDate?: string;
+    /**
+     * 购买商品的交易订单标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionIdentifier?: string;
+    /**
+     * 购买商品的交易收据
+     * base64编码格式字符串数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionReceipt?: string;
+    /**
+     * 购买商品的交易状态
+     * 可取值："1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionState?: string;
+}
+
+/**
+ * Push模块管理推送消息功能，可以实现在线、离线的消息推送，通过plus.push可获取推送消息管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPush {
+    /**
+     * JSON对象，获取的客户端标识信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    ClientInfo?: PlusPushClientInfo;
+    /**
+     * JSON对象，推送消息对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    PushMessage?: PlusPushPushMessage;
+    /**
+     * JSON对象，获客户端创建本地消息的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    MessageOptions?: PlusPushMessageOptions;
+    /**
+     * 添加推送消息事件监听器
+     * 添加推送消息事件监听器，当指定推送事件发出时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    addEventListener(type?: string, listener?: (result: string) => void, capture?: boolean): void;
+    /**
+     * 清空所有推送消息
+     * 清空系统消息中心所有的推送消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    clear(): void;
+    /**
+     * 创建本地消息
+     * 在本地直接创建推送消息，并添加到系统消息中心。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    createMessage(content?: string, payload?: string, options?: PlusPushMessageOptions): void;
+    /**
+     * 获取所有推送消息
+     * 获取客户端接收到的所有推送消息。
+     * 	仅包括在系统消息中心显示的推送消息，不包括调用setAutoNotification(false)方法设置不显示推送消息后接收到的消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    getAllMessage(): PlusPushPushMessage;
+    /**
+     * 获取客户端推送标识信息
+     * 客户端标识信息用于业务服务器下发推送消息时提交给推送服务器的数据，用于说明下发推送消息的接收者（客户端）。需要客户端在第一次运行时提交到业务服务器保存。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    getClientInfo(): PlusPushClientInfo;
+    /**
+     * 设置程序是否将消息显示在系统消息中心
+     * 默认情况下程序在接收到推送消息后将会在系统消息中心显示，通过此方法可关闭默认行为，接收到推送消息后不在系统消息中心显示，通过addEventListener方法的“receive”事件监听处理接收到的消息。
+     * 	在这种模式下可通过createMessage方法创建在系统消息中心显示的消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    setAutoNotification(notify?: boolean): void;
+    /**
+     * 删除推送消息
+     * 删除系统消息中心指定的推送消息，可通过getAllMessage方法获取所有的消息后进行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    remove(message?: PlusPushPushMessage): void;
+}
+
+/**
+ * JSON对象，获取的客户端标识信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushClientInfo {
+    /**
+     * 设备令牌（iOS设备唯一标识），用于APNS服务推送中标识设备的身份
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    token?: string;
+    /**
+     * 推送服务令牌（设备唯一标识），用于标识推送信息接收者身份
+     * 第三方推送服务器管理的设备唯一标识，在iOS平台此值通常与token不同；在其它平台此值通常与token值一致。
+     * 	此值与设备及应用都相关，即不同的apk/ipa安装到同一台设备上的值都不相同。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    clientid?: string;
+    /**
+     * 第三方推送服务的应用标识
+     * 第三方推送服务器管理的应用标识，通常需要在第三方推送服务器平台进行注册获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appid?: string;
+    /**
+     * 第三方推送服务器的应用键值
+     * 第三方推送服务器管理的应用键值，通常需要在第三方推送服务器平台进行注册获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appkey?: string;
+}
+
+/**
+ * JSON对象，推送消息对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushPushMessage {
+    /**
+     * 推送消息显示的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    title?: string;
+    /**
+     * 推送消息显示的内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    content?: string;
+    /**
+     * 推送消息承载的数据
+     * 如果推送消息中传输的数据不符合JSON格式，则作为String类型数据保存。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    payload?: any;
+    /**
+     * Apple APNS推送协议数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    aps?: any;
+}
+
+/**
+ * JSON对象，获客户端创建本地消息的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushMessageOptions {
+    /**
+     * 要启动流应用的appid
+     * 默认值为当前流应用的appid。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appid?: string;
+    /**
+     * 是否覆盖上一次提示的消息
+     * 可取值true或false，true为覆盖，false不覆盖，默认为permission中设置的cover值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    cover?: boolean;
+    /**
+     * 提示消息延迟显示的时间
+     * 当设备接收到推送消息后，可不立即显示，而是延迟一段时间显示，延迟时间单位为s，默认为0s，立即显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    delay?: number;
+    /**
+     * 推送消息的图标
+     * 本地图片地址，相对路径 - 相对于当前页面的host位置，如"a.jpg"，注意当前页面为网络地址则不支持； 绝对路径 - 系统绝对路径，如Android平台"/sdcard/logo.png"，此类路径通常通过其它5+ API获取的； 扩展相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.jpg"； 本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    icon?: string;
+    /**
+     * 推送消息的提示音
+     * 显示消息时的播放的提示音，可取值：
+     * 	“system”-表示使用系统通知提示音；
+     * 	“none”-表示不使用提示音；
+     * 	默认值为“system”。
+     * - system: 使用系统通知提示音
+     * - none: 不使用提示音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    sound?: 'system' | 'none';
+    /**
+     * 推送消息的标题
+     * 在系统消息中心显示的通知消息标题，默认值为程序的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    title?: string;
+    /**
+     * 消息上显示的提示时间
+     * 默认为当前时间，如果延迟显示则使用延时后显示消息的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    when?: Date;
+}
+
+/**
+ * Share模块管理客户端的社交分享功能，提供调用终端社交软件的分享能力。通过plus.share可获取社交分享管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShare {
+    /**
+     * JSON对象，分享授权认证参数选项
+     * 此对象支持的属性值由分享服务的授权认证模块定义。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    AuthOptions?: PlusShareAuthOptions;
+    /**
+     * 分享授权控件对象
+     * Authorize对象表示分享控件对象，用于在窗口中显示分享控件，使用此对象可自定义分享授权界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    Authorize?: PlusShareAuthorize;
+    /**
+     * JSON对象，用户位置信息
+     * GeoPosition对象用于表示用户分享消息时的位置信息。用于标识分享操作时用户的位置信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    GeoPosition?: PlusShareGeoPosition;
+    /**
+     * 分享服务对象
+     * ShareService对象用于表示分享服务，在JS中为对象，用于向系统请求分享操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareService?: PlusShareShareService;
+    /**
+     * 分享服务标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareServerIdentity?: PlusShareShareServerIdentity;
+    /**
+     * JSON对象，分享消息对象
+     * ShareMessage对象用于表示分享消息内容，在JS中为JSON对象，用于向系统发送分享信息操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareMessage?: PlusShareShareMessage;
+    /**
+     * JSON对象，保存分享消息扩展信息
+     * ShareMessageExtra对象用于保存各分享平台扩展的参数，用于自定义分享功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareMessageExtra?: PlusShareShareMessageExtra;
+    /**
+     * JSON对象，微信小程序信息
+     * 用于配置分享小程序的参数，如小程序标识、页面路径等。
+     * 	注意：分享的小程序需要在微信开放平台关联的开发者账号下，否则会分享失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    WeixinMiniProgramOptions?: PlusShareWeixinMiniProgramOptions;
+    /**
+     * 获取分享服务
+     * 获取终端支持的分享通道列表，可用于提示用户进行分享服务器的选择。获取分享服务成功后通过successCB回调返回支持的所有服务列表，获取服务失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    getServices(successCB?: (result: PlusShare []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 使用系统组件发送分享
+     * 调用系统分享组件分享消息，通过msg参数设置分享内容。
+     * 	发送成功后通过successCB回调函数通知操作完成，发送失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    sendWithSystem(msg?: PlusShareShareMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，分享授权认证参数选项
+ * 此对象支持的属性值由分享服务的授权认证模块定义。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareAuthOptions {
+    /**
+     * 分享服务平台申请的appid
+     * 动态设置分享服务授权认证时需要使用的appid，仅需要此参数的分享服务（如“微信”、“QQ”）支持。
+     * 	如果未设置则使用运行环境中内置的appid值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appid?: string;
+    /**
+     * 分享服务平台申请的appkey
+     * 动态设置分享服务授权认证时需要使用的appkey，仅需要此参数的分享服务（如“新浪微博”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appkey?: string;
+    /**
+     * 分享服务平台申请的appsecret
+     * 动态设置分享服务中需要使用的appsecret，仅需要此参数的分享服务（如“微信”、“新浪微博”）支持。
+     * 	如果未设置则使用运行环境中内置的appsecret值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）；当开放平台申请的appsecret值涉及到安全问题时，可在应用运行时从服务器获取，然后通过此api动态设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appsecret?: string;
+    /**
+     * 分享服务平台申请的redirect_url
+     * 动态设置分享服务中需要使用的redirect_url，仅需要此参数的登录授权服务（如“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的redirect_url值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    redirect_url?: string;
+}
+
+/**
+ * 分享授权控件对象
+ * Authorize对象表示分享控件对象，用于在窗口中显示分享控件，使用此对象可自定义分享授权界面。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareAuthorize {
+    /**
+     * 分享控件加载完成事件
+     * 分享授权控件内容加载完成事件，通过调用load方法加载分享授权控件内容，当内容加载完成时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onloaded?: (result: any) => void;
+    /**
+     * 分享授权认证成功事件
+     * 用户在分享授权控件上输入操作授权成功时触发，事件方法格式参考ShareSuccessCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onauthenticated?: Function;
+    /**
+     * 分享授权认证失败事件
+     * 用户在分享授权控件上输入操作授权认证错误时触发，事件方法格式参考ShareErrorCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onerror?: (result: any) => void;
+    /**
+     * 加载分享授权页面
+     * 创建分享授权页面后，需要调用此方法指定分享服务标识来加载授权页面数据，此标识可使用ShareService对象的id属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    load(id?: string): void;
+    /**
+     * 设置分享授权控件是否可见
+     * 创建分享授权页面后，调用此方法设置分享授权控件在页面中是否可见。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    setVisible(visible?: boolean): void;
+}
+
+/**
+ * JSON对象，用户位置信息
+ * GeoPosition对象用于表示用户分享消息时的位置信息。用于标识分享操作时用户的位置信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareGeoPosition {
+    /**
+     * 用户位置的纬度坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    latitude?: number;
+    /**
+     * 用户位置的经度坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    longitude?: number;
+}
+
+/**
+ * 分享服务对象
+ * ShareService对象用于表示分享服务，在JS中为对象，用于向系统请求分享操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareService {
+    /**
+     * 分享服务标识
+     * 用于表示分享服务标识：
+     * 	"sinaweibo" - 表示新浪微博；
+     * 	"tencentweibo" - 表示腾讯微博；
+     * 	"weixin" - 表示微信；
+     * 	"qq" - 表示腾讯QQ。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    id?: PlusShareShareServerIdentity;
+    /**
+     * 分享服务描述
+     * 用于描述分享服务的信息：
+     * 	如“新浪微博”、“腾讯微博”、“微信”、“QQ”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    description?: string;
+    /**
+     * 是否授权认证
+     * 用于标识此分享是否已经授权认证过，true表示已完成授权认证；false表示未完成授权认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    authenticated?: boolean;
+    /**
+     * 授权认证信息
+     * 仅在authenticated为true时有效，标识客户认证标识信息，用于发送分享信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    accessToken?: string;
+    /**
+     * 是否存在对应的分享客户端
+     * 对于某些分享服务，可直接调用本地客户端程序进行授权认证，此属性即可提供此相关信息，若没有安装本地客户端则可能调用其它方式进行分享操作，如WAP方式等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    nativeClient?: boolean;
+    /**
+     * 授权认证操作
+     * 对指定的分享服务进行授权认证操作，在授权前可通过ShareService.authenticated属性判断是否已经授权过，通常只需要对没有进行过授权认证的服务进行授权认证操作。
+     * 	授权认证操作成功后通过successCB回调函数通知操作完成，操作失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    authorize(successCallback?: (result: PlusShareShareService) => void, errorCallback?: (result: any) => void, options?: PlusShareAuthOptions): void;
+    /**
+     * 取消授权认证
+     * 对指定的分享服务取消授权认证操作，取消授权认证后，再次分享时需重新进行授权操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    forbid(): void;
+    /**
+     * 发送分享
+     * 发送分享消息，分享消息的内容通过msg设置。
+     * 	发送成功后通过successCB回调函数通知操作完成，发送失败则通过errorCB回调返回。若分享服务没有进行授权认证或授权认证失效则触发失败回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    send(msg?: PlusShareShareMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+    /**
+     * 调用微信小程序
+     * 注意：需在微信开放平台将应用关联小程序才能正常调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    launchMiniProgram(options?: PlusShareWeixinMiniProgramOptions): void;
+}
+
+/**
+ * 分享服务标识
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareServerIdentity {
+    /**
+     * 新浪微博
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    sinaweibo?: string;
+    /**
+     * 腾讯微博
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    tencentweibo?: string;
+    /**
+     * 微信
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    weixin?: string;
+}
+
+/**
+ * JSON对象，分享消息对象
+ * ShareMessage对象用于表示分享消息内容，在JS中为JSON对象，用于向系统发送分享信息操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareMessage {
+    /**
+     * 分享消息的类型
+     * 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    type?: string;
+    /**
+     * 分享消息的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    content?: string;
+    /**
+     * 分享消息的图片
+     * 分享消息中包含的图片路径，仅支持本地路径。
+     * 	若分享平台仅支持提交一张图片，传入多张图片则仅提交第一张图片。
+     * 	如果未指定type类型，优先级顺序为：pictures&gt;content（即设置了pictures则认为分享图片类型）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    pictures?: any [];
+    /**
+     * 分享消息的缩略图
+     * 分享消息中包含的缩略图路径，支持本地路径及网络路径。
+     * 	若分享平台仅支持提交一张图片，传入多张图片则仅提交第一张图片。
+     * 	如果分享平台的信息不支持缩略图，若没有设置消息的图片（pictures）则使用缩略图，否则忽略其属性值。
+     * 	注意：图片有大小限制，推荐图片小于20Kb。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    thumbs?: any [];
+    /**
+     * 分享的多媒体资源
+     * 分享的多媒体资源地址，当type值为"music"、"video"时有效。
+     * 	注意：
+     * 		微信分享平台支持音乐、视频类型，仅支持网络地址（以http://或https://开头）；
+     * 		QQ分享平台支持音乐类型，仅支持网络路径（以http://或https://开头）；
+     * 		新浪微博分享平台支持视频类型，仅支持本地文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    media?: string;
+    /**
+     * 分享独立的链接
+     * 分享资源地址，仅支持网络地址（以http://或https://开头）。
+     * 	如果未指定type类型，优先级顺序为：href&gt;pictures&gt;content（即设置了href则认为分享网页类型）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    href?: string;
+    /**
+     * 分享消息的标题
+     * 仅微信分享网页、音频、视频、小程序类型时支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    title?: string;
+    /**
+     * 分享消息中包含的用户地理信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    geo?: PlusShareGeoPosition;
+    /**
+     * 分享消息扩展参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    extra?: PlusShareShareMessageExtra;
+    /**
+     * 分享微信小程序参数
+     * 仅微信分享小程序类型时支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    miniProgram?: PlusShareWeixinMiniProgramOptions;
+    /**
+     * 分享消息的模式
+     * 可取值：
+     *     "auto" - 自动选择，如果已经安装微博客户端则采用编辑界面进行分享，否则采用无界面分享；
+     *     "slient" - 静默分享，采用无界面模式进行分享；
+     *     "editable" - 进入编辑界面，用户确认分享内容后发送，如果当前未安装微博客户端则触发错误回调。
+     *     默认值为"auto"。
+     *     （仅新浪微博分享时生效）
+     * - auto: 
+     * 	自动选择，如果已经安装微博客户端则采用编辑界面进行分享，否则采用无界面分享
+     * 								
+     * - slient: 
+     * 	静默分享，采用无界面模式进行分享
+     * 								
+     * - editable: 
+     * 	进入编辑界面，用户确认分享内容后发送，如果当前未安装微博客户端则触发错误回调
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    interface?: 'auto' | 'slient' | 'editable';
+}
+
+/**
+ * JSON对象，保存分享消息扩展信息
+ * ShareMessageExtra对象用于保存各分享平台扩展的参数，用于自定义分享功能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareMessageExtra {
+    /**
+     * 微信分享场景，仅微信分享平台有效
+     * 可取值：
+     * 	"WXSceneSession"分享到微信的“我的好友”；
+     * 	"WXSceneTimeline"分享到微信的“朋友圈”中；
+     * 	"WXSceneFavorite"分享到微信的“我的收藏”中。
+     * 	默认值为"WXSceneSession"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    scene?: string;
+}
+
+/**
+ * JSON对象，微信小程序信息
+ * 用于配置分享小程序的参数，如小程序标识、页面路径等。
+ * 	注意：分享的小程序需要在微信开放平台关联的开发者账号下，否则会分享失败。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareWeixinMiniProgramOptions {
+    /**
+     * 微信小程序ID
+     * 注意：是微信小程序的原始ID（"g_"开头的字符串）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    id?: string;
+    /**
+     * 微信小程序打开的页面路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    path?: string;
+    /**
+     * 微信小程序版本类型
+     * 可取值：
+     * 	0-正式版；
+     * 	1-测试版；
+     * 	2-体验版。
+     * 	默认值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    type?: number;
+    /**
+     * 兼容低版本的网页链接
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    webUrl?: string;
+}
+
+/**
+ * Speech模块管理语音输入功能，提供语音识别功能，可支持用户通过麦克风设备进行语音输入内容。通过plus.speech可获取语音输入管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeech {
+    /**
+     * JSON对象，语音识别参数
+     * 控制语音识别引擎内部参数，在JS中为JSON对象，在启动语音识别时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    SpeechRecognizeOptions?: PlusSpeechSpeechRecognizeOptions;
+    /**
+     * 语音识别事件类型
+     * 描述语音过程的触发事件列表，可以通过调用plus.sppech.addEventListener方法进行注册监听。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    SpeechRecoginzeEvents?: PlusSpeechSpeechRecoginzeEvents;
+    /**
+     * 启动语音识别
+     * 启动语音识别时调用，当语音识别成功后通过successCallback回调返回识别出文本内容，调用语音识别失败则通过errorCallback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 停止语音识别
+     * 当语音识别完成时或用户取消语音识别时调用，调用此方法将导致errorCallback回调函数的调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    stopRecognize(): void;
+    /**
+     * 监听语音识别事件
+     * 向语音识别模块添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法添加多个监听器，当监听的事件发生时，将按照添加的先后顺序触发执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: (result: any) => void, capture?: boolean): void;
+}
+
+/**
+ * JSON对象，语音识别参数
+ * 控制语音识别引擎内部参数，在JS中为JSON对象，在启动语音识别时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeechSpeechRecognizeOptions {
+    /**
+     * 语音识别是否采用持续模式
+     * 设置为true表示语音引擎不会根据语音输入自动结束，识别到文本内容将多次调用successCallback函数返回，如果需要结束语音识别则必须调用stopRecognize接口，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    continue?: boolean;
+    /**
+     * 语音识别引擎标识
+     * 用于兼容多语音识别引擎的浏览器，使用语音识别厂商的产品名称，如未设置或设置不正确则使用运行环境默认的语音识别引擎。
+     * 	支持以下语音识别引擎：
+     * 		"baidu"-百度语音识别；
+     * 		"iFly"-讯飞语音识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    engine?: string;
+    /**
+     * 语音识别引擎的语言
+     * 用于定义语音识别引擎的语言，其取值需符合W3C的Language codes规范。
+     * 	目前讯飞语音支持以下语言：
+     * 		"zh-cn"-中文，普通话；
+     * 		"en-us"-英语；
+     * 		"zh-cantonese"-中文，粤语；
+     * 		"zh-henanese"-中文，河南话（百度语音识别不支持此语言）。
+     * 		默认值为"zh-cn"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    lang?: string;
+    /**
+     * 指定识别结果识别包括多候选结果
+     * 用于指定识别结果识别包括多候选结果。如nbest:3，识别返回3个候选结果，默认值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    nbest?: number;
+    /**
+     * 识别结果中是否包含标点符号
+     * true表示识别结果文本中包含标点符号，false表示识别结果文本中不包含标点符号。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    punctuation?: boolean;
+    /**
+     * 语音识别超时时间
+     * 语音识别超时的时间，单位为ms，默认值为1000（即10秒）。
+     * 	注：百度语音识别不支持此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    timeout?: number;
+    /**
+     * 识别时是否显示用户界面
+     * 用于指定识别时是否显示用户界面，设置为true表示显示浏览器内置语音识别界面；设置为false表示不显示浏览器内置语音识别界面。默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    userInterface?: boolean;
+    /**
+     * 语音识别开始事件（已废弃，使用start事件）
+     * 事件函数，语音识别开始启动，在调用startRecognize方法后触发，与onend事件成对触发。
+     * 	注：iOS平台未支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    onstart?: (result: any) => void;
+    /**
+     * 语音识别结束事件（已废弃，使用end事件）
+     * 事件函数，语音识别结束，在调用stopRecognize方法后触发，或者在引擎内部自动完成语音识别后触发，与onstart事件成对触发。
+     * 	注：iOS平台未支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    onend?: (result: any) => void;
+}
+
+/**
+ * 语音识别事件类型
+ * 描述语音过程的触发事件列表，可以通过调用plus.sppech.addEventListener方法进行注册监听。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeechSpeechRecoginzeEvents {
+    /**
+     * 开始语音识别
+     * 调用plus.speech.startRecognize方法开始语音识别时触发。
+     * 	无回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    start?: string;
+    /**
+     * 音量变化
+     * 开始语音识别后，麦克风录制到的语音音量变化时触发。
+     * 	回调函数参数event={volume:"Number类型，取值范围0-1"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    volumeChange?: string;
+    /**
+     * 临时语音识别结果
+     * 返回临时语音识别结果时触发。
+     * 	回调函数参数event={partialResult:"String类型，临时识别结果"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    recognizing?: string;
+    /**
+     * 最终语音识别
+     * 返回最终语音识别结果。
+     * 	回调函数参数event={result:"String类型，最佳识别结果",results:"String数组类型，所有候选结果"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    recognition?: string;
+    /**
+     * 结束语音识别
+     * 调用plus.speech.stopRecognize方法结束语音识别或语音识别完成后自动结束时触发。
+     * 	无回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    end?: string;
+    /**
+     * 语音识别错误
+     * 语音识别发生错误时触发。
+     * 	回调函数参数event={code:"Number类型，错误编码",message:"String类型，错误描述信息"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    error?: string;
+}
+
+/**
+ * Statistic模块管理统计功能，用于提供应用内统计的能力，支持统计和分析用户属性和用户行为数据。通过plus.statistic可获取统计管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+ */
+interface PlusStatistic {
+    /**
+     * 触发事件
+     * 触发指定的统计事件，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventTrig(id?: string, value?: any): void;
+    /**
+     * 精确持续事件
+     * 精确时长的持续事件统计，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventDuration(id?: string, duration?: number, value?: any): void;
+    /**
+     * 开始持续事件（过期API，不推荐使用）
+     * 开始指定的持续事件统计，当事件结束时调用eventEnd方法，，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventStart(id?: string, value?: string): void;
+    /**
+     * 结束持续事件（过期API，不推荐使用）
+     * 结束指定的持续事件统计，需先调用eventStart方法开始持续事件统计，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventEnd(id?: string, label?: string): void;
+}
diff --git a/types/html5plus/tsconfig.json b/types/html5plus/tsconfig.json
new file mode 100644
index 0000000000..634c3eb205
--- /dev/null
+++ b/types/html5plus/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "html5plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/html5plus/tslint.json b/types/html5plus/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/html5plus/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 44231510355e31da2b44fb51fccd5231e553e2d4 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Mon, 4 Mar 2019 19:29:13 +1100
Subject: [PATCH 312/924] Updated export type

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

diff --git a/types/pretty-time/index.d.ts b/types/pretty-time/index.d.ts
index c46273abaa..0dadc88091 100644
--- a/types/pretty-time/index.d.ts
+++ b/types/pretty-time/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
-export type Increment =
+type Increment =
     | 'ns'
     | 'nano'
     | 'nanosecond'
@@ -37,4 +37,6 @@ export type Increment =
     | 'week'
     | 'weeks';
 
-export default function(time: number[], smallest?: Increment, digits?: number): string;
+declare function prettyTime(time: number[], smallest?: Increment, digits?: number): string;
+
+export = prettyTime;
diff --git a/types/pretty-time/pretty-time-tests.ts b/types/pretty-time/pretty-time-tests.ts
index c6f2e926ae..895042ecd1 100644
--- a/types/pretty-time/pretty-time-tests.ts
+++ b/types/pretty-time/pretty-time-tests.ts
@@ -1,4 +1,4 @@
-import DateTime from "pretty-time";
+import DateTime = require("pretty-time");
 
 DateTime([1200708, 795428088]);
 

From c9bb0dc4f70dc428be05b67079dbda3bd3e47f77 Mon Sep 17 00:00:00 2001
From: Federico Della Rovere <federico.dellarovere@apptecsrl.com>
Date: Mon, 4 Mar 2019 09:47:28 +0100
Subject: [PATCH 313/924] fix descrition issue

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

diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
index b8d29c5818..6c3126c049 100644
--- a/types/twitch-ext/index.d.ts
+++ b/types/twitch-ext/index.d.ts
@@ -207,9 +207,9 @@ interface TwitchExtConfiguration {
 
 	/**
 	 * This function can be called by the front end to set an extension configuration.
-	 * @param segment The string-encoded configuration.
-	 * @param version The configuration segment to set.
-	 * @param content The version of configuration with which the segment is stored.
+	 * @param segment The configuration segment to set. Valid value. "broadcaster".
+	 * @param version The version of configuration with which the segment is stored.
+	 * @param content The string-encoded configuration.
 	 */
 	set(segment: "broadcaster", version: string, content: string): void;
 }

From c01da43b4223ce947278a719e1ff232e291db3d9 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Mon, 4 Mar 2019 17:14:53 +0800
Subject: [PATCH 314/924] add type for dv

---
 types/dv/dv-tests.ts   |  18 ++
 types/dv/index.d.ts    | 446 +++++++++++++++++++++++++++++++++++++++++
 types/dv/tsconfig.json |  23 +++
 types/dv/tslint.json   |   1 +
 4 files changed, 488 insertions(+)
 create mode 100644 types/dv/dv-tests.ts
 create mode 100644 types/dv/index.d.ts
 create mode 100644 types/dv/tsconfig.json
 create mode 100644 types/dv/tslint.json

diff --git a/types/dv/dv-tests.ts b/types/dv/dv-tests.ts
new file mode 100644
index 0000000000..f49a7ef683
--- /dev/null
+++ b/types/dv/dv-tests.ts
@@ -0,0 +1,18 @@
+import dv = require('dv');
+import fs = require('fs');
+
+const image = new dv.Image('png', fs.readFileSync('textpage300.png'));
+const tesseract = new dv.Tesseract('eng', image);
+console.log(tesseract.findText('plain'));
+
+const barcodes = new dv.Image('png', fs.readFileSync('form2.png'));
+const open = barcodes.thin('bg', 8, 5).dilate(3, 3);
+const openMap = open.distanceFunction(8);
+const openMask = openMap.threshold(10).erode(22, 22);
+const boxes = openMask.invert().connectedComponents(8);
+for (const i in boxes) {
+	const boxImage = barcodes.crop(
+		boxes[i].x, boxes[i].y,
+		boxes[i].width, boxes[i].height);
+	// Do something useful with our image.
+}
diff --git a/types/dv/index.d.ts b/types/dv/index.d.ts
new file mode 100644
index 0000000000..6aec428e5e
--- /dev/null
+++ b/types/dv/index.d.ts
@@ -0,0 +1,446 @@
+// Type definitions for dv 2.1
+// Project: https://github.com/creatale/node-dv
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Box {
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+}
+
+export interface Point {
+	x: number;
+	y: number;
+}
+
+export interface Segment {
+	p1: Point;
+	p2: Point;
+	error: number;
+}
+
+
+export interface Skew {
+	angle: number;
+	confidence: number;
+}
+
+export interface Component {
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+}
+
+export class Image {
+	/**
+	 *  Creates a copy of otherImage.
+	 */
+	constructor(otherImage: Image);
+	/**
+	 * Creates a 32 bit imagen from three 8 bit images, where each image represents one channel of RGB or HSV.
+	 */
+	constructor(image1: Image, image2: Image, image3: Image);
+	/**
+	 * Creates an empty image with the specified dimensions (!!! note: this constructor is experimental and likely to change).
+	 */
+	constructor(width: number, height: number, depth: number);
+	/**
+	 * Creates an image from a Buffer object, that contains the PNG/JPG encoded image.
+	 */
+	constructor(type: 'png' | 'jpg', buffer: Buffer);
+	constructor(type: 'rgba' | 'rgb' | 'gray', buffer: Buffer, width: number, height: number);
+
+	public readonly width: number;
+	public readonly height: number;
+	/**
+	 * The depth of the image in bits per pixel, i.e. one of 32 (color), 8 (grayscale) or 1 (monochrome).
+	 */
+	public readonly depth: number;
+
+	/**
+	 * Returns the (boolean) inverse of this image.
+	 */
+	public invert(): Image;
+	/**
+	 * Returns the (boolean) union of two images with equal depth, aligning them to the upper left corner.
+	 */
+	public or(otherImage: Image): Image;
+	/**
+	 * Returns the (boolean) difference of two images with equal depth, aligning them to the upper left corner.
+	 */
+	public and(otherImage: Image): Image;
+	/**
+	 * Returns the (boolean) exclusive disjunction of two images with equal depth, aligning them to the upper left corner.
+	 */
+	public xor(otherImage: Image): Image;
+	/**
+	 * If the images are monochrome, dispatches to Leptonica's pixOr. Otherwise, returns the channelwise addition of b to a, clipped at 255.
+	 */
+	public add(otherImage: Image): Image;
+	/** If the images are monochrome, dispatches to Leptonica's pixSubtract and is equivalent to a.and(b.invert()). For grayscale images, returns the pixelwise subtraction of b from a, clipped at zero. For color, the entire RGB value is subtracted instead of doing channelwise subtraction (ask Leptonica why).
+	 * @example:
+	 * redness = colorImage.toGray(1, 0, 0).subtract(colorImage.toGray(0, 0.5, 0.5))
+	 */
+	public subtract(otherImage: Image): Image;
+	/**
+	 * Applies a convoltuion kernel with the specified dimensions. Image convolution is an operation where each destination pixel is computed based on a weighted sum of a set of nearby source pixels.
+	 */
+	public convolve(halfWidth: number, halfHeight: number): Image;
+
+	/**
+	 * Unsharp Masking creates an unsharp mask using halfWidth. The fraction determines how much of the edge is added back into image. The resulting image appears clearer, but it is generally less accurate.
+	 */
+	public unsharp(halfWidth: number, fraction: number): Image;
+	/**
+	 * Rotates the image around its center by the specified angle in degrees.
+	 */
+	public rotate(angle: number): Image;
+	/**
+	 * Scales an image proportionally by scale (1.0 = 100%).
+	 */
+	public scale(scale: number): Image;
+
+	/**
+	 * Scales an image by scaleX and scaleY (1.0 = 100%).
+	 */
+	public scale(scaleX: number, scaleY: number): Image;
+
+	/**
+	 * Crops an image from this image by the specified rectangle and returns the resulting image.
+	 */
+	public crop(box: Box): Image;
+	public crop(x: number, y: number, width: number, height: number): Image;
+	/**
+	 * Creates a mask by testing if pixels (RGB, HSV, ...) are between lower and upper. Formally speaking:
+	 * lower1 ≤ pixel1 ≤ upper1
+	 * ∧ lower2 ≤ pixel2 ≤ upper2
+	 * ∧ lower3 ≤ pixel3 ≤ upper3
+	 */
+	public inRange(lower1: number, lower2: number, lower3: number, upper1: number, upper2: number, upper3: number): Image;
+	/**
+	 * Only available for grayscale images. Returns the histogram in an array of length 256, where each entry represents the fraction (0.0 to 1.0) of that color in the image.
+	 * The mask parameter is optional and must be a monochrome image of same width and height; only pixels where mask is 0 will be counted.
+	 */
+	public histogram(mask?: Image): Image;
+	/**
+	 * Computes the horizontal or vertical projection of an 1bpp or 8bpp image.
+	 */
+	public projection(mode: 'horizontal' | 'vertical'): number[];
+	/**
+	 * Sets the specified value to each pixel set in the mask.
+	 */
+	public setMasked(mask: Image, value: number): Image;
+	/**
+	 * Available for grayscale and color images. Channelwise maps each pixel of image using mapping, which must be an array of length 256 with integer values between 0 and 255.
+	 * !!! !!! Note: this function actually changes the image!
+	 * The mask parameter is optional and must be a monochrome image of same width and height; only pixels where mask is 0 will be modified.
+	 */
+	public applyCurve(mapping: number[], mask?: Image): this;
+	/**
+	 * Applies a rank (0.0 ... 1.0) filter of the specified width and height (think of it as radius) to this image and returns the result. If you set rank to 0.5 you'll get a Median Filter. Note that this type of filter works best with odd sizes like 3 or 5.
+	 */
+	public rankFilter(width: number, height: number, rank: number): Image;
+	/**
+	 * Color image quantization using an octree based algorithm. colors must be between 2 and 256. Note that support for the resulting palette image is highly experimental at this point; only toGray() and toBuffer('png') are guaranteed to work.
+	 */
+	public octreeColorQuant(colors: number): Image;
+	/**
+	 * Color image quantization using median cut algorithm. colors must be between 2 and 256. Note that support for the resulting palette image is highly experimental at this point; only toGray() and toBuffer('png') are guaranteed to work.
+	 */
+	public medianCutQuant(colors: number): Image;
+	/**
+	 * Converts a grayscale image to monochrome using a global threshold. value must be between 0 and 255.
+	 */
+	public threshold(value: number): Image;
+	/**
+	 * Converts an image to grayscale using default settings. Can be used to convert monochrome images back to grayscale.
+	 */
+	public toGray(): Image;
+	/**
+	 * Converts an RGB image to grayscale using the specified widths for each channel.
+	 */
+	public toGray(redWeight: number, greenWeight: number, blueWeight: number): Image;
+	/**
+	 * Converts an RGB image to grayscale by selecting either the 'min' or 'max' channel. This can act as a simple color filter: 'max' maps colored pixels towards white, while 'min' maps colored pixels towards black.
+	 */
+	public toGray(selector: 'min' | 'max'): Image;
+	/**
+	 * Converts a grayscale image to a color image.
+	 */
+	public toColor(): Image;
+	/**
+	 * Converts from RGB to HSV color space. HSV has the following ranges:
+	 * Hue: [0 .. 239]
+	 * Saturation: [0 .. 255]
+	 * Value: [0 .. 255]
+	 */
+	public toHSV(): Image;
+	/**
+	 * Converts from HSV to RGB color space.
+	 */
+	public toRGB(): Image;
+	/**
+	 * Applies an Erode Filter and returns the result.
+	 */
+	public erode(width: number, height: number): Image;
+	/**
+	 * Applies a Dilate Filter and returns the result.
+	 */
+	public dilate(width: number, height: number): Image;
+	/**
+	 * Applies an Open Filter and returns the result.
+	 */
+	public open(width: number, height: number): Image;
+	/**
+	 * Applies a Close Filter and returns the result.
+	 */
+	public close(width: number, height: number): Image;
+	/**
+	 * Applies morphological thinning of type (fg or bg) with the specified connectivitiy (4 or 8) and maxIterations (0 to iterate until complete).
+	 */
+	public thin(type: 'fg' | 'bg', connectivity: number, maxIterations: number): Image;
+	/**
+	 * Scales an 8bpp image for maximum dynamic range. scale must be either log or linear.
+	 */
+	public maxDynamicRange(scale: 'log' | 'linear'): Image;
+	/**
+	 * Applies Otsu's Method for computing the threshold of a grayscale image. It computes a threshold for each tile of the specified size and performs the threshold operation, resulting in a binary image for each tile. These are stitched into the final result.
+	 * The smooth size controls the a convolution kernel applied to threshold array (use 0 for no smoothing). The score factor controls the fraction of the max. Otsu score (typically 0.1; use 0.0 for standard Otsu).
+	 */
+	public otsuAdaptiveThreshold(tileWidth: number, tileHeight: number, smoothWidth: number, smoothHeight: number, scoreFactor: number): Image;
+	/**
+	 * Detects Line Segments with the specified accuracy (3 is a good start). The number of found line segments can be limited using maxLineSegments (0 is unlimited).
+	 */
+	public lineSegments(accuracy: number, maxLineSegments: number, useWeightedMeanShift: boolean): Segment[];
+	/**
+	 * Only available for monochrome images. Tries to find the skew of this image. The resulting angle is in degree. The confidence is between 0.0 and 1.0.
+	 */
+	public findSkew(): Skew;
+	/**
+	 * Only available for monochrome images. Tries to extract connected components (think of flood fill). The connectivity can be specified as 4 or 8 directions.
+	 */
+	public connectedComponents(connectivity: 4 | 8): Component[];
+	/**
+	 * The Distance Function works on 1bpp images. It labels each pixel with the largest distance between this and any other pixel in its connected component. The connectivity is either 4 or 8.
+	 */
+	public distanceFunction(connectivity: 4 | 8): Image;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Fills a specified rectangle with white.
+	 */
+	public clearBox(box: Box): this;
+	public clearBox(x: number, y: number, width: number, height: number): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a filled rectangle to this image with the specified value. Works for 8bpp and 1bpp images.
+	 */
+	public fillBox(box: Box, value: number): this;
+	public fillBox(x: number, y: number, width: number, height: number, value: number): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a filled rectangle to this image in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
+	 */
+	public fillBox(box: Box, r: number, g: number, b: number, fraction?: number): this;
+	public fillBox(x: number, y: number, width: number, height: number, r: number, g: number, b: number, fraction?: number): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a rectangle to this image with the specified border. The possible pixel manipulating operations are set, clear and flip.
+	 */
+	public drawBox(box: Box, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
+	public drawBox(x: number, y: number, width: number, height: number, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a rectangle to this image with the specified border in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
+	 */
+	public drawBox(box: Box, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
+	public drawBox(x: number, y: number, width: number, height: number, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a line between p1 and p2 to this image with the specified line width. The possible pixel manipulating operations are set, clear and flip.
+	 */
+	public drawLine(p1: Point, p2: Point, width: number, operation: 'set' | 'clear' | 'flip'): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws a line between p1 and p2 to this image with the specified line width in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
+	 */
+	public drawLine(p1: Point, p2: Point, width: number, red: number, green: number, blue: number, frac?: number): this;
+	/**
+	 * !!! Note: this function actually changes the image!
+	 * Draws an image to this image with the specified destination box.
+	 */
+	public drawImage(image: Image, box: Box): this;
+	public drawImage(image: Image, x: number, y: number, width: number, height: number): this;
+	/**
+	 * Converts the Image in the specified format to a buffer.
+	 * Specifying raw returns the raw image data as buffer. For color images, the result contains three bytes per pixel in the order R, G, B; for grayscale and monochrome images, it contains one byte per pixel.
+	 * Specifying png returns a PNG encoded image as buffer.
+	 * Specifying jpg returns a JPG encoded image as buffer.
+	 */
+	public toBuffer(format?: 'raw' | 'png' | 'jpg'): Buffer;
+}
+
+export interface Rect {
+	// todo
+}
+
+export interface Region {
+	box: Box;
+	text: string,
+	confidence: number;
+}
+
+export type Paragaph = Region;
+
+export interface Textline {
+	box: Box;
+}
+
+export type Word = Region;
+
+export interface Choice {
+	text: string,
+	confidence: number;
+}
+
+export interface Symbol extends Region {
+	choices: Choice[];
+}
+
+export type Text = Choice;
+
+/**
+ * A Tesseract object represents an optical character recognition engine, that reads text using Tesseract from an image. Tesseract supports many langauges and fonts (see Tesseract/Downloads). New language files have to be installed in node-dv/tessdata.
+ */
+export class Tesseract {
+	/**
+	 * Creates a Tesseract engine with language set to english.
+	 */
+	constructor();
+	constructor(datapath: string);
+	/**
+	 * Creates a Tesseract engine with the specified language.
+	 */
+	constructor(datapath: string, lang: string);
+	/**
+	 * Creates a Tesseract engine with the specified language and image.
+	 */
+	constructor(datapath: string, lang: string, image: Image);
+
+	/**
+	 * Accessor for the input image.
+	 */
+	public image: Image;
+	/**
+	 * Accessor for the rectangle that specifies a "visible" area on the image.
+	 */
+	public rectangle: Rect;
+	/**
+	 * Accessor for the page segmentation mode. Valid values are: osd_only, auto_osd, auto_only, auto, single_column, single_block_vert_text, single_block, single_line, single_word, circle_word, single_char, sparse_text, sparse_text_osd.
+	 */
+	public pageSegMode: 'osd_only' | 'auto_osd' | 'auto_only' | 'auto' | 'single_column' | 'single_block_vert_text' | 'single_block' | 'single_line' | 'single_word' | 'circle_word' | 'single_char' | 'sparse_text' | 'sparse_text_osd'
+	[key: string]: unknown;
+
+	/**
+	 * Clears the tesseract image and its last results.
+	 */
+	public clear(): void;
+	/**
+	 * Clears all adaptive classifiers (use this when results vary during scanning).
+	 */
+	public clearAdaptiveClassifier(): void;
+	/**
+	 * Returns the binarized image Tesseract uses for its recognition.
+	 */
+	public thresholdImage(): Image;
+	/**
+	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
+	 */
+	public findRegions(recognize: boolean): Region[];
+	/**
+	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
+	 */
+	public findParagraphs(recognize: boolean): Paragaph[];
+	/**
+	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
+	 */
+	public findTextLines(recognize: boolean): Textline[];
+	/**
+	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
+	 */
+	public findWords(recognize: boolean): Word[];
+	/**
+	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
+	 */
+	public findSymbols(recognize: boolean): Symbol[];
+	/**
+	 * Returns text in the specified format. Valid formats are: plain, unlv.
+	 */
+	public findText(format: 'plain' | 'unlv', withConfidence?: boolean): string;
+	public findText(format: 'hocr' | 'box', pageNumber: number): string;
+}
+
+export interface Barcodeformat {
+	QR_CODE: boolean;
+	DATA_MATRIX: boolean;
+	PDF_417: boolean;
+	UPC_E: boolean;
+	UPC_A: boolean;
+	EAN_8: boolean;
+	EAN_13: boolean;
+	CODE_128: boolean;
+	CODE_39: boolean;
+	ITF: boolean;
+	AZTEC: boolean;
+}
+
+export interface BarCode {
+	type: string;
+	data: string;
+	buffer: Buffer;
+	points: Point[];
+}
+
+/**
+ * A ZXing object represents a barcode reader. By default it attempts to decode all barcode formats that ZXing supports.
+ */
+export class ZXing {
+	constructor(image?: Image);
+
+	/**
+	 * Accessor for the input image this barcode reader operates on.
+	 */
+	public image: Image;
+	/**
+	 * List of barcodes the reader tries to find. It's specified as an object and missing properties account as false
+	 */
+	public formats: Barcodeformat;
+	/**
+	 * If try harder is enabled, the barcode reader spends more time trying to find a barcode (optimize for accuracy, not speed).
+	 */
+	public tryHarder: boolean;
+	/**
+	 * Returns the first barcode found as an object with the following format:
+	 */
+	public findCode(): BarCode;
+	/**
+	 * enotes the barcodes type.
+	 */
+	public readonly type: 'None' | 'QR_CODE' | 'DATA_MATRIX' | 'PDF_417' | 'UPC_E' | 'UPC_A' | 'EAN_8' | 'EAN_13' | 'CODE_128' | 'CODE_39' | 'ITF' | 'AZTEC';
+	/**
+	 * denotes the stringified data read from the barcode.
+	 */
+	public readonly data: string;
+	/**
+	 * denotes the decoded binary data of the barcode before conversion into another character encoding.
+	 */
+	public readonly buffer: Buffer;
+	/**
+	 * denotes the points in pixels which were used by the barcode reader to detect the barcode.
+	 */
+	public readonly points: Point[];
+}
diff --git a/types/dv/tsconfig.json b/types/dv/tsconfig.json
new file mode 100644
index 0000000000..ad0aaa212b
--- /dev/null
+++ b/types/dv/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",
+		"dv-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/types/dv/tslint.json b/types/dv/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 246c3ed34bd24c811e2b4b02fc9e9db62445b92e Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Mon, 4 Mar 2019 10:57:08 +0000
Subject: [PATCH 315/924] Attempt to fix adone build errors

Re. https://github.com/DefinitelyTyped/DefinitelyTyped/pull/33228#issuecomment-469030749
---
 types/adone/tslint.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/adone/tslint.json b/types/adone/tslint.json
index 8c265eebb4..2a9ae5c804 100644
--- a/types/adone/tslint.json
+++ b/types/adone/tslint.json
@@ -13,6 +13,7 @@
         "no-unnecessary-qualifier": false,
         "unified-signatures": false,
         "space-before-function-paren": false,
-        "await-promise": false
+        "await-promise": false,
+        "no-restricted-globals": false
     }
 }
\ No newline at end of file

From 4f2a0af1575d74c5f3d0047f3690bc41857a12f6 Mon Sep 17 00:00:00 2001
From: Jonas Keisel <jonas.keisel@gmail.com>
Date: Mon, 4 Mar 2019 12:02:58 +0100
Subject: [PATCH 316/924] Added Stripe PaymentIntents

---
 types/stripe/index.d.ts      | 543 ++++++++++++++++++++++++++++++++++-
 types/stripe/stripe-tests.ts |  45 +++
 2 files changed, 587 insertions(+), 1 deletion(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 41e591c839..23b1a96ead 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stripe 6.19
+// Type definitions for stripe 6.25
 // Project: https://github.com/stripe/stripe-node/
 // Definitions by: William Johnston <https://github.com/wjohnsto>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -17,6 +17,7 @@
 //                 Slava Yultyyev <https://github.com/yultyyev>
 //                 Corey Psoinos <https://github.com/cpsoinos>
 //                 Saransh Kataria <https://github.com/saranshkataria>
+//                 Jonas Keisel <https://github.com/0xJoKe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -53,6 +54,7 @@ declare class Stripe {
     events: Stripe.resources.Events;
     invoices: Stripe.resources.Invoices;
     invoiceItems: Stripe.resources.InvoiceItems;
+    paymentIntents: Stripe.resources.PaymentIntents;
     payouts: Stripe.resources.Payouts;
     plans: Stripe.resources.Plans;
     /**
@@ -2980,6 +2982,411 @@ declare namespace Stripe {
         type PayoutTypes = "bank_account" | "card";
     }
 
+    namespace paymentIntents {
+		interface IPaymentIntent extends IResourceObject {
+			/**
+			 * Value is "payment_intent".
+			 */
+			object: 'payment_intent';
+
+			/**
+			 * The amount in cents that is to be collected from this PaymentIntent.
+			 */
+			amount: number;
+
+			/**
+			 * The amount that can be captured with from this PaymentIntent (in cents).
+			 */
+			amount_capturable: number;
+
+			/**
+			 * The amount that was collected from this PaymentIntent (in cents).
+			 */
+			amount_received: number;
+
+			/**
+			 * ID of the Connect application that created the PaymentIntent. [Expandable]
+			 */
+			application?: string | applications.IApplication | null;
+
+			/**
+			 * A fee in cents that will be applied to the invoice and transferred to the application owner's Stripe account.
+			 */
+			application_fee_amount?: number | null;
+
+			/**
+			 * Populated when `status` is `canceled`, this is the time at which the PaymentIntent was canceled.
+			 * Measured in seconds since the Unix epoch.
+			 */
+			canceled_at: number | null;
+
+			/**
+			 * User-given reason for cancellation of this PaymentIntent.
+			 */
+			cancelation_reason:
+				| 'duplicate'
+				| 'fraudulent'
+				| 'requested_by_customer'
+				| 'failed_invoice'
+				| null;
+
+			/**
+			 * Capture method of this PaymentIntent.
+			 */
+			capture_method: 'automatic' | 'manual';
+
+			/**
+			 * Charges that were created by this PaymentIntent, if any.
+			 */
+			charges: IList<charges.ICharge>;
+
+			/**
+			 * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled.
+			 */
+			client_secret: string;
+
+			/**
+			 * Confirmation method of this PaymentIntent.
+			 */
+			confirmation_method: 'secret' | 'publishable';
+
+			/**
+			 * Time at which the object was created. Measured in seconds since the Unix epoch.
+			 */
+			created: number;
+
+			/**
+			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+			 */
+			currency: string;
+
+			/**
+			 * ID of the Customer this PaymentIntent is for if one exists. [Expandable]
+			 */
+			customer: string | customers.ICustomer | null;
+
+			/**
+			 * An arbitrary string attached to the object. Often useful for displaying to users.
+			 */
+			description?: string;
+
+			/**
+			 * The payment error encountered in the previous PaymentIntent confirmation.
+			 */
+			last_payment_error: IStripeError | null;
+
+			livemode: boolean;
+
+			metadata: IMetadata;
+
+			/**
+			 * If present, this property tells you what actions you need to take in order for your customer to fulfill a payment using the provided source.
+			 */
+			next_action:
+				| IPaymentIntentNextActionUseStripeSdk
+				| IPaymentIntentNextActionRedirectToUrl;
+
+			/**
+			 * The account (if any) for which the funds of the PaymentIntent are intended. See the PaymentIntents Connect usage guide for details. [Expandable]
+			 */
+			on_behalf_of?: string | null;
+
+			/**
+			 * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+			 */
+			payment_method_types: string[];
+
+			/**
+			 * Email address that the receipt for the resulting payment will be sent to.
+			 */
+			receipt_email: string | null;
+
+			/**
+			 * ID of the review associated with this PaymentIntent, if any. [Expandable]
+			 */
+			review?: string | reviews.IReview | null;
+
+			/**
+			 * Shipping information for this PaymentIntent.
+			 */
+			shipping?: IShippingInformation | null;
+
+			/**
+			 * ID of the source used in this PaymentIntent. [Expandable]
+			 */
+			source:
+				| string
+				| cards.ICard
+				| bitcoinReceivers.IBitcoinReceiver
+				| bankAccounts.IBankAccount;
+
+			/**
+			 * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
+			 */
+			statement_descriptor: string | null;
+
+			/**
+			 * The several states the PaymentIntent goes through until it it either canceled or succeeds.
+			 */
+			status:
+				| 'requires_payment_method'
+				| 'requires_action'
+				| 'processing'
+				| 'requires_authorization'
+				| 'requires_capture'
+				| 'canceled'
+				| 'succeeded';
+
+			/**
+			 * The data with which to automatically create a Transfer when the payment is finalized.
+			 */
+			transfer_data: IPaymentIntentTransferData | null;
+
+			/**
+			 * A string that identifies the resulting payment as part of a group.
+			 */
+			transfer_group: string | null;
+		}
+
+		interface IPaymentIntentTransferData {
+			/**
+			 * The account (if any) the payment will be attributed to for tax reporting, and where funds from the payment will be transferred to upon payment success. [Expandable]
+			 */
+			destination:
+				| string
+				| bankAccounts.IBankAccount
+				| cards.ICardHash
+				| accounts.IAccountCreationOptions;
+		}
+
+		interface IPaymentIntentNextActionRedirectToUrl {
+			type: 'redirect_to_url';
+			/**
+			 * Contains instructions for authenticating a payment by redirecting your customer to another page or application.
+			 */
+			redirect_to_url: { return_url: string; url: string };
+		}
+
+		interface IPaymentIntentNextActionUseStripeSdk {
+			type: 'use_stripe_sdk';
+			/**
+			 * When confirming a PaymentIntent with js, js depends on the contents of this object to invoke authentication flows. The shape of the contents is subject to change and is only intended to be used by js.
+			 */
+			use_stripe_sdk: any;
+		}
+
+		interface IPaymentIntentCreationOptions {
+			/**
+			 * Amount intended to be collected by this PaymentIntent (in cents).
+			 */
+			amount: number;
+
+			/**
+			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+			 */
+			currency: string;
+
+			/**
+			 * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+			 */
+			payment_method_types: string[];
+
+			/**
+			 * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+			 */
+			application_fee_amount?: number;
+
+			/**
+			 * Capture method of this PaymentIntent.
+			 */
+			capture_method?: 'automatic' | 'manual';
+
+			/**
+			 * Attempt to confirm this PaymentIntent immediately. If the payment method attached is a card, a return_url must be provided in case additional authentication is required.
+			 */
+			confirm?: boolean;
+
+			/**
+			 * ID of the customer this PaymentIntent is for if one exists.
+			 */
+			customer?: string;
+
+			/**
+			 * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
+			 */
+			description?: string | null;
+
+			/**
+			 * A 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. You can unset an individual key by setting its value to null and
+			 * then saving. To clear all keys, set metadata to null, then save.
+			 */
+			metadata?: IOptionsMetadata;
+
+			/**
+			 * The Stripe account ID for which these funds are intended.
+			 */
+			on_behalf_of?: string;
+
+			/**
+			 * Email address that the receipt for the resulting payment will be sent to.
+			 */
+			receipt_email?: string;
+
+			/**
+			 * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This param can only be used if `confirm=true`.
+			 */
+			return_url?: string;
+
+			/**
+			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+			 */
+			save_payment_method?: boolean;
+
+			/**
+			 * Shipping information for this PaymentIntent.
+			 */
+			shipping?: IShippingInformation;
+
+			/**
+			 * ID of the Source object to attach to this PaymentIntent.
+			 */
+			source?: string;
+
+			/**
+			 * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
+			 */
+			statement_descriptor?: string;
+
+			/**
+			 * The parameters used to automatically create a Transfer when the payment succeeds.
+			 */
+			transfer_data?: IPaymentIntentTransferData;
+
+			/**
+			 * A string that identifies the resulting payment as part of a group.
+			 */
+			transfer_group?: string;
+		}
+
+		interface IPaymentIntentUpdateOptions {
+			/**
+			 * Amount intended to be collected by this PaymentIntent (in cents).
+			 */
+			amount?: number;
+
+			/**
+			 * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+			 */
+			application_fee_amount?: number;
+
+			/**
+			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+			 */
+			currency?: string;
+
+			/**
+			 * ID of the customer this PaymentIntent is for if one exists.
+			 */
+			customer?: string;
+
+			/**
+			 * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
+			 */
+			description?: string | null;
+
+			/**
+			 * A 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. You can unset an individual key by setting its value to null and
+			 * then saving. To clear all keys, set metadata to null, then save.
+			 */
+			metadata?: IOptionsMetadata;
+
+			/**
+			 * Email address that the receipt for the resulting payment will be sent to.
+			 */
+			receipt_email?: string;
+
+			/**
+			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+			 */
+			save_payment_method?: boolean;
+
+			/**
+			 * Shipping information for this PaymentIntent.
+			 */
+			shipping?: IShippingInformation;
+
+			/**
+			 * ID of the Source object to attach to this PaymentIntent.
+			 */
+			source?: string;
+
+			/**
+			 * A string that identifies the resulting payment as part of a group.
+			 */
+			transfer_group?: string;
+		}
+
+		interface IPaymentIntentConfirmOptions {
+			/**
+			 * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled. Required if using Publishable Key!
+			 */
+			client_secret?: string;
+
+			/**
+			 * Email address that the receipt for the resulting payment will be sent to.
+			 */
+			receipt_email?: string | null;
+
+			/**
+			 * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This parameter is only used for cards and other redirect-based payment methods.
+			 */
+			return_url?: string;
+
+			/**
+			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+			 */
+			save_payment_method?: boolean;
+
+			/**
+			 * Shipping information for this PaymentIntent.
+			 */
+			shipping?: IShippingInformation | null;
+
+			/**
+			 * ID of the source used in this PaymentIntent.
+			 */
+			source?: string;
+		}
+
+		interface IPaymentIntentCaptureOptions {
+			/**
+			 * The amount to capture (in cents) from the PaymentIntent, which must be less than or equal to the original amount. Any additional amount will be automatically refunded. Defaults to the full `amount_capturable` if not provided.
+			 */
+			amount_to_capture?: number;
+
+			/**
+			 * The amount of the application fee (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+			 */
+			application_fee_amount?: number;
+		}
+
+		interface IPaymentIntentListOptions extends IListOptionsCreated {
+			/**
+			 * Filter links by their expiration status. By default, all links are returned.
+			 */
+			expired?: boolean;
+
+			/**
+			 * Only return links for the given file.
+			 */
+			file?: boolean;
+		}
+	}
+
     namespace plans {
         interface ITier {
             /**
@@ -6816,6 +7223,140 @@ declare namespace Stripe {
             del(invoiceItemId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
         }
 
+		class PaymentIntents extends StripeResource {
+			/**
+			 * Creates a PaymentIntent object.
+			 */
+			create(
+				data: paymentIntents.IPaymentIntentCreationOptions,
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			create(
+				data: paymentIntents.IPaymentIntentCreationOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+
+			/**
+			 * Returns a list of PaymentIntents.
+			 *
+			 * @returns A object with a data property that contains an array of up to limit PaymentIntents, starting after PaymentIntent starting_after. Each entry in the array is a separate PaymentIntent object. If no more PaymentIntents are available, the resulting array will be empty. This request should never throw an error.
+			 */
+			list(
+				data: paymentIntents.IPaymentIntentListOptions,
+				options: HeaderOptions,
+				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+			): Promise<IList<paymentIntents.IPaymentIntent>>;
+			list(
+				data: paymentIntents.IPaymentIntentListOptions,
+				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+			): Promise<IList<paymentIntents.IPaymentIntent>>;
+			list(
+				options: HeaderOptions,
+				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+			): Promise<IList<paymentIntents.IPaymentIntent>>;
+			list(
+				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+			): Promise<IList<paymentIntents.IPaymentIntent>>;
+
+			/**
+			 * Updates a PaymentIntent object.
+			 */
+			update(
+				id: string,
+				data: paymentIntents.IPaymentIntentUpdateOptions,
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			update(
+				id: string,
+				data: paymentIntents.IPaymentIntentUpdateOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+
+			/**
+			 * Retrieves the details of a PaymentIntent that has previously been created.
+			 * Client-side retrieval using a publishable key is allowed when the client_secret is provided in the query string.
+			 * When retrieved with a publishable key, only a subset of properties will be returned. Please refer to the payment intent object reference for more details.
+			 */
+			retrieve(
+				id: string,
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			retrieve(
+				id: string,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+
+			/**
+			 * Confirm that your customer intends to pay with current or provided `source`. Upon confirmation, the PaymentIntent will attempt to initiate a payment.
+			 *
+			 * If the selected source requires additional authentication steps, the PaymentIntent will transition to the `requires_action` status and suggest additional actions via `next_source_action`. If payment fails, the PaymentIntent will transition to the `requires_payment_method` status. If payment succeeds, the PaymentIntent will transition to the `succeeded` status (or `requires_capture`, if `capture_method` is set to `manual`).
+			 *
+			 * When using a publishable key, the client_secret must be provided to confirm the PaymentIntent.
+			 */
+			confirm(
+				paymentIntentId: string,
+				data: paymentIntents.IPaymentIntentConfirmOptions,
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			confirm(
+				paymentIntentId: string,
+				data: paymentIntents.IPaymentIntentConfirmOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+
+			/**
+			 * Capture the funds of an existing uncaptured PaymentIntent where `required_action="requires_capture"`.
+			 * Uncaptured PaymentIntents will be canceled exactly seven days after they are created.
+			 *
+			 * @returns Returns a PaymentIntent object with `status="succeeded"` if the PaymentIntent was capturable. Returns an error if the PaymentIntent was not capturable or an invalid amount to capture was provided.
+			 */
+			capture(
+				paymentIntentId: string,
+				data: paymentIntents.IPaymentIntentCaptureOptions,
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			capture(
+				paymentIntentId: string,
+				data: paymentIntents.IPaymentIntentCaptureOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+
+			/**
+			 * A PaymentIntent object can be canceled when it is in one of these statuses: `requires_payment_method`, `requires_capture`, `requires_confirmation`, `requires_action`.
+			 * Once canceled, no additional charges will be made by the PaymentIntent and any operations on the PaymentIntent will fail with an error. For PaymentIntents with `status='requires_capture'`, the remaining `amount_capturable` will automatically be refunded.
+			 *
+			 * @returns Returns a PaymentIntent object if the cancellation succeeded. Returns an error if the PaymentIntent has already been canceled or is not in a cancelable state.
+			 */
+			cancel(
+				paymentIntentId: string,
+				data: {
+					cancellation_reason?:
+						| 'duplicate'
+						| 'fraudulent'
+						| 'requested_by_customer'
+						| 'failed_invoice';
+				},
+				options: HeaderOptions,
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+			cancel(
+				paymentIntentId: string,
+				data: {
+					cancellation_reason?:
+						| 'duplicate'
+						| 'fraudulent'
+						| 'requested_by_customer'
+						| 'failed_invoice';
+				},
+				response?: IResponseFn<paymentIntents.IPaymentIntent>,
+			): Promise<paymentIntents.IPaymentIntent>;
+		}
+
         class Payouts extends StripeResource {
             /**
              * To send funds to your own bank account, you create a new payout object. Your Stripe balance must be able to cover the payout amount, or you’ll receive an “Insufficient Funds” error.
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 154a5e0a58..6fc4a5ac25 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -1018,6 +1018,51 @@ stripe.invoices.retrieve("in_15fvyXEe31JkLCeQH7QbgZZb", { expand: ["subscription
 
 //#endregion
 
+//#region Payment Intents test
+// ##################################################################################
+stripe.paymentIntents.create({
+    amount: 2000,
+    currency: "eur",
+    payment_method_types: ["card"],
+}, (err, intent) => {});
+
+stripe.paymentIntents.create({
+    amount: 2000,
+    currency: "eur",
+    payment_method_types: ["card"],
+}).then((intent) => {});
+
+stripe.paymentIntents.list({}, (err, intent) => {});
+stripe.paymentIntents.list({}).then((intent) => {});
+stripe.paymentIntents.list((err, intent) => {});
+stripe.paymentIntents.list().then((intent) => {});
+stripe.paymentIntents.list({ expired: true }, (err, intent) => {});
+stripe.paymentIntents.list({ expired: true }).then((intent) => {});
+
+stripe.paymentIntents.update("pi_Aabcxyz01aDfoo", {
+    amount: 2001,
+    currency: 'usd',
+}, (err, intent) => {});
+stripe.paymentIntents.update("pi_Aabcxyz01aDfoo", {
+    amount: 2001,
+    currency: 'usd',
+}).then((intent) => {});
+
+stripe.paymentIntents.retrieve("pi_Aabcxyz01aDfoo", (err, intent) => {});
+stripe.paymentIntents.retrieve("pi_Aabcxyz01aDfoo").then((intent) => {});
+
+stripe.paymentIntents.confirm("pi_Aabcxyz01aDfoo", {}, (err, intent) => {});
+stripe.paymentIntents.confirm("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
+
+stripe.paymentIntents.capture("pi_Aabcxyz01aDfoo", {}, (err, intent) => {});
+stripe.paymentIntents.capture("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
+
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", {}, (err, intent) => {});
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", { cancellation_reason: 'duplicate' }, (err, intent) => {});
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", { cancellation_reason: 'requested_by_customer' }).then((intent) => {});
+//#endregion
+
 //#region Payouts tests
 // ##################################################################################
 stripe.payouts.create({

From bd701363922cc3c1bdaa9d19e98a2f2faab9b6d7 Mon Sep 17 00:00:00 2001
From: minijus <3633549+minijus@users.noreply.github.com>
Date: Mon, 4 Mar 2019 13:33:04 +0200
Subject: [PATCH 317/924] [webpack-dev-server] Add httpProxyMiddleware.Filter
 support to context property of ProxyConfigArrayItem

webpack-dev-server [proxy documentation](https://webpack.js.org/configuration/dev-server/#devserverproxy) gives an example of using Filter function for context property and in reality dev-server supports it. However, it was missing on `@types/webpack-dev-server`.
---
 types/webpack-dev-server/index.d.ts                  | 2 +-
 types/webpack-dev-server/webpack-dev-server-tests.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index 30fd2482e7..02b22e7817 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -28,7 +28,7 @@ declare namespace WebpackDevServer {
 
     type ProxyConfigArrayItem = {
         path?: string | string[];
-        context?: string | string[]
+        context?: string | string[] | httpProxyMiddleware.Filter
     } & httpProxyMiddleware.Config;
 
     type ProxyConfigArray = ProxyConfigArrayItem[];
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index 755245b035..dc8a1dbdc1 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -87,6 +87,9 @@ const c3: WebpackDevServer.Configuration = {
 const c4: WebpackDevServer.Configuration = {
     writeToDisk: (filePath: string) => true,
 };
+const c5: WebpackDevServer.Configuration = {
+    proxy: [{context: (pathname: string) => true}]
+};
 
 // API example
 server = new WebpackDevServer(compiler, config);

From aa73bbb298d339129ce6128777e3e78115d93373 Mon Sep 17 00:00:00 2001
From: Jonas Keisel <jonas.keisel@gmail.com>
Date: Mon, 4 Mar 2019 12:53:03 +0100
Subject: [PATCH 318/924] fixed spaces; created a cancellation reason type

---
 types/stripe/index.d.ts | 1049 +++++++++++++++++++--------------------
 1 file changed, 519 insertions(+), 530 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 23b1a96ead..d7d198d746 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -2983,409 +2983,406 @@ declare namespace Stripe {
     }
 
     namespace paymentIntents {
-		interface IPaymentIntent extends IResourceObject {
-			/**
-			 * Value is "payment_intent".
-			 */
-			object: 'payment_intent';
-
-			/**
-			 * The amount in cents that is to be collected from this PaymentIntent.
-			 */
-			amount: number;
-
-			/**
-			 * The amount that can be captured with from this PaymentIntent (in cents).
-			 */
-			amount_capturable: number;
-
-			/**
-			 * The amount that was collected from this PaymentIntent (in cents).
-			 */
-			amount_received: number;
-
-			/**
-			 * ID of the Connect application that created the PaymentIntent. [Expandable]
-			 */
-			application?: string | applications.IApplication | null;
-
-			/**
-			 * A fee in cents that will be applied to the invoice and transferred to the application owner's Stripe account.
-			 */
-			application_fee_amount?: number | null;
-
-			/**
-			 * Populated when `status` is `canceled`, this is the time at which the PaymentIntent was canceled.
-			 * Measured in seconds since the Unix epoch.
-			 */
-			canceled_at: number | null;
-
-			/**
-			 * User-given reason for cancellation of this PaymentIntent.
-			 */
-			cancelation_reason:
-				| 'duplicate'
-				| 'fraudulent'
-				| 'requested_by_customer'
-				| 'failed_invoice'
-				| null;
-
-			/**
-			 * Capture method of this PaymentIntent.
-			 */
-			capture_method: 'automatic' | 'manual';
-
-			/**
-			 * Charges that were created by this PaymentIntent, if any.
-			 */
-			charges: IList<charges.ICharge>;
-
-			/**
-			 * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled.
-			 */
-			client_secret: string;
-
-			/**
-			 * Confirmation method of this PaymentIntent.
-			 */
-			confirmation_method: 'secret' | 'publishable';
-
-			/**
-			 * Time at which the object was created. Measured in seconds since the Unix epoch.
-			 */
-			created: number;
-
-			/**
-			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
-			 */
-			currency: string;
-
-			/**
-			 * ID of the Customer this PaymentIntent is for if one exists. [Expandable]
-			 */
-			customer: string | customers.ICustomer | null;
-
-			/**
-			 * An arbitrary string attached to the object. Often useful for displaying to users.
-			 */
-			description?: string;
-
-			/**
-			 * The payment error encountered in the previous PaymentIntent confirmation.
-			 */
-			last_payment_error: IStripeError | null;
-
-			livemode: boolean;
-
-			metadata: IMetadata;
-
-			/**
-			 * If present, this property tells you what actions you need to take in order for your customer to fulfill a payment using the provided source.
-			 */
-			next_action:
-				| IPaymentIntentNextActionUseStripeSdk
-				| IPaymentIntentNextActionRedirectToUrl;
-
-			/**
-			 * The account (if any) for which the funds of the PaymentIntent are intended. See the PaymentIntents Connect usage guide for details. [Expandable]
-			 */
-			on_behalf_of?: string | null;
-
-			/**
-			 * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
-			 */
-			payment_method_types: string[];
-
-			/**
-			 * Email address that the receipt for the resulting payment will be sent to.
-			 */
-			receipt_email: string | null;
-
-			/**
-			 * ID of the review associated with this PaymentIntent, if any. [Expandable]
-			 */
-			review?: string | reviews.IReview | null;
-
-			/**
-			 * Shipping information for this PaymentIntent.
-			 */
-			shipping?: IShippingInformation | null;
-
-			/**
-			 * ID of the source used in this PaymentIntent. [Expandable]
-			 */
-			source:
-				| string
-				| cards.ICard
-				| bitcoinReceivers.IBitcoinReceiver
-				| bankAccounts.IBankAccount;
-
-			/**
-			 * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
-			 */
-			statement_descriptor: string | null;
-
-			/**
-			 * The several states the PaymentIntent goes through until it it either canceled or succeeds.
-			 */
-			status:
-				| 'requires_payment_method'
-				| 'requires_action'
-				| 'processing'
-				| 'requires_authorization'
-				| 'requires_capture'
-				| 'canceled'
-				| 'succeeded';
-
-			/**
-			 * The data with which to automatically create a Transfer when the payment is finalized.
-			 */
-			transfer_data: IPaymentIntentTransferData | null;
-
-			/**
-			 * A string that identifies the resulting payment as part of a group.
-			 */
-			transfer_group: string | null;
-		}
-
-		interface IPaymentIntentTransferData {
-			/**
-			 * The account (if any) the payment will be attributed to for tax reporting, and where funds from the payment will be transferred to upon payment success. [Expandable]
-			 */
-			destination:
-				| string
-				| bankAccounts.IBankAccount
-				| cards.ICardHash
-				| accounts.IAccountCreationOptions;
-		}
-
-		interface IPaymentIntentNextActionRedirectToUrl {
-			type: 'redirect_to_url';
-			/**
-			 * Contains instructions for authenticating a payment by redirecting your customer to another page or application.
-			 */
-			redirect_to_url: { return_url: string; url: string };
-		}
-
-		interface IPaymentIntentNextActionUseStripeSdk {
-			type: 'use_stripe_sdk';
-			/**
-			 * When confirming a PaymentIntent with js, js depends on the contents of this object to invoke authentication flows. The shape of the contents is subject to change and is only intended to be used by js.
-			 */
-			use_stripe_sdk: any;
-		}
-
-		interface IPaymentIntentCreationOptions {
-			/**
-			 * Amount intended to be collected by this PaymentIntent (in cents).
-			 */
-			amount: number;
-
-			/**
-			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
-			 */
-			currency: string;
-
-			/**
-			 * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
-			 */
-			payment_method_types: string[];
-
-			/**
-			 * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
-			 */
-			application_fee_amount?: number;
-
-			/**
-			 * Capture method of this PaymentIntent.
-			 */
-			capture_method?: 'automatic' | 'manual';
-
-			/**
-			 * Attempt to confirm this PaymentIntent immediately. If the payment method attached is a card, a return_url must be provided in case additional authentication is required.
-			 */
-			confirm?: boolean;
-
-			/**
-			 * ID of the customer this PaymentIntent is for if one exists.
-			 */
-			customer?: string;
-
-			/**
-			 * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
-			 */
-			description?: string | null;
-
-			/**
-			 * A 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. You can unset an individual key by setting its value to null and
-			 * then saving. To clear all keys, set metadata to null, then save.
-			 */
-			metadata?: IOptionsMetadata;
-
-			/**
-			 * The Stripe account ID for which these funds are intended.
-			 */
-			on_behalf_of?: string;
-
-			/**
-			 * Email address that the receipt for the resulting payment will be sent to.
-			 */
-			receipt_email?: string;
-
-			/**
-			 * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This param can only be used if `confirm=true`.
-			 */
-			return_url?: string;
-
-			/**
-			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
-			 */
-			save_payment_method?: boolean;
-
-			/**
-			 * Shipping information for this PaymentIntent.
-			 */
-			shipping?: IShippingInformation;
-
-			/**
-			 * ID of the Source object to attach to this PaymentIntent.
-			 */
-			source?: string;
-
-			/**
-			 * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
-			 */
-			statement_descriptor?: string;
-
-			/**
-			 * The parameters used to automatically create a Transfer when the payment succeeds.
-			 */
-			transfer_data?: IPaymentIntentTransferData;
-
-			/**
-			 * A string that identifies the resulting payment as part of a group.
-			 */
-			transfer_group?: string;
-		}
-
-		interface IPaymentIntentUpdateOptions {
-			/**
-			 * Amount intended to be collected by this PaymentIntent (in cents).
-			 */
-			amount?: number;
-
-			/**
-			 * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
-			 */
-			application_fee_amount?: number;
-
-			/**
-			 * Three-letter ISO currency code, in lowercase. Must be a supported currency.
-			 */
-			currency?: string;
-
-			/**
-			 * ID of the customer this PaymentIntent is for if one exists.
-			 */
-			customer?: string;
-
-			/**
-			 * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
-			 */
-			description?: string | null;
-
-			/**
-			 * A 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. You can unset an individual key by setting its value to null and
-			 * then saving. To clear all keys, set metadata to null, then save.
-			 */
-			metadata?: IOptionsMetadata;
-
-			/**
-			 * Email address that the receipt for the resulting payment will be sent to.
-			 */
-			receipt_email?: string;
-
-			/**
-			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
-			 */
-			save_payment_method?: boolean;
-
-			/**
-			 * Shipping information for this PaymentIntent.
-			 */
-			shipping?: IShippingInformation;
-
-			/**
-			 * ID of the Source object to attach to this PaymentIntent.
-			 */
-			source?: string;
-
-			/**
-			 * A string that identifies the resulting payment as part of a group.
-			 */
-			transfer_group?: string;
-		}
-
-		interface IPaymentIntentConfirmOptions {
-			/**
-			 * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled. Required if using Publishable Key!
-			 */
-			client_secret?: string;
-
-			/**
-			 * Email address that the receipt for the resulting payment will be sent to.
-			 */
-			receipt_email?: string | null;
-
-			/**
-			 * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This parameter is only used for cards and other redirect-based payment methods.
-			 */
-			return_url?: string;
-
-			/**
-			 * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
-			 */
-			save_payment_method?: boolean;
-
-			/**
-			 * Shipping information for this PaymentIntent.
-			 */
-			shipping?: IShippingInformation | null;
-
-			/**
-			 * ID of the source used in this PaymentIntent.
-			 */
-			source?: string;
-		}
-
-		interface IPaymentIntentCaptureOptions {
-			/**
-			 * The amount to capture (in cents) from the PaymentIntent, which must be less than or equal to the original amount. Any additional amount will be automatically refunded. Defaults to the full `amount_capturable` if not provided.
-			 */
-			amount_to_capture?: number;
-
-			/**
-			 * The amount of the application fee (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
-			 */
-			application_fee_amount?: number;
-		}
-
-		interface IPaymentIntentListOptions extends IListOptionsCreated {
-			/**
-			 * Filter links by their expiration status. By default, all links are returned.
-			 */
-			expired?: boolean;
-
-			/**
-			 * Only return links for the given file.
-			 */
-			file?: boolean;
-		}
-	}
+        interface IPaymentIntent extends IResourceObject {
+            /**
+             * Value is "payment_intent".
+             */
+            object: 'payment_intent';
+
+            /**
+             * The amount in cents that is to be collected from this PaymentIntent.
+             */
+            amount: number;
+
+            /**
+             * The amount that can be captured with from this PaymentIntent (in cents).
+             */
+            amount_capturable: number;
+
+            /**
+             * The amount that was collected from this PaymentIntent (in cents).
+             */
+            amount_received: number;
+
+            /**
+             * ID of the Connect application that created the PaymentIntent. [Expandable]
+             */
+            application?: string | applications.IApplication | null;
+
+            /**
+             * A fee in cents that will be applied to the invoice and transferred to the application owner's Stripe account.
+             */
+            application_fee_amount?: number | null;
+
+            /**
+             * Populated when `status` is `canceled`, this is the time at which the PaymentIntent was canceled.
+             * Measured in seconds since the Unix epoch.
+             */
+            canceled_at: number | null;
+
+            /**
+             * User-given reason for cancellation of this PaymentIntent.
+             */
+            cancelation_reason: PaymentIntentCancelationReason | null;
+
+            /**
+             * Capture method of this PaymentIntent.
+             */
+            capture_method: 'automatic' | 'manual';
+
+            /**
+             * Charges that were created by this PaymentIntent, if any.
+             */
+            charges: IList<charges.ICharge>;
+
+            /**
+             * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled.
+             */
+            client_secret: string;
+
+            /**
+             * Confirmation method of this PaymentIntent.
+             */
+            confirmation_method: 'secret' | 'publishable';
+
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch.
+             */
+            created: number;
+
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             */
+            currency: string;
+
+            /**
+             * ID of the Customer this PaymentIntent is for if one exists. [Expandable]
+             */
+            customer: string | customers.ICustomer | null;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users.
+             */
+            description?: string;
+
+            /**
+             * The payment error encountered in the previous PaymentIntent confirmation.
+             */
+            last_payment_error: IStripeError | null;
+
+            livemode: boolean;
+
+            metadata: IMetadata;
+
+            /**
+             * If present, this property tells you what actions you need to take in order for your customer to fulfill a payment using the provided source.
+             */
+            next_action:
+                | IPaymentIntentNextActionUseStripeSdk
+                | IPaymentIntentNextActionRedirectToUrl;
+
+            /**
+             * The account (if any) for which the funds of the PaymentIntent are intended. See the PaymentIntents Connect usage guide for details. [Expandable]
+             */
+            on_behalf_of?: string | null;
+
+            /**
+             * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+             */
+            payment_method_types: string[];
+
+            /**
+             * Email address that the receipt for the resulting payment will be sent to.
+             */
+            receipt_email: string | null;
+
+            /**
+             * ID of the review associated with this PaymentIntent, if any. [Expandable]
+             */
+            review?: string | reviews.IReview | null;
+
+            /**
+             * Shipping information for this PaymentIntent.
+             */
+            shipping?: IShippingInformation | null;
+
+            /**
+             * ID of the source used in this PaymentIntent. [Expandable]
+             */
+            source:
+                | string
+                | cards.ICard
+                | bitcoinReceivers.IBitcoinReceiver
+                | bankAccounts.IBankAccount;
+
+            /**
+             * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
+             */
+            statement_descriptor: string | null;
+
+            /**
+             * The several states the PaymentIntent goes through until it it either canceled or succeeds.
+             */
+            status:
+                | 'requires_payment_method'
+                | 'requires_action'
+                | 'processing'
+                | 'requires_authorization'
+                | 'requires_capture'
+                | 'canceled'
+                | 'succeeded';
+
+            /**
+             * The data with which to automatically create a Transfer when the payment is finalized.
+             */
+            transfer_data: IPaymentIntentTransferData | null;
+
+            /**
+             * A string that identifies the resulting payment as part of a group.
+             */
+            transfer_group: string | null;
+        }
+
+        interface IPaymentIntentTransferData {
+            /**
+             * The account (if any) the payment will be attributed to for tax reporting, and where funds from the payment will be transferred to upon payment success. [Expandable]
+             */
+            destination:
+                | string
+                | bankAccounts.IBankAccount
+                | cards.ICardHash
+                | accounts.IAccountCreationOptions;
+        }
+
+        interface IPaymentIntentNextActionRedirectToUrl {
+            type: 'redirect_to_url';
+            /**
+             * Contains instructions for authenticating a payment by redirecting your customer to another page or application.
+             */
+            redirect_to_url: { return_url: string; url: string };
+        }
+
+        interface IPaymentIntentNextActionUseStripeSdk {
+            type: 'use_stripe_sdk';
+            /**
+             * When confirming a PaymentIntent with js, js depends on the contents of this object to invoke authentication flows. The shape of the contents is subject to change and is only intended to be used by js.
+             */
+            use_stripe_sdk: any;
+        }
+
+        type PaymentIntentCancelationReason = 'duplicate' | 'fraudulent' | 'requested_by_customer' | 'failed_invoice';
+
+        interface IPaymentIntentCreationOptions {
+            /**
+             * Amount intended to be collected by this PaymentIntent (in cents).
+             */
+            amount: number;
+
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             */
+            currency: string;
+
+            /**
+             * The list of payment method types (e.g. card) that this PaymentIntent is allowed to use.
+             */
+            payment_method_types: string[];
+
+            /**
+             * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+             */
+            application_fee_amount?: number;
+
+            /**
+             * Capture method of this PaymentIntent.
+             */
+            capture_method?: 'automatic' | 'manual';
+
+            /**
+             * Attempt to confirm this PaymentIntent immediately. If the payment method attached is a card, a return_url must be provided in case additional authentication is required.
+             */
+            confirm?: boolean;
+
+            /**
+             * ID of the customer this PaymentIntent is for if one exists.
+             */
+            customer?: string;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
+             */
+            description?: string | null;
+
+            /**
+             * A 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. You can unset an individual key by setting its value to null and
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IOptionsMetadata;
+
+            /**
+             * The Stripe account ID for which these funds are intended.
+             */
+            on_behalf_of?: string;
+
+            /**
+             * Email address that the receipt for the resulting payment will be sent to.
+             */
+            receipt_email?: string;
+
+            /**
+             * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This param can only be used if `confirm=true`.
+             */
+            return_url?: string;
+
+            /**
+             * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+             */
+            save_payment_method?: boolean;
+
+            /**
+             * Shipping information for this PaymentIntent.
+             */
+            shipping?: IShippingInformation;
+
+            /**
+             * ID of the Source object to attach to this PaymentIntent.
+             */
+            source?: string;
+
+            /**
+             * Extra information about a PaymentIntent. This will appear on your customer’s statement when this PaymentIntent succeeds in creating a charge.
+             */
+            statement_descriptor?: string;
+
+            /**
+             * The parameters used to automatically create a Transfer when the payment succeeds.
+             */
+            transfer_data?: IPaymentIntentTransferData;
+
+            /**
+             * A string that identifies the resulting payment as part of a group.
+             */
+            transfer_group?: string;
+        }
+
+        interface IPaymentIntentUpdateOptions {
+            /**
+             * Amount intended to be collected by this PaymentIntent (in cents).
+             */
+            amount?: number;
+
+            /**
+             * The amount of the application fee in cents (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+             */
+            application_fee_amount?: number;
+
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             */
+            currency?: string;
+
+            /**
+             * ID of the customer this PaymentIntent is for if one exists.
+             */
+            customer?: string;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users. This can be unset by updating the value to null and then saving.
+             */
+            description?: string | null;
+
+            /**
+             * A 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. You can unset an individual key by setting its value to null and
+             * then saving. To clear all keys, set metadata to null, then save.
+             */
+            metadata?: IOptionsMetadata;
+
+            /**
+             * Email address that the receipt for the resulting payment will be sent to.
+             */
+            receipt_email?: string;
+
+            /**
+             * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+             */
+            save_payment_method?: boolean;
+
+            /**
+             * Shipping information for this PaymentIntent.
+             */
+            shipping?: IShippingInformation;
+
+            /**
+             * ID of the Source object to attach to this PaymentIntent.
+             */
+            source?: string;
+
+            /**
+             * A string that identifies the resulting payment as part of a group.
+             */
+            transfer_group?: string;
+        }
+
+        interface IPaymentIntentConfirmOptions {
+            /**
+             * The client secret of this PaymentIntent. Used for client-side retrieval using a publishable key. Please refer to dynamic authentication guide on how client_secret should be handled. Required if using Publishable Key!
+             */
+            client_secret?: string;
+
+            /**
+             * Email address that the receipt for the resulting payment will be sent to.
+             */
+            receipt_email?: string | null;
+
+            /**
+             * The URL to redirect your customer back to after they authenticate or cancel their payment on the payment method’s app or site. If you’d prefer to redirect to a mobile application, you can alternatively supply an application URI scheme. This parameter is only used for cards and other redirect-based payment methods.
+             */
+            return_url?: string;
+
+            /**
+             * Set to `true` to save this PaymentIntent’s payment method to the associated Customer, if the payment method is not already attached. This parameter only applies to the payment method passed in the same request or the current payment method attached to the PaymentIntent and must be specified again if a new payment method is added.
+             */
+            save_payment_method?: boolean;
+
+            /**
+             * Shipping information for this PaymentIntent.
+             */
+            shipping?: IShippingInformation | null;
+
+            /**
+             * ID of the source used in this PaymentIntent.
+             */
+            source?: string;
+        }
+
+        interface IPaymentIntentCaptureOptions {
+            /**
+             * The amount to capture (in cents) from the PaymentIntent, which must be less than or equal to the original amount. Any additional amount will be automatically refunded. Defaults to the full `amount_capturable` if not provided.
+             */
+            amount_to_capture?: number;
+
+            /**
+             * The amount of the application fee (if any) that will be applied to the payment and transferred to the application owner’s Stripe account. To use an application fee, the request must be made on behalf of another account, using the `Stripe-Account` header or an OAuth key.
+             */
+            application_fee_amount?: number;
+        }
+
+        interface IPaymentIntentListOptions extends IListOptionsCreated {
+            /**
+             * Filter links by their expiration status. By default, all links are returned.
+             */
+            expired?: boolean;
+
+            /**
+             * Only return links for the given file.
+             */
+            file?: boolean;
+        }
+    }
 
     namespace plans {
         interface ITier {
@@ -7223,139 +7220,131 @@ declare namespace Stripe {
             del(invoiceItemId: string, response?: IResponseFn<IDeleteConfirmation>): Promise<IDeleteConfirmation>;
         }
 
-		class PaymentIntents extends StripeResource {
-			/**
-			 * Creates a PaymentIntent object.
-			 */
-			create(
-				data: paymentIntents.IPaymentIntentCreationOptions,
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			create(
-				data: paymentIntents.IPaymentIntentCreationOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
+        class PaymentIntents extends StripeResource {
+            /**
+             * Creates a PaymentIntent object.
+             */
+            create(
+                data: paymentIntents.IPaymentIntentCreationOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            create(
+                data: paymentIntents.IPaymentIntentCreationOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
-			/**
-			 * Returns a list of PaymentIntents.
-			 *
-			 * @returns A object with a data property that contains an array of up to limit PaymentIntents, starting after PaymentIntent starting_after. Each entry in the array is a separate PaymentIntent object. If no more PaymentIntents are available, the resulting array will be empty. This request should never throw an error.
-			 */
-			list(
-				data: paymentIntents.IPaymentIntentListOptions,
-				options: HeaderOptions,
-				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
-			): Promise<IList<paymentIntents.IPaymentIntent>>;
-			list(
-				data: paymentIntents.IPaymentIntentListOptions,
-				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
-			): Promise<IList<paymentIntents.IPaymentIntent>>;
-			list(
-				options: HeaderOptions,
-				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
-			): Promise<IList<paymentIntents.IPaymentIntent>>;
-			list(
-				response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
-			): Promise<IList<paymentIntents.IPaymentIntent>>;
+            /**
+             * Returns a list of PaymentIntents.
+             *
+             * @returns A object with a data property that contains an array of up to limit PaymentIntents, starting after PaymentIntent starting_after. Each entry in the array is a separate PaymentIntent object. If no more PaymentIntents are available, the resulting array will be empty. This request should never throw an error.
+             */
+            list(
+                data: paymentIntents.IPaymentIntentListOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+            ): Promise<IList<paymentIntents.IPaymentIntent>>;
+            list(
+                data: paymentIntents.IPaymentIntentListOptions,
+                response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+            ): Promise<IList<paymentIntents.IPaymentIntent>>;
+            list(
+                options: HeaderOptions,
+                response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+            ): Promise<IList<paymentIntents.IPaymentIntent>>;
+            list(
+                response?: IResponseFn<IList<paymentIntents.IPaymentIntent>>,
+            ): Promise<IList<paymentIntents.IPaymentIntent>>;
 
-			/**
-			 * Updates a PaymentIntent object.
-			 */
-			update(
-				id: string,
-				data: paymentIntents.IPaymentIntentUpdateOptions,
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			update(
-				id: string,
-				data: paymentIntents.IPaymentIntentUpdateOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
+            /**
+             * Updates a PaymentIntent object.
+             */
+            update(
+                id: string,
+                data: paymentIntents.IPaymentIntentUpdateOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            update(
+                id: string,
+                data: paymentIntents.IPaymentIntentUpdateOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
-			/**
-			 * Retrieves the details of a PaymentIntent that has previously been created.
-			 * Client-side retrieval using a publishable key is allowed when the client_secret is provided in the query string.
-			 * When retrieved with a publishable key, only a subset of properties will be returned. Please refer to the payment intent object reference for more details.
-			 */
-			retrieve(
-				id: string,
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			retrieve(
-				id: string,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
+            /**
+             * Retrieves the details of a PaymentIntent that has previously been created.
+             * Client-side retrieval using a publishable key is allowed when the client_secret is provided in the query string.
+             * When retrieved with a publishable key, only a subset of properties will be returned. Please refer to the payment intent object reference for more details.
+             */
+            retrieve(
+                id: string,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            retrieve(
+                id: string,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
-			/**
-			 * Confirm that your customer intends to pay with current or provided `source`. Upon confirmation, the PaymentIntent will attempt to initiate a payment.
-			 *
-			 * If the selected source requires additional authentication steps, the PaymentIntent will transition to the `requires_action` status and suggest additional actions via `next_source_action`. If payment fails, the PaymentIntent will transition to the `requires_payment_method` status. If payment succeeds, the PaymentIntent will transition to the `succeeded` status (or `requires_capture`, if `capture_method` is set to `manual`).
-			 *
-			 * When using a publishable key, the client_secret must be provided to confirm the PaymentIntent.
-			 */
-			confirm(
-				paymentIntentId: string,
-				data: paymentIntents.IPaymentIntentConfirmOptions,
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			confirm(
-				paymentIntentId: string,
-				data: paymentIntents.IPaymentIntentConfirmOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
+            /**
+             * Confirm that your customer intends to pay with current or provided `source`. Upon confirmation, the PaymentIntent will attempt to initiate a payment.
+             *
+             * If the selected source requires additional authentication steps, the PaymentIntent will transition to the `requires_action` status and suggest additional actions via `next_source_action`. If payment fails, the PaymentIntent will transition to the `requires_payment_method` status. If payment succeeds, the PaymentIntent will transition to the `succeeded` status (or `requires_capture`, if `capture_method` is set to `manual`).
+             *
+             * When using a publishable key, the client_secret must be provided to confirm the PaymentIntent.
+             */
+            confirm(
+                paymentIntentId: string,
+                data: paymentIntents.IPaymentIntentConfirmOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            confirm(
+                paymentIntentId: string,
+                data: paymentIntents.IPaymentIntentConfirmOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
-			/**
-			 * Capture the funds of an existing uncaptured PaymentIntent where `required_action="requires_capture"`.
-			 * Uncaptured PaymentIntents will be canceled exactly seven days after they are created.
-			 *
-			 * @returns Returns a PaymentIntent object with `status="succeeded"` if the PaymentIntent was capturable. Returns an error if the PaymentIntent was not capturable or an invalid amount to capture was provided.
-			 */
-			capture(
-				paymentIntentId: string,
-				data: paymentIntents.IPaymentIntentCaptureOptions,
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			capture(
-				paymentIntentId: string,
-				data: paymentIntents.IPaymentIntentCaptureOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
+            /**
+             * Capture the funds of an existing uncaptured PaymentIntent where `required_action="requires_capture"`.
+             * Uncaptured PaymentIntents will be canceled exactly seven days after they are created.
+             *
+             * @returns Returns a PaymentIntent object with `status="succeeded"` if the PaymentIntent was capturable. Returns an error if the PaymentIntent was not capturable or an invalid amount to capture was provided.
+             */
+            capture(
+                paymentIntentId: string,
+                data: paymentIntents.IPaymentIntentCaptureOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            capture(
+                paymentIntentId: string,
+                data: paymentIntents.IPaymentIntentCaptureOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
-			/**
-			 * A PaymentIntent object can be canceled when it is in one of these statuses: `requires_payment_method`, `requires_capture`, `requires_confirmation`, `requires_action`.
-			 * Once canceled, no additional charges will be made by the PaymentIntent and any operations on the PaymentIntent will fail with an error. For PaymentIntents with `status='requires_capture'`, the remaining `amount_capturable` will automatically be refunded.
-			 *
-			 * @returns Returns a PaymentIntent object if the cancellation succeeded. Returns an error if the PaymentIntent has already been canceled or is not in a cancelable state.
-			 */
-			cancel(
-				paymentIntentId: string,
-				data: {
-					cancellation_reason?:
-						| 'duplicate'
-						| 'fraudulent'
-						| 'requested_by_customer'
-						| 'failed_invoice';
-				},
-				options: HeaderOptions,
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-			cancel(
-				paymentIntentId: string,
-				data: {
-					cancellation_reason?:
-						| 'duplicate'
-						| 'fraudulent'
-						| 'requested_by_customer'
-						| 'failed_invoice';
-				},
-				response?: IResponseFn<paymentIntents.IPaymentIntent>,
-			): Promise<paymentIntents.IPaymentIntent>;
-		}
+            /**
+             * A PaymentIntent object can be canceled when it is in one of these statuses: `requires_payment_method`, `requires_capture`, `requires_confirmation`, `requires_action`.
+             * Once canceled, no additional charges will be made by the PaymentIntent and any operations on the PaymentIntent will fail with an error. For PaymentIntents with `status='requires_capture'`, the remaining `amount_capturable` will automatically be refunded.
+             *
+             * @returns Returns a PaymentIntent object if the cancellation succeeded. Returns an error if the PaymentIntent has already been canceled or is not in a cancelable state.
+             */
+            cancel(
+                paymentIntentId: string,
+                data: {
+                    cancellation_reason?: paymentIntents.PaymentIntentCancelationReason,
+                },
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            cancel(
+                paymentIntentId: string,
+                data: {
+                    cancellation_reason?: paymentIntents.PaymentIntentCancelationReason,
+                },
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+        }
 
         class Payouts extends StripeResource {
             /**

From 1f6c41e790a1576a7ce40c61add8eef37d0110ec Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Mon, 4 Mar 2019 13:24:08 +0100
Subject: [PATCH 319/924] chore(png-async): remove typings

---
 notNeededPackages.json             |  6 +++
 types/png-async/index.d.ts         | 52 --------------------
 types/png-async/png-async-tests.ts | 31 ------------
 types/png-async/tsconfig.json      | 23 ---------
 types/png-async/tslint.json        | 79 ------------------------------
 5 files changed, 6 insertions(+), 185 deletions(-)
 delete mode 100644 types/png-async/index.d.ts
 delete mode 100644 types/png-async/png-async-tests.ts
 delete mode 100644 types/png-async/tsconfig.json
 delete mode 100644 types/png-async/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 4289393363..f590eaabfd 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1110,6 +1110,12 @@
             "sourceRepoURL": "https://github.com/theoephraim/node-pg-migrate#readme",
             "asOfVersion": "2.15.0"
         },
+        {
+            "libraryName": "node-png-async",
+            "typingsPackageName": "node-png-async",
+            "sourceRepoURL": "https://github.com/kanreisa/node-png-async",
+            "asOfVersion": "0.9.4"
+        },
         {
             "libraryName": "node-waves",
             "typingsPackageName": "node-waves",
diff --git a/types/png-async/index.d.ts b/types/png-async/index.d.ts
deleted file mode 100644
index cef8207ae2..0000000000
--- a/types/png-async/index.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Type definitions for png-async
-// Project: https://github.com/kanreisa/node-png-async
-// Definitions by: Yuki KAN <https://github.com/kanreisa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-
-import stream = require('stream');
-
-export interface IImageOptions {
-    width?: number;
-    height?: number;
-    fill?: boolean;
-    checkCRC?: boolean;
-    deflateChunkSize?: number;
-    deflateLevel?: number;
-    deflateStrategy?: EDeflateStrategy;
-    filterType?: EFilterType;
-}
-
-export declare enum EDeflateStrategy {
-    DEFAULT_STRATEGY = 0,
-    FILTERED = 1,
-    HUFFMAN_ONLY = 2,
-    RLE = 3,
-    FIXED = 4,
-}
-
-export declare enum EFilterType {
-    Auto = -1,
-    None = 0,
-    Sub = 1,
-    Up = 2,
-    Average = 3,
-    Paeth = 4,
-}
-
-export declare function createImage(option?: IImageOptions): Image;
-
-export declare class Image extends stream.Duplex {
-    width: number;
-    height: number;
-    gamma: number;
-    data: Buffer;
-    constructor(option?: IImageOptions);
-    pack(): Image;
-    parse(data: Buffer, callback?: (err: Error, image: Image) => void): Image;
-    write(data: any, cb?: any): boolean;
-    end(data?: any): void;
-    bitblt(dst: Image, sx: number, sy: number, w: number, h: number, dx: number, dy: number): Image;
-}
diff --git a/types/png-async/png-async-tests.ts b/types/png-async/png-async-tests.ts
deleted file mode 100644
index f108fe66b8..0000000000
--- a/types/png-async/png-async-tests.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-import fs = require('fs');
-import png = require('png-async');
-
-var devnull = process.platform === 'win32' ? 'nul' : '/dev/null';
-
-// stream test
-var img = new png.Image({
-    width: 1,
-    height: 1,
-    fill: true
-})
-    .pack()
-    .pipe(png.createImage({
-        deflateStrategy: png.EDeflateStrategy.FIXED,
-        filterType: png.EFilterType.Auto
-    })
-        .on('parsed', function () {
-
-            if (this.data[0] !== 0) {
-                throw new Error('invalid data');
-            }
-
-            this.data[0] = 255;
-            this.data[3] = 255;
-
-            this.pack().pipe(fs.createWriteStream(devnull)).on('finish', () => {
-                console.log('done');
-            });
-        })
-    );
diff --git a/types/png-async/tsconfig.json b/types/png-async/tsconfig.json
deleted file mode 100644
index 181b899496..0000000000
--- a/types/png-async/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "png-async-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/png-async/tslint.json b/types/png-async/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/png-async/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 51a727e81317ef19933e96b099ccadb874fd1c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20H=C3=BCbelbauer?= <tomas@hubelbauer.net>
Date: Mon, 4 Mar 2019 13:42:34 +0100
Subject: [PATCH 320/924] Document the timeGutterHeader component

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

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 7a6bebe1c2..85914eda10 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -120,6 +120,7 @@ export interface Components {
     dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     timeSlotWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
+    timeGutterHeader?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     timeGutterWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     toolbar?: React.ComponentType<ToolbarProps>;
     agenda?: {

From 880c1b9fddafe897597e29d160f9e175e70a8c46 Mon Sep 17 00:00:00 2001
From: Sergei Butko <svbutko@hotmail.com>
Date: Mon, 4 Mar 2019 14:54:46 +0200
Subject: [PATCH 321/924] Add activeColor and inactiveColor

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

diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index a6e6b27735..43517fa20b 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -212,6 +212,8 @@ export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
   renderBadge?: (scene: Scene<T>) => ReactNode
   onTabPress?: (scene: Scene<T>) => void
   onTabLongPress?: (scene: Scene<T>) => void
+  activeColor?: string
+  inactiveColor?: string
   pressColor?: string
   pressOpacity?: number
   scrollEnabled?: boolean

From 65a3fe8ce4c08ca1c866c67595c1b08a28f9b105 Mon Sep 17 00:00:00 2001
From: Kenneth Kidmose Johnsen <kkj@intranote.dk>
Date: Mon, 4 Mar 2019 15:23:05 +0100
Subject: [PATCH 322/924] Fixed so that getFromUniqueIdentifier return
 ResumableFile instead of just void

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

diff --git a/types/resumablejs/index.d.ts b/types/resumablejs/index.d.ts
index c87d669a07..48d3f578d8 100644
--- a/types/resumablejs/index.d.ts
+++ b/types/resumablejs/index.d.ts
@@ -213,7 +213,7 @@ declare namespace Resumable {
     /**
      * Look up a ResumableFile object by its unique identifier.
      **/
-    getFromUniqueIdentifier(uniqueIdentifier: string): void;
+    getFromUniqueIdentifier(uniqueIdentifier: string): ResumableFile;
     /**
      * Returns the total size of the upload in bytes.
      **/

From aad8e76a58b28168ceb10a16a75019d41e48b6ca Mon Sep 17 00:00:00 2001
From: Kenneth Kidmose Johnsen <kkj@intranote.dk>
Date: Mon, 4 Mar 2019 15:29:14 +0100
Subject: [PATCH 323/924] added definition credits for proper notifications
 about issues

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

diff --git a/types/resumablejs/index.d.ts b/types/resumablejs/index.d.ts
index 48d3f578d8..45047b7cf7 100644
--- a/types/resumablejs/index.d.ts
+++ b/types/resumablejs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Resumable.js v1.0.2
 // Project: https://github.com/23/resumable.js
 // Definitions by: Daniel McAssey <https://github.com/DanielMcAssey>
+//                 Kenneth Kidmose Johnsen <https://github.com/Johns3n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Resumable {

From 3cf473bd75fe65923d19cc058fdd0c3405413ba3 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jamie.sykes@creode.co.uk>
Date: Mon, 4 Mar 2019 15:23:24 +0000
Subject: [PATCH 324/924] Adds collectionsjs type.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
new file mode 100644
index 0000000000..2b7a3d5fb0
--- /dev/null
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -0,0 +1,57 @@
+import Collection from 'collectionsjs';
+
+const collectable = [
+    { name: 'Arya Stark', age: 9 },
+    { name: 'Bran Stark', age: 7 },
+    { name: 'Jon Snow', age: 14 }
+];
+
+const collection = new Collection(collectable);
+
+const item = { 6: 7 };
+
+collection.add(item);
+collection.all();
+collection.average('age');
+collection.chunk(2).all();
+collection.collect(collectable);
+
+const characters = [
+    { name: 'Ned Stark', age: 40},
+    { name: 'Catelyn Stark', age: 35}
+];
+
+const array = ['a', 'b', 'c'];
+
+collection.concat(characters);
+collection.contains(stark => stark.name === 'John Snow');
+collection.count();
+collection.each(t => t = 3);
+collection.filter(stark => stark.age === 14);
+collection.find('bran');
+collection.first(item => item.age > 7);
+collection.flatten(true);
+collection.get(2);
+collection.has({ name: 'Bran Stark', age: 7 });
+collection.join();
+collection.keys();
+collection.last();
+collection.map(stark => stark.name);
+collection.pluck('name');
+collection.push({name: 'Robb Stark', age: 17});
+collection.reduce((previous, current) => previous + current, 0);
+collection.reject(stark => stark.age < 14);
+collection.remove({name: 'Robb Stark', age: 17});
+collection.skip(2);
+collection.slice(1, 3);
+collection.sort();
+collection.sortBy('name');
+collection.stringify();
+collection.sum('age');
+collection.take(2);
+collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
+collection.unique(s => s.grade);
+collection.values();
+collection.where('age', 14);
+collection.where(stark => stark.age === 14);
+collection.zip(array);
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
new file mode 100644
index 0000000000..ca64acaff8
--- /dev/null
+++ b/types/collectionsjs/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for collectionsjs 0.3
+// Project: https://github.com/logaretm/collectionsjs#readme
+// Definitions by: Jaymeh <https://github.com/jaymeh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.1
+
+export default class Collection {
+    constructor(items?: any);
+    add(item: any): Collection;
+    all(): Collection;
+    average(property?: string | ((property?: number) => number)): number;
+    chunk(size: number): Collection;
+    collect(collectable: any[]|string): Collection;
+    concat(collection: any[]|Collection): Collection;
+    contains(closure: ((item: any) => boolean)): boolean;
+    count(): number;
+    each(callback: (item: any) => void): Collection;
+    filter(callback: (item: any) => any): Collection;
+    find(item: any): number;
+    first(callback?: ((item: any) => any)|null): any;
+    flatten(deep?: boolean): Collection;
+    get(index: number): any;
+    has(item: any): boolean;
+    join(separator?: string): string;
+    keys(): Collection;
+    last(callback?: ((item: any) => any)|null): any;
+    map(callback: (item: any) => any): Collection;
+    pluck(property: string): Collection;
+    push(item: any): Collection;
+    reduce(callback: (previous: any, current: any) => any, initial: any): any;
+    reject(callback: (item: any) => any): Collection;
+    remove(item: any): boolean;
+    skip(count: number): Collection;
+    slice(start: number, end?: number): Collection;
+    sort(compare?: () => any): Collection;
+    sortBy(property: string, order?: string): Collection;
+    stringify(): string;
+    sum(property?: string|null): any;
+    take(count: number): Collection;
+    macro(name: string, callback: (...args: any) => any): any;
+    unique(callback?: string|null|((item: any) => any)): Collection;
+    values(): Collection;
+    where(callback: ((item: any) => any)|string, value?: any): Collection;
+    zip(array: any[]|Collection): Collection;
+}
diff --git a/types/collectionsjs/tsconfig.json b/types/collectionsjs/tsconfig.json
new file mode 100644
index 0000000000..6ec4a9edc3
--- /dev/null
+++ b/types/collectionsjs/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "collectionsjs-tests.ts"
+    ]
+}
diff --git a/types/collectionsjs/tslint.json b/types/collectionsjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/collectionsjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f68540c9d2ba4d390088e2fb46ffe2ce8c8bd010 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Mon, 4 Mar 2019 08:44:15 -0800
Subject: [PATCH 325/924] Update 2 more project urls

---
 types/electron-spellchecker/index.d.ts | 2 +-
 types/mathjs/index.d.ts                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/electron-spellchecker/index.d.ts b/types/electron-spellchecker/index.d.ts
index fc10d13f34..6db76278d2 100644
--- a/types/electron-spellchecker/index.d.ts
+++ b/types/electron-spellchecker/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for electron-spellchecker 1.1
-// Project: https://github.com/paulcbetts/electron-spellchecker
+// Project: https://github.com/electron-userland/electron-spellchecker
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 20fb7154cb..285aed9e56 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mathjs 5.0
-// Project: http://mathjs.org/
+// Project: https://mathjs.org/
 // Definitions by: Ilya Shestakov <https://github.com/siavol>,
 //                  Andy Patterson <https://github.com/andnp>,
 //                  Brad Besserman <https://github.com/bradbesserman>

From 8c43522e3b7311b4b5306252a11d8318ee2dee1c Mon Sep 17 00:00:00 2001
From: James Reggio <james.reggio@gmail.com>
Date: Mon, 4 Mar 2019 08:51:51 -0800
Subject: [PATCH 326/924] [hoist-non-react-statics] Add support for exotic
 component in v3.3

---
 .../hoist-non-react-statics-tests.tsx         | 234 +++++++++++++++---
 types/hoist-non-react-statics/index.d.ts      |  30 ++-
 2 files changed, 223 insertions(+), 41 deletions(-)

diff --git a/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
index 05f282cc0c..954e4cc191 100644
--- a/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
+++ b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
@@ -3,60 +3,220 @@ import * as PropTypes from 'prop-types';
 
 import hoistNonReactStatics = require('hoist-non-react-statics');
 
-class A extends React.Component<{ x: number; y?: number | null }> {
-    static a = 'a';
+function TestClassComponents() {
+    class A extends React.Component<{ x: number; y?: number | null }> {
+        static a = 'a';
 
-    static propTypes = {
-        x: PropTypes.number.isRequired,
-        y: PropTypes.number,
-    };
+        static propTypes = {
+            x: PropTypes.number.isRequired,
+            y: PropTypes.number,
+        };
 
-    getA() {
-        return A.a;
+        getA() {
+            return A.a;
+        }
     }
+
+    class B extends React.Component {
+        static b = 'b';
+
+        static propTypes = {
+            n: PropTypes.number.isRequired,
+        };
+
+        static defaultProps = {
+            n: 42,
+        };
+
+        getB() {
+            return B.b;
+        }
+    }
+
+    const C = hoistNonReactStatics(A, B);
+
+    C.a !== C.b;
+
+    C.propTypes.x;
+    C.prototype.getA();
+
+    C.propTypes.n; // $ExpectError
+    C.defaultProps; // $ExpectError
+    C.prototype.getB(); // $ExpectError
+
+    <C x={1} />;
+
+    const CWithType: hoistNonReactStatics.NonReactStatics<typeof B> = C;
+
+    CWithType.propTypes; // $ExpectError
+    CWithType.defaultProps; // $ExpectError
+    CWithType.prototype.getB(); // $ExpectError
+
+    const D = hoistNonReactStatics(A, B, { a: true, b: true });
+
+    D.a;
+    D.b; // $ExpectError
+
+    const DWithType: hoistNonReactStatics.NonReactStatics<typeof B, { a: true; b: true }> = D;
+    const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof B> = D; // $ExpectError
+
+    DWithType.b; // $ExpectError
 }
 
-class B extends React.Component {
-    static b = 'b';
+// NOTE: We use Object.assign() to assign statics to functional components as a
+// convenience to avoid having to model the component's type with static fields.
 
-    static propTypes = {
-        n: PropTypes.number.isRequired,
-    };
+function TestFunctionalComponents() {
+    const A = ({x, y}: {x: number; y?: number}) => <div>{x + (y || 0)}</div>;
 
-    static defaultProps = {
-        n: 42,
-    };
+    // tslint:disable-next-line:prefer-object-spread
+    const AWithStatics = Object.assign(A, {
+        a: 'a',
+        propTypes: {
+            x: PropTypes.number.isRequired,
+            y: PropTypes.number,
+        },
+    });
 
-    getB() {
-        return B.b;
-    }
+    const B = ({n}: {n: number}) => <div>{n}</div>;
+
+    // tslint:disable-next-line:prefer-object-spread
+    const BWithStatics = Object.assign(B, {
+        b: 'b',
+        propTypes: {
+            n: PropTypes.number.isRequired,
+        },
+        defaultProps: {
+            n: 42,
+        },
+    });
+
+    const C = hoistNonReactStatics(AWithStatics, BWithStatics);
+
+    C.a !== C.b;
+
+    C.propTypes.x;
+    C.propTypes.n; // $ExpectError
+    C.defaultProps; // $ExpectError
+
+    <C x={1} />;
+
+    const CWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = C;
+
+    CWithType.propTypes; // $ExpectError
+    CWithType.defaultProps; // $ExpectError
+
+    const D = hoistNonReactStatics(AWithStatics, BWithStatics, { a: true, b: true });
+
+    D.a;
+    D.b; // $ExpectError
+
+    const DWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics, { a: true; b: true }> = D;
+    const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = D; // $ExpectError
+
+    DWithType.b; // $ExpectError
 }
 
-const C = hoistNonReactStatics(A, B);
+function TestMemoComponents() {
+    const A = ({x, y}: {x: number; y?: number}) => <div>{x + (y || 0)}</div>;
 
-C.a !== C.b;
+    // tslint:disable-next-line:prefer-object-spread
+    const AWithStatics = Object.assign(A, {
+        a: 'a',
+        propTypes: {
+            x: PropTypes.number.isRequired,
+            y: PropTypes.number,
+        },
+    });
 
-C.propTypes.x;
-C.prototype.getA();
+    const B = React.memo(({n}: {n: number}) => <div>{n}</div>);
 
-C.propTypes.n; // $ExpectError
-C.defaultProps; // $ExpectError
-C.prototype.getB(); // $ExpectError
+    // tslint:disable-next-line:prefer-object-spread
+    const BWithStatics = Object.assign(B, {
+        b: 'b',
+        propTypes: {
+            n: PropTypes.number.isRequired,
+        },
+        defaultProps: {
+            n: 42,
+        },
+    });
 
-<C x={1} />;
+    const C = hoistNonReactStatics(AWithStatics, BWithStatics);
 
-const CWithType: hoistNonReactStatics.NonReactStatics<typeof B> = C;
+    C.a !== C.b;
 
-CWithType.propTypes; // $ExpectError
-CWithType.defaultProps; // $ExpectError
-CWithType.prototype.getB(); // $ExpectError
+    C.propTypes.x;
+    C.propTypes.n; // $ExpectError
+    C.defaultProps; // $ExpectError
 
-const D = hoistNonReactStatics(A, B, { a: true, b: true });
+    <C x={1} />;
 
-D.a;
-D.b; // $ExpectError
+    const CWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = C;
 
-const DWithType: hoistNonReactStatics.NonReactStatics<typeof B, { a: true; b: true }> = D;
-const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof B> = D; // $ExpectError
+    CWithType.propTypes; // $ExpectError
+    CWithType.defaultProps; // $ExpectError
 
-DWithType.b; // $ExpectError
+    const D = hoistNonReactStatics(AWithStatics, BWithStatics, { a: true, b: true });
+
+    D.a;
+    D.b; // $ExpectError
+
+    const DWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics, { a: true; b: true }> = D;
+    const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = D; // $ExpectError
+
+    DWithType.b; // $ExpectError
+}
+
+function TestForwardRefComponents() {
+    const A = ({x, y}: {x: number; y?: number}) => <div>{x + (y || 0)}</div>;
+
+    // tslint:disable-next-line:prefer-object-spread
+    const AWithStatics = Object.assign(A, {
+        a: 'a',
+        propTypes: {
+            x: PropTypes.number.isRequired,
+            y: PropTypes.number,
+        },
+    });
+
+    const B = React.forwardRef(
+        ({n}: {n: number}, ref: React.Ref<HTMLDivElement>) => <div ref={ref}>{n}</div>
+    );
+
+    // tslint:disable-next-line:prefer-object-spread
+    const BWithStatics = Object.assign(B, {
+        b: 'b',
+        propTypes: {
+            n: PropTypes.number.isRequired,
+        },
+        defaultProps: {
+            n: 42,
+        },
+    });
+
+    const C = hoistNonReactStatics(AWithStatics, BWithStatics);
+
+    C.a !== C.b;
+
+    C.propTypes.x;
+    C.propTypes.n; // $ExpectError
+    C.defaultProps; // $ExpectError
+
+    <C x={1} />;
+
+    const CWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = C;
+
+    CWithType.propTypes; // $ExpectError
+    CWithType.defaultProps; // $ExpectError
+
+    const D = hoistNonReactStatics(AWithStatics, BWithStatics, { a: true, b: true });
+
+    D.a;
+    D.b; // $ExpectError
+
+    const DWithType: hoistNonReactStatics.NonReactStatics<typeof BWithStatics, { a: true; b: true }> = D;
+    const DWithTypeError: hoistNonReactStatics.NonReactStatics<typeof BWithStatics> = D; // $ExpectError
+
+    DWithType.b; // $ExpectError
+}
diff --git a/types/hoist-non-react-statics/index.d.ts b/types/hoist-non-react-statics/index.d.ts
index 8c874483ac..fc90d9713d 100644
--- a/types/hoist-non-react-statics/index.d.ts
+++ b/types/hoist-non-react-statics/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for hoist-non-react-statics 3.0
+// Type definitions for hoist-non-react-statics 3.3
 // Project: https://github.com/mridgway/hoist-non-react-statics#readme
-// Definitions by: JounQin <https://github.com/JounQin>
+// Definitions by: JounQin <https://github.com/JounQin>, James Reggio <https://github.com/jamesreggio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -8,10 +8,12 @@ import * as React from 'react';
 
 interface REACT_STATICS {
     childContextTypes: true;
+    contextType: true;
     contextTypes: true;
     defaultProps: true;
     displayName: true;
     getDefaultProps: true;
+    getDerivedStateFromError: true;
     getDerivedStateFromProps: true;
     mixins: true;
     propTypes: true;
@@ -28,6 +30,23 @@ interface KNOWN_STATICS {
     arity: true;
 }
 
+interface MEMO_STATICS {
+    '$$typeof': true;
+    compare: true;
+    defaultProps: true;
+    displayName: true;
+    propTypes: true;
+    type: true;
+}
+
+interface FORWARD_REF_STATICS {
+    '$$typeof': true;
+    render: true;
+    defaultProps: true;
+    displayName: true;
+    propTypes: true;
+}
+
 declare namespace hoistNonReactStatics {
     type NonReactStatics<
         S extends React.ComponentType<any>,
@@ -37,8 +56,11 @@ declare namespace hoistNonReactStatics {
     > = {
         [key in Exclude<
             keyof S,
-            // only extends static properties, exclude instance properties and known react statics
-            keyof REACT_STATICS | keyof KNOWN_STATICS | keyof C
+            S extends React.MemoExoticComponent<any>
+                ? keyof MEMO_STATICS | keyof C
+                : S extends React.ForwardRefExoticComponent<any>
+                ? keyof FORWARD_REF_STATICS | keyof C
+                : keyof REACT_STATICS | keyof KNOWN_STATICS | keyof C
         >]: S[key]
     };
 }

From b37b33f17c898dce5d01fd4d9628d82e67df4352 Mon Sep 17 00:00:00 2001
From: helloworld111gh <helloworld111gh@users.noreply.github.com>
Date: Mon, 4 Mar 2019 08:56:50 -0800
Subject: [PATCH 327/924] fix version for lolex

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

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 35c4880a5b..3f7031f266 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for lolex 3
+// Type definitions for lolex 3.1
 // Project: https://github.com/sinonjs/lolex
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>

From 31e96442b240412208a07ad4fdba3444fa750736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Holhjem?= <haakon@holhjem.net>
Date: Mon, 4 Mar 2019 18:00:01 +0100
Subject: [PATCH 328/924] Added allowNew function

From documentation:
https://github.com/ericgio/react-bootstrap-typeahead/blob/master/docs/Props.md
---
 types/react-bootstrap-typeahead/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 93fa2c9c6a..18311bccb5 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -126,7 +126,7 @@ export interface TypeaheadProps<T extends TypeaheadModel> {
        but not the list of original options unless handled as such by Typeahead's parent.
        The newly added item will always be returned as an object even if the other options are simply strings,
        so be sure your onChange callback can handle this. */
-    allowNew?: boolean;
+    allowNew?: boolean | ((results: T[], props: TypeaheadProps<T>) => boolean);
 
     /* Autofocus the input when the component initially mounts. */
     autoFocus?: boolean;

From 2761cb1b444ba0550f31d16e857e77fc60bfab20 Mon Sep 17 00:00:00 2001
From: helloworld111gh <helloworld111gh@users.noreply.github.com>
Date: Mon, 4 Mar 2019 08:56:50 -0800
Subject: [PATCH 329/924] fix version for lolex

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

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 35c4880a5b..3f7031f266 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for lolex 3
+// Type definitions for lolex 3.1
 // Project: https://github.com/sinonjs/lolex
 // Definitions by: Wim Looman <https://github.com/Nemo157>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>

From b6c52a90ddbf5e08a7d3c47cf0cdf4cbf4947489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjell=20Die=C3=9Fel?= <com.github@kettil.de>
Date: Mon, 4 Mar 2019 18:07:57 +0100
Subject: [PATCH 330/924] Update jsonwebtoken index.d.ts

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

diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index d1c3aeee5f..71a098cb8f 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -17,9 +17,9 @@ export class JsonWebTokenError extends Error {
 }
 
 export class TokenExpiredError extends JsonWebTokenError {
-    expiredAt: number;
+    expiredAt: Date;
 
-    constructor(message: string, expiredAt: number);
+    constructor(message: string, expiredAt: Date);
 }
 
 export class NotBeforeError extends JsonWebTokenError {

From 6f9e0fddedb7ec27aa6885cd382a8f7bdeb18c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjell=20Die=C3=9Fel?= <com.github@kettil.de>
Date: Mon, 4 Mar 2019 18:15:30 +0100
Subject: [PATCH 331/924]  Update jsonwebtoken index.d.ts

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

diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 71a098cb8f..079fd254dd 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -4,7 +4,8 @@
 //                 Daniel Heim <https://github.com/danielheim>,
 //                 Brice BERNARD <https://github.com/brikou>,
 //                 Veli-Pekka Kestilä <https://github.com/vpk>,
-//                 Daniel Parker <https://github.com/rlgod>
+//                 Daniel Parker <https://github.com/rlgod>,
+//                 Kjell Dießel <https://github.com/kettil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 

From 91ad301fb00a5ed1da136b4f129ee1b57a9858df Mon Sep 17 00:00:00 2001
From: helloworld111gh <helloworld111gh@users.noreply.github.com>
Date: Mon, 4 Mar 2019 09:54:14 -0800
Subject: [PATCH 332/924] update lolex to 3.1

---
 types/lolex/index.d.ts     | 18 +++++++++++++++++-
 types/lolex/lolex-tests.ts |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 3f7031f266..052c9c45dc 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -9,7 +9,7 @@
 /**
  * Names of clock methods that may be faked by install.
  */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime";
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime" | "requestIdleCallback" | "cancelIdleCallback";
 
 /**
  * Global methods avaliable to every clock and also as standalone methods (inside `timers` global object).
@@ -126,6 +126,22 @@ export interface LolexClock<TTimerId extends TimerId> extends GlobalTimers<TTime
      */
     cancelAnimationFrame: (id: TTimerId) => void;
 
+    /**
+     * Queues the callback to be fired during idle periods to perform background and low priority work on the main event loop.
+     * 
+     * @param callback   Callback to be fired.
+     * @param timeout   The maximum number of ticks before the callback must be fired.
+     * @remarks Callbacks which have a timeout option will be fired no later than time in milliseconds.
+     */
+    requestIdleCallback: (callback: () => void, timeout?: number) => TTimerId;
+
+    /**
+     * Clears a timer, as long as it was created using requestIdleCallback.
+     *
+     * @param id   Timer ID or object.
+     */
+    cancelIdleCallback: (id: TTimerId) => void;
+
 	/**
 	 * Get the number of waiting timers.
 	 *
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 2a01dd5916..d09cfcc042 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -59,10 +59,14 @@ const browserTimeout: number = browserClock.setTimeout(() => {}, 7);
 const browserInterval: number = browserClock.setInterval(() => {}, 7);
 const browserImmediate: number = browserClock.setImmediate(() => {});
 const browserAnimationFrame: number = browserClock.requestAnimationFrame(() => {});
+const browserIdleCallback: number = browserClock.requestIdleCallback(() => {});
+const browserIdleCallbackWithTimeout: number = browserClock.requestIdleCallback(() => {}, 7);
 const nodeTimeout: lolex.NodeTimer = nodeClock.setTimeout(() => {}, 7);
 const nodeInterval: lolex.NodeTimer = nodeClock.setInterval(() => {}, 7);
 const nodeImmediate: lolex.NodeTimer = nodeClock.setImmediate(() => {});
 const nodeAnimationFrame: lolex.NodeTimer = nodeClock.requestAnimationFrame(() => {});
+const nodeIdleCallback: lolex.NodeTimer = nodeClock.requestIdleCallback(() => {});
+const nodeIdleCallbackWithTimeout: lolex.NodeTimer = nodeClock.requestIdleCallback(() => {}, 7);
 
 nodeTimeout.ref();
 nodeTimeout.unref();
@@ -71,11 +75,15 @@ browserClock.clearTimeout(browserTimeout);
 browserClock.clearInterval(browserInterval);
 browserClock.clearImmediate(browserImmediate);
 browserClock.cancelAnimationFrame(browserAnimationFrame);
+browserClock.cancelIdleCallback(browserIdleCallback);
+browserClock.cancelIdleCallback(browserIdleCallbackWithTimeout);
 
 nodeClock.clearTimeout(nodeTimeout);
 nodeClock.clearInterval(nodeInterval);
 nodeClock.clearImmediate(nodeImmediate);
 nodeClock.cancelAnimationFrame(nodeAnimationFrame);
+nodeClock.cancelIdleCallback(nodeIdleCallback);
+nodeClock.cancelIdleCallback(nodeIdleCallbackWithTimeout);
 
 browserClock.tick(7);
 browserClock.tick("08");

From 6246216ca57e1354c1353777ea4cced81df8a179 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Mon, 4 Mar 2019 11:03:49 -0800
Subject: [PATCH 333/924] Try bumping deprecated version of p-queue

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 0c03bc3fe6..8aed163ab6 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1168,7 +1168,7 @@
             "libraryName": "p-queue",
             "typingsPackageName": "p-queue",
             "sourceRepoURL": "https://github.com/sindresorhus/p-queue",
-            "asOfVersion": "3.2.0"
+            "asOfVersion": "3.2.1"
         },
         {
             "libraryName": "p-throttle",

From 8ddaea3e6f7c648947170504085bfa7a3d8ce05b Mon Sep 17 00:00:00 2001
From: fhelwanger <fhelwanger@gmail.com>
Date: Mon, 4 Mar 2019 17:24:19 -0300
Subject: [PATCH 334/924] [expo] Add Accuracy enum

---
 types/expo/expo-tests.tsx | 10 ++++++++++
 types/expo/index.d.ts     |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index f2ce8d8197..bf58451f31 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -57,6 +57,16 @@ const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeA
     longitude: 0
 });
 
+Location.watchPositionAsync({
+    accuracy: Location.Accuracy.BestForNavigation,
+    timeInterval: 10000,
+    distanceInterval: 0,
+    timeout: 10000
+}, (data) => {
+    data.coords;
+    data.timestamp;
+});
+
 Accelerometer.addListener((obj) => {
     obj.x;
     obj.y;
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 7e75c1b7d6..2004d41754 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2242,6 +2242,15 @@ export namespace Location {
     function stopGeofencingAsync(taskName: string): Promise<void>;
     function hasStartedGeofencingAsync(taskName: string): Promise<boolean>;
     function setApiKey(key: string): void;
+
+    enum Accuracy  {
+        Lowest = 1,
+        Low = 2,
+        Balanced = 3,
+        High = 4,
+        Highest = 5,
+        BestForNavigation = 6
+    }
 }
 
 /**

From ecef3eeb3e698404be0a256d0c754fcd7f8b3cf9 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Mon, 4 Mar 2019 20:46:43 +0000
Subject: [PATCH 335/924] Adds missing reverse function.

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

diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index ca64acaff8..9252953ea3 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -30,6 +30,7 @@ export default class Collection {
     reduce(callback: (previous: any, current: any) => any, initial: any): any;
     reject(callback: (item: any) => any): Collection;
     remove(item: any): boolean;
+    reverse(): Collection;
     skip(count: number): Collection;
     slice(start: number, end?: number): Collection;
     sort(compare?: () => any): Collection;

From 07de538eef13e1df3baeff9e752afb978addd13f Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Mon, 4 Mar 2019 20:47:04 +0000
Subject: [PATCH 336/924] Adds $ExpectsType to each of the tests.

---
 types/collectionsjs/collectionsjs-tests.ts | 84 +++++++++++-----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 2b7a3d5fb0..b415502d67 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -6,52 +6,52 @@ const collectable = [
     { name: 'Jon Snow', age: 14 }
 ];
 
-const collection = new Collection(collectable);
-
-const item = { 6: 7 };
-
-collection.add(item);
-collection.all();
-collection.average('age');
-collection.chunk(2).all();
-collection.collect(collectable);
-
 const characters = [
     { name: 'Ned Stark', age: 40},
     { name: 'Catelyn Stark', age: 35}
 ];
 
+const item = { 6: 7 };
+
 const array = ['a', 'b', 'c'];
 
-collection.concat(characters);
-collection.contains(stark => stark.name === 'John Snow');
-collection.count();
-collection.each(t => t = 3);
-collection.filter(stark => stark.age === 14);
-collection.find('bran');
-collection.first(item => item.age > 7);
-collection.flatten(true);
-collection.get(2);
-collection.has({ name: 'Bran Stark', age: 7 });
-collection.join();
-collection.keys();
-collection.last();
-collection.map(stark => stark.name);
-collection.pluck('name');
-collection.push({name: 'Robb Stark', age: 17});
-collection.reduce((previous, current) => previous + current, 0);
-collection.reject(stark => stark.age < 14);
-collection.remove({name: 'Robb Stark', age: 17});
-collection.skip(2);
-collection.slice(1, 3);
-collection.sort();
-collection.sortBy('name');
-collection.stringify();
-collection.sum('age');
-collection.take(2);
-collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
-collection.unique(s => s.grade);
-collection.values();
-collection.where('age', 14);
-collection.where(stark => stark.age === 14);
-collection.zip(array);
+const collection = new Collection(collectable); // $ExpectType Collection
+
+collection.add(item); // $ExpectType Collection
+collection.all(); // $ExpectType Collection
+collection.average('age'); // $ExpectType number
+collection.chunk(2).all(); // $ExpectType Collection
+collection.collect(collectable); // $ExpectType Collection
+collection.concat(characters); // $ExpectType Collection
+collection.contains(stark => stark.name === 'John Snow'); // $ExpectType boolean
+collection.count(); // $ExpectType number
+collection.each(t => t = 3); // $ExpectType Collection
+collection.filter(stark => stark.age === 14); // $ExpectType Collection
+collection.find('bran'); // $ExpectType number
+collection.first(item => item.age > 7); // $ExpectType any
+collection.flatten(true); // $ExpectType Collection
+collection.get(2); // $ExpectType any
+collection.has({ name: 'Bran Stark', age: 7 }); // $ExpectType boolean
+collection.join(); // $ExpectType string
+collection.keys(); // $ExpectType Collection
+collection.last(); // $ExpectType any
+collection.map(stark => stark.name); // $ExpectType Collection
+collection.pluck('name'); // $ExpectType Collection
+collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection
+collection.reduce((previous, current) => previous + current, 0); // $ExpectType any
+collection.reject(stark => stark.age < 14); // $ExpectType Collection
+collection.remove({name: 'Robb Stark', age: 17}); // $ExpectType boolean
+collection.reverse(); // $ExpectType Collection
+collection.skip(2); // $ExpectType Collection
+collection.slice(1, 3); // $ExpectType Collection
+collection.sort(); // $ExpectType Collection
+collection.sortBy('name'); // $ExpectType Collection
+collection.stringify(); // $ExpectType string
+collection.sum('age'); // $ExpectType any
+collection.take(2); // $ExpectType Collection
+collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n)); // $ExpectType any
+collection.unique(s => s.grade); // $ExpectType Collection
+collection.values(); // $ExpectType Collection
+collection.where('age', 14); // $ExpectType Collection
+collection.where(stark => stark.age === 14); // $ExpectType Collection
+collection.zip(array); // $ExpectType Collection

From 83d99d609d2afad13a89677c3336be39222d2d6a Mon Sep 17 00:00:00 2001
From: fhelwanger <fhelwanger@gmail.com>
Date: Mon, 4 Mar 2019 17:49:48 -0300
Subject: [PATCH 337/924] [expo] Add Localization

---
 types/expo/expo-tests.tsx | 23 +++++++++++++++++++++++
 types/expo/index.d.ts     | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index f2ce8d8197..132290f576 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -37,6 +37,7 @@ import {
     LinearGradient,
     Linking,
     Location,
+    Localization,
     MailComposer,
     MapEvent,
     MapStyleElement,
@@ -1094,6 +1095,28 @@ async () => {
 };
 // #endregion
 
+// #region Localization
+
+let locale: string = Localization.locale;
+let locales: string[] = Localization.locales;
+let country: string | undefined = Localization.country;
+let isoCurrencyCodes: string[] | undefined = Localization.isoCurrencyCodes;
+let timezone: string = Localization.timezone;
+let isRTL: boolean = Localization.isRTL;
+
+async () => {
+    const localizationData = await Localization.getLocalizationAsync();
+
+    locale = localizationData.locale;
+    locales = localizationData.locales;
+    country = localizationData.country;
+    isoCurrencyCodes = localizationData.isoCurrencyCodes;
+    timezone = localizationData.timezone;
+    isRTL = localizationData.isRTL;
+};
+
+// #endregion
+
 // #region Contacts
 Contacts.Fields.ID === 'id';
 Contacts.Fields.Name === 'name';
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 7e75c1b7d6..777d574eea 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2244,6 +2244,29 @@ export namespace Location {
     function setApiKey(key: string): void;
 }
 
+/**
+ * Localization
+ */
+export namespace Localization {
+    const locale: string;
+    const locales: string[];
+    const country: string | undefined;
+    const isoCurrencyCodes: string[] | undefined;
+    const timezone: string;
+    const isRTL: boolean;
+
+    interface LocalizationData {
+        locale: string;
+        locales: string[];
+        country?: string;
+        isoCurrencyCodes?: string[];
+        timezone: string;
+        isRTL: boolean;
+    }
+
+    function getLocalizationAsync(): Promise<LocalizationData>;
+}
+
 /**
  * Magnetometer
  */

From 3fe737230e2888fa765b59ec9ffd9eff98e336c6 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 4 Mar 2019 13:44:58 -0800
Subject: [PATCH 338/924] Fixing typo in OfficeTheme.controlForegroundColor

---
 types/office-js-preview/index.d.ts | 2 +-
 types/office-js/index.d.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 3a0f28b574..f6fddea95b 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -1633,7 +1633,7 @@ declare namespace Office {
          */
         controlBackgroundColor: string;
         /**
-         * Gets the Office theme body control color as a hexadecimal color triplet (e.g. "FFA500").
+         * Gets the Office theme control foreground color as a hexadecimal color triplet (e.g. "FFA500").
          */
         controlForegroundColor: string;
     }
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 21017ce4be..97c4525703 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1633,7 +1633,7 @@ declare namespace Office {
          */
         controlBackgroundColor: string;
         /**
-         * Gets the Office theme body control color as a hexadecimal color triplet (e.g. "FFA500").
+         * Gets the Office theme control foreground color as a hexadecimal color triplet (e.g. "FFA500").
          */
         controlForegroundColor: string;
     }

From fcfcae44fab848bb9cbbe62b5178a9dc28a4969d Mon Sep 17 00:00:00 2001
From: Chives <chivesrs@gmail.com>
Date: Mon, 4 Mar 2019 13:48:04 -0800
Subject: [PATCH 339/924] Add type definitions for ResizeObserver API

---
 types/resize-observer-browser/index.d.ts      | 19 +++++++++++++++
 .../resize-observer-browser-tests.ts          | 13 ++++++++++
 types/resize-observer-browser/tsconfig.json   | 24 +++++++++++++++++++
 types/resize-observer-browser/tslint.json     |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/resize-observer-browser/index.d.ts
 create mode 100644 types/resize-observer-browser/resize-observer-browser-tests.ts
 create mode 100644 types/resize-observer-browser/tsconfig.json
 create mode 100644 types/resize-observer-browser/tslint.json

diff --git a/types/resize-observer-browser/index.d.ts b/types/resize-observer-browser/index.d.ts
new file mode 100644
index 0000000000..83291fe4a0
--- /dev/null
+++ b/types/resize-observer-browser/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for non-npm package resize-observer-browser 0.1
+// Project: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver, https://developers.google.com/web/updates/2016/10/resizeobserver, https://wicg.github.io/ResizeObserver/
+// Definitions by: Chives <https://github.com/chivesrs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+export class ResizeObserver {
+    constructor(callback: ResizeObserverCallback);
+    disconnect(): void;
+    observe(target: Element): void;
+    unobserve(target: Element): void;
+}
+
+export type ResizeObserverCallback = (entries: ResizeObserverEntry[]) => void;
+
+export interface ResizeObserverEntry {
+    readonly target: Element;
+    readonly contentRect: DOMRectReadOnly;
+}
diff --git a/types/resize-observer-browser/resize-observer-browser-tests.ts b/types/resize-observer-browser/resize-observer-browser-tests.ts
new file mode 100644
index 0000000000..5596f13870
--- /dev/null
+++ b/types/resize-observer-browser/resize-observer-browser-tests.ts
@@ -0,0 +1,13 @@
+import { ResizeObserver } from "resize-observer-browser";
+
+function resizeObserverCreates(): void {
+    const resizeObserver: ResizeObserver = new ResizeObserver((entries) => {
+        const div = document.getElementById('display-div')!;
+        const rect = entries[0].contentRect;
+        div.textContent = `${rect.left} ${rect.right}`;
+    });
+    const div = document.getElementById('resized-div')!;
+    resizeObserver.observe(div);
+    resizeObserver.unobserve(div);
+    resizeObserver.disconnect();
+}
diff --git a/types/resize-observer-browser/tsconfig.json b/types/resize-observer-browser/tsconfig.json
new file mode 100644
index 0000000000..849758c836
--- /dev/null
+++ b/types/resize-observer-browser/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "resize-observer-browser-tests.ts"
+    ]
+}
diff --git a/types/resize-observer-browser/tslint.json b/types/resize-observer-browser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/resize-observer-browser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From af9058995f6df0e81288249277d69f879360946e Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Mon, 4 Mar 2019 23:00:00 +0100
Subject: [PATCH 340/924] =?UTF-8?q?chore(tape=E2=80=91async):=20Require=20?=
 =?UTF-8?q?TypeScript=C2=A02.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
---
 types/tape-async/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/tape-async/index.d.ts b/types/tape-async/index.d.ts
index d5b07f37b7..be104ec2b4 100644
--- a/types/tape-async/index.d.ts
+++ b/types/tape-async/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/parro-it/tape-async
 // Definitions by: ExE Boss <https://github.com/ExE-Boss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 

From 56bcf7fd2418407623b3e95e8320779340bff866 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Mon, 4 Mar 2019 22:01:49 +0000
Subject: [PATCH 341/924] Make use of Generic's and ensure tests are up to
 date.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index b415502d67..1c3b8a5813 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -11,47 +11,50 @@ const characters = [
     { name: 'Catelyn Stark', age: 35}
 ];
 
-const item = { 6: 7 };
+const item = { name: 'Sansa Stark', age: 13 };
 
-const array = ['a', 'b', 'c'];
+const array = [
+    { name: 'Robert Baratheon', age: 40 },
+    { name: 'Joffrey Baratheon', age: 13 }
+];
 
-const collection = new Collection(collectable); // $ExpectType Collection
+const collection = new Collection(collectable); // $ExpectType Collection<{ name: string; age: number; }>
 
-collection.add(item); // $ExpectType Collection
-collection.all(); // $ExpectType Collection
+collection.add(item); // $ExpectType Collection<{ name: string; age: number; }>
+collection.all(); // $ExpectType Collection<{ name: string; age: number; }>
 collection.average('age'); // $ExpectType number
-collection.chunk(2).all(); // $ExpectType Collection
-collection.collect(collectable); // $ExpectType Collection
-collection.concat(characters); // $ExpectType Collection
+collection.chunk(2).all(); // $ExpectType Collection<{ name: string; age: number; }>
+collection.collect(collectable); // $ExpectType Collection<{ name: string; age: number; }>
+collection.concat(characters); // $ExpectType Collection<{ name: string; age: number; }>
 collection.contains(stark => stark.name === 'John Snow'); // $ExpectType boolean
 collection.count(); // $ExpectType number
-collection.each(t => t = 3); // $ExpectType Collection
-collection.filter(stark => stark.age === 14); // $ExpectType Collection
+collection.each(stark => stark.age = 3); // $ExpectType Collection<{ name: string; age: number; }>
+collection.filter(stark => stark.age === 14); // $ExpectType Collection<{ name: string; age: number; }>
 collection.find('bran'); // $ExpectType number
-collection.first(item => item.age > 7); // $ExpectType any
-collection.flatten(true); // $ExpectType Collection
-collection.get(2); // $ExpectType any
+collection.first(item => item.age > 7); // $ExpectType { name: string; age: number; }
+collection.flatten(true); // $ExpectType Collection<{ name: string; age: number; }>
+collection.get(2); // $ExpectType { name: string; age: number; }
 collection.has({ name: 'Bran Stark', age: 7 }); // $ExpectType boolean
 collection.join(); // $ExpectType string
-collection.keys(); // $ExpectType Collection
-collection.last(); // $ExpectType any
-collection.map(stark => stark.name); // $ExpectType Collection
-collection.pluck('name'); // $ExpectType Collection
-collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection
-collection.reduce((previous, current) => previous + current, 0); // $ExpectType any
-collection.reject(stark => stark.age < 14); // $ExpectType Collection
+collection.keys(); // $ExpectType Collection<{ name: string; age: number; }>
+collection.last(); // $ExpectType { name: string; age: number; }
+collection.map(stark => stark.name); // $ExpectType Collection<{ name: string; age: number; }>
+collection.pluck('name'); // $ExpectType Collection<{ name: string; age: number; }>
+collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection<{ name: string; age: number; }>
+collection.reduce((previous, current) => previous.age + current.age, 0); // $ExpectType any
+collection.reject(stark => stark.age < 14); // $ExpectType Collection<{ name: string; age: number; }>
 collection.remove({name: 'Robb Stark', age: 17}); // $ExpectType boolean
-collection.reverse(); // $ExpectType Collection
-collection.skip(2); // $ExpectType Collection
-collection.slice(1, 3); // $ExpectType Collection
-collection.sort(); // $ExpectType Collection
-collection.sortBy('name'); // $ExpectType Collection
+collection.reverse(); // $ExpectType Collection<{ name: string; age: number; }>
+collection.skip(2); // $ExpectType Collection<{ name: string; age: number; }>
+collection.slice(1, 3); // $ExpectType Collection<{ name: string; age: number; }>
+collection.sort(); // $ExpectType Collection<{ name: string; age: number; }>
+collection.sortBy('name'); // $ExpectType Collection<{ name: string; age: number; }>
 collection.stringify(); // $ExpectType string
 collection.sum('age'); // $ExpectType any
-collection.take(2); // $ExpectType Collection
+collection.take(2); // $ExpectType Collection<{ name: string; age: number; }>
 collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n)); // $ExpectType any
-collection.unique(s => s.grade); // $ExpectType Collection
-collection.values(); // $ExpectType Collection
-collection.where('age', 14); // $ExpectType Collection
-collection.where(stark => stark.age === 14); // $ExpectType Collection
-collection.zip(array); // $ExpectType Collection
+collection.unique(stark => stark.age); // $ExpectType Collection<{ name: string; age: number; }>
+collection.values(); // $ExpectType Collection<{ name: string; age: number; }>
+collection.where('age', 14); // $ExpectType Collection<{ name: string; age: number; }>
+collection.where(stark => stark.age === 14); // $ExpectType Collection<{ name: string; age: number; }>
+collection.zip(array); // $ExpectType Collection<{ name: string; age: number; }>
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index 9252953ea3..40c616fcdb 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -4,43 +4,43 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
 
-export default class Collection {
-    constructor(items?: any);
-    add(item: any): Collection;
-    all(): Collection;
+export default class Collection<T> {
+    constructor(items?: T[]);
+    add(item: T): Collection<T>;
+    all(): Collection<T>;
     average(property?: string | ((property?: number) => number)): number;
-    chunk(size: number): Collection;
-    collect(collectable: any[]|string): Collection;
-    concat(collection: any[]|Collection): Collection;
-    contains(closure: ((item: any) => boolean)): boolean;
+    chunk(size: number): Collection<T>;
+    collect(collectable: T[]): Collection<T>;
+    concat(collection: T[]|Collection<T>): Collection<T>;
+    contains(closure: ((item: T) => boolean)): boolean;
     count(): number;
-    each(callback: (item: any) => void): Collection;
-    filter(callback: (item: any) => any): Collection;
+    each(callback: (item: T) => void): Collection<T>;
+    filter(callback: (item: T) => boolean): Collection<T>;
     find(item: any): number;
-    first(callback?: ((item: any) => any)|null): any;
-    flatten(deep?: boolean): Collection;
-    get(index: number): any;
-    has(item: any): boolean;
+    first(callback?: ((item: T) => boolean)|null): T;
+    flatten(deep?: boolean): Collection<T>;
+    get(index: number): T;
+    has(item: T): boolean;
     join(separator?: string): string;
-    keys(): Collection;
-    last(callback?: ((item: any) => any)|null): any;
-    map(callback: (item: any) => any): Collection;
-    pluck(property: string): Collection;
-    push(item: any): Collection;
-    reduce(callback: (previous: any, current: any) => any, initial: any): any;
-    reject(callback: (item: any) => any): Collection;
+    keys(): Collection<T>;
+    last(callback?: ((item: T) => boolean)|null): T;
+    map(callback: (item: T) => any): Collection<T>;
+    pluck(property: string): Collection<T>;
+    push(item: T): Collection<T>;
+    reduce(callback: (previous: T, current: T) => any, initial: any): any;
+    reject(callback: (item: T) => boolean): Collection<T>;
     remove(item: any): boolean;
-    reverse(): Collection;
-    skip(count: number): Collection;
-    slice(start: number, end?: number): Collection;
-    sort(compare?: () => any): Collection;
-    sortBy(property: string, order?: string): Collection;
+    reverse(): Collection<T>;
+    skip(count: number): Collection<T>;
+    slice(start: number, end?: number): Collection<T>;
+    sort(compare?: () => boolean): Collection<T>;
+    sortBy(property: string, order?: string): Collection<T>;
     stringify(): string;
     sum(property?: string|null): any;
-    take(count: number): Collection;
+    take(count: number): Collection<T>;
     macro(name: string, callback: (...args: any) => any): any;
-    unique(callback?: string|null|((item: any) => any)): Collection;
-    values(): Collection;
-    where(callback: ((item: any) => any)|string, value?: any): Collection;
-    zip(array: any[]|Collection): Collection;
+    unique(callback?: string|null|((item: T) => any)): Collection<T>;
+    values(): Collection<T>;
+    where(callback: ((item: T) => boolean)|string, value?: any): Collection<T>;
+    zip(array: T[]|Collection<T>): Collection<T>;
 }

From f89faea7bbf9af23606fb837c8f8473410119c1b Mon Sep 17 00:00:00 2001
From: Evgeni Zharkov <zharkov.ev.u@yandex.ru>
Date: Tue, 5 Mar 2019 01:40:06 +0300
Subject: [PATCH 342/924] Fix to 0a5d7232d49: change default export

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

diff --git a/types/tarantool-driver/index.d.ts b/types/tarantool-driver/index.d.ts
index 63b34cb6fa..e8d8e01be3 100644
--- a/types/tarantool-driver/index.d.ts
+++ b/types/tarantool-driver/index.d.ts
@@ -17,7 +17,7 @@ export interface TarantoolOptions {
   lazyConnect?: boolean;
 }
 
-export default class TarantoolConnection extends EventEmitter {
+declare class TarantoolConnection extends EventEmitter {
   constructor(options: TarantoolOptions);
 
   /* Connection */
@@ -56,3 +56,5 @@ export default class TarantoolConnection extends EventEmitter {
 
   replace(spaceId: number | string, tuple: any[]): Promise<any>;
 }
+
+export = TarantoolConnection;

From 3d3fee9d5ceabbeaa664fa2e3af2fe4eee5c6775 Mon Sep 17 00:00:00 2001
From: Evgeni Zharkov <zharkov.ev.u@yandex.ru>
Date: Tue, 5 Mar 2019 02:01:22 +0300
Subject: [PATCH 343/924] Fix to f89faea: wrap exports into namespace

+ Changed key in select() method to any[]
---
 types/tarantool-driver/index.d.ts | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/types/tarantool-driver/index.d.ts b/types/tarantool-driver/index.d.ts
index e8d8e01be3..08a5aa4b3f 100644
--- a/types/tarantool-driver/index.d.ts
+++ b/types/tarantool-driver/index.d.ts
@@ -5,20 +5,22 @@
 
 import { EventEmitter } from "events";
 
-export interface TarantoolOptions {
-  host?: string;
-  port?: number;
-  username?: string;
-  password?: string;
-  reserveHosts?: string[];
-  beforeReserve?: number;
-  timeout?: number;
-  retryStrategy?: (times: number) => number;
-  lazyConnect?: boolean;
+declare namespace TarantoolConnection {
+    export interface TarantoolOptions {
+      host?: string;
+      port?: number;
+      username?: string;
+      password?: string;
+      reserveHosts?: string[];
+      beforeReserve?: number;
+      timeout?: number;
+      retryStrategy?: (times: number) => number;
+      lazyConnect?: boolean;
+    }
 }
 
 declare class TarantoolConnection extends EventEmitter {
-  constructor(options: TarantoolOptions);
+  constructor(options: TarantoolConnection.TarantoolOptions);
 
   /* Connection */
 
@@ -35,7 +37,7 @@ declare class TarantoolConnection extends EventEmitter {
   select(spaceId: number | string,
                 indexId: number | string,
                 limit: number, offset: number,
-                iterator: string, key: string | string[]): Promise<any>;
+                iterator: string, key: any[]): Promise<any>;
 
   delete(spaceId: number | string,
                 indexId: number | string,

From bb1d194eaec37289f4474bb25cab14a3a8c79b92 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Fri, 2 Nov 2018 12:16:46 -0700
Subject: [PATCH 344/924] add typings for cassanknex

---
 types/cassanknex/cassanknex-tests.ts |  74 ++++++++++
 types/cassanknex/index.d.ts          | 204 +++++++++++++++++++++++++++
 types/cassanknex/tsconfig.json       |  24 ++++
 types/cassanknex/tslint.json         |  14 ++
 4 files changed, 316 insertions(+)
 create mode 100644 types/cassanknex/cassanknex-tests.ts
 create mode 100644 types/cassanknex/index.d.ts
 create mode 100644 types/cassanknex/tsconfig.json
 create mode 100644 types/cassanknex/tslint.json

diff --git a/types/cassanknex/cassanknex-tests.ts b/types/cassanknex/cassanknex-tests.ts
new file mode 100644
index 0000000000..45e4ba3261
--- /dev/null
+++ b/types/cassanknex/cassanknex-tests.ts
@@ -0,0 +1,74 @@
+import * as cassanknex from "cassanknex";
+
+const knex = cassanknex({
+	connection: {
+		contactPoints: ['127.0.0.1']
+	}
+});
+
+knex.on('ready', (err) => {
+});
+
+interface BirdRow {
+	type: string;
+	canFly: boolean;
+}
+
+const qb = knex("animals")
+	.insert<BirdRow>({
+		type: 'Stork',
+		canFly: true
+	})
+	.into('birds');
+
+qb.exec((err, res) => {
+});
+
+qb.eachRow((n, row) => {
+}, (err) => {
+});
+
+interface FooRow {
+	id: string;
+	foo: string;
+	bar: number;
+	baz: string[];
+}
+
+const query2 = knex("keyspace")
+	.select<FooRow>("id", "foo", "bar", "baz")
+	.ttl('foo')
+	.where("id", "=", "1")
+	.orWhere("id", "in", ["2", "3"])
+	.orWhere("baz", "=", ["bar"])
+	.andWhere("foo", "IN", ["baz", "bar"])
+	.limit(10)
+	.from("table");
+
+query2.stream({
+	readable () {
+		const row = this.read();
+	},
+	end () {},
+	error () {}
+});
+
+const values = {
+	id: "foo",
+	bar: 13,
+	baz: ["foo", "bar"]
+};
+
+const query3 = knex("cassanKnexy")
+	.insert<FooRow>(values)
+	.usingTimestamp(250000)
+	.usingTTL(50000)
+	.into("columnFamily");
+
+const [cql, params] = [query3.cql(), query3.bindings()];
+
+const query4 = knex("cassanKnexy")
+	.update("columnFamily")
+	.add("bar", { foo: "baz" }) // "bar" is a map
+	.remove("foo", ["bar"]) // "foo" is a set
+	.where("id", "=", 1);
diff --git a/types/cassanknex/index.d.ts b/types/cassanknex/index.d.ts
new file mode 100644
index 0000000000..5f5dc72b8c
--- /dev/null
+++ b/types/cassanknex/index.d.ts
@@ -0,0 +1,204 @@
+// Type definitions for cassanknex 1.19
+// Project: https://github.com/azuqua/cassanknex
+// Definitions by: Daniel Chao <https://github.com/bioball>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+import { Client, ClientOptions, types, ResultCallback } from "cassandra-driver";
+import * as Long from "long";
+import { Readable } from "stream";
+
+declare function CassanKnex (options?: CassanKnex.DriverOptions): CassanKnex.CassanKnex;
+
+export = CassanKnex;
+
+/**
+ * Will return the `never` type if `T[K]` is not a member of `Type`, for all `T[K]`.
+ */
+type TypeMatchedValue<T, K extends keyof T, Type, This> = T[K] extends Type ? This : never;
+
+type MappedDict<B> = {
+	[key: string]: B
+};
+
+type InRestriction = 'in' | 'IN';
+
+type ComparisonRestriction = '=' | '<' | '>' | '<=' | '>=';
+
+declare namespace CassanKnex {
+	interface DriverOptions {
+		debug?: boolean;
+		connection?: Client | ClientOptions;
+	}
+
+	interface CassanKnex extends EventEmitter {
+		(keyspace?: string): QueryBuilderRoot;
+	}
+
+	type SelectAsClause<T> = {
+		[P in keyof T]: string;
+	};
+
+	interface StreamParams {
+		readable: (this: Readable) => any;
+		end: (this: Readable) => any;
+		error: (err: Error) => any;
+	}
+
+	interface QueryBuilderRoot {
+		insert <T = any>(values: Partial<T> | T): InsertQueryBuilder<T>;
+		select <T = any>(...columns: Array<keyof T>): SelectQueryBuilder<T>;
+		select <T = any>(values: SelectAsClause<T>): SelectQueryBuilder<T>;
+		update <T = any>(table: string): UpdateQueryBuilder<T>;
+		delete <T = any>(): DeleteQueryBuilder<T>;
+		alterColumnFamily <T = any>(columnFamily: string): AlterColumnFamilyQueryBuilder<T>;
+		createColumnFamily <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createColumnFamilyIfNotExists <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createIndex <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder;
+		createIndexCustom <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder & CreateableIndexBuilder;
+		createType <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
+		createTypeIfNotExists <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
+		dropColumnFamily (columnFamily: string): QueryBuilder;
+		dropColumnFamilyIfExists (columnFamily: string): QueryBuilder;
+		dropType (): QueryBuilder;
+		dropTypeIfExists (): QueryBuilder;
+		truncate (columnFamily: string): QueryBuilder;
+		alterKeyspace (keyspace: string): KeyspaceQueryBuilder;
+		createKeyspace (keyspace: string): KeyspaceQueryBuilder;
+		createKeyspaceIfNotExists (keyspace: string): KeyspaceQueryBuilder;
+		dropKeyspace (): QueryBuilder;
+		dropKeyspaceIfExists (): QueryBuilder;
+	}
+
+	interface QueryBuilder {
+		cql (): string;
+		bindings (): any[];
+		exec (cb: ResultCallback): undefined;
+		eachRow (onEachRow: (n: number, row: types.Row) => any, onError: (err: Error) => any): undefined;
+		stream (params: StreamParams): undefined;
+	}
+
+	interface FieldValueQueryBuilder<T> {
+		decimal <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.BigDecimal, this>;
+		boolean <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, boolean, this>;
+		blob <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Buffer, this>;
+		timestamp <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Date, this>;
+		date <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.LocalDate, this>;
+		inet <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.InetAddress, this>;
+		bigint <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		counter <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		double <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		int <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
+		float <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
+		map <K extends keyof T, A extends string, B>(columnName: K, a: A, b: B): TypeMatchedValue<T, K, Map<A, B>, this>;
+		ascii <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		text <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		timeuuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.TimeUuid, this>;
+		uuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.Uuid, this>;
+		varchar <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		list <K extends keyof T>(columnName: K, typeName: string): TypeMatchedValue<T, K, any[], this>;
+		primary (primaryKey: string): this;
+		set <K extends keyof T, A extends string>(columnName: K, a: A): TypeMatchedValue<T, K, Set<T[K]>, this>;
+	}
+
+	interface CreateableColumnFamilyBuilder<T> {
+		withCaching (): this;
+		withCompression (): this;
+		withCompaction (): this;
+		withClusteringOrderBy <K extends keyof T>(value: K, direction: 'desc' | 'asc'): this;
+	}
+
+	interface CreateableIndexBuilder {
+		withOptions (opts: MappedDict<string>): this;
+	}
+
+	interface KeyspaceableQueryBuilder {
+		withNetworkTopologyStrategy (strategy: MappedDict<number>): this;
+		withSimpleStrategy (replicas: number): this;
+		withDurableWrites (durableWrites: boolean): this;
+	}
+
+	interface InsertableQueryBuilder {
+		into (table: string): this;
+		ifNotExists (): this;
+	}
+
+	interface TtlableQueryBuilder {
+		usingTimestamp (timestamp: number): this;
+		usingTTL (ttl: number): this;
+	}
+
+	interface WhereableQueryBuilder<T> {
+		where <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		where <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		orWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		orWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		andWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		andWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		tokenWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		tokenWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		ttl <K extends keyof T>(columnName: K): this;
+	}
+
+	interface IfableQueryBuilder<T> {
+		if <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K] | null): this;
+	}
+
+	interface LimitableQueryBuilder {
+		limit (limit: number): this;
+		limitPerPartition (limit: number): this;
+	}
+
+	interface FromableQueryBuilder {
+		from (table: string): this;
+	}
+
+	interface UpdateableQueryBuilder<T> {
+		set <K extends keyof T>(key: K, value: T[K]): this;
+		set (object: Partial<T>): this;
+		add <K extends keyof T>(key: K, value: { [str: string]: T[K] }): TypeMatchedValue<T, K, Map<string, T[K]>, this>;
+		add <K extends keyof T>(key: K, value: Array<T[K]>): TypeMatchedValue<T, K, any[] | Set<any>, this>;
+		add (object: Partial<T>): this;
+		remove <K extends keyof T>(key: K, value: Array<T[K]>): this;
+		remove (object: Partial<T>): this;
+		increment (column: keyof T, amount: number): this;
+		increment (object: Partial<T>): this;
+		decrement (column: keyof T, amount: number): this;
+		decrement (object: Partial<T>): this;
+	}
+
+	interface AlterableQueryBuilder<T> {
+		drop <K extends keyof T>(...columns: K[]): this;
+		rename <K extends keyof T>(column: K, newColumn: K): this;
+		alter <K extends keyof T>(column: K, newType: string): this;
+	}
+
+	type InsertQueryBuilder<T> = QueryBuilder
+		& InsertableQueryBuilder
+		& TtlableQueryBuilder;
+	type SelectQueryBuilder<T> = QueryBuilder
+		& WhereableQueryBuilder<T>
+		& LimitableQueryBuilder
+		& FromableQueryBuilder;
+	type UpdateQueryBuilder<T> = QueryBuilder
+		& WhereableQueryBuilder<T>
+		& UpdateableQueryBuilder<T>
+		& IfableQueryBuilder<T>
+		& TtlableQueryBuilder;
+	type DeleteQueryBuilder<T> = QueryBuilder
+		& WhereableQueryBuilder<T>
+		& FromableQueryBuilder;
+	type CreateColumnFamilyQueryBuilder<T> = QueryBuilder
+		& FieldValueQueryBuilder<T>
+		& CreateableColumnFamilyBuilder<T>;
+	type KeyspaceQueryBuilder = QueryBuilder
+		& KeyspaceableQueryBuilder;
+	type CreateTypeQueryBuilder<T> = QueryBuilder
+		& FieldValueQueryBuilder<T>;
+	type AlterColumnFamilyQueryBuilder<T> = QueryBuilder
+		& AlterableQueryBuilder<T>
+		& FieldValueQueryBuilder<T>;
+}
diff --git a/types/cassanknex/tsconfig.json b/types/cassanknex/tsconfig.json
new file mode 100644
index 0000000000..d77cbaca70
--- /dev/null
+++ b/types/cassanknex/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",
+		"cassanknex-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/types/cassanknex/tslint.json b/types/cassanknex/tslint.json
new file mode 100644
index 0000000000..8bd9293b77
--- /dev/null
+++ b/types/cassanknex/tslint.json
@@ -0,0 +1,14 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"space-before-function-paren": [true, "always"],
+		"no-unnecessary-generics": false,
+		"strict-export-declare-modifiers": false,
+		"prefer-readonly": false,
+		"await-promise": false,
+		"no-for-in-array": false,
+		"no-void-expression": false,
+		"expect": false,
+		"no-declare-current-package": false
+	}
+}
\ No newline at end of file

From b2d972b0ae8649d0651d8128f935f3de09452bec Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Fri, 2 Nov 2018 13:57:08 -0700
Subject: [PATCH 345/924] expect: true

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

diff --git a/types/cassanknex/tslint.json b/types/cassanknex/tslint.json
index 8bd9293b77..978a6cf2fc 100644
--- a/types/cassanknex/tslint.json
+++ b/types/cassanknex/tslint.json
@@ -8,7 +8,7 @@
 		"await-promise": false,
 		"no-for-in-array": false,
 		"no-void-expression": false,
-		"expect": false,
+		"expect": true,
 		"no-declare-current-package": false
 	}
 }
\ No newline at end of file

From 08544665c8862d3637605b9390dca5b2bc583187 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Fri, 2 Nov 2018 13:58:44 -0700
Subject: [PATCH 346/924] fix linting errors

---
 types/cassanknex/index.d.ts | 102 ++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/types/cassanknex/index.d.ts b/types/cassanknex/index.d.ts
index 5f5dc72b8c..0de4ac8ebc 100644
--- a/types/cassanknex/index.d.ts
+++ b/types/cassanknex/index.d.ts
@@ -20,9 +20,9 @@ export = CassanKnex;
  */
 type TypeMatchedValue<T, K extends keyof T, Type, This> = T[K] extends Type ? This : never;
 
-type MappedDict<B> = {
+interface MappedDict<B> {
 	[key: string]: B
-};
+}
 
 type InRestriction = 'in' | 'IN';
 
@@ -49,18 +49,18 @@ declare namespace CassanKnex {
 	}
 
 	interface QueryBuilderRoot {
-		insert <T = any>(values: Partial<T> | T): InsertQueryBuilder<T>;
-		select <T = any>(...columns: Array<keyof T>): SelectQueryBuilder<T>;
-		select <T = any>(values: SelectAsClause<T>): SelectQueryBuilder<T>;
-		update <T = any>(table: string): UpdateQueryBuilder<T>;
-		delete <T = any>(): DeleteQueryBuilder<T>;
-		alterColumnFamily <T = any>(columnFamily: string): AlterColumnFamilyQueryBuilder<T>;
-		createColumnFamily <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
-		createColumnFamilyIfNotExists <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
-		createIndex <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder;
-		createIndexCustom <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder & CreateableIndexBuilder;
-		createType <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
-		createTypeIfNotExists <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
+		insert <T = any> (values: Partial<T> | T): InsertQueryBuilder<T>;
+		select <T = any> (...columns: Array<keyof T>): SelectQueryBuilder<T>;
+		select <T = any> (values: SelectAsClause<T>): SelectQueryBuilder<T>;
+		update <T = any> (table: string): UpdateQueryBuilder<T>;
+		delete <T = any> (): DeleteQueryBuilder<T>;
+		alterColumnFamily <T = any> (columnFamily: string): AlterColumnFamilyQueryBuilder<T>;
+		createColumnFamily <T = any> (columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createColumnFamilyIfNotExists <T = any> (columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createIndex <T = any> (columnFamily: string, indexName: string, column: keyof T): QueryBuilder;
+		createIndexCustom <T = any> (columnFamily: string, indexName: string, column: keyof T): QueryBuilder & CreateableIndexBuilder;
+		createType <T = any> (typeName: string): CreateTypeQueryBuilder<T>;
+		createTypeIfNotExists <T = any> (typeName: string): CreateTypeQueryBuilder<T>;
 		dropColumnFamily (columnFamily: string): QueryBuilder;
 		dropColumnFamilyIfExists (columnFamily: string): QueryBuilder;
 		dropType (): QueryBuilder;
@@ -82,33 +82,33 @@ declare namespace CassanKnex {
 	}
 
 	interface FieldValueQueryBuilder<T> {
-		decimal <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.BigDecimal, this>;
-		boolean <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, boolean, this>;
-		blob <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Buffer, this>;
-		timestamp <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Date, this>;
-		date <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.LocalDate, this>;
-		inet <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.InetAddress, this>;
-		bigint <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
-		counter <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
-		double <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
-		int <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
-		float <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
-		map <K extends keyof T, A extends string, B>(columnName: K, a: A, b: B): TypeMatchedValue<T, K, Map<A, B>, this>;
-		ascii <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
-		text <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
-		timeuuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.TimeUuid, this>;
-		uuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.Uuid, this>;
-		varchar <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
-		list <K extends keyof T>(columnName: K, typeName: string): TypeMatchedValue<T, K, any[], this>;
+		decimal <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.BigDecimal, this>;
+		boolean <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, boolean, this>;
+		blob <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Buffer, this>;
+		timestamp <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Date, this>;
+		date <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.LocalDate, this>;
+		inet <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.InetAddress, this>;
+		bigint <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
+		counter <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
+		double <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
+		int <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, number, this>;
+		float <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, number, this>;
+		map <K extends keyof T, A extends string, B> (columnName: K, a: A, b: B): TypeMatchedValue<T, K, Map<A, B>, this>;
+		ascii <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
+		text <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
+		timeuuid <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.TimeUuid, this>;
+		uuid <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.Uuid, this>;
+		varchar <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
+		list <K extends keyof T> (columnName: K, typeName: string): TypeMatchedValue<T, K, any[], this>;
 		primary (primaryKey: string): this;
-		set <K extends keyof T, A extends string>(columnName: K, a: A): TypeMatchedValue<T, K, Set<T[K]>, this>;
+		set <K extends keyof T, A extends string> (columnName: K, a: A): TypeMatchedValue<T, K, Set<T[K]>, this>;
 	}
 
 	interface CreateableColumnFamilyBuilder<T> {
 		withCaching (): this;
 		withCompression (): this;
 		withCompaction (): this;
-		withClusteringOrderBy <K extends keyof T>(value: K, direction: 'desc' | 'asc'): this;
+		withClusteringOrderBy <K extends keyof T> (value: K, direction: 'desc' | 'asc'): this;
 	}
 
 	interface CreateableIndexBuilder {
@@ -132,19 +132,19 @@ declare namespace CassanKnex {
 	}
 
 	interface WhereableQueryBuilder<T> {
-		where <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		where <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		orWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		orWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		andWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		andWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		tokenWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		tokenWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		ttl <K extends keyof T>(columnName: K): this;
+		where <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		where <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		orWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		orWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		andWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		andWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		tokenWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		tokenWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		ttl <K extends keyof T> (columnName: K): this;
 	}
 
 	interface IfableQueryBuilder<T> {
-		if <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K] | null): this;
+		if <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K] | null): this;
 	}
 
 	interface LimitableQueryBuilder {
@@ -157,12 +157,12 @@ declare namespace CassanKnex {
 	}
 
 	interface UpdateableQueryBuilder<T> {
-		set <K extends keyof T>(key: K, value: T[K]): this;
+		set <K extends keyof T> (key: K, value: T[K]): this;
 		set (object: Partial<T>): this;
-		add <K extends keyof T>(key: K, value: { [str: string]: T[K] }): TypeMatchedValue<T, K, Map<string, T[K]>, this>;
-		add <K extends keyof T>(key: K, value: Array<T[K]>): TypeMatchedValue<T, K, any[] | Set<any>, this>;
+		add <K extends keyof T> (key: K, value: { [str: string]: T[K] }): TypeMatchedValue<T, K, Map<string, T[K]>, this>;
+		add <K extends keyof T> (key: K, value: Array<T[K]>): TypeMatchedValue<T, K, any[] | Set<any>, this>;
 		add (object: Partial<T>): this;
-		remove <K extends keyof T>(key: K, value: Array<T[K]>): this;
+		remove <K extends keyof T> (key: K, value: Array<T[K]>): this;
 		remove (object: Partial<T>): this;
 		increment (column: keyof T, amount: number): this;
 		increment (object: Partial<T>): this;
@@ -171,9 +171,9 @@ declare namespace CassanKnex {
 	}
 
 	interface AlterableQueryBuilder<T> {
-		drop <K extends keyof T>(...columns: K[]): this;
-		rename <K extends keyof T>(column: K, newColumn: K): this;
-		alter <K extends keyof T>(column: K, newType: string): this;
+		drop <K extends keyof T> (...columns: K[]): this;
+		rename <K extends keyof T> (column: K, newColumn: K): this;
+		alter <K extends keyof T> (column: K, newType: string): this;
 	}
 
 	type InsertQueryBuilder<T> = QueryBuilder

From f681ca576b3cbbe8c7785858f542f415e9191344 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Fri, 2 Nov 2018 14:00:02 -0700
Subject: [PATCH 347/924] semicolon

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

diff --git a/types/cassanknex/index.d.ts b/types/cassanknex/index.d.ts
index 0de4ac8ebc..bd85325b4b 100644
--- a/types/cassanknex/index.d.ts
+++ b/types/cassanknex/index.d.ts
@@ -21,7 +21,7 @@ export = CassanKnex;
 type TypeMatchedValue<T, K extends keyof T, Type, This> = T[K] extends Type ? This : never;
 
 interface MappedDict<B> {
-	[key: string]: B
+	[key: string]: B;
 }
 
 type InRestriction = 'in' | 'IN';

From 4ee3aa7569fb9a21baaef713529de9328d4658e3 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Fri, 2 Nov 2018 14:43:57 -0700
Subject: [PATCH 348/924] move all type aliases to within the namespace

---
 types/cassanknex/index.d.ts | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/types/cassanknex/index.d.ts b/types/cassanknex/index.d.ts
index bd85325b4b..b9b75e92e6 100644
--- a/types/cassanknex/index.d.ts
+++ b/types/cassanknex/index.d.ts
@@ -15,33 +15,33 @@ declare function CassanKnex (options?: CassanKnex.DriverOptions): CassanKnex.Cas
 
 export = CassanKnex;
 
-/**
- * Will return the `never` type if `T[K]` is not a member of `Type`, for all `T[K]`.
- */
-type TypeMatchedValue<T, K extends keyof T, Type, This> = T[K] extends Type ? This : never;
-
-interface MappedDict<B> {
-	[key: string]: B;
-}
-
-type InRestriction = 'in' | 'IN';
-
-type ComparisonRestriction = '=' | '<' | '>' | '<=' | '>=';
-
 declare namespace CassanKnex {
 	interface DriverOptions {
 		debug?: boolean;
 		connection?: Client | ClientOptions;
 	}
 
+  /**
+   * Will return the `never` type if `T[K]` is not a member of `Type`, for all `T[K]`.
+   */
+  type TypeMatchedValue<T, K extends keyof T, Type, This> = T[K] extends Type ? This : never;
+
+  interface MappedDict<B> {
+    [key: string]: B;
+  }
+
+  type InRestriction = 'in' | 'IN';
+
+  type ComparisonRestriction = '=' | '<' | '>' | '<=' | '>=';
+
+  type SelectAsClause<T> = {
+    [P in keyof T]: string;
+  };
+
 	interface CassanKnex extends EventEmitter {
 		(keyspace?: string): QueryBuilderRoot;
 	}
 
-	type SelectAsClause<T> = {
-		[P in keyof T]: string;
-	};
-
 	interface StreamParams {
 		readable: (this: Readable) => any;
 		end: (this: Readable) => any;

From 51f148ad836c791c8b947f86a2d366a1d714dfc4 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Mon, 5 Nov 2018 17:37:33 -0800
Subject: [PATCH 349/924] use import = require syntax per PR feedback

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

diff --git a/types/cassanknex/cassanknex-tests.ts b/types/cassanknex/cassanknex-tests.ts
index 45e4ba3261..550fe141aa 100644
--- a/types/cassanknex/cassanknex-tests.ts
+++ b/types/cassanknex/cassanknex-tests.ts
@@ -1,4 +1,4 @@
-import * as cassanknex from "cassanknex";
+import cassanknex = require('cassanknex');
 
 const knex = cassanknex({
 	connection: {

From 4ec7a6b59bf208fa631398ef5f7cb9924a3740e4 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Sun, 2 Dec 2018 13:04:25 -0800
Subject: [PATCH 350/924] re-emable most dts-lint errors

---
 types/cassanknex/index.d.ts  | 176 +++++++++++++++++------------------
 types/cassanknex/tslint.json |  15 +--
 2 files changed, 92 insertions(+), 99 deletions(-)

diff --git a/types/cassanknex/index.d.ts b/types/cassanknex/index.d.ts
index b9b75e92e6..fd7f9c53f4 100644
--- a/types/cassanknex/index.d.ts
+++ b/types/cassanknex/index.d.ts
@@ -11,7 +11,7 @@ import { Client, ClientOptions, types, ResultCallback } from "cassandra-driver";
 import * as Long from "long";
 import { Readable } from "stream";
 
-declare function CassanKnex (options?: CassanKnex.DriverOptions): CassanKnex.CassanKnex;
+declare function CassanKnex(options?: CassanKnex.DriverOptions): CassanKnex.CassanKnex;
 
 export = CassanKnex;
 
@@ -49,134 +49,134 @@ declare namespace CassanKnex {
 	}
 
 	interface QueryBuilderRoot {
-		insert <T = any> (values: Partial<T> | T): InsertQueryBuilder<T>;
-		select <T = any> (...columns: Array<keyof T>): SelectQueryBuilder<T>;
-		select <T = any> (values: SelectAsClause<T>): SelectQueryBuilder<T>;
-		update <T = any> (table: string): UpdateQueryBuilder<T>;
-		delete <T = any> (): DeleteQueryBuilder<T>;
-		alterColumnFamily <T = any> (columnFamily: string): AlterColumnFamilyQueryBuilder<T>;
-		createColumnFamily <T = any> (columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
-		createColumnFamilyIfNotExists <T = any> (columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
-		createIndex <T = any> (columnFamily: string, indexName: string, column: keyof T): QueryBuilder;
-		createIndexCustom <T = any> (columnFamily: string, indexName: string, column: keyof T): QueryBuilder & CreateableIndexBuilder;
-		createType <T = any> (typeName: string): CreateTypeQueryBuilder<T>;
-		createTypeIfNotExists <T = any> (typeName: string): CreateTypeQueryBuilder<T>;
-		dropColumnFamily (columnFamily: string): QueryBuilder;
-		dropColumnFamilyIfExists (columnFamily: string): QueryBuilder;
-		dropType (): QueryBuilder;
-		dropTypeIfExists (): QueryBuilder;
-		truncate (columnFamily: string): QueryBuilder;
-		alterKeyspace (keyspace: string): KeyspaceQueryBuilder;
-		createKeyspace (keyspace: string): KeyspaceQueryBuilder;
-		createKeyspaceIfNotExists (keyspace: string): KeyspaceQueryBuilder;
-		dropKeyspace (): QueryBuilder;
-		dropKeyspaceIfExists (): QueryBuilder;
+		insert <T = any>(values: Partial<T> | T): InsertQueryBuilder;
+		select <T = any>(...columns: Array<keyof T>): SelectQueryBuilder<T>;
+		select <T = any>(values: SelectAsClause<T>): SelectQueryBuilder<T>;
+		update <T = any>(table: string): UpdateQueryBuilder<T>;
+		delete <T = any>(): DeleteQueryBuilder<T>;
+		alterColumnFamily <T = any>(columnFamily: string): AlterColumnFamilyQueryBuilder<T>;
+		createColumnFamily <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createColumnFamilyIfNotExists <T = any>(columnFamily: string): CreateColumnFamilyQueryBuilder<T>;
+		createIndex <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder;
+		createIndexCustom <T = any>(columnFamily: string, indexName: string, column: keyof T): QueryBuilder & CreateableIndexBuilder;
+		createType <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
+		createTypeIfNotExists <T = any>(typeName: string): CreateTypeQueryBuilder<T>;
+		dropColumnFamily(columnFamily: string): QueryBuilder;
+		dropColumnFamilyIfExists(columnFamily: string): QueryBuilder;
+		dropType(): QueryBuilder;
+		dropTypeIfExists(): QueryBuilder;
+		truncate(columnFamily: string): QueryBuilder;
+		alterKeyspace(keyspace: string): KeyspaceQueryBuilder;
+		createKeyspace(keyspace: string): KeyspaceQueryBuilder;
+		createKeyspaceIfNotExists(keyspace: string): KeyspaceQueryBuilder;
+		dropKeyspace(): QueryBuilder;
+		dropKeyspaceIfExists(): QueryBuilder;
 	}
 
 	interface QueryBuilder {
-		cql (): string;
-		bindings (): any[];
-		exec (cb: ResultCallback): undefined;
-		eachRow (onEachRow: (n: number, row: types.Row) => any, onError: (err: Error) => any): undefined;
-		stream (params: StreamParams): undefined;
+		cql(): string;
+		bindings(): any[];
+		exec(cb: ResultCallback): undefined;
+		eachRow(onEachRow: (n: number, row: types.Row) => any, onError: (err: Error) => any): undefined;
+		stream(params: StreamParams): undefined;
 	}
 
 	interface FieldValueQueryBuilder<T> {
-		decimal <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.BigDecimal, this>;
-		boolean <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, boolean, this>;
-		blob <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Buffer, this>;
-		timestamp <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Date, this>;
-		date <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.LocalDate, this>;
-		inet <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.InetAddress, this>;
-		bigint <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
-		counter <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
-		double <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, Long, this>;
-		int <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, number, this>;
-		float <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, number, this>;
-		map <K extends keyof T, A extends string, B> (columnName: K, a: A, b: B): TypeMatchedValue<T, K, Map<A, B>, this>;
-		ascii <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
-		text <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
-		timeuuid <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.TimeUuid, this>;
-		uuid <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, types.Uuid, this>;
-		varchar <K extends keyof T> (columnName: K): TypeMatchedValue<T, K, string, this>;
-		list <K extends keyof T> (columnName: K, typeName: string): TypeMatchedValue<T, K, any[], this>;
-		primary (primaryKey: string): this;
-		set <K extends keyof T, A extends string> (columnName: K, a: A): TypeMatchedValue<T, K, Set<T[K]>, this>;
+		decimal <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.BigDecimal, this>;
+		boolean <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, boolean, this>;
+		blob <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Buffer, this>;
+		timestamp <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Date, this>;
+		date <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.LocalDate, this>;
+		inet <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.InetAddress, this>;
+		bigint <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		counter <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		double <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, Long, this>;
+		int <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
+		float <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, number, this>;
+		map <K extends keyof T, A extends string, B>(columnName: K, a: A, b: B): TypeMatchedValue<T, K, Map<A, B>, this>;
+		ascii <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		text <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		timeuuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.TimeUuid, this>;
+		uuid <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, types.Uuid, this>;
+		varchar <K extends keyof T>(columnName: K): TypeMatchedValue<T, K, string, this>;
+		list <K extends keyof T>(columnName: K, typeName: string): TypeMatchedValue<T, K, any[], this>;
+		primary(primaryKey: string): this;
+		set <K extends keyof T, A extends string>(columnName: K, a: A): TypeMatchedValue<T, K, Set<T[K]>, this>;
 	}
 
 	interface CreateableColumnFamilyBuilder<T> {
-		withCaching (): this;
-		withCompression (): this;
-		withCompaction (): this;
-		withClusteringOrderBy <K extends keyof T> (value: K, direction: 'desc' | 'asc'): this;
+		withCaching(): this;
+		withCompression(): this;
+		withCompaction(): this;
+		withClusteringOrderBy <K extends keyof T>(value: K, direction: 'desc' | 'asc'): this;
 	}
 
 	interface CreateableIndexBuilder {
-		withOptions (opts: MappedDict<string>): this;
+		withOptions(opts: MappedDict<string>): this;
 	}
 
 	interface KeyspaceableQueryBuilder {
-		withNetworkTopologyStrategy (strategy: MappedDict<number>): this;
-		withSimpleStrategy (replicas: number): this;
-		withDurableWrites (durableWrites: boolean): this;
+		withNetworkTopologyStrategy(strategy: MappedDict<number>): this;
+		withSimpleStrategy(replicas: number): this;
+		withDurableWrites(durableWrites: boolean): this;
 	}
 
 	interface InsertableQueryBuilder {
-		into (table: string): this;
-		ifNotExists (): this;
+		into(table: string): this;
+		ifNotExists(): this;
 	}
 
 	interface TtlableQueryBuilder {
-		usingTimestamp (timestamp: number): this;
-		usingTTL (ttl: number): this;
+		usingTimestamp(timestamp: number): this;
+		usingTTL(ttl: number): this;
 	}
 
 	interface WhereableQueryBuilder<T> {
-		where <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		where <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		orWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		orWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		andWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		andWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		tokenWhere <K extends keyof T> (lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
-		tokenWhere <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
-		ttl <K extends keyof T> (columnName: K): this;
+		where <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		where <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		orWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		orWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		andWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		andWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		tokenWhere <K extends keyof T>(lhs: K, comparison: InRestriction, rhs: Array<T[K]>): this;
+		tokenWhere <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K]): this;
+		ttl <K extends keyof T>(columnName: K): this;
 	}
 
 	interface IfableQueryBuilder<T> {
-		if <K extends keyof T> (lhs: K, comparison: ComparisonRestriction, rhs: T[K] | null): this;
+		if <K extends keyof T>(lhs: K, comparison: ComparisonRestriction, rhs: T[K] | null): this;
 	}
 
 	interface LimitableQueryBuilder {
-		limit (limit: number): this;
-		limitPerPartition (limit: number): this;
+		limit(limit: number): this;
+		limitPerPartition(limit: number): this;
 	}
 
 	interface FromableQueryBuilder {
-		from (table: string): this;
+		from(table: string): this;
 	}
 
 	interface UpdateableQueryBuilder<T> {
-		set <K extends keyof T> (key: K, value: T[K]): this;
-		set (object: Partial<T>): this;
-		add <K extends keyof T> (key: K, value: { [str: string]: T[K] }): TypeMatchedValue<T, K, Map<string, T[K]>, this>;
-		add <K extends keyof T> (key: K, value: Array<T[K]>): TypeMatchedValue<T, K, any[] | Set<any>, this>;
-		add (object: Partial<T>): this;
-		remove <K extends keyof T> (key: K, value: Array<T[K]>): this;
-		remove (object: Partial<T>): this;
-		increment (column: keyof T, amount: number): this;
-		increment (object: Partial<T>): this;
-		decrement (column: keyof T, amount: number): this;
-		decrement (object: Partial<T>): this;
+		set <K extends keyof T>(key: K, value: T[K]): this;
+		set(object: Partial<T>): this;
+		add <K extends keyof T>(key: K, value: { [str: string]: T[K] }): TypeMatchedValue<T, K, Map<string, T[K]>, this>;
+		add <K extends keyof T>(key: K, value: Array<T[K]>): TypeMatchedValue<T, K, any[] | Set<any>, this>;
+		add(object: Partial<T>): this;
+		remove <K extends keyof T>(key: K, value: Array<T[K]>): this;
+		remove(object: Partial<T>): this;
+		increment(column: keyof T, amount: number): this;
+		increment(object: Partial<T>): this;
+		decrement(column: keyof T, amount: number): this;
+		decrement(object: Partial<T>): this;
 	}
 
 	interface AlterableQueryBuilder<T> {
-		drop <K extends keyof T> (...columns: K[]): this;
-		rename <K extends keyof T> (column: K, newColumn: K): this;
-		alter <K extends keyof T> (column: K, newType: string): this;
+		drop <K extends keyof T>(...columns: K[]): this;
+		rename <K extends keyof T>(column: K, newColumn: K): this;
+		alter <K extends keyof T>(column: K, newType: string): this;
 	}
 
-	type InsertQueryBuilder<T> = QueryBuilder
+	type InsertQueryBuilder = QueryBuilder
 		& InsertableQueryBuilder
 		& TtlableQueryBuilder;
 	type SelectQueryBuilder<T> = QueryBuilder
diff --git a/types/cassanknex/tslint.json b/types/cassanknex/tslint.json
index 978a6cf2fc..4074d3cece 100644
--- a/types/cassanknex/tslint.json
+++ b/types/cassanknex/tslint.json
@@ -1,14 +1,7 @@
 {
 	"extends": "dtslint/dt.json",
-	"rules": {
-		"space-before-function-paren": [true, "always"],
-		"no-unnecessary-generics": false,
-		"strict-export-declare-modifiers": false,
-		"prefer-readonly": false,
-		"await-promise": false,
-		"no-for-in-array": false,
-		"no-void-expression": false,
-		"expect": true,
-		"no-declare-current-package": false
-	}
+  "rules": {
+    "no-unnecessary-generics": false,
+    "strict-export-declare-modifiers": false
+  }
 }
\ No newline at end of file

From 9a5fd17efc249b0085813aad11c5589e03425ab9 Mon Sep 17 00:00:00 2001
From: Dan Chao <daniel.h.chao@gmail.com>
Date: Sun, 2 Dec 2018 13:10:33 -0800
Subject: [PATCH 351/924] fix more linting errors

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

diff --git a/types/cassanknex/cassanknex-tests.ts b/types/cassanknex/cassanknex-tests.ts
index 550fe141aa..b874d2a784 100644
--- a/types/cassanknex/cassanknex-tests.ts
+++ b/types/cassanknex/cassanknex-tests.ts
@@ -46,11 +46,11 @@ const query2 = knex("keyspace")
 	.from("table");
 
 query2.stream({
-	readable () {
+	readable() {
 		const row = this.read();
 	},
-	end () {},
-	error () {}
+	end() {},
+	error() {}
 });
 
 const values = {

From 9d645ea67fcbaf3b9af8799963cd84e46c2a1235 Mon Sep 17 00:00:00 2001
From: Evgeni Zharkov <zharkov.ev.u@yandex.ru>
Date: Tue, 5 Mar 2019 02:17:57 +0300
Subject: [PATCH 352/924] Fix to 3d3fee9: redundant export / resolve default
 export problem

---
 types/tarantool-driver/index.d.ts             | 22 +++++++++----------
 .../tarantool-driver-tests.ts                 |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/types/tarantool-driver/index.d.ts b/types/tarantool-driver/index.d.ts
index 08a5aa4b3f..25d0e04a09 100644
--- a/types/tarantool-driver/index.d.ts
+++ b/types/tarantool-driver/index.d.ts
@@ -6,17 +6,17 @@
 import { EventEmitter } from "events";
 
 declare namespace TarantoolConnection {
-    export interface TarantoolOptions {
-      host?: string;
-      port?: number;
-      username?: string;
-      password?: string;
-      reserveHosts?: string[];
-      beforeReserve?: number;
-      timeout?: number;
-      retryStrategy?: (times: number) => number;
-      lazyConnect?: boolean;
-    }
+  interface TarantoolOptions {
+    host?: string;
+    port?: number;
+    username?: string;
+    password?: string;
+    reserveHosts?: string[];
+    beforeReserve?: number;
+    timeout?: number;
+    retryStrategy?: (times: number) => number;
+    lazyConnect?: boolean;
+  }
 }
 
 declare class TarantoolConnection extends EventEmitter {
diff --git a/types/tarantool-driver/tarantool-driver-tests.ts b/types/tarantool-driver/tarantool-driver-tests.ts
index cf27d123fb..e7fe424afb 100644
--- a/types/tarantool-driver/tarantool-driver-tests.ts
+++ b/types/tarantool-driver/tarantool-driver-tests.ts
@@ -1,3 +1,3 @@
-import TarantoolDriver from "tarantool-driver";
+import TarantoolDriver = require("tarantool-driver");
 
 new TarantoolDriver({}).connect(); // $ExpectedType Promise

From efb1b38208f1e711616035b7350c4e86586d1cc6 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Tue, 5 Mar 2019 12:05:41 +1100
Subject: [PATCH 353/924] Updated export default to export

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

diff --git a/types/humanize-ms/humanize-ms-tests.ts b/types/humanize-ms/humanize-ms-tests.ts
index 80b675429a..bd329751f3 100644
--- a/types/humanize-ms/humanize-ms-tests.ts
+++ b/types/humanize-ms/humanize-ms-tests.ts
@@ -1,4 +1,4 @@
-import HumanizeMs from "humanize-ms";
+import HumanizeMs = require("humanize-ms");
 
 HumanizeMs('1s');
 
diff --git a/types/humanize-ms/index.d.ts b/types/humanize-ms/index.d.ts
index ea7e65bc80..40462c5782 100644
--- a/types/humanize-ms/index.d.ts
+++ b/types/humanize-ms/index.d.ts
@@ -3,4 +3,6 @@
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function(input: string|number): number;
+declare function HumanizeMS(input: string|number): number;
+
+export = HumanizeMS;

From 0edcd42252db8dd2350a5d73351e503f61d3ebcd Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Tue, 5 Mar 2019 10:15:47 +0800
Subject: [PATCH 354/924] fix: tslint

---
 types/dv/dv-tests.ts |  10 +-
 types/dv/index.d.ts  | 219 ++++++++++++++++++++++++-------------------
 types/dv/tslint.json |   7 +-
 3 files changed, 136 insertions(+), 100 deletions(-)

diff --git a/types/dv/dv-tests.ts b/types/dv/dv-tests.ts
index f49a7ef683..4dd9f0e88e 100644
--- a/types/dv/dv-tests.ts
+++ b/types/dv/dv-tests.ts
@@ -10,9 +10,9 @@ const open = barcodes.thin('bg', 8, 5).dilate(3, 3);
 const openMap = open.distanceFunction(8);
 const openMask = openMap.threshold(10).erode(22, 22);
 const boxes = openMask.invert().connectedComponents(8);
-for (const i in boxes) {
+boxes.forEach((box) => {
 	const boxImage = barcodes.crop(
-		boxes[i].x, boxes[i].y,
-		boxes[i].width, boxes[i].height);
-	// Do something useful with our image.
-}
+		// Do something useful with our image.
+		box.x, box.y,
+		box.width, box.height);
+});
diff --git a/types/dv/index.d.ts b/types/dv/index.d.ts
index 6aec428e5e..5a0447966a 100644
--- a/types/dv/index.d.ts
+++ b/types/dv/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/creatale/node-dv
 // Definitions by: taoqf <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 /// <reference types="node" />
 
@@ -23,7 +24,6 @@ export interface Segment {
 	error: number;
 }
 
-
 export interface Skew {
 	angle: number;
 	confidence: number;
@@ -55,242 +55,268 @@ export class Image {
 	constructor(type: 'png' | 'jpg', buffer: Buffer);
 	constructor(type: 'rgba' | 'rgb' | 'gray', buffer: Buffer, width: number, height: number);
 
-	public readonly width: number;
-	public readonly height: number;
+	readonly width: number;
+	readonly height: number;
 	/**
 	 * The depth of the image in bits per pixel, i.e. one of 32 (color), 8 (grayscale) or 1 (monochrome).
 	 */
-	public readonly depth: number;
+	readonly depth: number;
 
 	/**
 	 * Returns the (boolean) inverse of this image.
 	 */
-	public invert(): Image;
+	invert(): Image;
 	/**
 	 * Returns the (boolean) union of two images with equal depth, aligning them to the upper left corner.
 	 */
-	public or(otherImage: Image): Image;
+	or(otherImage: Image): Image;
 	/**
 	 * Returns the (boolean) difference of two images with equal depth, aligning them to the upper left corner.
 	 */
-	public and(otherImage: Image): Image;
+	and(otherImage: Image): Image;
 	/**
 	 * Returns the (boolean) exclusive disjunction of two images with equal depth, aligning them to the upper left corner.
 	 */
-	public xor(otherImage: Image): Image;
+	xor(otherImage: Image): Image;
 	/**
 	 * If the images are monochrome, dispatches to Leptonica's pixOr. Otherwise, returns the channelwise addition of b to a, clipped at 255.
 	 */
-	public add(otherImage: Image): Image;
-	/** If the images are monochrome, dispatches to Leptonica's pixSubtract and is equivalent to a.and(b.invert()). For grayscale images, returns the pixelwise subtraction of b from a, clipped at zero. For color, the entire RGB value is subtracted instead of doing channelwise subtraction (ask Leptonica why).
+	add(otherImage: Image): Image;
+
+	/**
+	 * If the images are monochrome, dispatches to Leptonica's pixSubtract and is equivalent to a.and(b.invert()).
+	 * For grayscale images, returns the pixelwise subtraction of b from a, clipped at zero.
+	 * For color, the entire RGB value is subtracted instead of doing channelwise subtraction (ask Leptonica why).
 	 * @example:
 	 * redness = colorImage.toGray(1, 0, 0).subtract(colorImage.toGray(0, 0.5, 0.5))
 	 */
-	public subtract(otherImage: Image): Image;
+	subtract(otherImage: Image): Image;
 	/**
 	 * Applies a convoltuion kernel with the specified dimensions. Image convolution is an operation where each destination pixel is computed based on a weighted sum of a set of nearby source pixels.
 	 */
-	public convolve(halfWidth: number, halfHeight: number): Image;
+	convolve(halfWidth: number, halfHeight: number): Image;
 
 	/**
-	 * Unsharp Masking creates an unsharp mask using halfWidth. The fraction determines how much of the edge is added back into image. The resulting image appears clearer, but it is generally less accurate.
+	 * Unsharp Masking creates an unsharp mask using halfWidth.
+	 * The fraction determines how much of the edge is added back into image.
+	 * The resulting image appears clearer, but it is generally less accurate.
 	 */
-	public unsharp(halfWidth: number, fraction: number): Image;
+	unsharp(halfWidth: number, fraction: number): Image;
 	/**
 	 * Rotates the image around its center by the specified angle in degrees.
 	 */
-	public rotate(angle: number): Image;
+	rotate(angle: number): Image;
 	/**
 	 * Scales an image proportionally by scale (1.0 = 100%).
 	 */
-	public scale(scale: number): Image;
+	scale(scale: number): Image;
 
 	/**
 	 * Scales an image by scaleX and scaleY (1.0 = 100%).
 	 */
-	public scale(scaleX: number, scaleY: number): Image;
+	scale(scaleX: number, scaleY: number): Image;
 
 	/**
 	 * Crops an image from this image by the specified rectangle and returns the resulting image.
 	 */
-	public crop(box: Box): Image;
-	public crop(x: number, y: number, width: number, height: number): Image;
+	crop(box: Box): Image;
+	crop(x: number, y: number, width: number, height: number): Image;
 	/**
 	 * Creates a mask by testing if pixels (RGB, HSV, ...) are between lower and upper. Formally speaking:
 	 * lower1 ≤ pixel1 ≤ upper1
 	 * ∧ lower2 ≤ pixel2 ≤ upper2
 	 * ∧ lower3 ≤ pixel3 ≤ upper3
 	 */
-	public inRange(lower1: number, lower2: number, lower3: number, upper1: number, upper2: number, upper3: number): Image;
+	inRange(lower1: number, lower2: number, lower3: number, upper1: number, upper2: number, upper3: number): Image;
 	/**
 	 * Only available for grayscale images. Returns the histogram in an array of length 256, where each entry represents the fraction (0.0 to 1.0) of that color in the image.
 	 * The mask parameter is optional and must be a monochrome image of same width and height; only pixels where mask is 0 will be counted.
 	 */
-	public histogram(mask?: Image): Image;
+	histogram(mask?: Image): Image;
 	/**
 	 * Computes the horizontal or vertical projection of an 1bpp or 8bpp image.
 	 */
-	public projection(mode: 'horizontal' | 'vertical'): number[];
+	projection(mode: 'horizontal' | 'vertical'): number[];
 	/**
 	 * Sets the specified value to each pixel set in the mask.
 	 */
-	public setMasked(mask: Image, value: number): Image;
+	setMasked(mask: Image, value: number): Image;
 	/**
 	 * Available for grayscale and color images. Channelwise maps each pixel of image using mapping, which must be an array of length 256 with integer values between 0 and 255.
 	 * !!! !!! Note: this function actually changes the image!
 	 * The mask parameter is optional and must be a monochrome image of same width and height; only pixels where mask is 0 will be modified.
 	 */
-	public applyCurve(mapping: number[], mask?: Image): this;
+	applyCurve(mapping: number[], mask?: Image): this;
 	/**
-	 * Applies a rank (0.0 ... 1.0) filter of the specified width and height (think of it as radius) to this image and returns the result. If you set rank to 0.5 you'll get a Median Filter. Note that this type of filter works best with odd sizes like 3 or 5.
+	 * Applies a rank (0.0 ... 1.0) filter of the specified width
+	 * and height (think of it as radius) to this image
+	 * and returns the result.
+	 * If you set rank to 0.5 you'll get a Median Filter.
+	 * Note that this type of filter works best with odd sizes like 3 or 5.
 	 */
-	public rankFilter(width: number, height: number, rank: number): Image;
+	rankFilter(width: number, height: number, rank: number): Image;
 	/**
-	 * Color image quantization using an octree based algorithm. colors must be between 2 and 256. Note that support for the resulting palette image is highly experimental at this point; only toGray() and toBuffer('png') are guaranteed to work.
+	 * Color image quantization using an octree based algorithm.
+	 * colors must be between 2 and 256.
+	 * Note that support for the resulting palette image is highly experimental at this point;
+	 * only toGray() and toBuffer('png') are guaranteed to work.
 	 */
-	public octreeColorQuant(colors: number): Image;
+	octreeColorQuant(colors: number): Image;
 	/**
-	 * Color image quantization using median cut algorithm. colors must be between 2 and 256. Note that support for the resulting palette image is highly experimental at this point; only toGray() and toBuffer('png') are guaranteed to work.
+	 * Color image quantization using median cut algorithm.
+	 * colors must be between 2 and 256.
+	 * Note that support for the resulting palette image is highly experimental at this point;
+	 * only toGray() and toBuffer('png') are guaranteed to work.
 	 */
-	public medianCutQuant(colors: number): Image;
+	medianCutQuant(colors: number): Image;
 	/**
 	 * Converts a grayscale image to monochrome using a global threshold. value must be between 0 and 255.
 	 */
-	public threshold(value: number): Image;
+	threshold(value: number): Image;
 	/**
 	 * Converts an image to grayscale using default settings. Can be used to convert monochrome images back to grayscale.
 	 */
-	public toGray(): Image;
+	toGray(): Image;
 	/**
 	 * Converts an RGB image to grayscale using the specified widths for each channel.
 	 */
-	public toGray(redWeight: number, greenWeight: number, blueWeight: number): Image;
+	toGray(redWeight: number, greenWeight: number, blueWeight: number): Image;
 	/**
-	 * Converts an RGB image to grayscale by selecting either the 'min' or 'max' channel. This can act as a simple color filter: 'max' maps colored pixels towards white, while 'min' maps colored pixels towards black.
+	 * Converts an RGB image to grayscale by selecting either the 'min' or 'max' channel.
+	 * This can act as a simple color filter: 'max' maps colored pixels towards white,
+	 * while 'min' maps colored pixels towards black.
 	 */
-	public toGray(selector: 'min' | 'max'): Image;
+	toGray(selector: 'min' | 'max'): Image;
 	/**
 	 * Converts a grayscale image to a color image.
 	 */
-	public toColor(): Image;
+	toColor(): Image;
 	/**
 	 * Converts from RGB to HSV color space. HSV has the following ranges:
 	 * Hue: [0 .. 239]
 	 * Saturation: [0 .. 255]
 	 * Value: [0 .. 255]
 	 */
-	public toHSV(): Image;
+	toHSV(): Image;
 	/**
 	 * Converts from HSV to RGB color space.
 	 */
-	public toRGB(): Image;
+	toRGB(): Image;
 	/**
 	 * Applies an Erode Filter and returns the result.
 	 */
-	public erode(width: number, height: number): Image;
+	erode(width: number, height: number): Image;
 	/**
 	 * Applies a Dilate Filter and returns the result.
 	 */
-	public dilate(width: number, height: number): Image;
+	dilate(width: number, height: number): Image;
 	/**
 	 * Applies an Open Filter and returns the result.
 	 */
-	public open(width: number, height: number): Image;
+	open(width: number, height: number): Image;
 	/**
 	 * Applies a Close Filter and returns the result.
 	 */
-	public close(width: number, height: number): Image;
+	close(width: number, height: number): Image;
 	/**
 	 * Applies morphological thinning of type (fg or bg) with the specified connectivitiy (4 or 8) and maxIterations (0 to iterate until complete).
 	 */
-	public thin(type: 'fg' | 'bg', connectivity: number, maxIterations: number): Image;
+	thin(type: 'fg' | 'bg', connectivity: number, maxIterations: number): Image;
 	/**
 	 * Scales an 8bpp image for maximum dynamic range. scale must be either log or linear.
 	 */
-	public maxDynamicRange(scale: 'log' | 'linear'): Image;
+	maxDynamicRange(scale: 'log' | 'linear'): Image;
 	/**
-	 * Applies Otsu's Method for computing the threshold of a grayscale image. It computes a threshold for each tile of the specified size and performs the threshold operation, resulting in a binary image for each tile. These are stitched into the final result.
-	 * The smooth size controls the a convolution kernel applied to threshold array (use 0 for no smoothing). The score factor controls the fraction of the max. Otsu score (typically 0.1; use 0.0 for standard Otsu).
+	 * Applies Otsu's Method for computing the threshold of a grayscale image.
+	 * It computes a threshold for each tile of the specified size and performs the threshold operation,
+	 * resulting in a binary image for each tile. These are stitched into the final result.
+	 * The smooth size controls the a convolution kernel applied to threshold array (use 0 for no smoothing).
+	 * The score factor controls the fraction of the max. Otsu score (typically 0.1; use 0.0 for standard Otsu).
 	 */
-	public otsuAdaptiveThreshold(tileWidth: number, tileHeight: number, smoothWidth: number, smoothHeight: number, scoreFactor: number): Image;
+	otsuAdaptiveThreshold(tileWidth: number, tileHeight: number, smoothWidth: number, smoothHeight: number, scoreFactor: number): Image;
 	/**
 	 * Detects Line Segments with the specified accuracy (3 is a good start). The number of found line segments can be limited using maxLineSegments (0 is unlimited).
 	 */
-	public lineSegments(accuracy: number, maxLineSegments: number, useWeightedMeanShift: boolean): Segment[];
+	lineSegments(accuracy: number, maxLineSegments: number, useWeightedMeanShift: boolean): Segment[];
 	/**
 	 * Only available for monochrome images. Tries to find the skew of this image. The resulting angle is in degree. The confidence is between 0.0 and 1.0.
 	 */
-	public findSkew(): Skew;
+	findSkew(): Skew;
 	/**
 	 * Only available for monochrome images. Tries to extract connected components (think of flood fill). The connectivity can be specified as 4 or 8 directions.
 	 */
-	public connectedComponents(connectivity: 4 | 8): Component[];
+	connectedComponents(connectivity: 4 | 8): Component[];
 	/**
 	 * The Distance Function works on 1bpp images. It labels each pixel with the largest distance between this and any other pixel in its connected component. The connectivity is either 4 or 8.
 	 */
-	public distanceFunction(connectivity: 4 | 8): Image;
+	distanceFunction(connectivity: 4 | 8): Image;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Fills a specified rectangle with white.
 	 */
-	public clearBox(box: Box): this;
-	public clearBox(x: number, y: number, width: number, height: number): this;
+	clearBox(box: Box): this;
+	clearBox(x: number, y: number, width: number, height: number): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a filled rectangle to this image with the specified value. Works for 8bpp and 1bpp images.
 	 */
-	public fillBox(box: Box, value: number): this;
-	public fillBox(x: number, y: number, width: number, height: number, value: number): this;
+	fillBox(box: Box, value: number): this;
+	fillBox(x: number, y: number, width: number, height: number, value: number): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a filled rectangle to this image in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
 	 */
-	public fillBox(box: Box, r: number, g: number, b: number, fraction?: number): this;
-	public fillBox(x: number, y: number, width: number, height: number, r: number, g: number, b: number, fraction?: number): this;
+	fillBox(box: Box, r: number, g: number, b: number, fraction?: number): this;
+	fillBox(x: number, y: number, width: number, height: number, r: number, g: number, b: number, fraction?: number): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a rectangle to this image with the specified border. The possible pixel manipulating operations are set, clear and flip.
 	 */
-	public drawBox(box: Box, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
-	public drawBox(x: number, y: number, width: number, height: number, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
+	drawBox(box: Box, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
+	drawBox(x: number, y: number, width: number, height: number, borderWidth: number, operation: 'set' | 'clear' | 'flip'): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a rectangle to this image with the specified border in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
 	 */
-	public drawBox(box: Box, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
-	public drawBox(x: number, y: number, width: number, height: number, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
+	drawBox(box: Box, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
+	drawBox(x: number, y: number, width: number, height: number, borderWidth: number, red: number, green: number, blue: number, frac?: number): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a line between p1 and p2 to this image with the specified line width. The possible pixel manipulating operations are set, clear and flip.
 	 */
-	public drawLine(p1: Point, p2: Point, width: number, operation: 'set' | 'clear' | 'flip'): this;
+	drawLine(p1: Point, p2: Point, width: number, operation: 'set' | 'clear' | 'flip'): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws a line between p1 and p2 to this image with the specified line width in the specified color with an optional blending parameter (0.0: transparent; 1.0: no transparency).
 	 */
-	public drawLine(p1: Point, p2: Point, width: number, red: number, green: number, blue: number, frac?: number): this;
+	drawLine(p1: Point, p2: Point, width: number, red: number, green: number, blue: number, frac?: number): this;
 	/**
 	 * !!! Note: this function actually changes the image!
 	 * Draws an image to this image with the specified destination box.
 	 */
-	public drawImage(image: Image, box: Box): this;
-	public drawImage(image: Image, x: number, y: number, width: number, height: number): this;
+	drawImage(image: Image, box: Box): this;
+	drawImage(image: Image, x: number, y: number, width: number, height: number): this;
 	/**
 	 * Converts the Image in the specified format to a buffer.
-	 * Specifying raw returns the raw image data as buffer. For color images, the result contains three bytes per pixel in the order R, G, B; for grayscale and monochrome images, it contains one byte per pixel.
+	 * Specifying raw returns the raw image data as buffer.
+	 * For color images, the result contains three bytes per pixel in the order R, G, B;
+	 * for grayscale and monochrome images, it contains one byte per pixel.
 	 * Specifying png returns a PNG encoded image as buffer.
 	 * Specifying jpg returns a JPG encoded image as buffer.
 	 */
-	public toBuffer(format?: 'raw' | 'png' | 'jpg'): Buffer;
+	toBuffer(format?: 'raw' | 'png' | 'jpg'): Buffer;
 }
 
 export interface Rect {
-	// todo
+	x: number;
+	y: number;
+	width: number;
+	height: number;
 }
 
 export interface Region {
 	box: Box;
-	text: string,
+	text: string;
 	confidence: number;
 }
 
@@ -303,7 +329,7 @@ export interface Textline {
 export type Word = Region;
 
 export interface Choice {
-	text: string,
+	text: string;
 	confidence: number;
 }
 
@@ -314,7 +340,9 @@ export interface Symbol extends Region {
 export type Text = Choice;
 
 /**
- * A Tesseract object represents an optical character recognition engine, that reads text using Tesseract from an image. Tesseract supports many langauges and fonts (see Tesseract/Downloads). New language files have to be installed in node-dv/tessdata.
+ * A Tesseract object represents an optical character recognition engine, that reads text using Tesseract from an image.
+ * Tesseract supports many langauges and fonts (see Tesseract/Downloads).
+ * New language files have to be installed in node-dv/tessdata.
  */
 export class Tesseract {
 	/**
@@ -325,7 +353,7 @@ export class Tesseract {
 	/**
 	 * Creates a Tesseract engine with the specified language.
 	 */
-	constructor(datapath: string, lang: string);
+	constructor(lang: string, image: Image);
 	/**
 	 * Creates a Tesseract engine with the specified language and image.
 	 */
@@ -334,54 +362,57 @@ export class Tesseract {
 	/**
 	 * Accessor for the input image.
 	 */
-	public image: Image;
+	image: Image;
 	/**
 	 * Accessor for the rectangle that specifies a "visible" area on the image.
 	 */
-	public rectangle: Rect;
+	rectangle: Rect;
 	/**
-	 * Accessor for the page segmentation mode. Valid values are: osd_only, auto_osd, auto_only, auto, single_column, single_block_vert_text, single_block, single_line, single_word, circle_word, single_char, sparse_text, sparse_text_osd.
+	 * Accessor for the page segmentation mode.
 	 */
-	public pageSegMode: 'osd_only' | 'auto_osd' | 'auto_only' | 'auto' | 'single_column' | 'single_block_vert_text' | 'single_block' | 'single_line' | 'single_word' | 'circle_word' | 'single_char' | 'sparse_text' | 'sparse_text_osd'
+	pageSegMode: 'osd_only' | 'auto_osd' | 'auto_only' | 'auto'
+		| 'single_column' | 'single_block_vert_text' | 'single_block'
+		| 'single_line' | 'single_word' | 'circle_word' | 'single_char'
+		| 'sparse_text' | 'sparse_text_osd';
 	[key: string]: unknown;
 
 	/**
 	 * Clears the tesseract image and its last results.
 	 */
-	public clear(): void;
+	clear(): void;
 	/**
 	 * Clears all adaptive classifiers (use this when results vary during scanning).
 	 */
-	public clearAdaptiveClassifier(): void;
+	clearAdaptiveClassifier(): void;
 	/**
 	 * Returns the binarized image Tesseract uses for its recognition.
 	 */
-	public thresholdImage(): Image;
+	thresholdImage(): Image;
 	/**
 	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
 	 */
-	public findRegions(recognize: boolean): Region[];
+	findRegions(recognize: boolean): Region[];
 	/**
 	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
 	 */
-	public findParagraphs(recognize: boolean): Paragaph[];
+	findParagraphs(recognize: boolean): Paragaph[];
 	/**
 	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
 	 */
-	public findTextLines(recognize: boolean): Textline[];
+	findTextLines(recognize: boolean): Textline[];
 	/**
 	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
 	 */
-	public findWords(recognize: boolean): Word[];
+	findWords(recognize: boolean): Word[];
 	/**
 	 * Returns an array of objects, You can omit text information by setting recognize = false, which is considerably faster.
 	 */
-	public findSymbols(recognize: boolean): Symbol[];
+	findSymbols(recognize: boolean): symbol[];
 	/**
 	 * Returns text in the specified format. Valid formats are: plain, unlv.
 	 */
-	public findText(format: 'plain' | 'unlv', withConfidence?: boolean): string;
-	public findText(format: 'hocr' | 'box', pageNumber: number): string;
+	findText(format: 'plain' | 'unlv', withConfidence?: boolean): string;
+	findText(format: 'hocr' | 'box', pageNumber: number): string;
 }
 
 export interface Barcodeformat {
@@ -414,33 +445,33 @@ export class ZXing {
 	/**
 	 * Accessor for the input image this barcode reader operates on.
 	 */
-	public image: Image;
+	image: Image;
 	/**
 	 * List of barcodes the reader tries to find. It's specified as an object and missing properties account as false
 	 */
-	public formats: Barcodeformat;
+	formats: Barcodeformat;
 	/**
 	 * If try harder is enabled, the barcode reader spends more time trying to find a barcode (optimize for accuracy, not speed).
 	 */
-	public tryHarder: boolean;
+	tryHarder: boolean;
 	/**
 	 * Returns the first barcode found as an object with the following format:
 	 */
-	public findCode(): BarCode;
+	findCode(): BarCode;
 	/**
 	 * enotes the barcodes type.
 	 */
-	public readonly type: 'None' | 'QR_CODE' | 'DATA_MATRIX' | 'PDF_417' | 'UPC_E' | 'UPC_A' | 'EAN_8' | 'EAN_13' | 'CODE_128' | 'CODE_39' | 'ITF' | 'AZTEC';
+	readonly type: 'None' | 'QR_CODE' | 'DATA_MATRIX' | 'PDF_417' | 'UPC_E' | 'UPC_A' | 'EAN_8' | 'EAN_13' | 'CODE_128' | 'CODE_39' | 'ITF' | 'AZTEC';
 	/**
 	 * denotes the stringified data read from the barcode.
 	 */
-	public readonly data: string;
+	readonly data: string;
 	/**
 	 * denotes the decoded binary data of the barcode before conversion into another character encoding.
 	 */
-	public readonly buffer: Buffer;
+	readonly buffer: Buffer;
 	/**
 	 * denotes the points in pixels which were used by the barcode reader to detect the barcode.
 	 */
-	public readonly points: Point[];
+	readonly points: Point[];
 }
diff --git a/types/dv/tslint.json b/types/dv/tslint.json
index 3db14f85ea..8765f2428f 100644
--- a/types/dv/tslint.json
+++ b/types/dv/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"unified-signatures": false
+	}
+}
\ No newline at end of file

From 5887c8669381c6c8d8ead32c72d23d147a1b8a10 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:19:18 +1100
Subject: [PATCH 355/924] Updated function default export to function

---
 types/mumath/clamp.d.ts      |  2 +-
 types/mumath/closest.d.ts    |  2 +-
 types/mumath/index.d.ts      | 68 +++++++-----------------------------
 types/mumath/isMultiple.d.ts |  2 +-
 types/mumath/len.d.ts        |  2 +-
 types/mumath/lerp.d.ts       |  2 +-
 types/mumath/mod.d.ts        |  2 +-
 types/mumath/mumath-tests.ts | 24 ++++++-------
 types/mumath/order.d.ts      |  2 +-
 types/mumath/precision.d.ts  |  2 +-
 types/mumath/round.d.ts      |  2 +-
 types/mumath/scale.d.ts      |  2 +-
 types/mumath/within.d.ts     |  2 +-
 13 files changed, 35 insertions(+), 79 deletions(-)

diff --git a/types/mumath/clamp.d.ts b/types/mumath/clamp.d.ts
index fe08302e37..9d674a9620 100644
--- a/types/mumath/clamp.d.ts
+++ b/types/mumath/clamp.d.ts
@@ -3,4 +3,4 @@
  */
 declare function clamp(value: number, left: number, right: number): number;
 
-export default clamp;
+export = clamp;
diff --git a/types/mumath/closest.d.ts b/types/mumath/closest.d.ts
index f2db4ea1ec..762bcb6548 100644
--- a/types/mumath/closest.d.ts
+++ b/types/mumath/closest.d.ts
@@ -3,4 +3,4 @@
  */
 declare function closest(value: number, list: number[]): number;
 
-export default closest;
+export = closest;
diff --git a/types/mumath/index.d.ts b/types/mumath/index.d.ts
index 3dcfccf565..ee0f0ff6c6 100644
--- a/types/mumath/index.d.ts
+++ b/types/mumath/index.d.ts
@@ -3,60 +3,16 @@
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/**
- * Detects proper clamp min/max.
- */
-export function clamp(value: number, left: number, right: number): number;
+import clamp = require('./clamp');
+import closest = require('./closest');
+import isMultiple = require('./isMultiple');
+import len = require('./len');
+import lerp = require('./lerp');
+import mod = require('./mod');
+import order = require('./order');
+import precision = require('./precision');
+import round = require('./round');
+import scale = require('./scale');
+import within = require('./within');
 
-/**
- * Get closest value out of a set.
- */
-export function closest(value: number, list: number[]): number;
-
-/**
- * Check if one number is multiple of other
- * Same as a % b === 0, but with precision check.
- */
-export function isMultiple(a: number, b: number, eps?: number): boolean;
-
-/**
- * Return quadratic length of a vector.
- */
-export function len(a: number, b: number): number;
-
-/**
- * Return value interpolated between x and y.
- */
-export function lerp(x: number, y: number, ratio: number): number;
-
-/**
- * An enhanced mod-loop, like fmod — loops value within a frame.
- */
-export function mod(value: number, max: number, min?: number): number;
-
-/**
- * Get order of magnitude for a number.
- */
-export function order(value: number): number;
-
-/**
- * Get precision from float:
- */
-export function precision(value: number): number;
-
-/**
- * Rounds value to optional step.
- */
-export function round(value: number, step?: number): number;
-
-/**
- * Get first scale out of a list of basic scales, aligned to the power. E. g.
- * step(.37, [1, 2, 5]) → .5 step(456, [1, 2]) → 1000
- * Similar to closest, but takes all possible powers of scales.
- */
-export function scale(value: number, list: number[]): number;
-
-/**
- * Whether element is between left & right, including.
- */
-export function within(value: number, left: number, right: number): number;
+export { clamp, closest, isMultiple, len, lerp, mod, order, precision, round, scale, within };
diff --git a/types/mumath/isMultiple.d.ts b/types/mumath/isMultiple.d.ts
index 255d0ece72..31c7a09b08 100644
--- a/types/mumath/isMultiple.d.ts
+++ b/types/mumath/isMultiple.d.ts
@@ -4,4 +4,4 @@
  */
 declare function isMultiple(a: number, b: number, eps?: number): boolean;
 
-export default isMultiple;
+export = isMultiple;
diff --git a/types/mumath/len.d.ts b/types/mumath/len.d.ts
index 2392cff32f..b2fae8a8e5 100644
--- a/types/mumath/len.d.ts
+++ b/types/mumath/len.d.ts
@@ -3,4 +3,4 @@
  */
 declare function len(a: number, b: number): number;
 
-export default len;
+export = len;
diff --git a/types/mumath/lerp.d.ts b/types/mumath/lerp.d.ts
index 3ab8639c0c..5e09370be2 100644
--- a/types/mumath/lerp.d.ts
+++ b/types/mumath/lerp.d.ts
@@ -3,4 +3,4 @@
  */
 declare function lerp(x: number, y: number, ratio: number): number;
 
-export default lerp;
+export = lerp;
diff --git a/types/mumath/mod.d.ts b/types/mumath/mod.d.ts
index 6517271e45..ac1784fe06 100644
--- a/types/mumath/mod.d.ts
+++ b/types/mumath/mod.d.ts
@@ -3,4 +3,4 @@
  */
 declare function mod(value: number, max: number, min?: number): number;
 
-export default mod;
+export = mod;
diff --git a/types/mumath/mumath-tests.ts b/types/mumath/mumath-tests.ts
index 5a8fd6476f..a5b339b2fe 100644
--- a/types/mumath/mumath-tests.ts
+++ b/types/mumath/mumath-tests.ts
@@ -1,16 +1,16 @@
-import * as mumath from "mumath";
+import mumath = require("mumath");
 
-import mumathClamp from "mumath/clamp";
-import mumathClosest from "mumath/closest";
-import mumathIsMultiple from "mumath/isMultiple";
-import mumathLen from "mumath/len";
-import mumathLerp from "mumath/lerp";
-import mumathMod from "mumath/mod";
-import mumathOrder from "mumath/order";
-import mumathPrecision from "mumath/precision";
-import mumathRound from "mumath/round";
-import mumathScale from "mumath/scale";
-import mumathWithin from "mumath/within";
+import mumathClamp = require("mumath/clamp");
+import mumathClosest = require("mumath/closest");
+import mumathIsMultiple = require("mumath/isMultiple");
+import mumathLen = require("mumath/len");
+import mumathLerp = require("mumath/lerp");
+import mumathMod = require("mumath/mod");
+import mumathOrder = require("mumath/order");
+import mumathPrecision = require("mumath/precision");
+import mumathRound = require("mumath/round");
+import mumathScale = require("mumath/scale");
+import mumathWithin = require("mumath/within");
 
 mumath.clamp(1, 2, 3);
 mumathClamp(1, 2, 3);
diff --git a/types/mumath/order.d.ts b/types/mumath/order.d.ts
index 6da624f1d3..8ce4c396fa 100644
--- a/types/mumath/order.d.ts
+++ b/types/mumath/order.d.ts
@@ -3,4 +3,4 @@
  */
 declare function order(value: number): number;
 
-export default order;
+export = order;
diff --git a/types/mumath/precision.d.ts b/types/mumath/precision.d.ts
index ec94b3a4ed..1b1a7290cc 100644
--- a/types/mumath/precision.d.ts
+++ b/types/mumath/precision.d.ts
@@ -3,4 +3,4 @@
  */
 declare function precision(value: number): number;
 
-export default precision;
+export = precision;
diff --git a/types/mumath/round.d.ts b/types/mumath/round.d.ts
index 09549f14f1..8966dc6068 100644
--- a/types/mumath/round.d.ts
+++ b/types/mumath/round.d.ts
@@ -3,4 +3,4 @@
  */
 declare function round(value: number, step?: number): number;
 
-export default round;
+export = round;
diff --git a/types/mumath/scale.d.ts b/types/mumath/scale.d.ts
index 2d5487ea10..2cb97bcb4f 100644
--- a/types/mumath/scale.d.ts
+++ b/types/mumath/scale.d.ts
@@ -5,4 +5,4 @@
  */
 declare function scale(value: number, list: number[]): number;
 
-export default scale;
+export = scale;
diff --git a/types/mumath/within.d.ts b/types/mumath/within.d.ts
index 47558c73d0..f1d7e56cbd 100644
--- a/types/mumath/within.d.ts
+++ b/types/mumath/within.d.ts
@@ -3,4 +3,4 @@
  */
 declare function within(value: number, left: number, right: number): number;
 
-export default within;
+export = within;

From ef3a842cf3e62f9a97e886c250a81a89022b0c64 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 5 Mar 2019 11:49:55 +0800
Subject: [PATCH 356/924] change tslint rules for types/html5plus

---
 types/html5plus/html5plus-tests.ts |   4 +-
 types/html5plus/index.d.ts         | 366 ++++++++++++++---------------
 types/html5plus/tslint.json        |  76 +-----
 3 files changed, 185 insertions(+), 261 deletions(-)

diff --git a/types/html5plus/html5plus-tests.ts b/types/html5plus/html5plus-tests.ts
index 56dd640498..371e463473 100644
--- a/types/html5plus/html5plus-tests.ts
+++ b/types/html5plus/html5plus-tests.ts
@@ -1,2 +1,2 @@
-const webview = plus.webview.currentWebview()
-const style = webview.getStyle()
\ No newline at end of file
+const webview = plus.webview.currentWebview();
+const style = webview.getStyle();
diff --git a/types/html5plus/index.d.ts b/types/html5plus/index.d.ts
index 841a64f6d4..808d31a9e5 100644
--- a/types/html5plus/index.d.ts
+++ b/types/html5plus/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for html5plus 1.0.0
+// Type definitions for non-npm package html5plus 1.0
 // Project: https://www.html5plus.org/doc/
 // Definitions by: Dcloud <https://github.com/dcloudio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -291,7 +291,7 @@ interface PlusAccelerometer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
      */
-    getCurrentAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void): void;
+    getCurrentAcceleration(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 监听设备加速度变化信息
      * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
@@ -300,7 +300,7 @@ interface PlusAccelerometer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
      */
-    watchAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void, options?: PlusAccelerometerAccelerometerOption): number;
+    watchAcceleration(successCB?: () => void, errorCB?: () => void, options?: PlusAccelerometerAccelerometerOption): number;
     /**
      * 关闭监听设备加速度信息
      * 关闭监听设备加速度信息，应用关闭调用watchAcceleration方法的开启的监听操作。
@@ -558,7 +558,7 @@ interface PlusAudioAudioRecorder {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
      */
-    record(option?: PlusAudioRecordOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    record(option?: PlusAudioRecordOptions, successCB?: () => void, errorCB?: () => void): void;
     /**
      * 结束录音操作
      * 结束录音操作，通知设备完成录音操作。录音完成后将调用record方法中传入的successCB回调返回录音文件。
@@ -580,7 +580,7 @@ interface PlusAudioAudioPlayer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
      */
-    play(successCB?: Function, errorCB?: (result: any) => void): void;
+    play(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 暂停播放音频
      * 需先调用createPlayer方法创建音频播放对象，并开始播放。音频播放对象在播放状态才能暂停，在其它状态调用此方法无任何作用。
@@ -716,14 +716,14 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    closeBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    closeBluetoothAdapter(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 获取本机蓝牙适配器状态
      * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBluetoothAdapterState(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getBluetoothAdapterState(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 获取已搜索到的蓝牙设备
      * 包括已经和本机处于连接状态的设备。
@@ -731,35 +731,35 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBluetoothDevices(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getBluetoothDevices(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 根据uuid获取处于已连接的设备
      * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getConnectedBluetoothDevices(services?: any [], success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getConnectedBluetoothDevices(services?: any [], success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 监听蓝牙适配器状态变化事件
      * 蓝牙适配器状态发生变化时触发回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBluetoothAdapterStateChange(changeCB?: (result: any) => void): void;
+    onBluetoothAdapterStateChange(changeCB?: () => void): void;
     /**
      * 监听搜索到新设备的事件
      * 搜索到新设备时触发回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBluetoothDeviceFound(callback?: (result: any) => void): void;
+    onBluetoothDeviceFound(callback?: () => void): void;
     /**
      * 初始化蓝牙模块
      * 初始化成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    openBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    openBluetoothAdapter(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 开始搜索附近的蓝牙设备
      * 此操作比较耗费系统资源，请在搜索并连接到设备后调用stopBluetoothDevicesDiscovery方法停止搜索。
@@ -767,7 +767,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 停止搜寻附近的蓝牙外围设备
      * 若已经找到需要的蓝牙设备并不需要继续搜索时，应该调用该接口停止蓝牙搜索。
@@ -775,32 +775,32 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    stopBluetoothDevicesDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    stopBluetoothDevicesDiscovery(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 断开与低功耗蓝牙设备的连接
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    closeBLEConnection(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    closeBLEConnection(deviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 连接低功耗蓝牙设备
      * 若之前已有搜索过某个蓝牙设备，并成功建立连接，可直接传入之前搜索获取的deviceId尝试连接该设备，无需进行搜索操作。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    createBLEConnection(deviceId?: string, timeout?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    createBLEConnection(deviceId?: string, timeout?: number, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 获取蓝牙设备指定服务中所有特征值(characteristic)
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 获取蓝牙设备的所有服务(service)
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBLEDeviceServices(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getBLEDeviceServices(deviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
      * 蓝牙设备服务的特征值必须支持notify或indicate才可以成功调用。
@@ -808,20 +808,20 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 监听低功耗蓝牙设备的特征值变化事件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBLECharacteristicValueChange(callback?: (result: any) => void): void;
+    onBLECharacteristicValueChange(callback?: () => void): void;
     /**
      * 监听低功耗蓝牙设备连接状态变化事件
      * 包括开发者主动连接或断开连接，设备丢失，连接异常断开等。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBLEConnectionStateChange(callback?: (result: any) => void): void;
+    onBLEConnectionStateChange(callback?: () => void): void;
     /**
      * 读取低功耗蓝牙设备指定特征值的二进制数据值
      * 指定的特征值需支持read操作才可以成功调用。
@@ -829,7 +829,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 向低功耗蓝牙设备指定特征值写入二进制数据
      * 指定的特征值需支持write操作才可以成功调用。
@@ -837,7 +837,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: () => void, fail?: () => void, complete?: () => void): void;
 }
 
 /**
@@ -1042,7 +1042,7 @@ interface PlusCameraCamera {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
      */
-    captureImage(successCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusCameraCameraOptions): void;
+    captureImage(successCB?: () => void, errorCB?: () => void, options?: PlusCameraCameraOptions): void;
     /**
      * 调用摄像头进行摄像操作
      * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
@@ -1051,7 +1051,7 @@ interface PlusCameraCamera {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
      */
-    startVideoCapture(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusCameraCameraOptions): void;
+    startVideoCapture(successCB?: () => void, errorCB?: () => void, option?: PlusCameraCameraOptions): void;
     /**
      * 结束摄像操作
      * 开始调用摄像头进行摄像操作后，可在后台结束摄像操作，与用户在界面结束操作效果一致。
@@ -1248,7 +1248,7 @@ interface PlusContacts {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    getAddressBook(type?: number, successCB?: (result: PlusContactsAddressBook) => void, errorCB?: (result: any) => void): void;
+    getAddressBook(type?: number, successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -1271,7 +1271,7 @@ interface PlusContactsAddressBook {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    find(contactFields?: String[], successCB?: (result: PlusContactsContact) => void, errorCB?: (result: any) => void, findOptions?: PlusContactsContactFindOption): void;
+    find(contactFields?: string [], successCB?: () => void, errorCB?: () => void, findOptions?: PlusContactsContactFindOption): void;
 }
 
 /**
@@ -1390,14 +1390,14 @@ interface PlusContactsContact {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    remove(successCB?: Function, errorCB?: (result: any) => void): void;
+    remove(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 保存联系人
      * 将联系人数据保存到通讯录中，操作成功将通过successCB回调函数返回保存结果，操作失败将通过通过errorCB回调函数返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    save(successCB?: Function, errorCB?: (result: any) => void): void;
+    save(successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -1960,14 +1960,14 @@ interface PlusDownloader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: (result0: PlusDownloaderDownload, result1: number) => void): PlusDownloaderDownload;
+    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: () => void): PlusDownloaderDownload;
     /**
      * 枚举下载任务
      * 枚举指定状态的下载任务列表，通过enumCB回调函数返回结果。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    enumerate(enumCB?: (result: any []) => void, state?: PlusDownloaderDownloadState): void;
+    enumerate(enumCB?: () => void, state?: PlusDownloaderDownloadState): void;
     /**
      * 清除下载任务
      * 清除指定状态的下载任务。
@@ -2055,7 +2055,7 @@ interface PlusDownloaderDownload {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    addEventListener(type?: string, listener?: (result0: PlusDownloaderDownload, result1: number) => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
     /**
      * 获取下载请求HTTP响应头部信息
      * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者下载请求未完成则为空字符串。
@@ -2241,7 +2241,7 @@ interface PlusFingerprint {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
      */
-    authenticate(successCB?: Function, errorCB?: (result: PlusFingerprintFingerprintError) => void, options?: PlusFingerprintAuthenticateOptions): void;
+    authenticate(successCB?: () => void, errorCB?: () => void, options?: PlusFingerprintAuthenticateOptions): void;
     /**
      * 取消指纹识别认证
      * 取消当前正在处理的指纹识别认证操作。
@@ -2377,7 +2377,7 @@ interface PlusGallery {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
      */
-    pick(succesCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusGalleryGalleryOptions): void;
+    pick(succesCB?: () => void, errorCB?: () => void, options?: PlusGalleryGalleryOptions): void;
     /**
      * 保存文件到系统相册中
      * 保存文件到系统相册中。
@@ -2386,7 +2386,7 @@ interface PlusGallery {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
      */
-    save(path  ?: string, succesCB?: (result: PlusGalleryGallerySaveEvent) => void, errorCB?: (result: any) => void): void;
+    save(path  ?: string, succesCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -2441,7 +2441,7 @@ interface PlusGalleryGalleryOptions {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
      */
-    onmaxed?: Function;
+    onmaxed?: () => void;
     /**
      * 相册选择界面弹出指示区域
      * 对于大屏幕设备如iPad，相册选择界面为弹出窗口，此时可通过此参数设置弹出窗口位置。
@@ -2586,7 +2586,7 @@ interface PlusGeolocation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
      */
-    getCurrentPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, options?: PlusGeolocationPositionOptions): void;
+    getCurrentPosition(successCB?: () => void, errorCB?: () => void, options?: PlusGeolocationPositionOptions): void;
     /**
      * 监听设备位置变化信息
      * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取。
@@ -2595,7 +2595,7 @@ interface PlusGeolocation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
      */
-    watchPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, option?: PlusGeolocationPositionOptions): number;
+    watchPosition(successCB?: () => void, errorCB?: () => void, option?: PlusGeolocationPositionOptions): number;
     /**
      * 关闭监听设备位置信息
      * 
@@ -2913,35 +2913,35 @@ interface PlusIbeacon {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 停止搜索附近的iBeacon设备
      * 取消成功后触发successCB回调，失败触发errorCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    stopBeaconDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    stopBeaconDiscovery(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 获取已搜索到的iBeacon设备
      * 获取成功后触发successCB回调，失败触发errorCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    getBeacons(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    getBeacons(success?: () => void, fail?: () => void, complete?: () => void): void;
     /**
      * 监听iBeacon设备更新
      * iBeacon设备更新后触发updateCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    onBeaconUpdate(updateCB?: (result: any) => void): void;
+    onBeaconUpdate(updateCB?: () => void): void;
     /**
      * 监听iBeacon服务状态变化
      * iBeacon服务状态变化时触发changeCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    onBeaconServiceChange(changeCB?: (result: any) => void): void;
+    onBeaconServiceChange(changeCB?: () => void): void;
 }
 
 /**
@@ -3129,7 +3129,7 @@ interface PlusIo {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    requestFileSystem(type?: number, succesCB?: (result: PlusIoFileSystem) => void, errorCB?: (result: any) => void): void;
+    requestFileSystem(type?: number, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 通过URL参数获取目录对象或文件对象
      * 快速获取指定的目录或文件操作对象，如通过URL值“_www/test.html”可直接获取文件操作对象。
@@ -3138,7 +3138,7 @@ interface PlusIo {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    resolveLocalFileSystemURL(url ?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    resolveLocalFileSystemURL(url ?: string, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 将本地URL路径转换成平台绝对路径
      * 绝对路径符合各平台文件路径格式，通常用于Native.JS调用系统原生文件操作API，也可以在前面添加“file://”后在html页面中直接使用。
@@ -3199,7 +3199,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void, recursive?: boolean): void;
+    getMetadata(succesCB?: () => void, errorCB?: () => void, recursive?: boolean): void;
     /**
      * 移动目录
      * 以下情况移动目录将会导致失败：
@@ -3211,7 +3211,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 拷贝目录
      * 以下情况拷贝目录将会导致失败：
@@ -3223,7 +3223,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取目录路径转换为URL地址
      * 
@@ -3251,14 +3251,14 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    remove(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取目录所属的父目录
      * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    getParent(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 创建目录读取对象
      * 创建一个目录读取对象，用户读取目下的文件及子目录。
@@ -3273,7 +3273,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 创建或打开文件
      * 创建或打开当前目录下指定的文件。
@@ -3281,7 +3281,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getFile(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    getFile(path?: string, flag?: PlusIoFlags, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 递归删除目录
      * 删除目录将会删除其下的所有文件及子目录
@@ -3290,7 +3290,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    removeRecursively(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    removeRecursively(succesCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -3306,7 +3306,7 @@ interface PlusIoDirectoryReader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    readEntries(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    readEntries(succesCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -3398,7 +3398,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void): void;
+    getMetadata(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 移动文件
      * 以下情况移动目录将会导致失败：
@@ -3408,7 +3408,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 拷贝文件
      * 以下情况拷贝文件将会导致失败：
@@ -3418,7 +3418,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取文件路径转换为URL地址
      * 
@@ -3444,28 +3444,28 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    remove(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取文件所属的父目录
      * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    getParent(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取文件关联的写文件操作对象FileWriter
      * 获取写文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    createWriter(succesCB?: (result: PlusIoFileWriter) => void, errorCB?: (result: any) => void): void;
+    createWriter(succesCB?: () => void, errorCB?: () => void): void;
     /**
      * 获取文件数据对象
      * 获取文件数据对象成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    file(succesCB?: (result: PlusIoFile) => void, errorCB?: (result: any) => void): void;
+    file(succesCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -3518,39 +3518,39 @@ interface PlusIoFileReader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onloadstart?: (result: PlusIoFileEvent) => void;
+    onloadstart?: () => void;
     /**
      * 读取文件过程中的回调函数
      * 用于获取文件读取进度。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onprogress?: (result: PlusIoFileEvent) => void;
+    onprogress?: () => void;
     /**
      * 读取文件成功完成的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onload?: (result: PlusIoFileEvent) => void;
+    onload?: () => void;
     /**
      * 取消读取文件时的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onabort?: (result: PlusIoFileEvent) => void;
+    onabort?: () => void;
     /**
      * 文件读取操作失败时调用的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onerror?: (result: PlusIoFileEvent) => void;
+    onerror?: () => void;
     /**
      * 文件读取操作完成时的回调函数
      * 不管成功或失败都会触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onloadend?: (result: PlusIoFileEvent) => void;
+    onloadend?: () => void;
     /**
      * 终止文件读取操作
      * 读取文件操作开始后，可通过此方法取消读取文件。
@@ -3632,39 +3632,39 @@ interface PlusIoFileWriter {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwritestart?: (result: PlusIoFileEvent) => void;
+    onwritestart?: () => void;
     /**
      * 写入文件过程中的回调函数
      * 用于获取文件读取进度。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onprogress?: (result: PlusIoFileEvent) => void;
+    onprogress?: () => void;
     /**
      * 写入文件成功完成的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwrite?: (result: PlusIoFileEvent) => void;
+    onwrite?: () => void;
     /**
      * 取消写入文件时的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onabort?: (result: PlusIoFileEvent) => void;
+    onabort?: () => void;
     /**
      * 文件写入操作失败时调用的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onerror?: (result: PlusIoFileEvent) => void;
+    onerror?: () => void;
     /**
      * 文件写入操作完成时的回调函数
      * 不管成功或失败都会触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwriteend?: (result: PlusIoFileEvent) => void;
+    onwriteend?: () => void;
     /**
      * 终止文件写入操作
      * 写入文件数据操作开始后，可通过此方法取消写入文件数据操作。
@@ -3870,9 +3870,7 @@ interface PlusIoRelativeURL {
  * 
  * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
  */
-interface PlusIoLocalURL {
-}
-
+type PlusIoLocalURL = any;
 /**
  * 网络路径URL
  * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
@@ -3880,8 +3878,7 @@ interface PlusIoLocalURL {
  * 
  * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
  */
-interface PlusIoRemoteURL {
-}
+type PlusIoRemoteURL = any;
 
 /**
  * Native.js for iOS封装一条通过JS语法直接调用Native Objective-C接口通道，通过plus.ios可调用几乎所有的系统API。
@@ -3954,8 +3951,7 @@ interface PlusIos {
  * 
  * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
  */
-interface PlusIosClassObject {
-}
+type PlusIosClassObject = any;
 
 /**
  * Objective-C实例对象
@@ -4006,7 +4002,7 @@ interface PlusKey {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
      */
-    addEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void, capture?: boolean): void;
+    addEventListener(event?: PlusKeyKeyType, listener?: () => void, capture?: boolean): void;
     /**
      * 隐藏软键盘
      * 隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
@@ -4035,7 +4031,7 @@ interface PlusKey {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
      */
-    removeEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void): void;
+    removeEventListener(event?: PlusKeyKeyType, listener?: () => void): void;
 }
 
 /**
@@ -4180,7 +4176,7 @@ interface PlusMessaging {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
      */
-    sendMessage(msg?: PlusMessagingMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+    sendMessage(msg?: PlusMessagingMessage, successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -4536,7 +4532,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    load(path?: string, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    load(path?: string, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 加载Base64编码格式图片到Bitmap对象
      * 从Base64编码格式图片数据中加载图片，此操作将覆盖之前的图片内容，
@@ -4544,7 +4540,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    loadBase64Data(data?: string, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    loadBase64Data(data?: string, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 回收Bitmap图片内存
      * 释放Bitmap图片占用的内存资源，但不销毁图片对象，依然可以继续使用图片对象。
@@ -4559,7 +4555,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 获取图片的Base64编码数据
      * 读取图片的数据内容，并转换为Base64编码格式字符串。
@@ -4831,21 +4827,21 @@ interface PlusNativeObjInputStyles {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onComplete?: (result: any) => void;
+    onComplete?: () => void;
     /**
      * 输入框获取焦点事件
      * 当编辑框获取焦点时触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onFocus?: (result: any) => void;
+    onFocus?: () => void;
     /**
      * 输入框失去焦点事件
      * 当编辑框失去焦点时触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onBlur?: (result: any) => void;
+    onBlur?: () => void;
 }
 
 /**
@@ -4984,7 +4980,7 @@ interface PlusNativeObjRichTextStyles {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onClick?: (result: any) => void;
+    onClick?: () => void;
 }
 
 /**
@@ -5216,7 +5212,7 @@ interface PlusNativeObjView {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    startAnimation(options?: PlusNativeObjAnimationOptions, view?: PlusNativeObjAnimationViewStyles, otherview?: PlusNativeObjAnimationViewStyles, callback?: Function): void;
+    startAnimation(options?: PlusNativeObjAnimationOptions, view?: PlusNativeObjAnimationViewStyles, otherview?: PlusNativeObjAnimationViewStyles, callback?: () => void): void;
     /**
      * 静态方法，关闭原生动画窗口
      * 通过plus.nativeObj.View.startAnimation方法开始原生动画后，不会自动关闭原生动画窗口对象，需要调用此方法关闭原生动画。
@@ -5241,14 +5237,14 @@ interface PlusNativeObjView {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    addEventListener(event?: PlusNativeObjViewEvents, listener?: (result: any) => void, capture?: boolean): void;
+    addEventListener(event?: PlusNativeObjViewEvents, listener?: () => void, capture?: boolean): void;
     /**
      * View控件内容动画
      * 动画后可能会导致View控件显示内容改变，可通过调用restore方法恢复。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    animate(options?: PlusNativeObjViewAnimationOptions, callback?: Function): void;
+    animate(options?: PlusNativeObjViewAnimationOptions, callback?: () => void): void;
     /**
      * 关闭View控件
      * 释放View控件资源，View对象不可再操作，如果View控件已经显示则自动隐藏。
@@ -5787,7 +5783,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: (result: any) => void): PlusNativeUINativeUIObj;
+    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: () => void): PlusNativeUINativeUIObj;
     /**
      * 弹出系统提示对话框
      * 创建并显示系统样式提示对话框，可设置提示对话框的标题、内容、按钮文字等。
@@ -5795,7 +5791,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    alert(message?: string, alertCB?: (result: any) => void, title?: string, buttonCapture?: string): void;
+    alert(message?: string, alertCB?: () => void, title?: string, buttonCapture?: string): void;
     /**
      * 弹出系统确认对话框
      * 创建并显示系统样式确认对话框，可设置确认对话框的标题、内容、按钮数目及其文字。
@@ -5803,7 +5799,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    confirm(message?: string, confirmCB?: (result: any) => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
+    confirm(message?: string, confirmCB?: () => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
     /**
      * 关闭系统等待对话框
      * 关闭已经显示的所有系统样式等待对话框，触发Waiting对象的onclose事件。
@@ -5839,7 +5835,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    pickDate(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickDateOption): void;
+    pickDate(successCB?: () => void, errorCB?: () => void, options?: PlusNativeUIPickDateOption): void;
     /**
      * 弹出系统时间选择对话框
      * 创建并弹出系统样式时间选择对话框，可进行时间的选择。
@@ -5847,7 +5843,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    pickTime(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickTimeOption): void;
+    pickTime(successCB?: () => void, errorCB?: () => void, options?: PlusNativeUIPickTimeOption): void;
     /**
      * 弹出系统输入对话框
      * 创建并显示系统样式输入对话框，可设置输入对话框的标题、内容、提示输入信息、按钮数目及其文字。
@@ -5855,7 +5851,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    prompt(message?: string, promptCB?: (result: any) => void, title?: string, tip?: string, buttons?: any []): void;
+    prompt(message?: string, promptCB?: () => void, title?: string, tip?: string, buttons?: any []): void;
     /**
      * 显示自动消失的提示消息
      * 创建并显示系统样式提示消息，弹出的提示消息为非阻塞模式，显示指定时间后自动消失。
@@ -6122,7 +6118,7 @@ interface PlusNativeUIWaitingObj {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    onclose?: Function;
+    onclose?: () => void;
     /**
      * 设置等待对话框上显示的文字内容
      * 
@@ -6453,13 +6449,13 @@ interface PlusNavigator {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
      */
-    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: () => void): void;
     /**
      * 查询是否存在应用快捷方式
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
      */
-    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: () => void): void;
     /**
      * 判断当前应用是否切换到后台
      * 在多应用运行环境（如流应用）中，启动一个新应用时，之前运行的应用将会自动切换到后台运行，此时plus.navigator.isBackground()返回状态只为true。
@@ -6767,14 +6763,14 @@ interface PlusOrientation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
      */
-    getCurrentOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    getCurrentOrientation(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 监听设备方向信息的变化
      * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。watchOrientation每隔固定时间就获取一次设备的方向信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备方向信息的时间间隔。方向信息获取失败则调用回调函数errorCB。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
      */
-    watchOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusOrientationOrientationOption): number;
+    watchOrientation(successCB?: () => void, errorCB?: () => void, option?: PlusOrientationOrientationOption): number;
     /**
      * 关闭监听设备方向信息
      * 
@@ -6860,14 +6856,14 @@ interface PlusProximity {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
      */
-    getCurrentProximity(successCB?: (result: number) => void, errorCB?: (result: any) => void): void;
+    getCurrentProximity(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 监听设备接近距离的变化
      * watchProximity将监听设备的接近距离信息变化事件，当接近距离发生变化时通过changeCB回调函数返回距离值。监听距离变化事件失败则通过errorCB回调函数返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
      */
-    watchProximity(changeCB?: (result: number) => void, errorCB?: (result: any) => void): number;
+    watchProximity(changeCB?: () => void, errorCB?: () => void): number;
     /**
      * 关闭监听设备接近距离变化
      * 
@@ -7048,7 +7044,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    getProperty(appid?: string, getPropertyCB?: (result: PlusRuntimeWidgetInfo) => void): void;
+    getProperty(appid?: string, getPropertyCB?: () => void): void;
     /**
      * 安装应用
      * 支持以下类型安装包：
@@ -7059,7 +7055,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: (result: PlusRuntimeWidgetInfo) => void, installErrorCB?: (result: any) => void): void;
+    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: () => void, installErrorCB?: () => void): void;
     /**
      * 退出客户端程序
      * 
@@ -7083,7 +7079,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    openURL(url?: string, errorCB?: (result: any) => void, identity?: string): void;
+    openURL(url?: string, errorCB?: () => void, identity?: string): void;
     /**
      * 使用内置Webview窗口打开URL
      * 
@@ -7095,7 +7091,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: (result: any) => void): void;
+    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: () => void): void;
     /**
      * 处理直达页面链接参数
      * 通过URL Scheme启动时，可以在?后面添加__direct_page参数自定义直达页面地址，
@@ -7111,7 +7107,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: (result: any) => void): void;
+    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: () => void): void;
     /**
      * 判断第三方程序是否已存在
      * 如果第三方程序已安装则返回true，未安装则返回false。
@@ -7274,7 +7270,7 @@ interface PlusRuntimeWidgetInfo {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    features?: String[];
+    features?: string [];
 }
 
 /**
@@ -7399,7 +7395,7 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    open(options?: PlusStreamStreamOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    open(options?: PlusStreamStreamOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 流应用激活统计
      * 提交统计数据到流应用服务器，表明业务系统激活成功。
@@ -7444,13 +7440,13 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 免流量绑定手机号
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 解除免流量绑定
      * 解除当前设备绑定的手机号，如果设备未绑定则不执行操作。
@@ -7463,7 +7459,7 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: () => void): void;
     /**
      * 免流量是否生效
      * 
@@ -7770,14 +7766,14 @@ interface PlusUploader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: (result0: PlusUploaderUpload, result1: number) => void): PlusUploaderUpload;
+    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: () => void): PlusUploaderUpload;
     /**
      * 枚举上传任务
      * 枚举指定状态的上传任务列表，通过enumCB回调函数返回结果。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    enumerate(enumCB?: (result: PlusUploader []) => void, state?: PlusUploaderUploadState): void;
+    enumerate(enumCB?: () => void, state?: PlusUploaderUploadState): void;
     /**
      * 清除上传任务
      * 清除指定状态的上传任务。
@@ -7906,7 +7902,7 @@ interface PlusUploaderUpload {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    addEventListener(type?: string, listener?: (result0: PlusUploaderUpload, result1: number) => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
     /**
      * 获取上传请求HTTP响应头部信息
      * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者上传请求未完成则为空字符串。
@@ -8125,7 +8121,7 @@ interface PlusVideoVideoPlayer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: (result: any) => void, capture?: boolean): void;
+    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: () => void, capture?: boolean): void;
     /**
      * 设置视频播放控件参数
      * 用于动态更新视频播放控件的配置参数。
@@ -8492,7 +8488,7 @@ interface PlusVideoLivePusher {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    addEventListener(event?: PlusVideoLivePusherEvents, listener?: (result: any) => void, capture?: boolean): void;
+    addEventListener(event?: PlusVideoLivePusherEvents, listener?: () => void, capture?: boolean): void;
     /**
      * 设置直播推流控件参数
      * 用于动态更新直播推流控件的配置参数。
@@ -8523,7 +8519,7 @@ interface PlusVideoLivePusher {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    start(successCB?: Function, errorCB?: Function): void;
+    start(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 停止推流
      * 如果未处于推流状态，则操作无效。
@@ -8556,7 +8552,7 @@ interface PlusVideoLivePusher {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    snapshot(successCB?: Function, errorCB?: Function): void;
+    snapshot(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 关闭直播推流控件
      * 关闭操作将释放控件所有资源，不再可用。
@@ -9043,7 +9039,7 @@ interface PlusWebview {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    open(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, aniShow?: string, duration?: number, showedCB?: Function): PlusWebviewWebviewObject;
+    open(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, aniShow?: string, duration?: number, showedCB?: () => void): PlusWebviewWebviewObject;
     /**
      * 预载网络页面
      * 预载网络页面会向服务器发起http/https请求获取html页面内容，
@@ -9068,7 +9064,7 @@ interface PlusWebview {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    show(id_wvobj?: string, aniShow?: string, duration?: number, showedCB?: Function, extras?: PlusWebviewWebviewExtraOptions): PlusWebviewWebviewObject;
+    show(id_wvobj?: string, aniShow?: string, duration?: number, showedCB?: () => void, extras?: PlusWebviewWebviewExtraOptions): PlusWebviewWebviewObject;
     /**
      * Webview窗口组合动画
      * 同步组合两个Webview窗口动画，动画完成后窗口的位置会发生变化，一次需要在动画属性参数中设置动画起始位置、结束位置等。
@@ -9076,7 +9072,7 @@ interface PlusWebview {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: (result: any) => void): void;
+    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: () => void): void;
     /**
      * 获取Webview默认是否开启硬件加速
      * 由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，	因此5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速。
@@ -9302,7 +9298,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    addEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void, capture?: boolean): void;
+    addEventListener(event?: PlusWebviewWebviewEvent, listener?: () => void, capture?: boolean): void;
     /**
      * 在Webview窗口中添加子窗口
      * 将另一个Webview窗口作为子窗口添加到当前Webview窗口中，添加后其所有权归父Webview窗口，当父窗口关闭时子窗口自动关闭。
@@ -9325,7 +9321,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    animate(options?: PlusWebviewWebviewContentAnimationOptions, callback?: Function): void;
+    animate(options?: PlusWebviewWebviewContentAnimationOptions, callback?: () => void): void;
     /**
      * 后退到上次加载的页面
      * Webview窗口历史记录操作，后退到窗口上次加载的HTML页面。
@@ -9348,14 +9344,14 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    canBack(queryCallback?: (result: any) => void): void;
+    canBack(queryCallback?: () => void): void;
     /**
      * 查询Webview窗口是否可前进
      * Webview窗口历史记录查询操作，获取Webview是否可前进到历史加载的页面，结果通过queryCallback回调方法返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    canForward(queryCallback?: (result: any) => void): void;
+    canForward(queryCallback?: () => void): void;
     /**
      * 检测Webview窗口是否渲染完成
      * 检测方式为判断的Webview窗口内容是否为白屏，如果非白屏则认为渲染完成，否则认为渲染未完成。
@@ -9363,7 +9359,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: Function, errorCallback?: (result: any) => void): void;
+    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 获取Webview窗口的所有子Webview窗口
      * 获取添加到Webview窗口中的所有子Webview窗口，如果没有子Webview窗口则返回空数组。
@@ -9392,14 +9388,14 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: (result: PlusWebviewWebviewDragEvent) => void): void;
+    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: () => void): void;
     /**
      * 截屏绘制
      * 将Webview窗口的可视区域截屏并绘制到Bitmap图片对象中。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    draw(bitmap?: PlusNativeObjBitmap, successCallback?: Function, errorCallback?: (result: any) => void, options?: PlusWebviewWebviewDrawOptions): void;
+    draw(bitmap?: PlusNativeObjBitmap, successCallback?: () => void, errorCallback?: () => void, options?: PlusWebviewWebviewDrawOptions): void;
     /**
      * 结束Webview窗口的下拉刷新
      * 关闭下拉刷新效果，恢复到开始下拉刷新之前的效果。
@@ -9518,7 +9514,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: (result: any) => void): void;
+    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: () => void): void;
     /**
      * 加载新HTML数据
      * 触发Webview窗口加载HTML页面数据，如果HTML数据无效将导致页面加载失败。
@@ -9571,7 +9567,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: (result: any) => void): void;
+    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: () => void): void;
     /**
      * 获取当前Webview窗口的父窗口
      * Webview窗口作为子窗口添加（Webview.append）到其它Webview窗口中时有效，这时其它Webview窗口为父窗口。
@@ -9616,7 +9612,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void): void;
+    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: () => void): void;
     /**
      * 从父窗口中移除
      * 从所属的父Webview窗口移除，如果没有父窗口，则无任何作用。
@@ -9698,7 +9694,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    setPullToRefresh(style?: PlusWebviewWebviewPullToRefreshStyles, refreshCB?: Function): void;
+    setPullToRefresh(style?: PlusWebviewWebviewPullToRefreshStyles, refreshCB?: () => void): void;
     /**
      * 设置Webview窗口rendered事件参数
      * 可设置页面渲染完成的判断标准，如判断页面顶部区域、中间区域、或底部区域。
@@ -9741,7 +9737,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    show(aniShow?: PlusWebviewAnimationTypeShow, duration?: number, showedCB?: Function, extras?: PlusWebviewWebviewExtraOptions): void;
+    show(aniShow?: PlusWebviewAnimationTypeShow, duration?: number, showedCB?: () => void, extras?: PlusWebviewWebviewExtraOptions): void;
     /**
      * 在指定Webview窗口后显示
      * 当调用plus.webview.create方法创建Webview窗口后，可调用其showBehind方法显示在指定Webview窗口之后。
@@ -11795,21 +11791,21 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onreadystatechange?: Function;
+    onreadystatechange?: () => void;
     /**
      * 网络请求开始事件
      * 通常在调用send方法开始发起HTTP请求时触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onloadstart?: (result: PlusNetProgressEvent) => void;
+    onloadstart?: () => void;
     /**
      * 网络请求传输数据事件
      * 通常在HTTP请求链接已经建立，开始传输数据时触发，在数据传输的过程中可能多次触发，此事件与onreadystatechange事件触发状态3类似。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onprogress?: (result: PlusNetProgressEvent) => void;
+    onprogress?: () => void;
     /**
      * 网络请求取消事件
      * 通常在调用abort方法取消HTTP请求时触发。
@@ -11817,7 +11813,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onabort?: (result: PlusNetProgressEvent) => void;
+    onabort?: () => void;
     /**
      * 网络请求错误事件
      * 通常在HTTP请求发生错误时触发，如无法连接到服务器等各种错误都触发此事件。
@@ -11825,7 +11821,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onerror?: (result: PlusNetProgressEvent) => void;
+    onerror?: () => void;
     /**
      * 网络请求成功事件
      * 通常在HTTP请求成功完成时触发，如果HTTP请求发生错误则不触发此事件。
@@ -11833,7 +11829,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onload?: (result: PlusNetProgressEvent) => void;
+    onload?: () => void;
     /**
      * 网络请求超时事件
      * 通常在HTTP请求超时时触发，此时不会触发onerror事件。
@@ -11841,7 +11837,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    ontimeout?: (result: PlusNetProgressEvent) => void;
+    ontimeout?: () => void;
     /**
      * 网络请求结束事件
      * 通常在HTTP请求结束时触发，不管是HTTP请求失败、成功、或超时之后都会触发此事件。
@@ -11849,7 +11845,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onloadend?: (result: PlusNetProgressEvent) => void;
+    onloadend?: () => void;
     /**
      * 取消当前响应，关闭连接并且结束任何未决的网络活动
      * 此方法把XMLHttpRequest对象重置为readyState为0的状态，并且取消所有未决的网络活动。
@@ -11987,20 +11983,20 @@ interface PlusZip {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    compress(src?: string, zipfile?: string, successCB?: Function, errorCB?: (result: any) => void): void;
+    compress(src?: string, zipfile?: string, successCB?: () => void, errorCB?: () => void): void;
     /**
      * 解压缩Zip文件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    decompress(zipfile?: string, target?: string, successCB?: Function, errorCB?: (result: any) => void): void;
+    decompress(zipfile?: string, target?: string, successCB?: () => void, errorCB?: () => void): void;
     /**
      * 图片压缩转换
      * 可用于图片的质量压缩、大小缩放、方向旋转、区域裁剪、格式转换等。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    compressImage(options?: PlusZipCompressImageOptions, successCB?: (result: any) => void, errorCB?: (result: any) => void): void;
+    compressImage(options?: PlusZipCompressImageOptions, successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -12294,7 +12290,7 @@ interface PlusBarcode {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    scan(path?: string, successCB?: (result0: number, result1: string, result2: string) => void, errorCB?: (result: any) => void, filters?: any []): void;
+    scan(path?: string, successCB?: () => void, errorCB?: () => void, filters?: any []): void;
     /**
      * 创建Barcode对象
      * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
@@ -12325,14 +12321,14 @@ interface PlusBarcodeBarcode {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    onmarked?: (result0: number, result1: string, result2: string) => void;
+    onmarked?: () => void;
     /**
      * 条码识别错误事件
      * 描控件识别过程中发生错误时触发的失败事件，并返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    onerror?: (result: any) => void;
+    onerror?: () => void;
     /**
      * 开始条码识别
      * 开始调用系统摄像头获取图片数据进行扫码识别，当识别出条码数据时通过onmarked回调函数返回。
@@ -12663,14 +12659,14 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: (result: PlusMapsPoint) => void;
+    onclick?: () => void;
     /**
      * 地图状态改变事件
      * 用户拖动、缩放地图等操作完成后触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onstatuschanged?: (result: any) => void;
+    onstatuschanged?: () => void;
     /**
      * 静态方法，计算面积
      * 计算指定地理区域的面积，单位为平方米。
@@ -12678,14 +12674,14 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    calculateArea(bounds?: PlusMapsBounds, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    calculateArea(bounds?: PlusMapsBounds, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 静态方法，计算距离
      * 计算从pointStart坐标点到pointEnd坐标的实际直线距离，单位为米（m）。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 静态方法，坐标转换
      * 将第三方坐标系坐标转换成当前地图的坐标系坐标。
@@ -12693,7 +12689,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 静态方法，地理编码
      * 将地理位置信息转换为坐标点。
@@ -12701,7 +12697,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 静态方法，反向地理编码
      * 将坐标点转换为地理位置信息。
@@ -12709,7 +12705,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 向地图中添加覆盖物
      * 此方法用于向地图中添加覆盖物。
@@ -12765,7 +12761,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    getCurrentCenter(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    getCurrentCenter(callback?: () => void): boolean;
     /**
      * 获取地图的显示类型
      * 
@@ -12779,7 +12775,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    getUserLocation(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    getUserLocation(callback?: () => void): boolean;
     /**
      * 获取地图的缩放级别
      * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
@@ -13204,14 +13200,14 @@ interface PlusMapsMarker {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: (result: PlusMapsOverlay) => void;
+    onclick?: () => void;
     /**
      * 用户拖拽标点事件
      * 可调用标点对象的markObj.setDraggable(true)方法设置标点允许拖拽，当用户拖拽标点对象时触发此事件。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onDrag?: (result: any) => void;
+    onDrag?: () => void;
     /**
      * 覆盖物显示到最上层
      * 常用于覆盖物相互覆盖时调整覆盖物的显示顺序。
@@ -13313,7 +13309,7 @@ interface PlusMapsBubble {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: (result: PlusMapsOverlay) => void;
+    onclick?: () => void;
     /**
      * 设置气泡上显示的图标
      * 若为设置则无默认图标，已添加的显示的气泡在设置新值后将在地图上立即更新内容。
@@ -13627,13 +13623,13 @@ interface PlusMapsSearch {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onPoiSearchComplete?: (result0: number, result1: PlusMapsSearchPoiResult) => void;
+    onPoiSearchComplete?: () => void;
     /**
      * 线路检索完成事件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onRouteSearchComplete?: (result0: number, result1: PlusMapsSearchRouteResult) => void;
+    onRouteSearchComplete?: () => void;
     /**
      * 设置检索返回结果每页的信息数目
      * 地图检索结果是按页返回的，默认检索每页返回10条信息。
@@ -14013,7 +14009,7 @@ interface PlusOauth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    getServices(successCB?: (result: PlusOauth []) => void, errorCB?: (result: any) => void): void;
+    getServices(successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -14076,7 +14072,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    authorize(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    authorize(successCallback?: () => void, errorCallback?: () => void, options?: PlusOauthAuthOptions): void;
     /**
      * 请求登录授权认证操作
      * 对指定的登录授权认证服务进行登录认证操作，在登录前可通过对象的authResult属性判断是否已经登录认证过，通常只需要对没有进行过登录认证的服务进行登录认证操作。
@@ -14084,7 +14080,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    login(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    login(successCallback?: () => void, errorCallback?: () => void, options?: PlusOauthAuthOptions): void;
     /**
      * 注销登录授权认证
      * 对指定的登录授权认证服务注销登录认证操作，注销授权认证后，再次操作时需重新进行登录认证操作。
@@ -14092,7 +14088,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    logout(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    logout(successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 获取登录授权用户信息
      * 获取登录授权认证的用户信息，在获取前可通过对象的userInfo属性判断是否已经获取过，通常只需要对没有获取过用户信息的服务进行操作。
@@ -14100,14 +14096,14 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    getUserInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    getUserInfo(successCallback?: () => void, errorCallback?: () => void): void;
     /**
      * 添加用户手机号信息
      * 打开登录授权服务的添加用户手机号界面进行操作，添加用户手机号操作成功后通过successCallback回调函数通知，否则通过errorCallback回调函数通知。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    addPhoneNumber(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    addPhoneNumber(successCallback?: () => void, errorCallback?: () => void): void;
 }
 
 /**
@@ -14345,7 +14341,7 @@ interface PlusPayment {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    getChannels(successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    getChannels(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 请求支付操作
      * 调用指定的支付通道进行支付操作，其中statement包含支付操作的相关信息，支付模块将弹出支付界面供用户进行支付信息的输入确认操作。
@@ -14353,7 +14349,7 @@ interface PlusPayment {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: (result: PlusPaymentPaymentResult) => void, errorCB?: (result: any) => void): void;
+    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -14405,14 +14401,14 @@ interface PlusPaymentPaymentChannel {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    requestOrder(ids?: any [], successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    requestOrder(ids?: any [], successCB?: () => void, errorCB?: () => void): void;
     /**
      * 向IAP服务器请求已经购买的非消耗性商品和订阅商品
      * 注意：不能获取已购买的消耗性商品。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    restoreComplateRequest(options?: any, successCB?: (result: PlusPayment []) => void): void;
+    restoreComplateRequest(options?: any, successCB?: () => void): void;
 }
 
 /**
@@ -14618,7 +14614,7 @@ interface PlusPush {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
      */
-    addEventListener(type?: string, listener?: (result: string) => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
     /**
      * 清空所有推送消息
      * 清空系统消息中心所有的推送消息。
@@ -14864,7 +14860,7 @@ interface PlusShare {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    getServices(successCB?: (result: PlusShare []) => void, errorCB?: (result: any) => void): void;
+    getServices(successCB?: () => void, errorCB?: () => void): void;
     /**
      * 使用系统组件发送分享
      * 调用系统分享组件分享消息，通过msg参数设置分享内容。
@@ -14872,7 +14868,7 @@ interface PlusShare {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    sendWithSystem(msg?: PlusShareShareMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+    sendWithSystem(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: () => void): void;
 }
 
 /**
@@ -14936,14 +14932,14 @@ interface PlusShareAuthorize {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    onauthenticated?: Function;
+    onauthenticated?: () => void;
     /**
      * 分享授权认证失败事件
      * 用户在分享授权控件上输入操作授权认证错误时触发，事件方法格式参考ShareErrorCallback回调函数。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    onerror?: (result: any) => void;
+    onerror?: () => void;
     /**
      * 加载分享授权页面
      * 创建分享授权页面后，需要调用此方法指定分享服务标识来加载授权页面数据，此标识可使用ShareService对象的id属性。
@@ -15035,7 +15031,7 @@ interface PlusShareShareService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    authorize(successCallback?: (result: PlusShareShareService) => void, errorCallback?: (result: any) => void, options?: PlusShareAuthOptions): void;
+    authorize(successCallback?: () => void, errorCallback?: () => void, options?: PlusShareAuthOptions): void;
     /**
      * 取消授权认证
      * 对指定的分享服务取消授权认证操作，取消授权认证后，再次分享时需重新进行授权操作。
@@ -15050,7 +15046,7 @@ interface PlusShareShareService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    send(msg?: PlusShareShareMessage, successCB?: Function, errorCB?: (result: any) => void): void;
+    send(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: () => void): void;
     /**
      * 调用微信小程序
      * 注意：需在微信开放平台将应用关联小程序才能正常调用。
@@ -15279,7 +15275,7 @@ interface PlusSpeech {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
      */
-    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 停止语音识别
      * 当语音识别完成时或用户取消语音识别时调用，调用此方法将导致errorCallback回调函数的调用。
@@ -15294,7 +15290,7 @@ interface PlusSpeech {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
      */
-    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: (result: any) => void, capture?: boolean): void;
+    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: () => void, capture?: boolean): void;
 }
 
 /**
diff --git a/types/html5plus/tslint.json b/types/html5plus/tslint.json
index a41bf5d19a..661e47a018 100644
--- a/types/html5plus/tslint.json
+++ b/types/html5plus/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
         "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-trailing-whitespace": false
     }
-}
+}
\ No newline at end of file

From e1f303170cd112a6818474233ad3d80aaffcca80 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 5 Mar 2019 11:57:47 +0800
Subject: [PATCH 357/924] change types for html5plus

---
 types/html5plus/index.d.ts | 326 ++++++++++++++++++-------------------
 1 file changed, 163 insertions(+), 163 deletions(-)

diff --git a/types/html5plus/index.d.ts b/types/html5plus/index.d.ts
index 808d31a9e5..2993f829b6 100644
--- a/types/html5plus/index.d.ts
+++ b/types/html5plus/index.d.ts
@@ -291,7 +291,7 @@ interface PlusAccelerometer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
      */
-    getCurrentAcceleration(successCB?: () => void, errorCB?: () => void): void;
+    getCurrentAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void): void;
     /**
      * 监听设备加速度变化信息
      * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
@@ -300,7 +300,7 @@ interface PlusAccelerometer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
      */
-    watchAcceleration(successCB?: () => void, errorCB?: () => void, options?: PlusAccelerometerAccelerometerOption): number;
+    watchAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void, options?: PlusAccelerometerAccelerometerOption): number;
     /**
      * 关闭监听设备加速度信息
      * 关闭监听设备加速度信息，应用关闭调用watchAcceleration方法的开启的监听操作。
@@ -558,7 +558,7 @@ interface PlusAudioAudioRecorder {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
      */
-    record(option?: PlusAudioRecordOptions, successCB?: () => void, errorCB?: () => void): void;
+    record(option?: PlusAudioRecordOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
     /**
      * 结束录音操作
      * 结束录音操作，通知设备完成录音操作。录音完成后将调用record方法中传入的successCB回调返回录音文件。
@@ -580,7 +580,7 @@ interface PlusAudioAudioPlayer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
      */
-    play(successCB?: () => void, errorCB?: () => void): void;
+    play(successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 暂停播放音频
      * 需先调用createPlayer方法创建音频播放对象，并开始播放。音频播放对象在播放状态才能暂停，在其它状态调用此方法无任何作用。
@@ -716,14 +716,14 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    closeBluetoothAdapter(success?: () => void, fail?: () => void, complete?: () => void): void;
+    closeBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 获取本机蓝牙适配器状态
      * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBluetoothAdapterState(success?: () => void, fail?: () => void, complete?: () => void): void;
+    getBluetoothAdapterState(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 获取已搜索到的蓝牙设备
      * 包括已经和本机处于连接状态的设备。
@@ -731,35 +731,35 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBluetoothDevices(success?: () => void, fail?: () => void, complete?: () => void): void;
+    getBluetoothDevices(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 根据uuid获取处于已连接的设备
      * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getConnectedBluetoothDevices(services?: any [], success?: () => void, fail?: () => void, complete?: () => void): void;
+    getConnectedBluetoothDevices(services?: any [], success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 监听蓝牙适配器状态变化事件
      * 蓝牙适配器状态发生变化时触发回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBluetoothAdapterStateChange(changeCB?: () => void): void;
+    onBluetoothAdapterStateChange(changeCB?: (result: any) => void): void;
     /**
      * 监听搜索到新设备的事件
      * 搜索到新设备时触发回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBluetoothDeviceFound(callback?: () => void): void;
+    onBluetoothDeviceFound(callback?: (result: any) => void): void;
     /**
      * 初始化蓝牙模块
      * 初始化成功后触发options参数中的success回调，失败触发options参数中的fail回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    openBluetoothAdapter(success?: () => void, fail?: () => void, complete?: () => void): void;
+    openBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 开始搜索附近的蓝牙设备
      * 此操作比较耗费系统资源，请在搜索并连接到设备后调用stopBluetoothDevicesDiscovery方法停止搜索。
@@ -767,7 +767,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: () => void, fail?: () => void, complete?: () => void): void;
+    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 停止搜寻附近的蓝牙外围设备
      * 若已经找到需要的蓝牙设备并不需要继续搜索时，应该调用该接口停止蓝牙搜索。
@@ -775,32 +775,32 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    stopBluetoothDevicesDiscovery(success?: () => void, fail?: () => void, complete?: () => void): void;
+    stopBluetoothDevicesDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 断开与低功耗蓝牙设备的连接
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    closeBLEConnection(deviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
+    closeBLEConnection(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 连接低功耗蓝牙设备
      * 若之前已有搜索过某个蓝牙设备，并成功建立连接，可直接传入之前搜索获取的deviceId尝试连接该设备，无需进行搜索操作。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    createBLEConnection(deviceId?: string, timeout?: number, success?: () => void, fail?: () => void, complete?: () => void): void;
+    createBLEConnection(deviceId?: string, timeout?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 获取蓝牙设备指定服务中所有特征值(characteristic)
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
+    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 获取蓝牙设备的所有服务(service)
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    getBLEDeviceServices(deviceId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
+    getBLEDeviceServices(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
      * 蓝牙设备服务的特征值必须支持notify或indicate才可以成功调用。
@@ -808,20 +808,20 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: () => void, fail?: () => void, complete?: () => void): void;
+    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 监听低功耗蓝牙设备的特征值变化事件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBLECharacteristicValueChange(callback?: () => void): void;
+    onBLECharacteristicValueChange(callback?: (result: any) => void): void;
     /**
      * 监听低功耗蓝牙设备连接状态变化事件
      * 包括开发者主动连接或断开连接，设备丢失，连接异常断开等。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    onBLEConnectionStateChange(callback?: () => void): void;
+    onBLEConnectionStateChange(callback?: (result: any) => void): void;
     /**
      * 读取低功耗蓝牙设备指定特征值的二进制数据值
      * 指定的特征值需支持read操作才可以成功调用。
@@ -829,7 +829,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: () => void, fail?: () => void, complete?: () => void): void;
+    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 向低功耗蓝牙设备指定特征值写入二进制数据
      * 指定的特征值需支持write操作才可以成功调用。
@@ -837,7 +837,7 @@ interface PlusBluetooth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
      */
-    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: () => void, fail?: () => void, complete?: () => void): void;
+    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
 }
 
 /**
@@ -1042,7 +1042,7 @@ interface PlusCameraCamera {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
      */
-    captureImage(successCB?: () => void, errorCB?: () => void, options?: PlusCameraCameraOptions): void;
+    captureImage(successCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusCameraCameraOptions): void;
     /**
      * 调用摄像头进行摄像操作
      * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
@@ -1051,7 +1051,7 @@ interface PlusCameraCamera {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
      */
-    startVideoCapture(successCB?: () => void, errorCB?: () => void, option?: PlusCameraCameraOptions): void;
+    startVideoCapture(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusCameraCameraOptions): void;
     /**
      * 结束摄像操作
      * 开始调用摄像头进行摄像操作后，可在后台结束摄像操作，与用户在界面结束操作效果一致。
@@ -1248,7 +1248,7 @@ interface PlusContacts {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    getAddressBook(type?: number, successCB?: () => void, errorCB?: () => void): void;
+    getAddressBook(type?: number, successCB?: (result: PlusContactsAddressBook) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -1271,7 +1271,7 @@ interface PlusContactsAddressBook {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    find(contactFields?: string [], successCB?: () => void, errorCB?: () => void, findOptions?: PlusContactsContactFindOption): void;
+    find(contactFields?: string [], successCB?: (result: PlusContactsContact) => void, errorCB?: (result: any) => void, findOptions?: PlusContactsContactFindOption): void;
 }
 
 /**
@@ -1390,14 +1390,14 @@ interface PlusContactsContact {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    remove(successCB?: () => void, errorCB?: () => void): void;
+    remove(successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 保存联系人
      * 将联系人数据保存到通讯录中，操作成功将通过successCB回调函数返回保存结果，操作失败将通过通过errorCB回调函数返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
      */
-    save(successCB?: () => void, errorCB?: () => void): void;
+    save(successCB?: () => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -1960,14 +1960,14 @@ interface PlusDownloader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: () => void): PlusDownloaderDownload;
+    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: (result0: PlusDownloaderDownload, result1: number) => void): PlusDownloaderDownload;
     /**
      * 枚举下载任务
      * 枚举指定状态的下载任务列表，通过enumCB回调函数返回结果。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    enumerate(enumCB?: () => void, state?: PlusDownloaderDownloadState): void;
+    enumerate(enumCB?: (result: any []) => void, state?: PlusDownloaderDownloadState): void;
     /**
      * 清除下载任务
      * 清除指定状态的下载任务。
@@ -2055,7 +2055,7 @@ interface PlusDownloaderDownload {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
      */
-    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: (result0: PlusDownloaderDownload, result1: number) => void, capture?: boolean): void;
     /**
      * 获取下载请求HTTP响应头部信息
      * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者下载请求未完成则为空字符串。
@@ -2241,7 +2241,7 @@ interface PlusFingerprint {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
      */
-    authenticate(successCB?: () => void, errorCB?: () => void, options?: PlusFingerprintAuthenticateOptions): void;
+    authenticate(successCB?: () => void, errorCB?: (result: PlusFingerprintFingerprintError) => void, options?: PlusFingerprintAuthenticateOptions): void;
     /**
      * 取消指纹识别认证
      * 取消当前正在处理的指纹识别认证操作。
@@ -2377,7 +2377,7 @@ interface PlusGallery {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
      */
-    pick(succesCB?: () => void, errorCB?: () => void, options?: PlusGalleryGalleryOptions): void;
+    pick(succesCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusGalleryGalleryOptions): void;
     /**
      * 保存文件到系统相册中
      * 保存文件到系统相册中。
@@ -2386,7 +2386,7 @@ interface PlusGallery {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
      */
-    save(path  ?: string, succesCB?: () => void, errorCB?: () => void): void;
+    save(path  ?: string, succesCB?: (result: PlusGalleryGallerySaveEvent) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -2586,7 +2586,7 @@ interface PlusGeolocation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
      */
-    getCurrentPosition(successCB?: () => void, errorCB?: () => void, options?: PlusGeolocationPositionOptions): void;
+    getCurrentPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, options?: PlusGeolocationPositionOptions): void;
     /**
      * 监听设备位置变化信息
      * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取。
@@ -2595,7 +2595,7 @@ interface PlusGeolocation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
      */
-    watchPosition(successCB?: () => void, errorCB?: () => void, option?: PlusGeolocationPositionOptions): number;
+    watchPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, option?: PlusGeolocationPositionOptions): number;
     /**
      * 关闭监听设备位置信息
      * 
@@ -2913,35 +2913,35 @@ interface PlusIbeacon {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: () => void, fail?: () => void, complete?: () => void): void;
+    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 停止搜索附近的iBeacon设备
      * 取消成功后触发successCB回调，失败触发errorCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    stopBeaconDiscovery(success?: () => void, fail?: () => void, complete?: () => void): void;
+    stopBeaconDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 获取已搜索到的iBeacon设备
      * 获取成功后触发successCB回调，失败触发errorCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    getBeacons(success?: () => void, fail?: () => void, complete?: () => void): void;
+    getBeacons(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
     /**
      * 监听iBeacon设备更新
      * iBeacon设备更新后触发updateCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    onBeaconUpdate(updateCB?: () => void): void;
+    onBeaconUpdate(updateCB?: (result: any) => void): void;
     /**
      * 监听iBeacon服务状态变化
      * iBeacon服务状态变化时触发changeCB回调。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
      */
-    onBeaconServiceChange(changeCB?: () => void): void;
+    onBeaconServiceChange(changeCB?: (result: any) => void): void;
 }
 
 /**
@@ -3129,7 +3129,7 @@ interface PlusIo {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    requestFileSystem(type?: number, succesCB?: () => void, errorCB?: () => void): void;
+    requestFileSystem(type?: number, succesCB?: (result: PlusIoFileSystem) => void, errorCB?: (result: any) => void): void;
     /**
      * 通过URL参数获取目录对象或文件对象
      * 快速获取指定的目录或文件操作对象，如通过URL值“_www/test.html”可直接获取文件操作对象。
@@ -3138,7 +3138,7 @@ interface PlusIo {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    resolveLocalFileSystemURL(url ?: string, succesCB?: () => void, errorCB?: () => void): void;
+    resolveLocalFileSystemURL(url ?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 将本地URL路径转换成平台绝对路径
      * 绝对路径符合各平台文件路径格式，通常用于Native.JS调用系统原生文件操作API，也可以在前面添加“file://”后在html页面中直接使用。
@@ -3199,7 +3199,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getMetadata(succesCB?: () => void, errorCB?: () => void, recursive?: boolean): void;
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void, recursive?: boolean): void;
     /**
      * 移动目录
      * 以下情况移动目录将会导致失败：
@@ -3211,7 +3211,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 拷贝目录
      * 以下情况拷贝目录将会导致失败：
@@ -3223,7 +3223,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取目录路径转换为URL地址
      * 
@@ -3251,14 +3251,14 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    remove(succesCB?: () => void, errorCB?: () => void): void;
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取目录所属的父目录
      * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getParent(succesCB?: () => void, errorCB?: () => void): void;
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 创建目录读取对象
      * 创建一个目录读取对象，用户读取目下的文件及子目录。
@@ -3273,7 +3273,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: () => void, errorCB?: () => void): void;
+    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 创建或打开文件
      * 创建或打开当前目录下指定的文件。
@@ -3281,7 +3281,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getFile(path?: string, flag?: PlusIoFlags, succesCB?: () => void, errorCB?: () => void): void;
+    getFile(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 递归删除目录
      * 删除目录将会删除其下的所有文件及子目录
@@ -3290,7 +3290,7 @@ interface PlusIoDirectoryEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    removeRecursively(succesCB?: () => void, errorCB?: () => void): void;
+    removeRecursively(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -3306,7 +3306,7 @@ interface PlusIoDirectoryReader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    readEntries(succesCB?: () => void, errorCB?: () => void): void;
+    readEntries(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -3398,7 +3398,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getMetadata(succesCB?: () => void, errorCB?: () => void): void;
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void): void;
     /**
      * 移动文件
      * 以下情况移动目录将会导致失败：
@@ -3408,7 +3408,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 拷贝文件
      * 以下情况拷贝文件将会导致失败：
@@ -3418,7 +3418,7 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: () => void, errorCB?: () => void): void;
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取文件路径转换为URL地址
      * 
@@ -3444,28 +3444,28 @@ interface PlusIoFileEntry {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    remove(succesCB?: () => void, errorCB?: () => void): void;
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取文件所属的父目录
      * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    getParent(succesCB?: () => void, errorCB?: () => void): void;
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取文件关联的写文件操作对象FileWriter
      * 获取写文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    createWriter(succesCB?: () => void, errorCB?: () => void): void;
+    createWriter(succesCB?: (result: PlusIoFileWriter) => void, errorCB?: (result: any) => void): void;
     /**
      * 获取文件数据对象
      * 获取文件数据对象成功通过succesCB回调返回，失败则通过errorCB返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    file(succesCB?: () => void, errorCB?: () => void): void;
+    file(succesCB?: (result: PlusIoFile) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -3518,39 +3518,39 @@ interface PlusIoFileReader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onloadstart?: () => void;
+    onloadstart?: (result: PlusIoFileEvent) => void;
     /**
      * 读取文件过程中的回调函数
      * 用于获取文件读取进度。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onprogress?: () => void;
+    onprogress?: (result: PlusIoFileEvent) => void;
     /**
      * 读取文件成功完成的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onload?: () => void;
+    onload?: (result: PlusIoFileEvent) => void;
     /**
      * 取消读取文件时的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onabort?: () => void;
+    onabort?: (result: PlusIoFileEvent) => void;
     /**
      * 文件读取操作失败时调用的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onerror?: () => void;
+    onerror?: (result: PlusIoFileEvent) => void;
     /**
      * 文件读取操作完成时的回调函数
      * 不管成功或失败都会触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onloadend?: () => void;
+    onloadend?: (result: PlusIoFileEvent) => void;
     /**
      * 终止文件读取操作
      * 读取文件操作开始后，可通过此方法取消读取文件。
@@ -3632,39 +3632,39 @@ interface PlusIoFileWriter {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwritestart?: () => void;
+    onwritestart?: (result: PlusIoFileEvent) => void;
     /**
      * 写入文件过程中的回调函数
      * 用于获取文件读取进度。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onprogress?: () => void;
+    onprogress?: (result: PlusIoFileEvent) => void;
     /**
      * 写入文件成功完成的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwrite?: () => void;
+    onwrite?: (result: PlusIoFileEvent) => void;
     /**
      * 取消写入文件时的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onabort?: () => void;
+    onabort?: (result: PlusIoFileEvent) => void;
     /**
      * 文件写入操作失败时调用的回调函数
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onerror?: () => void;
+    onerror?: (result: PlusIoFileEvent) => void;
     /**
      * 文件写入操作完成时的回调函数
      * 不管成功或失败都会触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
      */
-    onwriteend?: () => void;
+    onwriteend?: (result: PlusIoFileEvent) => void;
     /**
      * 终止文件写入操作
      * 写入文件数据操作开始后，可通过此方法取消写入文件数据操作。
@@ -4002,7 +4002,7 @@ interface PlusKey {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
      */
-    addEventListener(event?: PlusKeyKeyType, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void, capture?: boolean): void;
     /**
      * 隐藏软键盘
      * 隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
@@ -4031,7 +4031,7 @@ interface PlusKey {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
      */
-    removeEventListener(event?: PlusKeyKeyType, listener?: () => void): void;
+    removeEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void): void;
 }
 
 /**
@@ -4176,7 +4176,7 @@ interface PlusMessaging {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
      */
-    sendMessage(msg?: PlusMessagingMessage, successCB?: () => void, errorCB?: () => void): void;
+    sendMessage(msg?: PlusMessagingMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -4532,7 +4532,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    load(path?: string, successCallback?: () => void, errorCallback?: () => void): void;
+    load(path?: string, successCallback?: () => void, errorCallback?: (result: any) => void): void;
     /**
      * 加载Base64编码格式图片到Bitmap对象
      * 从Base64编码格式图片数据中加载图片，此操作将覆盖之前的图片内容，
@@ -4540,7 +4540,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    loadBase64Data(data?: string, successCallback?: () => void, errorCallback?: () => void): void;
+    loadBase64Data(data?: string, successCallback?: () => void, errorCallback?: (result: any) => void): void;
     /**
      * 回收Bitmap图片内存
      * 释放Bitmap图片占用的内存资源，但不销毁图片对象，依然可以继续使用图片对象。
@@ -4555,7 +4555,7 @@ interface PlusNativeObjBitmap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 获取图片的Base64编码数据
      * 读取图片的数据内容，并转换为Base64编码格式字符串。
@@ -4827,21 +4827,21 @@ interface PlusNativeObjInputStyles {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onComplete?: () => void;
+    onComplete?: (result: any) => void;
     /**
      * 输入框获取焦点事件
      * 当编辑框获取焦点时触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onFocus?: () => void;
+    onFocus?: (result: any) => void;
     /**
      * 输入框失去焦点事件
      * 当编辑框失去焦点时触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onBlur?: () => void;
+    onBlur?: (result: any) => void;
 }
 
 /**
@@ -4980,7 +4980,7 @@ interface PlusNativeObjRichTextStyles {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    onClick?: () => void;
+    onClick?: (result: any) => void;
 }
 
 /**
@@ -5237,7 +5237,7 @@ interface PlusNativeObjView {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
      */
-    addEventListener(event?: PlusNativeObjViewEvents, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusNativeObjViewEvents, listener?: (result: any) => void, capture?: boolean): void;
     /**
      * View控件内容动画
      * 动画后可能会导致View控件显示内容改变，可通过调用restore方法恢复。
@@ -5783,7 +5783,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: () => void): PlusNativeUINativeUIObj;
+    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: (result: any) => void): PlusNativeUINativeUIObj;
     /**
      * 弹出系统提示对话框
      * 创建并显示系统样式提示对话框，可设置提示对话框的标题、内容、按钮文字等。
@@ -5791,7 +5791,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    alert(message?: string, alertCB?: () => void, title?: string, buttonCapture?: string): void;
+    alert(message?: string, alertCB?: (result: any) => void, title?: string, buttonCapture?: string): void;
     /**
      * 弹出系统确认对话框
      * 创建并显示系统样式确认对话框，可设置确认对话框的标题、内容、按钮数目及其文字。
@@ -5799,7 +5799,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    confirm(message?: string, confirmCB?: () => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
+    confirm(message?: string, confirmCB?: (result: any) => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
     /**
      * 关闭系统等待对话框
      * 关闭已经显示的所有系统样式等待对话框，触发Waiting对象的onclose事件。
@@ -5835,7 +5835,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    pickDate(successCB?: () => void, errorCB?: () => void, options?: PlusNativeUIPickDateOption): void;
+    pickDate(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickDateOption): void;
     /**
      * 弹出系统时间选择对话框
      * 创建并弹出系统样式时间选择对话框，可进行时间的选择。
@@ -5843,7 +5843,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    pickTime(successCB?: () => void, errorCB?: () => void, options?: PlusNativeUIPickTimeOption): void;
+    pickTime(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickTimeOption): void;
     /**
      * 弹出系统输入对话框
      * 创建并显示系统样式输入对话框，可设置输入对话框的标题、内容、提示输入信息、按钮数目及其文字。
@@ -5851,7 +5851,7 @@ interface PlusNativeUI {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
      */
-    prompt(message?: string, promptCB?: () => void, title?: string, tip?: string, buttons?: any []): void;
+    prompt(message?: string, promptCB?: (result: any) => void, title?: string, tip?: string, buttons?: any []): void;
     /**
      * 显示自动消失的提示消息
      * 创建并显示系统样式提示消息，弹出的提示消息为非阻塞模式，显示指定时间后自动消失。
@@ -6449,13 +6449,13 @@ interface PlusNavigator {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
      */
-    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: () => void): void;
+    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
     /**
      * 查询是否存在应用快捷方式
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
      */
-    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: () => void): void;
+    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
     /**
      * 判断当前应用是否切换到后台
      * 在多应用运行环境（如流应用）中，启动一个新应用时，之前运行的应用将会自动切换到后台运行，此时plus.navigator.isBackground()返回状态只为true。
@@ -6763,14 +6763,14 @@ interface PlusOrientation {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
      */
-    getCurrentOrientation(successCB?: () => void, errorCB?: () => void): void;
+    getCurrentOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
     /**
      * 监听设备方向信息的变化
      * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。watchOrientation每隔固定时间就获取一次设备的方向信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备方向信息的时间间隔。方向信息获取失败则调用回调函数errorCB。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
      */
-    watchOrientation(successCB?: () => void, errorCB?: () => void, option?: PlusOrientationOrientationOption): number;
+    watchOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusOrientationOrientationOption): number;
     /**
      * 关闭监听设备方向信息
      * 
@@ -6856,14 +6856,14 @@ interface PlusProximity {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
      */
-    getCurrentProximity(successCB?: () => void, errorCB?: () => void): void;
+    getCurrentProximity(successCB?: (result: number) => void, errorCB?: (result: any) => void): void;
     /**
      * 监听设备接近距离的变化
      * watchProximity将监听设备的接近距离信息变化事件，当接近距离发生变化时通过changeCB回调函数返回距离值。监听距离变化事件失败则通过errorCB回调函数返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
      */
-    watchProximity(changeCB?: () => void, errorCB?: () => void): number;
+    watchProximity(changeCB?: (result: number) => void, errorCB?: (result: any) => void): number;
     /**
      * 关闭监听设备接近距离变化
      * 
@@ -7044,7 +7044,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    getProperty(appid?: string, getPropertyCB?: () => void): void;
+    getProperty(appid?: string, getPropertyCB?: (result: PlusRuntimeWidgetInfo) => void): void;
     /**
      * 安装应用
      * 支持以下类型安装包：
@@ -7055,7 +7055,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: () => void, installErrorCB?: () => void): void;
+    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: (result: PlusRuntimeWidgetInfo) => void, installErrorCB?: (result: any) => void): void;
     /**
      * 退出客户端程序
      * 
@@ -7079,7 +7079,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    openURL(url?: string, errorCB?: () => void, identity?: string): void;
+    openURL(url?: string, errorCB?: (result: any) => void, identity?: string): void;
     /**
      * 使用内置Webview窗口打开URL
      * 
@@ -7091,7 +7091,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: () => void): void;
+    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: (result: any) => void): void;
     /**
      * 处理直达页面链接参数
      * 通过URL Scheme启动时，可以在?后面添加__direct_page参数自定义直达页面地址，
@@ -7107,7 +7107,7 @@ interface PlusRuntime {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
      */
-    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: () => void): void;
+    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: (result: any) => void): void;
     /**
      * 判断第三方程序是否已存在
      * 如果第三方程序已安装则返回true，未安装则返回false。
@@ -7395,7 +7395,7 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    open(options?: PlusStreamStreamOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    open(options?: PlusStreamStreamOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 流应用激活统计
      * 提交统计数据到流应用服务器，表明业务系统激活成功。
@@ -7440,13 +7440,13 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
     /**
      * 免流量绑定手机号
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
     /**
      * 解除免流量绑定
      * 解除当前设备绑定的手机号，如果设备未绑定则不执行操作。
@@ -7459,7 +7459,7 @@ interface PlusStream {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
      */
-    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: () => void): void;
+    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 免流量是否生效
      * 
@@ -7766,14 +7766,14 @@ interface PlusUploader {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: () => void): PlusUploaderUpload;
+    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: (result0: PlusUploaderUpload, result1: number) => void): PlusUploaderUpload;
     /**
      * 枚举上传任务
      * 枚举指定状态的上传任务列表，通过enumCB回调函数返回结果。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    enumerate(enumCB?: () => void, state?: PlusUploaderUploadState): void;
+    enumerate(enumCB?: (result: PlusUploader []) => void, state?: PlusUploaderUploadState): void;
     /**
      * 清除上传任务
      * 清除指定状态的上传任务。
@@ -7902,7 +7902,7 @@ interface PlusUploaderUpload {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
      */
-    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: (result0: PlusUploaderUpload, result1: number) => void, capture?: boolean): void;
     /**
      * 获取上传请求HTTP响应头部信息
      * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者上传请求未完成则为空字符串。
@@ -8121,7 +8121,7 @@ interface PlusVideoVideoPlayer {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: (result: any) => void, capture?: boolean): void;
     /**
      * 设置视频播放控件参数
      * 用于动态更新视频播放控件的配置参数。
@@ -8488,7 +8488,7 @@ interface PlusVideoLivePusher {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
      */
-    addEventListener(event?: PlusVideoLivePusherEvents, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusVideoLivePusherEvents, listener?: (result: any) => void, capture?: boolean): void;
     /**
      * 设置直播推流控件参数
      * 用于动态更新直播推流控件的配置参数。
@@ -9072,7 +9072,7 @@ interface PlusWebview {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: () => void): void;
+    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: (result: any) => void): void;
     /**
      * 获取Webview默认是否开启硬件加速
      * 由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，	因此5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速。
@@ -9298,7 +9298,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    addEventListener(event?: PlusWebviewWebviewEvent, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void, capture?: boolean): void;
     /**
      * 在Webview窗口中添加子窗口
      * 将另一个Webview窗口作为子窗口添加到当前Webview窗口中，添加后其所有权归父Webview窗口，当父窗口关闭时子窗口自动关闭。
@@ -9344,14 +9344,14 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    canBack(queryCallback?: () => void): void;
+    canBack(queryCallback?: (result: any) => void): void;
     /**
      * 查询Webview窗口是否可前进
      * Webview窗口历史记录查询操作，获取Webview是否可前进到历史加载的页面，结果通过queryCallback回调方法返回。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    canForward(queryCallback?: () => void): void;
+    canForward(queryCallback?: (result: any) => void): void;
     /**
      * 检测Webview窗口是否渲染完成
      * 检测方式为判断的Webview窗口内容是否为白屏，如果非白屏则认为渲染完成，否则认为渲染未完成。
@@ -9359,7 +9359,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
     /**
      * 获取Webview窗口的所有子Webview窗口
      * 获取添加到Webview窗口中的所有子Webview窗口，如果没有子Webview窗口则返回空数组。
@@ -9388,14 +9388,14 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: () => void): void;
+    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: (result: PlusWebviewWebviewDragEvent) => void): void;
     /**
      * 截屏绘制
      * 将Webview窗口的可视区域截屏并绘制到Bitmap图片对象中。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    draw(bitmap?: PlusNativeObjBitmap, successCallback?: () => void, errorCallback?: () => void, options?: PlusWebviewWebviewDrawOptions): void;
+    draw(bitmap?: PlusNativeObjBitmap, successCallback?: () => void, errorCallback?: (result: any) => void, options?: PlusWebviewWebviewDrawOptions): void;
     /**
      * 结束Webview窗口的下拉刷新
      * 关闭下拉刷新效果，恢复到开始下拉刷新之前的效果。
@@ -9514,7 +9514,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: () => void): void;
+    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: (result: any) => void): void;
     /**
      * 加载新HTML数据
      * 触发Webview窗口加载HTML页面数据，如果HTML数据无效将导致页面加载失败。
@@ -9567,7 +9567,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: () => void): void;
+    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: (result: any) => void): void;
     /**
      * 获取当前Webview窗口的父窗口
      * Webview窗口作为子窗口添加（Webview.append）到其它Webview窗口中时有效，这时其它Webview窗口为父窗口。
@@ -9612,7 +9612,7 @@ interface PlusWebviewWebviewObject {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
      */
-    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: () => void): void;
+    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void): void;
     /**
      * 从父窗口中移除
      * 从所属的父Webview窗口移除，如果没有父窗口，则无任何作用。
@@ -11798,14 +11798,14 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onloadstart?: () => void;
+    onloadstart?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求传输数据事件
      * 通常在HTTP请求链接已经建立，开始传输数据时触发，在数据传输的过程中可能多次触发，此事件与onreadystatechange事件触发状态3类似。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onprogress?: () => void;
+    onprogress?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求取消事件
      * 通常在调用abort方法取消HTTP请求时触发。
@@ -11813,7 +11813,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onabort?: () => void;
+    onabort?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求错误事件
      * 通常在HTTP请求发生错误时触发，如无法连接到服务器等各种错误都触发此事件。
@@ -11821,7 +11821,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onerror?: () => void;
+    onerror?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求成功事件
      * 通常在HTTP请求成功完成时触发，如果HTTP请求发生错误则不触发此事件。
@@ -11829,7 +11829,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onload?: () => void;
+    onload?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求超时事件
      * 通常在HTTP请求超时时触发，此时不会触发onerror事件。
@@ -11837,7 +11837,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    ontimeout?: () => void;
+    ontimeout?: (result: PlusNetProgressEvent) => void;
     /**
      * 网络请求结束事件
      * 通常在HTTP请求结束时触发，不管是HTTP请求失败、成功、或超时之后都会触发此事件。
@@ -11845,7 +11845,7 @@ interface PlusNetXMLHttpRequest {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
      */
-    onloadend?: () => void;
+    onloadend?: (result: PlusNetProgressEvent) => void;
     /**
      * 取消当前响应，关闭连接并且结束任何未决的网络活动
      * 此方法把XMLHttpRequest对象重置为readyState为0的状态，并且取消所有未决的网络活动。
@@ -11983,20 +11983,20 @@ interface PlusZip {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    compress(src?: string, zipfile?: string, successCB?: () => void, errorCB?: () => void): void;
+    compress(src?: string, zipfile?: string, successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 解压缩Zip文件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    decompress(zipfile?: string, target?: string, successCB?: () => void, errorCB?: () => void): void;
+    decompress(zipfile?: string, target?: string, successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 图片压缩转换
      * 可用于图片的质量压缩、大小缩放、方向旋转、区域裁剪、格式转换等。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
      */
-    compressImage(options?: PlusZipCompressImageOptions, successCB?: () => void, errorCB?: () => void): void;
+    compressImage(options?: PlusZipCompressImageOptions, successCB?: (result: any) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -12290,7 +12290,7 @@ interface PlusBarcode {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    scan(path?: string, successCB?: () => void, errorCB?: () => void, filters?: any []): void;
+    scan(path?: string, successCB?: (result0: number, result1: string, result2: string) => void, errorCB?: (result: any) => void, filters?: any []): void;
     /**
      * 创建Barcode对象
      * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
@@ -12321,14 +12321,14 @@ interface PlusBarcodeBarcode {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    onmarked?: () => void;
+    onmarked?: (result0: number, result1: string, result2: string) => void;
     /**
      * 条码识别错误事件
      * 描控件识别过程中发生错误时触发的失败事件，并返回错误信息。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
      */
-    onerror?: () => void;
+    onerror?: (result: any) => void;
     /**
      * 开始条码识别
      * 开始调用系统摄像头获取图片数据进行扫码识别，当识别出条码数据时通过onmarked回调函数返回。
@@ -12659,14 +12659,14 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: () => void;
+    onclick?: (result: PlusMapsPoint) => void;
     /**
      * 地图状态改变事件
      * 用户拖动、缩放地图等操作完成后触发。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onstatuschanged?: () => void;
+    onstatuschanged?: (result: any) => void;
     /**
      * 静态方法，计算面积
      * 计算指定地理区域的面积，单位为平方米。
@@ -12674,14 +12674,14 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    calculateArea(bounds?: PlusMapsBounds, successCallback?: () => void, errorCallback?: () => void): void;
+    calculateArea(bounds?: PlusMapsBounds, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 静态方法，计算距离
      * 计算从pointStart坐标点到pointEnd坐标的实际直线距离，单位为米（m）。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: () => void, errorCallback?: () => void): void;
+    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 静态方法，坐标转换
      * 将第三方坐标系坐标转换成当前地图的坐标系坐标。
@@ -12689,7 +12689,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 静态方法，地理编码
      * 将地理位置信息转换为坐标点。
@@ -12697,7 +12697,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 静态方法，反向地理编码
      * 将坐标点转换为地理位置信息。
@@ -12705,7 +12705,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: () => void, errorCallback?: () => void): void;
+    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 向地图中添加覆盖物
      * 此方法用于向地图中添加覆盖物。
@@ -12761,7 +12761,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    getCurrentCenter(callback?: () => void): boolean;
+    getCurrentCenter(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
     /**
      * 获取地图的显示类型
      * 
@@ -12775,7 +12775,7 @@ interface PlusMapsMap {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    getUserLocation(callback?: () => void): boolean;
+    getUserLocation(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
     /**
      * 获取地图的缩放级别
      * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
@@ -13200,14 +13200,14 @@ interface PlusMapsMarker {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: () => void;
+    onclick?: (result: PlusMapsOverlay) => void;
     /**
      * 用户拖拽标点事件
      * 可调用标点对象的markObj.setDraggable(true)方法设置标点允许拖拽，当用户拖拽标点对象时触发此事件。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onDrag?: () => void;
+    onDrag?: (result: any) => void;
     /**
      * 覆盖物显示到最上层
      * 常用于覆盖物相互覆盖时调整覆盖物的显示顺序。
@@ -13309,7 +13309,7 @@ interface PlusMapsBubble {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onclick?: () => void;
+    onclick?: (result: PlusMapsOverlay) => void;
     /**
      * 设置气泡上显示的图标
      * 若为设置则无默认图标，已添加的显示的气泡在设置新值后将在地图上立即更新内容。
@@ -13623,13 +13623,13 @@ interface PlusMapsSearch {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onPoiSearchComplete?: () => void;
+    onPoiSearchComplete?: (result0: number, result1: PlusMapsSearchPoiResult) => void;
     /**
      * 线路检索完成事件
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
      */
-    onRouteSearchComplete?: () => void;
+    onRouteSearchComplete?: (result0: number, result1: PlusMapsSearchRouteResult) => void;
     /**
      * 设置检索返回结果每页的信息数目
      * 地图检索结果是按页返回的，默认检索每页返回10条信息。
@@ -14009,7 +14009,7 @@ interface PlusOauth {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    getServices(successCB?: () => void, errorCB?: () => void): void;
+    getServices(successCB?: (result: PlusOauth []) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -14072,7 +14072,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    authorize(successCallback?: () => void, errorCallback?: () => void, options?: PlusOauthAuthOptions): void;
+    authorize(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
     /**
      * 请求登录授权认证操作
      * 对指定的登录授权认证服务进行登录认证操作，在登录前可通过对象的authResult属性判断是否已经登录认证过，通常只需要对没有进行过登录认证的服务进行登录认证操作。
@@ -14080,7 +14080,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    login(successCallback?: () => void, errorCallback?: () => void, options?: PlusOauthAuthOptions): void;
+    login(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
     /**
      * 注销登录授权认证
      * 对指定的登录授权认证服务注销登录认证操作，注销授权认证后，再次操作时需重新进行登录认证操作。
@@ -14088,7 +14088,7 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    logout(successCallback?: () => void, errorCallback?: () => void): void;
+    logout(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 获取登录授权用户信息
      * 获取登录授权认证的用户信息，在获取前可通过对象的userInfo属性判断是否已经获取过，通常只需要对没有获取过用户信息的服务进行操作。
@@ -14096,14 +14096,14 @@ interface PlusOauthAuthService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    getUserInfo(successCallback?: () => void, errorCallback?: () => void): void;
+    getUserInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
     /**
      * 添加用户手机号信息
      * 打开登录授权服务的添加用户手机号界面进行操作，添加用户手机号操作成功后通过successCallback回调函数通知，否则通过errorCallback回调函数通知。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
      */
-    addPhoneNumber(successCallback?: () => void, errorCallback?: () => void): void;
+    addPhoneNumber(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
 }
 
 /**
@@ -14341,7 +14341,7 @@ interface PlusPayment {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    getChannels(successCB?: () => void, errorCB?: () => void): void;
+    getChannels(successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
     /**
      * 请求支付操作
      * 调用指定的支付通道进行支付操作，其中statement包含支付操作的相关信息，支付模块将弹出支付界面供用户进行支付信息的输入确认操作。
@@ -14349,7 +14349,7 @@ interface PlusPayment {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: () => void, errorCB?: () => void): void;
+    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: (result: PlusPaymentPaymentResult) => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -14401,14 +14401,14 @@ interface PlusPaymentPaymentChannel {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    requestOrder(ids?: any [], successCB?: () => void, errorCB?: () => void): void;
+    requestOrder(ids?: any [], successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
     /**
      * 向IAP服务器请求已经购买的非消耗性商品和订阅商品
      * 注意：不能获取已购买的消耗性商品。
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
      */
-    restoreComplateRequest(options?: any, successCB?: () => void): void;
+    restoreComplateRequest(options?: any, successCB?: (result: PlusPayment []) => void): void;
 }
 
 /**
@@ -14614,7 +14614,7 @@ interface PlusPush {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
      */
-    addEventListener(type?: string, listener?: () => void, capture?: boolean): void;
+    addEventListener(type?: string, listener?: (result: string) => void, capture?: boolean): void;
     /**
      * 清空所有推送消息
      * 清空系统消息中心所有的推送消息。
@@ -14860,7 +14860,7 @@ interface PlusShare {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    getServices(successCB?: () => void, errorCB?: () => void): void;
+    getServices(successCB?: (result: PlusShare []) => void, errorCB?: (result: any) => void): void;
     /**
      * 使用系统组件发送分享
      * 调用系统分享组件分享消息，通过msg参数设置分享内容。
@@ -14868,7 +14868,7 @@ interface PlusShare {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    sendWithSystem(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: () => void): void;
+    sendWithSystem(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
 }
 
 /**
@@ -14939,7 +14939,7 @@ interface PlusShareAuthorize {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    onerror?: () => void;
+    onerror?: (result: any) => void;
     /**
      * 加载分享授权页面
      * 创建分享授权页面后，需要调用此方法指定分享服务标识来加载授权页面数据，此标识可使用ShareService对象的id属性。
@@ -15031,7 +15031,7 @@ interface PlusShareShareService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    authorize(successCallback?: () => void, errorCallback?: () => void, options?: PlusShareAuthOptions): void;
+    authorize(successCallback?: (result: PlusShareShareService) => void, errorCallback?: (result: any) => void, options?: PlusShareAuthOptions): void;
     /**
      * 取消授权认证
      * 对指定的分享服务取消授权认证操作，取消授权认证后，再次分享时需重新进行授权操作。
@@ -15046,7 +15046,7 @@ interface PlusShareShareService {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
      */
-    send(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: () => void): void;
+    send(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
     /**
      * 调用微信小程序
      * 注意：需在微信开放平台将应用关联小程序才能正常调用。
@@ -15275,7 +15275,7 @@ interface PlusSpeech {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
      */
-    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: () => void, errorCB?: (result: any) => void): void;
+    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
     /**
      * 停止语音识别
      * 当语音识别完成时或用户取消语音识别时调用，调用此方法将导致errorCallback回调函数的调用。
@@ -15290,7 +15290,7 @@ interface PlusSpeech {
      * 
      * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
      */
-    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: () => void, capture?: boolean): void;
+    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: (result: any) => void, capture?: boolean): void;
 }
 
 /**

From b0c0de0a559025254302cafaaf7032a258cb77c2 Mon Sep 17 00:00:00 2001
From: tkow <t.kusama0613@outlook.jp>
Date: Tue, 5 Mar 2019 13:00:57 +0900
Subject: [PATCH 358/924] remove deprecated methods

---
 types/react-navigation/index.d.ts             | 23 -------------------
 .../react-navigation-tests.tsx                | 15 ------------
 2 files changed, 38 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index f2b0b968fb..9b2aee84e2 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -872,10 +872,6 @@ export interface StackNavigatorConfig
 }
 
 // Return createNavigationContainer
-export function StackNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  stackConfig?: StackNavigatorConfig
-): NavigationContainer;
 
 export function createStackNavigator(
   routeConfigMap: NavigationRouteConfigMap,
@@ -892,11 +888,6 @@ export interface SwitchNavigatorConfig {
 // Return createNavigationContainer
 export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
 
-export function SwitchNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  switchConfig?: SwitchNavigatorConfig
-): NavigationContainer;
-
 export function createSwitchNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   switchConfig?: SwitchNavigatorConfig
@@ -962,11 +953,6 @@ export interface DrawerNavigatorConfig
   drawerLockMode?: DrawerLockMode;
 }
 
-export function DrawerNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  drawerConfig?: DrawerNavigatorConfig
-): NavigationContainer;
-
 export function createDrawerNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   drawerConfig?: DrawerNavigatorConfig
@@ -1021,15 +1007,6 @@ export interface BottomTabNavigatorConfig
 }
 
 // From navigators/TabNavigator.js
-export function TabNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  drawConfig?: TabNavigatorConfig
-): NavigationContainer;
-
-export function createTabNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  drawConfig?: TabNavigatorConfig
-): NavigationContainer;
 
 export function createBottomTabNavigator(
   routeConfigMap: NavigationRouteConfigMap,
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 777a8fa9f3..cf933d43ba 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -36,7 +36,6 @@ import {
     createSwitchNavigator,
     SwitchNavigatorConfig,
     TabBarTop,
-    createTabNavigator,
     TabNavigatorConfig,
     Transitioner,
     HeaderBackButton,
@@ -245,20 +244,6 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
     },
 };
 
-const BasicTabNavigator = createTabNavigator(
-    routeConfigMap,
-    tabNavigatorConfig,
-);
-
-function renderBasicTabNavigator(): JSX.Element {
-    return (
-        <BasicTabNavigator
-            ref={(ref: any) => { }}
-            style={[viewStyle, undefined]} // Test that we are using StyleProp
-        />
-    );
-}
-
 /**
  * Stack navigator.
  */

From 78260dbf4c74d308b5e189cd8adcc4a587040502 Mon Sep 17 00:00:00 2001
From: Aaron Beall <contact@abeall.com>
Date: Mon, 4 Mar 2019 23:01:41 -0500
Subject: [PATCH 359/924] Added pendo-io-agent definitions

---
 pendo-io-agent/index.d.ts                    | 166 +++++++++++++++++++
 pendo-io-agent/pendo-io-agent-tests.ts       |  78 +++++++++
 pendo-io-agent/tsconfig.json                 |  23 +++
 pendo-io-agent/tslint.json                   |   1 +
 types/pendo-io-agent/index.d.ts              |  63 +++++++
 types/pendo-io-agent/pendo-io-agent-tests.ts |   0
 types/pendo-io-agent/tsconfig.json           |  22 +++
 types/pendo-io-agent/tslint.json             |   1 +
 8 files changed, 354 insertions(+)
 create mode 100644 pendo-io-agent/index.d.ts
 create mode 100644 pendo-io-agent/pendo-io-agent-tests.ts
 create mode 100644 pendo-io-agent/tsconfig.json
 create mode 100644 pendo-io-agent/tslint.json
 create mode 100644 types/pendo-io-agent/index.d.ts
 create mode 100644 types/pendo-io-agent/pendo-io-agent-tests.ts
 create mode 100644 types/pendo-io-agent/tsconfig.json
 create mode 100644 types/pendo-io-agent/tslint.json

diff --git a/pendo-io-agent/index.d.ts b/pendo-io-agent/index.d.ts
new file mode 100644
index 0000000000..6429f3b95b
--- /dev/null
+++ b/pendo-io-agent/index.d.ts
@@ -0,0 +1,166 @@
+// Type definitions for Pendo.io Agent 2.16
+// Project: https://www.pendo.io/
+// Definitions by: Aaron Beall <https://github.com/aaronbeall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace pendo {
+    interface Identity {
+        visitor: Visitor;
+        account?: Account;
+    }
+
+    type Metadata = Record<string, string | number | undefined>;
+
+    interface Visitor extends Metadata {
+        id: string;
+    }
+
+    interface Account extends Metadata {
+        id?: string;
+    }
+
+    interface InitOptions extends Identity {
+        apiKey?: string;
+        excludeAllText?: boolean;
+        excludeTitle?: boolean;
+        disablePersistence?: boolean;
+        guides?: {
+            delay?: boolean;
+            disable?: boolean;
+            timeout?: number;
+            tooltip?: {
+                arrowSize?: number;
+            }
+        };
+        events?: EventCallbacks;
+    }
+
+    interface EventCallbacks {
+        ready?(): void;
+        guidesLoaded?(): void;
+        guidesFailed?(): void;
+    }
+
+    interface Pendo {
+        // Initialization and Identification
+        initialize(options: InitOptions): void;
+        identify(visitorId: string, accountId?: string): void;
+        identify(identity: Identity): void;
+        isReady(): boolean;
+        flushNow(): Promise<any>;
+        updateOptions(visitorMetadata: Metadata): void;
+        getVersion(): string;
+        getVisitorId(): string;
+        getAccountId(): string;
+        getCurrentUrl(): string;
+
+        // Guides and Guide Center
+        findGuideByName(name: string): Guide | void;
+        findGuideById(id: string): Guide | void;
+        showGuideByName(name: string): void;
+        showGuideById(id: string): void;
+        toggleLauncher(): void;
+        removeLauncher(): void;
+
+        // Troubleshooting
+        loadGuides(): void;
+        startGuides(): void;
+        stopGuides(): void;
+
+        // Debugging
+        enableDebugging(): void;
+        disableDebugging(): void;
+        isDebuggingEnabled(coerce?: false): "Yes" | "No";
+        isDebuggingEnabled(coerce: true): boolean;
+        debugging: Debugging;
+
+        // Events
+        events: Events;
+        track(trackType: string, metadata?: Metadata): void;
+
+        // Guide Events
+        onGuideAdvanced(step?: GuideStep): void;
+        onGuideAdvanced(steps: { steps: number }): void;
+        onGuidePrevious(step?: GuideStep): void;
+        onGuideDismissed(step?: GuideStep): void;
+        onGuideDismissed(until: { until: "reload" }): void;
+
+        // Other
+        validateInstall(): void;
+        dom(input: any): HTMLElement; // TODO
+    }
+
+    interface Debugging {
+        getEventCache(): any[]; // TODO
+        getAllGuides(): Guide[];
+        getAutoGuides(): { auto: Guide[]; override: Guide[] };
+        getBadgeGuides(): Guide[];
+        getLauncherGuides(): Guide[];
+    }
+
+    type Events = {
+        [K in keyof EventCallbacks]-?: (callback: EventCallbacks[K]) => Events;
+    };
+
+    interface Guide {
+        createdByUser: User;
+        createdAt: number;
+        lastUpdatedByUser: User;
+        lastUpdatedAt: number;
+        kind: string;
+        rootVersionId: string;
+        stableVersionId: string;
+        id: string;
+        name: string;
+        state: "published" | "staged" | "draft" | "disabled";
+        launchMethod: "api" | "automatic" | "badge" | "dom" | "launcher";
+        isMultiStep: boolean;
+        steps: GuideStep[];
+        attributes: {
+            type: string;
+            device: { desktop: boolean; mobile: boolean; type: "desktop" | "mobile" };
+            badge: any;
+            priority: number;
+            launcher: { keywords: string[] };
+        };
+        audience: any[]; // TODO
+        audienceUiHint: { filters: any[] }; // TODO
+        resetAt: number;
+        publishedAt: number;
+    }
+
+    interface User {
+        id: string;
+        username: string;
+        first: string;
+        last: string;
+        role: number;
+        userType: string;
+    }
+
+    interface GuideStep {
+        id: string;
+        guideId: string;
+        type: string;
+        elementPathRule: string;
+        contentType: string;
+        contentUrl?: string;
+        contentUrlCss?: string;
+        contentUrlJs?: string;
+        rank: number;
+        advanceMethod: "button" | "programatic" /* sic */ | "element";
+        thumbnailUrls?: string;
+        attributes: {
+            height: number;
+            width: number;
+            autoHeight: boolean;
+            position: string;
+            css: string;
+            variables: any;
+        };
+        lastUpdatedAt: number;
+        resetAt: number;
+    }
+}
+
+declare const pendo: pendo.Pendo;
diff --git a/pendo-io-agent/pendo-io-agent-tests.ts b/pendo-io-agent/pendo-io-agent-tests.ts
new file mode 100644
index 0000000000..575b039686
--- /dev/null
+++ b/pendo-io-agent/pendo-io-agent-tests.ts
@@ -0,0 +1,78 @@
+// Examples from: https://developers.pendo.io/docs/?bash#agent-api
+
+pendo.initialize({
+    visitor: {
+        id: "PUT_VISITOR_ID_HERE",
+        name: "Neo",
+        email: "neo@thematrix.io",
+        role: "godlike"
+    },
+    account: {
+        id: "PUT_ACCOUNT_ID_HERE",
+        name: "CorpSchmorp"
+    }
+});
+
+pendo.identify(
+    "PUT_VISITOR_ID_HERE",
+    "PUT_ACCOUNT_ID_HERE"
+);
+
+pendo.identify({
+    visitor: {
+        id: "PUT_VISITOR_ID_HERE",
+        name: "Neo",
+        email: "neo@thematrix.io",
+        role: "godlike"
+    },
+    account: {
+        id: "PUT_ACCOUNT_ID_HERE",
+        name: "CorpSchmorp"
+    }
+});
+
+pendo.debugging.getEventCache();
+
+pendo.events
+    .ready(function () {
+        // Do something once `pendo.isReady()` would return `true`
+    })
+    .guidesLoaded(function () {
+        // Do something when Guides load
+    })
+    .guidesFailed(function () {
+        // Do something when Guides fail to load
+    });
+
+pendo.initialize({
+    apiKey: 'YOUR_API_KEY',
+    visitor: { id: "" },
+    account: { id: "" },
+    events: {
+        ready: function () {
+            // Do something when pendo is initialized
+        }
+    }
+});
+
+pendo.track("User Registered", {
+    userId: "user.id",
+    plan: "user.plan",
+    accountType: "Facebook"
+});
+
+try {
+    throw new Error();
+}
+catch (error) {
+    pendo.track("JIRA-12345--error-tripped", {
+        message: error.message,
+        stack: error.stack
+    });
+}
+
+pendo.dom("").closest('._pendo-guide-next_')
+
+pendo.onGuideAdvanced();
+pendo.onGuideAdvanced({ steps: 2 });
+pendo.onGuideDismissed();
diff --git a/pendo-io-agent/tsconfig.json b/pendo-io-agent/tsconfig.json
new file mode 100644
index 0000000000..4ee19675e0
--- /dev/null
+++ b/pendo-io-agent/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pendo-io-agent-tests.ts"
+    ]
+}
diff --git a/pendo-io-agent/tslint.json b/pendo-io-agent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/pendo-io-agent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pendo-io-agent/index.d.ts b/types/pendo-io-agent/index.d.ts
new file mode 100644
index 0000000000..edd35a96fd
--- /dev/null
+++ b/types/pendo-io-agent/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for pendo-io-agent x.x
+// Project: https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ If this library is callable (e.g. can be invoked as myLib(3)),
+ *~ include those call signatures here.
+ *~ Otherwise, delete this section.
+ */
+declare function myLib(a: string): string;
+declare function myLib(a: number): number;
+
+/*~ If you want the name of this library to be a valid type name,
+ *~ you can do so here.
+ *~
+ *~ For example, this allows us to write 'var x: myLib';
+ *~ Be sure this actually makes sense! If it doesn't, just
+ *~ delete this declaration and add types inside the namespace below.
+ */
+interface myLib {
+    name: string;
+    length: number;
+    extras?: string[];
+}
+
+/*~ If your library has properties exposed on a global variable,
+ *~ place them here.
+ *~ You should also place types (interfaces and type alias) here.
+ */
+declare namespace myLib {
+    //~ We can write 'myLib.timeout = 50;'
+    let timeout: number;
+
+    //~ We can access 'myLib.version', but not change it
+    const version: string;
+
+    //~ There's some class we can create via 'let c = new myLib.Cat(42)'
+    //~ Or reference e.g. 'function f(c: myLib.Cat) { ... }
+    class Cat {
+        constructor(n: number);
+
+        //~ We can read 'c.age' from a 'Cat' instance
+        readonly age: number;
+
+        //~ We can invoke 'c.purr()' from a 'Cat' instance
+        purr(): void;
+    }
+
+    //~ We can declare a variable as
+    //~   'var s: myLib.CatSettings = { weight: 5, name: "Maru" };'
+    interface CatSettings {
+        weight: number;
+        name: string;
+        tailLength?: number;
+    }
+
+    //~ We can write 'const v: myLib.VetID = 42;'
+    //~  or 'const v: myLib.VetID = "bob";'
+    type VetID = string | number;
+
+    //~ We can invoke 'myLib.checkCat(c)' or 'myLib.checkCat(c, v);'
+    function checkCat(c: Cat, s?: VetID);
+}
diff --git a/types/pendo-io-agent/pendo-io-agent-tests.ts b/types/pendo-io-agent/pendo-io-agent-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/pendo-io-agent/tsconfig.json b/types/pendo-io-agent/tsconfig.json
new file mode 100644
index 0000000000..35695dd90c
--- /dev/null
+++ b/types/pendo-io-agent/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pendo-io-agent-tests.ts"
+    ]
+}
diff --git a/types/pendo-io-agent/tslint.json b/types/pendo-io-agent/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pendo-io-agent/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c018882991198c685b6c38741242bab5435839dc Mon Sep 17 00:00:00 2001
From: tkow <t.kusama0613@outlook.jp>
Date: Tue, 5 Mar 2019 13:02:16 +0900
Subject: [PATCH 360/924] add createMaterialTopTabNavigator test

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

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index cf933d43ba..2f7c65f9cd 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -36,6 +36,7 @@ import {
     createSwitchNavigator,
     SwitchNavigatorConfig,
     TabBarTop,
+    createMaterialTopTabNavigator,
     TabNavigatorConfig,
     Transitioner,
     HeaderBackButton,
@@ -244,6 +245,20 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
     },
 };
 
+const BasicTabNavigator = createMaterialTopTabNavigator(
+    routeConfigMap,
+    tabNavigatorConfig,
+);
+
+function renderBasicTabNavigator(): JSX.Element {
+    return (
+        <BasicTabNavigator
+            ref={(ref: any) => { }}
+            style={[viewStyle, undefined]} // Test that we are using StyleProp
+        />
+    );
+}
+
 /**
  * Stack navigator.
  */

From 3f04dbeed99039d96b22dedd04bb456765b466a4 Mon Sep 17 00:00:00 2001
From: Aaron Beall <contact@abeall.com>
Date: Mon, 4 Mar 2019 23:07:34 -0500
Subject: [PATCH 361/924] Moved dir to /types

---
 pendo-io-agent/index.d.ts                    | 166 ---------------
 pendo-io-agent/pendo-io-agent-tests.ts       |  78 -------
 pendo-io-agent/tsconfig.json                 |  23 --
 pendo-io-agent/tslint.json                   |   1 -
 types/pendo-io-agent/index.d.ts              | 211 ++++++++++++++-----
 types/pendo-io-agent/pendo-io-agent-tests.ts |  78 +++++++
 types/pendo-io-agent/tsconfig.json           |   5 +-
 7 files changed, 238 insertions(+), 324 deletions(-)
 delete mode 100644 pendo-io-agent/index.d.ts
 delete mode 100644 pendo-io-agent/pendo-io-agent-tests.ts
 delete mode 100644 pendo-io-agent/tsconfig.json
 delete mode 100644 pendo-io-agent/tslint.json

diff --git a/pendo-io-agent/index.d.ts b/pendo-io-agent/index.d.ts
deleted file mode 100644
index 6429f3b95b..0000000000
--- a/pendo-io-agent/index.d.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-// Type definitions for Pendo.io Agent 2.16
-// Project: https://www.pendo.io/
-// Definitions by: Aaron Beall <https://github.com/aaronbeall>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace pendo {
-    interface Identity {
-        visitor: Visitor;
-        account?: Account;
-    }
-
-    type Metadata = Record<string, string | number | undefined>;
-
-    interface Visitor extends Metadata {
-        id: string;
-    }
-
-    interface Account extends Metadata {
-        id?: string;
-    }
-
-    interface InitOptions extends Identity {
-        apiKey?: string;
-        excludeAllText?: boolean;
-        excludeTitle?: boolean;
-        disablePersistence?: boolean;
-        guides?: {
-            delay?: boolean;
-            disable?: boolean;
-            timeout?: number;
-            tooltip?: {
-                arrowSize?: number;
-            }
-        };
-        events?: EventCallbacks;
-    }
-
-    interface EventCallbacks {
-        ready?(): void;
-        guidesLoaded?(): void;
-        guidesFailed?(): void;
-    }
-
-    interface Pendo {
-        // Initialization and Identification
-        initialize(options: InitOptions): void;
-        identify(visitorId: string, accountId?: string): void;
-        identify(identity: Identity): void;
-        isReady(): boolean;
-        flushNow(): Promise<any>;
-        updateOptions(visitorMetadata: Metadata): void;
-        getVersion(): string;
-        getVisitorId(): string;
-        getAccountId(): string;
-        getCurrentUrl(): string;
-
-        // Guides and Guide Center
-        findGuideByName(name: string): Guide | void;
-        findGuideById(id: string): Guide | void;
-        showGuideByName(name: string): void;
-        showGuideById(id: string): void;
-        toggleLauncher(): void;
-        removeLauncher(): void;
-
-        // Troubleshooting
-        loadGuides(): void;
-        startGuides(): void;
-        stopGuides(): void;
-
-        // Debugging
-        enableDebugging(): void;
-        disableDebugging(): void;
-        isDebuggingEnabled(coerce?: false): "Yes" | "No";
-        isDebuggingEnabled(coerce: true): boolean;
-        debugging: Debugging;
-
-        // Events
-        events: Events;
-        track(trackType: string, metadata?: Metadata): void;
-
-        // Guide Events
-        onGuideAdvanced(step?: GuideStep): void;
-        onGuideAdvanced(steps: { steps: number }): void;
-        onGuidePrevious(step?: GuideStep): void;
-        onGuideDismissed(step?: GuideStep): void;
-        onGuideDismissed(until: { until: "reload" }): void;
-
-        // Other
-        validateInstall(): void;
-        dom(input: any): HTMLElement; // TODO
-    }
-
-    interface Debugging {
-        getEventCache(): any[]; // TODO
-        getAllGuides(): Guide[];
-        getAutoGuides(): { auto: Guide[]; override: Guide[] };
-        getBadgeGuides(): Guide[];
-        getLauncherGuides(): Guide[];
-    }
-
-    type Events = {
-        [K in keyof EventCallbacks]-?: (callback: EventCallbacks[K]) => Events;
-    };
-
-    interface Guide {
-        createdByUser: User;
-        createdAt: number;
-        lastUpdatedByUser: User;
-        lastUpdatedAt: number;
-        kind: string;
-        rootVersionId: string;
-        stableVersionId: string;
-        id: string;
-        name: string;
-        state: "published" | "staged" | "draft" | "disabled";
-        launchMethod: "api" | "automatic" | "badge" | "dom" | "launcher";
-        isMultiStep: boolean;
-        steps: GuideStep[];
-        attributes: {
-            type: string;
-            device: { desktop: boolean; mobile: boolean; type: "desktop" | "mobile" };
-            badge: any;
-            priority: number;
-            launcher: { keywords: string[] };
-        };
-        audience: any[]; // TODO
-        audienceUiHint: { filters: any[] }; // TODO
-        resetAt: number;
-        publishedAt: number;
-    }
-
-    interface User {
-        id: string;
-        username: string;
-        first: string;
-        last: string;
-        role: number;
-        userType: string;
-    }
-
-    interface GuideStep {
-        id: string;
-        guideId: string;
-        type: string;
-        elementPathRule: string;
-        contentType: string;
-        contentUrl?: string;
-        contentUrlCss?: string;
-        contentUrlJs?: string;
-        rank: number;
-        advanceMethod: "button" | "programatic" /* sic */ | "element";
-        thumbnailUrls?: string;
-        attributes: {
-            height: number;
-            width: number;
-            autoHeight: boolean;
-            position: string;
-            css: string;
-            variables: any;
-        };
-        lastUpdatedAt: number;
-        resetAt: number;
-    }
-}
-
-declare const pendo: pendo.Pendo;
diff --git a/pendo-io-agent/pendo-io-agent-tests.ts b/pendo-io-agent/pendo-io-agent-tests.ts
deleted file mode 100644
index 575b039686..0000000000
--- a/pendo-io-agent/pendo-io-agent-tests.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Examples from: https://developers.pendo.io/docs/?bash#agent-api
-
-pendo.initialize({
-    visitor: {
-        id: "PUT_VISITOR_ID_HERE",
-        name: "Neo",
-        email: "neo@thematrix.io",
-        role: "godlike"
-    },
-    account: {
-        id: "PUT_ACCOUNT_ID_HERE",
-        name: "CorpSchmorp"
-    }
-});
-
-pendo.identify(
-    "PUT_VISITOR_ID_HERE",
-    "PUT_ACCOUNT_ID_HERE"
-);
-
-pendo.identify({
-    visitor: {
-        id: "PUT_VISITOR_ID_HERE",
-        name: "Neo",
-        email: "neo@thematrix.io",
-        role: "godlike"
-    },
-    account: {
-        id: "PUT_ACCOUNT_ID_HERE",
-        name: "CorpSchmorp"
-    }
-});
-
-pendo.debugging.getEventCache();
-
-pendo.events
-    .ready(function () {
-        // Do something once `pendo.isReady()` would return `true`
-    })
-    .guidesLoaded(function () {
-        // Do something when Guides load
-    })
-    .guidesFailed(function () {
-        // Do something when Guides fail to load
-    });
-
-pendo.initialize({
-    apiKey: 'YOUR_API_KEY',
-    visitor: { id: "" },
-    account: { id: "" },
-    events: {
-        ready: function () {
-            // Do something when pendo is initialized
-        }
-    }
-});
-
-pendo.track("User Registered", {
-    userId: "user.id",
-    plan: "user.plan",
-    accountType: "Facebook"
-});
-
-try {
-    throw new Error();
-}
-catch (error) {
-    pendo.track("JIRA-12345--error-tripped", {
-        message: error.message,
-        stack: error.stack
-    });
-}
-
-pendo.dom("").closest('._pendo-guide-next_')
-
-pendo.onGuideAdvanced();
-pendo.onGuideAdvanced({ steps: 2 });
-pendo.onGuideDismissed();
diff --git a/pendo-io-agent/tsconfig.json b/pendo-io-agent/tsconfig.json
deleted file mode 100644
index 4ee19675e0..0000000000
--- a/pendo-io-agent/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pendo-io-agent-tests.ts"
-    ]
-}
diff --git a/pendo-io-agent/tslint.json b/pendo-io-agent/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/pendo-io-agent/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/pendo-io-agent/index.d.ts b/types/pendo-io-agent/index.d.ts
index edd35a96fd..6429f3b95b 100644
--- a/types/pendo-io-agent/index.d.ts
+++ b/types/pendo-io-agent/index.d.ts
@@ -1,63 +1,166 @@
-// Type definitions for pendo-io-agent x.x
-// Project: https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
-// Definitions by: My Self <https://github.com/me>
+// Type definitions for Pendo.io Agent 2.16
+// Project: https://www.pendo.io/
+// Definitions by: Aaron Beall <https://github.com/aaronbeall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/*~ If this library is callable (e.g. can be invoked as myLib(3)),
- *~ include those call signatures here.
- *~ Otherwise, delete this section.
- */
-declare function myLib(a: string): string;
-declare function myLib(a: number): number;
-
-/*~ If you want the name of this library to be a valid type name,
- *~ you can do so here.
- *~
- *~ For example, this allows us to write 'var x: myLib';
- *~ Be sure this actually makes sense! If it doesn't, just
- *~ delete this declaration and add types inside the namespace below.
- */
-interface myLib {
-    name: string;
-    length: number;
-    extras?: string[];
-}
-
-/*~ If your library has properties exposed on a global variable,
- *~ place them here.
- *~ You should also place types (interfaces and type alias) here.
- */
-declare namespace myLib {
-    //~ We can write 'myLib.timeout = 50;'
-    let timeout: number;
-
-    //~ We can access 'myLib.version', but not change it
-    const version: string;
-
-    //~ There's some class we can create via 'let c = new myLib.Cat(42)'
-    //~ Or reference e.g. 'function f(c: myLib.Cat) { ... }
-    class Cat {
-        constructor(n: number);
-
-        //~ We can read 'c.age' from a 'Cat' instance
-        readonly age: number;
-
-        //~ We can invoke 'c.purr()' from a 'Cat' instance
-        purr(): void;
+declare namespace pendo {
+    interface Identity {
+        visitor: Visitor;
+        account?: Account;
     }
 
-    //~ We can declare a variable as
-    //~   'var s: myLib.CatSettings = { weight: 5, name: "Maru" };'
-    interface CatSettings {
-        weight: number;
+    type Metadata = Record<string, string | number | undefined>;
+
+    interface Visitor extends Metadata {
+        id: string;
+    }
+
+    interface Account extends Metadata {
+        id?: string;
+    }
+
+    interface InitOptions extends Identity {
+        apiKey?: string;
+        excludeAllText?: boolean;
+        excludeTitle?: boolean;
+        disablePersistence?: boolean;
+        guides?: {
+            delay?: boolean;
+            disable?: boolean;
+            timeout?: number;
+            tooltip?: {
+                arrowSize?: number;
+            }
+        };
+        events?: EventCallbacks;
+    }
+
+    interface EventCallbacks {
+        ready?(): void;
+        guidesLoaded?(): void;
+        guidesFailed?(): void;
+    }
+
+    interface Pendo {
+        // Initialization and Identification
+        initialize(options: InitOptions): void;
+        identify(visitorId: string, accountId?: string): void;
+        identify(identity: Identity): void;
+        isReady(): boolean;
+        flushNow(): Promise<any>;
+        updateOptions(visitorMetadata: Metadata): void;
+        getVersion(): string;
+        getVisitorId(): string;
+        getAccountId(): string;
+        getCurrentUrl(): string;
+
+        // Guides and Guide Center
+        findGuideByName(name: string): Guide | void;
+        findGuideById(id: string): Guide | void;
+        showGuideByName(name: string): void;
+        showGuideById(id: string): void;
+        toggleLauncher(): void;
+        removeLauncher(): void;
+
+        // Troubleshooting
+        loadGuides(): void;
+        startGuides(): void;
+        stopGuides(): void;
+
+        // Debugging
+        enableDebugging(): void;
+        disableDebugging(): void;
+        isDebuggingEnabled(coerce?: false): "Yes" | "No";
+        isDebuggingEnabled(coerce: true): boolean;
+        debugging: Debugging;
+
+        // Events
+        events: Events;
+        track(trackType: string, metadata?: Metadata): void;
+
+        // Guide Events
+        onGuideAdvanced(step?: GuideStep): void;
+        onGuideAdvanced(steps: { steps: number }): void;
+        onGuidePrevious(step?: GuideStep): void;
+        onGuideDismissed(step?: GuideStep): void;
+        onGuideDismissed(until: { until: "reload" }): void;
+
+        // Other
+        validateInstall(): void;
+        dom(input: any): HTMLElement; // TODO
+    }
+
+    interface Debugging {
+        getEventCache(): any[]; // TODO
+        getAllGuides(): Guide[];
+        getAutoGuides(): { auto: Guide[]; override: Guide[] };
+        getBadgeGuides(): Guide[];
+        getLauncherGuides(): Guide[];
+    }
+
+    type Events = {
+        [K in keyof EventCallbacks]-?: (callback: EventCallbacks[K]) => Events;
+    };
+
+    interface Guide {
+        createdByUser: User;
+        createdAt: number;
+        lastUpdatedByUser: User;
+        lastUpdatedAt: number;
+        kind: string;
+        rootVersionId: string;
+        stableVersionId: string;
+        id: string;
         name: string;
-        tailLength?: number;
+        state: "published" | "staged" | "draft" | "disabled";
+        launchMethod: "api" | "automatic" | "badge" | "dom" | "launcher";
+        isMultiStep: boolean;
+        steps: GuideStep[];
+        attributes: {
+            type: string;
+            device: { desktop: boolean; mobile: boolean; type: "desktop" | "mobile" };
+            badge: any;
+            priority: number;
+            launcher: { keywords: string[] };
+        };
+        audience: any[]; // TODO
+        audienceUiHint: { filters: any[] }; // TODO
+        resetAt: number;
+        publishedAt: number;
     }
 
-    //~ We can write 'const v: myLib.VetID = 42;'
-    //~  or 'const v: myLib.VetID = "bob";'
-    type VetID = string | number;
+    interface User {
+        id: string;
+        username: string;
+        first: string;
+        last: string;
+        role: number;
+        userType: string;
+    }
 
-    //~ We can invoke 'myLib.checkCat(c)' or 'myLib.checkCat(c, v);'
-    function checkCat(c: Cat, s?: VetID);
+    interface GuideStep {
+        id: string;
+        guideId: string;
+        type: string;
+        elementPathRule: string;
+        contentType: string;
+        contentUrl?: string;
+        contentUrlCss?: string;
+        contentUrlJs?: string;
+        rank: number;
+        advanceMethod: "button" | "programatic" /* sic */ | "element";
+        thumbnailUrls?: string;
+        attributes: {
+            height: number;
+            width: number;
+            autoHeight: boolean;
+            position: string;
+            css: string;
+            variables: any;
+        };
+        lastUpdatedAt: number;
+        resetAt: number;
+    }
 }
+
+declare const pendo: pendo.Pendo;
diff --git a/types/pendo-io-agent/pendo-io-agent-tests.ts b/types/pendo-io-agent/pendo-io-agent-tests.ts
index e69de29bb2..575b039686 100644
--- a/types/pendo-io-agent/pendo-io-agent-tests.ts
+++ b/types/pendo-io-agent/pendo-io-agent-tests.ts
@@ -0,0 +1,78 @@
+// Examples from: https://developers.pendo.io/docs/?bash#agent-api
+
+pendo.initialize({
+    visitor: {
+        id: "PUT_VISITOR_ID_HERE",
+        name: "Neo",
+        email: "neo@thematrix.io",
+        role: "godlike"
+    },
+    account: {
+        id: "PUT_ACCOUNT_ID_HERE",
+        name: "CorpSchmorp"
+    }
+});
+
+pendo.identify(
+    "PUT_VISITOR_ID_HERE",
+    "PUT_ACCOUNT_ID_HERE"
+);
+
+pendo.identify({
+    visitor: {
+        id: "PUT_VISITOR_ID_HERE",
+        name: "Neo",
+        email: "neo@thematrix.io",
+        role: "godlike"
+    },
+    account: {
+        id: "PUT_ACCOUNT_ID_HERE",
+        name: "CorpSchmorp"
+    }
+});
+
+pendo.debugging.getEventCache();
+
+pendo.events
+    .ready(function () {
+        // Do something once `pendo.isReady()` would return `true`
+    })
+    .guidesLoaded(function () {
+        // Do something when Guides load
+    })
+    .guidesFailed(function () {
+        // Do something when Guides fail to load
+    });
+
+pendo.initialize({
+    apiKey: 'YOUR_API_KEY',
+    visitor: { id: "" },
+    account: { id: "" },
+    events: {
+        ready: function () {
+            // Do something when pendo is initialized
+        }
+    }
+});
+
+pendo.track("User Registered", {
+    userId: "user.id",
+    plan: "user.plan",
+    accountType: "Facebook"
+});
+
+try {
+    throw new Error();
+}
+catch (error) {
+    pendo.track("JIRA-12345--error-tripped", {
+        message: error.message,
+        stack: error.stack
+    });
+}
+
+pendo.dom("").closest('._pendo-guide-next_')
+
+pendo.onGuideAdvanced();
+pendo.onGuideAdvanced({ steps: 2 });
+pendo.onGuideDismissed();
diff --git a/types/pendo-io-agent/tsconfig.json b/types/pendo-io-agent/tsconfig.json
index 35695dd90c..4ee19675e0 100644
--- a/types/pendo-io-agent/tsconfig.json
+++ b/types/pendo-io-agent/tsconfig.json
@@ -1,12 +1,13 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From ef25a112620ddf8e21f902efa98432ef8f6325ed Mon Sep 17 00:00:00 2001
From: Aaron Beall <contact@abeall.com>
Date: Mon, 4 Mar 2019 23:31:51 -0500
Subject: [PATCH 362/924] Renamed to pendo-io-browser per tslint, other lint
 fixes

---
 .../{pendo-io-agent => pendo-io-browser}/index.d.ts |  3 ++-
 .../pendo-io-browser-tests.ts}                      | 13 ++++++-------
 .../tsconfig.json                                   |  3 ++-
 .../tslint.json                                     |  0
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename types/{pendo-io-agent => pendo-io-browser}/index.d.ts (98%)
 rename types/{pendo-io-agent/pendo-io-agent-tests.ts => pendo-io-browser/pendo-io-browser-tests.ts} (88%)
 rename types/{pendo-io-agent => pendo-io-browser}/tsconfig.json (87%)
 rename types/{pendo-io-agent => pendo-io-browser}/tslint.json (100%)

diff --git a/types/pendo-io-agent/index.d.ts b/types/pendo-io-browser/index.d.ts
similarity index 98%
rename from types/pendo-io-agent/index.d.ts
rename to types/pendo-io-browser/index.d.ts
index 6429f3b95b..dfc04e25d4 100644
--- a/types/pendo-io-agent/index.d.ts
+++ b/types/pendo-io-browser/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Pendo.io Agent 2.16
+// Type definitions for non-npm package Pendo.io Agent 2.16
 // Project: https://www.pendo.io/
 // Definitions by: Aaron Beall <https://github.com/aaronbeall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
 
 declare namespace pendo {
     interface Identity {
diff --git a/types/pendo-io-agent/pendo-io-agent-tests.ts b/types/pendo-io-browser/pendo-io-browser-tests.ts
similarity index 88%
rename from types/pendo-io-agent/pendo-io-agent-tests.ts
rename to types/pendo-io-browser/pendo-io-browser-tests.ts
index 575b039686..16db208cda 100644
--- a/types/pendo-io-agent/pendo-io-agent-tests.ts
+++ b/types/pendo-io-browser/pendo-io-browser-tests.ts
@@ -34,13 +34,13 @@ pendo.identify({
 pendo.debugging.getEventCache();
 
 pendo.events
-    .ready(function () {
+    .ready(() => {
         // Do something once `pendo.isReady()` would return `true`
     })
-    .guidesLoaded(function () {
+    .guidesLoaded(() => {
         // Do something when Guides load
     })
-    .guidesFailed(function () {
+    .guidesFailed(() => {
         // Do something when Guides fail to load
     });
 
@@ -49,7 +49,7 @@ pendo.initialize({
     visitor: { id: "" },
     account: { id: "" },
     events: {
-        ready: function () {
+        ready() {
             // Do something when pendo is initialized
         }
     }
@@ -63,15 +63,14 @@ pendo.track("User Registered", {
 
 try {
     throw new Error();
-}
-catch (error) {
+} catch (error) {
     pendo.track("JIRA-12345--error-tripped", {
         message: error.message,
         stack: error.stack
     });
 }
 
-pendo.dom("").closest('._pendo-guide-next_')
+pendo.dom("").closest('._pendo-guide-next_');
 
 pendo.onGuideAdvanced();
 pendo.onGuideAdvanced({ steps: 2 });
diff --git a/types/pendo-io-agent/tsconfig.json b/types/pendo-io-browser/tsconfig.json
similarity index 87%
rename from types/pendo-io-agent/tsconfig.json
rename to types/pendo-io-browser/tsconfig.json
index 4ee19675e0..e5b8fc4c3f 100644
--- a/types/pendo-io-agent/tsconfig.json
+++ b/types/pendo-io-browser/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "module": "commonjs",
         "lib": [
             "es6",
             "dom"
@@ -18,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "pendo-io-agent-tests.ts"
+        "pendo-io-browser-tests.ts"
     ]
 }
diff --git a/types/pendo-io-agent/tslint.json b/types/pendo-io-browser/tslint.json
similarity index 100%
rename from types/pendo-io-agent/tslint.json
rename to types/pendo-io-browser/tslint.json

From 674528b01e60cd6a8a503b6a1953cd245236937b Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Tue, 5 Mar 2019 15:29:24 +1100
Subject: [PATCH 363/924] Added type defs for sntp

---
 types/sntp/index.d.ts    | 41 ++++++++++++++++++++++++++++++++++++++++
 types/sntp/sntp-tests.ts | 18 ++++++++++++++++++
 types/sntp/tsconfig.json | 25 ++++++++++++++++++++++++
 types/sntp/tslint.json   |  3 +++
 4 files changed, 87 insertions(+)
 create mode 100644 types/sntp/index.d.ts
 create mode 100644 types/sntp/sntp-tests.ts
 create mode 100644 types/sntp/tsconfig.json
 create mode 100644 types/sntp/tslint.json

diff --git a/types/sntp/index.d.ts b/types/sntp/index.d.ts
new file mode 100644
index 0000000000..9f94651df8
--- /dev/null
+++ b/types/sntp/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for sntp 3.0
+// Project: https://github.com/hueniverse/sntp
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    host?: string;
+    port?: number;
+    resolveReference?: boolean;
+    timeout?: number;
+}
+
+export interface TimeOptions {
+    isValid: boolean;
+    leapIndicator: string;
+    version: number;
+    mode: string;
+    stratum: string;
+    pollInterval: number;
+    precision: number;
+    rootDelay: number;
+    rootDispersion: number;
+    referenceId: string;
+    referenceTimestamp: number;
+    originateTimestamp: number;
+    receiveTimestamp: number;
+    transmitTimestamp: number;
+    d: number;
+    t: number;
+    receivedLocally: number;
+}
+
+export function start(options?: Options): Promise<void>;
+
+export function stop(): void;
+
+export function offset(): Promise<number>;
+
+export function time(options?: Options): Promise<TimeOptions>;
+
+export function now(): number;
diff --git a/types/sntp/sntp-tests.ts b/types/sntp/sntp-tests.ts
new file mode 100644
index 0000000000..1e6f80d35b
--- /dev/null
+++ b/types/sntp/sntp-tests.ts
@@ -0,0 +1,18 @@
+import Sntp = require('sntp');
+
+const options = {
+    host: 'abc',
+    port: 123,
+};
+
+Sntp.now();
+
+Sntp.start(options);
+Sntp.start();
+
+Sntp.stop();
+
+Sntp.time(options);
+Sntp.time();
+
+Sntp.offset();
diff --git a/types/sntp/tsconfig.json b/types/sntp/tsconfig.json
new file mode 100644
index 0000000000..4bf279440e
--- /dev/null
+++ b/types/sntp/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "sntp-tests.ts"
+    ]
+}
diff --git a/types/sntp/tslint.json b/types/sntp/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/sntp/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 92060063d559254444c9bdcae6a0ceffdda0a692 Mon Sep 17 00:00:00 2001
From: locknono <guozy0103@outlook.com>
Date: Tue, 5 Mar 2019 11:44:19 +0800
Subject: [PATCH 364/924] add types for d3-cloud

---
 types/d3-cloud/d3-cloud-tests.ts |  3 +++
 types/d3-cloud/index.d.ts        | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/types/d3-cloud/d3-cloud-tests.ts b/types/d3-cloud/d3-cloud-tests.ts
index e3bffed4cb..19a140959f 100644
--- a/types/d3-cloud/d3-cloud-tests.ts
+++ b/types/d3-cloud/d3-cloud-tests.ts
@@ -27,8 +27,11 @@ d3.layout.cloud().size([300, 300])
     .font("Impact")
     .fontSize(function(d:ICompTextSize) { return d.size; })
     .on("end", draw)
+    .random()
+    .canvas()
     .start();
 
+
 function draw(words:ICompTextSize[]) {
   d3.select("body").append("svg")
       .attr("width", 300)
diff --git a/types/d3-cloud/index.d.ts b/types/d3-cloud/index.d.ts
index fdf2dbc719..b0a3b8a78c 100644
--- a/types/d3-cloud/index.d.ts
+++ b/types/d3-cloud/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for d3JS cloud layout plugin by Jason Davies v1.2.2
+// Type definitions for d3JS cloud layout plugin by Jason Davies v1.2.5
 // Project: https://github.com/jasondavies/d3-cloud
-// Definitions by: hans windhoff <https://github.com/hansrwindhoff>
+// Definitions by: hans windhoff <https://github.com/hansrwindhoff>, locknono <https://github.com/locknono>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as d3 from 'd3';
@@ -71,6 +71,24 @@ declare module 'd3' {
             padding(padding: number): Cloud<T>;
             padding(padding: (datum: T, index: number) => number): Cloud<T>;
 
+             /**
+             * If specified, sets the internal random number generator,used for selecting the initial position of each word,
+             * and the clockwise/counterclockwise direction of the spiral for each word.
+             * 
+             * @param randomFunction should return a number in the range [0, 1).The default is Math.random.
+             */
+            random(): Cloud<T>;
+            random(randomFunction: () => number): Cloud<T>;
+
+            /**
+             * If specified, sets the canvas generator function, which is used internally to draw text.
+             * When using Node.js, you will almost definitely override the default, e.g. using the canvas module.
+             * @param canvasGenerator should return a HTMLCanvasElement.The default is:  ()=>{document.createElement("canvas");}
+             * 
+             */
+            canvas():Cloud<T>;
+            canvas(canvasGenerator: () => HTMLCanvasElement): Cloud<T>;
+
             on(type: "word", listener: (word: T) => void): Cloud<T>;
             on(type: "end", listener: (tags: T[], bounds: { x: number; y: number }[]) => void): Cloud<T>;
             on(type: string, listener: (...args: any[]) => void): Cloud<T>;

From d6bdcea216db4fb7c546bb72e51cee1b1753ae92 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Tue, 5 Mar 2019 17:15:20 +1100
Subject: [PATCH 365/924] Added type defs for gl-vec2

---
 types/gl-vec2/add.d.ts            |   6 ++
 types/gl-vec2/clone.d.ts          |   6 ++
 types/gl-vec2/copy.d.ts           |   6 ++
 types/gl-vec2/create.d.ts         |   6 ++
 types/gl-vec2/cross.d.ts          |   6 ++
 types/gl-vec2/dist.d.ts           |   6 ++
 types/gl-vec2/div.d.ts            |   6 ++
 types/gl-vec2/dot.d.ts            |   6 ++
 types/gl-vec2/equals.d.ts         |   6 ++
 types/gl-vec2/exactEquals.d.ts    |   6 ++
 types/gl-vec2/floor.d.ts          |   6 ++
 types/gl-vec2/forEach.d.ts        |   6 ++
 types/gl-vec2/fromValues.d.ts     |   6 ++
 types/gl-vec2/gl-vec2-tests.ts    | 134 ++++++++++++++++++++++++++++++
 types/gl-vec2/index.d.ts          |  75 +++++++++++++++++
 types/gl-vec2/inverse.d.ts        |   6 ++
 types/gl-vec2/len.d.ts            |   6 ++
 types/gl-vec2/lerp.d.ts           |   6 ++
 types/gl-vec2/limit.d.ts          |   6 ++
 types/gl-vec2/max.d.ts            |   6 ++
 types/gl-vec2/min.d.ts            |   6 ++
 types/gl-vec2/mul.d.ts            |   6 ++
 types/gl-vec2/negate.d.ts         |   6 ++
 types/gl-vec2/normalize.d.ts      |   6 ++
 types/gl-vec2/random.d.ts         |   6 ++
 types/gl-vec2/scale.d.ts          |   6 ++
 types/gl-vec2/scaleAndAdd.d.ts    |   6 ++
 types/gl-vec2/set.d.ts            |   6 ++
 types/gl-vec2/sqrDist.d.ts        |   6 ++
 types/gl-vec2/sqrLen.d.ts         |   6 ++
 types/gl-vec2/sub.d.ts            |   6 ++
 types/gl-vec2/transformMat2.d.ts  |   6 ++
 types/gl-vec2/transformMat2d.d.ts |   6 ++
 types/gl-vec2/transformMat3.d.ts  |   6 ++
 types/gl-vec2/transformMat4.d.ts  |   6 ++
 types/gl-vec2/tsconfig.json       |  58 +++++++++++++
 types/gl-vec2/tslint.json         |   3 +
 37 files changed, 468 insertions(+)
 create mode 100644 types/gl-vec2/add.d.ts
 create mode 100644 types/gl-vec2/clone.d.ts
 create mode 100644 types/gl-vec2/copy.d.ts
 create mode 100644 types/gl-vec2/create.d.ts
 create mode 100644 types/gl-vec2/cross.d.ts
 create mode 100644 types/gl-vec2/dist.d.ts
 create mode 100644 types/gl-vec2/div.d.ts
 create mode 100644 types/gl-vec2/dot.d.ts
 create mode 100644 types/gl-vec2/equals.d.ts
 create mode 100644 types/gl-vec2/exactEquals.d.ts
 create mode 100644 types/gl-vec2/floor.d.ts
 create mode 100644 types/gl-vec2/forEach.d.ts
 create mode 100644 types/gl-vec2/fromValues.d.ts
 create mode 100644 types/gl-vec2/gl-vec2-tests.ts
 create mode 100644 types/gl-vec2/index.d.ts
 create mode 100644 types/gl-vec2/inverse.d.ts
 create mode 100644 types/gl-vec2/len.d.ts
 create mode 100644 types/gl-vec2/lerp.d.ts
 create mode 100644 types/gl-vec2/limit.d.ts
 create mode 100644 types/gl-vec2/max.d.ts
 create mode 100644 types/gl-vec2/min.d.ts
 create mode 100644 types/gl-vec2/mul.d.ts
 create mode 100644 types/gl-vec2/negate.d.ts
 create mode 100644 types/gl-vec2/normalize.d.ts
 create mode 100644 types/gl-vec2/random.d.ts
 create mode 100644 types/gl-vec2/scale.d.ts
 create mode 100644 types/gl-vec2/scaleAndAdd.d.ts
 create mode 100644 types/gl-vec2/set.d.ts
 create mode 100644 types/gl-vec2/sqrDist.d.ts
 create mode 100644 types/gl-vec2/sqrLen.d.ts
 create mode 100644 types/gl-vec2/sub.d.ts
 create mode 100644 types/gl-vec2/transformMat2.d.ts
 create mode 100644 types/gl-vec2/transformMat2d.d.ts
 create mode 100644 types/gl-vec2/transformMat3.d.ts
 create mode 100644 types/gl-vec2/transformMat4.d.ts
 create mode 100644 types/gl-vec2/tsconfig.json
 create mode 100644 types/gl-vec2/tslint.json

diff --git a/types/gl-vec2/add.d.ts b/types/gl-vec2/add.d.ts
new file mode 100644
index 0000000000..f19025387f
--- /dev/null
+++ b/types/gl-vec2/add.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Adds two vec2's
+ */
+declare function add(out: number[], a: number[], b: number[]): number[];
+
+export = add;
diff --git a/types/gl-vec2/clone.d.ts b/types/gl-vec2/clone.d.ts
new file mode 100644
index 0000000000..53f4fd9aea
--- /dev/null
+++ b/types/gl-vec2/clone.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Creates a new vec2 initialized with values from an existing vector
+ */
+declare function clone(a: number[]): number[];
+
+export = clone;
diff --git a/types/gl-vec2/copy.d.ts b/types/gl-vec2/copy.d.ts
new file mode 100644
index 0000000000..8236100308
--- /dev/null
+++ b/types/gl-vec2/copy.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Copy the values from one vec2 to another.
+ */
+declare function copy(out: number[], a: number[]): number[];
+
+export = copy;
diff --git a/types/gl-vec2/create.d.ts b/types/gl-vec2/create.d.ts
new file mode 100644
index 0000000000..26b76eee80
--- /dev/null
+++ b/types/gl-vec2/create.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Creates a new, empty vec2.
+ */
+declare function create(): number[];
+
+export = create;
diff --git a/types/gl-vec2/cross.d.ts b/types/gl-vec2/cross.d.ts
new file mode 100644
index 0000000000..6ce6cab5f4
--- /dev/null
+++ b/types/gl-vec2/cross.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Computes the cross product of two vec2's Note that the cross product must by definition produce a 3D vector.
+ */
+declare function cross(out: number[], a: number[], b: number[]): number[];
+
+export = cross;
diff --git a/types/gl-vec2/dist.d.ts b/types/gl-vec2/dist.d.ts
new file mode 100644
index 0000000000..d83a49e3fb
--- /dev/null
+++ b/types/gl-vec2/dist.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Calculates the euclidian distance between two vec2's. Aliased as dist.
+ */
+declare function dist(a: number[], b: number[]): number;
+
+export = dist;
diff --git a/types/gl-vec2/div.d.ts b/types/gl-vec2/div.d.ts
new file mode 100644
index 0000000000..7999d6f3e9
--- /dev/null
+++ b/types/gl-vec2/div.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Divides two vec2's. Aliased as div.
+ */
+declare function div(out: number[], a: number[], b: number[]): number[];
+
+export = div;
diff --git a/types/gl-vec2/dot.d.ts b/types/gl-vec2/dot.d.ts
new file mode 100644
index 0000000000..60a7c484dc
--- /dev/null
+++ b/types/gl-vec2/dot.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Calculates the dot product of two vec2's.
+ */
+declare function dot(a: number[], b: number[]): number;
+
+export = dot;
diff --git a/types/gl-vec2/equals.d.ts b/types/gl-vec2/equals.d.ts
new file mode 100644
index 0000000000..3892372e7e
--- /dev/null
+++ b/types/gl-vec2/equals.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns whether or not the vectors have approximately the same elements in the same position.
+ */
+declare function equals(a: number[], b: number[]): boolean;
+
+export = equals;
diff --git a/types/gl-vec2/exactEquals.d.ts b/types/gl-vec2/exactEquals.d.ts
new file mode 100644
index 0000000000..ce8772b5fc
--- /dev/null
+++ b/types/gl-vec2/exactEquals.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns whether or not the vectors exactly have the same elements in the same position (when compared with ===).
+ */
+declare function exactEquals(a: number[], b: number[]): boolean;
+
+export = exactEquals;
diff --git a/types/gl-vec2/floor.d.ts b/types/gl-vec2/floor.d.ts
new file mode 100644
index 0000000000..7909d20a23
--- /dev/null
+++ b/types/gl-vec2/floor.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Math.floor the components of a vec2.
+ */
+declare function floor(out: number[], a: number[]): number[];
+
+export = floor;
diff --git a/types/gl-vec2/forEach.d.ts b/types/gl-vec2/forEach.d.ts
new file mode 100644
index 0000000000..7da060f549
--- /dev/null
+++ b/types/gl-vec2/forEach.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Perform some operation over an array of vec2s.
+ */
+declare function forEach(a: number[], stride: number, offset: number, count: number, fn: (a: number[], b: number[], arg: object) => number[], arg: object): number[];
+
+export = forEach;
diff --git a/types/gl-vec2/fromValues.d.ts b/types/gl-vec2/fromValues.d.ts
new file mode 100644
index 0000000000..7a3f7928e9
--- /dev/null
+++ b/types/gl-vec2/fromValues.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Creates a new vec2 initialized with the given values.
+ */
+declare function fromValues(x: number, y: number): number[];
+
+export = fromValues;
diff --git a/types/gl-vec2/gl-vec2-tests.ts b/types/gl-vec2/gl-vec2-tests.ts
new file mode 100644
index 0000000000..6db61462ac
--- /dev/null
+++ b/types/gl-vec2/gl-vec2-tests.ts
@@ -0,0 +1,134 @@
+import GlVec2 = require("gl-vec2");
+
+import GlVec2Add = require("gl-vec2/add");
+import GlVec2Clone = require("gl-vec2/clone");
+import GlVec2Copy = require("gl-vec2/copy");
+import GlVec2Create = require("gl-vec2/create");
+import GlVec2Cross = require("gl-vec2/cross");
+import GlVec2Dist = require("gl-vec2/dist");
+import GlVec2Div = require("gl-vec2/div");
+import GlVec2Dot = require("gl-vec2/dot");
+import GlVec2Equals = require("gl-vec2/equals");
+import GlVec2exactEquals = require("gl-vec2/exactEquals");
+import GlVec2forEach = require("gl-vec2/forEach");
+import GlVec2fromValues = require("gl-vec2/fromValues");
+import GlVec2Floor = require("gl-vec2/floor");
+import GlVec2Inverse = require("gl-vec2/inverse");
+import GlVec2Len = require("gl-vec2/len");
+import GlVec2Lerp = require("gl-vec2/lerp");
+import GlVec2Limit = require("gl-vec2/limit");
+import GlVec2Max = require("gl-vec2/max");
+import GlVec2Min = require("gl-vec2/min");
+import GlVec2Mul = require("gl-vec2/mul");
+import GlVec2Negate = require("gl-vec2/negate");
+import GlVec2Normalize = require("gl-vec2/normalize");
+import GlVec2Random = require("gl-vec2/random");
+import GlVec2Scale = require("gl-vec2/scale");
+import GlVec2ScaleAndAdd = require("gl-vec2/scaleAndAdd");
+import GlVec2Set = require("gl-vec2/set");
+import GlVec2SqrDist = require("gl-vec2/sqrDist");
+import GlVec2SqrLen = require("gl-vec2/sqrLen");
+import GlVec2Sub = require("gl-vec2/sub");
+import GlVec2TransformMat2 = require("gl-vec2/transformMat2");
+import GlVec2TransformMat2d = require("gl-vec2/transformMat2d");
+import GlVec2TransformMat3 = require("gl-vec2/transformMat3");
+import GlVec2TransformMat4 = require("gl-vec2/transformMat4");
+
+GlVec2.add([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Add([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.clone([1, 2, 3]);
+GlVec2Clone([1, 2, 3]);
+
+GlVec2.copy([1, 2, 3], [1, 2, 3]);
+GlVec2Copy([1, 2, 3], [1, 2, 3]);
+
+GlVec2.create();
+GlVec2Create();
+
+GlVec2.cross([1, 2], [1, 2], [1, 2]);
+GlVec2Cross([1, 2], [1, 2], [1, 2]);
+
+GlVec2.dist([1, 2, 3], [1, 2, 3]);
+GlVec2Dist([1, 2, 3], [1, 2, 3]);
+
+GlVec2.div([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Div([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.dot([1, 2, 3], [1, 2, 3]);
+GlVec2Dot([1, 2, 3], [1, 2, 3]);
+
+GlVec2.forEach([1, 2, 3], 5, 6, 1, () => [3], {});
+GlVec2forEach([1, 2, 3], 5, 6, 1, () => [3], {});
+
+GlVec2.fromValues(1, 2);
+GlVec2fromValues(1, 2);
+
+GlVec2.floor([1, 2], [1, 2]);
+GlVec2Floor([1, 2], [1, 2]);
+
+GlVec2.equals([1, 2, 3], [1, 2, 3]);
+GlVec2Equals([1, 2, 3], [1, 2, 3]);
+
+GlVec2.exactEquals([1, 2, 3], [1, 2, 3]);
+GlVec2exactEquals([1, 2, 3], [1, 2, 3]);
+
+GlVec2.inverse([1, 2, 3], [1, 2, 3]);
+GlVec2Inverse([1, 2, 3], [1, 2, 3]);
+
+GlVec2.len([1, 2, 3]);
+GlVec2Len([1, 2, 3]);
+
+GlVec2.lerp([1, 2, 3], [1, 2, 3], [1, 2, 3], 6);
+GlVec2Lerp([1, 2, 3], [1, 2, 3], [1, 2, 3], 6);
+
+GlVec2.limit([1, 2], [1, 2], 5);
+GlVec2Limit([1, 2], [1, 2], 5);
+
+GlVec2.max([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Max([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.min([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Min([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.mul([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Mul([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.negate([1, 2, 3], [1, 2, 3]);
+GlVec2Negate([1, 2, 3], [1, 2, 3]);
+
+GlVec2.normalize([1, 2, 3], [1, 2, 3]);
+GlVec2Normalize([1, 2, 3], [1, 2, 3]);
+
+GlVec2.random([1, 2, 3], 6);
+GlVec2Random([1, 2, 3], 6);
+
+GlVec2.scale([1, 2, 3], [1, 2, 3], 6);
+GlVec2Scale([1, 2, 3], [1, 2, 3], 6);
+
+GlVec2.scaleAndAdd([1, 2, 3], [1, 2, 3], [1, 2, 3], 6);
+GlVec2ScaleAndAdd([1, 2, 3], [1, 2, 3], [1, 2, 3], 6);
+
+GlVec2.set([1, 2], 1, 2);
+GlVec2Set([1, 2], 1, 2);
+
+GlVec2.sqrDist([1, 2, 3], [1, 2, 3]);
+GlVec2SqrDist([1, 2, 3], [1, 2, 3]);
+
+GlVec2.sqrLen([1, 2, 3]);
+GlVec2SqrLen([1, 2, 3]);
+
+GlVec2.sub([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2Sub([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.transformMat2([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2TransformMat2([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.transformMat2([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2TransformMat2d([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.transformMat3([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2TransformMat3([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+
+GlVec2.transformMat4([1, 2, 3], [1, 2, 3], [1, 2, 3]);
+GlVec2TransformMat4([1, 2, 3], [1, 2, 3], [1, 2, 3]);
diff --git a/types/gl-vec2/index.d.ts b/types/gl-vec2/index.d.ts
new file mode 100644
index 0000000000..65eb6ae91a
--- /dev/null
+++ b/types/gl-vec2/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for gl-vec2 1.3
+// Project: https://github.com/stackgl/gl-vec2
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import add = require('./add');
+import clone = require('./clone');
+import copy = require('./copy');
+import create = require('./create');
+import cross = require('./cross');
+import dist = require('./dist');
+import div = require('./div');
+import dot = require('./dot');
+import equals = require('./equals');
+import exactEquals = require('./exactEquals');
+import floor = require('./floor');
+import forEach = require('./forEach');
+import fromValues = require('./fromValues');
+import inverse = require('./inverse');
+import len = require('./len');
+import lerp = require('./lerp');
+import limit = require('./limit');
+import max = require('./max');
+import min = require('./min');
+import mul = require('./mul');
+import negate = require('./negate');
+import normalize = require('./normalize');
+import random = require('./random');
+import scale = require('./scale');
+import scaleAndAdd = require('./scaleAndAdd');
+import set = require('./set');
+import sqrDist = require('./sqrDist');
+import sqrLen = require('./sqrLen');
+import sub = require('./sub');
+import transformMat2 = require('./transformMat2');
+import transformMat2d = require('./transformMat2d');
+import transformMat3 = require('./transformMat3');
+import transformMat4 = require('./transformMat4');
+
+export {
+    add,
+    clone,
+    copy,
+    create,
+    cross,
+    dist,
+    div,
+    dot,
+    equals,
+    exactEquals,
+    floor,
+    forEach,
+    fromValues,
+    inverse,
+    len,
+    lerp,
+    limit,
+    max,
+    min,
+    mul,
+    negate,
+    normalize,
+    random,
+    scale,
+    scaleAndAdd,
+    set,
+    sqrDist,
+    sqrLen,
+    sub,
+    transformMat2,
+    transformMat2d,
+    transformMat3,
+    transformMat4
+};
diff --git a/types/gl-vec2/inverse.d.ts b/types/gl-vec2/inverse.d.ts
new file mode 100644
index 0000000000..af3840b2a0
--- /dev/null
+++ b/types/gl-vec2/inverse.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns the inverse of the components of a vec2.
+ */
+declare function inverse(out: number[], a: number[]): number[];
+
+export = inverse;
diff --git a/types/gl-vec2/len.d.ts b/types/gl-vec2/len.d.ts
new file mode 100644
index 0000000000..cfb66abfae
--- /dev/null
+++ b/types/gl-vec2/len.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Calculates the length of a vec2. Aliased as len.
+ */
+declare  function len(a: number[]): number;
+
+export = len;
diff --git a/types/gl-vec2/lerp.d.ts b/types/gl-vec2/lerp.d.ts
new file mode 100644
index 0000000000..d0c4ed4cda
--- /dev/null
+++ b/types/gl-vec2/lerp.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Performs a linear interpolation between two vec2's
+ */
+declare function lerp(out: number[], a: number[], b: number[], t: number): number[];
+
+export = lerp;
diff --git a/types/gl-vec2/limit.d.ts b/types/gl-vec2/limit.d.ts
new file mode 100644
index 0000000000..abf7af287a
--- /dev/null
+++ b/types/gl-vec2/limit.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Limit the magnitude of this vector to the value used for the max parameter.
+ */
+declare function limit(out: number[], a: number[], max: number): number[];
+
+export = limit;
diff --git a/types/gl-vec2/max.d.ts b/types/gl-vec2/max.d.ts
new file mode 100644
index 0000000000..38a64a2c34
--- /dev/null
+++ b/types/gl-vec2/max.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns the maximum of two vec2's.
+ */
+declare function max(out: number[], a: number[], b: number[]): number[];
+
+export = max;
diff --git a/types/gl-vec2/min.d.ts b/types/gl-vec2/min.d.ts
new file mode 100644
index 0000000000..19727a0e4e
--- /dev/null
+++ b/types/gl-vec2/min.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns the minimum of two vec2's.
+ */
+declare function min(out: number[], a: number[], b: number[]): number[];
+
+export = min;
diff --git a/types/gl-vec2/mul.d.ts b/types/gl-vec2/mul.d.ts
new file mode 100644
index 0000000000..0322ca0e9d
--- /dev/null
+++ b/types/gl-vec2/mul.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Multiplies two vec2's. Aliased as mul.
+ */
+declare function mul(out: number[], a: number[], b: number[]): number[];
+
+export = mul;
diff --git a/types/gl-vec2/negate.d.ts b/types/gl-vec2/negate.d.ts
new file mode 100644
index 0000000000..6edb8f50f6
--- /dev/null
+++ b/types/gl-vec2/negate.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Negates the components of a vec2.
+ */
+declare function negate(out: number[], a: number[]): number[];
+
+export = negate;
diff --git a/types/gl-vec2/normalize.d.ts b/types/gl-vec2/normalize.d.ts
new file mode 100644
index 0000000000..139a1c708e
--- /dev/null
+++ b/types/gl-vec2/normalize.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Normalize a number
+ */
+declare function normalize(out: number[], a: number[]): number[];
+
+export = normalize;
diff --git a/types/gl-vec2/random.d.ts b/types/gl-vec2/random.d.ts
new file mode 100644
index 0000000000..0fa076543a
--- /dev/null
+++ b/types/gl-vec2/random.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Generates a random vector with the given scale.
+ */
+declare function random(out: number[], scale: number): number[];
+
+export = random;
diff --git a/types/gl-vec2/scale.d.ts b/types/gl-vec2/scale.d.ts
new file mode 100644
index 0000000000..1348ff78c0
--- /dev/null
+++ b/types/gl-vec2/scale.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Scales a vec2 by a scalar number.
+ */
+declare function scale(out: number[], a: number[], b: number): number[];
+
+export = scale;
diff --git a/types/gl-vec2/scaleAndAdd.d.ts b/types/gl-vec2/scaleAndAdd.d.ts
new file mode 100644
index 0000000000..2a3e9b8a2d
--- /dev/null
+++ b/types/gl-vec2/scaleAndAdd.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Adds two vec2's after scaling the second operand by a scalar value.
+ */
+declare function scaleAndAdd(out: number[], a: number[], b: number[], scale: number): number[];
+
+export = scaleAndAdd;
diff --git a/types/gl-vec2/set.d.ts b/types/gl-vec2/set.d.ts
new file mode 100644
index 0000000000..33ed71f0f3
--- /dev/null
+++ b/types/gl-vec2/set.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Set the components of a vec2 to the given values.
+ */
+declare function set(out: number[], x: number, y: number): number[];
+
+export = set;
diff --git a/types/gl-vec2/sqrDist.d.ts b/types/gl-vec2/sqrDist.d.ts
new file mode 100644
index 0000000000..d510d253e0
--- /dev/null
+++ b/types/gl-vec2/sqrDist.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Calculates the squared euclidian distance between two vec2's. Aliased as sqrDist.
+ */
+declare function sqrDist(a: number[], b: number[]): number[];
+
+export = sqrDist;
diff --git a/types/gl-vec2/sqrLen.d.ts b/types/gl-vec2/sqrLen.d.ts
new file mode 100644
index 0000000000..3237540072
--- /dev/null
+++ b/types/gl-vec2/sqrLen.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Calculates the squared length of a vec2. Aliased as sqrLen.
+ */
+declare function sqrLen(a: number[]): number[];
+
+export = sqrLen;
diff --git a/types/gl-vec2/sub.d.ts b/types/gl-vec2/sub.d.ts
new file mode 100644
index 0000000000..7b5976404d
--- /dev/null
+++ b/types/gl-vec2/sub.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Subtracts vector b from vector a. Aliased as sub.
+ */
+declare function sub(out: number[], a: number[], b: number[]): number[];
+
+export = sub;
diff --git a/types/gl-vec2/transformMat2.d.ts b/types/gl-vec2/transformMat2.d.ts
new file mode 100644
index 0000000000..9ee67f7629
--- /dev/null
+++ b/types/gl-vec2/transformMat2.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Transforms the vec2 with a mat2.
+ */
+declare function transformMat2(out: number[], a: number[], m: number[]): number[];
+
+export = transformMat2;
diff --git a/types/gl-vec2/transformMat2d.d.ts b/types/gl-vec2/transformMat2d.d.ts
new file mode 100644
index 0000000000..978078f1da
--- /dev/null
+++ b/types/gl-vec2/transformMat2d.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Transforms the vec with a mat2d.
+ */
+declare function transformMat2d(out: number[], a: number[], m: number[]): number[];
+
+export = transformMat2d;
diff --git a/types/gl-vec2/transformMat3.d.ts b/types/gl-vec2/transformMat3.d.ts
new file mode 100644
index 0000000000..682ded3966
--- /dev/null
+++ b/types/gl-vec2/transformMat3.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Transforms the vec2 with a mat3 3rd vector component is implicitly '1'
+ */
+declare function transformMat3(out: number[], a: number[], m: number[]): number[];
+
+export = transformMat3;
diff --git a/types/gl-vec2/transformMat4.d.ts b/types/gl-vec2/transformMat4.d.ts
new file mode 100644
index 0000000000..f7f96e6d41
--- /dev/null
+++ b/types/gl-vec2/transformMat4.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Transforms the vec2 with a mat4 3rd vector component is implicitly '0' 4th vector component is implicitly '1'
+ */
+declare function transformMat4(out: number[], a: number[], m: number[]): number[];
+
+export = transformMat4;
diff --git a/types/gl-vec2/tsconfig.json b/types/gl-vec2/tsconfig.json
new file mode 100644
index 0000000000..c1f24a1dad
--- /dev/null
+++ b/types/gl-vec2/tsconfig.json
@@ -0,0 +1,58 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "add.d.ts",
+      "clone.d.ts",
+      "copy.d.ts",
+      "create.d.ts",
+      "cross.d.ts",
+      "dist.d.ts",
+      "div.d.ts",
+      "dot.d.ts",
+      "equals.d.ts",
+      "exactEquals.d.ts",
+      "forEach.d.ts",
+      "fromValues.d.ts",
+      "floor.d.ts",
+      "inverse.d.ts",
+      "len.d.ts",
+      "lerp.d.ts",
+      "limit.d.ts",
+      "max.d.ts",
+      "min.d.ts",
+      "mul.d.ts",
+      "negate.d.ts",
+      "normalize.d.ts",
+      "random.d.ts",
+      "scale.d.ts",
+      "scaleAndAdd.d.ts",
+      "set.d.ts",
+      "sqrDist.d.ts",
+      "sqrLen.d.ts",
+      "sub.d.ts",
+      "transformMat2.d.ts",
+      "transformMat2d.d.ts",
+      "transformMat3.d.ts",
+      "transformMat4.d.ts",
+      "gl-vec2-tests.ts"
+    ]
+}
diff --git a/types/gl-vec2/tslint.json b/types/gl-vec2/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/gl-vec2/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From af5b21291deebf95400956f1c9451dc5c40ba800 Mon Sep 17 00:00:00 2001
From: Florian Keller <github@floriankeller.de>
Date: Thu, 28 Feb 2019 16:55:33 +0100
Subject: [PATCH 366/924] Add types for open-graph

---
 types/open-graph/index.d.ts          | 74 ++++++++++++++++++++++++++++
 types/open-graph/open-graph-tests.ts | 18 +++++++
 types/open-graph/tsconfig.json       | 23 +++++++++
 types/open-graph/tslint.json         |  1 +
 4 files changed, 116 insertions(+)
 create mode 100644 types/open-graph/index.d.ts
 create mode 100644 types/open-graph/open-graph-tests.ts
 create mode 100644 types/open-graph/tsconfig.json
 create mode 100644 types/open-graph/tslint.json

diff --git a/types/open-graph/index.d.ts b/types/open-graph/index.d.ts
new file mode 100644
index 0000000000..14a3fe3ce6
--- /dev/null
+++ b/types/open-graph/index.d.ts
@@ -0,0 +1,74 @@
+// Type definitions for open-graph 0.2
+// Project: https://github.com/samholmes/node-open-graph
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="cheerio" />
+
+declare namespace og {
+    interface Metadata {
+        [key: string]: string | string[] | undefined;
+        /** An alternate url to use if the webpage requires HTTPS. */
+        secure_url?: string | string[];
+        /** A MIME type for this image. */
+        type?: string | string[];
+    }
+
+    interface ImageVideoMetadata extends Metadata {
+        /** A description of what is in the image (not a caption). If the page specifies an `og:image` it should specify `og:image:alt`. */
+        alt?: string | string[];
+        /** The number of pixels high. */
+        height?: string | string[];
+        /** The  */
+        url?: string | string[];
+        /** The number of pixels wide. */
+        width?: string | string[];
+    }
+
+    interface Data {
+        [key: string]: string | string[] | ImageVideoMetadata | Metadata | undefined;
+        /** A URL to an audio file to accompany this object. */
+        audio?: string | string[] | Metadata;
+        /** A one to two sentence description of your object. */
+        description?: string | string[];
+        /**
+         * The word that appears before this object's title in a sentence. An enum of (a, an, the, "", auto).
+         * If auto is chosen, the consumer of your data should chose between "a" or "an". Default is "" (blank).
+         */
+        determiner?: string | string[];
+        /** An image URL which should represent your object within the graph. */
+        image?: string | string[] | ImageVideoMetadata;
+        /** The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`. */
+        locale?:
+            | string | string[]
+            | {
+                  /** An array of other locales this page is available in. */
+                  alternate?: string | string[];
+              };
+        /** If your object is part of a larger web site, the name which should be displayed for the overall site. e.g., "IMDb". */
+        site_name?: string | string[];
+        /** The title of your object as it should appear within the graph, e.g., "The Rock". */
+        title: string | string[];
+        /** The type of your object, e.g., "video.movie". Depending on the type you specify, other properties may also be required. */
+        type?: string | string[];
+        /** The canonical URL of your object that will be used as its permanent ID in the graph, e.g., "http://www.imdb.com/title/tt0117500/". */
+        url?: string | string[];
+        /** A URL to a video file that complements this object. */
+        video?: string | string[] | ImageVideoMetadata;
+    }
+
+    type DataCallback = (err: Error | null, data: Data | undefined) => void;
+    type RequestCallback = (err: Error | null, data: string | undefined) => void;
+
+    interface Options {
+        strict?: boolean;
+    }
+
+    function parse(websiteContent: string, options?: Options): Data;
+    function getHTML(url: string | Cheerio, callback: RequestCallback): void;
+}
+
+declare function og(url: string, callback: og.DataCallback, options?: og.Options): void;
+
+export = og;
diff --git a/types/open-graph/open-graph-tests.ts b/types/open-graph/open-graph-tests.ts
new file mode 100644
index 0000000000..4e3db10438
--- /dev/null
+++ b/types/open-graph/open-graph-tests.ts
@@ -0,0 +1,18 @@
+import og = require('open-graph');
+
+const url = 'http://github.com/samholmes/node-open-graph/raw/master/test.html';
+
+og(url, (err, meta) => {
+    if (meta) {
+        meta.custom;
+        meta.description; // $ExpectType string | string[] | undefined
+    }
+});
+
+og.parse('content', {
+    strict: true,
+});
+
+og.getHTML('http://github.com/samholmes/node-open-graph/raw/master/test.html', (err, data) => {
+    data; // $ExpectType string | undefined
+});
diff --git a/types/open-graph/tsconfig.json b/types/open-graph/tsconfig.json
new file mode 100644
index 0000000000..72fa10a12d
--- /dev/null
+++ b/types/open-graph/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",
+        "open-graph-tests.ts"
+    ]
+}
diff --git a/types/open-graph/tslint.json b/types/open-graph/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/open-graph/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b2e95f16384b941696ef8b8c36b5c208786a0d72 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Tue, 5 Mar 2019 10:59:46 +0100
Subject: [PATCH 367/924] Update Select.d.ts

---
 types/react-select/lib/Select.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react-select/lib/Select.d.ts b/types/react-select/lib/Select.d.ts
index 11853f6be9..fd85909702 100644
--- a/types/react-select/lib/Select.d.ts
+++ b/types/react-select/lib/Select.d.ts
@@ -50,7 +50,9 @@ export interface FormatOptionLabelMeta<OptionType> {
   selectValue: ValueType<OptionType>;
 }
 
-export interface Props<OptionType = { label: string; value: string }> {
+type SelectComponentsProps = { [key in string]: any };
+
+export interface Props<OptionType = { label: string; value: string }> extends SelectComponentsProps {
   /* Aria label (for assistive tech) */
   'aria-label'?: string;
   /* HTML ID of an element that should be used as the label (for assistive tech) */

From 15e163aef6e358fcf8d522cc5419ab686e6db8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?v=C3=A9gtelens=C3=A9g?= <siya@stackworx.io>
Date: Tue, 5 Mar 2019 13:17:02 +0200
Subject: [PATCH 368/924] Added missing prop for the multi select component

---
 types/react-widgets/lib/Multiselect.d.ts    |  61 ++++--
 types/react-widgets/react-widgets-tests.tsx | 196 ++++++++++----------
 2 files changed, 139 insertions(+), 118 deletions(-)

diff --git a/types/react-widgets/lib/Multiselect.d.ts b/types/react-widgets/lib/Multiselect.d.ts
index 56a2753d3e..afafdfcb12 100644
--- a/types/react-widgets/lib/Multiselect.d.ts
+++ b/types/react-widgets/lib/Multiselect.d.ts
@@ -1,12 +1,14 @@
-import * as React from 'react';
-import { ReactWidgetsCommonDropdownProps, AutoFocus } from './CommonProps';
+import * as React from "react";
+import { ReactWidgetsCommonDropdownProps, AutoFocus } from "./CommonProps";
 
-interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectClass>, AutoFocus {
+interface MultiselectProps
+    extends ReactWidgetsCommonDropdownProps<MultiselectClass>,
+        AutoFocus {
     /**
      * Enables the list option creation UI. onFilter will only the UI when actively filtering for a list item.
      * @default 'onFilter'
      */
-    allowCreate?: boolean | 'onFilter';
+    allowCreate?: boolean | "onFilter";
     /**
      * The current values of the Multiselect. The value should can null, or an array of
      * valueField values, or an array of objects (such as a few items in the data array)
@@ -20,20 +22,26 @@ interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectCl
      * Change event Handler that is called when the value is changed. The handler is called with
      * an array of values.
      */
-    onChange?: (dataItems: any[], metadata: {
-        dataItem: any;
-        action: 'insert' | 'remove';
-        originalEvent?: any;
-        lastValue?: any[];
-        searchTerm?: string;
-    }) => void;
+    onChange?: (
+        dataItems: any[],
+        metadata: {
+            dataItem: any;
+            action: "insert" | "remove";
+            originalEvent?: any;
+            lastValue?: any[];
+            searchTerm?: string;
+        }
+    ) => void;
     /**
      * This handler fires when an item has been selected from the list. It fires before the
      * onChange handler, and fires regardless of whether the value has actually changed
      */
-    onSelect?: (value: any, metadata: {
-        originalEvent: any;
-    }) => void;
+    onSelect?: (
+        value: any,
+        metadata: {
+            originalEvent: any;
+        }
+    ) => void;
     /**
      * This handler fires when the user chooses to create a new tag, not in the data list. It is
      * up to the widget parent to implement creation logic, a common implementation is shown
@@ -100,11 +108,14 @@ interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectCl
      * Called when the value of the text box changes either from typing or a pasted value.
      * onSearch should be used when the searchTerm prop is set.
      */
-    onSearch?: (searchTerm: string, metadata: {
-        action: 'clear' | 'input';
-        lastSearchTerm?: string;
-        originalEvent?: any;
-    }) => void;
+    onSearch?: (
+        searchTerm: string,
+        metadata: {
+            action: "clear" | "input";
+            lastSearchTerm?: string;
+            originalEvent?: any;
+        }
+    ) => void;
     /**
      * Whether or not the Multiselect is open. When unset (undefined) the Multiselect will
      * handle the opening and closing internally. The defaultOpen prop can be used to set an
@@ -124,7 +135,12 @@ interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectCl
      * item (analogous to the array.filter builtin)
      * @default startsWith
      */
-    filter?: false | "startsWith" | "endsWith" | "contains" | ((dataItem: any, searchTerm: string) => boolean);
+    filter?:
+        | false
+        | "startsWith"
+        | "endsWith"
+        | "contains"
+        | ((dataItem: any, searchTerm: string) => boolean);
     /**
      * Use in conjunction with the filter prop. Filter the list without regard for case. This
      * only applies to non function values for filter.
@@ -167,6 +183,11 @@ interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectCl
      * The transition component is also injected with a dropUp prop indicating the direction it should open.
      */
     popupTransition?: React.ReactType | string;
+
+    /**
+     * Adds a css class to the input container element.
+     */
+    containerClassName?: string;
 }
 
 interface MultiselectMessages {
diff --git a/types/react-widgets/react-widgets-tests.tsx b/types/react-widgets/react-widgets-tests.tsx
index 2a4023d23a..522c0b4d05 100644
--- a/types/react-widgets/react-widgets-tests.tsx
+++ b/types/react-widgets/react-widgets-tests.tsx
@@ -1,7 +1,15 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
-import { Calendar, Combobox, DateTimePicker, DropdownList, Multiselect, NumberPicker, SelectList } from "react-widgets";
+import {
+    Calendar,
+    Combobox,
+    DateTimePicker,
+    DropdownList,
+    Multiselect,
+    NumberPicker,
+    SelectList
+} from "react-widgets";
 
 function tagComponent(props: { value: string }) {
     return <span>{props.value}</span>;
@@ -18,105 +26,97 @@ function listComponent(props: { value: string }) {
 class Test extends React.Component<React.Props<{}>> {
     render() {
         return (
-        <div>
             <div>
-                <Calendar />
-                <Combobox />
-                <DateTimePicker />
-                <DropdownList />
-                <Multiselect />
-                <NumberPicker />
-                <SelectList />
+                <div>
+                    <Calendar />
+                    <Combobox />
+                    <DateTimePicker />
+                    <DropdownList />
+                    <Multiselect />
+                    <NumberPicker />
+                    <SelectList />
+                </div>
+                <div>
+                    <Calendar defaultValue={new Date()} />
+                    <Combobox defaultValue={"foo"} />
+                    <DateTimePicker defaultValue={new Date()} />
+                    <DropdownList defaultValue={"foo"} />
+                    <Multiselect defaultValue={["foo"]} />
+                    <NumberPicker defaultValue={1} />
+                    <SelectList defaultValue={"foo"} />
+                </div>
+                <div>
+                    <Multiselect
+                        tagComponent={tagComponent}
+                        itemComponent={itemComponent}
+                    />
+                    <Combobox
+                        itemComponent={itemComponent}
+                        listComponent={listComponent}
+                    />
+                    <DropdownList
+                        itemComponent={itemComponent}
+                        listComponent={listComponent}
+                    />
+                    <Multiselect listComponent={listComponent} />
+                    <SelectList listComponent={listComponent} />
+                </div>
+                <div>
+                    <Calendar disabled readOnly />
+                    <Combobox
+                        disabled
+                        readOnly
+                        dropUp
+                        placeholder={"Some text"}
+                    />
+                    <DateTimePicker disabled readOnly dropUp />
+                    <DropdownList disabled readOnly dropUp />
+                    <Multiselect disabled readOnly dropUp />
+                    <NumberPicker disabled readOnly />
+                    <SelectList disabled readOnly />
+                </div>
+                <div>
+                    <Calendar
+                        autoFocus
+                        defaultValue={new Date()}
+                        defaultView="year"
+                        views={["year", "decade"]}
+                    />
+                    <Combobox autoFocus delay={300} name="box" />
+                    <Combobox
+                        busy
+                        busySpinner={<span className="fas fa-sync fa-spin" />}
+                    />
+                    <DateTimePicker autoFocus open="date" />
+                    <DropdownList
+                        autoFocus
+                        delay={350}
+                        name="list"
+                        multiple={false}
+                    />
+                    <DropdownList containerClassName="list-items" />
+                    <Multiselect autoFocus allowCreate />
+                    <Multiselect containerClassName="multiselect-container" />
+                    <NumberPicker
+                        autoFocus
+                        name="numbers"
+                        placeholder="hello"
+                    />
+                    <SelectList
+                        autoFocus
+                        delay={400}
+                        tabIndex={-1}
+                        name="list"
+                    />
+                </div>
+                <div>
+                    <DateTimePicker
+                        dropUp={true}
+                        containerClassName="d-flex"
+                        timeIcon={<i className="fa fa-clock" />}
+                    />
+                </div>
             </div>
-            <div>
-                <Calendar defaultValue={new Date()} />
-                <Combobox defaultValue={'foo'} />
-                <DateTimePicker defaultValue={new Date()} />
-                <DropdownList defaultValue={'foo'} />
-                <Multiselect defaultValue={['foo']} />
-                <NumberPicker defaultValue={1}/>
-                <SelectList defaultValue={'foo'} />
-            </div>
-            <div>
-                <Multiselect
-                    tagComponent={tagComponent}
-                    itemComponent={itemComponent}
-                 />
-                 <Combobox
-                    itemComponent={itemComponent}
-                    listComponent={listComponent}
-                 />
-                 <DropdownList
-                    itemComponent={itemComponent}
-                    listComponent={listComponent}
-                 />
-                 <Multiselect
-                    listComponent={listComponent}
-                />
-                 <SelectList
-                    listComponent={listComponent}
-                />
-            </div>
-            <div>
-                <Calendar disabled readOnly />
-                <Combobox disabled readOnly dropUp placeholder={'Some text'}/>
-                <DateTimePicker disabled readOnly dropUp />
-                <DropdownList disabled readOnly dropUp />
-                <Multiselect disabled readOnly dropUp />
-                <NumberPicker disabled readOnly />
-                <SelectList disabled readOnly />
-            </div>
-            <div>
-                <Calendar
-                    autoFocus
-                    defaultValue={new Date()}
-                    defaultView="year"
-                    views={['year', 'decade']}
-                />
-                <Combobox
-                    autoFocus
-                    delay={300}
-                    name="box"
-                />
-                <Combobox
-                    busy
-                    busySpinner={
-                      <span className="fas fa-sync fa-spin" />
-                    }
-                />
-                <DateTimePicker
-                    autoFocus
-                    open="date"
-                />
-                <DropdownList
-                    autoFocus
-                    delay={350}
-                    name="list"
-                    multiple={false}
-                />
-                <DropdownList
-                    containerClassName="list-items"
-                />
-                <Multiselect
-                    autoFocus
-                    allowCreate
-                />
-                <NumberPicker
-                    autoFocus
-                    name="numbers"
-                    placeholder="hello"
-                />
-                <SelectList
-                    autoFocus
-                    delay={400}
-                    tabIndex={-1}
-                    name="list"
-                />
-            </div>
-            <div>
-                <DateTimePicker dropUp={true} containerClassName="d-flex" timeIcon={<i className="fa fa-clock" />} />
-            </div>
-        </div>
         );
     }
 }

From 55bfcc3dd9681a8fdb07ee44e900198c39270518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20Holhjem?= <haakon@holhjem.net>
Date: Tue, 5 Mar 2019 12:57:58 +0100
Subject: [PATCH 369/924] More missing props and some corrections

From doc:
https://github.com/ericgio/react-bootstrap-typeahead/blob/master/docs/Props.md
---
 types/react-bootstrap-typeahead/index.d.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 18311bccb5..f916a4c293 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -5,6 +5,7 @@
 //                 Paito Anderson <https://github.com/PaitoAnderson>
 //                 Andreas Richter <https://github.com/arichter83>
 //                 Dale Fenton <https://github.com/dalevfenton>
+//                 Håkon Holhjem <https://github.com/KngHawkon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
@@ -126,7 +127,7 @@ export interface TypeaheadProps<T extends TypeaheadModel> {
        but not the list of original options unless handled as such by Typeahead's parent.
        The newly added item will always be returned as an object even if the other options are simply strings,
        so be sure your onChange callback can handle this. */
-    allowNew?: boolean | ((results: T[], props: TypeaheadProps<T>) => boolean);
+    allowNew?: boolean | ((results: T[], props: AllTypeaheadOwnAndInjectedProps<T>) => boolean);
 
     /* Autofocus the input when the component initially mounts. */
     autoFocus?: boolean;
@@ -172,6 +173,9 @@ export interface TypeaheadProps<T extends TypeaheadModel> {
        Does not work with allowNew. */
     highlightOnlyResult?: boolean;
 
+    /* An html id attribute, required for assistive technologies such as screen readers. */
+    id?: string | number;
+
     /* Whether the filter should ignore accents and other diacritical marks. */
     ignoreDiacritics?: boolean;
 
@@ -198,7 +202,7 @@ export interface TypeaheadProps<T extends TypeaheadModel> {
        so as not to render too many DOM nodes in the case of large data sets. */
     maxResults?: number;
 
-    /* Id applied to the top-level menu element. Required for accessibility. */
+    /* DEPRECATED. Id applied to the top-level menu element. Required for accessibility. */
     menuId?: string;
 
     /* Number of input characters that must be entered before showing results. */
@@ -253,6 +257,10 @@ export interface TypeaheadProps<T extends TypeaheadModel> {
     /* Placeholder text for the input. */
     placeholder?: string;
 
+    /* Whether to use fixed positioning for the menu, which is useful when rendering inside a
+    container with overflow: hidden;. Uses absolute positioning by default. */
+    positionFixed?: boolean;
+
     /* Callback for custom menu rendering. */
     renderMenu?: (results: Array<TypeaheadResult<T>>, menuProps: any) => React.ReactNode;
 

From ab5ce28a5c986c59398d2d5c4b4295492b604a3a Mon Sep 17 00:00:00 2001
From: Rob Valentine <rob@codemonkeys.co.za>
Date: Tue, 5 Mar 2019 14:29:23 +0200
Subject: [PATCH 370/924] Added MouseTransition as per module spec

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

diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index 36c161beb0..ea18d98b1a 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -97,7 +97,10 @@ export interface PreviewProps {
  * This is frequently used with the Touch backend to provide a preview on mobile devices.
  */
 export class Preview extends PureComponent<PreviewProps> {}
-
+/**
+ * Pre-existing/default react-dnd-multi-backend transition available to use.
+  */
+ export const MouseTransition: Transition;
 /**
  * Pre-existing/default react-dnd-touch-backend transition available to use.
  * This transition has the setting for "enableMouseEvents" turned on.

From 95ae13766fa48b9cd17ee73b90ad6f9811f91705 Mon Sep 17 00:00:00 2001
From: Rob Valentine <rob@codemonkeys.co.za>
Date: Tue, 5 Mar 2019 14:35:13 +0200
Subject: [PATCH 371/924] Contrib

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

diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index ea18d98b1a..9797be6e28 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/LouisBrunner/react-dnd-multi-backend, https://louisbrunner.github.io/dnd-multi-backend/packages/react-dnd-multi-backend
 // Definitions by: Janeene Beeforth <https://github.com/dawnmist>
 //                 Adam Haglund <https://github.com/beeequeue>
+//                 Rob Valentine <https://github.com/robcodemonkey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From e2969b1b13a910c6e4b1d000feec26b92fbef166 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Tue, 5 Mar 2019 13:42:13 +0100
Subject: [PATCH 372/924] Update Select.d.ts

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

diff --git a/types/react-select/lib/Select.d.ts b/types/react-select/lib/Select.d.ts
index fd85909702..57fef3bb9c 100644
--- a/types/react-select/lib/Select.d.ts
+++ b/types/react-select/lib/Select.d.ts
@@ -50,7 +50,7 @@ export interface FormatOptionLabelMeta<OptionType> {
   selectValue: ValueType<OptionType>;
 }
 
-type SelectComponentsProps = { [key in string]: any };
+export type SelectComponentsProps = { [key in string]: any };
 
 export interface Props<OptionType = { label: string; value: string }> extends SelectComponentsProps {
   /* Aria label (for assistive tech) */

From 11fd8b42509e956ba6b7c4f41a25176723ac3bff Mon Sep 17 00:00:00 2001
From: Marc Knaup <marc@knaup.io>
Date: Tue, 5 Mar 2019 14:17:00 +0100
Subject: [PATCH 373/924] [facebook-js-sdk] Fixed type of
 LoginOptions.auth_type

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

diff --git a/types/facebook-js-sdk/facebook-js-sdk-tests.ts b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
index db8b13686e..8bcd07cbed 100644
--- a/types/facebook-js-sdk/facebook-js-sdk-tests.ts
+++ b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
@@ -48,6 +48,10 @@ FB.logout(function(response: fb.StatusResponse) {
     console.log(response.authResponse.accessToken);
 });
 
+FB.login({ auth_type: 'reauthenticate' });
+FB.login({ auth_type: 'reauthorize' });
+FB.login({ auth_type: 'rerequest' });
+
 FB.logout();
 
 /**
diff --git a/types/facebook-js-sdk/index.d.ts b/types/facebook-js-sdk/index.d.ts
index c4f3b78c31..18da6b5ae9 100644
--- a/types/facebook-js-sdk/index.d.ts
+++ b/types/facebook-js-sdk/index.d.ts
@@ -150,7 +150,7 @@ declare namespace facebook {
     }
 
     interface LoginOptions {
-        auth_type?: 'rerequest';
+        auth_type?: 'reauthenticate' | 'reauthorize' | 'rerequest';
         scope?: string;
         return_scopes?: boolean;
         enable_profile_selector?: boolean;

From ea8883df25191abe36aa8c6bf1fa0e1d3c144cd4 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jamie.sykes@creode.co.uk>
Date: Tue, 5 Mar 2019 14:08:00 +0000
Subject: [PATCH 374/924] Makes some changes but macros are not valid.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 1c3b8a5813..bc71c9e544 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -52,7 +52,10 @@ collection.sortBy('name'); // $ExpectType Collection<{ name: string; age: number
 collection.stringify(); // $ExpectType string
 collection.sum('age'); // $ExpectType any
 collection.take(2); // $ExpectType Collection<{ name: string; age: number; }>
-collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n)); // $ExpectType any
+
+// Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
+// const collection2 = new Collection([1,2,3,4]).addToMembers(3);
+
 collection.unique(stark => stark.age); // $ExpectType Collection<{ name: string; age: number; }>
 collection.values(); // $ExpectType Collection<{ name: string; age: number; }>
 collection.where('age', 14); // $ExpectType Collection<{ name: string; age: number; }>
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index 40c616fcdb..364877050d 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -16,7 +16,7 @@ export default class Collection<T> {
     count(): number;
     each(callback: (item: T) => void): Collection<T>;
     filter(callback: (item: T) => boolean): Collection<T>;
-    find(item: any): number;
+    find(item: T): number;
     first(callback?: ((item: T) => boolean)|null): T;
     flatten(deep?: boolean): Collection<T>;
     get(index: number): T;
@@ -24,23 +24,24 @@ export default class Collection<T> {
     join(separator?: string): string;
     keys(): Collection<T>;
     last(callback?: ((item: T) => boolean)|null): T;
-    map(callback: (item: T) => any): Collection<T>;
+    map<R>(callback: (item: T) => R): Collection<T>;
     pluck(property: string): Collection<T>;
     push(item: T): Collection<T>;
-    reduce(callback: (previous: T, current: T) => any, initial: any): any;
+    reduce<R>(callback: (previous: R, current: T) => R, initial: R): R;
     reject(callback: (item: T) => boolean): Collection<T>;
-    remove(item: any): boolean;
+    remove(item: T): boolean;
     reverse(): Collection<T>;
     skip(count: number): Collection<T>;
     slice(start: number, end?: number): Collection<T>;
     sort(compare?: () => boolean): Collection<T>;
     sortBy(property: string, order?: string): Collection<T>;
     stringify(): string;
-    sum(property?: string|null): any;
+    sum(property: T extends object ? keyof T : never): number
     take(count: number): Collection<T>;
-    macro(name: string, callback: (...args: any) => any): any;
+    static macro(name: string, callback: (coll: Collection<unknown>, ...args: unknown[]) => unknown): void;
     unique(callback?: string|null|((item: T) => any)): Collection<T>;
     values(): Collection<T>;
-    where(callback: ((item: T) => boolean)|string, value?: any): Collection<T>;
+    where<K extends keyof T>(key: K, value: T[K]): Collection<T>
+    where(callback: (item: T) => boolean): Collection<T>
     zip(array: T[]|Collection<T>): Collection<T>;
 }

From 36e980b5fd44b20788c266c3c9f9d1792f00b934 Mon Sep 17 00:00:00 2001
From: Hitomi Hatsukaze <gigigiaru776@yahoo.co.jp>
Date: Tue, 5 Mar 2019 23:38:57 +0900
Subject: [PATCH 375/924] Add TextRenderer to marked types

---
 types/marked/index.d.ts      | 12 ++++++++++++
 types/marked/marked-tests.ts |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index 78a45b052c..818620bb5e 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -4,6 +4,7 @@
 //                 BendingBender <https://github.com/BendingBender>
 //                 CrossR <https://github.com/CrossR>
 //                 Mike Wickett <https://github.com/mwickett>
+//                 Hitomi Hatsukaze <https://github.com/htkzhtm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace marked;
@@ -102,6 +103,17 @@ declare namespace marked {
         text(text: string): string;
     }
 
+    class TextRenderer {
+        strong(text: string): string;
+        em(text: string): string;
+        codespan(text: string): string;
+        del(text: string): string;
+        text(text: string): string;
+        link(href: string, title: string, text: string): string;
+        image(href: string, title: string, text: string): string;
+        br(): string;
+    }
+
     class Lexer {
         rules: Rules;
         tokens: TokensList;
diff --git a/types/marked/marked-tests.ts b/types/marked/marked-tests.ts
index 0edc376e43..0abfb48efb 100644
--- a/types/marked/marked-tests.ts
+++ b/types/marked/marked-tests.ts
@@ -48,3 +48,6 @@ const slugger = new marked.Slugger();
 renderer.heading = (text, level, raw, slugger) => {
     return text + level.toString() + slugger.slug(raw);
 };
+
+const textRenderer = new marked.TextRenderer();
+console.log(textRenderer.strong(text));

From 974649dd4df36342daadf4ca9d6c8c78938112b1 Mon Sep 17 00:00:00 2001
From: Eugene Kolnick <eugene@gruntwork.io>
Date: Tue, 5 Mar 2019 10:19:18 -0500
Subject: [PATCH 376/924] Added optional custom strategy option: `userEmailURL`

See issue: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/33619
---
 types/passport-github2/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index 0048cfd901..a938e8c36b 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -29,6 +29,7 @@ export interface StrategyOption extends passport.AuthenticateOptions {
     scopeSeparator?: string;
     customHeaders?: OutgoingHttpHeaders;
     userProfileURL?: string;
+    userEmailURL?: string;
 }
 
 export type OAuth2StrategyOptionsWithoutRequiredURLs = Pick<
@@ -50,6 +51,7 @@ export interface _StrategyOptionsBase extends OAuth2StrategyOptionsWithoutRequir
     scopeSeparator?: string;
     customHeaders?: OutgoingHttpHeaders;
     userProfileURL?: string;
+    userEmailURL?: string;
 }
 
 export interface StrategyOptions extends _StrategyOptionsBase {

From 16d1c380cba458122ba900a4fb7245f0efbe4f4a Mon Sep 17 00:00:00 2001
From: Joe O'Hallaron <joseph.ohallaron@radiantsolutions.com>
Date: Tue, 5 Mar 2019 09:35:08 -0700
Subject: [PATCH 377/924] Event listener callbacks can have variable parameters

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

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 398d05ad33..c1be0e4f16 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -706,8 +706,8 @@ declare namespace Cesium {
 
     class Event {
         numberOfListeners: number;
-        addEventListener(listener: () => void, scope?: any): Event.RemoveCallback;
-        removeEventListener(listener: () => void, scope?: any): boolean;
+        addEventListener(listener: (...args: any[]) => void, scope?: any): Event.RemoveCallback;
+        removeEventListener(listener: (...args: any[]) => void, scope?: any): boolean;
         raiseEvent(...args: any[]): void;
     }
 

From 76e6187c4cbec5522430b0f39985f290e47fefc4 Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Mar 2019 11:46:54 -0500
Subject: [PATCH 378/924] [three.js] Remove unresolvable authors

@SereznoKot, @s093294, and @elk941 are usernames that longer exist on Github.
---
 types/three/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index f929ef2383..880f27f0ac 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -3,21 +3,18 @@
 // Definitions by: Kon <http://phyzkit.net/>,
 //                 Satoru Kimura <https://github.com/gyohk>,
 //                 Florent Poujol <https://github.com/florentpoujol>,
-//                 SereznoKot <https://github.com/SereznoKot>,
 //                 HouChunlei <https://github.com/omni360>,
 //                 Ivo <https://github.com/ivoisbelongtous>,
 //                 David Asmuth <https://github.com/piranha771>,
 //                 Brandon Roberge,
 //                 Qinsi ZHU <https://github.com/qszhusightp>,
 //                 Toshiya Nakakura <https://github.com/nakakura>,
-//                 Poul Kjeldager Sørensen <https://github.com/s093294>,
 //                 Stefan Profanter <https://github.com/Pro>,
 //                 Edmund Fokschaner <https://github.com/efokschaner>,
 //                 Roelof Jooste <https://github.com/PsychoSTS>,
 //                 Daniel Hritzkiv <https://github.com/dhritzkiv>,
 //                 Apurva Ojas <https://github.com/apurvaojas>,
 //                 Tiger Oakes <https://github.com/NotWoods>,
-//                 Ethan Kay <https://github.com/elk941>,
 //                 Methuselah96 <https://github.com/Methuselah96>
 //                 Dilip Ramirez <https://github.com/Dukuo>
 //                 Julian Strecker <https://github.com/JulianSSS>

From 8fc1bc0bbe2b3b1aae765e0c648f0d8643e57b3d Mon Sep 17 00:00:00 2001
From: Daniel Hritzkiv <daniel.hritzkiv@gmail.com>
Date: Tue, 5 Mar 2019 11:48:39 -0500
Subject: [PATCH 379/924] [three.js] Remove @dhritzkiv (myself) from definition
 authors

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

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index f929ef2383..1491cd8073 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -14,7 +14,6 @@
 //                 Stefan Profanter <https://github.com/Pro>,
 //                 Edmund Fokschaner <https://github.com/efokschaner>,
 //                 Roelof Jooste <https://github.com/PsychoSTS>,
-//                 Daniel Hritzkiv <https://github.com/dhritzkiv>,
 //                 Apurva Ojas <https://github.com/apurvaojas>,
 //                 Tiger Oakes <https://github.com/NotWoods>,
 //                 Ethan Kay <https://github.com/elk941>,

From a07c515fbd4732a465c01dd617cb99724b71daec Mon Sep 17 00:00:00 2001
From: Ostad <SOstad@kajimausa.com>
Date: Tue, 5 Mar 2019 13:04:15 -0500
Subject: [PATCH 380/924] - add typedef for sendmail package

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

diff --git a/types/sendmail/index.d.ts b/types/sendmail/index.d.ts
new file mode 100644
index 0000000000..191c0514fb
--- /dev/null
+++ b/types/sendmail/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for sendmail 1.4
+// Project: https://github.com/guileen/node-sendmail
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ If this module is a UMD module that exposes a global variable 'myLib' when
+ *~ loaded outside a module loader environment, declare that global here.
+ *~ Otherwise, delete this declaration.
+ */
+declare namespace sendMailConstructor {
+    export interface IOptions {
+        logger?: {
+            debug?: () => void;
+            info?: () => void;
+            warn?: () => void;
+            error?: () => void;
+        };
+        silent?: boolean;
+        /** Default: False */
+        dkim?:
+            | boolean
+            | {
+                  privateKey: string;
+                  keySelector: string;
+              };
+        /** Default: False */
+        devPort?: number | boolean;
+        /** Default: localhost */
+        devHost?: string;
+        /** Default: 25 */
+        smtpPort?: number;
+        /** Default: -1 - extra smtp host after resolveMX */
+        smtpHost?: string | number;
+    }
+
+    export interface IMailInput {
+        from: string;
+        to: string;
+        cc?: string;
+        bcc?: string;
+        replyTo?: string;
+        returnTo?: string;
+        subject: string;
+        type?: string;
+        charset?: string;
+        encoding?: string;
+        id?: string;
+        headers?: object;
+        content?: string;
+        html?: string;
+        attachments?: {
+            type: string;
+            filename: string;
+            content: any;
+        }[];
+    }
+}
+
+type CallbackFn = (err: Error, domain: string) => void;
+
+type SendMailFn = (
+    mail: sendMailConstructor.IMailInput,
+    callback: CallbackFn
+) => void;
+
+declare function sendMailConstructor(
+    options: sendMailConstructor.IOptions
+): SendMailFn;
+
+export = sendMailConstructor;
diff --git a/types/sendmail/sendmail-tests.ts b/types/sendmail/sendmail-tests.ts
new file mode 100644
index 0000000000..f57c3b00d9
--- /dev/null
+++ b/types/sendmail/sendmail-tests.ts
@@ -0,0 +1,24 @@
+import sendmail = require("sendmail");
+
+const emailSender = sendmail({
+    silent: false
+});
+
+const sendEmail = (options: sendmail.IMailInput): Promise<boolean> =>
+    new Promise((resolve, reject) => {
+        emailSender(options, (err, reply) => {
+            // if error happened or returned code is now started with 2**
+            if (err || !reply.startsWith("2")) {
+                reject(err);
+            } else {
+                resolve(true);
+            }
+        });
+    });
+
+sendEmail({
+    from: "Test Mail <noreply@mydomain.com>",
+    to: "test@mydomain.com",
+    subject: "First Test",
+    html: "This is a Test message!"
+});
diff --git a/types/sendmail/tsconfig.json b/types/sendmail/tsconfig.json
new file mode 100644
index 0000000000..c4cf4b7613
--- /dev/null
+++ b/types/sendmail/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sendmail-tests.ts"
+    ]
+}
diff --git a/types/sendmail/tslint.json b/types/sendmail/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sendmail/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 919218e6e65422e832a9551ebf39b9f67e3769bf Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Tue, 5 Mar 2019 10:20:22 -0800
Subject: [PATCH 381/924] added referrerpolicy to anchor tag in react types

---
 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 a2dd9ee144..29123092e6 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -21,6 +21,7 @@
 //                 Jessica Franco <https://github.com/Jessidhia>
 //                 Paul Sherman <https://github.com/pshrmn>
 //                 Sunil Pai <https://github.com/threepointone>
+//                 Saransh Kataria <https://github.com/saranshkataria>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1777,6 +1778,7 @@ declare namespace React {
         rel?: string;
         target?: string;
         type?: string;
+        referrerPolicy?: string;
     }
 
     // tslint:disable-next-line:no-empty-interface

From 55151c0d425b718ad8a929f2bb981e6d9864289d Mon Sep 17 00:00:00 2001
From: Ostad <SOstad@kajimausa.com>
Date: Tue, 5 Mar 2019 13:25:20 -0500
Subject: [PATCH 382/924] -fix linting problems

---
 types/sendmail/index.d.ts        | 15 ++++++++-------
 types/sendmail/sendmail-tests.ts |  2 +-
 types/sendmail/tsconfig.json     | 14 ++++----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/types/sendmail/index.d.ts b/types/sendmail/index.d.ts
index 191c0514fb..a70fc9930f 100644
--- a/types/sendmail/index.d.ts
+++ b/types/sendmail/index.d.ts
@@ -2,13 +2,14 @@
 // Project: https://github.com/guileen/node-sendmail
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /*~ If this module is a UMD module that exposes a global variable 'myLib' when
  *~ loaded outside a module loader environment, declare that global here.
  *~ Otherwise, delete this declaration.
  */
 declare namespace sendMailConstructor {
-    export interface IOptions {
+    interface Options {
         logger?: {
             debug?: () => void;
             info?: () => void;
@@ -33,7 +34,7 @@ declare namespace sendMailConstructor {
         smtpHost?: string | number;
     }
 
-    export interface IMailInput {
+    interface MailInput {
         from: string;
         to: string;
         cc?: string;
@@ -45,26 +46,26 @@ declare namespace sendMailConstructor {
         charset?: string;
         encoding?: string;
         id?: string;
-        headers?: object;
+        headers?: any;
         content?: string;
         html?: string;
-        attachments?: {
+        attachments?: Array<{
             type: string;
             filename: string;
             content: any;
-        }[];
+        }>;
     }
 }
 
 type CallbackFn = (err: Error, domain: string) => void;
 
 type SendMailFn = (
-    mail: sendMailConstructor.IMailInput,
+    mail: sendMailConstructor.MailInput,
     callback: CallbackFn
 ) => void;
 
 declare function sendMailConstructor(
-    options: sendMailConstructor.IOptions
+    options: sendMailConstructor.Options
 ): SendMailFn;
 
 export = sendMailConstructor;
diff --git a/types/sendmail/sendmail-tests.ts b/types/sendmail/sendmail-tests.ts
index f57c3b00d9..5b0f50979b 100644
--- a/types/sendmail/sendmail-tests.ts
+++ b/types/sendmail/sendmail-tests.ts
@@ -4,7 +4,7 @@ const emailSender = sendmail({
     silent: false
 });
 
-const sendEmail = (options: sendmail.IMailInput): Promise<boolean> =>
+const sendEmail = (options: sendmail.MailInput): Promise<boolean> =>
     new Promise((resolve, reject) => {
         emailSender(options, (err, reply) => {
             // if error happened or returned code is now started with 2**
diff --git a/types/sendmail/tsconfig.json b/types/sendmail/tsconfig.json
index c4cf4b7613..248bfdbfdf 100644
--- a/types/sendmail/tsconfig.json
+++ b/types/sendmail/tsconfig.json
@@ -1,22 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "sendmail-tests.ts"
-    ]
+    "files": ["index.d.ts", "sendmail-tests.ts"]
 }

From db16d65e4c903c410be28bdb7374b6178d15d090 Mon Sep 17 00:00:00 2001
From: helloworld111gh <helloworld111gh@users.noreply.github.com>
Date: Tue, 5 Mar 2019 10:28:46 -0800
Subject: [PATCH 383/924] fix missing animation frame on FakeMethod

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

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 052c9c45dc..1a33a60c7d 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -9,7 +9,7 @@
 /**
  * Names of clock methods that may be faked by install.
  */
-type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime" | "requestIdleCallback" | "cancelIdleCallback";
+type FakeMethod = "setTimeout" | "clearTimeout" | "setImmediate" | "clearImmediate" | "setInterval" | "clearInterval" | "Date" | "nextTick" | "hrtime" | "requestAnimationFrame" | "cancelAnimationFrame" | "requestIdleCallback" | "cancelIdleCallback";
 
 /**
  * Global methods avaliable to every clock and also as standalone methods (inside `timers` global object).

From d8f10f57fdaf6b1b21f2828e1f92b43d1e3ab261 Mon Sep 17 00:00:00 2001
From: Ostad <SOstad@kajimausa.com>
Date: Tue, 5 Mar 2019 14:26:09 -0500
Subject: [PATCH 384/924] - change Constructor to Factory

---
 types/sendmail/index.d.ts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/types/sendmail/index.d.ts b/types/sendmail/index.d.ts
index a70fc9930f..ec748e0118 100644
--- a/types/sendmail/index.d.ts
+++ b/types/sendmail/index.d.ts
@@ -1,14 +1,10 @@
 // Type definitions for sendmail 1.4
 // Project: https://github.com/guileen/node-sendmail
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Saeid Ostad <https://github.com/saostad>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/*~ If this module is a UMD module that exposes a global variable 'myLib' when
- *~ loaded outside a module loader environment, declare that global here.
- *~ Otherwise, delete this declaration.
- */
-declare namespace sendMailConstructor {
+declare namespace sendMailFactory {
     interface Options {
         logger?: {
             debug?: () => void;
@@ -60,12 +56,10 @@ declare namespace sendMailConstructor {
 type CallbackFn = (err: Error, domain: string) => void;
 
 type SendMailFn = (
-    mail: sendMailConstructor.MailInput,
+    mail: sendMailFactory.MailInput,
     callback: CallbackFn
 ) => void;
 
-declare function sendMailConstructor(
-    options: sendMailConstructor.Options
-): SendMailFn;
+declare function sendMailFactory(options: sendMailFactory.Options): SendMailFn;
 
-export = sendMailConstructor;
+export = sendMailFactory;

From 61e8cba63cf392513219a5f1c5445c26f5c2a122 Mon Sep 17 00:00:00 2001
From: pirix-gh <pierreantoine.urvoy@gmail.com>
Date: Tue, 5 Mar 2019 21:27:10 +0200
Subject: [PATCH 385/924] curry types

---
 types/ramda/index.d.ts     | 121 +++++++------------------------------
 types/ramda/ramda-tests.ts |  11 +++-
 types/ramda/tools.d.ts     | 114 ++++++++++++++++++++++++++++++++++
 types/ramda/tsconfig.json  |   1 +
 4 files changed, 146 insertions(+), 101 deletions(-)
 create mode 100644 types/ramda/tools.d.ts

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index e1b1f21334..e7536220be 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -27,8 +27,9 @@
 //                 John Ottenlips <https://github.com/jottenlips>
 //                 Nitesh Phadatare <https://github.com/minitesh>
 //                 Krantisinh Deshmukh <https://github.com/krantisinh>
+//                 Pierre-Antoine Mills <https://github.com/pirix-gh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.2
 
 /// <reference path="./es/add.d.ts" />
 /// <reference path="./es/addIndex.d.ts" />
@@ -275,6 +276,7 @@
 /// <reference path="./es/zipObj.d.ts" />
 /// <reference path="./es/zipWith.d.ts" />
 /// <reference path="./es/includes.d.ts" />
+/// <reference path="./tools.d.ts" />
 
 declare let R: R.Static;
 
@@ -366,77 +368,6 @@ declare namespace R {
             never
     };
 
-    // @see https://gist.github.com/donnut/fd56232da58d25ceecf1, comment by @albrow
-    interface CurriedTypeGuard2<T1, T2, R extends T2> {
-        (t1: T1): (t2: T2) => t2 is R;
-        (t1: T1, t2: T2): t2 is R;
-    }
-
-    interface CurriedTypeGuard3<T1, T2, T3, R extends T3> {
-        (t1: T1): CurriedTypeGuard2<T2, T3, R>;
-        (t1: T1, t2: T2): (t3: T3) => t3 is R;
-        (t1: T1, t2: T2, t3: T3): t3 is R;
-    }
-
-    interface CurriedTypeGuard4<T1, T2, T3, T4, R extends T4> {
-        (t1: T1): CurriedTypeGuard3<T2, T3, T4, R>;
-        (t1: T1, t2: T2): CurriedTypeGuard2<T3, T4, R>;
-        (t1: T1, t2: T2, t3: T3): (t4: T4) => t4 is R;
-        (t1: T1, t2: T2, t3: T3, t4: T4): t4 is R;
-    }
-
-    interface CurriedTypeGuard5<T1, T2, T3, T4, T5, R extends T5> {
-        (t1: T1): CurriedTypeGuard4<T2, T3, T4, T5, R>;
-        (t1: T1, t2: T2): CurriedTypeGuard3<T3, T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedTypeGuard2<T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): (t5: T5) => t5 is R;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): t5 is R;
-    }
-
-    interface CurriedTypeGuard6<T1, T2, T3, T4, T5, T6, R extends T6> {
-        (t1: T1): CurriedTypeGuard5<T2, T3, T4, T5, T6, R>;
-        (t1: T1, t2: T2): CurriedTypeGuard4<T3, T4, T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedTypeGuard3<T4, T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedTypeGuard2<T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): (t6: T6) => t6 is R;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): t6 is R;
-    }
-
-    interface CurriedFunction2<T1, T2, R> {
-        (t1: T1): (t2: T2) => R;
-        (t1: T1, t2: T2): R;
-    }
-
-    interface CurriedFunction3<T1, T2, T3, R> {
-        (t1: T1): CurriedFunction2<T2, T3, R>;
-        (t1: T1, t2: T2): (t3: T3) => R;
-        (t1: T1, t2: T2, t3: T3): R;
-    }
-
-    interface CurriedFunction4<T1, T2, T3, T4, R> {
-        (t1: T1): CurriedFunction3<T2, T3, T4, R>;
-        (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
-        (t1: T1, t2: T2, t3: T3): (t4: T4) => R;
-        (t1: T1, t2: T2, t3: T3, t4: T4): R;
-    }
-
-    interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
-        (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
-        (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): (t5: T5) => R;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
-    }
-
-    interface CurriedFunction6<T1, T2, T3, T4, T5, T6, R> {
-        (t1: T1): CurriedFunction5<T2, T3, T4, T5, T6, R>;
-        (t1: T1, t2: T2): CurriedFunction4<T3, T4, T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3): CurriedFunction3<T4, T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction2<T5, T6, R>;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): (t6: T6) => R;
-        (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5, t6: T6): R;
-    }
-
     interface Placeholder { __isRamdaPlaceholder__: true; }
 
     interface Reduced<T> {
@@ -463,11 +394,11 @@ declare namespace R {
          * Creates a new list iteration function from an existing one by adding two new parameters to its callback
          * function: the current index, and the entire list.
          */
-        addIndex<T, U>(fn: (f: (item: T) => U, list: T[]) => U[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => U, ReadonlyArray<T>, U[]>;
+        addIndex<T, U>(fn: (f: (item: T) => U, list: T[]) => U[]): Curry.Curry<(a: (item: T, idx: number, list?: T[]) => U, b: ReadonlyArray<T>) => U[]>;
         /* Special case for forEach */
-        addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[]): CurriedFunction2<(item: T, idx: number, list?: T[]) => void, ReadonlyArray<T>, T[]>;
+        addIndex<T>(fn: (f: (item: T) => void, list: T[]) => T[]): Curry.Curry<(a: (item: T, idx: number, list?: T[]) => void, b: ReadonlyArray<T>) => T[]>;
         /* Special case for reduce */
-        addIndex<T, U>(fn: (f: (acc: U, item: T) => U, aci: U, list: T[]) => U): CurriedFunction3<(acc: U, item: T, idx: number, list?: T[]) => U, U, ReadonlyArray<T>, U>;
+        addIndex<T, U>(fn: (f: (acc: U, item: T) => U, aci: U, list: T[]) => U): Curry.Curry<(a: (acc: U, item: T, idx: number, list?: T[]) => U, b: U, c: ReadonlyArray<T>) => U>;
 
         /**
          * Applies a function to the value at the given index of an array, returning a new copy of the array with the
@@ -583,7 +514,7 @@ declare namespace R {
         assocPath<T, U>(path: Path, __: Placeholder, obj: U): (val: T) => U;
         assocPath<T, U>(path: Path, val: T, obj: U): U;
         assocPath<T, U>(path: Path, val: T): (obj: U) => U;
-        assocPath<T, U>(path: Path): CurriedFunction2<T, U, U>;
+        assocPath<T, U>(path: Path): Curry.Curry<(a: T, b: U) => U>;
 
         /**
          * Wraps a function of any arity (including nullary) in a function that accepts exactly 2
@@ -835,17 +766,7 @@ declare namespace R {
          * Returns a curried equivalent of the provided function. The curried function has two unusual capabilities.
          * First, its arguments needn't be provided one at a time.
          */
-        curry<T1, T2, TResult extends T2>(fn: (a: T1, b: T2) => b is TResult): CurriedTypeGuard2<T1, T2, TResult>;
-        curry<T1, T2, T3, TResult extends T3>(fn: (a: T1, b: T2, c: T3) => c is TResult): CurriedTypeGuard3<T1, T2, T3, TResult>;
-        curry<T1, T2, T3, T4, TResult extends T4>(fn: (a: T1, b: T2, c: T3, d: T4) => d is TResult): CurriedTypeGuard4<T1, T2, T3, T4, TResult>;
-        curry<T1, T2, T3, T4, T5, TResult extends T5>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => e is TResult): CurriedTypeGuard5<T1, T2, T3, T4, T5, TResult>;
-        curry<T1, T2, T3, T4, T5, T6, TResult extends T6>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => f is TResult): CurriedTypeGuard6<T1, T2, T3, T4, T5, T6, TResult>;
-        curry<T1, T2, TResult>(fn: (a: T1, b: T2) => TResult): CurriedFunction2<T1, T2, TResult>;
-        curry<T1, T2, T3, TResult>(fn: (a: T1, b: T2, c: T3) => TResult): CurriedFunction3<T1, T2, T3, TResult>;
-        curry<T1, T2, T3, T4, TResult>(fn: (a: T1, b: T2, c: T3, d: T4) => TResult): CurriedFunction4<T1, T2, T3, T4, TResult>;
-        curry<T1, T2, T3, T4, T5, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => TResult): CurriedFunction5<T1, T2, T3, T4, T5, TResult>;
-        curry<T1, T2, T3, T4, T5, T6, TResult>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => TResult): CurriedFunction6<T1, T2, T3, T4, T5, T6, TResult>;
-        curry(fn: (...a: any[]) => any): (...a: any[]) => any;
+        curry<F extends (...args: any) => any>(f: F): Curry.Curry<F>;
 
         /**
          * Returns a curried equivalent of the provided function, with the specified arity. The curried function has
@@ -970,7 +891,7 @@ declare namespace R {
          */
         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>;
+        eqBy<T, U = T>(fn: (a: T) => U): Curry.Curry<(a: T, b: T) => boolean>;
 
         /**
          * Reports whether two functions have the same value for the specified property.
@@ -1444,7 +1365,7 @@ declare namespace R {
          */
         maxBy<T>(keyFn: (a: T) => Ord, a: T, b: T): T;
         maxBy<T>(keyFn: (a: T) => Ord, a: T): (b: T) => T;
-        maxBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>;
+        maxBy<T>(keyFn: (a: T) => Ord): Curry.Curry<(a: T, b: T) => T>;
 
         /**
          * Returns the mean of the given list of numbers.
@@ -1558,7 +1479,7 @@ declare namespace R {
          */
         minBy<T>(keyFn: (a: T) => Ord, a: T, b: T): T;
         minBy<T>(keyFn: (a: T) => Ord, a: T): (b: T) => T;
-        minBy<T>(keyFn: (a: T) => Ord): CurriedFunction2<T, T, T>;
+        minBy<T>(keyFn: (a: T) => Ord): Curry.Curry<(a: T, b: T) => T>;
 
         /**
          * Divides the second parameter by the first and returns the remainder.
@@ -1727,7 +1648,7 @@ declare namespace R {
          */
         pathEq(path: Path, val: any, obj: any): boolean;
         pathEq(path: Path, val: any): (obj: any) => boolean;
-        pathEq(path: Path): CurriedFunction2<any, any, boolean>;
+        pathEq(path: Path): Curry.Curry<(a: any, b: any) => boolean>;
 
         /**
          * If the given, non-null object has a value at the given path, returns the value at that path.
@@ -1735,14 +1656,14 @@ declare namespace R {
          */
         pathOr<T>(defaultValue: T, path: Path, obj: any): any;
         pathOr<T>(defaultValue: T, path: Path): (obj: any) => any;
-        pathOr<T>(defaultValue: T): CurriedFunction2<Path, any, any>;
+        pathOr<T>(defaultValue: T): Curry.Curry<(a: Path, b: any) => any>;
 
         /**
          * Returns true if the specified object property at given path satisfies the given predicate; false otherwise.
          */
         pathSatisfies<T, U>(pred: (val: T) => boolean, path: Path, obj: U): boolean;
         pathSatisfies<T, U>(pred: (val: T) => boolean, path: Path): (obj: U) => boolean;
-        pathSatisfies<T, U>(pred: (val: T) => boolean): CurriedFunction2<Path, U, boolean>;
+        pathSatisfies<T, U>(pred: (val: T) => boolean): Curry.Curry<(a: Path, b: U) => boolean>;
 
         /**
          * Returns a partial copy of an object containing only the keys specified.  If the key does not exist, the
@@ -2180,7 +2101,7 @@ declare namespace R {
          */
         propSatisfies<T, U>(pred: (val: T) => boolean, name: string, obj: U): boolean;
         propSatisfies<T, U>(pred: (val: T) => boolean, name: string): (obj: U) => boolean;
-        propSatisfies<T, U>(pred: (val: T) => boolean): CurriedFunction2<string, U, boolean>;
+        propSatisfies<T, U>(pred: (val: T) => boolean): Curry.Curry<(a: string, b: U) => boolean>;
 
         /**
          * Returns a list of numbers from `from` (inclusive) to `to`
@@ -2205,8 +2126,8 @@ declare namespace R {
          */
         reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string, list: ReadonlyArray<T>): { [index: string]: TResult };
         reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult, keyFn: (elem: T) => string): (list: ReadonlyArray<T>) => { [index: string]: TResult };
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): CurriedFunction2<(elem: T) => string, ReadonlyArray<T>, { [index: string]: TResult }>;
-        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): CurriedFunction3<TResult, (elem: T) => string, ReadonlyArray<T>, { [index: string]: TResult }>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult, acc: TResult): Curry.Curry<(a: (elem: T) => string, b: ReadonlyArray<T>) => { [index: string]: TResult }>;
+        reduceBy<T, TResult>(valueFn: (acc: TResult, elem: T) => TResult): Curry.Curry<(a: TResult, b: (elem: T) => string, c: ReadonlyArray<T>) => { [index: string]: TResult }>;
 
         /**
          * Returns a value wrapped to indicate that it is the final value of the reduce and
@@ -2232,8 +2153,8 @@ declare namespace R {
          */
         reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean, fn: (acc: TResult, elem: T) => TResult, acc: TResult, list: ReadonlyArray<T>): TResult;
         reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean, fn: (acc: TResult, elem: T) => TResult, acc: TResult): (list: ReadonlyArray<T>) => TResult;
-        reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean, fn: (acc: TResult, elem: T) => TResult): CurriedFunction2<TResult, ReadonlyArray<T>, TResult>;
-        reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean): CurriedFunction3<(acc: TResult, elem: T) => TResult, TResult, ReadonlyArray<T>, TResult>;
+        reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean, fn: (acc: TResult, elem: T) => TResult): Curry.Curry<(a: TResult, b: ReadonlyArray<T>) => TResult>;
+        reduceWhile<T, TResult>(predicate: (acc: TResult, elem: T) => boolean): Curry.Curry<(a: (acc: TResult, elem: T) => TResult, b: TResult, c: ReadonlyArray<T>) => TResult>;
 
         /**
          * Similar to `filter`, except that it keeps only values for which the given predicate
@@ -2387,7 +2308,7 @@ declare namespace R {
          * Duplication is determined according to the value returned by applying the supplied predicate to two list elements.
          */
         symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
-        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<ReadonlyArray<T>, ReadonlyArray<T>, T[]>;
+        symmetricDifferenceWith<T>(pred: (a: T, b: T) => boolean): Curry.Curry<(a: ReadonlyArray<T>, b: ReadonlyArray<T>) => T[]>;
 
         /**
          * A function that always returns true. Any passed in parameters are ignored.
@@ -2581,7 +2502,7 @@ declare namespace R {
          * determined according to the value returned by applying the supplied predicate to two list elements.
          */
         unionWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
-        unionWith<T>(pred: (a: T, b: T) => boolean): CurriedFunction2<ReadonlyArray<T>, ReadonlyArray<T>, T[]>;
+        unionWith<T>(pred: (a: T, b: T) => boolean): Curry.Curry<(a: ReadonlyArray<T>, b: ReadonlyArray<T>) => T[]>;
 
         /**
          * Returns a new list containing only one copy of each element in the original list.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 16ba23d85b..fdac7648db 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -68,6 +68,10 @@ class F2 {
         return a + b + c + d;
     }
 
+    function addTenFixedNumbers(a: 0, b: 1, c: 2, d: 3, e: 4, f: 5, g: 6, h: 7, i: 8, k: 9, l: 10): number {
+        return a + b + c + d;
+    }
+
     const x1: (a: number, b: number, c: number, d: number) => number = R.curry(addFourNumbers);
     // because of the current way of currying, the following call results in a type error
     // const x2: Function = R.curry(addFourNumbers)(1,2,4)
@@ -76,6 +80,8 @@ class F2 {
     const y1: number   = R.curry(addFourNumbers)(1)(2)(3)(4);
     const y2: number   = R.curry(addFourNumbers)(1, 2)(3, 4);
     const y3: number   = R.curry(addFourNumbers)(1, 2, 3)(4);
+    const y4: number   = R.curry(addTenFixedNumbers)(R.__, 1, 2)(0)(3)(R.__, R.__)(R.__, 5)(4)(6, 7)(R.__)(8, R.__, R.__)(9, 10);
+    const y5: number   = R.curry(addTenFixedNumbers)(R.__, 1, R.__)(R.__, 2)(0, 3)(R.__, 5)(4, R.__)(R.__)(6, R.__, 8, 9, 10)(7);
 
     R.nAry(0);
     R.nAry(0, takesNoArg);
@@ -119,7 +125,8 @@ class F2 {
     const cars: Car[] = [{speed: 65}, {}];
     for (const car of cars) {
         if (typeGuardCurried(1)(2)(3)(4)(5)(car)) {
-            drive(car);
+            drive(car); // $ExpectError
+            // Generic Curry solved a previously non reported issue
         }
     }
 };
@@ -2784,3 +2791,5 @@ class Why {
 () => {
     R.bind(console.log, console);
 };
+
+// Curry tests
diff --git a/types/ramda/tools.d.ts b/types/ramda/tools.d.ts
new file mode 100644
index 0000000000..b6f814012b
--- /dev/null
+++ b/types/ramda/tools.d.ts
@@ -0,0 +1,114 @@
+/// <reference path="./index.d.ts" />
+
+// All the following types are explained here:
+// https://medium.freecodecamp.org/typescript-curry-ramda-types-f747e99744ab
+// https://github.com/pirix-gh/medium/blob/master/types-curry-ramda/src/index.ts
+declare namespace Tools {
+    type Head<T extends any[]> =
+        T extends [any, ...any[]]
+        ? T[0]
+        : never;
+
+    type Tail<T extends any[]> =
+        ((...t: T) => any) extends ((_: any, ...tail: infer TT) => any)
+        ? TT
+        : [];
+
+    type HasTail<T extends any[]> =
+        T extends ([] | [any])
+        ? false
+        : true;
+
+    type Last<T extends any[]> = {
+        0: Last<Tail<T>>;
+        1: Head<T>;
+    }[
+        HasTail<T> extends true
+        ? 0
+        : 1
+    ];
+
+    type Length<T extends any[]> =
+        T['length'];
+
+    type Prepend<E, T extends any[]> =
+        ((head: E, ...args: T) => any) extends ((...args: infer U) => any)
+        ? U
+        : T;
+
+    type Drop<N extends number, T extends any[], I extends any[] = []> = {
+        0: Drop<N, Tail<T>, Prepend<any, I>>;
+        1: T;
+    }[
+        Length<I> extends N
+        ? 1
+        : 0
+    ];
+
+    type Cast<X, Y> = X extends Y ? X : Y;
+
+    type Pos<I extends any[]> =
+        Length<I>;
+
+    type Next<I extends any[]> =
+        Prepend<any, I>;
+
+    type Prev<I extends any[]> =
+        Tail<I>;
+
+    type Iterator<Index extends number = 0, From extends any[] = [], I extends any[] = []> = {
+        0: Iterator<Index, Next<From>, Next<I>>;
+        1: From;
+    }[
+        Pos<I> extends Index
+        ? 1
+        : 0
+    ];
+
+    type Reverse<T extends any[], R extends any[] = [], I extends any[] = []> = {
+        0: Reverse<T, Prepend<T[Pos<I>], R>, Next<I>>;
+        1: R;
+    }[
+        Pos<I> extends Length<T>
+        ? 1
+        : 0
+    ];
+
+    type Concat<T1 extends any[], T2 extends any[]> =
+        Reverse<Reverse<T1> extends infer R ? Cast<R, any[]> : never, T2>;
+
+    type Append<E, T extends any[]> =
+        Concat<T, [E]>;
+}
+
+declare namespace Curry {
+    type GapOf<T1 extends any[], T2 extends any[], TN extends any[], I extends any[]> =
+        T1[Tools.Pos<I>] extends R.Placeholder
+        ? Tools.Append<T2[Tools.Pos<I>], TN>
+        : TN;
+
+    type GapsOf<T1 extends any[], T2 extends any[], TN extends any[] = [], I extends any[] = []> = {
+        0: GapsOf<T1, T2, GapOf<T1, T2, TN, I> extends infer G ? Tools.Cast<G, any[]> : never, Tools.Next<I>>;
+        1: Tools.Concat<TN, Tools.Drop<Tools.Pos<I>, T2> extends infer D ? Tools.Cast<D, any[]> : never>;
+    }[
+        Tools.Pos<I> extends Tools.Length<T1>
+        ? 1
+        : 0
+    ];
+
+    type PartialGaps<T extends any[]> = {
+        [K in keyof T]?: T[K] | R.Placeholder
+    };
+
+    type CleanedGaps<T extends any[]> = {
+        [K in keyof T]: NonNullable<T[K]>
+    };
+
+    type Gaps<T extends any[]> = CleanedGaps<PartialGaps<T>>;
+
+    type Curry<F extends ((...args: any) => any)> =
+        <T extends any[]>(...args: Tools.Cast<Tools.Cast<T, Gaps<Parameters<F>>>, any[]>) =>
+            GapsOf<T, Parameters<F>> extends [any, ...any[]]
+            ? Curry<(...args: GapsOf<T, Parameters<F>> extends infer G ? Tools.Cast<G, any[]> : never) => ReturnType<F>>
+            : ReturnType<F>;
+}
diff --git a/types/ramda/tsconfig.json b/types/ramda/tsconfig.json
index 4de4f10d8f..92fcdd531d 100644
--- a/types/ramda/tsconfig.json
+++ b/types/ramda/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
+        "tools.d.ts",
         "ramda-tests.ts"
     ]
 }
\ No newline at end of file

From 33d021fc473863667468290f569a1fc70923c11e Mon Sep 17 00:00:00 2001
From: Ostad <SOstad@kajimausa.com>
Date: Tue, 5 Mar 2019 14:29:31 -0500
Subject: [PATCH 386/924] - add type to headers probperty instead of any

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

diff --git a/types/sendmail/index.d.ts b/types/sendmail/index.d.ts
index ec748e0118..1bab6d27b6 100644
--- a/types/sendmail/index.d.ts
+++ b/types/sendmail/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/guileen/node-sendmail
 // Definitions by: Saeid Ostad <https://github.com/saostad>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 declare namespace sendMailFactory {
     interface Options {
@@ -42,7 +42,7 @@ declare namespace sendMailFactory {
         charset?: string;
         encoding?: string;
         id?: string;
-        headers?: any;
+        headers?: object;
         content?: string;
         html?: string;
         attachments?: Array<{

From 3ea931135ed7225b0182cf4b5aefdb887e5a4252 Mon Sep 17 00:00:00 2001
From: pirix-gh <pierreantoine.urvoy@gmail.com>
Date: Tue, 5 Mar 2019 21:59:08 +0200
Subject: [PATCH 387/924] ramda update version

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index e7536220be..e0313e5957 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ramda 0.25
+// Type definitions for ramda 0.26
 // Project: https://github.com/donnut/typescript-ramda, https://ramdajs.com
 // Definitions by: Erwin Poeze <https://github.com/donnut>
 //                 Tycho Grouwstra <https://github.com/tycho01>

From 53804821fc3acd0cdec1195a8f1c5e7ed2b2b0c1 Mon Sep 17 00:00:00 2001
From: Seth Butler <seth.butler@ibm.com>
Date: Tue, 5 Mar 2019 15:06:56 -0500
Subject: [PATCH 388/924] Allowing ttl to be a function

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

diff --git a/types/connect-redis/index.d.ts b/types/connect-redis/index.d.ts
index c5a26de73a..9b56777ac3 100644
--- a/types/connect-redis/index.d.ts
+++ b/types/connect-redis/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for connect-redis
 // Project: https://npmjs.com/package/connect-redis
 // Definitions by: Xavier Stouder <https://github.com/xstoudi>
+//				   Seth Butler <https://github.com/sbutler2901>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -26,7 +27,7 @@ declare module "connect-redis" {
             port?: number;
             socket?: string;
             url?: string;
-            ttl?: number;
+            ttl?: number | string | ((store: RedisStore, sess: Express.SessionData, sid: string) => number);
             disableTTL?: boolean;
             db?: number;
             pass?: string;

From 6fecca7b45ade9ea7cff9166e4e80c128eb01bde Mon Sep 17 00:00:00 2001
From: Jordi Oliveras Rovira <jordi.oliveras.rovira@gmail.com>
Date: Tue, 5 Mar 2019 21:01:19 +0100
Subject: [PATCH 389/924] Remove 'del' package.

---
 notNeededPackages.json                  |  7 +++-
 types/del/del-tests.ts                  | 47 -------------------------
 types/del/index.d.ts                    | 29 ---------------
 types/del/tsconfig.json                 | 23 ------------
 types/del/tslint.json                   |  6 ----
 types/del/v2/del-tests.ts               | 37 -------------------
 types/del/v2/index.d.ts                 | 19 ----------
 types/del/v2/tsconfig.json              | 28 ---------------
 types/del/v2/tslint.json                |  6 ----
 types/gulp/package.json                 |  3 +-
 types/rollup-plugin-delete/package.json |  1 +
 types/vinyl-paths/package.json          |  7 ++++
 12 files changed, 16 insertions(+), 197 deletions(-)
 delete mode 100644 types/del/del-tests.ts
 delete mode 100644 types/del/index.d.ts
 delete mode 100644 types/del/tsconfig.json
 delete mode 100644 types/del/tslint.json
 delete mode 100644 types/del/v2/del-tests.ts
 delete mode 100644 types/del/v2/index.d.ts
 delete mode 100644 types/del/v2/tsconfig.json
 delete mode 100644 types/del/v2/tslint.json
 create mode 100644 types/vinyl-paths/package.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index acdb379b38..5752f85be4 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -420,6 +420,12 @@
             "sourceRepoURL": "git@github.com:KyleAMathews/deepmerge.git",
             "asOfVersion": "2.2.0"
         },
+        {
+            "libraryName": "del",
+            "typingsPackageName": "del",
+            "sourceRepoURL": "https://github.com/sindresorhus/del",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "delay",
             "typingsPackageName": "delay",
@@ -1169,7 +1175,6 @@
             "typingsPackageName": "p-limit",
             "sourceRepoURL": "https://github.com/sindresorhus/p-limit",
             "asOfVersion": "2.2.0"
-
         },
         {
             "libraryName": "p-map",
diff --git a/types/del/del-tests.ts b/types/del/del-tests.ts
deleted file mode 100644
index f9d01f644f..0000000000
--- a/types/del/del-tests.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import del = require('del');
-
-let paths = ['build', 'dist/**/*.js'];
-
-del(['tmp/*.js', '!tmp/unicorn.js']);
-del(['tmp/*.js', '!tmp/unicorn.js'], { force: true });
-del(['tmp/*.js', '!tmp/unicorn.js'], { dryRun: true });
-del(['tmp/*.js', '!tmp/unicorn.js'], { concurrency: 20 });
-del(['tmp/*.js', '!tmp/unicorn.js'], { cwd: '' });
-
-del(['tmp/*.js', '!tmp/unicorn.js']).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-del(['tmp/*.js', '!tmp/unicorn.js'], { force: true }).then(
-    (paths: string[]) => {
-        console.log('Deleted files/folders:\n', paths.join('\n'));
-    }
-);
-
-del('tmp/*.js');
-del('tmp/*.js', { force: true });
-del('tmp/*.js', { dryRun: true });
-del('tmp/*.js', { concurrency: 20 });
-del('tmp/*.js', { cwd: '' });
-del('tmp/*.js').then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-del('tmp/*.js', { force: true }).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-paths = del.sync(['tmp/*.js', '!tmp/unicorn.js']);
-paths = del.sync(['tmp/*.js', '!tmp/unicorn.js'], { force: true });
-
-paths = del.sync('tmp/*.js');
-paths = del.sync('tmp/*.js', { force: true });
-paths = del.sync('tmp/*.js', { dryRun: true });
-paths = del.sync('tmp/*.js', { concurrency: 20 });
-paths = del.sync('tmp/*.js', { cwd: '' });
-
-const immutable: ReadonlyArray<string> = ['tmp/*.js', '!tmp/unicorn.js'];
-const mutable = del(immutable);
-const mutablePaths = del.sync(immutable);
-mutable.then(paths => paths.push('test'));
-mutablePaths.push('test');
diff --git a/types/del/index.d.ts b/types/del/index.d.ts
deleted file mode 100644
index ec92f96c84..0000000000
--- a/types/del/index.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for del 3.0
-// Project: https://github.com/sindresorhus/del
-// Definitions by: Asana <https://asana.com>
-//                 Aya Morisawa <https://github.com/AyaMorisawa>
-//                 BendingBender <https://github.com/BendingBender>
-//                 Jason Dreyzehner <https://github.com/bitjson>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import glob = require('glob');
-
-declare function del(
-    patterns: string | ReadonlyArray<string>,
-    options?: del.Options
-): Promise<string[]>;
-
-declare namespace del {
-    function sync(
-        patterns: string | ReadonlyArray<string>,
-        options?: Options
-    ): string[];
-
-    interface Options extends glob.IOptions {
-        force?: boolean;
-        dryRun?: boolean;
-        concurrency?: number;
-    }
-}
-
-export = del;
diff --git a/types/del/tsconfig.json b/types/del/tsconfig.json
deleted file mode 100644
index 6143d08346..0000000000
--- a/types/del/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "del-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/del/tslint.json b/types/del/tslint.json
deleted file mode 100644
index 26bcea6634..0000000000
--- a/types/del/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		"dt-header": false
-	}
-}
diff --git a/types/del/v2/del-tests.ts b/types/del/v2/del-tests.ts
deleted file mode 100644
index 09702c4b39..0000000000
--- a/types/del/v2/del-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import del = require("del");
-
-let paths = ["build", "dist/**/*.js"];
-
-del(["tmp/*.js", "!tmp/unicorn.js"]);
-
-del(["tmp/*.js", "!tmp/unicorn.js"], {force: true});
-
-del(["tmp/*.js", "!tmp/unicorn.js"]).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-del(["tmp/*.js", "!tmp/unicorn.js"], {force: true}).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-del("tmp/*.js");
-
-del("tmp/*.js", {force: true});
-
-del("tmp/*.js").then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-del("tmp/*.js", {force: true}).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
-
-paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"]);
-
-paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"], {force: true});
-
-paths = del.sync("tmp/*.js");
-
-paths = del.sync("tmp/*.js", {force: true});
-
-paths = del.sync("tmp/*.js", {dryRun: true});
diff --git a/types/del/v2/index.d.ts b/types/del/v2/index.d.ts
deleted file mode 100644
index 50634e39eb..0000000000
--- a/types/del/v2/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for del 2.2
-// Project: https://github.com/sindresorhus/del
-// Definitions by: Asana <https://asana.com>, Aya Morisawa <https://github.com/AyaMorisawa>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import glob = require("glob");
-
-declare function del(patterns: string | string[], options?: del.Options): Promise<string[]>;
-
-declare namespace del {
-    function sync(patterns: string | string[], options?: Options): string[];
-
-    interface Options extends glob.IOptions {
-        force?: boolean;
-        dryRun?: boolean;
-    }
-}
-
-export = del;
diff --git a/types/del/v2/tsconfig.json b/types/del/v2/tsconfig.json
deleted file mode 100644
index 568d1a8a21..0000000000
--- a/types/del/v2/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "del": [
-                "del/v2"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "del-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/del/v2/tslint.json b/types/del/v2/tslint.json
deleted file mode 100644
index 65c83fb1e3..0000000000
--- a/types/del/v2/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "dt-header": false
-    }
-}
diff --git a/types/gulp/package.json b/types/gulp/package.json
index a0e2ec3c5c..bae72230b6 100644
--- a/types/gulp/package.json
+++ b/types/gulp/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "chokidar": "^2.1.2"
+    "chokidar": "^2.1.2",
+    "del": "*"
   }
 }
diff --git a/types/rollup-plugin-delete/package.json b/types/rollup-plugin-delete/package.json
index 272f65edde..cca5c8c155 100644
--- a/types/rollup-plugin-delete/package.json
+++ b/types/rollup-plugin-delete/package.json
@@ -1,6 +1,7 @@
 {
     "private": true,
     "dependencies": {
+        "del": "*",
         "rollup": ">=0.60.0"
     }
 }
diff --git a/types/vinyl-paths/package.json b/types/vinyl-paths/package.json
new file mode 100644
index 0000000000..d03842a47b
--- /dev/null
+++ b/types/vinyl-paths/package.json
@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "del": "*",
+    "rollup": ">=0.60.0"
+  }
+}

From 9a9277b1a963e152f315ec0f68436e690e472f31 Mon Sep 17 00:00:00 2001
From: Seth Butler <seth.butler@ibm.com>
Date: Tue, 5 Mar 2019 15:09:50 -0500
Subject: [PATCH 390/924] Adding test for ttl as function

---
 types/connect-redis/connect-redis-tests.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/connect-redis/connect-redis-tests.ts b/types/connect-redis/connect-redis-tests.ts
index a312ffd3ca..603b226dcc 100644
--- a/types/connect-redis/connect-redis-tests.ts
+++ b/types/connect-redis/connect-redis-tests.ts
@@ -6,5 +6,8 @@ const store = new RedisStore({
     host: 'localhost',
     port: 6379,
     logErrors: error => console.warn(error),
-    scanCount: 80,
+	scanCount: 80,
+	ttl: (store, sess, sessionID) => {
+		return 60;
+	}
 });

From b61c3407454aa7cedc55309fc4d6e77645e5b0e5 Mon Sep 17 00:00:00 2001
From: Heber <Anthony.Heber@gmail.com>
Date: Tue, 5 Mar 2019 14:14:10 -0700
Subject: [PATCH 391/924] Update Flickity Types

Add types for "on" event binding
---
 types/flickity/index.d.ts | 88 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 4d9a8a4c25..880b53943a 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://flickity.metafizzy.co
 // Definitions by: Chris McGrath <https://github.com/clmcgrath>
 //                 Michael Wagner <https://github.com/wagich>
+//                 Anthony Heber <https://github.com/aheber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -506,4 +507,91 @@ interface FlickityOptions {
      * javascript dictionary of points or path to SVG file
      */
     arrowShape?: string | { x0: number, x1: number, y1: number, x2: number, y2: number, x3: number };
+
+    /**
+     * Bind events within Flickity's options by setting on to an Object. The object's keys should match the event names. on is useful for capturing events as Flickity is initialized, like ready
+     */
+    on?: {
+
+        /**
+         * Triggered after Flickity has been activated.
+         */
+        ready?: () => void;
+
+        /**
+         * Triggered when the selected slide is changed.
+         */
+        change?: (index?: Number) => void;
+
+        /**
+         * Triggered when a slide is selected.
+         * 
+         * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
+         * 
+         * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
+         */
+        select?: (index?: Number) => void;
+
+        /**
+         * Triggered when the slider is settled at its end position.
+         */
+        settle?: (index?: Number) => void;
+
+        /**
+         * Triggered when the slider moves.
+         */
+        scroll?: (progress?: Number) => void;
+
+        /**
+         * Triggered when dragging starts and the slider starts moving.
+         */
+        dragStart?: (event?: Event, pointer?: Element | Touch) => void;
+
+        /**
+         * Triggered when dragging moves and the slider moves.
+         */
+        dragMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+
+        /**
+         * Triggered when dragging ends.
+         */
+        dragEnd?: (event: Event, pointer?: Element | Touch) => void;
+
+        /**
+         * Triggered when the user's pointer (mouse, touch, pointer) presses down.
+         */
+        pointerDown?: (event: Event, pointer?: Element | Touch) => void;
+
+        /**
+         * Triggered when the user's pointer moves.
+         */
+        pointerMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+
+        /**
+         * Triggered when the user's pointer unpresses.
+         */
+        pointerUp?: (event?: Event, pointer?: Element | Touch) => void;
+
+        /**
+         * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
+         * 
+         * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
+         */
+        staticClick?: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: Number) => void;
+
+        /**
+         * Triggered after an image has been loaded with lazyLoad.
+         */
+        lazyLoad?: (event?: Event, cellElement?: Element) => void;
+
+        /**
+         * Triggered after a background image has been loaded with bgLazyLoad.
+         */
+        bgLazyLoad?: (event?: Event, element?: Element) => void;
+
+        /**
+         * Triggered after entering or exiting fullscreen view.
+         */
+        fullscreenChange?: (isFullscreen?: Boolean) => void;
+    }
 }

From 60bfbc16ff78bd0fbe6c5932157e52458ee63375 Mon Sep 17 00:00:00 2001
From: Peter Oxenham <peter@divvito.com>
Date: Wed, 6 Mar 2019 07:16:46 +1000
Subject: [PATCH 392/924] Updated definition of 'tests' on SchemaDescription

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 58067b926b..f29fe60d23 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -296,7 +296,7 @@ export interface SchemaDescription {
     type: string;
     label: string;
     meta: object;
-    tests: string[];
+    tests: Array<{ name: string, params: object }>;
     fields: object;
 }
 
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 0c515ef78c..152fdd25e4 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -420,7 +420,7 @@ const description: SchemaDescription = {
     type: "type",
     label: "label",
     meta: { key: "value" },
-    tests: ["test1", "test2"],
+    tests: [{ name: "test1", params: {} }, { name: "test2", params: {} }],
     fields: { key: "value" }
 };
 

From 1240929245ca5c59e57673ce2d0d6d0ca6882588 Mon Sep 17 00:00:00 2001
From: Vincent Pizzo <vincent.pizzo@singlewire.com>
Date: Tue, 5 Mar 2019 13:29:46 -0800
Subject: [PATCH 393/924] Add types for react-csv

---
 .../react-csv/components/CommonPropTypes.d.ts | 22 ++++++
 types/react-csv/components/Download.d.ts      |  9 +++
 types/react-csv/components/Link.d.ts          |  5 ++
 types/react-csv/index.d.ts                    |  8 ++
 types/react-csv/react-csv-tests.tsx           | 78 +++++++++++++++++++
 types/react-csv/tsconfig.json                 | 30 +++++++
 types/react-csv/tslint.json                   |  7 ++
 7 files changed, 159 insertions(+)
 create mode 100644 types/react-csv/components/CommonPropTypes.d.ts
 create mode 100644 types/react-csv/components/Download.d.ts
 create mode 100644 types/react-csv/components/Link.d.ts
 create mode 100644 types/react-csv/index.d.ts
 create mode 100644 types/react-csv/react-csv-tests.tsx
 create mode 100644 types/react-csv/tsconfig.json
 create mode 100644 types/react-csv/tslint.json

diff --git a/types/react-csv/components/CommonPropTypes.d.ts b/types/react-csv/components/CommonPropTypes.d.ts
new file mode 100644
index 0000000000..4bad3dd766
--- /dev/null
+++ b/types/react-csv/components/CommonPropTypes.d.ts
@@ -0,0 +1,22 @@
+import { MouseEventHandler } from "react";
+
+export interface LabelKeyObject {
+    label: string;
+    key: string;
+}
+
+export type Data = object[];
+export type Headers = LabelKeyObject[] | string[];
+export type SyncClickHandler = (event: MouseEventHandler<HTMLAnchorElement>) => boolean | void;
+export type AsyncClickHandler = (event: MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => void;
+
+export interface CommonPropTypes {
+    data: string | Data;
+    headers?: Headers;
+    enclosingCharacter?: string;
+    separator?: string;
+    filename?: string;
+    uFEFF?: boolean;
+    onClick?: SyncClickHandler | AsyncClickHandler;
+    asyncOnClick?: boolean;
+}
diff --git a/types/react-csv/components/Download.d.ts b/types/react-csv/components/Download.d.ts
new file mode 100644
index 0000000000..282f41596a
--- /dev/null
+++ b/types/react-csv/components/Download.d.ts
@@ -0,0 +1,9 @@
+import { Component } from "react";
+import { CommonPropTypes } from "./CommonPropTypes";
+
+export interface DownloadPropTypes extends CommonPropTypes {
+    target?: string;
+}
+
+export default class Download extends Component<DownloadPropTypes> {
+}
diff --git a/types/react-csv/components/Link.d.ts b/types/react-csv/components/Link.d.ts
new file mode 100644
index 0000000000..3e133095de
--- /dev/null
+++ b/types/react-csv/components/Link.d.ts
@@ -0,0 +1,5 @@
+import { Component } from "react";
+import { CommonPropTypes } from "./CommonPropTypes";
+
+export default class Link extends Component<CommonPropTypes> {
+}
diff --git a/types/react-csv/index.d.ts b/types/react-csv/index.d.ts
new file mode 100644
index 0000000000..2fe767d3e7
--- /dev/null
+++ b/types/react-csv/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for react-csv 1.1.1
+// Project: https://github.com/react-csv/react-csv
+// Definitions by: Vincent Pizzo <https://github.com/vincentjames501>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export { default as CSVLink } from "./components/Link";
+export { default as CSVDownload } from "./components/Download";
diff --git a/types/react-csv/react-csv-tests.tsx b/types/react-csv/react-csv-tests.tsx
new file mode 100644
index 0000000000..a075b8161f
--- /dev/null
+++ b/types/react-csv/react-csv-tests.tsx
@@ -0,0 +1,78 @@
+import * as React from "react";
+import { MouseEventHandler } from "react";
+import { render } from "react-dom";
+import { CSVLink, CSVDownload } from "react-csv";
+
+const headers = [
+    {label: 'First Name', key: 'details.firstName'},
+    {label: 'Last Name', key: 'details.lastName'},
+    {label: 'Job', key: 'job'},
+];
+
+const headersStrings = ['foo', 'bar'];
+
+const data = [
+    {details: {firstName: 'Ahmed', lastName: 'Tomi'}, job: 'manager'},
+    {details: {firstName: 'John', lastName: 'Jones'}, job: 'developer'},
+];
+
+const dataString = `firstname,lastname
+Ahmed,Tomi
+Raed,Labes
+Yezzi,Min l3b
+`;
+
+const syncOnClickReturn = (event: MouseEventHandler<HTMLAnchorElement>) => {
+    window.console.log(event);
+    return true;
+};
+const syncOnClickVoid = (event: MouseEventHandler<HTMLAnchorElement>) => window.console.log(event);
+const asyncOnClickReturn = (event: MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+    window.console.log(event);
+    done(true);
+};
+const asyncOnClickVoid = (event: MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+    window.console.log(event);
+    done();
+};
+
+const node = document.getElementById("main");
+
+render(<CSVLink data={dataString}/>, node);
+render(<CSVLink data={dataString} headers={headersStrings}/>, node);
+render(<CSVLink data={data}/>, node);
+render(<CSVLink data={data} headers={headers}/>, node);
+render(<CSVLink data={data} headers={headers}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true}
+                enclosingCharacter={`'`}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
+                onClick={syncOnClickReturn}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
+                onClick={syncOnClickVoid}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
+                onClick={asyncOnClickReturn} asyncOnClick={true}/>, node);
+render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
+                onClick={asyncOnClickVoid} asyncOnClick={true}/>, node);
+
+render(<CSVDownload data={dataString}/>, node);
+render(<CSVDownload data={dataString} headers={headersStrings}/>, node);
+render(<CSVDownload data={data}/>, node);
+render(<CSVDownload data={data} headers={headers}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}
+                    uFEFF={true}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}
+                    uFEFF={true}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
+                    onClick={syncOnClickReturn}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
+                    onClick={syncOnClickVoid}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
+                    onClick={asyncOnClickReturn} asyncOnClick={true}/>, node);
+render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
+                    onClick={asyncOnClickVoid} asyncOnClick={true}/>, node);
diff --git a/types/react-csv/tsconfig.json b/types/react-csv/tsconfig.json
new file mode 100644
index 0000000000..cc91fd7689
--- /dev/null
+++ b/types/react-csv/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true,
+    "jsx": "react",
+    "noUnusedParameters": true,
+    "noUnusedLocals": true
+  },
+  "files": [
+    "index.d.ts",
+    "components/CommonPropTypes.d.ts",
+    "components/Download.d.ts",
+    "components/Link.d.ts",
+    "react-csv-tests.tsx"
+  ]
+}
diff --git a/types/react-csv/tslint.json b/types/react-csv/tslint.json
new file mode 100644
index 0000000000..b2ecae2fd2
--- /dev/null
+++ b/types/react-csv/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    // TODO
+    "no-duplicate-imports": false
+  }
+}

From a29a1cc518f05808125d978e444e92dee9e3c0e6 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Tue, 5 Mar 2019 22:30:16 +0100
Subject: [PATCH 394/924] Remove upstreamed types

---
 notNeededPackages.json                   | 55 ++++++++++++-
 types/camelcase/camelcase-tests.ts       | 10 ---
 types/camelcase/index.d.ts               |  9 ---
 types/camelcase/tsconfig.json            | 23 ------
 types/camelcase/tslint.json              |  1 -
 types/conf/conf-tests.ts                 | 54 -------------
 types/conf/index.d.ts                    | 37 ---------
 types/conf/tsconfig.json                 | 24 ------
 types/conf/tslint.json                   |  1 -
 types/conf/v0/conf-tests.ts              | 20 -----
 types/conf/v0/index.d.ts                 | 29 -------
 types/conf/v0/tsconfig.json              | 29 -------
 types/conf/v0/tslint.json                |  1 -
 types/conf/v1/conf-tests.ts              | 41 ----------
 types/conf/v1/index.d.ts                 | 31 --------
 types/conf/v1/tsconfig.json              | 29 -------
 types/conf/v1/tslint.json                |  1 -
 types/env-paths/env-paths-tests.ts       | 10 ---
 types/env-paths/index.d.ts               | 18 -----
 types/env-paths/tsconfig.json            | 19 -----
 types/env-paths/tslint.json              |  3 -
 types/globby/globby-tests.ts             | 71 -----------------
 types/globby/index.d.ts                  | 99 ------------------------
 types/globby/package.json                |  6 --
 types/globby/tsconfig.json               | 24 ------
 types/globby/tslint.json                 |  1 -
 types/log-update/index.d.ts              | 17 ----
 types/log-update/log-update-tests.ts     | 19 -----
 types/log-update/tsconfig.json           | 23 ------
 types/log-update/tslint.json             |  1 -
 types/make-dir/index.d.ts                | 41 ----------
 types/make-dir/make-dir-tests.ts         | 13 ----
 types/make-dir/tsconfig.json             | 23 ------
 types/make-dir/tslint.json               |  3 -
 types/move-file/index.d.ts               | 20 -----
 types/move-file/move-file-tests.ts       | 10 ---
 types/move-file/tsconfig.json            | 23 ------
 types/move-file/tslint.json              |  1 -
 types/on-change/index.d.ts               |  9 ---
 types/on-change/on-change-tests.ts       | 17 ----
 types/on-change/tsconfig.json            | 23 ------
 types/on-change/tslint.json              |  1 -
 types/query-string/index.d.ts            | 48 ------------
 types/query-string/query-string-tests.ts | 44 -----------
 types/query-string/tsconfig.json         | 23 ------
 types/query-string/tslint.json           |  6 --
 46 files changed, 54 insertions(+), 957 deletions(-)
 delete mode 100644 types/camelcase/camelcase-tests.ts
 delete mode 100644 types/camelcase/index.d.ts
 delete mode 100644 types/camelcase/tsconfig.json
 delete mode 100644 types/camelcase/tslint.json
 delete mode 100644 types/conf/conf-tests.ts
 delete mode 100644 types/conf/index.d.ts
 delete mode 100644 types/conf/tsconfig.json
 delete mode 100644 types/conf/tslint.json
 delete mode 100644 types/conf/v0/conf-tests.ts
 delete mode 100644 types/conf/v0/index.d.ts
 delete mode 100644 types/conf/v0/tsconfig.json
 delete mode 100644 types/conf/v0/tslint.json
 delete mode 100644 types/conf/v1/conf-tests.ts
 delete mode 100644 types/conf/v1/index.d.ts
 delete mode 100644 types/conf/v1/tsconfig.json
 delete mode 100644 types/conf/v1/tslint.json
 delete mode 100644 types/env-paths/env-paths-tests.ts
 delete mode 100644 types/env-paths/index.d.ts
 delete mode 100644 types/env-paths/tsconfig.json
 delete mode 100644 types/env-paths/tslint.json
 delete mode 100644 types/globby/globby-tests.ts
 delete mode 100644 types/globby/index.d.ts
 delete mode 100644 types/globby/package.json
 delete mode 100644 types/globby/tsconfig.json
 delete mode 100644 types/globby/tslint.json
 delete mode 100644 types/log-update/index.d.ts
 delete mode 100644 types/log-update/log-update-tests.ts
 delete mode 100644 types/log-update/tsconfig.json
 delete mode 100644 types/log-update/tslint.json
 delete mode 100644 types/make-dir/index.d.ts
 delete mode 100644 types/make-dir/make-dir-tests.ts
 delete mode 100644 types/make-dir/tsconfig.json
 delete mode 100644 types/make-dir/tslint.json
 delete mode 100644 types/move-file/index.d.ts
 delete mode 100644 types/move-file/move-file-tests.ts
 delete mode 100644 types/move-file/tsconfig.json
 delete mode 100644 types/move-file/tslint.json
 delete mode 100644 types/on-change/index.d.ts
 delete mode 100644 types/on-change/on-change-tests.ts
 delete mode 100644 types/on-change/tsconfig.json
 delete mode 100644 types/on-change/tslint.json
 delete mode 100644 types/query-string/index.d.ts
 delete mode 100644 types/query-string/query-string-tests.ts
 delete mode 100644 types/query-string/tsconfig.json
 delete mode 100644 types/query-string/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index acdb379b38..4b38d00307 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -216,6 +216,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/camel-case",
             "asOfVersion": "1.2.1"
         },
+        {
+            "libraryName": "camelcase",
+            "typingsPackageName": "camelcase",
+            "sourceRepoURL": "https://github.com/sindresorhus/camelcase",
+            "asOfVersion": "5.2.0"
+        },
         {
             "libraryName": "catalog",
             "typingsPackageName": "catalog",
@@ -264,6 +270,12 @@
             "sourceRepoURL": "https://github.com/tj/commander.js",
             "asOfVersion": "2.12.2"
         },
+        {
+            "libraryName": "conf",
+            "typingsPackageName": "conf",
+            "sourceRepoURL": "https://github.com/sindresorhus/conf",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "confirmdialog",
             "typingsPackageName": "confirmdialog",
@@ -516,6 +528,12 @@
             "sourceRepoURL": "https://github.com/Sembiance/email-validator",
             "asOfVersion": "1.0.6"
         },
+        {
+            "libraryName": "env-paths",
+            "typingsPackageName": "env-paths",
+            "sourceRepoURL": "https://github.com/sindresorhus/env-paths",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "error-stack-parser",
             "typingsPackageName": "error-stack-parser",
@@ -684,6 +702,12 @@
             "sourceRepoURL": "https://github.com/jdalrymple/node-gitlab",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "globby",
+            "typingsPackageName": "globby",
+            "sourceRepoURL": "https://github.com/sindresorhus/globby",
+            "asOfVersion": "9.1.0"
+        },
         {
             "libraryName": "Google Cloud Storage",
             "typingsPackageName": "google-cloud__storage",
@@ -1002,6 +1026,12 @@
             "sourceRepoURL": "https://github.com/steelsojka/lodash-decorators",
             "asOfVersion": "4.0.0"
         },
+        {
+            "libraryName": "log-update",
+            "typingsPackageName": "log-update",
+            "sourceRepoURL": "https://github.com/sindresorhus/log-update",
+            "asOfVersion": "3.1.0"
+        },
         {
             "libraryName": "log4javascript",
             "typingsPackageName": "log4javascript",
@@ -1026,6 +1056,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/lower-case-first",
             "asOfVersion": "1.0.1"
         },
+        {
+            "libraryName": "make-dir",
+            "typingsPackageName": "make-dir",
+            "sourceRepoURL": "https://github.com/sindresorhus/make-dir",
+            "asOfVersion": "2.1.0"
+        },
         {
             "libraryName": "mali",
             "typingsPackageName": "mali",
@@ -1098,6 +1134,12 @@
             "sourceRepoURL": "https://github.com/LearnBoost/monk.git",
             "asOfVersion": "6.0.0"
         },
+        {
+            "libraryName": "move-file",
+            "typingsPackageName": "move-file",
+            "sourceRepoURL": "https://github.com/sindresorhus/move-file",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "MQTT",
             "typingsPackageName": "mqtt",
@@ -1152,6 +1194,12 @@
             "sourceRepoURL": "https://github.com/foretagsplatsen/numbro/",
             "asOfVersion": "1.9.3"
         },
+        {
+            "libraryName": "on-change",
+            "typingsPackageName": "on-change",
+            "sourceRepoURL": "https://github.com/sindresorhus/on-change",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "Onsen UI",
             "typingsPackageName": "onsenui",
@@ -1169,7 +1217,6 @@
             "typingsPackageName": "p-limit",
             "sourceRepoURL": "https://github.com/sindresorhus/p-limit",
             "asOfVersion": "2.2.0"
-
         },
         {
             "libraryName": "p-map",
@@ -1309,6 +1356,12 @@
             "sourceRepoURL": "https://github.com/kazuhikoarase/qrcode-generator",
             "asOfVersion": "1.0.6"
         },
+        {
+            "libraryName": "query-string",
+            "typingsPackageName": "query-string",
+            "sourceRepoURL": "https://github.com/sindresorhus/query-string",
+            "asOfVersion": "6.3.0"
+        },
         {
             "libraryName": "Raven JS",
             "typingsPackageName": "raven-js",
diff --git a/types/camelcase/camelcase-tests.ts b/types/camelcase/camelcase-tests.ts
deleted file mode 100644
index 871ec5c3b2..0000000000
--- a/types/camelcase/camelcase-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import camelCase = require('camelcase');
-
-camelCase('foo-bar');
-camelCase('foo_bar');
-camelCase('Foo-Bar');
-camelCase('--foo.bar');
-camelCase('__foo__bar__');
-camelCase('foo bar');
-camelCase('foo', 'bar');
-camelCase('__foo__', '--bar');
diff --git a/types/camelcase/index.d.ts b/types/camelcase/index.d.ts
deleted file mode 100644
index 83abf5a8a5..0000000000
--- a/types/camelcase/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for camelcase 4.1
-// Project: https://github.com/sindresorhus/camelcase
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = camelcase;
-
-declare function camelcase(...args: string[]): string;
-declare namespace camelcase {}
diff --git a/types/camelcase/tsconfig.json b/types/camelcase/tsconfig.json
deleted file mode 100644
index bcc1b505e1..0000000000
--- a/types/camelcase/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "camelcase-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/camelcase/tslint.json b/types/camelcase/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/camelcase/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/conf/conf-tests.ts b/types/conf/conf-tests.ts
deleted file mode 100644
index ce67cd4799..0000000000
--- a/types/conf/conf-tests.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import Conf = require('conf');
-
-const conf = new Conf<string | number | boolean>();
-new Conf<string>({
-    defaults: {
-        foo: 'bar',
-        unicorn: 'rainbow',
-    },
-});
-new Conf<string>({ configName: '' });
-new Conf<string>({ projectName: 'foo' });
-new Conf<string>({ cwd: '' });
-new Conf<string>({ encryptionKey: '' });
-new Conf<string>({ encryptionKey: new Buffer('') });
-new Conf<string>({ encryptionKey: new Uint8Array([1]) });
-new Conf<string>({ encryptionKey: new DataView(new ArrayBuffer(2)) });
-new Conf<string>({ fileExtension: '.foo' });
-
-// $ExpectError
-new Conf<string>({
-    defaults: {
-        foo: 'bar',
-        unicorn: ['rainbow'],
-    },
-});
-conf.set('foo', 'bar');
-conf.set('hello', 1);
-conf.set('unicorn', false);
-conf.set('null', null); // $ExpectError
-
-conf.get('foo'); // $ExpectType string | number | boolean
-conf.get('foo', 'bar'); // $ExpectType string | number | boolean
-conf.get('foo', null); // $ExpectError
-conf.delete('foo');
-conf.has('foo'); // $ExpectType boolean
-conf.clear();
-conf.onDidChange('foo', (oldVal, newVal) => {
-    // $ExpectType string | number | boolean | undefined
-    oldVal;
-    // $ExpectType string | number | boolean | undefined
-    newVal;
-});
-
-conf.size; // $ExpectType number
-conf.store = {
-    foo: 'bar',
-    unicorn: 'rainbow',
-};
-conf.path; // $ExpectType string
-
-for (const [key, value] of conf) {
-    key; // $ExpectType string
-    value; // $ExpectType string | number | boolean
-}
diff --git a/types/conf/index.d.ts b/types/conf/index.d.ts
deleted file mode 100644
index 57d7285a3e..0000000000
--- a/types/conf/index.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for conf 2.1
-// Project: https://github.com/sindresorhus/conf
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-
-declare class Conf<T = any> implements Iterable<[string, T]> {
-    store: { [key: string]: T };
-    readonly path: string;
-    readonly size: number;
-
-    constructor(options?: Conf.Options<T>);
-    get(key: string, defaultValue?: T): T;
-    set(key: string, val: T): void;
-    set(object: { [key: string]: T }): void;
-    has(key: string): boolean;
-    delete(key: string): void;
-    clear(): void;
-    onDidChange(key: string, callback: (oldVal: T | undefined, newVal: T | undefined) => void): void;
-    [Symbol.iterator](): Iterator<[string, T]>;
-}
-
-declare namespace Conf {
-    interface Options<T> {
-        defaults?: { [key: string]: T };
-        configName?: string;
-        projectName?: string;
-        cwd?: string;
-        encryptionKey?: string | Buffer | NodeJS.TypedArray | DataView;
-        fileExtension?: string;
-    }
-}
-
-export = Conf;
diff --git a/types/conf/tsconfig.json b/types/conf/tsconfig.json
deleted file mode 100644
index 479fa6b41f..0000000000
--- a/types/conf/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "target": "es6",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "conf-tests.ts"
-    ]
-}
diff --git a/types/conf/tslint.json b/types/conf/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/conf/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/conf/v0/conf-tests.ts b/types/conf/v0/conf-tests.ts
deleted file mode 100644
index 1368e45c29..0000000000
--- a/types/conf/v0/conf-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import Conf = require('conf');
-
-const conf = new Conf();
-conf.set('foo', 'bar');
-conf.set('hello', 1);
-conf.set('unicorn', false);
-conf.set('object', {
-	foo: 'bar',
-	unicorn: ['rainbow']
-});
-
-conf.get('foo');
-conf.delete('foo');
-conf.has('foo');
-conf.clear();
-
-for (const [key, value] of conf) {
-    key; // $ExpectType string
-    value; // $ExpectType string | number | boolean | symbol | {}
-}
diff --git a/types/conf/v0/index.d.ts b/types/conf/v0/index.d.ts
deleted file mode 100644
index 21c136e823..0000000000
--- a/types/conf/v0/index.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for conf 0.11
-// Project: https://github.com/sindresorhus/conf
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Options {
-	defaults?: any;
-	configName?: string;
-	projectName?: string;
-	cwd?: string;
-}
-
-declare class Conf implements Iterable<[string, string | number | boolean | symbol | {}]> {
-	path: string;
-	store: any;
-
-	readonly size: number;
-
-	constructor(options?: Options);
-	get(key: string): any;
-	set(key: string, val: string | number | boolean | symbol | {}): void;
-	set(object: {}): void;
-	has(key: string): boolean;
-	delete(key: string): void;
-	clear(): void;
-	[Symbol.iterator](): Iterator<[string, string | number | boolean | symbol | {}]>;
-}
-
-export = Conf;
diff --git a/types/conf/v0/tsconfig.json b/types/conf/v0/tsconfig.json
deleted file mode 100644
index 004bd4a1b5..0000000000
--- a/types/conf/v0/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "target": "es6",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "conf": [
-                "conf/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "conf-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/conf/v0/tslint.json b/types/conf/v0/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/conf/v0/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/conf/v1/conf-tests.ts b/types/conf/v1/conf-tests.ts
deleted file mode 100644
index 4ee492da8d..0000000000
--- a/types/conf/v1/conf-tests.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import Conf = require('conf');
-
-const conf = new Conf<string | number | boolean>();
-new Conf<string>({
-    defaults: {
-        foo: 'bar',
-        unicorn: 'rainbow',
-    },
-    configName: '',
-    projectName: 'foo',
-    cwd: '',
-});
-// $ExpectError
-new Conf<string>({
-    defaults: {
-        foo: 'bar',
-        unicorn: ['rainbow'],
-    },
-});
-conf.set('foo', 'bar');
-conf.set('hello', 1);
-conf.set('unicorn', false);
-conf.set('null', null); // $ExpectError
-
-conf.get('foo'); // $ExpectType string | number | boolean
-conf.get('foo', 'bar'); // $ExpectType string | number | boolean
-conf.get('foo', null); // $ExpectError
-conf.delete('foo');
-conf.has('foo'); // $ExpectType boolean
-conf.clear();
-
-conf.store = {
-    foo: 'bar',
-    unicorn: 'rainbow',
-};
-conf.path; // $ExpectType string
-
-for (const [key, value] of conf) {
-    key; // $ExpectType string
-    value; // $ExpectType string | number | boolean
-}
diff --git a/types/conf/v1/index.d.ts b/types/conf/v1/index.d.ts
deleted file mode 100644
index f08cff1584..0000000000
--- a/types/conf/v1/index.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for conf 1.4
-// Project: https://github.com/sindresorhus/conf
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-interface Options<T> {
-    defaults?: { [key: string]: T };
-    configName?: string;
-    projectName?: string;
-    cwd?: string;
-}
-
-declare class Conf<T = any> implements Iterable<[string, T]> {
-    store: { [key: string]: T };
-    readonly path: string;
-    readonly size: number;
-
-    constructor(options?: Options<T>);
-    get(key: string, defaultValue?: T): T;
-    set(key: string, val: T): void;
-    set(object: { [key: string]: T }): void;
-    has(key: string): boolean;
-    delete(key: string): void;
-    clear(): void;
-    onDidChange(key: string, callback: (oldVal: any, newVal: any) => void): void;
-    [Symbol.iterator](): Iterator<[string, T]>;
-}
-
-export = Conf;
diff --git a/types/conf/v1/tsconfig.json b/types/conf/v1/tsconfig.json
deleted file mode 100644
index 86b3a62f41..0000000000
--- a/types/conf/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "target": "es6",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "conf": [
-                "conf/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "conf-tests.ts"
-    ]
-}
diff --git a/types/conf/v1/tslint.json b/types/conf/v1/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/conf/v1/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/env-paths/env-paths-tests.ts b/types/env-paths/env-paths-tests.ts
deleted file mode 100644
index 9f360bbe41..0000000000
--- a/types/env-paths/env-paths-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import envPaths = require('env-paths');
-
-// $ExpectType Paths
-envPaths('./');
-// $ExpectType Paths
-envPaths('./', {suffix: 'test'});
-// $ExpectType Paths
-envPaths('./', {suffix: false});
-// $ExpectType Paths
-envPaths('./', {suffix: true});
diff --git a/types/env-paths/index.d.ts b/types/env-paths/index.d.ts
deleted file mode 100644
index 8b594d8a61..0000000000
--- a/types/env-paths/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for env-paths 1.0
-// Project: https://github.com/sindresorhus/env-paths
-// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = envPaths;
-
-declare function envPaths(name: string, opts?: { suffix: string | boolean }): envPaths.Paths;
-
-declare namespace envPaths {
-  interface Paths {
-    readonly data: string;
-    readonly config: string;
-    readonly cache: string;
-    readonly log: string;
-    readonly temp: string;
-  }
-}
diff --git a/types/env-paths/tsconfig.json b/types/env-paths/tsconfig.json
deleted file mode 100644
index 62dcbca022..0000000000
--- a/types/env-paths/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": false,
-    "strictFunctionTypes": true,
-    "baseUrl": "../",
-    "typeRoots": ["../"],
-    "types": [],
-    "noEmit": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "files": [
-		"index.d.ts",
-		"env-paths-tests.ts"
-	]
-}
diff --git a/types/env-paths/tslint.json b/types/env-paths/tslint.json
deleted file mode 100644
index d88586e5bd..0000000000
--- a/types/env-paths/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "dtslint/dt.json"
-}
diff --git a/types/globby/globby-tests.ts b/types/globby/globby-tests.ts
deleted file mode 100644
index e1a57adb74..0000000000
--- a/types/globby/globby-tests.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { IOptions } from 'glob';
-
-import globby = require('globby');
-
-(async () => {
-    let result: string[];
-
-    /**
-     * Standard `pattern` usage
-     */
-    result = await globby('*.tmp');
-    result = await globby(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
-
-    result = globby.sync('*.tmp');
-    result = globby.sync(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
-
-    /**
-     * `expandDirectories` option
-     */
-    result = await globby('*.tmp', { expandDirectories: false });
-    result = globby.sync('*.tmp', { expandDirectories: false });
-    result = await globby('*.tmp', { expandDirectories: ['a*', 'b*'] });
-    result = globby.sync('*.tmp', { expandDirectories: ['a*', 'b*'] });
-    result = await globby('*.tmp', {
-        expandDirectories: {
-            files: ['a', 'b'],
-            extensions: ['tmp']
-        }
-    });
-    result = globby.sync('*.tmp', {
-        expandDirectories: {
-            files: ['a', 'b'],
-            extensions: ['tmp']
-        }
-    });
-
-    /**
-     * Options passed through from `fast-glob`
-     */
-    result = await globby('*.tmp', { ignore: ['**/b.tmp'] });
-    result = globby.sync('*.tmp', { ignore: ['**/b.tmp'] });
-})();
-
-const tasks: Array<{
-    pattern: string;
-    options: IOptions;
-}> = globby.generateGlobTasks(['*.tmp', '!b.tmp'], { ignore: ['c.tmp'] });
-
-console.log(globby.hasMagic('**'));
-console.log(globby.hasMagic(['**', 'path1', 'path2']));
-console.log(!globby.hasMagic(['path1', 'path2']));
-
-(async () => {
-    let result: (path: string) => boolean;
-
-    /**
-     * Standard `gitignore` usage
-     */
-    result = await globby.gitignore();
-    result = globby.gitignore.sync();
-
-    /** With options */
-    result = await globby.gitignore({
-        cwd: __dirname,
-        ignore: ['**/b.tmp']
-    });
-    result = globby.gitignore.sync({
-        cwd: __dirname,
-        ignore: ['**/b.tmp']
-    });
-})();
diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
deleted file mode 100644
index af49813432..0000000000
--- a/types/globby/index.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Type definitions for globby 8.0
-// Project: https://github.com/sindresorhus/globby#readme
-// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
-//                 Ika <https://github.com/ikatyang>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { IOptions as NodeGlobOptions } from 'glob';
-import { Options as FastGlobOptions } from 'fast-glob';
-
-type ExpandDirectoriesOption = boolean | string[] | { files: string[]; extensions: string[] };
-
-interface Options extends FastGlobOptions {
-    /**
-     * If set to `true`, `globby` will automatically glob directories for you.
-     * If you define an `Array` it will only glob files that matches the patterns inside the Array.
-     * You can also define an `Object` with `files` and `extensions` like below:
-     *
-     * ```js
-     * (async () => {
-     *   const paths = await globby('images', {
-     *     expandDirectories: {
-     *       files: ['cat', 'unicorn', '*.jpg'],
-     *       extensions: ['png']
-     *     }
-     *   });
-     *   console.log(paths);
-     *   //=> ['cat.png', 'unicorn.png', 'cow.jpg', 'rainbow.jpg']
-     * })();
-     * ```
-     *
-     * Note that if you set this option to `false`, you won't get back matched directories unless
-     * you set `onlyFiles: false`.
-     */
-    expandDirectories?: ExpandDirectoriesOption;
-    /**
-     * Respect ignore patterns in `.gitignore` files that apply to the globbed files.
-     */
-    gitignore?: boolean;
-}
-
-/**
- * Returns a `Promise<Array>` of matching paths.
- */
-declare function globby(patterns: string | string[], options?: Options): Promise<string[]>;
-
-declare namespace globby {
-    /**
-     * Returns an `Array` of matching paths.
-     */
-    function sync(patterns: string | string[], options?: Options): string[];
-    /**
-     * Returns an `Array<Object>` in the format `{ pattern: string, opts: Object }`,
-     * which can be passed as arguments to [`fast-glob`](https://github.com/mrmlnc/fast-glob).
-     * This is useful for other globbing-related packages.
-     *
-     * Note that you should avoid running the same tasks multiple times as they contain a file system cache.
-     * Instead, run this method each time to ensure file system changes are taken into consideration.
-     */
-    function generateGlobTasks(patterns: string | string[], options?: Options): Array<{ pattern: string; options: Options }>;
-    /**
-     * Returns a boolean of whether there are any special glob characters in the `patterns`.
-     *
-     * Note that the options affect the results. If `noext: true` is set, then `+(a|b)` will not
-     * be considered a magic pattern. If the pattern has a brace expansion, like `a/{b/c,x/y}`,
-     * then that is considered magical, unless `nobrace: true` is set.
-     *
-     * This function is backed by [`node-glob`](https://github.com/isaacs/node-glob#globhasmagicpattern-options)
-     */
-    function hasMagic(patterns: string | string[], options?: NodeGlobOptions): boolean;
-    /**
-     * Returns a Promise<(path: string) => boolean> indicating whether a given path is ignored
-     * via a `.gitignore` file.
-     *
-     * Takes `cwd?: string` and `ignore?: string[]` as options. `.gitignore` files matched by the
-     * ignore config are not used for the resulting filter function.
-     *
-     * ```js
-     * const {gitignore} = require('globby');
-     *
-     * (async () => {
-     *   const isIgnored = await gitignore();
-     *   console.log(isIgnored('some/file'));
-     * })();
-     * ```
-     */
-    function gitignore(options?: { cwd?: string; ignore?: string[]; }): Promise<(path: string) => boolean>;
-
-    namespace gitignore {
-        /**
-         * Returns a `(path: string) => boolean` indicating whether a given path is ignored via a `.gitignore` file.
-         *
-         * Takes the same options as `globby.gitignore`.
-         */
-        function sync(options?: { cwd?: string; ignore?: string[]; }): (path: string) => boolean;
-    }
-}
-
-export = globby;
diff --git a/types/globby/package.json b/types/globby/package.json
deleted file mode 100644
index 136d4694e9..0000000000
--- a/types/globby/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "fast-glob": "^2.0.2"
-    }
-}
diff --git a/types/globby/tsconfig.json b/types/globby/tsconfig.json
deleted file mode 100644
index 5cc0a3fe62..0000000000
--- a/types/globby/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "globby-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/globby/tslint.json b/types/globby/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/globby/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/log-update/index.d.ts b/types/log-update/index.d.ts
deleted file mode 100644
index 544223a766..0000000000
--- a/types/log-update/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for log-update 2.0
-// Project: https://github.com/sindresorhus/log-update#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node"/>
-
-export = logUpdate;
-
-declare function logUpdate(...text: string[]): void;
-
-declare namespace logUpdate {
-    function clear(): void;
-    function done(): void;
-    const stderr: typeof logUpdate;
-    function create(stream: NodeJS.WritableStream): typeof logUpdate;
-}
diff --git a/types/log-update/log-update-tests.ts b/types/log-update/log-update-tests.ts
deleted file mode 100644
index 9a0955f7d4..0000000000
--- a/types/log-update/log-update-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import logUpdate = require('log-update');
-
-logUpdate(`
-        ♥♥
-     unicorns
-        ♥♥
-`);
-
-logUpdate.clear();
-logUpdate.done();
-
-logUpdate.stderr('oh', 'my', 'oh', 'my');
-logUpdate.stderr.clear();
-logUpdate.stderr.done();
-
-const logStdOut = logUpdate.create(process.stdout);
-logStdOut('oh', 'my', 'oh', 'my');
-logStdOut.clear();
-logStdOut.done();
diff --git a/types/log-update/tsconfig.json b/types/log-update/tsconfig.json
deleted file mode 100644
index 888455297b..0000000000
--- a/types/log-update/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "log-update-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/log-update/tslint.json b/types/log-update/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/log-update/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/make-dir/index.d.ts b/types/make-dir/index.d.ts
deleted file mode 100644
index 1805280240..0000000000
--- a/types/make-dir/index.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for make-dir 1.0
-// Project: https://github.com/sindresorhus/make-dir
-// Definitions by: Ika <https://github.com/ikatyang>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-/// <reference types="node"/>
-import * as fs from 'fs';
-
-export = makeDir;
-
-/**
- * Returns a `Promise` for the path to the created directory.
- * @param path Directory to create.
- */
-declare function makeDir(path: string, options?: makeDir.Options): Promise<string>;
-
-declare namespace makeDir {
-    /**
-     * Returns the path to the created directory.
-     * @param path Directory to create.
-     */
-    function sync(path: string, options?: Options): string;
-
-    interface Options {
-        /**
-         * Default: `0o777 & (~process.umask())`
-         *
-         * Directory [permissions](https://x-team.com/blog/file-system-permissions-umask-node-js/).
-         */
-        mode?: number;
-
-        /**
-         * Default: `require('fs')`
-         *
-         * Use a custom `fs` implementation. For example [`graceful-fs`](https://github.com/isaacs/node-graceful-fs).
-         */
-        fs?: typeof fs;
-    }
-}
diff --git a/types/make-dir/make-dir-tests.ts b/types/make-dir/make-dir-tests.ts
deleted file mode 100644
index 2767706bf6..0000000000
--- a/types/make-dir/make-dir-tests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import makeDir = require('make-dir');
-import * as fs from 'fs';
-import * as gfs from 'graceful-fs';
-
-makeDir('path/to/somewhere').then(dirname => {
-    // do something
-});
-
-const dirname = makeDir.sync('path/to/somewhere');
-
-makeDir('path/to/somewhere', {mode: parseInt('777', 8)});
-makeDir('path/to/somewhere', {fs});
-makeDir('path/to/somewhere', {fs: gfs});
diff --git a/types/make-dir/tsconfig.json b/types/make-dir/tsconfig.json
deleted file mode 100644
index f1770d52af..0000000000
--- a/types/make-dir/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "make-dir-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/make-dir/tslint.json b/types/make-dir/tslint.json
deleted file mode 100644
index f93cf8562a..0000000000
--- a/types/make-dir/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}
diff --git a/types/move-file/index.d.ts b/types/move-file/index.d.ts
deleted file mode 100644
index 7c86feca71..0000000000
--- a/types/move-file/index.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// Type definitions for move-file 1.0
-// Project: https://github.com/sindresorhus/move-file#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = moveFile;
-
-declare function moveFile(
-    source: string,
-    destination: string,
-    options?: moveFile.Options
-): Promise<void>;
-
-declare namespace moveFile {
-    function sync(source: string, destination: string, options?: Options): void;
-
-    interface Options {
-        overwrite?: boolean;
-    }
-}
diff --git a/types/move-file/move-file-tests.ts b/types/move-file/move-file-tests.ts
deleted file mode 100644
index 36badd38c1..0000000000
--- a/types/move-file/move-file-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import moveFile = require('move-file');
-
-// $ExpectType Promise<void>
-moveFile('source/unicorn.png', 'destination/unicorn.png');
-// $ExpectType Promise<void>
-moveFile('source/unicorn.png', 'destination/unicorn.png', { overwrite: false });
-// $ExpectType void
-moveFile.sync('source/unicorn.png', 'destination/unicorn.png');
-// $ExpectType void
-moveFile.sync('source/unicorn.png', 'destination/unicorn.png', { overwrite: false });
diff --git a/types/move-file/tsconfig.json b/types/move-file/tsconfig.json
deleted file mode 100644
index bcd3f7550e..0000000000
--- a/types/move-file/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "move-file-tests.ts"
-    ]
-}
diff --git a/types/move-file/tslint.json b/types/move-file/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/move-file/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/on-change/index.d.ts b/types/on-change/index.d.ts
deleted file mode 100644
index 44fff26e60..0000000000
--- a/types/on-change/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for on-change 0.1
-// Project: https://github.com/sindresorhus/on-change#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-export = onChange;
-
-declare function onChange<T extends object>(object: T, onChange: () => void): T;
diff --git a/types/on-change/on-change-tests.ts b/types/on-change/on-change-tests.ts
deleted file mode 100644
index 003d89aab7..0000000000
--- a/types/on-change/on-change-tests.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import onChange = require('on-change');
-
-const object = {
-    foo: false,
-    a: {
-        b: [
-            {
-                c: false,
-            },
-        ],
-    },
-};
-
-const watchedObject = onChange(object, () => {});
-
-watchedObject.foo = true;
-watchedObject.a.b[0].c = true;
diff --git a/types/on-change/tsconfig.json b/types/on-change/tsconfig.json
deleted file mode 100644
index 433629ab82..0000000000
--- a/types/on-change/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "on-change-tests.ts"
-    ]
-}
diff --git a/types/on-change/tslint.json b/types/on-change/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/on-change/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/query-string/index.d.ts b/types/query-string/index.d.ts
deleted file mode 100644
index 3eaf34c159..0000000000
--- a/types/query-string/index.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for query-string 6.2
-// Project: https://github.com/sindresorhus/query-string
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-//                 Tanguy Krotoff <https://github.com/tkrotoff>
-//                 HuHuanming <https://github.com/huhuanming>
-//                 Madara Uchiha <https://github.com/MadaraUchiha>
-//                 Josh Holmer <https://github.com/shssoichiro>
-//                 Simon Van den Broeck <https://github.com/jarrku>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-export interface ParseOptions {
-    arrayFormat?: 'bracket' | 'index' | 'none';
-    decode?: boolean;
-}
-
-export interface InputParams {
-  [key: string]: any;
-}
-
-export interface OutputParams {
-  [key: string]: string | string[] | undefined;
-}
-
-/**
- * Parse a query string into an object.
- * Leading ? or # are ignored, so you can pass location.search or location.hash directly.
- */
-export function parse(str: string, options?: ParseOptions): OutputParams;
-
-export function parseUrl(str: string, options?: ParseOptions): {url: string, query: OutputParams};
-
-export interface StringifyOptions {
-    strict?: boolean;
-    encode?: boolean;
-    arrayFormat?: 'bracket' | 'index' | 'none';
-    sort?: ((m: string, n: string) => boolean) | boolean;
-}
-
-/**
- * Stringify an object into a query string, sorting the keys.
- */
-export function stringify(obj: InputParams, options?: StringifyOptions): string;
-
-/**
- * Extract a query string from a URL that can be passed into .parse().
- */
-export function extract(str: string): string;
diff --git a/types/query-string/query-string-tests.ts b/types/query-string/query-string-tests.ts
deleted file mode 100644
index 33152ce445..0000000000
--- a/types/query-string/query-string-tests.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import * as queryString from 'query-string';
-
-// stringify
-{
-    let result: string;
-    // test obj
-    result = queryString.stringify({
-        str: 'bar',
-        strArray: ['baz'],
-        num: 123,
-        numArray: [456],
-        bool: true,
-        boolArray: [false]
-    });
-
-    // test options
-    result = queryString.stringify({ foo: 'bar' }, { strict: false });
-    result = queryString.stringify({ foo: 'bar' }, { encode: false });
-    result = queryString.stringify({ foo: 'bar' }, { strict: false, encode: false });
-}
-
-// For each section below, the second line ensures the real answer is of the declared
-// type. You can find the real answer by running the first line of each section.
-
-// parse
-{
-    let fooBar = queryString.parse('?foo=bar');
-    fooBar = {foo: "bar"};
-
-    let fooBarBaz1 = queryString.parse('&foo=bar&foo=baz');
-    fooBarBaz1 = { foo: [ 'bar', 'baz' ] };
-
-    let fooBarBaz2 = queryString.parse('&foo[]=bar&foo[]=baz', {arrayFormat: 'bracket'});
-    fooBarBaz2 = { foo: [ 'bar', 'baz' ] };
-}
-
-// extract
-{
-    let result1 = queryString.extract('http://foo.bar/?abc=def&hij=klm');
-    result1 = 'abc=def&hij=klm';
-
-    let result2 = queryString.extract('http://foo.bar/?foo=bar');
-    result2 = 'foo=bar';
-}
diff --git a/types/query-string/tsconfig.json b/types/query-string/tsconfig.json
deleted file mode 100644
index 83d5a52072..0000000000
--- a/types/query-string/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "query-string-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/query-string/tslint.json b/types/query-string/tslint.json
deleted file mode 100644
index e765bc9e16..0000000000
--- a/types/query-string/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "dtslint/dt.json",
-  "rules": {
-    "no-single-declare-module": false
-  }
-}

From 7059ba1e9f54c3c439d522b7234e2a7dde8103a0 Mon Sep 17 00:00:00 2001
From: Vincent Pizzo <vincent.pizzo@singlewire.com>
Date: Tue, 5 Mar 2019 14:31:36 -0800
Subject: [PATCH 395/924] Don't use patch in version

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

diff --git a/types/react-csv/index.d.ts b/types/react-csv/index.d.ts
index 2fe767d3e7..1390ce1361 100644
--- a/types/react-csv/index.d.ts
+++ b/types/react-csv/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-csv 1.1.1
+// Type definitions for react-csv 1.1
 // Project: https://github.com/react-csv/react-csv
 // Definitions by: Vincent Pizzo <https://github.com/vincentjames501>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 52b5a630abe0329c02208051dd211d5799bf92a3 Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Tue, 5 Mar 2019 15:39:05 -0700
Subject: [PATCH 396/924] Add tests for new "on" bindings

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

diff --git a/types/flickity/flickity-tests.ts b/types/flickity/flickity-tests.ts
index 63943119b4..8686d2f587 100644
--- a/types/flickity/flickity-tests.ts
+++ b/types/flickity/flickity-tests.ts
@@ -140,3 +140,23 @@ let flikty4: Flickity = new Flickity(new HTMLElement(), {
         x3: 30
     }
 });
+
+let flikty5: Flickity = new Flickity(new HTMLElement(), {
+    on: {
+        ready: () => {},
+        change: (index) => {},
+        select: (index) => {},
+        settle: (index)  => {},
+        scroll: (progress)  => {},
+        dragStart: (event, pointer)  => {},
+        dragMove: (event, pointer, moveVector)  => {},
+        dragEnd: (event, pointer)  => {},
+        pointerDown: (event, pointer)  => {},
+        pointerMove: (event, pointer, moveVector)  => {},
+        pointerUp: (event, pointer)  => {},
+        staticClick: (event, pointer, cellElement, cellIndex)  => {},
+        lazyLoad: (event, cellElement)  => {},
+        bgLazyLoad: (event, element)  => {},
+        fullscreenChange: (isFullscreen)  => {}
+    }
+});

From d26a3f72ae00530a0a8a170393da5a1e47581080 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:39:38 -0800
Subject: [PATCH 397/924] Cleanup from DT nightly run

1. A couple of updated project urls. (one typo and one https)
2. Possible bug in ts@next, or at least surprising behaviour. Work
around it in jest-in-case. TS bug #30234
---
 types/chart.js/index.d.ts                    | 2 +-
 types/jest-in-case/jest-in-case-tests.ts     | 4 ++--
 types/storybook__addon-storyshots/index.d.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 7745713c84..e2af872c9e 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Chart.js 2.7
-// Project: https://github.com/nnnick/Chart.js, http://www.chartjs.org
+// Project: https://github.com/nnnick/Chart.js, https://www.chartjs.org
 // Definitions by: Alberto Nuti <https://github.com/anuti>
 //                 Fabien Lavocat <https://github.com/FabienLavocat>
 //                 KentarouTakeda <https://github.com/KentarouTakeda>
diff --git a/types/jest-in-case/jest-in-case-tests.ts b/types/jest-in-case/jest-in-case-tests.ts
index b38ccff0bc..2e3631efab 100644
--- a/types/jest-in-case/jest-in-case-tests.ts
+++ b/types/jest-in-case/jest-in-case-tests.ts
@@ -25,7 +25,7 @@ afterEach(() => {
 test('array', () => {
     const title = 'add(augend, addend)';
 
-    const tester = jest.fn(opts => {
+    const tester = jest.fn((opts, cb) => {
         expect(add(opts.augend, opts.addend)).toBe(opts.total);
     });
 
@@ -59,7 +59,7 @@ test('object', () => {
 
     const title = 'add(augend, addend)';
 
-    const tester = jest.fn(opts => {
+    const tester = jest.fn((opts, cb) => {
         expect(subtract(opts.minuend, opts.subtrahend)).toBe(opts.difference);
     });
 
diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index 546386ce40..6310e7f55e 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for @storybook/addon-storyshots 3.4
-// Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots, https://github.com/storybooks/storybook/tree/master/addons/storyshorts/storyshots-core
+// Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots, https://github.com/storybooks/storybook/tree/master/addons/storyshots/storyshots-core
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1

From b6265bae6fc5a9a751eb62b288bdb7b75195bfa4 Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Tue, 5 Mar 2019 15:43:58 -0700
Subject: [PATCH 398/924] Clean up linting

---
 types/flickity/index.d.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 880b53943a..5d9f3fa510 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -512,7 +512,6 @@ interface FlickityOptions {
      * Bind events within Flickity's options by setting on to an Object. The object's keys should match the event names. on is useful for capturing events as Flickity is initialized, like ready
      */
     on?: {
-
         /**
          * Triggered after Flickity has been activated.
          */
@@ -525,9 +524,7 @@ interface FlickityOptions {
 
         /**
          * Triggered when a slide is selected.
-         * 
          * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
-         * 
          * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
          */
         select?: (index?: Number) => void;
@@ -574,7 +571,6 @@ interface FlickityOptions {
 
         /**
          * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
-         * 
          * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
          */
         staticClick?: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: Number) => void;
@@ -593,5 +589,5 @@ interface FlickityOptions {
          * Triggered after entering or exiting fullscreen view.
          */
         fullscreenChange?: (isFullscreen?: Boolean) => void;
-    }
+    };
 }

From 9929fd321f9f12616851f65d817f16572e30066b Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Tue, 5 Mar 2019 22:46:02 +0000
Subject: [PATCH 399/924] Update examples.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index bc71c9e544..3748dc234e 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -30,7 +30,7 @@ collection.contains(stark => stark.name === 'John Snow'); // $ExpectType boolean
 collection.count(); // $ExpectType number
 collection.each(stark => stark.age = 3); // $ExpectType Collection<{ name: string; age: number; }>
 collection.filter(stark => stark.age === 14); // $ExpectType Collection<{ name: string; age: number; }>
-collection.find('bran'); // $ExpectType number
+collection.find({ name: 'Bran Stark', age: 7 }); // $ExpectType number
 collection.first(item => item.age > 7); // $ExpectType { name: string; age: number; }
 collection.flatten(true); // $ExpectType Collection<{ name: string; age: number; }>
 collection.get(2); // $ExpectType { name: string; age: number; }
@@ -41,7 +41,11 @@ collection.last(); // $ExpectType { name: string; age: number; }
 collection.map(stark => stark.name); // $ExpectType Collection<{ name: string; age: number; }>
 collection.pluck('name'); // $ExpectType Collection<{ name: string; age: number; }>
 collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection<{ name: string; age: number; }>
-collection.reduce((previous, current) => previous.age + current.age, 0); // $ExpectType any
+
+const value = new Collection([1, 2, 3]).reduce(
+    (previous, current) => previous + current,
+    0
+ ); // $ExpectType number
 collection.reject(stark => stark.age < 14); // $ExpectType Collection<{ name: string; age: number; }>
 collection.remove({name: 'Robb Stark', age: 17}); // $ExpectType boolean
 collection.reverse(); // $ExpectType Collection<{ name: string; age: number; }>

From fa2d5d5e91e661d6891f1871f60652b38bcbf47d Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Tue, 5 Mar 2019 22:51:45 +0000
Subject: [PATCH 400/924] Amend a few tests and types for linting.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 3748dc234e..5f40824445 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -41,11 +41,7 @@ collection.last(); // $ExpectType { name: string; age: number; }
 collection.map(stark => stark.name); // $ExpectType Collection<{ name: string; age: number; }>
 collection.pluck('name'); // $ExpectType Collection<{ name: string; age: number; }>
 collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection<{ name: string; age: number; }>
-
-const value = new Collection([1, 2, 3]).reduce(
-    (previous, current) => previous + current,
-    0
- ); // $ExpectType number
+const value = new Collection([1, 2, 3]).reduce((previous, current) => previous + current, 0); // $ExpectType number
 collection.reject(stark => stark.age < 14); // $ExpectType Collection<{ name: string; age: number; }>
 collection.remove({name: 'Robb Stark', age: 17}); // $ExpectType boolean
 collection.reverse(); // $ExpectType Collection<{ name: string; age: number; }>
@@ -56,9 +52,7 @@ collection.sortBy('name'); // $ExpectType Collection<{ name: string; age: number
 collection.stringify(); // $ExpectType string
 collection.sum('age'); // $ExpectType any
 collection.take(2); // $ExpectType Collection<{ name: string; age: number; }>
-
-// Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
-// const collection2 = new Collection([1,2,3,4]).addToMembers(3);
+Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
 
 collection.unique(stark => stark.age); // $ExpectType Collection<{ name: string; age: number; }>
 collection.values(); // $ExpectType Collection<{ name: string; age: number; }>
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index 364877050d..aaf92fe61e 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -36,12 +36,12 @@ export default class Collection<T> {
     sort(compare?: () => boolean): Collection<T>;
     sortBy(property: string, order?: string): Collection<T>;
     stringify(): string;
-    sum(property: T extends object ? keyof T : never): number
+    sum(property: T extends object ? keyof T : never): number;
     take(count: number): Collection<T>;
     static macro(name: string, callback: (coll: Collection<unknown>, ...args: unknown[]) => unknown): void;
     unique(callback?: string|null|((item: T) => any)): Collection<T>;
     values(): Collection<T>;
-    where<K extends keyof T>(key: K, value: T[K]): Collection<T>
-    where(callback: (item: T) => boolean): Collection<T>
+    where<K extends keyof T>(key: K, value: T[K]): Collection<T>;
+    where(callback: (item: T) => boolean): Collection<T>;
     zip(array: T[]|Collection<T>): Collection<T>;
 }

From ee356e5c4ddbf0b5c95e27e449f6a7dfee2061e6 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Tue, 5 Mar 2019 22:55:55 +0000
Subject: [PATCH 401/924] Picks up on the final two issues during testing.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 5f40824445..98cc95cabc 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -50,7 +50,7 @@ collection.slice(1, 3); // $ExpectType Collection<{ name: string; age: number; }
 collection.sort(); // $ExpectType Collection<{ name: string; age: number; }>
 collection.sortBy('name'); // $ExpectType Collection<{ name: string; age: number; }>
 collection.stringify(); // $ExpectType string
-collection.sum('age'); // $ExpectType any
+collection.sum('age'); // $ExpectType number
 collection.take(2); // $ExpectType Collection<{ name: string; age: number; }>
 Collection.macro('addToMembers', (collection, n) => collection.map((collectionItem: any) => collectionItem + n));
 
diff --git a/types/collectionsjs/index.d.ts b/types/collectionsjs/index.d.ts
index aaf92fe61e..1a9bfe7062 100644
--- a/types/collectionsjs/index.d.ts
+++ b/types/collectionsjs/index.d.ts
@@ -24,7 +24,7 @@ export default class Collection<T> {
     join(separator?: string): string;
     keys(): Collection<T>;
     last(callback?: ((item: T) => boolean)|null): T;
-    map<R>(callback: (item: T) => R): Collection<T>;
+    map<R>(callback: (item: T) => R): Collection<R>;
     pluck(property: string): Collection<T>;
     push(item: T): Collection<T>;
     reduce<R>(callback: (previous: R, current: T) => R, initial: R): R;

From ec421510feb521fd3a1c9892b518498222e2a903 Mon Sep 17 00:00:00 2001
From: Jamie Sykes <jaymehsykes@gmail.com>
Date: Tue, 5 Mar 2019 22:59:03 +0000
Subject: [PATCH 402/924] Found another issue with the map function.

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

diff --git a/types/collectionsjs/collectionsjs-tests.ts b/types/collectionsjs/collectionsjs-tests.ts
index 98cc95cabc..47ab0b00bb 100644
--- a/types/collectionsjs/collectionsjs-tests.ts
+++ b/types/collectionsjs/collectionsjs-tests.ts
@@ -38,7 +38,7 @@ collection.has({ name: 'Bran Stark', age: 7 }); // $ExpectType boolean
 collection.join(); // $ExpectType string
 collection.keys(); // $ExpectType Collection<{ name: string; age: number; }>
 collection.last(); // $ExpectType { name: string; age: number; }
-collection.map(stark => stark.name); // $ExpectType Collection<{ name: string; age: number; }>
+collection.map(stark => stark.name); // $ExpectType Collection<string>
 collection.pluck('name'); // $ExpectType Collection<{ name: string; age: number; }>
 collection.push({name: 'Robb Stark', age: 17}); // $ExpectType Collection<{ name: string; age: number; }>
 const value = new Collection([1, 2, 3]).reduce((previous, current) => previous + current, 0); // $ExpectType number

From 161917a82a844502caeac3687db37f4c1701959b Mon Sep 17 00:00:00 2001
From: Queenie Ma <queeniema@ucla.edu>
Date: Tue, 5 Mar 2019 15:00:24 -0800
Subject: [PATCH 403/924] Update keytar typings for v4.4.1

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

diff --git a/types/keytar/index.d.ts b/types/keytar/index.d.ts
index cf6a16e4f7..f5e8e7367a 100644
--- a/types/keytar/index.d.ts
+++ b/types/keytar/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for keytar 4.0.2
+// Type definitions for keytar 4.4.1
 // Project: http://atom.github.io/node-keytar/
-// Definitions by: Milan Burda <https://github.com/miniak>, Brendan Forster <https://github.com/shiftkey>, Hari Juturu <https://github.com/juturu>
+// Definitions by: Milan Burda <https://github.com/miniak>
+//                 Brendan Forster <https://github.com/shiftkey>
+//                 Hari Juturu <https://github.com/juturu>
+//                 Queenie Ma <https://github.com/queeniema>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -15,7 +18,7 @@
 export declare function getPassword(service: string, account: string): Promise<string | null>;
 
 /**
- * Add the password for the service and account to the keychain.
+ * Save the password for the service and account to the keychain. Adds a new entry if necessary, or updates an existing entry if one exists.
  *
  * @param service The string service name.
  * @param account The string account name.
@@ -36,7 +39,16 @@ export declare function setPassword(service: string, account: string, password:
 export declare function deletePassword(service: string, account: string): Promise<boolean>;
 
 /**
- * Find a password for the service in the keychain.
+ * Find all accounts and password for the service in the keychain.
+ *
+ * @param service The string service name.
+ *
+ * @returns A promise for the credentials array.
+ */
+export declare function findCredentials(service: string): Promise<Array<{ account: string, password: string }>>;
+
+/**
+ * Find a password for the service in the keychain. This is ideal for scenarios where an account is not required.
  *
  * @param service The string service name.
  *
diff --git a/types/keytar/keytar-tests.ts b/types/keytar/keytar-tests.ts
index f6873838c2..18a7423450 100644
--- a/types/keytar/keytar-tests.ts
+++ b/types/keytar/keytar-tests.ts
@@ -8,6 +8,8 @@ let success: Promise<boolean>;
 success = keytar.deletePassword('keytar-tests', 'username');
 
 let password: Promise<string | null>;
-
 password = keytar.findPassword('keytar-tests');
 password = keytar.getPassword('keytar-tests', 'username');
+
+let credentials: Promise<Array<{ account: string, password: string }>>;
+credentials = keytar.findCredentials('keytar-tests');

From 38c7f6fe6a1d02acfbf09a7ee369417504ebb9d5 Mon Sep 17 00:00:00 2001
From: zzanol <zach@intouchreceipting.com>
Date: Tue, 5 Mar 2019 17:00:05 -0800
Subject: [PATCH 404/924] fix callback argument shape

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

diff --git a/types/react-credit-cards/index.d.ts b/types/react-credit-cards/index.d.ts
index 4cbf2f9830..015334e1c3 100644
--- a/types/react-credit-cards/index.d.ts
+++ b/types/react-credit-cards/index.d.ts
@@ -1,14 +1,14 @@
-// Type definitions for react-credit-cards 0.7
+// Type definitions for react-credit-cards 0.8
 // Project: https://github.com/amarofashion/react-credit-cards
-// Definitions by: Vytautas Strimaitis <https://github.com/vstrimaitis>, Ole Frank <https://github.com/olefrank>
+// Definitions by: Vytautas Strimaitis <https://github.com/vstrimaitis>, Ole Frank <https://github.com/olefrank>, zzanol <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from "react";
 
 export interface CallbackArgument {
-    isValid: boolean;
-    type: { issuer: string; maxLength: number };
+    issuer: string;
+    maxLength: number;
 }
 
 export type Focused = "name" | "number" | "expiry" | "cvc";

From 8b1beff944f6c7bf913b6fcee31fb5f7129064a7 Mon Sep 17 00:00:00 2001
From: James Reggio <james.reggio@gmail.com>
Date: Wed, 27 Feb 2019 11:52:11 -0800
Subject: [PATCH 405/924] [react-redux] Add NonReactStatics to
 ConnectedComponentClass

---
 types/react-redux/index.d.ts            |  7 ++++-
 types/react-redux/react-redux-tests.tsx | 42 +++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 5adeb43612..624bc0b680 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -44,6 +44,8 @@ import {
     Store
 } from 'redux';
 
+import { NonReactStatics } from 'hoist-non-react-statics';
+
 // Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
@@ -96,7 +98,10 @@ export type GetProps<C> = C extends ComponentType<infer P> ? P : never;
 
 // Applies LibraryManagedAttributes (proper handling of defaultProps
 // and propTypes), as well as defines WrappedComponent.
-export type ConnectedComponentClass<C, P> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & {
+export type ConnectedComponentClass<
+    C extends ComponentType<any>,
+    P
+> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & NonReactStatics<C> & {
     WrappedComponent: C;
 };
 
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index ee5b9c1d94..085874a523 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -1167,6 +1167,48 @@ function TestLibraryManagedAttributes() {
     <ConnectedComponent2 fn={() => { }} />;
 }
 
+function TestNonReactStatics() {
+    interface OwnProps {
+        bar: number;
+    }
+
+    interface MapStateProps {
+        foo: string;
+    }
+
+    class Component extends React.Component<OwnProps & MapStateProps> {
+        static defaultProps = {
+            bar: 0,
+        };
+
+        static meaningOfLife = 42;
+
+        render() {
+            return <div />;
+        }
+    }
+
+    function mapStateToProps(state: any): MapStateProps {
+        return {
+            foo: 'foo',
+        };
+    }
+
+    Component.meaningOfLife;
+    Component.defaultProps.bar;
+
+    const ConnectedComponent = connect(mapStateToProps)(Component);
+
+    // This is a non-React static and should be hoisted as-is.
+    ConnectedComponent.meaningOfLife;
+
+    // This is a React static, so it's not hoisted.
+    // However, ConnectedComponent is still a ComponentClass, which specifies `defaultProps`
+    // as an optional static member. We can force an error (and assert that `defaultProps`
+    // wasn't hoisted) by reaching into the `defaultProps` object without a null check.
+    ConnectedComponent.defaultProps.bar; // $ExpectError
+}
+
 function TestProviderContext() {
     const store: Store = createStore((state = {}) => state);
     const nullContext = React.createContext(null);

From 4aadffd8bcffa7dc0ba170414e78b020aa08b633 Mon Sep 17 00:00:00 2001
From: "Matt R. Wilson" <mwilson@shutterstock.com>
Date: Tue, 5 Mar 2019 20:35:03 -0700
Subject: [PATCH 406/924] [express-bunyan-logger] Update Options.

The options are passed through to bunyan.createLogger so all those
options need to be valid. A `Partial` is used because the only required
option by `createLogger` is `name` but the middleware provides a
default.
---
 .../express-bunyan-logger/express-bunyan-logger-tests.ts | 9 +++++++++
 types/express-bunyan-logger/index.d.ts                   | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/express-bunyan-logger/express-bunyan-logger-tests.ts b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
index daac949c0e..564f27d020 100644
--- a/types/express-bunyan-logger/express-bunyan-logger-tests.ts
+++ b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
@@ -22,3 +22,12 @@ const logger = Bunyan.createLogger({
 const middleware5 = expressBunyan({
     logger
 });
+
+expressBunyan({
+    format: () => "some format",
+    genReqId: req => req.header("foo") || "other",
+    name: "foo_app",
+    parseUA: false,
+    serializers: Bunyan.stdSerializers,
+    streams: [{ level: 'info', stream: process.stdout }]
+});
diff --git a/types/express-bunyan-logger/index.d.ts b/types/express-bunyan-logger/index.d.ts
index 6697a26a20..45e3544a3d 100644
--- a/types/express-bunyan-logger/index.d.ts
+++ b/types/express-bunyan-logger/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for express-bunyan-logger 1.3
 // Project: https://github.com/villadora/express-bunyan-logger
 // Definitions by: Shrey Jain <https://github.com/shreyjain1994>
+//                 Matt R. Wilson <https://github.com/mastermatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -17,7 +18,7 @@ declare namespace Factory {
     type RequestIdGenFunction = (req: express.Request) => string;
     type LevelFunction = (status: number, err: Error | null, meta: any) => string;
 
-    interface Options {
+    interface Options extends Partial<Bunyan.LoggerOptions> {
         logger?: Bunyan;
         format?: string | FormatFunction;
         parseUA?: boolean;
@@ -26,7 +27,6 @@ declare namespace Factory {
         excludes?: string[];
         obfuscate?: string[];
         obfuscatePlaceholder?: string;
-        serializers?: { [field: string]: Bunyan.Serializer };
         immediate?: boolean;
         genReqId?: RequestIdGenFunction;
     }

From 2ba47ba8919dbd7a7613a6c4fdbf687b86273538 Mon Sep 17 00:00:00 2001
From: pdeva <prashant.deva@gmail.com>
Date: Tue, 5 Mar 2019 20:14:13 -0800
Subject: [PATCH 407/924] removing myself from list

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

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 5adeb43612..bd9ea1cae2 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -6,7 +6,6 @@
 //                 Frank Tan <https://github.com/tansongyang>
 //                 Nicholas Boll <https://github.com/nicholasboll>
 //                 Dibyo Majumdar <https://github.com/mdibyo>
-//                 Prashant Deva <https://github.com/pdeva>
 //                 Thomas Charlat <https://github.com/kallikrein>
 //                 Valentin Descamps <https://github.com/val1984>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>

From 1c3a4a3c99e3f9665cb1bd9f9b43356ddfa704d1 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:49:56 +1100
Subject: [PATCH 408/924] Added type defs for is-date-object

---
 types/is-date-object/index.d.ts              |  8 +++++++
 types/is-date-object/is-date-object-tests.ts | 14 +++++++++++
 types/is-date-object/tsconfig.json           | 25 ++++++++++++++++++++
 types/is-date-object/tslint.json             |  3 +++
 4 files changed, 50 insertions(+)
 create mode 100644 types/is-date-object/index.d.ts
 create mode 100644 types/is-date-object/is-date-object-tests.ts
 create mode 100644 types/is-date-object/tsconfig.json
 create mode 100644 types/is-date-object/tslint.json

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
new file mode 100644
index 0000000000..08885dce51
--- /dev/null
+++ b/types/is-date-object/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-date-object 1.0
+// Project: https://github.com/ljharb/is-date-object
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isDateObject(value?: any): boolean;
+
+export = isDateObject;
diff --git a/types/is-date-object/is-date-object-tests.ts b/types/is-date-object/is-date-object-tests.ts
new file mode 100644
index 0000000000..68fb22d684
--- /dev/null
+++ b/types/is-date-object/is-date-object-tests.ts
@@ -0,0 +1,14 @@
+import isDate = require("is-date-object");
+
+isDate();
+isDate(undefined);
+isDate(null);
+isDate(false);
+isDate(true);
+isDate(42);
+isDate('foo');
+isDate([]);
+isDate({});
+isDate(/a/g);
+isDate(new RegExp('a', 'g'));
+isDate(new Date());
diff --git a/types/is-date-object/tsconfig.json b/types/is-date-object/tsconfig.json
new file mode 100644
index 0000000000..7c42b57df2
--- /dev/null
+++ b/types/is-date-object/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "is-date-object-tests.ts"
+    ]
+}
diff --git a/types/is-date-object/tslint.json b/types/is-date-object/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/is-date-object/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 1f3fbac02514c332857735efbe8db0172109c1a1 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:57:59 +1100
Subject: [PATCH 409/924] Added type defs for date-now

---
 types/date-now/date-now-tests.ts |  5 +++++
 types/date-now/index.d.ts        |  8 ++++++++
 types/date-now/seed.d.ts         |  6 ++++++
 types/date-now/tsconfig.json     | 26 ++++++++++++++++++++++++++
 types/date-now/tslint.json       |  3 +++
 5 files changed, 48 insertions(+)
 create mode 100644 types/date-now/date-now-tests.ts
 create mode 100644 types/date-now/index.d.ts
 create mode 100644 types/date-now/seed.d.ts
 create mode 100644 types/date-now/tsconfig.json
 create mode 100644 types/date-now/tslint.json

diff --git a/types/date-now/date-now-tests.ts b/types/date-now/date-now-tests.ts
new file mode 100644
index 0000000000..f16487de44
--- /dev/null
+++ b/types/date-now/date-now-tests.ts
@@ -0,0 +1,5 @@
+import seeded = require('date-now/seed');
+import dateNow = require('date-now');
+
+seeded(123);
+dateNow();
diff --git a/types/date-now/index.d.ts b/types/date-now/index.d.ts
new file mode 100644
index 0000000000..7ed6ab7df3
--- /dev/null
+++ b/types/date-now/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for date-now 1.0
+// Project: https://github.com/Raynos/date-now
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function dateNow(): number;
+
+export = dateNow;
diff --git a/types/date-now/seed.d.ts b/types/date-now/seed.d.ts
new file mode 100644
index 0000000000..c87a702c55
--- /dev/null
+++ b/types/date-now/seed.d.ts
@@ -0,0 +1,6 @@
+/**
+ * Returns a Date.now() like function that's in sync with the seed value.
+ */
+declare function seeded(seed: number): number;
+
+export = seeded;
diff --git a/types/date-now/tsconfig.json b/types/date-now/tsconfig.json
new file mode 100644
index 0000000000..705da71b7b
--- /dev/null
+++ b/types/date-now/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "seed.d.ts",
+      "date-now-tests.ts"
+    ]
+}
diff --git a/types/date-now/tslint.json b/types/date-now/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/date-now/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 778d161e489437881cc16eebfd415708c494714b Mon Sep 17 00:00:00 2001
From: Rob Valentine <rob@codemonkeys.co.za>
Date: Wed, 6 Mar 2019 08:12:03 +0200
Subject: [PATCH 410/924] Fixed space issue

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

diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index 9797be6e28..e0a152c610 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -100,7 +100,7 @@ export interface PreviewProps {
 export class Preview extends PureComponent<PreviewProps> {}
 /**
  * Pre-existing/default react-dnd-multi-backend transition available to use.
-  */
+ */
  export const MouseTransition: Transition;
 /**
  * Pre-existing/default react-dnd-touch-backend transition available to use.

From dc82564d793ee57de681f47782381a0bdc4cb558 Mon Sep 17 00:00:00 2001
From: Jordi Oliveras Rovira <jordi.oliveras.rovira@gmail.com>
Date: Wed, 6 Mar 2019 07:56:41 +0100
Subject: [PATCH 411/924] Resolve tests errors.

---
 types/gulp/package.json                 | 3 +--
 types/gulp/test/index.ts                | 2 +-
 types/rollup-plugin-delete/package.json | 2 +-
 types/vinyl-paths/package.json          | 1 -
 types/vinyl-paths/vinyl-paths-tests.ts  | 3 ++-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/types/gulp/package.json b/types/gulp/package.json
index bae72230b6..a0e2ec3c5c 100644
--- a/types/gulp/package.json
+++ b/types/gulp/package.json
@@ -1,7 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "chokidar": "^2.1.2",
-    "del": "*"
+    "chokidar": "^2.1.2"
   }
 }
diff --git a/types/gulp/test/index.ts b/types/gulp/test/index.ts
index f5ca436450..4b096a8704 100644
--- a/types/gulp/test/index.ts
+++ b/types/gulp/test/index.ts
@@ -1,12 +1,12 @@
 import * as gulp from 'gulp';
 import * as undertaker from 'undertaker';
 import * as registry from 'undertaker-registry';
-import del = require("del");
 
 const minify: () => any = () => { };
 const jade: () => any = () => { };
 const someplugin: () => any = () => { };
 const promisedDel: (list: string[]) => any = (list) => { };
+const del: (pattern: string | string[]) => any = (pattern) => { };
 
 gulp.src('client/templates/*.jade')
     .pipe(jade())
diff --git a/types/rollup-plugin-delete/package.json b/types/rollup-plugin-delete/package.json
index cca5c8c155..8971fd5346 100644
--- a/types/rollup-plugin-delete/package.json
+++ b/types/rollup-plugin-delete/package.json
@@ -2,6 +2,6 @@
     "private": true,
     "dependencies": {
         "del": "*",
-        "rollup": ">=0.60.0"
+        "rollup": ">=0.60.0 <1.2.0"
     }
 }
diff --git a/types/vinyl-paths/package.json b/types/vinyl-paths/package.json
index d03842a47b..d24e43befc 100644
--- a/types/vinyl-paths/package.json
+++ b/types/vinyl-paths/package.json
@@ -1,7 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "del": "*",
     "rollup": ">=0.60.0"
   }
 }
diff --git a/types/vinyl-paths/vinyl-paths-tests.ts b/types/vinyl-paths/vinyl-paths-tests.ts
index 3e66d44e3a..4c2c7d940e 100644
--- a/types/vinyl-paths/vinyl-paths-tests.ts
+++ b/types/vinyl-paths/vinyl-paths-tests.ts
@@ -1,7 +1,8 @@
 import gulp = require('gulp');
-import del = require('del');
 import paths = require('vinyl-paths');
 
+const del: (pattern: string | string[]) => any = (pattern) => { };
+
 gulp.task('delete', function () {
     return gulp.src('app/*')
         .pipe(paths(del));

From 52b22e46ae22bb99542cbd23f183da1e0731777c Mon Sep 17 00:00:00 2001
From: Jordi Oliveras Rovira <jordi.oliveras.rovira@gmail.com>
Date: Wed, 6 Mar 2019 08:00:40 +0100
Subject: [PATCH 412/924] Remove unneeded package.json on vinyl-paths

---
 types/vinyl-paths/package.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 types/vinyl-paths/package.json

diff --git a/types/vinyl-paths/package.json b/types/vinyl-paths/package.json
deleted file mode 100644
index d24e43befc..0000000000
--- a/types/vinyl-paths/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "rollup": ">=0.60.0"
-  }
-}

From 462c6f2a82f59451f91fe3372928c5dd70edb3cf Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:17:47 +1100
Subject: [PATCH 413/924] Updated any type to unknown

---
 types/is-date-object/index.d.ts              | 7 ++++++-
 types/is-date-object/is-date-object-tests.ts | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 08885dce51..4564b5e34b 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -2,7 +2,12 @@
 // Project: https://github.com/ljharb/is-date-object
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
 
-declare function isDateObject(value?: any): boolean;
+type InvalidTypes = undefined | null | boolean | string | number | [] | {};
+
+declare function isDateObject(value: Date): true;
+declare function isDateObject(value: InvalidTypes | unknown): false;
+declare function isDateObject(value?: unknown): false;
 
 export = isDateObject;
diff --git a/types/is-date-object/is-date-object-tests.ts b/types/is-date-object/is-date-object-tests.ts
index 68fb22d684..9946c42d54 100644
--- a/types/is-date-object/is-date-object-tests.ts
+++ b/types/is-date-object/is-date-object-tests.ts
@@ -7,6 +7,7 @@ isDate(false);
 isDate(true);
 isDate(42);
 isDate('foo');
+isDate((): void => {});
 isDate([]);
 isDate({});
 isDate(/a/g);

From 7f1bccc091d452d9d90ada531792c09a309f1adc Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 21:44:52 +1100
Subject: [PATCH 414/924] Updated export type

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

diff --git a/types/repeat-string/index.d.ts b/types/repeat-string/index.d.ts
index e593a62b68..5664484e22 100644
--- a/types/repeat-string/index.d.ts
+++ b/types/repeat-string/index.d.ts
@@ -6,4 +6,6 @@
 /**
  * Repeat the given `string` the specified `number` of times.
  */
-export default function(str: string, num: number): string;
+declare function repeat(str: string, num: number): string;
+
+export = repeat;
diff --git a/types/repeat-string/repeat-string-tests.ts b/types/repeat-string/repeat-string-tests.ts
index 7095ea672b..c2692d7569 100644
--- a/types/repeat-string/repeat-string-tests.ts
+++ b/types/repeat-string/repeat-string-tests.ts
@@ -1,3 +1,3 @@
-import Repeat from "repeat-string";
+import Repeat = require("repeat-string");
 
 Repeat('A', 5);

From c19c506eb9a6688895537f07267f97d8fbe8e49c Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 21:56:07 +1100
Subject: [PATCH 415/924] Updated export type

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

diff --git a/types/cipher-base/cipher-base-tests.ts b/types/cipher-base/cipher-base-tests.ts
index 173a72b7f6..b81238ee98 100644
--- a/types/cipher-base/cipher-base-tests.ts
+++ b/types/cipher-base/cipher-base-tests.ts
@@ -1,4 +1,4 @@
-import CipherBase from "cipher-base";
+import CipherBase = require("cipher-base");
 
 const buf = new Buffer(1);
 
diff --git a/types/cipher-base/index.d.ts b/types/cipher-base/index.d.ts
index 228920ac91..f43ca2cdb9 100644
--- a/types/cipher-base/index.d.ts
+++ b/types/cipher-base/index.d.ts
@@ -11,4 +11,4 @@ declare abstract class CipherBase {
     abstract update(value: Buffer, inputEnc?: string, outputEnc?: string): Buffer;
 }
 
-export default CipherBase;
+export = CipherBase;

From 0219d7546ed10178d5659696ee431a6613abe088 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 21:51:56 +1100
Subject: [PATCH 416/924] Updated export type

---
 types/html-truncate/html-truncate-tests.ts | 2 +-
 types/html-truncate/index.d.ts             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/html-truncate/html-truncate-tests.ts b/types/html-truncate/html-truncate-tests.ts
index 0c46bf560b..30f6a19e7c 100644
--- a/types/html-truncate/html-truncate-tests.ts
+++ b/types/html-truncate/html-truncate-tests.ts
@@ -1,4 +1,4 @@
-import Truncate from "html-truncate";
+import Truncate = require("html-truncate");
 
 Truncate('hello world', 4);
 
diff --git a/types/html-truncate/index.d.ts b/types/html-truncate/index.d.ts
index 8be4a950a3..4784caa925 100644
--- a/types/html-truncate/index.d.ts
+++ b/types/html-truncate/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/huang47/nodejs-html-truncate
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
-export interface TruncateOptions {
+interface TruncateOptions {
     /**
      * Flag to specify if keep image tag, false by default.
      */
@@ -17,4 +18,6 @@ export interface TruncateOptions {
 /**
  * Truncate HTML text and also keep tag safe.
  */
-export default function truncate(input: string, maxLength: number, options?: TruncateOptions): string;
+declare function truncate(input: string, maxLength: number, options?: TruncateOptions): string;
+
+export = truncate;

From 57ee13062763ab3faa6f104624a03dab0f12e0de Mon Sep 17 00:00:00 2001
From: Rocky Warren <1085683+therockstorm@users.noreply.github.com>
Date: Wed, 6 Mar 2019 08:31:31 -0600
Subject: [PATCH 417/924] Update SQSMessageAttribute in aws-lambda

---
 types/aws-lambda/aws-lambda-tests.ts | 14 +++++++++++++-
 types/aws-lambda/index.d.ts          | 12 +++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index ad063c20b6..dc5f9b3eba 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -1003,7 +1003,15 @@ const SQSEvent: AWSLambda.SQSEvent = {
                 SenderId: "594035263019",
                 ApproximateFirstReceiveTimestamp: "1529104986230"
             },
-            messageAttributes: {},
+            messageAttributes: {
+                testAttr: {
+                    stringValue: "100",
+                    binaryValue: "base64Str",
+                    stringListValues: [],
+                    binaryListValues: [],
+                    dataType: "Number"
+                }
+            },
             md5OfBody: "9bb58f26192e4ba00f01e2e7b136bbd8",
             eventSource: "aws:sqs",
             eventSourceARN: "arn:aws:sqs:us-west-2:594035263019:NOTFIFOQUEUE",
@@ -1039,6 +1047,10 @@ const SQSMessageNode8AsyncHandler: AWSLambda.SQSHandler = async (
     event;
     str = event.Records[0].messageId;
     anyObj = event.Records[0].body;
+    strOrUndefined = event.Records[0].messageAttributes.testAttr.stringValue;
+    strOrUndefined = event.Records[0].messageAttributes.testAttr.binaryValue;
+    str = event.Records[0].messageAttributes.testAttr.dataType;
+
     // $ExpectType Context
     context;
     str = context.functionName;
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 6ebccd452a..25d5c471eb 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -878,11 +878,17 @@ export interface SQSRecordAttributes {
     SenderId: string;
     ApproximateFirstReceiveTimestamp: string;
 }
+
+export type SQSMessageAttributeDataType = 'String' | 'Number' | 'Binary' | string;
+
 export interface SQSMessageAttribute {
-    Name: string;
-    Type: string;
-    Value: string;
+    stringValue?: string;
+    binaryValue?: string;
+    stringListValues: never[]; // Not implemented. Reserved for future use.
+    binaryListValues: never[]; // Not implemented. Reserved for future use.
+    dataType: SQSMessageAttributeDataType;
 }
+
 export interface SQSMessageAttributes {
     [name: string]: SQSMessageAttribute;
 }

From ca73f3043114ae55ee3a018311ab031b424e34dd Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Wed, 6 Mar 2019 07:56:20 -0700
Subject: [PATCH 418/924] Expose Options interface

Expose the Options interface directly so it can be constructed before it is passed to the constructor.
---
 types/flickity/flickity-tests.ts |  46 +++
 types/flickity/index.d.ts        | 571 ++++++++++++++++---------------
 2 files changed, 333 insertions(+), 284 deletions(-)

diff --git a/types/flickity/flickity-tests.ts b/types/flickity/flickity-tests.ts
index 8686d2f587..6e24f16b3e 100644
--- a/types/flickity/flickity-tests.ts
+++ b/types/flickity/flickity-tests.ts
@@ -160,3 +160,49 @@ let flikty5: Flickity = new Flickity(new HTMLElement(), {
         fullscreenChange: (isFullscreen)  => {}
     }
 });
+
+let fliktyOpts1: Flickity.Options = {
+    initialIndex: 0,
+    accessibility: true,
+    asNavFor: "#nav-bar",
+    autoPlay: true,
+    cellAlign: "left",
+    cellSelector: ".gallery-cell",
+    contain: true,
+    draggable: true,
+    freeScroll: false,
+    freeScrollFriction: 0.5,
+    friction: 0.8,
+    imagesLoaded: false,
+    lazyLoad: false,
+    pageDots: false,
+    arrowShape: "arrow.svg",
+    percentPosition: false,
+    prevNextButtons: false,
+    selectedAttraction: 0.050,
+    setGallerySize: true,
+    watchCSS: true,
+    wrapAround: true,
+    resize: true,
+    rightToLeft: false
+};
+
+let fliktyOpts2: Flickity.Options = {
+    on: {
+        ready: () => {},
+        change: (index) => {},
+        select: (index) => {},
+        settle: (index)  => {},
+        scroll: (progress)  => {},
+        dragStart: (event, pointer)  => {},
+        dragMove: (event, pointer, moveVector)  => {},
+        dragEnd: (event, pointer)  => {},
+        pointerDown: (event, pointer)  => {},
+        pointerMove: (event, pointer, moveVector)  => {},
+        pointerUp: (event, pointer)  => {},
+        staticClick: (event, pointer, cellElement, cellIndex)  => {},
+        lazyLoad: (event, cellElement)  => {},
+        bgLazyLoad: (event, element)  => {},
+        fullscreenChange: (isFullscreen)  => {}
+    }
+};
diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 5d9f3fa510..44812373d9 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Flickity 2.0
+// Type definitions for Flickity 2.2
 // Project: https://flickity.metafizzy.co
 // Definitions by: Chris McGrath <https://github.com/clmcgrath>
 //                 Michael Wagner <https://github.com/wagich>
@@ -11,7 +11,7 @@ export = Flickity;
 
 declare global {
     interface JQuery {
-        flickity(options?: FlickityOptions): this;
+        flickity(options?: Flickity.Options): this;
         flickity(command: string, ...params: any[]): this;
     }
 }
@@ -67,6 +67,288 @@ declare namespace Flickity {
          * Triggered after a background image has been loaded with bgLazyLoad.
          */
         "bgLazyLoad";
+
+        
+
+    interface Options {
+        /**
+         * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
+         *
+         * default: '.gallery-cell'
+         */
+        cellSelector?: string;
+
+        /**
+         * Zero-based index of the initial selected cell.
+         */
+        initialIndex?: number;
+
+        /**
+         * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells.
+         *
+         * default: true
+         */
+        accessibility?: boolean;
+
+        /**
+         * Sets the height of the gallery to the height of the tallest cell.  Set to  false if you prefer to size the gallery with CSS, rather than using the size of cells.
+         *
+         * default: true
+         */
+        setGallerySize?: boolean;
+
+        /**
+         * Adjusts sizes and positions when window is resized.
+         *
+         * default: true
+         */
+        resize?: boolean;
+
+        /**
+         * Align cells within the gallery element.
+         * opttions: 'left', 'center', 'right'
+         *
+         * default: 'center'
+         */
+        cellAlign?: string;
+
+        /**
+         * Contains cells to gallery element to prevent excess scroll at beginning or end. Has no effect if wrapAround is enabled
+         *
+         * default: true
+         */
+        contain?: boolean;
+
+        /**
+         * Unloaded images have no size, which can throw off cell positions. To fix this, the imagesLoaded option re-positions cells once their images have loaded.
+         *
+         * default: true
+         */
+        imagesLoaded?: boolean;
+
+        /**
+         * Sets positioning in percent values, rather than pixel values. If your cells do not have percent widths, we recommended percentPosition: false.
+         *
+         * default: false
+         */
+        percentPosition?: boolean;
+
+        /**
+         * Enables right-to-left layout.
+         *
+         * default: false
+         */
+        rightToLeft?: boolean;
+
+        /**
+         * Enables dragging and flicking
+         *
+         * default: true
+         */
+        draggable?: boolean;
+
+        /**
+         * Enables content to be freely scrolled and flicked without aligning cells to an end position.
+         * Enable freeScroll and wrapAround and you can flick forever, man.
+         *
+         * default: false
+         */
+        freeScroll?: boolean;
+
+        /**
+         * At the end of cells, wrap-around to the other end for infinite scrolling.
+         *
+         * default: false
+         */
+        wrapAround?: boolean;
+
+        /**
+         * Groups cells together in slides. Flicking, page dots, and previous/next buttons are mapped to group slides, not individual cells.
+         * `is-selected` class is added to the multiple cells in the selected slide.
+         * If set to true, group cells that fit in carousel viewport.
+         * If set to a number, group cells by that number.
+         * If set to a percent string, group cells that fit in the percent of the width of the carousel viewport.
+         */
+        groupCells?: boolean | number | string;
+
+        /**
+         * Loads cell images when a cell is selected.
+         * Set the image's URL to load with the `data-flickity-lazyload` attribute.
+         * If set to `true`, lazyloads image in selected slide
+         * If set to a number n, load images in selected slide and next n slides and previous n slides.
+         *
+         * default: false
+         */
+        lazyLoad?: boolean | number;
+
+        /**
+         * Loads cell background image when a cell is selected.
+         * Set the background image's URL to load with the `data-flickity-bg-lazyload` attribute.
+         * If set to `true`, lazyloads background image in selected slide
+         * If set to a number n, load background images in selected slide and next n slides and previous n slides.
+         * bgLazyLoad requires the flickity-bg-lazyload package. This package is not included and must be installed separately.
+         */
+        bgLazyLoad?: boolean | number;
+
+        /**
+         * Automatically advances to the next cell.
+         *
+         * default: false
+         */
+        autoPlay?: boolean | number;
+
+        /**
+         * Changes height of carousel to fit height of selected slide.
+         */
+        adaptiveHeight?: boolean;
+
+        /**
+         * You can enable and disable Flickity with CSS. watchCSS option watches the content of :after of the gallery element. Flickity is enabled if :after content is 'flickity'.
+         * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers.
+         *
+         * default: false
+         */
+        watchCSS?: boolean | string;
+
+        /**
+         * Use one Flickity gallery as navigation for another.
+         *
+         * default: disabled
+         */
+        asNavFor?: string | HTMLElement;
+
+        /**
+         * The number of pixels a mouse or touch has to move before dragging begins. Increase dragThreshold to allow for more wiggle room for vertical page scrolling on touch devices.
+         *
+         * default: 3
+         */
+        dragThreshold?: number;
+
+        /**
+         * selectedAttraction attracts the position of the slider to the selected cell. Higher attraction makes the slider move faster. Lower makes it move slower.
+         *
+         * default: 0.025
+         */
+        selectedAttraction?: number;
+
+        /**
+         * Friction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly.
+         *
+         * default: 0.28
+         */
+        friction?: number;
+
+        /**
+         * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser.
+         *
+         * default: 0.075
+         */
+        freeScrollFriction?: number;
+
+        /**
+         * Creates and enables previous & next buttons.
+         *
+         * default: true
+         */
+        prevNextButtons?: boolean;
+
+        /**
+         * Creates and enables paging dots.
+         *
+         * default: true
+         */
+        pageDots?: boolean;
+
+        /**
+         * Draws the shape of the arrows in the previous & next buttons.
+         * javascript dictionary of points or path to SVG file
+         */
+        arrowShape?: string | { x0: number, x1: number, y1: number, x2: number, y2: number, x3: number };
+
+        /**
+         * Bind events within Flickity's options by setting on to an Object. The object's keys should match the event names. on is useful for capturing events as Flickity is initialized, like ready
+         */
+        on?: {
+            /**
+             * Triggered after Flickity has been activated.
+             */
+            ready?: () => void;
+
+            /**
+             * Triggered when the selected slide is changed.
+             */
+            change?: (index?: Number) => void;
+
+            /**
+             * Triggered when a slide is selected.
+             * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
+             * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
+             */
+            select?: (index?: Number) => void;
+            cellSelect?: (index?: Number) => void;
+            /**
+             * Triggered when the slider is settled at its end position.
+             */
+            settle?: (index?: Number) => void;
+
+            /**
+             * Triggered when the slider moves.
+             */
+            scroll?: (progress?: Number) => void;
+
+            /**
+             * Triggered when dragging starts and the slider starts moving.
+             */
+            dragStart?: (event?: Event, pointer?: Element | Touch) => void;
+
+            /**
+             * Triggered when dragging moves and the slider moves.
+             */
+            dragMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+
+            /**
+             * Triggered when dragging ends.
+             */
+            dragEnd?: (event: Event, pointer?: Element | Touch) => void;
+
+            /**
+             * Triggered when the user's pointer (mouse, touch, pointer) presses down.
+             */
+            pointerDown?: (event: Event, pointer?: Element | Touch) => void;
+
+            /**
+             * Triggered when the user's pointer moves.
+             */
+            pointerMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+
+            /**
+             * Triggered when the user's pointer unpresses.
+             */
+            pointerUp?: (event?: Event, pointer?: Element | Touch) => void;
+
+            /**
+             * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
+             * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
+             */
+            staticClick?: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: Number) => void;
+
+            /**
+             * Triggered after an image has been loaded with lazyLoad.
+             */
+            lazyLoad?: (event?: Event, cellElement?: Element) => void;
+
+            /**
+             * Triggered after a background image has been loaded with bgLazyLoad.
+             */
+            bgLazyLoad?: (event?: Event, element?: Element) => void;
+
+            /**
+             * Triggered after entering or exiting fullscreen view.
+             */
+            fullscreenChange?: (isFullscreen?: Boolean) => void;
+        };
+    }
+
 }
 
 declare class Flickity {
@@ -74,9 +356,9 @@ declare class Flickity {
      * Initializes an new instance of Flickity .
      *
      * @param element Element selector string or container Element to initialize Flickity on
-     * @param options (IFlickityOptions) Flickity options
+     * @param options (IOptions) Flickity options
      */
-    constructor(selector: string | Element, options?: FlickityOptions);
+    constructor(selector: string | Element, options?: Flickity.Options);
 
     // properties
 
@@ -292,7 +574,7 @@ declare class Flickity {
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: number) => any): void;
 
     /**
-     * one time event handler
+     * one time event handl`er
      * @param eventName name of event  (@see Flickity.FlickityEvents class for filckity supported events)
      * @param callback callback funtion to execute when event fires
      */
@@ -312,282 +594,3 @@ declare class Flickity {
      */
     once(eventname: string, callback: (event?: Event, pointer?: Element | Touch) => any): void;
 }
-
-interface FlickityOptions {
-    /**
-     * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
-     *
-     * default: '.gallery-cell'
-     */
-    cellSelector?: string;
-
-    /**
-     * Zero-based index of the initial selected cell.
-     */
-    initialIndex?: number;
-
-    /**
-     * Enable keyboard navigation. Users can tab to a Flickity gallery, and pressing left & right keys to change cells.
-     *
-     * default: true
-     */
-    accessibility?: boolean;
-
-    /**
-     * Sets the height of the gallery to the height of the tallest cell.  Set to  false if you prefer to size the gallery with CSS, rather than using the size of cells.
-     *
-     * default: true
-     */
-    setGallerySize?: boolean;
-
-    /**
-     * Adjusts sizes and positions when window is resized.
-     *
-     * default: true
-     */
-    resize?: boolean;
-
-    /**
-     * Align cells within the gallery element.
-     * opttions: 'left', 'center', 'right'
-     *
-     * default: 'center'
-     */
-    cellAlign?: string;
-
-    /**
-     * Contains cells to gallery element to prevent excess scroll at beginning or end. Has no effect if wrapAround is enabled
-     *
-     * default: true
-     */
-    contain?: boolean;
-
-    /**
-     * Unloaded images have no size, which can throw off cell positions. To fix this, the imagesLoaded option re-positions cells once their images have loaded.
-     *
-     * default: true
-     */
-    imagesLoaded?: boolean;
-
-    /**
-     * Sets positioning in percent values, rather than pixel values. If your cells do not have percent widths, we recommended percentPosition: false.
-     *
-     * default: false
-     */
-    percentPosition?: boolean;
-
-    /**
-     * Enables right-to-left layout.
-     *
-     * default: false
-     */
-    rightToLeft?: boolean;
-
-    /**
-     * Enables dragging and flicking
-     *
-     * default: true
-     */
-    draggable?: boolean;
-
-    /**
-     * Enables content to be freely scrolled and flicked without aligning cells to an end position.
-     * Enable freeScroll and wrapAround and you can flick forever, man.
-     *
-     * default: false
-     */
-    freeScroll?: boolean;
-
-    /**
-     * At the end of cells, wrap-around to the other end for infinite scrolling.
-     *
-     * default: false
-     */
-    wrapAround?: boolean;
-
-    /**
-     * Groups cells together in slides. Flicking, page dots, and previous/next buttons are mapped to group slides, not individual cells.
-     * `is-selected` class is added to the multiple cells in the selected slide.
-     * If set to true, group cells that fit in carousel viewport.
-     * If set to a number, group cells by that number.
-     * If set to a percent string, group cells that fit in the percent of the width of the carousel viewport.
-     */
-    groupCells?: boolean | number | string;
-
-    /**
-     * Loads cell images when a cell is selected.
-     * Set the image's URL to load with the `data-flickity-lazyload` attribute.
-     * If set to `true`, lazyloads image in selected slide
-     * If set to a number n, load images in selected slide and next n slides and previous n slides.
-     *
-     * default: false
-     */
-    lazyLoad?: boolean | number;
-
-    /**
-     * Loads cell background image when a cell is selected.
-     * Set the background image's URL to load with the `data-flickity-bg-lazyload` attribute.
-     * If set to `true`, lazyloads background image in selected slide
-     * If set to a number n, load background images in selected slide and next n slides and previous n slides.
-     * bgLazyLoad requires the flickity-bg-lazyload package. This package is not included and must be installed separately.
-     */
-    bgLazyLoad?: boolean | number;
-
-    /**
-     * Automatically advances to the next cell.
-     *
-     * default: false
-     */
-    autoPlay?: boolean | number;
-
-    /**
-     * Changes height of carousel to fit height of selected slide.
-     */
-    adaptiveHeight?: boolean;
-
-    /**
-     * You can enable and disable Flickity with CSS. watchCSS option watches the content of :after of the gallery element. Flickity is enabled if :after content is 'flickity'.
-     * note: IE8 and Android 2.3 do not support watching :after. Flickity will be disabled when watchCSS: true. Set watchCSS: 'fallbackOn' to enable Flickity for these browsers.
-     *
-     * default: false
-     */
-    watchCSS?: boolean | string;
-
-    /**
-     * Use one Flickity gallery as navigation for another.
-     *
-     * default: disabled
-     */
-    asNavFor?: string | HTMLElement;
-
-    /**
-     * The number of pixels a mouse or touch has to move before dragging begins. Increase dragThreshold to allow for more wiggle room for vertical page scrolling on touch devices.
-     *
-     * default: 3
-     */
-    dragThreshold?: number;
-
-    /**
-     * selectedAttraction attracts the position of the slider to the selected cell. Higher attraction makes the slider move faster. Lower makes it move slower.
-     *
-     * default: 0.025
-     */
-    selectedAttraction?: number;
-
-    /**
-     * Friction slows the movement of slider. Higher friction makes the slider feel stickier and less bouncy. Lower friction makes the slider feel looser and more wobbly.
-     *
-     * default: 0.28
-     */
-    friction?: number;
-
-    /**
-     * Slows movement of slider when freeScroll: true. Higher friction makes the slider feel stickier. Lower friction makes the slider feel looser.
-     *
-     * default: 0.075
-     */
-    freeScrollFriction?: number;
-
-    /**
-     * Creates and enables previous & next buttons.
-     *
-     * default: true
-     */
-    prevNextButtons?: boolean;
-
-    /**
-     * Creates and enables paging dots.
-     *
-     * default: true
-     */
-    pageDots?: boolean;
-
-    /**
-     * Draws the shape of the arrows in the previous & next buttons.
-     * javascript dictionary of points or path to SVG file
-     */
-    arrowShape?: string | { x0: number, x1: number, y1: number, x2: number, y2: number, x3: number };
-
-    /**
-     * Bind events within Flickity's options by setting on to an Object. The object's keys should match the event names. on is useful for capturing events as Flickity is initialized, like ready
-     */
-    on?: {
-        /**
-         * Triggered after Flickity has been activated.
-         */
-        ready?: () => void;
-
-        /**
-         * Triggered when the selected slide is changed.
-         */
-        change?: (index?: Number) => void;
-
-        /**
-         * Triggered when a slide is selected.
-         * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
-         * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
-         */
-        select?: (index?: Number) => void;
-
-        /**
-         * Triggered when the slider is settled at its end position.
-         */
-        settle?: (index?: Number) => void;
-
-        /**
-         * Triggered when the slider moves.
-         */
-        scroll?: (progress?: Number) => void;
-
-        /**
-         * Triggered when dragging starts and the slider starts moving.
-         */
-        dragStart?: (event?: Event, pointer?: Element | Touch) => void;
-
-        /**
-         * Triggered when dragging moves and the slider moves.
-         */
-        dragMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
-
-        /**
-         * Triggered when dragging ends.
-         */
-        dragEnd?: (event: Event, pointer?: Element | Touch) => void;
-
-        /**
-         * Triggered when the user's pointer (mouse, touch, pointer) presses down.
-         */
-        pointerDown?: (event: Event, pointer?: Element | Touch) => void;
-
-        /**
-         * Triggered when the user's pointer moves.
-         */
-        pointerMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
-
-        /**
-         * Triggered when the user's pointer unpresses.
-         */
-        pointerUp?: (event?: Event, pointer?: Element | Touch) => void;
-
-        /**
-         * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
-         * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
-         */
-        staticClick?: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: Number) => void;
-
-        /**
-         * Triggered after an image has been loaded with lazyLoad.
-         */
-        lazyLoad?: (event?: Event, cellElement?: Element) => void;
-
-        /**
-         * Triggered after a background image has been loaded with bgLazyLoad.
-         */
-        bgLazyLoad?: (event?: Event, element?: Element) => void;
-
-        /**
-         * Triggered after entering or exiting fullscreen view.
-         */
-        fullscreenChange?: (isFullscreen?: Boolean) => void;
-    };
-}

From f775dda6dca2d1f728c74d4058f6a7e5d758627e Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Wed, 6 Mar 2019 08:03:30 -0700
Subject: [PATCH 419/924] Clean up linting

---
 types/flickity/index.d.ts | 44 +++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 44812373d9..c2c475d6af 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -67,9 +67,6 @@ declare namespace Flickity {
          * Triggered after a background image has been loaded with bgLazyLoad.
          */
         "bgLazyLoad";
-
-        
-
     interface Options {
         /**
          * Specify selector for cell elements. cellSelector is useful if you have other elements in your gallery elements that are not cells.
@@ -299,48 +296,70 @@ declare namespace Flickity {
             /**
              * Triggered when dragging starts and the slider starts moving.
              */
-            dragStart?: (event?: Event, pointer?: Element | Touch) => void;
+            dragStart?: (
+                event?: Event, 
+                pointer?: Element | Touch) => void;
 
             /**
              * Triggered when dragging moves and the slider moves.
              */
-            dragMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+            dragMove?: (
+                event?: Event, 
+                pointer?: Element | Touch, 
+                moveVector?: { x: number, y: number }) => void;
 
             /**
              * Triggered when dragging ends.
              */
-            dragEnd?: (event: Event, pointer?: Element | Touch) => void;
+            dragEnd?: (
+                event: Event, 
+                pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer (mouse, touch, pointer) presses down.
              */
-            pointerDown?: (event: Event, pointer?: Element | Touch) => void;
+            pointerDown?: (
+                event: Event, 
+                pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer moves.
              */
-            pointerMove?: (event?: Event, pointer?: Element | Touch, moveVector?: { x: number, y: number }) => void;
+            pointerMove?: (
+                event?: Event, 
+                pointer?: Element | Touch, 
+                moveVector?: { x: number, y: number }) => void;
 
             /**
              * Triggered when the user's pointer unpresses.
              */
-            pointerUp?: (event?: Event, pointer?: Element | Touch) => void;
+            pointerUp?: (
+                event?: Event, 
+                pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
              * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
              */
-            staticClick?: (event?: Event, pointer?: Element | Touch, cellElement?: Element, cellIndex?: Number) => void;
+            staticClick?: (
+                event?: Event, 
+                pointer?: Element | Touch, 
+                cellElement?: Element, 
+                cellIndex?: Number) => void;
 
             /**
              * Triggered after an image has been loaded with lazyLoad.
              */
-            lazyLoad?: (event?: Event, cellElement?: Element) => void;
+            lazyLoad?: (
+                event?: Event, 
+                cellElement?: Element) => void;
 
             /**
              * Triggered after a background image has been loaded with bgLazyLoad.
              */
-            bgLazyLoad?: (event?: Event, element?: Element) => void;
+            bgLazyLoad?: (
+                event?: Event, 
+                element?: Element) => void;
 
             /**
              * Triggered after entering or exiting fullscreen view.
@@ -348,7 +367,6 @@ declare namespace Flickity {
             fullscreenChange?: (isFullscreen?: Boolean) => void;
         };
     }
-
 }
 
 declare class Flickity {

From e46cb9d61a0960cd707d41fb9452468578257705 Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Wed, 6 Mar 2019 08:09:14 -0700
Subject: [PATCH 420/924] More lint fixing

---
 types/flickity/index.d.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index c2c475d6af..8b5b7b2ffe 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -297,68 +297,69 @@ declare namespace Flickity {
              * Triggered when dragging starts and the slider starts moving.
              */
             dragStart?: (
-                event?: Event, 
+                event?: Event,
                 pointer?: Element | Touch) => void;
 
             /**
              * Triggered when dragging moves and the slider moves.
              */
             dragMove?: (
-                event?: Event, 
-                pointer?: Element | Touch, 
+                event?: Event,
+                pointer?: Element | Touch,
                 moveVector?: { x: number, y: number }) => void;
 
             /**
              * Triggered when dragging ends.
              */
             dragEnd?: (
-                event: Event, 
+                event: Event,
                 pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer (mouse, touch, pointer) presses down.
              */
             pointerDown?: (
-                event: Event, 
+                event: Event,
                 pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer moves.
              */
             pointerMove?: (
-                event?: Event, 
-                pointer?: Element | Touch, 
+                event?: Event,
+                pointer?: Element | Touch,
                 moveVector?: { x: number, y: number }) => void;
 
             /**
              * Triggered when the user's pointer unpresses.
              */
             pointerUp?: (
-                event?: Event, 
+                event?: Event,
                 pointer?: Element | Touch) => void;
 
             /**
              * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
-             * click events are hard to detect with draggable UI, as they are triggered whenever a user drags. Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
+             * click events are hard to detect with draggable UI, as they are triggered whenever a user drags.
+             * Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
              */
             staticClick?: (
-                event?: Event, 
-                pointer?: Element | Touch, 
-                cellElement?: Element, 
+                event?: Event,
+                pointer?: Element | Touch,
+                cellElement?: Element,
                 cellIndex?: Number) => void;
 
             /**
              * Triggered after an image has been loaded with lazyLoad.
              */
             lazyLoad?: (
-                event?: Event, 
+                event?: Event,
                 cellElement?: Element) => void;
 
             /**
              * Triggered after a background image has been loaded with bgLazyLoad.
              */
             bgLazyLoad?: (
-                event?: Event, 
+                event?: Event,
                 element?: Element) => void;
 
             /**

From 5c9faedd41649bed7ab58670b8dda60f552947c1 Mon Sep 17 00:00:00 2001
From: Jojoshua <jojoshua@gmail.com>
Date: Wed, 6 Mar 2019 10:17:05 -0500
Subject: [PATCH 421/924] Initial

---
 types/tabulator-tables/index.d.ts             | 1729 +++++++++++++++++
 .../tabulator-tables-tests.ts                 |  427 ++++
 types/tabulator-tables/tsconfig.json          |   16 +
 types/tabulator-tables/tslint.json            |    1 +
 4 files changed, 2173 insertions(+)
 create mode 100644 types/tabulator-tables/index.d.ts
 create mode 100644 types/tabulator-tables/tabulator-tables-tests.ts
 create mode 100644 types/tabulator-tables/tsconfig.json
 create mode 100644 types/tabulator-tables/tslint.json

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
new file mode 100644
index 0000000000..3fe21f805f
--- /dev/null
+++ b/types/tabulator-tables/index.d.ts
@@ -0,0 +1,1729 @@
+// Type definitions for tabulator-tables 4.2
+// Project: https://github.com/olifolkerd/tabulator
+// Definitions by: Josh Harris <https://github.com/jojoshua>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare namespace Tabulator {
+    interface Options extends OptionsGeneral, OptionsHistory, OptionsLocale, OptionsDownload, OptionsColumns, OptionsRows, OptionsData, OptionsSorting, OptionsFiltering, OptionsRowGrouping, OptionsPagination, OptionsPersistentConfiguration, OptionsClipboard, OptionsDataTree, OptionsCell {}
+
+    interface OptionsCells extends CellCallbacks {
+        /**The validationFailed event is triggered when the value entered into a cell during an edit fails to pass validation. */
+        validationFailed?: (cell: CellComponent, value: any, validators: Validator[] | StandardValidatorType[]) => void;
+    }
+    type OptionsDataTree = {
+        /**To enable data trees in your table, set the dataTree property to true in your table constructor: */
+        dataTree?: boolean;
+        /** By default the toggle element will be inserted into the first column on the table. If you want the toggle element to be inserted in a different column you can pass the feild name of the column to the dataTreeElementColumn setup option*/
+        dataTreeElementColumn?: boolean | string;
+        /**Show tree branch icon	 */
+        dataTreeBranchElement?: boolean | string;
+        /**Tree level indent in pixels	 */
+        dataTreeChildIndent?: number;
+        /**By default Tabulator will look for child rows in the _children field of a row data object. You can change this to look in a different field using the dataTreeChildField property in your table constructor: */
+        dataTreeChildField?: string;
+        /**The toggle button that allows users to collapse and expand the column can be customised to meet your needs. There are two options, dataTreeExpandElement and dataTreeCollapseElement, that can be set to replace the default toggle elements with your own.
+
+      Both options can take either an html string representing the contents of the toggle element */
+        dataTreeCollapseElement?: string | HTMLElement | boolean;
+        /** */
+        dataTreeExpandElement?: string | HTMLElement | boolean;
+        /** By default all nodes on the tree will start collapsed, you can customize the initial expansion state of the tree using the dataTreeStartExpanded option.
+     * 
+      This option can take one of three possible value types, either a boolean to indicate whether all nodes should start expanded or collapsed: */
+        dataTreeStartExpanded?: boolean | boolean[] | ((row: RowComponent, level: number) => boolean);
+    };
+    type OptionsClipboard = {
+        /**You can enable clipboard functionality using the clipboard config option. It can take one of four possible values:
+
+      true - enable clipboard copy and paste
+      "copy" - enable only copy functionality
+      "paste" - enable only paste functionality
+      false - disable all clipboard functionality (default) */
+        clipboard?: boolean | "copy" | "paste";
+        /**
+     * The copy selector is a function that is used to choose which data is copied into the clipboard. Tabulator comes with a few different selectors built in:
+      active - Copy all table data currently displayed in the table to the clipboard (default)
+      table - Copy all table data to the clipboard, including data that is currently filtered out
+      selected - Copy the currently selected rows to the clipboard, including data that is currently filtered out
+      Tabulator will try to use the best selector to match your table setup. If any text is selected on the table, then it will be that text which is copied. If the table has selectable rows enabled, the it will be the currently selected rows copied to the clipboard in the order in which they were selected. Otherwise the currently visible data in the table will be copied.
+
+      These selectors can also be used when programatically triggering a copy event. in this case if the selector is not specified it will default to the value set in the clipboardCopySelector property (which is active by default).
+     */
+        clipboardCopySelector?: "active" | "table" | "selected";
+        /** The copy formatter is used to take the row data provided by the selector and turn it into a text string for the clipboard.
+      There is one built in copy formatter called table, if you have extended the clipboard module and want to change the default you can use the clipboardCopyFormatter property. you can also pass in a formatting function directly into this property.*/
+        clipboardCopyFormatter?: "table" | ((rowData: any[]) => string);
+        /**By default Tabulator will include the column header titles in any clipboard data, this can be turned off by passing a value of false to the clipboardCopyHeader property: */
+        clipboardCopyHeader?: boolean;
+        /** Tabulator has one built in paste parser, that is designed to take a table formatted text string from the clipboard and turn it into row data. it breaks the tada into rows on a newline character \n and breaks the rows down to columns on a tab character \t.
+
+      It will then attempt to work out which columns in the data correspond to columns in the table. It tries three different ways to achieve this. First it checks the values of all columns in the first row of data to see if they match the titles of columns in the table. If any of the columns don't match it then tries the same approach but with the column fields. If either of those options match, Tabulator will map those columns to the incoming data and import it into rows. If there is no match then Tabulator will assume the columns in the data are in the same order as the visible columns in the table and import them that way.
+
+      The inbuilt parser will reject any clipboard data that does not contain at least one row and two columns, in that case the clipboardPasteError will be triggered.
+
+      If you extend the clipboard module to add your own parser, you can set it to be used as default with the clipboardPasteParser property.*/
+        clipboardPasteParser?: string | ((clipboard: any) => any[]);
+        /**Once the data has been parsed into row data, it will be passed to a paste action to be added to the table. There are three inbuilt paste actions:
+
+      insert - Inserts data into the table using the addRows function (default)
+      update - Updates data in the table using the updateOrAddData function
+      replace - replaces all data in the table using the setData function */
+        clipboardPasteAction?: "insert" | "update" | "replace";
+
+        /**By default Tabulator will copy some of the tables styling along with the data to give a better visual appearance when pasted into other documents.
+
+    If you want to only copy the unstyled data then you should set the clipboardCopyStyled option to false in the table options object:  */
+        clipboardCopyStyled?: boolean;
+
+        /**By default Tabulator includes column headers, row groups and column calculations in the clipboard output.
+
+    You can choose to remove column headers groups, row groups or column calculations from the output data by setting the values in the clipboardCopyConfig option in the table definition: */
+        clipboardCopyConfig?:
+            | {
+                  columnHeaders?: boolean;
+                  rowGroups?: boolean;
+                  columnCalcs?: boolean;
+              }
+            | boolean;
+
+        /**The clipboardCopied event is triggered whenever data is copied to the clipboard. */
+        clipboardCopied: () => void;
+        /**The clipboardPasted event is triggered whenever data is successfuly pasted into the table. */
+        clipboardPasted: () => void;
+        /**The clipboardPasteError event is triggered whenever an atempt to paste data into the table has failed because it was rejected by the paste parser. */
+        clipboardPasteError: () => void;
+    };
+
+    type OptionsPersistentConfiguration = {
+        /**ID tag used to identify persistent storage information	 */
+        persistenceID?: string;
+        /** Persistence information can either be stored in a cookie or in the localSotrage object, you can use the persistenceMode to choose which. It can take three possible values:
+
+      local - (string) Store the persistence information in the localStorage object
+      cookie - (string) Store the persistence information in a cookie
+      true - (boolean) check if localStorage is available and store persistence information, otherwise store in cookie (Default option)	*/
+        persistenceMode?: "local" | "cookie" | true;
+        /**Enable persistsnt storage of column layout information	 */
+        persistentLayout?: boolean;
+        /**You can ensure the data sorting is stored for the next page load by setting the persistentSort option to true */
+        persistentSort?: boolean;
+        /** You can ensure the data filtering is stored for the next page load by setting the persistentFilter option to true*/
+        persistentFilter?: boolean;
+    };
+
+    type OptionsPagination = {
+        /**Choose pagination method, "local" or "remote"	 */
+        pagination?: "remote" | "local";
+        /**Set the number of rows in each page	 */
+        paginationSize?: number;
+        /** Setting this option to true will cause Tabulator to create a list of page size options, that are multiples of the current page size. In the example below, the list will have the values of 5, 10, 15 and 20.
+
+    When using the page size selector like this, if you use the setPageSize function to set the page size to a value not in the list, the list will be regenerated using the new page size as the starting valuer	*/
+        paginationSizeSelector?: true | number[];
+        /** By default the pagination controls are added to the footer of the table. If you wish the controls to be created in another element pass a DOM node or a CSS selector for that element to the paginationElement option.*/
+        paginationElement?: HTMLElement | "string";
+        /**Lookup list to link expected data feilds from the server to their function	
+     * default
+     * {
+        "current_page":"current_page",
+        "last_page":"last_page",
+        "data":"data",
+        }
+     * 
+     * 
+     */
+        paginationDataReceived?: Record<string, string>;
+        /**Lookup list to link fields expected by the server to their function
+     * default:
+     * {
+        "page":"page",
+        "size":"size",
+        "sorters":"sorters",
+        "filters":"filters",
+        }
+    	 */
+        paginationDataSent?: Record<string, string>;
+        /**When using the addRow function on a paginated table, rows will be added relative to the current page (ie to the top or bottom of the current page), with overflowing rows being shifted onto the next page.
+
+      If you would prefer rows to be added relative to the table (firs/last page) then you can use the paginationAddRow option. it can take one of two values:
+
+      page - add rows relative to current page (default)
+      table - add rows relative to the table */
+        paginationAddRow?: "table" | "page";
+        /** The number of pagination page buttons shown in the footer using the paginationButtonCount option. By default this has a value of 5.*/
+        paginationButtonCount?: number;
+    };
+
+    type OptionsRowGrouping = {
+        /**String/function to select field to group rows by	 */
+        groupBy?: string | ((data: any) => any);
+        /**By default Tabulator will create groups for rows based on the values contained in the row data. if you want to explicitly define which field values groups should be created for at each level, you can use the groupValues option.
+
+    This option takes an array of value arrays, each item in the first array should be a list of acceptable field values for groups at that level	 */
+        groupValues?: any[][];
+
+        /**You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option.	 */
+        groupHeader?: ((value: any, count: number, data: any, group: GroupComponent) => string) | ((value: any, count: number, data: any) => string)[];
+
+        /**You can set the default open state of groups using the groupStartOpen property
+     * 
+     * This can take one of three possible values:
+
+        true - all groups start open (default value)
+        false - all groups start closed
+        function() - a callback to decide if a group should start open or closed
+        Group Open Function
+        If you want to decide on a group by group basis which should start open or closed then you can pass a function to the groupStartOpen property. This should return true if the group should start open or false if the group should start closed.
+     */
+        groupStartOpen?: boolean | ((value: any, count: number, data: any, group: GroupComponent) => boolean);
+
+        /**By default Tabulator allows users to toggle a group open or closed by clicking on the arrow icon in the left of the group header. If you would prefer a different behaviour you can use the groupToggleElement option to choose a different option:
+     * 
+     * The option can take one of three values:
+      arrow - togggle group on arrow element click
+      header - toggle group on click anywhere on the group header element
+      false - prevent clicking anywhere in the group toggling the group
+     */
+        groupToggleElement?: "arrow" | "header" | false;
+
+        /**show/hide column calculations when group is closed	 */
+        groupClosedShowCalcs?: boolean;
+
+        /**The dataGrouping callback is triggered whenever a data grouping event occurs, before grouping happens. */
+        dataGrouping?: () => void;
+        /**The dataGrouping callback is triggered whenever a data grouping event occurs, after grouping happens. */
+        dataGrouped?: () => void;
+        /**The groupVisibilityChanged callback is triggered whenever a group changes between hidden and visible states. */
+        groupVisibilityChanged?: (group: GroupComponent, visible: boolean) => void;
+
+        /**The groupClick callback is triggered when a user clicks on a group header. */
+        groupClick?: GroupEventCallback;
+        /**The groupDblClick callback is triggered when a user double clicks on a group header. */
+        groupDblClick?: GroupEventCallback;
+        /**The groupContext callback is triggered when a user right clicks on a group header.
+
+    If you want to prevent the browsers context menu being triggered in this event you will need to include the preventDefault() function in your callback. */
+        groupContext?: GroupEventCallback;
+        /**The groupTap callback is triggered when a user taps on a group header on a touch display. */
+        groupTap?: GroupEventCallback;
+        /**The groupDblTap callback is triggered when a user taps on a group header on a touch display twice in under 300ms. */
+        groupDblTap?: GroupEventCallback;
+        /**The groupTapHold callback is triggered when a user taps on a group header on a touch display and holds their finger down for over 1 second */
+        groupTapHold?: GroupEventCallback;
+    };
+
+    interface Filter {
+        field: string;
+        type: FilterType;
+        value: any;
+    }
+
+    type FilterFunction = (field: string, type: Tabulator.FilterType, value: any) => void;
+
+    type OptionsFiltering = {
+        /**Array of filters to be applied on load.	 */
+        initialFilter?: Filter[];
+
+        /**array of initial values for header filters.	 */
+        initialHeaderFilter?: Pick<Filter, "field" | "value">[];
+
+        /**The dataFiltering callback is triggered whenever a filter event occurs, before the filter happens. */
+        dataFiltering?: (filters: Filter[]) => void;
+        /**The dataFiltered callback is triggered after the table dataset is filtered. */
+        dataFiltered?: (filters: Filter[], rows: RowComponent[]) => void;
+    };
+    type OptionsSorting = {
+        /**Array of sorters to be applied on load.	 */
+        initialSort?: Sorter[];
+
+        /**reverse the order that multiple sorters are applied to the table.	 */
+        sortOrderReverse?: boolean;
+    };
+
+    interface Sorter {
+        column: string;
+        dir: SortDirection;
+    }
+    type OptionsData = {
+        /**A unique index value should be present for each row of data if you want to be able to programatically alter that data at a later point, this should be either numeric or a string. By default Tabulator will look for this value in the id field for the data. If you wish to use a different field as the index, set this using the index option parameter. */
+        index?: number | string;
+        //**Array to hold data that should be loaded on table creation	 */
+        data?: any[];
+
+        /**If you wish to retrieve your data from a remote source you can set the URL for the request in the ajaxURL option. */
+        ajaxURL?: string;
+
+        /**Parameters to be passed to remote Ajax data loading request	 */
+        ajaxParams?: {};
+
+        /**The HTTP request type for Ajax requests or config object for the request	 */
+        ajaxConfig?: HttpMethod | AjaxConfig;
+
+        /**When using a request method other than "GET" Tabulator will send any parameters with a content type of form data. You can change the content type with the ajaxContentType option. This will ensure parameters are sent in the format you expect, with the correct headers. 
+     * 
+     * The ajaxContentType option can take one of two values:
+      "form" - send parameters as form data (default option)
+      "json" - send parameters as JSON encoded string
+      If you want to use a custom content type then you can pass a content type formatter object into the ajaxContentType option. this object must have two properties, the headers property should contain all headers that should be sent with the request and the body property should contain a function that returns the body content of the request
+    */
+
+        ajaxContentType?: "form" | "json" | AjaxContentType;
+
+        /**If you need more control over the url of the request that you can get from the ajaxURL and ajaxParams properties, the you can use the ajaxURLGenerator property to pass in a callback that will generate the URL for you.
+
+    The callback should return a string representing the URL to be requested. */
+        ajaxURLGenerator?: (url: string, config: any, params: any) => string;
+
+        /**callback function to replace inbuilt ajax request functionality	 */
+        ajaxRequestFunc?: (url: string, config: any, params: any) => Promise<any>;
+
+        /**Send filter config to server instead of processing locally	 */
+        ajaxFiltering?: boolean;
+
+        /**Send sorter config to server instead of processing locally	 */
+        ajaxSorting?: boolean;
+
+        /**If you are loading a lot of data from a remote source into your table in one go, it can sometimes take a long time for the server to return the request, which can slow down the user experience.
+
+      To speed things up in this situation Tabulator has a progressive load mode, this uses the pagination module to make a series of requests for part of the data set, one at a time, appending it to the table as the data arrives. This mode can be enable using the ajaxProgressiveLoad option. No pagination controls will be visible on screen, it just reusues the functionality of the pagination module to sequentially load the data.
+
+      With this mode enabled, all of the settings outlined in the Ajax Documentation are still available
+
+      There are two different progressive loading modes, to give you a choice of how data is loaded into the table.	 */
+        ajaxProgressiveLoad?: "load" | "scroll";
+        /**By default tabulator will make the requests to fill the table as quickly as possible. On some servers these repeates requests from the same client may trigger rate limiting or security systems. In this case you can use the ajaxProgressiveLoadDelay option to add a delay in milliseconds between each page request. */
+        ajaxProgressiveLoadDelay?: number;
+        /**The ajaxProgressiveLoadScrollMargin property determines how close to the bottom of the table in pixels, the scroll bar must be before the next page worth of data is loaded, by default it is set to twice the height of the table. */
+        ajaxProgressiveLoadScrollMargin?: number;
+
+        /**Show loader while data is loading, can also take a function that must return a boolean	 */
+        ajaxLoader?: boolean | (() => boolean);
+
+        /**html for loader element	 */
+        ajaxLoaderLoading?: string;
+        /**html for the loader element in the event of an error	 */
+        ajaxLoaderError?: string;
+
+        /**The ajaxRequesting callback is triggered when ever an ajax request is made. */
+        ajaxRequesting?: (url: string, params: any) => boolean;
+        /**The ajaxResponse callback is triggered when a successful ajax request has been made. This callback can also be used to modify the received data before it is parsed by the table. If you use this callback it must return the data to be parsed by Tabulator, otherwise no data will be rendered */
+        ajaxResponse?: (url: string, params: any, response: any) => any;
+        /**The ajaxError callback is triggered there is an error response to an ajax request. */
+        ajaxError?: (xhr: any, textStatus: any, errorThrown: any) => void;
+    };
+
+    interface AjaxContentType {
+        headers: JSONRecord;
+        body: (url: string, config: any, params: any) => any;
+    }
+
+    type HttpMethod = "GET" | "POST";
+    interface AjaxConfig {
+        method?: HttpMethod;
+        headers?: JSONRecord;
+        mode?: string;
+        credentials?: string;
+    }
+
+    type OptionsRows = {
+        /**Tabulator also allows you to define a row level formatter using the rowFormatter option. this lets you alter each row of the table based on the data it contains.
+
+    The function accepts one argument, the RowComponent for the row being formatted. */
+        rowFormatter?: (row: RowComponent) => any;
+
+        /**The position in the table for new rows to be added, "bottom" or "top" */
+        addRowPos?: "bottom" | "top";
+
+        /**The selectable option can take one of a several values:
+
+      false - selectable rows are disabled
+      true - selectable rows are enabled, and you can select as many as you want
+      integer - any integer value, this sets the maximum number of rows that can be selected (when the maximum number of selected rows is exeded, the first selected row will be deselected to allow the next row to be selected).
+      "highlight" (default) - rows have the same hover stylings as selectable rows but do not change state when clicked. This is great for when you want to show that a row is clickable but don't want it to be selectable. */
+        selectable?: boolean | number | "highlight";
+
+        /**By default you can select a range of rows by holding down the shift key and click dragging over a number of rows to toggle the selected state state of all rows the cursor passes over.
+
+    If you would prefere to select a range of row by clicking on the first row then holding down shift and clicking on the end row then you can acheive this by setting the selectableRangeMode to click */
+        selectableRangeMode?: "click";
+
+        /**By default, row selection works on a rolling basis, if you set the selectable option to a numeric value then when you select past this number of rows, the first row to be selected will be deselected. If you want to disable this behaviour and instead prevent selection of new rows once the limit is reached you can set the selectableRollingSelection option to false. */
+        selectableRollingSelection?: boolean;
+
+        /**By default Tabulator will maintain selected rows when the table is filtered, sorted or paginated (but NOT when the setData function is used). If you want the selected rows to be cleared whenever the table view is updated then set the selectablePersistence option to false. */
+        selectablePersistence?: boolean;
+
+        /**You many want to exclude certain rows from being selected. The selectableCheck options allows you to pass a function to check if the current row should be selectable, returning true will allow row selection, false will result in nothing happening. The function should accept a RowComponent as its first argument. */
+        selectableCheck?: (row: RowComponent) => boolean;
+
+        /**To allow the user to move rows up and down the table, set the movableRows parameter in the options: */
+        movableRows?: boolean;
+
+        /**Tabulator also allows you to move rows between tables. To enable this you should supply either a valid CSS selector string a DOM node for the table or the Tabuator object for the table to the movableRowsConnectedTables option. if you want to connect to multple tables then you can pass in an array of values to this option. */
+        movableRowsConnectedTables?: string | string[] | HTMLElement | HTMLElement[];
+
+        /**The movableRowsSender option should be set on the sending table, and sets the action that should be taken after the row has been successfuly dropped into the receiving table.
+
+      There are several inbuilt sender functions:
+
+      false - do nothing(default)
+      delete - deletes the row from the table 
+      You can also pass a callback to the movableRowsSender option for custom sender functionality
+      */
+        movableRowsSender?: false | "delete" | ((fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => any);
+
+        /** The movableRowsReceiver option should be set on the receiving tables, and sets the action that should be taken when the row is dropped into the table.
+      There are several inbuilt receiver functions:
+
+      insert - inserts row next to the row it was dropped on, if not dropped on a row it is added to the table (default)
+      add - adds row to the table
+      update - updates the row it is dropped on with the sent rows data
+      replace - replaces the row it is dropped on with the sent row*/
+        movableRowsReceiver?: "insert" | "add" | "update" | "replace" | ((fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => any);
+
+        /**You can allow the user to manually resize rows by dragging the top or bottom border of a row. To enable this functionality, set the resizableRows property to true */
+        resizableRows?: boolean;
+
+        /**
+     * The default ScrollTo position can be set using the scrollToRowPosition option. It can take one of four possible values:
+
+        top - position row with its top edge at the top of the table (default)
+        center - position row with its top edge in the center of the table
+        bottom - position row with its bottom edge at the bottom of the table
+        nearest - position row on the edge of the table it is closest to
+     */
+        scrollToRowPosition?: ScrollToRowPostition;
+
+        /**The default option for triggering a ScrollTo on a visible element can be set using the scrollToRowIfVisible option. It can take a boolean value:
+
+      true - scroll to row, even if it is visible (default)
+      false - scroll to row, unless it is currently visible, then don't move */
+        scrollToRowIfVisible?: boolean;
+
+        /**The dataTreeRowExpanded callback is triggered when a row with child rows is expanded to reveal the children. */
+        dataTreeRowExpanded?: (row: RowComponent, level: number) => void;
+
+        /**The dataTreeRowCollapsed callback is triggered when a row with child rows is collapsed to hide its children.*/
+        dataTreeRowCollapsed?: (row: RowComponent, level: number) => void;
+
+        /**The movableRowsSendingStart callback is triggered on the sending table when a row is picked up from a sending table. */
+        movableRowsSendingStart?: (toTables: any[]) => void;
+
+        /**The movableRowsSent callback is triggered on the sending table when a row has been successfuly received by a receiving table. */
+        movableRowsSent?: (fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => void;
+
+        /**The movableRowsSentFailed callback is triggered on the sending table when a row has failed to be received by the receiving table.*/
+        movableRowsSentFailed?: (fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => void;
+
+        /**The movableRowsSendingStop callback is triggered on the sending table after a row has been dropped and any senders and receivers have been handled. */
+        movableRowsSendingStop?: (toTables: any[]) => void;
+
+        /**The movableRowsReceivingStart callback is triggered on a receiving table when a connection is established with a sending table. */
+        movableRowsReceivingStart?: (fromRow: RowComponent, toTable: Tabulator) => void;
+
+        /**The movableRowsReceived callback is triggered on a receiving table when a row has been successfuly received.*/
+        movableRowsReceived?: (fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => void;
+
+        /**The movableRowsReceivedFailed callback is triggered on a receiving table when a row receiver has returned false.*/
+        movableRowsReceivedFailed?: (fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => void;
+
+        /**The movableRowsReceivingStop callback is triggered on a receiving table after a row has been dropped and any senders and receivers have been handled.*/
+        movableRowsReceivingStop?: (fromTable: Tabulator) => void;
+
+        /**The rowClick callback is triggered when a user clicks on a row. */
+        rowClick?: RowEventCallback;
+        /**The rowDblClick callback is triggered when a user double clicks on a row. */
+        rowDblClick?: RowEventCallback;
+        /**The rowContext callback is triggered when a user right clicks on a row.
+
+    If you want to prevent the browsers context menu being triggered in this event you will need to include the preventDefault() function in your callback. */
+        rowContext?: RowEventCallback;
+        /**The rowTap callback is triggered when a user taps on a row on a touch display. */
+        rowTap?: RowEventCallback;
+        /**The rowDblTap callback is triggered when a user taps on a row on a touch display twice in under 300ms. */
+        rowDblTap?: RowEventCallback;
+        /**The rowTapHold callback is triggered when a user taps on a row on a touch display and holds their finger down for over 1 second. */
+        rowTapHold?: RowEventCallback;
+        /**The rowMouseEnter callback is triggered when the mouse pointer enters a row. */
+        rowMouseEnter?: RowEventCallback;
+        /**The rowMouseLeave callback is triggered when the mouse pointer leaves a row. */
+        rowMouseLeave?: RowEventCallback;
+        /** The rowMouseOver callback is triggered when the mouse pointer enters a row or any of its child elements.*/
+        rowMouseOver?: RowEventCallback;
+        /**The rowMouseOut callback is triggered when the mouse pointer leaves a row or any of its child elements. */
+        rowMouseOut?: RowEventCallback;
+        /**The rowMouseMove callback is triggered when the mouse pointer moves over a row. */
+        rowMouseMove?: RowEventCallback;
+        /**The rowAdded callback is triggered when a row is added to the table by the addRow and updateOrAddRow functions. */
+        rowAdded?: RowChangedCallback;
+        /**The rowUpdated callback is triggered when a row is updated by the updateRow, updateOrAddRow, updateData or updateOrAddData, functions. */
+        rowUpdated?: RowChangedCallback;
+        /**The rowDeleted callback is triggered when a row is deleted from the table by the deleteRow function. */
+        rowDeleted?: RowChangedCallback;
+        /**The rowMoved callback will be triggered when a row has been successfuly moved. */
+        rowMoved?: RowChangedCallback;
+        /**The rowResized callback will be triggered when a row has been resized by the user. */
+        rowResized?: RowChangedCallback;
+        /**Whenever the number of selected rows changes, through selection or deselection, the rowSelectionChanged event is triggered. This passes an array of the data objects for each row in the order they were selected as the first argument, and an array of row components for each of the rows in order of selection as the second argument. */
+        rowSelectionChanged?: (data: any[], rows: RowComponent[]) => void;
+        /**The rowSelected event is triggered when a row is selected, either by the user or programatically. */
+        rowSelected?: RowChangedCallback;
+        /**The rowDeselected event is triggered when a row is deselected, either by the user or programatically. */
+        rowDeselected?: RowChangedCallback;
+    };
+
+    type OptionsColumns = {
+        /**The column definitions are provided to Tabluator in the columns property of the table constructor object and should take the format of an array of objects, with each object representing the configuration of one column. */
+        columns?: ColumnDefinition[];
+
+        /**
+         * If you set the autoColumns option to true, every time data is loaded into the table through the data option or through the setData function, Tabulator will examine the first row of the data and build columns to match that data.
+         */
+        autoColumns?: boolean;
+
+        /**By default Tabulator will use the fitData layout mode, which will resize the tables columns to fit the data held in each column, unless you specify a width or minWidth in the column constructor. If the width of all columns exceeds the width of the containing element, a scroll bar will appear. */
+        layout?: "fitData" | "fitColumns" | "fitDataFill";
+
+        /**To keep the layout of the columns consistent, once the column widths have been set on the first data load (either from the data property in the constructor or the setData function) they will not be changed when new data is loaded.
+
+        If you would prefer that the column widths adjust to the data each time you load it into the table you can set the layoutColumnsOnNewData property to true. */
+        layoutColumnsOnNewData?: boolean;
+
+        /**Responsive layout will automatically hide/show columns to fit the width of the Tabulator element. This allows for clean rendering of tables on smaller mobile devices, showing important data while avoiding horizontal scroll bars. You can enable responsive layouts using the responsiveLayout option.
+
+      There are two responsive layout modes available:
+
+      hide - hide columns that no longer fit in the table
+      collapse - collapse columns that no longer fit on the table into a list under the row
+
+      Hide Extra Columns
+      By default, columns will be hidden from right to left as the width of the table decreases. You can choose exactlyhow columns are hidden using the responsive property in the column definition object.
+
+      When responsive layout is enabled, all columns are given a default responsive value of 1. The higher you set this value the sooner that column will be hidden as the table width decreases. If two columns have the same responsive value then they are hidden from right to left (as defined in the column definition array, ignoring user moving of the columns). If you set the value to 0 then the column will never be hidden regardless of how narrow the table gets. */
+        responsiveLayout?: boolean | "hide" | "collapse";
+
+        /**Collapsed lists are displayed to the user by default, if you would prefer they start closed so the user can open them you can use the responsiveLayoutCollapseStartOpen option */
+        responsiveLayoutCollapseStartOpen?: boolean;
+
+        /**By default any formatter set on the column is applied to the value that will appear in the list. while this works for most formatters it can cause issues with the progress formatter which relies on being inside a cell.
+
+    If you would like to disable column formatting in the collapsed list, you can use the responsiveLayoutCollapseUseFormatters option: */
+        responsiveLayoutCollapseUseFormatters?: boolean;
+
+        /**If you set the responsiveLayout option to collapse the values from hidden columns will be displayed in a title/value list under the row.
+
+      In this mode an object containing the title of each hidden column and its value is generated and then used to generate a list displayed in a div .tabulator-responsive-collapse under the row data.
+
+      The inbuilt collapse formatter creates a table to neatly display the hidden columns. If you would like to format the data in your own way you can use the responsiveLayoutCollapseFormatter, it take an object of the column values as an argument and must return the HTML content of the div.
+
+      This function should return an empty string if there is no data to display. */
+        responsiveLayoutCollapseFormatter?: (data: any[]) => any;
+
+        /**It is possible to set a minimum column width to prevent resizing columns from becoming too small.
+
+        This can be set globally, by setting the columnMinWidth option to the column width when you create your Tabulator.
+
+        This option can be overridden on a per column basis by setting the minWidth property on the column definition. */
+        columnMinWidth?: number;
+
+        /**By default it is possible to manually resize columns by dragging the borders of the column in both the column headers and the cells of the column.
+
+        If you want to alter this behaviour you can use the resizableColumns to choose where the resize handles are available.  */
+        resizableColumns?: true | false | "header" | "cell";
+
+        /**To allow the user to move columns along the table, set the movableColumns parameter in the options: */
+        movableColumns?: boolean;
+
+        /**Header tooltips can be set globally using the tooltipsHeader options parameter */
+        tooltipsHeader?: boolean;
+
+        /**You can use the columnVertAlign option to set how the text in your column headers should be vertically  */
+        columnVertAlign?: "top" | "middle" | "bottom";
+
+        /**The default placeholder text used for input elements can be set using the headerFilterPlaceholder option in the table definition */
+        headerFilterPlaceholder?: string;
+
+        /**The default ScrollTo position can be set using the scrollToColumnPosition option. It can take one of three possible values:
+
+    left - position column with its left edge at the left of the table (default)
+    center - position column with its left edge in the center of the table
+    right - position column with its right edge at the right of the table */
+        scrollToColumnPosition?: ScrollToColumnPosition;
+
+        /**The default option for triggering a ScrollTo on a visible element can be set using the scrollToColumnIfVisible option. It can take a boolean value:
+
+    true - scroll to column, even if it is visible (default)
+    false - scroll to column, unless it is currently visible, then don't move */
+        scrollToColumnIfVisible?: boolean;
+
+        /**By default column calculations are shown at the top and bottom of the table, unless row grouping is enabled, in which case they are shown at the top and bottom of each group.
+
+      The columnCalcs option lets you decided where the calculations should be displayed, it can take one of four values:
+
+      true - show calcs at top and bottom of the table, unless grouped, then show in groups (boolean, default)
+      both - show calcs at top and bottom of the table and show in groups
+      table - show calcs at top and bottom of the table only
+      group - show calcs in groups only */
+        columnCalcs?: boolean | "both" | "table" | "group";
+
+        /**If you need to use the . character as part of your field name, you can change the separator to any other character using the nestedFieldSeparator option
+         * Set to false to disable nested data parsing
+         */
+        nestedFieldSeparator?: string | boolean;
+
+        /**multiple or single column sorting */
+        columnHeaderSortMulti?: boolean;
+
+        /**The columnMoved callback will be triggered when a column has been successfuly moved. */
+        columnMoved?: (column: ColumnComponent, columns: any[]) => void;
+        columnResized?: (column: ColumnComponent) => void;
+        /**The columnVisibilityChanged callback is triggered whenever a column changes between hidden and visible states. */
+        columnVisibilityChanged?: (column: ColumnComponent, visible: boolean) => void;
+
+        /**The columnTitleChanged callback is triggered whenever a user edits a column title when the editableTitle parameter has been enabled in the column definition array. */
+        columnTitleChanged?: (column: ColumnComponent) => void;
+    };
+
+    type OptionsCell = {
+        /**The cellClick callback is triggered when a user left clicks on a cell, it can be set on a per column basis using the option in the columns definition object. */
+        cellClick?: CellEventCallback;
+        cellDblClick?: CellEventCallback;
+        cellContext?: CellEventCallback;
+        cellTap?: CellEventCallback;
+        cellDblTap?: CellEventCallback;
+        cellTapHold?: CellEventCallback;
+        cellMouseEnter?: CellEventCallback;
+        cellMouseLeave?: CellEventCallback;
+        cellMouseOver?: CellEventCallback;
+        cellMouseOut?: CellEventCallback;
+        cellMouseMove?: CellEventCallback;
+        cellEditing?: CellEditEventCallback;
+        cellEdited?: CellEditEventCallback;
+        cellEditCancelled?: CellEditEventCallback;
+    };
+
+    type OptionsGeneral = {
+        /**Sets the height of the containing element, can be set to any valid height css value. If set to false (the default), the height of the table will resize to fit the table data.	 */
+        height?: string | number | false;
+        /**Enable rendering using the Virtual DOM engine	 */
+        virtualDom?: boolean;
+
+        /**Manually set the size of the virtual DOM buffer	 */
+        virtualDomBuffer?: boolean;
+        /**placeholder element to display on empty table	 */
+        placeholder?: string | HTMLElement;
+
+        /**Footer  element to display for the table	 */
+        footerElement?: string | HTMLElement;
+
+        /**Function to generate tooltips for cells	 */
+        tooltips?: GlobalTooltipOption;
+        /**When to regenerate cell tooltip value	 */
+        tooltipGenerationMode?: "load";
+
+        /**Keybinding configuration object	 */
+        keybindings?: false | KeyBinding;
+
+        /**
+     * The reactivity systems allow Tabulator to watch arrays and objects passed into the table for changes and then automatically update the table.
+
+        This approach means you no longer need to worry about calling a number of different functions on the table to make changes, you simply update the array or object you originally passed into the table and Tabulator will take care of the rest.
+
+        You can enable reactive data by setting the reactiveData option to true in the table constructor, and then passing your data array to the data option.
+
+        Once the table is built any changes to the array will automatically be replicated to the table without needing to call any functions on the table itself*/
+
+        reactiveData?: boolean;
+
+        //Not listed in options--------------------
+        /**Tabulator will automatically attempt to redraw the data contained in the table if the containing element for the table is resized. To disable this functionality, set the autoResize property to false */
+        autoResize?: boolean;
+
+        /**When a the tabulator constructor is called, the tableBuilding callback will triggered */
+        tableBuilding?: () => void;
+
+        /**When a the tabulator constructor is called and the table has finished being rendered, the tableBuilt callback will triggered: */
+        tableBuilt?: () => void;
+
+        /**The renderStarted callback is triggered whenever all the rows in the table are about to be rendered. This can include:
+      Data is loaded into the table when setData is called
+      A page is loaded through any form of pagination
+      Rows are added to the table during progressive rendering
+      Columns are changed by setColumns
+      The data is filtered
+      The data is sorted
+      The redraw function is called */
+        renderStarted?: () => void;
+
+        /**The renderComplete callback is triggered after the table has been rendered */
+        renderComplete?: () => void;
+
+        /**The htmlImporting callback is triggered when Tabulator starts importing data from an HTML table. */
+        htmlImporting?: EmptyCallback;
+
+        /**The htmlImported callback is triggered when Tabulator finishes importing data from an HTML table. */
+        htmlImported?: EmptyCallback;
+
+        /**The dataLoading callback is triggered whenever new data is loaded into the table. */
+        dataLoading?: (data: any) => void;
+        /**The dataLoaded callback is triggered when a new set of data is loaded into the table. */
+        dataLoaded?: (data: any) => void;
+        /**The dataEdited callback is triggered whenever the table data is changed by the user. Triggers for this include editing any cell in the table, adding a row and deleting a row. */
+        dataEdited?: (data: any) => void;
+
+        /**Whenever a page has been loaded, the pageLoaded callback is called, passing the current page number as an argument. */
+        pageLoaded?: (pageno: number) => void;
+
+        /**The dataSorting callback is triggered whenever a sort event occurs, before sorting happens. */
+        dataSorting?: (sorters: Sorter[]) => void;
+
+        /**The dataSorted callback is triggered after the table dataset is sorted. */
+        dataSorted?: (sorters: Sorter[], rows: RowComponent[]) => void;
+    };
+
+    type DownloadType = "csv" | "json" | "xlsx" | "pdf";
+
+    interface DownloadOptions extends DownloadCSV, DownloadXLXS, DownloadPDF {
+        downloadType: DownloadType;
+        fileName: string;
+    }
+
+    interface DownloadCSV {
+        /**By default CSV files are created using a comma (,) delimiter. If you need to change this for any reason the you can pass the options object with a delimiter property to the download function which will then use this delimiter instead of the comma. */
+        delimiter?: "string";
+        /**If you need the output CSV to include a byte order mark (BOM) to ensure that output with UTF-8 characters can be correctly interpereted across didfferent applications, you should set the bom option to true */
+        bom?: boolean;
+    }
+
+    interface DownloadXLXS {
+        /**The sheet name must be a valid Excel sheet name, and cannot include any of the following characters \, /, *, [, ], :,  */
+        sheetName?: string;
+    }
+
+    interface DownloadPDF {
+        orientation?: "portrait" | "landscape";
+        title?: string;
+        rowGroupStyles?: any;
+        rowCalcStyles?: any;
+        jsPDF?: any;
+        autoTable?: {} | ((doc: any) => any);
+    }
+
+    type OptionsDownload = {
+        /**If you want to make any bulk changes to the table data before it is parsed into the download file you can pass a mutator function to the downloadDataFormatter option in the table definition */
+        downloadDataFormatter?: (data: any[]) => any;
+
+        /**The downloadReady callback allows you to intercept the download file data before the users is prompted to save the file.
+
+    In order for the download to proceed the downloadReady callback is expected to return a blob of file to be downloaded.
+
+    If you would prefer to abort the download you can return false from this callback. This could be useful for example if you want to send the created file to a server via ajax rather than allowing the user to download the file. */
+        downloadReady?: (fileContents: any, blob: any) => any;
+
+        /**The downloadComplete callback is triggered when the user has been prompted to download the file. */
+        downloadComplete?: () => void;
+
+        /**By default Tabulator includes column headers, row groups and column calculations in the download output.
+
+    You can choose to remove column headers groups, row groups or column calculations from the output data by setting the values in the downloadConfig option in the table definition: */
+
+        downloadConfig?: {
+            columnGroups?: boolean;
+            rowGroups?: boolean;
+            columnCalcs?: boolean;
+        };
+    };
+
+    type OptionsLocale = {
+        /**You can set the current local in one of two ways. If you want to set it when the table is created, simply include the locale option in your Tabulator constructor. You can either pass in a string matching one of the language options you have defined, or pass in the boolean true which will cause Tabulator to auto-detect the browsers language settings from the navigator.language object. */
+        locale?: boolean | string;
+
+        /**You can store as many languages as you like, creating an object inside the langs object with a property of the locale code for that language. A list of locale codes can be found here.
+
+    At present there are three parts of the table that can be localised, the column headers, the header filter placeholder text and the pagination buttons. To localize the pagination buttons, create a pagination property inside your language object and give it the properties outlined below.
+
+    If you wish you can also localize column titles by adding a columns property to your language object. You should store a property of the field name of the column you wish to change, with a value of its title. Any fields that match this will use this title instead of the one provided by the column definition array. */
+        langs?: any;
+
+        /**When a localization event has occurred , the localized callback will triggered, passing the current locale code and language object: */
+        localized?: (locale: string, lang: any) => void;
+    };
+
+    type HistoryAction = "cellEdit" | "rowAdd" | "rowDelete" | "rowMoved";
+    type OptionsHistory = {
+        /**Enable user interaction history functionality	 */
+        history?: boolean;
+
+        /**The historyUndo event is triggered when the undo action is triggered. */
+        historyUndo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
+        /**The historyRedo event is triggered when the redo action is triggered. */
+        historyRedo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
+    };
+
+    interface ColumnLayout {
+        /**title - Required This is the title that will be displayed in the header for this column */
+        title: string;
+        /**field - Required (not required in icon/button columns) this is the key for this column in the data array*/
+        field?: string;
+        /**visible - (boolean, default - true) determines if the column is visible. (see Column Visibility for more details */
+        visible?: boolean;
+
+        /**sets the width of this column, this can be set in pixels or as a percentage of total table width (if not set the system will determine the best) */
+        width?: number | string;
+    }
+
+    interface ColumnDefinition extends ColumnLayout, CellCallbacks {
+        //Layout
+        /**sets the text alignment for this column */
+        align?: "left" | "center" | "right"; //Align?
+        /**sets the minimum width of this column, this should be set in pixels (this takes priority over the global option of columnMinWidth) */
+        minWidth?: number;
+
+        /**The widthGrow property should be used on columns without a width property set. The value is used to work out what fraction of the available will be allocated to the column. The value should be set to a number greater than 0, by default any columns with no width set have a widthGrow value of 1 */
+        widthGrow?: number;
+
+        /**The widthShrink property should be used on columns with a width property set. The value is used to work out how to shrink columns with a fixed width when the table is too narrow to fit in all the columns. The value should be set to a number greater than 0, by default columns with a width set have a widthShrink value of 0, meaning they will not be shrunk if the table gets too narrow, and may cause the horizontal scrollbar to appear. */
+        widthShrink?: number;
+
+        /**set whether column can be resized by user dragging its edges */
+        resizable?: boolean;
+        /**You can freeze the position of columns on the left and right of the table using the frozen property in the column definition array. This will keep the column still when the table is scrolled horizontally. */
+        frozen?: boolean;
+        /**an integer to determine when the column should be hidden in responsive mode */
+        responsive?: number;
+        /**sets the on hover tooltip for each cell in this column 
+     * 
+     * The tooltip parameter can take three different types of value
+        boolean - a value of false disables the tooltip, a value of true sets the tooltip of the cell to its value
+        string - a string that will be displayed for all cells in the matching column/table.
+        function - a callback function that returns the string for the cell
+        
+     * Note: setting a tooltip value on a column will override the global setting.
+    */
+        tooltip?: string | GlobalTooltipOption;
+        /**sets css classes on header and cells in this column. (value should be a string containing space separated class names) */
+        cssClass?: string;
+        /**sets the column as a row handle, allowing it to be used to drag movable rows. */
+        rowHandle?: boolean;
+        /**When the getHtml function is called, hide the column from the output. */
+        hideInHtml?: boolean;
+
+        //Data Manipulation
+        /** By default Tabulator will attempt to guess which sorter should be applied to a column based on the data contained in the first row. It can determine sorters for strings, numbers, alphanumeric sequences and booleans, anything else will be treated as a string.
+
+To specify a sorter to be used on a column use the sorter property in the columns definition object
+
+You can pass an optional additional property with sorter, sorterParams that should contain an object with additional information for configuring the sorter*/
+        sorter?: "string" | "number" | "alphanum" | "boolean" | "exists" | "date" | "time" | "datetime" | "array" | ((a: any, b: any, aRow: RowComponent, bRow: RowComponent, column: ColumnComponent, dir: SortDirection, sorterParams: {}) => number);
+        /**If you want to dynamically generate the sorterParams at the time the sort is called you can pass a function into the property that should return the params object. */
+        sorterParams?: ColumnDefinitionSorterParams | ColumnSorterParamLookupFunction;
+        /** set how you would like the data to be formatted*/
+        formatter?: Formatter;
+        /** You can pass an optional additional parameter with the formatter, formatterParams that should contain an object with additional information for configuring the formatter.*/
+        formatterParams?: FormatterParams;
+        /**alter the row height to fit the contents of the cell instead of hiding overflow */
+        variableHeight?: boolean;
+        /** There are some circumstances where you may want to block editibility of a cell for one reason or another. To meet this need you can use the editable option. This lets you set a callback that is executed before the editor is built, if this callback returns true the editor is added, if it returns false the edit is aborted and the cell remains a non editable cell. The function is passed one parameter, the CellComponent of the cell about to be edited. You can also pass a boolean value instead of a function to this property.*/
+        editable?: boolean | ((cell: CellComponent) => boolean);
+        /**When a user clicks on an editable column the will be able to edit the value for that cell.
+
+    By default Tabulator will use an editor that matches the current formatter for that cell. if you wish to specify a specific editor, you can set them per column using the editor option in the column definition. Passing a value of true to this option will result in Tabulator applying the editor that best matches the columns formatter, if present.
+
+    You can pass an optional additional parameter with the editor, editorParams that should contain an object with additional information for configuring the editor. */
+        editor?: Editor;
+        /** */
+        editorParams?: EditorParams;
+
+        /**Validators are used to ensure that any user input into your editable cells matches your requirements.
+
+    Validators can be applied by using the validator property in a columns definition object (see Define Columns for more details). */
+        validator?: StandardValidatorType | StandardValidatorType[] | Validator | Validator[];
+
+        /**Mutators are used to alter data as it is parsed into Tabulator. For example if you wanted to convert a numeric column into a boolean based on its value, before the data is used to build the table.
+
+    You can set mutators on a per column basis using the mutator option in the column definition object.
+
+    You can pass an optional additional parameter with mutator, mutatorParams that should contain an object with additional information for configuring the mutator. */
+        mutator?: CustomMutator;
+        /**You can pass an optional additional parameter with mutator, mutatorParams that should contain an object with additional information for configuring the mutator. */
+        mutatorParams?: CustomMutatorParams;
+        /** only called when data is loaded via a command {eg. setData). */
+        mutatorData?: CustomMutator;
+        mutatorDataParams?: CustomMutatorParams;
+
+        /**only called when data is changed via a user editing a cell. */
+        mutatorEdit?: CustomMutator;
+        mutatorEditParams?: CustomMutatorParams;
+
+        /**only called when data is changed via a user editing a cell. */
+        mutatorClipboard?: CustomMutator;
+        mutatorClipboardParams?: CustomMutatorParams;
+
+        /** Accessors are used to alter data as it is extracted from the table, through commands, the clipboard, or download.
+
+    You can set accessors on a per column basis using the accessor option in the column definition object.*/
+        accessor?: CustomAccessor;
+        /** Each accessor function has its own matching params option, for example accessorDownload has accessorDownloadParams.*/
+        accessorParams?: CustomAccessorParams;
+        /**only called when data is being converted into a downloadable file. */
+        accessorDownload?: CustomAccessor;
+        /** */
+        accessorDownloadParams?: CustomAccessorParams;
+
+        /**only called when data is being copied into the clipboard. */
+        accessorClipboard?: CustomAccessor;
+        /** */
+        accessorClipboardParams?: CustomAccessorParams;
+
+        /**show or hide column in downloaded data */
+        download?: boolean;
+        /**set custom title for column in download */
+        downloadTitle?: string;
+
+        /** the column calculation to be displayed at the top of this column(see Column Calculations for more details) */
+        topCalc?: ColumnCalc;
+        /**additional parameters you can pass to the topCalc calculation function (see Column Calculations for more details) */
+        topCalcParams?: ColumnCalcParams;
+        /**formatter for the topCalc calculation cell  */
+        topCalcFormatter?: Formatter;
+        /** additional parameters you can pass to the topCalcFormatter function */
+        topCalcFormatterParams?: FormatterParams;
+
+        bottomCalc?: ColumnCalc;
+        bottomCalcParams?: ColumnCalcParams;
+        bottomCalcFormatter?: Formatter;
+        /** additional parameters you can pass to the bottomCalcFormatter function */
+        bottomCalcFormatterParams?: FormatterParams;
+
+        //Column Header
+        /**By default all columns in a table are sortable by clicking on the column header, if you want to disable this behaviour, set the headerSort property to false in the column definition array: */
+        headerSort?: boolean;
+        /**set the starting sort direction when a user first clicks on a header */
+        headerSortStartingDir?: SortDirection;
+
+        /**allow tristate toggling of column header sort direction */
+        headerSortTristate?: boolean;
+
+        /**  callback for when user clicks on the header for this column*/
+        headerClick?: ColumnEventCallback;
+        /** callback for when user double clicks on the header for this column */
+        headerDblClick?: ColumnEventCallback;
+        /**callback for when user right clicks on the header for this column  */
+        headerContext?: ColumnEventCallback;
+        /** callback for when user taps on a header for this column, triggered in touch displays. */
+        headerTap?: ColumnEventCallback;
+        /**callback for when user double taps on a header for this column, triggered in touch displays when a user taps the same header twice in under 300ms */
+        headerDblTap?: ColumnEventCallback;
+        /**callback for when user taps and holds on a header for this column, triggered in touch displays when a user taps and holds the same header for 1 second. */
+        headerTapHold?: ColumnEventCallback;
+        /**sets the on hover tooltip for the column header
+     * 
+     * The tooltip headerTooltip can take three different types of value
+
+      boolean - a value of false disables the tooltip, a value of true sets the tooltip of the column header to its title value.
+      string - a string that will be displayed for the tooltip.
+      function - a callback function that returns the string for the column header
+     * 
+     */
+        headerTooltip?: boolean | string | ((column: ColumnComponent) => string);
+        /**change the orientation of the column header to vertical
+     * 
+     * The headerVertical property can take one of three values:
+
+      false - vertical columns disabled (default value)
+      true - vertical columns enabled
+      "flip" - vertical columns enabled, with text direction flipped by 180 degrees
+     * 
+     */
+        headerVertical?: boolean | "flip";
+
+        /**allows the user to edit the header titles */
+        editableTitle?: boolean;
+        /** formatter function for header title */
+        titleFormatter?: Formatter;
+
+        /**additional parameters you can pass to the header title formatter */
+        titleFormatterParams?: FormatterParams;
+        /** filtering of columns from elements in the header */
+        headerFilter?: Editor;
+        /**additional parameters you can pass to the header filter */
+        headerFilterParams?: EditorParams;
+
+        /** placeholder text for the header filter */
+        headerFilterPlaceholder?: string;
+
+        /** function to check when the header filter is empty */
+        headerFilterEmptyCheck?: ValueBooleanCallback;
+        /** By default Tabulator will try and match the comparison type to the type of element used for the header filter.
+
+    Standard input elements will use the "like" filter, this allows for the matches to be displayed as the user types.
+
+    For all other element types (select boxes, check boxes, input elements of type number) an "=" filter type is used.
+
+    If you want to specify the type of filter used you can pass it to the headerFilterFunc option in the column definition object. This will take any of the standard filters outlined above or a custom function*/
+        headerFilterFunc?: FilterType | ((headerValue: any, rowValue: any, rowdata: any, filterparams: any) => boolean);
+        /** additional parameters object passed to the headerFilterFunc function  */
+        headerFilterFuncParams?: any;
+
+        /**disable live filtering of the table  */
+        headerFilterLiveFilter?: boolean;
+    }
+
+    interface CellCallbacks {
+        //Cell Events
+        /**callback for when user clicks on a cell in this column  */
+        cellClick?: CellEventCallback;
+        /** callback for when user double clicks on a cell in this column */
+        cellDblClick?: CellEventCallback;
+        /**callback for when user right clicks on a cell in this column */
+        cellContext?: CellEventCallback;
+        /**callback for when user taps on a cell in this column, triggered in touch displays.  */
+        cellTap?: CellEventCallback;
+        /** callback for when user double taps on a cell in this column, triggered in touch displays when a user taps the same cell twice in under 300ms.  */
+        cellDblTap?: CellEventCallback;
+        /** callback for when user taps and holds on a cell in this column, triggered in touch displays when a user taps and holds the same cell for 1 second.*/
+        cellTapHold?: CellEventCallback;
+
+        /**callback for when the mouse pointer enters a cell */
+        cellMouseEnter?: CellEventCallback;
+        /** callback for when the mouse pointer leaves a cell */
+        cellMouseLeave?: CellEventCallback;
+
+        /** callback for when the mouse pointer enters a cell or one of its child elements */
+        cellMouseOver?: CellEventCallback;
+
+        /**callback for when the mouse pointer enters a cell or one of its child elements */
+        cellMouseOut?: CellEventCallback;
+
+        /**callback for when the mouse pointer moves over a cell  */
+        cellMouseMove?: CellEventCallback;
+
+        //Cell editing
+        /**callback for when a cell in this column is being edited by the user */
+        cellEditing?: CellEditEventCallback;
+
+        /**callback for when a cell in this column has been edited by the user */
+        cellEdited?: CellEditEventCallback;
+
+        /** callback for when an edit on a cell in this column is aborted by the user  */
+        cellEditCancelled?: CellEditEventCallback;
+    }
+
+    interface ColumnDefinitionSorterParams {
+        format?: string;
+        locale?: string | boolean;
+        alignEmptyValues?: "top" | "bottom";
+        type?: "length" | "sum" | "max" | "min" | "avg";
+    }
+
+    type GlobalTooltipOption = boolean | ((cell: CellComponent) => string);
+    type CustomMutator = (value: any, data: any, type: "data" | "edit", mutatorParams: any, cell?: CellComponent) => any;
+    type CustomMutatorParams = {} | ((value: any, data: any, type: "data" | "edit", cell?: CellComponent) => any);
+    type CustomAccessor = (value: any, data: any, type: "data" | "download" | "clipboard", AccessorParams: any, column?: ColumnComponent) => any;
+    type CustomAccessorParams = {} | ((value: any, data: any, type: "data" | "download" | "clipboard", column?: ColumnComponent) => any);
+    type ColumnCalc = "avg" | "max" | "min" | "sum" | "concat" | "count" | ((values: Array<any>, data: Array<any>, calcParams: {}) => number);
+    type ColumnCalcParams = (values: any, data: any) => any;
+    type Formatter = "plaintext" | "textarea" | "html" | "money" | "image" | "datetime" | "datetimediff" | "link" | "tickCross" | "color" | "star" | "traffic" | "progress" | "lookup" | "buttonTick" | "buttonCross" | "rownum" | "handle" | ((cell: CellComponent, formatterParams: {}, onRendered: EmptyCallback) => string | HTMLElement);
+    type FormatterParams = MoneyParams | ImageParams | LinkParams | DateTimeParams | DateTimeDifferenceParams | TickCrossParams | TrafficParams | StarRatingParams | JSONRecord | ((cell: CellComponent) => {});
+
+    type Editor = true | "input" | "textarea" | "number" | "range" | "tick" | "star" | "select" | "autocomplete" | ((cell: CellComponent, onRendered: EmptyCallback, success: ValueVoidCallback, cancel: ValueVoidCallback, editorParams: {}) => HTMLElement | false);
+
+    type EditorParams = NumberParams | CheckboxParams | SelectParams | AutoCompleteParams | ((cell: CellComponent) => {});
+
+    type ScrollToRowPostition = "top" | "center" | "bottom" | "nearest";
+    type ScrollToColumnPosition = "left" | "center" | "middle" | "right";
+
+    interface MoneyParams {
+        //Money
+        decimal?: string;
+        thousand?: string;
+        symbol?: string;
+        symbolAfter?: boolean;
+        precision?: boolean | number;
+    }
+    interface ImageParams {
+        //Image
+        height?: string;
+        width?: string;
+    }
+    interface LinkParams {
+        //Link
+        labelField?: string;
+        label?: string;
+        urlPrefix?: string;
+        urlField?: string;
+        url?: string;
+        target?: string;
+    }
+
+    interface DateTimeParams {
+        //datetime
+        inputFormat?: string;
+        outputFormat?: string;
+        invalidPlaceholder?: true | string | number | ValueStringCallback;
+    }
+
+    interface DateTimeDifferenceParams extends DateTimeParams {
+        //Date Time Difference
+        date?: any;
+        humanize?: boolean;
+        unit?: "years" | "months" | "weeks" | "days" | "hours" | "minutes" | "seconds";
+        suffix?: boolean;
+    }
+    interface TickCrossParams {
+        //Tick Cross
+        allowEmpty?: boolean;
+        allowTruthy?: boolean;
+        tickElement?: boolean | string;
+        crossElement?: boolean | string;
+    }
+
+    interface TrafficParams {
+        //Traffic
+        min?: number;
+        max?: number;
+        color?: Color;
+    }
+    interface ProgressBarParams extends TrafficParams {
+        //Progress Bar
+        legend?: string | true | ValueStringCallback;
+        legendColor?: Color;
+        legendAlign?: Align;
+    }
+
+    interface StarRatingParams {
+        //Star Rating
+        stars?: number;
+    }
+
+    interface NumberParams {
+        //range,number
+        min?: number;
+        max?: number;
+        step?: number;
+    }
+
+    interface CheckboxParams {
+        //tick
+        tristate?: boolean;
+        indeterminateValue?: string;
+    }
+
+    interface SelectParams {
+        values: true | string[] | JSONRecord | SelectParamsGroup[];
+        listItemFormatter?: (value: string, text: string) => string;
+    }
+
+    interface SelectParamsGroup {
+        label: string;
+        value?: string | number | boolean;
+        options?: SelectLabelValue[];
+    }
+    type SelectLabelValue = { label: string; value: string | number | boolean };
+
+    interface AutoCompleteParams {
+        values: true | string[] | JSONRecord;
+        listItemFormatter?: (value: string, text: string) => string;
+        searchFunc: (term: string, values: string[]) => string[];
+        allowEmpty?: boolean;
+        freetext?: boolean;
+        showListOnEmpty?: boolean;
+    }
+
+    type ValueStringCallback = (value: any) => string;
+    type ValueBooleanCallback = (value: any) => boolean;
+    type ValueVoidCallback = (value: any) => void;
+    type EmptyCallback = (callback: () => void) => void;
+    type CellEventCallback = (e: any, cell: CellComponent) => void;
+    type CellEditEventCallback = (cell: CellComponent) => void;
+    type ColumnEventCallback = (e: any, column: ColumnComponent) => void;
+    type RowEventCallback = (e: any, row: RowComponent) => void;
+    type RowChangedCallback = (row: RowComponent) => void;
+    type GroupEventCallback = (e: any, group: GroupComponent) => void;
+
+    type SortDirection = "asc" | "desc";
+    type FilterType = "=" | "!=" | "like" | "<" | ">" | "<=" | ">=" | "in" | "regex";
+    type Color = string | any[] | ValueStringCallback;
+    type Align = "center" | "left" | "right" | "justify";
+
+    type JSONRecord = Record<string, string | number | boolean>;
+
+    type StandardValidatorType = "required" | "unique" | "integer" | "float" | "numeric" | "string";
+    interface Validator {
+        type: StandardValidatorType | ((cell: CellComponent, value: any, parameters?: any) => boolean);
+        parameters?: any;
+    }
+
+    type ColumnSorterParamLookupFunction = (column: ColumnComponent, dir: SortDirection) => {};
+
+    type ColumnLookup = ColumnComponent | ColumnDefinition | HTMLElement | string;
+    type RowLookup = RowComponent | HTMLElement | string | number;
+
+    interface KeyBinding {
+        navPrev?: string | boolean;
+        navNext?: string | boolean;
+        navLeft?: string | boolean;
+        navRight?: string | boolean;
+        navUp?: string | boolean;
+        navDown?: string | boolean;
+        undo?: string | boolean;
+        redo?: string | boolean;
+        scrollPageUp?: string | boolean;
+        scrollPageDown?: string | boolean;
+        scrollToStart?: string | boolean;
+        scrollToEnd?: string | boolean;
+        copyToClipboard?: string | boolean;
+    }
+
+    //Components-------------------------------------------------------------------
+    interface CellComponent {
+        /**The getValue function returns the current value for the cell. */
+        getValue: () => any;
+        /**The getOldValue function returns the previous value of the cell. Very usefull in the event of cell update callbacks. */
+        getOldValue: () => any;
+        /**The restoreOldValue reverts the value of the cell back to its previous value, without triggering any of the cell edit callbacks. */
+        restoreOldValue: () => any;
+        /**The getElement function returns the DOM node for the cell. */
+
+        getElement: () => HTMLElement;
+        /**The getTable function returns the Tabulator object for the table containing the cell. */
+        getTable: () => Tabulator;
+        /**The getRow function returns the RowComponent for the row that contains the cell. */
+        getRow: () => RowComponent;
+
+        /**The getColumn function returns the ColumnComponent for the column that contains the cell. */
+        getColumn: () => ColumnComponent;
+
+        /**The getData function returns the data for the row that contains the cell. */
+        getData: () => {};
+        /**The getField function returns the field name for the column that contains the cell. */
+        getField: () => string;
+        /**You can change the value of the cell using the setValue function. The first parameter should be the new value for the cell, the second optional parameter will apply the column mutators to the value when set to true (default = true). */
+        setValue: (value: any, mutate?: boolean) => void;
+        /**If you are making manual adjustments to elements contained withing the cell, or the cell itself, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the checkHeight function to check if the height of the cell has changed and normalize the row if it has. */
+        checkHeight: () => void;
+        /**You and programatically cause a cell to open its editor element using the edit function */
+        edit: (ignoreEditable?: boolean) => void;
+        /**You and programatically cancel a cell edit that is currently in progress by calling the cancelEdit function */
+        cancelEdit: () => void;
+        /**When a cell is being edited it is possible to move the editor focus from the current cell to one if its neighbours. There are a number of functions that can be called on the nav function to move the focus in different directions. */
+        nav: () => CellNavigation;
+    }
+
+    interface CellNavigation {
+        /**prev - next editable cell on the left, if none available move to the right most editable cell on the row above */
+        prev: () => boolean;
+        /**next - next editable cell on the right, if none available move to left most editable cell on the row below */
+        next: () => boolean;
+        /**left - next editable cell on the left, return false if none available on row */
+        left: () => boolean;
+        /**right - next editable cell on the right, return false if none available on row */
+        right: () => boolean;
+        /**up - move to the same cell in the row above */
+        up: () => void;
+        /**down - move to the same cell in the row below */
+        down: () => void;
+    }
+
+    interface RowComponent {
+        /**The getData function returns the data object for the row.*/
+        getData: () => {};
+        /**The getElement function returns the DOM node for the row.*/
+        getElement: () => HTMLElement;
+
+        /**The getTable function returns the Tabulator object for the table containing the row. */
+        getTable: () => Tabulator;
+
+        /**The getNextRow function returns the Row Component for the next visible row in the table, if there is no next row it will return a value of false */
+        getNextRow: () => RowComponent | false;
+        /**The getNextRow function returns the Row Component for the previous visible row in the table, if there is no next row it will return a value of false */
+        getPrevRow: () => RowComponent | false;
+
+        /**The getCells function returns an array of CellComponent objects, one for each cell in the row.*/
+        getCells: () => Array<CellComponent>;
+        /**The getCell function returns the CellComponent for the specified column from this row.*/
+        getCell: (column: ColumnComponent | HTMLElement | string) => CellComponent;
+        /**The getIndex function returns the index value for the row. (this is the value from the defined index column, NOT the row's position in the table)*/
+        getIndex: () => any;
+
+        /**Use the getPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
+
+    If you want to get the position of the row in the currently filtered/sorted data, you can pass a value of true to the optional first argument of the function. */
+        getPosition: (filteredPosition?: boolean) => number;
+
+        /**When using grouped rows, you can retrieve the group component for the current row using the getGroup function. */
+        getGroup: () => GroupComponent;
+        /**The delete function deletes the row, removing its data from the table
+         *
+         * The delete method returns a promise, this can be used to run any other commands that have to be run after the row has been deleted. By running them in the promise you ensure they are only run after the row has been deleted.
+         */
+        delete: () => Promise<void>;
+        /**The scrollTo function will scroll the table to the row if it passes the current filters.*/
+        scrollTo: () => Promise<void>;
+
+        /**The pageTo function will load the page for the row if it passes the current filters.*/
+        pageTo: () => Promise<void>;
+
+        /** You can move a row next to another row using the move function.
+
+    The first argument should be the target row that you want to move to, and can be any of the standard row component look up options.
+
+    The second argument determines whether the row is moved to above or below the target row. A value of false will cause to the row to be placed below the target row, a value of true will result in the row being placed above the target*/
+
+        move: (lookup: RowComponent | HTMLElement | number, belowTarget?: boolean) => void;
+
+        /**You can update the data in the row using the update function. You should pass an object to the function containing any fields you wish to update. This object will not replace the row data, only the fields included in the object will be updated.*/
+        update: (data: {}) => Promise<void>;
+        /**The select function will select the current row.*/
+        select: () => void;
+        /**The deselect function will deselect the current row.*/
+        deselect: () => void;
+        /**The deselect function will toggle the current row.*/
+        toggleSelect: () => void;
+        /**The isSelected function will return a boolean representing the current selected state of the row. */
+        isSelected: () => boolean;
+        /**If you are making manual adjustments to elements contained within the row, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the normalizeHeight function to do this.*/
+        normalizeHeight: () => void;
+
+        /**If you want to re-format a row once it has been rendered to re-trigger the cell formatters and the rowFormatter callback, Call the reformat function. */
+        reformat: () => void;
+
+        /**You can freeze a row at the top of the table by calling the freeze function. This will insert the row above the scrolling portion of the table in the table header. */
+        freeze: () => void;
+
+        /**A frozen row can be unfrozen using the unfreeze function. This will remove the row from the table header and re-insert it back in the table. */
+        unfreeze: () => void;
+
+        /**When the tree structure is enabled the treeExpand function will expand current row and show its children. */
+        treeExpand: () => void;
+
+        /**When the tree structure is enabled the treeCollapse function will collapse current row and hide its children */
+        treeCollapse: () => void;
+
+        /**When the tree structure is enabled the treeToggle function will toggle the collapsed state of the current row. */
+        treeToggle: () => void;
+
+        /**When the tree structure is enabled the getTreeParent function will return the Row Component for the parent of this row. If no parent exists, a value of false will be returned. */
+        getTreeParent: () => RowComponent | false;
+        /**When the tree structure is enabled the getTreeChildren function will return an array of Row Components for this rows children. */
+        getTreeChildren: () => RowComponent[];
+    }
+
+    interface GroupComponent {
+        /**The getElement function returns the DOM node for the group header. */
+        getElement: () => HTMLElement;
+
+        /**The getTable function returns the Tabulator object for the table containing the group */
+        getTable: () => Tabulator;
+
+        /**The getKey function returns the unique key that is shared between all rows in this group. */
+        getKey: () => any;
+
+        /**The getRows function returns an array of RowComponent objects, one for each row in the group */
+        getRows: () => RowComponent[];
+
+        /**The getSubGroups function returns an array of GroupComponent objects, one for each sub group of this group. */
+        getSubGroups: () => GroupComponent[];
+
+        /**The getParentGroup function returns the GroupComponent for the parent group of this group. if no parent exists, this function will return false */
+        getParentGroup: () => GroupComponent | false;
+
+        /** The getVisibility function returns a boolean to show if the group is visible, a value of true means it is visible.*/
+        getVisibility: () => boolean;
+
+        /**The show function shows the group if it is hidden. */
+        show: () => void;
+        /**The hide function hides the group if it is visible. */
+        hide: () => void;
+        /**The toggle function toggles the visibility of the group, switching between hidden and visible. */
+        toggle: () => void;
+    }
+
+    interface ColumnComponent {
+        /*The getElement function returns the DOM node for the colum*/
+        getElement: () => HTMLElement;
+        /**The getTable function returns the Tabulator object for the table containing the column */
+        getTable: () => Tabulator;
+        /**The getDefinition function returns the column definition object for the column.*/
+        getDefinition: () => ColumnDefinition;
+        /**The getField function returns the field name for the column.*/
+        getField: () => string;
+        /**The getCells function returns an array of CellComponent objects, one for each cell in the column.*/
+        getCells: () => Array<CellComponent>;
+
+        /**The getNextColumn function returns the Column Component for the next visible column in the table, if there is no next column it will return a value of false. */
+        getNextColumn: () => ColumnComponent | false;
+        /**The getPrevColumn function returns the Column Component for the previous visible column in the table, if there is no previous column it will return a value of false. */
+        getPrevColumn: () => ColumnComponent | false;
+        /**The getVisibility function returns a boolean to show if the column is visible, a value of true means it is visible.*/
+        getVisibility: () => boolean;
+        /**The show function shows the column if it is hidden.*/
+        show: () => void;
+        /**The hide function hides the column if it is visible.*/
+        hide: () => void;
+        /**The toggle function toggles the visibility of the column, switching between hidden and visible.*/
+        toggle: () => void;
+        /**The delete function deletes the column, removing it from the table*/
+        delete: () => void;
+        /**The scrollTo function will scroll the table to the column if it is visible. */
+        scrollTo: () => Promise<void>;
+        /**The getSubColumns function returns an array of ColumnComponent objects, one for each sub column of this column. */
+        getSubColumns: () => ColumnComponent[];
+
+        /**The getParentColumn function returns the ColumnComponent for the parent column of this column. if no parent exists, this function will return false */
+        getParentColumn: () => ColumnComponent | false;
+        /**The headerFilterFocus function will place focus on the header filter element for this column if it exists. */
+        headerFilterFocus: () => void;
+        /**The setHeaderFilterValue function set the value of the columns header filter element to the value provided in the first argument. */
+        setHeaderFilterValue: (value: any) => void;
+        /**The reloadHeaderFilter function rebuilds the header filter element, updating any params passed into the editor used to generate the filter. */
+        reloadHeaderFilter: () => void;
+    }
+}
+
+//Tabulator.prototype.(?!registerModule|helpers|_)\w+
+declare class Tabulator {
+    constructor(selector: string | HTMLElement, options?: Tabulator.Options);
+
+    columnManager: any;
+    rowManager: any;
+    footerManager: any;
+    browser: string;
+    browserSlow: boolean;
+    modules: any;
+    options: Tabulator.Options;
+
+    /**You have a choice of four file types to choose from:
+      csv - Comma separated value file
+      json - JSON formatted text file
+      xlsx - Excel File (Requires the SheetJS Library)
+      pdf - PDF File (Requires the jsPDF Library and jsPDF-AutoTable Plugin)
+      To trigger a download, call the download function, passing the file type (from the above list) as the first argument, and an optional second argument of the file name for the download (if this is left out it will be "Tabulator.ext"). The optional third argument is an object containing any setup options for the formatter, such as the delimiter choice for CSV's). 
+      
+      The PDF downloader requires that the jsPDF Library and jsPDF-AutoTable Plugin be included on your site, this can be included with the following script tags.
+      
+      If you want to create a custom file type from the table data then you can pass a function to the type argument, instead of a string value. At the end of this function you must call the setFileContents function, passing the formatted data and the mime type.
+      */
+    download: (downloadType: Tabulator.DownloadType | ((columns: Tabulator.ColumnDefinition[], data: any, options: any, setFileContents: any) => any), fileName: string, params?: Tabulator.DownloadOptions) => void;
+
+    /**If you want to open the generated file in a new browser tab rather than downloading it straight away, you can use the downloadToTab function. This is particularly useful with the PDF downloader, as it allows you to preview the resulting PDF in a new browser ta */
+    downloadToTab: (downloadType: Tabulator.DownloadType, fileName: string, params?: Tabulator.DownloadOptions) => void;
+
+    /**The copyToClipboard function allows you to copy the current table data to the clipboard.
+
+    The first argument is the copy selector, you can choose from any of the built in options or pass a function in to the argument, that must return the selected row components.
+
+    If you leave this argument undefined, Tabulator will use the value of the clipboardCopySelector property, which has a default value of table */
+    copyToClipboard: (type: "selection" | "table") => void;
+
+    /**With history enabled you can use the undo function to automatically undo a user action, the more times you call the function, the further up the history log you go. */
+    undo: () => boolean;
+
+    /**You can use the getHistoryUndoSize function to get a count of the number of history undo actions available. */
+    getHistoryUndoSize: () => number | false;
+
+    /**With history enabled you can use the redo function to automatically redo user action that has been undone, the more times you call the function, the further up the history log you go. once a user interacts with the table then can no longer redo any further actions until an undo is performe */
+    redo: () => boolean;
+
+    /**You can use the getHistoryRedoSize function to get a count of the number of history redo actions available.*/
+    getHistoryRedoSize: () => number | false;
+    /**Deconstructor */
+    destroy: () => void;
+    /**By default Tabulator will only allow files with a .json extension to be loaded into the table.
+
+    You can allow any other type of file into the file picker by passing the extension or mime type into the first argument of the setDataFromLocalFile function as a comma separated list. This argument will accept any of the values valid for the accept field of an input element */
+    setDataFromLocalFile: (extensions: string) => void;
+    setData: (data: any, params?: any, config?: any) => Promise<void>;
+    /**You can remove all data from the table using clearData */
+    clearData: () => void;
+    /**You can retrieve the data stored in the table using the getData function. */
+    getData: (activeOnly?: boolean) => any[];
+    getDataCount: (activeOnly?: boolean) => number;
+    /**The searchRows function allows you to retreive an array of row components that match any filters you pass in. it accepts the same arguments as the setFilter function. */
+    searchRows: Tabulator.FilterFunction;
+    /**The searchData function allows you to retreive an array of table row data that match any filters you pass in. it accepts the same arguments as the setFilter function. */
+    searchData: Tabulator.FilterFunction;
+    /**You can retrieve the table data as a simple HTML table using the getHtml function. */
+    getHtml: (activeOnly?: boolean) => void;
+    /**You can retrieve the current AJAX URL of the table with the getAjaxUrl function.
+   * 
+   * This will return a HTML encoded string of the table data.
+
+    By default getHtml will return a table containing all the data held in the Tabulator. If you only want to access the currently filtered/sorted elements, you can pass a value of true to the first argument of the function.
+   */
+    getAjaxUrl: () => string;
+    /**The replaceData function lets you silently replace all data in the table without updating scroll position, sort or filtering, and without triggering the ajax loading popup. This is great if you have a table you want to periodically update with new/updated information without alerting the user to a change.
+
+  It takes the same arguments as the setData function, and behaves in the same way when loading data (ie, it can make ajax requests, parse JSON etc) */
+    replaceData: (data?: {}[] | string, params?: any, config?: any) => Promise<void>;
+    /**If you want to update an existing set of data in the table, without completely replacing the data as the setData method would do, you can use the updateData method.
+
+    This function takes an array of row objects and will update each row based on its index value. (the index defaults to the "id" parameter, this can be set using the index option in the tabulator constructor). Options without an index will be ignored, as will items with an index that is not already in the table data. The addRow function should be used to add new data to the table. */
+    updateData: (data: {}[]) => Promise<void>;
+    /**The addData method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data. */
+    addData: (data?: {}[], addToTop?: boolean, positionTarget?: Tabulator.RowLookup) => Promise<Tabulator.RowComponent>;
+
+    /**If the data you are passng to the table contains a mix of existing rows to be updated and new rows to be added then you can call the updateOrAddData function. This will check each row object provided and update the existing row if available, or else create a new row with the data. */
+    updateOrAddData: (data: {}[]) => Promise<Tabulator.RowComponent[]>;
+    /**To rereive the DOM Node of a specific row, you can retrieve the RowComponent with the getRow function, then use the getElement function on the component. The first argument is the row you are looking for, it will take any of the standard row component look up options. */
+    getRow: (row: Tabulator.RowLookup) => Tabulator.RowComponent;
+
+    /**You can retrieve the Row Component of a row at a given position in the table using getRowFromPosition function. By default this will return the row based in its position in all table data, including data currently filtered out of the table.
+
+  If you want to get a row based on its position in the currently filtered/sorted data, you can pass a value of true to the optional second argument of the function. */
+    getRowFromPosition: (position: number, activeOnly?: boolean) => void;
+    /**You can delete any row in the table using the deleteRow function. */
+    deleteRow: (row: Tabulator.RowLookup) => void;
+
+    /**You can add a row to the table using the addRow function.
+
+    The first argument should be a row data object. If you do not pass data for a column, it will be left empty. To create a blank row (ie for a user to fill in), pass an empty object to the function.
+
+    The second argument is optional and determines whether the row is added to the top or bottom of the table. A value of true will add the row to the top of the table, a value of false will add the row to the bottom of the table. If the parameter is not set the row will be placed according to the addRowPos global option. */
+    addRow: (data?: {}, addToTop?: boolean, positionTarget?: Tabulator.RowLookup) => Promise<Tabulator.RowComponent>;
+    /**If you don't know whether a row already exists you can use the updateOrAddRow function. This will check if a row with a matching index exists, if it does it will update it, if not it will add a new row with that data. This takes the same arguments as the updateRow function. */
+    updateOrAddRow: (row: Tabulator.RowLookup, data: {}) => Promise<Tabulator.RowComponent>;
+    /**You can update any row in the table using the updateRow function.
+
+  The first argument is the row you want to update, it will take any of the standard row component look up options.
+
+  The second argument should be the updated data object for the row. As with the updateData function, this will not replace the existing row data object, it will only update any of the provided parameters.
+  
+  Once complete, this function will trigger the rowUpdated and dataEdited events.
+
+  This function will return true if the update was successful or false if the requested row could not be found. If the new data matches the existing row data, no update will be performed.
+  */
+    updateRow: (row: Tabulator.RowLookup, data: {}) => boolean;
+    /**If you want to trigger an animated scroll to a row then you can use the scrollToRow function.
+
+    The first argument should be any of the standard row component look up options for the row you want to scroll to.
+
+    The second argument is optional, and is used to set the position of the row, it should be a string with a value of either top, center, bottom or nearest, if omitted it will be set to the value of the scrollToRowPosition option which has a default value of top.
+
+    The third argument is optional, and is a boolean used to set if the table should scroll if the row is already visible, true to scroll, false to not, if omitted it will be set to the value of the scrollToRowIfVisible option, which defaults to true */
+    scrollToRow: (row: Tabulator.RowLookup, position?: Tabulator.ScrollToRowPostition, ifVisible?: boolean) => Promise<void>;
+    /**If you want to programmatically move a row to a new position you can use the moveRow function.
+
+    The first argument should be the row you want to move, and can be any of the standard row component look up options.
+
+    The second argument should be the target row that you want to move to, and can be any of the standard row component look up options.
+
+    The third argument determines whether the row is moved to above or below the target row. A value of false will cause to the row to be placed below the target row, a value of true will result in the row being placed above the target */
+    moveRow: (fromRow: Tabulator.RowLookup, toRow: Tabulator.RowLookup, placeAboveTarget?: boolean) => void;
+    /**You can retrieve all the row components in the table using the getRows function.
+     * By default getRows will return an array containing all the Row Component's held in the Tabulator. If you only want to access the currently filtered/sorted elements, you can pass a value of true to the first argument of the function.
+     */
+    getRows: (activeOnly?: boolean) => Tabulator.RowComponent[];
+    /**Use the getRowPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
+
+    The first argument is the row you are looking for, it will take any of the standard row component look up options. If you want to get the position of the row in the currently filtered/sorted data, you can pass a value of true to the optional second argument of the function.
+    
+    Note: If the row is not found, a value of -1 will be returned, row positions start at 0
+    */
+    getRowPosition: (row: Tabulator.RowLookup, activeOnly?: boolean) => number;
+    /**To replace the current column definitions for a table use the setColumns function. This function takes a column definition array as its only argument. */
+    setColumns: (definitions: Tabulator.ColumnDefinition[]) => void;
+    /**To get an array of Column Components for the current table setup, call the getColumns function. This will only return actual data columns not column groups.
+     *
+     * To get a structured array of Column Components that includes column groups, pass a value of true as an argument.
+     */
+    getColumns: (includeColumnGroups?: boolean) => Tabulator.ColumnComponent[] | Tabulator.GroupComponent[];
+    /**Using the getColumn function you can retrieve the Column Component  */
+    getColumn: (column: Tabulator.ColumnLookup) => Tabulator.ColumnComponent;
+    /**To get the current column definition array (including any changes made through user actions, such as resizing or re-ordering columns), call the getColumnDefinitions function. this will return the current columns definition array. */
+    getColumnDefinitions: () => Tabulator.ColumnDefinition[];
+    /**If you want to handle column layout persistence manually, for example storing it in a database to use elsewhere, you can use the getColumnLayout function to retrieve a layout object for the current table. */
+    getColumnLayout: () => Tabulator.ColumnLayout[];
+    /**If you have previously used the getColumnLayout function to retrieve a tables layout, you can use the setColumnLayout function to apply it to a table. */
+    setColumnLayout: (layout: Tabulator.ColumnLayout) => void;
+    /**You can show a hidden column at any point using the showColumn function.  */
+    showColumn: (column?: Tabulator.ColumnLookup) => void;
+    /**You can hide a visible column at any point using the hideColumn function.  */
+    hideColumn: (column?: Tabulator.ColumnLookup) => void;
+    /**You can toggle the visibility of a column at any point using the toggleColumn function.  */
+    toggleColumn: (column?: Tabulator.ColumnLookup) => void;
+    /**If you wish to add a single column to the table, you can do this using the addColumn function.
+   * This function takes three arguments:
+
+    Columns Definition - The column definition object for the column you want to add.
+    Before (optional) - Determines how to position the new column. A value of true will insert the column to the left of existing columns, a value of false will insert it to the right. If a Position argument is supplied then this will determine whether the new colum is inserted before or after this column.
+    Position (optional) - The field to insert the new column next to, this can be any of the standard column component look up options.
+      * 
+   */
+    addColumn: (definition: Tabulator.ColumnDefinition, insertRightOfTarget?: boolean, positionTarget?: Tabulator.ColumnLookup) => void;
+    /**To permanently remove a column from the table deleteColumn function. This function takes any of the standard column component look up options as its first parameter */
+    deleteColumn: (column: Tabulator.ColumnLookup) => void;
+    /**If you want to trigger an animated scroll to a column then you can use the scrollToColumn function. The first argument should be any of the standard column component look up options for the column you want to scroll to.
+
+  The second argument is optional, and is used to set the position of the column, it should be a string with a value of either left, middle or right, if omitted it will be set to the value of the scrollToColumnPosition option which has a default value of left.
+
+  The third argument is optional, and is a boolean used to set if the table should scroll if the column is already visible, true to scroll, false to not, if omitted it will be set to the value of the scrollToColumnIfVisible option, which defaults to true
+  */
+    scrollToColumn: (column: Tabulator.ColumnLookup, position?: Tabulator.ScrollToColumnPosition, ifVisible?: boolean) => Promise<void>;
+    /**You can also set the language at any point after the table has loaded using the setLocale function, which takes the same range of values as the locale setup option mentioned above. */
+    setLocale: (locale: string | boolean) => void;
+    /**It is possible to retrieve the locale code currently being used by Tabulator using the getLocale function: */
+    getLocale: () => string;
+    /**You can then access these at any point using the getLang function, which will return the language object for the currently active locale. */
+    getLang: (locale?: string) => any;
+    /**If the size of the element containing the Tabulator changes (and you are not able to use the in built auto-resize functionality) or you create a table before its containing element is visible, it will necessary to redraw the table to make sure the rows and columns render correctly.
+
+    This can be done by calling the redraw method. For example, to trigger a redraw whenever the viewport width is changed.
+
+    The redraw function also has an optional boolean argument that when set to true triggers a full rerender of the table including all data on all rows.*/
+    redraw: (force?: boolean) => void;
+    /**If you want to manually change the height of the table at any time, you can use the setHeight function, which will also redraw the virtual DOM if necessary. */
+    setHeight: (height: number) => void;
+    /**You can trigger sorting using the setSort function */
+    setSort: (sortList: string | Tabulator.Sorter[], dir?: Tabulator.SortDirection) => void;
+    getSorters: () => void;
+    /**To remove all sorting from the table, call the clearSort function. */
+    clearSort: () => void;
+    /**To set a filter you need to call the setFilter method, passing the field you wish to filter, the comparison type and the value to filter for.
+
+    This function will replace any exiting filters on the table with the specified filter 
+    
+    If you want to perform a more complicated filter then you can pass a callback function to the setFilter method, you can also pass an optional second argument, an object with parameters to be passed to the filter function.
+    */
+    setFilter: (p1: string | Tabulator.Filter[] | any[] | ((data: any, filterParams: any) => boolean), p2?: Tabulator.FilterType | {}, value?: any) => void;
+    /**If you want to add another filter to the existing filters then you can call the addFilter function: */
+    addFilter: Tabulator.FilterFunction;
+    /**You can retrieve an array of the current programtic filters using the getFilters function, this will not include any of the header filters: */
+    getFilters: (includeHeaderFilters: boolean) => Tabulator.Filter[];
+    /**You can programatically set the header filter value of a column by calling the setHeaderFilterValue function, This function takes any of the standard column component look up options as its first parameter, with the value for the header filter as the second option */
+    setHeaderFilterValue: (column: Tabulator.ColumnLookup, value: string) => void;
+
+    /**You can programatically set the focus on a header filter element by calling the setHeaderFilterFocus function, This function takes any of the standard column component look up options as its first parameter */
+    setHeaderFilterFocus: (column: Tabulator.ColumnLookup) => void;
+    /**If you just want to retrieve the current header filters, you can use the getHeaderFilters function: */
+    getHeaderFilters: () => Tabulator.Filter[];
+    /**If you want to remove one filter from the current list of filters you can use the removeFilter function: */
+    removeFilter: Tabulator.FilterFunction;
+    /**To remove all filters from the table, use the clearFilter function. */
+    clearFilter: (includeHeaderFilters: boolean) => void;
+    /**To remove just the header filters, leaving the programatic filters in place, use the clearHeaderFilter function. */
+    clearHeaderFilter: () => void;
+    /**To programmatically select a row you can use the selectRow function.
+
+    To select a specific row you can pass the any of the standard row component look up options into the first argument of the function. If you leave the argument blank you will select all rows (if you have set the selectable option to a numeric value, it will be ignored when selecting all rows). */
+    selectRow: (row?: Tabulator.RowLookup) => void;
+    deselectRow: (row?: Tabulator.RowLookup) => void;
+    toggleSelectRow: (row?: Tabulator.RowLookup) => void;
+    /**To get the RowComponent's for the selected rows at any time you can use the getSelectedRows function.
+
+  This will return an array of RowComponent's for the selected rows in the order in which they were selected. */
+    getSelectedRows: () => Tabulator.RowComponent[];
+    /**To get the data objects for the selected rows you can use the getSelectedData function.
+
+    This will return an array of the selected rows data objects in the order in which they were selected */
+    getSelectedData: () => any[];
+    /**set the maxmum page */
+    setMaxPage: (max: number) => void;
+    /**When pagination is enabled the table footer will contain a number of pagination controls for navigating through the data.
+
+  In addition to these controls it is possible to change page using the setPage function 
+  The setPage function takes one parameter, which should be an integer representing the page you wish to see. There are also four strings that you can pass into the parameter for special functions.
+
+  "first" - show the first page
+  "prev" - show the previous page
+  "next" - show the next page
+  "last" - show the last page
+  The setPage method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data.
+  */
+    setPage: (page: number | "first" | "prev" | "next" | "last") => Promise<void>;
+    /**You can load the page for a specific row using the setPageToRow function and passing in any of the standard row component look up options for the row you want to scroll to.
+     *
+     * The setPageToRow method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data.
+     */
+    setPageToRow: (row: Tabulator.RowLookup) => Promise<void>;
+
+    /**You can change the page size at any point by using the setPageSize function. (this setting will be ignored if using remote pagination with the page size set by the server) */
+    setPageSize: (size: number) => void;
+    /**To retrieve the number of rows allowed per page you can call the getPageSize function: */
+    getPageSize: () => number;
+    /**You can change to show the previous page using the previousPage function. */
+    previousPage: () => Promise<void>;
+    /**You can change to show the next page using the previousPage function. */
+
+    nextPage: () => Promise<void>;
+    /**To retrieve the current page use the getPage function. this will return the number of the current page. If pagination is disabled this will return false. */
+    getPage: () => number | false;
+    /**To retrieve the maximum available page use the getPageMax function. this will return the number of the maximum available page. If pagination is disabled this will return false. */
+    getPageMax: () => number | false;
+    /**You can use the setGroupBy function to change the fields that rows are grouped by. This function has one argument and takes the same values as passed to the groupBy setup option. */
+    setGroupBy: (groups: string | ((data: any) => any)) => void;
+    /**You can use the setGroupStartOpen function to change the default open state of groups. This function has one argument and takes the same values as passed to the groupStartOpen setup option.
+     *
+     * Note: If you use the setGroupStartOpen or setGroupHeader before you have set any groups on the table, the table will not update until the setGroupBy function is called.
+     */
+    setGroupStartOpen: (values: boolean | ((value: any, count: number, data: any, group: Tabulator.GroupComponent) => boolean)) => void;
+    /**You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option. */
+    setGroupHeader: (values: ((value: any, count: number, data: any, group: Tabulator.GroupComponent) => string) | ((value: any, count: number, data: any) => string)[]) => void;
+    /**You can use the getGroups function to retrieve an array of all the first level Group Components in the table. */
+    getGroups: () => Tabulator.GroupComponent[];
+    /**get grouped table data in the same format as getData() */
+    getGroupedData: (activeOnly?: boolean) => any;
+    /**You can retrieve the results of the column calculations at any point using the getCalcResults function.
+     * For a table without grouped rows, this will return an object with top and bottom properties, that contain a row data object for all the columns in the table for the top calculations and bottom calculations respectively.
+     */
+    getCalcResults: () => any;
+    /**Use the navigatePrev function to shift focus to the next editable cell on the left, if none available move to the right most editable cell on the row above.
+   * 
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigatePrev: () => void;
+    /**Use the navigateNext function to shift focus to the next editable cell on the right, if none available move to left most editable cell on the row below.
+     * 
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigateNext: () => void;
+    /**Use the navigateLeft function to shift focus to next editable cell on the left, return false if none available on row.
+     * 
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigateLeft: () => void;
+    /**Use the navigateRight function to shift focus to next editable cell on the right, return false if none available on row.
+     * 
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigateRight: () => void;
+    /**Use the navigateUp function to shift focus to the same cell in the row above.
+
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigateUp: () => void;
+
+    /*Use the navigateDown function to shift focus to the same cell in the row below.
+
+   * Note: These actions will only work when a cell is editable and has focus.
+
+    Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
+   * 
+   */
+    navigateDown: () => void;
+
+    /**A lot of the modules come with a range of default settings to make setting up your table easier, for example the sorters, formatters and editors that ship with Tabulator as standard.
+
+    If you are using a lot of custom settings over and over again (for example a custom sorter). you can end up re-delcaring it several time for different tables. To make your life easier Tabulator allows you to extend the default setup of each module to make your custom options as easily accessible as the defaults.
+
+    Using the extendModule function on the global Tabulator variable allows you to globally add these options to all tables.
+
+    The function takes three arguments, the name of the module, the name of the property you want to extend, and an object containing the elements you want to add in your module. In the example below we extend the format module to add two new default formatters: */
+    extendModule: (name: string, property: string, values: {}) => void;
+}
diff --git a/types/tabulator-tables/tabulator-tables-tests.ts b/types/tabulator-tables/tabulator-tables-tests.ts
new file mode 100644
index 0000000000..470dce2c76
--- /dev/null
+++ b/types/tabulator-tables/tabulator-tables-tests.ts
@@ -0,0 +1,427 @@
+//constructor
+let table = new Tabulator("#test");
+table.copyToClipboard("selection");
+table.searchRows("name", "<", 3);
+table.setFilter("name", "<=", 3);
+table.setFilter([
+    { field: "age", type: ">", value: 52 }, //filter by age greater than 52
+    { field: "height", type: "<", value: 142 }, //and by height less than 142
+    { field: "name", type: "in", value: ["steve", "bob", "jim"] } //name must be steve, bob or jim
+]);
+table.setFilter(
+    (data, filterParams) => {
+        //data - the data for the row being filtered
+        //filterParams - params object passed to the filter
+        return data.name == "bob" && data.height < filterParams.height; //must return a boolean, true if it passes the filter.
+    },
+    { height: 3 }
+);
+table.setFilter("age", "in", ["steve", "bob", "jim"]);
+table.setFilter([
+    { field: "age", type: ">", value: 52 }, //filter by age greater than 52
+    [
+        { field: "height", type: "<", value: 142 }, //with a height of less than 142
+        { field: "name", type: "=", value: "steve" } //or a name of steve
+    ]
+]);
+
+table
+    .setPageToRow(12)
+    .then(function() {
+        //run code after table has been successfuly updated
+    })
+    .catch(function(error) {
+        //handle error loading data
+    });
+
+table.setGroupBy("gender");
+table.setGroupStartOpen(true);
+
+table.setGroupHeader((value, count, data, group) => {
+    return "";
+});
+table.setGroupHeader((value, count, data) => {
+    return "";
+});
+
+table.setSort([
+    { column: "age", dir: "asc" }, //sort by this first
+    { column: "height", dir: "desc" } //then sort by this second
+]);
+
+table
+    .scrollToColumn("age", "middle", false)
+    .then(function() {
+        //run code after column has been scrolled to
+    })
+    .catch(function(error) {
+        //handle error scrolling to column
+    });
+
+table
+    .updateOrAddData([{ id: 1, name: "bob" }, { id: 3, name: "steve" }])
+    .then(function(rows) {
+        //rows - array of the row components for the rows updated or added
+        //run code after data has been updated
+    })
+    .catch(function(error) {
+        //handle error updating data
+    });
+
+table.updateData([{ id: 1, name: "bob", gender: "male" }, { id: 2, name: "Jenny", gender: "female" }]);
+table
+    .updateData([{ id: 1, name: "bob" }])
+    .then(function() {
+        //run code after data has been updated
+    })
+    .catch(function(error) {
+        //handle error updating data
+    });
+
+let row1: Tabulator.RowComponent;
+let row2: Tabulator.RowComponent;
+
+//column definitions
+let colDef: Tabulator.ColumnDefinition = {} as Tabulator.ColumnDefinition;
+colDef.title = "title";
+colDef.sorter = customSorter;
+
+function customSorter(a: any, b: any, aRow: Tabulator.RowComponent, bRow: Tabulator.RowComponent, column: Tabulator.ColumnComponent, dir: Tabulator.SortDirection, sorterParams: Tabulator.ColumnDefinitionSorterParams): number {
+    return 1;
+}
+
+colDef.sorterParams = (col: Tabulator.ColumnComponent, dir: Tabulator.SortDirection) => {
+    return {};
+};
+colDef.sorterParams = { format: "DD/MM/YY" };
+colDef.formatterParams = {
+    invalidPlaceholder: val => {
+        return "";
+    }
+};
+
+colDef.formatterParams = cell => {
+    //cell - the cell component
+
+    //do some processing and return the param object
+    return { param1: "green" };
+};
+
+//List lookup
+colDef.formatterParams = {
+    small: "Cute",
+    medium: "Fine",
+    big: 2,
+    huge: true
+};
+//Custom Formatter
+colDef.formatter = (cell: Tabulator.CellComponent, formatterParams: {}, onRendered) => {
+    onRendered = () => {};
+    return "";
+};
+
+colDef.editor = true;
+colDef.editor = "number";
+colDef.editor = function(cell, onRendered, success, cancel, editorParams) {
+    //cell - the cell component for the editable cell
+    //onRendered - function to call when the editor has been rendered
+    //success - function to call to pass the successfuly updated value to Tabulator
+    //cancel - function to call to abort the edit and return to a normal cell
+    //editorParams - params object passed into the editorParams column definition property
+
+    //create and style editor
+    var editor = document.createElement("input");
+
+    editor.setAttribute("type", "date");
+
+    //create and style input
+    editor.style.padding = "3px";
+    editor.style.width = "100%";
+    editor.style.boxSizing = "border-box";
+
+    //Set value of editor to the current value of the cell
+    editor.value = moment(cell.getValue(), "DD/MM/YYYY");
+
+    //set focus on the select box when the editor is selected (timeout allows for editor to be added to DOM)
+    onRendered(function() {
+        editor.focus();
+        editor.style.cssText = "100%";
+    });
+
+    //when the value has been set, trigger the cell to update
+    function successFunc() {
+        success(moment(editor.value, "YYYY-MM-DD"));
+    }
+
+    editor.addEventListener("change", successFunc);
+    editor.addEventListener("blur", successFunc);
+
+    //return the editor element
+    return editor;
+};
+//Dummy function
+function moment(a: any, b: any) {
+    return "";
+}
+
+colDef.cellClick = (_e, cell) => {
+    console.log(cell.checkHeight);
+};
+
+colDef.formatterParams = { stars: 3 };
+
+colDef.editorParams = {};
+colDef.editorParams = {
+    values: [
+        {
+            //option group
+            label: "Men",
+            options: [
+                //options in option group
+                {
+                    label: "Steve Boberson",
+                    value: "steve"
+                },
+                {
+                    label: "Bob Jimmerson",
+                    value: "bob"
+                }
+            ]
+        },
+        {
+            //option group
+            label: "Women",
+            options: [
+                //options in option group
+                {
+                    label: "Jenny Jillerson",
+                    value: "jenny"
+                },
+                {
+                    label: "Jill Betterson",
+                    value: "jill"
+                }
+            ]
+        },
+        {
+            //ungrouped option
+            label: "Other",
+            value: "other"
+        }
+    ]
+};
+
+let selectParamValues: Tabulator.JSONRecord;
+selectParamValues = {
+    steve: "Steve Boberson",
+    bob: "Bob Jimmerson",
+    jim: true
+};
+colDef.editorParams = {
+    values: selectParamValues
+};
+
+colDef.editorParams = function(cell) {
+    return {};
+};
+
+let autoComplete: Tabulator.AutoCompleteParams = {
+    showListOnEmpty: true, //show all values when the list is empty,
+    freetext: true, //allow the user to set the value of the cell to a free text entry
+    allowEmpty: true, //allow empty string values
+    searchFunc: (term, values) => {
+        //search for exact matches
+        var matches: string[] = [];
+        return matches;
+    },
+    listItemFormatter: function(value, title) {
+        //prefix all titles with the work "Mr"
+        return "Mr " + title;
+    },
+    values: true //create list of values from all values contained in this column
+};
+colDef.editorParams = autoComplete;
+
+colDef.editorParams = {
+    values: [
+        {
+            //option group
+            label: "Men",
+            options: [
+                //options in option group
+                {
+                    label: "Steve Boberson",
+                    value: "steve"
+                },
+                {
+                    label: "Bob Jimmerson",
+                    value: "bob"
+                }
+            ]
+        },
+        {
+            //option group
+            label: "Women",
+            options: [
+                //options in option group
+                {
+                    label: "Jenny Jillerson",
+                    value: "jenny"
+                },
+                {
+                    label: "Jill Betterson",
+                    value: "jill"
+                }
+            ]
+        },
+        {
+            //ungrouped option
+            label: "Other",
+            value: "other"
+        }
+    ]
+};
+
+//Validators
+colDef.validator = {
+    type: (cell, value, parameters) => {
+        return true;
+    },
+    parameters: {
+        divisor: 5
+    }
+};
+colDef.validator = "float";
+colDef.validator = { type: "float", parameters: {} };
+
+let validators: Tabulator.Validator[] = [
+    { type: "integer", parameters: {} },
+    {
+        type: (cell, value, parameters) => {
+            return true;
+        },
+        parameters: {}
+    }
+];
+
+colDef.headerFilterFunc = "!=";
+colDef.headerFilterFunc = (headerValue, rowValue, rowData, filterParams) => {
+    return rowData.name == filterParams.name && rowValue < headerValue; //must return a boolean, true if it passes the filter.
+};
+
+//Cell Component
+let cell: Tabulator.CellComponent = {} as Tabulator.CellComponent;
+cell.nav().down();
+
+let data = cell.getData();
+table = cell.getTable();
+
+//Row Component
+let row: Tabulator.RowComponent = {} as Tabulator.RowComponent;
+row.delete()
+    .then(function() {
+        //run code after row has been deleted
+    })
+    .catch(function(error) {
+        //handle error deleting row
+    });
+
+//Options
+let options: Tabulator.Options = {} as Tabulator.Options;
+options.keybindings = {
+    navPrev: "ctrl + 1",
+    navNext: false
+};
+
+options.downloadDataFormatter = data => {
+    // data.forEach(function(row){
+    //   row.age = row.age >= 18 ? "adult" : "child";
+};
+
+options.downloadConfig = {
+    columnGroups: false, //include column groups in column headers for download
+    rowGroups: false, //do not include row groups in download
+    columnCalcs: false //do not include column calculation rows in download
+};
+
+options.ajaxConfig = "GET";
+options.ajaxConfig = {
+    mode: "cors", //set request mode to cors
+    credentials: "same-origin", //send cookies with the request from the matching origin
+    headers: {
+        Accept: "application/json", //tell the server we need JSON back
+        "X-Requested-With": "XMLHttpRequest", //fix to help some frameworks respond correctly to request
+        "Content-type": "application/json; charset=utf-8", //set the character encoding of the request
+        "Access-Control-Allow-Origin": "http://yout-site.com" //the URL origin of the site making the request
+    }
+};
+options.ajaxConfig = {
+    method: "POST", //set request type to Position
+    headers: {
+        "Content-type": "application/json; charset=utf-8" //set specific content type
+    }
+};
+
+options.ajaxContentType = {
+    headers: {
+        "Content-Type": "text/html"
+    },
+    body: function(url, config, params) {
+        //url - the url of the request
+        //config - the fetch config object
+        //params - the request parameters
+
+        //return comma list of params:values
+        var output = [];
+
+        for (var key in params) {
+            output.push(key + ":" + params[key]);
+        }
+
+        return output.join(",");
+    }
+};
+
+options.initialSort = [{ column: "name", dir: "asc" }, { column: "name2", dir: "desc" }];
+options.initialFilter = [{ field: "color", type: "=", value: "red" }];
+options.initialHeaderFilter = [
+    { field: "color", value: "red" } //set the initial value of the header filter to "red"
+];
+
+options.groupValues = [
+    ["red", "blue", "green"], //create groups for color values of "red", "blue", and "green",
+    [10, 20, 30] //create sub groups for ages of 10, 20 and 30
+];
+
+options.groupHeader = (value, count, data, group) => {
+    //value - the value all members of this group share
+    //count - the number of rows in this group
+    //data - an array of all the row data objects in this group
+    //group - the group component for the group
+
+    return value + "<span style='color:#d00; margin-left:10px;'>(" + count + " item)</span>";
+};
+
+options.groupHeader = [
+    function(value, count, data) {
+        //generate header contents for gender groups
+        return value + "<span style='color:#d00; margin-left:10px;'>(" + count + " item)</span>";
+    },
+    function(value, count, data) {
+        //generate header contents for color groups
+        return value + "<span style='color:#0dd; margin-left:10px;'>(" + count + " item)</span>";
+    }
+];
+
+options.paginationDataReceived = {
+    last_page: "max_pages",
+    a: "b"
+};
+
+options.clipboardPasteParser = clipboard => {
+    return []; //return array
+};
+
+options.cellEditing = cell => {
+    console.log(cell);
+};
diff --git a/types/tabulator-tables/tsconfig.json b/types/tabulator-tables/tsconfig.json
new file mode 100644
index 0000000000..7f97e421b8
--- /dev/null
+++ b/types/tabulator-tables/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "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", "tabulator-tables-tests.ts"]
+}
diff --git a/types/tabulator-tables/tslint.json b/types/tabulator-tables/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tabulator-tables/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ad7bc3d6e41fa0008dc9fbf1ba27b45e744f8030 Mon Sep 17 00:00:00 2001
From: Anthony Heber <aheber@gmail.com>
Date: Wed, 6 Mar 2019 08:18:31 -0700
Subject: [PATCH 422/924] Abstract binding to their own interface

Clean up types and abstract types into their own interface
---
 types/flickity/flickity-tests.ts |  41 ++++---
 types/flickity/index.d.ts        | 180 ++++++++++++++++---------------
 2 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/types/flickity/flickity-tests.ts b/types/flickity/flickity-tests.ts
index 6e24f16b3e..7fa5dc78eb 100644
--- a/types/flickity/flickity-tests.ts
+++ b/types/flickity/flickity-tests.ts
@@ -161,6 +161,24 @@ let flikty5: Flickity = new Flickity(new HTMLElement(), {
     }
 });
 
+let fliktyBindings: Flickity.EventBindings = {
+    ready: () => {},
+    change: (index) => {},
+    select: (index) => {},
+    settle: (index)  => {},
+    scroll: (progress)  => {},
+    dragStart: (event, pointer)  => {},
+    dragMove: (event, pointer, moveVector)  => {},
+    dragEnd: (event, pointer)  => {},
+    pointerDown: (event, pointer)  => {},
+    pointerMove: (event, pointer, moveVector)  => {},
+    pointerUp: (event, pointer)  => {},
+    staticClick: (event, pointer, cellElement, cellIndex)  => {},
+    lazyLoad: (event, cellElement)  => {},
+    bgLazyLoad: (event, element)  => {},
+    fullscreenChange: (isFullscreen)  => {}
+};
+
 let fliktyOpts1: Flickity.Options = {
     initialIndex: 0,
     accessibility: true,
@@ -184,25 +202,6 @@ let fliktyOpts1: Flickity.Options = {
     watchCSS: true,
     wrapAround: true,
     resize: true,
-    rightToLeft: false
-};
-
-let fliktyOpts2: Flickity.Options = {
-    on: {
-        ready: () => {},
-        change: (index) => {},
-        select: (index) => {},
-        settle: (index)  => {},
-        scroll: (progress)  => {},
-        dragStart: (event, pointer)  => {},
-        dragMove: (event, pointer, moveVector)  => {},
-        dragEnd: (event, pointer)  => {},
-        pointerDown: (event, pointer)  => {},
-        pointerMove: (event, pointer, moveVector)  => {},
-        pointerUp: (event, pointer)  => {},
-        staticClick: (event, pointer, cellElement, cellIndex)  => {},
-        lazyLoad: (event, cellElement)  => {},
-        bgLazyLoad: (event, element)  => {},
-        fullscreenChange: (isFullscreen)  => {}
-    }
+    rightToLeft: false,
+    on: fliktyBindings
 };
diff --git a/types/flickity/index.d.ts b/types/flickity/index.d.ts
index 8b5b7b2ffe..69d4dbda10 100644
--- a/types/flickity/index.d.ts
+++ b/types/flickity/index.d.ts
@@ -265,108 +265,110 @@ declare namespace Flickity {
         /**
          * Bind events within Flickity's options by setting on to an Object. The object's keys should match the event names. on is useful for capturing events as Flickity is initialized, like ready
          */
-        on?: {
-            /**
-             * Triggered after Flickity has been activated.
-             */
-            ready?: () => void;
+        on?: EventBindings;
+    }
 
-            /**
-             * Triggered when the selected slide is changed.
-             */
-            change?: (index?: Number) => void;
+    interface EventBindings {
+        /**
+         * Triggered after Flickity has been activated.
+         */
+        ready?: () => void;
 
-            /**
-             * Triggered when a slide is selected.
-             * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
-             * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
-             */
-            select?: (index?: Number) => void;
-            cellSelect?: (index?: Number) => void;
-            /**
-             * Triggered when the slider is settled at its end position.
-             */
-            settle?: (index?: Number) => void;
+        /**
+         * Triggered when the selected slide is changed.
+         */
+        change?: (index?: number) => void;
 
-            /**
-             * Triggered when the slider moves.
-             */
-            scroll?: (progress?: Number) => void;
+        /**
+         * Triggered when a slide is selected.
+         * select is triggered any time a slide is selected, even on the same slide. change is triggered only when a different slide is selected.
+         * This event was previously cellSelect in Flickity v1. cellSelect will continue to work in Flickity v2.
+         */
+        select?: (index?: number) => void;
+        cellSelect?: (index?: number) => void;
+        /**
+         * Triggered when the slider is settled at its end position.
+         */
+        settle?: (index?: number) => void;
 
-            /**
-             * Triggered when dragging starts and the slider starts moving.
-             */
-            dragStart?: (
-                event?: Event,
-                pointer?: Element | Touch) => void;
+        /**
+         * Triggered when the slider moves.
+         */
+        scroll?: (progress?: number) => void;
 
-            /**
-             * Triggered when dragging moves and the slider moves.
-             */
-            dragMove?: (
-                event?: Event,
-                pointer?: Element | Touch,
-                moveVector?: { x: number, y: number }) => void;
+        /**
+         * Triggered when dragging starts and the slider starts moving.
+         */
+        dragStart?: (
+            event?: Event,
+            pointer?: Element | Touch) => void;
 
-            /**
-             * Triggered when dragging ends.
-             */
-            dragEnd?: (
-                event: Event,
-                pointer?: Element | Touch) => void;
+        /**
+         * Triggered when dragging moves and the slider moves.
+         */
+        dragMove?: (
+            event?: Event,
+            pointer?: Element | Touch,
+            moveVector?: { x: number, y: number }) => void;
 
-            /**
-             * Triggered when the user's pointer (mouse, touch, pointer) presses down.
-             */
-            pointerDown?: (
-                event: Event,
-                pointer?: Element | Touch) => void;
+        /**
+         * Triggered when dragging ends.
+         */
+        dragEnd?: (
+            event: Event,
+            pointer?: Element | Touch) => void;
 
-            /**
-             * Triggered when the user's pointer moves.
-             */
-            pointerMove?: (
-                event?: Event,
-                pointer?: Element | Touch,
-                moveVector?: { x: number, y: number }) => void;
+        /**
+         * Triggered when the user's pointer (mouse, touch, pointer) presses down.
+         */
+        pointerDown?: (
+            event: Event,
+            pointer?: Element | Touch) => void;
 
-            /**
-             * Triggered when the user's pointer unpresses.
-             */
-            pointerUp?: (
-                event?: Event,
-                pointer?: Element | Touch) => void;
+        /**
+         * Triggered when the user's pointer moves.
+         */
+        pointerMove?: (
+            event?: Event,
+            pointer?: Element | Touch,
+            moveVector?: { x: number, y: number }) => void;
 
-            /**
-             * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
-             * click events are hard to detect with draggable UI, as they are triggered whenever a user drags.
-             * Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
-             */
-            staticClick?: (
-                event?: Event,
-                pointer?: Element | Touch,
-                cellElement?: Element,
-                cellIndex?: Number) => void;
+        /**
+         * Triggered when the user's pointer unpresses.
+         */
+        pointerUp?: (
+            event?: Event,
+            pointer?: Element | Touch) => void;
 
-            /**
-             * Triggered after an image has been loaded with lazyLoad.
-             */
-            lazyLoad?: (
-                event?: Event,
-                cellElement?: Element) => void;
+        /**
+         * Triggered when the user's pointer is pressed and unpressed and has not moved enough to start dragging.
+         * click events are hard to detect with draggable UI, as they are triggered whenever a user drags.
+         * Flickity's staticClick event resolves this, as it is triggered when the user has not dragged.
+         */
+        staticClick?: (
+            event?: Event,
+            pointer?: Element | Touch,
+            cellElement?: Element,
+            cellIndex?: number) => void;
 
-            /**
-             * Triggered after a background image has been loaded with bgLazyLoad.
-             */
-            bgLazyLoad?: (
-                event?: Event,
-                element?: Element) => void;
+        /**
+         * Triggered after an image has been loaded with lazyLoad.
+         */
+        lazyLoad?: (
+            event?: Event,
+            cellElement?: Element) => void;
 
-            /**
-             * Triggered after entering or exiting fullscreen view.
-             */
-            fullscreenChange?: (isFullscreen?: Boolean) => void;
-        };
+        /**
+         * Triggered after a background image has been loaded with bgLazyLoad.
+         */
+        bgLazyLoad?: (
+            event?: Event,
+            element?: Element) => void;
+
+        /**
+         * Triggered after entering or exiting fullscreen view.
+         */
+        fullscreenChange?: (isFullscreen?: boolean) => void;
     }
 }
 

From c79ee7b65f500c19ec2bf6e5dccfa9111efe434f Mon Sep 17 00:00:00 2001
From: Jojoshua <jojoshua@gmail.com>
Date: Wed, 6 Mar 2019 10:39:56 -0500
Subject: [PATCH 423/924] Update project url

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

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
index 3fe21f805f..3a3e3de64a 100644
--- a/types/tabulator-tables/index.d.ts
+++ b/types/tabulator-tables/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for tabulator-tables 4.2
-// Project: https://github.com/olifolkerd/tabulator
+// Project: http://tabulator.info
 // Definitions by: Josh Harris <https://github.com/jojoshua>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3

From 1c4ca4d8bf630730711f616e1fd671c032757e9e Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 6 Mar 2019 08:43:53 -0800
Subject: [PATCH 424/924] Add codeowners update (#33654)

* Add update-codeowners script

Right now it works but doesn't open a PR for you.
Also not present as an npm script.

* Dump in a bunch of code from TS

* A few fixes and updates

1. Fix package.json formatting.
2. Adapt copied code from TS.

* Ready to test locally

* Fix git add

* Put everything in one Promise chain

Also start compiling JS files in scripts/
---
 package.json                 |   1 +
 scripts/tsconfig.json        |  11 ++-
 scripts/update-codeowners.js | 126 +++++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 7 deletions(-)
 create mode 100644 scripts/update-codeowners.js

diff --git a/package.json b/package.json
index 1a5124c035..f4c48b1b32 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "scripts": {
         "compile-scripts": "tsc -p scripts",
         "not-needed": "node scripts/not-needed.js",
+        "update-codeowners": "node scripts/update-codeowners.js",
         "test": "node node_modules/types-publisher/bin/tester/test.js --run-from-definitely-typed",
         "lint": "dtslint types"
     },
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
index 899f96af64..6e0fd5a58c 100644
--- a/scripts/tsconfig.json
+++ b/scripts/tsconfig.json
@@ -1,13 +1,10 @@
 {
     "compilerOptions": {
+        "allowJs": true,
+        "checkJs": true,
         "module": "commonjs",
         "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
+        "strict": true,
         "baseUrl": "../types",
         "typeRoots": [
             "../types"
@@ -15,4 +12,4 @@
         "types": [],
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}
diff --git a/scripts/update-codeowners.js b/scripts/update-codeowners.js
new file mode 100644
index 0000000000..56eda138c6
--- /dev/null
+++ b/scripts/update-codeowners.js
@@ -0,0 +1,126 @@
+/// <reference lib="esnext.asynciterable" />
+// Must reference esnext.asynciterable lib, since octokit uses AsyncIterable internally
+const cp = require("child_process");
+const Octokit = require("@octokit/rest");
+const { AllPackages, getDefinitelyTyped, loggerWithErrors,
+        parseDefinitions, parseNProcesses, clean } = require("types-publisher");
+const { writeFile } = require("fs-extra");
+
+async function main() {
+    const options = { definitelyTypedPath: ".", progress: false, parseInParallel: true };
+    const log = loggerWithErrors()[0];
+
+    clean();
+    const dt = await getDefinitelyTyped(options, log);
+    await parseDefinitions(dt, { nProcesses: parseNProcesses(), definitelyTypedPath: "." }, log);
+    const allPackages = await AllPackages.read(dt);
+    const typings = allPackages.allTypings();
+    const maxPathLen = Math.max(...typings.map(t => t.subDirectoryPath.length));
+    const entries = mapDefined(typings, t => getEntry(t, maxPathLen));
+    await writeFile([options.definitelyTypedPath, ".github", "CODEOWNERS"].join("/"), `${header}\n\n${entries.join("\n")}\n`, { encoding: "utf-8" });
+}
+
+const token = /** @type {string} */(process.env.GH_TOKEN);
+const gh = new Octokit();
+const reviewers = ["weswigham", "sandersn", "RyanCavanaugh"]
+const now = new Date();
+const branchName = `codeowner-update-${now.getFullYear()}${padNum(now.getMonth())}${padNum(now.getDay())}`;
+const remoteUrl = `https://${token}@github.com/DefinitelyTyped/DefinitelyTyped.git`;
+runSequence([
+    ["git", ["checkout", "."]], // reset any changes
+]);
+
+main().then(() => {
+    runSequence([
+        ["git", ["checkout", "-b", branchName]], // create a branch
+        ["git", ["add", ".github/CODEOWNERS"]], // Add CODEOWNERS
+        ["git", ["commit", "-m", `"Update CODEOWNERS"`]], // Commit all changes
+        ["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork
+        ["git", ["push", "--set-upstream", "fork", branchName, "-f"]] // push the branch
+    ]);
+
+    gh.authenticate({
+        type: "token",
+        token,
+    });
+    return gh.pulls.create({
+        owner: "DefinitelyTyped",
+        repo: "DefinitelyTyped",
+        maintainer_can_modify: true,
+        title: `🤖 CODEOWNERS has changed`,
+        head: `DefinitelyTyped:${branchName}`,
+        base: "master",
+        body:
+        `Please review the diff and merge if no changes are unexpected.
+
+cc ${reviewers.map(r => "@" + r).join(" ")}`,
+    })
+}).then(r => {
+    const num = r.data.number;
+    console.log(`Pull request ${num} created.`);
+    return gh.pulls.createReviewRequest({
+        owner: "DefinitelyTyped",
+        repo: "DefinitelyTyped",
+        number: num,
+        reviewers,
+    });
+}).then(() => {
+    console.log(`Reviewers requested, done.`);
+}).catch(e => {
+    console.error(e);
+    process.exit(1);
+});
+
+/** @param {[string, string[]][]} tasks */
+function runSequence(tasks) {
+    for (const task of tasks) {
+        console.log(`${task[0]} ${task[1].join(" ")}`);
+        const result = cp.spawnSync(task[0], task[1], { timeout: 100000, shell: true, stdio: "inherit" });
+        if (result.status !== 0) throw new Error(`${task[0]} ${task[1].join(" ")} failed: ${result.stderr && result.stderr.toString()}`);
+    }
+}
+
+/** @param {number} number */
+function padNum(number) {
+    const str = "" + number;
+    return str.length >= 2 ? str : "0" + str;
+}
+
+
+const header =
+`# This file is generated.
+# Add yourself to the "Definitions by:" list instead.
+# See https://github.com/DefinitelyTyped/DefinitelyTyped#edit-an-existing-package`;
+
+/**
+ * @param { { contributors: ReadonlyArray<{githubUsername?: string }>, subDirectoryPath: string} } pkg
+ * @param {number} maxPathLen
+ * @return {string | undefined}
+ */
+function getEntry(pkg, maxPathLen) {
+    const users = mapDefined(pkg.contributors, c => c.githubUsername);
+    if (!users.length) {
+        return undefined;
+    }
+
+    const path = `${pkg.subDirectoryPath}/`.padEnd(maxPathLen);
+    return `/types/${path} ${users.map(u => `@${u}`).join(" ")}`;
+}
+
+/**
+ * @template T,U
+ * @param {ReadonlyArray<T>} arr
+ * @param {(t: T) => U | undefined} mapper
+ * @return U[]
+ */
+function mapDefined(arr, mapper) {
+    const out = [];
+    for (const a of arr) {
+        const res = mapper(a);
+        if (res !== undefined) {
+            out.push(res);
+        }
+    }
+    return out;
+}
+

From 789bf69f40fc7d95a13084178515fb1cd4ddb23a Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 6 Mar 2019 09:15:53 -0800
Subject: [PATCH 425/924] Bump chokidar deprecation (#33658)

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 945f418211..6d943f4b08 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -244,7 +244,7 @@
             "libraryName": "chokidar",
             "typingsPackageName": "chokidar",
             "sourceRepoURL": "https://github.com/paulmillr/chokidar",
-            "asOfVersion": "2.1.2"
+            "asOfVersion": "2.1.3"
         },
         {
             "libraryName": "chunked-dc",

From a205830fc92a70ac964cda10264fffb9f02028a6 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 6 Mar 2019 09:53:22 -0800
Subject: [PATCH 426/924] Nightly cleanup 06-03-2019

1. Add handlebars depdencies missed in #33518, which deprecated
@types/handlebars now that handlebars ships its own types.
2. Add project homepage for kafkajs.
---
 types/ember/v1/package.json           | 6 ++++++
 types/ember/v2/package.json           | 6 ++++++
 types/hbs/package.json                | 6 ++++++
 types/kafkajs/index.d.ts              | 2 +-
 types/koa-hbs/package.json            | 6 ++++++
 types/snazzy-info-window/package.json | 6 ++++++
 types/swag/package.json               | 6 ++++++
 7 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 types/ember/v1/package.json
 create mode 100644 types/ember/v2/package.json
 create mode 100644 types/hbs/package.json
 create mode 100644 types/koa-hbs/package.json
 create mode 100644 types/snazzy-info-window/package.json
 create mode 100644 types/swag/package.json

diff --git a/types/ember/v1/package.json b/types/ember/v1/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/ember/v1/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
diff --git a/types/ember/v2/package.json b/types/ember/v2/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/ember/v2/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
diff --git a/types/hbs/package.json b/types/hbs/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/hbs/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
diff --git a/types/kafkajs/index.d.ts b/types/kafkajs/index.d.ts
index a28377e369..c416a07063 100644
--- a/types/kafkajs/index.d.ts
+++ b/types/kafkajs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for kafkajs 1.4
-// Project: https://github.com/tulios/kafkajs
+// Project: https://github.com/tulios/kafkajs, https://kafka.js.org
 // Definitions by: Michal Kaminski <https://github.com/michal-b-kaminski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
diff --git a/types/koa-hbs/package.json b/types/koa-hbs/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/koa-hbs/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
diff --git a/types/snazzy-info-window/package.json b/types/snazzy-info-window/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/snazzy-info-window/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}
diff --git a/types/swag/package.json b/types/swag/package.json
new file mode 100644
index 0000000000..77c0c562ac
--- /dev/null
+++ b/types/swag/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "handlebars": "^4.1.0"
+    }
+}

From 4ca1f9a325b641d48938222e845889630eb28c25 Mon Sep 17 00:00:00 2001
From: Adam Zerella <me@adamzerella.com>
Date: Thu, 7 Mar 2019 05:00:35 +1100
Subject: [PATCH 427/924] [repeat-element] Add typing for repeat-element
 (#33503)

* Added type defs for repeat-element

* Updated export type
---
 types/repeat-element/index.d.ts              | 12 ++++++++++
 types/repeat-element/repeat-element-tests.ts |  9 +++++++
 types/repeat-element/tsconfig.json           | 25 ++++++++++++++++++++
 types/repeat-element/tslint.json             |  3 +++
 4 files changed, 49 insertions(+)
 create mode 100644 types/repeat-element/index.d.ts
 create mode 100644 types/repeat-element/repeat-element-tests.ts
 create mode 100644 types/repeat-element/tsconfig.json
 create mode 100644 types/repeat-element/tslint.json

diff --git a/types/repeat-element/index.d.ts b/types/repeat-element/index.d.ts
new file mode 100644
index 0000000000..2c3cd5d633
--- /dev/null
+++ b/types/repeat-element/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for repeat-element 1.1
+// Project: https://github.com/jonschlinkert/repeat-element
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+/**
+ * Create an array by repeating the given value n times.
+ */
+declare function repeat(element: unknown, num: number): unknown[];
+
+export = repeat;
diff --git a/types/repeat-element/repeat-element-tests.ts b/types/repeat-element/repeat-element-tests.ts
new file mode 100644
index 0000000000..b76b7b4b7e
--- /dev/null
+++ b/types/repeat-element/repeat-element-tests.ts
@@ -0,0 +1,9 @@
+import repeat = require("repeat-element");
+
+repeat(5, 5);
+
+repeat({some: 'object'}, 5);
+
+repeat('a', 5);
+
+repeat(null, 5);
diff --git a/types/repeat-element/tsconfig.json b/types/repeat-element/tsconfig.json
new file mode 100644
index 0000000000..6e7674eafd
--- /dev/null
+++ b/types/repeat-element/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "repeat-element-tests.ts"
+    ]
+}
diff --git a/types/repeat-element/tslint.json b/types/repeat-element/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/repeat-element/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From b23cd56977f63341061d45e4fa7f99e13fa6fa66 Mon Sep 17 00:00:00 2001
From: Po Chen <chenpaul914@gmail.com>
Date: Thu, 7 Mar 2019 05:12:58 +1100
Subject: [PATCH 428/924] [phoenix] Improve type definitions (#33247)

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update tslint.json

* Update tslint.json

* Update index.d.ts

* Update tslint.json

* Update tslint.json

* Update index.d.ts

* Update index.d.ts

* Update phoenix-tests.ts

* Update tslint.json
---
 types/phoenix/index.d.ts       | 117 +++++++++++---------
 types/phoenix/phoenix-tests.ts |  42 ++++----
 types/phoenix/tslint.json      | 192 ++++++++++++++++++++-------------
 3 files changed, 202 insertions(+), 149 deletions(-)

diff --git a/types/phoenix/index.d.ts b/types/phoenix/index.d.ts
index 8b0e6574d8..daff513651 100644
--- a/types/phoenix/index.d.ts
+++ b/types/phoenix/index.d.ts
@@ -1,22 +1,26 @@
-// Type definitions for phoenix
+// Type definitions for phoenix 1.4
 // Project: https://github.com/phoenixframework/phoenix
-// Definitions by: Mirosław Ciastek <https://github.com/mciastek>, John Goff <https://github.com/John-Goff>
+// Definitions by: Mirosław Ciastek <https://github.com/mciastek>, John Goff <https://github.com/John-Goff>, Po Chen <https://github.com/princemaple>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
-declare module "phoenix" {
+declare module 'phoenix' {
   class Push {
-    constructor(channel: Channel, event: string, payload: any, timeout: number);
+    constructor(
+      channel: Channel,
+      event: string,
+      payload: object,
+      timeout: number,
+    );
 
-    resend(timeout: number): void;
     send(): void;
+    resend(timeout: number): void;
 
-    receive(status: string, callback: (response?: any) => void): Push;
+    receive(status: string, callback: (response?: any) => any): this;
   }
 
-  export class Channel {
-    constructor(topic: string, params?: Object, socket?: Socket);
-
-    rejoinUntilConnected(): void;
+  class Channel {
+    constructor(topic: string, params?: object | Function, socket?: Socket);
 
     join(timeout?: number): Push;
     leave(timeout?: number): Push;
@@ -28,50 +32,50 @@ declare module "phoenix" {
     on(event: string, callback: (response?: any) => void): void;
     off(event: string): void;
 
-    canPush(): boolean;
-
-    push(event: string, payload: Object, timeout?: number): Push;
+    push(event: string, payload: object, timeout?: number): Push;
   }
 
-  export class Socket {
-    constructor(endPoint: string, opts?: Object);
+  type ConnectionState = 'connecting' | 'open' | 'closing' | 'closed';
+
+  interface SocketConnectOption {
+    params: object | Function;
+    transport: any;
+    timeout: number;
+    heartbeatIntervalMs: number;
+    reconnectAfterMs: number;
+    longpollernumber: number;
+    encode: (payload: object, callback: Function) => any;
+    decode: (payload: string, callback: Function) => any;
+    logger: (kind: string, message: string, data: any) => void;
+  }
+
+  class Socket {
+    constructor(endPoint: string, opts?: Partial<SocketConnectOption>);
 
     protocol(): string;
     endPointURL(): string;
 
-    disconnect(callback?: Function, code?: string, reason?: any): void;
     connect(params?: any): void;
+    disconnect(callback?: Function, code?: number, reason?: string): void;
+    connectionState(): ConnectionState;
+    isConnected(): boolean;
 
-    log(kind: string, msg: string, data: any): void;
+    remove(channel: Channel): void;
+    channel(topic: string, chanParams?: object): Channel;
+    push(data: object): void;
+
+    log(kind: string, message: string, data: object): void;
+    hasLogger(): boolean;
 
     onOpen(callback: Function): void;
     onClose(callback: Function): void;
     onError(callback: Function): void;
     onMessage(callback: Function): void;
 
-    onConnOpen(): void;
-    onConnClose(event: any): void;
-    onConnError(error: any): void;
-
-    triggerChanError(): void;
-
-    connectionState(): string;
-
-    isConnected(): boolean;
-
-    remove(channel: Channel): void;
-    channel(topic: string, chanParams?: Object): Channel;
-
-    push(data: any): void;
-
     makeRef(): string;
-    sendHeartbeat(): void;
-    flushSendBuffer(): void;
-
-    onConnMessage(rawMessage: any): void;
   }
 
-  export class LongPoll {
+  class LongPoll {
     constructor(endPoint: string);
 
     normalizeEndpoint(endPoint: string): string;
@@ -86,8 +90,10 @@ declare module "phoenix" {
     close(code?: any, reason?: any): void;
   }
 
-  export class Ajax {
-    request(
+  class Ajax {
+    static states: {[state: string]: number};
+
+    static request(
       method: string,
       endPoint: string,
       accept: string,
@@ -97,7 +103,7 @@ declare module "phoenix" {
       callback?: (response?: any) => void
     ): void;
 
-    xdomainRequest(
+    static xdomainRequest(
       req: any,
       method: string,
       endPoint: string,
@@ -107,7 +113,7 @@ declare module "phoenix" {
       callback?: (response?: any) => void
     ): void;
 
-    xhrRequest(
+    static xhrRequest(
       req: any,
       method: string,
       endPoint: string,
@@ -118,28 +124,37 @@ declare module "phoenix" {
       callback?: (response?: any) => void
     ): void;
 
-    parseJSON(resp: string): JSON;
-    serialize(obj: any, parentKey: string): string;
-    appendParams(url: string, params: any): string;
+    static parseJSON(resp: string): JSON;
+    static serialize(obj: any, parentKey: string): string;
+    static appendParams(url: string, params: any): string;
   }
 
-  export class Presence {
-    constructor(channel: Channel, opts?: Object);
+  class Presence {
+    constructor(channel: Channel, opts?: object);
+
+    onJoin(callback: Function): void;
+    onLeave(callback: Function): void;
+    onSync(callback: Function): void;
+    list<T = any>(chooser?: (key: string, presence: any) => T): T[];
+    inPendingSyncState(): boolean;
 
     static syncState(
-      currentState: any,
-      newState: any,
+      currentState: object,
+      newState: object,
       onJoin?: (key?: string, currentPresence?: any, newPresence?: any) => void,
       onLeave?: (key?: string, currentPresence?: any, newPresence?: any) => void
     ): any;
 
     static syncDiff(
-      currentState: any,
-      newState: any,
+      currentState: object,
+      diff: {joins: object; leaves: object},
       onJoin?: (key?: string, currentPresence?: any, newPresence?: any) => void,
       onLeave?: (key?: string, currentPresence?: any, newPresence?: any) => void
     ): any;
 
-    static list(presences: Object, chooser?: Function): any;
+    static list<T = any>(
+      presences: object,
+      chooser?: (key: string, presence: any) => T,
+    ): T[];
   }
 }
diff --git a/types/phoenix/phoenix-tests.ts b/types/phoenix/phoenix-tests.ts
index 1e7641fc91..6e34b5c50c 100644
--- a/types/phoenix/phoenix-tests.ts
+++ b/types/phoenix/phoenix-tests.ts
@@ -1,46 +1,46 @@
 import { Socket, Channel, Presence } from 'phoenix';
 
 function test_socket() {
-  const socket = new Socket("/ws", {params: {userToken: "123"}});
+  const socket = new Socket('/ws', {params: {userToken: '123'}});
   socket.connect();
 }
 
 function test_channel() {
-  const socket = new Socket("/ws", {params: {userToken: "123"}});
+  const socket = new Socket('/ws', {params: {userToken: '123'}});
   socket.connect();
 
-  const channel = socket.channel("room:123", {token: '123'});
+  const channel = socket.channel('room:123', {token: '123'});
 
-  channel.on("new_msg", msg => console.log("Got message", msg));
+  channel.on('new_msg', msg => console.log('Got message', msg));
 
-  channel.push("new_msg", {body: 'some value'}, 10000)
-   .receive("ok", (msg) => console.log("created message", msg))
-   .receive("error", (reasons) => console.log("create failed", reasons))
-   .receive("timeout", () => console.log("Networking issue..."));
+  channel.push('new_msg', {body: 'some value'}, 10000)
+   .receive('ok', (msg) => console.log('created message', msg))
+   .receive('error', (reasons) => console.log('create failed', reasons))
+   .receive('timeout', () => console.log('Networking issue...'));
 
   channel.join()
-    .receive("ok", ({messages}) => console.log("catching up", messages))
-    .receive("error", ({reason}) => console.log("failed join", reason))
-    .receive("timeout", () => console.log("Networking issue. Still waiting..."));
+    .receive('ok', ({messages}) => console.log('catching up', messages))
+    .receive('error', ({reason}) => console.log('failed join', reason))
+    .receive('timeout', () => console.log('Networking issue. Still waiting...'));
 }
 
 function test_hooks() {
-  const socket = new Socket("/ws", {params: {userToken: "123"}});
+  const socket = new Socket('/ws', {params: {userToken: '123'}});
   socket.connect();
 
-  socket.onError(() => console.log("there was an error with the connection!"));
-  socket.onClose(() => console.log("the connection dropped"));
+  socket.onError(() => console.log('there was an error with the connection!'));
+  socket.onClose(() => console.log('the connection dropped'));
 
-  const channel = socket.channel("room:123", {token: '123'});
+  const channel = socket.channel('room:123', {token: '123'});
 
-  channel.onError(() => console.log("there was an error!"));
-  channel.onClose(() => console.log("the channel has gone away gracefully"))
+  channel.onError(() => console.log('there was an error!'));
+  channel.onClose(() => console.log('the channel has gone away gracefully'));
 }
 
 function test_presence() {
-  const socket = new Socket("/ws", {params: {userToken: "123"}});
+  const socket = new Socket('/ws', {params: {userToken: '123'}});
 
-  const channel = socket.channel("room:123", {token: '123'});
+  const channel = socket.channel('room:123', {token: '123'});
   const presence = new Presence(channel);
 
   let presenceState = {};
@@ -49,12 +49,12 @@ function test_presence() {
     Presence.list(state, (id: string) => id).forEach(console.log);
   };
 
-  channel.on("presence_state", (state) => {
+  channel.on('presence_state', (state) => {
     presenceState = Presence.syncState(presenceState, state);
     logState(presenceState);
   });
 
-  channel.on("presence_diff", (diff) => {
+  channel.on('presence_diff', (diff) => {
     presenceState = Presence.syncState(presenceState, diff);
     logState(presenceState);
   });
diff --git a/types/phoenix/tslint.json b/types/phoenix/tslint.json
index a41bf5d19a..6fca40ff8d 100644
--- a/types/phoenix/tslint.json
+++ b/types/phoenix/tslint.json
@@ -1,79 +1,117 @@
 {
-    "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",
+  "rules": {
+    "arrow-return-shorthand": true,
+    "ban-types": false,
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "deprecation": {
+      "severity": "warn"
+    },
+    "eofline": true,
+    "forin": true,
+    "import-spacing": false,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": false,
+    "member-access": false,
+    "member-ordering": false,
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-declare-current-package": false,
+    "no-duplicate-super": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    "no-single-declare-module": false,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-class": false,
+    "no-unnecessary-initializer": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "no-output-on-prefix": true,
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true
+  }
 }
+

From d2b667e02b6abddeabe11c3ba5b8133fa2c74a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=98=E8=85=BE=E7=AC=94=E8=AE=B0?=
 <guoshengqiang@live.com>
Date: Thu, 7 Mar 2019 02:15:57 +0800
Subject: [PATCH 429/924] Added new types for html5plus (#33572)

* Added new types for html5plus

* change tslint rules for types/html5plus

* change types for html5plus
---
 types/html5plus/html5plus-tests.ts |     2 +
 types/html5plus/index.d.ts         | 15472 +++++++++++++++++++++++++++
 types/html5plus/tsconfig.json      |    23 +
 types/html5plus/tslint.json        |     7 +
 4 files changed, 15504 insertions(+)
 create mode 100644 types/html5plus/html5plus-tests.ts
 create mode 100644 types/html5plus/index.d.ts
 create mode 100644 types/html5plus/tsconfig.json
 create mode 100644 types/html5plus/tslint.json

diff --git a/types/html5plus/html5plus-tests.ts b/types/html5plus/html5plus-tests.ts
new file mode 100644
index 0000000000..371e463473
--- /dev/null
+++ b/types/html5plus/html5plus-tests.ts
@@ -0,0 +1,2 @@
+const webview = plus.webview.currentWebview();
+const style = webview.getStyle();
diff --git a/types/html5plus/index.d.ts b/types/html5plus/index.d.ts
new file mode 100644
index 0000000000..2993f829b6
--- /dev/null
+++ b/types/html5plus/index.d.ts
@@ -0,0 +1,15472 @@
+// Type definitions for non-npm package html5plus 1.0
+// Project: https://www.html5plus.org/doc/
+// Definitions by: Dcloud <https://github.com/dcloudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * HTML5+接口，统一浏览器自定义扩展，提供增强的功能、性能扩展规范，使得开发者可开发出跨平台的app，并接近原生的功能和性能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/h5p.html](http://www.html5plus.org/doc/h5p.html)
+ */
+declare const plus: Plus;
+
+/**
+ * HTML5+接口，统一浏览器自定义扩展，提供增强的功能、性能扩展规范，使得开发者可开发出跨平台的app，并接近原生的功能和性能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface Plus {
+    /**
+     * Accelerometer模块管理设备加速度传感器，用于获取设备加速度信息，包括x（屏幕水平方向）、y（垂直屏幕水平方向）、z（垂直屏幕平面方向）三个方向的加速度信息。通过plus.accelerometer获取设备加速度传感器管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    accelerometer: PlusAccelerometer;
+    /**
+     * Native.js for Android封装一条通过JS语法直接调用Native Java接口通道，通过plus.android可调用几乎所有的系统API。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    android: PlusAndroid;
+    /**
+     * Audio模块用于提供音频的录制和播放功能，可调用系统的麦克风设备进行录音操作，也可调用系统的扬声器设备播放音频文件。通过plus.audio获取音频管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    audio: PlusAudio;
+    /**
+     * Bluetooth模块用于管理蓝牙设备，搜索附近蓝牙设备、连接实现数据通信等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    bluetooth: PlusBluetooth;
+    /**
+     * Camera模块管理设备的摄像头，可用于拍照、摄像操作，通过plus.camera获取摄像头管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    camera: PlusCamera;
+    /**
+     * Contacts模块管理系统通讯录，用于可对系统通讯录进行增、删、改、查等操作。通过plus.contacts获取系统通讯录管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    contacts: PlusContacts;
+    /**
+     * Device模块管理设备信息，用于获取手机设备的相关信息，如IMEI、IMSI、型号、厂商等。通过plus.device获取设备信息管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    device: PlusDevice;
+    /**
+     * Screen模块管理设备屏幕信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    screen: PlusScreen;
+    /**
+     * Display模块管理应用可使用的显示区域信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    display: PlusDisplay;
+    /**
+     * networkinfo模块用于获取网络信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    networkinfo: PlusNetworkinfo;
+    /**
+     * OS模块管理操作系统信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    os: PlusOs;
+    /**
+     * Downloader模块管理网络文件下载任务，用于从服务器下载各种文件，并支持跨域访问操作。通过plus.downloader获取下载管理对象。Downloader下载使用HTTP的GET/POST方式请求下载文件，符合标准HTTP/HTTPS传输协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    downloader: PlusDownloader;
+    /**
+     * Fingerprint模块管理指纹识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    fingerprint: PlusFingerprint;
+    /**
+     * Gallery模块管理系统相册，支持从相册中选择图片或视频文件、保存图片或视频文件到相册等功能。通过plus.gallery获取相册管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    gallery: PlusGallery;
+    /**
+     * Geolocation模块管理设备位置信息，用于获取地理位置信息，如经度、纬度等。通过plus.geolocation可获取设备位置管理对象。虽然W3C已经提供标准API获取位置信息，但在某些平台存在差异或未实现，为了保持各平台的统一性，定义此规范接口获取位置信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    geolocation: PlusGeolocation;
+    /**
+     * iBeacon模块用于搜索附件的iBeacon设备（*请使用HBuilderX并更新到最新版本*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    ibeacon: PlusIbeacon;
+    /**
+     * IO模块管理本地文件系统，用于对文件系统的目录浏览、文件的读取、文件的写入等操作。通过plus.io可获取文件系统管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    io: PlusIo;
+    /**
+     * Native.js for iOS封装一条通过JS语法直接调用Native Objective-C接口通道，通过plus.ios可调用几乎所有的系统API。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    ios: PlusIos;
+    /**
+     * Key管理设备按键事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    key: PlusKey;
+    /**
+     * Messaging模块管理设备通讯功能，可用于短信、彩信、邮件发送等。通过plus.messaging可获取设备通讯管理对象。另外也可以直接通过html中的href直接快速发送短信、拨打电话、发送邮件等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    messaging: PlusMessaging;
+    /**
+     * nativeObj管理系统原生对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    nativeObj: PlusNativeObj;
+    /**
+     * nativeUI管理系统原生界面，可用于弹出系统原生提示对话框窗口、时间日期选择对话框、等待对话框等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    nativeUI: PlusNativeUI;
+    /**
+     * navigator用于管理浏览器运行环境信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    navigator: PlusNavigator;
+    /**
+     * Orientation模块管理设备的方向信息，包括alpha、beta、gamma三个方向信息，通过plus.orientation可获取设备方向管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    orientation: PlusOrientation;
+    /**
+     * Proximity模块管理设备距离传感器，可获取当前设备的接近距离信息，通过plus.proximity可获取设备距离传感管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    proximity: PlusProximity;
+    /**
+     * Runtime模块管理运行环境，可用于获取当前运行环境信息、与其它程序进行通讯等。通过plus.runtime可获取运行环境管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    runtime: PlusRuntime;
+    /**
+     * Storage模块管理应用本地数据存储区，用于应用数据的保存和读取。应用本地数据与localStorage、sessionStorage的区别在于数据有效域不同，前者可在应用内跨域操作，数据存储期是持久化的，并且没有容量限制。通过plus.storage可获取应用本地数据管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    storage: PlusStorage;
+    /**
+     * Stream模块操作流应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    stream: PlusStream;
+    /**
+     * Uploader模块管理网络上传任务，用于从本地上传各种文件到服务器，并支持跨域访问操作。通过plus.uploader可获取上传管理对象。Uploader上传使用HTTP的POST方式提交数据，数据格式符合Multipart/form-data规范，即rfc1867（Form-based File Upload in HTML）协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    uploader: PlusUploader;
+    /**
+     * Video模块管理多媒体视频相关能力，可用创建视频播放控件，直播推流控件等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    video: PlusVideo;
+    /**
+     * Webview模块管理应用窗口界面，实现多窗口的逻辑控制管理操作。通过plus.webview可获取应用界面管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    webview: PlusWebview;
+    /**
+     * XMLHttpRequest模块管理网络请求，与标准HTML中的XMLHttpRequest用途一致，差别在于前者可以进行跨域访问。通过plus.net可获取网络请求管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    net: PlusNet;
+    /**
+     * Zip模块管理文件压缩和解压，通过plus.zip可获取压缩管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    zip: PlusZip;
+    /**
+     * Barcode模块管理条码扫描，支持常见的条码（一维码及二维码）的扫描识别功能。可调用设备的摄像头对条码图片扫描进行数据输入，解码后返回码数据及码类型。通过plus.barcode可获取条码码管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    barcode: PlusBarcode;
+    /**
+     * Maps模块管理地图控件，用于在web页面中显示地图控件，提供各种接口操作地图控件，如添加标点、路线等。通过plus.maps可获取地图管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    maps: PlusMaps;
+    /**
+     * OAuth模块管理客户端的用户登录授权验证功能，允许应用访问第三方平台的资源。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    oauth: PlusOauth;
+    /**
+     * Payment模块管理支付功能，用于提供网页安全支付能力，支持通过Web接口进行支付操作。通过plus.payment可获取支付管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    payment: PlusPayment;
+    /**
+     * Push模块管理推送消息功能，可以实现在线、离线的消息推送，通过plus.push可获取推送消息管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    push: PlusPush;
+    /**
+     * Share模块管理客户端的社交分享功能，提供调用终端社交软件的分享能力。通过plus.share可获取社交分享管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    share: PlusShare;
+    /**
+     * Speech模块管理语音输入功能，提供语音识别功能，可支持用户通过麦克风设备进行语音输入内容。通过plus.speech可获取语音输入管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    speech: PlusSpeech;
+    /**
+     * Statistic模块管理统计功能，用于提供应用内统计的能力，支持统计和分析用户属性和用户行为数据。通过plus.statistic可获取统计管理对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    statistic: PlusStatistic;
+}
+
+/**
+ * Accelerometer模块管理设备加速度传感器，用于获取设备加速度信息，包括x（屏幕水平方向）、y（垂直屏幕水平方向）、z（垂直屏幕平面方向）三个方向的加速度信息。通过plus.accelerometer获取设备加速度传感器管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometer {
+    /**
+     * 设备加速度信息对象
+     * JSON对象，保存获取设备的加速度信息，包括x、y、z三个方向的加速度信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    Acceleration?: PlusAccelerometerAcceleration;
+    /**
+     * 监听设备加速度感应器参数
+     * JSON对象，用于设置获取设备加速度信息的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    AccelerometerOption?: PlusAccelerometerAccelerometerOption;
+    /**
+     * 获取当前设备的加速度信息
+     * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
+     * 	加速度信息可通过successCB回调函数返回。加速度信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    getCurrentAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备加速度变化信息
+     * 加速度是设备在当前方向上所做相对运动变化（增、减量）的运动传感器。加速度信息包括x、y、z三个方向的信息。
+     * watchAcceleration每隔固定时间就获取一次设备的加速度信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备加速度信息的时间间隔。
+     * 加速度信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    watchAcceleration(successCB?: (result: PlusAccelerometerAcceleration) => void, errorCB?: (result: any) => void, options?: PlusAccelerometerAccelerometerOption): number;
+    /**
+     * 关闭监听设备加速度信息
+     * 关闭监听设备加速度信息，应用关闭调用watchAcceleration方法的开启的监听操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * 设备加速度信息对象
+ * JSON对象，保存获取设备的加速度信息，包括x、y、z三个方向的加速度信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometerAcceleration {
+    /**
+     * x轴方向的加速度
+     * 获取当前设备x轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    xAxis?: number;
+    /**
+     * y轴方向的加速度
+     * 获取当前设备y轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    yAxis?: number;
+    /**
+     * z轴方向的加速度
+     * 获取当前设备z轴方向的加速度，浮点型数据，与物理学中的加速度值一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    zAxis?: number;
+}
+
+/**
+ * 监听设备加速度感应器参数
+ * JSON对象，用于设置获取设备加速度信息的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+ */
+interface PlusAccelerometerAccelerometerOption {
+    /**
+     * 更新加速度信息间隔时间
+     * 监听器获取加速度信息的时间间隔，单位为ms，默认值为500ms
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/accelerometer.html](http://www.html5plus.org/doc/zh_cn/accelerometer.html)
+     */
+    frequency?: number;
+}
+
+/**
+ * Native.js for Android封装一条通过JS语法直接调用Native Java接口通道，通过plus.android可调用几乎所有的系统API。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroid {
+    /**
+     * Java类对象
+     * Java类对象，可通过其属性获取类的常量，可通过方法来操作类的静态变量和方法，也通过new方法来创建类的实例对象。
+     * 	对于类的常量，则直接通过.后面跟随常量名称调用即可。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    ClassObject?: PlusAndroidClassObject;
+    /**
+     * Java实例对象
+     * Java实例对象，可通过其方法来操作实例的变量和方法。
+     * 	注意：必须通过plusGetAttribute()方法读取实例对象的属性值，通过plusSetAttribute()方法设置实例对象的属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    InstanceObject?: PlusAndroidInstanceObject;
+    /**
+     * 导入Java类对象
+     * 导入类对象后，就可以通过.操作符直接调用对象（类对象/实例对象）的方法。
+     * 	注意：导入类对象将会消耗较多的系统资源，通常不应该导入过多的类对象，可以使用plus.android.invoke()来调用未导入类实例对象的方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    importClass(classname?: string): PlusAndroidClassObject;
+    /**
+     * 创建实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    newObject(classname?: string, args?: any): PlusAndroidInstanceObject;
+    /**
+     * 获取对象（类对象/实例对象）的属性值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    getAttribute(obj?: PlusAndroidInstanceObject, name?: string): any;
+    /**
+     * 设置对象（类对象/实例对象）的属性值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    setAttribute(obj?: PlusAndroidInstanceObject, name?: string, value?: any): void;
+    /**
+     * 调用对象（类对象/实例对象）的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    invoke(obj?: PlusAndroidInstanceObject, name?: string, args?: any): any;
+    /**
+     * 实现Interface的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    implements(name?: string, obj?: any): PlusAndroidInstanceObject;
+    /**
+     * 获取应用主Activity实例对象
+     * Android平台完整Java类名为android.app.Activity，完整API请参考Android开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    runtimeMainActivity(): PlusAndroidInstanceObject;
+    /**
+     * 获取当前Webview窗口对象的native层实例对象
+     * Android平台完整Java类名为android.webkit.Webview，完整API请参考Android开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    currentWebview(): PlusAndroidInstanceObject;
+}
+
+/**
+ * Java类对象
+ * Java类对象，可通过其属性获取类的常量，可通过方法来操作类的静态变量和方法，也通过new方法来创建类的实例对象。
+ * 	对于类的常量，则直接通过.后面跟随常量名称调用即可。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroidClassObject {
+    /**
+     * 获取Java类对象的静态属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Java类对象的静态属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Java实例对象
+ * Java实例对象，可通过其方法来操作实例的变量和方法。
+ * 	注意：必须通过plusGetAttribute()方法读取实例对象的属性值，通过plusSetAttribute()方法设置实例对象的属性值。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+ */
+interface PlusAndroidInstanceObject {
+    /**
+     * 获取Java实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Java实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/android.html](http://www.html5plus.org/doc/zh_cn/android.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Audio模块用于提供音频的录制和播放功能，可调用系统的麦克风设备进行录音操作，也可调用系统的扬声器设备播放音频文件。通过plus.audio获取音频管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudio {
+    /**
+     * 录音对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    AudioRecorder?: PlusAudioAudioRecorder;
+    /**
+     * 音频播放对象
+     * 音频播放对象，用于音频文件的播放。不能通过new方法直接创建，只能通过audio.createPlayer方法创建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    AudioPlayer?: PlusAudioAudioPlayer;
+    /**
+     * JSON对象，调用麦克风设备进行录音的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    RecordOptions?: PlusAudioRecordOptions;
+    /**
+     * 设备的扬声器音频输出线路
+     * 音频输出线路常量，值为0。音频播放时在设备的扬声器输出。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    ROUTE_SPEAKER?: number;
+    /**
+     * 设备听筒音频输出线路
+     * 音频输出线路常量，值为1。音频播放时在设备的听筒输出。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    ROUTE_EARPIECE?: number;
+    /**
+     * 获取当前设备的录音对象
+     * 获取当前设备的录音对象，进行录音操作，录音对象是设备的独占资源，在同一时间仅可执行一个录音操作，否则可能会导致操作失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getRecorder(): PlusAudioAudioRecorder;
+    /**
+     * 创建音频播放对象
+     * 创建一个音频文件播放对象，用于打开音频文件并播放。
+     * 	可通过path参数指定要播放的音频文件。创建后返回播放对象，通过Audio.play方法开始播放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    createPlayer(path?: string): PlusAudioAudioPlayer;
+}
+
+/**
+ * 录音对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioAudioRecorder {
+    /**
+     * 数组，设备录音支持的采用率
+     * 属性类型为Array(String)，若不支持此属性则返回空数组对象。支持的录音采样率，字符串格式为“采样频率”，如“8000”；其单位为Hz。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    supportedSamplerates?: string;
+    /**
+     * 数组，设备录音支持的文件格式
+     * 属性类型为Array(String)，若不支持此属性则返回空数组对象。支持的录音文件的格式，字符串格式为文件格式后缀名，如"mp3"、"aac"、"wav"等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    supportedFormats?: string;
+    /**
+     * 调用设备麦克风进行录音操作
+     * 调用设备麦克风开始录音操作，录音完成需调用stop方法停止。录音完成后将通过successCB回调返回录音后的文件数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    record(option?: PlusAudioRecordOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 结束录音操作
+     * 结束录音操作，通知设备完成录音操作。录音完成后将调用record方法中传入的successCB回调返回录音文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    stop(): void;
+}
+
+/**
+ * 音频播放对象
+ * 音频播放对象，用于音频文件的播放。不能通过new方法直接创建，只能通过audio.createPlayer方法创建。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioAudioPlayer {
+    /**
+     * 开始播放音频
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    play(successCB?: () => void, errorCB?: (result: any) => void): void;
+    /**
+     * 暂停播放音频
+     * 需先调用createPlayer方法创建音频播放对象，并开始播放。音频播放对象在播放状态才能暂停，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    pause(): void;
+    /**
+     * 恢复播放音频
+     * 音频播放对象在暂停状态才能恢复播放，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    resume(): void;
+    /**
+     * 停止播放音频
+     * 停止播放音频，音频播放对象在播放或暂停状态才能停止播放，在其它状态调用此方法无任何作用。
+     * 	停止播放后如果需要继续播放，则需调用play方法重新开始播放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    stop(): void;
+    /**
+     * 跳到指定位置播放音频
+     * 跳到指定位置播放音频，音频播放对象在播放或暂停状态才能跳到指定播放音频，在其它状态调用此方法无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    seekTo(position?: number): void;
+    /**
+     * 获取音频流的总长度
+     * 获取音频流的总长度，单位为秒，若长度未知则返回-1。如果还未获取到音频流信息则返回NaN，此时需要延迟获取此信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getDuration(): number;
+    /**
+     * 获取音频流当前播放的位置
+     * 获取音频流当前播放的位置（已播放的长度），单位为s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    getPosition(): number;
+    /**
+     * 设置音频输出线路
+     * 可在音频文件开始播放前或播放的过程中改变音频输出线路，默认使用扬声器（plus.audio.ROUTE_SPEAKER）输出线路。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    setRoute(route?: number): void;
+}
+
+/**
+ * JSON对象，调用麦克风设备进行录音的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+ */
+interface PlusAudioRecordOptions {
+    /**
+     * 录音声道
+     * 可取值：
+     * 		"mono" - 单声道录音；
+     * 		"stereo" - 立体声道录音。
+     * 	默认值为"mono"。
+     * - mono: 单声道录音
+     * - stereo: 立体声录音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    channels?: 'mono' | 'stereo';
+    /**
+     * 保存录音文件的路径
+     * 可设置具体文件名，也可只设置路径，如果以“/”结尾则表明是路径，文件名由录音程序自动生成。
+     * 	如未设置则使用默认目录生成随机文件名称，默认目录为应用%APPID%下的documents目录。
+     * - _www/: 应用资源目录
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    filename?: '_www/' | '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 录音文件的采样率
+     * 需通过supportedSamplerates属性获取设备支持的采样率，若设置无效的值，则使用系统默认的采样率。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    samplerate?: string;
+    /**
+     * 录音文件的格式
+     * 需通过supportedFormats属性获取设备支持的录音格式，若设置无效的值，则使用系统默认的录音格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/audio.html](http://www.html5plus.org/doc/zh_cn/audio.html)
+     */
+    format?: string;
+}
+
+/**
+ * Bluetooth模块用于管理蓝牙设备，搜索附近蓝牙设备、连接实现数据通信等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetooth {
+    /**
+     * 蓝牙设备信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothDeviceInfo?: PlusBluetoothBluetoothDeviceInfo;
+    /**
+     * 蓝牙设备服务信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothService?: PlusBluetoothBluetoothService;
+    /**
+     * 蓝牙设备特征值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    Bluetoothcharacteristic?: PlusBluetoothBluetoothcharacteristic;
+    /**
+     * 蓝牙设备特征值支持的操作类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    BluetoothcharacteristicProperties?: PlusBluetoothBluetoothcharacteristicProperties;
+    /**
+     * 关闭蓝牙模块
+     * 断开所有已经建立的连接，释放系统资源，要求在蓝牙功能使用完成后调用（于openBluetoothAdapter成对使用）。
+     * 	关闭成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    closeBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取本机蓝牙适配器状态
+     * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBluetoothAdapterState(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取已搜索到的蓝牙设备
+     * 包括已经和本机处于连接状态的设备。
+     * 	获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBluetoothDevices(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 根据uuid获取处于已连接的设备
+     * 获取成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getConnectedBluetoothDevices(services?: any [], success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听蓝牙适配器状态变化事件
+     * 蓝牙适配器状态发生变化时触发回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBluetoothAdapterStateChange(changeCB?: (result: any) => void): void;
+    /**
+     * 监听搜索到新设备的事件
+     * 搜索到新设备时触发回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBluetoothDeviceFound(callback?: (result: any) => void): void;
+    /**
+     * 初始化蓝牙模块
+     * 初始化成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    openBluetoothAdapter(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 开始搜索附近的蓝牙设备
+     * 此操作比较耗费系统资源，请在搜索并连接到设备后调用stopBluetoothDevicesDiscovery方法停止搜索。
+     * 	搜索成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    startBluetoothDevicesDiscovery(services?: any [], allowDuplicatesKey?: boolean, interval?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 停止搜寻附近的蓝牙外围设备
+     * 若已经找到需要的蓝牙设备并不需要继续搜索时，应该调用该接口停止蓝牙搜索。
+     * 	停止成功后触发options参数中的success回调，失败触发options参数中的fail回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    stopBluetoothDevicesDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 断开与低功耗蓝牙设备的连接
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    closeBLEConnection(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 连接低功耗蓝牙设备
+     * 若之前已有搜索过某个蓝牙设备，并成功建立连接，可直接传入之前搜索获取的deviceId尝试连接该设备，无需进行搜索操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    createBLEConnection(deviceId?: string, timeout?: number, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取蓝牙设备指定服务中所有特征值(characteristic)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBLEDeviceCharacteristics(deviceId?: string, serviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取蓝牙设备的所有服务(service)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    getBLEDeviceServices(deviceId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
+     * 蓝牙设备服务的特征值必须支持notify或indicate才可以成功调用。
+     * 另外，必须先启用notifyBLECharacteristicValueChange才能监听到设备characteristicValueChange事件,即特征值发生变化时通过onBLECharacteristicValueChange注册的事件回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    notifyBLECharacteristicValueChange(deviceId?: string, serviceId?: string, characteristicId?: string, state?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听低功耗蓝牙设备的特征值变化事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBLECharacteristicValueChange(callback?: (result: any) => void): void;
+    /**
+     * 监听低功耗蓝牙设备连接状态变化事件
+     * 包括开发者主动连接或断开连接，设备丢失，连接异常断开等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    onBLEConnectionStateChange(callback?: (result: any) => void): void;
+    /**
+     * 读取低功耗蓝牙设备指定特征值的二进制数据值
+     * 指定的特征值需支持read操作才可以成功调用。
+     * 	并行调用多次可能导致读取失败，读取的数据需要在onBLECharacteristicValueChange方法注册的回调中获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    readBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 向低功耗蓝牙设备指定特征值写入二进制数据
+     * 指定的特征值需支持write操作才可以成功调用。
+     * 	并行调用多次可能导致读取失败，系统可能会限制单次传输的数据大小，超过最大字节数后可能会发生写入错误，建议每次写入不超过20字节。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    writeBLECharacteristicValue(deviceId?: string, serviceId?: string, characteristicId?: string, value?: ArrayBuffer, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+}
+
+/**
+ * 蓝牙设备信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothDeviceInfo {
+    /**
+     * 蓝牙设备名称
+     * 某些设备可能没有此字段值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    name?: string;
+    /**
+     * 蓝牙设备的id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙设备的信号强度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    RSSI?: string;
+    /**
+     * 蓝牙设备的广播数据段中的ManufacturerData数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    advertisData?: ArrayBuffer;
+    /**
+     * 蓝牙设备的广播数据段中的ServiceUUIDs数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    advertisServiceUUIDs?: any [];
+    /**
+     * 蓝牙设备的广播数据段中的LocalName数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    localName?: string;
+    /**
+     * 蓝牙设备的广播数据段中的ServiceData数据段
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    serviceData?: any;
+}
+
+/**
+ * 蓝牙设备服务信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothService {
+    /**
+     * 蓝牙设备服务的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    uuid?: string;
+    /**
+     * 是否为设备的主服务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    isPrimary?: boolean;
+}
+
+/**
+ * 蓝牙设备特征值
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothcharacteristic {
+    /**
+     * 蓝牙设备特征值的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    uuid?: string;
+    /**
+     * 设备特征值支持的操作类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    properties?: PlusBluetoothBluetoothcharacteristicProperties;
+}
+
+/**
+ * 蓝牙设备特征值支持的操作类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+ */
+interface PlusBluetoothBluetoothcharacteristicProperties {
+    /**
+     * 特征值是否支持read操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    read?: boolean;
+    /**
+     * 特征值是否支持write操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    write?: boolean;
+    /**
+     * 特征值是否支持notify操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    notify?: boolean;
+    /**
+     * 特征值是否支持indicate操作
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/bluetooth.html](http://www.html5plus.org/doc/zh_cn/bluetooth.html)
+     */
+    indicate?: boolean;
+}
+
+/**
+ * Camera模块管理设备的摄像头，可用于拍照、摄像操作，通过plus.camera获取摄像头管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCamera {
+    /**
+     * 摄像头对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    Camera?: PlusCameraCamera;
+    /**
+     * JSON对象，调用摄像头的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    CameraOptions?: PlusCameraCameraOptions;
+    /**
+     * JSON对象，弹出拍照或摄像界面指示位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    PopPosition?: PlusCameraPopPosition;
+    /**
+     * 获取摄像头管理对象
+     * 获取需要操作的摄像头对象，如果要进行拍照或摄像操作，需先通过此方法获取摄像头对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    getCamera(index?: number): PlusCameraCamera;
+}
+
+/**
+ * 摄像头对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraCamera {
+    /**
+     * 字符串数组，摄像头支持的拍照分辨率
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的拍照图片分辨率字符串形式“WIDTH*Height”，如“400*800”；如果支持任意自定义分辨率则“*”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedImageResolutions?: any [];
+    /**
+     * 字符串数组，摄像头支持的摄像分辨率
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的视频分辨率字符串形式为“WIDTH*Height”，如“400*800”；如果支持任意自定义分辨率则“*”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedVideoResolutions?: any [];
+    /**
+     * 字符串数组，摄像头支持的拍照文件格式
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的图片文件格式字符串形式为文件格式后缀名，如“jpg”、“png”、“bmp”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedImageFormats?: any [];
+    /**
+     * 字符串数组，摄像头支持的摄像文件格式
+     * 属性类型为String[]，若不支持此属性则返回空数组对象。
+     * 	摄像头支持的视频文件格式字符串形式为文件格式后缀名，如“3gp”、“mp4”、“avi”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    supportedVideoFormats?: any [];
+    /**
+     * 进行拍照操作
+     * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
+     * 	拍照操作成功将通过successCB返回拍照获取的图片路径。
+     * 	可通过option设置摄像头的各种属性参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    captureImage(successCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusCameraCameraOptions): void;
+    /**
+     * 调用摄像头进行摄像操作
+     * 摄像头资源为独占资源，如果其它程序或页面已经占用摄像头，再次操作则失败。
+     * 	拍照操作成功将通过successCB返回摄像获取的视频文件路径。
+     * 	可通过option设置摄像头的各种属性参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    startVideoCapture(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusCameraCameraOptions): void;
+    /**
+     * 结束摄像操作
+     * 开始调用摄像头进行摄像操作后，可在后台结束摄像操作，与用户在界面结束操作效果一致。
+     * 	摄像操作成功将通过startVideoCapture函数中的successCB返回拍照获取的图片路径。
+     * 	用户如果没有进行摄像操作关闭摄像头页面则调用失败回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    stopVideoCapture(): void;
+}
+
+/**
+ * JSON对象，调用摄像头的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraCameraOptions {
+    /**
+     * 拍照或摄像文件保存的路径
+     * 可设置具体文件名（如"_doc/camera/a.jpg"）；也可只设置路径，以"/"结尾则表明是路径（如"_doc/camera/"）。
+     * 	如未设置文件名称或设置的文件名冲突则文件名由程序程序自动生成。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    filename?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 拍照或摄像的文件格式
+     * 可通过Camera对象的supportedImageFormats或supportedVideoFormats获取，如果设置的参数无效则使用系统默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    format?: string;
+    /**
+     * 拍照或摄像默认使用的摄像头
+     * 拍照或摄像界面默认使用的摄像头编号，1表示主摄像头，2表示辅摄像头。
+     * - 1: 使用设备主摄像头
+     * - 2: 使用设备辅摄像头
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    index?: '1' | '2';
+    /**
+     * 视频长度
+     * 单位为秒（s），小于等于0表示不限定视频长度。
+     * 	默认值为0（不限定视频长度）。
+     * 	注意：仅在调用拍摄视频（startVideoCapture）时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    videoMaximumDuration?: number;
+    /**
+     * 是否优化图片
+     * 自动调整图片的方向，在部分设备上可能出现图片方向不正确的问题，此参数将配置是否自动调整图片方向。
+     * 	可取值：
+     * 		true - 自动调整图片方向；
+     * 		false - 不调整。
+     * 	默认值为true。
+     * 	注意：自动调整图片方向将消耗部分系统资源，可能会导致拍照后回调触发时机延迟，将此值设置为false则可避免延迟问题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    optimize?: boolean;
+    /**
+     * 拍照或摄像使用的分辨率
+     * 可通过Camera对象的supportedImageResolutions或supportedVideoResolutions获取，如果设置的参数无效则使用系统默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    resolution?: string;
+    /**
+     * 拍照或摄像界面弹出指示区域
+     * 对于大屏幕设备如iPad，拍照或摄像界面为弹出窗口，此时可通过此参数设置弹出窗口位置，其为JSON对象，格式如{top:"10px",left:"10px",width:"200px",height:"200px"}，默认弹出位置为屏幕居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    popover?: PlusCameraPopPosition;
+}
+
+/**
+ * JSON对象，弹出拍照或摄像界面指示位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+ */
+interface PlusCameraPopPosition {
+    /**
+     * 指示区域距离容器顶部的距离
+     * 弹出拍照或摄像窗口指示区域距离容器顶部的距离，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    top?: string;
+    /**
+     * 指示区域距离容器左侧的距离
+     * 弹出拍照或摄像窗口指示区域距离容器左侧的距离，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    left?: string;
+    /**
+     * 指示区域的宽度
+     * 弹出拍照或摄像窗口指示区域的宽度，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    width?: string;
+    /**
+     * 指示区域的高度
+     * 弹出拍照或摄像窗口指示区域的高度，支持像素值（如"100px"）和百分比（如"50%"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/camera.html](http://www.html5plus.org/doc/zh_cn/camera.html)
+     */
+    height?: string;
+}
+
+/**
+ * Contacts模块管理系统通讯录，用于可对系统通讯录进行增、删、改、查等操作。通过plus.contacts获取系统通讯录管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContacts {
+    /**
+     * 通讯录对象
+     * 通讯录管理对象，可对系统通讯录进行联系人的增、删、改、查操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    AddressBook?: PlusContactsAddressBook;
+    /**
+     * 联系人对象
+     * 联系人对象，包括联系人的各种信息，如名称、电话号码、地址等。也包括新增、删除联系人的操作方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    Contact?: PlusContactsContact;
+    /**
+     * JSON对象，联系人域数据对象
+     * 联系人域数据对象，保存联系人特定域信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactField?: PlusContactsContactField;
+    /**
+     * JSON对象，联系人名称对象
+     * 联系人名称对象，保存联系人名称信息，如姓、名等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactName?: PlusContactsContactName;
+    /**
+     * JSON对象，联系人地址对象
+     * 联系人地址对象，保存联系人地址信息，如国家、省份、城市等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactAddress?: PlusContactsContactAddress;
+    /**
+     * JSON对象，联系人所属组织信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactOrganization?: PlusContactsContactOrganization;
+    /**
+     * JSON对象，查找联系人参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactFindOption?: PlusContactsContactFindOption;
+    /**
+     * JSON对象，联系人查找过滤器
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ContactFindFilter?: PlusContactsContactFindFilter;
+    /**
+     * 手机通讯录
+     * 通讯录类型常量，数值类型，固定值为0，用于获取系统的联系人信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ADDRESSBOOK_PHONE?: number;
+    /**
+     * SIM卡通讯录
+     * 通讯录类型常量，数值类型，固定值为1，用于获取SIM卡上的联系人信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ADDRESSBOOK_SIM?: number;
+    /**
+     * 获取通讯录对象
+     * 根据指定通讯录类型获取通讯录对象，获取通讯录对象后可对其进行增、删、改操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    getAddressBook(type?: number, successCB?: (result: PlusContactsAddressBook) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 通讯录对象
+ * 通讯录管理对象，可对系统通讯录进行联系人的增、删、改、查操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsAddressBook {
+    /**
+     * 创建联系人
+     * 创建一个系统联系人，并返回联系人对象，可对联系人对象进行操作设置联系人信息，如名称、地址、电话等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    create(): PlusContactsContact;
+    /**
+     * 在通讯录中查找联系人
+     * 在通讯录中安装指定的规则查找联系人，contactFields可设定查找返回的联系人中包含的字段值，查找联系人成功时通过successCB回调返回，查找联系人失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    find(contactFields?: string [], successCB?: (result: PlusContactsContact) => void, errorCB?: (result: any) => void, findOptions?: PlusContactsContactFindOption): void;
+}
+
+/**
+ * 联系人对象
+ * 联系人对象，包括联系人的各种信息，如名称、电话号码、地址等。也包括新增、删除联系人的操作方法。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContact {
+    /**
+     * 联系人的id
+     * 联系人id由系统分配维护，从系统获取联系人时自动赋值，再次查询时可使用此id值进行检索。
+     * 	注意：此值为只读属性，改写此值可能会导致无法预期的错误。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    id?: string;
+    /**
+     * 联系人显示的名字
+     * 联系人显示的名字通常由其姓和名组合而成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    displayName?: string;
+    /**
+     * 联系人的名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    name?: PlusContactsContactName;
+    /**
+     * 联系人的昵称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    nickname?: string;
+    /**
+     * 数组，联系人的电话
+     * 如果联系人中未保存电话信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    phoneNumbers?: PlusContactsContactField;
+    /**
+     * 数组，联系人的邮箱
+     * 如果联系人中未保存邮箱信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    emails?: PlusContactsContactField;
+    /**
+     * 数组，联系人的地址
+     * 如果联系人中未保存地址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    addresses?: PlusContactsContactAddress;
+    /**
+     * 数组，联系人的即时通讯地址
+     * 如果联系人中未保存即时通讯地址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    ims?: PlusContactsContactField;
+    /**
+     * 数组，联系人所属组织信息
+     * 如果联系人中未保存所属组织信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    organizations?: PlusContactsContactOrganization;
+    /**
+     * 联系人的生日
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    birthday?: Date;
+    /**
+     * 联系人的备注
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    note?: string;
+    /**
+     * 数组，联系人的头像
+     * 其值为头像图片url地址或图片数据：
+     * 	url地址：仅支持本地图片地址，可以是绝对路径或相对路径，如“_doc/a.png”；
+     * 	图片数据：必须符合Data URI scheme（RFC2397）格式的数据，如“image/png;base64,XXXX”，其中XXXX为base64编码的图片数据。在获取联系人时默认返回此类型的数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    photos?: PlusContactsContactField;
+    /**
+     * 数组，联系人的组名
+     * 如果联系人中未保存组名信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    categories?: PlusContactsContactField;
+    /**
+     * 数组，联系人的网址
+     * 如果联系人中未保存网址信息，则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    urls?: PlusContactsContactField;
+    /**
+     * 克隆联系人
+     * 克隆联系人，创建出一个新的联系人对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    clone(): PlusContactsContact;
+    /**
+     * 删除联系人
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    remove(successCB?: () => void, errorCB?: (result: any) => void): void;
+    /**
+     * 保存联系人
+     * 将联系人数据保存到通讯录中，操作成功将通过successCB回调函数返回保存结果，操作失败将通过通过errorCB回调函数返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    save(successCB?: () => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，联系人域数据对象
+ * 联系人域数据对象，保存联系人特定域信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactField {
+    /**
+     * 联系人域类型，如电话号码中的“mobile”、“home”、“company”
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 联系人域值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    value?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，联系人名称对象
+ * 联系人名称对象，保存联系人名称信息，如姓、名等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactName {
+    /**
+     * 联系人的完整名称，由其它字段组合生成
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    formatted?: string;
+    /**
+     * 联系人的姓
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    familyName?: string;
+    /**
+     * 联系人的名
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    givenName?: string;
+    /**
+     * 联系人的中间名
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    middleName?: string;
+    /**
+     * 联系人的前缀（如Mr.或Dr.）
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    honorificPrefix?: string;
+    /**
+     * 联系人的后缀
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    honorificSuffix?: string;
+}
+
+/**
+ * JSON对象，联系人地址对象
+ * 联系人地址对象，保存联系人地址信息，如国家、省份、城市等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactAddress {
+    /**
+     * 联系人地址类型，如“home”表示家庭地址、“company”表示单位地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 完整地址，由其它字段组合而成
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    formatted?: string;
+    /**
+     * 完整的街道地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    streetAddress?: string;
+    /**
+     * 城市或地区
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    locality?: string;
+    /**
+     * 省或地区
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    region?: string;
+    /**
+     * 国家
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    country?: string;
+    /**
+     * 邮政编码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    postalCode?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，联系人所属组织信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactOrganization {
+    /**
+     * 联系人所属组织类型，如"company"
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    type?: string;
+    /**
+     * 联系人所属组织名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    name?: string;
+    /**
+     * 联系人所属组织部门
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    department?: string;
+    /**
+     * 联系人在组织中的职位
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    title?: string;
+    /**
+     * 是否为首选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    preferred?: boolean;
+}
+
+/**
+ * JSON对象，查找联系人参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactFindOption {
+    /**
+     * 数组，查找时的过滤器
+     * 可设置为空，表示不过滤。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    filter?: PlusContactsContactFindFilter;
+    /**
+     * 是否查找多个联系人，默认值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    multiple?: boolean;
+}
+
+/**
+ * JSON对象，联系人查找过滤器
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+ */
+interface PlusContactsContactFindFilter {
+    /**
+     * 区配的逻辑
+     * 可取“and”、“or”、“not”，默认值为“and”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    logic?: string;
+    /**
+     * 区配的联系人域，可取联系人的属性名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    field?: string;
+    /**
+     * 区配的联系人值，可使用区配符号“?”和“*”
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/contacts.html](http://www.html5plus.org/doc/zh_cn/contacts.html)
+     */
+    value?: string;
+}
+
+/**
+ * Device模块管理设备信息，用于获取手机设备的相关信息，如IMEI、IMSI、型号、厂商等。通过plus.device获取设备信息管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusDevice {
+    /**
+     * 设备的国际移动设备身份码
+     * 调用此属性获取设备的国际移动设备身份码。
+     * 	如果设备不支持则返回空字符串。
+     * 	如果设备存在多个身份码，则以“,”字符分割拼接，如“862470039452950,862470039452943”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    imei?: string;
+    /**
+     * 设备的国际移动用户识别码
+     * 字符串数组类型，获取设备上插入SIM的国际移动设备身份码。
+     * 	如果设备支持多卡模式则返回所有SIM身份码。
+     * 	如果设备不支持或没有插入SIM卡则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    imsi?: any [];
+    /**
+     * 设备的型号
+     * 调用此属性获取设备的型号信息。
+     * 	如果设备不支持则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    model?: string;
+    /**
+     * 设备的生产厂商
+     * 调用此属性获取设备的生产厂商信息。
+     * 	如果设备不支持则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vendor?: string;
+    /**
+     * 设备的唯一标识
+     * 调用此属性获取设备的唯一标识号。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    uuid?: string;
+    /**
+     * 拨打电话
+     * 调用系统程序拨打电话。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dial(number?: string, confirm?: boolean): void;
+    /**
+     * 发出蜂鸣声
+     * 调用此方法使得设备发出蜂鸣声。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    beep(times?: number): void;
+    /**
+     * 设备振动
+     * 调用此方法使得设备振动。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vibrate(milliseconds?: number): void;
+    /**
+     * 设置应用是否保持唤醒（屏幕常亮）状态
+     * 调用此方法设置应用是否一直保持唤醒状态，保持唤醒状态将会导致程序屏幕常亮、系统不会自动锁屏，从而导致消耗更多的电量。若未设置一直保持唤醒状态则会根据系统设置自动锁定屏幕。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setWakelock(lock?: boolean): void;
+    /**
+     * 获取程序是否一直保持唤醒（屏幕常亮）状态
+     * 调用此方法获取程序是否一致保持唤醒状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    isWakelock(): boolean;
+    /**
+     * 设置设备的系统音量
+     * 调用此方法调节设备的系统音量。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setVolume(volume?: number): void;
+    /**
+     * 获取设备的系统音量
+     * 系统音量值范围为0到1，0表示静音，1表示最大音量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getVolume(): number;
+}
+
+/**
+ * Screen模块管理设备屏幕信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusScreen {
+    /**
+     * 设备屏幕高度分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，screen获取的是设备屏幕总区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionHeight?: number;
+    /**
+     * 设备屏幕宽度分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，screen获取的是设备屏幕总区域的分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionWidth?: number;
+    /**
+     * 逻辑分辨率与实际分辨率的比例
+     * 屏幕分辨率分逻辑分辨率率和实际分辨率，在html页面中使用的像素值都是相对于逻辑分辨率，此值就是逻辑分辨率和实际分辨率的比例，实际分辨率=逻辑分辨率*比例。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    scale?: number;
+    /**
+     * 设备屏幕水平方向的密度
+     * 设备屏幕的密度为每英寸所显示的像素点数，密度越高显示清晰度越高，单位为dpi。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dpiX?: number;
+    /**
+     * 设备屏幕垂直方向的密度
+     * 设备屏幕的密度为每英寸所显示的像素点数，密度越高显示清晰度越高，单位为dpi。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    dpiY?: number;
+    /**
+     * 设置屏幕亮度
+     * 调用此方法调节设备屏幕亮度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    setBrightness(brightness?: number): void;
+    /**
+     * 获取屏幕亮度值
+     * 屏幕亮度值范围为0到1，0表示最低亮度值，1表示最高亮度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getBrightness(): number;
+    /**
+     * 锁定屏幕方向
+     * 锁定屏幕方向后屏幕只能按锁定的屏幕方向显示，关闭当前页面后仍然有效。
+     * 	可再次调用此方法修改屏幕锁定方向或调用unlockOrientation()方法恢复到应用的默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    lockOrientation(orientation?: string): void;
+    /**
+     * 解除锁定屏幕方向
+     * 解除锁定屏幕方向后将恢复应用默认的屏幕显示方向（通常为应用打包发布时设置的方向）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    unlockOrientation(): void;
+}
+
+/**
+ * Display模块管理应用可使用的显示区域信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusDisplay {
+    /**
+     * 应用可使用的屏幕高度逻辑分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，display获取的是应用显示区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionHeight?: number;
+    /**
+     * 应用可使用的屏幕宽度逻辑分辨率
+     * 设备屏幕区域包括系统状态栏显示区域和应用显示区域，display获取的是应用显示区域的逻辑分辨率，单位为px。
+     * 	如果需要获取实际分辨率则需要乘以比例值scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    resolutionWidth?: number;
+}
+
+/**
+ * networkinfo模块用于获取网络信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusNetworkinfo {
+    /**
+     * 网络连接状态未知
+     * 网络状态常量，表示当前设备网络状态未知，固定值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_UNKNOW?: number;
+    /**
+     * 未连接网络
+     * 网络状态常量，当前设备网络未连接网络，固定值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_NONE?: number;
+    /**
+     * 有线网络
+     * 网络状态常量，当前设备连接到有线网络，固定值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_ETHERNET?: number;
+    /**
+     * 无线WIFI网络
+     * 网络状态常量，当前设备连接到无线WIFI网络，固定值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_WIFI?: number;
+    /**
+     * 蜂窝移动2G网络
+     * 网络状态常量，当前设备连接到蜂窝移动2G网络，固定值为4。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL2G?: number;
+    /**
+     * 蜂窝移动3G网络
+     * 网络状态常量，当前设备连接到蜂窝移动3G网络，固定值为5。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL3G?: number;
+    /**
+     * 蜂窝移动4G网络
+     * 网络状态常量，当前设备连接到蜂窝移动4G网络，固定值为6。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    CONNECTION_CELL4G?: number;
+    /**
+     * 获取设备当前连接的网络类型
+     * 获取当前设备连接的网络类型，返回值为网络类型常量，可取值CONNECTION_*常量。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    getCurrentType(): number;
+}
+
+/**
+ * OS模块管理操作系统信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+ */
+interface PlusOs {
+    /**
+     * 系统语言信息
+     * 获取当前操作系统设置的系统语言，字符串类型数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    language?: string;
+    /**
+     * 系统版本信息
+     * 获取当前操作系统的版本信息，字符串类型数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    version?: string;
+    /**
+     * 系统的名称
+     * 获取当前操作系统的名称，字符串类型数据。
+     * - iOS: 
+     * 	iOS系统。
+     * 								
+     * - Android: 
+     * 	Android系统。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    name?: 'iOS' | 'Android';
+    /**
+     * 系统的供应商信息
+     * 获取当前操作系统的供应商名称，字符串类型数据。
+     * - Apple: 
+     * 	iOS设备，包括iPhone、iPad、iTouch。
+     * 								
+     * - Google: 
+     * 	Android设备。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/device.html](http://www.html5plus.org/doc/zh_cn/device.html)
+     */
+    vendor?: 'Apple' | 'Google';
+}
+
+/**
+ * Downloader模块管理网络文件下载任务，用于从服务器下载各种文件，并支持跨域访问操作。通过plus.downloader获取下载管理对象。Downloader下载使用HTTP的GET/POST方式请求下载文件，符合标准HTTP/HTTPS传输协议。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloader {
+    /**
+     * Download对象管理一个下载任务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    Download?: PlusDownloaderDownload;
+    /**
+     * 下载任务事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadEvent?: PlusDownloaderDownloadEvent;
+    /**
+     * 下载任务状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadState?: PlusDownloaderDownloadState;
+    /**
+     * 下载任务参数
+     * 在创建下载任务时设置的参数，如设置下载任务使用的HTTP协议类型、优先级等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    DownloadOptions?: PlusDownloaderDownloadOptions;
+    /**
+     * 新建下载任务
+     * 请求下载管理创建新的下载任务，创建成功则返回Download对象，用于管理下载任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    createDownload(url?: string, options?: PlusDownloaderDownloadOptions, completedCB?: (result0: PlusDownloaderDownload, result1: number) => void): PlusDownloaderDownload;
+    /**
+     * 枚举下载任务
+     * 枚举指定状态的下载任务列表，通过enumCB回调函数返回结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    enumerate(enumCB?: (result: any []) => void, state?: PlusDownloaderDownloadState): void;
+    /**
+     * 清除下载任务
+     * 清除指定状态的下载任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    clear(state?: PlusDownloaderDownloadState): void;
+    /**
+     * 开始所有下载任务
+     * 开始所有处于为开始调度或暂停状态的下载任务。
+     * 	若下载任务数超过可并发处理的总数，超出的任务处于调度状态（等待下载），当有任务完成时根据调度状态任务的优先级选择任务开始下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    startAll(): void;
+}
+
+/**
+ * Download对象管理一个下载任务
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownload {
+    /**
+     * 下载任务的标识
+     * 在创建任务时系统自动分配，用于标识下载任务的唯一性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    id?: string;
+    /**
+     * 下载文件的地址
+     * 调用plus.donwloader.createDownload()方法创建下载任务时设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    url?: string;
+    /**
+     * 任务的状态
+     * 表示当前下载任务的状态，可通过addEventListener()方法监听statechanged事件监听任务状态的变化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    state?: PlusDownloaderDownloadState;
+    /**
+     * 下载任务的参数
+     * 调用plus.donwloader.createDownload()方法创建下载任务时设置的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    options?: PlusDownloaderDownloadOptions;
+    /**
+     * 下载的文件名称
+     * 下载任务在本地保存的文件路径，下载任务完成时更新，可通过此值访问下载的文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    filename?: string;
+    /**
+     * 已完成下载文件的大小
+     * 整数类型，单位为字节（byte），下载任务开始传输数据时，每次触发statechanged事件或下载任务完成时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    downloadedSize?: number;
+    /**
+     * 下载任务文件的总大小
+     * 整数类型，单位为字节（byte），下载任务开始传输数据时更新，在此之前其值为0。
+     * 	此值是从HTTP请求头中获取，如果服务器未返回则此值始终为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    totalSize?: number;
+    /**
+     * 取消下载任务
+     * 如果任务未完成，则终止下载，并从任务列表中删除。
+     * 	如下载未完成，将删除已下载的临时文件，如果下载已完成，将不删除已下载的文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    abort(): void;
+    /**
+     * 添加下载任务事件监听器
+     * 下载任务添加事件监听器后，当监听的事件发生时触发listener回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    addEventListener(type?: string, listener?: (result0: PlusDownloaderDownload, result1: number) => void, capture?: boolean): void;
+    /**
+     * 获取下载请求HTTP响应头部信息
+     * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者下载请求未完成则为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取下载请求指定的HTTP响应头部的值
+     * 其参数是要返回的HTTP响应头部的名称，可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	如果没有接收到这个头部或者下载请求未完成则为空字符串；如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 暂停下载任务
+     * 暂停下载任务，如果任务已经处于初始状态或暂停状态则无任何响应。
+     * 	通常在任务已开始后暂停任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    pause(): void;
+    /**
+     * 恢复暂停的下载任务
+     * 继续暂停的下载任务，如果任务处于非暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    resume(): void;
+    /**
+     * 设置下载请求的HTTP头数据
+     * Http的Header应该包含在通过后续start()调用而发起的请求中，此方法必需在调用start()之前设置才能生效。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+    /**
+     * 开始下载任务
+     * 开始下载任务，如果任务已经处于开始状态则无任何响应。
+     * 	在创建任务或任务下载失败后调用可重新开始下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    start(): void;
+}
+
+/**
+ * 下载任务事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownloadEvent {
+    /**
+     * 下载任务状态变化事件
+     * 当下载任务状态发生变化时触发此事件，事件原型参考DownloadStateChangedCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    statechanged?: string;
+}
+
+/**
+ * 下载任务状态
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+type PlusDownloaderDownloadState = undefined | 0 | 1 | 2 | 3 | 4 | 5 | -1;
+
+/**
+ * 下载任务参数
+ * 在创建下载任务时设置的参数，如设置下载任务使用的HTTP协议类型、优先级等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+ */
+interface PlusDownloaderDownloadOptions {
+    /**
+     * 网络请求类型
+     * 支持http协议的“GET”、“POST”，默认为“GET”请求。
+     * - GET: GET请求
+     * - POST: POST请求
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    method?: 'GET' | 'POST';
+    /**
+     * POST请求时提交的数据
+     * 仅在网络请求类型method设置为"POST"时有效，"GET"请求时忽略此数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    data?: string;
+    /**
+     * 下载文件保存的路径
+     * 保存文件路径仅支持以"_downloads/"、"_doc/"、"_documents/"开头的字符串。
+     * 	文件路径以文件后缀名结尾（如"_doc/download/a.doc"）表明指定保存文件目录及名称，以“/”结尾则认为指定保存文件的目录（此时程序自动生成文件名）。
+     * 	如果指定的文件已经存在，则自动在文件名后面加"(i)"，其中i为数字，如果文件名称后面已经是此格式，则数字i递增，如"download(1).doc"。
+     * 	默认保存目录为（"_downloads"），并自动生成文件名称。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    filename?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 下载任务的优先级
+     * 数值类型，数值越大优先级越高，默认优先级值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    priority?: number;
+    /**
+     * 下载任务超时时间
+     * 数值类型，单位为s(秒)，默认值为120s。
+     * 	超时时间为服务器响应请求的时间（不是下载任务完成的总时间），如果设置为0则表示永远不超时。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    timeout?: number;
+    /**
+     * 下载任务重试次数
+     * 数值类型，默认为重试3次。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    retry?: number;
+    /**
+     * 下载任务重试间隔时间
+     * 数值类型，单位为s(秒)，默认值为30s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/downloader.html](http://www.html5plus.org/doc/zh_cn/downloader.html)
+     */
+    retryInterval?: number;
+}
+
+/**
+ * Fingerprint模块管理指纹识别。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprint {
+    /**
+     * JSON对象，指纹识别认证参数
+     * 用于设置指纹识别认证界面显示的提示信息等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AuthenticateOptions?: PlusFingerprintAuthenticateOptions;
+    /**
+     * JSON对象，指纹识别错误信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    FingerprintError?: PlusFingerprintFingerprintError;
+    /**
+     * 当前设备环境是否支持指纹识别
+     * 目前还有很多设备没有指纹识别模块，需要调用此方法判断是否可使用指纹识别功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isSupport(): boolean;
+    /**
+     * 当前设备是否设置密码锁屏
+     * 如果设备没有设置密码锁屏，则无法使用指纹识别功能，建议调用指纹识别前先使用此接口检查。
+     * 	调用plus.fingerprint.authenticate会返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isKeyguardSecure(): boolean;
+    /**
+     * 当前设备是否已经录入指纹
+     * 如果设备没有录入指纹，则无法使用指纹识别功能，建议调用指纹识别前先使用此接口检查。
+     * 	调用plus.fingerprint.authenticate会返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    isEnrolledFingerprints(): boolean;
+    /**
+     * 指纹识别认证
+     * 用户可以开始输入指纹进行识别，如果认证成功则触发successCB回调，识别失败则触发errorCB回调返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    authenticate(successCB?: () => void, errorCB?: (result: PlusFingerprintFingerprintError) => void, options?: PlusFingerprintAuthenticateOptions): void;
+    /**
+     * 取消指纹识别认证
+     * 取消当前正在处理的指纹识别认证操作。
+     * 	如果当前没有进行指纹识别则不进行任何操作；如果当前正在进行指纹识别则触发错误回调（错误码为“CANCEL”）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    cancel(): void;
+}
+
+/**
+ * JSON对象，指纹识别认证参数
+ * 用于设置指纹识别认证界面显示的提示信息等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprintAuthenticateOptions {
+    /**
+     * 在指纹识别过程中显示在界面上的提示信息
+     * 如果指纹识别认证过程中不显示提示框，则不显示此信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    message?: string;
+}
+
+/**
+ * JSON对象，指纹识别错误信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+ */
+interface PlusFingerprintFingerprintError {
+    /**
+     * 不支持指纹识别
+     * 当前设备不支持指纹识别功能时返回此错误，错误代码常量值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    UNSUPPORT?: number;
+    /**
+     * 设备未设置密码锁屏
+     * 当前设备为设置密码锁屏导致无法使用指纹识别功能时返回此错误，错误代码常量值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    KEYGUARD_INSECURE?: number;
+    /**
+     * 未录入指纹识别
+     * 当前设备未录入指纹导致无法使用指纹识别功能时返回此错误，错误代码常量值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    FINGERPRINT_UNENROLLED?: number;
+    /**
+     * 指纹识别不匹配
+     * 用户指纹识别认证不通过时返回此错误，错误代码常量值为4。
+     * 	用户每次尝试指纹识别认证未通过都会触发此错误，此时还可以继续识别认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AUTHENTICATE_MISMATCH?: number;
+    /**
+     * 指纹识别次数超过限制
+     * 用户多次指纹识别认证不通过时返回此错误，错误代码常量值为5。
+     * 	通常出现此错误后系统会锁定一段时间禁止使用指纹识别，如果再次调用指纹识别认证会立即返回此错误，因此出现此错误时应该提示用户使用其它方式进行认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    AUTHENTICATE_OVERLIMIT?: number;
+    /**
+     * 取消指纹识别
+     * 用户取消指纹识别认证时返回此错误，错误代码常量值为6。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    CANCEL?: number;
+    /**
+     * 未知错误
+     * 其它未知错误，错误代码常量值为7。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    UNKNOWN_ERROR?: number;
+    /**
+     * 错误代码
+     * 取值范围为FingerprintError对象的错误常量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    code?: number;
+    /**
+     * 错误描述信息
+     * 详细错误描述信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/fingerprint.html](http://www.html5plus.org/doc/zh_cn/fingerprint.html)
+     */
+    message?: string;
+}
+
+/**
+ * Gallery模块管理系统相册，支持从相册中选择图片或视频文件、保存图片或视频文件到相册等功能。通过plus.gallery获取相册管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGallery {
+    /**
+     * JSON对象，从相册中选择文件的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GalleryOptions?: PlusGalleryGalleryOptions;
+    /**
+     * 相册选择文件过滤类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GalleryFilter?: PlusGalleryGalleryFilter;
+    /**
+     * 保存图片到相册成功事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    GallerySaveEvent?: PlusGalleryGallerySaveEvent;
+    /**
+     * JSON对象，弹出拍照或摄像界面指示位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    PopPosition?: PlusGalleryPopPosition;
+    /**
+     * 从系统相册选择文件（图片或视频）
+     * 从系统相册中选择图片或视频文件。每次仅能选择一个文件，选择后将返回选择的文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    pick(succesCB?: (result: string) => void, errorCB?: (result: any) => void, options?: PlusGalleryGalleryOptions): void;
+    /**
+     * 保存文件到系统相册中
+     * 保存文件到系统相册中。
+     * 	每次仅能保存一个文件，支持图片类型（jpg/jpeg、png、bmp等格式）和视频文件（3gp、mov等格式）。
+     * 	若保存的文件系统不支持，则通过errorCB返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    save(path  ?: string, succesCB?: (result: PlusGalleryGallerySaveEvent) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，从相册中选择文件的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGalleryOptions {
+    /**
+     * 是否显示系统相册文件选择界面的动画
+     * 可取值true、false，默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    animation?: boolean;
+    /**
+     * 选择文件保存的路径
+     * 某些系统不能直接使用系统相册的路径，这时需要将选择的文件保存到应用可访问的目录中，可通过此参数设置保存文件的路径。
+     * 	如果路径中包括文件后缀名称，则表明指定文件路径及名称，否则仅指定文件保存目录，文件名称自动生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    filename?: string;
+    /**
+     * 相册中选择文件类型过滤器
+     * 系统相册选择器中可选择的文件类型，可设置为仅选择图片文件（“image”）、视频文件（“video”）或所有文件（“none”），默认值为“image”。
+     * - image: 仅可选择图片文件
+     * - video: 仅可选择视频文件
+     * - none: 可选择图片或视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    filter?: 'image' | 'video' | 'none';
+    /**
+     * 最多选择的图片数量
+     * 仅在支持多选时有效，取值范围为1到Infinity，默认值为Infinity，即不限制选择的图片数。
+     * 	如果设置的值非法则使用默认值Infinity。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    maximum?: number;
+    /**
+     * 是否支持多选图片
+     * 可从系统相册中选择多张图片，选择图片后通过GalleryMultiplePickSuccessCallback回调返回选择的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    multiple?: boolean;
+    /**
+     * 超过最多选择图片数量事件
+     * 使用相册多选图片时，可通过maximum属性设置最多选择的图片数量，当用户操作选择的数量大于此时触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    onmaxed?: () => void;
+    /**
+     * 相册选择界面弹出指示区域
+     * 对于大屏幕设备如iPad，相册选择界面为弹出窗口，此时可通过此参数设置弹出窗口位置。
+     * 	其为JSON对象，格式如{top:"10px",left:"10px",width:"200px",height:"200px"}，所有值为像素值，左上坐标相对于容器的位置，默认弹出位置为屏幕居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    popover?: PlusGalleryPopPosition;
+    /**
+     * 已选择的图片路径列表
+     * 仅在多图片选择时生效，相册选择界面将选中指定的图片路径列表。
+     * 	如果指定的路径无效，则忽略此项；如果指定的路径数超过maximum属性指定的最大选择数目则超出的图片不选中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    selected?: any [];
+    /**
+     * 是否使用系统相册文件选择界面
+     * multiple属性设置为true时，如果系统自带相册选择控件时则优先使用，否则使用5+统一相册选择控件；设置为false则不使用系统自带相册选择控件，直接使用5+统一相册选择界面。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    system?: boolean;
+}
+
+/**
+ * 相册选择文件过滤类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGalleryFilter {
+    /**
+     * 仅可选择图片文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    image?: string;
+    /**
+     * 仅可选择视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    video?: string;
+    /**
+     * 不过滤，可选择图片或视频文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    none?: string;
+}
+
+/**
+ * 保存图片到相册成功事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryGallerySaveEvent {
+    /**
+     * 保存到相册的图片路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    path?: string;
+}
+
+/**
+ * JSON对象，弹出拍照或摄像界面指示位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+ */
+interface PlusGalleryPopPosition {
+    /**
+     * 指示区域距离容器顶部的距离
+     * 弹出拍照或摄像窗口指示区域距离容器顶部的距离，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    top?: string;
+    /**
+     * 指示区域距离容器左侧的距离
+     * 弹出拍照或摄像窗口指示区域距离容器左侧的距离，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    left?: string;
+    /**
+     * 指示区域的宽度
+     * 弹出拍照或摄像窗口指示区域的宽度，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    width?: string;
+    /**
+     * 指示区域的高度
+     * 弹出拍照或摄像窗口指示区域的高度，单位支持像素值（如"100px"）和百分比（如"50%"），如不写单位则为像素值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/gallery.html](http://www.html5plus.org/doc/zh_cn/gallery.html)
+     */
+    height?: string;
+}
+
+/**
+ * Geolocation模块管理设备位置信息，用于获取地理位置信息，如经度、纬度等。通过plus.geolocation可获取设备位置管理对象。虽然W3C已经提供标准API获取位置信息，但在某些平台存在差异或未实现，为了保持各平台的统一性，定义此规范接口获取位置信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocation {
+    /**
+     * JSON对象，设备位置信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Position?: PlusGeolocationPosition;
+    /**
+     * JSON对象，地址信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Address?: PlusGeolocationAddress;
+    /**
+     * JSON对象，地理坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    Coordinates?: PlusGeolocationCoordinates;
+    /**
+     * JSON对象，监听设备位置信息参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    PositionOptions?: PlusGeolocationPositionOptions;
+    /**
+     * JSON对象，定位错误信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    GeolocationError?: PlusGeolocationGeolocationError;
+    /**
+     * 获取当前设备位置信息
+     * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取，由于获取位置信息可能需要较长的时间，当成功获取位置信息后将通过successCB回调函数返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    getCurrentPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, options?: PlusGeolocationPositionOptions): void;
+    /**
+     * 监听设备位置变化信息
+     * 位置信息将通过手机GPS设备或其它信息如IP地址、移动网络信号获取。
+     * 	当位置信息更新后将通过successCB回调函数返回。
+     * 	位置信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    watchPosition(successCB?: (result: PlusGeolocationPosition) => void, errorCB?: (result: PlusGeolocationGeolocationError) => void, option?: PlusGeolocationPositionOptions): number;
+    /**
+     * 关闭监听设备位置信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * JSON对象，设备位置信息数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationPosition {
+    /**
+     * 地理坐标信息，包括经纬度、海拔、速度等信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coords?: PlusGeolocationCoordinates;
+    /**
+     * 获取到地理坐标信息的坐标系类型
+     * 可取以下坐标系类型：
+     * 	"gps"：表示WGS-84坐标系；
+     * 	"gcj02"：表示国测局经纬度坐标系；
+     * 	"bd09"：表示百度墨卡托坐标系；
+     * 	"bd09ll"：表示百度经纬度坐标系。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coordsType?: string;
+    /**
+     * 获取到地理坐标的时间戳信息
+     * 时间戳值为从1970年1月1日至今的毫秒数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    timestamp?: number;
+    /**
+     * 获取到地理位置对应的地址信息
+     * 获取地址信息需要连接到服务器进行解析，所以会消耗更多的资源，如果不需要获取地址信息可通过设置PositionOptions参数的geocode属性值为false避免获取地址信息。
+     * 	如果没有获取到地址信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    address?: PlusGeolocationAddress;
+    /**
+     * 获取完整地址描述信息
+     * 如果没有获取到地址信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    addresses?: string;
+}
+
+/**
+ * JSON对象，地址信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationAddress {
+    /**
+     * 国家
+     * 如“中国”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    country?: string;
+    /**
+     * 省份名称
+     * 如“北京市”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    province?: string;
+    /**
+     * 城市名称
+     * 如“北京市”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    city?: string;
+    /**
+     * 区（县）名称
+     * 如“朝阳区”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    district?: string;
+    /**
+     * 街道信息
+     * 如“酒仙桥路”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    street?: string;
+    /**
+     * 获取街道门牌号信息
+     * 如“3号”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    streetNum?: string;
+    /**
+     * POI信息
+     * 如“电子城．国际电子总部”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    poiName?: string;
+    /**
+     * 邮政编码
+     * 如“100016”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    postalCode?: string;
+    /**
+     * 城市代码
+     * 如“010”，如果无法获取此信息则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    cityCode?: string;
+}
+
+/**
+ * JSON对象，地理坐标信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationCoordinates {
+    /**
+     * 坐标纬度值
+     * 数据类型对象，地理坐标中的纬度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    latitude?: number;
+    /**
+     * 坐标经度值
+     * 数据类型对象，地理坐标中的经度值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    longitude?: number;
+    /**
+     * 海拔信息
+     * 数据类型对象，如果无法获取此信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    altitude?: number;
+    /**
+     * 地理坐标信息的精确度信息
+     * 数据类型对象，单位为米，其有效值必须大于0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    accuracy?: number;
+    /**
+     * 海拔的精确度信息
+     * 数据类型对象，单位为米，其有效值必须大于0。如果无法获取海拔信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    altitudeAccuracy?: number;
+    /**
+     * 表示设备移动的方向
+     * 数据类型对象，范围为0到360，表示相对于正北方向的角度。如果无法获取此信息，则此值为空（null）。如果设备没有移动则此值为NaN。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    heading?: number;
+    /**
+     * 表示设备移动的速度
+     * 数据类型对象，单位为米每秒（m/s），其有效值必须大于0。如果无法获取速度信息，则此值为空（null）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    speed?: number;
+}
+
+/**
+ * JSON对象，监听设备位置信息参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationPositionOptions {
+    /**
+     * 是否高精确度获取位置信息
+     * 高精度获取表示需要使用更多的系统资源，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    enableHighAccuracy?: boolean;
+    /**
+     * 获取位置信息的超时时间
+     * 单位为毫秒（ms），默认值为不超时。如果在指定的时间内没有获取到位置信息则触发错误回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    timeout?: number;
+    /**
+     * 获取位置信息的间隔时间
+     * 单位为毫秒（ms），默认值为5000（即5秒）。调用plus.geolocation.watchPosition时为更新位置信息的间隔时间。
+     * 	注意：在不同定位模块下支持范围值可能不同，如百度定位模块的间隔范围为大于等于1秒，如果设置的值小于最小值则使用最小值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    maximumAge?: number;
+    /**
+     * 优先使用的定位模块
+     * 可取以下供应者：
+     * 	"system"：表示系统定位模块，支持wgs84坐标系；
+     * 	"baidu"：表示百度定位模块，支持gcj02/bd09/bd09ll坐标系；
+     * 	"amap"：表示高德定位模板，支持gcj02坐标系。
+     * 	默认值按以下优先顺序获取（amap&gt;baidu&gt;system），若指定的provider不存在或无效则返回错误回调。
+     * 	注意：百度/高德定位模块需要配置百度/高德地图相关参数才能正常使用。
+     * - system: 优先使用系统定位模块
+     * - baidu: 优先使用百度定位模块
+     * - amap: 优先使用高德定位模块
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    provider?: 'system' | 'baidu' | 'amap';
+    /**
+     * 指定获取的定位数据坐标系类型
+     * 可取以下坐标系类型：
+     * 	"wgs84"：表示WGS-84坐标系；
+     * 	"gcj02"：表示国测局经纬度坐标系；
+     * 	"bd09"：表示百度墨卡托坐标系；
+     * 	"bd09ll"：表示百度经纬度坐标系；
+     * 	provider为"system"时，默认使用"wgs84"坐标系；provider为"baidu"时，默认使用"gcj02"坐标系；provider为"amap"时，默认使用"gcj02"坐标系。
+     * 	如果设置的坐标系类型provider不支持，则返回错误。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    coordsType?: string;
+    /**
+     * 是否解析地址信息
+     * 解析的地址信息保存到Position对象的address、addresses属性中，true表示解析地址信息，false表示不解析地址信息，返回的Position对象的address、addresses属性值为undefined，默认值为true。
+     * 	如果解析地址信息失败则返回的Position对象的address、addresses属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    geocode?: boolean;
+}
+
+/**
+ * JSON对象，定位错误信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+ */
+interface PlusGeolocationGeolocationError {
+    /**
+     * 访问权限被拒绝
+     * 系统不允许程序获取定位功能，错误代码常量值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    PERMISSION_DENIED?: number;
+    /**
+     * 位置信息不可用
+     * 无法获取有效的位置信息，错误代码常量值为2。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    POSITION_UNAVAILABLE?: number;
+    /**
+     * 获取位置信息超时
+     * 无法在指定的时间内获取位置信息，错误代码常量值为3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    TIMEOUT?: number;
+    /**
+     * 未知错误
+     * 其它未知错误导致无法获取位置信息，错误代码常量值为4。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    UNKNOWN_ERROR?: number;
+    /**
+     * 错误代码
+     * 取值范围为GeolocationError对象的常量值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    code?: number;
+    /**
+     * 错误描述信息
+     * 详细错误描述信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/geolocation.html](http://www.html5plus.org/doc/zh_cn/geolocation.html)
+     */
+    message?: string;
+}
+
+/**
+ * iBeacon模块用于搜索附件的iBeacon设备（*请使用HBuilderX并更新到最新版本*）。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+ */
+interface PlusIbeacon {
+    /**
+     * iBeacon设备信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    IBeaconInfo?: PlusIbeaconIBeaconInfo;
+    /**
+     * 开始搜索附近的iBeacon设备
+     * 搜索成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    startBeaconDiscovery(uuids?: any [], ignoretoothAvailable?: boolean, success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 停止搜索附近的iBeacon设备
+     * 取消成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    stopBeaconDiscovery(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 获取已搜索到的iBeacon设备
+     * 获取成功后触发successCB回调，失败触发errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    getBeacons(success?: (result: any) => void, fail?: (result: any) => void, complete?: (result: any) => void): void;
+    /**
+     * 监听iBeacon设备更新
+     * iBeacon设备更新后触发updateCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    onBeaconUpdate(updateCB?: (result: any) => void): void;
+    /**
+     * 监听iBeacon服务状态变化
+     * iBeacon服务状态变化时触发changeCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    onBeaconServiceChange(changeCB?: (result: any) => void): void;
+}
+
+/**
+ * iBeacon设备信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+ */
+interface PlusIbeaconIBeaconInfo {
+    /**
+     * iBeacon设备广播的uuid
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    uuid?: string;
+    /**
+     * iBeacon设备的主id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    major?: string;
+    /**
+     * iBeacon设备的次id
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    minor?: string;
+    /**
+     * iBeacon设备的距离
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    proximity?: number;
+    /**
+     * iBeacon设备的距离精度信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    accuracy?: number;
+    /**
+     * iBeacon设备的信号强度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ibeacon.html](http://www.html5plus.org/doc/zh_cn/ibeacon.html)
+     */
+    rssi?: string;
+}
+
+/**
+ * IO模块管理本地文件系统，用于对文件系统的目录浏览、文件的读取、文件的写入等操作。通过plus.io可获取文件系统管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIo {
+    /**
+     * 文件系统中的目录对象，用于管理特定的本地目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DirectoryEntry?: PlusIoDirectoryEntry;
+    /**
+     * 读取目录信息对象，用于获取目录中包含的文件及子目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DirectoryReader?: PlusIoDirectoryReader;
+    /**
+     * 文件系统中的文件数据对象，用于获取文件的数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    File?: PlusIoFile;
+    /**
+     * 文件系统中的文件对象，用于管理特定的本地文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileEntry?: PlusIoFileEntry;
+    /**
+     * 文件系统中的读取文件对象，用于获取文件的内容
+     * FileReader对象是从设备文件系统读取文件FileReader对象是从设备文件系统读取文件的一种方式，文件以文本或者Base64编码的字符串形式读出来。
+     * 	用户注册自己的事件监听器来接收loadstart、progress、load、loadend、error和abort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileReader?: PlusIoFileReader;
+    /**
+     * 文件系统中的写文件对象，用于写入文件内容
+     * FileWriter对象是从设备文件系统写入文件FileWriter对象是从设备文件系统写入文件的一种方式，用户注册自己的事件监听器来接收writestart、progress、write、writeend、error和abort事件。
+     * 	一个FileWriter对象是为单个文件的操作而创建。你可以使用该对象多次对相应文件进行写入操作。FileWriter维护该文件的指针位置及长度属性，这样你就可以寻找和写入文件的任何地方。
+     * 	默认情况下，FileWriter从文件的开头开始写入（将覆盖现有数据）。FileWriter对象的seek方法可设置文件操作指定位置，如fw.seek(fw.length-1)写入操作就会从文件的末尾开始。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileWriter?: PlusIoFileWriter;
+    /**
+     * 文件系统对象，用于管理特定本地文件目录
+     * 文件系统对象表示一个应用可访问的根目录。name属性用于标识此根目录的名称，与LocalFileSystem中的文件系统类型一一对应。root属性为文件目录对象，用于实际操作文件系统，参考DirectoryEntry。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileSystem?: PlusIoFileSystem;
+    /**
+     * JSON对象，获取文件操作的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    Flags?: PlusIoFlags;
+    /**
+     * JSON对象，保存文件或目录的状态信息对象
+     * 可通过DirectoryEntry或FileEntry对象的getMetaData方法获取
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    Metadata?: PlusIoMetadata;
+    /**
+     * 文件或目录操作事件对象
+     * 所有文件或目录操作事件回调函数中都创建该对象的实例。
+     * 	该对象从DOMEvent继承而来，可通过该其target属性获取事件触发的文件或目录操作对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    FileEvent?: PlusIoFileEvent;
+    /**
+     * 文件路径类型
+     * 在文件系统中的文件路径需转换成URL格式，已方便runtime快速加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    URLType?: PlusIoURLType;
+    /**
+     * 相对路径URL
+     * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RelativeURL?: PlusIoRelativeURL;
+    /**
+     * 本地路径URL
+     * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+     * 	如示例：“file:///D:/res/hello.html”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LocalURL?: PlusIoLocalURL;
+    /**
+     * 网络路径URL
+     * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+     * 	如示例：“http://localhost:13131/_www/res/icon.png”，其中“_www”字段可支持类型与相对路径URL一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RemoteURL?: PlusIoRemoteURL;
+    /**
+     * 应用运行资源目录常量
+     * 本地文件系统常量，Number类型，固定值1。应用运行资源目录，仅本应用可访问。
+     * 	为了确保应用资源的安全性，此目录只可读。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PRIVATE_WWW?: number;
+    /**
+     * 应用私有文档目录常量
+     * 本地文件系统常量，Number类型，固定值2。应用私有文档目录，仅本应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PRIVATE_DOC?: number;
+    /**
+     * 程序公用文档目录常量
+     * 本地文件系统常量，Number类型，固定值3。程序公用文档目录，所有应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PUBLIC_DOCUMENTS?: number;
+    /**
+     * 程序公用下载目录常量
+     * 本地文件系统常量，Number类型，固定值4。程序公用下载目录，所有应用可读写。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    PUBLIC_DOWNLOADS?: number;
+    /**
+     * 请求本地文件系统对象
+     * 获取指定的文件系统，可通过type指定获取文件系统的类型。
+     * 	获取指定的文件系统对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    requestFileSystem(type?: number, succesCB?: (result: PlusIoFileSystem) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 通过URL参数获取目录对象或文件对象
+     * 快速获取指定的目录或文件操作对象，如通过URL值“_www/test.html”可直接获取文件操作对象。
+     * 	url值可支持相对路径URL、本地路径URL。
+     * 	获取指定的文件或目录操作对象成功通过succesCB回调返回，如果指定URL路径或文件不存在则失败通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    resolveLocalFileSystemURL(url ?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 将本地URL路径转换成平台绝对路径
+     * 绝对路径符合各平台文件路径格式，通常用于Native.JS调用系统原生文件操作API，也可以在前面添加“file://”后在html页面中直接使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    convertLocalFileSystemURL(url?: string): string;
+    /**
+     * 将平台绝对路径转换成本地URL路径
+     * 绝对路径符合各平台文件路径格式，转换后变成RelativeURL类型格式。
+     * 	功能与convertLocalFileSystemURL方法相反，将绝对路径转换成相对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    convertAbsoluteFileSystem(path?: string): string;
+}
+
+/**
+ * 文件系统中的目录对象，用于管理特定的本地目录
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoDirectoryEntry {
+    /**
+     * 操作对象的是否为文件，DirectoryEntry对象固定其值为false
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isFile?: boolean;
+    /**
+     * 操作对象是否为目录，DirectoryEntry对象固定其值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isDirectory?: boolean;
+    /**
+     * 目录操作对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 目录操作对象的完整路径，文件系统的绝对路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fullPath?: string;
+    /**
+     * 文件操作对象所属的文件系统对象，参考FileSystem
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileSystem?: PlusIoFileSystem;
+    /**
+     * 获取目录的属性
+     * 用于获取文件或目录的属性信息。
+     * 	获取属性信息成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void, recursive?: boolean): void;
+    /**
+     * 移动目录
+     * 以下情况移动目录将会导致失败：
+     * 	将父目录移动到子目录中；
+     * 	要移动到的目标目录无效；
+     * 	要移动到的目标路径被文件占用；
+     * 	要移动到的目标目录已经存在并且不为空。
+     * 	移动目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 拷贝目录
+     * 以下情况拷贝目录将会导致失败：
+     * 	将父目录拷贝到子目录中；
+     * 	要拷贝到的目标目录无效；
+     * 	要拷贝到的目标路径被文件占用；
+     * 	要拷贝到的目标目录已经存在并且不为空。
+     * 	拷贝目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取目录路径转换为URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toURL(): string;
+    /**
+     * 获取目录路径转换为本地路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toLocalURL(): string;
+    /**
+     * 获取目录路径转换为网络路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toRemoteURL(): string;
+    /**
+     * 删除目录
+     * 以下情况删除目录将会导致失败：
+     * 	目录中存在文件；
+     * 	删除根目录；
+     * 	删除目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取目录所属的父目录
+     * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 创建目录读取对象
+     * 创建一个目录读取对象，用户读取目下的文件及子目录。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    createReader(): PlusIoDirectoryReader;
+    /**
+     * 创建或打开子目录
+     * 创建或打开当前目录指定的目录。
+     * 	创建或打开目录操作成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getDirectory(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 创建或打开文件
+     * 创建或打开当前目录下指定的文件。
+     * 	创建或打开文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getFile(path?: string, flag?: PlusIoFlags, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 递归删除目录
+     * 删除目录将会删除其下的所有文件及子目录
+     * 	不能删除根目录，如果操作删除根目录将会删除目录下的文件及子目录，不会删除根目录自身。
+     * 	删除目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    removeRecursively(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 读取目录信息对象，用于获取目录中包含的文件及子目录
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoDirectoryReader {
+    /**
+     * 获取当前目录中的所有文件和子目录
+     * 获取当前目录下的所有文件和子目录。
+     * 	获取操作成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readEntries(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 文件系统中的文件数据对象，用于获取文件的数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFile {
+    /**
+     * 文件数据对象的数据大小，单位为字节
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    size?: number;
+    /**
+     * 文件数据对象MIME类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    type?: string;
+    /**
+     * 文件数据对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件对象的最后修改时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    lastModifiedDate?: Date;
+    /**
+     * 获取文件指定的数据内容
+     * 获取文件指定的数据内容，其中end必须大于start。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    slice(start?: number, end?: number): PlusIoFile;
+    /**
+     * 关闭文件数据对象
+     * 当文件数据对象不再使用时，可通过此方法关闭，释放系统资源。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    close(): void;
+}
+
+/**
+ * 文件系统中的文件对象，用于管理特定的本地文件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileEntry {
+    /**
+     * 文件操作对象的是否为文件，FileEntry对象固定其值为true
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isFile?: boolean;
+    /**
+     * 文件操作对象是否为目录，FileEntry对象固定其值为false
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    isDirectory?: boolean;
+    /**
+     * 文件操作对象的名称，不包括路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件操作对象的完整路径，文件系统的绝对路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fullPath?: string;
+    /**
+     * 文件操作对象所属的文件系统对象，参考FileSystem
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileSystem?: PlusIoFileSystem;
+    /**
+     * 获取文件的属性信息
+     * 用于获取文件的属性信息。
+     * 	获取属性信息成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getMetadata(succesCB?: (result: PlusIoMetadata) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 移动文件
+     * 以下情况移动目录将会导致失败：
+     * 	要移动到的目标目录无效；
+     * 	要移动到的目标路径被其它文件占用；
+     * 	移动文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    moveTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 拷贝文件
+     * 以下情况拷贝文件将会导致失败：
+     * 	要拷贝到的目标目录无效；
+     * 	要拷贝到的目标路径被其它文件占用；
+     * 	拷贝文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    copyTo(parent?: PlusIoDirectoryEntry, newName?: string, succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件路径转换为URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toURL(): string;
+    /**
+     * 获取文件路径转换为本地路径URL地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toLocalURL(): string;
+    /**
+     * 获取文件路径转换为网络路径URL地址
+     * URL地址格式为以“http://localhost:13131/”开头的网络路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    toRemoteURL(): string;
+    /**
+     * 删除文件
+     * 删除文件成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    remove(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件所属的父目录
+     * 获取父目录成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    getParent(succesCB?: (result: PlusIoDirectoryEntry) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件关联的写文件操作对象FileWriter
+     * 获取写文件操作对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    createWriter(succesCB?: (result: PlusIoFileWriter) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 获取文件数据对象
+     * 获取文件数据对象成功通过succesCB回调返回，失败则通过errorCB返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    file(succesCB?: (result: PlusIoFile) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 文件系统中的读取文件对象，用于获取文件的内容
+ * FileReader对象是从设备文件系统读取文件FileReader对象是从设备文件系统读取文件的一种方式，文件以文本或者Base64编码的字符串形式读出来。
+ * 	用户注册自己的事件监听器来接收loadstart、progress、load、loadend、error和abort事件。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileReader {
+    /**
+     * 值为0，开始读取文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    EMPTY?: number;
+    /**
+     * 值为1，正在读取文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LOADING?: number;
+    /**
+     * 值为2，读文件操作完成状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DONE?: number;
+    /**
+     * 当前读取文件所处的状态
+     * 可取上面定义的常量值，EMPTY（0）、LOADING（1）、DONE（2）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readyState?: number;
+    /**
+     * 已读取文件的内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    result?: string;
+    /**
+     * 文件操作错误代码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    error?: number;
+    /**
+     * 读取文件开始时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onloadstart?: (result: PlusIoFileEvent) => void;
+    /**
+     * 读取文件过程中的回调函数
+     * 用于获取文件读取进度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onprogress?: (result: PlusIoFileEvent) => void;
+    /**
+     * 读取文件成功完成的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onload?: (result: PlusIoFileEvent) => void;
+    /**
+     * 取消读取文件时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onabort?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件读取操作失败时调用的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onerror?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件读取操作完成时的回调函数
+     * 不管成功或失败都会触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onloadend?: (result: PlusIoFileEvent) => void;
+    /**
+     * 终止文件读取操作
+     * 读取文件操作开始后，可通过此方法取消读取文件。
+     * 	调用此方法后将触发文件读取对象的onabort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    abort(): void;
+    /**
+     * 以URL编码格式读取文件数据内容
+     * 读取文件的数据内容，并将数据内容进行URL编码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readAsDataURL(file?: PlusIoFile, encoding ?: string): void;
+    /**
+     * 以文本格式读取文件数据内容
+     * 读取文件的数据内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readAsText(file?: PlusIoFile, encoding ?: string): void;
+}
+
+/**
+ * 文件系统中的写文件对象，用于写入文件内容
+ * FileWriter对象是从设备文件系统写入文件FileWriter对象是从设备文件系统写入文件的一种方式，用户注册自己的事件监听器来接收writestart、progress、write、writeend、error和abort事件。
+ * 	一个FileWriter对象是为单个文件的操作而创建。你可以使用该对象多次对相应文件进行写入操作。FileWriter维护该文件的指针位置及长度属性，这样你就可以寻找和写入文件的任何地方。
+ * 	默认情况下，FileWriter从文件的开头开始写入（将覆盖现有数据）。FileWriter对象的seek方法可设置文件操作指定位置，如fw.seek(fw.length-1)写入操作就会从文件的末尾开始。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileWriter {
+    /**
+     * 值为0，写文件初始化状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    INIT?: number;
+    /**
+     * 值为1，正在写入文件状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    WRITING?: number;
+    /**
+     * 值为2，写文件操作完成状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    DONE?: number;
+    /**
+     * 当前写入文件所处的状态
+     * 可取上面定义的常量值，INIT(0)、WRITING（1）、DONE（2）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    readyState?: number;
+    /**
+     * 文件当前的长度，单位为字节
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    length?: number;
+    /**
+     * 文件当前操作的指针位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    position?: number;
+    /**
+     * 文件写入操作错误代码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    error?: number;
+    /**
+     * 写入文件开始时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwritestart?: (result: PlusIoFileEvent) => void;
+    /**
+     * 写入文件过程中的回调函数
+     * 用于获取文件读取进度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onprogress?: (result: PlusIoFileEvent) => void;
+    /**
+     * 写入文件成功完成的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwrite?: (result: PlusIoFileEvent) => void;
+    /**
+     * 取消写入文件时的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onabort?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件写入操作失败时调用的回调函数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onerror?: (result: PlusIoFileEvent) => void;
+    /**
+     * 文件写入操作完成时的回调函数
+     * 不管成功或失败都会触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    onwriteend?: (result: PlusIoFileEvent) => void;
+    /**
+     * 终止文件写入操作
+     * 写入文件数据操作开始后，可通过此方法取消写入文件数据操作。
+     * 	调用此方法后将触发文件写入对象的onabort事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    abort(): void;
+    /**
+     * 定位文件操作位置
+     * 定位文件的操作位置，有效值为0到文件的总长度减1。
+     * 	0表示文件的起始位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    seek(position?: number): void;
+    /**
+     * 按照指定长度截断文件
+     * 从文件当前定位的位置开始，按照指定长度截断文件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    truncate(length ?: number): void;
+    /**
+     * 向文件中写入数据
+     * 从文件当前定位的位置开始，写入数据到文件中。
+     * 	如果文件中已经存在数据，新写入的数据将覆盖已有数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    write(data ?: string): void;
+}
+
+/**
+ * 文件系统对象，用于管理特定本地文件目录
+ * 文件系统对象表示一个应用可访问的根目录。name属性用于标识此根目录的名称，与LocalFileSystem中的文件系统类型一一对应。root属性为文件目录对象，用于实际操作文件系统，参考DirectoryEntry。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileSystem {
+    /**
+     * 文件系统的名称
+     * 值为文件系统类型常量值字符串，如“PRIVATE_WWW”、“PRIVATE_DOCUMENTS”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    name?: string;
+    /**
+     * 文件系统的根目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    root?: PlusIoDirectoryEntry;
+}
+
+/**
+ * JSON对象，获取文件操作的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFlags {
+    /**
+     * 是否创建对象标记
+     * 指示如果文件或目录不存在时是否进行创建，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    create?: boolean;
+    /**
+     * 反向操作标记
+     * 其本身没有任何效果，需与create属性值设置为true时一起使用，如果目标文件或目录已经存在则会导致文件或目录打开失败，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    exclusive?: boolean;
+}
+
+/**
+ * JSON对象，保存文件或目录的状态信息对象
+ * 可通过DirectoryEntry或FileEntry对象的getMetaData方法获取
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoMetadata {
+    /**
+     * 文件或目录的最后修改时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    modificationTime?: Date;
+    /**
+     * 文件的大小
+     * 若获取的是目录对象的属性则值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    size?: number;
+    /**
+     * 包含的子目录数
+     * 若自身是文件则其值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    directoryCount?: number;
+    /**
+     * 目录的文件数
+     * 若自身是文件则其值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    fileCount?: number;
+}
+
+/**
+ * 文件或目录操作事件对象
+ * 所有文件或目录操作事件回调函数中都创建该对象的实例。
+ * 	该对象从DOMEvent继承而来，可通过该其target属性获取事件触发的文件或目录操作对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoFileEvent {
+    /**
+     * 文件或目录操作对象
+     * 在不同的回调中指向的对象不同，可指向的对象包括：FileEntry、DirectoryEntry、FileReader、FileWriter。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    target?: PlusIoDirectoryEntry;
+}
+
+/**
+ * 文件路径类型
+ * 在文件系统中的文件路径需转换成URL格式，已方便runtime快速加载。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoURLType {
+    /**
+     * 相对路径URL
+     * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RelativeURL?: PlusIoRelativeURL;
+    /**
+     * 本地路径URL
+     * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    LocalURL?: PlusIoLocalURL;
+    /**
+     * 网络路径URL
+     * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    RomoteURL?: string;
+}
+
+/**
+ * 相对路径URL
+ * 只能在扩展API中使用，相对于基座提供的特定目录，以“_”开头。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+interface PlusIoRelativeURL {
+    /**
+     * 应用资源目录
+     * 保存应用的所有html、css、js等资源文件，与文件系统中根目录PRIVATE_WWW一致，后面加相对路径如“_www/res/icon.png”。
+     * 	注意：应用资源目录是只读目录，只能读取次目录下的文件，不能修改或新建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _www?: string;
+    /**
+     * 应用私有文档目录
+     * 用于保存应用运行期业务逻辑数据，与文件系统中根目录PRIVATE_DOCUMENTS，如“_doc/userdata.xml”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _doc?: string;
+    /**
+     * 程序公用文档目录
+     * 用于保存程序中各应用间可共享文件的目录，与文件系统中根目录PUBLIC_DOCUMENTS，如“_document/share.doc”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _documents?: string;
+    /**
+     * 程序公用下载目录
+     * 用于保存程序下载文件的目录，与文件系统中根目录PUBLIC_DOWNLOADS，如“_download/mydoc.doc”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+     */
+    _downloads?: string;
+}
+
+/**
+ * 本地路径URL
+ * 可在html页面中直接访问本地资源，以“file:///”开头，后面跟随系统的绝对路径。
+ * 	如示例：“file:///D:/res/hello.html”。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+type PlusIoLocalURL = any;
+/**
+ * 网络路径URL
+ * 可在html页面中以网络资源模式访问本地资源，以“http://”开头，后面跟随相对路径。
+ * 	如示例：“http://localhost:13131/_www/res/icon.png”，其中“_www”字段可支持类型与相对路径URL一致。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/io.html](http://www.html5plus.org/doc/zh_cn/io.html)
+ */
+type PlusIoRemoteURL = any;
+
+/**
+ * Native.js for iOS封装一条通过JS语法直接调用Native Objective-C接口通道，通过plus.ios可调用几乎所有的系统API。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+interface PlusIos {
+    /**
+     * Objective-C类对象
+     * Objective-C类对象，可通过其属性获取类的常量，可通过方法来操作类的静态方法，也通过new方法来创建类的实例对象。
+     * 	对于类的静态方法，则直接通过.后面跟随方法名称调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    ClassObject?: PlusIosClassObject;
+    /**
+     * Objective-C实例对象
+     * Objective-C实例对象，可通过其方法来操作示例的变量和方法。
+     * 	注意：必须通过plusGetAttribute()方法读取示例对象的属性值，通过plusSetAttribute()方法设置示例对象的属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    InstanceObject?: PlusIosInstanceObject;
+    /**
+     * 导入Objective-C类对象
+     * 导入类对象后，就可以通过.操作符直接调用对象（类对象/实例对象）的方法。
+     * 	通过.操作符号调用方法时，不需要使用":"来分割参数。
+     * 	注意：导入类对象将会消耗较多的系统资源，不应该导入过多的类对象，可以使用plus.ios.invoke()来调用未导入类实例对象的方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    importClass(classname?: string): PlusIosClassObject;
+    /**
+     * 创建实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    newObject(classname?: string, args?: any): PlusIosInstanceObject;
+    /**
+     * 销毁实例对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    deleteObject(obj?: any): void;
+    /**
+     * 调用对象（类对象/示例对象）的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    invoke(obj?: PlusIosInstanceObject, name?: string, args?: any): any;
+    /**
+     * 实现代理的方法
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    implements(name?: string, obj?: any): PlusIosInstanceObject;
+    /**
+     * 获取当前Webview窗口对象的native层UIWebview实例对象
+     * UIWebview对象的API请参考Apple开发文档
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    currentWebview(): PlusIosInstanceObject;
+}
+
+/**
+ * Objective-C类对象
+ * Objective-C类对象，可通过其属性获取类的常量，可通过方法来操作类的静态方法，也通过new方法来创建类的实例对象。
+ * 	对于类的静态方法，则直接通过.后面跟随方法名称调用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+type PlusIosClassObject = any;
+
+/**
+ * Objective-C实例对象
+ * Objective-C实例对象，可通过其方法来操作示例的变量和方法。
+ * 	注意：必须通过plusGetAttribute()方法读取示例对象的属性值，通过plusSetAttribute()方法设置示例对象的属性值。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+ */
+interface PlusIosInstanceObject {
+    /**
+     * 获取Objective-C实例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    plusGetAttribute(name?: string): any;
+    /**
+     * 设置Objective-C示例对象的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/ios.html](http://www.html5plus.org/doc/zh_cn/ios.html)
+     */
+    plusSetAttribute(name?: string, value?: any): void;
+}
+
+/**
+ * Key管理设备按键事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKey {
+    /**
+     * 按键类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    KeyType?: PlusKeyKeyType;
+    /**
+     * 按键事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    KeyEvent?: PlusKeyKeyEvent;
+    /**
+     * 添加按键事件监听器
+     * 添加按键事件监听器，当指定的按键事件发生时，回调函数将触发。
+     * 	应用中存在多个Webview窗口时，按照窗口的显示栈顺序从后往前查找，查找到添加按键事件监听器的窗口后停止（中断前面Webview窗口对按键事件的监听），并向窗口触发执行按键回调事件。
+     * 	在同一Webview窗口中可多次调用此方法对同一事件添加多个监听器，触发时按照添加的顺序先后调用。
+     * 	注意：此方法无法监听软键盘的按键事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    addEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void, capture?: boolean): void;
+    /**
+     * 隐藏软键盘
+     * 隐藏已经显示的软键盘，如果软键盘没有显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    hideSoftKeybord(): void;
+    /**
+     * 设置辅助输入类型
+     * input的type类型为text获取焦点时，在软键盘上方显示辅助输入条方便用户快速输入。
+     * 	在页面中input编辑框type类型不为"tel"、"email"时生效（type为tel类型时一定显示tel的辅助输入条，type为email时一定显示email的辅助输入条）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    setAssistantType(type?: string): void;
+    /**
+     * 显示软键盘
+     * 强制显示系统软键盘，如果软键盘已经显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    showSoftKeybord(): void;
+    /**
+     * 移除按键事件监听器
+     * 从窗口移除指定的事件监听器。若没有查找到对应的事件监听器，则无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    removeEventListener(event?: PlusKeyKeyType, listener?: (result: PlusKeyKeyEvent) => void): void;
+}
+
+/**
+ * 按键类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKeyKeyType {
+    /**
+     * 设备“返回”按钮按键事件
+     * 如果需要改变默认“返回”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"backbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    backbutton?: string;
+    /**
+     * 键按下事件
+     * 如果需要改变默认键按下的处理逻辑，则可通过plus.key.addEventListener来注册监听"keydown"事件。
+     * 	可通过回调函数中KeyEvent对象的keyCode来获取按下的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keydown?: string;
+    /**
+     * 键松开事件
+     * 如果需要改变默认键松开的处理逻辑，则可通过plus.key.addEventListener来注册监听"keyup"事件。
+     * 	可通过回调函数中KeyEvent对象的keyCode来获取松开的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyup?: string;
+    /**
+     * 长按键事件
+     * 如果需要改变默认长按键的处理逻辑，则可通过plus.key.addEventListener来注册监听"longpressed"事件。
+     * 	长按键时会多次触发回调函数，通过回调函数中KeyEvent对象的keyCode来获取长按的键值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    longpressed?: string;
+    /**
+     * 设备“菜单”按钮按键事件
+     * 如果需要改变默认“菜单”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"menubutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    menubutton?: string;
+    /**
+     * 设备“搜索”按钮按键事件
+     * 如果需要改变默认“搜索”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"searchbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    searchbutton?: string;
+    /**
+     * 设备“音量+”按钮按键事件
+     * 如果需要改变默认“音量+”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"volumeupbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    volumeupbutton?: string;
+    /**
+     * 设备“音量-”按钮按键事件
+     * 如果需要改变默认“音量-”按钮的处理逻辑，则可通过plus.key.addEventListener来注册监听"volumedownbutton"事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    volumedownbutton?: string;
+}
+
+/**
+ * 按键事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+ */
+interface PlusKeyKeyEvent {
+    /**
+     * 触发按键事件的键值
+     * 键值由各系统平台定义，一些特殊按键在不同的设备上可能存在差异。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyCode?: number;
+    /**
+     * 按键事件类型
+     * 用于表明触发此按键事件的类型，值为KeyType中定义的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/key.html](http://www.html5plus.org/doc/zh_cn/key.html)
+     */
+    keyType?: PlusKeyKeyType;
+}
+
+/**
+ * Messaging模块管理设备通讯功能，可用于短信、彩信、邮件发送等。通过plus.messaging可获取设备通讯管理对象。另外也可以直接通过html中的href直接快速发送短信、拨打电话、发送邮件等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessaging {
+    /**
+     * 消息对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    Message?: PlusMessagingMessage;
+    /**
+     * 消息体内容类型
+     * 用于设定消息的消息体内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    BodyType?: PlusMessagingBodyType;
+    /**
+     * 简单短信类型常量
+     * 消息类型常量，Number类型，固定值为1，用于创建并发送短信。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_SMS?: number;
+    /**
+     * 彩信类型常量
+     * 消息类型常量，Number类型，固定值为2，用于创建并发送多媒体短信（彩信）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_MMS?: number;
+    /**
+     * 邮件类型常量
+     * 消息类型常量，Number类型，固定值为3，用于创建并发送邮件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    TYPE_EMAIL?: number;
+    /**
+     * 创建消息对象
+     * 创建指定类型的消息，消息类型可取plus.messaging.TYPE_SMS、plus.messaging.TYPE_MMS、plus.messaging.TYPE_EMAIL。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    createMessage(type ?: number): PlusMessagingMessage;
+    /**
+     * 发送消息
+     * 发送消息，发送成功回调successCB函数，发送失败回调errorCB函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    sendMessage(msg?: PlusMessagingMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 消息对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessagingMessage {
+    /**
+     * 收件人信息
+     * 字符串数组类型，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    to?: any [];
+    /**
+     * 抄送人信息
+     * 字符串数组类型，仅发送邮件时有效，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    cc?: any [];
+    /**
+     * 暗送人信息
+     * 字符串数组类型，仅发送邮件时有效，输入的地址收件人信息必须符合消息类型格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    bcc?: any [];
+    /**
+     * 发件人信息
+     * 仅在监听接收到的信息时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    from?: string;
+    /**
+     * 发送消息主题
+     * 字符串类型，仅发送邮件时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    subject?: string;
+    /**
+     * 发送消息内容
+     * 字符串类型，要发送的消息体内容，其格式必须与bodyType指定的一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    body?: string;
+    /**
+     * 发送消息内容类型
+     * 要发送消息体内容的类型，可取值"text"表示文本内容，"html"表示为html页面，默认值为"text"。
+     * - text/plain: 纯文本类型消息体内容
+     * - text/html: 网页数据类型消息体内容(用于发送邮件)
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    bodyType?: 'text/plain' | 'text/html';
+    /**
+     * 是否采用静默方式发送消息
+     * 布尔类型，可取值为true或false，true表示静默方式发送，不弹出界面；false表示非静默方式发送。默认采用非静默方式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    silent?: boolean;
+    /**
+     * 添加附件
+     * 向消息中添加附件，仅邮件类型消息支持，其它类型消息不支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    addAttachment(url?: string): void;
+}
+
+/**
+ * 消息体内容类型
+ * 用于设定消息的消息体内容。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+ */
+interface PlusMessagingBodyType {
+    /**
+     * 文本类型
+     * 纯文本类型消息体内容，默认消息体内容类型。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    'text/plain'?: string;
+    /**
+     * Html类型
+     * 网页数据类型消息体内容，可用于发送邮件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/messaging.html](http://www.html5plus.org/doc/zh_cn/messaging.html)
+     */
+    'text/html'?: string;
+}
+
+/**
+ * nativeObj管理系统原生对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObj {
+    /**
+     * 原生动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    AnimationOptions?: PlusNativeObjAnimationOptions;
+    /**
+     * 原生动画窗口样式
+     * 指定动画窗口的样式，如背景图片，绘制的文字等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    AnimationViewStyles?: PlusNativeObjAnimationViewStyles;
+    /**
+     * 原生图片对象
+     * 原生图片对象会占用较大的内存资源，在使用时需谨慎管理，当图片不再使用时应该及时调用clear方法进行销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Bitmap?: PlusNativeObjBitmap;
+    /**
+     * JSON对象，保存图片的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    BitmapSaveOptions?: PlusNativeObjBitmapSaveOptions;
+    /**
+     * 原生图片轮播控件对象
+     * 原生图片轮播控件对象从原生View控件（plus.nativeObj.View）继承而来，用于绘制图片轮播内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSlider?: PlusNativeObjImageSlider;
+    /**
+     * 图片轮播控件样式
+     * 从ViewStyles继承而来，扩展支持轮播图片等配置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSliderStyles?: PlusNativeObjImageSliderStyles;
+    /**
+     * 图片轮播控件中图片项配置参数
+     * 用于指定图片地址等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ImageSliderImageStyles?: PlusNativeObjImageSliderImageStyles;
+    /**
+     * 输入框样式
+     * 用于定义输入框的显示样式，如字体大小，提示内容等信息。
+     * 	输入文本内容在指定区域水平居左，垂直居中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    InputStyles?: PlusNativeObjInputStyles;
+    /**
+     * 区域信息对象
+     * 包括位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Rect?: PlusNativeObjRect;
+    /**
+     * 绘制区域样式对象
+     * 用于定义矩形区域的显示样式，如空心/实心样式、圆角等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    RectStyles?: PlusNativeObjRectStyles;
+    /**
+     * 富文本样式
+     * 用于定义富文本使用的默认使用的字体名称、字体文件路径等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    RichTextStyles?: PlusNativeObjRichTextStyles;
+    /**
+     * 区域信息对象
+     * 包括位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    Position?: PlusNativeObjPosition;
+    /**
+     * 绘制文本样式对象
+     * 用于定义文本的显示样式，如字体大小、字体颜色、字体粗细、字体样式、字体名称等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    TextStyles?: PlusNativeObjTextStyles;
+    /**
+     * 原生控件对象
+     * 原生控件对象可用于在屏幕上绘制图片或文本内容，当控件不再使用时需要调用close方法销毁控件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    View?: PlusNativeObjView;
+    /**
+     * View控件动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewAnimationOptions?: PlusNativeObjViewAnimationOptions;
+    /**
+     * View控件绘制元素参数
+     * 指定绘制图片、矩形区域、文本内容等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewDrawTagStyles?: PlusNativeObjViewDrawTagStyles;
+    /**
+     * View控件事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewEvents?: PlusNativeObjViewEvents;
+    /**
+     * JSON对象，View控件的系统状态栏区域样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewStatusbarStyles?: PlusNativeObjViewStatusbarStyles;
+    /**
+     * View控件样式
+     * 包括位置、大小等信息等，其中位置信息相对于父容器控件进行计算。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    ViewStyles?: PlusNativeObjViewStyles;
+}
+
+/**
+ * 原生动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值：
+     * 	"pop-in" - 从右侧平移入栈动画效果（副窗口从右侧向左平移滑出显示，主窗口从当前屏幕区域向左侧平移滑出被遮盖），如果仅传入一个View控件对象则自动降级为slide-in-right动画；
+     * 	"pop-out" - 从右侧平移出栈动画效果（副窗口从当前屏幕区域向右侧平移出可视区域，主窗口从左侧向右平移滑出显示），如果仅出入一个View控件对象则自动降级为slide-out-right动画；
+     * 	"slide-in-right" - 从右侧横向滑动效果（主窗口从当前屏幕右侧外向内横向滑动显示）；
+     * 	"slide-out-right - 横向向右侧滑出屏幕动画（主窗口从屏幕中横向向右侧滑动到屏幕外）。
+     * - pop-in: 
+     * 	从右侧平移入栈动画效果（副窗口从右侧向左平移滑出显示，主窗口从当前屏幕区域向左侧平移滑出被遮盖）。
+     * 								
+     * - pop-out: 
+     * 	从右侧平移出栈动画效果（副窗口从当前屏幕区域向右侧平移出可视区域，主窗口从左侧向右平移滑出显示）。
+     * 								
+     * - slide-in-right: 
+     * 	从右侧横向滑动效果（主窗口从当前屏幕右侧外向内横向滑动显示）。
+     * 								
+     * - slide-out-right: 
+     * 	横向向右侧滑出屏幕动画（主窗口从屏幕中横向向右侧滑动到屏幕外）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'pop-in' | 'pop-out' | 'slide-in-right' | 'slide-out-right';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    duration?: number;
+}
+
+/**
+ * 原生动画窗口样式
+ * 指定动画窗口的样式，如背景图片，绘制的文字等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjAnimationViewStyles {
+    /**
+     * 动画窗口上绘制的背景图片
+     * 图片可以通过Webview对象的draw方法截图，也可以通过Bitmap的API从本地文件中加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bitmap?: PlusNativeObjBitmap;
+    /**
+     * 动画窗口上绘制的文本内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    text?: string;
+    /**
+     * 动画窗口上绘制的文本样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textStyles?: PlusNativeObjTextStyles;
+    /**
+     * 动画窗口上绘制的文本区域
+     * 默认值为{top:'0px',left:'0px',width:'100%',height:'44px'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textRect?: PlusNativeObjRect;
+}
+
+/**
+ * 原生图片对象
+ * 原生图片对象会占用较大的内存资源，在使用时需谨慎管理，当图片不再使用时应该及时调用clear方法进行销毁。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjBitmap {
+    /**
+     * Bitmap对象的标识
+     * 在创建Bitmap对象时设置，如果没有设置标识，此属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 静态方法，获取所有Bitmap图片对象
+     * 获取应用运行期创建的所有Bitmap图片对象，包含所有空Bitmap对象，不包含已经销毁的Bitmap对象。返回的Bitmap对象在数组中按创建的属性排列，及数组中第一个是最先创建的Bitmap对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getItems(): PlusNativeObj [];
+    /**
+     * 静态方法，获取指定标识的Bitmap图片对象
+     * 在应用中已创建的图片对象中查找指定标识的Bitmap对象并返回。
+     * 	若存在多个相同标识的Bitmap图片，则返回第一个创建的Bitmap图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getBitmapById(id?: string): PlusNativeObjBitmap;
+    /**
+     * 销毁Bitmap图片
+     * 释放Bitmap图片占用的内存资源，销毁后图片对象将不可使用，其id属性值为undefined，调用其所有方法操作都会失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clear(): void;
+    /**
+     * 加载Bitmap图片
+     * 从指定的路径（仅支持本地文件系统）中加载图片，此操作将覆盖之前的图片内容，
+     * 	如果加载图片失败则保留之前的图片内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    load(path?: string, successCallback?: () => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 加载Base64编码格式图片到Bitmap对象
+     * 从Base64编码格式图片数据中加载图片，此操作将覆盖之前的图片内容，
+     * 	如果加载图片失败则保留之前的图片内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    loadBase64Data(data?: string, successCallback?: () => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 回收Bitmap图片内存
+     * 释放Bitmap图片占用的内存资源，但不销毁图片对象，依然可以继续使用图片对象。
+     * 	当图片对象再次被使用时会自动从设置的路径（构造函数或load/save方法设置）加载到内存中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    recycle(): void;
+    /**
+     * 保存图片
+     * 将图片保存到指定的路径（仅支持本地文件系统），如果图片为空或者指定的路径文件已经存在则返回失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    save(path?: string, options?: PlusNativeObjBitmapSaveOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取图片的Base64编码数据
+     * 读取图片的数据内容，并转换为Base64编码格式字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    toBase64Data(): string;
+}
+
+/**
+ * JSON对象，保存图片的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjBitmapSaveOptions {
+    /**
+     * 覆盖保存图片文件
+     * 仅在保存的图片路径文件存在时有效：
+     * 	true表示覆盖存在的文件；
+     * 	false表示不覆盖，如果文件存在，则返回失败。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    overwrite?: boolean;
+    /**
+     * 保存图片的格式
+     * 支持"jpg"、"png"，如果未指定则默认使用指定的保存路径后缀对应的文件格式，如果后缀文件格式无效则使用jpg格式。
+     * - jpg: JPG格式图片
+     * - png: PNG格式图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    format?: 'jpg' | 'png';
+    /**
+     * 保存图片的质量
+     * 取值范围为1-100，1表示使用最低的图片质量（保存后的图片文件最小）、100表示使用最高的图片质量（保存后的图片文件最大）；
+     * 	默认值为50。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    quality?: number;
+    /**
+     * 指定裁剪区域保存图片
+     * 相对于图片的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clip?: PlusNativeObjRect;
+}
+
+/**
+ * 原生图片轮播控件对象
+ * 原生图片轮播控件对象从原生View控件（plus.nativeObj.View）继承而来，用于绘制图片轮播内容。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSlider {
+    /**
+     * 添加图片轮播控件的图片
+     * 动态添加图片轮播控件显示的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    addImages(images?: PlusNativeObj []): void;
+    /**
+     * 获取当前图片轮播控件显示的图片索引值
+     * 索引值从0开始，即0表示图片轮播控件当前显示第一张图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    currentImageIndex(): number;
+    /**
+     * 设置图片轮播控件的图片
+     * 动态更新图片轮播控件显示的图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setImages(images?: PlusNativeObj []): void;
+}
+
+/**
+ * 图片轮播控件样式
+ * 从ViewStyles继承而来，扩展支持轮播图片等配置。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSliderStyles {
+    /**
+     * 是否自动播放
+     * 可取值：
+     * 		"true" - 自动播放；
+     * 		"false" - 不自动播放。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    autoplay?: boolean;
+    /**
+     * 是否可全屏显示
+     * 可取值：
+     * 		"true" - 表示可全屏显示，用户点击轮播图片时全屏显示；
+     * 		"false" - 表示不可全屏显示，用户点击轮播图片时无响应。
+     * 	默认值为"true"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fullscreen?: boolean;
+    /**
+     * 是否可循环轮播
+     * 可取值：
+     * 		"true" - 支持循环轮播；
+     * 		"false" - 不支持循环轮播。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    loop?: boolean;
+    /**
+     * 轮播的图片
+     * 至少必须设置一张图片的地址信息，否则可能导致图片轮播控件显示不正常。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    images?: PlusNativeObj [];
+    /**
+     * 自动播放切换时间
+     * 当autoplay属性值为true时生效，单位为毫秒。默认值为3000（3秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    interval?: number;
+}
+
+/**
+ * 图片轮播控件中图片项配置参数
+ * 用于指定图片地址等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjImageSliderImageStyles {
+    /**
+     * 图片地址
+     * 支持本地地址（相对地址、绝对路径、RelativeURL、本地路径URL）；
+     * 	也支持网络地址（http://或https://）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    src?: string;
+    /**
+     * 图片水平对齐方式
+     * 仅在图片显示的宽度与图片轮播控件宽度不一致时有效，可取值：
+     * 		"left" - 图片在轮播控件中水平居左对齐；
+     * 		"center" - 图片在轮播控件中水平居中对齐；
+     * 		"right" - 图片在轮播控件中水平居右对齐。
+     * 	默认值为"center"。
+     * - left: 图片在轮播控件中水平居左对齐
+     * - center: 图片在轮播控件中水平居中对齐
+     * - right: 图片在轮播控件中水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 图片显示的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，现对于图片轮播控件的高度；
+     * 		自动计算"auto"，如果指定图片宽度（width），则按图片实际大小等比缩放图片高度值，如果没有指定宽度（width值为"auto"）则自动缩放图片至可完整显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 图片显示的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于图片轮播控件的宽度；
+     * 		自动计算"auto"，如果指定图片高度（height），则按图片实际大小等比缩放图片宽度值，如果没有指定高度（height值为"auto"）则自动缩放图片至可完整显示。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 图片垂直对齐方式
+     * 仅在图片显示的高度与图片轮播控件宽度不一致时有效，可取值：
+     * 		"top" - 图片在轮播控件中垂直居顶对齐；
+     * 		"middle" - 图片在轮播控件中垂直居中对齐；
+     * 		"bottom" - 图片在轮播控件中垂直居底对齐。
+     * 	默认值为"middle"。
+     * - top: 图片在轮播控件中垂直居顶对齐
+     * - middle: 图片在轮播控件中垂直居中对齐
+     * - bottom: 图片在轮播控件中垂直居底对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    verticalAlign?: 'top' | 'middle' | 'bottom';
+}
+
+/**
+ * 输入框样式
+ * 用于定义输入框的显示样式，如字体大小，提示内容等信息。
+ * 	输入文本内容在指定区域水平居左，垂直居中显示。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjInputStyles {
+    /**
+     * 输入框类型
+     * 可取值：
+     * 		"email" - 邮箱地址输入框；
+     * 		"number" - 数字输入框；
+     * 		"search" - 搜索文本输入框；
+     * 		"tel" - 电话号码输入框；
+     * 		"text" - 普通文本输入框；
+     * 		"url" - URL地址输入框。
+     * 	默认为text（即普通文本输入框）。
+     * - email: 邮箱地址输入框
+     * - number: 数字输入框
+     * - search: 搜索文本输入框
+     * - tel: 电话号码输入框
+     * - text: 普通文本输入框
+     * - url: URL地址输入框
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'email' | 'number' | 'search' | 'tel' | 'text' | 'url';
+    /**
+     * 输入框的提示文本
+     * 当用户未输入内容时显示在编辑框中（灰色文字）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    placeholder?: string;
+    /**
+     * 输入框的字体大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"12px"。 
+     * 	默认值为"16px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSize?: string;
+    /**
+     * 输入框的边框颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示红色边框。默认值为"#000000"（黑色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderColor?: string;
+    /**
+     * 输入框边框圆角半径
+     * 可取值：圆角半径像素值，数字加"px"格式字符串，如"6px"。
+     * 	默认值为"0px"（边框无圆角）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderRadius?: string;
+    /**
+     * 输入框的边框宽度
+     * 可取值：像素值，数字加"px"格式字符串，如"2px"。 默认值为"1px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderWidth?: string;
+    /**
+     * 输入框完成输入事件
+     * 弹出软键盘完成输入后，点击软键盘上的“完成”、“前往”按钮时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onComplete?: (result: any) => void;
+    /**
+     * 输入框获取焦点事件
+     * 当编辑框获取焦点时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onFocus?: (result: any) => void;
+    /**
+     * 输入框失去焦点事件
+     * 当编辑框失去焦点时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onBlur?: (result: any) => void;
+}
+
+/**
+ * 区域信息对象
+ * 包括位置、大小等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRect {
+    /**
+     * 区域左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于作用对象垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的宽度；
+     * 		自动计算，如"auto",根据width值自动计算，相对于作用对象水平居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * 区域的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 区域的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于作用对象的高度。
+     * 		内容自适应，如"wrap_content"，根据内容计算高度（如调用drawText绘制文本时支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+}
+
+/**
+ * 绘制区域样式对象
+ * 用于定义矩形区域的显示样式，如空心/实心样式、圆角等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRectStyles {
+    /**
+     * 绘制颜色
+     * 矩形填充区域的颜色，可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 矩形区域的圆角半径
+     * 可取值：圆角半径像素值，数字加"px"格式字符串，如"6px"。
+     * 	默认值为"0px"（矩形无圆角）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    radius?: string;
+    /**
+     * 矩形边框颜色
+     * 绘制矩形边框的颜色，可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为矩形填充区域颜色（color属性值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderColor?: string;
+    /**
+     * 矩形边框宽度
+     * 可取值：像素值，数字加"px"格式字符串，如"2px"。
+     * 	默认值为"0px"（无边框）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    borderWidth?: string;
+}
+
+/**
+ * 富文本样式
+ * 用于定义富文本使用的默认使用的字体名称、字体文件路径等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjRichTextStyles {
+    /**
+     * 富文本内容的水平对齐方式
+     * 对整体内容有效，无法单独控制每行的内容。
+     * 	可取值：
+     * 	"left"-字体在指定的区域中水平居左对齐；
+     * 	"center"-字体在指定的区域中水平居中对齐；
+     * 	"right"-字体在指定的区域中水平居右对齐。
+     * 	默认值为"left"。
+     * - left: 富文本内容水平居左对齐
+     * - center: 富文本内容水平居中对齐
+     * - right: 富文本内容水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 富文本默认使用的字体名称
+     * 例如"Times New Roman"，	如果指定名称的字体不存在，则使用系统默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    family?: string;
+    /**
+     * 富文本默认使用的字体文件路径
+     * 加载字体文件路径，必须为本地路径，如果指定的文件路径无效，则使用系统默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSrc?: string;
+    /**
+     * 点击事件回调函数
+     * 如果设置此属性，则表示拦截所有RichText上的点击事件（不透传事件）。
+     * 	如果没有设置此属性，则仅拦截操作包含onclick属性的a/img标签的点击事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    onClick?: (result: any) => void;
+}
+
+/**
+ * 区域信息对象
+ * 包括位置、大小等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjPosition {
+    /**
+     * 区域顶部相对于作用对象（或容器）向下的偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于作用对象（或容器）的高度；
+     * 	自动计算，如"auto",根据height值自动计算，相对于作用对象（或容器）垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域左侧相对于作用对象（或容器）向右的偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于作用对象（或容器）的宽度；
+     * 	自动计算，如"auto",根据width值自动计算，相对于作用对象（或容器）水平居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * 区域的宽度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+    /**
+     * 区域的高度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 区域底部相对于作用对象（或容器）向上的偏移量
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的高度。
+     * 	当设置了top和height值时，忽略此属性值；
+     * 	当未设置top值时，可通过bottom属性值来确定区域的垂直位置；
+     * 	当未设置height值时，可通过top和bottom属性值来确定区域的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bottom?: string;
+    /**
+     * 区域右侧相对于作用对象（或容器）向左的偏移量
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于作用对象（或容器）的宽度。
+     * 	当设置了left和width值时，忽略此属性值；
+     * 	当未设置left值时，可通过right属性值来确定区域的水平位置；
+     * 	当未设置width值时，可通过left和right属性值来确定区域的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    right?: string;
+}
+
+/**
+ * 绘制文本样式对象
+ * 用于定义文本的显示样式，如字体大小、字体颜色、字体粗细、字体样式、字体名称等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjTextStyles {
+    /**
+     * 水平对齐方式
+     * 可取值：
+     * 	"left"-字体在指定的区域中水平居左对齐；
+     * 	"center"-字体在指定的区域中水平居中对齐；
+     * 	"right"-字体在指定的区域中水平居右对齐。
+     * 	默认值为"center"。
+     * - left: 字体在指定的区域中水平居左对齐
+     * - center: 字体在指定的区域中水平居中对齐
+     * - right: 字体在指定的区域中水平居右对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 字体颜色
+     * 可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#000000"（黑色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 文本装饰
+     * 可取值：
+     * 		"none" - 无装饰效果；
+     * 		"underline" - 文本带下划线效果；
+     * 		"line-through" - 文本带贯穿线（删除线）效果。
+     * 	默认值为"none"。
+     * - none: 
+     * 	无装饰效果
+     * 								
+     * - underline: 
+     * 	文本带下划线效果
+     * 								
+     * - line-through: 
+     * 	文本带贯穿线（删除线）效果
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    decoration?: 'none' | 'underline' | 'line-through';
+    /**
+     * 字体名称
+     * 例如"Times New Roman"，	如果指定名称的字体不存在，则使用默认字体。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    family?: string;
+    /**
+     * 字体文件路径
+     * 加载字体文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    fontSrc?: string;
+    /**
+     * 文本的行间距
+     * 可取值：
+     * 	像素值，如"100px"；百分比，如"10%"，相对于字体的高度（size属性）；
+     * 	默认值为"20%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    lineSpacing?: string;
+    /**
+     * 字体的边距
+     * 用于设置字体在绘制目标区域四个方向（top/right/bottom/left）的边距，可取值：像素值，如"10px"；百分比，相对于绘制目标区域，如"5%"；
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    margin?: string;
+    /**
+     * 文本内容超出显示区域时处理方式
+     * 可取值：
+     * 		"clip" - 超出显示区域时内容裁剪；
+     * 		"ellipsis" - 超出显示区域时尾部显示省略标记（...）。
+     * 	默认值为"clip"。
+     * - clip: 
+     * 	
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    overflow?: 'clip';
+    /**
+     * 字体大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"12px"。
+     * 	默认值为"16px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    size?: string;
+    /**
+     * 字体样式
+     * 可取值："normal" - 正常字体样式；"italic" - 斜体样式。默认值为"normal"。
+     * - normal: 正常字体样式
+     * - italic: 斜体样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    style?: 'normal' | 'italic';
+    /**
+     * 垂直对齐方式
+     * 文本内容在指定绘制区域中的垂直对齐方式，可取值：
+     * 		"top" - 垂直居顶对齐；
+     * 		"middle" - 垂直居中对齐；
+     * 		"bottom" - 垂直居底对齐。
+     * 	默认值为"middle"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    verticalAlign?: string;
+    /**
+     * 字体粗细
+     * 可取值："normal" - 普通字体；"bold" - 粗字体。默认值为"normal"。
+     * - normal: 普通字体
+     * - bold: 粗字体
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    weight?: 'normal' | 'bold';
+    /**
+     * 文本换行模式
+     * 可取值：
+     * 		"nowrap" - 不换行，将所有文本在一行中绘制，忽略换行符("\n")；
+     * 		"normal" - 自动换行，当指定的宽度无法绘制所有文本时自动换行绘制，碰到'\n'字符时强制换行。
+     * 	默认值为"nowrap"。
+     * - nowrap: 
+     * 	不换行，将所有文本在一行中绘制，忽略换行符("\n")
+     * 								
+     * - normal: 
+     * 	自动换行，当指定的宽度无法绘制所有文本时自动换行绘制，碰到'\n'字符时强制换行
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    whiteSpace?: 'nowrap' | 'normal';
+}
+
+/**
+ * 原生控件对象
+ * 原生控件对象可用于在屏幕上绘制图片或文本内容，当控件不再使用时需要调用close方法销毁控件。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjView {
+    /**
+     * View对象的标识
+     * 在创建原生控件View对象时设置，如果没有设置标识，此属性值为null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 静态方法，开始原生动画
+     * 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    startAnimation(options?: PlusNativeObjAnimationOptions, view?: PlusNativeObjAnimationViewStyles, otherview?: PlusNativeObjAnimationViewStyles, callback?: () => void): void;
+    /**
+     * 静态方法，关闭原生动画窗口
+     * 通过plus.nativeObj.View.startAnimation方法开始原生动画后，不会自动关闭原生动画窗口对象，需要调用此方法关闭原生动画。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clearAnimation(type?: string): void;
+    /**
+     * 静态方法，获取指定标识的View控件对象
+     * 如果存在多个指定id标识的View对象，则返回第一个创建的View控件对象。
+     * 	如果不存在指定id标识的View对象，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getViewById(id?: string): PlusNativeObjView;
+    /**
+     * 添加事件监听器
+     * 向View控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。
+     * 		可多次调用此方法向Webview添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 		可通过setTouchEventRect方法指定监听触屏操作的区域。
+     * 		注意：默认View控件拦截处理触屏事件，可调用view.interceptTouchEvent(false)改变为不拦截处理触屏事件（透传）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    addEventListener(event?: PlusNativeObjViewEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * View控件内容动画
+     * 动画后可能会导致View控件显示内容改变，可通过调用restore方法恢复。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    animate(options?: PlusNativeObjViewAnimationOptions, callback?: () => void): void;
+    /**
+     * 关闭View控件
+     * 释放View控件资源，View对象不可再操作，如果View控件已经显示则自动隐藏。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    close(): void;
+    /**
+     * 清空矩形区域
+     * 清除指定矩形区域内容，透明显示其后面的内容。
+     * 	可多次调用设置多个区域透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    clearRect(position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制内容
+     * 在当前View控件之上绘制指定的内容，可一次指定绘制多个元素，绘制元素可以是图片/矩形区域/文本，
+     * 	即将多次调用drawBitmap/drawRect/drawText方法合并调用一次draw方法来实现，
+     * 	推荐使用draw方法来替换多次调用drawBitmap/drawRect/drawText。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    draw(tags?: PlusNativeObj []): void;
+    /**
+     * 绘制图片
+     * 在当前View控件之上绘制指定的图片，如果图片无效则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawBitmap(src?: string, sprite?: PlusNativeObjPosition, position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制矩形区域
+     * 在当前View控件之上绘制指定颜色的矩形区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawRect(styles?: PlusNativeObjRectStyles, position?: PlusNativeObjPosition, id?: string): void;
+    /**
+     * 绘制文本
+     * 在当前View控件之上绘制指定的文本内容，如果文本为空则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawText(text?: string, position?: PlusNativeObjPosition, styles?: PlusNativeObjTextStyles, id?: string): void;
+    /**
+     * 绘制富文本
+     * 在当前View控件之上绘制指定的文本内容，如果文本为空则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawRichText(text?: string, position?: PlusNativeObjPosition, styles?: PlusNativeObjRichTextStyles, id?: string): void;
+    /**
+     * 绘制输入框
+     * 在当前View控件之上绘制输入框。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    drawInput(position?: PlusNativeObjPosition, styles?: PlusNativeObjInputStyles, id?: string): void;
+    /**
+     * 获取编辑框的焦点状态
+     * 通过id查找到指定的编辑框，获取其焦点状态。
+     * 	如果指定的id无效则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getInputFocusById(id?: string): boolean;
+    /**
+     * 获取编辑框的内容
+     * 通过id查找到指定的编辑框，获取其输入的字符串。
+     * 	如果指定的id无效则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    getInputValueById(id?: string): string;
+    /**
+     * 重置view控件显示内容
+     * 清除调用drawBitmap、drawText方法绘制的内容，将View控件重置为空内容（透明不可见）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    reset(): void;
+    /**
+     * 恢复View控件显示内容
+     * 恢复调用animate方法改变View控件的内容，更新至动画前的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    restore(): void;
+    /**
+     * 显示View控件
+     * 将View控件显示到屏幕，显示在所有Webview窗口之上。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    show(): void;
+    /**
+     * 设置编辑框的焦点状态
+     * 通过id查找到指定的编辑框，并设置编辑框的焦点状态。
+     * 	如果指定的id无效则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setInputFocusById(id?: string, focusable?: boolean): string;
+    /**
+     * 设置View控件的样式
+     * 动态更新View控件样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setStyle(styles?: PlusNativeObjViewStyles): void;
+    /**
+     * 指定监听触屏事件区域
+     * 当调用addEventListener监听View控件事件时，可调用此方法限定监听事件的区域，仅当用户触屏操作在指定区域时才触发监听事件。
+     * 	非限定监听事件的区域则不拦截，透传给其它窗口处理。
+     * 	注意：此操作覆盖之前设置的区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    setTouchEventRect(rect?: PlusNativeObj []): void;
+    /**
+     * 隐藏View控件
+     * 将View控件从屏幕隐藏，如果View控件未显示则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    hide(): void;
+    /**
+     * 是否拦截View控件的触屏事件
+     * 设置为拦截后View控件上的触屏事件不再传递（即不透传），否则触屏事件将继续传递给View控件下的其它窗口处理（即透传）。
+     * 	注意：View控件默认拦截触屏事件（不透传）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    interceptTouchEvent(intercept?: boolean): void;
+    /**
+     * 获取View控件的显示状态
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    isVisible(): boolean;
+}
+
+/**
+ * View控件动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值："shrink" - 从上到下分块收缩清除窗口动画。
+     * - shrink: 从上到下分块清除动画
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    type?: 'shrink';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    duration?: number;
+    /**
+     * 动画帧数
+     * 必须为大于0的整数，默认值为12。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    frames?: number;
+    /**
+     * 动画作用区域
+     * 支持以下属性：
+     * 	top - 区域距离控件顶部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	bottom - 区域距离控件底部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	left - 区域距离控件左侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'；
+     * 	right - 区域距离控件右侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'。
+     * 	如“{top:'44px',bottom:'48px'}”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    region?: PlusNativeObjRect;
+}
+
+/**
+ * View控件绘制元素参数
+ * 指定绘制图片、矩形区域、文本内容等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewDrawTagStyles {
+    /**
+     * 绘制操作标识
+     * 可通过view对象的drawBitmap/drawRect/drawText/clearRect方法进行更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    id?: string;
+    /**
+     * 绘制操作类型
+     * 可取值：
+     * 	"img" - 绘制图片，与drawBitmap操作一致，此时id、src、position、sprite属性值有效；
+     * 	"rect" - 绘制矩形区域，与drawRect操作一致，此时id、color、position、rectStyles属性值有效；
+     * 	"font" - 绘制文本内容，与drawText操作一致，此时id、position、text、textStyles属性值有效；
+     * 	"richtext" - 绘制富文本内容，与drawRichText操作一致，此时id、position、text、richTextStyles属性值有效；
+     * 	"input" - 绘制输入框内容，此时id、position、inputStyles属性值有效。
+     * - img: 绘制图片
+     * - rect: 绘制矩形区域
+     * - font: 绘制文本内容
+     * - richtext: 绘制富文本内容
+     * - input: 绘制输入框内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    tag?: 'img' | 'rect' | 'font' | 'richtext' | 'input';
+    /**
+     * 矩形区域颜色
+     * 不推荐使用（推荐使用rectStyles），可取值：
+     * 	"#RRGGBB"格式字符串，如红色为"#FF0000"。
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	当tag属性值为"rect"时有效，用于指定矩形区域颜色，默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    color?: string;
+    /**
+     * 绘制输入框的样式
+     * 当tag属性值为"input"时有效，用于指定绘制输入框的样式、大小位置等信息。，
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    inputStyles?: PlusNativeObjInputStyles;
+    /**
+     * 绘制内容区域
+     * 当tag属性值为"img"时，用于指定绘制图片的目标区域；
+     * 	当tag属性值为"rect"时，用于指定绘制的矩形区域；
+     * 	当tag属性值为"font"时，用于指定绘制文本的目标区域，此时height属性值支持设置为"wrap_content"，表示文本高度根据内容自动计算，此时通过top来定位文本绘制的起始位置。
+     * 	相对于View控件的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    position?: PlusNativeObjPosition;
+    /**
+     * 绘制区域的样式
+     * 当tag属性值为"rect"时有效，用于指定绘制区域的样式、填充颜色、圆角大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    rectStyles?: PlusNativeObjRectStyles;
+    /**
+     * 绘制的图片资源
+     * 当tag属性值为"img"时有效，可以是图片资源路径（字符串类型）或者图片对象（plus.nativeObj.Bitmap对象）。
+     * 	src路径支持gif图片，但设置的图片路径文件使用".gif"后缀时则认为是gif图片，如"_www/loading.gif"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    src?: string;
+    /**
+     * 图片源的绘制区域
+     * 当tag属性值为"img"时有效，用于指定图片源的绘制区域，相对于图片的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    sprite?: PlusNativeObjPosition;
+    /**
+     * 绘制的文本内容
+     * 当tag属性值为"font"时有效，用于保存绘制的文本内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    text?: string;
+    /**
+     * 绘制文本的样式
+     * 当tag属性值为"font"时有效，用于指定绘制文本内容的字体大小、字体颜色、字体类型等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    textStyles?: PlusNativeObjTextStyles;
+    /**
+     * 绘制富文本的样式
+     * 当tag属性值为"richtext"时有效，用于指定绘制富文本内容的默认字体颜色、字体类型等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    richTextStyles?: PlusNativeObjRichTextStyles;
+}
+
+/**
+ * View控件事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewEvents {
+    /**
+     * 双击事件
+     * 双击屏幕时触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    doubleclick?: string;
+    /**
+     * 点击事件
+     * 当手指点击屏幕时触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    click?: string;
+    /**
+     * 开始触屏事件
+     * 当手指触摸屏幕时候触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchstart?: string;
+    /**
+     * 触摸滑屏事件
+     * 当手指在屏幕上滑动的时候连续地触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchmove?: string;
+    /**
+     * 结束触屏事件
+     * 当手指从屏幕上离开的时候触发。
+     * 	注意：如果将View控件设置为不拦截触屏事件（view.interceptTouchEvent(false)）则不会触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    touchend?: string;
+}
+
+/**
+ * JSON对象，View控件的系统状态栏区域样式
+ * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewStatusbarStyles {
+    /**
+     * 系统状态栏区域背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景，默认值为应用manifest.json中plus-&gt;statusbar-&gt;background属性配置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    background?: string;
+}
+
+/**
+ * View控件样式
+ * 包括位置、大小等信息等，其中位置信息相对于父容器控件进行计算。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+ */
+interface PlusNativeObjViewStyles {
+    /**
+     * 区域背景颜色
+     * 可取值：
+     * 	#RRGGBB"格式字符串，如"#FF0000"表示绘制红色区域；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。 默认值为"#FFFFFF"（白色）。 "rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。 默认值为"#FFFFFF"（白色）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    backgroundColor?: string;
+    /**
+     * View控件垂直向上的偏移量
+     * 现对于父容器底部的距离，可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父容器的高度，如果没有父容器则相对于屏幕高度。
+     * 	当设置了top和height值时，忽略此属性值；
+     * 	未设置height值时，可通过top和bottom属性值来确定View控件的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    bottom?: string;
+    /**
+     * View控件的停靠方式
+     * 仅当View控件添加到Webview窗口对象中并且position属性值设置为"dock"时才生效，此时View控件挤压Webview窗口的大小。
+     * 	可取值：
+     * 		"top"，控件停靠则页面顶部；
+     * 		"bottom"，控件停靠在页面底部；
+     * 		"right"，控件停靠在页面右侧；
+     * 		"left"，控件停靠在页面左侧。
+     * 	默认值为"top"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    dock?: string;
+    /**
+     * 区域的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父容器的高度，如果没有父容器则相对于屏幕高度；
+     * 		内容自适应，如"wrap_content"，根据内容计算控件的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    height?: string;
+    /**
+     * 区域左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父控件的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父控件水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    left?: string;
+    /**
+     * View控件的不透明度
+     * 取值范围为0-1，0为全透明，1为不透明，默认值为1，即不透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    opacity?: number;
+    /**
+     * View控件的排版方式
+     * 仅当View控件添加到Webview窗口对象中时才生效。
+     * 	可取值：
+     * 	"static"，View控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动；
+     * 	"absolute"，Veiw控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动；
+     * 	"dock"，View控件在页面中停靠，停靠的位置由dock属性值决定。
+     * 	默认值为"absolute"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    position?: string;
+    /**
+     * View控件的状态栏样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，设置此属性后将自动保留系统状态栏区域不被View控件占用（即View控件非沉浸式样式显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    statusbar?: PlusNativeObjViewStatusbarStyles;
+    /**
+     * View控件左上角的垂直偏移量
+     * 可取值：像素值，如"100px"；百分比，如"10%"，相对于父控件的高度；自动计算，如"auto",根据height值自动计算，相对于父控件垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    top?: string;
+    /**
+     * 区域的宽度
+     * 可取值：像素值，如"100px";百分比，如"10%"，相对于父控件的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeobj.html](http://www.html5plus.org/doc/zh_cn/nativeobj.html)
+     */
+    width?: string;
+}
+
+/**
+ * nativeUI管理系统原生界面，可用于弹出系统原生提示对话框窗口、时间日期选择对话框、等待对话框等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUI {
+    /**
+     * JSON对象，原生选择按钮框上按钮的样式参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ActionButtonStyles?: PlusNativeUIActionButtonStyles;
+    /**
+     * JSON对象，原生选择按钮框的样式参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ActionSheetStyles?: PlusNativeUIActionSheetStyles;
+    /**
+     * 确认对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ConfirmOptions?: PlusNativeUIConfirmOptions;
+    /**
+     * JSON对象，图片预览的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PreviewImageOptions?: PlusNativeUIPreviewImageOptions;
+    /**
+     * 日期选择对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PickDateOption?: PlusNativeUIPickDateOption;
+    /**
+     * JSON对象，时间选择对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    PickTimeOption?: PlusNativeUIPickTimeOption;
+    /**
+     * 系统原生界面基类对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    NativeUIObj?: PlusNativeUINativeUIObj;
+    /**
+     * 系统等待对话框对象
+     * 从NativeUIObj对象继承而来，通过plus.nativeUI.showWaiting方法创建时返回。
+     * 	用于控制系统样式等待对话框的操作，如关闭、设置标题内容等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingObj?: PlusNativeUIWaitingObj;
+    /**
+     * JSON对象，原生等待对话框的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingOptions?: PlusNativeUIWaitingOptions;
+    /**
+     * JSON对象，原生等待对话框上loading图标自定义样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    WaitingLoadingOptions?: PlusNativeUIWaitingLoadingOptions;
+    /**
+     * JSON对象，系统提示消息框要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    ToastOptions?: PlusNativeUIToastOptions;
+    /**
+     * 弹出系统选择按钮框
+     * 从底部动画弹出系统样式选择按钮框，可设置选择框的标题、按钮文字等。
+     * 	弹出的提示框为非阻塞模式，用户点击选择框上的按钮后关闭，并通过actionsheetCallback回调函数通知用户选择的按钮。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    actionSheet(actionsheetStyle?: PlusNativeUIActionSheetStyles, actionsheetCallback?: (result: any) => void): PlusNativeUINativeUIObj;
+    /**
+     * 弹出系统提示对话框
+     * 创建并显示系统样式提示对话框，可设置提示对话框的标题、内容、按钮文字等。
+     * 	弹出的提示对话框为非阻塞模式，用户点击提示对话框上的按钮后关闭，并通过alertCB回调函数通知对话框已关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    alert(message?: string, alertCB?: (result: any) => void, title?: string, buttonCapture?: string): void;
+    /**
+     * 弹出系统确认对话框
+     * 创建并显示系统样式确认对话框，可设置确认对话框的标题、内容、按钮数目及其文字。
+     * 	弹出的确认对话框为非阻塞模式，用户点击确认对话框上的按钮后关闭，并通过confirmCB回调函数通知用户点击的按钮索引值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    confirm(message?: string, confirmCB?: (result: any) => void, options?: PlusNativeUIConfirmOptions, buttons?: any []): void;
+    /**
+     * 关闭系统等待对话框
+     * 关闭已经显示的所有系统样式等待对话框，触发Waiting对象的onclose事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    closeWaiting(): void;
+    /**
+     * 关闭自动消失的提示消息
+     * 关闭已经显示的所有自动消失的提示框。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    closeToast(): void;
+    /**
+     * 预览图片
+     * 创建并显示全屏图片预览界面，用户点击图片或返回键退出预览界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    previewImage(urls?: any [], options?: PlusNativeUIPreviewImageOptions): void;
+    /**
+     * 显示系统等待对话框
+     * 创建并显示系统样式等待对话框，并返回等待对话框对象Waiting，显示后需调用其close方法进行关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    showWaiting(title?: string, options?: PlusNativeUIWaitingOptions): PlusNativeUIWaitingObj;
+    /**
+     * 弹出系统日期选择对话框
+     * 创建并显示系统样式日期选择对话框，可进行日期的选择。
+     * 	用户操作确认后通过successCB回调函数返回用户选择的日期，若用户取消选择则通过errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    pickDate(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickDateOption): void;
+    /**
+     * 弹出系统时间选择对话框
+     * 创建并弹出系统样式时间选择对话框，可进行时间的选择。
+     * 	用户操作确认后通过successCB回调函数返回用户选择的时间，若用户取消选择则通过errorCB回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    pickTime(successCB?: (result: any) => void, errorCB?: (result: any) => void, options?: PlusNativeUIPickTimeOption): void;
+    /**
+     * 弹出系统输入对话框
+     * 创建并显示系统样式输入对话框，可设置输入对话框的标题、内容、提示输入信息、按钮数目及其文字。
+     * 	弹出的输入对话框为非阻塞模式，其中包含编辑框供用户输入内容，用户点击输入对话框上的按钮后自动关闭，并通过promptCB回调函数返回用户点击的按钮及输入的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    prompt(message?: string, promptCB?: (result: any) => void, title?: string, tip?: string, buttons?: any []): void;
+    /**
+     * 显示自动消失的提示消息
+     * 创建并显示系统样式提示消息，弹出的提示消息为非阻塞模式，显示指定时间后自动消失。
+     * 	提示消息显示时间可通过options的duration属性控制，长时间提示消息显示时间约为3.5s，短时间提示消息显示时间约为2s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    toast(message?: string, options?: PlusNativeUIToastOptions): void;
+}
+
+/**
+ * JSON对象，原生选择按钮框上按钮的样式参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIActionButtonStyles {
+    /**
+     * 按钮上显示的文字颜色
+     * 可取值：
+     * 	"#RRGGBB"格式字符串，如"#FF0000"表示文字颜色为红色；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    color?: string;
+    /**
+     * 按钮上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 按钮的样式
+     * 可取值：
+     * 	"destructive" - 表示警示按钮样式，默认文字颜色为红色；
+     * 	"default" - 表示默认按钮样式。
+     * 	默认值为"default"。
+     * - destructive: 
+     * 	警示按钮样式。
+     * 								
+     * - default: 
+     * 	默认按钮样式。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: 'destructive' | 'default';
+}
+
+/**
+ * JSON对象，原生选择按钮框的样式参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIActionSheetStyles {
+    /**
+     * 选择按钮框的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 取消按钮上显示的文字内容
+     * 不设置此属性，则不显示取消按钮。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    cancel?: string;
+    /**
+     * 选择框上的按钮，ActionButtonStyles对象数组
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    buttons?: PlusNativeUI [];
+}
+
+/**
+ * 确认对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIConfirmOptions {
+    /**
+     * 确认对话框显示的标题
+     * 如果不设置此属性值，则不显示标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 确认对话框上显示的按钮
+     * 字符串数组，每项对应在确认对话框上显示一个按钮，用户点击后通过confirmCB返回用户点击按钮的在数组中的索引值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    buttons?: any [];
+    /**
+     * 对话框在屏幕中的垂直分享对齐方式
+     * 可取值：
+     * 		"top" - 表示垂直居顶对齐；
+     * 		"center" - 表示垂直居中对齐；
+     * 		"bottom" - 表示垂直居底对齐。
+     * 	默认值为"center"（垂直居中对齐）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    verticalAlign?: string;
+}
+
+/**
+ * JSON对象，图片预览的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPreviewImageOptions {
+    /**
+     * 图片预览的背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景。
+     * 	默认值为黑色（"#000000"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    background?: string;
+    /**
+     * 默认显示图片的索引值
+     * 索引值从0开始，默认值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    current?: number;
+    /**
+     * 图片指示器样式
+     * 可取值：
+     * 		"default" - 默认指示器（底部圆点样式）；
+     * 		"number" - 顶部数字指示器（顶部居中显示，文字为%当前图片索引值（从1开始）%/%图片总数%）；
+     * 		"none" - 不显示指示器。
+     * 	默认值为"default"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    indicator?: string;
+    /**
+     * 是否可循环预览
+     * 可取值：
+     * 		"true" - 支持循环预览；
+     * 		"false" - 不支持循环预览。
+     * 	默认值为"false"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    loop?: boolean;
+}
+
+/**
+ * 日期选择对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPickDateOption {
+    /**
+     * 日期选择对话框显示的标题
+     * 如果未设置标题，则默认显示标题为当前选择的日期。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 日期选择对话框默认显示的日期
+     * 如果未设置默认显示的日期，则显示当前的日期。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    date?: Date;
+    /**
+     * 日期选择对话框可选择的最小日期
+     * Date类型对象，如果未设置可选择的最小日期，则使用系统默认可选择的最小日期值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    minDate?: Date;
+    /**
+     * 日期选择对话框可选择的最大日期
+     * Date类型对象，如果未设置可选择的最大日期，则使用系统默认可选择的最大日期值。
+     * 	其值必须大于minDate设置的值，否则使用系统默认可选择的最大日期值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    maxDate?: Date;
+    /**
+     * 时间选择对话框弹出指示区域
+     * JSON类型对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，其值为相对于容器Webview的位置。
+     * 	如未设置此值，默认在屏幕居中显示。仅在iPad上有效，其它设备忽略此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    popover?: any;
+}
+
+/**
+ * JSON对象，时间选择对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIPickTimeOption {
+    /**
+     * 时间选择对话框默认显示的时间
+     * 如果未设置标题，则默认显示标题为当前选择的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    time?: Date;
+    /**
+     * 时间选择对话框显示的标题
+     * 如果未设置标题，则默认显示标题为当前选择的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    title?: string;
+    /**
+     * 是否24小时制模式
+     * true表示使用24小时制模式显示，fale表示使用12小时制模式显示，默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    is24Hour?: boolean;
+    /**
+     * 日期选择对话框弹出指示区域
+     * JSON类型对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，其值相对于容器webview的位置。
+     * 	如未设置此值，默认在屏幕居中显示。仅在iPad上有效，其它设备忽略此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    popover?: any;
+}
+
+/**
+ * 系统原生界面基类对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUINativeUIObj {
+    /**
+     * 关闭显示的系统原生界面
+     * 调用plus.nativeUI.actionSheet方法创建并显示系统界面后，可通过其close方法将原生界面关闭。
+     * 	此情况下触发界面关闭回调函数参数的index属性值为-1。
+     * 	注意：一个系统原生界面只能关闭一次，多次调用将无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    close(): void;
+}
+
+/**
+ * 系统等待对话框对象
+ * 从NativeUIObj对象继承而来，通过plus.nativeUI.showWaiting方法创建时返回。
+ * 	用于控制系统样式等待对话框的操作，如关闭、设置标题内容等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingObj {
+    /**
+     * 等待对话框关闭事件
+     * 等待框关闭时触发，当调用close方法或用户点击返回按钮导致等待框关闭时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    onclose?: () => void;
+    /**
+     * 设置等待对话框上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    setTitle(title?: string): void;
+    /**
+     * 关闭显示的系统等待对话框
+     * 调用plus.nativeUI.showWaiting方法创建并显示系统等待界后，可通过其close方法将原生等待控件关闭。
+     * 	一个系统等待对话框只能关闭一次，多次调用将无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    close(): void;
+}
+
+/**
+ * JSON对象，原生等待对话框的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingOptions {
+    /**
+     * 等待框背景区域的宽度
+     * 值支持像素值（"500px"）或百分比（"50%"），百分比相对于屏幕的宽计算，如果不设置则根据内容自动计算合适的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    width?: string;
+    /**
+     * 等待框背景区域的高度
+     * 值支持像素绝对值（"500px"）或百分比（"50%"），如果不设置则根据内容自动计算合适的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    height?: string;
+    /**
+     * 等待框中文字的颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为白色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    color?: string;
+    /**
+     * 等待框中文字的字体大小
+     * 如"14px"表示使用14像素高的文字，未设置则使用系统默认字体大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    size?: string;
+    /**
+     * 等待对话框中标题文字的水平对齐方式
+     * 对齐方式可选值包括："left"：水平居左对齐显示，"center"：水平居中对齐显示，"right"：水平居右对齐显示。默认值为水平居中对齐显示，即"center"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    textalign?: string;
+    /**
+     * 等待对话框的内边距
+     * 值支持像素值（"10px"）和百分比（"5%"），百分比相对于屏幕的宽计算，默认值为"3%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    padding?: string;
+    /**
+     * 等待对话框显示区域的背景色
+     * 背景色的值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为rgba(0,0,0,0.8)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    background?: string;
+    /**
+     * 等待对话框样式
+     * 可取值"black"、"white"，black表示等待框为黑色雪花样式，通常在背景主色为浅色时使用；white表示等待框为白色雪花样式，通常在背景主色为深色时使用。
+     * 	仅在iOS平台有效，其它平台忽略此值，未设置时默认值为white。
+     * - black: 黑色雪花样式，适合浅色界面使用
+     * - white: 白色雪花样式，适合深色界面使用
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: 'black' | 'white';
+    /**
+     * 等待框是否模态显示
+     * 模态显示时用户不可操作直到等待对话框关闭，否则用户在等待对话框显示时也可操作下面的内容，未设置时默认为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    modal?: boolean;
+    /**
+     * 等待框显示区域的圆角
+     * 值支持像素值（"10px"），未设置时使用默认值"10px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    round?: number;
+    /**
+     * 点击等待显示区域是否自动关闭
+     * true表示点击等待对话框显示区域时自动关闭，false则不关闭，未设置时默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    padlock?: boolean;
+    /**
+     * 返回键处理方式
+     * 可取值"none"表示截获处理返回键，但不做任何响应；"close"表示截获处理返回键并关闭等待框；"transmit"表示不截获返回键，向后传递给Webview窗口继续处理（与未显示等待框的情况一致）。
+     * - none: 截获返回键，不做任何响应
+     * - close: 截获返回键并关闭等待框
+     * - transmit: 不截获返回键，继续传递给Webview窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    back?: 'none' | 'close' | 'transmit';
+    /**
+     * 自定义等待框上loading图标样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    loading?: PlusNativeUIWaitingLoadingOptions;
+}
+
+/**
+ * JSON对象，原生等待对话框上loading图标自定义样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIWaitingLoadingOptions {
+    /**
+     * loading图标显示样式
+     * 可取值：
+     * 	"block"表示图标与文字分开两行显示，上面显示loading图标，下面显示文字；
+     * 	"inline"表示loading图标与文字在同一行显示，左边显示loading图标，右边显示文字；
+     * 	"none"表示不显示loading图标；
+     * - block: 
+     * 	loading图标与文字分开两行显示，上面显示loading图标，下面显示文字。
+     * 								
+     * - inline: 
+     * 	loading图标与文字在同一行显示，左边显示loading图标，右边显示文字。
+     * 								
+     * - none: 
+     * 	不显示loading图标。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    display?: 'block' | 'inline' | 'none';
+    /**
+     * loading图标高度
+     * 设置loading图标的高度（宽度等比率缩放），取值类型：像素值，如"14px"表示14像素高。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    height?: string;
+    /**
+     * loading图标路径
+     * 自定义loading图标的路径，png格式，并且必须是本地资源地址；
+     * 	loading图要求宽是高的整数倍，显示等待框时按照图片的高横向截取每帧刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    icon?: string;
+    /**
+     * loading图每帧刷新间隔
+     * 单位为ms（毫秒），默认值为100ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    interval?: number;
+}
+
+/**
+ * JSON对象，系统提示消息框要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+ */
+interface PlusNativeUIToastOptions {
+    /**
+     * 提示消息框在屏幕中的水平位置
+     * 可选值为"left"、"center"、"right"，分别为水平居左、居中、居右，未设置时默认值为"center"。
+     * - left: 水平居左对齐
+     * - center: 水平居中对齐
+     * - right: 水平居左对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    align?: 'left' | 'center' | 'right';
+    /**
+     * 提示消息框显示的时间
+     * 可选值为"long"、"short"，值为"long"时显示时间约为3.5s，值为"short"时显示时间约为2s，未设置时默认值为"short"。
+     * - long: 长显示时间
+     * - short: 短显示时间
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    duration?: 'long' | 'short';
+    /**
+     * 提示消息框上显示的图标
+     * 仅支持本地图片路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    icon?: string;
+    /**
+     * 图标的宽度
+     * 单位为px（逻辑像素值），默认值为图片的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    iconWidth?: string;
+    /**
+     * 图标的高度
+     * 单位为px（逻辑像素值），默认值为图片的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    iconHeight?: string;
+    /**
+     * 提示消息框上显示的样式
+     * 可取值：
+     * 	"block"表示图标与文字分两行显示，上面显示图标，下面显示文字；
+     * 	"inline"表示图标与文字在同一行显示，左边显示图标，右边显示文字。
+     * 	默认值为"block"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    style?: string;
+    /**
+     * 提示消息框上显示的文本类型
+     * 可取值：
+     * 		"text" - 显示的消息内容为文本字符串；
+     * 		"richtext" - 显示的消息内容为富文本内容。
+     * 	默认值为"text"。
+     * 	当type为"text"时，富文本使用html的部分标签，具体标签如下：
+     * 	图片标签&lt;img src="图片资源url地址" width="图片显示的宽度" height="图片显示的高度" onclick="console.log('clicked img')"&gt;&lt;/img&gt;；
+     * 	字体标签&lt;font color="字体颜色"&gt;&lt;/font&gt;，内容在一行显示不下时自动换行，行高默认为字体的1.2倍；
+     * 	换行标签&lt;br/&gt;；
+     * 	链接标签&lt;a onclick="console.log('clicked a')"&gt;链接地址&lt;/a&gt;。
+     * 	如示例“&lt;img onclick="console.log('clicked img')" src="http://img-cdn-qiniu.dcloud.net.cn/icon2.png"/&gt;&lt;a onclick="console.log(clicked a)"&gt;链接地址&lt;/a&gt;”。
+     * - text: 文本字符串
+     * - richtext: 富文本内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    type?: 'text' | 'richtext';
+    /**
+     * 富文本样式
+     * 当type属性值为"richtext"时有效，用于定义富文本的样式，如其文本对齐方式、使用的字体等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    richTextStyle?: PlusNativeObjRichTextStyles;
+    /**
+     * 提示消息在屏幕中的垂直位置
+     * 可选值为"top"、"center"、"bottom"，分别为垂直居顶、居中、居底，未设置时默认值为"bottom"。
+     * - top: 垂直居顶对齐
+     * - center: 垂直居中对齐
+     * - bottom: 垂直居底对齐
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/nativeui.html](http://www.html5plus.org/doc/zh_cn/nativeui.html)
+     */
+    verticalAlign?: 'top' | 'center' | 'bottom';
+}
+
+/**
+ * navigator用于管理浏览器运行环境信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigator {
+    /**
+     * 创建应用快捷方式要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    ShortcutOptions?: PlusNavigatorShortcutOptions;
+    /**
+     * 更新应用启动界面要设置的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    SplashscreenOptions?: PlusNavigatorSplashscreenOptions;
+    /**
+     * 运行环境权限类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    PermissionNames?: PlusNavigatorPermissionNames;
+    /**
+     * 检查运行环境的权限
+     * 向系统检查当前程序的权限状态，不触发权限相对应的功能API的调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    checkPermission(permission?: PlusNavigatorPermissionNames): string;
+    /**
+     * 关闭应用启动界面
+     * 很多情况下，应用启动后需要一段时间加载数据，为了避免界面显示空白内容，提高用户体验效果，这时可显示启动界面。
+     * 	等数据加载完成后再关闭启动界面进入应用，通常可在应用首界面加载数据完成并更新显示内容后调用此方法。
+     * 	注意：HBuilder7.1版本后启动界面不调用此方法超过6秒后会自动关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    closeSplashscreen(): void;
+    /**
+     * 查询设备是否为刘海屏
+     * 刘海屏返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasNotchInScreen(): boolean;
+    /**
+     * 查询应用启动界面是否已关闭
+     * 如果启动界面显示返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasSplashscreen(): boolean;
+    /**
+     * 更新程序启动界面
+     * 可设置启动界面显示的图片（仅支持本地文件路径，如果是网络资源可先通过plus.downloader.*下载到本地），
+     * 	更新启动界面后程序下次启动时生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    updateSplashscreen(options?: PlusNavigatorSplashscreenOptions): void;
+    /**
+     * 创建应用快捷方式
+     * 在系统桌面创建应用的快捷方式，点击后可直接启动应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    createShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    /**
+     * 查询是否存在应用快捷方式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    hasShortcut(options?: PlusNavigatorShortcutOptions, successCallback?: (result: any) => void): void;
+    /**
+     * 判断当前应用是否切换到后台
+     * 在多应用运行环境（如流应用）中，启动一个新应用时，之前运行的应用将会自动切换到后台运行，此时plus.navigator.isBackground()返回状态只为true。
+     * 	注意：此状态不是5+应用切换到系统后台的状态，而是在同一apk中同时运行多个应用时被切换到后台的状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isBackground(): boolean;
+    /**
+     * 判断应用当前是否全屏模式显示
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isFullscreen(): boolean;
+    /**
+     * 判断应用当前是否输出日志
+     * 日志包括应用原生层内部跟踪日志（ADB、LogCat工具可获取的日志）及JS层跟踪日志（console.log输出的日志）。
+     * 	开启日志在一定程度上会降低程序的性能，通常建议在正式发布时关闭日志输出，在调试时开启日志输出（此时可以通过工具ADB、LogCat获取分析日志）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isLogs(): boolean;
+    /**
+     * 设置应用是否全屏显示
+     * 设置应用在全屏模式显示时，将隐藏系统状态栏，通常游戏类应用才会设置为全屏模式显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setFullscreen(fullscreen?: boolean): void;
+    /**
+     * 设置应用是否输出日志
+     * 设置应用是否输出日志信息，默认关闭输出日志功能。
+     * 	日志包括应用原生层内部跟踪日志（ADB、LogCat工具可获取的日志）及JS层跟踪日志（console.log输出的日志）。
+     * 	开启日志在一定程度上会降低程序的性能，通常建议在正式发布时关闭日志输出，在调试时开启日志输出（此时可以通过工具ADB、LogCat获取分析日志）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setLogs(log?: boolean): void;
+    /**
+     * 设置系统状态栏背景颜色
+     * 设置应用在前台运行时系统状态栏的背景颜色，默认使用系统状态栏默认背景色（有系统状态栏样式决定）。
+     * 	注意：为了有更好的兼容性，避免设置接近白色或黑色的颜色值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setStatusBarBackground(color?: string): void;
+    /**
+     * 获取系统状态栏背景颜色
+     * 获取应用在前台运行时系统状态栏的背景颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusBarBackground(): string;
+    /**
+     * 设置系统状态栏样式
+     * 设置应用在前台运行时系统状态栏的样式，默认值可通过manifest.json文件的plus-&gt;statusbar-&gt;style配置。
+     * 	注意：此操作是应用全局配置，调用的Webview窗口关闭后仍然生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setStatusBarStyle(style?: string): void;
+    /**
+     * 获取系统状态栏样式
+     * 获取应用运行时系统状态栏的样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusBarStyle(): string;
+    /**
+     * 获取系统状态栏高度
+     * 单位为像素（px），值为Webview中的逻辑高度单位，如果要获取真实高度则必须乘以plus.screen.scale。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getStatusbarHeight(): number;
+    /**
+     * 判断当前是否为沉浸式状态栏模式
+     * 如果当前应用采用沉浸式状态栏则返回true，否则返回false。
+     * 	注意：如果当前系统版本不支持沉浸式状态栏也返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    isImmersedStatusbar(): boolean;
+    /**
+     * 设置userAgent值
+     * 设置应用通过navigator.userAgent获取的值，及所有发起Http请求时提交的userAgent值。
+     * 	如果要设置启动页面的userAgent值则需要在manifest.json中进行配置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setUserAgent(useragent?: string, checkplus?: boolean): void;
+    /**
+     * 获取userAgent值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getUserAgent(): string;
+    /**
+     * 设置Cookie值
+     * 设置应用发起Http请求时提交的cookie值，调用此接口后所有的请求都生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    setCookie(url?: string, value?: string): void;
+    /**
+     * 获取Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    getCookie(url?: string): string;
+    /**
+     * 删除应用所有Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeAllCookie(): void;
+    /**
+     * 删除应用Cookie
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeCookie(url?: string): void;
+    /**
+     * 删除应用所有会话期Cookie值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    removeSessionCookie(): void;
+}
+
+/**
+ * 创建应用快捷方式要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorShortcutOptions {
+    /**
+     * 快捷方式名称
+     * 如果未设置则使用应用的名称，manifest.json中name属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    name?: string;
+    /**
+     * 快捷方式的图标
+     * 如果未设置则优先使用应用中指定的图标（manifest.json中icon节点下对应分辨率的图标），如未区配则使用应用的图标（仅在独立打包时），否则使用runtime提供的默认图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    icon?: string;
+    /**
+     * 创建快捷方式后的提示信息
+     * 快捷方式创建成功后显示，默认提示内容为“"XXXX"已创建桌面快捷方式”，其中"XXXX"为程序的名称，如果不需要提示则设置此值为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    toast?: string;
+    /**
+     * 快捷方式的扩展参数
+     * 其中key和value值都必须是字符串类型。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    extra?: any;
+    /**
+     * 要启动Activity类名
+     * 通常情况下不需要指定此值，仅在5+SDK集成时自定义Activity才用到。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    classname?: string;
+    /**
+     * 是否需要强制创建快捷方式
+     * true表示强制创建，false表示不强制创建，默认值为true。
+     * 	强制创建可能会导致在无法判断快捷方式是否存在的设备上重复创建，如果需要尽可能避免出现重复创建桌面快捷方式则应该设置force属性值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    force?: boolean;
+}
+
+/**
+ * 更新应用启动界面要设置的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorSplashscreenOptions {
+    /**
+     * 启动界面的图片路径
+     * 仅支持本地文件路径，图片必须为png格式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    image?: string;
+    /**
+     * 是否自动关闭启动界面
+     * true表示应用启动后自动关闭启动界面，false表示应用启动后不自动关闭启动界面，需要在应用调用plus.navigator.closeSplashscreen()方法关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    autoclose?: boolean;
+    /**
+     * 是否自动关闭启动界面（WAP2APP应用）
+     * 与autoclose属性值作用一致，仅在WAP2APP应用中有效。
+     * 	不推荐设置此值，如果未设置会自动使用autoclose属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    autoclose_w2a?: boolean;
+    /**
+     * 启动界面延时关闭时间
+     * 仅在设置为自动关闭启动界面时有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    delay?: number;
+    /**
+     * 启动界面延时关闭时间（WAP2APP应用）
+     * 与delay属性值作用一致，仅在WAP2APP应用中有效。
+     * 	不推荐设置此值，如果未设置会自动使用delay属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    delay_w2a?: number;
+}
+
+/**
+ * 运行环境权限类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+ */
+interface PlusNavigatorPermissionNames {
+    /**
+     * 访问摄像头权限
+     * 用于调用摄像头（plus.camera.*、plus.barcode.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    CAMERA?: string;
+    /**
+     * 访问系统联系人权限
+     * 用于访问（读、写）系统通讯录（plus.gallery.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    CONTACTS?: string;
+    /**
+     * 访问系统相册权限
+     * 用于访问（读、写）系统相册（plus.gallery.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    GALLERY?: string;
+    /**
+     * 定位权限
+     * 用于获取当前用户位置信息（plus.geolocation.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    LOCATION?: string;
+    /**
+     * 消息通知权限
+     * 用于接收系统消息通知（plus.push.*）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    NOTIFITION?: string;
+    /**
+     * 录音权限
+     * 用于进行本地录音操作（plus.audio.AudioRecorder）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    RECORD?: string;
+    /**
+     * 创建桌面快捷方式权限
+     * 用于在系统桌面创建快捷方式图标（plus.navigator.createShortcut）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/navigator.html](http://www.html5plus.org/doc/zh_cn/navigator.html)
+     */
+    SHORTCUT?: string;
+}
+
+/**
+ * Orientation模块管理设备的方向信息，包括alpha、beta、gamma三个方向信息，通过plus.orientation可获取设备方向管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientation {
+    /**
+     * JSON对象，监听设备方向感应器参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    OrientationOption?: PlusOrientationOrientationOption;
+    /**
+     * JSON对象，设备方向信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    Rotation?: PlusOrientationRotation;
+    /**
+     * 获取当前设备的方向信息，包括alpha、beta、gamma三个方向信息
+     * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。 方向信息可通过successCB回调函数返回。方向信息获取失败则调用回调函数errorCB
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    getCurrentOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备方向信息的变化
+     * 方向信息是设备相对于水平初始方向分别以z、x、y轴为轴心旋转的角度，对应值为alpha、beta、gamma三个方向的信息。watchOrientation每隔固定时间就获取一次设备的方向信息，通过successCB回调函数返回。可通过option的frequency参数设定获取设备方向信息的时间间隔。方向信息获取失败则调用回调函数errorCB。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    watchOrientation(successCB?: (result: string) => void, errorCB?: (result: any) => void, option?: PlusOrientationOrientationOption): number;
+    /**
+     * 关闭监听设备方向信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * JSON对象，监听设备方向感应器参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientationOrientationOption {
+    /**
+     * 更新方向信息的时间间隔
+     * 数值类型，单位为ms，默认值为500ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    frequency?: number;
+}
+
+/**
+ * JSON对象，设备方向信息数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+ */
+interface PlusOrientationRotation {
+    /**
+     * 以z方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    alpha?: number;
+    /**
+     * 以x方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为-180到180（不等于180）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    beta?: number;
+    /**
+     * 以y方向为轴心的旋转角度
+     * 浮点数类型，只读属性，取值范围为-180到180（不等于180）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    gamma?: number;
+    /**
+     * 设备方向与地球磁场北极方向的角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    magneticHeading?: number;
+    /**
+     * 设备方向与地球真实北极方向的角度
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    trueHeading?: number;
+    /**
+     * 设备方向值的误差值
+     * 浮点数类型，只读属性，取值范围为0到360（不等于360）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/orientation.html](http://www.html5plus.org/doc/zh_cn/orientation.html)
+     */
+    headingAccuracy?: number;
+}
+
+/**
+ * Proximity模块管理设备距离传感器，可获取当前设备的接近距离信息，通过plus.proximity可获取设备距离传感管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+ */
+interface PlusProximity {
+    /**
+     * 获取当前设备的接近距离信息
+     * 获取当前接近设备的距离信息，距离值单位为厘米。如果感应器无法获取准确的距离值，则在接近设备时返回0，否则返回Infinity。 获取成功则调用successCB回调函数返接近回距离值。获取失败则调用errorCB回调函数错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    getCurrentProximity(successCB?: (result: number) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 监听设备接近距离的变化
+     * watchProximity将监听设备的接近距离信息变化事件，当接近距离发生变化时通过changeCB回调函数返回距离值。监听距离变化事件失败则通过errorCB回调函数返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    watchProximity(changeCB?: (result: number) => void, errorCB?: (result: any) => void): number;
+    /**
+     * 关闭监听设备接近距离变化
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/proximity.html](http://www.html5plus.org/doc/zh_cn/proximity.html)
+     */
+    clearWatch(watchId?: number): void;
+}
+
+/**
+ * Runtime模块管理运行环境，可用于获取当前运行环境信息、与其它程序进行通讯等。通过plus.runtime可获取运行环境管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntime {
+    /**
+     * JSON对象，打开第三方程序参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    ApplicationInf?: PlusRuntimeApplicationInf;
+    /**
+     * JSON对象，应用角标显示需要的通知栏消息的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    BadgeOptions?: PlusRuntimeBadgeOptions;
+    /**
+     * JSON对象，打开文件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    OpenFileOptions?: PlusRuntimeOpenFileOptions;
+    /**
+     * JSON对象，应用信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    WidgetInfo?: PlusRuntimeWidgetInfo;
+    /**
+     * JSON对象，应用安装参数
+     * 可通过对象设置安装的应用是否进行appid校验、版本号校验等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    WidgetOptions?: PlusRuntimeWidgetOptions;
+    /**
+     * 当前应用的APPID
+     * 当前应用的APPID，字符串类型。注意，如果是在HBuilder真机运行获取的是固定值"HBuilder"，需要提交App云端打包后运行才能获取真实的APPID值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    appid?: string;
+    /**
+     * 第三方程序调用时传递给程序的参数
+     * 第三方程序传递过来的参数，字符串格式类型数据。
+     * 	不是由第三方程序调用启动，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    arguments?: string;
+    /**
+     * 应用的市场推广渠道标识
+     * "qihoo:browser"标识360浏览器流应用，"qihoo:appstore "表示360手机助手流应用，"dcloud:streamapps"表示DCloud流应用基座。
+     * 	注意：仅流应用环境中可用（如果没有特殊配置默认返回运行环境的包名），非流应用环境中返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    channel?: string;
+    /**
+     * 应用启动来源
+     * 5+ APP启动类型，可取以下值：
+     * 	"default"：默认启动方式，通常表示应用列表启动（360手助中搜索启动）；
+     * 	"scheme"：通过urlscheme方式触发启动；
+     * 	"push"：通过点击系统通知方式触发启动；
+     * 	"stream"：通过流应用api（plus.stream.open）启动；
+     * 	"shortcut"：通过快捷方式启动，iOS平台表示通过3D Touch快捷方式，Android平台表示通过桌面快捷方式启动；
+     * 	"barcode"：通过二维码扫描启动；
+     * 	"myapp"：通过流应用"我的"应用列表或历史列表中触发启动；
+     * 	"favorite"：通过流应用的"收藏"应用列表启动；
+     * 	"browser"：通过流应用的内置浏览器导流启动的流应用（地址栏输入url启动应用、点击wap页面链接启动应用）；
+     * 	"engines"：通过流应用的浏览器界面作为搜索引擎启动；
+     * 	"search"：通过流应用的应用搜索启动应用（如iOS平台的T9键盘搜索）；
+     * 	"speech"：通过流应用的语音识别启动应用；
+     * 	"miniProgram"：通过微信小程序启动应用。
+     * - default: 
+     * 	默认启动方式，通常表示从系统桌面图标启动
+     * 						
+     * - scheme: 
+     * 	通过urlscheme方式触发启动
+     * 						
+     * - push: 
+     * 	通过点击系统通知方式触发启动
+     * 						
+     * - stream: 
+     * 	通过流应用api（plus.stream.open）启动
+     * 						
+     * - shortcut: 
+     * 	iOS平台表示通过3D Touch快捷方式，Android平台表示通过桌面快捷方式启动
+     * 						
+     * - barcode: 
+     * 	通过二维码扫描启动
+     * 						
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launcher?: 'default' | 'scheme' | 'push' | 'stream' | 'shortcut' | 'barcode';
+    /**
+     * 应用安装来源
+     * 5+应用安装来源，可取以下值：
+     * 	"default"：默认安装来源，apk/ipa安装包内置安装；
+     * 	"stream"：通过流应用api（plus.stream.open）安装，仅流应用环境下支持；
+     * 	"push"：通过点击系统通知方式触发安装，仅流应用环境下支持；
+     * 	"scheme"：通过urlscheme方式触发安装，仅流应用环境下支持；
+     * 	"barcode"：通过二维码扫描触发安装，仅流应用环境下支持；
+     * 	"silent"：通过后台静默方式安装，仅流应用环境下支持；
+     * 	"speech"：通过语音识别方式触发安装，仅流应用环境下支持；
+     * 	"favorite"：通过收藏界面启动触发安装，仅流应用环境下支持。
+     * - default: 
+     * 	默认安装来源，apk/ipa安装包内置安装
+     * 						
+     * - stream: 
+     * 	通过流应用api（plus.stream.open）安装
+     * 						
+     * - push: 
+     * 	通过点击系统通知方式触发安装
+     * 						
+     * - scheme: 
+     * 	通过urlscheme方式触发安装
+     * 						
+     * - barcode: 
+     * 	通过二维码扫描触发安装
+     * 						
+     * - silent: 
+     * 	通过后台静默方式安装
+     * 						
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    origin?: 'default' | 'stream' | 'push' | 'scheme' | 'barcode' | 'silent';
+    /**
+     * 客户端的版本号
+     * 字符串类型，在编译环境中设置的apk/ipa版本号。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    version?: string;
+    /**
+     * 客户端5+运行环境的版本号
+     * 5+运行环境版本号，格式为：[主版本号].[次版本号].[修订版本号].[编译代号]。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    innerVersion?: string;
+    /**
+     * 获取当前应用首页加载的时间
+     * 应用加载首页面的总时间，从开始加载首页面到首页面加载完成，单位为ms。
+     * 	注意，应用首页为网络地址则包括网络传输时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launchLoadedTime?: number;
+    /**
+     * 获取当前应用的进程标识
+     * 当前应用所属系统进程标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    processId?: string;
+    /**
+     * 获取当前应用的启动时间
+     * 应用启动时间戳，距1970年1月1日之间的毫秒数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    startupTime?: number;
+    /**
+     * 获取指定APPID对应的应用信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    getProperty(appid?: string, getPropertyCB?: (result: PlusRuntimeWidgetInfo) => void): void;
+    /**
+     * 安装应用
+     * 支持以下类型安装包：
+     * 	1. 应用资源安装包（wgt），扩展名为'.wgt'；
+     * 	2. 应用资源差量升级包（wgtu），扩展名为'.wgtu'；
+     * 	3. 系统程序安装包（apk），要求使用当前平台支持的安装包格式。
+     * 	注意：仅支持本地地址，调用此方法前需把安装包从网络地址或其他位置放置到运行时环境可以访问的本地目录。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    install(filePath?: string, options?: PlusRuntimeWidgetOptions, installSuccessCB?: (result: PlusRuntimeWidgetInfo) => void, installErrorCB?: (result: any) => void): void;
+    /**
+     * 退出客户端程序
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    quit(): void;
+    /**
+     * 重启当前的应用
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    restart(): void;
+    /**
+     * 设置程序快捷方式图标上显示的角标数字
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    setBadgeNumber(number?: number, options?: PlusRuntimeBadgeOptions): void;
+    /**
+     * 调用第三方程序打开指定的URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openURL(url?: string, errorCB?: (result: any) => void, identity?: string): void;
+    /**
+     * 使用内置Webview窗口打开URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openWeb(url?: string): void;
+    /**
+     * 调用第三方程序打开指定的文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    openFile(filepath?: string, options?: PlusRuntimeOpenFileOptions, errorCB?: (result: any) => void): void;
+    /**
+     * 处理直达页面链接参数
+     * 通过URL Scheme启动时，可以在?后面添加__direct_page参数自定义直达页面地址，
+     * 	如“streamapp://m3w.cn/s/HelloH5?__direct_page=http%3a%2f%2fm.weibo.cn%2fu%2f3196963860”；
+     * 	在流应用SDK集成时也可以通过direct_page参数（原生调用Intent）设置。
+     * 	注意：仅第一次调用此API时返回直达页面链接地址，再次调用将返回空字符串；如果应用重新被带直达页面链接参数的URL Scheme启动/激活时，可再次调用此方法获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    processDirectPage(): string;
+    /**
+     * 调用第三方程序
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    launchApplication(appInf?: PlusRuntimeApplicationInf, errorCB?: (result: any) => void): void;
+    /**
+     * 判断第三方程序是否已存在
+     * 如果第三方程序已安装则返回true，未安装则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    isApplicationExist(appInf?: PlusRuntimeApplicationInf): boolean;
+    /**
+     * 判断是否自定义应用启动页面加载地址
+     * 通过URL Scheme启动时，可以在?后面添加__launch_path参数自定义应用启动首页加载的页面地址，
+     * 	如“streamapp://m3w.cn/s/HelloH5?__launch_path=http%3a%2f%2fm.weibo.cn%2fu%2f3196963860”；
+     * 	在流SDK集成时也可以通过launch_path参数（原生调用Intent）设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    isCustomLaunchPath(): boolean;
+}
+
+/**
+ * JSON对象，打开第三方程序参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeApplicationInf {
+    /**
+     * 第三方程序包名
+     * 仅Android平台支持，表示程序的包名，其它平台忽略此属性值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    pname?: string;
+    /**
+     * 程序的操作行为
+     * Android平台上与系统的action值一致；iOS平台为要调用程序的URLScheme格式字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    action?: string;
+    /**
+     * 新任务模式标记
+     * 可取值：
+     * 		true-使用新任务模式标记（FLAG_ACTIVITY_NEW_TASK）启动应用；
+     * 		false-不使用新任务模式标记（FLAG_ACTIVITY_NEW_TASK）启动应用。
+     * 	默认值为true。
+     * 	注意：由于5+应用配置的launchMode为singleTask，所以另一个5+应用通过plus.runtime.launchApplication启动时如果应用已经在后台运行则不会触发newintent事件，为了避免此问题需要将newTask参数值设置为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    newTask?: boolean;
+    /**
+     * 调用程序的参数
+     * 仅Android平台支持，为JSON格式，用于传递给要调用程序的参数，如extra:{url:"http://www.html5plus.org"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    extra?: any;
+}
+
+/**
+ * JSON对象，应用角标显示需要的通知栏消息的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeBadgeOptions {
+    /**
+     * 消息的标题
+     * 默认值为应用的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    title?: string;
+    /**
+     * 消息的内容
+     * 默认值为“您有x条未读消息"”，其中x未设置的角标数字值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    content?: string;
+}
+
+/**
+ * JSON对象，打开文件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeOpenFileOptions {
+    /**
+     * 优先使用的程序包名
+     * 如果指定包名的程序已经安装，则调用其打开文件，若程序不支持打开文件则触发错误回调。
+     * 	如果指定包名的程序未安装，则弹出系统支持打开此文件的列表，由用户选择程序打开。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    pname?: string;
+    /**
+     * 弹出系统选择程序界面指示区域
+     * JSON对象，格式如{top:10;left:10;width:200;height:200;}，所有值为像素值，左上坐标相对于容器webview的位置。仅在iPad设备平台有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    popover?: any;
+}
+
+/**
+ * JSON对象，应用信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeWidgetInfo {
+    /**
+     * 应用的APPID
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    appid?: string;
+    /**
+     * 应用的版本号
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    version?: string;
+    /**
+     * 应用的名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    name?: string;
+    /**
+     * 应用描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    description?: string;
+    /**
+     * 应用描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    author?: string;
+    /**
+     * 开发者邮箱地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    email?: string;
+    /**
+     * 应用授权描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    license?: string;
+    /**
+     * 应用授权说明链接地址
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    licensehref?: string;
+    /**
+     * 应用许可特性列表
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    features?: string [];
+}
+
+/**
+ * JSON对象，应用安装参数
+ * 可通过对象设置安装的应用是否进行appid校验、版本号校验等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+ */
+interface PlusRuntimeWidgetOptions {
+    /**
+     * 是否强制安装
+     * true表示强制安装，不进行版本号的校验；false则需要版本号校验，如果将要安装应用的版本号不高于现有应用的版本号则终止安装，并返回安装失败。
+     * 	仅安装wgt和wgtu时生效，默认值 false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/runtime.html](http://www.html5plus.org/doc/zh_cn/runtime.html)
+     */
+    force?: boolean;
+}
+
+/**
+ * Storage模块管理应用本地数据存储区，用于应用数据的保存和读取。应用本地数据与localStorage、sessionStorage的区别在于数据有效域不同，前者可在应用内跨域操作，数据存储期是持久化的，并且没有容量限制。通过plus.storage可获取应用本地数据管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+ */
+interface PlusStorage {
+    /**
+     * 获取应用存储区中保存的键值对的个数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    getLength(): number;
+    /**
+     * 通过键(key)检索获取应用存储的值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    getItem(key?: string): string;
+    /**
+     * 修改或添加键值(key-value)对数据到应用数据存储中
+     * 如果设置的键在应用数据存储中已经存在，更新存储的键值。
+     * 	存储的键和值没有容量限制，但过多的数据量会导致效率降低，建议单个键值数据不要超过10Kb。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    setItem(key?: string, value?: string): void;
+    /**
+     * 通过key值删除键值对存储的数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    removeItem(key?: string): void;
+    /**
+     * 清除应用所有的键值对存储数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    clear(): void;
+    /**
+     * 获取键值对中指定索引值的key值
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/storage.html](http://www.html5plus.org/doc/zh_cn/storage.html)
+     */
+    key(index?: number): void;
+}
+
+/**
+ * Stream模块操作流应用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStream {
+    /**
+     * JSON对象，启动流应用参数
+     * 指定要启动的流应用标识、名称、图标、参数等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamOptions?: PlusStreamStreamOptions;
+    /**
+     * JSON对象，流应用恢复运行的参数
+     * 设置流应用恢复运行时的参数、splash、首页等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamRestoreOptions?: PlusStreamStreamRestoreOptions;
+    /**
+     * 流应用恢复运行时启动界面配置参数
+     * 设置流应用恢复运行时启动界面，如是否自动关闭、延时关闭时间、超时时间等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamRestoreSplashscreenOptions?: PlusStreamStreamRestoreSplashscreenOptions;
+    /**
+     * JSON对象，启动流应用的首页窗口属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    LaunchWebviewStyles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * JSON对象，流应用信息
+     * 流应用标识、图标、是否下载完成等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    StreamInfo?: PlusStreamStreamInfo;
+    /**
+     * JSON对象，免流量操作参数
+     * 包含电话号码、验证码等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    FreetrafficOptions?: PlusStreamFreetrafficOptions;
+    /**
+     * 免流量状态变化事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    onfreetrafficStateChange?: any;
+    /**
+     * 启动流应用
+     * 打开指定的流应用，在流应用中通过plus.runtime.launcher获取的值为"stream"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    open(options?: PlusStreamStreamOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 流应用激活统计
+     * 提交统计数据到流应用服务器，表明业务系统激活成功。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    activate(): void;
+    /**
+     * 已下载流应用列表
+     * 获取当前设备上已安装的所有流应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    list(options?: any, successCallback?: any, errorCallback?: any): void;
+    /**
+     * 预加载流应用
+     * 预加载指定的流应用资源，下载应用资源等，并不运行流应用。
+     * 	如果应用资源已经下载，则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    preload(appid?: string): void;
+    /**
+     * 删除流应用
+     * 删除已下载的流应用，清空应用相关运行期保存的资源（如缓存、配置文件等）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    remove(appid?: string): void;
+    /**
+     * 设置流应用恢复运行的参数
+     * 当流应用运行数目超过限制（通常最多运行2个流应用），会自动关闭之前切换到后台运行的应用。
+     * 	可通过此方法设置应用被自动关闭后再次被唤醒恢复运行时的参数，流应用恢复运行流程与第一次启动一致（差别是会使用StreamRestoreOptions中配置的参数）。
+     * 	如果没有调用setRestoreState方法，则恢复运行时使用启动时（调用plus.stream.open方法）传入的参数。
+     * 	注意：如果通过plus.stream.open方法启动应用，则忽略此方法设置的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    setRestoreState(options?: PlusStreamStreamRestoreOptions): void;
+    /**
+     * 请求免流量验证码
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficRequest(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 免流量绑定手机号
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficBind(options?: PlusStreamFreetrafficOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 解除免流量绑定
+     * 解除当前设备绑定的手机号，如果设备未绑定则不执行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficRelease(): void;
+    /**
+     * 获取免流量状态信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 免流量是否生效
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    freetrafficIsValid(): boolean;
+}
+
+/**
+ * JSON对象，启动流应用参数
+ * 指定要启动的流应用标识、名称、图标、参数等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamOptions {
+    /**
+     * 流应用运行模式
+     * 可取值："test"表示测试版模式运行，其它值则为正式版本模式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    appmode?: string;
+    /**
+     * 流应用标识
+     * 流应用唯一字符串标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    appid?: string;
+    /**
+     * 启动流应用的直达页面链接地址
+     * 可在应用中通过plus.runtime.processDirectPage()方法获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    direct_page?: string;
+    /**
+     * 流应用运行参数
+     * 启动流应用的扩展参数，可在流应用中通过plus.runtime.arguments获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    extras?: any;
+    /**
+     * 流应用图标
+     * 流应用显示的图标路径（仅支持本地路径），在启动提示界面中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    icon?: string;
+    /**
+     * 流应用启动类型
+     * 流应用的启动类型，可在流应用中通过plus.runtime.launcher获取，默认值为“stream”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    launcher?: string;
+    /**
+     * 应用启动界面样式
+     * 可取值：
+     * 	"auto"：自动选择启动界面，如果splash图片已经下载则显示splash图片，否则使用默认加载流应用界面；
+     * 	"default"：使用默认加载流应用界面（如在360浏览器环境中在标题栏下显示加载进度条）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splash?: string;
+    /**
+     * 流应用首页窗口对象样式
+     * 如果流应用已经运行，从后台激活到前台时忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    styles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * 流应用名称
+     * 流应用显示的标题，在启动提示界面中显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    title?: string;
+    /**
+     * 启动流应用的快捷方式逻辑
+     * 可取值：
+     * 		"auto" - 检查并引导用户打开快捷方式权限，自动创建桌面快捷方式，在不支持快捷方式滤重的系统上仅创建一次；
+     *         "force" - 检查并引导用户打开快捷方式权限，自动创建桌面快捷方式，在不支持快捷方式滤重的系统上每次都尝试创建；
+     *         "none" - 不检查快捷方式权限，不创建桌面快捷方式（与从桌面快捷方式启动的流程一致）；
+     *         "query" - 弹出询问提示框（底部显示），用户点击确定后创建桌面快捷方式（检查并引导用户打开快捷方式权限）；
+     *         "tipOnce" - 业务逻辑与"auto"类似，差别是只会引导用户打开快捷方式权限一次、toast提示一次。
+     * 	默认值为"force"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    shortcut?: string;
+    /**
+     * 退出流应用的快捷方式逻辑
+     * 可取值：
+     * 		"query" - 应用退出时检查是否创建桌面快捷方式，如果查询到没有创建则弹出询问框，用户点击确定后创建桌面快捷方式（检查并引导用户打开快捷方式权限）；
+     *         "queryOnce" - 仅应用第一次退出检查，检查逻辑同query；
+     *         "none" - 应用退出时不检查是否创建桌面快捷方式。
+     * 	默认值为"none"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    shortcutQuit?: string;
+}
+
+/**
+ * JSON对象，流应用恢复运行的参数
+ * 设置流应用恢复运行时的参数、splash、首页等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamRestoreOptions {
+    /**
+     * 流应用运行参数
+     * 启动流应用的扩展参数，可在流应用中通过plus.runtime.arguments获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    extras?: any;
+    /**
+     * 应用启动界面样式
+     * 可取值：
+     * 	"auto"：自动选择启动界面，如果流应用自动关闭时截图成功则使用截图，如果splash图片已经下载则显示splash图片，否则使用默认加载流应用界面；
+     * 	"default"：使用默认加载流应用界面（如在360浏览器环境中在标题栏下显示加载进度条）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splash?: string;
+    /**
+     * 流应用首页窗口对象样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    styles?: PlusStreamLaunchWebviewStyles;
+    /**
+     * 流应用恢复运行时启动界面配置参数
+     * 用于流应用自动关闭后恢复运行时调整启动界面配置参数，如将自动关闭splash调整为手动关闭，以便恢复上次运行状态后再进入应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    splashscreen?: PlusStreamStreamRestoreSplashscreenOptions;
+}
+
+/**
+ * 流应用恢复运行时启动界面配置参数
+ * 设置流应用恢复运行时启动界面，如是否自动关闭、延时关闭时间、超时时间等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamRestoreSplashscreenOptions {
+    /**
+     * 是否自动关闭启动界面
+     * true表示应用启动后自动关闭启动界面，false表示应用启动后不自动关闭启动界面，需要在应用调用plus.navigator.closeSplashscreen()方法关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    autoclose?: boolean;
+    /**
+     * 启动界面超时时间
+     * 单位为毫秒（ms），当启动界面超过此时间仍然未关闭时（不管autoclose值设置true还是false），应用将自动关闭启动界面。
+     * 	默认值为6000（即6秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    timeout?: number;
+}
+
+/**
+ * JSON对象，启动流应用的首页窗口属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamLaunchWebviewStyles {
+    /**
+     * 流应用首页是否阻塞网络图片的加载
+     * true表示阻塞网络图片的加载，false表示不阻塞网络图片的加载。默认值为false。
+     * 	设置后可通过Webview窗口对象的setBlockNetworkImage(false)方法修改设置来继续加载网络图片。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    blockNetworkImage?: boolean;
+    /**
+     * 指定流应用首页地址
+     * 可使用网络地址（http://或https://开头），也可使用本地地址（相对应用资源路径）。
+     * 	也可使用特定地址：
+     * 	about:blank - 使用空白首页，仅加载内置注入的脚本（如all.js、wap2app.js、config.js等）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    launch_path?: string;
+    /**
+     * 指定首页Webview的id
+     * 如果未指定id，则使用应用的appid作为首页Webview的id。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    id?: string;
+    /**
+     * 流应用首页是否显示
+     * true表示显示，false表示不显示。默认值为true。
+     * 	注意：流应用首页隐藏后，需要调用首页的setVisible方法显示，如plus.webview.getLaunchWebview().setVisible(true)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    visible?: boolean;
+}
+
+/**
+ * JSON对象，流应用信息
+ * 流应用标识、图标、是否下载完成等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamStreamInfo {
+    /**
+     * 流应用标识
+     * 流应用唯一字符串标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    id?: string;
+    /**
+     * 流应用的图标
+     * 流应用下载的图标路径（本地路径），如果未下载完成则返回空。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    icon?: string;
+    /**
+     * 流应用是否下载完成
+     * true表示流应用下载完成，false表示流应用未下载完成。
+     * 	注意，流应用未下载完成以让可以正常启动运行，启动后会自动下载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    complete?: boolean;
+}
+
+/**
+ * JSON对象，免流量操作参数
+ * 包含电话号码、验证码等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+ */
+interface PlusStreamFreetrafficOptions {
+    /**
+     * 电话号码
+     * 免流量请求验证码、绑定设备使用的电话号码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    phone?: string;
+    /**
+     * 验证码
+     * 免流量绑定设备使用的验证码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/stream.html](http://www.html5plus.org/doc/zh_cn/stream.html)
+     */
+    code?: string;
+}
+
+/**
+ * Uploader模块管理网络上传任务，用于从本地上传各种文件到服务器，并支持跨域访问操作。通过plus.uploader可获取上传管理对象。Uploader上传使用HTTP的POST方式提交数据，数据格式符合Multipart/form-data规范，即rfc1867（Form-based File Upload in HTML）协议。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploader {
+    /**
+     * Upload对象管理一个上传任务
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    Upload?: PlusUploaderUpload;
+    /**
+     * 上传任务事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadEvent?: PlusUploaderUploadEvent;
+    /**
+     * 上传任务的状态，Number类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadState?: PlusUploaderUploadState;
+    /**
+     * JSON对象，创建上传任务的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadOptions?: PlusUploaderUploadOptions;
+    /**
+     * JSON对象，添加上传文件的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    UploadFileOptions?: PlusUploaderUploadFileOptions;
+    /**
+     * 新建上传任务
+     * 请求上传管理创建新的上传任务，创建成功则返回Upload对象，用于管理上传任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    createUpload(url?: string, options?: PlusUploaderUploadOptions, completedCB?: (result0: PlusUploaderUpload, result1: number) => void): PlusUploaderUpload;
+    /**
+     * 枚举上传任务
+     * 枚举指定状态的上传任务列表，通过enumCB回调函数返回结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    enumerate(enumCB?: (result: PlusUploader []) => void, state?: PlusUploaderUploadState): void;
+    /**
+     * 清除上传任务
+     * 清除指定状态的上传任务。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    clear(state?: PlusUploaderUploadState): void;
+    /**
+     * 开始所有上传任务
+     * 开始所有处于未开始调度或暂停状态的上传任务。
+     * 	若上传任务数超过可并发处理的总数，超出的任务处于调度状态（等待上传），当有任务完成时根据调度状态任务的优先级选择任务开始上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    startAll(): void;
+}
+
+/**
+ * Upload对象管理一个上传任务
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUpload {
+    /**
+     * 上传任务的标识
+     * 在创建任务时系统自动分配，用于标识上传任务的唯一性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    id?: string;
+    /**
+     * 上传文件的服务器地址
+     * 调用plus.uploader.createUpload()方法创建上传任务时设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    url?: string;
+    /**
+     * 任务的状态
+     * 上传任务的状态，参考UploadState，在UploadCompleteCallback事件和UploadStateChangedCallback事件触发时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    state?: number;
+    /**
+     * 上传任务的参数
+     * 上传任务配置的参数，参考UploadOptions。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    options?: PlusUploaderUploadOptions;
+    /**
+     * 上传任务完成后服务器返回的数据
+     * 表示当前上传任务的状态，可通过addEventListener()方法监听statechanged事件监听任务状态的变化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    responseText?: string;
+    /**
+     * 已完成上传数据的大小）
+     * 整数类型，单位为字节（byte），上传任务开始传输数据时，每次触发statechanged事件或上传任务完成更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    uploadedSize?: number;
+    /**
+     * 上传数据的总大小
+     * 整数类型，单位为字节（byte），上传任务开始传输数据时更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    totalSize?: number;
+    /**
+     * 添加上传文件
+     * 向上传任务中添加文件，必须在任务开始上传前调用。
+     * 	以下情况会导致添加上传文件失败：
+     * 	1. options参数中指定的key在任务中已经存在，则添加失败返回false；
+     * 	2. path参数指定的文件路径不合法或文件不存在，则添加失败返回false；
+     * 	3. 上传任务已经开始调度，调用此方法则添加失败返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addFile(path?: string, options?: PlusUploaderUploadFileOptions): boolean;
+    /**
+     * 添加上传数据
+     * 向上传任务中添加数据，必须在任务开始上传前调用。
+     * 	以下情况会导致添加上传文件失败：
+     * 	1. key参数中指定的键名在任务中已经存在，则添加失败返回false；
+     * 	2. 上传任务已经开始调度，调用此方法则添加失败返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addData(key?: string, value?: string): boolean;
+    /**
+     * 开始上传任务
+     * 开始调度上传任务，如果任务已经处于开始状态则无任何响应。
+     * 	在创建任务或任务上传失败后调用可重新开始上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    start(): void;
+    /**
+     * 暂停上传任务
+     * 暂停上传任务，如果任务已经处于初始状态或暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    pause(): void;
+    /**
+     * 恢复暂停的上传任务
+     * 继续暂停的上传任务，如果任务处于非暂停状态则无任何响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    resume(): void;
+    /**
+     * 取消上传任务
+     * 如果任务未完成，则终止上传，并从任务列表中删除。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    abort(): void;
+    /**
+     * 添加上传任务事件监听器
+     * 上传任务添加事件监听器后，当监听的事件发生时触发listener回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    addEventListener(type?: string, listener?: (result0: PlusUploaderUpload, result1: number) => void, capture?: boolean): void;
+    /**
+     * 获取上传请求HTTP响应头部信息
+     * HTTP响应头部全部内容作为未解析的字符串返回，如果没有接收到这个HTTP响应头数据或者上传请求未完成则为空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取上传请求指定的HTTP响应头部的值
+     * 其参数是要返回的HTTP响应头部的名称，可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	如果没有接收到这个头部或者伤处请求未完成则为空字符串；如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 设置上传请求的HTTP头数据
+     * Http的Header应该包含在通过后续start()调用而发起的请求中，此方法必需在调用start()之前设置才能生效。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+}
+
+/**
+ * 上传任务事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadEvent {
+    /**
+     * 上传任务状态变化事件
+     * 当上传任务状态发生变化时触发此事件，事件原型参考UploadStateChangedCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    statechanged?: string;
+}
+
+/**
+ * 上传任务的状态，Number类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+type PlusUploaderUploadState = undefined | 0 | 1 | 2 | 3 | 4 | 5 | -1;
+
+/**
+ * JSON对象，创建上传任务的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadOptions {
+    /**
+     * 网络请求类型
+     * 仅支持http协议的“POST”请求。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    method?: string;
+    /**
+     * 上传任务每次上传的文件块大小（仅在支持断点续传的服务有效）
+     * 数值类型，单位为Byte（字节），默认值为102400，若设置值小于等于0则表示不分块上传。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    blocksize?: number;
+    /**
+     * 上传任务的优先级
+     * 数值类型，数值越大优先级越高，默认优先级值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    priority?: number;
+    /**
+     * 上传任务超时时间
+     * 数值类型，单位为s(秒)，默认值为120s。
+     * 	超时时间为服务器响应请求的时间（不是上传任务完成的总时间），如果设置为0则表示永远不超时。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    timeout?: number;
+    /**
+     * 上传任务重试次数
+     * 数值类型，默认为重试3次。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    retry?: number;
+    /**
+     * 上传任务重试间隔时间
+     * 数值类型，单位为s(秒)，默认值为30s。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    retryInterval?: number;
+}
+
+/**
+ * JSON对象，添加上传文件的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+ */
+interface PlusUploaderUploadFileOptions {
+    /**
+     * 文件键名
+     * 上传文件在上传任务中的键名，默认值为为文件名称。
+     * 	上传任务中如果已经存在相同key的上传文件或数据将导致添加文件失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    key?: string;
+    /**
+     * 文件名称
+     * 上传文件的名称，默认值为上传文件路径中的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    name?: string;
+    /**
+     * 文件类型
+     * 上传文件的类型（如图片文件为“image/jpeg”），默认值自动根据文件后缀名称生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/uploader.html](http://www.html5plus.org/doc/zh_cn/uploader.html)
+     */
+    mime?: string;
+}
+
+/**
+ * Video模块管理多媒体视频相关能力，可用创建视频播放控件，直播推流控件等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideo {
+    /**
+     * 视频播放控件对象
+     * VideoPlayer对象表示视频播放控件对象，在窗口中播放视频，可支持本地视频(mp4/flv)，网络视频地址（mp4/flv/m3u8）及流媒体（rtmp/hls/rtsp）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayer?: PlusVideoVideoPlayer;
+    /**
+     * 视频播放控件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayerStyles?: PlusVideoVideoPlayerStyles;
+    /**
+     * 视频播放控件事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    VideoPlayerEvents?: PlusVideoVideoPlayerEvents;
+    /**
+     * 直播推流控件对象
+     * LivePusher对象表示直播推流控件对象，在窗口中显示捕获视频，实时推送到流媒体（RTMP）服务器。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusher?: PlusVideoLivePusher;
+    /**
+     * 直播推流控件配置选项
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusherStyles?: PlusVideoLivePusherStyles;
+    /**
+     * 直播推流控件事件类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    LivePusherEvents?: PlusVideoLivePusherEvents;
+    /**
+     * 创建VideoPlayer对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    createVideoPlayer(id?: string, styles?: PlusVideoVideoPlayerStyles): PlusVideoVideoPlayer;
+    /**
+     * 创建LivePusher对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    createLivePusher(id?: string, styles?: PlusVideoLivePusherStyles): PlusVideoLivePusher;
+    /**
+     * 查找已经创建的VideoPlayer对象
+     * 查找指定id的VideoPlayer对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    getVideoPlayerById(id?: string): PlusVideoVideoPlayer;
+    /**
+     * 查找已经创建的LivePusher对象
+     * 查找指定id的LivePusher对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    getLivePusherById(id?: string): PlusVideoLivePusher;
+}
+
+/**
+ * 视频播放控件对象
+ * VideoPlayer对象表示视频播放控件对象，在窗口中播放视频，可支持本地视频(mp4/flv)，网络视频地址（mp4/flv/m3u8）及流媒体（rtmp/hls/rtsp）。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayer {
+    /**
+     * 监听视频播放控件事件
+     * 向视频播放控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法向视频播放控件添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    addEventListener(event?: PlusVideoVideoPlayerEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 设置视频播放控件参数
+     * 用于动态更新视频播放控件的配置参数。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考VideoPlayerStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setStyles(styles?: PlusVideoVideoPlayerStyles): void;
+    /**
+     * 设置视频播放控件参数（将废弃，使用setStyles）
+     * 用于动态更新视频播放控件的配置选项。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考VideoPlayerStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setOptions(options?: PlusVideoVideoPlayerStyles): void;
+    /**
+     * 播放视频
+     * 如果视频已经处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    play(): void;
+    /**
+     * 暂停视频
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    seek(position?: number): void;
+    /**
+     * 切换到全屏
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    requestFullScreen(direction?: number): void;
+    /**
+     * 退出全屏
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    exitFullScreen(): void;
+    /**
+     * 停止播放视频
+     * 如果视频未处于播放或暂停状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    stop(): void;
+    /**
+     * 隐藏视频播放控件
+     * 隐藏只是控件不可见，控件依然存在并且不改变播放状态。
+     * 	如果控件已经隐藏，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    hide(): void;
+    /**
+     * 显示视频播放控件
+     * 将隐藏的控件显示出来（回复到隐藏前的状态）。
+     * 	如果控件已经显示，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    show(): void;
+    /**
+     * 关闭视频播放控件
+     * 关闭操作将释放控件所有资源，不再可用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    close(): void;
+    /**
+     * 发送弹幕
+     * 如果视频未处于播放状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    sendDanmu(danmu?: any): void;
+    /**
+     * 设置倍速播放
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    playbackRate(rate?: number): void;
+}
+
+/**
+ * 视频播放控件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayerStyles {
+    /**
+     * 视频资源地址
+     * 支持本地地址，也支持网络地址及直播流（RTMP）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    src?: string;
+    /**
+     * 视频初始播放位置
+     * 单位为秒（s）。
+     * 	注意：仅在视频开始播放前设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'initial-time'?: number;
+    /**
+     * 视频长度
+     * 单位为秒（s）。
+     * 	注意：仅在视频开始播放前设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    duration?: number;
+    /**
+     * 是否显示默认播放控件
+     * 默认值为true。
+     * 	包括播放/暂停按钮、播放进度、时间等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    controls?: boolean;
+    /**
+     * 弹幕列表
+     * 弹幕JSON对象包括属性：text（String类型，弹幕文本类容），color（String类型，弹幕颜色，格式为#RRGGBB），time（Number类型，弹幕出现的时间，单位为秒）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'danmu-list'?: any [];
+    /**
+     * 是否显示弹幕按钮
+     * 默认值为false。
+     * 	注意：仅在控件构造时设置有效，不能动态更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'danmu-btn'?: boolean;
+    /**
+     * 是否展示弹幕
+     * 默认值为false。
+     * 	注意：仅在控件构造时设置有效，不能动态更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-danmu'?: boolean;
+    /**
+     * 是否自动播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    autoplay?: boolean;
+    /**
+     * 是否循环播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    loop?: boolean;
+    /**
+     * 是否静音播放
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    muted?: boolean;
+    /**
+     * 设置全屏时视频的方向
+     * 不指定则根据宽高比自动判断。
+     * 	有效值为： 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度）。
+     * 	默认值为-90。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    direction?: number;
+    /**
+     * 是否显示播放进度
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-progress'?: boolean;
+    /**
+     * 是否显示全屏按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-fullscreen-btn'?: boolean;
+    /**
+     * 是否显示视频底部控制栏的播放按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-play-btn'?: boolean;
+    /**
+     * 是否显示视频中间的播放按钮
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'show-center-play-btn'?: boolean;
+    /**
+     * 是否开启控制进度的手势
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-progress-gesture'?: boolean;
+    /**
+     * 当视频大小与 video 容器大小不一致时，视频的表现形式
+     * 有效值为：contain（包含），fill（填充），cover（覆盖）。
+     * 	默认值为contain。
+     * 	仅Android平台支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    objectFit?: string;
+    /**
+     * 视频封面的图片网络资源地址
+     * 如果 controls 属性值为 false 则设置 poster 无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    poster?: string;
+    /**
+     * VideoPlayer控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    top?: string;
+    /**
+     * VideoPlayer控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    left?: string;
+    /**
+     * VideoPlayer控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    width?: string;
+    /**
+     * VideoPlayer控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    height?: string;
+    /**
+     * VideoPlayer控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    position?: string;
+}
+
+/**
+ * 视频播放控件事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoVideoPlayerEvents {
+    /**
+     * 视频播放事件
+     * 当视频开始/继续播放时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    play?: string;
+    /**
+     * 视频暂停事件
+     * 当视频暂停播放时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause?: string;
+    /**
+     * 视频结束事件
+     * 当视频播放到末尾时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    ended?: string;
+    /**
+     * 视频播放进度更新事件
+     * 当视频播放进度变化时触发，触发频率250ms一次。
+     * 	事件回调函数参数event.detail = {currentTime:"Number类型，当前播放时间（单位为秒）",duration:"Number类型，视频总长度（单位为秒）"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    timeupdate?: string;
+    /**
+     * 视频播放全屏播放状态变化事件
+     * 当视频播放进入或退出全屏时触发。
+     * 	事件回调函数参数event.detail = {fullScreen:"Boolean类型，当前状态是否为全屏", direction:"String类型，vertical或horizontal"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    fullscreenchange?: string;
+    /**
+     * 视频缓冲事件
+     * 当视频播放出现缓冲时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    waiting?: string;
+    /**
+     * 视频错误事件
+     * 当视频播放出错时触发。
+     * 	无事件回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    error?: string;
+}
+
+/**
+ * 直播推流控件对象
+ * LivePusher对象表示直播推流控件对象，在窗口中显示捕获视频，实时推送到流媒体（RTMP）服务器。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusher {
+    /**
+     * 监听直播推流控件事件
+     * 向直播推流控件添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法向直播推流控件添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    addEventListener(event?: PlusVideoLivePusherEvents, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 设置直播推流控件参数
+     * 用于动态更新直播推流控件的配置参数。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考LivePusherStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setStyles(styles?: PlusVideoLivePusherStyles): void;
+    /**
+     * 设置直播推流控件参数（将废弃，使用setStyles）
+     * 用于动态更新直播推流控件的配置选项。
+     * 	注意：有些选项无法动态更新，只能创建时进行设置，详情参考LivePusherStyles。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    setOptions(options?: PlusVideoLivePusherStyles): void;
+    /**
+     * 预览摄像头采集数据
+     * 调用摄像头采集图像数据，并在推流控件中预览（此时不会向服务器推流，需调用start方法才开始推流）。
+     * 	注意：为了确保预览窗口大小正确，应该在创建控件后延时一定的时间（如500ms）进行预览。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    preview(): void;
+    /**
+     * 开始推流
+     * 如果已经处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    start(successCB?: () => void, errorCB?: () => void): void;
+    /**
+     * 停止推流
+     * 如果未处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    stop(options?: any): void;
+    /**
+     * 暂停推流
+     * 如果未处于推流状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    pause(): void;
+    /**
+     * 恢复推流
+     * 如果未处于暂停状态，则操作无效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    resume(): void;
+    /**
+     * 切换前后摄像头
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    switchCamera(): void;
+    /**
+     * 快照
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    snapshot(successCB?: () => void, errorCB?: () => void): void;
+    /**
+     * 关闭直播推流控件
+     * 关闭操作将释放控件所有资源，不再可用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    close(): void;
+}
+
+/**
+ * 直播推流控件配置选项
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusherStyles {
+    /**
+     * 推流地址
+     * 支持RTMP协议。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    url?: string;
+    /**
+     * 推流视频模式
+     * 可取值：SD（标清）, HD（高清）, FHD（超清）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    mode?: string;
+    /**
+     * 是否静音
+     * 默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    muted?: boolean;
+    /**
+     * 开启摄像头
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'enable-camera'?: boolean;
+    /**
+     * 自动聚集
+     * 默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    'auto-focus'?: boolean;
+    /**
+     * 是否美颜
+     * 可取值0、1，其中0表示不使用美颜，1表示不使用美颜。
+     * 	默认值为0(不使用美颜)。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    beauty?: number;
+    /**
+     * 是否美白
+     * 可取值0、1、2、3、4、5，其中0表示不使用美白，其余值分别表示美白的程度，值越大美白程度越大。
+     * 	默认值为0（不使用美白）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    whiteness?: number;
+    /**
+     * 宽高比
+     * 可取值：3:4, 9:16。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    aspect?: string;
+    /**
+     * LivePusher控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    top?: string;
+    /**
+     * LivePusher控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    left?: string;
+    /**
+     * LivePusher控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    width?: string;
+    /**
+     * LivePusher控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    height?: string;
+    /**
+     * LivePusher控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    position?: string;
+}
+
+/**
+ * 直播推流控件事件类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+ */
+interface PlusVideoLivePusherEvents {
+    /**
+     * 状态变化事件
+     * 当推流连接服务器状态变化时触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为statechange",target:"触发此事件的直播推流控件对象",detail:{code:"状态码，参考后面状态码说明",message:"描述信息"}}。
+     * 	其中code状态码：
+     * 	1001 - 已经连接推流服务器；
+     * 	1002 - 已经与服务器握手完毕,开始推流；
+     * 	1003 - 打开摄像头成功；
+     * 	1004 - 录屏启动成功；
+     * 	1005 - 推流动态调整分辨率；
+     * 	1006 - 推流动态调整码率；
+     * 	1007 - 首帧画面采集完成；
+     * 	1008 - 编码器启动；
+     * 	-1301 - 打开摄像头失败；
+     * 	-1302 - 打开麦克风失败；
+     * 	-1303 - 视频编码失败；
+     * 	-1304 - 音频编码失败；
+     * 	-1305 - 不支持的视频分辨率；
+     * 	-1306 - 不支持的音频采样率；
+     * 	-1307 - 网络断连，且经多次重连抢救无效，更多重试请自行重启推流；
+     * 	-1308 - 开始录屏失败，可能是被用户拒绝；
+     * 	-1309 - 录屏失败，不支持的Android系统版本，需要5.0以上的系统；
+     * 	-1310 - 录屏被其他应用打断了；
+     * 	-1311 - Android Mic打开成功，但是录不到音频数据；
+     * 	-1312 - 录屏动态切横竖屏失败；
+     * 	1101 - 网络状况不佳：上行带宽太小，上传数据受阻；
+     * 	1102 - 网络断连, 已启动自动重连；
+     * 	1103 - 硬编码启动失败,采用软编码；
+     * 	1104 - 视频编码失败；
+     * 	1105 - 新美颜软编码启动失败，采用老的软编码；
+     * 	1106 - 新美颜软编码启动失败，采用老的软编码；
+     * 	3001 - RTMP -DNS解析失败；
+     * 	3002 - RTMP服务器连接失败；
+     * 	3003 - RTMP服务器握手失败；
+     * 	3004 - RTMP服务器主动断开，请检查推流地址的合法性或防盗链有效期；
+     * 	3005 - RTMP 读/写失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    statechange?: string;
+    /**
+     * 网络状态通知事件
+     * 当推流的网络状态发生变化时触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为netstatus",target:"触发此事件的直播推流控件对象",detail:{videoBitrate:"视频码率",audioBitrate:"音频码率",videoFPS:"视频帧率",netSpeed:"推流网速",videoWidth:"视频宽度",videoHeight:"视频高度"}}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    netstatus?: string;
+    /**
+     * 渲染错误事件
+     * 当推流发生错误是触发。
+     * 	事件回调函数参数event={type:"事件类型，此时为error",target:"触发此事件的直播推流控件对象",detail:{code:"错误编码，参考后面错误码说明",message:"描述信息"}}。
+     * 	其中code错误码：
+     * 	1001 - 用户禁止使用摄像头；
+     * 	1002 - 用户禁止使用录音。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/video.html](http://www.html5plus.org/doc/zh_cn/video.html)
+     */
+    error?: string;
+}
+
+/**
+ * Webview模块管理应用窗口界面，实现多窗口的逻辑控制管理操作。通过plus.webview可获取应用界面管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebview {
+    /**
+     * 一组用于定义页面或控件显示动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    AnimationTypeShow?: PlusWebviewAnimationTypeShow;
+    /**
+     * 一组用于定义页面或控件关闭的动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    AnimationTypeClose?: PlusWebviewAnimationTypeClose;
+    /**
+     * Webview窗口对象，用于操作加载HTML页面的窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewObject?: PlusWebviewWebviewObject;
+    /**
+     * Webview窗口动画参数
+     * 用于指定动画目标窗口，起始位置、目标位置等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewAnimationOptions?: PlusWebviewWebviewAnimationOptions;
+    /**
+     * Webview窗口动画样式
+     * 用于指定动画窗口的起始位置、目标位置等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewAnimationStyles?: PlusWebviewWebviewAnimationStyles;
+    /**
+     * Webview窗口回弹样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewBounceStyle?: PlusWebviewWebviewBounceStyle;
+    /**
+     * Webview窗口内容动画参数
+     * 指定动画的类型、持续时间等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewContentAnimationOptions?: PlusWebviewWebviewContentAnimationOptions;
+    /**
+     * 原生控件在窗口中停靠的方式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDock?: PlusWebviewWebviewDock;
+    /**
+     * Webview窗口滑动事件数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragEvent?: PlusWebviewWebviewDragEvent;
+    /**
+     * 窗口手势操作参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragOptions?: PlusWebviewWebviewDragOptions;
+    /**
+     * 手势操作关联对象参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDragOtherViewOptions?: PlusWebviewWebviewDragOtherViewOptions;
+    /**
+     * 截屏绘制操作参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewDrawOptions?: PlusWebviewWebviewDrawOptions;
+    /**
+     * 窗口收藏参数
+     * 在流应用环境中调用收藏功能时使用的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewFavoriteOptions?: PlusWebviewWebviewFavoriteOptions;
+    /**
+     * 创建加载HTML数据参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewLoadDataOptions?: PlusWebviewWebviewLoadDataOptions;
+    /**
+     * 窗口的分享参数
+     * 在流应用环境中调用分享功能时使用的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewShareOptions?: PlusWebviewWebviewShareOptions;
+    /**
+     * 窗口原生子View控件样式
+     * 可设置原生控件的标识、大小、位置以及绘制的内容等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewSubNViewStyles?: PlusWebviewWebviewSubNViewStyles;
+    /**
+     * 窗口标题栏控件样式
+     * 标题栏控件固定高度为44px,可通过Webview窗口对象的getTitleNView方法获取标题栏原生控件对象动态绘制内容。
+     * 	可以通过WebviewObject对象的getTitleNView()获取标题栏的NView对象，然后调用其setStyle方法更新样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTitleNViewStyles?: PlusWebviewWebviewTitleNViewStyles;
+    /**
+     * 窗口标题栏自定义按钮样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTitleNViewButtonStyles?: PlusWebviewWebviewTitleNViewButtonStyles;
+    /**
+     * 标题栏控件的进度条样式
+     * 显示在标题栏控件底部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewProgressStyles?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 窗口标题栏控件的分割线样式
+     * 显示在标题栏控件底部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewSplitLineStyles?: PlusWebviewWebviewSplitLineStyles;
+    /**
+     * Webview窗口事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewEvent?: PlusWebviewWebviewEvent;
+    /**
+     * JSON对象，原生窗口扩展参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewExtraOptions?: PlusWebviewWebviewExtraOptions;
+    /**
+     * 原生控件在窗口中显示的位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewPosition?: PlusWebviewWebviewPosition;
+    /**
+     * Webview窗口下拉刷新样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewPullToRefreshStyles?: PlusWebviewWebviewPullToRefreshStyles;
+    /**
+     * Webview窗口rendered事件参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewRenderedEventOptions?: PlusWebviewWebviewRenderedEventOptions;
+    /**
+     * 替换H5标准API配置信息
+     * 目前仅支持替换H5标准定位接口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewReplaceWebApiOptions?: PlusWebviewWebviewReplaceWebApiOptions;
+    /**
+     * JSON对象，Webview窗口的系统状态栏区域样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewStatusbarStyles?: PlusWebviewWebviewStatusbarStyles;
+    /**
+     * JSON对象，Webview窗口对象的样式
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewStyles?: PlusWebviewWebviewStyles;
+    /**
+     * 一组用于定义页面或控件变形的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTransform?: PlusWebviewWebviewTransform;
+    /**
+     * 一组用于定义页面或控件转换效果的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewTransition?: PlusWebviewWebviewTransition;
+    /**
+     * 拦截Webview窗口资源请求的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewOverrideResourceOptions?: PlusWebviewWebviewOverrideResourceOptions;
+    /**
+     * 拦截Webview窗口URL请求的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewOverrideUrlOptions?: PlusWebviewWebviewOverrideUrlOptions;
+    /**
+     * 监听Webview窗口资源加载的属性
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    WebviewListenResourceOptions?: PlusWebviewWebviewListenResourceOptions;
+    /**
+     * 获取所有Webview窗口
+     * 获取应用中已创建的所有Webview窗口，包括所有未显示的Webview窗口。
+     * 	返回WebviewObject对象在数组中按创建的先后顺序排列，即数组中第一个WebviewObject对象用是加载应用的入口页面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    all(): PlusWebview [];
+    /**
+     * 关闭Webview窗口
+     * 关闭已经打开的Webview窗口，需先获取窗口对象或窗口id，并可指定关闭窗口的动画及动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close(id_wvobj?: string, aniClose?: string, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 创建新的Webview窗口
+     * 创建Webview窗口，用于加载新的HTML页面，可通过styles设置Webview窗口的样式，创建完成后需要调用show方法才能将Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    create(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, extras?: any): PlusWebviewWebviewObject;
+    /**
+     * 获取当前窗口的WebviewObject对象
+     * 获取当前页面所属的Webview窗口对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    currentWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取屏幕所有可视的Webview窗口
+     * 仅在屏幕区域显示的Webview窗口，如果Webview窗口显示了但被其它Webview窗口盖住则认为不可视。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getDisplayWebview(): PlusWebview [];
+    /**
+     * 查找指定标识的WebviewObject窗口
+     * 在已创建的窗口列表中查找指定标识的Webview窗口并返回。
+     * 	若没有查找到指定标识的窗口则返回null，若存在多个相同标识的Webview窗口，则返回第一个创建的Webview窗口。
+     * 	如果要获取应用入口页面所属的Webview窗口，其标识为应用的%APPID%，可通过plus.runtime.appid获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getWebviewById(id?: string): PlusWebviewWebviewObject;
+    /**
+     * 获取应用首页WebviewObject窗口对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getLaunchWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取应用第二个首页WebviewObject窗口对象
+     * 在双首页模式下（在manifest.json的plus-&gt;secondwebview节点下配置），应用会自动创建两个首页Webview，通过getLaunchWebview()可获取第一个首页窗口对象，通过getSecondWebview()可获取第二个首页窗口对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getSecondWebview(): PlusWebviewWebviewObject;
+    /**
+     * 获取应用显示栈顶的WebviewObject窗口对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTopWebview(): PlusWebviewWebviewObject;
+    /**
+     * 隐藏Webview窗口
+     * 根据指定的WebviewObject对象或id隐藏Webview窗口，使得窗口不可见。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide(id_wvobj?: string, aniHide?: string, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 创建并打开Webview窗口
+     * 创建并显示Webview窗口，用于加载新的HTML页面，可通过styles设置Webview窗口的样式，创建完成后自动将Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    open(url?: string, id?: string, styles?: PlusWebviewWebviewStyles, aniShow?: string, duration?: number, showedCB?: () => void): PlusWebviewWebviewObject;
+    /**
+     * 预载网络页面
+     * 预载网络页面会向服务器发起http/https请求获取html页面内容，
+     * 	待Webview窗口加载此url页面时会则根据缓存机制优先使用预载的页面内容(加快页面显示速度)。
+     * 	注意：预载网络页面仅在运行期生效，为了节省内存仅保留最后5个预载页面数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    prefetchURL(url?: string): void;
+    /**
+     * 预载网络页面（多个地址）
+     * 预载网络页面会向服务器发起http/https请求获取html页面内容，
+     * 	待Webview窗口加载此url页面时会则根据缓存机制优先使用预载的页面内容(加快页面显示速度)。
+     * 	注意：预载网络页面仅在运行期生效，为了节省内存仅保留最后5个预载页面数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    prefetchURLs(urls?: any []): void;
+    /**
+     * 显示Webview窗口
+     * 显示已创建或隐藏的Webview窗口，需先获取窗口对象或窗口id，并可指定显示窗口的动画及动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show(id_wvobj?: string, aniShow?: string, duration?: number, showedCB?: () => void, extras?: PlusWebviewWebviewExtraOptions): PlusWebviewWebviewObject;
+    /**
+     * Webview窗口组合动画
+     * 同步组合两个Webview窗口动画，动画完成后窗口的位置会发生变化，一次需要在动画属性参数中设置动画起始位置、结束位置等。
+     * 	注意：此动画操作会改变窗口位置（如left值等），再次调用show方法时需要确保其位置是否在可视区域，如果不在可视区域则需要调用窗口的setStyle方法设置其位置到可视区域内，如setStyle({left:'0px'});。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    startAnimation(options?: PlusWebviewWebviewAnimationOptions, otherOptions?: PlusWebviewWebviewAnimationOptions, callback?: (result: any) => void): void;
+    /**
+     * 获取Webview默认是否开启硬件加速
+     * 由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，	因此5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速。
+     * 	关闭硬件加速则可能会导致Webview页面无法支持Video标签播放视频等问题，如果在特定情况下需要调整修改默认开启硬件加速的行为，则可通过plus.webview.defaultHardwareAccelerated()方法获取当前设备默认是否开启硬件加速状态，从而决定是否需要显式开启或关闭指定Webview的硬件加速功能（通过WebviewStyles的hardwareAccelerated属性设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    defaultHardwareAccelerated(): boolean;
+}
+
+/**
+ * 一组用于定义页面或控件显示动画效果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewAnimationTypeShow {
+    /**
+     * 自动选择动画效果
+     * 自动选择动画效果，使用上次显示窗口设置的动画效果，如果是第一次显示则默认动画效果“none”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    auto?: string;
+    /**
+     * 无动画效果
+     * 立即显示页面，无任何动画效果，页面显示默认的动画效果。
+     * 	此效果忽略动画时间参数，立即显示。
+     * 	对应关闭动画"none"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    none?: string;
+    /**
+     * 从右侧横向滑动效果
+     * 页面从屏幕右侧外向内横向滑动显示。
+     * 	对应关闭动画"slide-out-right"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-right'?: string;
+    /**
+     * 从左侧横向滑动效果
+     * 页面从屏幕左侧向右横向滑动显示。
+     * 	对应关闭动画"slide-out-left"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-left'?: string;
+    /**
+     * 从上侧竖向滑动效果
+     * 页面从屏幕上侧向下竖向滑动显示。
+     * 	对应关闭动画"slide-out-top"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-top'?: string;
+    /**
+     * 从下侧竖向滑动效果
+     * 页面从屏幕下侧向上竖向滑动显示。
+     * 	对应关闭动画"slide-out-bottom"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-in-bottom'?: string;
+    /**
+     * 从透明到不透明逐渐显示效果
+     * 页面从完全透明到不透明逐渐显示。
+     * 	对应关闭动画"fade-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'fade-in'?: string;
+    /**
+     * 从小到大逐渐放大显示效果
+     * 页面在屏幕中间从小到大逐渐放大显示。
+     * 	对应关闭动画"zoom-in"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-out'?: string;
+    /**
+     * 从小到大逐渐放大并且从透明到不透明逐渐显示效果
+     * 页面在屏幕中间从小到大逐渐放大并且从透明到不透明逐渐显示。
+     * 	对应关闭动画"zoom-fade-in"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-fade-out'?: string;
+    /**
+     * 从右侧平移入栈动画效果
+     * 页面从屏幕右侧滑入显示，同时上一个页面带阴影效果从屏幕左侧滑出隐藏。
+     * 	对应关闭动画"pop-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'pop-in'?: string;
+}
+
+/**
+ * 一组用于定义页面或控件关闭的动画效果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewAnimationTypeClose {
+    /**
+     * 自动选择动画效果
+     * 自动选择显示窗口相对于的动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    auto?: string;
+    /**
+     * 无动画
+     * 立即关闭页面，无任何动画效果。
+     * 	此效果忽略动画时间参数，立即关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    none?: string;
+    /**
+     * 横向向右侧滑出屏幕动画
+     * 页面从屏幕中横向向右侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-right'?: string;
+    /**
+     * 横向向左侧滑出屏幕动画
+     * 页面从屏幕中横向向左侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-left'?: string;
+    /**
+     * 竖向向上侧滑出屏幕动画
+     * 页面从屏幕中竖向向上侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-top'?: string;
+    /**
+     * 竖向向下侧滑出屏幕动画
+     * 页面从屏幕中竖向向下侧滑动到屏幕外关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'slide-out-bottom'?: string;
+    /**
+     * 从不透明到透明逐渐隐藏动画
+     * 页面从不透明到透明逐渐隐藏关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'fade-out'?: string;
+    /**
+     * 从大逐渐缩小关闭动画
+     * 页面逐渐向页面中心缩小关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-in'?: string;
+    /**
+     * 从大逐渐缩小并且从不透明到透明逐渐隐藏关闭动画
+     * 页面逐渐向页面中心缩小并且从不透明到透明逐渐隐藏关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'zoom-fade-in'?: string;
+    /**
+     * 从右侧平移出栈动画效果
+     * 页面从屏幕右侧滑出消失，同时上一个页面带阴影效果从屏幕左侧滑入显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'pop-out'?: string;
+}
+
+/**
+ * Webview窗口对象，用于操作加载HTML页面的窗口
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewObject {
+    /**
+     * Webview窗口的标识
+     * 在打开或创建Webview窗口时设置，如果没有设置窗口标识，此属性值为undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * Webview窗口关闭事件
+     * 当Webview窗口关闭时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onclose?: (result: any) => void;
+    /**
+     * Webview窗口错误事件
+     * 当Webview窗口加载错误时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onerror?: PlusWebviewWebviewEvent;
+    /**
+     * Webview窗口页面加载完成事件
+     * 当Webview窗口页面加载完成时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onloaded?: PlusWebviewWebviewEvent;
+    /**
+     * Webview窗口页面开始加载事件
+     * 当Webview窗口开始加载新页面时触发此事件，类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onloading?: PlusWebviewWebviewEvent;
+    /**
+     * 添加事件监听器
+     * 向Webview窗口添加事件监听器，当指定的事件发生时，将触发listener函数的执行。
+     * 		可多次调用此方法向Webview添加多个监听器，当监听的事件发生时，将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    addEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void, capture?: boolean): void;
+    /**
+     * 在Webview窗口中添加子窗口
+     * 将另一个Webview窗口作为子窗口添加到当前Webview窗口中，添加后其所有权归父Webview窗口，当父窗口关闭时子窗口自动关闭。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    append(webview?: PlusNativeObjView): void;
+    /**
+     * 添加Webview窗口预加载js文件
+     * 对于一些网络HTML页面，在无法修改HTML页面时可通过此方法自动加载本地js文件。
+     * 	当Webview窗口跳转到新页面时也会自动加载指定的js执行，添加多个js文件将按照添加的先后顺序执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    appendJsFile(file?: string): void;
+    /**
+     * Webview窗口内容动画
+     * 动画后可能会导致Webview窗口显示内容改变，可通过调用restore方法恢复。
+     * 	当Webview窗口内容动画引起内容不可见（透明），将显示此窗口后面的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    animate(options?: PlusWebviewWebviewContentAnimationOptions, callback?: () => void): void;
+    /**
+     * 后退到上次加载的页面
+     * Webview窗口历史记录操作，后退到窗口上次加载的HTML页面。
+     * 	如果窗口历史记录中没有可后退的页面则不触发任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    back(): void;
+    /**
+     * 开始Webview窗口的下拉刷新
+     * 开始触发下拉刷新效果，与用户操作下拉刷新行为一致（有动画效果）。
+     * 	触发setPullTorefresh方法设置的下拉刷新事件回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    beginPullToRefresh(): void;
+    /**
+     * 查询Webview窗口是否可后退
+     * Webview窗口历史记录查询操作，获取Webview是否可后退到历史加载的页面，结果通过queryCallback回调方法返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    canBack(queryCallback?: (result: any) => void): void;
+    /**
+     * 查询Webview窗口是否可前进
+     * Webview窗口历史记录查询操作，获取Webview是否可前进到历史加载的页面，结果通过queryCallback回调方法返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    canForward(queryCallback?: (result: any) => void): void;
+    /**
+     * 检测Webview窗口是否渲染完成
+     * 检测方式为判断的Webview窗口内容是否为白屏，如果非白屏则认为渲染完成，否则认为渲染未完成。
+     * 	通过successCallback回调函数返回结果，如果检测过程中发生错误则触发errorCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    checkRenderedContent(options?: PlusWebviewWebviewRenderedEventOptions, successCallback?: () => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取Webview窗口的所有子Webview窗口
+     * 获取添加到Webview窗口中的所有子Webview窗口，如果没有子Webview窗口则返回空数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    children(): PlusWebview [];
+    /**
+     * 清空原生Webview窗口加载的内容
+     * 清除原生窗口的内容，用于重置原生窗口加载的内容，清除其加载的历史记录等内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    clear(): void;
+    /**
+     * 关闭Webview窗口
+     * 关闭并销毁Webview窗口，可设置关闭动画和动画持续时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close(aniClose?: PlusWebviewAnimationTypeClose, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 设置Webview窗口的滑屏操作手势
+     * 将Webview窗口的左右滑动手势关联到其它Webview窗口，可实现滑动切换显示Webview的动画效果（如Tab页面切换效果）。
+     * 	注意：滑屏操作会改变窗口位置（如left值等），如果不在可视区域则需要调用窗口的setStyle方法设置其位置到可视区域内，如setStyle({left:'0px'});。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    drag(options?: PlusWebviewWebviewDragOptions, otherView?: PlusWebviewWebviewDragOtherViewOptions, callback?: (result: PlusWebviewWebviewDragEvent) => void): void;
+    /**
+     * 截屏绘制
+     * 将Webview窗口的可视区域截屏并绘制到Bitmap图片对象中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    draw(bitmap?: PlusNativeObjBitmap, successCallback?: () => void, errorCallback?: (result: any) => void, options?: PlusWebviewWebviewDrawOptions): void;
+    /**
+     * 结束Webview窗口的下拉刷新
+     * 关闭下拉刷新效果，恢复到开始下拉刷新之前的效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    endPullToRefresh(): void;
+    /**
+     * 在Webview窗口中执行JS脚本
+     * 将JS脚本发送到Webview窗口中运行，可用于实现Webview窗口间的数据通讯。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    evalJS(js?: string): void;
+    /**
+     * 前进到上次加载的页面
+     * Webview窗口历史记录操作，前进到窗口上次加载的HTML页面。
+     * 	如果窗口历史记录中没有可前进的页面则不触发任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    forward(): void;
+    /**
+     * 获取Webview窗口的收藏参数
+     * 获取Webview窗口的收藏参数，如收藏页面的标题、图标、地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getFavoriteOptions(): PlusWebviewWebviewFavoriteOptions;
+    /**
+     * 获取Webview窗口的分享参数
+     * 获取Webview窗口的分享参数，如分享的标题、图标、链接地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getShareOptions(): PlusWebviewWebviewShareOptions;
+    /**
+     * 获取Webview窗口的样式
+     * 获取Webview窗口的样式属性，如窗口位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getStyle(): PlusWebviewWebviewStyles;
+    /**
+     * 获取Webview窗口的原生子View控件对象
+     * 创建Webview窗口的所有原生子View控件。
+     * 	可以在创建窗口时设置其subNViews属性自动创建（应用首页可通过manfest.json中的plus-&gt;launchwebview-&gt;subNNViews节点配置创建）；
+     * 	也可以通过Webview窗口的append方法将已经创建的原生View控件添加为其子。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getSubNViews(): any [];
+    /**
+     * 获取Webview窗口加载HTML页面的标题
+     * 标题为HTML页面head节点下title节点中的文本内容，当窗口内容发生页面内跳转时可通过窗口触发的“loaded”事件中调用此方法来获取跳转后页面的标题。
+     * 	如果HTML页面没有使用title节点来设置标题，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTitle(): string;
+    /**
+     * 获取Webview窗口的标题栏控件对象
+     * 创建Webview窗口时设置其titleNView属性时则自动创建标题栏控件，应用首页可通过manfest.json中的plus-&gt;launchwebview-&gt;titleNView节点配置创建标题栏控件。
+     * 	可通过此方法获取Webview窗口创建的标题栏控件，对象类型为plus.nativeObj.View，可通过调用其drawBitmap/drawRect/drawText方法绘制更新内容来实现自定义样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getTitleNView(): PlusNativeObjView;
+    /**
+     * 获取Webview窗口加载HTML页面的地址
+     * 当窗口内容发生页面内跳转时可通过窗口触发的“loaded”事件中调用此方法来获取跳转后页面的地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    getURL(): string;
+    /**
+     * 隐藏Webview窗口
+     * 隐藏Webview窗口可保存已加载HTML页面的上下文数据，能降低应用使用的系统资源，通过show方法可将隐藏的Webview窗口显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide(aniHide?: PlusWebviewAnimationTypeClose, duration?: number, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 隐藏标题栏上按钮的红点
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hideTitleNViewButtonRedDot(index?: number): void;
+    /**
+     * 是否拦截Webview窗口的触屏事件
+     * 拦截后触屏事件不再传递，否则传递给View控件下的其它窗口处理。
+     * 	Webview窗口默认拦截所有触屏事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    interceptTouchEvent(intercept?: boolean): void;
+    /**
+     * 查询Webview窗口是否开启硬件加速
+     * 若Webview窗口已经开启硬件加速则返回true，否则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    isHardwareAccelerated(): boolean;
+    /**
+     * 查询Webview窗口是否可见
+     * 若Webview窗口已经显示（调用过show方法，即使被其它窗口挡住了也认为已显示）则返回true，若Webview窗口被隐藏则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    isVisible(): boolean;
+    /**
+     * 监听页面开始加载资源
+     * Webview加载资源时，如果满足options参数中定义的条件，则触发callback回调。
+     * 	此方法仅触发回调事件，不会阻止资源的加载。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    listenResourceLoading(options?: PlusWebviewWebviewListenResourceOptions, callback?: (result: any) => void): void;
+    /**
+     * 加载新HTML数据
+     * 触发Webview窗口加载HTML页面数据，如果HTML数据无效将导致页面加载失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loadData(data?: string, options?: PlusWebviewWebviewLoadDataOptions): void;
+    /**
+     * 加载新URL页面
+     * 触发Webview窗口从新的URL地址加载页面，如果url地址无效将导致页面显示失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loadURL(url?: string, additionalHttpHeaders?: any): void;
+    /**
+     * 获取Webview窗口对象的原生（Native.JS）实例对象
+     * Android平台返回Webview窗口对象的android.webkit.Webview实例对象，
+     * 	iOS平台返回Webview窗口对象的UIWebview实例对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    nativeInstanceObject(): PlusAndroidInstanceObject | PlusIosInstanceObject;
+    /**
+     * 获取在当前Webview窗口中创建的所有窗口
+     * 返回从当前Webview中调用plus.webview.open或plus.webview.create创建的所有Webview窗口数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opened(): PlusWebview [];
+    /**
+     * 获取当前Webview窗口的创建者
+     * 创建者为调用plus.webview.open或plus.webview.create方法创建当前窗口的Webview窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opener(): PlusWebviewWebviewObject;
+    /**
+     * 拦截Webview窗口的资源加载
+     * 根据区配规则拦截Webview窗口加载资源的URL地址，重定向到其它资源地址（暂仅支持本地地址）。
+     * 	注意：多次调用overrideResourceRequest时仅以最后一次调用设置的参数值生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    overrideResourceRequest(options?: PlusWebview []): void;
+    /**
+     * 拦截Webview窗口的URL请求
+     * 拦截URL请求后，Webview窗口将不会跳转到新的URL地址，此时将通过callback回调方法返回拦截的URL地址（可新开Webview窗口加载URL页面等）。
+     * 	此方法只能拦截窗口的网络超链接跳转（包括调用loadURL方法触发的跳转），不可拦截页面请求资源请求（如加载css/js/png等资源的请求）。
+     * 	注意：多次调用overrideUrlLoading时仅以最后一次调用设置的参数值生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    overrideUrlLoading(options?: PlusWebviewWebviewOverrideUrlOptions, callback?: (result: any) => void): void;
+    /**
+     * 获取当前Webview窗口的父窗口
+     * Webview窗口作为子窗口添加（Webview.append）到其它Webview窗口中时有效，这时其它Webview窗口为父窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    parent(): PlusWebviewWebviewObject;
+    /**
+     * 重新加载Webview窗口显示的HTML页面
+     * 触发Webview窗口重新加载当前显示的页面内容。
+     * 	如果当前HTML页面未加载完则停止并重新加载，如果当前Webview窗口没有加载任何页面则无响应。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    reload(force?: boolean): void;
+    /**
+     * 重置Webview窗口的回弹位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，松开后自动回弹到停靠位置。
+     * 	这时需要调用此方法来重置窗口的回弹位置，窗口将采用动画方式回弹到其初始显示的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    resetBounce(): void;
+    /**
+     * 恢复Webview控件显示内容
+     * 恢复调用animate方法改变Webview控件的内容，更新至动画前显示的内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    restore(): void;
+    /**
+     * 移除子Webview窗口
+     * 从当前Webview窗口移除指定的子Webview窗口，若指定的webview对象不是当前窗口的子窗口则无任何作用。
+     * 	移除后子Webview窗口不会关闭，需要调用其close方法才能真正关闭并销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    remove(webview?: PlusNativeObjView): void;
+    /**
+     * 移除Webview窗口事件监听器
+     * 从Webview窗口移除通过addEventListener方法添加的事件监听器，若没有查找到对应的事件监听器，则无任何作用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeEventListener(event?: PlusWebviewWebviewEvent, listener?: (result: any) => void): void;
+    /**
+     * 从父窗口中移除
+     * 从所属的父Webview窗口移除，如果没有父窗口，则无任何作用。
+     * 	从父窗口中移除后子Webview窗口不会关闭，需要调用其close方法才能真正关闭并销毁。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeFromParent(): void;
+    /**
+     * 移除标题栏上按钮的角标
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    removeTitleNViewButtonBadge(index?: number): void;
+    /**
+     * 设置Webview窗口的回弹效果
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，松开后自动回弹到停靠位置（可通过style设置）。
+     * 	拖拽窗口内容时页面显示Webview窗口的背景色，默认为透明，此时显示Webview下面的内容，利用这个特点可以实现自定下拉刷新特效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setBounce(style?: PlusWebviewWebviewBounceStyle): void;
+    /**
+     * 设置Webview窗口是否阻塞加载页面中使用的网络图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setBlockNetworkImage(block?: boolean): void;
+    /**
+     * 设置HTML内容是否可见
+     * 设置HTML内容不可见后，将显示Webview窗口的背景色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setContentVisible(visible?: boolean): void;
+    /**
+     * 设置预加载的CSS文件
+     * 预加载CSS文件不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的CSS文件后将清空之前设置的值（包括调用setCssText设置的值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setCssFile(file?: string): void;
+    /**
+     * 设置预加载的CSS内容
+     * 预加载CSS内容不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的CSS内容后将清空之前设置的值（包括调用setCssFile设置的值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setCssText(text?: string): void;
+    /**
+     * 设置Webview窗口的收藏参数
+     * 仅在流应用环境（流应用/5+浏览器）中有效：用户点击流应用环境的收藏按钮时使用的参数，如设置收藏页面标题，图标、页面地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setFavoriteOptions(options?: PlusWebviewWebviewFavoriteOptions): void;
+    /**
+     * 设置Webview窗口底部修复区域高度
+     * 如果Webview加载页面中存在底部停靠区域（如“蘑菇街”WAP页面的底部Tab栏），在页面滚动时动态改变Webview高度可能会出现底部停靠区域抖动的现象（如360浏览器中向上滑顶部标题栏自动消失引起Webview变高）。
+     * 	此时可以调用此方法来指定底部停靠区域（通常是底部Tab栏）进行优化修复抖动效果，高度值为底部停靠区域的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setFixBottom(height?: number): void;
+    /**
+     * 设置预加载的JS文件
+     * 预加载JS文件不需要在HTML页面中显式引用，在Webview窗口加载HTML页面时自动加载，在页面跳转时也会自动加载。
+     * 	设置新的JS文件后将清空之前设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setJsFile(file?: string): void;
+    /**
+     * 设置Webview窗口的下拉刷新效果
+     * 开启Webview窗口的下拉刷新功能，显示窗口内置的下拉刷新控件样式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setPullToRefresh(style?: PlusWebviewWebviewPullToRefreshStyles, refreshCB?: () => void): void;
+    /**
+     * 设置Webview窗口rendered事件参数
+     * 可设置页面渲染完成的判断标准，如判断页面顶部区域、中间区域、或底部区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setRenderedEventOptions(options?: PlusWebviewWebviewRenderedEventOptions): void;
+    /**
+     * 设置Webview窗口的样式
+     * 更新Webview窗口的样式，如窗口位置、大小、背景色等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setStyle(styles?: PlusWebviewWebviewStyles): void;
+    /**
+     * 设置Webview窗口的分享参数
+     * 仅在流应用环境（流应用/5+浏览器）中有效：用户点击流应用环境的分享按钮时使用的参数，如设置分享的标题、链接地址等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setShareOptions(options?: PlusWebviewWebviewShareOptions): void;
+    /**
+     * 设置标题栏上按钮的角标
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setTitleNViewButtonBadge(index?: number, text?: string): void;
+    /**
+     * 设置Webview窗口是否可见
+     * 修改窗口是否可见并不影响窗口的显示栈顺序，窗口显示与隐藏也不会有动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    setVisible(visible?: boolean): void;
+    /**
+     * 显示Webview窗口
+     * 当调用plus.webview.create方法创建Webview窗口后，需要调用其show方法才能显示，并可设置窗口显示动画及动画时间。
+     * 	Webview窗口被隐藏后也可调用此方法来重新显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show(aniShow?: PlusWebviewAnimationTypeShow, duration?: number, showedCB?: () => void, extras?: PlusWebviewWebviewExtraOptions): void;
+    /**
+     * 在指定Webview窗口后显示
+     * 当调用plus.webview.create方法创建Webview窗口后，可调用其showBehind方法显示在指定Webview窗口之后。
+     * 	这种显示方式不会出现动画效果，当指定的Webview窗口关闭后，则自身窗口自动显示出来。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    showBehind(webview?: PlusWebviewWebviewObject): void;
+    /**
+     * 设置标题栏上按钮的红点
+     * 仅在窗口使用原生标题栏（titleNView）时生效，未显示原生标题栏时操作此接口无任何效果。
+     * 	注意：设置显示按钮的角标后红点不显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    showTitleNViewButtonRedDot(index?: number): void;
+    /**
+     * 停止加载HTML页面内容
+     * 触发Webview窗口停止加载页面内容，如果已经加载部分内容则显示部分内容，如果加载完成则显示全部内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    stop(): void;
+    /**
+     * 更新Webview窗口的原生子View控件对象
+     * 通过WebviewSubNViewStyles中的id属性值匹配子View控件更新绘制内容，如果没有查找到对应id的子View控件则忽略。
+     * 	此操作仅更新子View控件上绘制的内容，不会添加或删除原生子View控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    updateSubNViews(styles?: PlusWebview []): void;
+}
+
+/**
+ * Webview窗口动画参数
+ * 用于指定动画目标窗口，起始位置、目标位置等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewAnimationOptions {
+    /**
+     * 执行动画的窗口对象
+     * 可取值Webview窗口对象、Webview窗口的id（String类型）、原生View窗口对象（plus.nativeObj.View）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    view?: PlusWebviewWebviewObject;
+    /**
+     * 动画样式
+     * 用于指定动画窗口的起始位置，目标位置等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    styles?: PlusWebviewWebviewAnimationStyles;
+    /**
+     * 窗口动画完成后的行为
+     * 可取值：
+     * 	"none" - 动画完成后不做任何操作；
+     * 	"hide" - 动画完成后隐藏窗口；
+     * 	"close" - 动画完成后关闭窗口。
+     * 	默认值为"none"。
+     * - none: 动画完成后不做任何操作
+     * - hide: 动画完成后隐藏窗口
+     * - close: 动画完成后关闭窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    action?: 'none' | 'hide' | 'close';
+}
+
+/**
+ * Webview窗口动画样式
+ * 用于指定动画窗口的起始位置、目标位置等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewAnimationStyles {
+    /**
+     * 画窗口的起始左侧位置
+     * 支持百分比、像素值，默认值为当前窗口的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fromLeft?: string;
+    /**
+     * 画窗口的目标左侧位置
+     * 持百分比、像素值。
+     * 	注意：如果设置的位置与起始位置一直，则无动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    toLeft?: string;
+}
+
+/**
+ * Webview窗口回弹样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewBounceStyle {
+    /**
+     * Webview窗口支持回弹效果的方向
+     * 可通过此参数设置开启Webview哪个方向支持回弹效果。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部支持回弹效果；
+     * 	left：表示窗口左侧支持回弹效果；
+     * 	right：表示窗口右侧支持回弹效果；
+     * 	bottom：表示窗口底部支持回弹效果。
+     * 	**目前仅支持top属性**
+     * 	属性值：用于指定可拖拽的范围，可取百分比，如"10%"；像素值，如"100px"；自动计算值，如"auto"；无回弹效果值，如"none"；
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    position?: any;
+    /**
+     * Webview窗口回弹时停靠的位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（顶部或底部）时，再拖拽时窗口整体内容将跟随移动，拖拽过程中将触发"dragBounce"事件，松开后自动回弹到停靠位置。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部回弹时停靠的位置。
+     * 	属性值：用于指定窗口回弹的位置，可取百分比，如"5%"；像素值，如"100px"；自动计算值，如"auto"，默认为可拖拽的范围值的一半；
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    changeoffset?: any;
+    /**
+     * Webview窗口侧滑时停靠的位置
+     * 开启窗口回弹效果后，当窗口中展现的内容滚动到头（左侧或右侧）时，在拖拽时窗口整体内容将跟随移动，松开后自动停靠的侧滑位置，并触发"slideBounce"事件。
+     * 	支持以下属性：
+     * 	left：表示窗口左侧侧滑的位置；
+     * 	right：表示窗口右侧侧滑的位置。
+     * 	属性值：用于指定滑动后停靠的距离，可取百分比（left/right相对于窗口的宽度，top/bottom相对于窗口的高度），如"30%"；像素值，如"100px"；自动计算值，为可拖拽范围，如"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    slideoffset?: any;
+    /**
+     * Webview窗口拖拽偏移的位置
+     * 开启窗口回弹效果后，可以通过此属性值来主动设置拖拽的偏移位置，与手动操作拖拽至此偏移位置松开后的逻辑一致。
+     * 	支持以下属性：
+     * 	top：表示窗口顶部偏移的位置；
+     * 	left：表示窗口左侧偏移的位置；
+     * 	right：表示窗口右侧偏移的位置；
+     * 	bottom：表示窗口底部偏移的位置。
+     * 	属性值：用于指定偏移的位置，可取百分比，如"5%"；像素值，如"100px"；有效值范围为0到position属性定义的位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    offset?: any;
+    /**
+     * Webview窗口是否阻止touch事件传递给DOM元素
+     * 设置为true表示阻止touch事件，设置为false表示不阻止touch事件。当开启侧滑功能（左侧滑和右侧滑）时默认值为true，否则为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    preventTouchEvent?: boolean;
+}
+
+/**
+ * Webview窗口内容动画参数
+ * 指定动画的类型、持续时间等信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewContentAnimationOptions {
+    /**
+     * 动画类型
+     * 可取值："shrink" - 从上到下分块收缩清除窗口动画。
+     * - shrink: 从上到下分块清除动画
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'shrink';
+    /**
+     * 动画持续时间
+     * 单位为毫秒，默认值为200ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    duration?: number;
+    /**
+     * 动画帧数
+     * 必须为大于0的整数，默认值为12。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    frames?: number;
+    /**
+     * 动画作用区域
+     * 支持以下属性：
+     * 	top - 区域距离控件顶部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	bottom - 区域距离控件底部的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的高度）,默认值为'0px'；
+     * 	left - 区域距离控件左侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'；
+     * 	right - 区域距离控件右侧的偏移量，属性值可取像素值（如"100px"），百分比（如"10%"，相对于控件的宽度）,默认值为'0px'。
+     * 	如“{top:'44px',bottom:'48px'}”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    region?: any;
+}
+
+/**
+ * 原生控件在窗口中停靠的方式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDock {
+    /**
+     * 控件停靠则页面顶部
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    top?: string;
+    /**
+     * 控件停靠在页面底部
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bottom?: string;
+    /**
+     * 控件停靠在页面右侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    right?: string;
+    /**
+     * 控件停靠在页面左侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    left?: string;
+}
+
+/**
+ * Webview窗口滑动事件数据
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragEvent {
+    /**
+     * 手势类型
+     * 可取值：
+     * 	"rtl" - 从右向左滑动手势；
+     * 	"left" - 向左滑动手势，与rtl一致；
+     * 	"ltr" - 从左向右滑动手势；
+     * 	"right" - 向右滑动手势，与ltr一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    direction?: string;
+    /**
+     * 窗口滑动类型
+     * 可取值：
+     * 	"start" - 表示开始滑动操作；
+     * 	"move" - 表示正在滑动；
+     * 	"end" - 表示滑动操作结束。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: string;
+    /**
+     * 窗口滑动结果
+     * 可取值：
+     * 	"true" - 表示滑动操作成功；
+     * 	"false" - 表示滑动操作失败（恢复到滑动前的状态）；
+     * 	"undefined" - 无状态值（当type值为"end"时返回此值）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    result?: string;
+    /**
+     * 当前操作窗口标识
+     * 当type值为"start"/"move"时，保存当前操作窗口（或View控件）的标识；
+     * 	当type值为"end"时保存滑动操作后显示窗口（或View控件）的标识（即result值为"true"则认为关联窗口显示，result值为false则认为主窗口显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * 关联窗口标识
+     * 滑动操作关联窗口（或View控件）的标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    otherId?: string;
+    /**
+     * 主窗口标识
+     * 滑动操作主窗口（或View控件）的标识。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    targetId?: string;
+    /**
+     * 滑动进度
+     * 滑动进度位置信息，取值范围为0-100，如20表示滑动了总距离的20%：
+     * 	当type值为"start"时progress值为0；
+     * 	当type值为"end"时如果result为true则progress值为0，如果result为false则progress值为100；
+     * 	当type值为"move"时，保存当前滑动的进度信息（注：多次触发move事件）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: number;
+}
+
+/**
+ * 窗口手势操作参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragOptions {
+    /**
+     * 滑屏操作回调事件触发步长
+     * 用于设置滑屏回调事件触发频率，取值范围为1-100，值越小触发频率越高，值越大触发频率越小，默认值为20。
+     * 	如设置值为20，则表示滑屏操作移动距离超过可移动范围的20%则触发一次回调事件，可通过回调函数参数（WebviewDragEvent）的progress属性获取。
+     * 	注意：触发频率过大会影响效率，开发者需谨慎设置此值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    callbackStep?: number;
+    /**
+     * 设置的手势类型
+     * 可取值：
+     * 	可取值：
+     * 	"rtl" - 从右向左滑动手势；
+     * 	"left" - 向左滑动手势，与rtl一致；
+     * 	"ltr" - 从左向右滑动手势；
+     * 	"right" - 向右滑动手势，与ltr一致。
+     * - rtl: 从右向左滑动手势
+     * - left: 向左滑动手势，与rtl一致
+     * - ltr: 从左向右滑动手势
+     * - right: 向右滑动手势，与ltr一致
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    direction?: 'rtl' | 'left' | 'ltr' | 'right';
+    /**
+     * 滑动手势模式
+     * 可取值：
+     * 	"followFinger" - 当前Webview窗口跟随手指滑动；
+     * 	"silent" - 当前Webview窗口不跟随手指滑动；
+     * 	"bounce" - 当前Webview窗口自动回弹（松手后窗口恢复到拖动前的位置）,通常可通过设置此模式来实现Tab项无法继续滑动切换自动回弹效果。
+     * - followFinger: 当前Webview窗口跟随手指滑动
+     * - silent: 当前Webview窗口不跟随手指滑动
+     * - bounce: 当前Webview窗口自动回弹
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    moveMode?: 'followFinger' | 'silent' | 'bounce';
+}
+
+/**
+ * 手势操作关联对象参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDragOtherViewOptions {
+    /**
+     * 手势关联对象
+     * 可取值Webview窗口的id（String类型）、Webview窗口对象、原生View窗口对象（plus.nativeObj.View）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    view?: string;
+    /**
+     * 滑动模式
+     * 可取值：
+     * 	"follow" - 同步跟随主Webview窗口滑动；
+     * 	"silent" - 不跟随主Webview窗口滑动。
+     * - follow: 同步跟随主Webview窗口滑动
+     * - silent: 不跟随主Webview窗口滑动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    moveMode?: 'follow' | 'silent';
+}
+
+/**
+ * 截屏绘制操作参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewDrawOptions {
+    /**
+     * 截屏图片的位深
+     * 可取值：
+     * 		"RGB565" - RGB565彩色模式,一个像素占两个字节；
+     * 		"ARGB" - ARGB彩色模式,保存透明度信息。
+     * - RGB565: 
+     * 	RGB565彩色模式,一个像素占两个字节。
+     * 								
+     * - ARGB: 
+     * 	ARGB彩色模式,保存透明度信息。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bit?: 'RGB565' | 'ARGB';
+    /**
+     * 是否检测截屏图片是否为空白
+     * 可取值：
+     * 		true - 表示检测到截屏到空白图片时认为操作失败（触发错误回调函数）；
+     * 		false - 表示不检测，即使为空白图片仍然返回成功。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    check?: boolean;
+    /**
+     * 设置截屏区域
+     * 相对于Webview窗口的区域信息，默认值为{top:'0px',left:'0px',width:'100%',height:'100%'}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    clip?: PlusNativeObj;
+    /**
+     * 是否检测当前是否弹出软键盘
+     * 可取值：
+     * 		true - 表示检测到弹出软键盘是认为截屏操作失败（触发错误回调函数）；
+     * 		false - 表示不检测软键盘状态，直接截屏。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    checkKeyboard?: boolean;
+}
+
+/**
+ * 窗口收藏参数
+ * 在流应用环境中调用收藏功能时使用的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewFavoriteOptions {
+    /**
+     * 收藏时显示的图标
+     * 在收藏列表中显示的图标，默认使用应用图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    icon?: string;
+    /**
+     * 收藏时显示的标题
+     * 在收藏列表中显示的标题字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    title?: string;
+    /**
+     * 收藏的页面地址
+     * 必须是网络地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    href?: string;
+}
+
+/**
+ * 创建加载HTML数据参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewLoadDataOptions {
+    /**
+     * 页面的Base URL
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    baseURL?: string;
+    /**
+     * HTML数据的数据类型
+     * 默认值为"text/html"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mimeType?: string;
+    /**
+     * HTML数据的编码类型
+     * 默认值为"utf-8"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    encoding?: string;
+}
+
+/**
+ * 窗口的分享参数
+ * 在流应用环境中调用分享功能时使用的参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewShareOptions {
+    /**
+     * 分享时使用的图标
+     * 默认使用应用图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    icon?: string;
+    /**
+     * 分享时使用的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    title?: string;
+    /**
+     * 分享时使用的链接地址
+     * 必须是网络地址。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    href?: string;
+}
+
+/**
+ * 窗口原生子View控件样式
+ * 可设置原生控件的标识、大小、位置以及绘制的内容等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewSubNViewStyles {
+    /**
+     * 原生子View控件的标识
+     * 可通过plus.nativeObj.View.getViewById(id)方法传入此标识来获取子View控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    id?: string;
+    /**
+     * 原生子View控件类型
+     * 可取值：
+     * 		"NView" - 原生子View控件（plus.nativeObj.NView）；
+     * 		"ImageSlider" - 原生图片轮播控件（plus.nativeObj.ImageSlider）。
+     * 	默认值为"NView"。
+     * - NView: 
+     * 	原生子View控件（plus.nativeObj.NView）
+     * 								
+     * - ImageSlider: 
+     * 	原生图片轮播控件（plus.nativeObj.ImageSlider）							
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'NView' | 'ImageSlider';
+    /**
+     * 原生子View控件的样式
+     * 可设置原生控件的位置、大小等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    styles?: PlusNativeObjViewStyles;
+    /**
+     * 原生子View控件初始绘制内容
+     * 可设置绘制图片、矩形区域、文本等内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    tags?: any [];
+}
+
+/**
+ * 窗口标题栏控件样式
+ * 标题栏控件固定高度为44px,可通过Webview窗口对象的getTitleNView方法获取标题栏原生控件对象动态绘制内容。
+ * 	可以通过WebviewObject对象的getTitleNView()获取标题栏的NView对象，然后调用其setStyle方法更新样式。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTitleNViewStyles {
+    /**
+     * 标题栏控件是否显示左侧返回按钮
+     * 可取值：
+     * 		"true" - 显示返回按钮；
+     * 		"false" - 不显示返回按钮。
+     * 	默认值为"false"。
+     * 	返回按钮的颜色为窗口标题文字颜色，按下时颜色自动调整透明度为0.3。
+     * 	点击返回按钮的逻辑与按下系统返回键逻辑一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    autoBackButton?: boolean;
+    /**
+     * 标题栏控件的背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景，默认值为"#F7F7F7"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColor?: string;
+    /**
+     * 标题栏上的自定义按钮
+     * 创建的自定义按钮数目不限制，实际应用中建议最多设置4个按钮（包括左侧返回按钮）。
+     * 	注意：此属性不支持动态修改，仅在创建titleNView时设置有效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    buttons?: PlusWebview [];
+    /**
+     * 标题栏控件变化作用范围
+     * 仅在type值为transparent时有效，页面滚动时标题栏背景透明度将发生变化。
+     * 	当页面滚动到指定偏移量时标题栏背景变为完全不透明。
+     * 	支持百分比、像素值，默认为'132px'。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    coverage?: string;
+    /**
+     * 标题栏控件是否显示Home按钮
+     * 可取值：
+     * 		"true" - 显示Home按钮；
+     * 		"false" - 不显示Home按钮。
+     * 	默认值为"false"。
+     * 	Home按钮的颜色为窗口标题文字颜色，按下时颜色自动调整透明度为0.3。
+     * 	点击Home按钮的逻辑为关闭所有非首页窗口，显示首页窗口。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    homeButton?: boolean;
+    /**
+     * 内边距
+     * 标题栏左右的内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    padding?: string;
+    /**
+     * 右内边距
+     * 标题栏右侧内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"，优先级padding-right &gt; padding。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'padding-right'?: string;
+    /**
+     * 左内边距
+     * 标题栏左侧内边距，单位为px（逻辑像素值），如"10px"表示10逻辑像素值。
+     * 	默认值为"0px"，优先级padding-left &gt; padding。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    'padding-left'?: string;
+    /**
+     * 标题栏控件的进度条样式
+     * 设置此属性则在标题栏控件的底部显示进度条，可配置进度条颜色值即高度。
+     * 	设置此属性值为undefined或null则隐藏进度条。
+     * 	默认不显示底部进度条。
+     * 	注意：此属性将废弃，推荐使用WebviewStyles的progress。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 标题栏控件的底部分割线
+     * 设置此属性则在标题栏控件的底部显示分割线，可配置颜色值及高度。
+     * 	设置此属性值为undefined或null则隐藏分割线。
+     * 	默认不显示底部分割线。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    splitLine?: PlusWebviewWebviewSplitLineStyles;
+    /**
+     * 标题栏上初始自定义绘制内容
+     * 可用于设置自定义绘制图片、矩形区域、文本等内容。
+     * 	注意：此属性不支持动态修改，仅在创建titleNView时设置有效，如果需要更新绘制内容可根据tags的id调用draw方法操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    tags?: any [];
+    /**
+     * 标题栏控件的标题文字颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示标题文字颜色为红色，默认值为"#000000"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleColor?: string;
+    /**
+     * 标题栏控件的标题文字超出显示区域时处理方式
+     * 可取值：
+     * 		"clip" - 超出显示区域时内容裁剪；
+     * 		"ellipsis" - 超出显示区域时尾部显示省略标记（...）。
+     * 	默认值为"ellipsis"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleOverflow?: string;
+    /**
+     * 标题栏控件的标题文字内容
+     * 在标题栏控件居中（水平和垂直）显示，左右边距为88px，如果文本过长则尾部裁剪（加三个点"..."）显示。
+     * 	当不设置titleText属性或属性值为undefined/null时，使用当前Webview窗口加载页面的标题，并自动同步更新页面的标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleText?: string;
+    /**
+     * 标题栏控件的标题文字字体大小
+     * 字体大小单位为像素，如"20px"表示字体大小为20像素，默认值为17像素。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleSize?: string;
+    /**
+     * 标题栏控件样式
+     * 可取值：
+     * 		"default" - 默认样式，顶部停靠显示，挤压Webview页面内容显示区域；
+     * 		"transparent" - 透明样式，顶部沉浸式显示覆盖Webview页面内容，标题栏上内容（除按钮外）全部透明，当页面滚动时透明度逐渐变化，直到不透明显示。
+     * 	默认值为"default"。
+     * 	注意：此属性不支持动态更新。
+     * - default: 
+     * 	默认样式，顶部停靠显示，挤压Webview页面内容显示区域
+     * 								
+     * - transparent: 
+     * 	透明样式，顶部沉浸式显示覆盖Webview页面内容，标题栏上内容（除按钮外）全部透明，当页面滚动时透明度逐渐变化，直到不透明显示							
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'default' | 'transparent';
+}
+
+/**
+ * 窗口标题栏自定义按钮样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTitleNViewButtonStyles {
+    /**
+     * 按钮样式
+     * 运行环境中内置按钮样式直接使用，内置样式忽略fontSrc和text属性。
+     * 	可取值：
+     * 		"forward" - 前进按钮；
+     * 		"back" - 后退按钮；
+     * 		"share" - 分享按钮；
+     * 		"favorite" - 收藏按钮；
+     * 		"home" - 主页按钮；
+     * 		"menu" - 菜单按钮；
+     * 		"close" - 关闭按钮；
+     * 		"none" - 无样式。
+     * 	默认值为无样式（"none"），需通过text属性设置按钮上显示的内容、通过fontSrc属性设置使用的字体库。
+     * - forward: 前进按钮
+     * - back: 后退按钮
+     * - share: 分享按钮
+     * - favorite: 收藏按钮
+     * - home: 主页按钮
+     * - menu: 菜单按钮
+     * - close: 关闭按钮
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: 'forward' | 'back' | 'share' | 'favorite' | 'home' | 'menu' | 'close';
+    /**
+     * 按钮的背景颜色
+     * 仅在标题栏type=transparent时生效，当标题栏透明时按钮显示的背景颜色。
+     * 	可取值#RRGGBB和rgba格式颜色字符串，默认值为灰色半透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+    /**
+     * 按钮上显示的角标文本
+     * 最多显示3个字符，超过则显示为...。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    badgeText?: string;
+    /**
+     * 按钮上文字颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色返回键；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为窗口标题栏控件的标题文字颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 按下状态按钮文字颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色返回键；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为color属性值自动调整透明度为0.3。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    colorPressed?: string;
+    /**
+     * 按钮在标题栏上的显示位置
+     * 可取值：
+     * 		"right" - 在标题栏中靠右排列显示；
+     * 		"left" - 在标题栏中靠左侧排列显示（在返回键后）。
+     * 		默认值为"right"。
+     * - right: 
+     * 	在标题栏中靠右排列显示
+     * 								
+     * - left: 
+     * 	在标题栏中靠左侧排列显示（在返回键后）
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    float?: 'right' | 'left';
+    /**
+     * 按钮上文字的粗细
+     * 可取值：
+     * 		"normal" - 标准字体；
+     * 		"bold" - 加粗字体。
+     * 	默认值为"normal"。
+     * - normal: 
+     * 	标准字体
+     * 								
+     * - bold: 
+     * 	加粗字体
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontWeight?: 'normal' | 'bold';
+    /**
+     * 按钮上文字大小
+     * 可取值：字体高度像素值，数字加"px"格式字符串，如"22px"。 
+     * 	窗口标题栏为透明样式（type="transparent"）时，默认值为"22px"；
+     * 	窗口标题栏为默认样式（type="default"）时，默认值为"27px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontSize?: string;
+    /**
+     * 按钮上文字使用的字体文件路径
+     * 字体文件路径支持以下类型：
+     * 		相对路径 - 相对于当前页面的host位置，如"a.ttf"，注意当前页面为网络地址则不支持；
+     * 		绝对路径 - 系统绝对路径，如Android平台"/sdcard/a.ttf"，此类路径通常通过其它5+ API获取的；
+     * 		扩展相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.ttf"；
+     * 		本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    fontSrc?: string;
+    /**
+     * 按钮点击后触发的回调函数
+     * 回调函数中将返回此JSON对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    onclick?: (result: any) => void;
+    /**
+     * 按钮上是否显示红点
+     * 设置为true则显示红点，false则不显示红点。默认值为false。
+     * 	注意：当设置了角标文本时红点不显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    redDot?: boolean;
+    /**
+     * 是否显示选择指示图标
+     * 设置为true则显示选择指示图标（向下箭头），颜色与文字颜色一致；
+     * 	false则不显示。默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    select?: boolean;
+    /**
+     * 按钮上显示的文字
+     * 推荐使用一个字符，超过一个字符可能无法正常显示，使用字体图标时unicode字符表示必须'\u'开头，如"\ue123"（注意不能写成"\e123"）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    text?: string;
+    /**
+     * 按钮的宽度
+     * 可取值：
+     * 		"*px" - 逻辑像素值，如"10px"表示10逻辑像素值，按钮的内容居中显示；
+     * 		"auto" - 自定计算宽度，根据内容自动调整按钮宽度。
+     * 	默认值为"44px"（适合字体图标）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    width?: string;
+}
+
+/**
+ * 标题栏控件的进度条样式
+ * 显示在标题栏控件底部。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewProgressStyles {
+    /**
+     * 进度条颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色分割线；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#00FF00"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 进度条高度
+     * 可取值：像素值（逻辑像素），支持小数点，如"1px"表示1像素高；百分比，如"1%"，相对于标题栏控件的高度。
+     * 	默认值为"2px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+}
+
+/**
+ * 窗口标题栏控件的分割线样式
+ * 显示在标题栏控件底部。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewSplitLineStyles {
+    /**
+     * 底部分割线颜色
+     * 可取值： "#RRGGBB"格式字符串，如"#FF0000"表示绘制红色分割线；
+     * 	"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为"#CCCCCC"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 底部分割线高度
+     * 可取值：像素值（逻辑像素），支持小数点，如"1px"表示1像素高；百分比，如"1%"，相对于标题栏控件的高度。
+     * 	默认值为"1px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+}
+
+/**
+ * Webview窗口事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewEvent {
+    /**
+     * Webview窗口关闭事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口关闭时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    close?: string;
+    /**
+     * Webview窗口回弹事件
+     * 通过WebviewObject对象的setBounce方法开启回弹效果设置顶部下拉回弹changeoffset属性后，当用户向下拖拽窗口时触发发此事件，回调函数类型为BounceEventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dragBounce?: string;
+    /**
+     * Webview窗口回弹事件
+     * 通过WebviewObject对象的setBounce方法开启回弹效果设置左右侧侧滑slideoffset属性后，当用户向左右侧拖拽窗口侧滑时触发发此事件，回调函数类型为BounceEventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    slideBounce?: string;
+    /**
+     * Webview窗口加载错误事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载错误时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    error?: string;
+    /**
+     * Webview窗口隐藏事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口隐藏（窗口动画完成后）时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hide?: string;
+    /**
+     * Webview窗口页面开始加载事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口开始加载新页面时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loading?: string;
+    /**
+     * Webview窗口页面加载完成事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口页面加载完成时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    loaded?: string;
+    /**
+     * Webview窗口显示遮罩层时点击事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口通过mask属性设置显示遮罩层并且点击时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    maskClick?: string;
+    /**
+     * Webview窗口开始渲染事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口开始渲染内容时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rendering?: string;
+    /**
+     * Webview窗口渲染完成事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口渲染完成时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rendered?: string;
+    /**
+     * Webview窗口显示事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口显示（窗口动画完成后）时触发此事件，回调函数类型为EventCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    show?: string;
+    /**
+     * Webview加载页面标题更新事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载新页面更新标题时触发此事件，回调函数类型为SuccessCallback。
+     * 	注意：此事件会先于loaded事件触发，通常在加载网络页面时通过此事件可更快获取到页面的标题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleUpdate?: string;
+    /**
+     * Webview窗口接收到触屏事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当用户操作按下到Webview窗口时触发此事件，回调函数类型为SuccessCallback。
+     * 	注意：每按下屏幕触发一次此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    touchstart?: string;
+    /**
+     * Webview窗口侧滑返回事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口侧滑返回时触发此事件，回调函数类型为PopGestureCallback。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    popGesture?: string;
+    /**
+     * Webview窗口加载进度变化事件
+     * 通过WebviewObject对象的addEventListener方法添加事件监听函数，当Webview窗口加载页面进度变化时触发此事件。
+     * 	回调函数原型为void PorgressCandedCallback(Event e),可通过e.progress获取窗口加载进度，取值范围为0-100。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progressChanged?: string;
+    /**
+     * Webview窗口下拉刷新事件
+     * Webview窗口打开下拉刷新功能后，用户操作下拉刷新时或调用beginPullToRefresh方法时触发，用于通知业务逻辑可以开始执行刷新操作。
+     * 	更新操作完成后调用窗口的endPullToRefresh方法结束下拉刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    pullToRefresh?: string;
+}
+
+/**
+ * JSON对象，原生窗口扩展参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewExtraOptions {
+    /**
+     * 窗口动画加速
+     * 开启窗口动画加速功能可优化窗口动画效果，提升动画流程度，可避免部分设备上打开（关闭）窗口闪屏的问题。
+     * 	可取值：
+     * 	"auto" - 自动优化窗口动画；
+     * 	"none" - 关闭窗口动画加速功能；
+     * 	"capture" - 使用截屏方式加速窗口动画。
+     * 	默认值为"auto"。
+     * - auto: 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    acceleration?: 'auto';
+    /**
+     * 窗口动画加速时使用的图片
+     * 当使用截屏方式加速窗口动画时，可设置已经创建好的截屏图片，此时不会进行实时截屏操作，加速窗口动画响应时间，提升用户体验。
+     * 	如果未指定截屏图片，则实时截取当前Webview窗口对象的图片进行动画操作。
+     * 	如果窗口未使用截屏方式加速动画，则忽略此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    capture?: PlusNativeObjBitmap;
+    /**
+     * 关联窗口动画使用的图片
+     * 当使用截屏方式加速窗口动画时，可设置已经创建好的截屏图片，此时不会进行实时截屏操作，加速关联窗口动画响应时间，提升用户体验。
+     * 	如果未指定截屏图片，则实时截取关联Webview窗口对象的图片进行动画操作。
+     * 	如果窗口未使用截屏方式加速动画，则忽略此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    otherCapture?: PlusNativeObjBitmap;
+}
+
+/**
+ * 原生控件在窗口中显示的位置
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewPosition {
+    /**
+     * 控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    static?: string;
+    /**
+     * 控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    absolute?: string;
+    /**
+     * 控件在页面中停靠，停靠的位置通过dock属性进行定义
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dock?: string;
+}
+
+/**
+ * Webview窗口下拉刷新样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewPullToRefreshStyles {
+    /**
+     * 是否开启Webview窗口的下拉刷新功能
+     * true表示开启窗口的下拉刷新功能；
+     * 	false表示关闭窗口的下拉刷新功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    support?: boolean;
+    /**
+     * 下拉刷新控件颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"为设置下拉属性控件为红色，默认值为"#2BD009"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    color?: string;
+    /**
+     * 下拉刷新样式
+     * 用于定义下拉刷新风格样式，可取值：
+     * 	"default" - 经典下拉刷新样式（下拉拖动时页面内容跟随）；
+     * 	"circle" - 圆圈样式下拉刷新控件样式（下拉拖动时仅刷新控件跟随）。
+     * 	默认值为"default"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    style?: string;
+    /**
+     * 窗口的下拉刷新控件进入刷新状态的拉拽高度
+     * 支持百分比，如"10%"；像素值，如"50px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+    /**
+     * 窗口可下拉拖拽的范围
+     * 支持百分比，如"10%"；像素值，如"50px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    range?: string;
+    /**
+     * 下拉刷新控件的起始位置
+     * 仅对"circle"样式下拉刷新控件有效，用于定义刷新控件下拉时的起始位置。
+     * 	相对于Webview的顶部偏移量，支持百分比，如"10%"；像素值，如"50px"。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    offset?: string;
+    /**
+     * 在下拉可刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在下拉可刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentdown?: any;
+    /**
+     * 在释放可刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在释放可刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentover?: any;
+    /**
+     * 在正在刷新状态时显示的内容
+     * 支持以下属性：
+     * 	caption：在正在刷新状态时下拉刷新控件上显示的标题内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    contentrefresh?: any;
+}
+
+/**
+ * Webview窗口rendered事件参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewRenderedEventOptions {
+    /**
+     * 判断窗口渲染完成类型
+     * 可取值：
+     * 	"top"-从顶部向下偏移22px横线截屏检测渲染是否完成；
+     * 	"bottom"-从底部向上偏移25px横线检测渲染是否完成；
+     * 	"center"-从中间横线检测渲染是否完成；
+     * 	"auto"为全屏检测（左、中、右三条竖线）。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    type?: string;
+    /**
+     * 判断窗口渲染完成间隔时间
+     * 单位为ms（毫秒），默认值为150ms。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    interval?: number;
+}
+
+/**
+ * 替换H5标准API配置信息
+ * 目前仅支持替换H5标准定位接口
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewReplaceWebApiOptions {
+    /**
+     * 替换H5标准定位接口(navigator.geolocation.*)
+     * 由于网络原因，在部分手机上可能无法调用标准H5定位接口(navigator.geolocation.*)获取定位数据，此时可以通过此属性配置使用原生定位模块替换标准H5定位接口，可取值：
+     * 		"alldevice" - 在所有设备上替换标准H5定位接口(navigator.geolocation.*)；
+     * 		"auto" - 自动替换H5标准定位接口，仅在调用标准H5定位接口无法获取数据的设备上替换；
+     * 		"none" - 不替换H5标准定位接口(navigator.geolocation.*)。
+     * 	默认值为"none"。
+     * 	注意：替换H5标准定位接口，会导致页面加载速度延迟100ms左右，推荐使用"auto"模式。
+     * - alldevice: 
+     * 	强制替换H5标准定位接口(navigator.geolocation.*)		
+     * 								
+     * - auto: 
+     * 	自动替换标准H5定位接口，仅在调用标准H5定位接口无法获取数据的设备上替换
+     * 								
+     * - none: 
+     * 	不替换标准H5定位接口(navigator.geolocation.*)
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    geolocation?: 'alldevice' | 'auto' | 'none';
+}
+
+/**
+ * JSON对象，Webview窗口的系统状态栏区域样式
+ * 仅在应用设置为沉浸式状态栏样式下有效，非沉浸式状态栏样式下忽略此属性。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewStatusbarStyles {
+    /**
+     * 系统状态栏区域背景颜色
+     * 颜色值格式为"#RRGGBB"，如"#FF0000"表示为红色背景。
+     * 	默认值为应用manifest.json中plus-&gt;statusbar-&gt;background属性配置的值，如果未配置此属性值，则使用系统默认状态栏的背景颜色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+}
+
+/**
+ * JSON对象，Webview窗口对象的样式
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewStyles {
+    /**
+     * 窗口加载页面时额外添加的HTTP请求头数据
+     * 仅在Webview窗口第一次加载页面时使用，如用户点击的触发的链接跳转则不再添加此额外请求头数据。
+     * 	如果Webview窗口非第一次加载页面时也需要额外添加HTTP请求头数据，可通过loadURL()方法的参数设置。
+     * 	如果HTTP请求头中已经包含需要额外添加的头数据，则添加的请求数据覆盖默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    additionalHttpHeaders?: any;
+    /**
+     * 窗口动画优化方式
+     * 可取值：
+     * 		"auto" - 如果窗口中存在titleNView或subNViews，窗口动画时真实Webview控件从动画窗口中移除加速（避免真实Webview渲染影响动画效率）；
+     * 		"none" - 窗口动画不使用优化。
+     * 	默认值为"auto"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    animationOptimization?: string;
+    /**
+     * 窗口的缓存模式
+     * 可取值：
+     * 	"default" - 根据cache-control决定是否使用缓存数据，如果存在缓存并且没有过期则使用本地缓存资源，否则从网络获取；
+     * 	"cacheElseNetwork" - 只要存在缓存（即使过期）数据则使用，否则从网络获取；
+     * 	"noCache" - 不使用缓存数据，全部从网络获取；
+     * 	"cacheOnly" - 仅使用缓存数据，不从网络获取（注：如果没有缓存数据则会导致加载失败）。
+     * 	默认使用"default"。
+     * - default: 
+     * 	根据cache-control决定是否使用缓存数据，如果存在缓存并且没有过期则使用本地缓存资源，否则从网络获取。
+     * 								
+     * - cacheElseNetwork: 
+     * 	只要存在缓存（即使过期）数据则使用，否则从网络获取。
+     * 								
+     * - noCache: 
+     * 	不使用缓存数据，全部从网络获取。
+     * 								
+     * - cacheOnly: 
+     * 	仅使用缓存数据，不从网络获取（注：如果没有缓存数据则会导致加载失败）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    cachemode?: 'default' | 'cacheElseNetwork' | 'noCache' | 'cacheOnly';
+    /**
+     * Webview窗口自动处理返回键逻辑
+     * 当Webview窗口在显示栈顶，并且Webview窗口中没有调用JS监听返回键（plus.key.addEventListener('backbutton',...)）时按下返回键响应行为。
+     * 	可取值：
+     * 		"hide" - 隐藏Webview窗口，隐藏动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）；
+     * 		"close" - 关闭Webview窗口，关闭动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”） ；
+     * 		"none" - 不做操作，将返回键传递给下一Webview窗口处理；
+     * 		"quit" - 退出应用。
+     * - hide: 
+     * 	隐藏Webview窗口，隐藏动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）。
+     * 								
+     * - close: 
+     * 	关闭Webview窗口，关闭动画与上一次调用显示时设置的动画类型相对应（如“slide-in-right”对应的关闭动画为“slid-out-right”）。
+     * 								
+     * - none: 
+     * 	不做操作，将返回键传递给下一Webview窗口处理。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backButtonAutoControl?: 'hide' | 'close' | 'none';
+    /**
+     * 窗口的背景颜色
+     * 窗口空白区域的背景模式，设置background为颜色值(参考CSS Color Names，可取值/十六进制值/rgb值/rgba值)，窗口为独占模式显示（占整个屏幕区域）；
+     * 	设置background为“transparent”，则表示窗口背景透明，为非独占模式。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    background?: string;
+    /**
+     * 窗口顶部背景颜色值
+     * 窗口内容滚动到顶部下拉时可见。
+     * 	可取值：
+     * 		"#RRGGBB"格式字符串，如"#FF0000"表示红色；
+     * 		"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColorTop?: string;
+    /**
+     * 窗口底部背景颜色
+     * 窗口内容滚动到底部上拉时可见。
+     * 	可取值：
+     * 		"#RRGGBB"格式字符串，如"#FF0000"表示红色；
+     * 		"rgba(R,G,B,A)"，其中R/G/B分别代表红色值/绿色值/蓝色值，正整数类型，取值范围为0-255，A为透明度，浮点数类型，取值范围为0-1（0为全透明，1为不透明），如"rgba(255,0,0,0.5)"，表示红色半透明。
+     * 	默认值为透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    backgroundColorBottom?: string;
+    /**
+     * 是否阻塞网络图片的加载
+     * 布尔类型，true表示阻塞，false表示不阻塞，默认值为false。
+     * 	阻塞后Webview窗口将不加载页面中使用的所有网络图片，可通过Webview窗口对象的setBlockNetWorkImage()方法动态修改此状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    blockNetworkImage?: boolean;
+    /**
+     * 窗口垂直向上的偏移量
+     * 支持百分比、像素值，默认值无值（根据top和height属性值来自动计算）。
+     * 	当同时设置了top和height值时，忽略此属性值；
+     * 	当未设置height值时，可通过top和bottom属性值来确定窗口的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bottom?: string;
+    /**
+     * 窗口遇到边框是否有反弹效果
+     * 可取值：
+     * 		"none" - 表示没有反弹效果；
+     * 		"vertical" - 表示垂直方向有反弹效果；
+     * 		"horizontal" - 表示水平方向有反弹效果；
+     * 		"all" - 表示垂直和水平方向都有反弹效果。
+     * 	默认值为"none"。
+     * - none: 没有反弹效果
+     * - vertical: 垂直方向有反弹效果
+     * - horizontal: 水平方向有反弹效果
+     * - all: 垂直和水平方向都有反弹效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bounce?: 'none' | 'vertical' | 'horizontal' | 'all';
+    /**
+     * 窗口回弹效果区域的背景
+     * 窗口回弹效果区域背景可支持颜色值或图片：
+     * 		颜色值格式为"#RRGGBB"，如"#FFFFFF"为设置白色背景；
+     * 		背景图为"url(%image path%)"，如"url(./icon.png)"为设置icon.png为背景图，图片采用平铺模式绘制。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    bounceBackground?: string;
+    /**
+     * 窗口内容停止滑动的减速度
+     * 当Webview加载的内容超过其高度时，可以拖拽滑动内容，decelerationRate属性控制手指松开后页面滑动的速度。
+     * 	设置值越大手指松开后的滑动速度越快（滑动距离越长），其值域范围为0.0-1.0，默认值为0.989。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    decelerationRate?: number;
+    /**
+     * 窗口的停靠方式
+     * 当Webview窗口添加到另外一个窗口中时，停靠方式才会生效，采用停靠方式添加会导致原Webview窗口自动调整其大小避免其内容被子窗口盖住。
+     * 	可取值："top"，控件停靠则页面顶部；"bottom"，控件停靠在页面底部；"right"，控件停靠在页面右侧；"left"，控件停靠在页面左侧。
+     * 	默认值为"bottom"。
+     * - top: 控件停靠则页面顶部
+     * - bottom: 控件停靠在页面底部
+     * - right: 控件停靠在页面右侧
+     * - left: 控件停靠在页面左侧
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    dock?: 'top' | 'bottom' | 'right' | 'left';
+    /**
+     * 窗口加载错误时跳转的页面地址
+     * 当Webview窗口无法加载指定的url地址时（如本地页面不存在，或者无法访问的网络地址），此时会自动跳转到指定的错误页面地址（仅支持本地页面地址）。
+     * 	设置为“none”则关闭跳转到错误页面功能，此时页面显示Webview默认的错误页面内容。默认使用5+ Runtime内置的错误页面。
+     * - none: 关闭加载页面错误自动跳转功能
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    errorPage?: 'none';
+    /**
+     * 替换H5标准API
+     * 用于解决在部分设备上调用H5标准定位接口可能无法获取定位数据的问题。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    replacewebapi?: PlusWebviewWebviewReplaceWebApiOptions;
+    /**
+     * 窗口是否开启硬件加速
+     * 布尔类型，true表示开启硬件加速，false表示不开启硬件加速，默认情况5+ Runtime会根据设备实际支持情况自动选择是否开启硬件加速，可以通过plus.webview.defaultHardwareAccelerated()方法获取默认Webview是否开启硬件加速。
+     * 	由于不同设备对硬件加速的支持情况存在差异，开启硬件加速能加速HTML页面的渲染，但也会消耗更多的系统资源，从而导致在部分设备上可能出现闪屏、发虚、分块渲染等问题，因此在特定设备的特定页面如果出现以上问题需要手动设置关闭硬件加速来避免。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    hardwareAccelerated?: boolean;
+    /**
+     * 窗口的高度
+     * 支持百分比、像素值，默认为100%。
+     * 	当未设置height属性值时，优先通过top和bottom属性值来计算窗口的高度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    height?: string;
+    /**
+     * 窗口使用的内核
+     * 可取值：
+     * 	"WKWebview" - 在iOS8.0及以上系统使用WKWebview内核，低版本下仍然使用UIWebview内核；
+     *     "UIWebview" - 在所有版本上都使用UIWebview内核。
+     *     默认值为"UIWebview"。
+     *     WKWebview内核的优势是：
+     * 		1. 滚动时懒加载的图片也可以实时渲染，UIWebview在滚动停止后才能渲染；
+     * 		2. WKWebview的video支持AirPlay。
+     * 	但WKWebview也有些限制和不足，目前已知的问题有：
+     * 		1. 不支持跨域设置cookie，即plus.navigator.setCookie()API无法使用；
+     * 		2. 本地的HTML页面中的XHR不支持跨域访问，需使用plus.net.XMLHttpRequest来替换；
+     * 		3. 不支持使用WebSQL，需使用indexDB来替换；
+     * 		4. 不支持js原生混淆功能，需使用前端js混淆来替换；
+     * 		5. 内存不足时会白屏。
+     * 	首页的Webview的kernel在manifest中配置（plus-&gt;kernel-&gt;ios）。
+     * - WKWebview: 
+     * 	使用"WKWebview"内核。
+     * 								
+     * - UIWebview: 
+     * 	使用"UIWebview"内核。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    kernel?: 'WKWebview' | 'UIWebview';
+    /**
+     * 窗口水平向右的偏移量
+     * 支持百分比、像素值，默认值为0px。
+     * 	未设置left属性值时，优先通过right和width属性值来计算窗口的left位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    left?: string;
+    /**
+     * 窗口的边距
+     * 用于定位窗口的位置，支持auto，auto表示居中。若设置了left、right、top、bottom则对应的边距值失效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    margin?: string;
+    /**
+     * 窗口的遮罩
+     * 用于设置Webview窗口的遮罩层样式，遮罩层会覆盖Webview中所有内容，包括子webview，并且截获webview的所有触屏事件，此时Webview窗口的点击操作会触发maskClick事件。
+     * 	字符串类型，可取值：
+     * 	rgba格式字符串，定义纯色遮罩层样式，如"rgba(0,0,0,0.5)"，表示黑色半透明；
+     * 	"none"，表示不使用遮罩层；
+     * 	默认值为"none"，即无遮罩层。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mask?: string;
+    /**
+     * 窗口的不透明度
+     * 0为全透明，1为不透明，默认值为1，即不透明。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    opacity?: number;
+    /**
+     * 控制Webview注入5+ API时机
+     * 可取值：
+     *         "ahead" - 尽量提前，拦截页面中网络js请求实现提前注入，如果没有拦截到js请求则在页面loaded时注入；
+     *         "normal" - 页面loaded时注入；
+     *         "later" - 较晚在注入，在loaded事件发生后2s再注入，plusready事件同样延迟；
+     *         "none" - 不注入，页面无法调用5+ API，不触发plusready事件。
+     *         默认值为"normal"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    plusrequire?: string;
+    /**
+     * 窗口的进度条样式
+     * 设置此属性则在Webview窗口的顶部显示进度条，可配置进度条颜色及高度。
+     * 	设置此属性值为undefined或null则隐藏进度条。
+     * 	默认不显示进度条。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    progress?: PlusWebviewWebviewProgressStyles;
+    /**
+     * 窗口的侧滑返回功能
+     * 可取值：
+     * 		"none"-无侧滑返回功能；
+     * 		"close"-侧滑返回关闭Webview窗口；
+     * 		"hide"-侧滑返回隐藏webview窗口。
+     * - none: 无侧滑返回功能
+     * - close: 侧滑返回关闭Webview窗口
+     * - hide: 侧滑返回隐藏webview窗口
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    popGesture?: 'none' | 'close' | 'hide';
+    /**
+     * 窗口下拉刷新配置
+     * 设置窗口是否开启下拉刷新功能及样式。
+     * 	开启下拉刷新后可通过监听窗口的"pullToRefresh"事件处理下拉刷新业务逻辑，更新操作完成后调用窗口的endPullToRefresh方法结束下拉刷新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    pullToRefresh?: PlusWebviewWebviewPullToRefreshStyles;
+    /**
+     * 窗口渲染模式
+     * 支持以下属性值：
+     * 		"onscreen" - Webview窗口在屏幕区可见时渲染，不可见时不进行渲染，此时能减少内存使用量；
+     * 		"always" - Webview在任何时候都渲染，在内存较大的设备上使用，被遮挡的窗口在此中模式下显示的时候会有更流畅的效果。
+     * 	默认值为"onscreen"。
+     * 	仅Android平台支持。
+     * - onscreen: Webview窗口在屏幕区可见时渲染，不可见时不进行渲染，此时能减少内存使用量
+     * - always: Webview在任何时候都渲染，在内存较大的设备上使用，被遮挡的窗口在此中模式下显示的时候会有更流畅的效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    render?: 'onscreen' | 'always';
+    /**
+     * 窗口水平向左的偏移量
+     * 支持百分比、像素值，默认无值（根据left和width属性值来自动计算）。
+     * 	当设置了left和width值时，忽略此属性值；
+     * 	当未设置width值时，可通过left和bottom属性值来确定窗口的宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    right?: string;
+    /**
+     * 窗口是否可缩放
+     * 窗口设置为可缩放（scalable:true）时，用户可通过双指操作放大或缩小页面，此时html页面可通过meta节点设置“name="viewport" content="user-scalable=no"”来限制页面不可缩放。
+     * 	窗口设置为不可缩放（scalable:false）时，用户不可通过双指操作放大或缩小页面，即使页面中的meta节点也无法开启可缩放功能。
+     * 	默认值为false，即不可缩放。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scalable?: boolean;
+    /**
+     * 窗口是否显示滚动条
+     * 用于控制窗口滚动条样式，可取值：
+     * 	"all"：垂直和水平滚动条都显示；
+     * 	"vertical"：仅显示垂直滚动条；
+     * 	"horizontal"：仅显示水平滚动条；
+     * 	"none"：垂直和水平滚动条都不显示。
+     * 	默认值为"all"，即垂直和水平滚动条都显示。
+     * 	注意：显示滚动条的前提条件是窗口中的内容超过窗口显示的宽或高。
+     * - all: 垂直和水平滚动条都显示
+     * - vertical: 仅显示垂直滚动条
+     * - horizontal: 仅显示水平滚动条
+     * - none: 垂直和水平滚动条都不显示
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scrollIndicator?: 'all' | 'vertical' | 'horizontal' | 'none';
+    /**
+     * 点击设备的状态栏时是否滚动返回至顶部
+     * true表示点击设备的状态栏可以滚动返回至顶部，false表示点击设备的状态栏不可以，默认值为true。
+     * 	此功能仅iOS平台支持，在iPhone上有且只有一个Webview窗口的scrollsToTop属性值为true时才生效，所以在显示和关闭Webview窗口时需动态更新所有Webview的scrollsToTop值，已确保此功能生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scrollsToTop?: boolean;
+    /**
+     * 是否可分享窗口加载的链接地址
+     * 在流应用环境（流应用/5+浏览器）中可通过分享按钮分享页面链接地址，
+     * 	可取值：
+     * 		true - 可分享窗口加载页面链接地址；
+     * 		false - 不可分享窗口加载的页面链接地址，此时分享的是应用。
+     * 	默认值值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    shareable?: boolean;
+    /**
+     * 弹出系统软键盘模式
+     * 可选值：“adjustPan”- 弹出软键盘时Webview窗口自动上移，以保证当前输入框可见；“adjustResize”- 自动调整Webview窗口大小（屏幕区域减去软键盘区域），同时自动滚动Webview保证输入框可见。
+     * 	默认值为“adjustPan”。
+     * - adjustPan: 弹出软键盘时Webview窗口自动上移，以保证当前输入框可见
+     * - adjustResize: 自动调整Webview窗口大小（屏幕区域减去软键盘区域），同时自动滚动Webview保证输入框可见
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    softinputMode?: 'adjustPan' | 'adjustResize';
+    /**
+     * 窗口状态栏样式
+     * 仅在应用设置为沉浸式状态栏样式下有效，设置此属性后将自动保留系统状态栏区域不被Webview窗口占用（即Webview窗口非沉浸式样式显示）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    statusbar?: PlusWebviewWebviewStatusbarStyles;
+    /**
+     * 定义窗口的原生子View控件
+     * 数组类型，可通过配置项设置原生子View控件，每个配置项对应添加一个原生子View控件。
+     * 	通过Webview窗口的getSubNViews()方法可获取原生子View控件对象数组。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    subNViews?: PlusWebview [];
+    /**
+     * 定义窗口的标题栏控件样式
+     * 设置此属性值则表明创建Webview窗口的标题栏控件，并可通过其属性值设置背景颜色、文本内容、文本颜色等。
+     * 	通过Webview窗口的getTitleNView()方法可获取标题栏控件对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    titleNView?: PlusWebviewWebviewTitleNViewStyles;
+    /**
+     * 窗口垂直向下的偏移量
+     * 支持百分比、像素值，默认值为0px。
+     * 	未设置top属性值时，优先通过bottom和height属性值来计算窗口的top位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    top?: string;
+    /**
+     * 窗口定义窗口变换的动画效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    transition?: PlusWebviewWebviewTransition;
+    /**
+     * 窗口定义窗口变形效果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    transform?: PlusWebviewWebviewTransform;
+    /**
+     * Webview窗口的排版位置
+     * 当Webview窗口添加到另外一个窗口中时，排版位置才会生效，排版位置决定子窗口在父窗口中的定位方式。
+     * 	可取值："static"，控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动；"absolute"，控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动；"dock"，控件在页面中停靠，停靠的位置由dock属性值决定。
+     * 	默认值为"absolute"。
+     * - static: 控件在页面中正常定位，如果页面存在滚动条则随窗口内容滚动
+     * - absolute: 控件在页面中绝对定位，如果页面存在滚动条不随窗口内容滚动
+     * - dock: 控件在页面中停靠，停靠的位置由dock属性值决定
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    position?: 'static' | 'absolute' | 'dock';
+    /**
+     * 用户是否可选择内容
+     * 可取值：
+     * 	true - 表示可选择内容，用户可通过长按来选择页面内容，如文本内容选择后可以弹出系统复制粘贴菜单；
+     * 	false - 表示不可选择内容，用户不可通过长按来选择页面内容。
+     * 	默认值为true。
+     * 	注意：在Web页面中可通过CSS的user-select对单个页面元素进行控制，前提是Webview对象的userSelect设置为true，否则CSS设置的user-select失效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    userSelect?: boolean;
+    /**
+     * 视频全屏播放时的显示方向
+     * 可取值：
+     * 	"auto": 自动适配，如果当前页面竖屏，则竖屏显示；如果当前页面横盘显示，则横屏；如果当前页面自动感应，则自动感应横竖屏切换。
+     * 	"portrait-primary": 竖屏正方向； 
+     * 	"portrait-secondary": 竖屏反方向，屏幕正方向按顺时针旋转180°； 
+     * 	"landscape-primary": 横屏正方向，屏幕正方向按顺时针旋转90°； 
+     * 	"landscape-secondary": 横屏方向，屏幕正方向按顺时针旋转270°； 
+     * 	"landscape": 横屏正方向或反方向，根据设备重力感应器自动调整；
+     * 	默认值为“auto”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    videoFullscreen?: string;
+    /**
+     * 窗口的宽度
+     * 支持百分比、像素值，默认为100%。未设置width属性值时，可同时设置left和right属性值改变窗口的默认宽度。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    width?: string;
+    /**
+     * 窗口的堆叠顺序值
+     * 拥有更高堆叠顺序的窗口总是会处于堆叠顺序较低的窗口的前面，拥有相同堆叠顺序的窗口后调用show方法则在前面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    zindex?: number;
+}
+
+/**
+ * 一组用于定义页面或控件变形的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTransform {
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    rotate?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    translate?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    scale?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    skew?: string;
+    /**
+     * 暂不支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    matrix?: string;
+}
+
+/**
+ * 一组用于定义页面或控件转换效果的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewTransition {
+    /**
+     * 产生变换效果的属性
+     * 默认值为"all"，暂不支持其它值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    property?: string;
+    /**
+     * 变换持续的时间
+     * 默认值为0，即无动画效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    duration?: string;
+    /**
+     * 窗口变换效果
+     * 可取值：
+     * 	"linear"：匀速变化，匀速动画效果；
+     * 	"ease-in"：匀加速变化，逐渐变快的动画效果；
+     * 	"ease-out"：匀减速变化，逐渐变慢的动画效果；
+     * 	"ease-in-out"：先加速后减速变化，先变快后变慢的动画效果。
+     * 	默认值为"ease-in-out"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    timingfunction?: string;
+}
+
+/**
+ * 拦截Webview窗口资源请求的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewOverrideResourceOptions {
+    /**
+     * 区配需要拦截请求资源的URL地址
+     * 支持正则表达式，默认值为空字符串（即不拦截）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+    /**
+     * 拦截重定向的资源地址
+     * 仅支持本地资源地址，如"_www"、"_doc"、"_downloads"、"_documents"等开头的路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    redirect?: string;
+    /**
+     * 重定向的资源数据类型
+     * RFC2045/RFC2046/RFC2047/RFC2048/RFC2049规范中定义的数据类型。
+     * 	如普通文本（text/plain）、PNG图像(image/png)、GIF图形(image/gif)、JPEG图形(image/jpeg)。
+     * 	如果未指定mime类型，则根据重定向资源路径自动区配。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mime?: string;
+    /**
+     * 重定向的资源数据编码
+     * 如未设置，则使用默认值"UTF-8"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    encoding?: string;
+    /**
+     * 设置重定向资源数据的http头数据
+     * 可设置标注http头数据（如Content-type）,也可设置自定义数据。
+     * 	通常可通过此属性来设置拦截资源的缓存策略（如Cache-control）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    header?: any;
+}
+
+/**
+ * 拦截Webview窗口URL请求的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewOverrideUrlOptions {
+    /**
+     * 拦截URL请求生效时机
+     * 可取值：
+     * 		"instant" - 表示立即生效，即调用overrideUrlLoading方法后立即生效；
+     * 		"touchstart" - 表示用户操作Webview窗口（触发touchstart事件）后生效，如果用户没有操作Webview窗口则不对URL请求操作进行拦截处理。
+     * 	默认值为"instant"。
+     * - instant: 
+     * 	立即生效，即调用overrideUrlLoading方法后立即生效。
+     * 								
+     * - : 
+     * 	表示用户操作Webview窗口（触发touchstart事件）后生效。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    effect?: 'instant' | '';
+    /**
+     * 拦截模式
+     * 可取值：
+     * 	"allow"表示满足match属性定义的条件时不拦截url继续加载，不满足match属性定义的条件时拦截url跳转并触发callback回调；
+     * 	"reject"表示满足match属性定义的提交时拦截url跳转并触发callback回调，不满足match属性定义的条件时不拦截url继续加载。
+     * 	默认值为"reject"。
+     * - allow: 
+     * 	满足match属性定义的条件时不拦截url继续加载，不满足match属性定义的条件时拦截url跳转并触发callback回调。
+     * 								
+     * - reject: 
+     * 	满足match属性定义的提交时拦截url跳转并触发callback回调，不满足match属性定义的条件时不拦截url继续加载。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    mode?: 'allow' | 'reject';
+    /**
+     * 区配是否需要处理的URL请求
+     * 支持正则表达式，默认值为对所有URL地址生效（相当于正则表达式“.*”）。
+     * 	如果mode值为"allow"则允许区配的URL请求跳转，mode值为"reject"则拦截区配的URL请求。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+    /**
+     * 排除拦截处理请求类型
+     * 不拦截处理指定类型的URL请求，直接使用系统默认处理逻辑。
+     * 	可取值：
+     * 	"none"表示不排除任何URL请求（即拦截处理所有URL请求）；
+     * 	"redirect"表示排除拦截处理301/302跳转的请求（谨慎使用，非a标签的href触发的URL请求可能会误判断为302跳转）。
+     * 	默认值为"none"。
+     * - none: 
+     * 	不排除任何URL请求（即拦截处理所有URL请求）。
+     * 								
+     * - redirect: 
+     * 	排除拦截处理301/302跳转的请求（谨慎使用，非a标签的href触发的URL请求可能会误判断为302跳转）。
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    exclude?: 'none' | 'redirect';
+}
+
+/**
+ * 监听Webview窗口资源加载的属性
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+ */
+interface PlusWebviewWebviewListenResourceOptions {
+    /**
+     * 区配是否需要处理的URL资源
+     * 支持正则表达式，默认值为对所有URL资源请求生效（相当于正则表达式“.*”）。
+     * 	如果Webview加载的资源区配条件，则触发回调事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/webview.html](http://www.html5plus.org/doc/zh_cn/webview.html)
+     */
+    match?: string;
+}
+
+/**
+ * XMLHttpRequest模块管理网络请求，与标准HTML中的XMLHttpRequest用途一致，差别在于前者可以进行跨域访问。通过plus.net可获取网络请求管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNet {
+    /**
+     * 跨域网络请求对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    XMLHttpRequest?: PlusNetXMLHttpRequest;
+    /**
+     * HTTP请求进度事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    ProgressEvent?: PlusNetProgressEvent;
+}
+
+/**
+ * 跨域网络请求对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNetXMLHttpRequest {
+    /**
+     * HTTP 请求的状态
+     * 当一个 XMLHttpRequest 初次创建时，这个属性的值从 0 开始，直到接收到完整的 HTTP 响应，这个值增加到 4。
+     * 	5 个状态中每一个都有一个相关联的非正式的名称，下表列出了状态、名称和含义：
+     * 		0 Uninitialized，未初始化状态。XMLHttpRequest对象已创建或已被abort()方法重置。
+     * 		1 Open，open()方法已调用，但是send()方法未调用。请求还没有被发送。
+     * 		2 Sent，send()方法已调用，HTTP 请求已发送到Web服务器。未接收到响应。
+     * 		3 Receiving，所有响应头部都已经接收到。响应体开始接收但未完成。
+     * 		4 Loaded，HTTP响应已经完全接收。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    readyState?: number;
+    /**
+     * 请求从服务器接收到的响应数据
+     * 如果没有从服务器接收到数据，则为null；
+     * 	否则根据responseType类型决定：
+     * 		如果responseType设置为空字符串或"text"，则返回空字符串；
+     * 		如果responseType设置为"document"，则返回Document对象；
+     * 		如果responseType设置为"json"，则返回JSON对象；
+     * 	若服务器返回的数据与设置的responseType类型不区配，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    response?: string;
+    /**
+     * 请求从服务器接收到的响应数据（字符串数据）
+     * 如果还没有接收到数据的话，此属性值为空字符串；
+     * 	如果readyState小于3，此属性值为空字符串；
+     * 	如果readyState为3，此属性值返回目前已经接收的HTTP响应部分数据值；
+     * 	如果readyState为4，此属性值保存了完整的HTTP响应数据体。
+     * 	如果HTTP请求返回的数据头中包含了Content-Type值中指定字符编码，就使用该编码，否则，使用UTF-8字符集。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseText?: string;
+    /**
+     * 请求响应数据response的类型
+     * 默认值为空字符串，即reponse为String，类型可设置："document"表示Document对象，"json"表示JSON对象，"text"表示字符串。
+     * 	此值必须在调用send方法之前设置，否则设置的值不生效，仍使用之前设置的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseType?: string;
+    /**
+     * 请求响应的Document对象
+     * 对请求的响应，解析为 XML 并作为 Document 对象返回。
+     * 	如果请求未成功，或响应的数据无法被解析为XML，则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    responseXML?: string;
+    /**
+     * 服务器返回的HTTP状态代码
+     * 服务器返回的HTTP状态代码，如200表示成功，而404表示"Not Found"错误；
+     * 	当readyState小于3的时候此属性值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    status?: number;
+    /**
+     * 服务器返回的HTTP状态描述
+     * 此属性值用名称而不是数字指定了请求的HTTP的状态代码。
+     * 	也就是说，当状态为200的时候它是"OK"；当状态为404的时候它是"Not Found"。
+     * 	和status属性类似，当readyState小于3的时候读取这一属性会返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    statusText?: string;
+    /**
+     * 请求服务器的超时时间，单位为毫秒（ms）
+     * 数值类型，单位为ms，其默认值为120秒。
+     * 	超时时间为服务器响应请求的时间（不是Http请求完成的总时间），如果设置为0则表示永远不超时。
+     * 	必须在请求发起前设置，否则当前请求将不生效，在当前请求完成后重新发起新请求时生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    timeout?: number;
+    /**
+     * 是否支持跨域请求
+     * 此对象创建的HTTP请求都支持跨域，所以永远返回true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    withCredentials?: boolean;
+    /**
+     * 网络请求状态发生变化事件
+     * 网络请求状态发生变化时触发，通常在函数中判断对象的state属性值来获取当前请求的状态。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onreadystatechange?: () => void;
+    /**
+     * 网络请求开始事件
+     * 通常在调用send方法开始发起HTTP请求时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onloadstart?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求传输数据事件
+     * 通常在HTTP请求链接已经建立，开始传输数据时触发，在数据传输的过程中可能多次触发，此事件与onreadystatechange事件触发状态3类似。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onprogress?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求取消事件
+     * 通常在调用abort方法取消HTTP请求时触发。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onabort?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求错误事件
+     * 通常在HTTP请求发生错误时触发，如无法连接到服务器等各种错误都触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onerror?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求成功事件
+     * 通常在HTTP请求成功完成时触发，如果HTTP请求发生错误则不触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onload?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求超时事件
+     * 通常在HTTP请求超时时触发，此时不会触发onerror事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    ontimeout?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 网络请求结束事件
+     * 通常在HTTP请求结束时触发，不管是HTTP请求失败、成功、或超时之后都会触发此事件。
+     * 	此事件在onreadystatechange事件触发状态4事件之后。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    onloadend?: (result: PlusNetProgressEvent) => void;
+    /**
+     * 取消当前响应，关闭连接并且结束任何未决的网络活动
+     * 此方法把XMLHttpRequest对象重置为readyState为0的状态，并且取消所有未决的网络活动。
+     * 	调用此方法后将停止触发XMLHttpRequest对象的所有事件。
+     * 	例如，如果请求用了太长时间，而且响应不再必要的时候，可以调用这个方法。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    abort(): void;
+    /**
+     * 获取HTTP响应头部信息
+     * 把HTTP响应头部作为未解析的字符串返回。 如果readyState小于3，这个方法返回null。
+     * 	否则，它返回服务器发送的所有 HTTP 响应的头部。头部作为单个的字符串返回，一行一个头部。每行用换行符"\r\n"隔开。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    getAllResponseHeaders(): string;
+    /**
+     * 获取指定的HTTP响应头部的值
+     * 其参数是要返回的 HTTP 响应头部的名称。可以使用任何大小写来制定这个头部名字，和响应头部的比较是不区分大小写的。
+     * 	该方法的返回值是指定的 HTTP 响应头部的值，如果没有接收到这个头部或者readyState小于3则为空字符串。
+     * 	如果接收到多个有指定名称的头部，这个头部的值被连接起来并返回，使用逗号和空格分隔开各个头部的值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    getResponseHeader(headerName?: string): string;
+    /**
+     * 初始化HTTP请求参数，例如URL和HTTP方法，但是并不发送请求
+     * 这个方法初始化请求参数以供 send() 方法稍后使用。它把readyState设置为1，删除之前指定的所有请求头部，以及之前接收的所有响应头部，并且把responseText、responseXML、status 以及 statusText 参数设置为它们的默认值。
+     * 	当readyState为0的时候（当XMLHttpRequest对象刚创建或者abort()方法调用后）以及当readyState为4时（已经接收响应时），调用这个方法是安全的。
+     * 	当针对任何其他状态调用的时候，open()方法的行为是为指定的。
+     * 	除了保存供send()方法使用的请求参数，以及重置 XMLHttpRequest 对象以便复用，open()方法没有其他的行为。
+     * 	要特别注意，当这个方法调用的时候，实现通常不会打开一个到Web服务器的网络连接。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    open(method?: string, url?: string, username?: string, password?: string): void;
+    /**
+     * 重写服务器返回的MIME类型
+     * 此方法覆盖HTTP请求返回数据头"Content-Type"字段值中包含的IMIE类型，如果设置的MIME类型无效则继续使用"Content-Type"字段值中包含的IMIE类型。
+     * 	如果MIME类型中指定了字符集类型（charset），则需按照指定的字符集类型对接收到的数据体（respose）进行处理，否则默认为UTF-8字符集。
+     * 	注意：此方法需在send方法前调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    overrideMimeType(mime?: string): void;
+    /**
+     * 发送HTTP请求
+     * 此方法触发HTTP请求发送，如果之前没有调用open()，或者更具体地说，如果readyState不是1，send()抛出一个异常。否则，将发送HTTP请求，该请求由以下几部分组成：	
+     * 	之前调用open()时指定的HTTP方法、URL；
+     * 	之前调用setRequestHeader()时指定的请求头部（如果有的话）；
+     * 	传递给这个方法的body参数。
+     * 	一旦请求发送了，send()把readyState设置为2，并触发onreadystatechange事件；
+     * 	如果服务器响应带有一个HTTP重定向，send()方法在后台线程自动遵从重定向；
+     * 	当所有的HTTP响应头部已经接收，send()或后台线程把readyState设置为3并触发onreadystatechange事件；
+     * 	如果响应较长，send()或后台线程可能在状态3中触发多次onreadystatechange事件；
+     * 	最后，当响应完成，send()或后台线程把readyState设置为4，并最后一次触发onreadystatechange事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    send(body?: string): void;
+    /**
+     * 指定一个HTTP请求的Header
+     * Http的Header应该包含在通过后续send()调用而发起的请求中。
+     * 	此方法只有当readyState为1的时候才能调用，例如，在调用了open()之后，但在调用send()之前。
+     * 	如果带有指定名称的头部已经被指定了，这个头部的新值就是：之前指定的值，加上逗号、以及这个调用指定的值（形成一个数组）。
+     * 	如果Web服务器已经保存了和传递给open()的URL相关联的cookie，适当的Cookie或Cookie2头部也自动地包含到请求中，可以通过调用setRequestHeader()来把这些cookie添加到头部。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    setRequestHeader(headerName?: string, headerValue?: string): void;
+}
+
+/**
+ * HTTP请求进度事件
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+ */
+interface PlusNetProgressEvent {
+    /**
+     * 事件的目标对象
+     * 通知HTTP请求进度事件的XMLHttpRequest对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    target?: PlusNetXMLHttpRequest;
+    /**
+     * 进度信息是否可计算
+     * HTTP请求进度信息是否有效，如果HTTP请求头中包含Content-Length头信息则为true，否则为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    lengthComputable?: number;
+    /**
+     * 当前已经接收到的数据长度
+     * HTTP请求接收到的数据长度，单位为字节。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    loaded?: number;
+    /**
+     * 总数据长度
+     * HTTP请求返回的总数据长度，单位为字节。
+     * 	如果无法获取则设置为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/net.html](http://www.html5plus.org/doc/zh_cn/net.html)
+     */
+    total?: number;
+}
+
+/**
+ * Zip模块管理文件压缩和解压，通过plus.zip可获取压缩管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZip {
+    /**
+     * JSON对象，配置图片压缩转换的参数
+     * 设置width/height属性则表示需对图片进行缩放转换操作；
+     * 	设置rotate属性则表示需对图片进行旋转转换操作；
+     * 	设置clip属性则表示需对图片进行裁剪转换操作；
+     * 	如同时设置了多个转换操作，则按缩放、旋转、裁剪顺序进行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    CompressImageOptions?: PlusZipCompressImageOptions;
+    /**
+     * JSON对象，图片裁剪区域的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    ClipImageOptions?: PlusZipClipImageOptions;
+    /**
+     * 压缩生成Zip文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    compress(src?: string, zipfile?: string, successCB?: () => void, errorCB?: (result: any) => void): void;
+    /**
+     * 解压缩Zip文件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    decompress(zipfile?: string, target?: string, successCB?: () => void, errorCB?: (result: any) => void): void;
+    /**
+     * 图片压缩转换
+     * 可用于图片的质量压缩、大小缩放、方向旋转、区域裁剪、格式转换等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    compressImage(options?: PlusZipCompressImageOptions, successCB?: (result: any) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，配置图片压缩转换的参数
+ * 设置width/height属性则表示需对图片进行缩放转换操作；
+ * 	设置rotate属性则表示需对图片进行旋转转换操作；
+ * 	设置clip属性则表示需对图片进行裁剪转换操作；
+ * 	如同时设置了多个转换操作，则按缩放、旋转、裁剪顺序进行操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZipCompressImageOptions {
+    /**
+     * 压缩转换原始图片的路径
+     * 支持以下图片路径：
+     * 	相对路径 - 相对于当前页面的host位置，如"a.jpg"，注意当前页面为网络地址则不支持；
+     * 	绝对路径 - 系统绝对路径，如Android平台"/storage/sdcard0/Android/data/io.dcloud.HBuilder/.HBuilder/apps/HBuilder/www/ａ.jpg"，iOS平台"/var/mobile/Containers/Data/Application/757966CF-345C-4348-B07F-EEF83CF9A369/Library/Pandora/apps/HBuilder/www/a.png"；
+     * 	相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.jpg"、"_doc/b.jpg"、"_documents/c.jpg"、"_downloads/d.jpg"；
+     * 	本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * - _www/: 应用资源目录
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    src?: '_www/' | '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 压缩转换目标图片的路径
+     * 支持以下图片路径：
+     * 	绝对路径 - 系统绝对路径，如Android平台"/storage/sdcard0/Android/data/io.dcloud.HBuilder/.HBuilder/apps/HBuilder/doc/ａ.jpg"，iOS平台"/var/mobile/Containers/Data/Application/757966CF-345C-4348-B07F-EEF83CF9A369/Library/Pandora/apps/HBuilder/doc/a.png"；
+     * 	相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_doc/b.jpg"、"_documents/c.jpg"、"_downloads/d.jpg"，注意不支持"_www"开头的路径；
+     * 	本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 	注意：如果设置的路径无权限访问，则返回失败。
+     * - _doc/: 应用私有文档目录
+     * - _documents/: 共享文档目录
+     * - _downloads/: 共享下载目录
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    dst?: '_doc/' | '_documents/' | '_downloads/';
+    /**
+     * 覆盖生成新文件
+     * 仅在dst制定的路径文件存在时有效：
+     * 	true表示覆盖存在的文件；
+     * 	false表示不覆盖，如果文件存在，则返回失败。
+     * 	默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    overwrite?: boolean;
+    /**
+     * 压缩转换后的图片格式
+     * 支持"jpg"、"png",如果未指定则使用源图片的格式。
+     * - jpg: JPG格式图片
+     * - png: PNG格式图片
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    format?: 'jpg' | 'png';
+    /**
+     * 压缩图片的质量
+     * 取值范围为1-100，1表示使用最低的图片质量（转换后的图片文件最小）、100表示使用最高的图片质量（转换后的图片文件最大）；
+     * 	默认值为50。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    quality?: number;
+    /**
+     * 缩放图片的宽度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即根据height与源图高的缩放比例计算，若未设置height则使用源图高度）；
+     * 	默认值为"auto"。
+     * 	注意：若设置了width属性值不合法（如"0px"），则不对图片进行缩放操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    width?: string;
+    /**
+     * 缩放图片的高度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即根据width与源图宽的缩放比例计算，若未设置width则使用源图高度）；
+     * 	默认值为"auto"。
+     * 	注意：若设置了height属性值不合法（如"0px"），则不对图片进行缩放操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    height?: string;
+    /**
+     * 旋转图片的角度
+     * 支持值：90-表示旋转90度；180-表示旋转180度；270-表示旋转270度。
+     * 	注意：若设置rotate属性值不合法，则不对图片进行旋转操作。
+     * - 90: 旋转90度
+     * - 180: 旋转180度
+     * - 270: 旋转270度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    rotate?: '90' | '180' | '270';
+    /**
+     * 裁剪图片的区域
+     * 值参考ClipImageOptions定义，若设置clip属性值不合法，则不对图片进行裁剪操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    clip?: PlusZipClipImageOptions;
+}
+
+/**
+ * JSON对象，图片裁剪区域的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+ */
+interface PlusZipClipImageOptions {
+    /**
+     * 图片裁剪区域与原图片上边界的偏移距离
+     * 支持像素值（如"10px"）、百分比（如"10%"）；默认值为"0px"。
+     * 	注意：如果top值超出原图片高度，则图片裁剪失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    top?: string;
+    /**
+     * 图片裁剪区域与原图片左边界的偏移距离
+     * 支持像素值（如"10px"）、百分比（如"10%"）；默认值为"0px"。
+     * 	注意：如果left值超出原图片宽度，则图片裁剪失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    left?: string;
+    /**
+     * 图片裁剪区域的宽度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即从left位置到图片右边界的宽度）；默认值为"auto"。
+     * 	注意：如果left值加width值超出原图片宽度，则使用"auto"值进行裁剪。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    width?: string;
+    /**
+     * 图片裁剪区域的高度
+     * 支持像素值（如"100px"）、百分比（如"50%"）、自动计算（如"auto"，即从top位置到图片下边界的高度）；默认值为"auto"。
+     * 	注意：如果top值加height值超出原图片高度，则使用"auto"值进行裁剪。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/zip.html](http://www.html5plus.org/doc/zh_cn/zip.html)
+     */
+    height?: string;
+}
+
+/**
+ * Barcode模块管理条码扫描，支持常见的条码（一维码及二维码）的扫描识别功能。可调用设备的摄像头对条码图片扫描进行数据输入，解码后返回码数据及码类型。通过plus.barcode可获取条码码管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcode {
+    /**
+     * Barcode扫码控件对象
+     * Barcode对象表示条码识别控件对象，在窗口中显示条码识别控件，使用此对象可自定义条码识别界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    Barcode?: PlusBarcodeBarcode;
+    /**
+     * Barcode扫码控件样式
+     * 设置Barcode扫码控件的样式，如扫码框、扫码条的颜色等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    BarcodeStyles?: PlusBarcodeBarcodeStyles;
+    /**
+     * 条码识别控件扫描参数
+     * 设置Barcode扫码控件的扫码识别参数，如是否保存扫码功时的截图等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    BarcodeOptions?: PlusBarcodeBarcodeOptions;
+    /**
+     * QR二维码，数值为0
+     * 1994年由日本Denso-Wave公司发明，QR来自英文Quick Response的缩写，即快速反应的意思，源自发明者希望QR码可让其内容快速被解码。
+     * 	目前使用最广泛的二维码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    QR?: number;
+    /**
+     * EAN条形码标准版，数值为1
+     * 国际物品编码协会在全球推广应用的商品条码，是由13位数字组成。
+     * 	目前使用最广泛的一维条形码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    EAN13?: number;
+    /**
+     * ENA条形码简版，数值为2
+     * 国际物品编码协会在全球推广应用的商品条码，是由8位数字组成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    EAN8?: number;
+    /**
+     * Aztec二维码，数值为3
+     * Andrew Longacre发明于1995年，该代码是用于国际出版。最小的Aztec码符号编码13个数字或12个英文字母。最大的Aztec码符号编码3832数字或3067英文字母或1914字节的数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    AZTEC?: number;
+    /**
+     * Data Matrix二维码，数值为4
+     * Data Matrix原名Data code，由美国国际资料公司(International Data Matrix, 简称IDMatrix)于1989年发明。可编码字元集包括全部的ASCII字元及扩充ASCII字元，容量可包含2235个英文数字资料、1556个8位元资料，3116个数字资料。由于Data Matrix二维条码只需要读取资料的20%即可精确辨读，因此很适合应用在条码容易受损的场所。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    DATAMATRIX?: number;
+    /**
+     * UPC条形码标准版，数值为5
+     * UPC码是美国统一代码委员会制定的一种商品用条码，主要用于美国和加拿大地区，常在美国进口的商品上可以看到。UPC码标准版由12位数字构成，故其字码集为数字0~9。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    UPCA?: number;
+    /**
+     * UPC条形码缩短版，数值为6
+     * UPC码是美国统一代码委员会制定的一种商品用条码，主要用于美国和加拿大地区，常在美国进口的商品上可以看到。UPC码缩短版由8位数字构成，故其字码集为数字0~9。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    UPCE?: number;
+    /**
+     * Codabar条形码，数值为7
+     * Codabar码最初是为零售价格标签系统而研制开发的。1975年，National Retail Merchants Association（NRMA）选择了其它符号类型作为标准后，Codabar开始在多个方面用于非零售应用领域，如图书馆、货运和医药业。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODABAR?: number;
+    /**
+     * Code39条形码，数值为8
+     * Code 39码是Intermec公司于1975年推出的一维条码， 39码是一种可供使用者双向扫瞄的分散式条码，也就是说相临两资料码之间，39码必须包含一个不具任何意义的空白(或细白，其逻辑值为0)，且 39码具有支援文数字的能力，编码规则简单、误码率低、所能表示字符个数多等特点，39码在各个领域有着极为广泛的应用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE39?: number;
+    /**
+     * Code93条形码，数值为9
+     * Code 93码的条码符号是由Intermec公司于1982年设计的 提供更高的密度和数据安全增强code39 。它是一个字母，长度可变符号。代码93主要用于由加拿大邮政编码补充提供的资料。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE93?: number;
+    /**
+     * Code128条形码，数值为10
+     * CODE128码是1981年引入的一种高密度条码，CODE128 码可表示从 ASCII 0 到ASCII 127 共128个字符，故称128码。CODE128码是广泛应用在企业内部管理、生产流程、物流控制系统方面的条码码制，由于其优良的特性在管理信息系统的设计中被广泛使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    CODE128?: number;
+    /**
+     * ITF条形码，数值为11
+     * ITF条码，又称交叉二五条码，由14位数字字符代表组成。主要用于运输包装，是印刷条件较差，不允许印刷EAN-13和UPC-A条码时应选用的一种条码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    ITF?: number;
+    /**
+     * MaxiCode二维码，数值为12
+     * 1996年时，美国自动辨识协会（AIMUSA）制定统一的符号规格，称为Maxicode二维条码，也有人称USS-Maxicode二维条码（Uniform Symbology Specification-Maxicode）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    MAXICODE?: number;
+    /**
+     * PDF 417二维条码，数值为13
+     * PDF417条码是由美国SYMBOL公司发明的，PDF（Portable Data File）意思是“便携数据文件”。组成条码的每一个条码字符由4个条和4个空共17个模块构成，故称为PDF417条码。PDF417条码最大的优势在于其庞大的数据容量和极强的纠错能力。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    PDF417?: number;
+    /**
+     * RSS 14条形组合码，数值为14
+     * RSS条码是有国际物品编码协会EAN和美国统一代码委员会UCC开发的RSS（Reduced Space Symbology）条码符号。它是一种一维码和二维码的组合码。和其它线性条码相比，RSS系列码制具有更高的密度，因为它可以表示更多的字符。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    RSS14?: number;
+    /**
+     * 扩展式RSS条形组合码，数值为15
+     * RSS条码是有国际物品编码协会EAN和美国统一代码委员会UCC开发的RSS（Reduced Space Symbology）条码符号。它是一种一维码和二维码的组合码。和其它线性条码相比，RSS系列码制具有更高的密度，因为它可以表示更多的字符。扩展式RSS码是长度可以变化的线性码制，能够对74个数字字符或41个字母字符的AI单元数据传数据进行编码。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    RSSEXPANDED?: number;
+    /**
+     * 通过图片扫码识别
+     * 直接输入图片扫码识别，成功扫描到条码数据后通过successCallback回调返回，失败则通过errorCallback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    scan(path?: string, successCB?: (result0: number, result1: string, result2: string) => void, errorCB?: (result: any) => void, filters?: any []): void;
+    /**
+     * 创建Barcode对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    create(id?: string, filters?: any [], styles?: PlusBarcodeBarcodeStyles): PlusBarcodeBarcode;
+    /**
+     * 查找已经创建的Barcode对象
+     * 调用此方法查找指定id的Barcode对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    getBarcodeById(id?: string): PlusBarcodeBarcode;
+}
+
+/**
+ * Barcode扫码控件对象
+ * Barcode对象表示条码识别控件对象，在窗口中显示条码识别控件，使用此对象可自定义条码识别界面。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcode {
+    /**
+     * 条码识别成功事件
+     * Barcode扫码控件识别到有效的条码数据时触发的成功事件，并返回扫码结果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    onmarked?: (result0: number, result1: string, result2: string) => void;
+    /**
+     * 条码识别错误事件
+     * 描控件识别过程中发生错误时触发的失败事件，并返回错误信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    onerror?: (result: any) => void;
+    /**
+     * 开始条码识别
+     * 开始调用系统摄像头获取图片数据进行扫码识别，当识别出条码数据时通过onmarked回调函数返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    start(optons?: PlusBarcodeBarcodeOptions): void;
+    /**
+     * 结束条码识别
+     * 结束对摄像头获取图片数据进行条码识别操作，同时关闭摄像头的视频捕获。
+     * 	结束后可调用start方法重新开始识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    cancel(): void;
+    /**
+     * 关闭条码识别控件
+     * 释放控件占用系统资源，调用close方法后控件对象将不可使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    close(): void;
+    /**
+     * 是否开启闪光灯
+     * 设置Barcode扫码控件在扫码时是否开启摄像头的闪光灯，默认值为不开启闪光灯。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    setFlash(open?: boolean): void;
+    /**
+     * 设置Barcode扫码控件的配置参数
+     * 用于动态更新Barcode扫码控件的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    setStyles(styles?: PlusBarcodeBarcodeStyles): void;
+}
+
+/**
+ * Barcode扫码控件样式
+ * 设置Barcode扫码控件的样式，如扫码框、扫码条的颜色等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcodeStyles {
+    /**
+     * 条码识别控件背景颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    background?: string;
+    /**
+     * 扫码框颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    frameColor?: string;
+    /**
+     * 扫码条颜色
+     * 颜色值支持(参考CSS颜色规范)：颜色名称(参考CSS Color Names)/十六进制值/rgb值/rgba值，默认值为红色。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    scanbarColor?: string;
+    /**
+     * Barcode扫码控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    top?: string;
+    /**
+     * Barcode扫码控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    left?: string;
+    /**
+     * Barcode扫码控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    width?: string;
+    /**
+     * Barcode扫码控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    height?: string;
+    /**
+     * Barcode扫码控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    position?: string;
+}
+
+/**
+ * 条码识别控件扫描参数
+ * 设置Barcode扫码控件的扫码识别参数，如是否保存扫码功时的截图等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+ */
+interface PlusBarcodeBarcodeOptions {
+    /**
+     * 是否保存扫码成功时的截图
+     * 如果设置为true则在扫码成功时将图片保存，并通过onmarked回调函数的file参数返回保存文件的路径。
+     * 	默认值为false，不保存截图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    conserve?: boolean;
+    /**
+     * 保存扫码成功时图片保存路径
+     * 可通过此参数设置保存截图的路径和名称，如果设置图片文件名称则必须指定文件的后缀名（必须是.png），否则认为是指定目录，文件名称则自动生成。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    filename?: string;
+    /**
+     * 扫码成功时是否需要震动提醒
+     * 如果设置为true则在扫码成功时震动设备，false则不震动。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    vibrate?: boolean;
+    /**
+     * 扫码成功时播放的提示音
+     * 可取值：
+     * 	"none" - 不播放提示音；
+     * 	"default" - 播放默认提示音（5+引擎内置）。
+     * 	默认值为"default"。
+     * - none: 扫码成功时不播放提示音
+     * - default: 扫码成功时播放默认提示音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/barcode.html](http://www.html5plus.org/doc/zh_cn/barcode.html)
+     */
+    sound?: 'none' | 'default';
+}
+
+/**
+ * Maps模块管理地图控件，用于在web页面中显示地图控件，提供各种接口操作地图控件，如添加标点、路线等。通过plus.maps可获取地图管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMaps {
+    /**
+     * 地图控件对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Map?: PlusMapsMap;
+    /**
+     * 地图控件对象的参数
+     * 设置地图对象显示时使用的参数，如地图的中心位置、缩放级别等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MapStyles?: PlusMapsMapStyles;
+    /**
+     * 地理编码转换的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    GeocodeOptions?: PlusMapsGeocodeOptions;
+    /**
+     * 地图坐标转换的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    CoordinateConvertOptions?: PlusMapsCoordinateConvertOptions;
+    /**
+     * Point对象用于表示地图元素的坐标
+     * 常用语对地图上元素进行定位时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Point?: PlusMapsPoint;
+    /**
+     * 地理区域
+     * 有西南及东北坐标点数据组成的矩形区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Bounds?: PlusMapsBounds;
+    /**
+     * 地图视图类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MapType?: PlusMapsMapType;
+    /**
+     * 地图覆盖物基类对象
+     * Overlay是地图上显示元素的基类，用于抽象地图元素，不用于实例化。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Overlay?: PlusMapsOverlay;
+    /**
+     * 地图上显示的标点对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Marker?: PlusMapsMarker;
+    /**
+     * 地图上显示的气泡对象
+     * 此对象不能直接添加到地图上显示，只可关联到地图标点覆盖物上，用户点击标点时弹出显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Bubble?: PlusMapsBubble;
+    /**
+     * 地图上显示的圆圈对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Circle?: PlusMapsCircle;
+    /**
+     * 地图上显示的折线对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Polyline?: PlusMapsPolyline;
+    /**
+     * 地图上显示的多边形对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Polygon?: PlusMapsPolygon;
+    /**
+     * 地图检索对象
+     * Search对象用于管理地图上的检索功能，包括位置检索、周边检索和范围检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Search?: PlusMapsSearch;
+    /**
+     * 检索策略类型
+     * 在线路检索时设置检索策略时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchPolicy?: PlusMapsSearchPolicy;
+    /**
+     * 保存位置检索、周边检索和范围检索返回的结果
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchPoiResult?: PlusMapsSearchPoiResult;
+    /**
+     * 保存位置检索、周边检索和范围检索返回的结果
+     * 不可通过new操作符创建SearchRouteResult对象，在触发onRouteSearchComplete()时自动创建。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    SearchRouteResult?: PlusMapsSearchRouteResult;
+    /**
+     * 检索结果的位置点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Position?: PlusMapsPosition;
+    /**
+     * 地图中的路线对象
+     * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    Route?: PlusMapsRoute;
+    /**
+     * 调用系统第三方程序进行导航
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    openSysMap(dst?: PlusMapsPoint, des?: string, src?: PlusMapsPoint): void;
+    /**
+     * 创建Map对象
+     * 调用此方法创建后并不会显示，需要调用Webview窗口的append方法将其添加到Webview窗口后才能显示。
+     * 	注意：此时需要通过styles参数的top/left/width/height属性设置控件的位置及大小。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    create(id?: string, styles?: PlusMapsMapStyles): PlusMapsMap;
+    /**
+     * 查找已经创建的Map对象
+     * 调用此方法查找指定id的Map对象，如果不存在则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getMapById(id?: string): PlusMapsMap;
+}
+
+/**
+ * 地图控件对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMap {
+    /**
+     * 用户点击地图事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsPoint) => void;
+    /**
+     * 地图状态改变事件
+     * 用户拖动、缩放地图等操作完成后触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onstatuschanged?: (result: any) => void;
+    /**
+     * 静态方法，计算面积
+     * 计算指定地理区域的面积，单位为平方米。
+     * 	注：此功能仅百度地图支持，高德地图暂不支持此功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    calculateArea(bounds?: PlusMapsBounds, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，计算距离
+     * 计算从pointStart坐标点到pointEnd坐标的实际直线距离，单位为米（m）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    calculateDistance(pointStart?: PlusMapsPoint, pointEnd?: PlusMapsPoint, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，坐标转换
+     * 将第三方坐标系坐标转换成当前地图的坐标系坐标。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    convertCoordinates(point?: PlusMapsPoint, options?: PlusMapsCoordinateConvertOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，地理编码
+     * 将地理位置信息转换为坐标点。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    geocode(address?: string, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 静态方法，反向地理编码
+     * 将坐标点转换为地理位置信息。
+     * 	转换成功通过successCallback返回，转换失败则通过errorCallback返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    reverseGeocode(point?: PlusMapsPoint, options?: PlusMapsGeocodeOptions, successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 向地图中添加覆盖物
+     * 此方法用于向地图中添加覆盖物。
+     * 	支持各种从maps.Overlay对象继承的各种覆盖物对象；
+     * 	如果添加不支持的对象则直接返回false；
+     * 	同一覆盖物对象只能添加到地图中一次，已在地图中的覆盖物再次添加时则返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    addOverlay(overlay?: PlusMapsOverlay): boolean;
+    /**
+     * 设置地图初始中心点和缩放级别
+     * 用于设置地图的初始中心点和缩放级别，通常在创建地图后立即调用。
+     * 	默认中心点为天安门，默认缩放级别为12；
+     * 	该方法设置的中心点和缩放级别可通过reset()方法恢复；
+     * 	如果在地图显示后调用将改变地图的中心点和缩放级别并立即更新，并将初始值更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    centerAndZoom(center?: PlusMapsPoint, zoom?: number): void;
+    /**
+     * 清除地图中所有覆盖物对象
+     * 此方法用于清除地图中所有覆盖物对象。
+     * 	清除地图中的覆盖物对象后会自动更新地图视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    clearOverlays(): void;
+    /**
+     * 关闭地图控件
+     * 关闭地图控件将会销毁地图使用的资源，不可再使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    close(): void;
+    /**
+     * 获取当前地图可视范围的地理区域
+     * 当旋转或俯视时，是当前地图可视范围的最大外接矩形地理区域。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getBounds(): PlusMapsBounds;
+    /**
+     * 获取地图中心点位置
+     * 此方法用于获取设置的地图中心点位置（centerAndZoom/setCenter）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+    /**
+     * 获取当前地图显示的地图中心点位置
+     * 此方法用于获取当前地图显示的地图中心点位置，获取成功后通过callback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCurrentCenter(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    /**
+     * 获取地图的显示类型
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getMapType(): PlusMapsMapType;
+    /**
+     * 获取用户的当前位置信息
+     * 此方法用于获取用户的当前位置信息，获取成功后通过callback回调返回。
+     * 	获取用户当前位置信息将打开定位设备。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getUserLocation(callback?: (result0: number, result1: PlusMapsPoint) => void): boolean;
+    /**
+     * 获取地图的缩放级别
+     * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
+     * 	该方法改变缩放级别后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示区域，以当前地图显示的中心点位置来缩放地图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getZoom(): number;
+    /**
+     * 隐藏地图控件
+     * 此方法用于隐藏地图控件，通常在显示后调用此方法来隐藏。
+     * 	如果地图已经隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hide(): void;
+    /**
+     * 获取是否显示用户位置
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isShowUserLocation(): boolean;
+    /**
+     * 获取是否显示地图内置缩放控件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isShowZoomControls(): boolean;
+    /**
+     * 获取是否打开地图交通信息图层
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isTraffic(): boolean;
+    /**
+     * 从地图中删除覆盖物对象
+     * 此方法用于从地图中删除覆盖物对象。
+     * 	支持各种从maps.Overlay对象继承的各种覆盖物对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    removeOverlay(overlay?: PlusMapsOverlay): void;
+    /**
+     * 重置地图
+     * 此方法用于重新设置地图，恢复地图的初始化时的中心点和缩放级别。
+     * 	该方法将导致显示内容将立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    reset(): void;
+    /**
+     * 重设地图控件大小
+     * 此方法用于重新计算地图控件大小，保持与构造时传入DOM元素的大小及位置一致。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    resize(): void;
+    /**
+     * 设置地图的中心点
+     * 此方法用于设置地图的中心点，用于切换当前显示地图位置。
+     * 	该方法改变中心点后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示的缩放级别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setCenter(center?: PlusMapsPoint): void;
+    /**
+     * 设置地图的视图类型
+     * 此方法用于设置地图类型，默认为普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setMapType(type?: PlusMapsMapType): void;
+    /**
+     * 设置地图控件的配置参数
+     * 用于动态更新地图控件的参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStyles(styles?: PlusMapsMapStyles): void;
+    /**
+     * 是否打开地图交通信息图层
+     * 此方法用于设置是否打开地图交通信息图层，默认不显示。
+     * 	该方法改变是否显示交通图层后地图显示内容将立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setTraffic(traffic?: boolean): void;
+    /**
+     * 设置地图的缩放级别
+     * 此方法用于设置地图的缩放级别，用于切换当前显示地图缩放级别。
+     * 	该方法改变缩放级别后地图显示内容将立即更新；
+     * 	该方法不会改变地图显示区域，以当前地图显示的中心点位置来缩放地图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setZoom(zoom?: number): void;
+    /**
+     * 显示地图控件
+     * 此方法用于显示地图控件，通常在隐藏后调用此方法来显示。
+     * 	如果地图已经显示再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    show(): void;
+    /**
+     * 显示用户位置
+     * 此方法将在地图上显示用户位置信息。
+     * 	显示用户位置将打开定位设备。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    showUserLocation(display?: boolean): void;
+    /**
+     * 设置是否显示地图内置缩放控件
+     * 此方法将在地图上显示内置缩放控件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    showZoomControls(display?: boolean): void;
+}
+
+/**
+ * 地图控件对象的参数
+ * 设置地图对象显示时使用的参数，如地图的中心位置、缩放级别等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMapStyles {
+    /**
+     * 地图的中心位置
+     * 未设置则使用地图的默认中心点（由地图供应商确定）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    center?: PlusMapsPoint;
+    /**
+     * 地图的缩放级别
+     * 有效范围为1-22，默认值为12，设置无效的值则使用默认值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    zoom?: number;
+    /**
+     * 地图的视图类型
+     * 可设置普通街道视图、卫星视图，默认值为普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    type?: PlusMapsMapType;
+    /**
+     * 地图的是否显示交通信息
+     * true表示显示地图的交通信息图层，false则不显示，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    traffic?: boolean;
+    /**
+     * 是否显示地图的内置缩放控件
+     * true表示显示地图的内置缩放控件，false则不显示，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    zoomControls?: boolean;
+    /**
+     * 地图控件左上角的垂直偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度；
+     * 		自动计算，如"auto",根据height值自动计算，相对于父Webview窗口垂直居中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    top?: string;
+    /**
+     * 地图控件左上角的水平偏移量
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度；
+     * 		自动计算，如"auto"，根据width值自动计算，相对于父Webview窗口水平居中。
+     * 	默认值为"0px"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    left?: string;
+    /**
+     * 地图控件的宽度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的宽度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    width?: string;
+    /**
+     * 地图控件的高度
+     * 可取值：
+     * 		像素值，如"100px"；
+     * 		百分比，如"10%"，相对于父Webview窗口的高度。
+     * 	默认值为"100%"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    height?: string;
+    /**
+     * 地图控件在Webview窗口的布局模式
+     * 可取值：
+     * 		"static" - 静态布局模式，如果页面存在滚动条则随窗口内容滚动；
+     * 		"absolute" - 绝对布局模式，如果页面存在滚动条不随窗口内容滚动；
+     * 	默认值为"static"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    position?: string;
+}
+
+/**
+ * 地理编码转换的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsGeocodeOptions {
+    /**
+     * 源数据的坐标系类型
+     * 仅在反向地理编码转换时生效。
+     * 	“wgs84”：表示WGS-84坐标系； “gcj02”：表示国测局经纬度坐标系； “bd09”：表示百度墨卡托坐标系； “bd09ll”：表示百度经纬度坐标系；
+     * 	默认使用wgs84坐标系。
+     * - wgs84: WGS-84坐标系，即GPS设备采集的原始GPS坐标
+     * - gcj02: 国测局经纬度坐标系，soso地图、aliyun地图、mapabc地图和amap地图所用的坐标系
+     * - bd09: 百度墨卡托坐标系
+     * - bd09ll: 百度经纬度坐标系
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    coordType?: 'wgs84' | 'gcj02' | 'bd09' | 'bd09ll';
+    /**
+     * 源地址所属的城市
+     * 仅在地理编码转换时生效，如果不指定则在全国范围内区配转换。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    city?: string;
+}
+
+/**
+ * 地图坐标转换的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsCoordinateConvertOptions {
+    /**
+     * 源数据的坐标系类型
+     * “wgs84”：表示WGS-84坐标系； “gcj02”：表示国测局经纬度坐标系； “bd09”：表示百度墨卡托坐标系； “bd09ll”：表示百度经纬度坐标系；
+     * 	默认使用wgs84坐标系。
+     * - wgs84: WGS-84坐标系，即GPS设备采集的原始GPS坐标
+     * - gcj02: 国测局经纬度坐标系，soso地图、aliyun地图、mapabc地图和amap地图所用的坐标系
+     * - bd09: 百度墨卡托坐标系
+     * - bd09ll: 百度经纬度坐标系
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    coordType?: 'wgs84' | 'gcj02' | 'bd09' | 'bd09ll';
+}
+
+/**
+ * Point对象用于表示地图元素的坐标
+ * 常用语对地图上元素进行定位时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPoint {
+    /**
+     * 设置坐标点的经度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLng(lng?: number): void;
+    /**
+     * 获取坐标的经度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLng(): number;
+    /**
+     * 设置坐标的纬度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLat(): void;
+    /**
+     * 获取坐标的纬度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLat(): number;
+    /**
+     * 判断两个坐标点是否相等
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    equals(pt?: PlusMapsPoint): boolean;
+}
+
+/**
+ * 地理区域
+ * 有西南及东北坐标点数据组成的矩形区域。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsBounds {
+    /**
+     * 设置地理区域的东北坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setNorthEase(point?: PlusMapsPoint): void;
+    /**
+     * 地理区域的东北坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getNorthEase(): PlusMapsPoint;
+    /**
+     * 设置地理区域的西南坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setSouthWest(point?: PlusMapsPoint): void;
+    /**
+     * 地理区域的西南坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getSouthWest(): PlusMapsPoint;
+    /**
+     * 判断制定的坐标是否在地理区域中
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    contains(point?: PlusMapsPoint): boolean;
+    /**
+     * 判断两个地理区域是否相等
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    equals(bounds?: PlusMapsBounds): boolean;
+    /**
+     * 获取地理区域的中心点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+}
+
+/**
+ * 地图视图类型
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMapType {
+    /**
+     * 普通街道视图类型
+     * 地图视图类型常量，普通街道视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MAPTYPE_NORMAL?: number;
+    /**
+     * 卫星视图
+     * 地图视图类型常量，卫星视图。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    MAPTYPE_SATELLITE?: number;
+}
+
+/**
+ * 地图覆盖物基类对象
+ * Overlay是地图上显示元素的基类，用于抽象地图元素，不用于实例化。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsOverlay {
+    /**
+     * 判断地图覆盖物是否可见
+     * 地图覆盖物对象默认为可见；地图覆盖物对象是否可见由其自身状态决定，不管其是否被添加到地图层中。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isVisible(): boolean;
+    /**
+     * 显示地图上的覆盖物
+     * 常用于地图覆盖物在隐藏后调用此方法来显示。
+     * 	只有添加到地图上的覆盖物才能看到效果；
+     * 	如果覆盖物对象已经在地图上显示再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    show(): void;
+    /**
+     * 隐藏地图上的覆盖物
+     * 常用于地图覆盖物在显示后调用此方法来隐藏。
+     * 		只有添加到地图上的覆盖物才能看到效果；
+     * 		如果覆盖物对象已经在地图上隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hide(): void;
+}
+
+/**
+ * 地图上显示的标点对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsMarker {
+    /**
+     * 用户点击地图标点事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsOverlay) => void;
+    /**
+     * 用户拖拽标点事件
+     * 可调用标点对象的markObj.setDraggable(true)方法设置标点允许拖拽，当用户拖拽标点对象时触发此事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onDrag?: (result: any) => void;
+    /**
+     * 覆盖物显示到最上层
+     * 常用于覆盖物相互覆盖时调整覆盖物的显示顺序。
+     * 	只有添加到地图上的覆盖物才能看到效果；
+     * 	如果覆盖物对象已经在地图上隐藏再调用此方法将无效果。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    bringToTop(): void;
+    /**
+     * 设置标点对象的坐标
+     * 标点在设置新坐标后将在地图上立即更新标点位置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPoint(point?: PlusMapsPoint): void;
+    /**
+     * 获取标点的坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPoint(): PlusMapsPoint;
+    /**
+     * 设置标点上显示的图标
+     * 若未设置则显示默认标点图标，已添加的标点在设置新值后将在地图上立即更新标点内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcon(icon?: string): void;
+    /**
+     * 设置标点上显示的图标数组
+     * 设置图标数组后则按照指定的间隔时间轮播数组中图标。
+     * 	设置图标数组后将忽略setIcon方法设置的图标，未设置则显示setIcon设置的图标。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcons(icons?: any []): void;
+    /**
+     * 设置标点上显示的文本标注
+     * 若未设置则不显示标注（默认为空字符串），已添加的标点在设置新值后将在地图上立即更新标点内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLabel(label?: string): void;
+    /**
+     * 获取标点上显示的文本标注
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLabel(): string;
+    /**
+     * 设置标点的气泡内容
+     * 设置气泡内容后，用户点击标点时弹出则弹出气泡。
+     * 	注意：用户点击标点时先弹出标点关联的气泡，再响应标点的onclick事件。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setBubble(buuble?: PlusMapsBubble, pop?: boolean): void;
+    /**
+     * 获取标点上显示的文本标注
+     * 如果没有设置关联的气泡对象则返回null。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getBubble(): PlusMapsBubble;
+    /**
+     * 隐藏标点上显示的气泡
+     * 如果没有设置关联的气泡对象或者气泡对象没有弹出显示，则不做任何操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    hideBubble(): void;
+    /**
+     * 设置标点的是否允许拖拽
+     * 设置标点可拖拽后，用户按住标点后拖动，标点会跟随手的拖拽而移动。
+     * 	拖拽后会更新标点的坐标信息。
+     * 	注：拖动前需要先在标点上长按。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setDraggable(draggable?: boolean): void;
+    /**
+     * 获取标点是否允许拖拽
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    isDraggable(): boolean;
+}
+
+/**
+ * 地图上显示的气泡对象
+ * 此对象不能直接添加到地图上显示，只可关联到地图标点覆盖物上，用户点击标点时弹出显示。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsBubble {
+    /**
+     * 用户点击气泡事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onclick?: (result: PlusMapsOverlay) => void;
+    /**
+     * 设置气泡上显示的图标
+     * 若为设置则无默认图标，已添加的显示的气泡在设置新值后将在地图上立即更新内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setIcon(icon?: string): void;
+    /**
+     * 设置气泡上显示的文字内容
+     * 若未设置则不显示文字（默认为空字符串），已添加的显示的气泡在设置新值后将在地图上立即更新内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLabel(label?: string): void;
+    /**
+     * 获取气泡上显示的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLabel(): string;
+    /**
+     * 获取气泡所属的标点对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    belongMarker(): PlusMapsMarker;
+    /**
+     * 从图片加载气泡显示的内容
+     * 通过加载图片来自定义气泡显示的内容，加载图片后将清空气泡使用的图标及文字内容。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    loadImage(path?: string): void;
+    /**
+     * 从图片数据加载气泡显示的内容
+     * 通过加载图片数据来自定义气泡显示的内容，加载图片后将清空气泡使用的图标及文字内容。
+     * 	图片数据可通过Canvas自定义绘制后调用toDataURL来获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    loadImageDataURL(data?: string): void;
+}
+
+/**
+ * 地图上显示的圆圈对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsCircle {
+    /**
+     * 设置圆圈中心点的经纬度坐标
+     * 该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setCenter(point?: PlusMapsPoint): void;
+    /**
+     * 获取圆圈中心点的坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getCenter(): PlusMapsPoint;
+    /**
+     * 设置圆圈的半径，单位为米
+     * 该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setRadius(radius?: number): void;
+    /**
+     * 获取圆圈的半径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getRadius(): number;
+    /**
+     * 设置圆圈的边框颜色
+     * 圆圈默认的圆圈边框颜色为黑色"#000000"，该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取圆圈的边框颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设置圆圈的边框颜色
+     * 圆圈默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取圆圈边框的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置圆圈的填充颜色
+     * 圆圈默认的圆圈填充颜色为无色，该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillColor(color?: string): void;
+    /**
+     * 获取圆圈的填充颜色
+     * 如果填充颜色为无色，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillColor(): string;
+    /**
+     * 设置圆圈填充颜色的透明度
+     * 圆圈默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillOpacity(opacity?: number): void;
+    /**
+     * 获取圆圈填充色的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillOpacity(): number;
+    /**
+     * 设置圆圈边框的线条宽度
+     * 圆圈边框的默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的圆圈立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取圆圈边框的线条宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图上显示的折线对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPolyline {
+    /**
+     * 设置折线的顶点坐标
+     * 该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPath(points?: any []): void;
+    /**
+     * 获取折线的顶点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPath(): any [];
+    /**
+     * 设置折线的颜色
+     * 折线默认的颜色为黑色"#000000"，该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取折线的颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设设置折线的透明度
+     * 折线默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取折线的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置折线的线条宽度
+     * 折线线条的宽度默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的折线立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取折线的线条宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图上显示的多边形对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPolygon {
+    /**
+     * 设置多边形的顶点坐标
+     * 该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPath(points?: any []): void;
+    /**
+     * 获取多边形的顶点坐标
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPath(): any [];
+    /**
+     * 设置多边形的颜色
+     * 多边形边框默认的颜色为黑色"#000000"，该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeColor(color?: string): void;
+    /**
+     * 获取多边形边框的颜色
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeColor(): string;
+    /**
+     * 设置多边形的透明度
+     * 多边形边框默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setStrokeOpacity(opacity?: number): void;
+    /**
+     * 获取多边形边框的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getStrokeOpacity(): number;
+    /**
+     * 设置多边形的填充颜色
+     * 多边形默认填充颜色为无色，该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillColor(color?: string): void;
+    /**
+     * 获取多边形的填充色
+     * 如果填充色为无色，则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillColor(): string;
+    /**
+     * 设置多边形填充色的透明度
+     * 多边形填充色默认值为不透明。
+     * 	如果设置的值不合法则保持原有的透明度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setFillOpacity(opacity?: number): void;
+    /**
+     * 获取多边形填充色的透明度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getFillOpacity(): number;
+    /**
+     * 设置多边形的边框宽度
+     * 多边形边框的宽度默认值为5。
+     * 	如果设置的值不合法则保持原有的宽度；该方法设置将导致地图中的多边形立即更新。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setLineWidth(width?: number): void;
+    /**
+     * 获取多边形边框的宽度
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getLineWidth(): number;
+}
+
+/**
+ * 地图检索对象
+ * Search对象用于管理地图上的检索功能，包括位置检索、周边检索和范围检索。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearch {
+    /**
+     * 兴趣点检索完成事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onPoiSearchComplete?: (result0: number, result1: PlusMapsSearchPoiResult) => void;
+    /**
+     * 线路检索完成事件
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    onRouteSearchComplete?: (result0: number, result1: PlusMapsSearchRouteResult) => void;
+    /**
+     * 设置检索返回结果每页的信息数目
+     * 地图检索结果是按页返回的，默认检索每页返回10条信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setPageCapacity(capacity?: number): void;
+    /**
+     * 获取检索返回结果每页的信息数目
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPageCapacity(): number;
+    /**
+     * 城市兴趣点检索
+     * 检索结果将通过onPoiSearchComplete事件返回。
+     * 	如果调用此方法时已经处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchInCity(city?: string, key?: string, index?: number): boolean;
+    /**
+     * 周边检索
+     * 周边检索根据中心点、半径与检索词进行检索，检索完成后触发onPoiSearchComplete()事件。
+     * 	若调用此方法时对象处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchNearBy(key?: string, pt?: PlusMapsPoint, radius?: number, index?: number): boolean;
+    /**
+     * 指定范围检索
+     * 根据范围和检索词进行检索，检索完成后触发onPoiSearchComplete()事件。
+     * 	若调用此方法时对象处于POI检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiSearchInbounds(): boolean;
+    /**
+     * 设置公交路线检索策略
+     * 默认采用maps.SearchPolicy.TRANSIT_TIME_FIRST策略。
+     * 	需在调用transitSearch()方法前设置的策略才生效；
+     * 	如果设置非法值则认为设置失败，采用上次设置的检索策略并返回false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setTransitPolicy(policy?: PlusMapsSearchPolicy): boolean;
+    /**
+     * 公交路线检索
+     * 检索完成后触发onRouteSearchComplete()事件。
+     * 	若调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    transitSearch(start?: string, end?: string, city?: string): boolean;
+    /**
+     * 设置驾车路线检索策略
+     * 设置驾车路线检索策略，默认采用maps.SearchPolicy.DRIVING_TIME_FIRST策略。
+     * 	如果设置非法值则认为设置失败，采用上次设置的检索策略并返回false；需在调用drivingSearch()方法前设置的策略才生效。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    setDrivingPolicy(policy?: PlusMapsSearchPolicy): boolean;
+    /**
+     * 驾车路线检索
+     * 用于驾车路线检索，检索完成后触发onRouteSearchComplete()事件。
+     * 	调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    drivingSearch(start?: string, startCity?: string, end?: string, endCity?: string): boolean;
+    /**
+     * 步行路线检索
+     * 用于步行路线检索，检索完成后触发onRouteSearchComplete()事件。
+     * 	调用此方法时对象处于检索操作中，则终止上次检索操作，重新开始新的检索。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    walkingSearch(start?: string, startCity?: string, end?: string, endCity?: string): boolean;
+}
+
+/**
+ * 检索策略类型
+ * 在线路检索时设置检索策略时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchPolicy {
+    /**
+     * 时间优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_TIME_FIRST?: number;
+    /**
+     * 最少换乘优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_TRANSFER_FIRST?: number;
+    /**
+     * 最少步行距离优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_WALK_FIRST?: number;
+    /**
+     * 选择车票花销最少优先
+     * 检索策略类型常量，用于公交检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    TRANSIT_FEE_FIRST?: number;
+    /**
+     * 最短距离优先
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_DIS_FIRST?: number;
+    /**
+     * 无高速公路线路
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_NO_EXPRESSWAY?: number;
+    /**
+     * 最少费用优先
+     * 检索策略类型常量，用于驾车检索策略
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    DRIVING_FEE_FIRST?: number;
+}
+
+/**
+ * 保存位置检索、周边检索和范围检索返回的结果
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchPoiResult {
+    /**
+     * POI检索总结果数
+     * POI检索总结果数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    totalNumber?: number;
+    /**
+     * 当前页的POI检索结果数
+     * 当前页POI检索结果数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    currentNumber?: number;
+    /**
+     * 本次POI检索的总页数
+     * 本次POI检索的总页数，若没有检索到则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pageNumber?: number;
+    /**
+     * 获取当前页的索引
+     * 当前页的索引值，从0开始，即0表示第一页。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pageIndex?: number;
+    /**
+     * 本次POI检索结果数组
+     * POI检索结果数组，Array数组对象，数组内容为Position对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    poiList?: any [];
+    /**
+     * 获取指定索引的检索结果
+     * 如果index值超出范围则返回null对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getPosition(): PlusMapsPosition;
+}
+
+/**
+ * 保存位置检索、周边检索和范围检索返回的结果
+ * 不可通过new操作符创建SearchRouteResult对象，在触发onRouteSearchComplete()时自动创建。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsSearchRouteResult {
+    /**
+     * 线路的起点位置
+     * 线路检索结果的起始位置点对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    startPosition?: PlusMapsPosition;
+    /**
+     * 线路的终点位置
+     * 线路检索结果的终点位置点对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    endPosition?: PlusMapsPosition;
+    /**
+     * 本次线路检索的总方案数
+     * 线路检索结果的方案数目，若未检索到有效结果则返回0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeNumber?: number;
+    /**
+     * 线路检索结果数组
+     * 线路检索结果数组，Array数组对象，数组内容为Route对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeList?: any [];
+    /**
+     * 获取指定索引的线路方案
+     * 如果index值超出范围则返回null对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    getRoute(index?: number): PlusMapsRoute;
+}
+
+/**
+ * 检索结果的位置点
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsPosition {
+    /**
+     * 位置点的经纬度坐标
+     * 如果没有经纬度坐标信息（如果公交、地铁路线数据等），则其值为undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    point?: PlusMapsPoint;
+    /**
+     * 位置点的地址信息
+     * 如果没有位置点的地址信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    address?: string;
+    /**
+     * 位置点的所属城市信息
+     * 如果没有位置点的所属城市信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    city?: string;
+    /**
+     * 位置点的名称
+     * 如果没有位置点的名称则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    name?: string;
+    /**
+     * 位置点的电话信息
+     * 如果没有位置点的电话信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    phone?: string;
+    /**
+     * 位置点的邮编信息
+     * 如果没有位置点的邮编信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    postcode?: string;
+}
+
+/**
+ * 地图中的路线对象
+ * 从Overlay对象继承而来，可通过Map对象的addOverlay()方法将对象添加地图中。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+ */
+interface PlusMapsRoute {
+    /**
+     * 路线起点地理坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    startPoint?: PlusMapsPoint;
+    /**
+     * 路线终点地理坐标点
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    endPoint?: PlusMapsPoint;
+    /**
+     * 路线坐标点段数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pointCount?: PlusMapsPoint;
+    /**
+     * 路线的地理坐标点数组
+     * 路线的地理坐标点数组，数组中保存Point对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    pointList?: any [];
+    /**
+     * 路线总距离
+     * 路线从起始点到终点的距离，单位为米。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    distance?: number;
+    /**
+     * 线路的提示信息
+     * 线路提示信息，没有提示信息则返回空字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/maps.html](http://www.html5plus.org/doc/zh_cn/maps.html)
+     */
+    routeTip?: string;
+}
+
+/**
+ * OAuth模块管理客户端的用户登录授权验证功能，允许应用访问第三方平台的资源。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauth {
+    /**
+     * 登录授权认证服务对象
+     * AuthService对象用于表示登录授权认证服务，在JS中为对象，用于向系统进行登录授权认证操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthService?: PlusOauthAuthService;
+    /**
+     * JSON对象，授权认证参数选项
+     * 此对象支持的属性值由登录授权认证服务定义。
+     * 	例如“微信”，则可配置以下参数：
+     * 	scope - 应用授权作用域；
+     * 	state - 用于保持请求和回调的状态参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthOptions?: PlusOauthAuthOptions;
+    /**
+     * 登录授权认证信息
+     * 此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+     * 	例如“微信”登录授权服务，则包括以下数据：
+     * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    AuthInfo?: PlusOauthAuthInfo;
+    /**
+     * 登录授权用户信息
+     * 用于保存登录授权用户的信息。
+     * 	此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+     * 	例如“微信”登录授权服务，可能包括以下自定义数据：
+     * 	privilege - 用户特权信息，json数组，如微信沃卡用户为（chinaunicom）；
+     * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    UserInfo?: PlusOauthUserInfo;
+    /**
+     * 获取登录授权认证服务列表
+     * 获取终端支持的权登录认证服务列表，可用于提示用户进行登录平台的选择。获取登录授权认证服务成功后通过successCB回调返回支持的所有服务列表，获取服务失败则通过errorCB回调返回失败信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    getServices(successCB?: (result: PlusOauth []) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 登录授权认证服务对象
+ * AuthService对象用于表示登录授权认证服务，在JS中为对象，用于向系统进行登录授权认证操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthService {
+    /**
+     * 登录授权认证服务标识
+     * 用于表示登录授权认证服务标识：
+     * 		"weixin" - 表示微信登录授权；
+     * 		"qq" - 表示QQ登录授权；
+     * 		"sinaweibo" - 表示新浪微博登录授权；
+     * 		"qihoo" - 表示360账号登录（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    id?: string;
+    /**
+     * 登录授权认证服务描述
+     * 用于描述登录授权认证服务的信息：
+     * 		"微信" - 表示微信登录授权；
+     * 		"QQ" - 表示QQ登录授权；
+     * 		"新浪微博" - 表示新浪微博登录授权；
+     * 		"360账号" - 表示360账号登录（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    description?: string;
+    /**
+     * 授权认证结果数据
+     * 用于保存登录授权认证获取的认证信息，如果值为"undefined"则表示未进行授权认证或者是授权认证失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    authResult?: PlusOauthAuthInfo;
+    /**
+     * 登录授权认证用户信息
+     * 用于保存登录授权认证获取的用户信息，如果值为"undefined"则表示未获取过用户信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    userInfo?: PlusOauthUserInfo;
+    /**
+     * 登录授权认证扩展信息
+     * 用于保存登录授权认证服务返回的扩展信息，具体内容由各登录平台决定，如果没有扩展信息则为undefined。
+     * 	例如“微信”，则可保存以下数据：
+     * 	state - 用于保持请求和回调的状态参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    extra?: any;
+    /**
+     * 请求授权认证
+     * 向开放平台请求进行授权认证，需提供授权域（scope），用户在终端确认后通过成功回调返回授权临时票据（code）。
+     * 	开发者可以将授权临时票据（code）提交到业务服务器，又业务服务器从微信开放平台获取授权登录等相关信息，避免将appsecret等信息保存在客户端可能引起泄露的问题。
+     * 	注意：目前仅微信平台支持请求授权认证，其它平台调用此方法将返回错误回调。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    authorize(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    /**
+     * 请求登录授权认证操作
+     * 对指定的登录授权认证服务进行登录认证操作，在登录前可通过对象的authResult属性判断是否已经登录认证过，通常只需要对没有进行过登录认证的服务进行登录认证操作。
+     * 	授权认证操作成功后通过successCB回调函数通知，失败则通过errorCB回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    login(successCallback?: (result: any) => void, errorCallback?: (result: any) => void, options?: PlusOauthAuthOptions): void;
+    /**
+     * 注销登录授权认证
+     * 对指定的登录授权认证服务注销登录认证操作，注销授权认证后，再次操作时需重新进行登录认证操作。
+     * 	如果第三方平台不需要注销操作，则情况保存的相关登录认证等信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    logout(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 获取登录授权用户信息
+     * 获取登录授权认证的用户信息，在获取前可通过对象的userInfo属性判断是否已经获取过，通常只需要对没有获取过用户信息的服务进行操作。
+     * 	获取用户信息操作成功后通过successCallback回调函数通知，失败则通过errorCallback回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    getUserInfo(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+    /**
+     * 添加用户手机号信息
+     * 打开登录授权服务的添加用户手机号界面进行操作，添加用户手机号操作成功后通过successCallback回调函数通知，否则通过errorCallback回调函数通知。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    addPhoneNumber(successCallback?: (result: any) => void, errorCallback?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，授权认证参数选项
+ * 此对象支持的属性值由登录授权认证服务定义。
+ * 	例如“微信”，则可配置以下参数：
+ * 	scope - 应用授权作用域；
+ * 	state - 用于保持请求和回调的状态参数。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthOptions {
+    /**
+     * 申请的权限作用范围
+     * 如果存在多个权限，则以","符号分割。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    scope?: string;
+    /**
+     * 客户端的当前状态，可以指定任意值，登录认证后原封不动的返回保存到AuthService对象的extra中
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    state?: string;
+    /**
+     * 登录授权认证服务平台申请的appid
+     * 动态设置登录授权服务中需要使用的appid，仅需要此参数的登录授权服务（如“微信登录”、“QQ登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appid值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appid?: string;
+    /**
+     * 登录授权认证服务平台申请的appkey
+     * 动态设置登录授权服务中需要使用的appkey，仅需要此参数的登录授权服务（如“新浪微博登录”、“360登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appkey?: string;
+    /**
+     * 登录授权认证服务平台申请的appsecret
+     * 动态设置登录授权服务中需要使用的appsecret，仅需要此参数的登录授权服务（如“微信登录”、“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）；当开放平台申请的appsecret值涉及到安全问题时，可在应用运行时从服务器获取，然后通过此api动态设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    appsecret?: string;
+    /**
+     * 登录授权认证服务平台申请的redirect_url
+     * 动态设置登录授权服务中需要使用的redirect_url，仅需要此参数的登录授权服务（如“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的redirect_url值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    redirect_url?: string;
+}
+
+/**
+ * 登录授权认证信息
+ * 此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+ * 	例如“微信”登录授权服务，则包括以下数据：
+ * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthAuthInfo {
+    /**
+     * 登录授权的访问令牌
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    access_token?: string;
+    /**
+     * 登录授权用户的唯一标识
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    openid?: string;
+    /**
+     * 登录授权访问令牌过期时间
+     * 单位为秒，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    expires_in?: string;
+    /**
+     * 登录授权的更新令牌
+     * 用来获取下一次的访问令牌，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    refresh_token?: string;
+    /**
+     * 登录授权的权限范围
+     * 如果存在多个权限，则以","符号分割。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    scope?: string;
+}
+
+/**
+ * 登录授权用户信息
+ * 用于保存登录授权用户的信息。
+ * 	此对象仅定义标准属性，登录授权认证服务可扩展自定义数据。
+ * 	例如“微信”登录授权服务，可能包括以下自定义数据：
+ * 	privilege - 用户特权信息，json数组，如微信沃卡用户为（chinaunicom）；
+ * 	unionid - 用户统一标识，针对一个微信开放平台帐号下的应用，同一用户的unionid是唯一的。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+ */
+interface PlusOauthUserInfo {
+    /**
+     * 登录授权用户的唯一标识
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    openid?: string;
+    /**
+     * 登录授权用户的头像图片地址
+     * 要求为"http://"或"https://"开头的地址，如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    headimgurl?: string;
+    /**
+     * 登录授权用户的昵称
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    nickname?: string;
+    /**
+     * 登录授权用户的邮箱地址
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    email?: string;
+    /**
+     * 登录授权用户的电话号码
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    phonenumber?: string;
+    /**
+     * 登录授权用户的性别
+     * 1为男性，2为女性。
+     * 	如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    sex?: string;
+    /**
+     * 登录授权用户注册的省份信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    province?: string;
+    /**
+     * 登录授权用户注册的城市信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    city?: string;
+    /**
+     * 登录授权用户注册的国家信息
+     * 如果登录授权服务不支持此属性，则返回"undefined"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/oauth.html](http://www.html5plus.org/doc/zh_cn/oauth.html)
+     */
+    country?: string;
+}
+
+/**
+ * Payment模块管理支付功能，用于提供网页安全支付能力，支持通过Web接口进行支付操作。通过plus.payment可获取支付管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPayment {
+    /**
+     * 支付通道对象
+     * PaymentChannel对象表示特定的支付通道，用于向系统请求支付操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    PaymentChannel?: PlusPaymentPaymentChannel;
+    /**
+     * IAP订单数据对象
+     * 描述IAP商品订单信息，如标识、数量等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    OrderStatementIAP?: PlusPaymentOrderStatementIAP;
+    /**
+     * 支付操作结果对象
+     * PaymentResult对象表示支付操作返回结果，用于确认支付操作成功。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    PaymentResult?: PlusPaymentPaymentResult;
+    /**
+     * IAP商品对象
+     * 描述IAP商品详细信息，如标识、价格、标题、描述信息等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPProduct?: PlusPaymentIAPProduct;
+    /**
+     * 购买IAP商品对象
+     * 描述购买的IAP商品详细信息，如标识、数量等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPProductInfo?: PlusPaymentIAPProductInfo;
+    /**
+     * 购买IAP商品交易信息对象
+     * 描述购买的IAP商品交易详细信息，如购买商品信息、交易日期、订单标识等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    IAPTransaction?: PlusPaymentIAPTransaction;
+    /**
+     * 获取支付通道
+     * 在进行支付操作前需获取终端支持的支付通道列表，用于提示用户进行选择。
+     * 	获取支付通道成功后通过successCB回调返回支持的所有通道列表，获取支付通道列表失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    getChannels(successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 请求支付操作
+     * 调用指定的支付通道进行支付操作，其中statement包含支付操作的相关信息，支付模块将弹出支付界面供用户进行支付信息的输入确认操作。
+     * 	用户支付操作成功后通过successCB回调返回支付操作结果，支付操作失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    request(channel?: PlusPaymentPaymentChannel, statement?: string, successCB?: (result: PlusPaymentPaymentResult) => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * 支付通道对象
+ * PaymentChannel对象表示特定的支付通道，用于向系统请求支付操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentPaymentChannel {
+    /**
+     * 支付通道标识
+     * 用于标识支付通道：
+     * 		"alipay" - 表示支付宝；
+     * 		"wxpay" - 表示微信支付；
+     * 		"appleiap" - 表示苹果应用内支付；
+     * 		"qhpay" - 表示360聚合支付（仅360手助流应用环境下支持）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    id?: string;
+    /**
+     * 支付通道描述
+     * 支付通道的描述信息，如“支付宝”、“微信”、“In-App Purchase”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: string;
+    /**
+     * 支付通道服务是否安装
+     * 通常特定的支付通道依赖系统安装相关的服务，此属性用于标识其服务是否安装，如果没有安装则为false，否则为true。
+     * 	若系统环境中没有安装相关的服务，则可能导致调用支付操作失败，这时可以调用installService方法进行安装。
+     * 	注意：如果支付通道不需要依赖系统安装服务，则永远返回true。例如支付宝，如果设备上未安装支付宝客户端则调用Wap页面进行支付，因此值固定返回true；
+     * 	而微信支付则依赖微信客户端，如果设备上未安装微信客户端则serviceReady值为false，此时应该提示用户安装微信客户端才能进行支付操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    serviceReady?: boolean;
+    /**
+     * 安装支付通道依赖的服务
+     * 对于某些支付通道，通常特定的支付通道依赖系统安装相关的服务，调用此方法将安装其依赖的支付服务。
+     * 	如支付宝，则在系统中安装支付宝客户端程序。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    installService(): void;
+    /**
+     * 向IAP服务器请求支付订单
+     * IAP支付在调用plus.payment.request方法支付前须先向服务器请求获取商品的详细信息，否则会支付失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    requestOrder(ids?: any [], successCB?: (result: PlusPayment []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 向IAP服务器请求已经购买的非消耗性商品和订阅商品
+     * 注意：不能获取已购买的消耗性商品。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    restoreComplateRequest(options?: any, successCB?: (result: PlusPayment []) => void): void;
+}
+
+/**
+ * IAP订单数据对象
+ * 描述IAP商品订单信息，如标识、数量等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentOrderStatementIAP {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productid?: string;
+    /**
+     * 购买用户名称
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    username?: string;
+    /**
+     * 商品数量
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    quantity?: string;
+}
+
+/**
+ * 支付操作结果对象
+ * PaymentResult对象表示支付操作返回结果，用于确认支付操作成功。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentPaymentResult {
+    /**
+     * 支付通道对象
+     * 用于发起支付操作的支付通道对象。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    channel?: PlusPaymentPaymentChannel;
+    /**
+     * 交易编号信息
+     * 如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    tradeno?: string;
+    /**
+     * 交易描述信息
+     * 如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: boolean;
+    /**
+     * 查找支付交易信息地址
+     * 用于向支付平台查询交易信息，如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    url?: boolean;
+    /**
+     * 支付操作指纹信息
+     * 用于向支付平台查询支付订单信息，如果支付平台不支持此数据则返回undefined。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    signature?: string;
+    /**
+     * 支付平台返回的原始数据
+     * 如果支付平台返回key-value类型字符串，则组合成符合JSON格式的字符串。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    rawdata?: string;
+}
+
+/**
+ * IAP商品对象
+ * 描述IAP商品详细信息，如标识、价格、标题、描述信息等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPProduct {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productid?: string;
+    /**
+     * 商品的价格
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    price?: string;
+    /**
+     * 商品标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    title?: string;
+    /**
+     * 商品的描述信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    description?: string;
+}
+
+/**
+ * 购买IAP商品对象
+ * 描述购买的IAP商品详细信息，如标识、数量等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPProductInfo {
+    /**
+     * 商品的标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    productIdentifier?: string;
+    /**
+     * 商品的数量
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    quantity?: string;
+}
+
+/**
+ * 购买IAP商品交易信息对象
+ * 描述购买的IAP商品交易详细信息，如购买商品信息、交易日期、订单标识等。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+ */
+interface PlusPaymentIAPTransaction {
+    /**
+     * 购买商品的信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    payment?: string;
+    /**
+     * 购买商品的交易日期
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionDate?: string;
+    /**
+     * 购买商品的交易订单标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionIdentifier?: string;
+    /**
+     * 购买商品的交易收据
+     * base64编码格式字符串数据。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionReceipt?: string;
+    /**
+     * 购买商品的交易状态
+     * 可取值："1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/payment.html](http://www.html5plus.org/doc/zh_cn/payment.html)
+     */
+    transactionState?: string;
+}
+
+/**
+ * Push模块管理推送消息功能，可以实现在线、离线的消息推送，通过plus.push可获取推送消息管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPush {
+    /**
+     * JSON对象，获取的客户端标识信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    ClientInfo?: PlusPushClientInfo;
+    /**
+     * JSON对象，推送消息对象
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    PushMessage?: PlusPushPushMessage;
+    /**
+     * JSON对象，获客户端创建本地消息的参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    MessageOptions?: PlusPushMessageOptions;
+    /**
+     * 添加推送消息事件监听器
+     * 添加推送消息事件监听器，当指定推送事件发出时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    addEventListener(type?: string, listener?: (result: string) => void, capture?: boolean): void;
+    /**
+     * 清空所有推送消息
+     * 清空系统消息中心所有的推送消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    clear(): void;
+    /**
+     * 创建本地消息
+     * 在本地直接创建推送消息，并添加到系统消息中心。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    createMessage(content?: string, payload?: string, options?: PlusPushMessageOptions): void;
+    /**
+     * 获取所有推送消息
+     * 获取客户端接收到的所有推送消息。
+     * 	仅包括在系统消息中心显示的推送消息，不包括调用setAutoNotification(false)方法设置不显示推送消息后接收到的消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    getAllMessage(): PlusPushPushMessage;
+    /**
+     * 获取客户端推送标识信息
+     * 客户端标识信息用于业务服务器下发推送消息时提交给推送服务器的数据，用于说明下发推送消息的接收者（客户端）。需要客户端在第一次运行时提交到业务服务器保存。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    getClientInfo(): PlusPushClientInfo;
+    /**
+     * 设置程序是否将消息显示在系统消息中心
+     * 默认情况下程序在接收到推送消息后将会在系统消息中心显示，通过此方法可关闭默认行为，接收到推送消息后不在系统消息中心显示，通过addEventListener方法的“receive”事件监听处理接收到的消息。
+     * 	在这种模式下可通过createMessage方法创建在系统消息中心显示的消息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    setAutoNotification(notify?: boolean): void;
+    /**
+     * 删除推送消息
+     * 删除系统消息中心指定的推送消息，可通过getAllMessage方法获取所有的消息后进行操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    remove(message?: PlusPushPushMessage): void;
+}
+
+/**
+ * JSON对象，获取的客户端标识信息
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushClientInfo {
+    /**
+     * 设备令牌（iOS设备唯一标识），用于APNS服务推送中标识设备的身份
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    token?: string;
+    /**
+     * 推送服务令牌（设备唯一标识），用于标识推送信息接收者身份
+     * 第三方推送服务器管理的设备唯一标识，在iOS平台此值通常与token不同；在其它平台此值通常与token值一致。
+     * 	此值与设备及应用都相关，即不同的apk/ipa安装到同一台设备上的值都不相同。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    clientid?: string;
+    /**
+     * 第三方推送服务的应用标识
+     * 第三方推送服务器管理的应用标识，通常需要在第三方推送服务器平台进行注册获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appid?: string;
+    /**
+     * 第三方推送服务器的应用键值
+     * 第三方推送服务器管理的应用键值，通常需要在第三方推送服务器平台进行注册获取。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appkey?: string;
+}
+
+/**
+ * JSON对象，推送消息对象
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushPushMessage {
+    /**
+     * 推送消息显示的标题
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    title?: string;
+    /**
+     * 推送消息显示的内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    content?: string;
+    /**
+     * 推送消息承载的数据
+     * 如果推送消息中传输的数据不符合JSON格式，则作为String类型数据保存。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    payload?: any;
+    /**
+     * Apple APNS推送协议数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    aps?: any;
+}
+
+/**
+ * JSON对象，获客户端创建本地消息的参数
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+ */
+interface PlusPushMessageOptions {
+    /**
+     * 要启动流应用的appid
+     * 默认值为当前流应用的appid。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    appid?: string;
+    /**
+     * 是否覆盖上一次提示的消息
+     * 可取值true或false，true为覆盖，false不覆盖，默认为permission中设置的cover值。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    cover?: boolean;
+    /**
+     * 提示消息延迟显示的时间
+     * 当设备接收到推送消息后，可不立即显示，而是延迟一段时间显示，延迟时间单位为s，默认为0s，立即显示。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    delay?: number;
+    /**
+     * 推送消息的图标
+     * 本地图片地址，相对路径 - 相对于当前页面的host位置，如"a.jpg"，注意当前页面为网络地址则不支持； 绝对路径 - 系统绝对路径，如Android平台"/sdcard/logo.png"，此类路径通常通过其它5+ API获取的； 扩展相对路径URL(RelativeURL) - 以"_"开头的相对路径，如"_www/a.jpg"； 本地路径URL - 以“file://”开头，后面跟随系统绝对路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    icon?: string;
+    /**
+     * 推送消息的提示音
+     * 显示消息时的播放的提示音，可取值：
+     * 	“system”-表示使用系统通知提示音；
+     * 	“none”-表示不使用提示音；
+     * 	默认值为“system”。
+     * - system: 使用系统通知提示音
+     * - none: 不使用提示音
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    sound?: 'system' | 'none';
+    /**
+     * 推送消息的标题
+     * 在系统消息中心显示的通知消息标题，默认值为程序的名称。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    title?: string;
+    /**
+     * 消息上显示的提示时间
+     * 默认为当前时间，如果延迟显示则使用延时后显示消息的时间。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/push.html](http://www.html5plus.org/doc/zh_cn/push.html)
+     */
+    when?: Date;
+}
+
+/**
+ * Share模块管理客户端的社交分享功能，提供调用终端社交软件的分享能力。通过plus.share可获取社交分享管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShare {
+    /**
+     * JSON对象，分享授权认证参数选项
+     * 此对象支持的属性值由分享服务的授权认证模块定义。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    AuthOptions?: PlusShareAuthOptions;
+    /**
+     * 分享授权控件对象
+     * Authorize对象表示分享控件对象，用于在窗口中显示分享控件，使用此对象可自定义分享授权界面。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    Authorize?: PlusShareAuthorize;
+    /**
+     * JSON对象，用户位置信息
+     * GeoPosition对象用于表示用户分享消息时的位置信息。用于标识分享操作时用户的位置信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    GeoPosition?: PlusShareGeoPosition;
+    /**
+     * 分享服务对象
+     * ShareService对象用于表示分享服务，在JS中为对象，用于向系统请求分享操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareService?: PlusShareShareService;
+    /**
+     * 分享服务标识
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareServerIdentity?: PlusShareShareServerIdentity;
+    /**
+     * JSON对象，分享消息对象
+     * ShareMessage对象用于表示分享消息内容，在JS中为JSON对象，用于向系统发送分享信息操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareMessage?: PlusShareShareMessage;
+    /**
+     * JSON对象，保存分享消息扩展信息
+     * ShareMessageExtra对象用于保存各分享平台扩展的参数，用于自定义分享功能。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    ShareMessageExtra?: PlusShareShareMessageExtra;
+    /**
+     * JSON对象，微信小程序信息
+     * 用于配置分享小程序的参数，如小程序标识、页面路径等。
+     * 	注意：分享的小程序需要在微信开放平台关联的开发者账号下，否则会分享失败。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    WeixinMiniProgramOptions?: PlusShareWeixinMiniProgramOptions;
+    /**
+     * 获取分享服务
+     * 获取终端支持的分享通道列表，可用于提示用户进行分享服务器的选择。获取分享服务成功后通过successCB回调返回支持的所有服务列表，获取服务失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    getServices(successCB?: (result: PlusShare []) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 使用系统组件发送分享
+     * 调用系统分享组件分享消息，通过msg参数设置分享内容。
+     * 	发送成功后通过successCB回调函数通知操作完成，发送失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    sendWithSystem(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
+}
+
+/**
+ * JSON对象，分享授权认证参数选项
+ * 此对象支持的属性值由分享服务的授权认证模块定义。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareAuthOptions {
+    /**
+     * 分享服务平台申请的appid
+     * 动态设置分享服务授权认证时需要使用的appid，仅需要此参数的分享服务（如“微信”、“QQ”）支持。
+     * 	如果未设置则使用运行环境中内置的appid值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appid?: string;
+    /**
+     * 分享服务平台申请的appkey
+     * 动态设置分享服务授权认证时需要使用的appkey，仅需要此参数的分享服务（如“新浪微博”）支持。
+     * 	如果未设置则使用运行环境中内置的appkey值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appkey?: string;
+    /**
+     * 分享服务平台申请的appsecret
+     * 动态设置分享服务中需要使用的appsecret，仅需要此参数的分享服务（如“微信”、“新浪微博”）支持。
+     * 	如果未设置则使用运行环境中内置的appsecret值（如在HBuilder中可在manifest.json的“SDK配置”项中进行设置）；当开放平台申请的appsecret值涉及到安全问题时，可在应用运行时从服务器获取，然后通过此api动态设置。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    appsecret?: string;
+    /**
+     * 分享服务平台申请的redirect_url
+     * 动态设置分享服务中需要使用的redirect_url，仅需要此参数的登录授权服务（如“新浪微博登录”）支持。
+     * 	如果未设置则使用运行环境中内置的redirect_url值（如在HBuilder中可在manifest.json的SDK配置项中进行设置）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    redirect_url?: string;
+}
+
+/**
+ * 分享授权控件对象
+ * Authorize对象表示分享控件对象，用于在窗口中显示分享控件，使用此对象可自定义分享授权界面。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareAuthorize {
+    /**
+     * 分享控件加载完成事件
+     * 分享授权控件内容加载完成事件，通过调用load方法加载分享授权控件内容，当内容加载完成时触发。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onloaded?: (result: any) => void;
+    /**
+     * 分享授权认证成功事件
+     * 用户在分享授权控件上输入操作授权成功时触发，事件方法格式参考ShareSuccessCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onauthenticated?: () => void;
+    /**
+     * 分享授权认证失败事件
+     * 用户在分享授权控件上输入操作授权认证错误时触发，事件方法格式参考ShareErrorCallback回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    onerror?: (result: any) => void;
+    /**
+     * 加载分享授权页面
+     * 创建分享授权页面后，需要调用此方法指定分享服务标识来加载授权页面数据，此标识可使用ShareService对象的id属性。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    load(id?: string): void;
+    /**
+     * 设置分享授权控件是否可见
+     * 创建分享授权页面后，调用此方法设置分享授权控件在页面中是否可见。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    setVisible(visible?: boolean): void;
+}
+
+/**
+ * JSON对象，用户位置信息
+ * GeoPosition对象用于表示用户分享消息时的位置信息。用于标识分享操作时用户的位置信息。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareGeoPosition {
+    /**
+     * 用户位置的纬度坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    latitude?: number;
+    /**
+     * 用户位置的经度坐标信息
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    longitude?: number;
+}
+
+/**
+ * 分享服务对象
+ * ShareService对象用于表示分享服务，在JS中为对象，用于向系统请求分享操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareService {
+    /**
+     * 分享服务标识
+     * 用于表示分享服务标识：
+     * 	"sinaweibo" - 表示新浪微博；
+     * 	"tencentweibo" - 表示腾讯微博；
+     * 	"weixin" - 表示微信；
+     * 	"qq" - 表示腾讯QQ。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    id?: PlusShareShareServerIdentity;
+    /**
+     * 分享服务描述
+     * 用于描述分享服务的信息：
+     * 	如“新浪微博”、“腾讯微博”、“微信”、“QQ”。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    description?: string;
+    /**
+     * 是否授权认证
+     * 用于标识此分享是否已经授权认证过，true表示已完成授权认证；false表示未完成授权认证。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    authenticated?: boolean;
+    /**
+     * 授权认证信息
+     * 仅在authenticated为true时有效，标识客户认证标识信息，用于发送分享信息。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    accessToken?: string;
+    /**
+     * 是否存在对应的分享客户端
+     * 对于某些分享服务，可直接调用本地客户端程序进行授权认证，此属性即可提供此相关信息，若没有安装本地客户端则可能调用其它方式进行分享操作，如WAP方式等。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    nativeClient?: boolean;
+    /**
+     * 授权认证操作
+     * 对指定的分享服务进行授权认证操作，在授权前可通过ShareService.authenticated属性判断是否已经授权过，通常只需要对没有进行过授权认证的服务进行授权认证操作。
+     * 	授权认证操作成功后通过successCB回调函数通知操作完成，操作失败则通过errorCB回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    authorize(successCallback?: (result: PlusShareShareService) => void, errorCallback?: (result: any) => void, options?: PlusShareAuthOptions): void;
+    /**
+     * 取消授权认证
+     * 对指定的分享服务取消授权认证操作，取消授权认证后，再次分享时需重新进行授权操作。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    forbid(): void;
+    /**
+     * 发送分享
+     * 发送分享消息，分享消息的内容通过msg设置。
+     * 	发送成功后通过successCB回调函数通知操作完成，发送失败则通过errorCB回调返回。若分享服务没有进行授权认证或授权认证失效则触发失败回调函数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    send(msg?: PlusShareShareMessage, successCB?: () => void, errorCB?: (result: any) => void): void;
+    /**
+     * 调用微信小程序
+     * 注意：需在微信开放平台将应用关联小程序才能正常调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    launchMiniProgram(options?: PlusShareWeixinMiniProgramOptions): void;
+}
+
+/**
+ * 分享服务标识
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareServerIdentity {
+    /**
+     * 新浪微博
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    sinaweibo?: string;
+    /**
+     * 腾讯微博
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    tencentweibo?: string;
+    /**
+     * 微信
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    weixin?: string;
+}
+
+/**
+ * JSON对象，分享消息对象
+ * ShareMessage对象用于表示分享消息内容，在JS中为JSON对象，用于向系统发送分享信息操作。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareMessage {
+    /**
+     * 分享消息的类型
+     * 
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    type?: string;
+    /**
+     * 分享消息的文字内容
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    content?: string;
+    /**
+     * 分享消息的图片
+     * 分享消息中包含的图片路径，仅支持本地路径。
+     * 	若分享平台仅支持提交一张图片，传入多张图片则仅提交第一张图片。
+     * 	如果未指定type类型，优先级顺序为：pictures&gt;content（即设置了pictures则认为分享图片类型）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    pictures?: any [];
+    /**
+     * 分享消息的缩略图
+     * 分享消息中包含的缩略图路径，支持本地路径及网络路径。
+     * 	若分享平台仅支持提交一张图片，传入多张图片则仅提交第一张图片。
+     * 	如果分享平台的信息不支持缩略图，若没有设置消息的图片（pictures）则使用缩略图，否则忽略其属性值。
+     * 	注意：图片有大小限制，推荐图片小于20Kb。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    thumbs?: any [];
+    /**
+     * 分享的多媒体资源
+     * 分享的多媒体资源地址，当type值为"music"、"video"时有效。
+     * 	注意：
+     * 		微信分享平台支持音乐、视频类型，仅支持网络地址（以http://或https://开头）；
+     * 		QQ分享平台支持音乐类型，仅支持网络路径（以http://或https://开头）；
+     * 		新浪微博分享平台支持视频类型，仅支持本地文件路径。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    media?: string;
+    /**
+     * 分享独立的链接
+     * 分享资源地址，仅支持网络地址（以http://或https://开头）。
+     * 	如果未指定type类型，优先级顺序为：href&gt;pictures&gt;content（即设置了href则认为分享网页类型）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    href?: string;
+    /**
+     * 分享消息的标题
+     * 仅微信分享网页、音频、视频、小程序类型时支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    title?: string;
+    /**
+     * 分享消息中包含的用户地理信息数据
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    geo?: PlusShareGeoPosition;
+    /**
+     * 分享消息扩展参数
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    extra?: PlusShareShareMessageExtra;
+    /**
+     * 分享微信小程序参数
+     * 仅微信分享小程序类型时支持。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    miniProgram?: PlusShareWeixinMiniProgramOptions;
+    /**
+     * 分享消息的模式
+     * 可取值：
+     *     "auto" - 自动选择，如果已经安装微博客户端则采用编辑界面进行分享，否则采用无界面分享；
+     *     "slient" - 静默分享，采用无界面模式进行分享；
+     *     "editable" - 进入编辑界面，用户确认分享内容后发送，如果当前未安装微博客户端则触发错误回调。
+     *     默认值为"auto"。
+     *     （仅新浪微博分享时生效）
+     * - auto: 
+     * 	自动选择，如果已经安装微博客户端则采用编辑界面进行分享，否则采用无界面分享
+     * 								
+     * - slient: 
+     * 	静默分享，采用无界面模式进行分享
+     * 								
+     * - editable: 
+     * 	进入编辑界面，用户确认分享内容后发送，如果当前未安装微博客户端则触发错误回调
+     * 								
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    interface?: 'auto' | 'slient' | 'editable';
+}
+
+/**
+ * JSON对象，保存分享消息扩展信息
+ * ShareMessageExtra对象用于保存各分享平台扩展的参数，用于自定义分享功能。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareShareMessageExtra {
+    /**
+     * 微信分享场景，仅微信分享平台有效
+     * 可取值：
+     * 	"WXSceneSession"分享到微信的“我的好友”；
+     * 	"WXSceneTimeline"分享到微信的“朋友圈”中；
+     * 	"WXSceneFavorite"分享到微信的“我的收藏”中。
+     * 	默认值为"WXSceneSession"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    scene?: string;
+}
+
+/**
+ * JSON对象，微信小程序信息
+ * 用于配置分享小程序的参数，如小程序标识、页面路径等。
+ * 	注意：分享的小程序需要在微信开放平台关联的开发者账号下，否则会分享失败。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+ */
+interface PlusShareWeixinMiniProgramOptions {
+    /**
+     * 微信小程序ID
+     * 注意：是微信小程序的原始ID（"g_"开头的字符串）。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    id?: string;
+    /**
+     * 微信小程序打开的页面路径
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    path?: string;
+    /**
+     * 微信小程序版本类型
+     * 可取值：
+     * 	0-正式版；
+     * 	1-测试版；
+     * 	2-体验版。
+     * 	默认值为0。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    type?: number;
+    /**
+     * 兼容低版本的网页链接
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/share.html](http://www.html5plus.org/doc/zh_cn/share.html)
+     */
+    webUrl?: string;
+}
+
+/**
+ * Speech模块管理语音输入功能，提供语音识别功能，可支持用户通过麦克风设备进行语音输入内容。通过plus.speech可获取语音输入管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeech {
+    /**
+     * JSON对象，语音识别参数
+     * 控制语音识别引擎内部参数，在JS中为JSON对象，在启动语音识别时使用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    SpeechRecognizeOptions?: PlusSpeechSpeechRecognizeOptions;
+    /**
+     * 语音识别事件类型
+     * 描述语音过程的触发事件列表，可以通过调用plus.sppech.addEventListener方法进行注册监听。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    SpeechRecoginzeEvents?: PlusSpeechSpeechRecoginzeEvents;
+    /**
+     * 启动语音识别
+     * 启动语音识别时调用，当语音识别成功后通过successCallback回调返回识别出文本内容，调用语音识别失败则通过errorCallback回调返回。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    startRecognize(options?: PlusSpeechSpeechRecognizeOptions, successCB?: (result: string) => void, errorCB?: (result: any) => void): void;
+    /**
+     * 停止语音识别
+     * 当语音识别完成时或用户取消语音识别时调用，调用此方法将导致errorCallback回调函数的调用。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    stopRecognize(): void;
+    /**
+     * 监听语音识别事件
+     * 向语音识别模块添加事件监听器，当指定的事件发生时，将触发listener函数的执行。 
+     * 	可多次调用此方法添加多个监听器，当监听的事件发生时，将按照添加的先后顺序触发执行。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    addEventListener(event?: PlusSpeechSpeechRecoginzeEvents, listener?: (result: any) => void, capture?: boolean): void;
+}
+
+/**
+ * JSON对象，语音识别参数
+ * 控制语音识别引擎内部参数，在JS中为JSON对象，在启动语音识别时使用。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeechSpeechRecognizeOptions {
+    /**
+     * 语音识别是否采用持续模式
+     * 设置为true表示语音引擎不会根据语音输入自动结束，识别到文本内容将多次调用successCallback函数返回，如果需要结束语音识别则必须调用stopRecognize接口，默认值为false。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    continue?: boolean;
+    /**
+     * 语音识别引擎标识
+     * 用于兼容多语音识别引擎的浏览器，使用语音识别厂商的产品名称，如未设置或设置不正确则使用运行环境默认的语音识别引擎。
+     * 	支持以下语音识别引擎：
+     * 		"baidu"-百度语音识别；
+     * 		"iFly"-讯飞语音识别。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    engine?: string;
+    /**
+     * 语音识别引擎的语言
+     * 用于定义语音识别引擎的语言，其取值需符合W3C的Language codes规范。
+     * 	目前讯飞语音支持以下语言：
+     * 		"zh-cn"-中文，普通话；
+     * 		"en-us"-英语；
+     * 		"zh-cantonese"-中文，粤语；
+     * 		"zh-henanese"-中文，河南话（百度语音识别不支持此语言）。
+     * 		默认值为"zh-cn"。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    lang?: string;
+    /**
+     * 指定识别结果识别包括多候选结果
+     * 用于指定识别结果识别包括多候选结果。如nbest:3，识别返回3个候选结果，默认值为1。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    nbest?: number;
+    /**
+     * 识别结果中是否包含标点符号
+     * true表示识别结果文本中包含标点符号，false表示识别结果文本中不包含标点符号。
+     * 	默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    punctuation?: boolean;
+    /**
+     * 语音识别超时时间
+     * 语音识别超时的时间，单位为ms，默认值为1000（即10秒）。
+     * 	注：百度语音识别不支持此参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    timeout?: number;
+    /**
+     * 识别时是否显示用户界面
+     * 用于指定识别时是否显示用户界面，设置为true表示显示浏览器内置语音识别界面；设置为false表示不显示浏览器内置语音识别界面。默认值为true。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    userInterface?: boolean;
+    /**
+     * 语音识别开始事件（已废弃，使用start事件）
+     * 事件函数，语音识别开始启动，在调用startRecognize方法后触发，与onend事件成对触发。
+     * 	注：iOS平台未支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    onstart?: (result: any) => void;
+    /**
+     * 语音识别结束事件（已废弃，使用end事件）
+     * 事件函数，语音识别结束，在调用stopRecognize方法后触发，或者在引擎内部自动完成语音识别后触发，与onstart事件成对触发。
+     * 	注：iOS平台未支持
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    onend?: (result: any) => void;
+}
+
+/**
+ * 语音识别事件类型
+ * 描述语音过程的触发事件列表，可以通过调用plus.sppech.addEventListener方法进行注册监听。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+ */
+interface PlusSpeechSpeechRecoginzeEvents {
+    /**
+     * 开始语音识别
+     * 调用plus.speech.startRecognize方法开始语音识别时触发。
+     * 	无回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    start?: string;
+    /**
+     * 音量变化
+     * 开始语音识别后，麦克风录制到的语音音量变化时触发。
+     * 	回调函数参数event={volume:"Number类型，取值范围0-1"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    volumeChange?: string;
+    /**
+     * 临时语音识别结果
+     * 返回临时语音识别结果时触发。
+     * 	回调函数参数event={partialResult:"String类型，临时识别结果"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    recognizing?: string;
+    /**
+     * 最终语音识别
+     * 返回最终语音识别结果。
+     * 	回调函数参数event={result:"String类型，最佳识别结果",results:"String数组类型，所有候选结果"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    recognition?: string;
+    /**
+     * 结束语音识别
+     * 调用plus.speech.stopRecognize方法结束语音识别或语音识别完成后自动结束时触发。
+     * 	无回调函数参数。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    end?: string;
+    /**
+     * 语音识别错误
+     * 语音识别发生错误时触发。
+     * 	回调函数参数event={code:"Number类型，错误编码",message:"String类型，错误描述信息"}。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/speech.html](http://www.html5plus.org/doc/zh_cn/speech.html)
+     */
+    error?: string;
+}
+
+/**
+ * Statistic模块管理统计功能，用于提供应用内统计的能力，支持统计和分析用户属性和用户行为数据。通过plus.statistic可获取统计管理对象。
+ * 
+ * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+ */
+interface PlusStatistic {
+    /**
+     * 触发事件
+     * 触发指定的统计事件，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventTrig(id?: string, value?: any): void;
+    /**
+     * 精确持续事件
+     * 精确时长的持续事件统计，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventDuration(id?: string, duration?: number, value?: any): void;
+    /**
+     * 开始持续事件（过期API，不推荐使用）
+     * 开始指定的持续事件统计，当事件结束时调用eventEnd方法，，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventStart(id?: string, value?: string): void;
+    /**
+     * 结束持续事件（过期API，不推荐使用）
+     * 结束指定的持续事件统计，需先调用eventStart方法开始持续事件统计，触发的事件必须要先在统计网站上注册事件ID。
+     * 
+     * 参考: [http://www.html5plus.org/doc/zh_cn/statistic.html](http://www.html5plus.org/doc/zh_cn/statistic.html)
+     */
+    eventEnd(id?: string, label?: string): void;
+}
diff --git a/types/html5plus/tsconfig.json b/types/html5plus/tsconfig.json
new file mode 100644
index 0000000000..634c3eb205
--- /dev/null
+++ b/types/html5plus/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "html5plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/html5plus/tslint.json b/types/html5plus/tslint.json
new file mode 100644
index 0000000000..661e47a018
--- /dev/null
+++ b/types/html5plus/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false,
+        "no-trailing-whitespace": false
+    }
+}
\ No newline at end of file

From 75125724566199dbfb627163c1686da958747fcc Mon Sep 17 00:00:00 2001
From: Michael Mifsud <xzyfer@gmail.com>
Date: Thu, 7 Mar 2019 05:16:41 +1100
Subject: [PATCH 430/924] Add type definition for
 datadog-statsd-metrics-collector  (#33611)

* Add StatsDClient implement to node-dogstatsd

* Update connect-datadog to accept a dogstatsd.StatsDClient

* Add type definition for datadog-statsd-metrics-collector
---
 types/connect-datadog/index.d.ts              |  3 +-
 .../datadog-statsd-metrics-collector-tests.ts | 43 +++++++++++++++++++
 .../index.d.ts                                | 24 +++++++++++
 .../tsconfig.json                             | 23 ++++++++++
 .../tslint.json                               |  1 +
 types/node-dogstatsd/index.d.ts               | 17 +++++++-
 6 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 types/datadog-statsd-metrics-collector/datadog-statsd-metrics-collector-tests.ts
 create mode 100644 types/datadog-statsd-metrics-collector/index.d.ts
 create mode 100644 types/datadog-statsd-metrics-collector/tsconfig.json
 create mode 100644 types/datadog-statsd-metrics-collector/tslint.json

diff --git a/types/connect-datadog/index.d.ts b/types/connect-datadog/index.d.ts
index df18c0c208..9b68fb6a4f 100644
--- a/types/connect-datadog/index.d.ts
+++ b/types/connect-datadog/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for connect-datadog 0.0
 // Project: https://github.com/datadog/node-connect-datadog
 // Definitions by: Moshe Good <https://github.com/moshegood>
+//                 Michael Mifsud <https://github.com/xzyfer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -19,6 +20,6 @@ declare namespace Factory {
         method?: boolean;
         protocol?: boolean;
         response_code?: boolean;
-        dogstatsd?: dogstatsd.StatsD;
+        dogstatsd?: dogstatsd.StatsDClient;
     }
 }
diff --git a/types/datadog-statsd-metrics-collector/datadog-statsd-metrics-collector-tests.ts b/types/datadog-statsd-metrics-collector/datadog-statsd-metrics-collector-tests.ts
new file mode 100644
index 0000000000..ef5691a57d
--- /dev/null
+++ b/types/datadog-statsd-metrics-collector/datadog-statsd-metrics-collector-tests.ts
@@ -0,0 +1,43 @@
+import datadog = require('node-dogstatsd');
+import Collector = require('datadog-statsd-metrics-collector');
+
+const client = new datadog.StatsD('localhost');
+
+// constructors
+let collector = new Collector(client);
+collector = new Collector(client, 1000);
+
+// interface
+const key = 'key';
+const timeValue = 99;
+const sampleRate = 0.85;
+const incrementBy = 7;
+const decrementBy = 5;
+const gaugeValue = 199;
+const tags: string[] = ['tag1', 'tag2'];
+
+collector.timing(key, timeValue);
+collector.timing(key, timeValue, sampleRate);
+collector.timing(key, timeValue, sampleRate, tags);
+
+collector.increment(key);
+collector.increment(key, sampleRate);
+collector.increment(key, sampleRate, tags);
+
+collector.incrementBy(key, incrementBy);
+collector.incrementBy(key, incrementBy, tags);
+
+collector.decrement(key);
+collector.decrement(key, sampleRate);
+collector.decrement(key, sampleRate, tags);
+
+collector.decrementBy(key, decrementBy);
+collector.decrementBy(key, decrementBy, tags);
+
+collector.gauge(key, gaugeValue);
+collector.gauge(key, gaugeValue, sampleRate);
+collector.gauge(key, gaugeValue, sampleRate, tags);
+
+collector.histogram(key, timeValue);
+collector.histogram(key, timeValue, sampleRate);
+collector.histogram(key, timeValue, sampleRate, tags);
diff --git a/types/datadog-statsd-metrics-collector/index.d.ts b/types/datadog-statsd-metrics-collector/index.d.ts
new file mode 100644
index 0000000000..741c5a9f43
--- /dev/null
+++ b/types/datadog-statsd-metrics-collector/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for datadog-statsd-metrics-collector 1.1
+// Project: https://github.com/xzyfer/datadog-statsd-metrics-collector#readme
+// Definitions by: Michael Mifsud <https://github.com/xzyfer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import dogstatsd = require('node-dogstatsd');
+
+declare class Collector implements dogstatsd.StatsDClient {
+    constructor(client: dogstatsd.StatsDClient, delayMilliseconds?: number);
+
+    timing(stat: string, time: number, sample_rate?: number, tags?: string[]): void;
+
+    increment(stat: string, sample_rate?: number, tags?: string[]): void;
+    incrementBy(stat: string, value: number, tags?: string[]): void;
+
+    decrement(stat: string, sample_rate?: number, tags?: string[]): void;
+    decrementBy(stat: string, value: number, tags?: string[]): void;
+
+    gauge(stat: string, value: number, sample_rate?: number, tags?: string[]): void;
+
+    histogram(stat: string, time: number, sample_rate?: number, tags?: string[]): void;
+}
+
+export = Collector;
diff --git a/types/datadog-statsd-metrics-collector/tsconfig.json b/types/datadog-statsd-metrics-collector/tsconfig.json
new file mode 100644
index 0000000000..d136060376
--- /dev/null
+++ b/types/datadog-statsd-metrics-collector/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",
+        "datadog-statsd-metrics-collector-tests.ts"
+    ]
+}
diff --git a/types/datadog-statsd-metrics-collector/tslint.json b/types/datadog-statsd-metrics-collector/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datadog-statsd-metrics-collector/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-dogstatsd/index.d.ts b/types/node-dogstatsd/index.d.ts
index 36f8145202..8e818f7cb6 100644
--- a/types/node-dogstatsd/index.d.ts
+++ b/types/node-dogstatsd/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Datadog's nodejs metrics client node-dogstatsd
 // Project: https://github.com/joybro/node-dogstatsd
 // Definitions by: Chris Bobo <https://github.com/chrisbobo>
+//                 Michael Mifsud <https://github.com/xzyfer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "node-dogstatsd" {
@@ -9,7 +10,21 @@ declare module "node-dogstatsd" {
     global_tags?: string[];
   }
 
-  export class StatsD {
+  export interface StatsDClient {
+    timing(stat: string, time: number, sample_rate?: number, tags?: string[]): void;
+
+    increment(stat: string, sample_rate?: number, tags?: string[]): void;
+    incrementBy(stat: string, value: number, tags?: string[]): void;
+
+    decrement(stat: string, sample_rate?: number, tags?: string[]): void;
+    decrementBy(stat: string, value: number, tags?: string[]): void;
+
+    gauge(stat: string, value: number, sample_rate?: number, tags?: string[]): void;
+
+    histogram(stat: string, time: number, sample_rate?: number, tags?: string[]): void;
+  }
+
+  export class StatsD implements StatsDClient {
     constructor(host: string, port?: number, socket?: string, options?: StatsDOptions);
 
     timing(stat: string, time: number, sample_rate?: number, tags?: string[]): void;

From 322e9ec92ef43cb895984b1e1296baf5ad2616a1 Mon Sep 17 00:00:00 2001
From: Derek Ries <influenztial@gmail.com>
Date: Wed, 6 Mar 2019 10:23:24 -0800
Subject: [PATCH 431/924] Updates react-map-gl to include onNativeClick prop

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

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 4d147d3611..45752cb2d6 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-map-gl 4.0
+// Type definitions for react-map-gl 4.0.13
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 //                 Fabio Berta <https://github.com/fnberta>
@@ -226,6 +226,7 @@ export interface InteractiveMapProps extends StaticMapProps {
     keyboard?: boolean;
     onHover?: (event: PointerEvent) => void;
     onClick?: (event: PointerEvent) => void;
+    onNativeClick?: (event: PointerEvent) => void;
     onDblClick?: (event: PointerEvent) => void;
     onContextMenu?: (event: PointerEvent) => void;
     onMouseDown?: (event: PointerEvent) => void;

From c372d80438392c137a0851a8599ecc050a6b1ae7 Mon Sep 17 00:00:00 2001
From: Jordi Oliveras Rovira <jordi.oliveras.rovira@gmail.com>
Date: Wed, 6 Mar 2019 19:52:01 +0100
Subject: [PATCH 432/924] Remove sudo: false setting from travis.yml

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bd31bda14..ab47e3af2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,5 @@ language: node_js
 node_js:
   - 8
 
-sudo: false
-
 notifications:
   email: false

From 506669b0a683996dd0f807fbe12fe72cc3d11784 Mon Sep 17 00:00:00 2001
From: Derek Ries <influenztial@gmail.com>
Date: Wed, 6 Mar 2019 11:07:54 -0800
Subject: [PATCH 433/924] removed patch version

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

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 45752cb2d6..04c4d9aed9 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-map-gl 4.0.13
+// Type definitions for react-map-gl 4.0
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 //                 Fabio Berta <https://github.com/fnberta>

From d7e81294df74998de39d441db1840c4101dcb479 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 6 Mar 2019 11:14:16 -0800
Subject: [PATCH 434/924] Use correct npm name for png-async deprecation

---
 notNeededPackages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 8e0d726046..0edaa82c1e 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1135,8 +1135,8 @@
             "asOfVersion": "2.15.0"
         },
         {
-            "libraryName": "node-png-async",
-            "typingsPackageName": "node-png-async",
+            "libraryName": "png-async",
+            "typingsPackageName": "png-async",
             "sourceRepoURL": "https://github.com/kanreisa/node-png-async",
             "asOfVersion": "0.9.4"
         },

From 4de5967e61fd772dfe07fc0eeb10a98d21a5cd73 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Wed, 6 Mar 2019 20:25:27 +0100
Subject: [PATCH 435/924] [types/react] Fix regression with PropsWithChildren
 [The Travis build is lying] (#33462)

* Fix regression

* Update index.d.ts

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 29123092e6..dd7756d2b2 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -427,7 +427,7 @@ declare namespace React {
         // always pass children as variadic arguments to `createElement`.
         // In the future, if we can define its call signature conditionally
         // on the existence of `children` in `P`, then we should remove this.
-        readonly props: Readonly<PropsWithChildren<P>>;
+        readonly props: Readonly<P> & Readonly<{ children?: ReactNode }>;
         state: Readonly<S>;
         /**
          * @deprecated

From c650a04ddef9ee4a4d51004006a54ba00fb6ed7c Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Sat, 2 Mar 2019 21:42:25 +0100
Subject: [PATCH 436/924] [ora] Remove types

---
 notNeededPackages.json     |   6 +
 types/ora/index.d.ts       | 290 -------------------------------------
 types/ora/ora-tests.ts     |  49 -------
 types/ora/tsconfig.json    |  24 ---
 types/ora/tslint.json      |   1 -
 types/ora/v0/index.d.ts    |  34 -----
 types/ora/v0/ora-tests.ts  |   8 -
 types/ora/v0/tsconfig.json |  28 ----
 types/ora/v0/tslint.json   |   1 -
 types/ora/v1/index.d.ts    | 137 ------------------
 types/ora/v1/ora-tests.ts  |  49 -------
 types/ora/v1/tsconfig.json |  29 ----
 types/ora/v1/tslint.json   |   1 -
 13 files changed, 6 insertions(+), 651 deletions(-)
 delete mode 100644 types/ora/index.d.ts
 delete mode 100644 types/ora/ora-tests.ts
 delete mode 100644 types/ora/tsconfig.json
 delete mode 100644 types/ora/tslint.json
 delete mode 100644 types/ora/v0/index.d.ts
 delete mode 100644 types/ora/v0/ora-tests.ts
 delete mode 100644 types/ora/v0/tsconfig.json
 delete mode 100644 types/ora/v0/tslint.json
 delete mode 100644 types/ora/v1/index.d.ts
 delete mode 100644 types/ora/v1/ora-tests.ts
 delete mode 100644 types/ora/v1/tsconfig.json
 delete mode 100644 types/ora/v1/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 0edaa82c1e..d13d8d3073 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1176,6 +1176,12 @@
             "sourceRepoURL": "http://onsen.io",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "ora",
+            "typingsPackageName": "ora",
+            "sourceRepoURL": "https://github.com/sindresorhus/ora",
+            "asOfVersion": "3.2.0"
+        },
         {
             "libraryName": "p-event",
             "typingsPackageName": "p-event",
diff --git a/types/ora/index.d.ts b/types/ora/index.d.ts
deleted file mode 100644
index 13104b0b5c..0000000000
--- a/types/ora/index.d.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-// Type definitions for ora 3.1
-// Project: https://github.com/sindresorhus/ora
-// 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
-// TypeScript Version: 2.1
-
-/// <reference types="node" />
-
-export = ora;
-
-/**
- * Elegant terminal spinner.
- *
- * @param options If a string is provided, it is treated as a shortcut for `options.text`.
- */
-declare function ora(options?: ora.Options | string): ora.Ora;
-
-declare namespace ora {
-    /**
-     * Starts a spinner for a promise. The spinner is stopped with `.succeed()` if the promise fulfills
-     * or with `.fail()` if it rejects.
-     *
-     * @param action
-     * @param options If a string is provided, it is treated as a shortcut for `options.text`.
-     * @returns The spinner instance.
-     */
-    function promise(action: PromiseLike<any>, options?: Options | string): Ora;
-
-    interface Ora {
-        /**
-         * A boolean of whether the instance is currently spinning.
-         */
-        readonly isSpinning: boolean;
-
-        /**
-         * Change the text.
-         */
-        text: string;
-
-        /**
-         * Change the spinner color.
-         */
-        color: Color;
-
-        /**
-         * Change the spinner.
-         */
-        spinner: SpinnerName | Spinner;
-
-        /**
-         * Change the spinner indent.
-         */
-        indent: number;
-
-        /**
-         * Start the spinner.
-         *
-         * @param text Set the current text.
-         * @returns The spinner instance.
-         */
-        start(text?: string): Ora;
-
-        /**
-         * Stop and clear the spinner.
-         *
-         * @returns The spinner instance.
-         */
-        stop(): Ora;
-
-        /**
-         * Stop the spinner, change it to a green `✔` and persist the current text, or `text` if provided.
-         *
-         * @param text will persist text if provided
-         * @returns The spinner instance.
-         */
-        succeed(text?: string): Ora;
-
-        /**
-         * Stop the spinner, change it to a red `✖` and persist the current text, or `text` if provided.
-         *
-         * @param text will persist text if provided
-         * @returns The spinner instance.
-         */
-        fail(text?: string): Ora;
-
-        /**
-         * Stop the spinner, change it to a yellow `⚠` and persist the current text, or `text` if provided.
-         *
-         * @param text will persist text if provided
-         * @returns The spinner instance.
-         */
-        warn(text?: string): Ora;
-
-        /**
-         * Stop the spinner, change it to a blue `ℹ` and persist the current text, or `text` if provided.
-         *
-         * @param text will persist text if provided
-         * @returns The spinner instance.
-         */
-        info(text?: string): Ora;
-
-        /**
-         * Stop the spinner and change the symbol or text.
-         *
-         * @param options
-         * @returns The spinner instance.
-         */
-        stopAndPersist(options?: PersistOptions): Ora;
-
-        /**
-         * Clear the spinner.
-         * @returns The spinner instance.
-         */
-        clear(): Ora;
-
-        /**
-         * Manually render a new frame.
-         * @returns The spinner instance.
-         */
-        render(): Ora;
-
-        /**
-         * Get a new frame.
-         * @returns The spinner instance.
-         */
-        frame(): Ora;
-    }
-
-    interface Options {
-        /**
-         * Text to display after the spinner.
-         */
-        text?: string;
-        /**
-         * Name of one of the provided spinners. See `example.js` in this repo if you want to test out different spinners.
-         * On Windows, it will always use the line spinner as the Windows command-line doesn't have proper Unicode support.
-         *
-         * Or an object like:
-         *
-         * @example
-         * {
-         *     interval: 80, // optional
-         *     frames: ['-', '+', '-']
-         * }
-         *
-         * @default 'dots'
-         */
-        spinner?: SpinnerName | Spinner;
-        /**
-         * Color of the spinner.
-         * @default 'cyan'
-         */
-        color?: Color;
-        /**
-         * Set to `false` to stop Ora from hiding the cursor.
-         * @default true
-         */
-        hideCursor?: boolean;
-        /**
-         * Indent the spinner with the given number of spaces.
-         * @default 0
-         */
-        indent?: number;
-        /**
-         * Interval between each frame.
-         *
-         * Spinners provide their own recommended interval, so you don't really need to specify this.
-         * @default Provided by the spinner or 100
-         */
-        interval?: number;
-        /**
-         * Stream to write the output.
-         *
-         * You could for example set this to `process.stdout` instead.
-         * @default process.stderr
-         */
-        stream?: NodeJS.WritableStream;
-        /**
-         * Force enable/disable the spinner. If not specified, the spinner will be enabled
-         * if the `stream` is being run inside a TTY context (not spawned or piped) and/or not in a CI environment.
-         *
-         * Note that `{isEnabled: false}` doesn't mean it won't output anything. It just means it won't output the spinner,
-         * colors, and other ansi escape codes. It will still log text.
-         */
-        isEnabled?: boolean;
-    }
-
-    interface PersistOptions {
-        /**
-         * Symbol to replace the spinner with.
-         * @default ' '
-         */
-        symbol?: string;
-        /**
-         * Text to be persisted.
-         * @default Current text
-         */
-        text?: string;
-    }
-
-    interface Spinner {
-        interval?: number;
-        frames: string[];
-    }
-
-    type SpinnerName =
-        | 'dots'
-        | 'dots2'
-        | 'dots3'
-        | 'dots4'
-        | 'dots5'
-        | 'dots6'
-        | 'dots7'
-        | 'dots8'
-        | 'dots9'
-        | 'dots10'
-        | 'dots11'
-        | 'dots12'
-        | 'line'
-        | 'line2'
-        | 'pipe'
-        | 'simpleDots'
-        | 'simpleDotsScrolling'
-        | 'star'
-        | 'star2'
-        | 'flip'
-        | 'hamburger'
-        | 'growVertical'
-        | 'growHorizontal'
-        | 'balloon'
-        | 'balloon2'
-        | 'noise'
-        | 'bounce'
-        | 'boxBounce'
-        | 'boxBounce2'
-        | 'triangle'
-        | 'arc'
-        | 'circle'
-        | 'squareCorners'
-        | 'circleQuarters'
-        | 'circleHalves'
-        | 'squish'
-        | 'toggle'
-        | 'toggle2'
-        | 'toggle3'
-        | 'toggle4'
-        | 'toggle5'
-        | 'toggle6'
-        | 'toggle7'
-        | 'toggle8'
-        | 'toggle9'
-        | 'toggle10'
-        | 'toggle11'
-        | 'toggle12'
-        | 'toggle13'
-        | 'arrow'
-        | 'arrow2'
-        | 'arrow3'
-        | 'bouncingBar'
-        | 'bouncingBall'
-        | 'smiley'
-        | 'monkey'
-        | 'hearts'
-        | 'clock'
-        | 'earth'
-        | 'moon'
-        | 'runner'
-        | 'pong'
-        | 'shark'
-        | 'dqpb'
-        | 'weather'
-        | 'christmas'
-        | 'grenade'
-        | 'point'
-        | 'layer';
-
-    type Color =
-        | 'black'
-        | 'red'
-        | 'green'
-        | 'yellow'
-        | 'blue'
-        | 'magenta'
-        | 'cyan'
-        | 'white'
-        | 'gray';
-}
diff --git a/types/ora/ora-tests.ts b/types/ora/ora-tests.ts
deleted file mode 100644
index 4e06c11248..0000000000
--- a/types/ora/ora-tests.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { PassThrough } from 'stream';
-import ora = require('ora');
-
-const spinner = ora('Loading unicorns');
-ora({ text: 'Loading unicorns' });
-ora({ spinner: 'squish' });
-ora({ spinner: { frames: ['-', '+', '-'] } });
-ora({ spinner: { interval: 80, frames: ['-', '+', '-'] } });
-ora({ color: 'cyan' });
-ora({ color: 'foo' }); // $ExpectError
-ora({ hideCursor: true });
-ora({ indent: 1 });
-ora({ interval: 80 });
-ora({ stream: new PassThrough() });
-ora({ isEnabled: true });
-
-spinner.color = 'yellow';
-spinner.text = 'Loading rainbows';
-spinner.isSpinning; // $ExpectType boolean
-spinner.isSpinning = true; // $ExpectError
-spinner.spinner = 'dots';
-spinner.indent = 5;
-
-spinner.start();
-spinner.start('Test text');
-spinner.stop();
-spinner.succeed();
-spinner.succeed('fooed');
-spinner.fail();
-spinner.fail('failed to foo');
-spinner.warn();
-spinner.warn('warn foo');
-spinner.info();
-spinner.info('info foo');
-spinner.stopAndPersist();
-spinner.stopAndPersist({ text: 'all done' });
-spinner.stopAndPersist({ symbol: '@', text: 'all done' });
-spinner.clear();
-spinner.render();
-spinner.frame();
-
-const resolves = Promise.resolve(1);
-ora.promise(resolves, 'foo');
-ora.promise(resolves, {
-    stream: new PassThrough(),
-    text: 'foo',
-    color: 'blue',
-    isEnabled: true,
-});
diff --git a/types/ora/tsconfig.json b/types/ora/tsconfig.json
deleted file mode 100644
index 302dc253cc..0000000000
--- a/types/ora/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "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",
-        "ora-tests.ts"
-    ]
-}
diff --git a/types/ora/tslint.json b/types/ora/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/ora/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/ora/v0/index.d.ts b/types/ora/v0/index.d.ts
deleted file mode 100644
index 771f6beef6..0000000000
--- a/types/ora/v0/index.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for ora 0.3
-// Project: https://github.com/sindresorhus/ora
-// Definitions by: Basarat Ali Syed <https://github.com/basarat>, Christian Rackerseder <https://github.com/screendriver>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
-interface Options {
-    text?: string;
-    spinner?: string | Spinner;
-    color?: Color;
-    interval?: number;
-    stream?: NodeJS.WritableStream;
-    enabled?: boolean;
-}
-interface Spinner {
-    interval?: number;
-    frames: string[];
-}
-interface Instance {
-    start(): Instance;
-    stop(): Instance;
-    succeed(): Instance;
-    fail(): Instance;
-    stopAndPersist(symbol?: string): Instance;
-    clear(): Instance;
-    render(): Instance;
-    frame(): Instance;
-    text: string;
-    color: Color;
-}
-declare function ora(options: Options | string): Instance;
-export = ora;
diff --git a/types/ora/v0/ora-tests.ts b/types/ora/v0/ora-tests.ts
deleted file mode 100644
index b6e2a671dc..0000000000
--- a/types/ora/v0/ora-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import ora = require('ora');
-
-const spinner = ora('Loading unicorns').start();
-
-setTimeout(() => {
-    spinner.color = 'yellow';
-    spinner.text = 'Loading rainbows';
-}, 1000);
diff --git a/types/ora/v0/tsconfig.json b/types/ora/v0/tsconfig.json
deleted file mode 100644
index b614f6cbc4..0000000000
--- a/types/ora/v0/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "ora": [
-                "ora/v0"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ora-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/ora/v0/tslint.json b/types/ora/v0/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/ora/v0/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/ora/v1/index.d.ts b/types/ora/v1/index.d.ts
deleted file mode 100644
index a3099f6cd9..0000000000
--- a/types/ora/v1/index.d.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-// Type definitions for ora 1.3
-// Project: https://github.com/sindresorhus/ora
-// 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" />
-
-type SpinnerName =
-    'dots'
-    | 'dots2'
-    | 'dots3'
-    | 'dots4'
-    | 'dots5'
-    | 'dots6'
-    | 'dots7'
-    | 'dots8'
-    | 'dots9'
-    | 'dots10'
-    | 'dots11'
-    | 'dots12'
-    | 'line'
-    | 'line2'
-    | 'pipe'
-    | 'simpleDots'
-    | 'simpleDotsScrolling'
-    | 'star'
-    | 'star2'
-    | 'flip'
-    | 'hamburger'
-    | 'growVertical'
-    | 'growHorizontal'
-    | 'balloon'
-    | 'balloon2'
-    | 'noise'
-    | 'bounce'
-    | 'boxBounce'
-    | 'boxBounce2'
-    | 'triangle'
-    | 'arc'
-    | 'circle'
-    | 'squareCorners'
-    | 'circleQuarters'
-    | 'circleHalves'
-    | 'squish'
-    | 'toggle'
-    | 'toggle2'
-    | 'toggle3'
-    | 'toggle4'
-    | 'toggle5'
-    | 'toggle6'
-    | 'toggle7'
-    | 'toggle8'
-    | 'toggle9'
-    | 'toggle10'
-    | 'toggle11'
-    | 'toggle12'
-    | 'toggle13'
-    | 'arrow'
-    | 'arrow2'
-    | 'arrow3'
-    | 'bouncingBar'
-    | 'bouncingBall'
-    | 'smiley'
-    | 'monkey'
-    | 'hearts'
-    | 'clock'
-    | 'earth'
-    | 'moon'
-    | 'runner'
-    | 'pong'
-    | 'shark'
-    | 'dqpb';
-
-type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
-
-interface Options {
-    text?: string;
-    spinner?: SpinnerName | Spinner;
-    color?: Color;
-    interval?: number;
-    stream?: NodeJS.WritableStream;
-    enabled?: boolean;
-    hideCursor?: boolean;
-}
-
-interface PersistOptions {
-    symbol?: string;
-    text?: string;
-}
-
-interface Spinner {
-    interval?: number;
-    frames: string[];
-}
-
-declare class Ora {
-    start(text?: string): Ora;
-
-    stop(): Ora;
-
-    succeed(text?: string): Ora;
-
-    fail(text?: string): Ora;
-
-    warn(text?: string): Ora;
-
-    info(text?: string): Ora;
-
-    stopAndPersist(options?: PersistOptions | string): Ora;
-
-    clear(): Ora;
-
-    render(): Ora;
-
-    frame(): Ora;
-
-    text: string;
-
-    color: Color;
-
-    frameIndex: number;
-}
-
-interface oraFactory {
-    (options?: Options | string): Ora;
-
-    new (options?: Options | string): Ora;
-
-    promise(action: PromiseLike<any>, options?: Options | string): Ora;
-}
-
-declare const ora: oraFactory;
-
-export = ora;
diff --git a/types/ora/v1/ora-tests.ts b/types/ora/v1/ora-tests.ts
deleted file mode 100644
index 56a0d498c3..0000000000
--- a/types/ora/v1/ora-tests.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { PassThrough } from 'stream';
-import Ora = require('ora');
-
-const spinner = Ora('Loading unicorns').start();
-
-const spinnerNothing = Ora().start();
-
-const spinnerNew = new Ora({
-    text: 'Loading unicorns',
-    spinner: 'squish'
-});
-
-const spinnerNew2 = new Ora({
-    stream: new PassThrough(),
-    text: 'foo',
-    color: 'cyan',
-    enabled: true
-});
-
-spinner.start();
-spinner.start('Test text');
-
-setTimeout(() => {
-    spinner.color = 'yellow';
-    spinner.text = 'Loading rainbows';
-}, 1000);
-
-setTimeout(() => {
-    spinner.succeed();
-}, 2000);
-
-spinner.succeed();
-spinner.succeed('fooed');
-spinner.fail();
-spinner.fail('failed to foo');
-spinner.warn();
-spinner.info();
-spinner.stopAndPersist();
-spinner.stopAndPersist('@');
-spinner.stopAndPersist({text: 'all done'});
-spinner.stopAndPersist({symbol: '@', text: 'all done'});
-
-const resolves = Promise.resolve(1);
-Ora.promise(resolves, {
-    stream: new PassThrough(),
-    text: 'foo',
-    color: 'blue',
-    enabled: true
-});
diff --git a/types/ora/v1/tsconfig.json b/types/ora/v1/tsconfig.json
deleted file mode 100644
index ad30053dff..0000000000
--- a/types/ora/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "ora": [
-                "ora/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "esModuleInterop": true
-    },
-    "files": [
-        "index.d.ts",
-        "ora-tests.ts"
-    ]
-}
diff --git a/types/ora/v1/tslint.json b/types/ora/v1/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/ora/v1/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 9faaa89c157520ae5e7ba93f6b8dcc41fa3afe28 Mon Sep 17 00:00:00 2001
From: Michael Mifsud <michael.mifsud@redbubble.com>
Date: Thu, 7 Mar 2019 09:46:54 +1100
Subject: [PATCH 437/924] Fix node-dogstatsd constructor type definition

As per the documentation the `socket` argument to the constructor
is an optional Socket type not a string type. Using a string would
result in a fatal error.
---
 types/node-dogstatsd/index.d.ts              | 7 ++++++-
 types/node-dogstatsd/node-dogstatsd-tests.ts | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/node-dogstatsd/index.d.ts b/types/node-dogstatsd/index.d.ts
index 8e818f7cb6..9f3c56dff9 100644
--- a/types/node-dogstatsd/index.d.ts
+++ b/types/node-dogstatsd/index.d.ts
@@ -4,7 +4,10 @@
 //                 Michael Mifsud <https://github.com/xzyfer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 declare module "node-dogstatsd" {
+  import * as dgram from 'dgram';
 
   export interface StatsDOptions {
     global_tags?: string[];
@@ -25,7 +28,9 @@ declare module "node-dogstatsd" {
   }
 
   export class StatsD implements StatsDClient {
-    constructor(host: string, port?: number, socket?: string, options?: StatsDOptions);
+    public socket: dgram.Socket
+
+    constructor(host: string, port?: number, socket?: dgram.Socket, options?: StatsDOptions);
 
     timing(stat: string, time: number, sample_rate?: number, tags?: string[]): void;
 
diff --git a/types/node-dogstatsd/node-dogstatsd-tests.ts b/types/node-dogstatsd/node-dogstatsd-tests.ts
index 072c5b168e..949ed73eac 100644
--- a/types/node-dogstatsd/node-dogstatsd-tests.ts
+++ b/types/node-dogstatsd/node-dogstatsd-tests.ts
@@ -1,12 +1,14 @@
+import * as dgram from 'dgram';
 import * as datadog from 'node-dogstatsd';
 
 function test_statsd_client() {
   // can create client with defaults
   let client = new datadog.StatsD('localhost');
   let options: datadog.StatsDOptions = { global_tags: ['environment:definitely_typed']};
+  const socket: dgram.Socket = dgram.createSocket('udp4');
 
   // can create client with all params
-  client = new datadog.StatsD('localhost', 8125, null, options);
+  client = new datadog.StatsD('localhost', 8125, socket, options);
 
   let key: string = 'key';
   let timeValue: number = 99;

From a142998ff0eeb54e33e21f0e767b7a12187cdb85 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Thu, 7 Mar 2019 00:24:30 +0100
Subject: [PATCH 438/924] fix(ansi-escapes): make arguments to functions
 optional (#33423)

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

diff --git a/types/ansi-escapes/index.d.ts b/types/ansi-escapes/index.d.ts
index 519d429545..d01e74661a 100644
--- a/types/ansi-escapes/index.d.ts
+++ b/types/ansi-escapes/index.d.ts
@@ -19,10 +19,10 @@ declare namespace Ansi {
     interface AnsiEscapes {
         cursorTo(x: number, y?: number): string;
         cursorMove(x: number, y?: number): string;
-        cursorUp(count: number): string;
-        cursorDown(count: number): string;
-        cursorForward(count: number): string;
-        cursorBackward(count: number): string;
+        cursorUp(count?: number): string;
+        cursorDown(count?: number): string;
+        cursorForward(count?: number): string;
+        cursorBackward(count?: number): string;
 
         cursorLeft: string;
         cursorSavePosition: string;

From eed96d4372ed55c81eb7e7708c5f3ea02c579ddd Mon Sep 17 00:00:00 2001
From: Richard <richardcornelissen@users.noreply.github.com>
Date: Thu, 7 Mar 2019 00:29:48 +0100
Subject: [PATCH 439/924] aws-lambda Authorizer response context only allows
 booleans, numbers and strings (#33437)

* Context only allows booleans, numbers and strings

* add richardcornelissen as contributor
---
 types/aws-lambda/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 6ebccd452a..d3bee679b3 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -27,6 +27,7 @@
 //                 Erik Dalén <https://github.com/dalen>
 //                 Loïk Gaonac'h <https://github.com/loikg>
 //                 Roberto Zen <https://github.com/skyzenr>
+//                 Richard Cornelissen <https://github.com/richardcornelissen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -536,10 +537,10 @@ export type StatementResource = MaybeStatementPrincipal & ({ Resource: string |
 export type StatementPrincipal = MaybeStatementResource & ({ Principal: PrincipalValue } | { NotPrincipal: PrincipalValue });
 /**
  * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.Statement.
- * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
+ * https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-lambda-authorizer-output.html
  */
 export interface AuthResponseContext {
-    [name: string]: any;
+    [name: string]: boolean | number | string;
 }
 
 /**

From a1dfe0ee2586937a420583565eefba009edbcd26 Mon Sep 17 00:00:00 2001
From: Carlos Urango <ingurango11@gmail.com>
Date: Wed, 6 Mar 2019 18:31:32 -0500
Subject: [PATCH 440/924] Add Howler 2.1.1 definitions (#33438)

* Add Howler 2.1.1 definitions

* fix unlock event name
---
 types/howler/index.d.ts | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/types/howler/index.d.ts b/types/howler/index.d.ts
index 5ee9c40627..6ab3d6e8f0 100644
--- a/types/howler/index.d.ts
+++ b/types/howler/index.d.ts
@@ -1,20 +1,25 @@
-// Type definitions for howler.js v2.0.5
+// Type definitions for howler.js v2.1.1
 // Project: https://github.com/goldfire/howler.js
-// Definitions by: Pedro Casaubon <https://github.com/xperiments>, Alexander Leon <https://github.com/alien35>, Nicholas Higgins <https://github.com/nicholashza> 
+// Definitions by: Pedro Casaubon <https://github.com/xperiments>
+//                 Alexander Leon <https://github.com/alien35>
+//                 Nicholas Higgins <https://github.com/nicholashza>
+//                 Carlos Urango <https://github.com/cjurango>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface HowlerGlobal {
-    mute(muted: boolean): void;
+    mute(muted: boolean): this;
     volume(): number;
     volume(volume: number): this;
     codecs(ext: string): boolean;
-    unload(): void;
+    unload(): this;
     usingWebAudio: boolean;
+    html5PoolSize: number;
     noAudio: boolean;
-    mobileAutoEnable: boolean;
+    autoUnlock: boolean;
     autoSuspend: boolean;
     ctx: AudioContext;
     masterGain: GainNode;
+
     stereo(pan: number): this;
     pos(x: number, y: number, z: number): this | void;
     orientation(x: number, y: number, z: number, xUp: number, yUp: number, zUp: number): this | void;
@@ -51,6 +56,7 @@ interface IHowlProperties {
     onrate?: (soundId: number) => void;
     onseek?: (soundId: number) => void;
     onfade?: (soundId: number) => void;
+    onunlock?: (soundId: number) => void;
 }
 
 interface Howl {
@@ -75,7 +81,9 @@ interface Howl {
     loop(loop?: boolean, id?: number): this;
     playing(id?: number): boolean;
     duration(id?: number): number;
-
+    state(): 'unloaded' | 'loading' | 'loaded';
+    load(): this;
+    unload(): void;
 
     on(event: 'load', callback: () => void, id?: number): this;
     on(event: 'loaderror', callback: (soundId: number, error: any) => void, id?: number): this;
@@ -90,6 +98,7 @@ interface Howl {
     on(event: 'seek', callback: (soundId: number) => void, id?: number): this;
     on(event: 'fade', callback: (soundId: number) => void, id?: number): this;
     on(event: string, callback: Function, id?: number): this;
+    on(event: 'unlock', callback: (soundId: number) => void, id?: number): this;
 
     once(event: 'load', callback: () => void, id?: number): this;
     once(event: 'loaderror', callback: (soundId: number, error: any) => void, id?: number): this;
@@ -104,12 +113,10 @@ interface Howl {
     once(event: 'seek', callback: (soundId: number) => void, id?: number): this;
     once(event: 'fade', callback: (soundId: number) => void, id?: number): this;
     once(event: string, callback: Function, id?: number): this;
+    once(event: 'unlock', callback: (soundId: number) => void, id?: number): this;
 
     off(event: string, callback?: Function, id?: number): this;
 
-    state(): 'unloaded' | 'loading' | 'loaded';
-    load(): void;
-    unload(): void;
     stereo(pan: number, id?: number): this | void;
     pos(x: number, y: number, z: number, id?: number): this | void;
     orientation(x: number, y: number, z: number, xUp: number, yUp: number, zUp: number): this | void;

From 46d861bb9865a1a17ccc1104a3f95fe72f1c8630 Mon Sep 17 00:00:00 2001
From: Jojoshua <jojoshua@gmail.com>
Date: Wed, 6 Mar 2019 19:50:33 -0500
Subject: [PATCH 441/924] Fix linting

---
 types/tabulator-tables/index.d.ts             | 1037 ++++++++---------
 .../tabulator-tables-tests.ts                 |  244 ++--
 2 files changed, 631 insertions(+), 650 deletions(-)

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
index 3a3e3de64a..328cf80865 100644
--- a/types/tabulator-tables/index.d.ts
+++ b/types/tabulator-tables/index.d.ts
@@ -4,45 +4,47 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+// tslint:disable:max-line-length
+// tslint:disable:jsdoc-format
+// tslint:disable:no-trailing-whitespace
+
 declare namespace Tabulator {
     interface Options extends OptionsGeneral, OptionsHistory, OptionsLocale, OptionsDownload, OptionsColumns, OptionsRows, OptionsData, OptionsSorting, OptionsFiltering, OptionsRowGrouping, OptionsPagination, OptionsPersistentConfiguration, OptionsClipboard, OptionsDataTree, OptionsCell {}
 
     interface OptionsCells extends CellCallbacks {
-        /**The validationFailed event is triggered when the value entered into a cell during an edit fails to pass validation. */
+        /** The validationFailed event is triggered when the value entered into a cell during an edit fails to pass validation. */
         validationFailed?: (cell: CellComponent, value: any, validators: Validator[] | StandardValidatorType[]) => void;
     }
-    type OptionsDataTree = {
-        /**To enable data trees in your table, set the dataTree property to true in your table constructor: */
+    interface OptionsDataTree {
+        /** To enable data trees in your table, set the dataTree property to true in your table constructor: */
         dataTree?: boolean;
-        /** By default the toggle element will be inserted into the first column on the table. If you want the toggle element to be inserted in a different column you can pass the feild name of the column to the dataTreeElementColumn setup option*/
+        /**  By default the toggle element will be inserted into the first column on the table. If you want the toggle element to be inserted in a different column you can pass the feild name of the column to the dataTreeElementColumn setup option*/
         dataTreeElementColumn?: boolean | string;
-        /**Show tree branch icon	 */
+        /** Show tree branch icon	 */
         dataTreeBranchElement?: boolean | string;
-        /**Tree level indent in pixels	 */
+        /** Tree level indent in pixels	 */
         dataTreeChildIndent?: number;
-        /**By default Tabulator will look for child rows in the _children field of a row data object. You can change this to look in a different field using the dataTreeChildField property in your table constructor: */
+        /** By default Tabulator will look for child rows in the _children field of a row data object. You can change this to look in a different field using the dataTreeChildField property in your table constructor: */
         dataTreeChildField?: string;
-        /**The toggle button that allows users to collapse and expand the column can be customised to meet your needs. There are two options, dataTreeExpandElement and dataTreeCollapseElement, that can be set to replace the default toggle elements with your own.
+        /** The toggle button that allows users to collapse and expand the column can be customised to meet your needs. There are two options, dataTreeExpandElement and dataTreeCollapseElement, that can be set to replace the default toggle elements with your own.
 
       Both options can take either an html string representing the contents of the toggle element */
         dataTreeCollapseElement?: string | HTMLElement | boolean;
-        /** */
+        /** The toggle button that allows users to expand the column */
         dataTreeExpandElement?: string | HTMLElement | boolean;
-        /** By default all nodes on the tree will start collapsed, you can customize the initial expansion state of the tree using the dataTreeStartExpanded option.
-     * 
-      This option can take one of three possible value types, either a boolean to indicate whether all nodes should start expanded or collapsed: */
+        /**  By default all nodes on the tree will start collapsed, you can customize the initial expansion state of the tree using the dataTreeStartExpanded option.*
+        This option can take one of three possible value types, either a boolean to indicate whether all nodes should start expanded or collapsed: */
         dataTreeStartExpanded?: boolean | boolean[] | ((row: RowComponent, level: number) => boolean);
-    };
-    type OptionsClipboard = {
-        /**You can enable clipboard functionality using the clipboard config option. It can take one of four possible values:
+    }
+    interface OptionsClipboard {
+        /** You can enable clipboard functionality using the clipboard config option. It can take one of four possible values:
 
       true - enable clipboard copy and paste
       "copy" - enable only copy functionality
       "paste" - enable only paste functionality
       false - disable all clipboard functionality (default) */
         clipboard?: boolean | "copy" | "paste";
-        /**
-     * The copy selector is a function that is used to choose which data is copied into the clipboard. Tabulator comes with a few different selectors built in:
+        /** * The copy selector is a function that is used to choose which data is copied into the clipboard. Tabulator comes with a few different selectors built in:
       active - Copy all table data currently displayed in the table to the clipboard (default)
       table - Copy all table data to the clipboard, including data that is currently filtered out
       selected - Copy the currently selected rows to the clipboard, including data that is currently filtered out
@@ -51,12 +53,12 @@ declare namespace Tabulator {
       These selectors can also be used when programatically triggering a copy event. in this case if the selector is not specified it will default to the value set in the clipboardCopySelector property (which is active by default).
      */
         clipboardCopySelector?: "active" | "table" | "selected";
-        /** The copy formatter is used to take the row data provided by the selector and turn it into a text string for the clipboard.
+        /**  The copy formatter is used to take the row data provided by the selector and turn it into a text string for the clipboard.
       There is one built in copy formatter called table, if you have extended the clipboard module and want to change the default you can use the clipboardCopyFormatter property. you can also pass in a formatting function directly into this property.*/
         clipboardCopyFormatter?: "table" | ((rowData: any[]) => string);
-        /**By default Tabulator will include the column header titles in any clipboard data, this can be turned off by passing a value of false to the clipboardCopyHeader property: */
+        /** By default Tabulator will include the column header titles in any clipboard data, this can be turned off by passing a value of false to the clipboardCopyHeader property: */
         clipboardCopyHeader?: boolean;
-        /** Tabulator has one built in paste parser, that is designed to take a table formatted text string from the clipboard and turn it into row data. it breaks the tada into rows on a newline character \n and breaks the rows down to columns on a tab character \t.
+        /**  Tabulator has one built in paste parser, that is designed to take a table formatted text string from the clipboard and turn it into row data. it breaks the tada into rows on a newline character \n and breaks the rows down to columns on a tab character \t.
 
       It will then attempt to work out which columns in the data correspond to columns in the table. It tries three different ways to achieve this. First it checks the values of all columns in the first row of data to see if they match the titles of columns in the table. If any of the columns don't match it then tries the same approach but with the column fields. If either of those options match, Tabulator will map those columns to the incoming data and import it into rows. If there is no match then Tabulator will assume the columns in the data are in the same order as the visible columns in the table and import them that way.
 
@@ -64,19 +66,19 @@ declare namespace Tabulator {
 
       If you extend the clipboard module to add your own parser, you can set it to be used as default with the clipboardPasteParser property.*/
         clipboardPasteParser?: string | ((clipboard: any) => any[]);
-        /**Once the data has been parsed into row data, it will be passed to a paste action to be added to the table. There are three inbuilt paste actions:
+        /** Once the data has been parsed into row data, it will be passed to a paste action to be added to the table. There are three inbuilt paste actions:
 
       insert - Inserts data into the table using the addRows function (default)
       update - Updates data in the table using the updateOrAddData function
       replace - replaces all data in the table using the setData function */
         clipboardPasteAction?: "insert" | "update" | "replace";
 
-        /**By default Tabulator will copy some of the tables styling along with the data to give a better visual appearance when pasted into other documents.
+        /** By default Tabulator will copy some of the tables styling along with the data to give a better visual appearance when pasted into other documents.
 
     If you want to only copy the unstyled data then you should set the clipboardCopyStyled option to false in the table options object:  */
         clipboardCopyStyled?: boolean;
 
-        /**By default Tabulator includes column headers, row groups and column calculations in the clipboard output.
+        /** By default Tabulator includes column headers, row groups and column calculations in the clipboard output.
 
     You can choose to remove column headers groups, row groups or column calculations from the output data by setting the values in the clipboardCopyConfig option in the table definition: */
         clipboardCopyConfig?:
@@ -87,56 +89,50 @@ declare namespace Tabulator {
               }
             | boolean;
 
-        /**The clipboardCopied event is triggered whenever data is copied to the clipboard. */
+        /** The clipboardCopied event is triggered whenever data is copied to the clipboard. */
         clipboardCopied: () => void;
-        /**The clipboardPasted event is triggered whenever data is successfuly pasted into the table. */
+        /** The clipboardPasted event is triggered whenever data is successfuly pasted into the table. */
         clipboardPasted: () => void;
-        /**The clipboardPasteError event is triggered whenever an atempt to paste data into the table has failed because it was rejected by the paste parser. */
+        /** The clipboardPasteError event is triggered whenever an atempt to paste data into the table has failed because it was rejected by the paste parser. */
         clipboardPasteError: () => void;
-    };
+    }
 
-    type OptionsPersistentConfiguration = {
-        /**ID tag used to identify persistent storage information	 */
+    interface OptionsPersistentConfiguration {
+        /** ID tag used to identify persistent storage information	 */
         persistenceID?: string;
-        /** Persistence information can either be stored in a cookie or in the localSotrage object, you can use the persistenceMode to choose which. It can take three possible values:
+        /**  Persistence information can either be stored in a cookie or in the localSotrage object, you can use the persistenceMode to choose which. It can take three possible values:
 
       local - (string) Store the persistence information in the localStorage object
       cookie - (string) Store the persistence information in a cookie
       true - (boolean) check if localStorage is available and store persistence information, otherwise store in cookie (Default option)	*/
         persistenceMode?: "local" | "cookie" | true;
-        /**Enable persistsnt storage of column layout information	 */
+        /** Enable persistsnt storage of column layout information	 */
         persistentLayout?: boolean;
-        /**You can ensure the data sorting is stored for the next page load by setting the persistentSort option to true */
+        /** You can ensure the data sorting is stored for the next page load by setting the persistentSort option to true */
         persistentSort?: boolean;
-        /** You can ensure the data filtering is stored for the next page load by setting the persistentFilter option to true*/
+        /**  You can ensure the data filtering is stored for the next page load by setting the persistentFilter option to true*/
         persistentFilter?: boolean;
-    };
+    }
 
-    type OptionsPagination = {
-        /**Choose pagination method, "local" or "remote"	 */
+    interface OptionsPagination {
+        /** Choose pagination method, "local" or "remote"	 */
         pagination?: "remote" | "local";
-        /**Set the number of rows in each page	 */
+        /** Set the number of rows in each page	 */
         paginationSize?: number;
-        /** Setting this option to true will cause Tabulator to create a list of page size options, that are multiples of the current page size. In the example below, the list will have the values of 5, 10, 15 and 20.
+        /**  Setting this option to true will cause Tabulator to create a list of page size options, that are multiples of the current page size. In the example below, the list will have the values of 5, 10, 15 and 20.
 
     When using the page size selector like this, if you use the setPageSize function to set the page size to a value not in the list, the list will be regenerated using the new page size as the starting valuer	*/
         paginationSizeSelector?: true | number[];
-        /** By default the pagination controls are added to the footer of the table. If you wish the controls to be created in another element pass a DOM node or a CSS selector for that element to the paginationElement option.*/
+        /**  By default the pagination controls are added to the footer of the table. If you wish the controls to be created in another element pass a DOM node or a CSS selector for that element to the paginationElement option.*/
         paginationElement?: HTMLElement | "string";
-        /**Lookup list to link expected data feilds from the server to their function	
-     * default
-     * {
+        /** Lookup list to link expected data feilds from the server to their function	* default* {
         "current_page":"current_page",
         "last_page":"last_page",
         "data":"data",
-        }
-     * 
-     * 
+        }* *
      */
         paginationDataReceived?: Record<string, string>;
-        /**Lookup list to link fields expected by the server to their function
-     * default:
-     * {
+        /** Lookup list to link fields expected by the server to their function* default:* {
         "page":"page",
         "size":"size",
         "sorters":"sorters",
@@ -144,31 +140,29 @@ declare namespace Tabulator {
         }
     	 */
         paginationDataSent?: Record<string, string>;
-        /**When using the addRow function on a paginated table, rows will be added relative to the current page (ie to the top or bottom of the current page), with overflowing rows being shifted onto the next page.
+        /** When using the addRow function on a paginated table, rows will be added relative to the current page (ie to the top or bottom of the current page), with overflowing rows being shifted onto the next page.
 
       If you would prefer rows to be added relative to the table (firs/last page) then you can use the paginationAddRow option. it can take one of two values:
 
       page - add rows relative to current page (default)
       table - add rows relative to the table */
         paginationAddRow?: "table" | "page";
-        /** The number of pagination page buttons shown in the footer using the paginationButtonCount option. By default this has a value of 5.*/
+        /**  The number of pagination page buttons shown in the footer using the paginationButtonCount option. By default this has a value of 5.*/
         paginationButtonCount?: number;
-    };
+    }
 
-    type OptionsRowGrouping = {
-        /**String/function to select field to group rows by	 */
+    interface OptionsRowGrouping {
+        /** String/function to select field to group rows by	 */
         groupBy?: string | ((data: any) => any);
-        /**By default Tabulator will create groups for rows based on the values contained in the row data. if you want to explicitly define which field values groups should be created for at each level, you can use the groupValues option.
+        /** By default Tabulator will create groups for rows based on the values contained in the row data. if you want to explicitly define which field values groups should be created for at each level, you can use the groupValues option.
 
     This option takes an array of value arrays, each item in the first array should be a list of acceptable field values for groups at that level	 */
         groupValues?: any[][];
 
-        /**You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option.	 */
-        groupHeader?: ((value: any, count: number, data: any, group: GroupComponent) => string) | ((value: any, count: number, data: any) => string)[];
+        /** You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option.	 */
+        groupHeader?: ((value: any, count: number, data: any, group: GroupComponent) => string) | Array<(value: any, count: number, data: any) => string>;
 
-        /**You can set the default open state of groups using the groupStartOpen property
-     * 
-     * This can take one of three possible values:
+        /** You can set the default open state of groups using the groupStartOpen property* * This can take one of three possible values:
 
         true - all groups start open (default value)
         false - all groups start closed
@@ -178,40 +172,38 @@ declare namespace Tabulator {
      */
         groupStartOpen?: boolean | ((value: any, count: number, data: any, group: GroupComponent) => boolean);
 
-        /**By default Tabulator allows users to toggle a group open or closed by clicking on the arrow icon in the left of the group header. If you would prefer a different behaviour you can use the groupToggleElement option to choose a different option:
-     * 
-     * The option can take one of three values:
+        /** By default Tabulator allows users to toggle a group open or closed by clicking on the arrow icon in the left of the group header. If you would prefer a different behaviour you can use the groupToggleElement option to choose a different option:* * The option can take one of three values:
       arrow - togggle group on arrow element click
       header - toggle group on click anywhere on the group header element
       false - prevent clicking anywhere in the group toggling the group
      */
         groupToggleElement?: "arrow" | "header" | false;
 
-        /**show/hide column calculations when group is closed	 */
+        /** show/hide column calculations when group is closed	 */
         groupClosedShowCalcs?: boolean;
 
-        /**The dataGrouping callback is triggered whenever a data grouping event occurs, before grouping happens. */
+        /** The dataGrouping callback is triggered whenever a data grouping event occurs, before grouping happens. */
         dataGrouping?: () => void;
-        /**The dataGrouping callback is triggered whenever a data grouping event occurs, after grouping happens. */
+        /** The dataGrouping callback is triggered whenever a data grouping event occurs, after grouping happens. */
         dataGrouped?: () => void;
-        /**The groupVisibilityChanged callback is triggered whenever a group changes between hidden and visible states. */
+        /** The groupVisibilityChanged callback is triggered whenever a group changes between hidden and visible states. */
         groupVisibilityChanged?: (group: GroupComponent, visible: boolean) => void;
 
-        /**The groupClick callback is triggered when a user clicks on a group header. */
+        /** The groupClick callback is triggered when a user clicks on a group header. */
         groupClick?: GroupEventCallback;
-        /**The groupDblClick callback is triggered when a user double clicks on a group header. */
+        /** The groupDblClick callback is triggered when a user double clicks on a group header. */
         groupDblClick?: GroupEventCallback;
-        /**The groupContext callback is triggered when a user right clicks on a group header.
+        /** The groupContext callback is triggered when a user right clicks on a group header.
 
     If you want to prevent the browsers context menu being triggered in this event you will need to include the preventDefault() function in your callback. */
         groupContext?: GroupEventCallback;
-        /**The groupTap callback is triggered when a user taps on a group header on a touch display. */
+        /** The groupTap callback is triggered when a user taps on a group header on a touch display. */
         groupTap?: GroupEventCallback;
-        /**The groupDblTap callback is triggered when a user taps on a group header on a touch display twice in under 300ms. */
+        /** The groupDblTap callback is triggered when a user taps on a group header on a touch display twice in under 300ms. */
         groupDblTap?: GroupEventCallback;
-        /**The groupTapHold callback is triggered when a user taps on a group header on a touch display and holds their finger down for over 1 second */
+        /** The groupTapHold callback is triggered when a user taps on a group header on a touch display and holds their finger down for over 1 second */
         groupTapHold?: GroupEventCallback;
-    };
+    }
 
     interface Filter {
         field: string;
@@ -219,50 +211,48 @@ declare namespace Tabulator {
         value: any;
     }
 
-    type FilterFunction = (field: string, type: Tabulator.FilterType, value: any) => void;
+    type FilterFunction = (field: string, type: FilterType, value: any) => void;
 
-    type OptionsFiltering = {
-        /**Array of filters to be applied on load.	 */
+    interface OptionsFiltering {
+        /** Array of filters to be applied on load.	 */
         initialFilter?: Filter[];
 
-        /**array of initial values for header filters.	 */
-        initialHeaderFilter?: Pick<Filter, "field" | "value">[];
+        /** array of initial values for header filters.	 */
+        initialHeaderFilter?: Array<Pick<Filter, "field" | "value">>;
 
-        /**The dataFiltering callback is triggered whenever a filter event occurs, before the filter happens. */
+        /** The dataFiltering callback is triggered whenever a filter event occurs, before the filter happens. */
         dataFiltering?: (filters: Filter[]) => void;
-        /**The dataFiltered callback is triggered after the table dataset is filtered. */
+        /** The dataFiltered callback is triggered after the table dataset is filtered. */
         dataFiltered?: (filters: Filter[], rows: RowComponent[]) => void;
-    };
-    type OptionsSorting = {
-        /**Array of sorters to be applied on load.	 */
+    }
+    interface OptionsSorting {
+        /** Array of sorters to be applied on load.	 */
         initialSort?: Sorter[];
 
-        /**reverse the order that multiple sorters are applied to the table.	 */
+        /** reverse the order that multiple sorters are applied to the table.	 */
         sortOrderReverse?: boolean;
-    };
+    }
 
     interface Sorter {
         column: string;
         dir: SortDirection;
     }
-    type OptionsData = {
-        /**A unique index value should be present for each row of data if you want to be able to programatically alter that data at a later point, this should be either numeric or a string. By default Tabulator will look for this value in the id field for the data. If you wish to use a different field as the index, set this using the index option parameter. */
+    interface OptionsData {
+        /** A unique index value should be present for each row of data if you want to be able to programatically alter that data at a later point, this should be either numeric or a string. By default Tabulator will look for this value in the id field for the data. If you wish to use a different field as the index, set this using the index option parameter. */
         index?: number | string;
-        //**Array to hold data that should be loaded on table creation	 */
+        /** Array to hold data that should be loaded on table creation	 */
         data?: any[];
 
-        /**If you wish to retrieve your data from a remote source you can set the URL for the request in the ajaxURL option. */
+        /** If you wish to retrieve your data from a remote source you can set the URL for the request in the ajaxURL option. */
         ajaxURL?: string;
 
-        /**Parameters to be passed to remote Ajax data loading request	 */
+        /** Parameters to be passed to remote Ajax data loading request	 */
         ajaxParams?: {};
 
-        /**The HTTP request type for Ajax requests or config object for the request	 */
+        /** The HTTP request type for Ajax requests or config object for the request	 */
         ajaxConfig?: HttpMethod | AjaxConfig;
 
-        /**When using a request method other than "GET" Tabulator will send any parameters with a content type of form data. You can change the content type with the ajaxContentType option. This will ensure parameters are sent in the format you expect, with the correct headers. 
-     * 
-     * The ajaxContentType option can take one of two values:
+        /** When using a request method other than "GET" Tabulator will send any parameters with a content type of form data. You can change the content type with the ajaxContentType option. This will ensure parameters are sent in the format you expect, with the correct headers. * * The ajaxContentType option can take one of two values:
       "form" - send parameters as form data (default option)
       "json" - send parameters as JSON encoded string
       If you want to use a custom content type then you can pass a content type formatter object into the ajaxContentType option. this object must have two properties, the headers property should contain all headers that should be sent with the request and the body property should contain a function that returns the body content of the request
@@ -270,21 +260,21 @@ declare namespace Tabulator {
 
         ajaxContentType?: "form" | "json" | AjaxContentType;
 
-        /**If you need more control over the url of the request that you can get from the ajaxURL and ajaxParams properties, the you can use the ajaxURLGenerator property to pass in a callback that will generate the URL for you.
+        /** If you need more control over the url of the request that you can get from the ajaxURL and ajaxParams properties, the you can use the ajaxURLGenerator property to pass in a callback that will generate the URL for you.
 
     The callback should return a string representing the URL to be requested. */
         ajaxURLGenerator?: (url: string, config: any, params: any) => string;
 
-        /**callback function to replace inbuilt ajax request functionality	 */
+        /** callback function to replace inbuilt ajax request functionality	 */
         ajaxRequestFunc?: (url: string, config: any, params: any) => Promise<any>;
 
-        /**Send filter config to server instead of processing locally	 */
+        /** Send filter config to server instead of processing locally	 */
         ajaxFiltering?: boolean;
 
-        /**Send sorter config to server instead of processing locally	 */
+        /** Send sorter config to server instead of processing locally	 */
         ajaxSorting?: boolean;
 
-        /**If you are loading a lot of data from a remote source into your table in one go, it can sometimes take a long time for the server to return the request, which can slow down the user experience.
+        /** If you are loading a lot of data from a remote source into your table in one go, it can sometimes take a long time for the server to return the request, which can slow down the user experience.
 
       To speed things up in this situation Tabulator has a progressive load mode, this uses the pagination module to make a series of requests for part of the data set, one at a time, appending it to the table as the data arrives. This mode can be enable using the ajaxProgressiveLoad option. No pagination controls will be visible on screen, it just reusues the functionality of the pagination module to sequentially load the data.
 
@@ -292,26 +282,26 @@ declare namespace Tabulator {
 
       There are two different progressive loading modes, to give you a choice of how data is loaded into the table.	 */
         ajaxProgressiveLoad?: "load" | "scroll";
-        /**By default tabulator will make the requests to fill the table as quickly as possible. On some servers these repeates requests from the same client may trigger rate limiting or security systems. In this case you can use the ajaxProgressiveLoadDelay option to add a delay in milliseconds between each page request. */
+        /** By default tabulator will make the requests to fill the table as quickly as possible. On some servers these repeates requests from the same client may trigger rate limiting or security systems. In this case you can use the ajaxProgressiveLoadDelay option to add a delay in milliseconds between each page request. */
         ajaxProgressiveLoadDelay?: number;
-        /**The ajaxProgressiveLoadScrollMargin property determines how close to the bottom of the table in pixels, the scroll bar must be before the next page worth of data is loaded, by default it is set to twice the height of the table. */
+        /** The ajaxProgressiveLoadScrollMargin property determines how close to the bottom of the table in pixels, the scroll bar must be before the next page worth of data is loaded, by default it is set to twice the height of the table. */
         ajaxProgressiveLoadScrollMargin?: number;
 
-        /**Show loader while data is loading, can also take a function that must return a boolean	 */
+        /** Show loader while data is loading, can also take a function that must return a boolean	 */
         ajaxLoader?: boolean | (() => boolean);
 
-        /**html for loader element	 */
+        /** html for loader element	 */
         ajaxLoaderLoading?: string;
-        /**html for the loader element in the event of an error	 */
+        /** html for the loader element in the event of an error	 */
         ajaxLoaderError?: string;
 
-        /**The ajaxRequesting callback is triggered when ever an ajax request is made. */
+        /** The ajaxRequesting callback is triggered when ever an ajax request is made. */
         ajaxRequesting?: (url: string, params: any) => boolean;
-        /**The ajaxResponse callback is triggered when a successful ajax request has been made. This callback can also be used to modify the received data before it is parsed by the table. If you use this callback it must return the data to be parsed by Tabulator, otherwise no data will be rendered */
+        /** The ajaxResponse callback is triggered when a successful ajax request has been made. This callback can also be used to modify the received data before it is parsed by the table. If you use this callback it must return the data to be parsed by Tabulator, otherwise no data will be rendered */
         ajaxResponse?: (url: string, params: any, response: any) => any;
-        /**The ajaxError callback is triggered there is an error response to an ajax request. */
+        /** The ajaxError callback is triggered there is an error response to an ajax request. */
         ajaxError?: (xhr: any, textStatus: any, errorThrown: any) => void;
-    };
+    }
 
     interface AjaxContentType {
         headers: JSONRecord;
@@ -326,16 +316,16 @@ declare namespace Tabulator {
         credentials?: string;
     }
 
-    type OptionsRows = {
-        /**Tabulator also allows you to define a row level formatter using the rowFormatter option. this lets you alter each row of the table based on the data it contains.
+    interface OptionsRows {
+        /** Tabulator also allows you to define a row level formatter using the rowFormatter option. this lets you alter each row of the table based on the data it contains.
 
     The function accepts one argument, the RowComponent for the row being formatted. */
         rowFormatter?: (row: RowComponent) => any;
 
-        /**The position in the table for new rows to be added, "bottom" or "top" */
+        /** The position in the table for new rows to be added, "bottom" or "top" */
         addRowPos?: "bottom" | "top";
 
-        /**The selectable option can take one of a several values:
+        /** The selectable option can take one of a several values:
 
       false - selectable rows are disabled
       true - selectable rows are enabled, and you can select as many as you want
@@ -343,37 +333,37 @@ declare namespace Tabulator {
       "highlight" (default) - rows have the same hover stylings as selectable rows but do not change state when clicked. This is great for when you want to show that a row is clickable but don't want it to be selectable. */
         selectable?: boolean | number | "highlight";
 
-        /**By default you can select a range of rows by holding down the shift key and click dragging over a number of rows to toggle the selected state state of all rows the cursor passes over.
+        /** By default you can select a range of rows by holding down the shift key and click dragging over a number of rows to toggle the selected state state of all rows the cursor passes over.
 
     If you would prefere to select a range of row by clicking on the first row then holding down shift and clicking on the end row then you can acheive this by setting the selectableRangeMode to click */
         selectableRangeMode?: "click";
 
-        /**By default, row selection works on a rolling basis, if you set the selectable option to a numeric value then when you select past this number of rows, the first row to be selected will be deselected. If you want to disable this behaviour and instead prevent selection of new rows once the limit is reached you can set the selectableRollingSelection option to false. */
+        /** By default, row selection works on a rolling basis, if you set the selectable option to a numeric value then when you select past this number of rows, the first row to be selected will be deselected. If you want to disable this behaviour and instead prevent selection of new rows once the limit is reached you can set the selectableRollingSelection option to false. */
         selectableRollingSelection?: boolean;
 
-        /**By default Tabulator will maintain selected rows when the table is filtered, sorted or paginated (but NOT when the setData function is used). If you want the selected rows to be cleared whenever the table view is updated then set the selectablePersistence option to false. */
+        /** By default Tabulator will maintain selected rows when the table is filtered, sorted or paginated (but NOT when the setData function is used). If you want the selected rows to be cleared whenever the table view is updated then set the selectablePersistence option to false. */
         selectablePersistence?: boolean;
 
-        /**You many want to exclude certain rows from being selected. The selectableCheck options allows you to pass a function to check if the current row should be selectable, returning true will allow row selection, false will result in nothing happening. The function should accept a RowComponent as its first argument. */
+        /** You many want to exclude certain rows from being selected. The selectableCheck options allows you to pass a function to check if the current row should be selectable, returning true will allow row selection, false will result in nothing happening. The function should accept a RowComponent as its first argument. */
         selectableCheck?: (row: RowComponent) => boolean;
 
-        /**To allow the user to move rows up and down the table, set the movableRows parameter in the options: */
+        /** To allow the user to move rows up and down the table, set the movableRows parameter in the options: */
         movableRows?: boolean;
 
-        /**Tabulator also allows you to move rows between tables. To enable this you should supply either a valid CSS selector string a DOM node for the table or the Tabuator object for the table to the movableRowsConnectedTables option. if you want to connect to multple tables then you can pass in an array of values to this option. */
+        /** Tabulator also allows you to move rows between tables. To enable this you should supply either a valid CSS selector string a DOM node for the table or the Tabuator object for the table to the movableRowsConnectedTables option. if you want to connect to multple tables then you can pass in an array of values to this option. */
         movableRowsConnectedTables?: string | string[] | HTMLElement | HTMLElement[];
 
-        /**The movableRowsSender option should be set on the sending table, and sets the action that should be taken after the row has been successfuly dropped into the receiving table.
+        /** The movableRowsSender option should be set on the sending table, and sets the action that should be taken after the row has been successfuly dropped into the receiving table.
 
       There are several inbuilt sender functions:
 
       false - do nothing(default)
-      delete - deletes the row from the table 
+      delete - deletes the row from the table
       You can also pass a callback to the movableRowsSender option for custom sender functionality
       */
         movableRowsSender?: false | "delete" | ((fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => any);
 
-        /** The movableRowsReceiver option should be set on the receiving tables, and sets the action that should be taken when the row is dropped into the table.
+        /**  The movableRowsReceiver option should be set on the receiving tables, and sets the action that should be taken when the row is dropped into the table.
       There are several inbuilt receiver functions:
 
       insert - inserts row next to the row it was dropped on, if not dropped on a row it is added to the table (default)
@@ -382,11 +372,10 @@ declare namespace Tabulator {
       replace - replaces the row it is dropped on with the sent row*/
         movableRowsReceiver?: "insert" | "add" | "update" | "replace" | ((fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => any);
 
-        /**You can allow the user to manually resize rows by dragging the top or bottom border of a row. To enable this functionality, set the resizableRows property to true */
+        /** You can allow the user to manually resize rows by dragging the top or bottom border of a row. To enable this functionality, set the resizableRows property to true */
         resizableRows?: boolean;
 
-        /**
-     * The default ScrollTo position can be set using the scrollToRowPosition option. It can take one of four possible values:
+        /** * The default ScrollTo position can be set using the scrollToRowPosition option. It can take one of four possible values:
 
         top - position row with its top edge at the top of the table (default)
         center - position row with its top edge in the center of the table
@@ -395,86 +384,86 @@ declare namespace Tabulator {
      */
         scrollToRowPosition?: ScrollToRowPostition;
 
-        /**The default option for triggering a ScrollTo on a visible element can be set using the scrollToRowIfVisible option. It can take a boolean value:
+        /** The default option for triggering a ScrollTo on a visible element can be set using the scrollToRowIfVisible option. It can take a boolean value:
 
       true - scroll to row, even if it is visible (default)
       false - scroll to row, unless it is currently visible, then don't move */
         scrollToRowIfVisible?: boolean;
 
-        /**The dataTreeRowExpanded callback is triggered when a row with child rows is expanded to reveal the children. */
+        /** The dataTreeRowExpanded callback is triggered when a row with child rows is expanded to reveal the children. */
         dataTreeRowExpanded?: (row: RowComponent, level: number) => void;
 
-        /**The dataTreeRowCollapsed callback is triggered when a row with child rows is collapsed to hide its children.*/
+        /** The dataTreeRowCollapsed callback is triggered when a row with child rows is collapsed to hide its children.*/
         dataTreeRowCollapsed?: (row: RowComponent, level: number) => void;
 
-        /**The movableRowsSendingStart callback is triggered on the sending table when a row is picked up from a sending table. */
+        /** The movableRowsSendingStart callback is triggered on the sending table when a row is picked up from a sending table. */
         movableRowsSendingStart?: (toTables: any[]) => void;
 
-        /**The movableRowsSent callback is triggered on the sending table when a row has been successfuly received by a receiving table. */
+        /** The movableRowsSent callback is triggered on the sending table when a row has been successfuly received by a receiving table. */
         movableRowsSent?: (fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => void;
 
-        /**The movableRowsSentFailed callback is triggered on the sending table when a row has failed to be received by the receiving table.*/
+        /** The movableRowsSentFailed callback is triggered on the sending table when a row has failed to be received by the receiving table.*/
         movableRowsSentFailed?: (fromRow: RowComponent, toRow: RowComponent, toTable: Tabulator) => void;
 
-        /**The movableRowsSendingStop callback is triggered on the sending table after a row has been dropped and any senders and receivers have been handled. */
+        /** The movableRowsSendingStop callback is triggered on the sending table after a row has been dropped and any senders and receivers have been handled. */
         movableRowsSendingStop?: (toTables: any[]) => void;
 
-        /**The movableRowsReceivingStart callback is triggered on a receiving table when a connection is established with a sending table. */
+        /** The movableRowsReceivingStart callback is triggered on a receiving table when a connection is established with a sending table. */
         movableRowsReceivingStart?: (fromRow: RowComponent, toTable: Tabulator) => void;
 
-        /**The movableRowsReceived callback is triggered on a receiving table when a row has been successfuly received.*/
+        /** The movableRowsReceived callback is triggered on a receiving table when a row has been successfuly received.*/
         movableRowsReceived?: (fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => void;
 
-        /**The movableRowsReceivedFailed callback is triggered on a receiving table when a row receiver has returned false.*/
+        /** The movableRowsReceivedFailed callback is triggered on a receiving table when a row receiver has returned false.*/
         movableRowsReceivedFailed?: (fromRow: RowComponent, toRow: RowComponent, fromTable: Tabulator) => void;
 
-        /**The movableRowsReceivingStop callback is triggered on a receiving table after a row has been dropped and any senders and receivers have been handled.*/
+        /** The movableRowsReceivingStop callback is triggered on a receiving table after a row has been dropped and any senders and receivers have been handled.*/
         movableRowsReceivingStop?: (fromTable: Tabulator) => void;
 
-        /**The rowClick callback is triggered when a user clicks on a row. */
+        /** The rowClick callback is triggered when a user clicks on a row. */
         rowClick?: RowEventCallback;
-        /**The rowDblClick callback is triggered when a user double clicks on a row. */
+        /** The rowDblClick callback is triggered when a user double clicks on a row. */
         rowDblClick?: RowEventCallback;
-        /**The rowContext callback is triggered when a user right clicks on a row.
+        /** The rowContext callback is triggered when a user right clicks on a row.
 
     If you want to prevent the browsers context menu being triggered in this event you will need to include the preventDefault() function in your callback. */
         rowContext?: RowEventCallback;
-        /**The rowTap callback is triggered when a user taps on a row on a touch display. */
+        /** The rowTap callback is triggered when a user taps on a row on a touch display. */
         rowTap?: RowEventCallback;
-        /**The rowDblTap callback is triggered when a user taps on a row on a touch display twice in under 300ms. */
+        /** The rowDblTap callback is triggered when a user taps on a row on a touch display twice in under 300ms. */
         rowDblTap?: RowEventCallback;
-        /**The rowTapHold callback is triggered when a user taps on a row on a touch display and holds their finger down for over 1 second. */
+        /** The rowTapHold callback is triggered when a user taps on a row on a touch display and holds their finger down for over 1 second. */
         rowTapHold?: RowEventCallback;
-        /**The rowMouseEnter callback is triggered when the mouse pointer enters a row. */
+        /** The rowMouseEnter callback is triggered when the mouse pointer enters a row. */
         rowMouseEnter?: RowEventCallback;
-        /**The rowMouseLeave callback is triggered when the mouse pointer leaves a row. */
+        /** The rowMouseLeave callback is triggered when the mouse pointer leaves a row. */
         rowMouseLeave?: RowEventCallback;
-        /** The rowMouseOver callback is triggered when the mouse pointer enters a row or any of its child elements.*/
+        /**  The rowMouseOver callback is triggered when the mouse pointer enters a row or any of its child elements.*/
         rowMouseOver?: RowEventCallback;
-        /**The rowMouseOut callback is triggered when the mouse pointer leaves a row or any of its child elements. */
+        /** The rowMouseOut callback is triggered when the mouse pointer leaves a row or any of its child elements. */
         rowMouseOut?: RowEventCallback;
-        /**The rowMouseMove callback is triggered when the mouse pointer moves over a row. */
+        /** The rowMouseMove callback is triggered when the mouse pointer moves over a row. */
         rowMouseMove?: RowEventCallback;
-        /**The rowAdded callback is triggered when a row is added to the table by the addRow and updateOrAddRow functions. */
+        /** The rowAdded callback is triggered when a row is added to the table by the addRow and updateOrAddRow functions. */
         rowAdded?: RowChangedCallback;
-        /**The rowUpdated callback is triggered when a row is updated by the updateRow, updateOrAddRow, updateData or updateOrAddData, functions. */
+        /** The rowUpdated callback is triggered when a row is updated by the updateRow, updateOrAddRow, updateData or updateOrAddData, functions. */
         rowUpdated?: RowChangedCallback;
-        /**The rowDeleted callback is triggered when a row is deleted from the table by the deleteRow function. */
+        /** The rowDeleted callback is triggered when a row is deleted from the table by the deleteRow function. */
         rowDeleted?: RowChangedCallback;
-        /**The rowMoved callback will be triggered when a row has been successfuly moved. */
+        /** The rowMoved callback will be triggered when a row has been successfuly moved. */
         rowMoved?: RowChangedCallback;
-        /**The rowResized callback will be triggered when a row has been resized by the user. */
+        /** The rowResized callback will be triggered when a row has been resized by the user. */
         rowResized?: RowChangedCallback;
-        /**Whenever the number of selected rows changes, through selection or deselection, the rowSelectionChanged event is triggered. This passes an array of the data objects for each row in the order they were selected as the first argument, and an array of row components for each of the rows in order of selection as the second argument. */
+        /** Whenever the number of selected rows changes, through selection or deselection, the rowSelectionChanged event is triggered. This passes an array of the data objects for each row in the order they were selected as the first argument, and an array of row components for each of the rows in order of selection as the second argument. */
         rowSelectionChanged?: (data: any[], rows: RowComponent[]) => void;
-        /**The rowSelected event is triggered when a row is selected, either by the user or programatically. */
+        /** The rowSelected event is triggered when a row is selected, either by the user or programatically. */
         rowSelected?: RowChangedCallback;
-        /**The rowDeselected event is triggered when a row is deselected, either by the user or programatically. */
+        /** The rowDeselected event is triggered when a row is deselected, either by the user or programatically. */
         rowDeselected?: RowChangedCallback;
-    };
+    }
 
-    type OptionsColumns = {
-        /**The column definitions are provided to Tabluator in the columns property of the table constructor object and should take the format of an array of objects, with each object representing the configuration of one column. */
+    interface OptionsColumns {
+        /** The column definitions are provided to Tabluator in the columns property of the table constructor object and should take the format of an array of objects, with each object representing the configuration of one column. */
         columns?: ColumnDefinition[];
 
         /**
@@ -482,15 +471,15 @@ declare namespace Tabulator {
          */
         autoColumns?: boolean;
 
-        /**By default Tabulator will use the fitData layout mode, which will resize the tables columns to fit the data held in each column, unless you specify a width or minWidth in the column constructor. If the width of all columns exceeds the width of the containing element, a scroll bar will appear. */
+        /** By default Tabulator will use the fitData layout mode, which will resize the tables columns to fit the data held in each column, unless you specify a width or minWidth in the column constructor. If the width of all columns exceeds the width of the containing element, a scroll bar will appear. */
         layout?: "fitData" | "fitColumns" | "fitDataFill";
 
-        /**To keep the layout of the columns consistent, once the column widths have been set on the first data load (either from the data property in the constructor or the setData function) they will not be changed when new data is loaded.
+        /** To keep the layout of the columns consistent, once the column widths have been set on the first data load (either from the data property in the constructor or the setData function) they will not be changed when new data is loaded.
 
         If you would prefer that the column widths adjust to the data each time you load it into the table you can set the layoutColumnsOnNewData property to true. */
         layoutColumnsOnNewData?: boolean;
 
-        /**Responsive layout will automatically hide/show columns to fit the width of the Tabulator element. This allows for clean rendering of tables on smaller mobile devices, showing important data while avoiding horizontal scroll bars. You can enable responsive layouts using the responsiveLayout option.
+        /** Responsive layout will automatically hide/show columns to fit the width of the Tabulator element. This allows for clean rendering of tables on smaller mobile devices, showing important data while avoiding horizontal scroll bars. You can enable responsive layouts using the responsiveLayout option.
 
       There are two responsive layout modes available:
 
@@ -503,15 +492,15 @@ declare namespace Tabulator {
       When responsive layout is enabled, all columns are given a default responsive value of 1. The higher you set this value the sooner that column will be hidden as the table width decreases. If two columns have the same responsive value then they are hidden from right to left (as defined in the column definition array, ignoring user moving of the columns). If you set the value to 0 then the column will never be hidden regardless of how narrow the table gets. */
         responsiveLayout?: boolean | "hide" | "collapse";
 
-        /**Collapsed lists are displayed to the user by default, if you would prefer they start closed so the user can open them you can use the responsiveLayoutCollapseStartOpen option */
+        /** Collapsed lists are displayed to the user by default, if you would prefer they start closed so the user can open them you can use the responsiveLayoutCollapseStartOpen option */
         responsiveLayoutCollapseStartOpen?: boolean;
 
-        /**By default any formatter set on the column is applied to the value that will appear in the list. while this works for most formatters it can cause issues with the progress formatter which relies on being inside a cell.
+        /** By default any formatter set on the column is applied to the value that will appear in the list. while this works for most formatters it can cause issues with the progress formatter which relies on being inside a cell.
 
     If you would like to disable column formatting in the collapsed list, you can use the responsiveLayoutCollapseUseFormatters option: */
         responsiveLayoutCollapseUseFormatters?: boolean;
 
-        /**If you set the responsiveLayout option to collapse the values from hidden columns will be displayed in a title/value list under the row.
+        /** If you set the responsiveLayout option to collapse the values from hidden columns will be displayed in a title/value list under the row.
 
       In this mode an object containing the title of each hidden column and its value is generated and then used to generate a list displayed in a div .tabulator-responsive-collapse under the row data.
 
@@ -520,44 +509,44 @@ declare namespace Tabulator {
       This function should return an empty string if there is no data to display. */
         responsiveLayoutCollapseFormatter?: (data: any[]) => any;
 
-        /**It is possible to set a minimum column width to prevent resizing columns from becoming too small.
+        /** It is possible to set a minimum column width to prevent resizing columns from becoming too small.
 
         This can be set globally, by setting the columnMinWidth option to the column width when you create your Tabulator.
 
         This option can be overridden on a per column basis by setting the minWidth property on the column definition. */
         columnMinWidth?: number;
 
-        /**By default it is possible to manually resize columns by dragging the borders of the column in both the column headers and the cells of the column.
+        /** By default it is possible to manually resize columns by dragging the borders of the column in both the column headers and the cells of the column.
 
         If you want to alter this behaviour you can use the resizableColumns to choose where the resize handles are available.  */
         resizableColumns?: true | false | "header" | "cell";
 
-        /**To allow the user to move columns along the table, set the movableColumns parameter in the options: */
+        /** To allow the user to move columns along the table, set the movableColumns parameter in the options: */
         movableColumns?: boolean;
 
-        /**Header tooltips can be set globally using the tooltipsHeader options parameter */
+        /** Header tooltips can be set globally using the tooltipsHeader options parameter */
         tooltipsHeader?: boolean;
 
-        /**You can use the columnVertAlign option to set how the text in your column headers should be vertically  */
+        /** You can use the columnVertAlign option to set how the text in your column headers should be vertically  */
         columnVertAlign?: "top" | "middle" | "bottom";
 
-        /**The default placeholder text used for input elements can be set using the headerFilterPlaceholder option in the table definition */
+        /** The default placeholder text used for input elements can be set using the headerFilterPlaceholder option in the table definition */
         headerFilterPlaceholder?: string;
 
-        /**The default ScrollTo position can be set using the scrollToColumnPosition option. It can take one of three possible values:
+        /** The default ScrollTo position can be set using the scrollToColumnPosition option. It can take one of three possible values:
 
     left - position column with its left edge at the left of the table (default)
     center - position column with its left edge in the center of the table
     right - position column with its right edge at the right of the table */
         scrollToColumnPosition?: ScrollToColumnPosition;
 
-        /**The default option for triggering a ScrollTo on a visible element can be set using the scrollToColumnIfVisible option. It can take a boolean value:
+        /** The default option for triggering a ScrollTo on a visible element can be set using the scrollToColumnIfVisible option. It can take a boolean value:
 
     true - scroll to column, even if it is visible (default)
     false - scroll to column, unless it is currently visible, then don't move */
         scrollToColumnIfVisible?: boolean;
 
-        /**By default column calculations are shown at the top and bottom of the table, unless row grouping is enabled, in which case they are shown at the top and bottom of each group.
+        /** By default column calculations are shown at the top and bottom of the table, unless row grouping is enabled, in which case they are shown at the top and bottom of each group.
 
       The columnCalcs option lets you decided where the calculations should be displayed, it can take one of four values:
 
@@ -567,26 +556,26 @@ declare namespace Tabulator {
       group - show calcs in groups only */
         columnCalcs?: boolean | "both" | "table" | "group";
 
-        /**If you need to use the . character as part of your field name, you can change the separator to any other character using the nestedFieldSeparator option
+        /** If you need to use the . character as part of your field name, you can change the separator to any other character using the nestedFieldSeparator option
          * Set to false to disable nested data parsing
          */
         nestedFieldSeparator?: string | boolean;
 
-        /**multiple or single column sorting */
+        /** multiple or single column sorting */
         columnHeaderSortMulti?: boolean;
 
-        /**The columnMoved callback will be triggered when a column has been successfuly moved. */
+        /** The columnMoved callback will be triggered when a column has been successfuly moved. */
         columnMoved?: (column: ColumnComponent, columns: any[]) => void;
         columnResized?: (column: ColumnComponent) => void;
-        /**The columnVisibilityChanged callback is triggered whenever a column changes between hidden and visible states. */
+        /** The columnVisibilityChanged callback is triggered whenever a column changes between hidden and visible states. */
         columnVisibilityChanged?: (column: ColumnComponent, visible: boolean) => void;
 
-        /**The columnTitleChanged callback is triggered whenever a user edits a column title when the editableTitle parameter has been enabled in the column definition array. */
+        /** The columnTitleChanged callback is triggered whenever a user edits a column title when the editableTitle parameter has been enabled in the column definition array. */
         columnTitleChanged?: (column: ColumnComponent) => void;
-    };
+    }
 
-    type OptionsCell = {
-        /**The cellClick callback is triggered when a user left clicks on a cell, it can be set on a per column basis using the option in the columns definition object. */
+    interface OptionsCell {
+        /** The cellClick callback is triggered when a user left clicks on a cell, it can be set on a per column basis using the option in the columns definition object. */
         cellClick?: CellEventCallback;
         cellDblClick?: CellEventCallback;
         cellContext?: CellEventCallback;
@@ -601,32 +590,31 @@ declare namespace Tabulator {
         cellEditing?: CellEditEventCallback;
         cellEdited?: CellEditEventCallback;
         cellEditCancelled?: CellEditEventCallback;
-    };
+    }
 
-    type OptionsGeneral = {
-        /**Sets the height of the containing element, can be set to any valid height css value. If set to false (the default), the height of the table will resize to fit the table data.	 */
+    interface OptionsGeneral {
+        /** Sets the height of the containing element, can be set to any valid height css value. If set to false (the default), the height of the table will resize to fit the table data.	 */
         height?: string | number | false;
-        /**Enable rendering using the Virtual DOM engine	 */
+        /** Enable rendering using the Virtual DOM engine	 */
         virtualDom?: boolean;
 
-        /**Manually set the size of the virtual DOM buffer	 */
+        /** Manually set the size of the virtual DOM buffer	 */
         virtualDomBuffer?: boolean;
-        /**placeholder element to display on empty table	 */
+        /** placeholder element to display on empty table	 */
         placeholder?: string | HTMLElement;
 
-        /**Footer  element to display for the table	 */
+        /** Footer  element to display for the table	 */
         footerElement?: string | HTMLElement;
 
-        /**Function to generate tooltips for cells	 */
+        /** Function to generate tooltips for cells	 */
         tooltips?: GlobalTooltipOption;
-        /**When to regenerate cell tooltip value	 */
+        /** When to regenerate cell tooltip value	 */
         tooltipGenerationMode?: "load";
 
-        /**Keybinding configuration object	 */
+        /** Keybinding configuration object	 */
         keybindings?: false | KeyBinding;
 
-        /**
-     * The reactivity systems allow Tabulator to watch arrays and objects passed into the table for changes and then automatically update the table.
+        /** * The reactivity systems allow Tabulator to watch arrays and objects passed into the table for changes and then automatically update the table.
 
         This approach means you no longer need to worry about calling a number of different functions on the table to make changes, you simply update the array or object you originally passed into the table and Tabulator will take care of the rest.
 
@@ -636,17 +624,17 @@ declare namespace Tabulator {
 
         reactiveData?: boolean;
 
-        //Not listed in options--------------------
-        /**Tabulator will automatically attempt to redraw the data contained in the table if the containing element for the table is resized. To disable this functionality, set the autoResize property to false */
+        // Not listed in options--------------------
+        /** Tabulator will automatically attempt to redraw the data contained in the table if the containing element for the table is resized. To disable this functionality, set the autoResize property to false */
         autoResize?: boolean;
 
-        /**When a the tabulator constructor is called, the tableBuilding callback will triggered */
+        /** When a the tabulator constructor is called, the tableBuilding callback will triggered */
         tableBuilding?: () => void;
 
-        /**When a the tabulator constructor is called and the table has finished being rendered, the tableBuilt callback will triggered: */
+        /** When a the tabulator constructor is called and the table has finished being rendered, the tableBuilt callback will triggered: */
         tableBuilt?: () => void;
 
-        /**The renderStarted callback is triggered whenever all the rows in the table are about to be rendered. This can include:
+        /** The renderStarted callback is triggered whenever all the rows in the table are about to be rendered. This can include:
       Data is loaded into the table when setData is called
       A page is loaded through any form of pagination
       Rows are added to the table during progressive rendering
@@ -656,31 +644,31 @@ declare namespace Tabulator {
       The redraw function is called */
         renderStarted?: () => void;
 
-        /**The renderComplete callback is triggered after the table has been rendered */
+        /** The renderComplete callback is triggered after the table has been rendered */
         renderComplete?: () => void;
 
-        /**The htmlImporting callback is triggered when Tabulator starts importing data from an HTML table. */
+        /** The htmlImporting callback is triggered when Tabulator starts importing data from an HTML table. */
         htmlImporting?: EmptyCallback;
 
-        /**The htmlImported callback is triggered when Tabulator finishes importing data from an HTML table. */
+        /** The htmlImported callback is triggered when Tabulator finishes importing data from an HTML table. */
         htmlImported?: EmptyCallback;
 
-        /**The dataLoading callback is triggered whenever new data is loaded into the table. */
+        /** The dataLoading callback is triggered whenever new data is loaded into the table. */
         dataLoading?: (data: any) => void;
-        /**The dataLoaded callback is triggered when a new set of data is loaded into the table. */
+        /** The dataLoaded callback is triggered when a new set of data is loaded into the table. */
         dataLoaded?: (data: any) => void;
-        /**The dataEdited callback is triggered whenever the table data is changed by the user. Triggers for this include editing any cell in the table, adding a row and deleting a row. */
+        /** The dataEdited callback is triggered whenever the table data is changed by the user. Triggers for this include editing any cell in the table, adding a row and deleting a row. */
         dataEdited?: (data: any) => void;
 
-        /**Whenever a page has been loaded, the pageLoaded callback is called, passing the current page number as an argument. */
+        /** Whenever a page has been loaded, the pageLoaded callback is called, passing the current page number as an argument. */
         pageLoaded?: (pageno: number) => void;
 
-        /**The dataSorting callback is triggered whenever a sort event occurs, before sorting happens. */
+        /** The dataSorting callback is triggered whenever a sort event occurs, before sorting happens. */
         dataSorting?: (sorters: Sorter[]) => void;
 
-        /**The dataSorted callback is triggered after the table dataset is sorted. */
+        /** The dataSorted callback is triggered after the table dataset is sorted. */
         dataSorted?: (sorters: Sorter[], rows: RowComponent[]) => void;
-    };
+    }
 
     type DownloadType = "csv" | "json" | "xlsx" | "pdf";
 
@@ -690,14 +678,14 @@ declare namespace Tabulator {
     }
 
     interface DownloadCSV {
-        /**By default CSV files are created using a comma (,) delimiter. If you need to change this for any reason the you can pass the options object with a delimiter property to the download function which will then use this delimiter instead of the comma. */
+        /** By default CSV files are created using a comma (,) delimiter. If you need to change this for any reason the you can pass the options object with a delimiter property to the download function which will then use this delimiter instead of the comma. */
         delimiter?: "string";
-        /**If you need the output CSV to include a byte order mark (BOM) to ensure that output with UTF-8 characters can be correctly interpereted across didfferent applications, you should set the bom option to true */
+        /** If you need the output CSV to include a byte order mark (BOM) to ensure that output with UTF-8 characters can be correctly interpereted across didfferent applications, you should set the bom option to true */
         bom?: boolean;
     }
 
     interface DownloadXLXS {
-        /**The sheet name must be a valid Excel sheet name, and cannot include any of the following characters \, /, *, [, ], :,  */
+        /** The sheet name must be a valid Excel sheet name, and cannot include any of the following characters \, /, *, [, ], :,  */
         sheetName?: string;
     }
 
@@ -710,21 +698,21 @@ declare namespace Tabulator {
         autoTable?: {} | ((doc: any) => any);
     }
 
-    type OptionsDownload = {
-        /**If you want to make any bulk changes to the table data before it is parsed into the download file you can pass a mutator function to the downloadDataFormatter option in the table definition */
+    interface OptionsDownload {
+        /** If you want to make any bulk changes to the table data before it is parsed into the download file you can pass a mutator function to the downloadDataFormatter option in the table definition */
         downloadDataFormatter?: (data: any[]) => any;
 
-        /**The downloadReady callback allows you to intercept the download file data before the users is prompted to save the file.
+        /** The downloadReady callback allows you to intercept the download file data before the users is prompted to save the file.
 
     In order for the download to proceed the downloadReady callback is expected to return a blob of file to be downloaded.
 
     If you would prefer to abort the download you can return false from this callback. This could be useful for example if you want to send the created file to a server via ajax rather than allowing the user to download the file. */
         downloadReady?: (fileContents: any, blob: any) => any;
 
-        /**The downloadComplete callback is triggered when the user has been prompted to download the file. */
+        /** The downloadComplete callback is triggered when the user has been prompted to download the file. */
         downloadComplete?: () => void;
 
-        /**By default Tabulator includes column headers, row groups and column calculations in the download output.
+        /** By default Tabulator includes column headers, row groups and column calculations in the download output.
 
     You can choose to remove column headers groups, row groups or column calculations from the output data by setting the values in the downloadConfig option in the table definition: */
 
@@ -733,229 +721,220 @@ declare namespace Tabulator {
             rowGroups?: boolean;
             columnCalcs?: boolean;
         };
-    };
+    }
 
-    type OptionsLocale = {
-        /**You can set the current local in one of two ways. If you want to set it when the table is created, simply include the locale option in your Tabulator constructor. You can either pass in a string matching one of the language options you have defined, or pass in the boolean true which will cause Tabulator to auto-detect the browsers language settings from the navigator.language object. */
+    interface OptionsLocale {
+        /** You can set the current local in one of two ways. If you want to set it when the table is created, simply include the locale option in your Tabulator constructor. You can either pass in a string matching one of the language options you have defined, or pass in the boolean true which will cause Tabulator to auto-detect the browsers language settings from the navigator.language object. */
         locale?: boolean | string;
 
-        /**You can store as many languages as you like, creating an object inside the langs object with a property of the locale code for that language. A list of locale codes can be found here.
+        /** You can store as many languages as you like, creating an object inside the langs object with a property of the locale code for that language. A list of locale codes can be found here.
 
     At present there are three parts of the table that can be localised, the column headers, the header filter placeholder text and the pagination buttons. To localize the pagination buttons, create a pagination property inside your language object and give it the properties outlined below.
 
     If you wish you can also localize column titles by adding a columns property to your language object. You should store a property of the field name of the column you wish to change, with a value of its title. Any fields that match this will use this title instead of the one provided by the column definition array. */
         langs?: any;
 
-        /**When a localization event has occurred , the localized callback will triggered, passing the current locale code and language object: */
+        /** When a localization event has occurred , the localized callback will triggered, passing the current locale code and language object: */
         localized?: (locale: string, lang: any) => void;
-    };
+    }
 
     type HistoryAction = "cellEdit" | "rowAdd" | "rowDelete" | "rowMoved";
-    type OptionsHistory = {
-        /**Enable user interaction history functionality	 */
+    interface OptionsHistory {
+        /** Enable user interaction history functionality	 */
         history?: boolean;
 
-        /**The historyUndo event is triggered when the undo action is triggered. */
+        /** The historyUndo event is triggered when the undo action is triggered. */
         historyUndo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
-        /**The historyRedo event is triggered when the redo action is triggered. */
+        /** The historyRedo event is triggered when the redo action is triggered. */
         historyRedo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
-    };
+    }
 
     interface ColumnLayout {
-        /**title - Required This is the title that will be displayed in the header for this column */
+        /** title - Required This is the title that will be displayed in the header for this column */
         title: string;
-        /**field - Required (not required in icon/button columns) this is the key for this column in the data array*/
+        /** field - Required (not required in icon/button columns) this is the key for this column in the data array*/
         field?: string;
-        /**visible - (boolean, default - true) determines if the column is visible. (see Column Visibility for more details */
+        /** visible - (boolean, default - true) determines if the column is visible. (see Column Visibility for more details */
         visible?: boolean;
 
-        /**sets the width of this column, this can be set in pixels or as a percentage of total table width (if not set the system will determine the best) */
+        /** sets the width of this column, this can be set in pixels or as a percentage of total table width (if not set the system will determine the best) */
         width?: number | string;
     }
 
     interface ColumnDefinition extends ColumnLayout, CellCallbacks {
-        //Layout
-        /**sets the text alignment for this column */
-        align?: "left" | "center" | "right"; //Align?
-        /**sets the minimum width of this column, this should be set in pixels (this takes priority over the global option of columnMinWidth) */
+        // Layout
+        /** sets the text alignment for this column */
+        align?: "left" | "center" | "right"; // Align?
+        /** sets the minimum width of this column, this should be set in pixels (this takes priority over the global option of columnMinWidth) */
         minWidth?: number;
 
-        /**The widthGrow property should be used on columns without a width property set. The value is used to work out what fraction of the available will be allocated to the column. The value should be set to a number greater than 0, by default any columns with no width set have a widthGrow value of 1 */
+        /** The widthGrow property should be used on columns without a width property set. The value is used to work out what fraction of the available will be allocated to the column. The value should be set to a number greater than 0, by default any columns with no width set have a widthGrow value of 1 */
         widthGrow?: number;
 
-        /**The widthShrink property should be used on columns with a width property set. The value is used to work out how to shrink columns with a fixed width when the table is too narrow to fit in all the columns. The value should be set to a number greater than 0, by default columns with a width set have a widthShrink value of 0, meaning they will not be shrunk if the table gets too narrow, and may cause the horizontal scrollbar to appear. */
+        /** The widthShrink property should be used on columns with a width property set. The value is used to work out how to shrink columns with a fixed width when the table is too narrow to fit in all the columns. The value should be set to a number greater than 0, by default columns with a width set have a widthShrink value of 0, meaning they will not be shrunk if the table gets too narrow, and may cause the horizontal scrollbar to appear. */
         widthShrink?: number;
 
-        /**set whether column can be resized by user dragging its edges */
+        /** set whether column can be resized by user dragging its edges */
         resizable?: boolean;
-        /**You can freeze the position of columns on the left and right of the table using the frozen property in the column definition array. This will keep the column still when the table is scrolled horizontally. */
+        /** You can freeze the position of columns on the left and right of the table using the frozen property in the column definition array. This will keep the column still when the table is scrolled horizontally. */
         frozen?: boolean;
-        /**an integer to determine when the column should be hidden in responsive mode */
+        /** an integer to determine when the column should be hidden in responsive mode */
         responsive?: number;
-        /**sets the on hover tooltip for each cell in this column 
-     * 
-     * The tooltip parameter can take three different types of value
+        /** sets the on hover tooltip for each cell in this column * * The tooltip parameter can take three different types of value
         boolean - a value of false disables the tooltip, a value of true sets the tooltip of the cell to its value
         string - a string that will be displayed for all cells in the matching column/table.
         function - a callback function that returns the string for the cell
-        
-     * Note: setting a tooltip value on a column will override the global setting.
+        * Note: setting a tooltip value on a column will override the global setting.
     */
         tooltip?: string | GlobalTooltipOption;
-        /**sets css classes on header and cells in this column. (value should be a string containing space separated class names) */
+        /** sets css classes on header and cells in this column. (value should be a string containing space separated class names) */
         cssClass?: string;
-        /**sets the column as a row handle, allowing it to be used to drag movable rows. */
+        /** sets the column as a row handle, allowing it to be used to drag movable rows. */
         rowHandle?: boolean;
-        /**When the getHtml function is called, hide the column from the output. */
+        /** When the getHtml function is called, hide the column from the output. */
         hideInHtml?: boolean;
 
-        //Data Manipulation
-        /** By default Tabulator will attempt to guess which sorter should be applied to a column based on the data contained in the first row. It can determine sorters for strings, numbers, alphanumeric sequences and booleans, anything else will be treated as a string.
+        // Data Manipulation
+        /**  By default Tabulator will attempt to guess which sorter should be applied to a column based on the data contained in the first row. It can determine sorters for strings, numbers, alphanumeric sequences and booleans, anything else will be treated as a string.
 
 To specify a sorter to be used on a column use the sorter property in the columns definition object
 
 You can pass an optional additional property with sorter, sorterParams that should contain an object with additional information for configuring the sorter*/
         sorter?: "string" | "number" | "alphanum" | "boolean" | "exists" | "date" | "time" | "datetime" | "array" | ((a: any, b: any, aRow: RowComponent, bRow: RowComponent, column: ColumnComponent, dir: SortDirection, sorterParams: {}) => number);
-        /**If you want to dynamically generate the sorterParams at the time the sort is called you can pass a function into the property that should return the params object. */
+        /** If you want to dynamically generate the sorterParams at the time the sort is called you can pass a function into the property that should return the params object. */
         sorterParams?: ColumnDefinitionSorterParams | ColumnSorterParamLookupFunction;
-        /** set how you would like the data to be formatted*/
+        /**  set how you would like the data to be formatted*/
         formatter?: Formatter;
-        /** You can pass an optional additional parameter with the formatter, formatterParams that should contain an object with additional information for configuring the formatter.*/
+        /**  You can pass an optional additional parameter with the formatter, formatterParams that should contain an object with additional information for configuring the formatter.*/
         formatterParams?: FormatterParams;
-        /**alter the row height to fit the contents of the cell instead of hiding overflow */
+        /** alter the row height to fit the contents of the cell instead of hiding overflow */
         variableHeight?: boolean;
-        /** There are some circumstances where you may want to block editibility of a cell for one reason or another. To meet this need you can use the editable option. This lets you set a callback that is executed before the editor is built, if this callback returns true the editor is added, if it returns false the edit is aborted and the cell remains a non editable cell. The function is passed one parameter, the CellComponent of the cell about to be edited. You can also pass a boolean value instead of a function to this property.*/
+        /**  There are some circumstances where you may want to block editibility of a cell for one reason or another. To meet this need you can use the editable option. This lets you set a callback that is executed before the editor is built, if this callback returns true the editor is added, if it returns false the edit is aborted and the cell remains a non editable cell. The function is passed one parameter, the CellComponent of the cell about to be edited. You can also pass a boolean value instead of a function to this property.*/
         editable?: boolean | ((cell: CellComponent) => boolean);
-        /**When a user clicks on an editable column the will be able to edit the value for that cell.
+        /** When a user clicks on an editable column the will be able to edit the value for that cell.
 
     By default Tabulator will use an editor that matches the current formatter for that cell. if you wish to specify a specific editor, you can set them per column using the editor option in the column definition. Passing a value of true to this option will result in Tabulator applying the editor that best matches the columns formatter, if present.
 
     You can pass an optional additional parameter with the editor, editorParams that should contain an object with additional information for configuring the editor. */
         editor?: Editor;
-        /** */
+        /** additional parameters you can pass to the editor   */
         editorParams?: EditorParams;
 
-        /**Validators are used to ensure that any user input into your editable cells matches your requirements.
+        /** Validators are used to ensure that any user input into your editable cells matches your requirements.
 
     Validators can be applied by using the validator property in a columns definition object (see Define Columns for more details). */
         validator?: StandardValidatorType | StandardValidatorType[] | Validator | Validator[];
 
-        /**Mutators are used to alter data as it is parsed into Tabulator. For example if you wanted to convert a numeric column into a boolean based on its value, before the data is used to build the table.
+        /** Mutators are used to alter data as it is parsed into Tabulator. For example if you wanted to convert a numeric column into a boolean based on its value, before the data is used to build the table.
 
     You can set mutators on a per column basis using the mutator option in the column definition object.
 
     You can pass an optional additional parameter with mutator, mutatorParams that should contain an object with additional information for configuring the mutator. */
         mutator?: CustomMutator;
-        /**You can pass an optional additional parameter with mutator, mutatorParams that should contain an object with additional information for configuring the mutator. */
+        /** You can pass an optional additional parameter with mutator, mutatorParams that should contain an object with additional information for configuring the mutator. */
         mutatorParams?: CustomMutatorParams;
-        /** only called when data is loaded via a command {eg. setData). */
+        /**  only called when data is loaded via a command {eg. setData). */
         mutatorData?: CustomMutator;
         mutatorDataParams?: CustomMutatorParams;
 
-        /**only called when data is changed via a user editing a cell. */
+        /** only called when data is changed via a user editing a cell. */
         mutatorEdit?: CustomMutator;
         mutatorEditParams?: CustomMutatorParams;
 
-        /**only called when data is changed via a user editing a cell. */
+        /** only called when data is changed via a user editing a cell. */
         mutatorClipboard?: CustomMutator;
         mutatorClipboardParams?: CustomMutatorParams;
 
-        /** Accessors are used to alter data as it is extracted from the table, through commands, the clipboard, or download.
+        /**  Accessors are used to alter data as it is extracted from the table, through commands, the clipboard, or download.
 
     You can set accessors on a per column basis using the accessor option in the column definition object.*/
         accessor?: CustomAccessor;
-        /** Each accessor function has its own matching params option, for example accessorDownload has accessorDownloadParams.*/
+        /**  Each accessor function has its own matching params option, for example accessorDownload has accessorDownloadParams.*/
         accessorParams?: CustomAccessorParams;
-        /**only called when data is being converted into a downloadable file. */
+        /** only called when data is being converted into a downloadable file. */
         accessorDownload?: CustomAccessor;
-        /** */
+        /** additional parameters you can pass to the accessorDownload */
         accessorDownloadParams?: CustomAccessorParams;
 
-        /**only called when data is being copied into the clipboard. */
+        /** only called when data is being copied into the clipboard. */
         accessorClipboard?: CustomAccessor;
-        /** */
+        /**  additional parameters you can pass to the accessorClipboard*/
         accessorClipboardParams?: CustomAccessorParams;
 
-        /**show or hide column in downloaded data */
+        /** show or hide column in downloaded data */
         download?: boolean;
-        /**set custom title for column in download */
+        /** set custom title for column in download */
         downloadTitle?: string;
 
-        /** the column calculation to be displayed at the top of this column(see Column Calculations for more details) */
+        /**  the column calculation to be displayed at the top of this column(see Column Calculations for more details) */
         topCalc?: ColumnCalc;
-        /**additional parameters you can pass to the topCalc calculation function (see Column Calculations for more details) */
+        /** additional parameters you can pass to the topCalc calculation function (see Column Calculations for more details) */
         topCalcParams?: ColumnCalcParams;
-        /**formatter for the topCalc calculation cell  */
+        /** formatter for the topCalc calculation cell  */
         topCalcFormatter?: Formatter;
-        /** additional parameters you can pass to the topCalcFormatter function */
+        /**  additional parameters you can pass to the topCalcFormatter function */
         topCalcFormatterParams?: FormatterParams;
 
         bottomCalc?: ColumnCalc;
         bottomCalcParams?: ColumnCalcParams;
         bottomCalcFormatter?: Formatter;
-        /** additional parameters you can pass to the bottomCalcFormatter function */
+        /**  additional parameters you can pass to the bottomCalcFormatter function */
         bottomCalcFormatterParams?: FormatterParams;
 
-        //Column Header
-        /**By default all columns in a table are sortable by clicking on the column header, if you want to disable this behaviour, set the headerSort property to false in the column definition array: */
+        // Column Header
+        /** By default all columns in a table are sortable by clicking on the column header, if you want to disable this behaviour, set the headerSort property to false in the column definition array: */
         headerSort?: boolean;
-        /**set the starting sort direction when a user first clicks on a header */
+        /** set the starting sort direction when a user first clicks on a header */
         headerSortStartingDir?: SortDirection;
 
-        /**allow tristate toggling of column header sort direction */
+        /** allow tristate toggling of column header sort direction */
         headerSortTristate?: boolean;
 
-        /**  callback for when user clicks on the header for this column*/
+        /**   callback for when user clicks on the header for this column*/
         headerClick?: ColumnEventCallback;
-        /** callback for when user double clicks on the header for this column */
+        /**  callback for when user double clicks on the header for this column */
         headerDblClick?: ColumnEventCallback;
-        /**callback for when user right clicks on the header for this column  */
+        /** callback for when user right clicks on the header for this column  */
         headerContext?: ColumnEventCallback;
-        /** callback for when user taps on a header for this column, triggered in touch displays. */
+        /**  callback for when user taps on a header for this column, triggered in touch displays. */
         headerTap?: ColumnEventCallback;
-        /**callback for when user double taps on a header for this column, triggered in touch displays when a user taps the same header twice in under 300ms */
+        /** callback for when user double taps on a header for this column, triggered in touch displays when a user taps the same header twice in under 300ms */
         headerDblTap?: ColumnEventCallback;
-        /**callback for when user taps and holds on a header for this column, triggered in touch displays when a user taps and holds the same header for 1 second. */
+        /** callback for when user taps and holds on a header for this column, triggered in touch displays when a user taps and holds the same header for 1 second. */
         headerTapHold?: ColumnEventCallback;
-        /**sets the on hover tooltip for the column header
-     * 
-     * The tooltip headerTooltip can take three different types of value
+        /** sets the on hover tooltip for the column header* * The tooltip headerTooltip can take three different types of value
 
       boolean - a value of false disables the tooltip, a value of true sets the tooltip of the column header to its title value.
       string - a string that will be displayed for the tooltip.
-      function - a callback function that returns the string for the column header
-     * 
+      function - a callback function that returns the string for the column header*
      */
         headerTooltip?: boolean | string | ((column: ColumnComponent) => string);
-        /**change the orientation of the column header to vertical
-     * 
-     * The headerVertical property can take one of three values:
+        /** change the orientation of the column header to vertical* * The headerVertical property can take one of three values:
 
       false - vertical columns disabled (default value)
       true - vertical columns enabled
-      "flip" - vertical columns enabled, with text direction flipped by 180 degrees
-     * 
+      "flip" - vertical columns enabled, with text direction flipped by 180 degrees*
      */
         headerVertical?: boolean | "flip";
 
-        /**allows the user to edit the header titles */
+        /** allows the user to edit the header titles */
         editableTitle?: boolean;
-        /** formatter function for header title */
+        /**  formatter function for header title */
         titleFormatter?: Formatter;
 
-        /**additional parameters you can pass to the header title formatter */
+        /** additional parameters you can pass to the header title formatter */
         titleFormatterParams?: FormatterParams;
-        /** filtering of columns from elements in the header */
+        /**  filtering of columns from elements in the header */
         headerFilter?: Editor;
-        /**additional parameters you can pass to the header filter */
+        /** additional parameters you can pass to the header filter */
         headerFilterParams?: EditorParams;
 
-        /** placeholder text for the header filter */
+        /**  placeholder text for the header filter */
         headerFilterPlaceholder?: string;
 
-        /** function to check when the header filter is empty */
+        /**  function to check when the header filter is empty */
         headerFilterEmptyCheck?: ValueBooleanCallback;
-        /** By default Tabulator will try and match the comparison type to the type of element used for the header filter.
+        /**  By default Tabulator will try and match the comparison type to the type of element used for the header filter.
 
     Standard input elements will use the "like" filter, this allows for the matches to be displayed as the user types.
 
@@ -963,50 +942,50 @@ You can pass an optional additional property with sorter, sorterParams that shou
 
     If you want to specify the type of filter used you can pass it to the headerFilterFunc option in the column definition object. This will take any of the standard filters outlined above or a custom function*/
         headerFilterFunc?: FilterType | ((headerValue: any, rowValue: any, rowdata: any, filterparams: any) => boolean);
-        /** additional parameters object passed to the headerFilterFunc function  */
+        /**  additional parameters object passed to the headerFilterFunc function  */
         headerFilterFuncParams?: any;
 
-        /**disable live filtering of the table  */
+        /** disable live filtering of the table  */
         headerFilterLiveFilter?: boolean;
     }
 
     interface CellCallbacks {
-        //Cell Events
-        /**callback for when user clicks on a cell in this column  */
+        // Cell Events
+        /** callback for when user clicks on a cell in this column  */
         cellClick?: CellEventCallback;
-        /** callback for when user double clicks on a cell in this column */
+        /**  callback for when user double clicks on a cell in this column */
         cellDblClick?: CellEventCallback;
-        /**callback for when user right clicks on a cell in this column */
+        /** callback for when user right clicks on a cell in this column */
         cellContext?: CellEventCallback;
-        /**callback for when user taps on a cell in this column, triggered in touch displays.  */
+        /** callback for when user taps on a cell in this column, triggered in touch displays.  */
         cellTap?: CellEventCallback;
-        /** callback for when user double taps on a cell in this column, triggered in touch displays when a user taps the same cell twice in under 300ms.  */
+        /**  callback for when user double taps on a cell in this column, triggered in touch displays when a user taps the same cell twice in under 300ms.  */
         cellDblTap?: CellEventCallback;
-        /** callback for when user taps and holds on a cell in this column, triggered in touch displays when a user taps and holds the same cell for 1 second.*/
+        /**  callback for when user taps and holds on a cell in this column, triggered in touch displays when a user taps and holds the same cell for 1 second.*/
         cellTapHold?: CellEventCallback;
 
-        /**callback for when the mouse pointer enters a cell */
+        /** callback for when the mouse pointer enters a cell */
         cellMouseEnter?: CellEventCallback;
-        /** callback for when the mouse pointer leaves a cell */
+        /**  callback for when the mouse pointer leaves a cell */
         cellMouseLeave?: CellEventCallback;
 
-        /** callback for when the mouse pointer enters a cell or one of its child elements */
+        /**  callback for when the mouse pointer enters a cell or one of its child elements */
         cellMouseOver?: CellEventCallback;
 
-        /**callback for when the mouse pointer enters a cell or one of its child elements */
+        /** callback for when the mouse pointer enters a cell or one of its child elements */
         cellMouseOut?: CellEventCallback;
 
-        /**callback for when the mouse pointer moves over a cell  */
+        /** callback for when the mouse pointer moves over a cell  */
         cellMouseMove?: CellEventCallback;
 
-        //Cell editing
-        /**callback for when a cell in this column is being edited by the user */
+        // Cell editing
+        /** callback for when a cell in this column is being edited by the user */
         cellEditing?: CellEditEventCallback;
 
-        /**callback for when a cell in this column has been edited by the user */
+        /** callback for when a cell in this column has been edited by the user */
         cellEdited?: CellEditEventCallback;
 
-        /** callback for when an edit on a cell in this column is aborted by the user  */
+        /**  callback for when an edit on a cell in this column is aborted by the user  */
         cellEditCancelled?: CellEditEventCallback;
     }
 
@@ -1022,7 +1001,7 @@ You can pass an optional additional property with sorter, sorterParams that shou
     type CustomMutatorParams = {} | ((value: any, data: any, type: "data" | "edit", cell?: CellComponent) => any);
     type CustomAccessor = (value: any, data: any, type: "data" | "download" | "clipboard", AccessorParams: any, column?: ColumnComponent) => any;
     type CustomAccessorParams = {} | ((value: any, data: any, type: "data" | "download" | "clipboard", column?: ColumnComponent) => any);
-    type ColumnCalc = "avg" | "max" | "min" | "sum" | "concat" | "count" | ((values: Array<any>, data: Array<any>, calcParams: {}) => number);
+    type ColumnCalc = "avg" | "max" | "min" | "sum" | "concat" | "count" | ((values: any[], data: any[], calcParams: {}) => number);
     type ColumnCalcParams = (values: any, data: any) => any;
     type Formatter = "plaintext" | "textarea" | "html" | "money" | "image" | "datetime" | "datetimediff" | "link" | "tickCross" | "color" | "star" | "traffic" | "progress" | "lookup" | "buttonTick" | "buttonCross" | "rownum" | "handle" | ((cell: CellComponent, formatterParams: {}, onRendered: EmptyCallback) => string | HTMLElement);
     type FormatterParams = MoneyParams | ImageParams | LinkParams | DateTimeParams | DateTimeDifferenceParams | TickCrossParams | TrafficParams | StarRatingParams | JSONRecord | ((cell: CellComponent) => {});
@@ -1035,7 +1014,7 @@ You can pass an optional additional property with sorter, sorterParams that shou
     type ScrollToColumnPosition = "left" | "center" | "middle" | "right";
 
     interface MoneyParams {
-        //Money
+        // Money
         decimal?: string;
         thousand?: string;
         symbol?: string;
@@ -1043,12 +1022,12 @@ You can pass an optional additional property with sorter, sorterParams that shou
         precision?: boolean | number;
     }
     interface ImageParams {
-        //Image
+        // Image
         height?: string;
         width?: string;
     }
     interface LinkParams {
-        //Link
+        // Link
         labelField?: string;
         label?: string;
         urlPrefix?: string;
@@ -1058,21 +1037,21 @@ You can pass an optional additional property with sorter, sorterParams that shou
     }
 
     interface DateTimeParams {
-        //datetime
+        // datetime
         inputFormat?: string;
         outputFormat?: string;
         invalidPlaceholder?: true | string | number | ValueStringCallback;
     }
 
     interface DateTimeDifferenceParams extends DateTimeParams {
-        //Date Time Difference
+        // Date Time Difference
         date?: any;
         humanize?: boolean;
         unit?: "years" | "months" | "weeks" | "days" | "hours" | "minutes" | "seconds";
         suffix?: boolean;
     }
     interface TickCrossParams {
-        //Tick Cross
+        // Tick Cross
         allowEmpty?: boolean;
         allowTruthy?: boolean;
         tickElement?: boolean | string;
@@ -1080,32 +1059,32 @@ You can pass an optional additional property with sorter, sorterParams that shou
     }
 
     interface TrafficParams {
-        //Traffic
+        // Traffic
         min?: number;
         max?: number;
         color?: Color;
     }
     interface ProgressBarParams extends TrafficParams {
-        //Progress Bar
+        // Progress Bar
         legend?: string | true | ValueStringCallback;
         legendColor?: Color;
         legendAlign?: Align;
     }
 
     interface StarRatingParams {
-        //Star Rating
+        // Star Rating
         stars?: number;
     }
 
     interface NumberParams {
-        //range,number
+        // range,number
         min?: number;
         max?: number;
         step?: number;
     }
 
     interface CheckboxParams {
-        //tick
+        // tick
         tristate?: boolean;
         indeterminateValue?: string;
     }
@@ -1120,7 +1099,10 @@ You can pass an optional additional property with sorter, sorterParams that shou
         value?: string | number | boolean;
         options?: SelectLabelValue[];
     }
-    type SelectLabelValue = { label: string; value: string | number | boolean };
+    interface SelectLabelValue {
+        label: string;
+        value: string | number | boolean;
+    }
 
     interface AutoCompleteParams {
         values: true | string[] | JSONRecord;
@@ -1176,96 +1158,63 @@ You can pass an optional additional property with sorter, sorterParams that shou
         copyToClipboard?: string | boolean;
     }
 
-    //Components-------------------------------------------------------------------
-    interface CellComponent {
-        /**The getValue function returns the current value for the cell. */
-        getValue: () => any;
-        /**The getOldValue function returns the previous value of the cell. Very usefull in the event of cell update callbacks. */
-        getOldValue: () => any;
-        /**The restoreOldValue reverts the value of the cell back to its previous value, without triggering any of the cell edit callbacks. */
-        restoreOldValue: () => any;
-        /**The getElement function returns the DOM node for the cell. */
-
-        getElement: () => HTMLElement;
-        /**The getTable function returns the Tabulator object for the table containing the cell. */
-        getTable: () => Tabulator;
-        /**The getRow function returns the RowComponent for the row that contains the cell. */
-        getRow: () => RowComponent;
-
-        /**The getColumn function returns the ColumnComponent for the column that contains the cell. */
-        getColumn: () => ColumnComponent;
-
-        /**The getData function returns the data for the row that contains the cell. */
-        getData: () => {};
-        /**The getField function returns the field name for the column that contains the cell. */
-        getField: () => string;
-        /**You can change the value of the cell using the setValue function. The first parameter should be the new value for the cell, the second optional parameter will apply the column mutators to the value when set to true (default = true). */
-        setValue: (value: any, mutate?: boolean) => void;
-        /**If you are making manual adjustments to elements contained withing the cell, or the cell itself, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the checkHeight function to check if the height of the cell has changed and normalize the row if it has. */
-        checkHeight: () => void;
-        /**You and programatically cause a cell to open its editor element using the edit function */
-        edit: (ignoreEditable?: boolean) => void;
-        /**You and programatically cancel a cell edit that is currently in progress by calling the cancelEdit function */
-        cancelEdit: () => void;
-        /**When a cell is being edited it is possible to move the editor focus from the current cell to one if its neighbours. There are a number of functions that can be called on the nav function to move the focus in different directions. */
-        nav: () => CellNavigation;
-    }
+    // Components-------------------------------------------------------------------
 
     interface CellNavigation {
-        /**prev - next editable cell on the left, if none available move to the right most editable cell on the row above */
+        /** prev - next editable cell on the left, if none available move to the right most editable cell on the row above */
         prev: () => boolean;
-        /**next - next editable cell on the right, if none available move to left most editable cell on the row below */
+        /** next - next editable cell on the right, if none available move to left most editable cell on the row below */
         next: () => boolean;
-        /**left - next editable cell on the left, return false if none available on row */
+        /** left - next editable cell on the left, return false if none available on row */
         left: () => boolean;
-        /**right - next editable cell on the right, return false if none available on row */
+        /** right - next editable cell on the right, return false if none available on row */
         right: () => boolean;
-        /**up - move to the same cell in the row above */
+        /** up - move to the same cell in the row above */
         up: () => void;
-        /**down - move to the same cell in the row below */
+        /** down - move to the same cell in the row below */
         down: () => void;
     }
 
     interface RowComponent {
-        /**The getData function returns the data object for the row.*/
+        /** The getData function returns the data object for the row.*/
         getData: () => {};
-        /**The getElement function returns the DOM node for the row.*/
+        /** The getElement function returns the DOM node for the row.*/
         getElement: () => HTMLElement;
 
-        /**The getTable function returns the Tabulator object for the table containing the row. */
+        /** The getTable function returns the Tabulator object for the table containing the row. */
         getTable: () => Tabulator;
 
-        /**The getNextRow function returns the Row Component for the next visible row in the table, if there is no next row it will return a value of false */
+        /** The getNextRow function returns the Row Component for the next visible row in the table, if there is no next row it will return a value of false */
         getNextRow: () => RowComponent | false;
-        /**The getNextRow function returns the Row Component for the previous visible row in the table, if there is no next row it will return a value of false */
+        /** The getNextRow function returns the Row Component for the previous visible row in the table, if there is no next row it will return a value of false */
         getPrevRow: () => RowComponent | false;
 
-        /**The getCells function returns an array of CellComponent objects, one for each cell in the row.*/
-        getCells: () => Array<CellComponent>;
-        /**The getCell function returns the CellComponent for the specified column from this row.*/
+        /** The getCells function returns an array of CellComponent objects, one for each cell in the row.*/
+        getCells: () => CellComponent[];
+        /** The getCell function returns the CellComponent for the specified column from this row.*/
         getCell: (column: ColumnComponent | HTMLElement | string) => CellComponent;
-        /**The getIndex function returns the index value for the row. (this is the value from the defined index column, NOT the row's position in the table)*/
+        /** The getIndex function returns the index value for the row. (this is the value from the defined index column, NOT the row's position in the table)*/
         getIndex: () => any;
 
-        /**Use the getPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
+        /** Use the getPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
 
     If you want to get the position of the row in the currently filtered/sorted data, you can pass a value of true to the optional first argument of the function. */
         getPosition: (filteredPosition?: boolean) => number;
 
-        /**When using grouped rows, you can retrieve the group component for the current row using the getGroup function. */
+        /** When using grouped rows, you can retrieve the group component for the current row using the getGroup function. */
         getGroup: () => GroupComponent;
-        /**The delete function deletes the row, removing its data from the table
+        /** The delete function deletes the row, removing its data from the table
          *
          * The delete method returns a promise, this can be used to run any other commands that have to be run after the row has been deleted. By running them in the promise you ensure they are only run after the row has been deleted.
          */
         delete: () => Promise<void>;
-        /**The scrollTo function will scroll the table to the row if it passes the current filters.*/
+        /** The scrollTo function will scroll the table to the row if it passes the current filters.*/
         scrollTo: () => Promise<void>;
 
-        /**The pageTo function will load the page for the row if it passes the current filters.*/
+        /** The pageTo function will load the page for the row if it passes the current filters.*/
         pageTo: () => Promise<void>;
 
-        /** You can move a row next to another row using the move function.
+        /**  You can move a row next to another row using the move function.
 
     The first argument should be the target row that you want to move to, and can be any of the standard row component look up options.
 
@@ -1273,116 +1222,150 @@ You can pass an optional additional property with sorter, sorterParams that shou
 
         move: (lookup: RowComponent | HTMLElement | number, belowTarget?: boolean) => void;
 
-        /**You can update the data in the row using the update function. You should pass an object to the function containing any fields you wish to update. This object will not replace the row data, only the fields included in the object will be updated.*/
+        /** You can update the data in the row using the update function. You should pass an object to the function containing any fields you wish to update. This object will not replace the row data, only the fields included in the object will be updated.*/
         update: (data: {}) => Promise<void>;
-        /**The select function will select the current row.*/
+        /** The select function will select the current row.*/
         select: () => void;
-        /**The deselect function will deselect the current row.*/
+        /** The deselect function will deselect the current row.*/
         deselect: () => void;
-        /**The deselect function will toggle the current row.*/
+        /** The deselect function will toggle the current row.*/
         toggleSelect: () => void;
-        /**The isSelected function will return a boolean representing the current selected state of the row. */
+        /** The isSelected function will return a boolean representing the current selected state of the row. */
         isSelected: () => boolean;
-        /**If you are making manual adjustments to elements contained within the row, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the normalizeHeight function to do this.*/
+        /** If you are making manual adjustments to elements contained within the row, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the normalizeHeight function to do this.*/
         normalizeHeight: () => void;
 
-        /**If you want to re-format a row once it has been rendered to re-trigger the cell formatters and the rowFormatter callback, Call the reformat function. */
+        /** If you want to re-format a row once it has been rendered to re-trigger the cell formatters and the rowFormatter callback, Call the reformat function. */
         reformat: () => void;
 
-        /**You can freeze a row at the top of the table by calling the freeze function. This will insert the row above the scrolling portion of the table in the table header. */
+        /** You can freeze a row at the top of the table by calling the freeze function. This will insert the row above the scrolling portion of the table in the table header. */
         freeze: () => void;
 
-        /**A frozen row can be unfrozen using the unfreeze function. This will remove the row from the table header and re-insert it back in the table. */
+        /** A frozen row can be unfrozen using the unfreeze function. This will remove the row from the table header and re-insert it back in the table. */
         unfreeze: () => void;
 
-        /**When the tree structure is enabled the treeExpand function will expand current row and show its children. */
+        /** When the tree structure is enabled the treeExpand function will expand current row and show its children. */
         treeExpand: () => void;
 
-        /**When the tree structure is enabled the treeCollapse function will collapse current row and hide its children */
+        /** When the tree structure is enabled the treeCollapse function will collapse current row and hide its children */
         treeCollapse: () => void;
 
-        /**When the tree structure is enabled the treeToggle function will toggle the collapsed state of the current row. */
+        /** When the tree structure is enabled the treeToggle function will toggle the collapsed state of the current row. */
         treeToggle: () => void;
 
-        /**When the tree structure is enabled the getTreeParent function will return the Row Component for the parent of this row. If no parent exists, a value of false will be returned. */
+        /** When the tree structure is enabled the getTreeParent function will return the Row Component for the parent of this row. If no parent exists, a value of false will be returned. */
         getTreeParent: () => RowComponent | false;
-        /**When the tree structure is enabled the getTreeChildren function will return an array of Row Components for this rows children. */
+        /** When the tree structure is enabled the getTreeChildren function will return an array of Row Components for this rows children. */
         getTreeChildren: () => RowComponent[];
     }
 
     interface GroupComponent {
-        /**The getElement function returns the DOM node for the group header. */
+        /** The getElement function returns the DOM node for the group header. */
         getElement: () => HTMLElement;
 
-        /**The getTable function returns the Tabulator object for the table containing the group */
+        /** The getTable function returns the Tabulator object for the table containing the group */
         getTable: () => Tabulator;
 
-        /**The getKey function returns the unique key that is shared between all rows in this group. */
+        /** The getKey function returns the unique key that is shared between all rows in this group. */
         getKey: () => any;
 
-        /**The getRows function returns an array of RowComponent objects, one for each row in the group */
+        /** The getRows function returns an array of RowComponent objects, one for each row in the group */
         getRows: () => RowComponent[];
 
-        /**The getSubGroups function returns an array of GroupComponent objects, one for each sub group of this group. */
+        /** The getSubGroups function returns an array of GroupComponent objects, one for each sub group of this group. */
         getSubGroups: () => GroupComponent[];
 
-        /**The getParentGroup function returns the GroupComponent for the parent group of this group. if no parent exists, this function will return false */
+        /** The getParentGroup function returns the GroupComponent for the parent group of this group. if no parent exists, this function will return false */
         getParentGroup: () => GroupComponent | false;
 
-        /** The getVisibility function returns a boolean to show if the group is visible, a value of true means it is visible.*/
+        /**  The getVisibility function returns a boolean to show if the group is visible, a value of true means it is visible.*/
         getVisibility: () => boolean;
 
-        /**The show function shows the group if it is hidden. */
+        /** The show function shows the group if it is hidden. */
         show: () => void;
-        /**The hide function hides the group if it is visible. */
+        /** The hide function hides the group if it is visible. */
         hide: () => void;
-        /**The toggle function toggles the visibility of the group, switching between hidden and visible. */
+        /** The toggle function toggles the visibility of the group, switching between hidden and visible. */
         toggle: () => void;
     }
 
     interface ColumnComponent {
         /*The getElement function returns the DOM node for the colum*/
         getElement: () => HTMLElement;
-        /**The getTable function returns the Tabulator object for the table containing the column */
+        /** The getTable function returns the Tabulator object for the table containing the column */
         getTable: () => Tabulator;
-        /**The getDefinition function returns the column definition object for the column.*/
+        /** The getDefinition function returns the column definition object for the column.*/
         getDefinition: () => ColumnDefinition;
-        /**The getField function returns the field name for the column.*/
+        /** The getField function returns the field name for the column.*/
         getField: () => string;
-        /**The getCells function returns an array of CellComponent objects, one for each cell in the column.*/
-        getCells: () => Array<CellComponent>;
+        /** The getCells function returns an array of CellComponent objects, one for each cell in the column.*/
+        getCells: () => CellComponent[];
 
-        /**The getNextColumn function returns the Column Component for the next visible column in the table, if there is no next column it will return a value of false. */
+        /** The getNextColumn function returns the Column Component for the next visible column in the table, if there is no next column it will return a value of false. */
         getNextColumn: () => ColumnComponent | false;
-        /**The getPrevColumn function returns the Column Component for the previous visible column in the table, if there is no previous column it will return a value of false. */
+        /** The getPrevColumn function returns the Column Component for the previous visible column in the table, if there is no previous column it will return a value of false. */
         getPrevColumn: () => ColumnComponent | false;
-        /**The getVisibility function returns a boolean to show if the column is visible, a value of true means it is visible.*/
+        /** The getVisibility function returns a boolean to show if the column is visible, a value of true means it is visible.*/
         getVisibility: () => boolean;
-        /**The show function shows the column if it is hidden.*/
+        /** The show function shows the column if it is hidden.*/
         show: () => void;
-        /**The hide function hides the column if it is visible.*/
+        /** The hide function hides the column if it is visible.*/
         hide: () => void;
-        /**The toggle function toggles the visibility of the column, switching between hidden and visible.*/
+        /** The toggle function toggles the visibility of the column, switching between hidden and visible.*/
         toggle: () => void;
-        /**The delete function deletes the column, removing it from the table*/
+        /** The delete function deletes the column, removing it from the table*/
         delete: () => void;
-        /**The scrollTo function will scroll the table to the column if it is visible. */
+        /** The scrollTo function will scroll the table to the column if it is visible. */
         scrollTo: () => Promise<void>;
-        /**The getSubColumns function returns an array of ColumnComponent objects, one for each sub column of this column. */
+        /** The getSubColumns function returns an array of ColumnComponent objects, one for each sub column of this column. */
         getSubColumns: () => ColumnComponent[];
 
-        /**The getParentColumn function returns the ColumnComponent for the parent column of this column. if no parent exists, this function will return false */
+        /** The getParentColumn function returns the ColumnComponent for the parent column of this column. if no parent exists, this function will return false */
         getParentColumn: () => ColumnComponent | false;
-        /**The headerFilterFocus function will place focus on the header filter element for this column if it exists. */
+        /** The headerFilterFocus function will place focus on the header filter element for this column if it exists. */
         headerFilterFocus: () => void;
-        /**The setHeaderFilterValue function set the value of the columns header filter element to the value provided in the first argument. */
+        /** The setHeaderFilterValue function set the value of the columns header filter element to the value provided in the first argument. */
         setHeaderFilterValue: (value: any) => void;
-        /**The reloadHeaderFilter function rebuilds the header filter element, updating any params passed into the editor used to generate the filter. */
+        /** The reloadHeaderFilter function rebuilds the header filter element, updating any params passed into the editor used to generate the filter. */
         reloadHeaderFilter: () => void;
     }
+
+    interface CellComponent {
+        /** The getValue function returns the current value for the cell. */
+        getValue: () => any;
+        /** The getOldValue function returns the previous value of the cell. Very usefull in the event of cell update callbacks. */
+        getOldValue: () => any;
+        /** The restoreOldValue reverts the value of the cell back to its previous value, without triggering any of the cell edit callbacks. */
+        restoreOldValue: () => any;
+        /** The getElement function returns the DOM node for the cell. */
+
+        getElement: () => HTMLElement;
+        /** The getTable function returns the Tabulator object for the table containing the cell. */
+        getTable: () => Tabulator;
+        /** The getRow function returns the RowComponent for the row that contains the cell. */
+        getRow: () => RowComponent;
+
+        /** The getColumn function returns the ColumnComponent for the column that contains the cell. */
+        getColumn: () => ColumnComponent;
+
+        /** The getData function returns the data for the row that contains the cell. */
+        getData: () => {};
+        /** The getField function returns the field name for the column that contains the cell. */
+        getField: () => string;
+        /** You can change the value of the cell using the setValue function. The first parameter should be the new value for the cell, the second optional parameter will apply the column mutators to the value when set to true (default = true). */
+        setValue: (value: any, mutate?: boolean) => void;
+        /** If you are making manual adjustments to elements contained withing the cell, or the cell itself, it may sometimes be necessary to recalculate the height of all the cells in the row to make sure they remain aligned. Call the checkHeight function to check if the height of the cell has changed and normalize the row if it has. */
+        checkHeight: () => void;
+        /** You and programatically cause a cell to open its editor element using the edit function */
+        edit: (ignoreEditable?: boolean) => void;
+        /** You and programatically cancel a cell edit that is currently in progress by calling the cancelEdit function */
+        cancelEdit: () => void;
+        /** When a cell is being edited it is possible to move the editor focus from the current cell to one if its neighbours. There are a number of functions that can be called on the nav function to move the focus in different directions. */
+        nav: () => CellNavigation;
+    }
 }
 
-//Tabulator.prototype.(?!registerModule|helpers|_)\w+
+// Tabulator.prototype.(?!registerModule|helpers|_)\w+
 declare class Tabulator {
     constructor(selector: string | HTMLElement, options?: Tabulator.Options);
 
@@ -1394,12 +1377,12 @@ declare class Tabulator {
     modules: any;
     options: Tabulator.Options;
 
-    /**You have a choice of four file types to choose from:
+    /** You have a choice of four file types to choose from:
       csv - Comma separated value file
       json - JSON formatted text file
       xlsx - Excel File (Requires the SheetJS Library)
       pdf - PDF File (Requires the jsPDF Library and jsPDF-AutoTable Plugin)
-      To trigger a download, call the download function, passing the file type (from the above list) as the first argument, and an optional second argument of the file name for the download (if this is left out it will be "Tabulator.ext"). The optional third argument is an object containing any setup options for the formatter, such as the delimiter choice for CSV's). 
+      To trigger a download, call the download function, passing the file type (from the above list) as the first argument, and an optional second argument of the file name for the download (if this is left out it will be "Tabulator.ext"). The optional third argument is an object containing any setup options for the formatter, such as the delimiter choice for CSV's).
       
       The PDF downloader requires that the jsPDF Library and jsPDF-AutoTable Plugin be included on your site, this can be included with the following script tags.
       
@@ -1407,84 +1390,84 @@ declare class Tabulator {
       */
     download: (downloadType: Tabulator.DownloadType | ((columns: Tabulator.ColumnDefinition[], data: any, options: any, setFileContents: any) => any), fileName: string, params?: Tabulator.DownloadOptions) => void;
 
-    /**If you want to open the generated file in a new browser tab rather than downloading it straight away, you can use the downloadToTab function. This is particularly useful with the PDF downloader, as it allows you to preview the resulting PDF in a new browser ta */
+    /** If you want to open the generated file in a new browser tab rather than downloading it straight away, you can use the downloadToTab function. This is particularly useful with the PDF downloader, as it allows you to preview the resulting PDF in a new browser ta */
     downloadToTab: (downloadType: Tabulator.DownloadType, fileName: string, params?: Tabulator.DownloadOptions) => void;
 
-    /**The copyToClipboard function allows you to copy the current table data to the clipboard.
+    /** The copyToClipboard function allows you to copy the current table data to the clipboard.
 
     The first argument is the copy selector, you can choose from any of the built in options or pass a function in to the argument, that must return the selected row components.
 
     If you leave this argument undefined, Tabulator will use the value of the clipboardCopySelector property, which has a default value of table */
     copyToClipboard: (type: "selection" | "table") => void;
 
-    /**With history enabled you can use the undo function to automatically undo a user action, the more times you call the function, the further up the history log you go. */
+    /** With history enabled you can use the undo function to automatically undo a user action, the more times you call the function, the further up the history log you go. */
     undo: () => boolean;
 
-    /**You can use the getHistoryUndoSize function to get a count of the number of history undo actions available. */
+    /** You can use the getHistoryUndoSize function to get a count of the number of history undo actions available. */
     getHistoryUndoSize: () => number | false;
 
-    /**With history enabled you can use the redo function to automatically redo user action that has been undone, the more times you call the function, the further up the history log you go. once a user interacts with the table then can no longer redo any further actions until an undo is performe */
+    /** With history enabled you can use the redo function to automatically redo user action that has been undone, the more times you call the function, the further up the history log you go. once a user interacts with the table then can no longer redo any further actions until an undo is performe */
     redo: () => boolean;
 
-    /**You can use the getHistoryRedoSize function to get a count of the number of history redo actions available.*/
+    /** You can use the getHistoryRedoSize function to get a count of the number of history redo actions available.*/
     getHistoryRedoSize: () => number | false;
-    /**Deconstructor */
+    /** Deconstructor */
     destroy: () => void;
-    /**By default Tabulator will only allow files with a .json extension to be loaded into the table.
+    /** By default Tabulator will only allow files with a .json extension to be loaded into the table.
 
     You can allow any other type of file into the file picker by passing the extension or mime type into the first argument of the setDataFromLocalFile function as a comma separated list. This argument will accept any of the values valid for the accept field of an input element */
     setDataFromLocalFile: (extensions: string) => void;
     setData: (data: any, params?: any, config?: any) => Promise<void>;
-    /**You can remove all data from the table using clearData */
+    /** You can remove all data from the table using clearData */
     clearData: () => void;
-    /**You can retrieve the data stored in the table using the getData function. */
+    /** You can retrieve the data stored in the table using the getData function. */
     getData: (activeOnly?: boolean) => any[];
     getDataCount: (activeOnly?: boolean) => number;
-    /**The searchRows function allows you to retreive an array of row components that match any filters you pass in. it accepts the same arguments as the setFilter function. */
+    /** The searchRows function allows you to retreive an array of row components that match any filters you pass in. it accepts the same arguments as the setFilter function. */
     searchRows: Tabulator.FilterFunction;
-    /**The searchData function allows you to retreive an array of table row data that match any filters you pass in. it accepts the same arguments as the setFilter function. */
+    /** The searchData function allows you to retreive an array of table row data that match any filters you pass in. it accepts the same arguments as the setFilter function. */
     searchData: Tabulator.FilterFunction;
-    /**You can retrieve the table data as a simple HTML table using the getHtml function. */
+    /** You can retrieve the table data as a simple HTML table using the getHtml function. */
     getHtml: (activeOnly?: boolean) => void;
-    /**You can retrieve the current AJAX URL of the table with the getAjaxUrl function.
+    /** You can retrieve the current AJAX URL of the table with the getAjaxUrl function.
    * 
    * This will return a HTML encoded string of the table data.
 
     By default getHtml will return a table containing all the data held in the Tabulator. If you only want to access the currently filtered/sorted elements, you can pass a value of true to the first argument of the function.
    */
     getAjaxUrl: () => string;
-    /**The replaceData function lets you silently replace all data in the table without updating scroll position, sort or filtering, and without triggering the ajax loading popup. This is great if you have a table you want to periodically update with new/updated information without alerting the user to a change.
+    /** The replaceData function lets you silently replace all data in the table without updating scroll position, sort or filtering, and without triggering the ajax loading popup. This is great if you have a table you want to periodically update with new/updated information without alerting the user to a change.
 
   It takes the same arguments as the setData function, and behaves in the same way when loading data (ie, it can make ajax requests, parse JSON etc) */
-    replaceData: (data?: {}[] | string, params?: any, config?: any) => Promise<void>;
-    /**If you want to update an existing set of data in the table, without completely replacing the data as the setData method would do, you can use the updateData method.
+    replaceData: (data?: Array<{}> | string, params?: any, config?: any) => Promise<void>;
+    /** If you want to update an existing set of data in the table, without completely replacing the data as the setData method would do, you can use the updateData method.
 
     This function takes an array of row objects and will update each row based on its index value. (the index defaults to the "id" parameter, this can be set using the index option in the tabulator constructor). Options without an index will be ignored, as will items with an index that is not already in the table data. The addRow function should be used to add new data to the table. */
-    updateData: (data: {}[]) => Promise<void>;
-    /**The addData method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data. */
-    addData: (data?: {}[], addToTop?: boolean, positionTarget?: Tabulator.RowLookup) => Promise<Tabulator.RowComponent>;
+    updateData: (data: Array<{}>) => Promise<void>;
+    /** The addData method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data. */
+    addData: (data?: Array<{}>, addToTop?: boolean, positionTarget?: Tabulator.RowLookup) => Promise<Tabulator.RowComponent>;
 
-    /**If the data you are passng to the table contains a mix of existing rows to be updated and new rows to be added then you can call the updateOrAddData function. This will check each row object provided and update the existing row if available, or else create a new row with the data. */
-    updateOrAddData: (data: {}[]) => Promise<Tabulator.RowComponent[]>;
-    /**To rereive the DOM Node of a specific row, you can retrieve the RowComponent with the getRow function, then use the getElement function on the component. The first argument is the row you are looking for, it will take any of the standard row component look up options. */
+    /** If the data you are passng to the table contains a mix of existing rows to be updated and new rows to be added then you can call the updateOrAddData function. This will check each row object provided and update the existing row if available, or else create a new row with the data. */
+    updateOrAddData: (data: Array<{}>) => Promise<Tabulator.RowComponent[]>;
+    /** To rereive the DOM Node of a specific row, you can retrieve the RowComponent with the getRow function, then use the getElement function on the component. The first argument is the row you are looking for, it will take any of the standard row component look up options. */
     getRow: (row: Tabulator.RowLookup) => Tabulator.RowComponent;
 
-    /**You can retrieve the Row Component of a row at a given position in the table using getRowFromPosition function. By default this will return the row based in its position in all table data, including data currently filtered out of the table.
+    /** You can retrieve the Row Component of a row at a given position in the table using getRowFromPosition function. By default this will return the row based in its position in all table data, including data currently filtered out of the table.
 
   If you want to get a row based on its position in the currently filtered/sorted data, you can pass a value of true to the optional second argument of the function. */
     getRowFromPosition: (position: number, activeOnly?: boolean) => void;
-    /**You can delete any row in the table using the deleteRow function. */
+    /** You can delete any row in the table using the deleteRow function. */
     deleteRow: (row: Tabulator.RowLookup) => void;
 
-    /**You can add a row to the table using the addRow function.
+    /** You can add a row to the table using the addRow function.
 
     The first argument should be a row data object. If you do not pass data for a column, it will be left empty. To create a blank row (ie for a user to fill in), pass an empty object to the function.
 
     The second argument is optional and determines whether the row is added to the top or bottom of the table. A value of true will add the row to the top of the table, a value of false will add the row to the bottom of the table. If the parameter is not set the row will be placed according to the addRowPos global option. */
     addRow: (data?: {}, addToTop?: boolean, positionTarget?: Tabulator.RowLookup) => Promise<Tabulator.RowComponent>;
-    /**If you don't know whether a row already exists you can use the updateOrAddRow function. This will check if a row with a matching index exists, if it does it will update it, if not it will add a new row with that data. This takes the same arguments as the updateRow function. */
+    /** If you don't know whether a row already exists you can use the updateOrAddRow function. This will check if a row with a matching index exists, if it does it will update it, if not it will add a new row with that data. This takes the same arguments as the updateRow function. */
     updateOrAddRow: (row: Tabulator.RowLookup, data: {}) => Promise<Tabulator.RowComponent>;
-    /**You can update any row in the table using the updateRow function.
+    /** You can update any row in the table using the updateRow function.
 
   The first argument is the row you want to update, it will take any of the standard row component look up options.
 
@@ -1495,7 +1478,7 @@ declare class Tabulator {
   This function will return true if the update was successful or false if the requested row could not be found. If the new data matches the existing row data, no update will be performed.
   */
     updateRow: (row: Tabulator.RowLookup, data: {}) => boolean;
-    /**If you want to trigger an animated scroll to a row then you can use the scrollToRow function.
+    /** If you want to trigger an animated scroll to a row then you can use the scrollToRow function.
 
     The first argument should be any of the standard row component look up options for the row you want to scroll to.
 
@@ -1503,7 +1486,7 @@ declare class Tabulator {
 
     The third argument is optional, and is a boolean used to set if the table should scroll if the row is already visible, true to scroll, false to not, if omitted it will be set to the value of the scrollToRowIfVisible option, which defaults to true */
     scrollToRow: (row: Tabulator.RowLookup, position?: Tabulator.ScrollToRowPostition, ifVisible?: boolean) => Promise<void>;
-    /**If you want to programmatically move a row to a new position you can use the moveRow function.
+    /** If you want to programmatically move a row to a new position you can use the moveRow function.
 
     The first argument should be the row you want to move, and can be any of the standard row component look up options.
 
@@ -1511,116 +1494,114 @@ declare class Tabulator {
 
     The third argument determines whether the row is moved to above or below the target row. A value of false will cause to the row to be placed below the target row, a value of true will result in the row being placed above the target */
     moveRow: (fromRow: Tabulator.RowLookup, toRow: Tabulator.RowLookup, placeAboveTarget?: boolean) => void;
-    /**You can retrieve all the row components in the table using the getRows function.
-     * By default getRows will return an array containing all the Row Component's held in the Tabulator. If you only want to access the currently filtered/sorted elements, you can pass a value of true to the first argument of the function.
+    /** You can retrieve all the row components in the table using the getRows function.* By default getRows will return an array containing all the Row Component's held in the Tabulator. If you only want to access the currently filtered/sorted elements, you can pass a value of true to the first argument of the function.
      */
     getRows: (activeOnly?: boolean) => Tabulator.RowComponent[];
-    /**Use the getRowPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
+    /** Use the getRowPosition function to retrieve the numerical position of a row in the table. By default this will return the position of the row in all data, including data currently filtered out of the table.
 
     The first argument is the row you are looking for, it will take any of the standard row component look up options. If you want to get the position of the row in the currently filtered/sorted data, you can pass a value of true to the optional second argument of the function.
     
     Note: If the row is not found, a value of -1 will be returned, row positions start at 0
     */
     getRowPosition: (row: Tabulator.RowLookup, activeOnly?: boolean) => number;
-    /**To replace the current column definitions for a table use the setColumns function. This function takes a column definition array as its only argument. */
+    /** To replace the current column definitions for a table use the setColumns function. This function takes a column definition array as its only argument. */
     setColumns: (definitions: Tabulator.ColumnDefinition[]) => void;
-    /**To get an array of Column Components for the current table setup, call the getColumns function. This will only return actual data columns not column groups.
-     *
-     * To get a structured array of Column Components that includes column groups, pass a value of true as an argument.
+    /** To get an array of Column Components for the current table setup, call the getColumns function. This will only return actual data columns not column groups.
+     ** To get a structured array of Column Components that includes column groups, pass a value of true as an argument.
      */
     getColumns: (includeColumnGroups?: boolean) => Tabulator.ColumnComponent[] | Tabulator.GroupComponent[];
-    /**Using the getColumn function you can retrieve the Column Component  */
+    /** Using the getColumn function you can retrieve the Column Component  */
     getColumn: (column: Tabulator.ColumnLookup) => Tabulator.ColumnComponent;
-    /**To get the current column definition array (including any changes made through user actions, such as resizing or re-ordering columns), call the getColumnDefinitions function. this will return the current columns definition array. */
+    /** To get the current column definition array (including any changes made through user actions, such as resizing or re-ordering columns), call the getColumnDefinitions function. this will return the current columns definition array. */
     getColumnDefinitions: () => Tabulator.ColumnDefinition[];
-    /**If you want to handle column layout persistence manually, for example storing it in a database to use elsewhere, you can use the getColumnLayout function to retrieve a layout object for the current table. */
+    /** If you want to handle column layout persistence manually, for example storing it in a database to use elsewhere, you can use the getColumnLayout function to retrieve a layout object for the current table. */
     getColumnLayout: () => Tabulator.ColumnLayout[];
-    /**If you have previously used the getColumnLayout function to retrieve a tables layout, you can use the setColumnLayout function to apply it to a table. */
+    /** If you have previously used the getColumnLayout function to retrieve a tables layout, you can use the setColumnLayout function to apply it to a table. */
     setColumnLayout: (layout: Tabulator.ColumnLayout) => void;
-    /**You can show a hidden column at any point using the showColumn function.  */
+    /** You can show a hidden column at any point using the showColumn function.  */
     showColumn: (column?: Tabulator.ColumnLookup) => void;
-    /**You can hide a visible column at any point using the hideColumn function.  */
+    /** You can hide a visible column at any point using the hideColumn function.  */
     hideColumn: (column?: Tabulator.ColumnLookup) => void;
-    /**You can toggle the visibility of a column at any point using the toggleColumn function.  */
+    /** You can toggle the visibility of a column at any point using the toggleColumn function.  */
     toggleColumn: (column?: Tabulator.ColumnLookup) => void;
-    /**If you wish to add a single column to the table, you can do this using the addColumn function.
+    /** If you wish to add a single column to the table, you can do this using the addColumn function.
    * This function takes three arguments:
 
     Columns Definition - The column definition object for the column you want to add.
     Before (optional) - Determines how to position the new column. A value of true will insert the column to the left of existing columns, a value of false will insert it to the right. If a Position argument is supplied then this will determine whether the new colum is inserted before or after this column.
     Position (optional) - The field to insert the new column next to, this can be any of the standard column component look up options.
-      * 
+* 
    */
     addColumn: (definition: Tabulator.ColumnDefinition, insertRightOfTarget?: boolean, positionTarget?: Tabulator.ColumnLookup) => void;
-    /**To permanently remove a column from the table deleteColumn function. This function takes any of the standard column component look up options as its first parameter */
+    /** To permanently remove a column from the table deleteColumn function. This function takes any of the standard column component look up options as its first parameter */
     deleteColumn: (column: Tabulator.ColumnLookup) => void;
-    /**If you want to trigger an animated scroll to a column then you can use the scrollToColumn function. The first argument should be any of the standard column component look up options for the column you want to scroll to.
+    /** If you want to trigger an animated scroll to a column then you can use the scrollToColumn function. The first argument should be any of the standard column component look up options for the column you want to scroll to.
 
   The second argument is optional, and is used to set the position of the column, it should be a string with a value of either left, middle or right, if omitted it will be set to the value of the scrollToColumnPosition option which has a default value of left.
 
   The third argument is optional, and is a boolean used to set if the table should scroll if the column is already visible, true to scroll, false to not, if omitted it will be set to the value of the scrollToColumnIfVisible option, which defaults to true
   */
     scrollToColumn: (column: Tabulator.ColumnLookup, position?: Tabulator.ScrollToColumnPosition, ifVisible?: boolean) => Promise<void>;
-    /**You can also set the language at any point after the table has loaded using the setLocale function, which takes the same range of values as the locale setup option mentioned above. */
+    /** You can also set the language at any point after the table has loaded using the setLocale function, which takes the same range of values as the locale setup option mentioned above. */
     setLocale: (locale: string | boolean) => void;
-    /**It is possible to retrieve the locale code currently being used by Tabulator using the getLocale function: */
+    /** It is possible to retrieve the locale code currently being used by Tabulator using the getLocale function: */
     getLocale: () => string;
-    /**You can then access these at any point using the getLang function, which will return the language object for the currently active locale. */
+    /** You can then access these at any point using the getLang function, which will return the language object for the currently active locale. */
     getLang: (locale?: string) => any;
-    /**If the size of the element containing the Tabulator changes (and you are not able to use the in built auto-resize functionality) or you create a table before its containing element is visible, it will necessary to redraw the table to make sure the rows and columns render correctly.
+    /** If the size of the element containing the Tabulator changes (and you are not able to use the in built auto-resize functionality) or you create a table before its containing element is visible, it will necessary to redraw the table to make sure the rows and columns render correctly.
 
     This can be done by calling the redraw method. For example, to trigger a redraw whenever the viewport width is changed.
 
     The redraw function also has an optional boolean argument that when set to true triggers a full rerender of the table including all data on all rows.*/
     redraw: (force?: boolean) => void;
-    /**If you want to manually change the height of the table at any time, you can use the setHeight function, which will also redraw the virtual DOM if necessary. */
+    /** If you want to manually change the height of the table at any time, you can use the setHeight function, which will also redraw the virtual DOM if necessary. */
     setHeight: (height: number) => void;
-    /**You can trigger sorting using the setSort function */
+    /** You can trigger sorting using the setSort function */
     setSort: (sortList: string | Tabulator.Sorter[], dir?: Tabulator.SortDirection) => void;
     getSorters: () => void;
-    /**To remove all sorting from the table, call the clearSort function. */
+    /** To remove all sorting from the table, call the clearSort function. */
     clearSort: () => void;
-    /**To set a filter you need to call the setFilter method, passing the field you wish to filter, the comparison type and the value to filter for.
+    /** To set a filter you need to call the setFilter method, passing the field you wish to filter, the comparison type and the value to filter for.
 
     This function will replace any exiting filters on the table with the specified filter 
     
     If you want to perform a more complicated filter then you can pass a callback function to the setFilter method, you can also pass an optional second argument, an object with parameters to be passed to the filter function.
     */
     setFilter: (p1: string | Tabulator.Filter[] | any[] | ((data: any, filterParams: any) => boolean), p2?: Tabulator.FilterType | {}, value?: any) => void;
-    /**If you want to add another filter to the existing filters then you can call the addFilter function: */
+    /** If you want to add another filter to the existing filters then you can call the addFilter function: */
     addFilter: Tabulator.FilterFunction;
-    /**You can retrieve an array of the current programtic filters using the getFilters function, this will not include any of the header filters: */
+    /** You can retrieve an array of the current programtic filters using the getFilters function, this will not include any of the header filters: */
     getFilters: (includeHeaderFilters: boolean) => Tabulator.Filter[];
-    /**You can programatically set the header filter value of a column by calling the setHeaderFilterValue function, This function takes any of the standard column component look up options as its first parameter, with the value for the header filter as the second option */
+    /** You can programatically set the header filter value of a column by calling the setHeaderFilterValue function, This function takes any of the standard column component look up options as its first parameter, with the value for the header filter as the second option */
     setHeaderFilterValue: (column: Tabulator.ColumnLookup, value: string) => void;
 
-    /**You can programatically set the focus on a header filter element by calling the setHeaderFilterFocus function, This function takes any of the standard column component look up options as its first parameter */
+    /** You can programatically set the focus on a header filter element by calling the setHeaderFilterFocus function, This function takes any of the standard column component look up options as its first parameter */
     setHeaderFilterFocus: (column: Tabulator.ColumnLookup) => void;
-    /**If you just want to retrieve the current header filters, you can use the getHeaderFilters function: */
+    /** If you just want to retrieve the current header filters, you can use the getHeaderFilters function: */
     getHeaderFilters: () => Tabulator.Filter[];
-    /**If you want to remove one filter from the current list of filters you can use the removeFilter function: */
+    /** If you want to remove one filter from the current list of filters you can use the removeFilter function: */
     removeFilter: Tabulator.FilterFunction;
-    /**To remove all filters from the table, use the clearFilter function. */
+    /** To remove all filters from the table, use the clearFilter function. */
     clearFilter: (includeHeaderFilters: boolean) => void;
-    /**To remove just the header filters, leaving the programatic filters in place, use the clearHeaderFilter function. */
+    /** To remove just the header filters, leaving the programatic filters in place, use the clearHeaderFilter function. */
     clearHeaderFilter: () => void;
-    /**To programmatically select a row you can use the selectRow function.
+    /** To programmatically select a row you can use the selectRow function.
 
     To select a specific row you can pass the any of the standard row component look up options into the first argument of the function. If you leave the argument blank you will select all rows (if you have set the selectable option to a numeric value, it will be ignored when selecting all rows). */
     selectRow: (row?: Tabulator.RowLookup) => void;
     deselectRow: (row?: Tabulator.RowLookup) => void;
     toggleSelectRow: (row?: Tabulator.RowLookup) => void;
-    /**To get the RowComponent's for the selected rows at any time you can use the getSelectedRows function.
+    /** To get the RowComponent's for the selected rows at any time you can use the getSelectedRows function.
 
   This will return an array of RowComponent's for the selected rows in the order in which they were selected. */
     getSelectedRows: () => Tabulator.RowComponent[];
-    /**To get the data objects for the selected rows you can use the getSelectedData function.
+    /** To get the data objects for the selected rows you can use the getSelectedData function.
 
     This will return an array of the selected rows data objects in the order in which they were selected */
     getSelectedData: () => any[];
-    /**set the maxmum page */
+    /** set the maxmum page */
     setMaxPage: (max: number) => void;
-    /**When pagination is enabled the table footer will contain a number of pagination controls for navigating through the data.
+    /** When pagination is enabled the table footer will contain a number of pagination controls for navigating through the data.
 
   In addition to these controls it is possible to change page using the setPage function 
   The setPage function takes one parameter, which should be an integer representing the page you wish to see. There are also four strings that you can pass into the parameter for special functions.
@@ -1632,43 +1613,40 @@ declare class Tabulator {
   The setPage method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data.
   */
     setPage: (page: number | "first" | "prev" | "next" | "last") => Promise<void>;
-    /**You can load the page for a specific row using the setPageToRow function and passing in any of the standard row component look up options for the row you want to scroll to.
-     *
-     * The setPageToRow method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data.
+    /** You can load the page for a specific row using the setPageToRow function and passing in any of the standard row component look up options for the row you want to scroll to.
+     ** The setPageToRow method returns a promise, this can be used to run any other commands that have to be run after the data has been loaded into the table. By running them in the promise you ensure they are only run after the table has loaded the data.
      */
     setPageToRow: (row: Tabulator.RowLookup) => Promise<void>;
 
-    /**You can change the page size at any point by using the setPageSize function. (this setting will be ignored if using remote pagination with the page size set by the server) */
+    /** You can change the page size at any point by using the setPageSize function. (this setting will be ignored if using remote pagination with the page size set by the server) */
     setPageSize: (size: number) => void;
-    /**To retrieve the number of rows allowed per page you can call the getPageSize function: */
+    /** To retrieve the number of rows allowed per page you can call the getPageSize function: */
     getPageSize: () => number;
-    /**You can change to show the previous page using the previousPage function. */
+    /** You can change to show the previous page using the previousPage function. */
     previousPage: () => Promise<void>;
-    /**You can change to show the next page using the previousPage function. */
+    /** You can change to show the next page using the previousPage function. */
 
     nextPage: () => Promise<void>;
-    /**To retrieve the current page use the getPage function. this will return the number of the current page. If pagination is disabled this will return false. */
+    /** To retrieve the current page use the getPage function. this will return the number of the current page. If pagination is disabled this will return false. */
     getPage: () => number | false;
-    /**To retrieve the maximum available page use the getPageMax function. this will return the number of the maximum available page. If pagination is disabled this will return false. */
+    /** To retrieve the maximum available page use the getPageMax function. this will return the number of the maximum available page. If pagination is disabled this will return false. */
     getPageMax: () => number | false;
-    /**You can use the setGroupBy function to change the fields that rows are grouped by. This function has one argument and takes the same values as passed to the groupBy setup option. */
+    /** You can use the setGroupBy function to change the fields that rows are grouped by. This function has one argument and takes the same values as passed to the groupBy setup option. */
     setGroupBy: (groups: string | ((data: any) => any)) => void;
-    /**You can use the setGroupStartOpen function to change the default open state of groups. This function has one argument and takes the same values as passed to the groupStartOpen setup option.
-     *
-     * Note: If you use the setGroupStartOpen or setGroupHeader before you have set any groups on the table, the table will not update until the setGroupBy function is called.
+    /** You can use the setGroupStartOpen function to change the default open state of groups. This function has one argument and takes the same values as passed to the groupStartOpen setup option.
+     ** Note: If you use the setGroupStartOpen or setGroupHeader before you have set any groups on the table, the table will not update until the setGroupBy function is called.
      */
     setGroupStartOpen: (values: boolean | ((value: any, count: number, data: any, group: Tabulator.GroupComponent) => boolean)) => void;
-    /**You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option. */
-    setGroupHeader: (values: ((value: any, count: number, data: any, group: Tabulator.GroupComponent) => string) | ((value: any, count: number, data: any) => string)[]) => void;
-    /**You can use the getGroups function to retrieve an array of all the first level Group Components in the table. */
+    /** You can use the setGroupHeader function to change the header generation function for each group. This function has one argument and takes the same values as passed to the groupHeader setup option. */
+    setGroupHeader: (values: ((value: any, count: number, data: any, group: Tabulator.GroupComponent) => string) | Array<(value: any, count: number, data: any) => string>) => void;
+    /** You can use the getGroups function to retrieve an array of all the first level Group Components in the table. */
     getGroups: () => Tabulator.GroupComponent[];
-    /**get grouped table data in the same format as getData() */
+    /** get grouped table data in the same format as getData() */
     getGroupedData: (activeOnly?: boolean) => any;
-    /**You can retrieve the results of the column calculations at any point using the getCalcResults function.
-     * For a table without grouped rows, this will return an object with top and bottom properties, that contain a row data object for all the columns in the table for the top calculations and bottom calculations respectively.
+    /** You can retrieve the results of the column calculations at any point using the getCalcResults function.* For a table without grouped rows, this will return an object with top and bottom properties, that contain a row data object for all the columns in the table for the top calculations and bottom calculations respectively.
      */
     getCalcResults: () => any;
-    /**Use the navigatePrev function to shift focus to the next editable cell on the left, if none available move to the right most editable cell on the row above.
+    /** Use the navigatePrev function to shift focus to the next editable cell on the left, if none available move to the right most editable cell on the row above.
    * 
    * Note: These actions will only work when a cell is editable and has focus.
 
@@ -1676,31 +1654,28 @@ declare class Tabulator {
    * 
    */
     navigatePrev: () => void;
-    /**Use the navigateNext function to shift focus to the next editable cell on the right, if none available move to left most editable cell on the row below.
-     * 
+    /** Use the navigateNext function to shift focus to the next editable cell on the right, if none available move to left most editable cell on the row below.* 
    * Note: These actions will only work when a cell is editable and has focus.
 
     Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
    * 
    */
     navigateNext: () => void;
-    /**Use the navigateLeft function to shift focus to next editable cell on the left, return false if none available on row.
-     * 
+    /** Use the navigateLeft function to shift focus to next editable cell on the left, return false if none available on row.* 
    * Note: These actions will only work when a cell is editable and has focus.
 
     Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
    * 
    */
     navigateLeft: () => void;
-    /**Use the navigateRight function to shift focus to next editable cell on the right, return false if none available on row.
-     * 
+    /** Use the navigateRight function to shift focus to next editable cell on the right, return false if none available on row.* 
    * Note: These actions will only work when a cell is editable and has focus.
 
     Note: Navigation commands will only focus on editable cells, that is cells with an editor and if present an editable function that returns true.
    * 
    */
     navigateRight: () => void;
-    /**Use the navigateUp function to shift focus to the same cell in the row above.
+    /** Use the navigateUp function to shift focus to the same cell in the row above.
 
    * Note: These actions will only work when a cell is editable and has focus.
 
@@ -1718,7 +1693,7 @@ declare class Tabulator {
    */
     navigateDown: () => void;
 
-    /**A lot of the modules come with a range of default settings to make setting up your table easier, for example the sorters, formatters and editors that ship with Tabulator as standard.
+    /** A lot of the modules come with a range of default settings to make setting up your table easier, for example the sorters, formatters and editors that ship with Tabulator as standard.
 
     If you are using a lot of custom settings over and over again (for example a custom sorter). you can end up re-delcaring it several time for different tables. To make your life easier Tabulator allows you to extend the default setup of each module to make your custom options as easily accessible as the defaults.
 
diff --git a/types/tabulator-tables/tabulator-tables-tests.ts b/types/tabulator-tables/tabulator-tables-tests.ts
index 470dce2c76..3a33817b4f 100644
--- a/types/tabulator-tables/tabulator-tables-tests.ts
+++ b/types/tabulator-tables/tabulator-tables-tests.ts
@@ -1,37 +1,40 @@
-//constructor
+// tslint:disable:no-object-literal-type-assertion
+// tslint:disable:whitespace
+
+// constructor
 let table = new Tabulator("#test");
 table.copyToClipboard("selection");
 table.searchRows("name", "<", 3);
 table.setFilter("name", "<=", 3);
 table.setFilter([
-    { field: "age", type: ">", value: 52 }, //filter by age greater than 52
-    { field: "height", type: "<", value: 142 }, //and by height less than 142
-    { field: "name", type: "in", value: ["steve", "bob", "jim"] } //name must be steve, bob or jim
+    { field: "age", type: ">", value: 52 }, // filter by age greater than 52
+    { field: "height", type: "<", value: 142 }, // and by height less than 142
+    { field: "name", type: "in", value: ["steve", "bob", "jim"] } // name must be steve, bob or jim
 ]);
 table.setFilter(
     (data, filterParams) => {
-        //data - the data for the row being filtered
-        //filterParams - params object passed to the filter
-        return data.name == "bob" && data.height < filterParams.height; //must return a boolean, true if it passes the filter.
+        // data - the data for the row being filtered
+        // filterParams - params object passed to the filter
+        return data.name === "bob" && data.height < filterParams.height; // must return a boolean, true if it passes the filter.
     },
     { height: 3 }
 );
 table.setFilter("age", "in", ["steve", "bob", "jim"]);
 table.setFilter([
-    { field: "age", type: ">", value: 52 }, //filter by age greater than 52
+    { field: "age", type: ">", value: 52 }, // filter by age greater than 52
     [
-        { field: "height", type: "<", value: 142 }, //with a height of less than 142
-        { field: "name", type: "=", value: "steve" } //or a name of steve
+        { field: "height", type: "<", value: 142 }, // with a height of less than 142
+        { field: "name", type: "=", value: "steve" } // or a name of steve
     ]
 ]);
 
 table
     .setPageToRow(12)
-    .then(function() {
-        //run code after table has been successfuly updated
+    .then(() => {
+        // run code after table has been successfuly updated
     })
-    .catch(function(error) {
-        //handle error loading data
+    .catch(error => {
+        // handle error loading data
     });
 
 table.setGroupBy("gender");
@@ -45,48 +48,50 @@ table.setGroupHeader((value, count, data) => {
 });
 
 table.setSort([
-    { column: "age", dir: "asc" }, //sort by this first
-    { column: "height", dir: "desc" } //then sort by this second
+    { column: "age", dir: "asc" }, // sort by this first
+    { column: "height", dir: "desc" } // then sort by this second
 ]);
 
 table
     .scrollToColumn("age", "middle", false)
-    .then(function() {
-        //run code after column has been scrolled to
+    .then(() => {
+        // run code after column has been scrolled to
     })
-    .catch(function(error) {
-        //handle error scrolling to column
+    .catch(error => {
+        // handle error scrolling to column
     });
 
 table
     .updateOrAddData([{ id: 1, name: "bob" }, { id: 3, name: "steve" }])
-    .then(function(rows) {
-        //rows - array of the row components for the rows updated or added
-        //run code after data has been updated
+    .then(rows => {
+        // rows - array of the row components for the rows updated or added
+        // run code after data has been updated
     })
-    .catch(function(error) {
-        //handle error updating data
+    .catch(error => {
+        // handle error updating data
     });
 
 table.updateData([{ id: 1, name: "bob", gender: "male" }, { id: 2, name: "Jenny", gender: "female" }]);
 table
     .updateData([{ id: 1, name: "bob" }])
-    .then(function() {
-        //run code after data has been updated
+    .then(() => {
+        // run code after data has been updated
     })
-    .catch(function(error) {
-        //handle error updating data
+    .catch(error => {
+        // handle error updating data
     });
 
 let row1: Tabulator.RowComponent;
 let row2: Tabulator.RowComponent;
 
-//column definitions
-let colDef: Tabulator.ColumnDefinition = {} as Tabulator.ColumnDefinition;
-colDef.title = "title";
+// column definitions
+let colDef: Tabulator.ColumnDefinition = { title: "title" };
 colDef.sorter = customSorter;
 
-function customSorter(a: any, b: any, aRow: Tabulator.RowComponent, bRow: Tabulator.RowComponent, column: Tabulator.ColumnComponent, dir: Tabulator.SortDirection, sorterParams: Tabulator.ColumnDefinitionSorterParams): number {
+// prettier-ignore
+function customSorter(a: any, b: any, aRow: Tabulator.RowComponent,
+    bRow: Tabulator.RowComponent, column: Tabulator.ColumnComponent,
+    dir: Tabulator.SortDirection, sorterParams: Tabulator.ColumnDefinitionSorterParams): number {
     return 1;
 }
 
@@ -101,20 +106,20 @@ colDef.formatterParams = {
 };
 
 colDef.formatterParams = cell => {
-    //cell - the cell component
+    // cell - the cell component
 
-    //do some processing and return the param object
+    // do some processing and return the param object
     return { param1: "green" };
 };
 
-//List lookup
+// List lookup
 colDef.formatterParams = {
     small: "Cute",
     medium: "Fine",
     big: 2,
     huge: true
 };
-//Custom Formatter
+// Custom Formatter
 colDef.formatter = (cell: Tabulator.CellComponent, formatterParams: {}, onRendered) => {
     onRendered = () => {};
     return "";
@@ -122,33 +127,33 @@ colDef.formatter = (cell: Tabulator.CellComponent, formatterParams: {}, onRender
 
 colDef.editor = true;
 colDef.editor = "number";
-colDef.editor = function(cell, onRendered, success, cancel, editorParams) {
-    //cell - the cell component for the editable cell
-    //onRendered - function to call when the editor has been rendered
-    //success - function to call to pass the successfuly updated value to Tabulator
-    //cancel - function to call to abort the edit and return to a normal cell
-    //editorParams - params object passed into the editorParams column definition property
+colDef.editor = (cell, onRendered, success, cancel, editorParams) => {
+    // cell - the cell component for the editable cell
+    // onRendered - function to call when the editor has been rendered
+    // success - function to call to pass the successfuly updated value to Tabulator
+    // cancel - function to call to abort the edit and return to a normal cell
+    // editorParams - params object passed into the editorParams column definition property
 
-    //create and style editor
-    var editor = document.createElement("input");
+    // create and style editor
+    const editor = document.createElement("input");
 
     editor.setAttribute("type", "date");
 
-    //create and style input
+    // create and style input
     editor.style.padding = "3px";
     editor.style.width = "100%";
     editor.style.boxSizing = "border-box";
 
-    //Set value of editor to the current value of the cell
+    // Set value of editor to the current value of the cell
     editor.value = moment(cell.getValue(), "DD/MM/YYYY");
 
-    //set focus on the select box when the editor is selected (timeout allows for editor to be added to DOM)
-    onRendered(function() {
+    // set focus on the select box when the editor is selected (timeout allows for editor to be added to DOM)
+    onRendered(() => {
         editor.focus();
         editor.style.cssText = "100%";
     });
 
-    //when the value has been set, trigger the cell to update
+    // when the value has been set, trigger the cell to update
     function successFunc() {
         success(moment(editor.value, "YYYY-MM-DD"));
     }
@@ -156,10 +161,10 @@ colDef.editor = function(cell, onRendered, success, cancel, editorParams) {
     editor.addEventListener("change", successFunc);
     editor.addEventListener("blur", successFunc);
 
-    //return the editor element
+    // return the editor element
     return editor;
 };
-//Dummy function
+// Dummy function
 function moment(a: any, b: any) {
     return "";
 }
@@ -174,10 +179,10 @@ colDef.editorParams = {};
 colDef.editorParams = {
     values: [
         {
-            //option group
+            // option group
             label: "Men",
             options: [
-                //options in option group
+                // options in option group
                 {
                     label: "Steve Boberson",
                     value: "steve"
@@ -189,10 +194,10 @@ colDef.editorParams = {
             ]
         },
         {
-            //option group
+            // option group
             label: "Women",
             options: [
-                //options in option group
+                // options in option group
                 {
                     label: "Jenny Jillerson",
                     value: "jenny"
@@ -204,7 +209,7 @@ colDef.editorParams = {
             ]
         },
         {
-            //ungrouped option
+            // ungrouped option
             label: "Other",
             value: "other"
         }
@@ -221,34 +226,34 @@ colDef.editorParams = {
     values: selectParamValues
 };
 
-colDef.editorParams = function(cell) {
+colDef.editorParams = cell => {
     return {};
 };
 
 let autoComplete: Tabulator.AutoCompleteParams = {
-    showListOnEmpty: true, //show all values when the list is empty,
-    freetext: true, //allow the user to set the value of the cell to a free text entry
-    allowEmpty: true, //allow empty string values
+    showListOnEmpty: true, // show all values when the list is empty,
+    freetext: true, // allow the user to set the value of the cell to a free text entry
+    allowEmpty: true, // allow empty string values
     searchFunc: (term, values) => {
-        //search for exact matches
-        var matches: string[] = [];
+        // search for exact matches
+        const matches: string[] = [];
         return matches;
     },
-    listItemFormatter: function(value, title) {
-        //prefix all titles with the work "Mr"
+    listItemFormatter: (value, title) => {
+        // prefix all titles with the work "Mr"
         return "Mr " + title;
     },
-    values: true //create list of values from all values contained in this column
+    values: true // create list of values from all values contained in this column
 };
 colDef.editorParams = autoComplete;
 
 colDef.editorParams = {
     values: [
         {
-            //option group
+            // option group
             label: "Men",
             options: [
-                //options in option group
+                // options in option group
                 {
                     label: "Steve Boberson",
                     value: "steve"
@@ -260,10 +265,10 @@ colDef.editorParams = {
             ]
         },
         {
-            //option group
+            // option group
             label: "Women",
             options: [
-                //options in option group
+                // options in option group
                 {
                     label: "Jenny Jillerson",
                     value: "jenny"
@@ -275,14 +280,14 @@ colDef.editorParams = {
             ]
         },
         {
-            //ungrouped option
+            // ungrouped option
             label: "Other",
             value: "other"
         }
     ]
 };
 
-//Validators
+// Validators
 colDef.validator = {
     type: (cell, value, parameters) => {
         return true;
@@ -306,59 +311,60 @@ let validators: Tabulator.Validator[] = [
 
 colDef.headerFilterFunc = "!=";
 colDef.headerFilterFunc = (headerValue, rowValue, rowData, filterParams) => {
-    return rowData.name == filterParams.name && rowValue < headerValue; //must return a boolean, true if it passes the filter.
+    return rowData.name === filterParams.name && rowValue < headerValue; // must return a boolean, true if it passes the filter.
 };
 
-//Cell Component
-let cell: Tabulator.CellComponent = {} as Tabulator.CellComponent;
+// Cell Component
+
+let cell = <Tabulator.CellComponent>{};
 cell.nav().down();
 
 let data = cell.getData();
 table = cell.getTable();
 
-//Row Component
-let row: Tabulator.RowComponent = {} as Tabulator.RowComponent;
+// Row Component
+let row = <Tabulator.RowComponent>{};
 row.delete()
-    .then(function() {
-        //run code after row has been deleted
+    .then(() => {
+        // run code after row has been deleted
     })
-    .catch(function(error) {
-        //handle error deleting row
+    .catch(error => {
+        // handle error deleting row
     });
 
-//Options
-let options: Tabulator.Options = {} as Tabulator.Options;
+// Options
+let options = <Tabulator.Options>{};
 options.keybindings = {
     navPrev: "ctrl + 1",
     navNext: false
 };
 
 options.downloadDataFormatter = data => {
-    // data.forEach(function(row){
-    //   row.age = row.age >= 18 ? "adult" : "child";
+    //  data.forEach(function(row){
+    //    row.age = row.age >= 18 ? "adult" : "child";
 };
 
 options.downloadConfig = {
-    columnGroups: false, //include column groups in column headers for download
-    rowGroups: false, //do not include row groups in download
-    columnCalcs: false //do not include column calculation rows in download
+    columnGroups: false, // include column groups in column headers for download
+    rowGroups: false, // do not include row groups in download
+    columnCalcs: false // do not include column calculation rows in download
 };
 
 options.ajaxConfig = "GET";
 options.ajaxConfig = {
-    mode: "cors", //set request mode to cors
-    credentials: "same-origin", //send cookies with the request from the matching origin
+    mode: "cors", // set request mode to cors
+    credentials: "same-origin", // send cookies with the request from the matching origin
     headers: {
-        Accept: "application/json", //tell the server we need JSON back
-        "X-Requested-With": "XMLHttpRequest", //fix to help some frameworks respond correctly to request
-        "Content-type": "application/json; charset=utf-8", //set the character encoding of the request
-        "Access-Control-Allow-Origin": "http://yout-site.com" //the URL origin of the site making the request
+        Accept: "application/json", // tell the server we need JSON back
+        "X-Requested-With": "XMLHttpRequest", // fix to help some frameworks respond correctly to request
+        "Content-type": "application/json; charset=utf-8", // set the character encoding of the request
+        "Access-Control-Allow-Origin": "http:// yout-site.com" // the URL origin of the site making the request
     }
 };
 options.ajaxConfig = {
-    method: "POST", //set request type to Position
+    method: "POST", // set request type to Position
     headers: {
-        "Content-type": "application/json; charset=utf-8" //set specific content type
+        "Content-type": "application/json; charset=utf-8" // set specific content type
     }
 };
 
@@ -366,16 +372,16 @@ options.ajaxContentType = {
     headers: {
         "Content-Type": "text/html"
     },
-    body: function(url, config, params) {
-        //url - the url of the request
-        //config - the fetch config object
-        //params - the request parameters
+    body: (url, config, params) => {
+        // url - the url of the request
+        // config - the fetch config object
+        // params - the request parameters
 
-        //return comma list of params:values
-        var output = [];
+        // return comma list of params:values
+        const output = [];
 
-        for (var key in params) {
-            output.push(key + ":" + params[key]);
+        for (const key in params) {
+            output.push(`${key} ":" ${params[key]}`);
         }
 
         return output.join(",");
@@ -385,31 +391,31 @@ options.ajaxContentType = {
 options.initialSort = [{ column: "name", dir: "asc" }, { column: "name2", dir: "desc" }];
 options.initialFilter = [{ field: "color", type: "=", value: "red" }];
 options.initialHeaderFilter = [
-    { field: "color", value: "red" } //set the initial value of the header filter to "red"
+    { field: "color", value: "red" } // set the initial value of the header filter to "red"
 ];
 
 options.groupValues = [
-    ["red", "blue", "green"], //create groups for color values of "red", "blue", and "green",
-    [10, 20, 30] //create sub groups for ages of 10, 20 and 30
+    ["red", "blue", "green"], // create groups for color values of "red", "blue", and "green",
+    [10, 20, 30] // create sub groups for ages of 10, 20 and 30
 ];
 
 options.groupHeader = (value, count, data, group) => {
-    //value - the value all members of this group share
-    //count - the number of rows in this group
-    //data - an array of all the row data objects in this group
-    //group - the group component for the group
+    // value - the value all members of this group share
+    // count - the number of rows in this group
+    // data - an array of all the row data objects in this group
+    // group - the group component for the group
 
-    return value + "<span style='color:#d00; margin-left:10px;'>(" + count + " item)</span>";
+    return `${value} <span style='color:#d00; margin-left:10px;'>(${count}item)</span>`;
 };
 
 options.groupHeader = [
-    function(value, count, data) {
-        //generate header contents for gender groups
-        return value + "<span style='color:#d00; margin-left:10px;'>(" + count + " item)</span>";
+    (value, count, data) => {
+        // generate header contents for gender groups
+        return `${value} <span style='color:#d00; margin-left:10px;'>(${count}item)</span>`;
     },
-    function(value, count, data) {
-        //generate header contents for color groups
-        return value + "<span style='color:#0dd; margin-left:10px;'>(" + count + " item)</span>";
+    (value, count, data) => {
+        // generate header contents for color groups
+        return `${value} <span style='color:#0dd; margin-left:10px;'>(${count}item)</span>`;
     }
 ];
 
@@ -419,7 +425,7 @@ options.paginationDataReceived = {
 };
 
 options.clipboardPasteParser = clipboard => {
-    return []; //return array
+    return []; // return array
 };
 
 options.cellEditing = cell => {

From 7ea404d70bf96f7530d2f402913cc6a58317a383 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:49:56 +1100
Subject: [PATCH 442/924] Added type defs for is-date-object

---
 types/is-date-object/index.d.ts              |  8 +++++++
 types/is-date-object/is-date-object-tests.ts | 14 +++++++++++
 types/is-date-object/tsconfig.json           | 25 ++++++++++++++++++++
 types/is-date-object/tslint.json             |  3 +++
 4 files changed, 50 insertions(+)
 create mode 100644 types/is-date-object/index.d.ts
 create mode 100644 types/is-date-object/is-date-object-tests.ts
 create mode 100644 types/is-date-object/tsconfig.json
 create mode 100644 types/is-date-object/tslint.json

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
new file mode 100644
index 0000000000..08885dce51
--- /dev/null
+++ b/types/is-date-object/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-date-object 1.0
+// Project: https://github.com/ljharb/is-date-object
+// Definitions by:  Adam Zerella <https://github.com/adamzerella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isDateObject(value?: any): boolean;
+
+export = isDateObject;
diff --git a/types/is-date-object/is-date-object-tests.ts b/types/is-date-object/is-date-object-tests.ts
new file mode 100644
index 0000000000..68fb22d684
--- /dev/null
+++ b/types/is-date-object/is-date-object-tests.ts
@@ -0,0 +1,14 @@
+import isDate = require("is-date-object");
+
+isDate();
+isDate(undefined);
+isDate(null);
+isDate(false);
+isDate(true);
+isDate(42);
+isDate('foo');
+isDate([]);
+isDate({});
+isDate(/a/g);
+isDate(new RegExp('a', 'g'));
+isDate(new Date());
diff --git a/types/is-date-object/tsconfig.json b/types/is-date-object/tsconfig.json
new file mode 100644
index 0000000000..7c42b57df2
--- /dev/null
+++ b/types/is-date-object/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+        "../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "is-date-object-tests.ts"
+    ]
+}
diff --git a/types/is-date-object/tslint.json b/types/is-date-object/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/is-date-object/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 56de1e479c09182b87d995775b1397dccebe6f0e Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:17:47 +1100
Subject: [PATCH 443/924] Updated any type to unknown

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

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 08885dce51..da3444ad91 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -2,7 +2,8 @@
 // Project: https://github.com/ljharb/is-date-object
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
 
-declare function isDateObject(value?: any): boolean;
+declare function isDateObject(value?: unknown): boolean;
 
 export = isDateObject;

From 28e01537831d35cdafce4d4ac8e6cc89d413bc8f Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Wed, 6 Mar 2019 16:17:47 +1100
Subject: [PATCH 444/924] Updated any type to unknown

---
 types/is-date-object/index.d.ts              | 6 +++++-
 types/is-date-object/is-date-object-tests.ts | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index da3444ad91..4564b5e34b 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -4,6 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
-declare function isDateObject(value?: unknown): boolean;
+type InvalidTypes = undefined | null | boolean | string | number | [] | {};
+
+declare function isDateObject(value: Date): true;
+declare function isDateObject(value: InvalidTypes | unknown): false;
+declare function isDateObject(value?: unknown): false;
 
 export = isDateObject;
diff --git a/types/is-date-object/is-date-object-tests.ts b/types/is-date-object/is-date-object-tests.ts
index 68fb22d684..9946c42d54 100644
--- a/types/is-date-object/is-date-object-tests.ts
+++ b/types/is-date-object/is-date-object-tests.ts
@@ -7,6 +7,7 @@ isDate(false);
 isDate(true);
 isDate(42);
 isDate('foo');
+isDate((): void => {});
 isDate([]);
 isDate({});
 isDate(/a/g);

From 0454d3a6a6c0c4559e55752091b41512737131b5 Mon Sep 17 00:00:00 2001
From: "Adam A. Zerella" <adamzerella@users.noreply.github.com>
Date: Thu, 7 Mar 2019 12:18:39 +1100
Subject: [PATCH 445/924] Updated return type for unknown param value

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

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 4564b5e34b..55865a2a2e 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -7,7 +7,7 @@
 type InvalidTypes = undefined | null | boolean | string | number | [] | {};
 
 declare function isDateObject(value: Date): true;
-declare function isDateObject(value: InvalidTypes | unknown): false;
-declare function isDateObject(value?: unknown): false;
+declare function isDateObject(value: InvalidTypes | unknown): boolean;
+declare function isDateObject(value?: unknown): boolean;
 
 export = isDateObject;

From 44c10e7262bd247dfce56590136beebd13ec49c3 Mon Sep 17 00:00:00 2001
From: Alan Choi <alan.choi@sendbird.com>
Date: Thu, 7 Mar 2019 10:13:58 +0900
Subject: [PATCH 446/924] keep element type when string literal array passed

When select options is an array of string literal union type, select must return the same type of value.
---
 types/storybook__addon-knobs/index.d.ts                |  1 +
 .../storybook__addon-knobs-tests.tsx                   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index 3aab101f74..dbfd84a13d 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -52,6 +52,7 @@ export function object<T>(name: string, value: T, groupId?: string): T;
 export function radios<T>(name: string, options: { [s: string]: T }, value?: T, groupId?: string): string;
 
 export function select<T>(name: string, options: { [s: string]: T }, value: T, groupId?: string): T;
+export function select<T extends string>(name: string, options: ReadonlyArray<T>, value: T, groupId?: string): T;
 export function select(name: string, options: ReadonlyArray<string>, value: string, groupId?: string): string;
 
 export function date(name: string, value?: Date, groupId?: string): Date;
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index 75ab4c79a9..d09447f75d 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -94,7 +94,15 @@ stories.add('dynamic knobs', () => {
 });
 
 const readonlyOptionsArray: ReadonlyArray<string> = ['hi'];
-select('With readonly array', readonlyOptionsArray, readonlyOptionsArray[0]);
+select('With readonly string array', readonlyOptionsArray, readonlyOptionsArray[0]);
+
+type StringLiteralType = 'Apple' | 'Banana' | 'Grapes';
+const stringLiteralArray: StringLiteralType[] = ['Apple', 'Banana', 'Grapes'];
+
+let selectedFruit: StringLiteralType;
+
+// type of value returned from `select` must be `StringLiteralType`.
+selectedFruit = select('With string literal array', stringLiteralArray, stringLiteralArray[0]);
 
 const optionsObject = {
   Apple: { taste: 'sweet', color: 'red' },

From 2bbab68802af8be26a4f268f25764bc7f7c80c32 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Thu, 7 Mar 2019 13:57:30 +1100
Subject: [PATCH 447/924] Update types/is-date-object/index.d.ts

Co-Authored-By: adamzerella <me@adamzerella.com>
---
 types/is-date-object/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 55865a2a2e..3ad24b15af 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -8,6 +8,7 @@ type InvalidTypes = undefined | null | boolean | string | number | [] | {};
 
 declare function isDateObject(value: Date): true;
 declare function isDateObject(value: InvalidTypes | unknown): boolean;
-declare function isDateObject(value?: unknown): boolean;
+declare function isDateObject(value?: object): boolean;
+declare function isDateObject(value?: null | undefined | boolean | string | number | symbol | bigint | Array | Function): false; 
 
 export = isDateObject;

From b11d95d4336819d9f36703248bd87b6772e30ee1 Mon Sep 17 00:00:00 2001
From: Adam Zerella <me@adamzerella.com>
Date: Thu, 7 Mar 2019 13:58:48 +1100
Subject: [PATCH 448/924] Update index.d.ts

---
 types/is-date-object/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 3ad24b15af..52b2f3ac84 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -4,10 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
-type InvalidTypes = undefined | null | boolean | string | number | [] | {};
-
 declare function isDateObject(value: Date): true;
-declare function isDateObject(value: InvalidTypes | unknown): boolean;
 declare function isDateObject(value?: object): boolean;
 declare function isDateObject(value?: null | undefined | boolean | string | number | symbol | bigint | Array | Function): false; 
 

From 585d4ff9650d7eec6bffab2d4bfc019ed4e233d0 Mon Sep 17 00:00:00 2001
From: jgresham <jgresham@cisco.com>
Date: Wed, 6 Mar 2019 19:06:13 -0800
Subject: [PATCH 449/924] Highcharts.ganttChart(). Initial types for basic
 gantt chart

---
 types/highcharts/index.d.ts    | 19 ++++++++++++++++---
 types/highcharts/test/index.ts | 30 ++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 51028bd6af..2c4b14c797 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -4,6 +4,7 @@
 //                 Dan Lewi Harkestad <https://github.com/baltie>
 //                 Albert Ozimek <https://github.com/AlbertOzimek>
 //                 Juliën Hanssens <https://github.com/hanssens>
+//                 Johns Gresham <https://github.com/jgresham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -6018,7 +6019,11 @@ declare namespace Highcharts {
          * The id of a series in the drilldown.series array to use for a drilldown for this point.
          * @since 3.0.8
          */
-        drilldown?: string;
+				drilldown?: string;
+				/**
+				 * The end value of the point. For gantt datetime axes, the end value is the timestamp in milliseconds since 1970.
+				 */
+				end?: number;
         /**
          * Individual point events
          */
@@ -6097,7 +6102,11 @@ declare namespace Highcharts {
          * Whether to display a slice offset from the center.
          * @default false
          */
-        sliced?: boolean;
+				sliced?: boolean;
+				/**
+				 * The start value of the point. For gantt datetime axes, the start value is the timestamp in milliseconds since 1970.
+				 */
+				start?: number;
         /**
          * The value of the point, resulting in a relative area of the point in the treemap.
          */
@@ -7256,7 +7265,11 @@ declare namespace Highcharts {
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-        chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+				chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+				/**
+				 * Highcharts ganttChart which doesn't require the new keyword. Required Highcharts Gantt module.
+				 */
+				ganttChart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
         /**
          * An array containing the current chart objects in the page. A chart's position in the array is preserved
          * throughout the page's lifetime. When a chart is destroyed, the array item becomes undefined.
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index 1474ee7e9c..9ac03d1f81 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2856,3 +2856,33 @@ function test_WrapTooltipBehavior() {
         // Many prototype functions use this so arrow functions should only be used to replace behaviors.
     });
 }
+
+// Tests Highcharts.ganttChart, which usings the Gantt module
+function test_GanttChart() {
+	Highcharts.ganttChart('ganttChartContainer', {
+		xAxis: {
+			min: Date.UTC(2014, 9, 18),
+			max: Date.UTC(2014, 12, 20)
+		},
+		series: [{
+			name: 'Project 1',
+			data: [
+				{
+					name: 'Lemon Tea',
+					start: Date.UTC(2014, 10, 18),
+					end: Date.UTC(2014, 11, 20)
+				},
+				{
+					name: 'Stapler',
+					start: Date.UTC(2014, 11, 18),
+					end: Date.UTC(2014, 12, 20)
+				},
+				{
+					name: 'Sierra',
+					start: Date.UTC(2014, 12, 18),
+					end: Date.UTC(2014, 12, 20)
+				},
+			],
+		}],
+	});
+}

From 7d67be826cc8c13f7cd238167204704a9408a045 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 6 Mar 2019 19:33:09 -0800
Subject: [PATCH 450/924] Try to add conditional update-codeowners to travis

---
 .travis.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9bd31bda14..fa657d16d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,3 +6,15 @@ sudo: false
 
 notifications:
   email: false
+
+jobs:
+  include:
+    - stage: build
+      script: npm install
+      script: npm run build
+      script: npm run test
+    - stage: codeowners
+      script: npm run update-codeowners
+stages:
+ - name: codeowners
+   if: env(TRAVIS_EVENT_TYPE) = cron
\ No newline at end of file

From 704068364b2b32773ca32a8b2178625dec4715f7 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Thu, 7 Mar 2019 14:26:10 +0800
Subject: [PATCH 451/924] [amap-js-api] merge test file & update lint rule

---
 types/amap-js-api/amap-js-api-tests.ts        | 3376 +++++++++++++++++
 types/amap-js-api/index.d.ts                  |    2 +-
 types/amap-js-api/overlay/markerShape.d.ts    |    2 +-
 types/amap-js-api/test/arryBounds.ts          |   18 -
 types/amap-js-api/test/bounds.ts              |   30 -
 types/amap-js-api/test/browser.ts             |  141 -
 types/amap-js-api/test/convert-from.ts        |   25 -
 types/amap-js-api/test/dom-util.ts            |   47 -
 types/amap-js-api/test/event.ts               |   74 -
 types/amap-js-api/test/geometry-util.ts       |  158 -
 types/amap-js-api/test/layer/buildings.ts     |   40 -
 types/amap-js-api/test/layer/canvasLayer.ts   |   53 -
 types/amap-js-api/test/layer/flexible.ts      |   54 -
 types/amap-js-api/test/layer/imageLayer.ts    |   51 -
 types/amap-js-api/test/layer/layer.ts         |   34 -
 types/amap-js-api/test/layer/layerGroup.ts    |  115 -
 types/amap-js-api/test/layer/massMarks.ts     |   83 -
 types/amap-js-api/test/layer/tileLayer.ts     |   60 -
 types/amap-js-api/test/layer/videoLayer.ts    |   51 -
 types/amap-js-api/test/layer/wms.ts           |   89 -
 types/amap-js-api/test/layer/wmts.ts          |   69 -
 types/amap-js-api/test/lnglat.ts              |   48 -
 types/amap-js-api/test/map.ts                 |  338 --
 types/amap-js-api/test/overlay/bezierCurve.ts |  155 -
 types/amap-js-api/test/overlay/circle.ts      |  150 -
 types/amap-js-api/test/overlay/contextMenu.ts |   48 -
 types/amap-js-api/test/overlay/ellipse.ts     |  117 -
 types/amap-js-api/test/overlay/geoJSON.ts     |  106 -
 types/amap-js-api/test/overlay/icon.ts        |   32 -
 types/amap-js-api/test/overlay/infoWindow.ts  |   81 -
 types/amap-js-api/test/overlay/marker.ts      |  195 -
 types/amap-js-api/test/overlay/markerShape.ts |   26 -
 types/amap-js-api/test/overlay/overlay.ts     |   27 -
 .../amap-js-api/test/overlay/overlayGroup.ts  |  108 -
 types/amap-js-api/test/overlay/polygon.ts     |  123 -
 types/amap-js-api/test/overlay/polyline.ts    |  139 -
 types/amap-js-api/test/overlay/rectangle.ts   |  121 -
 types/amap-js-api/test/overlay/text.ts        |  169 -
 types/amap-js-api/test/pixel.ts               |   42 -
 types/amap-js-api/test/preset.ts              |   29 -
 types/amap-js-api/test/size.ts                |   16 -
 types/amap-js-api/test/util.ts                |   79 -
 types/amap-js-api/test/view2d.ts              |   22 -
 types/amap-js-api/tsconfig.json               |   43 +-
 types/amap-js-api/tslint.json                 |    9 +-
 45 files changed, 3381 insertions(+), 3414 deletions(-)
 create mode 100644 types/amap-js-api/amap-js-api-tests.ts
 delete mode 100644 types/amap-js-api/test/arryBounds.ts
 delete mode 100644 types/amap-js-api/test/bounds.ts
 delete mode 100644 types/amap-js-api/test/browser.ts
 delete mode 100644 types/amap-js-api/test/convert-from.ts
 delete mode 100644 types/amap-js-api/test/dom-util.ts
 delete mode 100644 types/amap-js-api/test/event.ts
 delete mode 100644 types/amap-js-api/test/geometry-util.ts
 delete mode 100644 types/amap-js-api/test/layer/buildings.ts
 delete mode 100644 types/amap-js-api/test/layer/canvasLayer.ts
 delete mode 100644 types/amap-js-api/test/layer/flexible.ts
 delete mode 100644 types/amap-js-api/test/layer/imageLayer.ts
 delete mode 100644 types/amap-js-api/test/layer/layer.ts
 delete mode 100644 types/amap-js-api/test/layer/layerGroup.ts
 delete mode 100644 types/amap-js-api/test/layer/massMarks.ts
 delete mode 100644 types/amap-js-api/test/layer/tileLayer.ts
 delete mode 100644 types/amap-js-api/test/layer/videoLayer.ts
 delete mode 100644 types/amap-js-api/test/layer/wms.ts
 delete mode 100644 types/amap-js-api/test/layer/wmts.ts
 delete mode 100644 types/amap-js-api/test/lnglat.ts
 delete mode 100644 types/amap-js-api/test/map.ts
 delete mode 100644 types/amap-js-api/test/overlay/bezierCurve.ts
 delete mode 100644 types/amap-js-api/test/overlay/circle.ts
 delete mode 100644 types/amap-js-api/test/overlay/contextMenu.ts
 delete mode 100644 types/amap-js-api/test/overlay/ellipse.ts
 delete mode 100644 types/amap-js-api/test/overlay/geoJSON.ts
 delete mode 100644 types/amap-js-api/test/overlay/icon.ts
 delete mode 100644 types/amap-js-api/test/overlay/infoWindow.ts
 delete mode 100644 types/amap-js-api/test/overlay/marker.ts
 delete mode 100644 types/amap-js-api/test/overlay/markerShape.ts
 delete mode 100644 types/amap-js-api/test/overlay/overlay.ts
 delete mode 100644 types/amap-js-api/test/overlay/overlayGroup.ts
 delete mode 100644 types/amap-js-api/test/overlay/polygon.ts
 delete mode 100644 types/amap-js-api/test/overlay/polyline.ts
 delete mode 100644 types/amap-js-api/test/overlay/rectangle.ts
 delete mode 100644 types/amap-js-api/test/overlay/text.ts
 delete mode 100644 types/amap-js-api/test/pixel.ts
 delete mode 100644 types/amap-js-api/test/preset.ts
 delete mode 100644 types/amap-js-api/test/size.ts
 delete mode 100644 types/amap-js-api/test/util.ts
 delete mode 100644 types/amap-js-api/test/view2d.ts

diff --git a/types/amap-js-api/amap-js-api-tests.ts b/types/amap-js-api/amap-js-api-tests.ts
new file mode 100644
index 0000000000..41b0638526
--- /dev/null
+++ b/types/amap-js-api/amap-js-api-tests.ts
@@ -0,0 +1,3376 @@
+/**
+ * preset.ts
+ */
+
+declare const map: AMap.Map;
+declare const lnglat: AMap.LngLat;
+declare const size: AMap.Size;
+declare const lnglatTuple: [number, number];
+declare const pixel: AMap.Pixel;
+declare const markerShape: AMap.MarkerShape;
+declare const icon: AMap.Icon;
+declare const bounds: AMap.Bounds;
+declare const div: HTMLDivElement;
+declare const lang: AMap.Lang;
+declare const domEle: HTMLElement;
+declare const canvasEle: HTMLCanvasElement;
+declare const imgEle: HTMLImageElement;
+
+declare const circle: AMap.Circle;
+declare const marker: AMap.Marker;
+declare const layer: AMap.Layer;
+declare const tileLayer: AMap.TileLayer;
+declare const massMarksLayer: AMap.MassMarks;
+
+// declare const videoLayer: AMap.VideoLayer;
+// declare const buildings: AMap.Buildings;
+// declare const canvasLayer: AMap.CanvasLayer;
+// declare const flexible: AMap.TileLayer.Flexible;
+// declare const imageLayer: AMap.ImageLayer;
+// declare const tileLayerGroup: AMap.LayerGroup<AMap.TileLayer>;
+// declare const layerGroup: AMap.LayerGroup;
+// declare const trafficLayer: AMap.TileLayer.Traffic;
+// declare const bezierCurve: AMap.BezierCurve;
+// declare const contextMenu: AMap.ContextMenu;
+// declare const polyline: AMap.Polyline;
+// declare const polygon: AMap.Polygon;
+
+/**
+ * arryBounds.ts
+ */
+
+// $ExpectType ArrayBounds
+const testArrayBounds = new AMap.ArrayBounds([lnglat, lnglat, lnglat]);
+
+// $ExpectType LngLat[]
+testArrayBounds.bounds;
+
+// $ExpectType boolean
+testArrayBounds.contains(lnglat);
+
+// $ExpectType Bounds
+testArrayBounds.toBounds();
+
+// $ExpectType LngLat
+testArrayBounds.getCenter();
+
+/**
+ * bounds.ts
+ */
+
+// $ExpectType Bounds
+const testBounds = new AMap.Bounds(lnglat, lnglat);
+
+// $ExpectType boolean
+testBounds.contains(lnglat);
+// $ExpectType boolean
+testBounds.contains(lnglatTuple);
+
+// $ExpectType LngLat
+testBounds.getCenter();
+
+// $ExpectType LngLat
+testBounds.getSouthWest();
+
+// $ExpectType LngLat
+testBounds.getSouthEast();
+
+// $ExpectType LngLat
+testBounds.getNorthEast();
+
+// $ExpectType LngLat
+testBounds.getNorthWest();
+
+// $ExpectType string
+testBounds.toString();
+
+/**
+ * browser.ts
+ */
+
+const brwoser = AMap.Browser;
+
+// $ExpectType string
+brwoser.ua;
+
+// $ExpectType boolean
+brwoser.mobile;
+
+const plat: 'android' | 'ios' | 'windows' | 'mac' | 'other' = brwoser.plat;
+
+// $ExpectType boolean
+brwoser.mac;
+
+// $ExpectType boolean
+brwoser.windows;
+
+// $ExpectType boolean
+brwoser.ios;
+
+// $ExpectType boolean
+brwoser.iPad;
+
+// $ExpectType boolean
+brwoser.iPhone;
+
+// $ExpectType boolean
+brwoser.android;
+
+// $ExpectType boolean
+brwoser.android23;
+
+// $ExpectType boolean
+brwoser.chrome;
+
+// $ExpectType boolean
+brwoser.firefox;
+
+// $ExpectType boolean
+brwoser.safari;
+
+// $ExpectType boolean
+brwoser.wechat;
+
+// $ExpectType boolean
+brwoser.uc;
+
+// $ExpectType boolean
+brwoser.qq;
+
+// $ExpectType boolean
+brwoser.ie;
+
+// $ExpectType boolean
+brwoser.ie6;
+
+// $ExpectType boolean
+brwoser.ie7;
+
+// $ExpectType boolean
+brwoser.ie8;
+
+// $ExpectType boolean
+brwoser.ie9;
+
+// $ExpectType boolean
+brwoser.ie10;
+
+// $ExpectType boolean
+brwoser.ie11;
+
+// $ExpectType boolean
+brwoser.edge;
+
+// $ExpectType boolean
+brwoser.ielt9;
+
+// $ExpectType boolean
+brwoser.baidu;
+
+// $ExpectType boolean
+brwoser.isLocalStorage;
+
+// $ExpectType boolean
+brwoser.isGeolocation;
+
+// $ExpectType boolean
+brwoser.mobileWebkit;
+
+// $ExpectType boolean
+brwoser.mobileWebkit3d;
+
+// $ExpectType boolean
+brwoser.mobileOpera;
+
+// $ExpectType boolean
+brwoser.retina;
+
+// $ExpectType boolean
+brwoser.touch;
+
+// $ExpectType boolean
+brwoser.msPointer;
+
+// $ExpectType boolean
+brwoser.pointer;
+
+// $ExpectType boolean
+brwoser.webkit;
+
+// $ExpectType boolean
+brwoser.ie3d;
+
+// $ExpectType boolean
+brwoser.webkit3d;
+
+// $ExpectType boolean
+brwoser.gecko3d;
+
+// $ExpectType boolean
+brwoser.opera3d;
+
+// $ExpectType boolean
+brwoser.any3d;
+
+// $ExpectType boolean
+brwoser.isCanvas;
+
+// $ExpectType boolean
+brwoser.isSvg;
+
+// $ExpectType boolean
+brwoser.isVML;
+
+// $ExpectType boolean
+brwoser.isWorker;
+
+// $ExpectType boolean
+brwoser.isWebsocket;
+
+// $ExpectType boolean
+brwoser.isWebGL();
+
+/**
+ * convert-from.ts
+ */
+
+declare const convertType: 'baidu' | 'mapbar' | 'gps' | null;
+// $ExpectType void
+AMap.convertFrom(lnglat, convertType, (status, result) => {
+    const temp: 'complete' | 'error' = status;
+    if (typeof result !== 'string') {
+        // $ExpectType string
+        result.info;
+        // $ExpectType LngLat[]
+        result.locations;
+    } else {
+        // $ExpectType string
+        result;
+    }
+});
+// $ExpectType void
+AMap.convertFrom([lnglat], null, () => { });
+// $ExpectType void
+AMap.convertFrom(lnglatTuple, null, () => { });
+// $ExpectType void
+AMap.convertFrom([lnglatTuple], null, () => { });
+
+/**
+ * dom-util.ts
+ */
+
+const domUtil = AMap.DomUtil;
+
+// $ExpectType Size
+domUtil.getViewport(div);
+
+// $ExpectType Pixel
+domUtil.getViewportOffset(div);
+
+// $ExpectType HTMLDivElement
+domUtil.create('div');
+// $ExpectType HTMLAnchorElement
+domUtil.create('a');
+// $ExpectType HTMLDivElement
+domUtil.create('div', div);
+// $ExpectType HTMLDivElement
+domUtil.create('div', div, 'className');
+
+// $ExpectType void
+domUtil.setClass(div);
+// $ExpectType void
+domUtil.setClass(div, 'className');
+
+// $ExpectType boolean
+domUtil.hasClass(div, 'className');
+
+// $ExpectType void
+domUtil.removeClass(div, 'className');
+
+// $ExpectType void
+domUtil.setOpacity(div, 1);
+
+// $ExpectType void
+domUtil.rotate(div, 10);
+// $ExpectType void
+domUtil.rotate(div, 10, { x: 10, y: 10 });
+
+const util2: typeof AMap.DomUtil = domUtil.setCss(div, { textAlign: 'left' });
+// $ExpectError
+domUtil.setCss(div, { textAlign: 10 });
+
+// $ExpectType void
+domUtil.empty(div);
+
+// $ExpectType void
+domUtil.remove(div);
+
+/**
+ * event.ts
+ */
+
+// $ExpectType Map
+map.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+});
+
+// $ExpectType EventListener<0>
+AMap.event.addDomListener(div, 'click', event => {
+    // $ExpectType number
+    event.clientX;
+});
+
+// $ExpectType EventListener<1>
+AMap.event.addListener(map, 'hotspotclick', function(event: AMap.Map.EventMap['hotspotclick']) {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+AMap.event.addListener(map, 'click', (event: AMap.Map.EventMap['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType Map
+    event.target;
+});
+
+// $ExpectType EventListener<1>
+const eventListener = AMap.event.addListenerOnce(map, 'hotspotclick', function(event: AMap.Map.EventMap['hotspotclick']) {
+    // $ExpectType "hotspotclick"
+    event.type;
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+// $ExpectType void
+AMap.event.removeListener(eventListener);
+
+// $ExpectType void
+AMap.event.trigger(map, 'click', {
+    lnglat,
+    pixel,
+    target: map
+});
+// $ExpectType void
+AMap.event.trigger(map, 'hotspotclick', {
+    lnglat,
+    name: 'name',
+    id: 'id',
+    isIndoorPOI: true
+});
+// $ExpectType void
+AMap.event.trigger(map, 'complete');
+
+/**
+ * geometry-util.ts
+ */
+
+{
+    const point = lnglat;
+    const pointTuple = lnglatTuple;
+    const line = [point];
+    const lineTuple = [pointTuple];
+    const ring = [point];
+    const ringTuple = [pointTuple];
+    const polygon = [ring];
+    const polygonTuple = [ringTuple];
+    const geometryUtil = AMap.GeometryUtil;
+
+    // $ExpectType number
+    geometryUtil.distance(point, point);
+    // $ExpectType number
+    geometryUtil.distance(pointTuple, pointTuple);
+    // $ExpectType number
+    geometryUtil.distance(point, line);
+    // $ExpectType number
+    geometryUtil.distance(pointTuple, lineTuple);
+
+    // $ExpectType number
+    geometryUtil.ringArea(ring);
+    // $ExpectType number
+    geometryUtil.ringArea(ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.isClockwise(ring);
+    // $ExpectType boolean
+    geometryUtil.isClockwise(ringTuple);
+
+    // $ExpectType number
+    geometryUtil.distanceOfLine(line);
+    // $ExpectType number
+    geometryUtil.distanceOfLine(lineTuple);
+
+    // $ExpectType [number, number][]
+    geometryUtil.ringRingClip(ring, ring);
+    // $ExpectType [number, number][]
+    geometryUtil.ringRingClip(ringTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesRingRingIntersect(ring, ring);
+    // $ExpectType boolean
+    geometryUtil.doesRingRingIntersect(ringTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesLineRingIntersect(line, ring);
+    // $ExpectType boolean
+    geometryUtil.doesLineRingIntersect(lineTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesLineLineIntersect(line, line);
+    // $ExpectType boolean
+    geometryUtil.doesLineLineIntersect(lineTuple, lineTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesSegmentPolygonIntersect(point, point, polygon);
+    // $ExpectType boolean
+    geometryUtil.doesSegmentPolygonIntersect(pointTuple, pointTuple, polygonTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesSegmentRingIntersect(point, point, ring);
+    // $ExpectType boolean
+    geometryUtil.doesSegmentRingIntersect(pointTuple, pointTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesSegmentLineIntersect(point, point, line);
+    // $ExpectType boolean
+    geometryUtil.doesSegmentLineIntersect(pointTuple, pointTuple, lineTuple);
+
+    // $ExpectType boolean
+    geometryUtil.doesSegmentsIntersect(point, point, point, point);
+    // $ExpectType boolean
+    geometryUtil.doesSegmentsIntersect(pointTuple, pointTuple, pointTuple, pointTuple);
+
+    // $ExpectType boolean
+    geometryUtil.isPointInRing(point, ring);
+    // $ExpectType boolean
+    geometryUtil.isPointInRing(pointTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.isRingInRing(ring, ring);
+    // $ExpectType boolean
+    geometryUtil.isRingInRing(ringTuple, ringTuple);
+
+    // $ExpectType boolean
+    geometryUtil.isPointInPolygon(point, polygon);
+    // $ExpectType boolean
+    geometryUtil.isPointInPolygon(pointTuple, polygonTuple);
+
+    // $ExpectType [number, number][]
+    geometryUtil.makesureClockwise(lineTuple);
+
+    // $ExpectType [number, number][]
+    geometryUtil.makesureAntiClockwise(lineTuple);
+
+    // $ExpectType [number, number]
+    geometryUtil.closestOnSegment(point, point, point);
+    // $ExpectType [number, number]
+    geometryUtil.closestOnSegment(pointTuple, pointTuple, pointTuple);
+
+    // $ExpectType [number, number]
+    geometryUtil.closestOnSegment(point, point, point);
+    // $ExpectType [number, number]
+    geometryUtil.closestOnSegment(pointTuple, pointTuple, pointTuple);
+
+    // $ExpectType [number, number]
+    geometryUtil.closestOnLine(point, line);
+    // $ExpectType [number, number]
+    geometryUtil.closestOnLine(pointTuple, lineTuple);
+
+    // $ExpectType number
+    geometryUtil.distanceToSegment(point, point, point);
+    // $ExpectType number
+    geometryUtil.distanceToSegment(pointTuple, pointTuple, pointTuple);
+
+    // $ExpectType number
+    geometryUtil.distanceToLine(point, line);
+    // $ExpectType number
+    geometryUtil.distanceToLine(pointTuple, lineTuple);
+
+    // $ExpectType boolean
+    geometryUtil.isPointOnSegment(point, point, point);
+    // $ExpectType boolean
+    geometryUtil.isPointOnSegment(point, point, point, 1);
+    // $ExpectType boolean
+    geometryUtil.isPointOnSegment(pointTuple, pointTuple, pointTuple);
+    // $ExpectType boolean
+    geometryUtil.isPointOnSegment(pointTuple, pointTuple, pointTuple, 1);
+
+    // $ExpectType boolean
+    geometryUtil.isPointOnLine(point, line);
+    // $ExpectType boolean
+    geometryUtil.isPointOnLine(point, line, 1);
+    // $ExpectType boolean
+    geometryUtil.isPointOnLine(pointTuple, lineTuple);
+    // $ExpectType boolean
+    geometryUtil.isPointOnLine(pointTuple, lineTuple, 1);
+
+    // $ExpectType boolean
+    geometryUtil.isPointOnRing(point, ring);
+    // $ExpectType boolean
+    geometryUtil.isPointOnRing(point, ring, 1);
+    // $ExpectType boolean
+    geometryUtil.isPointOnRing(pointTuple, ringTuple);
+    // $ExpectType boolean
+    geometryUtil.isPointOnRing(pointTuple, ringTuple, 1);
+
+    // $ExpectType boolean
+    geometryUtil.isPointOnPolygon(point, polygon);
+    // $ExpectType boolean
+    geometryUtil.isPointOnPolygon(point, polygon, 1);
+    // $ExpectType boolean
+    geometryUtil.isPointOnPolygon(pointTuple, polygonTuple);
+    // $ExpectType boolean
+    geometryUtil.isPointOnPolygon(pointTuple, polygonTuple, 1);
+}
+
+/**
+ * lnglat.ts
+ */
+
+// $ExpectType LngLat
+new AMap.LngLat(114, 22);
+// $ExpectType LngLat
+const testLnglat = new AMap.LngLat(113, 21);
+
+// $ExpectType LngLat
+testLnglat.offset(1, 2);
+
+// $ExpectType number
+testLnglat.distance(testLnglat);
+// $ExpectType number
+testLnglat.distance([testLnglat]);
+
+// $ExpectType number
+testLnglat.getLng();
+
+// $ExpectType number
+testLnglat.getLat();
+
+// $ExpectType boolean
+testLnglat.equals(testLnglat);
+
+// $ExpectType string
+testLnglat.toString();
+
+// $ExpectType LngLat
+testLnglat.add(testLnglat);
+// $ExpectType LngLat
+testLnglat.add(testLnglat, true);
+
+// $ExpectType LngLat
+testLnglat.subtract(testLnglat);
+// $ExpectType LngLat
+testLnglat.subtract(testLnglat, true);
+
+// $ExpectType LngLat
+testLnglat.divideBy(1);
+// $ExpectType LngLat
+testLnglat.divideBy(1, true);
+
+// $ExpectType LngLat
+testLnglat.multiplyBy(1);
+// $ExpectType LngLat
+testLnglat.multiplyBy(1, true);
+
+/**
+ * map.ts
+ */
+
+// $ExpectType Map
+new AMap.Map('map');
+// $ExpectType Map
+new AMap.Map(div);
+
+// $ExpectType Map
+new AMap.Map(div, {});
+
+// $ExpectType Map
+const testMap = new AMap.Map(div, {
+    layers: [tileLayer],
+    zoom: 15,
+    center: [1, 2],
+    labelzIndex: 110,
+    zooms: [5, 15],
+    lang: 'zh_cn',
+    defaultCursor: 'default',
+    crs: 'EPSG4326',
+    animateEnable: true,
+    isHotspot: false,
+    defaultLayer: tileLayer,
+    rotateEnable: true,
+    resizeEnable: true,
+    showIndoorMap: true,
+    // indoorMap, // TODO
+    expandZoomRange: true,
+    dragEnable: true,
+    zoomEnable: true,
+    doubleClickZoom: true,
+    keyboardEnable: true,
+    jogEnable: true,
+    scrollWheel: true,
+    touchZoom: true,
+    mapStyle: '',
+    features: ['road'],
+    showBuildingBlock: true,
+    skyColor: '#fff',
+    preloadMode: true,
+    mask: [[1, 2], [2, 3], [3, 4]]
+});
+
+// $ExpectType number
+testMap.getZoom();
+
+// $ExpectType Layer[]
+testMap.getLayers();
+
+// $ExpectType LngLat
+testMap.getCenter();
+
+// $ExpectType HTMLElement | null
+testMap.getContainer();
+
+testMap.getCity(city => {
+    // $ExpectType string
+    city.city;
+    // $ExpectType string
+    city.citycode;
+    // $ExpectType string
+    city.district;
+    // $ExpectType string | never[]
+    city.province;
+});
+
+// $ExpectType Bounds
+testMap.getBounds();
+
+// $ExpectType number
+testMap.getLabelzIndex();
+
+// $ExpectType Lang
+testMap.getLang();
+
+// $ExpectType Size
+testMap.getSize();
+
+// $ExpectType number
+testMap.getRotation();
+
+// $ExpectType Status
+const mapStatus = testMap.getStatus();
+// $ExpectType boolean
+mapStatus.animateEnable;
+// $ExpectType boolean
+mapStatus.doubleClickZoom;
+// $ExpectType boolean
+mapStatus.dragEnable;
+// $ExpectType boolean
+mapStatus.isHotspot;
+// $ExpectType boolean
+mapStatus.jogEnable;
+// $ExpectType boolean
+mapStatus.keyboardEnable;
+// $ExpectType boolean
+mapStatus.pitchEnable;
+// $ExpectType boolean
+mapStatus.resizeEnable;
+// $ExpectType boolean
+mapStatus.rotateEnable;
+// $ExpectType boolean
+mapStatus.scrollWheel;
+// $ExpectType boolean
+mapStatus.touchZoom;
+// $ExpectType boolean
+mapStatus.zoomEnable;
+
+// $ExpectType string
+testMap.getDefaultCursor();
+
+// $ExpectType number
+testMap.getResolution();
+
+// $ExpectType number
+testMap.getScale();
+// $ExpectType number
+testMap.getScale(1);
+
+// $ExpectType void
+testMap.setZoom(1);
+
+// $ExpectType void
+testMap.setLabelzIndex(1);
+
+// $ExpectType void
+testMap.setLayers([tileLayer]);
+
+// $ExpectType void
+testMap.setCenter(lnglat);
+// $ExpectType void
+testMap.setCenter([1, 2]);
+
+// $ExpectType void
+testMap.setZoomAndCenter(13, lnglat);
+// $ExpectType void
+testMap.setZoomAndCenter(13, [1, 2]);
+
+// $ExpectType void
+testMap.setCity('city', (coord, zoom) => {
+    // $ExpectType string
+    coord[0];
+    // $ExpectType string
+    coord[1];
+    // $ExpectType number
+    zoom;
+});
+
+// $ExpectType Bounds
+testMap.setBounds(bounds);
+
+// $ExpectType void
+testMap.setLimitBounds(bounds);
+
+// $ExpectType void
+testMap.clearLimitBounds();
+
+// $ExpectType void
+testMap.setLang('zh_cn');
+
+// $ExpectType void
+testMap.setRotation(1);
+
+// $ExpectType void
+testMap.setStatus({});
+// $ExpectType void
+testMap.setStatus({
+    animateEnable: true,
+    doubleClickZoom: true,
+    dragEnable: true,
+    isHotspot: true,
+    jogEnable: true,
+    keyboardEnable: true,
+    pitchEnable: false,
+    resizeEnable: false,
+    rotateEnable: false,
+    scrollWheel: true,
+    touchZoom: true,
+    zoomEnable: true
+});
+
+// $ExpectType void
+testMap.setDefaultCursor('default');
+
+// $ExpectType void
+testMap.zoomIn();
+
+// $ExpectType void
+testMap.zoomOut();
+
+// $ExpectType void
+testMap.panTo([1, 2]);
+// $ExpectType void
+testMap.panTo(lnglat);
+
+// $ExpectType void
+testMap.panBy(1, 2);
+
+// $ExpectType void
+testMap.clearMap();
+
+// $ExpectType Map
+testMap.plugin('plugin name', () => { });
+// $ExpectType Map
+testMap.plugin(['plugin name'], () => { });
+
+// $ExpectType void
+testMap.clearInfoWindow();
+
+// $ExpectType LngLat
+testMap.pixelToLngLat(pixel);
+// $ExpectType LngLat
+testMap.pixelToLngLat(pixel, 1);
+
+// $ExpectType Pixel
+testMap.lnglatToPixel(lnglat);
+// $ExpectType Pixel
+testMap.lnglatToPixel(lnglat, 1);
+
+// $ExpectType LngLat
+testMap.containerToLngLat(pixel);
+
+// $ExpectType Pixel
+testMap.lngLatToContainer(lnglat);
+// $ExpectType Pixel
+testMap.lnglatTocontainer(lnglat);
+
+// $ExpectType void
+testMap.setMapStyle('');
+// $ExpectType string
+testMap.getMapStyle();
+
+// $ExpectType void
+testMap.setFeatures('all');
+// $ExpectType void
+testMap.setFeatures(['bg']);
+
+const feature: 'all' | 'bg' | 'point' | 'road' | 'building' | AMap.Map.Feature[] = testMap.getFeatures();
+
+// $ExpectType void
+testMap.setDefaultLayer(tileLayer);
+
+// $ExpectType void
+testMap.setPitch(1);
+// $ExpectType number
+testMap.getPitch();
+
+// $ExpectType ViewMode
+testMap.getViewMode_();
+
+// $ExpectType Pixel
+testMap.lngLatToGeodeticCoord(lnglat);
+// $ExpectType Pixel
+testMap.lngLatToGeodeticCoord(lnglatTuple);
+
+// $ExpectType LngLat
+testMap.geodeticCoordToLngLat(pixel);
+
+// $ExpectType void
+testMap.destroy();
+
+declare function dblClickHandler(this: AMap.Map, event: AMap.Map.EventMap['dblclick']): void;
+
+// $ExpectType Map
+testMap.on('click', (event: AMap.Map.EventMap['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Pixel
+    event.pixel;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType Map
+    event.target;
+});
+// $ExpectType Map
+testMap.on('dblclick', dblClickHandler);
+// $ExpectType Map
+testMap.on('complete', (event: AMap.Map.EventMap['complete']) => {
+    // $ExpectType "complete"
+    event.type;
+    // $ExpectError
+    event.value;
+});
+// $ExpectType Map
+testMap.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
+    // $ExpectType string
+    event.id;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType string
+    event.name;
+    // $ExpectType "hotspotclick"
+    event.type;
+});
+// $ExpectType Map
+testMap.on('custom', (event: AMap.Event<'custom', { test: string }>) => {
+    // $ExpectType "custom"
+    event.type;
+    // $ExpectType string
+    event.test;
+});
+
+// $ExpectType Map
+testMap.off('dblclick', dblClickHandler);
+// $ExpectType Map
+testMap.off('click', 'mv');
+
+// $ExpectType Map
+testMap.emit('click', {
+    target: testMap,
+    lnglat,
+    pixel
+});
+
+testMap.emit('complete');
+// $ExpectType Map
+testMap.emit('hotspotclick', {
+    lnglat,
+    name: '123',
+    id: '123',
+    isIndoorPOI: true
+});
+// $ExpectType Map
+testMap.emit('custom', {
+    test: 1
+});
+// $ExpectType Map
+testMap.emit('custom', undefined);
+
+/**
+ * pixel.ts
+ */
+
+// $ExpectType Pixel
+new AMap.Pixel(10, 20);
+// $ExpectType Pixel
+const testPixel = new AMap.Pixel(10, 20);
+
+// $ExpectType number
+testPixel.getX();
+
+// $ExpectType number
+testPixel.getY();
+
+// $ExpectType boolean
+testPixel.equals(testPixel);
+
+// $ExpectType string
+testPixel.toString();
+
+// $ExpectType Pixel
+testPixel.add({ x: 1, y: 2 });
+// $ExpectType Pixel
+testPixel.add({ x: 1, y: 2 }, false);
+
+// $ExpectType Pixel
+testPixel.round();
+
+// $ExpectType Pixel
+testPixel.floor();
+
+// $ExpectType number
+testPixel.length();
+
+// $ExpectType number | null
+testPixel.direction();
+
+// $ExpectType Pixel
+testPixel.toFixed();
+// $ExpectType Pixel
+testPixel.toFixed(2);
+
+/**
+ * size.ts
+ */
+
+// $ExpectType Size
+const testSize = new AMap.Size(10, 20);
+
+// $ExpectType number
+testSize.getHeight();
+
+// $ExpectType number
+testSize.getWidth();
+
+// $ExpectType string
+testSize.toString();
+
+// $ExpectType boolean
+testSize.contains({ x: 10, y: 10 });
+
+/**
+ * util.ts
+ */
+
+const util = AMap.Util;
+
+// $ExpectType string
+util.colorNameToHex('colorName');
+
+// $ExpectType string
+util.rgbHex2Rgba('rgbHex');
+
+// $ExpectType string
+util.argbHex2Rgba('argbHex');
+
+// $ExpectType boolean
+util.isEmpty({});
+// $ExpectError
+util.isEmpty(1);
+
+// $ExpectType number[]
+util.deleteItemFromArray([1], 1);
+
+// $ExpectType number[]
+util.deleteItemFromArrayByIndex([1], 1);
+
+// $ExpectType number
+util.indexOf([1], 1);
+// $ExpectError
+util.indexOf([1], '1');
+
+// $ExpectType number
+util.format(1);
+// $ExpectType number
+util.format(1, 1);
+
+declare const value1: number | number[];
+// $ExpectType boolean
+util.isArray(value1);
+if (util.isArray(value1)) {
+    // $ExpectType number[]
+    value1;
+} else {
+    // $ExpectType number
+    value1;
+}
+
+declare const value2: number | HTMLElement;
+// $ExpectType boolean
+util.isDOM(value2);
+if (util.isDOM(value2)) {
+    // $ExpectType HTMLElement
+    value2;
+} else {
+    // $ExpectType number
+    value2;
+}
+
+// $ExpectType boolean
+util.includes([1], 1);
+// $ExpectError
+util.includes([1], '1');
+
+// $ExpectType number
+util.requestIdleCallback(() => { });
+// $ExpectType number
+const idleCallbackHandle = util.requestIdleCallback(() => { }, { timeout: 1 });
+
+// $ExpectType void
+util.cancelIdleCallback(idleCallbackHandle);
+
+// $ExpectType number
+util.requestAnimFrame(() => { });
+// $ExpectType number
+const animFrameHandle = util.requestAnimFrame(function() {
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+// $ExpectType void
+util.cancelAnimFrame(animFrameHandle);
+
+/**
+ * view2d.ts
+ */
+
+// $ExpectType View2D
+new AMap.View2D();
+// $ExpectType View2D
+new AMap.View2D({});
+
+// $ExpectType View2D
+new AMap.View2D({
+    center: [1, 2],
+    rotation: 1,
+    zoom: 10,
+    crs: 'EPGS3395'
+});
+
+// $ExpectType View2D
+const testView2d = new AMap.View2D({
+    center: lnglat
+});
+
+// $ExpectType View2D
+testView2d.on('complete', () => { });
+
+/**
+ * layer/buildings.ts
+ */
+
+// $ExpectType Buildings
+new AMap.Buildings();
+// $ExpectType Buildings
+new AMap.Buildings();
+// $ExpectType Buildings
+const testBuildings = new AMap.Buildings({
+    zooms: [1, 18],
+    opacity: 0.8,
+    heightFactor: 1,
+    visible: true,
+    zIndex: 10,
+    map
+});
+
+testBuildings.setStyle({
+    hideWithoutStyle: false,
+    areas: [
+        {
+            visible: true,
+            rejectTexture: true,
+            color1: 'ffffff00',
+            color2: 'ffffcc00',
+            path: [[1, 2]]
+        },
+        {
+            visible: true,
+            rejectTexture: true,
+            color1: 'ffffff00',
+            color2: 'ffffcc00',
+            path: [lnglat]
+        },
+        {
+            color1: 'ff99ff00',
+            path: [lnglat]
+        },
+    ]
+});
+
+/**
+ * layer/canvasLayer.ts
+ */
+
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer();
+// $ExpectType CanvasLayer
+new AMap.CanvasLayer({});
+// $ExpectType CanvasLayer
+const testCanvasLayer = new AMap.CanvasLayer({
+    bounds
+});
+
+// $ExpectType void
+testCanvasLayer.setMap(null);
+// $ExpectType void
+testCanvasLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+testCanvasLayer.getMap();
+
+// $ExpectType void
+testCanvasLayer.show();
+
+// $ExpectType void
+testCanvasLayer.hide();
+
+// $ExpectType number
+testCanvasLayer.getzIndex();
+
+// $ExpectType void
+testCanvasLayer.setzIndex(10);
+
+// $ExpectType HTMLCanvasElement | null
+testCanvasLayer.getElement();
+
+// $ExpectType void
+testCanvasLayer.setCanvas(canvasEle);
+
+// $ExpectType HTMLCanvasElement | undefined
+testCanvasLayer.getCanvas();
+
+/**
+ * layer/flexible.ts
+ */
+
+// $ExpectType Flexible
+new AMap.TileLayer.Flexible();
+// $ExpectType Flexible
+new AMap.TileLayer.Flexible({});
+// $ExpectType Flexible
+const testFlexible = new AMap.TileLayer.Flexible({
+    createTile(x, y, z, success, fail) {
+        // $ExpectType number
+        x;
+        // $ExpectType number
+        y;
+        // $ExpectType number
+        z;
+        // $ExpectType void
+        success(imgEle);
+        // $ExpectType void
+        success(canvasEle);
+        // $ExpectType void
+        fail();
+    },
+    cacheSize: 10,
+    opacity: 1,
+    visible: true,
+    map,
+    zIndex: 1,
+    zooms: [1, 2]
+});
+
+// $ExpectType void
+testFlexible.setMap(null);
+// $ExpectType void
+testFlexible.setMap(map);
+
+// $ExpectType Map | null | undefined
+testFlexible.getMap();
+
+// $ExpectType void
+testFlexible.show();
+
+// $ExpectType void
+testFlexible.hide();
+
+// $ExpectType void
+testFlexible.setzIndex(10);
+
+// $ExpectType number
+testFlexible.getzIndex();
+
+/**
+ * layer/imageLayer.ts
+ */
+
+// $ExpectType ImageLayer
+new AMap.ImageLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType ImageLayer
+new AMap.ImageLayer();
+// $ExpectType ImageLayer
+new AMap.ImageLayer({});
+// $ExpectType ImageLayer
+const testImageLayer = new AMap.ImageLayer({
+    bounds
+});
+
+// $ExpectType void
+testImageLayer.setMap(null);
+// $ExpectType void
+testImageLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+testImageLayer.getMap();
+
+// $ExpectType void
+testImageLayer.show();
+
+// $ExpectType void
+testImageLayer.hide();
+
+// $ExpectType number
+testImageLayer.getzIndex();
+
+// $ExpectType void
+testImageLayer.setzIndex(10);
+
+// $ExpectType HTMLImageElement | null
+testImageLayer.getElement();
+
+// $ExpectType void
+testImageLayer.setImageUrl('url');
+
+// $ExpectType string | undefined
+testImageLayer.getImageUrl();
+
+/**
+ * layer/layer.ts
+ */
+
+// $ExpectError
+new AMap.Layer();
+
+// $ExpectType HTMLDivElement | undefined
+layer.getContainer();
+
+// $ExpectType [number, number]
+layer.getZooms();
+
+// $ExpectType void
+layer.setOpacity(1);
+
+// $ExpectType number
+layer.getOpacity();
+
+// $ExpectType void
+layer.show();
+
+// $ExpectType void
+layer.hide();
+
+// $ExpectType void
+layer.setMap();
+// $ExpectType void
+layer.setMap(map);
+
+// $ExpectType void
+layer.setzIndex(1);
+
+// $ExpectType number
+layer.getzIndex();
+
+/**
+ * layer/layerGroup.ts
+ */
+
+// $ExpectError
+new AMap.LayerGroup();
+
+// $ExpectType LayerGroup<TileLayer>
+new AMap.LayerGroup(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+const testTileLayerGroup = new AMap.LayerGroup([tileLayer]);
+// $ExpectType LayerGroup<any>
+const testAnyLauerGroup = new AMap.LayerGroup<any>([]);
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.addLayer(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.addLayer([tileLayer]);
+// $ExpectError
+testTileLayerGroup.addLayer(massMarksLayer);
+
+// $ExpectType TileLayer[]
+testTileLayerGroup.getLayers();
+
+// $ExpectType TileLayer | null
+testTileLayerGroup.getLayer(function(item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType null
+    this;
+
+    return true;
+});
+
+testTileLayerGroup.hasLayer(function(item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType null
+    this;
+
+    return true;
+});
+testTileLayerGroup.hasLayer(tileLayer);
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.removeLayer(tileLayer);
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.removeLayer([tileLayer]);
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.clearLayers();
+
+testTileLayerGroup.eachLayer(function(item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType TileLayer
+    this;
+});
+testTileLayerGroup.eachLayer(function(item, index, list) {
+    // $ExpectType TileLayer
+    item;
+    // $ExpectType number
+    index;
+    // $ExpectType TileLayer[]
+    list;
+    // $ExpectType number
+    this.test;
+}, { test: 1 });
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.setMap(map);
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.hide();
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.show();
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.reload();
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.setOptions({});
+
+// $ExpectType LayerGroup<TileLayer>
+testTileLayerGroup.setOptions({
+    tileSize: 256
+});
+// layerGruop.setOptions({
+//     // $ExpectError
+//     interval: 1
+// });
+
+testAnyLauerGroup.addLayer(tileLayer);
+
+testAnyLauerGroup.addLayer(massMarksLayer);
+
+testAnyLauerGroup.setOptions({
+    test: 1
+});
+
+/**
+ * layer/massMarks.ts
+ */
+
+const massMarksStyle1 = {
+    anchor: pixel,
+    url: '',
+    size,
+    rotation: 1
+};
+const massMarksStyle2 = {
+    anchor: pixel,
+    url: '',
+    size
+};
+const massMarksData1 = {
+    lnglat
+};
+
+interface MassMarksCustomData extends AMap.MassMarks.Data {
+    name: string;
+    id: string;
+}
+const massMarksMassMarksCustomData: MassMarksCustomData = {
+    lnglat: [1, 2],
+    style: 1,
+    name: '',
+    id: ''
+};
+
+// $ExpectError
+new AMap.MassMarks();
+// $ExpectError
+new AMap.MassMarks([], {});
+
+new AMap.MassMarks([], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+new AMap.MassMarks([massMarksData1], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+
+// $ExpectType MassMarks<MassMarksCustomData>
+const testMassMarks = new AMap.MassMarks<MassMarksCustomData>([massMarksMassMarksCustomData], {
+    style: [massMarksStyle1, massMarksStyle2]
+});
+
+// $ExpectType void
+testMassMarks.setStyle(massMarksStyle1);
+// $ExpectType void
+testMassMarks.setStyle([massMarksStyle1]);
+
+// $ExpectType Style | Style[]
+testMassMarks.getStyle();
+
+// $ExpectType void
+testMassMarks.setData('');
+
+// $ExpectError
+testMassMarks.setData(massMarksData1);
+// $ExpectError
+testMassMarks.setData(massMarksMassMarksCustomData);
+
+const massMarksCustomData = testMassMarks.getData()[0];
+// $ExpectType string
+massMarksCustomData.name;
+// $ExpectType string
+massMarksCustomData.id;
+// $ExpectType LngLat
+massMarksCustomData.lnglat;
+
+// $ExpectType void
+testMassMarks.clear();
+
+testMassMarks.on('click', (event: AMap.MassMarks.EventMap<typeof testMassMarks>['click']) => {
+    // $ExpectType "click"
+    event.type;
+
+    // $ExpectType MassMarksCustomData
+    event.data;
+
+    // $ExpectType MassMarks<MassMarksCustomData>
+    event.target;
+});
+
+/**
+ * layer/tileLayer.ts
+ */
+
+// $ExpectType TileLayer
+new AMap.TileLayer();
+
+// $ExpectType TileLayer
+new AMap.TileLayer({});
+
+// $ExpectType TileLayer
+const testTileLayer = new AMap.TileLayer({
+    map,
+    tileSize: 256,
+    tileUrl: '',
+    errorUrl: '',
+    getTileUrl: (x, y, z) => '',
+    zIndex: 1,
+    opacity: 0.1,
+    zooms: [3, 18],
+    detectRetina: true
+});
+
+// $ExpectType string[]
+testTileLayer.getTiles();
+
+// $ExpectType void
+testTileLayer.reload();
+
+// $ExpectType void
+testTileLayer.setTileUrl('');
+// $ExpectType void
+testTileLayer.setTileUrl((x, y, level) => {
+    // $ExpectType number
+    x;
+    // $ExpectType number
+    y;
+    // $ExpectType number
+    level;
+    return '';
+});
+
+// $ExpectType TileLayer
+testTileLayer.on('complete', () => { });
+
+testTileLayer.off('complete', () => { });
+
+testTileLayer.emit('complete');
+
+// $ExpectType Traffic
+const testTrafficLayer = new AMap.TileLayer.Traffic({});
+// $ExpectType Traffic
+new AMap.TileLayer.Traffic({
+    autoRefresh: true,
+    interval: 180
+});
+
+testTrafficLayer.on('complete', () => { });
+
+/**
+ * layer/videoLayer.ts
+ */
+
+// $ExpectType VideoLayer
+new AMap.VideoLayer({
+    map,
+    bounds,
+    visible: true,
+    zooms: [1, 2],
+    opacity: 1
+});
+
+// $ExpectType VideoLayer
+new AMap.VideoLayer();
+// $ExpectType VideoLayer
+new AMap.VideoLayer({});
+// $ExpectType VideoLayer
+const testVideoLayer = new AMap.VideoLayer({
+    bounds
+});
+
+// $ExpectType void
+testVideoLayer.setMap(null);
+// $ExpectType void
+testVideoLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+testVideoLayer.getMap();
+
+// $ExpectType void
+testVideoLayer.show();
+
+// $ExpectType void
+testVideoLayer.hide();
+
+// $ExpectType number
+testVideoLayer.getzIndex();
+
+// $ExpectType void
+testVideoLayer.setzIndex(10);
+
+// $ExpectType HTMLVideoElement | null
+testVideoLayer.getElement();
+
+// $ExpectType void
+testVideoLayer.setVideoUrl('url');
+
+// $ExpectType string | string[] | undefined
+testVideoLayer.getVideoUrl();
+
+/**
+ * layer/wms.ts
+ */
+
+// $ExpectType WMS
+new AMap.TileLayer.WMS({
+    url: 'url',
+    params: {}
+});
+// $ExpectType WMS
+const testWms = new AMap.TileLayer.WMS({
+    url: 'url',
+    blend: true,
+    params: {
+        VERSION: 'version',
+        LAYERS: 'layers',
+        STYLES: 'styles',
+        FORMAT: 'format',
+        TRANSPARENT: 'TRUE',
+        BGCOLOR: '#000',
+        EXCEPTIONS: 'exceptions',
+        TIME: 'time',
+        ELEVATION: 'elevation'
+    },
+    zooms: [1, 2],
+    tileSize: 256,
+    opacity: 1,
+    zIndex: 10,
+    visible: true
+});
+
+// $ExpectType void
+testWms.setMap(map);
+// $ExpectType void
+testWms.setMap(null);
+
+// $ExpectType Map | null | undefined
+testWms.getMap();
+
+// $ExpectType void
+testWms.show();
+
+// $ExpectType void
+testWms.hide();
+
+// $ExpectType void
+testWms.setzIndex(10);
+
+// $ExpectType number
+testWms.getzIndex();
+
+// $ExpectType void
+testWms.setUrl('url');
+
+// $ExpectType string
+testWms.getUrl();
+
+// $ExpectType void
+testWms.setParams({
+    VERSION: 'version',
+    LAYERS: 'layers',
+    STYLES: 'styles',
+    FORMAT: 'format',
+    TRANSPARENT: 'TRUE',
+    BGCOLOR: '#000',
+    EXCEPTIONS: 'exceptions',
+    TIME: 'time',
+    ELEVATION: 'elevation'
+});
+
+{
+    const params = testWms.getParams();
+    // $ExpectType string | undefined
+    params.VERSION;
+    // $ExpectType string | undefined
+    params.LAYERS;
+    // $ExpectType string | undefined
+    params.STYLES;
+    // $ExpectType string | undefined
+    params.FORMAT;
+    // $ExpectType "TRUE" | "FALSE" | undefined
+    params.TRANSPARENT;
+    // $ExpectType string | undefined
+    params.BGCOLOR;
+    // $ExpectType string | undefined
+    params.EXCEPTIONS;
+    // $ExpectType string | undefined
+    params.TIME;
+    // $ExpectType string | undefined
+    params.ELEVATION;
+}
+
+/**
+ * layer/wmts.ts
+ */
+
+// $ExpectType WMTS
+new AMap.TileLayer.WMTS({
+    url: 'url',
+    params: {}
+});
+// $ExpectType WMTS
+const testWmts = new AMap.TileLayer.WMTS({
+    url: 'url',
+    blend: true,
+    tileSize: 256,
+    zooms: [1, 2],
+    opacity: 1,
+    zIndex: 10,
+    visible: true,
+    params: {
+        Version: 'version',
+        Layer: 'layers',
+        Style: 'style',
+        Format: 'format'
+    }
+});
+
+// $ExpectType void
+testWmts.setMap(map);
+// $ExpectType void
+testWmts.setMap(null);
+
+// $ExpectType Map | null | undefined
+testWmts.getMap();
+
+// $ExpectType void
+testWmts.show();
+
+// $ExpectType void
+testWmts.hide();
+
+// $ExpectType void
+testWmts.setzIndex(10);
+
+// $ExpectType number
+testWmts.getzIndex();
+
+// $ExpectType void
+testWmts.setUrl('url');
+
+// $ExpectType string
+testWmts.getUrl();
+
+// $ExpectType void
+testWmts.setParams({
+    Version: 'version',
+    Layer: 'layers',
+    Style: 'style',
+    Format: 'format'
+});
+
+{
+    const params = testWmts.getParams();
+    // $ExpectType string | undefined
+    params.Version;
+    // $ExpectType string | undefined
+    params.Layer;
+    // $ExpectType string | undefined
+    params.Style;
+    // $ExpectType string | undefined
+    params.Format;
+}
+
+/**
+ * overlay/bezierCurve.ts
+ */
+
+interface BezierCurveExtraData {
+    test: number;
+}
+
+const bezierCurvePath = [
+    [1, 2, 3, 4],
+    [1, 2, 3],
+    [
+        [1, 2, 3],
+        [1, 2]
+    ],
+    [1, 2]
+];
+
+// $ExpectError
+new AMap.BezierCurve();
+// $ExpectError
+new AMap.BezierCurve({});
+// $ExpectType BezierCurve<BezierCurveExtraData>
+const testBezierCurve = new AMap.BezierCurve<BezierCurveExtraData>({
+    map,
+    path: bezierCurvePath,
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.6,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [1, 5],
+    zIndex: 10,
+    bubble: false,
+    showDir: true,
+    cursor: 'pointer',
+    isOutline: true,
+    outlineColor: '#00FF00',
+    borderWeight: 2
+});
+
+// $ExpectType void
+testBezierCurve.setPath(bezierCurvePath);
+
+// $ExpectType void
+testBezierCurve.setPath(bezierCurvePath);
+
+// $ExpectType void
+testBezierCurve.setOptions({});
+testBezierCurve.setOptions({
+    map,
+    path: bezierCurvePath,
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.6,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [1, 5],
+    zIndex: 10,
+    bubble: false,
+    showDir: true,
+    cursor: 'pointer',
+    isOutline: true,
+    outlineColor: '#00FF00',
+    borderWeight: 2
+});
+
+{
+    const options = testBezierCurve.getOptions();
+
+    // $ExpectType number | undefined
+    options.borderWeight;
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType string | undefined
+    options.dirColor;
+    // $ExpectType string | undefined
+    options.dirImg;
+    // $ExpectType {} | BezierCurveExtraData | undefined
+    options.extData;
+    // $ExpectType boolean | undefined
+    options.geodesic;
+    // $ExpectType boolean | undefined
+    options.isOutline;
+    // $ExpectType "round" | "butt" | "square" | undefined
+    options.lineCap;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType string | undefined
+    options.outlineColor;
+    // $ExpectType (LngLat & { controlPoints: LngLat[]; })[] | undefined
+    options.path;
+    // $ExpectType boolean | undefined
+    options.showDir;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType number
+testBezierCurve.getLength();
+
+// $ExpectType Bounds | null
+testBezierCurve.getBounds();
+
+// $ExpectType void
+testBezierCurve.show();
+
+// $ExpectType void
+testBezierCurve.hide();
+
+// $ExpectType void
+testBezierCurve.setMap(null);
+testBezierCurve.setMap(map);
+
+// $ExpectType void
+testBezierCurve.setExtData({ test: 1 });
+// $ExpectError
+testBezierCurve.setExtData({ test: '123' });
+
+// $ExpectType {} | BezierCurveExtraData
+testBezierCurve.getExtData();
+
+testBezierCurve.on('click', (event: AMap.BezierCurve.EventMap<typeof testBezierCurve>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType BezierCurve<BezierCurveExtraData>
+    event.target;
+});
+
+testBezierCurve.on('show', (event: AMap.BezierCurve.EventMap<typeof testBezierCurve>['show']) => {
+    // $ExpectType "show"
+    event.type;
+    // $ExpectType BezierCurve<BezierCurveExtraData>
+    event.target;
+});
+
+testBezierCurve.on('options', (event: AMap.BezierCurve.EventMap<typeof testBezierCurve>['options']) => {
+    // $ExpectType "options"
+    event.type;
+    // $ExpectError
+    event.target;
+});
+
+/**
+ * overlay/circle.ts
+ */
+
+interface CircleExtraData {
+    test: number;
+}
+
+// $ExpectType Circle<any>
+new AMap.Circle();
+new AMap.Circle({});
+// $ExpectType Circle<CircleExtraData>
+const testCircle = new AMap.Circle<CircleExtraData>({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    bubble: true,
+    cursor: 'pointer',
+    radius: 1000,
+    strokeColor: '#FF0000',
+    strokeOpcity: 0.8,
+    strokeWeight: 3,
+    fillColor: '#00FF00',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [2, 4]
+});
+
+// $ExpectType void
+testCircle.setCenter(lnglat);
+// $ExpectType void
+testCircle.setCenter(lnglatTuple);
+
+// $ExpectType LngLat | undefined
+testCircle.getCenter();
+
+// $ExpectType Bounds | null
+testCircle.getBounds();
+
+// $ExpectType void
+testCircle.setRadius(100);
+
+// $ExpectType number
+testCircle.getRadius();
+
+// $ExpectType void
+testCircle.setOptions({});
+testCircle.setOptions({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    bubble: true,
+    cursor: 'pointer',
+    radius: 1000,
+    strokeColor: '#FF0000',
+    strokeOpcity: 0.8,
+    strokeWeight: 3,
+    fillColor: '#00FF00',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [2, 4]
+});
+
+{
+    const options = testCircle.getOptions();
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType LngLat | undefined
+    options.center;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType {} | CircleExtraData | undefined
+    options.extData;
+    // $ExpectType string | undefined
+    options.fillColor;
+    // $ExpectType number | undefined
+    options.fillOpacity;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType LngLat[] | undefined
+    options.path;
+    // $ExpectType number | undefined
+    options.radius;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType string | undefined
+    options.texture;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType Bounds | null
+testCircle.getBounds();
+
+// $ExpectType void
+testCircle.hide();
+
+// $ExpectType void
+testCircle.show();
+
+// $ExpectType void
+testCircle.setMap(null);
+// $ExpectType void
+testCircle.setMap(map);
+
+// $ExpectType void
+testCircle.setExtData({ test: 2 });
+// $ExpectError
+testCircle.setExtData({ test: '1' });
+
+// $ExpectType {} | CircleExtraData
+testCircle.getExtData();
+
+// $ExpectType boolean
+testCircle.contains(lnglat);
+// $ExpectType boolean
+testCircle.contains(lnglatTuple);
+
+testCircle.on('click', (event: AMap.Circle.EventMap<typeof testCircle>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Circle<CircleExtraData>
+    event.target;
+});
+
+testCircle.on('setCenter', (event: AMap.Circle.EventMap<typeof testCircle>['setCenter']) => {
+    // $ExpectType "setCenter"
+    event.type;
+    // $ExpectError
+    event.target;
+});
+
+testCircle.on('change', (event: AMap.Circle.EventMap<typeof testCircle>['change']) => {
+    // $ExpectType "change"
+    event.type;
+    // $ExpectType Circle<CircleExtraData>
+    event.target;
+});
+
+/**
+ * overlay/contextMenu.ts
+ */
+
+interface ContextMenuExtraData {
+    test: number;
+}
+// $ExpectType ContextMenu<any>
+new AMap.ContextMenu();
+// $ExpectType ContextMenu<any>
+new AMap.ContextMenu({});
+// $ExpectType ContextMenu<ContextMenuExtraData>
+const testContextMenu = new AMap.ContextMenu<ContextMenuExtraData>({
+    content: '<div>content</div>',
+});
+
+// $ExpectType void
+testContextMenu.addItem('item', function() {
+    // $ExpectType HTMLLIElement
+    this;
+});
+// $ExpectType void
+testContextMenu.addItem('item', () => { }, 1);
+
+// $ExpectType void
+testContextMenu.removeItem('item', () => {});
+
+// $ExpectType void
+testContextMenu.open(map, lnglatTuple);
+// $ExpectType void
+testContextMenu.open(map, lnglat);
+
+// $ExpectType void
+testContextMenu.close();
+
+testContextMenu.on('items', (event: AMap.ContextMenu.EventMap<typeof testContextMenu>['items']) => {
+    // $ExpectType "items"
+    event.type;
+});
+
+testContextMenu.on('open', (event: AMap.ContextMenu.EventMap<typeof testContextMenu>['open']) => {
+    // $ExpectType "open"
+    event.type;
+    // $ExpectType ContextMenu<ContextMenuExtraData>
+    event.target;
+});
+
+/**
+ * overlay/ellipse.ts
+ */
+
+interface EllipseExtraData {
+    test: number;
+}
+// $ExpectType Ellipse<any>
+new AMap.Ellipse();
+// $ExpectType Ellipse<any>
+new AMap.Ellipse({});
+// $ExpectType Ellipse<EllipseExtraData>
+const testEllipse = new AMap.Ellipse<EllipseExtraData>({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    radius: [10000, 15000],
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+// $ExpectType LngLat | undefined
+testEllipse.getCenter();
+
+// $ExpectType void
+testEllipse.setCenter(lnglat);
+// $ExpectType void
+testEllipse.setCenter(lnglatTuple);
+
+// $ExpectType Bounds | null
+testEllipse.getBounds();
+
+// $ExpectType void
+testEllipse.setOptions({
+    map,
+    zIndex: 10,
+    center: lnglat,
+    radius: [10000, 15000],
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#FF0000',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'dashed',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+{
+    const options = testEllipse.getOptions();
+
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType LngLat | undefined
+    options.center;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType {} | EllipseExtraData | undefined
+    options.extData;
+    // $ExpectType string | undefined
+    options.fillColor;
+    // $ExpectType number | undefined
+    options.fillOpacity;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType LngLat[] | undefined
+    options.path;
+    // $ExpectType [number, number] | undefined
+    options.radius;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType string | undefined
+    options.texture;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType void
+testEllipse.hide();
+
+// $ExpectType void
+testEllipse.show();
+
+// $ExpectType void
+testEllipse.setMap(null);
+// $ExpectType void
+testEllipse.setMap(map);
+
+// $ExpectType void
+testEllipse.setExtData({ test: 2 });
+// $ExpectType {} | EllipseExtraData
+testEllipse.getExtData();
+
+// $ExpectType boolean
+testEllipse.contains(lnglat);
+// $ExpectType boolean
+testEllipse.contains(lnglatTuple);
+
+/**
+ * overlay/geoJSON.ts
+ */
+
+interface GeoJSONExtraData {
+    test: number;
+}
+
+const geoJSONObject: AMap.GeoJSON.GeoJSONObject[] = [
+    {
+        type: 'Feature',
+        properties: {},
+        geometry: {
+            type: 'Point',
+            coordinates: lnglatTuple
+        }
+    },
+    {
+        type: 'Feature',
+        properties: { test: 1 },
+        geometry: {
+            type: 'LineString',
+            coordinates: [lnglatTuple, lnglatTuple]
+        }
+    }
+];
+
+// $ExpectType GeoJSON<any>
+new AMap.GeoJSON();
+// $ExpectType GeoJSON<any>
+new AMap.GeoJSON({});
+// $ExpectType GeoJSON<GeoJSONExtraData>
+const testGeoJSON = new AMap.GeoJSON<GeoJSONExtraData>({
+    geoJSON: geoJSONObject,
+    getMarker(obj, lnglat) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat
+        lnglat;
+        return testMarker;
+    },
+    getPolyline(obj, lnglats) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat[]
+        lnglats;
+        return testPolyline;
+    },
+    getPolygon(obj, lnglats) {
+        // $ExpectType GeoJSONObject
+        obj;
+        // $ExpectType LngLat[]
+        lnglats;
+        return testPolygon;
+    },
+    coordsToLatLng(coord) {
+        // $ExpectType LngLat
+        coord;
+        return coord;
+    }
+});
+
+// $ExpectType void
+testGeoJSON.importData(geoJSONObject);
+
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.removeOverlay(testMarker);
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.removeOverlay([testMarker]);
+
+// $ExpectType boolean
+testGeoJSON.hasOverlay(testMarker);
+// $ExpectType boolean
+testGeoJSON.hasOverlay(m => m === testMarker);
+
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.addOverlay(testMarker);
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.addOverlay([testMarker]);
+
+// $ExpectType GeoJSONObject[]
+testGeoJSON.toGeoJSON();
+
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.setMap(null);
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.setMap(map);
+
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.hide();
+
+// $ExpectType GeoJSON<GeoJSONExtraData>
+testGeoJSON.show();
+
+testGeoJSON.on('click', (event: AMap.MapsEvent<'click', AMap.Overlay>) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Overlay<any>
+    event.target;
+});
+
+/**
+ * overlay/icon.ts
+ */
+
+// $ExpectType Icon
+new AMap.Icon();
+// $ExpectType Icon
+new AMap.Icon({});
+// $ExpectType Icon
+new AMap.Icon({
+    size,
+    imageOffset: pixel,
+    image: 'image uri',
+    imageSize: size
+});
+// $ExpectType Icon
+const testIcon = new AMap.Icon({
+    size: [1, 2],
+    imageOffset: pixel,
+    image: 'image uri',
+    imageSize: [1, 2]
+});
+
+// $ExpectType Size
+testIcon.getImageSize();
+
+// $ExpectType void
+testIcon.setImageSize(size);
+// $ExpectType void
+testIcon.setImageSize([1, 2]);
+
+/**
+ * overlay/infoWindow.ts
+ */
+
+interface InfoWindowExtraData {
+    test: number;
+}
+
+// $ExpectType InfoWindow<any>
+new AMap.InfoWindow();
+// $ExpectType InfoWindow<any>
+new AMap.InfoWindow({});
+// $ExpectType InfoWindow<InfoWindowExtraData>
+const testInfoWindow = new AMap.InfoWindow<InfoWindowExtraData>({
+    isCustom: false,
+    autoMove: false,
+    closeWhenClickMap: false,
+    content: 'content',
+    size: [100, 100],
+    offset: new AMap.Pixel(10, 10),
+    position: lnglat,
+    showShadow: true
+});
+
+// $ExpectType void
+testInfoWindow.open(map);
+// $ExpectType void
+testInfoWindow.open(map, lnglat);
+// $ExpectType void
+testInfoWindow.open(map, lnglatTuple);
+
+// $ExpectType void
+testInfoWindow.close();
+
+// $ExpectType boolean
+testInfoWindow.getIsOpen();
+
+// $ExpectType void
+testInfoWindow.setContent('content');
+// $ExpectType void
+testInfoWindow.setContent(div);
+
+// $ExpectType string | HTMLElement | undefined
+testInfoWindow.getContent();
+
+// $ExpectType void
+testInfoWindow.setPosition(lnglat);
+// $ExpectType void
+testInfoWindow.setPosition(lnglatTuple);
+
+// $ExpectType LngLat | undefined
+testInfoWindow.getPosition();
+
+// $ExpectType Size | undefined
+testInfoWindow.getSize();
+
+testInfoWindow.on('change', (event: AMap.InfoWindow.EventMap<typeof testInfoWindow>['change']) => {
+    // $ExpectType "change"
+    event.type;
+    // $ExpectType InfoWindow<InfoWindowExtraData>
+    event.target;
+});
+
+testInfoWindow.on('close', (event: AMap.InfoWindow.EventMap<typeof testInfoWindow>['close']) => {
+    // $ExpectType "close"
+    event.type;
+    // $ExpectType InfoWindow<InfoWindowExtraData>
+    event.target;
+});
+
+testInfoWindow.on('open', (event: AMap.InfoWindow.EventMap<typeof testInfoWindow>['open']) => {
+    // $ExpectType "open"
+    event.type;
+    // $ExpectType InfoWindow<InfoWindowExtraData>
+    event.target;
+});
+
+/**
+ * overlay/marker.ts
+ */
+
+interface MarkerExtraData {
+    test: number;
+}
+
+// $ExpectType Marker<MarkerExtraData>
+new AMap.Marker<MarkerExtraData>();
+// $ExpectType Marker<any>
+new AMap.Marker();
+// $ExpectType Marker<any>
+new AMap.Marker({});
+// $ExpectType Marker<MarkerExtraData>
+const testMarker = new AMap.Marker<MarkerExtraData>({
+    map,
+    position: lnglat,
+    offset: pixel,
+    icon: 'iconUrl',
+    content: 'htmlString',
+    topWhenClick: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 10,
+    angle: 10,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: icon,
+    title: '123',
+    clickable: true,
+    shape: markerShape,
+    extData: {
+        test: 123
+    }
+});
+
+// $ExpectType void
+testMarker.markOnAMAP({
+    name: '123',
+    position: [1, 2]
+});
+// $ExpectType void
+testMarker.markOnAMAP();
+// $ExpectType void
+testMarker.markOnAMAP({});
+// $ExpectType void
+testMarker.markOnAMAP({
+    position: [1, 2],
+    name: '123'
+});
+
+// $ExpectType Pixel
+testMarker.getOffset();
+
+// $ExpectType void
+testMarker.setOffset(pixel);
+
+// $ExpectType void
+testMarker.setAnimation('AMAP_ANIMATION_BOUNCE');
+
+// $ExpectType AnimationName
+testMarker.getAnimation();
+
+// $ExpectType void
+testMarker.setClickable(true);
+
+// $ExpectType boolean
+testMarker.getClickable();
+
+// $ExpectType LngLat | undefined
+testMarker.getPosition();
+
+// $ExpectType void
+testMarker.setPosition(lnglat);
+
+// $ExpectType void
+testMarker.setAngle(0);
+
+// $ExpectType void
+testMarker.setLabel();
+// $ExpectType void
+testMarker.setLabel({});
+// $ExpectType void
+testMarker.setLabel({
+    content: 'label content',
+    offset: pixel
+});
+
+// $ExpectType Label | undefined
+testMarker.getLabel();
+
+// $ExpectType number
+testMarker.getAngle();
+
+// $ExpectType void
+testMarker.setzIndex(100);
+
+// $ExpectType number
+testMarker.getzIndex();
+
+// $ExpectType void
+testMarker.setIcon('icon uri');
+// $ExpectType void
+testMarker.setIcon(icon);
+
+// $ExpectType string | Icon | undefined
+testMarker.getIcon();
+
+// $ExpectType void
+testMarker.setDraggable(true);
+
+// $ExpectType boolean
+testMarker.getDraggable();
+
+// $ExpectType void
+testMarker.setCursor('default');
+
+// $ExpectType void
+testMarker.setContent('content');
+// $ExpectType void
+testMarker.setContent(domEle);
+
+// $ExpectType string | HTMLElement
+testMarker.getContent();
+
+// $ExpectType void
+testMarker.moveAlong([lnglat], 100);
+// $ExpectError
+testMarker.moveAlong([[1, 2]], 100);
+// $ExpectType void
+testMarker.moveAlong([lnglat], 100, t => t, false);
+
+// $ExpectType void
+testMarker.moveTo(lnglat, 100);
+// $ExpectType void
+testMarker.moveTo([1, 2], 100);
+// $ExpectType void
+testMarker.moveTo([1, 2], 100, t => t);
+
+// $ExpectType void
+testMarker.stopMove();
+
+// $ExpectType boolean
+testMarker.pauseMove();
+
+// $ExpectType boolean
+testMarker.resumeMove();
+
+// $ExpectType void
+testMarker.setMap(map);
+
+// $ExpectType void
+testMarker.setTitle('title');
+// $ExpectError
+testMarker.setTitle();
+
+// $ExpectType string | undefined
+testMarker.getTitle();
+
+// $ExpectType void
+testMarker.setTop(true);
+
+// $ExpectType boolean
+testMarker.getTop();
+
+// $ExpectType void
+testMarker.setShadow();
+// $ExpectType void
+testMarker.setShadow(icon);
+// $ExpectType void
+testMarker.setShadow('shadow url');
+
+// $ExpectType string | Icon | undefined
+testMarker.getShadow();
+
+// $ExpectType void
+testMarker.setShape();
+// $ExpectType void
+testMarker.setShape(markerShape);
+
+// $ExpectType MarkerShape | undefined
+testMarker.getShape();
+
+testMarker.on('click', (event: AMap.Marker.EventMap<typeof testMarker>['click']) => {
+    // $ExpectType {} | MarkerExtraData
+    event.target.getExtData();
+});
+
+/**
+ * overlay/markerShape.ts
+ */
+
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'circle',
+    coords: [1, 1, 1]
+});
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'rect',
+    coords: [1, 1, 1, 2]
+});
+// $ExpectType MarkerShape
+new AMap.MarkerShape({
+    type: 'poly',
+    coords: [1, 2, 3, 4, 5]
+});
+
+// $ExpectError
+new AMap.MarkerShape({
+    type: 'circle',
+    coords: [1, 1]
+});
+// $ExpectError
+new AMap.MarkerShape({
+    type: 'rect',
+    coords: [1, 1, 1, 2, 2]
+});
+
+/**
+ * overlay/overlay.ts
+ */
+
+interface OverlayExtraData {
+    test: number;
+}
+declare const testOverlay: AMap.Overlay<OverlayExtraData>;
+
+// $ExpectType void
+testOverlay.show();
+
+// $ExpectType void
+testOverlay.hide();
+
+// $ExpectType Map | null | undefined
+testOverlay.getMap();
+
+// $ExpectType void
+testOverlay.setMap(map);
+// $ExpectType void
+testOverlay.setMap(null);
+
+// $ExpectError
+testOverlay.setExtData({ any: 123 });
+
+// $ExpectError OverlayExtraData
+testOverlay.getExtData();
+
+/**
+ * overlay/overlayGroup.ts
+ */
+
+// $ExpectType OverlayGroup<Overlay<any>, any>
+const testOverlayGroup2 = new AMap.OverlayGroup();
+// $ExpectType OverlayGroup<Marker<any>, any>
+new AMap.OverlayGroup<AMap.Marker, any>(testMarker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+const testOverlayGroup = new AMap.OverlayGroup<AMap.Marker>([testMarker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.addOverlay(testMarker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.addOverlay([testMarker]);
+// $ExpectError
+testOverlayGroup.addOverlay([testCircle]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.addOverlays(testMarker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.addOverlays([testMarker]);
+
+// $ExpectType Marker<any>[]
+testOverlayGroup.getOverlays();
+
+// $ExpectType boolean
+testOverlayGroup.hasOverlay(testMarker);
+// $ExpectType boolean
+testOverlayGroup.hasOverlay(o => o === testMarker);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.removeOverlay(testMarker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.removeOverlay([testMarker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.removeOverlays(testMarker);
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.removeOverlays([testMarker]);
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.clearOverlays();
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.eachOverlay(function(overlay, index, overlays) {
+    // $ExpectType Marker<any>
+    overlay;
+    // $ExpectType number
+    index;
+    // $ExpectType Marker<any>[]
+    overlays;
+    // $ExpectType Marker<any>
+    this;
+});
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.setMap(null);
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.setMap(map);
+
+// $ExpectType OverlayGroup<Overlay<any>, any>
+testOverlayGroup2.setOptions({
+    test: 1
+});
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.setOptions({
+    map,
+    position: lnglat,
+    offset: pixel,
+    icon: 'iconUrl',
+    content: 'htmlString',
+    topWhenClick: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 10,
+    angle: 10,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: icon,
+    title: '123',
+    clickable: true,
+    shape: markerShape,
+    extData: {
+        test: 123
+    }
+});
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.show();
+
+// $ExpectType OverlayGroup<Marker<any>, any>
+testOverlayGroup.hide();
+
+testOverlayGroup.on('click', (event: AMap.MapsEvent<'click', AMap.Overlay>) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Overlay<any>
+    event.target;
+});
+
+/**
+ * overlay/polygon.ts
+ */
+
+interface PolygonExtraData {
+    test: number;
+}
+
+const polygonPath1 = [lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple];
+const polygonPath2 = [lnglat, lnglat, lnglat, lnglat, lnglat];
+
+// $ExpectType Polygon<any>
+new AMap.Polygon();
+// $ExpectType Polygon<any>
+new AMap.Polygon({});
+// $ExpectType Polygon<PolygonExtraData>
+const testPolygon = new AMap.Polygon<PolygonExtraData>({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.3,
+    strokeWeight: 5,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    draggable: true,
+    extData: { test: 1 },
+    strokeStyle: 'dashed',
+    strokeDasharray: [2, 4],
+    path: polygonPath1
+});
+
+// $ExpectType void
+testPolygon.setPath(polygonPath1);
+// $ExpectType void
+testPolygon.setPath(polygonPath2);
+// $ExpectType void
+testPolygon.setPath([polygonPath1, polygonPath2]);
+
+// $ExpectType LngLat[] | LngLat[][]
+testPolygon.getPath();
+
+// $ExpectType void
+testPolygon.setOptions({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 5,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    draggable: true,
+    extData: { test: 1 },
+    strokeStyle: 'dashed',
+    strokeDasharray: [4, 2],
+    path: [polygonPath2, polygonPath1]
+});
+
+{
+    const options = testPolygon.getOptions();
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType {} | PolygonExtraData | undefined
+    options.extData;
+    // $ExpectType string | undefined
+    options.fillColor;
+    // $ExpectType number | undefined
+    options.fillOpacity;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType LngLat[] | LngLat[][] | undefined
+    options.path;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType string | undefined
+    options.texture;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType Bounds | null
+testPolygon.getBounds();
+
+// $ExpectType number
+testPolygon.getArea();
+
+// $ExpectType void
+testPolygon.setMap(null);
+// $ExpectType void
+testPolygon.setMap(map);
+
+// $ExpectType void
+testPolygon.setExtData({ test: 1 });
+
+// $ExpectType {} | PolygonExtraData
+testPolygon.getExtData();
+
+// $ExpectType boolean
+testPolygon.contains(lnglat);
+// $ExpectType boolean
+testPolygon.contains(lnglatTuple);
+
+testPolygon.on('click', (event: AMap.Polygon.EventMap<typeof testPolygon>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Polygon<PolygonExtraData>
+    event.target;
+});
+
+/**
+ * overlay/polyline.ts
+ */
+
+interface PolylineExtraData {
+    test: number;
+}
+
+// $ExpectType Polyline<any>
+new AMap.Polyline();
+// $ExpectType Polyline<any>
+new AMap.Polyline({});
+// $ExpectType Polyline<PolylineExtraData>
+const testPolyline = new AMap.Polyline<PolylineExtraData>({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'default',
+    geodesic: true,
+    isOutline: true,
+    borderWeight: 1,
+    outlineColor: '#AA0000',
+    path: [lnglat],
+    strokeColor: '#0000AA',
+    strokeOpacity: 0.5,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [20, 10, 20],
+    lineJoin: 'bevel',
+    lineCap: 'butt',
+    draggable: true,
+    extData: { test: 1 },
+    showDir: true
+});
+// Polyline<PolylineExtraData>
+
+// $ExpectType void
+testPolyline.setPath([lnglat]);
+// $ExpectType void
+testPolyline.setPath([lnglatTuple]);
+
+// $ExpectType void
+testPolyline.setOptions({});
+// $ExpectType void
+testPolyline.setOptions({
+    map,
+    zIndex: 10,
+    bubble: true,
+    cursor: 'default',
+    geodesic: true,
+    isOutline: true,
+    borderWeight: 1,
+    outlineColor: '#AA0000',
+    path: [lnglat, lnglat],
+    strokeColor: '#0000AA',
+    strokeOpacity: 0.5,
+    strokeWeight: 10,
+    strokeStyle: 'dashed',
+    strokeDasharray: [20, 10, 20],
+    lineJoin: 'bevel',
+    lineCap: 'butt',
+    draggable: true,
+    extData: { test: 1 },
+    showDir: true
+});
+
+{
+    const options = testPolyline.getOptions();
+    // $ExpectType number | undefined
+    options.borderWeight;
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType string | undefined
+    options.dirColor;
+    // $ExpectType string | undefined
+    options.dirImg;
+    // $ExpectType {} | PolylineExtraData | undefined
+    options.extData;
+    // $ExpectType boolean | undefined
+    options.geodesic;
+    // $ExpectType boolean | undefined
+    options.isOutline;
+    // $ExpectType "round" | "butt" | "square" | undefined
+    options.lineCap;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType string | undefined
+    options.outlineColor;
+    // $ExpectType LngLat[] | undefined
+    options.path;
+    // $ExpectType boolean | undefined
+    options.showDir;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType number
+testPolyline.getLength();
+
+// $ExpectType Bounds | null
+testPolyline.getBounds();
+
+// $ExpectType void
+testPolyline.hide();
+
+// $ExpectType void
+testPolyline.show();
+
+// $ExpectType void
+testPolyline.setMap(null);
+// $ExpectType void
+testPolyline.setMap(map);
+
+// $ExpectType void
+testPolyline.setExtData({ test: 1 });
+
+// $ExpectType {} | PolylineExtraData
+testPolyline.getExtData();
+
+testPolyline.on('click', (event: AMap.Polyline.EventMap<typeof testPolyline>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Polyline<PolylineExtraData>
+    event.target;
+});
+
+/**
+ * overlay/rectangle.ts
+ */
+
+interface RectangleExtraData {
+    test: number;
+}
+
+// $ExpectType Rectangle<any>
+new AMap.Rectangle();
+// $ExpectType Rectangle<any>
+new AMap.Rectangle({});
+// $ExpectType Rectangle<RectangleExtraData>
+const testRectangle = new AMap.Rectangle<RectangleExtraData>({
+    map,
+    zIndex: 10,
+    bounds,
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'solid',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+// $ExpectType Bounds | undefined
+testRectangle.getBounds();
+
+// $ExpectType void
+testRectangle.setBounds(bounds);
+
+// $ExpectType void
+testRectangle.setOptions({});
+// $ExpectType void
+testRectangle.setOptions({
+    map,
+    zIndex: 10,
+    bounds,
+    bubble: false,
+    cursor: 'pointer',
+    strokeColor: '#00FF00',
+    strokeOpacity: 0.8,
+    strokeWeight: 2,
+    fillColor: '#0000FF',
+    fillOpacity: 0.5,
+    strokeStyle: 'solid',
+    extData: { test: 1 },
+    strokeDasharray: [1, 5]
+});
+
+{
+    const options = testRectangle.getOptions();
+    // $ExpectType Bounds | undefined
+    options.bounds;
+    // $ExpectType boolean | undefined
+    options.bubble;
+    // $ExpectType boolean | undefined
+    options.clickable;
+    // $ExpectType {} | RectangleExtraData | undefined
+    options.extData;
+    // $ExpectType string | undefined
+    options.fillColor;
+    // $ExpectType number | undefined
+    options.fillOpacity;
+    // $ExpectType "miter" | "round" | "bevel" | undefined
+    options.lineJoin;
+    // $ExpectType Map | undefined
+    options.map;
+    // $ExpectType LngLat[] | undefined
+    options.path;
+    // $ExpectType string | undefined
+    options.strokeColor;
+    // $ExpectType number[] | undefined
+    options.strokeDasharray;
+    // $ExpectType number | undefined
+    options.strokeOpacity;
+    // $ExpectType "dashed" | "solid" | undefined
+    options.strokeStyle;
+    // $ExpectType number | undefined
+    options.strokeWeight;
+    // $ExpectType string | undefined
+    options.texture;
+    // $ExpectType number | undefined
+    options.zIndex;
+}
+
+// $ExpectType void
+testRectangle.hide();
+
+// $ExpectType void
+testRectangle.show();
+
+// $ExpectType void
+testRectangle.setExtData({test: 2});
+
+// $ExpectType {} | RectangleExtraData
+testRectangle.getExtData();
+
+// $ExpectType boolean
+testRectangle.contains(lnglat);
+// $ExpectType boolean
+testRectangle.contains(lnglatTuple);
+
+testRectangle.on('click', (event: AMap.Rectangle.EventMap<typeof testRectangle>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Rectangle<RectangleExtraData>
+    event.target;
+});
+
+testRectangle.on('setBounds', (event: AMap.Rectangle.EventMap<typeof testRectangle>['setBounds']) => {
+    // $ExpectType "setBounds"
+    event.type;
+    // $ExpectError
+    event.target;
+});
+
+/**
+ * overlay/text.ts
+ */
+
+interface TextExtraData {
+    test: number;
+}
+
+// $ExpectType Text<any>
+new AMap.Text();
+// $ExpectType Text<any>
+new AMap.Text({});
+// $ExpectType Text<TextExtraData>
+const testText = new AMap.Text<TextExtraData>({
+    text: 'content',
+    textAlign: 'center',
+    verticalAlign: 'top',
+    map,
+    position: lnglat,
+    offset: pixel,
+    topWhenClick: true,
+    bubble: true,
+    draggable: true,
+    raiseOnDrag: true,
+    cursor: 'default',
+    visible: true,
+    zIndex: 100,
+    angle: 45,
+    autoRotation: true,
+    animation: 'AMAP_ANIMATION_BOUNCE',
+    shadow: 'https://webapi.amap.com/theme/v1.3/markers/0.png',
+    title: 'title',
+    clickable: true,
+    extData: { test: 1 }
+});
+
+// $ExpectType string
+testText.getText();
+
+// $ExpectType void
+testText.setText('123');
+
+// $ExpectType void
+testText.setStyle({
+    background: 'red',
+    width: '200px'
+});
+
+// $ExpectType void
+testText.markOnAMAP({
+    name: '123',
+    position: lnglatTuple
+});
+
+// $ExpectType Pixel
+testText.getOffset();
+
+// $ExpectType void
+testText.setOffset(pixel);
+
+// $ExpectType void
+testText.setAnimation('AMAP_ANIMATION_BOUNCE');
+
+// $ExpectType AnimationName
+testText.getAnimation();
+
+// $ExpectType void
+testText.setClickable(true);
+
+// $ExpectType boolean
+testText.getClickable();
+
+// $ExpectType LngLat | undefined
+testText.getPosition();
+
+// $ExpectType void
+testText.setAngle(10);
+
+// $ExpectType number
+testText.getAngle();
+
+// $ExpectType void
+testText.setzIndex(1);
+
+// $ExpectType number
+testText.getzIndex();
+
+// $ExpectType void
+testText.setDraggable(true);
+
+// $ExpectType boolean
+testText.getDraggable();
+
+// $ExpectType void
+testText.hide();
+
+// $ExpectType void
+testText.show();
+
+// $ExpectType void
+testText.setCursor('default');
+
+// $ExpectType void
+testText.moveAlong([lnglat], 100);
+
+// $ExpectType void
+testText.moveAlong([lnglat], 100);
+// $ExpectError
+testText.moveAlong([[1, 2]], 100);
+// $ExpectType void
+testText.moveAlong([lnglat], 100, t => t, false);
+
+// $ExpectType void
+testText.moveTo(lnglat, 100);
+// $ExpectType void
+testText.moveTo([1, 2], 100);
+// $ExpectType void
+testText.moveTo([1, 2], 100, t => t);
+
+// $ExpectType void
+testText.stopMove();
+
+// $ExpectType boolean
+testText.pauseMove();
+
+// $ExpectType boolean
+testText.resumeMove();
+
+// $ExpectType void
+testText.setMap(map);
+
+// $ExpectType void
+testText.setTitle('title');
+// $ExpectError
+testText.setTitle();
+
+// $ExpectType string | undefined
+testText.getTitle();
+
+// $ExpectType void
+testText.setTop(true);
+
+// $ExpectType boolean
+testText.getTop();
+
+// $ExpectType void
+testText.setShadow();
+// $ExpectType void
+testText.setShadow(icon);
+// $ExpectType void
+testText.setShadow('shadow url');
+
+// $ExpectType void
+testText.setExtData({test: 1});
+
+// $ExpectType {} | TextExtraData
+testText.getExtData();
+
+testText.on('click', (event: AMap.Text.EventMap<typeof testText>['click']) => {
+    // $ExpectType "click"
+    event.type;
+    // $ExpectType Text<TextExtraData>
+    event.target;
+});
diff --git a/types/amap-js-api/index.d.ts b/types/amap-js-api/index.d.ts
index 54f79c08ea..5b8c1a5b94 100644
--- a/types/amap-js-api/index.d.ts
+++ b/types/amap-js-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package amap-js-sdk 1.4
+// Type definitions for non-npm package amap-js-api 1.4
 // Project: https://lbs.amap.com/api/javascript-api/summary
 // Definitions by: breeze9527 <https://github.com/breeze9527>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/amap-js-api/overlay/markerShape.d.ts b/types/amap-js-api/overlay/markerShape.d.ts
index c8efd93850..f0d6c39bac 100644
--- a/types/amap-js-api/overlay/markerShape.d.ts
+++ b/types/amap-js-api/overlay/markerShape.d.ts
@@ -15,7 +15,7 @@ declare namespace AMap {
         type Options = CircleOptions | PolyOptions | RectOptions;
     }
 
-    class MarkerShape {
+    class MarkerShape extends EventEmitter {
         constructor(options: MarkerShape.Options);
     }
 }
diff --git a/types/amap-js-api/test/arryBounds.ts b/types/amap-js-api/test/arryBounds.ts
deleted file mode 100644
index 1ccc4d0488..0000000000
--- a/types/amap-js-api/test/arryBounds.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {
-    lnglat
-} from './preset';
-
-// $ExpectType ArrayBounds
-const arrayBounds = new AMap.ArrayBounds([lnglat, lnglat, lnglat]);
-
-// $ExpectType LngLat[]
-arrayBounds.bounds;
-
-// $ExpectType boolean
-arrayBounds.contains(lnglat);
-
-// $ExpectType Bounds
-arrayBounds.toBounds();
-
-// $ExpectType LngLat
-arrayBounds.getCenter();
diff --git a/types/amap-js-api/test/bounds.ts b/types/amap-js-api/test/bounds.ts
deleted file mode 100644
index d22ba697f9..0000000000
--- a/types/amap-js-api/test/bounds.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-    lnglat,
-    lnglatTuple
-} from './preset';
-
-// $ExpectType Bounds
-const bounds = new AMap.Bounds(lnglat, lnglat);
-
-// $ExpectType boolean
-bounds.contains(lnglat);
-// $ExpectType boolean
-bounds.contains(lnglatTuple);
-
-// $ExpectType LngLat
-bounds.getCenter();
-
-// $ExpectType LngLat
-bounds.getSouthWest();
-
-// $ExpectType LngLat
-bounds.getSouthEast();
-
-// $ExpectType LngLat
-bounds.getNorthEast();
-
-// $ExpectType LngLat
-bounds.getNorthWest();
-
-// $ExpectType string
-bounds.toString();
diff --git a/types/amap-js-api/test/browser.ts b/types/amap-js-api/test/browser.ts
deleted file mode 100644
index b80d8cd3ff..0000000000
--- a/types/amap-js-api/test/browser.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-const brwoser = AMap.Browser;
-
-// $ExpectType string
-brwoser.ua;
-
-// $ExpectType boolean
-brwoser.mobile;
-
-const plat: 'android' | 'ios' | 'windows' | 'mac' | 'other' = brwoser.plat;
-
-// $ExpectType boolean
-brwoser.mac;
-
-// $ExpectType boolean
-brwoser.windows;
-
-// $ExpectType boolean
-brwoser.ios;
-
-// $ExpectType boolean
-brwoser.iPad;
-
-// $ExpectType boolean
-brwoser.iPhone;
-
-// $ExpectType boolean
-brwoser.android;
-
-// $ExpectType boolean
-brwoser.android23;
-
-// $ExpectType boolean
-brwoser.chrome;
-
-// $ExpectType boolean
-brwoser.firefox;
-
-// $ExpectType boolean
-brwoser.safari;
-
-// $ExpectType boolean
-brwoser.wechat;
-
-// $ExpectType boolean
-brwoser.uc;
-
-// $ExpectType boolean
-brwoser.qq;
-
-// $ExpectType boolean
-brwoser.ie;
-
-// $ExpectType boolean
-brwoser.ie6;
-
-// $ExpectType boolean
-brwoser.ie7;
-
-// $ExpectType boolean
-brwoser.ie8;
-
-// $ExpectType boolean
-brwoser.ie9;
-
-// $ExpectType boolean
-brwoser.ie10;
-
-// $ExpectType boolean
-brwoser.ie11;
-
-// $ExpectType boolean
-brwoser.edge;
-
-// $ExpectType boolean
-brwoser.ielt9;
-
-// $ExpectType boolean
-brwoser.baidu;
-
-// $ExpectType boolean
-brwoser.isLocalStorage;
-
-// $ExpectType boolean
-brwoser.isGeolocation;
-
-// $ExpectType boolean
-brwoser.mobileWebkit;
-
-// $ExpectType boolean
-brwoser.mobileWebkit3d;
-
-// $ExpectType boolean
-brwoser.mobileOpera;
-
-// $ExpectType boolean
-brwoser.retina;
-
-// $ExpectType boolean
-brwoser.touch;
-
-// $ExpectType boolean
-brwoser.msPointer;
-
-// $ExpectType boolean
-brwoser.pointer;
-
-// $ExpectType boolean
-brwoser.webkit;
-
-// $ExpectType boolean
-brwoser.ie3d;
-
-// $ExpectType boolean
-brwoser.webkit3d;
-
-// $ExpectType boolean
-brwoser.gecko3d;
-
-// $ExpectType boolean
-brwoser.opera3d;
-
-// $ExpectType boolean
-brwoser.any3d;
-
-// $ExpectType boolean
-brwoser.isCanvas;
-
-// $ExpectType boolean
-brwoser.isSvg;
-
-// $ExpectType boolean
-brwoser.isVML;
-
-// $ExpectType boolean
-brwoser.isWorker;
-
-// $ExpectType boolean
-brwoser.isWebsocket;
-
-// $ExpectType boolean
-brwoser.isWebGL();
diff --git a/types/amap-js-api/test/convert-from.ts b/types/amap-js-api/test/convert-from.ts
deleted file mode 100644
index 8cb9b8502c..0000000000
--- a/types/amap-js-api/test/convert-from.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-    lnglat,
-    lnglatTuple
-} from './preset';
-
-declare const convertType: 'baidu' | 'mapbar' | 'gps' | null;
-// $ExpectType void
-AMap.convertFrom(lnglat, convertType, (status, result) => {
-    const temp: 'complete' | 'error' = status;
-    if (typeof result !== 'string') {
-        // $ExpectType string
-        result.info;
-        // $ExpectType LngLat[]
-        result.locations;
-    } else {
-        // $ExpectType string
-        result;
-    }
-});
-// $ExpectType void
-AMap.convertFrom([lnglat], null, () => { });
-// $ExpectType void
-AMap.convertFrom(lnglatTuple, null, () => { });
-// $ExpectType void
-AMap.convertFrom([lnglatTuple], null, () => { });
diff --git a/types/amap-js-api/test/dom-util.ts b/types/amap-js-api/test/dom-util.ts
deleted file mode 100644
index 6cb0bce511..0000000000
--- a/types/amap-js-api/test/dom-util.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { div } from './preset';
-
-const util = AMap.DomUtil;
-
-// $ExpectType Size
-util.getViewport(div);
-
-// $ExpectType Pixel
-util.getViewportOffset(div);
-
-// $ExpectType HTMLDivElement
-util.create('div');
-// $ExpectType HTMLAnchorElement
-util.create('a');
-// $ExpectType HTMLDivElement
-util.create('div', div);
-// $ExpectType HTMLDivElement
-util.create('div', div, 'className');
-
-// $ExpectType void
-util.setClass(div);
-// $ExpectType void
-util.setClass(div, 'className');
-
-// $ExpectType boolean
-util.hasClass(div, 'className');
-
-// $ExpectType void
-util.removeClass(div, 'className');
-
-// $ExpectType void
-util.setOpacity(div, 1);
-
-// $ExpectType void
-util.rotate(div, 10);
-// $ExpectType void
-util.rotate(div, 10, { x: 10, y: 10 });
-
-const util2: typeof AMap.DomUtil = util.setCss(div, { textAlign: 'left' });
-// $ExpectError
-util.setCss(div, { textAlign: 10 });
-
-// $ExpectType void
-util.empty(div);
-
-// $ExpectType void
-util.remove(div);
diff --git a/types/amap-js-api/test/event.ts b/types/amap-js-api/test/event.ts
deleted file mode 100644
index 8061b0d747..0000000000
--- a/types/amap-js-api/test/event.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {
-    lnglat,
-    pixel,
-    map
-} from './preset';
-declare var div: HTMLDivElement;
-declare var input: HTMLInputElement;
-
-// $ExpectType Map
-map.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
-    // $ExpectType "hotspotclick"
-    event.type;
-    // $ExpectType string
-    event.id;
-    // $ExpectType LngLat
-    event.lnglat;
-});
-
-// $ExpectType EventListener<0>
-AMap.event.addDomListener(div, 'click', event => {
-    // $ExpectType number
-    event.clientX;
-});
-
-// $ExpectType EventListener<1>
-AMap.event.addListener(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
-    // $ExpectType "hotspotclick"
-    event.type;
-    // $ExpectType string
-    event.id;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType number
-    this.test;
-}, { test: 1 });
-AMap.event.addListener(map, 'click', (event: AMap.Map.EventMap['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType Map
-    event.target;
-});
-
-// $ExpectType EventListener<1>
-const eventListener = AMap.event.addListenerOnce(map, 'hotspotclick', function (event: AMap.Map.EventMap['hotspotclick']) {
-    // $ExpectType "hotspotclick"
-    event.type;
-    // $ExpectType string
-    event.id;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType number
-    this.test;
-}, { test: 1 });
-
-// $ExpectType void
-AMap.event.removeListener(eventListener);
-
-// $ExpectType void
-AMap.event.trigger(map, 'click', {
-    lnglat,
-    pixel,
-    target: map
-});
-// $ExpectType void
-AMap.event.trigger(map, 'hotspotclick', {
-    lnglat,
-    name: 'name',
-    id: 'id',
-    isIndoorPOI: true
-});
-// $ExpectType void
-AMap.event.trigger(map, 'complete');
diff --git a/types/amap-js-api/test/geometry-util.ts b/types/amap-js-api/test/geometry-util.ts
deleted file mode 100644
index 98a8263fb0..0000000000
--- a/types/amap-js-api/test/geometry-util.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import {
-    lnglat as point,
-    lnglatTuple as pointTuple
-} from './preset';
-
-const line = [point];
-const lineTuple = [pointTuple];
-const ring = [point];
-const ringTuple = [pointTuple];
-const polygon = [ring];
-const polygonTuple = [ringTuple];
-const util = AMap.GeometryUtil;
-
-// $ExpectType number
-util.distance(point, point);
-// $ExpectType number
-util.distance(pointTuple, pointTuple);
-// $ExpectType number
-util.distance(point, line);
-// $ExpectType number
-util.distance(pointTuple, lineTuple);
-
-// $ExpectType number
-util.ringArea(ring);
-// $ExpectType number
-util.ringArea(ringTuple);
-
-// $ExpectType boolean
-util.isClockwise(ring);
-// $ExpectType boolean
-util.isClockwise(ringTuple);
-
-// $ExpectType number
-util.distanceOfLine(line);
-// $ExpectType number
-util.distanceOfLine(lineTuple);
-
-// $ExpectType [number, number][]
-util.ringRingClip(ring, ring);
-// $ExpectType [number, number][]
-util.ringRingClip(ringTuple, ringTuple);
-
-// $ExpectType boolean
-util.doesRingRingIntersect(ring, ring);
-// $ExpectType boolean
-util.doesRingRingIntersect(ringTuple, ringTuple);
-
-// $ExpectType boolean
-util.doesLineRingIntersect(line, ring);
-// $ExpectType boolean
-util.doesLineRingIntersect(lineTuple, ringTuple);
-
-// $ExpectType boolean
-util.doesLineLineIntersect(line, line);
-// $ExpectType boolean
-util.doesLineLineIntersect(lineTuple, lineTuple);
-
-// $ExpectType boolean
-util.doesSegmentPolygonIntersect(point, point, polygon);
-// $ExpectType boolean
-util.doesSegmentPolygonIntersect(pointTuple, pointTuple, polygonTuple);
-
-// $ExpectType boolean
-util.doesSegmentRingIntersect(point, point, ring);
-// $ExpectType boolean
-util.doesSegmentRingIntersect(pointTuple, pointTuple, ringTuple);
-
-// $ExpectType boolean
-util.doesSegmentLineIntersect(point, point, line);
-// $ExpectType boolean
-util.doesSegmentLineIntersect(pointTuple, pointTuple, lineTuple);
-
-// $ExpectType boolean
-util.doesSegmentsIntersect(point, point, point, point);
-// $ExpectType boolean
-util.doesSegmentsIntersect(pointTuple, pointTuple, pointTuple, pointTuple);
-
-// $ExpectType boolean
-util.isPointInRing(point, ring);
-// $ExpectType boolean
-util.isPointInRing(pointTuple, ringTuple);
-
-// $ExpectType boolean
-util.isRingInRing(ring, ring);
-// $ExpectType boolean
-util.isRingInRing(ringTuple, ringTuple);
-
-// $ExpectType boolean
-util.isPointInPolygon(point, polygon);
-// $ExpectType boolean
-util.isPointInPolygon(pointTuple, polygonTuple);
-
-// $ExpectType [number, number][]
-util.makesureClockwise(lineTuple);
-
-// $ExpectType [number, number][]
-util.makesureAntiClockwise(lineTuple);
-
-// $ExpectType [number, number]
-util.closestOnSegment(point, point, point);
-// $ExpectType [number, number]
-util.closestOnSegment(pointTuple, pointTuple, pointTuple);
-
-// $ExpectType [number, number]
-util.closestOnSegment(point, point, point);
-// $ExpectType [number, number]
-util.closestOnSegment(pointTuple, pointTuple, pointTuple);
-
-// $ExpectType [number, number]
-util.closestOnLine(point, line);
-// $ExpectType [number, number]
-util.closestOnLine(pointTuple, lineTuple);
-
-// $ExpectType number
-util.distanceToSegment(point, point, point);
-// $ExpectType number
-util.distanceToSegment(pointTuple, pointTuple, pointTuple);
-
-// $ExpectType number
-util.distanceToLine(point, line);
-// $ExpectType number
-util.distanceToLine(pointTuple, lineTuple);
-
-// $ExpectType boolean
-util.isPointOnSegment(point, point, point);
-// $ExpectType boolean
-util.isPointOnSegment(point, point, point, 1);
-// $ExpectType boolean
-util.isPointOnSegment(pointTuple, pointTuple, pointTuple);
-// $ExpectType boolean
-util.isPointOnSegment(pointTuple, pointTuple, pointTuple, 1);
-
-// $ExpectType boolean
-util.isPointOnLine(point, line);
-// $ExpectType boolean
-util.isPointOnLine(point, line, 1);
-// $ExpectType boolean
-util.isPointOnLine(pointTuple, lineTuple);
-// $ExpectType boolean
-util.isPointOnLine(pointTuple, lineTuple, 1);
-
-// $ExpectType boolean
-util.isPointOnRing(point, ring);
-// $ExpectType boolean
-util.isPointOnRing(point, ring, 1);
-// $ExpectType boolean
-util.isPointOnRing(pointTuple, ringTuple);
-// $ExpectType boolean
-util.isPointOnRing(pointTuple, ringTuple, 1);
-
-// $ExpectType boolean
-util.isPointOnPolygon(point, polygon);
-// $ExpectType boolean
-util.isPointOnPolygon(point, polygon, 1);
-// $ExpectType boolean
-util.isPointOnPolygon(pointTuple, polygonTuple);
-// $ExpectType boolean
-util.isPointOnPolygon(pointTuple, polygonTuple, 1);
diff --git a/types/amap-js-api/test/layer/buildings.ts b/types/amap-js-api/test/layer/buildings.ts
deleted file mode 100644
index 209b3c490b..0000000000
--- a/types/amap-js-api/test/layer/buildings.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-declare var map: AMap.Map;
-declare var lnglat: AMap.LngLat;
-
-// $ExpectType Buildings
-var buildings = new AMap.Buildings();
-// $ExpectType Buildings
-new AMap.Buildings();
-// $ExpectType Buildings
-new AMap.Buildings({
-    zooms: [1, 18],
-    opacity: 0.8,
-    heightFactor: 1,
-    visible: true,
-    zIndex: 10,
-    map
-});
-
-buildings.setStyle({
-    hideWithoutStyle: false,
-    areas: [
-        {
-            visible: true,
-            rejectTexture: true,
-            color1: 'ffffff00',
-            color2: 'ffffcc00',
-            path: [[1, 2]]
-        },
-        {
-            visible: true,
-            rejectTexture: true,
-            color1: 'ffffff00',
-            color2: 'ffffcc00',
-            path: [lnglat]
-        },
-        {
-            color1: 'ff99ff00',
-            path: [lnglat]
-        },
-    ]
-});
diff --git a/types/amap-js-api/test/layer/canvasLayer.ts b/types/amap-js-api/test/layer/canvasLayer.ts
deleted file mode 100644
index 577d032b2c..0000000000
--- a/types/amap-js-api/test/layer/canvasLayer.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
-    map,
-    bounds
-} from '../preset';
-
-declare const canvas: HTMLCanvasElement;
-
-// $ExpectType CanvasLayer
-new AMap.CanvasLayer({
-    map,
-    bounds,
-    visible: true,
-    zooms: [1, 2],
-    opacity: 1
-});
-
-// $ExpectType CanvasLayer
-new AMap.CanvasLayer();
-// $ExpectType CanvasLayer
-new AMap.CanvasLayer({});
-// $ExpectType CanvasLayer
-const canvasLayer = new AMap.CanvasLayer({
-    bounds
-});
-
-// $ExpectType void
-canvasLayer.setMap(null);
-// $ExpectType void
-canvasLayer.setMap(map);
-
-// $ExpectType Map | null | undefined
-canvasLayer.getMap();
-
-// $ExpectType void
-canvasLayer.show();
-
-// $ExpectType void
-canvasLayer.hide();
-
-// $ExpectType number
-canvasLayer.getzIndex();
-
-// $ExpectType void
-canvasLayer.setzIndex(10);
-
-// $ExpectType HTMLCanvasElement | null
-canvasLayer.getElement();
-
-// $ExpectType void
-canvasLayer.setCanvas(canvas);
-
-// $ExpectType HTMLCanvasElement | undefined
-canvasLayer.getCanvas();
diff --git a/types/amap-js-api/test/layer/flexible.ts b/types/amap-js-api/test/layer/flexible.ts
deleted file mode 100644
index 5a0e3f7aa7..0000000000
--- a/types/amap-js-api/test/layer/flexible.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import {
-    map
-} from '../preset';
-
-const img = document.createElement('img');
-const canvas = document.createElement('canvas');
-
-// $ExpectType Flexible
-new AMap.TileLayer.Flexible();
-// $ExpectType Flexible
-new AMap.TileLayer.Flexible({});
-// $ExpectType Flexible
-const flexible = new AMap.TileLayer.Flexible({
-    createTile(x, y, z, success, fail) {
-        // $ExpectType number
-        x;
-        // $ExpectType number
-        y;
-        // $ExpectType number
-        z;
-        // $ExpectType void
-        success(img);
-        // $ExpectType void
-        success(canvas);
-        // $ExpectType void
-        fail();
-    },
-    cacheSize: 10,
-    opacity: 1,
-    visible: true,
-    map,
-    zIndex: 1,
-    zooms: [1, 2]
-});
-
-// $ExpectType void
-flexible.setMap(null);
-// $ExpectType void
-flexible.setMap(map);
-
-// $ExpectType Map | null | undefined
-flexible.getMap();
-
-// $ExpectType void
-flexible.show();
-
-// $ExpectType void
-flexible.hide();
-
-// $ExpectType void
-flexible.setzIndex(10);
-
-// $ExpectType number
-flexible.getzIndex();
diff --git a/types/amap-js-api/test/layer/imageLayer.ts b/types/amap-js-api/test/layer/imageLayer.ts
deleted file mode 100644
index 06b9fc076e..0000000000
--- a/types/amap-js-api/test/layer/imageLayer.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import {
-    map,
-    bounds
-} from '../preset';
-
-// $ExpectType ImageLayer
-new AMap.ImageLayer({
-    map,
-    bounds,
-    visible: true,
-    zooms: [1, 2],
-    opacity: 1
-});
-
-// $ExpectType ImageLayer
-new AMap.ImageLayer();
-// $ExpectType ImageLayer
-new AMap.ImageLayer({});
-// $ExpectType ImageLayer
-const imageLayer = new AMap.ImageLayer({
-    bounds
-});
-
-// $ExpectType void
-imageLayer.setMap(null);
-// $ExpectType void
-imageLayer.setMap(map);
-
-// $ExpectType Map | null | undefined
-imageLayer.getMap();
-
-// $ExpectType void
-imageLayer.show();
-
-// $ExpectType void
-imageLayer.hide();
-
-// $ExpectType number
-imageLayer.getzIndex();
-
-// $ExpectType void
-imageLayer.setzIndex(10);
-
-// $ExpectType HTMLImageElement | null
-imageLayer.getElement();
-
-// $ExpectType void
-imageLayer.setImageUrl('url');
-
-// $ExpectType string | undefined
-imageLayer.getImageUrl();
diff --git a/types/amap-js-api/test/layer/layer.ts b/types/amap-js-api/test/layer/layer.ts
deleted file mode 100644
index 921c90e52d..0000000000
--- a/types/amap-js-api/test/layer/layer.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-declare var layer: AMap.Layer;
-declare var map: AMap.Map;
-
-// $ExpectError
-new AMap.Layer();
-
-// $ExpectType HTMLDivElement | undefined
-layer.getContainer();
-
-// $ExpectType [number, number]
-layer.getZooms();
-
-// $ExpectType void
-layer.setOpacity(1);
-
-// $ExpectType number
-layer.getOpacity();
-
-// $ExpectType void
-layer.show();
-
-// $ExpectType void
-layer.hide();
-
-// $ExpectType void
-layer.setMap();
-// $ExpectType void
-layer.setMap(map);
-
-// $ExpectType void
-layer.setzIndex(1);
-
-// $ExpectType number
-layer.getzIndex();
diff --git a/types/amap-js-api/test/layer/layerGroup.ts b/types/amap-js-api/test/layer/layerGroup.ts
deleted file mode 100644
index bcad7d6f50..0000000000
--- a/types/amap-js-api/test/layer/layerGroup.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-declare var map: AMap.Map;
-declare var tileLayer: AMap.TileLayer;
-declare var massMarksLayer: AMap.MassMarks;
-declare var layer: AMap.Layer;
-
-// $ExpectError
-new AMap.LayerGroup();
-
-// $ExpectType LayerGroup<TileLayer>
-new AMap.LayerGroup(tileLayer);
-// $ExpectType LayerGroup<TileLayer>
-new AMap.LayerGroup([tileLayer]);
-
-declare var layerGruop: AMap.LayerGroup<AMap.TileLayer>;
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.addLayer(tileLayer);
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.addLayer([tileLayer]);
-// $ExpectError
-layerGruop.addLayer(massMarksLayer);
-
-// $ExpectType TileLayer[]
-layerGruop.getLayers();
-
-// $ExpectType TileLayer | null
-layerGruop.getLayer(function (item, index, list) {
-    // $ExpectType TileLayer
-    item;
-    // $ExpectType number
-    index;
-    // $ExpectType TileLayer[]
-    list;
-    // $ExpectType null
-    this;
-
-    return true;
-});
-
-layerGruop.hasLayer(function (item, index, list) {
-    // $ExpectType TileLayer
-    item;
-    // $ExpectType number
-    index;
-    // $ExpectType TileLayer[]
-    list;
-    // $ExpectType null
-    this;
-
-    return true;
-});
-layerGruop.hasLayer(tileLayer);
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.removeLayer(tileLayer);
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.removeLayer([tileLayer]);
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.clearLayers();
-
-layerGruop.eachLayer(function (item, index, list) {
-    // $ExpectType TileLayer
-    item;
-    // $ExpectType number
-    index;
-    // $ExpectType TileLayer[]
-    list;
-    // $ExpectType TileLayer
-    this;
-});
-layerGruop.eachLayer(function (item, index, list) {
-    // $ExpectType TileLayer
-    item;
-    // $ExpectType number
-    index;
-    // $ExpectType TileLayer[]
-    list;
-    // $ExpectType number
-    this.test;
-}, { test: 1 });
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.setMap(map);
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.hide();
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.show();
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.reload();
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.setOptions({});
-
-// $ExpectType LayerGroup<TileLayer>
-layerGruop.setOptions({
-    tileSize: 256
-});
-// layerGruop.setOptions({
-//     // $ExpectError
-//     interval: 1
-// });
-
-declare var layerGroup2: AMap.LayerGroup;
-
-layerGroup2.addLayer(tileLayer);
-
-layerGroup2.addLayer(massMarksLayer);
-
-layerGroup2.setOptions({
-    test: 1
-});
diff --git a/types/amap-js-api/test/layer/massMarks.ts b/types/amap-js-api/test/layer/massMarks.ts
deleted file mode 100644
index 5f4bfbf455..0000000000
--- a/types/amap-js-api/test/layer/massMarks.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-declare var pixel: AMap.Pixel;
-declare var size: AMap.Size;
-declare var lnglat: AMap.LngLat;
-var massMarksStyle1 = {
-    anchor: pixel,
-    url: '',
-    size,
-    rotation: 1
-};
-var massMarksStyle2 = {
-    anchor: pixel,
-    url: '',
-    size
-};
-var massMarksData1 = {
-    lnglat
-};
-
-interface CustomData extends AMap.MassMarks.Data {
-    name: string;
-    id: string;
-}
-var massMarksCustomData: CustomData = {
-    lnglat: [1, 2],
-    style: 1,
-    name: '',
-    id: ''
-};
-
-// $ExpectError
-new AMap.MassMarks();
-// $ExpectError
-new AMap.MassMarks([], {});
-
-new AMap.MassMarks([], {
-    style: [massMarksStyle1, massMarksStyle2]
-});
-new AMap.MassMarks([massMarksData1], {
-    style: [massMarksStyle1, massMarksStyle2]
-});
-
-// $ExpectType MassMarks<CustomData>
-var massMarks = new AMap.MassMarks<CustomData>([massMarksCustomData], {
-    style: [massMarksStyle1, massMarksStyle2]
-});
-
-// $ExpectType void
-massMarks.setStyle(massMarksStyle1);
-// $ExpectType void
-massMarks.setStyle([massMarksStyle1]);
-
-// $ExpectType Style | Style[]
-massMarks.getStyle();
-
-// $ExpectType void
-massMarks.setData('');
-
-// $ExpectError
-massMarks.setData(massMarksData1);
-// $ExpectError
-massMarks.setData(massMarksCustomData);
-
-var _customData = massMarks.getData()[0];
-// $ExpectType string
-_customData.name;
-// $ExpectType string
-_customData.id;
-// $ExpectType LngLat
-_customData.lnglat;
-
-// $ExpectType void
-massMarks.clear();
-
-massMarks.on('click', (event: AMap.MassMarks.EventMap<typeof massMarks>['click']) => {
-    // $ExpectType "click"
-    event.type;
-
-    // $ExpectType CustomData
-    event.data;
-
-    // $ExpectType MassMarks<CustomData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/layer/tileLayer.ts b/types/amap-js-api/test/layer/tileLayer.ts
deleted file mode 100644
index 7e4e2dc2e4..0000000000
--- a/types/amap-js-api/test/layer/tileLayer.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-declare var map: AMap.Map;
-
-// $ExpectType TileLayer
-var tileLayer = new AMap.TileLayer();
-
-// $ExpectType TileLayer
-new AMap.TileLayer({});
-
-// $ExpectType TileLayer
-new AMap.TileLayer({
-    map,
-    tileSize: 256,
-    tileUrl: '',
-    errorUrl: '',
-    getTileUrl: (x, y, z) => '',
-    zIndex: 1,
-    opacity: 0.1,
-    zooms: [3, 18],
-    detectRetina: true
-});
-
-// $ExpectType string[]
-tileLayer.getTiles();
-
-// $ExpectType void
-tileLayer.reload();
-
-// $ExpectType void
-tileLayer.setTileUrl('');
-// $ExpectType void
-tileLayer.setTileUrl((x, y, level) => {
-    // $ExpectType number
-    x;
-    // $ExpectType number
-    y;
-    // $ExpectType number
-    level;
-    return '';
-});
-
-// Traffic
-
-// $ExpectType Traffic
-let trafficLayer = new AMap.TileLayer.Traffic();
-// $ExpectType Traffic
-new AMap.TileLayer.Traffic({});
-// $ExpectType Traffic
-new AMap.TileLayer.Traffic({
-    autoRefresh: true,
-    interval: 180
-});
-
-// $ExpectType TileLayer
-tileLayer.on('complete', () => { });
-
-tileLayer.off('complete', () => { });
-
-tileLayer.emit('complete');
-
-trafficLayer.on('complete', () => { });
diff --git a/types/amap-js-api/test/layer/videoLayer.ts b/types/amap-js-api/test/layer/videoLayer.ts
deleted file mode 100644
index e34718193c..0000000000
--- a/types/amap-js-api/test/layer/videoLayer.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import {
-    map,
-    bounds
-} from '../preset';
-
-// $ExpectType VideoLayer
-new AMap.VideoLayer({
-    map,
-    bounds,
-    visible: true,
-    zooms: [1, 2],
-    opacity: 1
-});
-
-// $ExpectType VideoLayer
-new AMap.VideoLayer();
-// $ExpectType VideoLayer
-new AMap.VideoLayer({});
-// $ExpectType VideoLayer
-const videoLayer = new AMap.VideoLayer({
-    bounds
-});
-
-// $ExpectType void
-videoLayer.setMap(null);
-// $ExpectType void
-videoLayer.setMap(map);
-
-// $ExpectType Map | null | undefined
-videoLayer.getMap();
-
-// $ExpectType void
-videoLayer.show();
-
-// $ExpectType void
-videoLayer.hide();
-
-// $ExpectType number
-videoLayer.getzIndex();
-
-// $ExpectType void
-videoLayer.setzIndex(10);
-
-// $ExpectType HTMLVideoElement | null
-videoLayer.getElement();
-
-// $ExpectType void
-videoLayer.setVideoUrl('url');
-
-// $ExpectType string | string[] | undefined
-videoLayer.getVideoUrl();
diff --git a/types/amap-js-api/test/layer/wms.ts b/types/amap-js-api/test/layer/wms.ts
deleted file mode 100644
index 255affa216..0000000000
--- a/types/amap-js-api/test/layer/wms.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
-    map
-} from '../preset';
-
-// $ExpectType WMS
-new AMap.TileLayer.WMS({
-    url: 'url',
-    params: {}
-});
-// $ExpectType WMS
-const wms = new AMap.TileLayer.WMS({
-    url: 'url',
-    blend: true,
-    params: {
-        VERSION: 'version',
-        LAYERS: 'layers',
-        STYLES: 'styles',
-        FORMAT: 'format',
-        TRANSPARENT: 'TRUE',
-        BGCOLOR: '#000',
-        EXCEPTIONS: 'exceptions',
-        TIME: 'time',
-        ELEVATION: 'elevation'
-    },
-    zooms: [1, 2],
-    tileSize: 256,
-    opacity: 1,
-    zIndex: 10,
-    visible: true
-});
-
-// $ExpectType void
-wms.setMap(map);
-// $ExpectType void
-wms.setMap(null);
-
-// $ExpectType Map | null | undefined
-wms.getMap();
-
-// $ExpectType void
-wms.show();
-
-// $ExpectType void
-wms.hide();
-
-// $ExpectType void
-wms.setzIndex(10);
-
-// $ExpectType number
-wms.getzIndex();
-
-// $ExpectType void
-wms.setUrl('url');
-
-// $ExpectType string
-wms.getUrl();
-
-// $ExpectType void
-wms.setParams({
-    VERSION: 'version',
-    LAYERS: 'layers',
-    STYLES: 'styles',
-    FORMAT: 'format',
-    TRANSPARENT: 'TRUE',
-    BGCOLOR: '#000',
-    EXCEPTIONS: 'exceptions',
-    TIME: 'time',
-    ELEVATION: 'elevation'
-});
-
-const params = wms.getParams();
-// $ExpectType string | undefined
-params.VERSION;
-// $ExpectType string | undefined
-params.LAYERS;
-// $ExpectType string | undefined
-params.STYLES;
-// $ExpectType string | undefined
-params.FORMAT;
-// $ExpectType "TRUE" | "FALSE" | undefined
-params.TRANSPARENT;
-// $ExpectType string | undefined
-params.BGCOLOR;
-// $ExpectType string | undefined
-params.EXCEPTIONS;
-// $ExpectType string | undefined
-params.TIME;
-// $ExpectType string | undefined
-params.ELEVATION;
diff --git a/types/amap-js-api/test/layer/wmts.ts b/types/amap-js-api/test/layer/wmts.ts
deleted file mode 100644
index bc167c1189..0000000000
--- a/types/amap-js-api/test/layer/wmts.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import {
-    map
-} from '../preset';
-
-// $ExpectType WMTS
-new AMap.TileLayer.WMTS({
-    url: 'url',
-    params: {}
-});
-// $ExpectType WMTS
-const wmts = new AMap.TileLayer.WMTS({
-    url: 'url',
-    blend: true,
-    tileSize: 256,
-    zooms: [1, 2],
-    opacity: 1,
-    zIndex: 10,
-    visible: true,
-    params: {
-        Version: 'version',
-        Layer: 'layers',
-        Style: 'style',
-        Format: 'format'
-    }
-});
-
-// $ExpectType void
-wmts.setMap(map);
-// $ExpectType void
-wmts.setMap(null);
-
-// $ExpectType Map | null | undefined
-wmts.getMap();
-
-// $ExpectType void
-wmts.show();
-
-// $ExpectType void
-wmts.hide();
-
-// $ExpectType void
-wmts.setzIndex(10);
-
-// $ExpectType number
-wmts.getzIndex();
-
-// $ExpectType void
-wmts.setUrl('url');
-
-// $ExpectType string
-wmts.getUrl();
-
-// $ExpectType void
-wmts.setParams({
-    Version: 'version',
-    Layer: 'layers',
-    Style: 'style',
-    Format: 'format'
-});
-
-const params = wmts.getParams();
-// $ExpectType string | undefined
-params.Version;
-// $ExpectType string | undefined
-params.Layer;
-// $ExpectType string | undefined
-params.Style;
-// $ExpectType string | undefined
-params.Format;
diff --git a/types/amap-js-api/test/lnglat.ts b/types/amap-js-api/test/lnglat.ts
deleted file mode 100644
index 92057953ee..0000000000
--- a/types/amap-js-api/test/lnglat.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-    lnglat
-} from './preset';
-
-// $ExpectType LngLat
-new AMap.LngLat(114, 22);
-// $ExpectType LngLat
-new AMap.LngLat(113, 21);
-
-// $ExpectType LngLat
-lnglat.offset(1, 2);
-
-// $ExpectType number
-lnglat.distance(lnglat);
-// $ExpectType number
-lnglat.distance([lnglat]);
-
-// $ExpectType number
-lnglat.getLng();
-
-// $ExpectType number
-lnglat.getLat();
-
-// $ExpectType boolean
-lnglat.equals(lnglat);
-
-// $ExpectType string
-lnglat.toString();
-
-// $ExpectType LngLat
-lnglat.add(lnglat);
-// $ExpectType LngLat
-lnglat.add(lnglat, true);
-
-// $ExpectType LngLat
-lnglat.subtract(lnglat);
-// $ExpectType LngLat
-lnglat.subtract(lnglat, true);
-
-// $ExpectType LngLat
-lnglat.divideBy(1);
-// $ExpectType LngLat
-lnglat.divideBy(1, true);
-
-// $ExpectType LngLat
-lnglat.multiplyBy(1);
-// $ExpectType LngLat
-lnglat.multiplyBy(1, true);
diff --git a/types/amap-js-api/test/map.ts b/types/amap-js-api/test/map.ts
deleted file mode 100644
index 6f2b027e60..0000000000
--- a/types/amap-js-api/test/map.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-import {
-    lnglat,
-    bounds,
-    lnglatTuple,
-    pixel
-} from './preset';
-
-declare const container: HTMLDivElement;
-declare const tileLayer: AMap.TileLayer;
-
-// declare var indoorMap: AMap.IndoorMap
-
-// $ExpectType Map
-new AMap.Map('map');
-// $ExpectType Map
-new AMap.Map(container);
-
-// $ExpectType Map
-new AMap.Map(container, {});
-
-// $ExpectType Map
-const map = new AMap.Map(container, {
-    layers: [tileLayer],
-    zoom: 15,
-    center: [1, 2],
-    labelzIndex: 110,
-    zooms: [5, 15],
-    lang: 'zh_cn',
-    defaultCursor: 'default',
-    crs: 'EPSG4326',
-    animateEnable: true,
-    isHotspot: false,
-    defaultLayer: tileLayer,
-    rotateEnable: true,
-    resizeEnable: true,
-    showIndoorMap: true,
-    // indoorMap, // TODO
-    expandZoomRange: true,
-    dragEnable: true,
-    zoomEnable: true,
-    doubleClickZoom: true,
-    keyboardEnable: true,
-    jogEnable: true,
-    scrollWheel: true,
-    touchZoom: true,
-    mapStyle: '',
-    features: ['road'],
-    showBuildingBlock: true,
-    skyColor: '#fff',
-    preloadMode: true,
-    mask: [[1, 2], [2, 3], [3, 4]]
-});
-
-// $ExpectType number
-map.getZoom();
-
-// $ExpectType Layer[]
-map.getLayers();
-
-// $ExpectType LngLat
-map.getCenter();
-
-// $ExpectType HTMLElement | null
-map.getContainer();
-
-map.getCity(city => {
-    // $ExpectType string
-    city.city;
-    // $ExpectType string
-    city.citycode;
-    // $ExpectType string
-    city.district;
-    // $ExpectType string | never[]
-    city.province;
-});
-
-// $ExpectType Bounds
-map.getBounds();
-
-// $ExpectType number
-map.getLabelzIndex();
-
-// $ExpectType Lang
-map.getLang();
-
-// $ExpectType Size
-map.getSize();
-
-// $ExpectType number
-map.getRotation();
-
-// $ExpectType Status
-const mapStatus = map.getStatus();
-// $ExpectType boolean
-mapStatus.animateEnable;
-// $ExpectType boolean
-mapStatus.doubleClickZoom;
-// $ExpectType boolean
-mapStatus.dragEnable;
-// $ExpectType boolean
-mapStatus.isHotspot;
-// $ExpectType boolean
-mapStatus.jogEnable;
-// $ExpectType boolean
-mapStatus.keyboardEnable;
-// $ExpectType boolean
-mapStatus.pitchEnable;
-// $ExpectType boolean
-mapStatus.resizeEnable;
-// $ExpectType boolean
-mapStatus.rotateEnable;
-// $ExpectType boolean
-mapStatus.scrollWheel;
-// $ExpectType boolean
-mapStatus.touchZoom;
-// $ExpectType boolean
-mapStatus.zoomEnable;
-
-// $ExpectType string
-map.getDefaultCursor();
-
-// $ExpectType number
-map.getResolution();
-
-// $ExpectType number
-map.getScale();
-// $ExpectType number
-map.getScale(1);
-
-// $ExpectType void
-map.setZoom(1);
-
-// $ExpectType void
-map.setLabelzIndex(1);
-
-// $ExpectType void
-map.setLayers([tileLayer]);
-
-// $ExpectType void
-map.setCenter(lnglat);
-// $ExpectType void
-map.setCenter([1, 2]);
-
-// $ExpectType void
-map.setZoomAndCenter(13, lnglat);
-// $ExpectType void
-map.setZoomAndCenter(13, [1, 2]);
-
-// $ExpectType void
-map.setCity('city', (coord, zoom) => {
-    // $ExpectType string
-    coord[0];
-    // $ExpectType string
-    coord[1];
-    // $ExpectType number
-    zoom;
-});
-
-// $ExpectType Bounds
-map.setBounds(bounds);
-
-// $ExpectType void
-map.setLimitBounds(bounds);
-
-// $ExpectType void
-map.clearLimitBounds();
-
-// $ExpectType void
-map.setLang('zh_cn');
-
-// $ExpectType void
-map.setRotation(1);
-
-// $ExpectType void
-map.setStatus({});
-// $ExpectType void
-map.setStatus({
-    animateEnable: true,
-    doubleClickZoom: true,
-    dragEnable: true,
-    isHotspot: true,
-    jogEnable: true,
-    keyboardEnable: true,
-    pitchEnable: false,
-    resizeEnable: false,
-    rotateEnable: false,
-    scrollWheel: true,
-    touchZoom: true,
-    zoomEnable: true
-});
-
-// $ExpectType void
-map.setDefaultCursor('default');
-
-// $ExpectType void
-map.zoomIn();
-
-// $ExpectType void
-map.zoomOut();
-
-// $ExpectType void
-map.panTo([1, 2]);
-// $ExpectType void
-map.panTo(lnglat);
-
-// $ExpectType void
-map.panBy(1, 2);
-
-// $ExpectType void
-map.clearMap();
-
-// $ExpectType Map
-map.plugin('plugin name', () => { });
-// $ExpectType Map
-map.plugin(['plugin name'], () => { });
-
-// $ExpectType void
-map.clearInfoWindow();
-
-// $ExpectType LngLat
-map.pixelToLngLat(pixel);
-// $ExpectType LngLat
-map.pixelToLngLat(pixel, 1);
-
-// $ExpectType Pixel
-map.lnglatToPixel(lnglat);
-// $ExpectType Pixel
-map.lnglatToPixel(lnglat, 1);
-
-// $ExpectType LngLat
-map.containerToLngLat(pixel);
-
-// $ExpectType Pixel
-map.lngLatToContainer(lnglat);
-// $ExpectType Pixel
-map.lnglatTocontainer(lnglat);
-
-// $ExpectType void
-map.setMapStyle('');
-// $ExpectType string
-map.getMapStyle();
-
-// $ExpectType void
-map.setFeatures('all');
-// $ExpectType void
-map.setFeatures(['bg']);
-
-const feature: 'all' | 'bg' | 'point' | 'road' | 'building' | AMap.Map.Feature[] = map.getFeatures();
-
-// $ExpectType void
-map.setDefaultLayer(tileLayer);
-
-// $ExpectType void
-map.setPitch(1);
-// $ExpectType number
-map.getPitch();
-
-// $ExpectType ViewMode
-map.getViewMode_();
-
-// $ExpectType Pixel
-map.lngLatToGeodeticCoord(lnglat);
-// $ExpectType Pixel
-map.lngLatToGeodeticCoord(lnglatTuple);
-
-// $ExpectType LngLat
-map.geodeticCoordToLngLat(pixel);
-
-// $ExpectType void
-map.destroy();
-
-declare function dblClickHandler(this: AMap.Map, event: AMap.Map.EventMap['dblclick']): void;
-
-// $ExpectType Map
-map.on('click', (event: AMap.Map.EventMap['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Pixel
-    event.pixel;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType Map
-    event.target;
-});
-// $ExpectType Map
-map.on('dblclick', dblClickHandler);
-// $ExpectType Map
-map.on('complete', (event: AMap.Map.EventMap['complete']) => {
-    // $ExpectType "complete"
-    event.type;
-    // $ExpectError
-    event.value;
-});
-// $ExpectType Map
-map.on('hotspotclick', (event: AMap.Map.EventMap['hotspotclick']) => {
-    // $ExpectType string
-    event.id;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType string
-    event.name;
-    // $ExpectType "hotspotclick"
-    event.type;
-});
-// $ExpectType Map
-map.on('custom', (event: AMap.Event<'custom', { test: string }>) => {
-    // $ExpectType "custom"
-    event.type;
-    // $ExpectType string
-    event.test;
-});
-
-// $ExpectType Map
-map.off('dblclick', dblClickHandler);
-// $ExpectType Map
-map.off('click', 'mv');
-
-// $ExpectType Map
-map.emit('click', {
-    target: map,
-    lnglat,
-    pixel
-});
-
-map.emit('complete');
-// $ExpectType Map
-map.emit('hotspotclick', {
-    lnglat,
-    name: '123',
-    id: '123',
-    isIndoorPOI: true
-});
-// $ExpectType Map
-map.emit('custom', {
-    test: 1
-});
-// $ExpectType Map
-map.emit('custom', undefined);
diff --git a/types/amap-js-api/test/overlay/bezierCurve.ts b/types/amap-js-api/test/overlay/bezierCurve.ts
deleted file mode 100644
index abf0640fc9..0000000000
--- a/types/amap-js-api/test/overlay/bezierCurve.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import {
-    map,
-    lnglat
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-const path = [
-    [1, 2, 3, 4],
-    [1, 2, 3],
-    [
-        [1, 2, 3],
-        [1, 2]
-    ],
-    [1, 2]
-];
-
-// $ExpectError
-new AMap.BezierCurve();
-// $ExpectError
-new AMap.BezierCurve({});
-// $ExpectType BezierCurve<ExtraData>
-const bezierCurve = new AMap.BezierCurve<ExtraData>({
-    map,
-    path,
-    strokeColor: '#FF0000',
-    strokeOpacity: 0.6,
-    strokeWeight: 10,
-    strokeStyle: 'dashed',
-    strokeDasharray: [1, 5],
-    zIndex: 10,
-    bubble: false,
-    showDir: true,
-    cursor: 'pointer',
-    isOutline: true,
-    outlineColor: '#00FF00',
-    borderWeight: 2
-});
-
-// $ExpectType void
-bezierCurve.setPath(path);
-
-// $ExpectType void
-bezierCurve.setPath(path);
-
-// $ExpectType void
-bezierCurve.setOptions({});
-bezierCurve.setOptions({
-    map,
-    path,
-    strokeColor: '#FF0000',
-    strokeOpacity: 0.6,
-    strokeWeight: 10,
-    strokeStyle: 'dashed',
-    strokeDasharray: [1, 5],
-    zIndex: 10,
-    bubble: false,
-    showDir: true,
-    cursor: 'pointer',
-    isOutline: true,
-    outlineColor: '#00FF00',
-    borderWeight: 2
-});
-
-const options = bezierCurve.getOptions();
-
-// $ExpectType number | undefined
-options.borderWeight;
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType string | undefined
-options.dirColor;
-// $ExpectType string | undefined
-options.dirImg;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType boolean | undefined
-options.geodesic;
-// $ExpectType boolean | undefined
-options.isOutline;
-// $ExpectType "round" | "butt" | "square" | undefined
-options.lineCap;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType string | undefined
-options.outlineColor;
-// $ExpectType (LngLat & { controlPoints: LngLat[]; })[] | undefined
-options.path;
-// $ExpectType boolean | undefined
-options.showDir;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType number
-bezierCurve.getLength();
-
-// $ExpectType Bounds | null
-bezierCurve.getBounds();
-
-// $ExpectType void
-bezierCurve.show();
-
-// $ExpectType void
-bezierCurve.hide();
-
-// $ExpectType void
-bezierCurve.setMap(null);
-bezierCurve.setMap(map);
-
-// $ExpectType void
-bezierCurve.setExtData({ test: 1 });
-// $ExpectError
-bezierCurve.setExtData({ test: '123' });
-
-// $ExpectType {} | ExtraData
-bezierCurve.getExtData();
-
-bezierCurve.on('click', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType LngLat
-    event.lnglat;
-    // $ExpectType BezierCurve<ExtraData>
-    event.target;
-});
-
-bezierCurve.on('show', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['show']) => {
-    // $ExpectType "show"
-    event.type;
-    // $ExpectType BezierCurve<ExtraData>
-    event.target;
-});
-
-bezierCurve.on('options', (event: AMap.BezierCurve.EventMap<typeof bezierCurve>['options']) => {
-    // $ExpectType "options"
-    event.type;
-    // $ExpectError
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/circle.ts b/types/amap-js-api/test/overlay/circle.ts
deleted file mode 100644
index 28822b9ec9..0000000000
--- a/types/amap-js-api/test/overlay/circle.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import {
-    map,
-    lnglat,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType Circle<any>
-new AMap.Circle();
-new AMap.Circle({});
-// $ExpectType Circle<ExtraData>
-const circle = new AMap.Circle<ExtraData>({
-    map,
-    zIndex: 10,
-    center: lnglat,
-    bubble: true,
-    cursor: 'pointer',
-    radius: 1000,
-    strokeColor: '#FF0000',
-    strokeOpcity: 0.8,
-    strokeWeight: 3,
-    fillColor: '#00FF00',
-    fillOpacity: 0.5,
-    strokeStyle: 'dashed',
-    extData: { test: 1 },
-    strokeDasharray: [2, 4]
-});
-
-// $ExpectType void
-circle.setCenter(lnglat);
-// $ExpectType void
-circle.setCenter(lnglatTuple);
-
-// $ExpectType LngLat | undefined
-circle.getCenter();
-
-// $ExpectType Bounds | null
-circle.getBounds();
-
-// $ExpectType void
-circle.setRadius(100);
-
-// $ExpectType number
-circle.getRadius();
-
-// $ExpectType void
-circle.setOptions({});
-circle.setOptions({
-    map,
-    zIndex: 10,
-    center: lnglat,
-    bubble: true,
-    cursor: 'pointer',
-    radius: 1000,
-    strokeColor: '#FF0000',
-    strokeOpcity: 0.8,
-    strokeWeight: 3,
-    fillColor: '#00FF00',
-    fillOpacity: 0.5,
-    strokeStyle: 'dashed',
-    extData: { test: 1 },
-    strokeDasharray: [2, 4]
-});
-
-const options = circle.getOptions();
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType LngLat | undefined
-options.center;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType string | undefined
-options.fillColor;
-// $ExpectType number | undefined
-options.fillOpacity;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType LngLat[] | undefined
-options.path;
-// $ExpectType number | undefined
-options.radius;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType string | undefined
-options.texture;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType Bounds | null
-circle.getBounds();
-
-// $ExpectType void
-circle.hide();
-
-// $ExpectType void
-circle.show();
-
-// $ExpectType void
-circle.setMap(null);
-// $ExpectType void
-circle.setMap(map);
-
-// $ExpectType void
-circle.setExtData({ test: 2 });
-// $ExpectError
-circle.setExtData({ test: '1' });
-
-// $ExpectType {} | ExtraData
-circle.getExtData();
-
-// $ExpectType boolean
-circle.contains(lnglat);
-// $ExpectType boolean
-circle.contains(lnglatTuple);
-
-circle.on('click', (event: AMap.Circle.EventMap<typeof circle>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Circle<ExtraData>
-    event.target;
-});
-
-circle.on('setCenter', (event: AMap.Circle.EventMap<typeof circle>['setCenter']) => {
-    // $ExpectType "setCenter"
-    event.type;
-    // $ExpectError
-    event.target;
-});
-
-circle.on('change', (event: AMap.Circle.EventMap<typeof circle>['change']) => {
-    // $ExpectType "change"
-    event.type;
-    // $ExpectType Circle<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/contextMenu.ts b/types/amap-js-api/test/overlay/contextMenu.ts
deleted file mode 100644
index 5c7173d26b..0000000000
--- a/types/amap-js-api/test/overlay/contextMenu.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import {
-    map,
-    lnglat,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-// $ExpectType ContextMenu<any>
-new AMap.ContextMenu();
-// $ExpectType ContextMenu<any>
-new AMap.ContextMenu({});
-// $ExpectType ContextMenu<ExtraData>
-const contextMenu = new AMap.ContextMenu<ExtraData>({
-    content: '<div>content</div>',
-});
-
-// $ExpectType void
-contextMenu.addItem('item', function () {
-    // $ExpectType HTMLLIElement
-    this;
-});
-// $ExpectType void
-contextMenu.addItem('item', () => { }, 1);
-
-// $ExpectType void
-contextMenu.removeItem('item', () => {});
-
-// $ExpectType void
-contextMenu.open(map, lnglatTuple);
-// $ExpectType void
-contextMenu.open(map, lnglat);
-
-// $ExpectType void
-contextMenu.close();
-
-contextMenu.on('items', (event: AMap.ContextMenu.EventMap<typeof contextMenu>['items']) => {
-    // $ExpectType "items"
-    event.type;
-});
-
-contextMenu.on('open', (event: AMap.ContextMenu.EventMap<typeof contextMenu>['open']) => {
-    // $ExpectType "open"
-    event.type;
-    // $ExpectType ContextMenu<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/ellipse.ts b/types/amap-js-api/test/overlay/ellipse.ts
deleted file mode 100644
index c5205d9915..0000000000
--- a/types/amap-js-api/test/overlay/ellipse.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import {
-    map,
-    lnglat,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-// $ExpectType Ellipse<any>
-new AMap.Ellipse();
-// $ExpectType Ellipse<any>
-new AMap.Ellipse({});
-// $ExpectType Ellipse<ExtraData>
-const ellipse = new AMap.Ellipse<ExtraData>({
-    map,
-    zIndex: 10,
-    center: lnglat,
-    radius: [10000, 15000],
-    bubble: false,
-    cursor: 'pointer',
-    strokeColor: '#FF0000',
-    strokeOpacity: 0.8,
-    strokeWeight: 2,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    strokeStyle: 'dashed',
-    extData: { test: 1 },
-    strokeDasharray: [1, 5]
-});
-
-// $ExpectType LngLat | undefined
-ellipse.getCenter();
-
-// $ExpectType void
-ellipse.setCenter(lnglat);
-// $ExpectType void
-ellipse.setCenter(lnglatTuple);
-
-// $ExpectType Bounds | null
-ellipse.getBounds();
-
-// $ExpectType void
-ellipse.setOptions({
-    map,
-    zIndex: 10,
-    center: lnglat,
-    radius: [10000, 15000],
-    bubble: false,
-    cursor: 'pointer',
-    strokeColor: '#FF0000',
-    strokeOpacity: 0.8,
-    strokeWeight: 2,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    strokeStyle: 'dashed',
-    extData: { test: 1 },
-    strokeDasharray: [1, 5]
-});
-
-const options = ellipse.getOptions();
-
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType LngLat | undefined
-options.center;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType string | undefined
-options.fillColor;
-// $ExpectType number | undefined
-options.fillOpacity;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType LngLat[] | undefined
-options.path;
-// $ExpectType [number, number] | undefined
-options.radius;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType string | undefined
-options.texture;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType void
-ellipse.hide();
-
-// $ExpectType void
-ellipse.show();
-
-// $ExpectType void
-ellipse.setMap(null);
-// $ExpectType void
-ellipse.setMap(map);
-
-// $ExpectType void
-ellipse.setExtData({test: 2});
-// $ExpectType {} | ExtraData
-ellipse.getExtData();
-
-// $ExpectType boolean
-ellipse.contains(lnglat);
-// $ExpectType boolean
-ellipse.contains(lnglatTuple);
diff --git a/types/amap-js-api/test/overlay/geoJSON.ts b/types/amap-js-api/test/overlay/geoJSON.ts
deleted file mode 100644
index ee8c501472..0000000000
--- a/types/amap-js-api/test/overlay/geoJSON.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import {
-    map,
-    lnglatTuple
-} from '../preset';
-
-declare const marker: AMap.Marker;
-declare const polyline: AMap.Polyline;
-declare const polygon: AMap.Polygon;
-
-interface ExtraData {
-    test: number;
-}
-
-const geoJSONObject: AMap.GeoJSON.GeoJSONObject[] = [
-    {
-        type: 'Feature',
-        properties: {},
-        geometry: {
-            type: 'Point',
-            coordinates: lnglatTuple
-        }
-    },
-    {
-        type: 'Feature',
-        properties: { test: 1 },
-        geometry: {
-            type: 'LineString',
-            coordinates: [lnglatTuple, lnglatTuple]
-        }
-    }
-];
-
-// $ExpectType GeoJSON<any>
-new AMap.GeoJSON();
-// $ExpectType GeoJSON<any>
-new AMap.GeoJSON({});
-// $ExpectType GeoJSON<ExtraData>
-const geoJSON = new AMap.GeoJSON<ExtraData>({
-    geoJSON: geoJSONObject,
-    getMarker(obj, lnglat) {
-        // $ExpectType GeoJSONObject
-        obj;
-        // $ExpectType LngLat
-        lnglat;
-        return marker;
-    },
-    getPolyline(obj, lnglats) {
-        // $ExpectType GeoJSONObject
-        obj;
-        // $ExpectType LngLat[]
-        lnglats;
-        return polyline;
-    },
-    getPolygon(obj, lnglats) {
-        // $ExpectType GeoJSONObject
-        obj;
-        // $ExpectType LngLat[]
-        lnglats;
-        return polygon;
-    },
-    coordsToLatLng(coord) {
-        // $ExpectType LngLat
-        coord;
-        return coord;
-    }
-});
-
-// $ExpectType void
-geoJSON.importData(geoJSONObject);
-
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.removeOverlay(marker);
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.removeOverlay([marker]);
-
-// $ExpectType boolean
-geoJSON.hasOverlay(marker);
-// $ExpectType boolean
-geoJSON.hasOverlay(m => m === marker);
-
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.addOverlay(marker);
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.addOverlay([marker]);
-
-// $ExpectType GeoJSONObject[]
-geoJSON.toGeoJSON();
-
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.setMap(null);
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.setMap(map);
-
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.hide();
-
-// $ExpectType GeoJSON<ExtraData>
-geoJSON.show();
-
-type ClickEvent = AMap.MapsEvent<'click', AMap.Overlay>;
-geoJSON.on('click', (event: ClickEvent) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Overlay<any>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/icon.ts b/types/amap-js-api/test/overlay/icon.ts
deleted file mode 100644
index 8576685b8a..0000000000
--- a/types/amap-js-api/test/overlay/icon.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import {
-    size,
-    pixel,
-    icon
-} from '../preset';
-
-// $ExpectType Icon
-new AMap.Icon();
-// $ExpectType Icon
-new AMap.Icon({});
-// $ExpectType Icon
-new AMap.Icon({
-    size,
-    imageOffset: pixel,
-    image: 'image uri',
-    imageSize: size
-});
-// $ExpectType Icon
-new AMap.Icon({
-    size: [1, 2],
-    imageOffset: pixel,
-    image: 'image uri',
-    imageSize: [1, 2]
-});
-
-// $ExpectType Size
-icon.getImageSize();
-
-// $ExpectType void
-icon.setImageSize(size);
-// $ExpectType void
-icon.setImageSize([1, 2]);
diff --git a/types/amap-js-api/test/overlay/infoWindow.ts b/types/amap-js-api/test/overlay/infoWindow.ts
deleted file mode 100644
index 3fa4b0e656..0000000000
--- a/types/amap-js-api/test/overlay/infoWindow.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import {
-    map,
-    lnglat,
-    size,
-    pixel,
-    div,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType InfoWindow<any>
-new AMap.InfoWindow();
-// $ExpectType InfoWindow<any>
-new AMap.InfoWindow({});
-// $ExpectType InfoWindow<ExtraData>
-const infoWindow = new AMap.InfoWindow<ExtraData>({
-    isCustom: false,
-    autoMove: false,
-    closeWhenClickMap: false,
-    content: 'content',
-    size: [100, 100],
-    offset: new AMap.Pixel(10, 10),
-    position: lnglat,
-    showShadow: true
-});
-
-// $ExpectType void
-infoWindow.open(map);
-// $ExpectType void
-infoWindow.open(map, lnglat);
-// $ExpectType void
-infoWindow.open(map, lnglatTuple);
-
-// $ExpectType void
-infoWindow.close();
-
-// $ExpectType boolean
-infoWindow.getIsOpen();
-
-// $ExpectType void
-infoWindow.setContent('content');
-// $ExpectType void
-infoWindow.setContent(div);
-
-// $ExpectType string | HTMLElement | undefined
-infoWindow.getContent();
-
-// $ExpectType void
-infoWindow.setPosition(lnglat);
-// $ExpectType void
-infoWindow.setPosition(lnglatTuple);
-
-// $ExpectType LngLat | undefined
-infoWindow.getPosition();
-
-// $ExpectType Size | undefined
-infoWindow.getSize();
-
-infoWindow.on('change', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['change']) => {
-    // $ExpectType "change"
-    event.type;
-    // $ExpectType InfoWindow<ExtraData>
-    event.target;
-});
-
-infoWindow.on('close', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['close']) => {
-    // $ExpectType "close"
-    event.type;
-    // $ExpectType InfoWindow<ExtraData>
-    event.target;
-});
-
-infoWindow.on('open', (event: AMap.InfoWindow.EventMap<typeof infoWindow>['open']) => {
-    // $ExpectType "open"
-    event.type;
-    // $ExpectType InfoWindow<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/marker.ts b/types/amap-js-api/test/overlay/marker.ts
deleted file mode 100644
index 635ce724c8..0000000000
--- a/types/amap-js-api/test/overlay/marker.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import {
-    map,
-    lnglat
-} from '../preset';
-
-declare var pixel: AMap.Pixel;
-declare var domEle: HTMLElement;
-declare var markerShape: AMap.MarkerShape;
-declare var icon: AMap.Icon;
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType Marker<ExtraData>
-new AMap.Marker<ExtraData>();
-// $ExpectType Marker<any>
-new AMap.Marker();
-// $ExpectType Marker<any>
-new AMap.Marker({});
-// $ExpectType Marker<ExtraData>
-const marker = new AMap.Marker<ExtraData>({
-    map,
-    position: lnglat,
-    offset: pixel,
-    icon: 'iconUrl',
-    content: 'htmlString',
-    topWhenClick: true,
-    raiseOnDrag: true,
-    cursor: 'default',
-    visible: true,
-    zIndex: 10,
-    angle: 10,
-    autoRotation: true,
-    animation: 'AMAP_ANIMATION_BOUNCE',
-    shadow: icon,
-    title: '123',
-    clickable: true,
-    shape: markerShape,
-    extData: {
-        test: 123
-    }
-});
-
-// $ExpectType void
-marker.markOnAMAP({
-    name: '123',
-    position: [1, 2]
-});
-// $ExpectType void
-marker.markOnAMAP();
-// $ExpectType void
-marker.markOnAMAP({});
-// $ExpectType void
-marker.markOnAMAP({
-    position: [1, 2],
-    name: '123'
-});
-
-// $ExpectType Pixel
-marker.getOffset();
-
-// $ExpectType void
-marker.setOffset(pixel);
-
-// $ExpectType void
-marker.setAnimation('AMAP_ANIMATION_BOUNCE');
-
-// $ExpectType AnimationName
-marker.getAnimation();
-
-// $ExpectType void
-marker.setClickable(true);
-
-// $ExpectType boolean
-marker.getClickable();
-
-// $ExpectType LngLat | undefined
-marker.getPosition();
-
-// $ExpectType void
-marker.setPosition(lnglat);
-
-// $ExpectType void
-marker.setAngle(0);
-
-// $ExpectType void
-marker.setLabel();
-// $ExpectType void
-marker.setLabel({});
-// $ExpectType void
-marker.setLabel({
-    content: 'label content',
-    offset: pixel
-});
-
-// $ExpectType Label | undefined
-marker.getLabel();
-
-// $ExpectType number
-marker.getAngle();
-
-// $ExpectType void
-marker.setzIndex(100);
-
-// $ExpectType number
-marker.getzIndex();
-
-// $ExpectType void
-marker.setIcon('icon uri');
-// $ExpectType void
-marker.setIcon(icon);
-
-// $ExpectType string | Icon | undefined
-marker.getIcon();
-
-// $ExpectType void
-marker.setDraggable(true);
-
-// $ExpectType boolean
-marker.getDraggable();
-
-// $ExpectType void
-marker.setCursor('default');
-
-// $ExpectType void
-marker.setContent('content');
-// $ExpectType void
-marker.setContent(domEle);
-
-// $ExpectType string | HTMLElement
-marker.getContent();
-
-// $ExpectType void
-marker.moveAlong([lnglat], 100);
-// $ExpectError
-marker.moveAlong([[1, 2]], 100);
-// $ExpectType void
-marker.moveAlong([lnglat], 100, t => t, false);
-
-// $ExpectType void
-marker.moveTo(lnglat, 100);
-// $ExpectType void
-marker.moveTo([1, 2], 100);
-// $ExpectType void
-marker.moveTo([1, 2], 100, t => t);
-
-// $ExpectType void
-marker.stopMove();
-
-// $ExpectType boolean
-marker.pauseMove();
-
-// $ExpectType boolean
-marker.resumeMove();
-
-// $ExpectType void
-marker.setMap(map);
-
-// $ExpectType void
-marker.setTitle('title');
-// $ExpectError
-marker.setTitle();
-
-// $ExpectType string | undefined
-marker.getTitle();
-
-// $ExpectType void
-marker.setTop(true);
-
-// $ExpectType boolean
-marker.getTop();
-
-// $ExpectType void
-marker.setShadow();
-// $ExpectType void
-marker.setShadow(icon);
-// $ExpectType void
-marker.setShadow('shadow url');
-
-// $ExpectType string | Icon | undefined
-marker.getShadow();
-
-// $ExpectType void
-marker.setShape();
-// $ExpectType void
-marker.setShape(markerShape);
-
-// $ExpectType MarkerShape | undefined
-marker.getShape();
-
-marker.on('click', (event: AMap.Marker.EventMap<typeof marker>['click']) => {
-    // $ExpectType {} | ExtraData
-    event.target.getExtData();
-});
diff --git a/types/amap-js-api/test/overlay/markerShape.ts b/types/amap-js-api/test/overlay/markerShape.ts
deleted file mode 100644
index 259b68cf20..0000000000
--- a/types/amap-js-api/test/overlay/markerShape.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// $ExpectType MarkerShape
-new AMap.MarkerShape({
-    type: 'circle',
-    coords: [1, 1, 1]
-});
-// $ExpectType MarkerShape
-new AMap.MarkerShape({
-    type: 'rect',
-    coords: [1, 1, 1, 2]
-});
-// $ExpectType MarkerShape
-new AMap.MarkerShape({
-    type: 'poly',
-    coords: [1, 2, 3, 4, 5]
-});
-
-// $ExpectError
-new AMap.MarkerShape({
-    type: 'circle',
-    coords: [1, 1]
-});
-// $ExpectError
-new AMap.MarkerShape({
-    type: 'rect',
-    coords: [1, 1, 1, 2, 2]
-});
diff --git a/types/amap-js-api/test/overlay/overlay.ts b/types/amap-js-api/test/overlay/overlay.ts
deleted file mode 100644
index 6a301e7091..0000000000
--- a/types/amap-js-api/test/overlay/overlay.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {
-    map
-} from '../preset';
-interface ExtraData {
-    test: number;
-}
-declare const overlay: AMap.Overlay<ExtraData>;
-
-// $ExpectType void
-overlay.show();
-
-// $ExpectType void
-overlay.hide();
-
-// $ExpectType Map | null | undefined
-overlay.getMap();
-
-// $ExpectType void
-overlay.setMap(map);
-// $ExpectType void
-overlay.setMap(null);
-
-// $ExpectError
-overlay.setExtData({ any: 123 });
-
-// $ExpectError ExtraData
-overlay.getExtData();
diff --git a/types/amap-js-api/test/overlay/overlayGroup.ts b/types/amap-js-api/test/overlay/overlayGroup.ts
deleted file mode 100644
index 11e04f91cf..0000000000
--- a/types/amap-js-api/test/overlay/overlayGroup.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import {
-    map,
-    lnglat,
-    pixel,
-    circle,
-    marker,
-    markerShape,
-    icon
-} from '../preset';
-
-// $ExpectType OverlayGroup<Overlay<any>, any>
-const overlayGroup2 = new AMap.OverlayGroup();
-// $ExpectType OverlayGroup<Marker<any>, any>
-new AMap.OverlayGroup<AMap.Marker, any>(marker);
-// $ExpectType OverlayGroup<Marker<any>, any>
-const overlayGroup = new AMap.OverlayGroup<AMap.Marker>([marker]);
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.addOverlay(marker);
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.addOverlay([marker]);
-// $ExpectError
-overlayGroup.addOverlay([circle]);
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.addOverlays(marker);
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.addOverlays([marker]);
-
-// $ExpectType Marker<any>[]
-overlayGroup.getOverlays();
-
-// $ExpectType boolean
-overlayGroup.hasOverlay(marker);
-// $ExpectType boolean
-overlayGroup.hasOverlay(o => o === marker);
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.removeOverlay(marker);
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.removeOverlay([marker]);
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.removeOverlays(marker);
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.removeOverlays([marker]);
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.clearOverlays();
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.eachOverlay(function(overlay, index, overlays) {
-    // $ExpectType Marker<any>
-    overlay;
-    // $ExpectType number
-    index;
-    // $ExpectType Marker<any>[]
-    overlays;
-    // $ExpectType Marker<any>
-    this;
-});
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.setMap(null);
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.setMap(map);
-
-// $ExpectType OverlayGroup<Overlay<any>, any>
-overlayGroup2.setOptions({
-    test: 1
-});
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.setOptions({
-    map,
-    position: lnglat,
-    offset: pixel,
-    icon: 'iconUrl',
-    content: 'htmlString',
-    topWhenClick: true,
-    raiseOnDrag: true,
-    cursor: 'default',
-    visible: true,
-    zIndex: 10,
-    angle: 10,
-    autoRotation: true,
-    animation: 'AMAP_ANIMATION_BOUNCE',
-    shadow: icon,
-    title: '123',
-    clickable: true,
-    shape: markerShape,
-    extData: {
-        test: 123
-    }
-});
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.show();
-
-// $ExpectType OverlayGroup<Marker<any>, any>
-overlayGroup.hide();
-
-type ClickEvent = AMap.MapsEvent<'click', AMap.Overlay>;
-overlayGroup.on('click', (event: ClickEvent) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Overlay<any>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/polygon.ts b/types/amap-js-api/test/overlay/polygon.ts
deleted file mode 100644
index d41a597d45..0000000000
--- a/types/amap-js-api/test/overlay/polygon.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import {
-    map,
-    lnglat,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-const path1 = [lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple, lnglatTuple];
-const path2 = [lnglat, lnglat, lnglat, lnglat, lnglat];
-
-// $ExpectType Polygon<any>
-new AMap.Polygon();
-// $ExpectType Polygon<any>
-new AMap.Polygon({});
-// $ExpectType Polygon<ExtraData>
-const polygon = new AMap.Polygon<ExtraData>({
-    map,
-    zIndex: 10,
-    bubble: true,
-    cursor: 'pointer',
-    strokeColor: '#00FF00',
-    strokeOpacity: 0.3,
-    strokeWeight: 5,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    draggable: true,
-    extData: { test: 1 },
-    strokeStyle: 'dashed',
-    strokeDasharray: [2, 4],
-    path: path1
-});
-
-// $ExpectType void
-polygon.setPath(path1);
-// $ExpectType void
-polygon.setPath(path2);
-// $ExpectType void
-polygon.setPath([path1, path2]);
-
-// $ExpectType LngLat[] | LngLat[][]
-polygon.getPath();
-
-// $ExpectType void
-polygon.setOptions({
-    map,
-    zIndex: 10,
-    bubble: true,
-    cursor: 'pointer',
-    strokeColor: '#00FF00',
-    strokeOpacity: 0.8,
-    strokeWeight: 5,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    draggable: true,
-    extData: { test: 1 },
-    strokeStyle: 'dashed',
-    strokeDasharray: [4, 2],
-    path: [path2, path1]
-});
-
-const options = polygon.getOptions();
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType string | undefined
-options.fillColor;
-// $ExpectType number | undefined
-options.fillOpacity;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType LngLat[] | LngLat[][] | undefined
-options.path;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType string | undefined
-options.texture;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType Bounds | null
-polygon.getBounds();
-
-// $ExpectType number
-polygon.getArea();
-
-// $ExpectType void
-polygon.setMap(null);
-// $ExpectType void
-polygon.setMap(map);
-
-// $ExpectType void
-polygon.setExtData({ test: 1 });
-
-// $ExpectType {} | ExtraData
-polygon.getExtData();
-
-// $ExpectType boolean
-polygon.contains(lnglat);
-// $ExpectType boolean
-polygon.contains(lnglatTuple);
-
-polygon.on('click', (event: AMap.Polygon.EventMap<typeof polygon>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Polygon<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/polyline.ts b/types/amap-js-api/test/overlay/polyline.ts
deleted file mode 100644
index fc8d52b058..0000000000
--- a/types/amap-js-api/test/overlay/polyline.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-    map,
-    lnglat,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType Polyline<any>
-new AMap.Polyline();
-// $ExpectType Polyline<any>
-new AMap.Polyline({});
-// $ExpectType Polyline<ExtraData>
-const polyline = new AMap.Polyline<ExtraData>({
-    map,
-    zIndex: 10,
-    bubble: true,
-    cursor: 'default',
-    geodesic: true,
-    isOutline: true,
-    borderWeight: 1,
-    outlineColor: '#AA0000',
-    path: [lnglat],
-    strokeColor: '#0000AA',
-    strokeOpacity: 0.5,
-    strokeWeight: 10,
-    strokeStyle: 'dashed',
-    strokeDasharray: [20, 10, 20],
-    lineJoin: 'bevel',
-    lineCap: 'butt',
-    draggable: true,
-    extData: { test: 1 },
-    showDir: true
-});
-// Polyline<ExtraData>
-
-// $ExpectType void
-polyline.setPath([lnglat]);
-// $ExpectType void
-polyline.setPath([lnglatTuple]);
-
-// $ExpectType void
-polyline.setOptions({});
-// $ExpectType void
-polyline.setOptions({
-    map,
-    zIndex: 10,
-    bubble: true,
-    cursor: 'default',
-    geodesic: true,
-    isOutline: true,
-    borderWeight: 1,
-    outlineColor: '#AA0000',
-    path: [lnglat, lnglat],
-    strokeColor: '#0000AA',
-    strokeOpacity: 0.5,
-    strokeWeight: 10,
-    strokeStyle: 'dashed',
-    strokeDasharray: [20, 10, 20],
-    lineJoin: 'bevel',
-    lineCap: 'butt',
-    draggable: true,
-    extData: { test: 1 },
-    showDir: true
-});
-
-const options = polyline.getOptions();
-// $ExpectType number | undefined
-options.borderWeight;
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType string | undefined
-options.dirColor;
-// $ExpectType string | undefined
-options.dirImg;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType boolean | undefined
-options.geodesic;
-// $ExpectType boolean | undefined
-options.isOutline;
-// $ExpectType "round" | "butt" | "square" | undefined
-options.lineCap;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType string | undefined
-options.outlineColor;
-// $ExpectType LngLat[] | undefined
-options.path;
-// $ExpectType boolean | undefined
-options.showDir;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType number
-polyline.getLength();
-
-// $ExpectType Bounds | null
-polyline.getBounds();
-
-// $ExpectType void
-polyline.hide();
-
-// $ExpectType void
-polyline.show();
-
-// $ExpectType void
-polyline.setMap(null);
-// $ExpectType void
-polyline.setMap(map);
-
-// $ExpectType void
-polyline.setExtData({test: 1});
-
-// $ExpectType {} | ExtraData
-polyline.getExtData();
-
-polyline.on('click', (event: AMap.Polyline.EventMap<typeof polyline>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Polyline<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/rectangle.ts b/types/amap-js-api/test/overlay/rectangle.ts
deleted file mode 100644
index d2cafa8f09..0000000000
--- a/types/amap-js-api/test/overlay/rectangle.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-    map,
-    lnglat,
-    bounds,
-    lnglatTuple
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType Rectangle<any>
-new AMap.Rectangle();
-// $ExpectType Rectangle<any>
-new AMap.Rectangle({});
-// $ExpectType Rectangle<ExtraData>
-const rectangle = new AMap.Rectangle<ExtraData>({
-    map,
-    zIndex: 10,
-    bounds,
-    bubble: false,
-    cursor: 'pointer',
-    strokeColor: '#00FF00',
-    strokeOpacity: 0.8,
-    strokeWeight: 2,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    strokeStyle: 'solid',
-    extData: { test: 1 },
-    strokeDasharray: [1, 5]
-});
-
-// $ExpectType Bounds | undefined
-rectangle.getBounds();
-
-// $ExpectType void
-rectangle.setBounds(bounds);
-
-// $ExpectType void
-rectangle.setOptions({});
-// $ExpectType void
-rectangle.setOptions({
-    map,
-    zIndex: 10,
-    bounds,
-    bubble: false,
-    cursor: 'pointer',
-    strokeColor: '#00FF00',
-    strokeOpacity: 0.8,
-    strokeWeight: 2,
-    fillColor: '#0000FF',
-    fillOpacity: 0.5,
-    strokeStyle: 'solid',
-    extData: { test: 1 },
-    strokeDasharray: [1, 5]
-});
-
-const options = rectangle.getOptions();
-// $ExpectType Bounds | undefined
-options.bounds;
-// $ExpectType boolean | undefined
-options.bubble;
-// $ExpectType boolean | undefined
-options.clickable;
-// $ExpectType {} | ExtraData | undefined
-options.extData;
-// $ExpectType string | undefined
-options.fillColor;
-// $ExpectType number | undefined
-options.fillOpacity;
-// $ExpectType "miter" | "round" | "bevel" | undefined
-options.lineJoin;
-// $ExpectType Map | undefined
-options.map;
-// $ExpectType LngLat[] | undefined
-options.path;
-// $ExpectType string | undefined
-options.strokeColor;
-// $ExpectType number[] | undefined
-options.strokeDasharray;
-// $ExpectType number | undefined
-options.strokeOpacity;
-// $ExpectType "dashed" | "solid" | undefined
-options.strokeStyle;
-// $ExpectType number | undefined
-options.strokeWeight;
-// $ExpectType string | undefined
-options.texture;
-// $ExpectType number | undefined
-options.zIndex;
-
-// $ExpectType void
-rectangle.hide();
-
-// $ExpectType void
-rectangle.show();
-
-// $ExpectType void
-rectangle.setExtData({test: 2});
-
-// $ExpectType {} | ExtraData
-rectangle.getExtData();
-
-// $ExpectType boolean
-rectangle.contains(lnglat);
-// $ExpectType boolean
-rectangle.contains(lnglatTuple);
-
-rectangle.on('click', (event: AMap.Rectangle.EventMap<typeof rectangle>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Rectangle<ExtraData>
-    event.target;
-});
-
-rectangle.on('setBounds', (event: AMap.Rectangle.EventMap<typeof rectangle>['setBounds']) => {
-    // $ExpectType "setBounds"
-    event.type;
-    // $ExpectError
-    event.target;
-});
diff --git a/types/amap-js-api/test/overlay/text.ts b/types/amap-js-api/test/overlay/text.ts
deleted file mode 100644
index c4d678493c..0000000000
--- a/types/amap-js-api/test/overlay/text.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import {
-    map,
-    marker,
-    lnglat,
-    pixel,
-    lnglatTuple,
-    icon
-} from '../preset';
-
-interface ExtraData {
-    test: number;
-}
-
-// $ExpectType Text<any>
-new AMap.Text();
-// $ExpectType Text<any>
-new AMap.Text({});
-// $ExpectType Text<ExtraData>
-const text = new AMap.Text<ExtraData>({
-    text: 'content',
-    textAlign: 'center',
-    verticalAlign: 'top',
-    map,
-    position: lnglat,
-    offset: pixel,
-    topWhenClick: true,
-    bubble: true,
-    draggable: true,
-    raiseOnDrag: true,
-    cursor: 'default',
-    visible: true,
-    zIndex: 100,
-    angle: 45,
-    autoRotation: true,
-    animation: 'AMAP_ANIMATION_BOUNCE',
-    shadow: 'https://webapi.amap.com/theme/v1.3/markers/0.png',
-    title: 'title',
-    clickable: true,
-    extData: { test: 1 }
-});
-
-// $ExpectType string
-text.getText();
-
-// $ExpectType void
-text.setText('123');
-
-// $ExpectType void
-text.setStyle({
-    background: 'red',
-    width: '200px'
-});
-
-// $ExpectType void
-text.markOnAMAP({
-    name: '123',
-    position: lnglatTuple
-});
-
-// $ExpectType Pixel
-text.getOffset();
-
-// $ExpectType void
-text.setOffset(pixel);
-
-// $ExpectType void
-text.setAnimation('AMAP_ANIMATION_BOUNCE');
-
-// $ExpectType AnimationName
-text.getAnimation();
-
-// $ExpectType void
-text.setClickable(true);
-
-// $ExpectType boolean
-text.getClickable();
-
-// $ExpectType LngLat | undefined
-text.getPosition();
-
-// $ExpectType void
-text.setAngle(10);
-
-// $ExpectType number
-text.getAngle();
-
-// $ExpectType void
-text.setzIndex(1);
-
-// $ExpectType number
-text.getzIndex();
-
-// $ExpectType void
-text.setDraggable(true);
-
-// $ExpectType boolean
-text.getDraggable();
-
-// $ExpectType void
-text.hide();
-
-// $ExpectType void
-text.show();
-
-// $ExpectType void
-text.setCursor('default');
-
-// $ExpectType void
-text.moveAlong([lnglat], 100);
-
-// $ExpectType void
-text.moveAlong([lnglat], 100);
-// $ExpectError
-text.moveAlong([[1, 2]], 100);
-// $ExpectType void
-text.moveAlong([lnglat], 100, t => t, false);
-
-// $ExpectType void
-text.moveTo(lnglat, 100);
-// $ExpectType void
-text.moveTo([1, 2], 100);
-// $ExpectType void
-text.moveTo([1, 2], 100, t => t);
-
-// $ExpectType void
-text.stopMove();
-
-// $ExpectType boolean
-text.pauseMove();
-
-// $ExpectType boolean
-text.resumeMove();
-
-// $ExpectType void
-text.setMap(map);
-
-// $ExpectType void
-text.setTitle('title');
-// $ExpectError
-text.setTitle();
-
-// $ExpectType string | undefined
-text.getTitle();
-
-// $ExpectType void
-text.setTop(true);
-
-// $ExpectType boolean
-text.getTop();
-
-// $ExpectType void
-text.setShadow();
-// $ExpectType void
-text.setShadow(icon);
-// $ExpectType void
-text.setShadow('shadow url');
-
-// $ExpectType void
-text.setExtData({test: 1});
-
-// $ExpectType {} | ExtraData
-text.getExtData();
-
-text.on('click', (event: AMap.Text.EventMap<typeof text>['click']) => {
-    // $ExpectType "click"
-    event.type;
-    // $ExpectType Text<ExtraData>
-    event.target;
-});
diff --git a/types/amap-js-api/test/pixel.ts b/types/amap-js-api/test/pixel.ts
deleted file mode 100644
index bcb96e4b77..0000000000
--- a/types/amap-js-api/test/pixel.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import {
-    pixel
-} from './preset';
-
-// $ExpectType Pixel
-new AMap.Pixel(10, 20);
-// $ExpectType Pixel
-new AMap.Pixel(10, 20);
-
-// $ExpectType number
-pixel.getX();
-
-// $ExpectType number
-pixel.getY();
-
-// $ExpectType boolean
-pixel.equals(pixel);
-
-// $ExpectType string
-pixel.toString();
-
-// $ExpectType Pixel
-pixel.add({ x: 1, y: 2 });
-// $ExpectType Pixel
-pixel.add({ x: 1, y: 2 }, false);
-
-// $ExpectType Pixel
-pixel.round();
-
-// $ExpectType Pixel
-pixel.floor();
-
-// $ExpectType number
-pixel.length();
-
-// $ExpectType number | null
-pixel.direction();
-
-// $ExpectType Pixel
-pixel.toFixed();
-// $ExpectType Pixel
-pixel.toFixed(2);
diff --git a/types/amap-js-api/test/preset.ts b/types/amap-js-api/test/preset.ts
deleted file mode 100644
index 2c7bb37d59..0000000000
--- a/types/amap-js-api/test/preset.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-declare const map: AMap.Map;
-declare const lnglat: AMap.LngLat;
-declare const size: AMap.Size;
-declare const lnglatTuple: [number, number];
-declare const pixel: AMap.Pixel;
-declare const marker: AMap.Marker;
-declare const circle: AMap.Circle;
-declare const markerShape: AMap.MarkerShape;
-declare const icon: AMap.Icon;
-declare const bounds: AMap.Bounds;
-declare const div: HTMLDivElement;
-declare const polygon: AMap.Polygon;
-declare const lang: AMap.Lang;
-
-export {
-    map,
-    lnglat,
-    size,
-    lnglatTuple,
-    pixel,
-    marker,
-    circle,
-    markerShape,
-    icon,
-    bounds,
-    div,
-    polygon,
-    lang
-};
diff --git a/types/amap-js-api/test/size.ts b/types/amap-js-api/test/size.ts
deleted file mode 100644
index bdd700f532..0000000000
--- a/types/amap-js-api/test/size.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { size } from './preset';
-
-// $ExpectType Size
-new AMap.Size(10, 20);
-
-// $ExpectType number
-size.getHeight();
-
-// $ExpectType number
-size.getWidth();
-
-// $ExpectType string
-size.toString();
-
-// $ExpectType boolean
-size.contains({ x: 10, y: 10 });
diff --git a/types/amap-js-api/test/util.ts b/types/amap-js-api/test/util.ts
deleted file mode 100644
index c238070e21..0000000000
--- a/types/amap-js-api/test/util.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import * as preset from './preset';
-
-const util = AMap.Util;
-
-// $ExpectType string
-util.colorNameToHex('colorName');
-
-// $ExpectType string
-util.rgbHex2Rgba('rgbHex');
-
-// $ExpectType string
-util.argbHex2Rgba('argbHex');
-
-// $ExpectType boolean
-util.isEmpty({});
-// $ExpectError
-util.isEmpty(1);
-
-// $ExpectType number[]
-util.deleteItemFromArray([1], 1);
-
-// $ExpectType number[]
-util.deleteItemFromArrayByIndex([1], 1);
-
-// $ExpectType number
-util.indexOf([1], 1);
-// $ExpectError
-util.indexOf([1], '1');
-
-// $ExpectType number
-util.format(1);
-// $ExpectType number
-util.format(1, 1);
-
-declare const value1: number | number[];
-// $ExpectType boolean
-util.isArray(value1);
-if (util.isArray(value1)) {
-    // $ExpectType number[]
-    value1;
-} else {
-    // $ExpectType number
-    value1;
-}
-
-declare const value2: number | HTMLElement;
-// $ExpectType boolean
-util.isDOM(value2);
-if (util.isDOM(value2)) {
-    // $ExpectType HTMLElement
-    value2;
-} else {
-    // $ExpectType number
-    value2;
-}
-
-// $ExpectType boolean
-util.includes([1], 1);
-// $ExpectError
-util.includes([1], '1');
-
-// $ExpectType number
-util.requestIdleCallback(() => { });
-// $ExpectType number
-const idleCallbackHandle = util.requestIdleCallback(() => { }, { timeout: 1 });
-
-// $ExpectType void
-util.cancelIdleCallback(idleCallbackHandle);
-
-// $ExpectType number
-util.requestAnimFrame(() => { });
-// $ExpectType number
-const animFrameHandle = util.requestAnimFrame(function () {
-    // $ExpectType number
-    this.test;
-}, { test: 1 });
-
-// $ExpectType void
-util.cancelAnimFrame(animFrameHandle);
diff --git a/types/amap-js-api/test/view2d.ts b/types/amap-js-api/test/view2d.ts
deleted file mode 100644
index 2560922a5a..0000000000
--- a/types/amap-js-api/test/view2d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { lnglat } from './preset';
-
-// $ExpectType View2D
-new AMap.View2D();
-// $ExpectType View2D
-new AMap.View2D({});
-
-// $ExpectType View2D
-new AMap.View2D({
-    center: [1, 2],
-    rotation: 1,
-    zoom: 10,
-    crs: 'EPGS3395'
-});
-
-// $ExpectType View2D
-const view2d = new AMap.View2D({
-    center: lnglat
-});
-
-// $ExpectType View2D
-view2d.on('complete', () => { });
diff --git a/types/amap-js-api/tsconfig.json b/types/amap-js-api/tsconfig.json
index e63a35d326..a26facba9e 100644
--- a/types/amap-js-api/tsconfig.json
+++ b/types/amap-js-api/tsconfig.json
@@ -58,48 +58,9 @@
         "overlay/text.d.ts",
         "pixel.d.ts",
         "size.d.ts",
-        "test/arryBounds.ts",
-        "test/bounds.ts",
-        "test/browser.ts",
-        "test/convert-from.ts",
-        "test/dom-util.ts",
-        "test/event.ts",
-        "test/geometry-util.ts",
-        "test/layer/buildings.ts",
-        "test/layer/canvasLayer.ts",
-        "test/layer/flexible.ts",
-        "test/layer/imageLayer.ts",
-        "test/layer/layer.ts",
-        "test/layer/layerGroup.ts",
-        "test/layer/massMarks.ts",
-        "test/layer/tileLayer.ts",
-        "test/layer/videoLayer.ts",
-        "test/layer/wms.ts",
-        "test/layer/wmts.ts",
-        "test/lnglat.ts",
-        "test/map.ts",
-        "test/overlay/bezierCurve.ts",
-        "test/overlay/circle.ts",
-        "test/overlay/contextMenu.ts",
-        "test/overlay/ellipse.ts",
-        "test/overlay/geoJSON.ts",
-        "test/overlay/icon.ts",
-        "test/overlay/infoWindow.ts",
-        "test/overlay/marker.ts",
-        "test/overlay/markerShape.ts",
-        "test/overlay/overlay.ts",
-        "test/overlay/overlayGroup.ts",
-        "test/overlay/polygon.ts",
-        "test/overlay/polyline.ts",
-        "test/overlay/rectangle.ts",
-        "test/overlay/text.ts",
-        "test/pixel.ts",
-        "test/preset.ts",
-        "test/size.ts",
-        "test/util.ts",
-        "test/view2d.ts",
         "type-util.d.ts",
         "util.d.ts",
-        "view2D.d.ts"
+        "view2D.d.ts",
+        "amap-js-api-tests.ts"
     ]
 }
diff --git a/types/amap-js-api/tslint.json b/types/amap-js-api/tslint.json
index ab1e56673f..f93cf8562a 100644
--- a/types/amap-js-api/tslint.json
+++ b/types/amap-js-api/tslint.json
@@ -1,10 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "only-arrow-functions": false,
-        "space-before-function-paren": false,
-        "no-var-keyword": false,
-        "no-unnecessary-class": false,
-        "file-name-casing": false
-    }
+    "extends": "dtslint/dt.json"
 }

From c9c0a8d4055892ad1d328d6fc17d554bfd62d215 Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 6 Mar 2019 22:35:25 -0800
Subject: [PATCH 452/924] Updated for 1.4

---
 types/tmi.js/index.d.ts      | 81 ++++++++++++++++++++++++++++++------
 types/tmi.js/tmi.js-tests.ts |  4 +-
 2 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
index 86076ce202..cfbd9500ca 100644
--- a/types/tmi.js/index.d.ts
+++ b/types/tmi.js/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for tmi.js 1.3
+// Type definitions for tmi.js 1.4
 // Project: https://github.com/tmijs/tmi.js
 // Definitions by: William Papsco <https://github.com/wpapsco>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 
 // Twitch IRC docs: https://dev.twitch.tv/docs/irc/
-// Last updated: 2019/2/27
+// Last updated: 2019/3/06
 
 import { StrictEventEmitter } from "./strict-event-emitter-types";
 
@@ -16,6 +16,7 @@ export interface Actions {
     color(color: string): Promise<[string]>;
     commercial(channel: string, seconds: number): Promise<[string, number]>;
     connect(): Promise<[string, number]>;
+    deletemessage(channel: string, messageUUID: string): Promise<[string]>;
     disconnect(): Promise<[string, number]>;
     emoteonly(channel: string): Promise<[string]>;
     emoteonlyoff(channel: string): Promise<[string]>;
@@ -39,11 +40,15 @@ export interface Actions {
     unban(channel: string, username: string): Promise<[string, string]>;
     unhost(channel: string): Promise<[string]>;
     unmod(channel: string, username: string): Promise<[string, string]>;
+    unvip(channel: string, username: string): Promise<[string, string]>;
+    vip(channel: string, username: string): Promise<[string, string]>;
+    vips(channel: string): Promise<string[]>;
     whisper(username: string, message: string): Promise<[string, string]>;
 }
 
 export interface Events {
     action(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
+    anongiftpaidupgrade(channel: string, username: string, userstate: AnonSubGiftUpgradeUserstate): void;
     ban(channel: string, username: string, reason: string): void;
     chat(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
     cheer(channel: string, userstate: ChatUserstate, message: string): void;
@@ -54,11 +59,13 @@ export interface Events {
     emoteonly(channel: string, enabled: boolean): void;
     emotesets(sets: string, obj: EmoteObj): void;
     followersonly(channel: string, enabled: boolean, length: number): void;
+    giftpaidupgrade(channel: string, username: string, sender: string, userstate: SubGiftUpgradeUserstate): void;
     hosted(channel: string, username: string, viewers: number, autohost: boolean): void;
     hosting(channel: string, target: string, viewers: number): void;
     join(channel: string, username: string, self: boolean): void;
     logon(): void;
     message(channel: string, userstate: ChatUserstate, message: string, self: boolean): void;
+    messagedeleted(channel: string, username: string, deletedMessage: string, userstate: DeleteUserstate): void;
     mod(channel: string, username: string): void;
     mods(channel: string, mods: string[]): void;
     notice(channel: string, msgid: MsgID, message: string): void;
@@ -66,16 +73,21 @@ export interface Events {
     ping(): void;
     pong(latency: number): void;
     r9kbeta(channel: string, enabled: boolean): void;
+    raided(channel: string, username: string, viewers: number): void;
+    "raw_message": (messageCloned: { [property: string]: any }, message: { [property: string]: any }) => void;
     reconnect(): void;
-    resub(channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: ResubMethod): void;
+    resub(channel: string, username: string, months: number, message: string, userstate: SubUserstate, methods: SubMethods): void;
     roomstate(channel: string, state: RoomState): void;
     serverchange(channel: string): void;
     slowmode(channel: string, enabled: boolean, length: number): void;
+    subgift(channel: string, username: string, streakMonths: number, recipient: string, methods: SubMethods, userstate: SubGiftUserstate): void;
+    submysterygift(channel: string, username: string, numbOfSubs: number, methods: SubMethods, userstate: SubMysteryGiftUserstate): void;
     subscribers(channel: string, enabled: boolean): void;
-    subscription(channel: string, username: string, method: ResubMethod, message: string, userstate: SubUserstate): void;
+    subscription(channel: string, username: string, methods: SubMethods, message: string, userstate: SubUserstate): void;
     timeout(channel: string, username: string, reason: string, duration: number): void;
     unhost(channel: string, viewers: number): void;
     unmod(channel: string, username: string): void;
+    vips(channel: string, vips: string[]): void;
     whisper(from: string, userstate: ChatUserstate, message: string, self: boolean): void;
 }
 
@@ -108,6 +120,18 @@ export interface Badges {
     premium?: string;
 }
 
+export interface SubMethods {
+    prime?: boolean;
+    plan?: SubMethod;
+    planName?: string;
+}
+
+export interface DeleteUserstate {
+    login?: string;
+    message?: string;
+    "target-msg-id"?: string;
+}
+
 export interface CommonUserstate {
     badges?: Badges;
     color?: string;
@@ -130,13 +154,21 @@ export interface UserNoticeState extends CommonUserstate {
     login?: string;
     message?: string;
     "system-msg"?: string;
+    [paramater: string]: any;
 }
 
 export interface CommonSubUserstate extends UserNoticeState {
-    "msg-param-sub-plan"?: ResubMethod;
+    "msg-param-sub-plan"?: SubMethod;
     "msg-param-sub-plan-name"?: string;
 }
 
+export interface CommonGiftSubUserstate extends CommonSubUserstate {
+    "msg-param-recipient-display-name"?: string;
+    "msg-param-recipient-id"?: string;
+    "msg-param-recipient-user-name"?: string;
+    "msg-param-months"?: boolean | string;
+}
+
 export interface ChatUserstate extends CommonUserstate {
     'message-type'?: "chat" | "action" | "whisper";
     username?: string;
@@ -150,11 +182,28 @@ export interface SubUserstate extends CommonSubUserstate {
     "msg-param-streak-months"?: string | boolean;
 }
 
-export interface SubGiftUserstate extends CommonSubUserstate {
-    'message-type'?: "subgift" | "anonsubgift";
-    "msg-param-recipient-display-name"?: string;
-    "msg-param-recipient-id"?: string;
-    "msg-param-recipient-user-name"?: string;
+export interface SubMysteryGiftUserstate extends CommonSubUserstate {
+    'message-type'?: "submysterygift";
+    "msg-param-sender-count"?: string | boolean;
+}
+
+export interface SubGiftUserstate extends CommonGiftSubUserstate {
+    'message-type'?: "subgift";
+    "msg-param-sender-count"?: string | boolean;
+}
+
+export interface AnonSubGiftUserstate extends CommonGiftSubUserstate {
+    "message-type"?: "anonsubgift";
+}
+
+export interface SubGiftUpgradeUserstate extends CommonSubUserstate {
+    "message-type"?: "giftpaidupgrade";
+    "msg-param-sender-name"?: string;
+    "msg-param-sender-login"?: string;
+}
+
+export interface AnonSubGiftUpgradeUserstate extends CommonSubUserstate {
+    "message-type"?: "anongiftpaidupgrade";
 }
 
 export interface RaidUserstate extends UserNoticeState {
@@ -169,7 +218,15 @@ export interface RitualUserstate extends UserNoticeState {
     "msg-param-ritual-name"?: "new_chatter";
 }
 
-export type Userstate = ChatUserstate | SubGiftUserstate | SubUserstate | RaidUserstate | RitualUserstate;
+export type Userstate = ChatUserstate |
+    SubUserstate |
+    SubGiftUserstate |
+    SubGiftUpgradeUserstate |
+    AnonSubGiftUserstate |
+    SubMysteryGiftUserstate |
+    AnonSubGiftUpgradeUserstate |
+    RaidUserstate |
+    RitualUserstate;
 
 export interface EmoteObj {
     [id: string]: [{
@@ -251,7 +308,7 @@ export type MsgID = "already_banned" |
     "whisper_limit_per_sec" |
     "whisper_restricted_recipient";
 
-export type ResubMethod = "Prime" | "1000" | "2000" | "3000";
+export type SubMethod = "Prime" | "1000" | "2000" | "3000";
 
 export interface RoomState {
     "broadcaster-lang"?: string;
diff --git a/types/tmi.js/tmi.js-tests.ts b/types/tmi.js/tmi.js-tests.ts
index 6cd2c62629..28a380088b 100644
--- a/types/tmi.js/tmi.js-tests.ts
+++ b/types/tmi.js/tmi.js-tests.ts
@@ -30,7 +30,7 @@ const options: tmi.Options = {
 const client: tmi.Client = tmi.Client(options);
 
 client.connect().then(() => {
-    client.on("subscription", (channel: string, username: string, method: tmi.ResubMethod, msg: string, userstate: tmi.SubUserstate) => {
+    client.on("subscription", (channel: string, username: string, methods: tmi.SubMethods, msg: string, userstate: tmi.SubUserstate) => {
         client.say(channel, `Thank you to ${userstate["display-name"]} for subscribing!`);
         client.ping();
         client.r9kbeta(channel);
@@ -56,7 +56,7 @@ client.connect().then(() => {
         client.unmod(channel, username);
         client.whisper(username, "whisper");
         client.part(channel);
-        switch (method) {
+        switch (methods.plan) {
             case "1000":
             case "2000":
             case "3000":

From ccaaedb36c7db966284ebdefe20e4a7556dcc5dd Mon Sep 17 00:00:00 2001
From: Wpapsco <wpapsco@gmail.com>
Date: Wed, 6 Mar 2019 22:43:37 -0800
Subject: [PATCH 453/924] Moved index signature up the hierarchy of userstates

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

diff --git a/types/tmi.js/index.d.ts b/types/tmi.js/index.d.ts
index cfbd9500ca..0363842148 100644
--- a/types/tmi.js/index.d.ts
+++ b/types/tmi.js/index.d.ts
@@ -148,13 +148,13 @@ export interface CommonUserstate {
     "user-id"?: string;
     "tmi-sent-ts"?: string;
     flags?: string;
+    [paramater: string]: any;
 }
 
 export interface UserNoticeState extends CommonUserstate {
     login?: string;
     message?: string;
     "system-msg"?: string;
-    [paramater: string]: any;
 }
 
 export interface CommonSubUserstate extends UserNoticeState {

From bc341d3bc709dd8e3288c46cb9811f235ff22546 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Thu, 7 Mar 2019 14:52:59 +0800
Subject: [PATCH 454/924] [amap-js-api] fix lint error

---
 types/amap-js-api/amap-js-api-tests.ts | 40 +++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/types/amap-js-api/amap-js-api-tests.ts b/types/amap-js-api/amap-js-api-tests.ts
index 41b0638526..ee7a2ac583 100644
--- a/types/amap-js-api/amap-js-api-tests.ts
+++ b/types/amap-js-api/amap-js-api-tests.ts
@@ -2303,7 +2303,7 @@ const testGeoJSON = new AMap.GeoJSON<GeoJSONExtraData>({
         obj;
         // $ExpectType LngLat
         lnglat;
-        return testMarker;
+        return marker;
     },
     getPolyline(obj, lnglats) {
         // $ExpectType GeoJSONObject
@@ -2330,19 +2330,19 @@ const testGeoJSON = new AMap.GeoJSON<GeoJSONExtraData>({
 testGeoJSON.importData(geoJSONObject);
 
 // $ExpectType GeoJSON<GeoJSONExtraData>
-testGeoJSON.removeOverlay(testMarker);
+testGeoJSON.removeOverlay(marker);
 // $ExpectType GeoJSON<GeoJSONExtraData>
-testGeoJSON.removeOverlay([testMarker]);
+testGeoJSON.removeOverlay([marker]);
 
 // $ExpectType boolean
-testGeoJSON.hasOverlay(testMarker);
+testGeoJSON.hasOverlay(marker);
 // $ExpectType boolean
-testGeoJSON.hasOverlay(m => m === testMarker);
+testGeoJSON.hasOverlay(m => m === marker);
 
 // $ExpectType GeoJSON<GeoJSONExtraData>
-testGeoJSON.addOverlay(testMarker);
+testGeoJSON.addOverlay(marker);
 // $ExpectType GeoJSON<GeoJSONExtraData>
-testGeoJSON.addOverlay([testMarker]);
+testGeoJSON.addOverlay([marker]);
 
 // $ExpectType GeoJSONObject[]
 testGeoJSON.toGeoJSON();
@@ -2488,7 +2488,7 @@ new AMap.Marker();
 // $ExpectType Marker<any>
 new AMap.Marker({});
 // $ExpectType Marker<MarkerExtraData>
-const testMarker = new AMap.Marker<MarkerExtraData>({
+export const testMarker = new AMap.Marker<MarkerExtraData>({
     map,
     position: lnglat,
     offset: pixel,
@@ -2730,39 +2730,39 @@ testOverlay.getExtData();
 // $ExpectType OverlayGroup<Overlay<any>, any>
 const testOverlayGroup2 = new AMap.OverlayGroup();
 // $ExpectType OverlayGroup<Marker<any>, any>
-new AMap.OverlayGroup<AMap.Marker, any>(testMarker);
+new AMap.OverlayGroup<AMap.Marker, any>(marker);
 // $ExpectType OverlayGroup<Marker<any>, any>
-const testOverlayGroup = new AMap.OverlayGroup<AMap.Marker>([testMarker]);
+const testOverlayGroup = new AMap.OverlayGroup<AMap.Marker>([marker]);
 
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.addOverlay(testMarker);
+testOverlayGroup.addOverlay(marker);
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.addOverlay([testMarker]);
+testOverlayGroup.addOverlay([marker]);
 // $ExpectError
 testOverlayGroup.addOverlay([testCircle]);
 
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.addOverlays(testMarker);
+testOverlayGroup.addOverlays(marker);
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.addOverlays([testMarker]);
+testOverlayGroup.addOverlays([marker]);
 
 // $ExpectType Marker<any>[]
 testOverlayGroup.getOverlays();
 
 // $ExpectType boolean
-testOverlayGroup.hasOverlay(testMarker);
+testOverlayGroup.hasOverlay(marker);
 // $ExpectType boolean
-testOverlayGroup.hasOverlay(o => o === testMarker);
+testOverlayGroup.hasOverlay(o => o === marker);
 
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.removeOverlay(testMarker);
+testOverlayGroup.removeOverlay(marker);
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.removeOverlay([testMarker]);
+testOverlayGroup.removeOverlay([marker]);
 
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.removeOverlays(testMarker);
+testOverlayGroup.removeOverlays(marker);
 // $ExpectType OverlayGroup<Marker<any>, any>
-testOverlayGroup.removeOverlays([testMarker]);
+testOverlayGroup.removeOverlays([marker]);
 
 // $ExpectType OverlayGroup<Marker<any>, any>
 testOverlayGroup.clearOverlays();

From 96f6a298d7eae6d41eab0049e64106da28834712 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Thu, 7 Mar 2019 16:09:42 +0800
Subject: [PATCH 455/924] Added new types for uni-app

---
 types/uni-app/index.d.ts       |   12 +
 types/uni-app/lib/app.d.ts     |  234 ++
 types/uni-app/lib/common.d.ts  |    5 +
 types/uni-app/lib/page.d.ts    |  152 +
 types/uni-app/lib/uni.d.ts     | 6225 ++++++++++++++++++++++++++++++++
 types/uni-app/lib/vue.d.ts     |   15 +
 types/uni-app/package.json     |    6 +
 types/uni-app/tsconfig.json    |   29 +
 types/uni-app/tslint.json      |    8 +
 types/uni-app/uni-app-tests.ts |   21 +
 10 files changed, 6707 insertions(+)
 create mode 100644 types/uni-app/index.d.ts
 create mode 100644 types/uni-app/lib/app.d.ts
 create mode 100644 types/uni-app/lib/common.d.ts
 create mode 100644 types/uni-app/lib/page.d.ts
 create mode 100644 types/uni-app/lib/uni.d.ts
 create mode 100644 types/uni-app/lib/vue.d.ts
 create mode 100644 types/uni-app/package.json
 create mode 100644 types/uni-app/tsconfig.json
 create mode 100644 types/uni-app/tslint.json
 create mode 100644 types/uni-app/uni-app-tests.ts

diff --git a/types/uni-app/index.d.ts b/types/uni-app/index.d.ts
new file mode 100644
index 0000000000..207a3447e4
--- /dev/null
+++ b/types/uni-app/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for non-npm package uni-app 1.0
+// Project: https://github.com/dcloudio/uni-app
+// Definitions by: DCloud <https://github.com/dcloudio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.3
+
+import "./lib/app";
+import "./lib/common";
+import "./lib/page";
+import "./lib/uni";
+import "./lib/vue";
diff --git a/types/uni-app/lib/app.d.ts b/types/uni-app/lib/app.d.ts
new file mode 100644
index 0000000000..af29f99b17
--- /dev/null
+++ b/types/uni-app/lib/app.d.ts
@@ -0,0 +1,234 @@
+declare namespace App {
+    interface LaunchOptions {
+      query: number;
+    }
+
+    interface ReferrerInfo {
+      /**
+       * 来源小程序或公众号或App的 appId
+       *
+       * 以下场景支持返回 referrerInfo.appId：
+       * - 1020（公众号 profile 页相关小程序列表）： appId
+       * - 1035（公众号自定义菜单）：来源公众号 appId
+       * - 1036（App 分享消息卡片）：来源应用 appId
+       * - 1037（小程序打开小程序）：来源小程序 appId
+       * - 1038（从另一个小程序返回）：来源小程序 appId
+       * - 1043（公众号模板消息）：来源公众号 appId
+       */
+      appId: string;
+      /** 来源小程序传过来的数据，scene=1037或1038时支持 */
+      extraData?: any;
+    }
+
+    type SceneValues = 1001
+    | 1005
+    | 1006
+    | 1007
+    | 1008
+    | 1011
+    | 1012
+    | 1013
+    | 1014
+    | 1017
+    | 1019
+    | 1020
+    | 1022
+    | 1023
+    | 1024
+    | 1025
+    | 1026
+    | 1027
+    | 1028
+    | 1029
+    | 1030
+    | 1031
+    | 1032
+    | 1034
+    | 1035
+    | 1036
+    | 1037
+    | 1038
+    | 1039
+    | 1042
+    | 1043
+    | 1044
+    | 1045
+    | 1046
+    | 1047
+    | 1048
+    | 1049
+    | 1052
+    | 1053
+    | 1054
+    | 1056
+    | 1057
+    | 1058
+    | 1059
+    | 1064
+    | 1067
+    | 1068
+    | 1069
+    | 1071
+    | 1072
+    | 1073
+    | 1074
+    | 1077
+    | 1078
+    | 1079
+    | 1081
+    | 1082
+    | 1084
+    | 1089
+    | 1090
+    | 1091
+    | 1092
+    | 1095
+    | 1096
+    | 1097
+    | 1099
+    | 1102
+    | 1103
+    | 1104
+    | number;
+
+    interface LaunchShowOption {
+      /** 打开小程序的路径 */
+      path: string;
+      /** 打开小程序的query */
+      query: AnyObject;
+      /**
+       * 打开小程序的场景值
+       * - 1001: 发现栏小程序主入口，「最近使用」列表（基础库2.2.4版本起包含「我的小程序」列表）
+       * - 1005: 顶部搜索框的搜索结果页
+       * - 1006: 发现栏小程序主入口搜索框的搜索结果页
+       * - 1007: 单人聊天会话中的小程序消息卡片
+       * - 1008: 群聊会话中的小程序消息卡片
+       * - 1011: 扫描二维码
+       * - 1012: 长按图片识别二维码
+       * - 1013: 手机相册选取二维码
+       * - 1014: 小程序模板消息
+       * - 1017: 前往体验版的入口页
+       * - 1019: 微信钱包
+       * - 1020: 公众号 profile 页相关小程序列表
+       * - 1022: 聊天顶部置顶小程序入口
+       * - 1023: 安卓系统桌面图标
+       * - 1024: 小程序 profile 页
+       * - 1025: 扫描一维码
+       * - 1026: 附近小程序列表
+       * - 1027: 顶部搜索框搜索结果页「使用过的小程序」列表
+       * - 1028: 我的卡包
+       * - 1029: 卡券详情页
+       * - 1030: 自动化测试下打开小程序
+       * - 1031: 长按图片识别一维码
+       * - 1032: 手机相册选取一维码
+       * - 1034: 微信支付完成页
+       * - 1035: 公众号自定义菜单
+       * - 1036: App 分享消息卡片
+       * - 1037: 小程序打开小程序
+       * - 1038: 从另一个小程序返回
+       * - 1039: 摇电视
+       * - 1042: 添加好友搜索框的搜索结果页
+       * - 1043: 公众号模板消息
+       * - 1044: 带 shareTicket 的小程序消息卡片 [详情]((转发#获取更多转发信息))
+       * - 1045: 朋友圈广告
+       * - 1046: 朋友圈广告详情页
+       * - 1047: 扫描小程序码
+       * - 1048: 长按图片识别小程序码
+       * - 1049: 手机相册选取小程序码
+       * - 1052: 卡券的适用门店列表
+       * - 1053: 搜一搜的结果页
+       * - 1054: 顶部搜索框小程序快捷入口
+       * - 1056: 音乐播放器菜单
+       * - 1057: 钱包中的银行卡详情页
+       * - 1058: 公众号文章
+       * - 1059: 体验版小程序绑定邀请页
+       * - 1064: 微信连Wi-Fi状态栏
+       * - 1067: 公众号文章广告
+       * - 1068: 附近小程序列表广告
+       * - 1069: 移动应用
+       * - 1071: 钱包中的银行卡列表页
+       * - 1072: 二维码收款页面
+       * - 1073: 客服消息列表下发的小程序消息卡片
+       * - 1074: 公众号会话下发的小程序消息卡片
+       * - 1077: 摇周边
+       * - 1078: 连Wi-Fi成功页
+       * - 1079: 微信游戏中心
+       * - 1081: 客服消息下发的文字链
+       * - 1082: 公众号会话下发的文字链
+       * - 1084: 朋友圈广告原生页
+       * - 1089: 微信聊天主界面下拉，「最近使用」栏（基础库2.2.4版本起包含「我的小程序」栏）
+       * - 1090: 长按小程序右上角菜单唤出最近使用历史
+       * - 1091: 公众号文章商品卡片
+       * - 1092: 城市服务入口
+       * - 1095: 小程序广告组件
+       * - 1096: 聊天记录
+       * - 1097: 微信支付签约页
+       * - 1099: 页面内嵌插件
+       * - 1102: 公众号 profile 页服务预览
+       * - 1103: 发现栏小程序主入口，「我的小程序」列表（基础库2.2.4版本起废弃）
+       * - 1104: 微信聊天主界面下拉，「我的小程序」栏（基础库2.2.4版本起废弃）
+       */
+      scene: SceneValues;
+      /** shareTicket，详见 [获取更多转发信息]((转发#获取更多转发信息)) */
+      shareTicket: string;
+      /** 当场景为由从另一个小程序或公众号或App打开时，返回此字段 */
+      referrerInfo?: ReferrerInfo;
+    }
+
+    interface PageNotFoundOption {
+      /** 不存在页面的路径 */
+      path: string;
+      /** 打开不存在页面的 query */
+      query: AnyObject;
+      /** 是否本次启动的首个页面（例如从分享等入口进来，首个页面是开发者配置的分享页面） */
+      isEntryPage: boolean;
+    }
+
+    interface AppInstance<T extends AnyObject = {}> {
+    /**
+     * 生命周期回调—监听应用初始化
+     * 应用初始化完成时触发，全局只触发一次。
+     */
+    onLaunch?(options?: LaunchShowOption): void;
+    /**
+     * 生命周期回调—监听应用显示
+     * 应用启动，或从后台进入前台显示时
+     */
+    onShow?(options?: LaunchShowOption): void;
+    /**
+     * 生命周期回调—监听应用隐藏
+     * 应用从前台进入后台时
+     */
+    onHide?(): void;
+    /**
+     * 错误监听函数
+     * 应用发生脚本错误，或者 api
+     */
+    onError?(/** 错误信息，包含堆栈 */error?: string): void;
+    /**
+     * 页面不存在监听函数
+     * 应用要打开的页面不存在时触发，会带上页面信息回调该函数
+     *
+     * **注意：**
+     * 1. 如果开发者没有添加 `onPageNotFound` 监听，当跳转页面不存在时，将推入微信客户端原生的页面不存在提示页面。
+     * 2. 如果 `onPageNotFound` 回调中又重定向到另一个不存在的页面，将推入微信客户端原生的页面不存在提示页面，并且不再回调 `onPageNotFound`。
+     *
+     */
+    onPageNotFound?(options?: PageNotFoundOption): void;
+    }
+
+    type AppConstructor = <T extends AnyObject & AppInstance>(
+        options: AppInstance<T> & T,
+      ) => void;
+
+    interface GetAppOption {
+      /**
+       * 在 `App` 未定义时返回默认实现。当App被调用时，默认实现中定义的属性会被覆盖合并到App中。一般用于独立分包
+       */
+      allowDefault: boolean;
+    }
+
+    type GetApp = <T extends AnyObject>(opts?: GetAppOption) => AppInstance<T> & T;
+  }
+
+declare const getApp: App.GetApp;
diff --git a/types/uni-app/lib/common.d.ts b/types/uni-app/lib/common.d.ts
new file mode 100644
index 0000000000..c8c1ed7c54
--- /dev/null
+++ b/types/uni-app/lib/common.d.ts
@@ -0,0 +1,5 @@
+type AnyObject = Record<string, any>;
+
+type KVInfer<T> = { [K in keyof T]: T[K] };
+
+type Void<T> = T | undefined | null;
diff --git a/types/uni-app/lib/page.d.ts b/types/uni-app/lib/page.d.ts
new file mode 100644
index 0000000000..26d622733b
--- /dev/null
+++ b/types/uni-app/lib/page.d.ts
@@ -0,0 +1,152 @@
+declare namespace Page {
+    interface CustomShareContent {
+        /**
+         * 转发标题。默认值：当前应用名称
+         */
+        title?: string;
+        /**
+         * 转发路径，必须是以 / 开头的完整路径。默认值：当前页面 path
+         */
+        path?: string;
+        /**
+         * 自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径。支持PNG及JPG。显示图片长宽比是 5:4，默认值：使用默认截图
+         */
+        imageUrl?: string;
+    }
+
+    interface PageScrollOption {
+        /**
+         * 页面在垂直方向已滚动的距离（单位px）
+         */
+        scrollTop: number;
+    }
+
+    interface ShareAppMessageOption {
+        /**
+         * 转发事件来源。
+         * 可选值：
+         * - `button`：页面内转发按钮；
+         * - `menu`：右上角转发菜单。
+         *
+         */
+        from: "button" | "menu" | string;
+        /**
+         * 如果 `from` 值是 `button`，则 `target` 是触发这次转发事件的 `button`，否则为 `undefined`
+         */
+        target: any;
+        /**
+         * 页面中包含`<web-view>`组件时，返回当前`<web-view>`的url
+         */
+        webViewUrl?: string;
+    }
+
+    interface TabItemTapOption {
+        /**
+         * 被点击tabItem的序号，从0开始
+         */
+        index: string;
+        /**
+         * 被点击tabItem的页面路径
+         */
+        pagePath: string;
+        /**
+         * 被点击tabItem的按钮文字
+         */
+        text: string;
+    }
+
+    interface PageInstanceBaseProps<D extends AnyObject = any> {
+        /**
+         * 到当前页面的路径，类型为`String`
+         */
+        route?: string;
+    }
+
+    interface PageInstance<D extends AnyObject = any, T extends AnyObject = any> extends PageInstanceBaseProps<D> {
+        /**
+         * 生命周期回调—监听页面加载
+         * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取打开当前页面路径中的参数。
+         */
+        onLoad?(
+            /**
+             * 打开当前页面路径中的参数
+             */
+            query?: { [queryKey: string]: string },
+        ): void;
+        /**
+         * 生命周期回调—监听页面显示
+         * 页面显示/切入前台时触发。
+         */
+        onShow?(): void;
+        /**
+         * 生命周期回调—监听页面初次渲染完成
+         * 页面初次渲染完成时触发。一个页面只会调用一次，代表页面已经准备妥当，可以和视图层进行交互。
+         */
+        onReady?(): void;
+        /**
+         * 生命周期回调—监听页面隐藏
+         * 页面隐藏/切入后台时触发。 如 `navigateTo` 或底部 `tab` 切换到其他页面，应用切入后台等。
+         */
+        onHide?(): void;
+        /**
+         * 生命周期回调—监听页面卸载
+         * 页面卸载时触发。如`redirectTo`或`navigateBack`到其他页面时。
+         */
+        onUnload?(): void;
+        /**
+         * 监听用户下拉动作
+         * 监听用户下拉刷新事件。
+         * - 需要在`pages.json`的页面配置中开启`enablePullDownRefresh`。
+         * - 可以通过`uni.startPullDownRefresh`触发下拉刷新，调用后触发下拉刷新动画，效果与用户手动下拉刷新一致。
+         * - 当处理完数据刷新后，`uni.stopPullDownRefresh`可以停止当前页面的下拉刷新。
+         */
+        onPullDownRefresh?(): void;
+        /**
+         * 页面上拉触底事件的处理函数
+         * 监听用户上拉触底事件。
+         * - 可以在`pages.json`的页面配置中设置触发距离`onReachBottomDistance`。
+         * - 在触发距离内滑动期间，本事件只会被触发一次。
+         */
+        onReachBottom?(): void;
+        /**
+         * 用户点击右上角转发
+         * 监听用户点击页面内转发按钮（`<button>` 组件 `open-type="share"`）或右上角菜单“转发”按钮的行为，并自定义转发内容。
+         * **注意：只有定义了此事件处理函数，右上角菜单才会显示“转发”按钮**
+         * 此事件需要 return 一个 Object，用于自定义转发内容
+         */
+        onShareAppMessage?(
+            /**
+             * 分享发起来源参数
+             */
+            options?: ShareAppMessageOption,
+        ): CustomShareContent;
+        /**
+         * 页面滚动触发事件的处理函数
+         * 监听用户滑动页面事件。
+         */
+        onPageScroll?(
+            /**
+             * 页面滚动参数
+             */
+            options?: PageScrollOption,
+        ): void;
+
+        /**
+         * 当前是 tab 页时，点击 tab 时触发
+         */
+        onTabItemTap?(
+            /**
+             * tab 点击参数
+             */
+            options?: TabItemTapOption,
+        ): void;
+    }
+
+    type PageConstructor = <D extends AnyObject, T extends AnyObject & PageInstance>(
+            options: PageInstance<D, T> & T,
+        ) => void;
+
+    type GetCurrentPages = <D extends AnyObject = {}, T extends AnyObject = {}>() => Array<PageInstance<D, T> & T>;
+}
+
+declare const getCurrentPages: Page.GetCurrentPages;
diff --git a/types/uni-app/lib/uni.d.ts b/types/uni-app/lib/uni.d.ts
new file mode 100644
index 0000000000..ee3fed73d3
--- /dev/null
+++ b/types/uni-app/lib/uni.d.ts
@@ -0,0 +1,6225 @@
+/**
+ * Uni 实例变量
+ */
+declare const uni: Uni;
+
+declare class Uni {
+    /**
+     * 发起网络请求
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/request?id=request](http://uniapp.dcloud.io/api/request/request?id=request)
+     */
+    request(options: RequestOptions): RequestTask;
+    /**
+     * 上传文件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=uploadfile](http://uniapp.dcloud.io/api/request/network-file?id=uploadfile)
+     */
+    uploadFile(options: UploadFileOption): UploadTask;
+    /**
+     * 下载文件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
+     */
+    downloadFile(options: DownloadFileOption): DownloadTask;
+    /**
+     * 导入原生插件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
+     */
+    requireNativePlugin(moduleName: string): void;
+    /**
+     * upx 换算为 px
+     * 
+     * 参考: [http://uniapp.dcloud.io/frame?id=upx2px](http://uniapp.dcloud.io/frame?id=upx2px)
+     */
+    upx2px(): number;
+    /**
+     * 创建一个 WebSocket 连接
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=connectsocket](http://uniapp.dcloud.io/api/request/websocket?id=connectsocket)
+     */
+    connectSocket(options: ConnectSocketOption): SocketTask;
+    /**
+     * 监听WebSocket连接打开事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen](http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen)
+     */
+    onSocketOpen(options: (result: OnSocketOpenCallbackResult) => void): void;
+    /**
+     * 监听WebSocket错误
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror](http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror)
+     */
+    onSocketError(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 通过 WebSocket 连接发送数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage)
+     */
+    sendSocketMessage(options: SendSocketMessageOptions): void;
+    /**
+     * 监听WebSocket接受到服务器的消息事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage)
+     */
+    onSocketMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
+    /**
+     * 关闭 WebSocket 连接
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=closesocket](http://uniapp.dcloud.io/api/request/websocket?id=closesocket)
+     */
+    closeSocket(options: CloseSocketOptions): void;
+    /**
+     * 监听WebSocket关闭
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose](http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose)
+     */
+    onSocketClose(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 从本地相册选择图片或使用相机拍照
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=chooseimage](http://uniapp.dcloud.io/api/media/image?id=chooseimage)
+     */
+    chooseImage(options: ChooseImageOptions): void;
+    /**
+     * 预览图片
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=previewimage](http://uniapp.dcloud.io/api/media/image?id=previewimage)
+     */
+    previewImage(options: PreviewImageOptions): void;
+    /**
+     * 预览图片
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=getimageinfo](http://uniapp.dcloud.io/api/media/image?id=getimageinfo)
+     */
+    getImageInfo(options: GetImageInfoOptions): void;
+    /**
+     * 保存图片到系统相册
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum](http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum)
+     */
+    saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
+    /**
+     * 录音管理
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager](http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager)
+     */
+    getRecorderManager(): RecorderManager;
+    /**
+     * 获取全局唯一的背景音频管理器 backgroundAudioManager
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager](http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager)
+     */
+    getBackgroundAudioManager(): BackgroundAudioManager;
+    /**
+     * 创建并返回 audio 上下文 audioContext 对象
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext](http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext)
+     */
+    createInnerAudioContext(): CreateInnerAudioContext;
+    /**
+     * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/video?id=choosevideo](http://uniapp.dcloud.io/api/media/video?id=choosevideo)
+     */
+    chooseVideo(options: ChooseVideoOptions): void;
+    /**
+     * 保存视频到系统相册
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum](http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum)
+     */
+    saveVideoToPhotosAlbum(options: SaveVideoToPhotosAlbumOptions): void;
+    /**
+     * 创建并返回 video 上下文 videoContext 对象
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext](http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext)
+     */
+    createVideoContext(): VideoContext;
+    /**
+     * 保存文件到本地
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=savefile](http://uniapp.dcloud.io/api/file/file?id=savefile)
+     */
+    saveFile(options: SaveFileOptions): void;
+    /**
+     * 获取文件信息
+     */
+    getFileInfo(options: GetFileInfoOptions): void;
+    /**
+     * 获取本地已保存的文件列表
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist](http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist)
+     */
+    getSavedFileList(options: GetSavedFileListOptions): void;
+    /**
+     * 获取本地文件的文件信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo](http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo)
+     */
+    getSavedFileInfo(options: GetSavedFileInfoOptions): void;
+    /**
+     * 删除本地存储的文件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=removesavedfile](http://uniapp.dcloud.io/api/file/file?id=removesavedfile)
+     */
+    removeSavedFile(options: RemoveSavedFileOptions): void;
+    /**
+     * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=opendocument](http://uniapp.dcloud.io/api/file/file?id=opendocument)
+     */
+    openDocument(options: OpenDocumentOptions): void;
+    /**
+     * 将数据存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个异步接口
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstorage](http://uniapp.dcloud.io/api/storage/storage?id=setstorage)
+     */
+    setStorage(options: SetStorageOptions): void;
+    /**
+     * 将 data 存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个同步接口
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync)
+     */
+    setStorageSync(): void;
+    /**
+     * 从本地缓存中异步获取指定 key 对应的内容
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorage](http://uniapp.dcloud.io/api/storage/storage?id=getstorage)
+     */
+    getStorage(options: GetStorageOptions): void;
+    /**
+     * 从本地缓存中同步获取指定 key 对应的内容
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync)
+     */
+    getStorageSync(): void;
+    /**
+     * 异步获取当前storage的相关信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo)
+     */
+    getStorageInfo(options: GetStorageInfoOptions): void;
+    /**
+     * 同步获取当前storage的相关信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync)
+     */
+    getStorageInfoSync(): void;
+    /**
+     * 从本地缓存中异步移除指定 key
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestorage](http://uniapp.dcloud.io/api/storage/storage?id=removestorage)
+     */
+    removeStorage(options: RemoveStorageOptions): void;
+    /**
+     * 从本地缓存中同步移除指定 key
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync](http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync)
+     */
+    removeStorageSync(): void;
+    /**
+     * 清理本地数据缓存
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstorage](http://uniapp.dcloud.io/api/storage/storage?id=clearstorage)
+     */
+    clearStorage(): void;
+    /**
+     * 同步清理本地数据缓存
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync)
+     */
+    clearStorageSync(): void;
+    /**
+     * 获取当前的地理位置、速度
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/location/location?id=getlocation](http://uniapp.dcloud.io/api/location/location?id=getlocation)
+     */
+    getLocation(options: GetLocationOptions): void;
+    /**
+     * 打开地图选择位置。
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/location/location?id=chooselocation](http://uniapp.dcloud.io/api/location/location?id=chooselocation)
+     */
+    chooseLocation(options: ChooseLocationOptions): void;
+    /**
+     * 使用地图查看位置
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/location/open-location?id=openlocation](http://uniapp.dcloud.io/api/location/open-location?id=openlocation)
+     */
+    openLocation(options: OpenLocationOptions): void;
+    /**
+     * 创建并返回 map 上下文 mapContext 对象
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/location/map?id=createmapcontext](http://uniapp.dcloud.io/api/location/map?id=createmapcontext)
+     */
+    createMapContext(): MapContext;
+    /**
+     * 获取系统信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfo](http://uniapp.dcloud.io/api/system/info?id=getsysteminfo)
+     */
+    getSystemInfo(options: GetSystemInfoOptions): void;
+    /**
+     * 获取系统信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync](http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync)
+     */
+    getSystemInfoSync(): GetSystemInfoSuccess;
+    /**
+     * 判断uni-app的API，回调，参数，组件等是否在当前版本可用
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=caniuse](http://uniapp.dcloud.io/api/system/info?id=caniuse)
+     */
+    canIUse(options: string): boolean;
+    /**
+     * 获取网络类型
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/network?id=getnetworktype](http://uniapp.dcloud.io/api/system/network?id=getnetworktype)
+     */
+    getNetworkType(options: GetNetworkTypeOptions): void;
+    /**
+     * 监听网络状态变化
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange](http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange)
+     */
+    onNetworkStatusChange(callback: (result: OnNetworkStatusChangeSuccess) => void): void;
+    /**
+     * 监听加速度数据，频率：5次/秒，接口调用后会自动开始监听，可使用 uni.stopAccelerometer 停止监听
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange](http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange)
+     */
+    onAccelerometerChange(callback: (result: OnAccelerometerChangeSuccess) => void): void;
+    /**
+     * 开始监听加速度数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer)
+     */
+    startAccelerometer(options: StartAccelerometerOptions): void;
+    /**
+     * 停止监听加速度数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer)
+     */
+    stopAccelerometer(options: StopAccelerometerOptions): void;
+    /**
+     * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用uni.stopCompass停止监听
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=oncompasschange](http://uniapp.dcloud.io/api/system/compass?id=oncompasschange)
+     */
+    onCompassChange(callback: (result: OnCompassChangeSuccess) => void): void;
+    /**
+     * 开始监听罗盘数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=startcompass](http://uniapp.dcloud.io/api/system/compass?id=startcompass)
+     */
+    startCompass(options: StartCompassOptions): void;
+    /**
+     * 停止监听罗盘数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=stopcompass](http://uniapp.dcloud.io/api/system/compass?id=stopcompass)
+     */
+    stopCompass(options: StopCompassOptions): void;
+    /**
+     * 拨打电话
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/phone?id=makephonecall](http://uniapp.dcloud.io/api/system/phone?id=makephonecall)
+     */
+    makePhoneCall(options: MakePhoneCallOptions): void;
+    /**
+     * 调用扫码界面，扫码成功后返回对应的结果
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/barcode?id=scancode](http://uniapp.dcloud.io/api/system/barcode?id=scancode)
+     */
+    scanCode(options: ScanCodeOptions): void;
+    /**
+     * 设置系统剪贴板的内容
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata)
+     */
+    setClipboardData(options: SetClipboardDataOptions): void;
+    /**
+     * 获得系统剪贴板的内容
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata)
+     */
+    getClipboardData(options: GetClipboardDataOptions): void;
+    /**
+     * 隐藏软键盘
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard](http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard)
+     */
+    hideKeyboard(): void;
+    /**
+     * 设置屏幕亮度
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness)
+     */
+    setScreenBrightness(options: SetScreenBrightnessOptions): void;
+    /**
+     * 获取屏幕亮度
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness)
+     */
+    getScreenBrightness(options: GetScreenBrightnessOptions): void;
+    /**
+     * 设置是否保持常亮状态
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon](http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon)
+     */
+    setKeepScreenOn(options: SetKeepScreenOnOptions): void;
+    /**
+     * 使手机发生较长时间的振动（400ms）
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong](http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong)
+     */
+    vibrateLong(options: VibrateLongOptions): void;
+    /**
+     * 使手机发生较短时间的振动（15ms）
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort](http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort)
+     */
+    vibrateShort(options: VibrateShortOptions): void;
+    /**
+     * 手机通讯录联系人和联系方式的增加
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/contact?id=addphonecontact](http://uniapp.dcloud.io/api/system/contact?id=addphonecontact)
+     */
+    addPhoneContact(options: AddPhoneContactOptions): void;
+    /**
+     * 获取已搜索到的iBeacon设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons](http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons)
+     */
+    getBeacons(options: GetBeaconsOptions): void;
+    /**
+     * 开始搜索附近的iBeacon设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery](http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery)
+     */
+    startBeaconDiscovery(options: StartBeaconDiscoveryOptions): void;
+    /**
+     * 停止搜索附近的iBeacon设备
+     * 
+     * 参考: [http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery](http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery)
+     */
+    stopBeaconDiscovery(options: StopBeaconDiscoveryOptions): void;
+    /**
+     * 监听iBeacon设备更新
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate)
+     */
+    onBeaconUpdate(callback: (result: GetBeaconsRes) => void): void;
+    /**
+     * 监听iBeacon服务状态变化
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange)
+     */
+    onBeaconServiceChange(callback: (result: BeaconService) => void): void;
+    /**
+     * 关闭蓝牙模块
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter)
+     */
+    closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
+    /**
+     * 获取本机蓝牙适配器状态
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate)
+     */
+    getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
+    /**
+     * 获取已搜索到的蓝牙设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices)
+     */
+    getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
+    /**
+     * 根据uuid获取处于已连接的设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices)
+     */
+    getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
+    /**
+     * 监听蓝牙适配器状态变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange)
+     */
+    onBluetoothAdapterStateChange(callback: (result: OnBluetoothAdapterStateChangeResult) => void): void;
+    /**
+     * 监听搜索到新设备的事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound)
+     */
+    onBluetoothDeviceFound(callback: (result: OnBluetoothDeviceFoundResult) => void): void;
+    /**
+     * 初始化蓝牙模块
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter)
+     */
+    openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
+    /**
+     * 开始搜索附近的蓝牙设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery)
+     */
+    startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
+    /**
+     * 停止搜寻附近的蓝牙外围设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery)
+     */
+    stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
+    /**
+     * 断开与低功耗蓝牙设备的连接
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=closebleconnection](http://uniapp.dcloud.io/api/system/ble?id=closebleconnection)
+     */
+    closeBLEConnection(options: CloseBLEConnectionOptions): void;
+    /**
+     * 连接低功耗蓝牙设备
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=createbleconnection](http://uniapp.dcloud.io/api/system/ble?id=createbleconnection)
+     */
+    createBLEConnection(options: CreateBLEConnectionOptions): void;
+    /**
+     * 获取蓝牙设备指定服务中所有特征值
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics](http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics)
+     */
+    getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
+    /**
+     * 获取蓝牙设备的所有服务
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices](http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices)
+     */
+    getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
+    /**
+     * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange)
+     */
+    notifyBLECharacteristicValueChange(options: NotifyBLECharacteristicValueChangeOptions): void;
+    /**
+     * 监听低功耗蓝牙设备的特征值变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange)
+     */
+    onBLECharacteristicValueChange(callback: (result: OnBLECharacteristicValueChangeSuccess) => void): void;
+    /**
+     * 监听低功耗蓝牙设备连接状态变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange](http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange)
+     */
+    onBLEConnectionStateChange(callback: (result: OnBLEConnectionStateChangeSuccess) => void): void;
+    /**
+     * 读取低功耗蓝牙设备指定特征值的二进制数据值
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue)
+     */
+    readBLECharacteristicValue(options: ReadBLECharacteristicValueOptions): void;
+    /**
+     * 向低功耗蓝牙设备指定特征值写入二进制数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue)
+     */
+    writeBLECharacteristicValue(options: WriteBLECharacteristicValueOptions): void;
+    /**
+     * 显示消息提示框
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showtoast](http://uniapp.dcloud.io/api/ui/prompt?id=showtoast)
+     */
+    showToast(options: ShowToastOptions): void;
+    /**
+     * 显示 loading 提示框
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showloading](http://uniapp.dcloud.io/api/ui/prompt?id=showloading)
+     */
+    showLoading(options: ShowLoadingOptions): void;
+    /**
+     * 隐藏消息提示框
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast](http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast)
+     */
+    hideToast(): void;
+    /**
+     * 隐藏 loading 提示框
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hideloading](http://uniapp.dcloud.io/api/ui/prompt?id=hideloading)
+     */
+    hideLoading(): void;
+    /**
+     * 显示模态弹窗
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showmodal](http://uniapp.dcloud.io/api/ui/prompt?id=showmodal)
+     */
+    showModal(options: ShowModalOptions): void;
+    /**
+     * 显示操作菜单
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet](http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet)
+     */
+    showActionSheet(options: ShowActionSheetOptions): void;
+    /**
+     * 动态设置当前页面的标题
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle)
+     */
+    setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
+    /**
+     * 在当前页面显示导航条加载动画
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading)
+     */
+    showNavigationBarLoading(): void;
+    /**
+     * 隐藏导航条加载动画
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading)
+     */
+    hideNavigationBarLoading(): void;
+    /**
+     * 设置导航条颜色
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor)
+     */
+    setNavigationBarColor(options: SetNavigationbarColorOptions): void;
+    /**
+     * 动态设置 tabBar 某一项的内容
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem)
+     */
+    setTabBarItem(options: SetTabBarItemOptions): void;
+    /**
+     * 动态设置 tabBar 的整体样式
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle)
+     */
+    setTabBarStyle(options: SetTabBarStyleOptions): void;
+    /**
+     * 隐藏 tabBar
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar)
+     */
+    hideTabBar(options: HideTabBarOptions): void;
+    /**
+     * 显示 tabBar
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar)
+     */
+    showTabBar(options: ShowTabBarOptions): void;
+    /**
+     * 为 tabBar 某一项的右上角添加文本
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge)
+     */
+    setTabBarBadge(options: SetTabBarBadgeOptions): void;
+    /**
+     * 移除 tabBar 某一项右上角的文本
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge)
+     */
+    removeTabBarBadge(options: RemoveTabBarBadgeOptions): void;
+    /**
+     * 显示 tabBar 某一项的右上角的红点
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot)
+     */
+    showTabBarRedDot(options: ShowTabBarRedDotOptions): void;
+    /**
+     * 隐藏 tabBar 某一项的右上角的红点
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot)
+     */
+    hideTabBarRedDot(options: HideTabBarRedDotOptions): void;
+    /**
+     * 保留当前页面，跳转到应用内的某个页面
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateto](http://uniapp.dcloud.io/api/router?id=navigateto)
+     */
+    navigateTo(options: NavigateToOptions): void;
+    /**
+     * 关闭当前页面，跳转到应用内的某个页面
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/router?id=redirectto](http://uniapp.dcloud.io/api/router?id=redirectto)
+     */
+    redirectTo(options: RedirectToOptions): void;
+    /**
+     * 关闭所有页面，打开到应用内的某个页面
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/router?id=relaunch](http://uniapp.dcloud.io/api/router?id=relaunch)
+     */
+    reLaunch(options: ReLaunchOptions): void;
+    /**
+     * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/router?id=switchtab](http://uniapp.dcloud.io/api/router?id=switchtab)
+     */
+    switchTab(options: SwitchTabOptions): void;
+    /**
+     * 关闭当前页面，返回上一页面或多级页面
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateback](http://uniapp.dcloud.io/api/router?id=navigateback)
+     */
+    navigateBack(options: NavigateBackOptions): void;
+    /**
+     * 创建一个动画实例
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/animation?id=createanimation](http://uniapp.dcloud.io/api/ui/animation?id=createanimation)
+     */
+    createAnimation(options: CreateAnimationOptions): Animation;
+    /**
+     * 将页面滚动到目标位置
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto](http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto)
+     */
+    pageScrollTo(options: PageScrollToOptions): void;
+    /**
+     * 开始下拉刷新
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh)
+     */
+    startPullDownRefresh(options: StartPullDownRefreshOptions): void;
+    /**
+     * 停止当前页面下拉刷新
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh)
+     */
+    stopPullDownRefresh(): void;
+    /**
+     * 返回一个SelectorQuery对象实例
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery](http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery)
+     */
+    createSelectorQuery(): SelectorQuery;
+    /**
+     * 创建并返回一个 IntersectionObserver 对象实例
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver](http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver)
+     */
+    createIntersectionObserver(options: CreateIntersectionObserverOptions): IntersectionObserver;
+    /**
+     * 创建 canvas 绘图上下文
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext](http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext)
+     */
+    createCanvasContext(canvasId: string, componentInstance: any): CanvasContext;
+    /**
+     * 把当前画布指定区域的内容导出生成指定大小的图片
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath](http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath)
+     */
+    canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
+    /**
+     * 描述 canvas 区域隐含的像素数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata)
+     */
+    canvasGetImageData(options: CanvasGetImageDataOptions): void;
+    /**
+     * 将像素数据绘制到画布
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata)
+     */
+    canvasPutImageData(options: CanvasPutImageDataOptions): void;
+    /**
+     * 监听窗口尺寸变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=onwindowresize](http://uniapp.dcloud.io/api/ui/window?id=onwindowresize)
+     */
+    onWindowResize(callback: (result: WindowResizeResult) => void): void;
+    /**
+     * 取消监听窗口尺寸变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=offwindowresize](http://uniapp.dcloud.io/api/ui/window?id=offwindowresize)
+     */
+    offWindowResize(callback: () => void): void;
+    /**
+     * 获取服务供应商
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/provider?id=getprovider](http://uniapp.dcloud.io/api/plugins/provider?id=getprovider)
+     */
+    getProvider(options: GetProviderOptions): void;
+    /**
+     * 登录
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=login](http://uniapp.dcloud.io/api/plugins/login?id=login)
+     */
+    login(options: LoginOptions): void;
+    /**
+     * 获取用户信息
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo](http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo)
+     */
+    getUserInfo(options: GetUserInfoOptions): void;
+    /**
+     * 分享
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=share](http://uniapp.dcloud.io/api/plugins/share?id=share)
+     */
+    share(options: ShareOptions): void;
+    /**
+     * 开启推送
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=subscribepush](http://uniapp.dcloud.io/api/plugins/push?id=subscribepush)
+     */
+    subscribePush(options: SubscribePushOptions): void;
+    /**
+     * 关闭推送
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush](http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush)
+     */
+    unsubscribePush(options: UnscribePushOptions): void;
+    /**
+     * 监听透传数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=onpush](http://uniapp.dcloud.io/api/plugins/push?id=onpush)
+     */
+    onPush(options: OnPushOptions): void;
+    /**
+     * 移除监听透传数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=offpush](http://uniapp.dcloud.io/api/plugins/push?id=offpush)
+     */
+    offPush(options: OffPushOptions): void;
+    /**
+     * 支付
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment](http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment)
+     */
+    requestPayment(options: RequestPaymentOptions): void;
+    /**
+     * 提前向用户发起授权请求
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=authorize](http://uniapp.dcloud.io/api/other/authorize?id=authorize)
+     */
+    authorize(options: AuthorizeOptions): void;
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=opensetting](http://uniapp.dcloud.io/api/other/authorize?id=opensetting)
+     */
+    openSetting(options: OpenSettingOptions): void;
+    /**
+     * 获取用户的当前设置
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/setting?id=getsetting](http://uniapp.dcloud.io/api/other/setting?id=getsetting)
+     */
+    getSetting(options: GetSettingOptions): void;
+    /**
+     * 获取用户收货地址。调起用户编辑收货地址原生界面，并在编辑完成后返回用户选择的地址，需要用户授权 scope.address
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress](http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress)
+     */
+    chooseAddress(options: ChooseAddressOptions): void;
+    /**
+     * 选择用户的发票抬头，需要用户授权 scope.invoiceTitle
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle](http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle)
+     */
+    chooseInvoiceTitle(options: ChooseInvoiceTitleOptions): void;
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram)
+     */
+    navigateToMiniProgram(options: NavigateToMiniProgramOptions): void;
+    /**
+     * 跳转回上一个小程序，只有当另一个小程序跳转到当前小程序时才会能调用成功
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram)
+     */
+    navigateBackMiniProgram(options: NavigateBackMiniProgramOptions): void;
+    /**
+     * 返回全局唯一的版本更新管理器对象： updateManager，用于管理小程序更新
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/update?id=getupdatemanager](http://uniapp.dcloud.io/api/other/update?id=getupdatemanager)
+     */
+    getUpdateManager(): UpdateManager;
+    /**
+     * 设置是否打开调试开关。此开关对正式版也能生效
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug](http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug)
+     */
+    setEnableDebug(options: SetEnableDebugOptions): void;
+    /**
+     * 获取第三方平台自定义的数据字段
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig)
+     */
+    getExtConfig(options: GetExtConfigOptions): GetExtConfigRes;
+    /**
+     * uni.getExtConfig() 的同步版本
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync)
+     */
+    getExtConfigSync(): GetExtConfigSyncRes;
+    /**
+     * 隐藏分享按钮
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu](http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu)
+     */
+    hideShareMenu(options: HideShareMenuOptions): void;
+    /**
+     * 动态设置窗口的背景色
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor)
+     */
+    setBackgroundColor(options: SetBackgroundColorOptions): void;
+    /**
+     * 动态设置窗口的背景色
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle)
+     */
+    setBackgroundTextStyle(options: SetBackgroundTextStyleOptions): void;
+    /**
+     * 监听陀螺仪数据变化事件
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange](http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange)
+     */
+    onGyroscopeChange(callback: (result: OnGyroscopeChangeSuccess) => void): void;
+    /**
+     * 开始监听陀螺仪数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope)
+     */
+    startGyroscope(options: StartGyroscopeOptions): void;
+    /**
+     * 停止监听陀螺仪数据
+     * 
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope)
+     */
+    stopGyroscope(options: StopGyroscopeOptions): void;
+}
+
+interface GeneralCallbackResult {
+    /**
+     * 错误信息
+     */
+    errMsg?: string;
+}
+
+interface RequestPaymentOptions {
+    /**
+     * 分享服务提供商，通过 uni.getProvider 获取
+     */
+    provider?: string;
+    /**
+     * 订单数据
+     */
+    orderInfo?: string;
+    /**
+     * 时间戳从1970年1月1日至今的秒数，即当前的时间，微信小程序独有
+     */
+    timeStamp?: string;
+    /**
+     * 随机字符串，长度为32个字符以下，微信小程序独有 。
+     */
+    nonceStr?: string;
+    /**
+     * 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=xx，微信小程序独有
+     */
+    package?: string;
+    /**
+     * 签名算法，暂支持 MD5 ，微信小程序独有
+     */
+    signType?: string;
+    /**
+     * 签名，具体签名方案参见小程序支付接口文档，微信小程序独有
+     */
+    paySign?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RequestOptions {
+    /**
+     * 资源url
+     */
+    url?: string;
+    /**
+     * 请求的参数
+     */
+    data?: string | object | ArrayBuffer;
+    /**
+     * 设置请求的 header，header 中不能设置 Referer。
+     */
+    header?: any;
+    /**
+     * 默认为 GET
+     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
+     */
+    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
+    /**
+     * 如果设为json，会尝试对返回的数据做一次 JSON.parse
+     */
+    dataType?: string;
+    /**
+     * 设置响应的数据类型。合法值：text、arraybuffer
+     */
+    responseType?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: RequestSuccessCallbackResult) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface RequestSuccessCallbackResult {
+    /**
+     * 开发者服务器返回的数据
+     */
+    data?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+    /**
+     * 开发者服务器返回的 HTTP Response Header
+     */
+    header?: any;
+}
+
+interface RequestTask {
+    /**
+     * 中断请求任务
+     */
+    abort(): void;
+}
+
+interface UploadFileOption {
+    /**
+     * 开发者服务器 url
+     */
+    url?: string;
+    /**
+     * 文件类型，image/video/audio，仅支付宝小程序，且必填。
+     * - image: 图像
+     * - video: 视频
+     * - audio: 音频
+     */
+    fileType?: 'image' | 'video' | 'audio';
+    /**
+     * 要上传文件资源的路径
+     */
+    filePath?: string;
+    /**
+     * 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+     */
+    name?: string;
+    /**
+     * 需要上传的文件列表。使用 files 时，filePath 和 name 不生效。仅 5+App 支持
+     */
+    files?: UploadFileOptionFiles [];
+    /**
+     * HTTP 请求 Header, header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * HTTP 请求中其他额外的 form data
+     */
+    formData?: any;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: UploadFileSuccessCallbackResult) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface UploadFileOptionFiles {
+    /**
+     * multipart 提交时，表单的项目名，默认为 file，如果 name 不填或填的值相同，可能导致服务端读取文件时只能读取到一个文件。
+     */
+    name?: string;
+    /**
+     * 要上传文件资源的路径
+     */
+    uri?: string;
+}
+
+interface UploadTask {
+    /**
+     * 监听上传进度变化
+     */
+    onProgressUpdate(callback: (result: OnProgressUpdateResult) => void): void;
+    /**
+     * 中断上传任务
+     */
+    abort(): void;
+}
+
+interface OnProgressUpdateResult {
+    /**
+     * 上传进度百分比
+     */
+    progress?: number;
+    /**
+     * 已经上传的数据长度，单位 Bytes
+     */
+    totalBytesSent?: number;
+    /**
+     * 预期需要上传的数据总长度，单位 Bytes
+     */
+    totalBytesExpectedToSend?: number;
+}
+
+interface DownloadFileOption {
+    /**
+     * 下载资源的 url
+     */
+    url?: string;
+    /**
+     * HTTP 请求 Header，header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'}
+     */
+    success?: (result: DownloadSuccessData) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface DownloadTask {
+    /**
+     * 监听下载进度变化
+     */
+    onProgressUpdate(callback: (result: OnProgressDownloadResult) => void): void;
+    /**
+     * 中断下载任务
+     */
+    abort(): void;
+}
+
+interface OnProgressDownloadResult {
+    /**
+     * 下载进度百分比
+     */
+    progress?: number;
+    /**
+     * 已经下载的数据长度，单位 Bytes
+     */
+    totalBytesWritten?: number;
+    /**
+     * 预期需要下载的数据总长度，单位 Bytes
+     */
+    totalBytesExpectedToWrite?: number;
+}
+
+interface UploadFileSuccessCallbackResult {
+    /**
+     * 开发者服务器返回的数据
+     */
+    data?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+}
+
+interface DownloadSuccessData {
+    /**
+     * 临时文件路径，下载后的文件会存储到一个临时文件
+     */
+    tempFilePath?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+}
+
+interface ConnectSocketOption {
+    /**
+     * 开发者服务器接口地址，必须是 wss 协议，且域名必须是后台配置的合法域名
+     */
+    url?: string;
+    /**
+     * HTTP 请求 Header，header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * 默认为 GET
+     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
+     */
+    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
+    /**
+     * 子协议数组
+     */
+    protocols?: string [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SendSocketMessageOptions {
+    /**
+     * 需要发送的内容
+     */
+    data?: string | ArrayBuffer;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface CloseSocketOptions {
+    /**
+     * 一个数字值表示关闭连接的状态号，表示连接被关闭的原因。如果这个参数没有被指定，默认的取值是1000 （表示正常连接关闭）
+     */
+    code?: number;
+    /**
+     * 一个可读的字符串，表示连接被关闭的原因。这个字符串必须是不长于123字节的UTF-8 文本（不是字符）
+     */
+    reason?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface SocketTask {
+    /**
+     * 通过 WebSocket 连接发送数据
+     */
+    send(options: SendSocketMessageOptions): void;
+    /**
+     * 关闭 WebSocket 连接
+     */
+    close(options: CloseSocketOptions): void;
+    /**
+     * 监听 WebSocket 连接打开事件
+     */
+    onOpen(callback: (result: OnSocketOpenCallbackResult) => void): void;
+    /**
+     * 监听 WebSocket 连接关闭事件
+     */
+    onClose(callback: () => void): void;
+    /**
+     * 监听 WebSocket 错误
+     */
+    onError(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 监听WebSocket接受到服务器的消息事件
+     */
+    onMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
+}
+
+interface OnSocketMessageCallbackResult {
+    /**
+     * 服务器返回的消息
+     */
+    data?: string | ArrayBuffer;
+}
+
+interface OnSocketOpenCallbackResult {
+    /**
+     * 连接成功的 HTTP 响应 Header
+     */
+    header?: any;
+}
+
+interface ChooseImageOptions {
+    /**
+     * 最多可以选择的图片张数，默认9
+     */
+    count?: number;
+    /**
+     * original 原图，compressed 压缩图，默认二者都有
+     */
+    sizeType?: string | string [];
+    /**
+     * album 从相册选图，camera 使用相机，默认二者都有
+     */
+    sourceType?: string | string [];
+    /**
+     * 成功则返回图片的本地文件路径列表 tempFilePaths
+     */
+    success?: (result: ChooseImageSuccessCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseImageSuccessCallbackResult {
+    /**
+     * 图片的本地文件路径列表
+     */
+    tempFilePaths?: string | any [];
+    /**
+     * 图片的本地文件列表，每一项是一个 File 对象
+     */
+    tempFiles?: ChooseImageSuccessCallbackResultFile | ChooseImageSuccessCallbackResultFile [];
+}
+
+interface ChooseImageSuccessCallbackResultFile {
+    /**
+     * 本地文件路径
+     */
+    path?: string;
+    /**
+     * 本地文件大小，单位：B
+     */
+    size?: number;
+}
+
+interface PreviewImageOptions {
+    /**
+     * 当前显示图片的链接，不填则默认为 urls 的第一张
+     */
+    count?: string;
+    /**
+     * 需要预览的图片链接列表
+     */
+    urls?: string | any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetImageInfoOptions {
+    /**
+     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+     */
+    src?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetImageInfoSuccessData) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetImageInfoSuccessData {
+    /**
+     * 图片宽度，单位px
+     */
+    width?: number;
+    /**
+     * 图片高度，单位px
+     */
+    height?: number;
+    /**
+     * 返回图片的本地路径
+     */
+    path?: string;
+    /**
+     * 返回图片的方向
+     */
+    orientation?: string;
+    /**
+     * 返回图片的格式
+     */
+    type?: string;
+}
+
+interface SaveImageToPhotosAlbumOptions {
+    /**
+     * 图片文件路径，可以是临时文件路径也可以是永久文件路径，不支持网络图片路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartRecordOptions {
+    /**
+     * 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'}
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RecorderManager {
+    /**
+     * 开始录音
+     */
+    start(options: RecorderManagerStartOptions): void;
+    /**
+     * 暂停录音
+     */
+    pause(): void;
+    /**
+     * 暂停录音
+     */
+    resume(): void;
+    /**
+     * 停止录音
+     */
+    stop(): void;
+    /**
+     * 录音开始事件
+     */
+    onStart(options: () => void): void;
+    /**
+     * 录音暂停事件
+     */
+    onPause(options: () => void): void;
+    /**
+     * 录音停止事件，会回调文件地址
+     */
+    onStop(options: () => void): void;
+    /**
+     * 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件
+     */
+    onFrameRecorded(options: () => void): void;
+    /**
+     * 录音错误事件, 会回调错误信息
+     */
+    onError(options: () => void): void;
+}
+
+interface RecorderManagerStartOptions {
+    /**
+     * 指定录音的时长，单位 ms ，如果传入了合法的 duration ，在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
+     */
+    duration?: number;
+    /**
+     * 采样率，有效值 8000/16000/44100
+     */
+    sampleRate?: number;
+    /**
+     * 录音通道数，有效值 1/2
+     */
+    numberOfChannels?: number;
+    /**
+     * 编码码率，有效值见下表格
+     */
+    encodeBitRate?: number;
+    /**
+     * 音频格式，有效值 aac/mp3
+     */
+    format?: string;
+    /**
+     * 指定帧大小，单位 KB。传入 frameSize 后，每录制指定帧大小的内容后，会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
+     */
+    frameSize?: number;
+}
+
+interface PlayVoiceOptions {
+    /**
+     * 需要播放的语音文件的文件路径
+     */
+    filePath?: string;
+    /**
+     * original 原图，compressed 压缩图，默认二者都有
+     */
+    duration?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBackgroundAudioPlayerStateOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetBackgroundAudioPlayerStateSuccessData) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBackgroundAudioPlayerStateSuccessData {
+    /**
+     * 选定音频的长度（单位：s），只有在当前有音乐播放时返回
+     */
+    duration?: number;
+    /**
+     * 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回
+     */
+    currentPosition?: number;
+    /**
+     * 播放状态（2：没有音乐在播放，1：播放中，0：暂停中）
+     */
+    status?: number;
+    /**
+     * 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回
+     */
+    downloadPercent?: number;
+    /**
+     * 歌曲数据链接，只有在当前有音乐播放时返回
+     */
+    dataUrl?: string;
+}
+
+interface GetBackgroundAudioOptions {
+    /**
+     * 音乐链接，目前支持的格式有 m4a, aac, mp3, wav
+     */
+    dataUrl?: string;
+    /**
+     * 音乐标题
+     */
+    title?: string;
+    /**
+     * 封面url
+     */
+    coverImgUrl?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SeekBackgroundAudioOptions {
+    /**
+     * 音乐位置，单位：秒
+     */
+    position?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface BackgroundAudioManager {
+    /**
+     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
+     */
+    duration?: number;
+    /**
+     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
+     */
+    currentTime?: number;
+    /**
+     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
+     */
+    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;
+    /**
+     * 音频协议。默认值为 'http'，设置 'hls' 可以支持播放 HLS 协议的直播音频
+     */
+    protocol?: string;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+    /**
+     * 停止
+     */
+    stop(): 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;
+    /**
+     * 背景音频播放错误事件
+     */
+    onNext(callback: () => void): void;
+    /**
+     * 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发
+     */
+    onWaiting(callback: () => void): void;
+}
+
+interface CreateAudioContext {
+    /**
+     * 音频的地址
+     */
+    setSrc(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+}
+
+interface CreateInnerAudioContext {
+    /**
+     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
+     */
+    duration?: number;
+    /**
+     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
+     */
+    currentTime?: number;
+    /**
+     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
+     */
+    paused?: boolean;
+    /**
+     * 音频的数据链接，用于直接播放。
+     */
+    src?: string;
+    /**
+     * 音频开始播放的位置（单位：s）
+     */
+    startTime?: number;
+    /**
+     * 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲
+     */
+    buffered?: number;
+    /**
+     * 是否自动开始播放，默认 false
+     */
+    autoplay?: boolean;
+    /**
+     * 是否循环播放，默认 false
+     */
+    loop?: boolean;
+    /**
+     * 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true
+     */
+    obeyMuteSwitch?: boolean;
+    /**
+     * 音量。范围 0~1。
+     */
+    volume?: number;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 停止
+     */
+    stop(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): 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;
+    /**
+     * 取消监听 onCanplay 事件
+     */
+    offCanplay(callback: () => void): void;
+    /**
+     * 取消监听 onPlay 事件
+     */
+    offPlay(callback: () => void): void;
+    /**
+     * 取消监听 onPause 事件
+     */
+    offPause(callback: () => void): void;
+    /**
+     * 取消监听 onStop 事件
+     */
+    offStop(callback: () => void): void;
+    /**
+     * 取消监听 onEnded 事件
+     */
+    offEnded(callback: () => void): void;
+    /**
+     * 取消监听 onTimeUpdate 事件
+     */
+    offTimeUpdate(callback: () => void): void;
+    /**
+     * 取消监听 onWaiting 事件
+     */
+    offError(callback: () => void): void;
+    /**
+     * 取消监听 onWaiting 事件
+     */
+    offWaiting(callback: () => void): void;
+    /**
+     * 取消监听 onSeeking 事件
+     */
+    offSeeking(callback: () => void): void;
+    /**
+     * 取消监听 onSeeked 事件
+     */
+    offSeeked(callback: () => void): void;
+}
+
+interface ChooseVideoOptions {
+    /**
+     * album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera']
+     */
+    sourceType?: string | any [];
+    /**
+     * 是否压缩所选的视频源文件，默认值为true，需要压缩
+     */
+    compressed?: boolean;
+    /**
+     * 拍摄视频最长拍摄时间，单位秒。最长支持 60 秒
+     */
+    maxDuration?: number;
+    /**
+     * 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明
+     */
+    success?: (result: ChooseVideoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveVideoToPhotosAlbumOptions {
+    /**
+     * 视频文件路径，可以是临时文件路径也可以是永久文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseVideoSuccess {
+    /**
+     * 临时文件路径，下载后的文件会存储到一个临时文件
+     */
+    tempFilePath?: string;
+    /**
+     * 选定视频的时间长度
+     */
+    duration?: number;
+    /**
+     * 选定视频的数据量大小
+     */
+    size?: number;
+    /**
+     * 返回选定视频的长
+     */
+    height?: number;
+    /**
+     * 返回选定视频的宽
+     */
+    width?: number;
+}
+
+interface VideoContext {
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+    /**
+     * 发送弹幕，danmu 包含两个属性 text, color。
+     */
+    sendDanmu(): void;
+    /**
+     * 设置倍速播放，支持的倍率有 0.5/0.8/1.0/1.25/1.5
+     */
+    playbackRate(): void;
+    /**
+     * 进入全屏，可传入{direction}参数（1.7.0起支持），详见video组件文档
+     */
+    requestFullScreen(): void;
+    /**
+     * 退出全屏
+     */
+    exitFullScreen(): void;
+}
+
+interface CameraContext {
+    /**
+     * 拍照，可指定质量，成功则返回图片
+     */
+    takePhoto(options: CameraContextTakePhotoOptions): void;
+    /**
+     * 开始录像
+     */
+    startRecord(options: CameraContextStartRecordOptions): void;
+    /**
+     * 结束录像，成功则返回封面与视频
+     */
+    stopRecord(options: CameraContextStopRecordOptions): void;
+}
+
+interface CameraContextTakePhotoOptions {
+    /**
+     * 成像质量，值为high, normal, low，默认normal
+     */
+    quality?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CameraContextStartRecordOptions {
+    /**
+     * 超过30s或页面onHide时会结束录像，res = { tempThumbPath, tempVideoPath }
+     */
+    timeoutCallback?: () => void;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CameraContextStopRecordOptions {
+    /**
+     * 接口调用成功的回调函数 ，res = { tempThumbPath, tempVideoPath }
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveFileOptions {
+    /**
+     * 需要保存的文件的临时路径
+     */
+    tempFilePath?: string;
+    /**
+     * 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'}
+     */
+    success?: (result: SaveFileSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveFileSuccess {
+    /**
+     * 文件的保存路径
+     */
+    savedFilePath?: string;
+}
+
+interface GetFileInfoOptions {
+    /**
+     * 本地路径
+     */
+    filePath?: string;
+    /**
+     * 计算文件摘要的算法，默认值 md5，有效值：md5，sha1
+     */
+    digestAlgorithm?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetFileInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetFileInfoSuccess {
+    /**
+     * 文件大小，单位：B
+     */
+    size?: number;
+    /**
+     * 按照传入的 digestAlgorithm 计算得出的的文件摘要
+     */
+    digest?: string;
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+}
+
+interface GetSavedFileListOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSavedFileListSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSavedFileListSuccess {
+    /**
+     * 接口调用结果
+     */
+    errMsg?: number;
+    /**
+     * 文件列表
+     */
+    fileList?: string;
+}
+
+interface GetSavedFileInfoOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSavedFileInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSavedFileInfoSuccess {
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+    /**
+     * 文件大小，单位B
+     */
+    size?: number;
+    /**
+     * 文件保存时的时间戳，从1970/01/01 08:00:00 到该时刻的秒数
+     */
+    createTime?: number;
+}
+
+interface RemoveSavedFileOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OpenDocumentOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx
+     */
+    fileType?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 需要存储的内容
+     */
+    data?: object | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageInfoOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetStorageInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageInfoSuccess {
+    /**
+     * 当前storage中所有的key
+     */
+    keys?: string | any [];
+    /**
+     * 当前占用的空间大小, 单位kb
+     */
+    currentSize?: number;
+    /**
+     * 限制的空间大小，单位kb
+     */
+    limitSize?: number;
+}
+
+interface RemoveStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetLocationOptions {
+    /**
+     * 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于uni.openLocation的坐标
+     */
+    type?: string;
+    /**
+     * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
+     */
+    altitude?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetLocationSuccess {
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+    /**
+     * 速度，浮点数，单位m/s
+     */
+    speed?: number;
+    /**
+     * 位置的精确度
+     */
+    accuracy?: string;
+    /**
+     * 高度，单位 m
+     */
+    altitude?: number;
+    /**
+     * 垂直精度，单位 m（Android 无法获取，返回 0）
+     */
+    verticalAccuracy?: number;
+    /**
+     * 水平精度，单位 m
+     */
+    horizontalAccuracy?: number;
+}
+
+interface ChooseLocationOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseLocationSuccess {
+    /**
+     * 位置名称
+     */
+    name?: string;
+    /**
+     * 详细地址
+     */
+    address?: string;
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+}
+
+interface OpenLocationOptions {
+    /**
+     * 纬度，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+    /**
+     * 缩放比例，范围5~18，默认为18
+     */
+    scale?: number;
+    /**
+     * 位置名称
+     */
+    name?: string;
+    /**
+     * 地址的详细说明
+     */
+    address?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContext {
+    /**
+     * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 uni.openLocation
+     */
+    getCenterLocation(options: MapContextGetCenterLocationOptions): void;
+    /**
+     * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
+     */
+    moveToLocation(): void;
+    /**
+     * 平移marker，带动画
+     */
+    translateMarker(options: MapContextTranslateMarkerOptions): void;
+    /**
+     * 缩放视野展示所有经纬度
+     */
+    includePoints(options: MapContextIncludePointsOptions): void;
+    /**
+     * 获取当前地图的视野范围
+     */
+    getRegion(options: MapContextGetRegionOptions): void;
+    /**
+     * 获取当前地图的缩放级别
+     */
+    getScale(options: MapContextGetScaleOptions): void;
+}
+
+interface MapContextGetCenterLocationOptions {
+    /**
+     * 接口调用成功的回调函数 ，res = { longitude: "经度", latitude: "纬度"}
+     */
+    success?: (result: MapContextGetLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContextGetLocationSuccess {
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+}
+
+interface MapContextTranslateMarkerOptions {
+    /**
+     * 指定marker
+     */
+    markerId?: number;
+    /**
+     * 指定marker移动到的目标点
+     */
+    destination?: any;
+    /**
+     * 移动过程中是否自动旋转marker
+     */
+    autoRotate?: boolean;
+    /**
+     * marker的旋转角度
+     */
+    rotate?: number;
+    /**
+     * 动画持续时长，默认值1000ms，平移与旋转分别计算
+     */
+    duration?: number;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 动画结束回调函数
+     */
+    animationEnd?: () => void;
+}
+
+interface MapContextIncludePointsOptions {
+    /**
+     * 要显示在可视区域内的坐标点列表，[{latitude, longitude}]
+     */
+    points?: any [];
+    /**
+     * 坐标点形成的矩形边缘到地图边缘的距离，单位像素。格式为[上,右,下,左]，安卓上只能识别数组第一项，上下左右的padding一致。开发者工具暂不支持padding参数。
+     */
+    padding?: any [];
+}
+
+interface MapContextGetRegionOptions {
+    /**
+     * 接口调用成功的回调函数，res = {southwest, northeast}，西南角与东北角的经纬度
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContextGetScaleOptions {
+    /**
+     * 接口调用成功的回调函数，res = {scale}
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSystemInfoOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSystemInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSystemInfoSuccess {
+    /**
+     * 手机品牌
+     */
+    brand?: string;
+    /**
+     * 手机型号
+     */
+    model?: string;
+    /**
+     * 设备像素比
+     */
+    pixelRatio?: string;
+    /**
+     * 屏幕宽度
+     */
+    screenWidth?: number;
+    /**
+     * 屏幕高度
+     */
+    screenHeight?: number;
+    /**
+     * 可使用窗口宽度
+     */
+    windowWidth?: number;
+    /**
+     * 可使用窗口高度
+     */
+    windowHeight?: number;
+    /**
+     * 状态栏的高度
+     */
+    statusBarHeight?: number;
+    /**
+     * 程序设置的语言
+     */
+    language?: string;
+    /**
+     * 5+版本号
+     */
+    version?: number;
+    /**
+     * 操作系统版本
+     */
+    system?: string;
+    /**
+     * 客户端平台
+     */
+    platform?: string;
+    /**
+     * 用户字体大小设置
+     */
+    fontSizeSetting?: number;
+}
+
+interface GetNetworkTypeOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetNetworkTypeSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetNetworkTypeSuccess {
+    /**
+     * 网络类型
+     */
+    networkType?: string;
+}
+
+interface OnNetworkStatusChangeSuccess {
+    /**
+     * 当前是否有网络连接
+     */
+    isConnected?: number;
+    /**
+     * 网络类型
+     */
+    networkType?: string;
+}
+
+interface OnAccelerometerChangeSuccess {
+    /**
+     * X 轴
+     */
+    x?: number;
+    /**
+     * Y 轴
+     */
+    y?: number;
+    /**
+     * Z 轴
+     */
+    z?: number;
+}
+
+interface StartAccelerometerOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopAccelerometerOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnCompassChangeSuccess {
+    /**
+     * 面对的方向度数
+     */
+    direction?: number;
+}
+
+interface StartCompassOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopCompassOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MakePhoneCallOptions {
+    /**
+     * 需要拨打的电话号码
+     */
+    phoneNumber?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ScanCodeOptions {
+    /**
+     * 是否只能从相机扫码，不允许从相册选择图片
+     */
+    onlyFromCamera?: boolean;
+    /**
+     * 扫码类型，参数类型是数组，二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
+     */
+    scanType?: any [];
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: ScanCodeSuccessRes) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ScanCodeSuccessRes {
+    /**
+     * 所扫码的内容
+     */
+    result?: string;
+    /**
+     * 所扫码的类型
+     */
+    scanType?: string;
+    /**
+     * 所扫码的字符集
+     */
+    charSet?: string;
+    /**
+     * 当所扫的码为当前应用的合法二维码时，会返回此字段，内容为二维码携带的 path。
+     */
+    path?: string;
+}
+
+interface SetClipboardDataOptions {
+    /**
+     * 需要设置的内容
+     */
+    data?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetClipboardDataOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: GetClipboardDataSuccessRes) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetClipboardDataSuccessRes {
+    /**
+     * 剪贴板的内容
+     */
+    data?: string;
+}
+
+interface OpenBluetoothAdapterOptions {
+    /**
+     * 成功则返回成功初始化信息
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CloseBluetoothAdapterOptions {
+    /**
+     * 成功则返回成功关闭模块信息
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothAdapterStateOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBluetoothAdapterStateSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothAdapterStateSuccess {
+    /**
+     * 是否正在搜索设备
+     */
+    discovering?: boolean;
+    /**
+     * 蓝牙适配器是否可用
+     */
+    available?: boolean;
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface OnBluetoothAdapterStateChangeResult {
+    /**
+     * 是否正在搜索设备
+     */
+    discovering?: boolean;
+    /**
+     * 蓝牙适配器是否可用
+     */
+    available?: boolean;
+}
+
+interface OnBluetoothDeviceFoundResult {
+    /**
+     * 设备列表信息
+     */
+    devices?: BluetoothDeviceInfo [];
+}
+
+interface StartBluetoothDevicesDiscoveryOptions {
+    /**
+     * 蓝牙设备主 service 的 uuid 列表
+     */
+    services?: any [];
+    /**
+     * 是否允许重复上报同一设备， 如果允许重复上报，则onDeviceFound 方法会多次上报同一设备，但是 RSSI 值会有不同
+     */
+    allowDuplicatesKey?: boolean;
+    /**
+     * 上报设备的间隔，默认为0，意思是找到新设备立即上报，否则根据传入的间隔上报
+     */
+    interval?: number;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBluetoothDevicesDiscoveryOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBluetoothDevicesDiscoverySuccess {
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBluetoothDevicesOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBluetoothDevicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothDevicesSuccess {
+    /**
+     * uuid 对应的的已连接设备列表
+     */
+    devices?: BluetoothDeviceInfo [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface BluetoothDeviceInfo {
+    /**
+     * 蓝牙设备名称，某些设备可能没有
+     */
+    name?: string;
+    /**
+     * 用于区分设备的 id
+     */
+    deviceId?: string;
+    /**
+     * 当前蓝牙设备的信号强度
+     */
+    RSSI?: number;
+    /**
+     * 当前蓝牙设备的广播数据段中的ManufacturerData数据段 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
+     */
+    advertisData?: any [];
+    /**
+     * 当前蓝牙设备的广播数据段中的ServiceUUIDs数据段
+     */
+    advertisServiceUUIDs?: any [];
+    /**
+     * 当前蓝牙设备的广播数据段中的LocalName数据段
+     */
+    localName?: string;
+    /**
+     * 当前蓝牙设备的广播数据段中的ServiceData数据段
+     */
+    serviceData?: any [];
+}
+
+interface GetConnectedBluetoothDevicesOptions {
+    /**
+     * 蓝牙设备主 service 的 uuid 列表
+     */
+    services?: any [];
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetConnectedBluetoothDevicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetConnectedBluetoothDevicesSuccess {
+    /**
+     * 搜索到的设备列表
+     */
+    devices?: GetConnectedBluetoothDevicesSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetConnectedBluetoothDevicesSuccessData {
+    /**
+     * 蓝牙设备名称，某些设备可能没有
+     */
+    name?: string;
+    /**
+     * 用于区分设备的 id
+     */
+    deviceId?: string;
+}
+
+interface CloseBLEConnectionOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+}
+
+interface CreateBLEConnectionOptions {
+    /**
+     * 蓝牙设备 id，参考 getDevices 接口
+     */
+    deviceId?: string;
+    /**
+     * 超时时间
+     */
+    timeout?: number;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnBLEConnectionStateChangeSuccess {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 连接目前的状态
+     */
+    connected?: boolean;
+}
+
+interface GetBLEDeviceServicesOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBLEDeviceServicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBLEDeviceServicesSuccess {
+    /**
+     * 设备服务列表
+     */
+    services?: GetBLEDeviceServicesSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBLEDeviceServicesSuccessData {
+    /**
+     * 蓝牙设备服务的 uuid
+     */
+    uuid?: string;
+    /**
+     * 该服务是否为主服务
+     */
+    isPrimary?: boolean;
+}
+
+interface GetBLEDeviceCharacteristicsOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙服务 uuid
+     */
+    serviceId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBLEDeviceCharacteristicsSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBLEDeviceCharacteristicsSuccess {
+    /**
+     * 设备特征值列表
+     */
+    characteristics?: GetBLEDeviceCharacteristicsSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBLEDeviceCharacteristicsSuccessData {
+    /**
+     * 蓝牙设备服务的 uuid
+     */
+    uuid?: string;
+    /**
+     * 该特征值支持的操作类型
+     */
+    properties?: any;
+}
+
+interface ReadBLECharacteristicValueOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: ReadBLECharacteristicValueSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ReadBLECharacteristicValueSuccess {
+    /**
+     * 错误码
+     */
+    errCode?: string;
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface WriteBLECharacteristicValueOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 蓝牙设备特征值对应的二进制值
+     */
+    value?: any [];
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NotifyBLECharacteristicValueChangeOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * true: 启用 notify; false: 停用 notify
+     */
+    state?: boolean;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnBLECharacteristicValueChangeSuccess {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 特征值最新的值 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
+     */
+    value?: any [];
+}
+
+interface StartBeaconDiscoveryOptions {
+    /**
+     * iBeacon设备广播的 uuids
+     */
+    uuids?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBeaconDiscoveryOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBeaconsOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetBeaconsRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBeaconsRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    beacons?: Beacon [];
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+}
+
+interface Beacon {
+    /**
+     * iBeacon 设备广播的 uuid
+     */
+    uuid?: string;
+    /**
+     * iBeacon 设备的主 id
+     */
+    major?: string;
+    /**
+     * iBeacon 设备的次 id
+     */
+    minor?: string;
+    /**
+     * 表示设备距离的枚举值
+     */
+    proximity?: number;
+    /**
+     * iBeacon 设备的距离
+     */
+    accuracy?: number;
+    /**
+     * 表示设备的信号强度
+     */
+    rssi?: number;
+}
+
+interface BeaconService {
+    /**
+     * 服务目前是否可用
+     */
+    available?: boolean;
+    /**
+     * 目前是否处于搜索状态
+     */
+    discovering?: boolean;
+}
+
+interface GetHCEStateOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartHCEOptions {
+    /**
+     * 需要注册到系统的 AID 列表，每个 AID 为 String 类型
+     */
+    aid_list?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopHCEOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HCEMessageRes {
+    /**
+     * 消息类型
+     */
+    messageType?: number;
+    /**
+     * 客户端接收到 NFC 设备的指令
+     */
+    data?: any [];
+    /**
+     * 此参数当且仅当 messageType=2 时有效
+     */
+    reason?: number;
+}
+
+interface SendHCEMessageOptions {
+    /**
+     * 二进制数据
+     */
+    data?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ConnectWifiOptions {
+    /**
+     * Wi-Fi 设备ssid
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 设备bssid
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 设备密码
+     */
+    password?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWifiListOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface WiFi {
+    /**
+     * Wi-Fi 的SSID
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 的BSSID
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 是否安全
+     */
+    secure?: boolean;
+    /**
+     * Wi-Fi 信号强度
+     */
+    signalStrength?: number;
+}
+
+interface SetWifiListOptions {
+    /**
+     * Wi-Fi 的SSID
+     */
+    wifiList?: WiFiItem [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface WiFiItem {
+    /**
+     * Wi-Fi 的SSID
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 的BSSID
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 设备密码
+     */
+    password?: string;
+}
+
+interface GetConnectedWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetConnectedWifiRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetConnectedWifiRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    wifi?: WiFi;
+}
+
+interface ShowToastOptions {
+    /**
+     * 提示的内容
+     */
+    title?: string;
+    /**
+     * 图标
+     * - success: 显示成功图标
+     * - loading: 显示加载图标
+     * - none: 不显示图标
+     */
+    icon?: 'success' | 'loading' | 'none';
+    /**
+     * 自定义图标的本地路径，image 的优先级高于 icon
+     */
+    image?: string;
+    /**
+     * 提示的延迟时间，单位毫秒，默认：1500
+     */
+    duration?: number;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowLoadingOptions {
+    /**
+     * 提示的内容
+     */
+    title?: string;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowModalOptions {
+    /**
+     * 提示的标题
+     */
+    title?: string;
+    /**
+     * 提示的内容
+     */
+    content?: string;
+    /**
+     * 是否显示取消按钮，默认为 true
+     */
+    showCancel?: boolean;
+    /**
+     * 取消按钮的文字，默认为"取消"
+     */
+    cancelText?: string;
+    /**
+     * 取消按钮的文字颜色，默认为"#000000"
+     */
+    cancelColor?: string;
+    /**
+     * 确定按钮的文字，默认为"确定"
+     */
+    confirmText?: string;
+    /**
+     * 确定按钮的文字颜色，默认为"#3CC51F"
+     */
+    confirmColor?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ShowModalRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowModalRes {
+    /**
+     * 为 true 时，表示用户点击了确定按钮
+     */
+    confirm?: boolean;
+    /**
+     * 为 true 时，表示用户点击了取消
+     */
+    cancel?: boolean;
+}
+
+interface ShowActionSheetOptions {
+    /**
+     * 按钮的文字数组
+     */
+    itemList?: any [];
+    /**
+     * 按钮的文字颜色，默认为"#000000"
+     */
+    itemColor?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ShowActionSheetRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowActionSheetRes {
+    /**
+     * 用户点击的按钮，从上到下的顺序，从0开始
+     */
+    tapIndex?: number;
+}
+
+interface SetNavigationBarTitleOptions {
+    /**
+     * 页面标题
+     */
+    title?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetNavigationbarColorOptions {
+    /**
+     * 前景颜色值，包括按钮、标题、状态栏的颜色
+     */
+    frontColor?: string;
+    /**
+     * 背景颜色值，有效值为十六进制颜色
+     */
+    backgroundColor?: string;
+    /**
+     * 动画效果
+     */
+    animation?: NavigationBarAnimation;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 显示的文本，不超过 3 个半角字符
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RemoveTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigationBarAnimation {
+    /**
+     * 动画变化时间，默认0，单位：毫秒
+     */
+    duration?: number;
+    /**
+     * 动画变化方式，默认 linear
+     * - linear: 动画从头到尾的速度是相同的
+     * - easeIn: 动画以低速开始
+     * - easeOut: 动画以低速结束
+     * - easeInOut: 动画以低速开始和结束
+     */
+    timingFunc?: 'linear' | 'easeIn' | 'easeOut' | 'easeInOut';
+}
+
+interface WindowResizeResult {
+    /**
+     * 变化后的窗口宽度，单位 px
+     */
+    windowWidth?: number;
+    /**
+     * 变化后的窗口高度，单位 px
+     */
+    windowHeight?: number;
+}
+
+interface SetTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 显示的文本
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RemoveTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarStyleOptions {
+    /**
+     * tab 上的文字默认颜色
+     */
+    color?: string;
+    /**
+     * tab 上的文字选中时的颜色
+     */
+    selectedColor?: string;
+    /**
+     * tab 的背景色
+     */
+    backgroundColor?: string;
+    /**
+     * tabbar上边框的颜色
+     */
+    borderStyle?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarItemOptions {
+    /**
+     * tabBar 的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * tab 上按钮文字
+     */
+    text?: string;
+    /**
+     * 图片路径
+     */
+    iconPath?: string;
+    /**
+     * 选中时的图片路径
+     */
+    selectedIconPath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarOptions {
+    /**
+     * 是否需要动画效果
+     */
+    animation?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarOptions {
+    /**
+     * 是否需要动画效果
+     */
+    animation?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTopBarTextOptions {
+    /**
+     * 置顶栏文字内容
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigateToOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 窗口显示的动画类型
+     * - auto: 自动选择动画效果
+     * - none: 无动画效果
+     * - slide-in-right: 从右侧横向滑动效果
+     * - slide-in-left: 左侧横向滑动效果
+     * - slide-in-top: 从上侧竖向滑动效果
+     * - slide-in-bottom: 从下侧竖向滑动效果
+     * - fade-in: 从透明到不透明逐渐显示效果
+     * - zoom-out: 从小到大逐渐放大显示效果
+     * - zoom-fade-out: 从小到大逐渐放大并且从透明到不透明逐渐显示效果
+     * - pop-in: 从右侧平移入栈动画效果
+     */
+    animationType?: 'auto' | 'none' | 'slide-in-right' | 'slide-in-left' | 'slide-in-top' | 'slide-in-bottom' | 'fade-in' | 'zoom-out' | 'zoom-fade-out' | 'pop-in';
+    /**
+     * 窗口显示动画的持续时间，单位为 ms
+     */
+    animationDuration?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RedirectToOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ReLaunchOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SwitchTabOptions {
+    /**
+     * 需要跳转的 tabBar 页面的路径，路径后不能带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CreateIntersectionObserverOptions {
+    /**
+     * 所有阈值
+     */
+    thresholds?: any [];
+    /**
+     * 初始的相交比例
+     */
+    initialRatio?: number;
+    /**
+     * 是否同时观测多个参照节点（而非一个）
+     */
+    selectAll?: boolean;
+}
+
+interface NavigateBackOptions {
+    /**
+     * 返回的页面数，如果 delta 大于现有页面数，则返回到首页
+     */
+    delta?: number;
+    /**
+     * 窗口关闭的动画类型
+     * - auto: 自动选择动画效果
+     * - none: 无动画效果
+     * - slide-out-right: 横向向右侧滑出屏幕动画
+     * - slide-out-left: 横向向左侧滑出屏幕动画
+     * - slide-out-top: 竖向向上侧滑出屏幕动画
+     * - slide-out-bottom: 竖向向下侧滑出屏幕动画
+     * - fade-out: 从不透明到透明逐渐隐藏动画
+     * - zoom-in: 从大逐渐缩小关闭动画
+     * - zoom-fade-in: 从大逐渐缩小并且从不透明到透明逐渐隐藏关闭动画
+     * - pop-out: 从右侧平移出栈动画效果
+     */
+    animationType?: 'auto' | 'none' | 'slide-out-right' | 'slide-out-left' | 'slide-out-top' | 'slide-out-bottom' | 'fade-out' | 'zoom-in' | 'zoom-fade-in' | 'pop-out';
+    /**
+     * 窗口关闭动画的持续时间，单位为 ms
+     */
+    animationDuration?: number;
+}
+
+interface CreateAnimationOptions {
+    /**
+     * 动画持续时间，单位ms
+     */
+    duration?: number;
+    /**
+     * 定义动画的效果
+     * - linear: 动画从头到尾的速度是相同的
+     * - ease: 动画以低速开始，然后加快，在结束前变慢
+     * - ease-in: 动画以低速开始
+     * - ease-in-out: 动画以低速开始和结束
+     * - ease-out: 动画以低速结束
+     * - step-start: 动画第一帧就跳至结束状态直到结束
+     * - step-end: 动画一直保持开始状态，最后一帧跳到结束状态
+     */
+    timingFunction?: 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
+    /**
+     * 动画延迟时间，单位 ms
+     */
+    delay?: number;
+    /**
+     * 设置transform-origin
+     */
+    transformOrigin?: string;
+}
+
+interface PageScrollToOptions {
+    /**
+     * 滚动到页面的目标位置
+     */
+    scrollTop?: number;
+    /**
+     * 滚动动画的时长
+     */
+    duration?: number;
+}
+
+interface StartPullDownRefreshOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SelectorQuery {
+    /**
+     * 将选择器的选取范围更改为自定义组件component内
+     */
+    in(component: any): void;
+    /**
+     * 在当前页面下选择第一个匹配选择器selector的节点
+     */
+    select(selector: string): NodesRef;
+    /**
+     * 在当前页面下选择匹配选择器selector的所有节点
+     */
+    selectAll(selector: string): NodesRef;
+    /**
+     * 选择显示区域
+     */
+    selectViewport(selector: string): NodesRef;
+    /**
+     * 执行所有的请求
+     */
+    exec(callback: () => void): void;
+}
+
+interface NodesRef {
+    /**
+     * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位
+     */
+    boundingClientRect(callback: (result: NodeRect) => void): void;
+    /**
+     * 添加节点的滚动位置查询请求，以像素为单位
+     */
+    scrollOffset(callback: (result: NodeRect) => void): SelectorQuery;
+    /**
+     * 获取节点的相关信息，需要获取的字段在fields中指定
+     */
+    fields(fields: NodeField, callback: (result: NodeRect) => void): SelectorQuery;
+}
+
+interface NodeRect {
+    /**
+     * 节点的ID
+     */
+    id?: string;
+    /**
+     * 节点的dataset
+     */
+    dataset?: any;
+    /**
+     * 节点的左边界坐标
+     */
+    left?: number;
+    /**
+     * 节点的右边界坐标
+     */
+    right?: number;
+    /**
+     * 节点的上边界坐标
+     */
+    top?: number;
+    /**
+     * 节点的下边界坐标
+     */
+    bottom?: number;
+    /**
+     * 节点的宽度
+     */
+    width?: number;
+    /**
+     * 节点的高度
+     */
+    height?: number;
+}
+
+interface NodeField {
+    /**
+     * 节点的dataset
+     */
+    dataset?: any;
+    /**
+     * 节点的宽度
+     */
+    width?: number;
+    /**
+     * 节点的高度
+     */
+    height?: number;
+    /**
+     * 节点的水平滚动位置
+     */
+    scrollLeft?: number;
+    /**
+     * 节点的竖直滚动位置
+     */
+    scrollTop?: number;
+    /**
+     * 节点 scroll-x 属性的当前值
+     */
+    scrollX?: number;
+    /**
+     * 节点 scroll-y 属性的当前值
+     */
+    scrollY?: number;
+}
+
+interface IntersectionObserver {
+    /**
+     * 使用选择器指定一个节点，作为参照区域之一
+     */
+    relativeTo(selector: string, margins: any []): void;
+    /**
+     * 指定页面显示区域作为参照区域之一
+     */
+    relativeToViewport(margins: any []): void;
+    /**
+     * 指定目标节点并开始监听相交状态变化情况
+     */
+    observe(targetSelector: string, callback: (result: ObserveResult) => void): void;
+    /**
+     * 停止监听
+     */
+    disconnect(): void;
+}
+
+interface ObserveResult {
+    /**
+     * 相交比例
+     */
+    intersectionRatio?: number;
+    /**
+     * 相交区域的边界
+     */
+    intersectionRect?: any;
+    /**
+     * 目标节点布局区域的边界
+     */
+    boundingClientRect?: ObserveNodeRect;
+    /**
+     * 参照区域的边界
+     */
+    relativeRect?: ObserveNodeRect;
+    /**
+     * 相交检测时的时间戳
+     */
+    time?: number;
+}
+
+interface ObserveNodeRect {
+    /**
+     * left
+     */
+    left?: number;
+    /**
+     * right
+     */
+    right?: number;
+    /**
+     * top
+     */
+    top?: number;
+    /**
+     * bottom
+     */
+    bottom?: number;
+}
+
+interface Animation {
+    /**
+     * 透明度
+     */
+    opacity(value: number): void;
+    /**
+     * 颜色值
+     */
+    backgroundColor(color: number): void;
+    /**
+     * 长度值
+     */
+    width(length: number): void;
+    /**
+     * 长度值
+     */
+    height(length: number): void;
+    /**
+     * 长度值
+     */
+    top(length: number): void;
+    /**
+     * 长度值
+     */
+    left(length: number): void;
+    /**
+     * 长度值
+     */
+    bottom(length: number): void;
+    /**
+     * 长度值
+     */
+    right(length: number): void;
+    /**
+     * 从原点顺时针旋转一个deg角度
+     */
+    rotate(deg: number): void;
+    /**
+     * 在X轴旋转一个deg角度
+     */
+    rotateX(deg: number): void;
+    /**
+     * 在Y轴旋转一个deg角度
+     */
+    rotateY(deg: number): void;
+    /**
+     * 在Z轴旋转一个deg角度
+     */
+    rotateZ(deg: number): void;
+    /**
+     * 同transform-function rotate3d
+     */
+    rotate3d(x: number, y: number, z: number, deg: number): void;
+    /**
+     * 缩放
+     */
+    scale(sx: number, sy: number): void;
+    /**
+     * 在X轴缩放sx倍数
+     */
+    scaleX(sx: number): void;
+    /**
+     * 在Y轴缩放sy倍数
+     */
+    scaleY(sy: number): void;
+    /**
+     * 在Z轴缩放sz倍数
+     */
+    scaleZ(sz: number): void;
+    /**
+     * 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数
+     */
+    scale3d(sx: number, sy: number, sz: number): void;
+    /**
+     * 偏移
+     */
+    translate(tx: number, ty: number): void;
+    /**
+     * 在X轴偏移tx
+     */
+    translateX(tx: number): void;
+    /**
+     * 在Y轴偏移ty
+     */
+    translateY(ty: number): void;
+    /**
+     * 在Z轴偏移tx
+     */
+    translateZ(tz: number): void;
+    /**
+     * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz
+     */
+    translate3d(tx: number, ty: number, tz: number): void;
+    /**
+     * 倾斜
+     */
+    skew(ax: number, ay: number): void;
+    /**
+     * Y轴坐标不变，X轴坐标延顺时针倾斜ax度
+     */
+    skewX(ax: number): void;
+    /**
+     * X轴坐标不变，Y轴坐标延顺时针倾斜ay度
+     */
+    skewY(ay: number): void;
+    /**
+     * 矩阵变形
+     */
+    matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): void;
+    /**
+     * 矩阵变形
+     */
+    matrix3d(): void;
+}
+
+interface CanvasContext {
+    /**
+     * 填充色
+     */
+    fillStyle?: string;
+    /**
+     * 边框颜色
+     */
+    strokeStyle?: string;
+    /**
+     * 阴影的模糊级别
+     */
+    shadowBlur?: number;
+    /**
+     * 阴影的颜色
+     */
+    shadowColor?: string;
+    /**
+     * 阴影相对于形状在水平方向的偏移
+     */
+    shadowOffsetX?: number;
+    /**
+     * 阴影相对于形状在竖直方向的偏移
+     */
+    shadowOffsetY?: number;
+    /**
+     * 线条的宽度
+     */
+    lineWidth?: number;
+    /**
+     * 线条的端点样式
+     * - butt: 
+     * - round: 
+     * - square: 
+     */
+    lineCap?: 'butt' | 'round' | 'square';
+    /**
+     * 线条的结束交点样式
+     * - bevel: 
+     * - round: 
+     * - miter: 
+     */
+    lineJoin?: 'bevel' | 'round' | 'miter';
+    /**
+     * 最大斜接长度
+     */
+    miterLimit?: number;
+    /**
+     * 透明度
+     */
+    globalAlpha?: number;
+    /**
+     * 设置要在绘制新形状时应用的合成操作的类型
+     */
+    globalCompositeOperation?: string;
+    /**
+     * 偏移量
+     */
+    lineDashOffset?: number;
+    /**
+     * 字体样式
+     */
+    font?: string;
+    /**
+     * 设置填充色
+     */
+    setFillStyle(color: string): void;
+    /**
+     * 设置边框颜色
+     */
+    setStrokeStyle(color: string): void;
+    /**
+     * 设置阴影样式
+     */
+    setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
+    /**
+     * 创建一个线性的渐变颜色
+     */
+    createLinearGradient(x0: number, y0: number, x1: number, y1: string): CanvasContext;
+    /**
+     * 创建一个圆形的渐变颜色
+     */
+    createCircularGradient(x: number, y: number, r: number): CanvasContext;
+    /**
+     * 创建一个颜色的渐变点
+     */
+    addColorStop(stop: number, color: string): void;
+    /**
+     * 设置线条的宽度
+     */
+    setLineWidth(lineWidth: number): void;
+    /**
+     * 设置线条的端点样式
+     */
+    setLineCap(lineCap: string): void;
+    /**
+     * 设置线条的交点样式
+     */
+    setLineJoin(lineJoin: string): void;
+    /**
+     * 设置线条的宽度
+     */
+    setLineDash(pattern: any [], offset: number): void;
+    /**
+     * 设置最大斜接长度
+     */
+    setMiterLimit(miterLimit: number): void;
+    /**
+     * 创建一个矩形
+     */
+    rect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 填充一个矩形
+     */
+    fillRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 画一个矩形(非填充)
+     */
+    strokeRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 清除画布上在该矩形区域内的内容
+     */
+    clearRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 对当前路径中的内容进行填充
+     */
+    fill(): void;
+    /**
+     * 画出当前路径的边框
+     */
+    stroke(): void;
+    /**
+     * 开始创建一个路径
+     */
+    beginPath(): void;
+    /**
+     * 关闭一个路径
+     */
+    closePath(): void;
+    /**
+     * 把路径移动到画布中的指定点，不创建线条
+     */
+    moveTo(x: number, y: number): void;
+    /**
+     * 增加一个新点，然后创建一条从上次指定点到目标点的线
+     */
+    lineTo(x: number, y: number): void;
+    /**
+     * 画一条弧线
+     */
+    arc(x: number, y: number, r: number, sAngle: number, eAngle: number, counterclockwise: boolean): void;
+    /**
+     * 创建三次方贝塞尔曲线路径
+     */
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    /**
+     * 创建二次贝塞尔曲线路径
+     */
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    /**
+     * 横纵坐标缩放
+     */
+    scale(scaleWidth: number, scaleHeight: number): void;
+    /**
+     * 顺时针旋转当前坐标轴
+     */
+    rotate(rotate: number): void;
+    /**
+     * 对当前坐标系的原点(0, 0)进行变换
+     */
+    translate(x: number, y: number): void;
+    /**
+     * 从原始画布中剪切任意形状和尺寸
+     */
+    clip(): void;
+    /**
+     * 设置字体的字号
+     */
+    setFontSize(fontSize: number): void;
+    /**
+     * 在画布上绘制被填充的文本
+     */
+    fillText(text: string, x: number, y: number, maxWidth: number): void;
+    /**
+     * 设置文字的对齐
+     */
+    setTextAlign(align: string): void;
+    /**
+     * 设置文字的水平对齐
+     */
+    setTextBaseline(textBaseline: string): void;
+    /**
+     * 绘制图像到画布
+     */
+    drawImage(imageResource: string, dx: number, dy: number, dWidth: number, dHeigt: number, sx: number, sy: number, sWidth: number, sHeight: number): void;
+    /**
+     * 设置全局画笔透明度
+     */
+    setGlobalAlpha(alpha: number): void;
+    /**
+     * 保存当前的绘图上下文
+     */
+    save(): void;
+    /**
+     * 恢复之前保存的绘图上下文
+     */
+    restore(): void;
+    /**
+     * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中
+     */
+    draw(reserve: boolean, callback: () => void): void;
+    /**
+     * 测量文本尺寸信息，目前仅返回文本宽度
+     */
+    measureText(text: string): CanvasTextMetrics;
+    /**
+     * 根据控制点和半径绘制圆弧路径
+     */
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    /**
+     * 给定的 (x, y) 位置绘制文本描边的方法
+     */
+    strokeText(text: string, x: number, y: number, maxWidth: number): void;
+    /**
+     * 对指定的图像创建模式的方法，可在指定的方向上重复元图像
+     */
+    createPattern(image: string, repetition: string): void;
+    /**
+     * 使用矩阵重新设置（覆盖）当前变换的方法
+     */
+    setTransform(scaleX: number, skewX: number, skewY: number, scaleY: number, translateX: number, translateY: number): void;
+}
+
+interface CanvasTextMetrics {
+    /**
+     * 文本的宽度
+     */
+    width?: number;
+}
+
+interface CanvasToTempFilePathOptions {
+    /**
+     * 画布x轴起点（默认0）
+     */
+    x?: number;
+    /**
+     * 画布y轴起点（默认0）
+     */
+    y?: number;
+    /**
+     * 画布宽度（默认为canvas宽度-x）
+     */
+    width?: number;
+    /**
+     * 画布高度（默认为canvas高度-y）
+     */
+    height?: number;
+    /**
+     * 输出图片宽度（默认为 width * 屏幕像素密度）
+     */
+    destWidth?: boolean;
+    /**
+     * 输出图片高度（默认为 height * 屏幕像素密度）
+     */
+    destHeight?: () => void;
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 目标文件的类型，默认为 'png'
+     */
+    fileType?: string;
+    /**
+     * 图片的质量，取值范围为 (0, 1]，不在范围内时当作1.0处理
+     */
+    quality?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CanvasToTempFilePathRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CanvasToTempFilePathRes {
+    /**
+     * 导出生成的图片路径
+     */
+    tempFilePath?: string;
+}
+
+interface CanvasGetImageDataOptions {
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 将要被提取的图像数据矩形区域的左上角 x 坐标
+     */
+    x?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的左上角 y 坐标
+     */
+    y?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的宽度
+     */
+    width?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的高度
+     */
+    height?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CanvasGetImageDataRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CanvasGetImageDataRes {
+    /**
+     * 回调信息
+     */
+    errMsg?: string;
+    /**
+     * 图像数据矩形的宽度
+     */
+    width?: number;
+    /**
+     * 图像数据矩形的高度
+     */
+    height?: number;
+    /**
+     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
+     */
+    data?: any [];
+}
+
+interface CanvasPutImageDataOptions {
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
+     */
+    data?: any [];
+    /**
+     * 源图像数据在目标画布中的位置偏移量（x 轴方向的偏移量）
+     */
+    x?: number;
+    /**
+     * 源图像数据在目标画布中的位置偏移量（y 轴方向的偏移量）
+     */
+    y?: number;
+    /**
+     * 源图像数据矩形区域的宽度
+     */
+    width?: number;
+    /**
+     * 源图像数据矩形区域的高度
+     */
+    height?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetScreenBrightnessOptions {
+    /**
+     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮
+     */
+    value?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetScreenBrightnessOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetScreenBrightnessSuccessRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetScreenBrightnessSuccessRes {
+    /**
+     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮。
+     */
+    value?: number;
+}
+
+interface SetKeepScreenOnOptions {
+    /**
+     * 是否保持屏幕常亮
+     */
+    keepScreenOn?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface VibrateLongOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface VibrateShortOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AddPhoneContactOptions {
+    /**
+     * 头像本地文件路径
+     */
+    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;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetExtConfigOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetExtConfigRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetExtConfigRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 第三方平台自定义的数据
+     */
+    extConfig?: any;
+}
+
+interface GetExtConfigSyncRes {
+    /**
+     * 第三方平台自定义的数据
+     */
+    extConfig?: any;
+}
+
+interface GetProviderOptions {
+    /**
+     * 服务类型，可取值“oauth”、“share”、“payment”、“push”
+     * - oauth: 授权登录
+     * - share: 分享
+     * - payment: 支付
+     * - push: 推送
+     */
+    service?: 'oauth' | 'share' | 'payment' | 'push';
+    /**
+     * 接口调用成功的回调
+     */
+    success?: (result: GetProviderRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetProviderRes {
+    /**
+     * 服务类型
+     */
+    service?: string;
+    /**
+     * 得到的服务供应商
+     */
+    provider?: any [];
+}
+
+interface LoginOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
+     */
+    provider?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: LoginRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface LoginRes {
+    /**
+     * 描述信息
+     */
+    errMsg?: string;
+    /**
+     * 登录服务商提供的登录信息，服务商不同返回的结果不完全相同
+     */
+    authResult?: string;
+}
+
+interface CheckSessionOptions {
+    /**
+     * 接口调用成功的回调函数，session_key未过期
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数，session_key已过期
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AuthorizeOptions {
+    /**
+     * 需要获取权限的scope
+     */
+    scope?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetUserInfoOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 是否带上登录态信息，仅微信小程序生效。
+     */
+    withCredentials?: boolean;
+    /**
+     * 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。默认为en，仅微信小程序生效。
+     */
+    lang?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetUserInfoRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetUserInfoRes {
+    /**
+     * 用户信息对象，不包含 openid 等敏感信息
+     */
+    userInfo?: UserInfo;
+    /**
+     * 不包括敏感信息的原始数据字符串，用于计算签名。
+     */
+    rawData?: string;
+    /**
+     * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，仅微信小程序生效。
+     */
+    signature?: string;
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法，仅微信小程序生效。
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量，详细见加密数据解密算法，仅微信小程序生效。
+     */
+    iv?: string;
+    /**
+     * 描述信息
+     */
+    errMsg?: string;
+}
+
+interface UserInfo {
+    /**
+     * 用户昵称
+     */
+    nickname?: string;
+    /**
+     * 该服务商唯一用户标识
+     */
+    openid?: string;
+    /**
+     * 用户头像
+     */
+    avatarUrl?: string;
+}
+
+interface ShareOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
+     */
+    provider?: string;
+    /**
+     * 分享类型。默认图文0，纯文字1，纯图片2，音乐3，视频4，小程序5。
+     * - 0: 图文
+     * - 1: 纯文字
+     * - 2: 纯图片
+     * - 3: 音乐
+     * - 4: 视频
+     * - 5: 小程序
+     */
+    type?: '0' | '1' | '2' | '3' | '4' | '5';
+    /**
+     * 标题
+     */
+    title?: string;
+    /**
+     * 场景。可取值“WXSceneSession”分享到聊天界面，“WXSenceTimeline”分享到朋友圈，“WXSceneFavorite”分享到微信收藏
+     */
+    scene?: string;
+    /**
+     * 摘要
+     */
+    summary?: string;
+    /**
+     * 跳转链接
+     */
+    href?: string;
+    /**
+     * 图片地址
+     */
+    imageUrl?: string;
+    /**
+     * 音视频地址
+     */
+    mediaUrl?: string;
+    /**
+     * 分享小程序
+     */
+    miniProgram?: MiniProgramShareOptions;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MiniProgramShareOptions {
+    /**
+     * 微信小程序原始id
+     */
+    id?: string;
+    /**
+     * 点击链接进入的页面
+     */
+    path?: string;
+    /**
+     * 微信小程序版本类型，默认为0。
+     * - 0: 正式版
+     * - 1: 测试版
+     * - 2: 体验版
+     */
+    type?: '0' | '1' | '2';
+    /**
+     * 兼容低版本的网页链接
+     */
+    webUrl?: string;
+}
+
+interface SubscribePushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UnscribePushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnPushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接收到透传数据回调，回调参数（Object）：messageId（消息id）、data（消息内容）
+     */
+    callback?: () => void;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OffPushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowShareMenuOptions {
+    /**
+     * 是否使用带 shareTicket 的转发
+     */
+    withShareTicket?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideShareMenuOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UpdateShareMenuOptions {
+    /**
+     * 是否使用带 shareTicket 的转发
+     */
+    withShareTicket?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetShareInfoOptions {
+    /**
+     * shareTicket
+     */
+    shareTicket?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetShareInfoRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetShareInfoRes {
+    /**
+     * 错误信息
+     */
+    errMsg?: string;
+    /**
+     * 包括敏感数据在内的完整转发信息的加密数据
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量
+     */
+    iv?: string;
+}
+
+interface ChooseAddressOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseAddressRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseAddressRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 收货人姓名
+     */
+    userName?: string;
+    /**
+     * 邮编
+     */
+    postalCode?: string;
+    /**
+     * 国标收货地址第一级地址
+     */
+    provinceName?: string;
+    /**
+     * 国标收货地址第二级地址
+     */
+    cityName?: string;
+    /**
+     * 国标收货地址第三级地址
+     */
+    countyName?: string;
+    /**
+     * 详细收货地址信息
+     */
+    detailInfo?: string;
+    /**
+     * 收货地址国家码
+     */
+    nationalCode?: string;
+    /**
+     * 收货人手机号码
+     */
+    telNumber?: string;
+}
+
+interface AddCardOptions {
+    /**
+     * 需要添加的卡券列表
+     */
+    cardList?: AddCardData [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: AddCardRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AddCardData {
+    /**
+     * 卡券 id
+     */
+    cardId?: string;
+    /**
+     * 卡券的扩展参数
+     */
+    cardExt?: string;
+}
+
+interface AddCardRes {
+    /**
+     * 卡券 id
+     */
+    cardList?: CardData [];
+}
+
+interface CardData {
+    /**
+     * 加密 code，为用户领取到卡券的code加密后的字符串
+     */
+    code?: string;
+    /**
+     * 用户领取到卡券的id
+     */
+    cardId?: string;
+    /**
+     * 用户领取到卡券的扩展参数，与调用时传入的参数相同
+     */
+    cardExt?: string;
+    /**
+     * 是否成功
+     */
+    isSuccess?: boolean;
+}
+
+interface OpenCardOptions {
+    /**
+     * 需要打开的卡券列表
+     */
+    cardList?: OpenCardData [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OpenCardData {
+    /**
+     * 需要打开的卡券 Id
+     */
+    cardId?: string;
+    /**
+     * 由 addCard 的返回对象中的加密 code 通过解密后得到
+     */
+    code?: string;
+}
+
+interface OpenSettingOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSettingOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWeRunDataOptions {
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetWeRunDataRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWeRunDataRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量
+     */
+    iv?: string;
+}
+
+interface NavigateToMiniProgramOptions {
+    /**
+     * 要打开的uni-app appId
+     */
+    appId?: string;
+    /**
+     * 打开的页面路径，如果为空则打开首页
+     */
+    path?: string;
+    /**
+     * 需要传递给目标uni-app的数据
+     */
+    extraData?: any;
+    /**
+     * 要打开的uni-app版本
+     */
+    envVersion?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigateBackMiniProgramOptions {
+    /**
+     * 需要返回给上一个uni-app的数据
+     */
+    extraData?: any;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseInvoiceTitleOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseInvoiceTitleRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseInvoiceTitleRes {
+    /**
+     * 抬头类型（0：单位，1：个人）
+     */
+    type?: string;
+    /**
+     * 抬头名称
+     */
+    title?: string;
+    /**
+     * 抬头税号
+     */
+    taxNumber?: string;
+    /**
+     * 单位地址
+     */
+    companyAddress?: string;
+    /**
+     * 手机号码
+     */
+    telephone?: string;
+    /**
+     * 银行名称
+     */
+    bankName?: string;
+    /**
+     * 银行账号
+     */
+    bankAccount?: string;
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface CheckIsSupportSoterAuthenticationOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CheckIsSupportSoterAuthenticationRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CheckIsSupportSoterAuthenticationRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    supportMode?: any [];
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface StartSoterAuthenticationOptions {
+    /**
+     * 请求使用的可接受的生物认证方式
+     */
+    requestAuthModes?: any [];
+    /**
+     * 挑战因子
+     */
+    challenge?: string;
+    /**
+     * 验证描述，即识别过程中显示在界面上的对话框提示内容
+     */
+    authContent?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: StartSoterAuthenticationRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartSoterAuthenticationRes {
+    /**
+     * 错误码
+     */
+    errCode?: number;
+    /**
+     * 生物认证方式
+     */
+    authMode?: string;
+    /**
+     * 在设备安全区域（TEE）内获得的本机安全信息以及本次认证信息
+     */
+    resultJSON?: string;
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface CheckIsSoterEnrolledInDeviceOptions {
+    /**
+     * 认证方式
+     * - fingerPrint: 指纹识别
+     * - facial: 人脸识别（暂未支持）
+     * - speech: 声纹识别（暂未支持）
+     */
+    checkAuthMode?: 'fingerPrint' | 'facial' | 'speech';
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UpdateManager {
+    /**
+     * 当向应用后台请求完新版本信息，会进行回调
+     */
+    onCheckForUpdate(callback: () => void): void;
+    /**
+     * 当新版本下载完成，会进行回调
+     */
+    onUpdateReady(callback: () => void): void;
+    /**
+     * 当新版本下载失败，会进行回调
+     */
+    onUpdateFailed(callback: () => void): void;
+    /**
+     * 当新版本下载完成，调用该方法会强制当前uni-app应用上新版本并重启
+     */
+    applyUpdate(): void;
+}
+
+interface Worker {
+    /**
+     * 向 Worker 线程发送的消息。
+     */
+    postMessage(message: any): void;
+    /**
+     * 监听 Worker 线程向当前线程发送的消息
+     */
+    onMessage(callback: () => void): void;
+    /**
+     * 结束当前 Worker 线程，仅限在主线程 Worker 实例上调用。
+     */
+    terminate(): void;
+}
+
+interface SetEnableDebugOptions {
+    /**
+     * 是否打开调试
+     */
+    enableDebug?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetBackgroundColorOptions {
+    /**
+     * 窗口的背景色，必须为十六进制颜色值
+     */
+    backgroundColor?: string;
+    /**
+     * 顶部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
+     */
+    backgroundColorTop?: string;
+    /**
+     * 底部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
+     */
+    backgroundColorBottom?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetBackgroundTextStyleOptions {
+    /**
+     * 下拉背景字体、loading 图的样式，值为：dark、light
+     */
+    textStyle?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnGyroscopeChangeSuccess {
+    /**
+     * x 轴方向角速度
+     */
+    x?: number;
+    /**
+     * y 轴方向角速度
+     */
+    y?: number;
+    /**
+     * z 轴方向角速度
+     */
+    z?: number;
+}
+
+interface StartGyroscopeOptions {
+    /**
+     * 监听陀螺仪数据回调函数的执行频率：game（20ms/次）、ui（60ms/次）、normal （200ms/次）
+     */
+    interval?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopGyroscopeOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
diff --git a/types/uni-app/lib/vue.d.ts b/types/uni-app/lib/vue.d.ts
new file mode 100644
index 0000000000..68e67db047
--- /dev/null
+++ b/types/uni-app/lib/vue.d.ts
@@ -0,0 +1,15 @@
+import Vue from "vue";
+
+declare module "*.vue" {
+    export default Vue;
+}
+
+declare module "vue/types/options" {
+    type Hooks = App.AppInstance & Page.PageInstance;
+    interface ComponentOptions<V extends Vue> extends Hooks {
+        /**
+         * 组件类型
+         */
+        mpType?: string;
+    }
+}
diff --git a/types/uni-app/package.json b/types/uni-app/package.json
new file mode 100644
index 0000000000..c3d06b0d9e
--- /dev/null
+++ b/types/uni-app/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "vue": "^2.6.8"
+    }
+}
diff --git a/types/uni-app/tsconfig.json b/types/uni-app/tsconfig.json
new file mode 100644
index 0000000000..25eccf7459
--- /dev/null
+++ b/types/uni-app/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "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",
+        "lib/app.d.ts",
+        "lib/page.d.ts",
+        "lib/common.d.ts",
+        "lib/uni.d.ts",
+        "lib/vue.d.ts",
+        "uni-app-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/uni-app/tslint.json b/types/uni-app/tslint.json
new file mode 100644
index 0000000000..0d531c5643
--- /dev/null
+++ b/types/uni-app/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false,
+        "no-trailing-whitespace": false,
+        "no-unnecessary-generics": false
+    }
+}
\ No newline at end of file
diff --git a/types/uni-app/uni-app-tests.ts b/types/uni-app/uni-app-tests.ts
new file mode 100644
index 0000000000..c203d6cfaf
--- /dev/null
+++ b/types/uni-app/uni-app-tests.ts
@@ -0,0 +1,21 @@
+uni.request({
+    url: 'https://dcloud.io',
+    success(res) {
+        uni.showToast({
+            title: res.data
+        });
+    },
+    fail(error) {
+        uni.showToast({
+            title: error.errMsg
+        });
+    }
+});
+
+uni.navigateTo({
+    url: 'index/index'
+});
+
+uni.showLoading({
+    title: 'test'
+});

From d6748925aae7eb34de578f623c72995b7f392d71 Mon Sep 17 00:00:00 2001
From: Jonas Keisel <jonas.keisel@gmail.com>
Date: Thu, 7 Mar 2019 11:25:14 +0100
Subject: [PATCH 456/924] =?UTF-8?q?added=20missing=20`paymentIntents.cance?=
 =?UTF-8?q?l(=E2=80=A6)`=20signatures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index d7d198d746..d747fc6de9 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -7337,6 +7337,11 @@ declare namespace Stripe {
                 options: HeaderOptions,
                 response?: IResponseFn<paymentIntents.IPaymentIntent>,
             ): Promise<paymentIntents.IPaymentIntent>;
+            cancel(
+                paymentIntentId: string,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
             cancel(
                 paymentIntentId: string,
                 data: {
@@ -7344,6 +7349,10 @@ declare namespace Stripe {
                 },
                 response?: IResponseFn<paymentIntents.IPaymentIntent>,
             ): Promise<paymentIntents.IPaymentIntent>;
+            cancel(
+                paymentIntentId: string,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
         }
 
         class Payouts extends StripeResource {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 6fc4a5ac25..bffadadb23 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -1057,6 +1057,8 @@ stripe.paymentIntents.confirm("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
 stripe.paymentIntents.capture("pi_Aabcxyz01aDfoo", {}, (err, intent) => {});
 stripe.paymentIntents.capture("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
 
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", (err, intent) => {});
+stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo").then((intent) => {});
 stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", {}, (err, intent) => {});
 stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", {}).then((intent) => {});
 stripe.paymentIntents.cancel("pi_Aabcxyz01aDfoo", { cancellation_reason: 'duplicate' }, (err, intent) => {});

From b26e09b0deefa5442d085e09daa685382b2d4486 Mon Sep 17 00:00:00 2001
From: Jonas Keisel <jonas.keisel@gmail.com>
Date: Thu, 7 Mar 2019 11:38:42 +0100
Subject: [PATCH 457/924] Added missing signatures based on the Java
 implementation

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index d747fc6de9..772a4bdb87 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -3359,6 +3359,15 @@ declare namespace Stripe {
             source?: string;
         }
 
+        interface IPaymentIntentRetrieveOptions {
+            /**
+             * The client secret of the PaymentIntent. Required if a publishable key is used to retrieve the source.
+             *
+             * REQUIRED IF USING PUBLISHABLE KEY!
+             */
+            client_secret: string;
+        }
+
         interface IPaymentIntentCaptureOptions {
             /**
              * The amount to capture (in cents) from the PaymentIntent, which must be less than or equal to the original amount. Any additional amount will be automatically refunded. Defaults to the full `amount_capturable` if not provided.
@@ -7276,6 +7285,17 @@ declare namespace Stripe {
              * Client-side retrieval using a publishable key is allowed when the client_secret is provided in the query string.
              * When retrieved with a publishable key, only a subset of properties will be returned. Please refer to the payment intent object reference for more details.
              */
+            retrieve(
+                id: string,
+                data: paymentIntents.IPaymentIntentRetrieveOptions,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            retrieve(
+                id: string,
+                data: paymentIntents.IPaymentIntentRetrieveOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
             retrieve(
                 id: string,
                 options: HeaderOptions,
@@ -7304,6 +7324,15 @@ declare namespace Stripe {
                 data: paymentIntents.IPaymentIntentConfirmOptions,
                 response?: IResponseFn<paymentIntents.IPaymentIntent>,
             ): Promise<paymentIntents.IPaymentIntent>;
+            confirm(
+                paymentIntentId: string,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            confirm(
+                paymentIntentId: string,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
             /**
              * Capture the funds of an existing uncaptured PaymentIntent where `required_action="requires_capture"`.
@@ -7322,6 +7351,15 @@ declare namespace Stripe {
                 data: paymentIntents.IPaymentIntentCaptureOptions,
                 response?: IResponseFn<paymentIntents.IPaymentIntent>,
             ): Promise<paymentIntents.IPaymentIntent>;
+            capture(
+                paymentIntentId: string,
+                options: HeaderOptions,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
+            capture(
+                paymentIntentId: string,
+                response?: IResponseFn<paymentIntents.IPaymentIntent>,
+            ): Promise<paymentIntents.IPaymentIntent>;
 
             /**
              * A PaymentIntent object can be canceled when it is in one of these statuses: `requires_payment_method`, `requires_capture`, `requires_confirmation`, `requires_action`.

From 9baa009b9275341490c53ad040af363fd847f0ce Mon Sep 17 00:00:00 2001
From: Daniel Cassidy <mail@danielcassidy.me.uk>
Date: Thu, 7 Mar 2019 11:02:18 +0000
Subject: [PATCH 458/924] condense-whitespace: Add type definitions.

---
 .../condense-whitespace-tests.ts              |  7 ++++++
 types/condense-whitespace/index.d.ts          |  8 +++++++
 types/condense-whitespace/tsconfig.json       | 23 +++++++++++++++++++
 types/condense-whitespace/tslint.json         |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/condense-whitespace/condense-whitespace-tests.ts
 create mode 100644 types/condense-whitespace/index.d.ts
 create mode 100644 types/condense-whitespace/tsconfig.json
 create mode 100644 types/condense-whitespace/tslint.json

diff --git a/types/condense-whitespace/condense-whitespace-tests.ts b/types/condense-whitespace/condense-whitespace-tests.ts
new file mode 100644
index 0000000000..027b106195
--- /dev/null
+++ b/types/condense-whitespace/condense-whitespace-tests.ts
@@ -0,0 +1,7 @@
+import condense = require("condense-whitespace");
+
+// $ExpectType string
+condense("   \n\n\t Hello    World \t\n");
+
+// $ExpectError
+condense(1);
diff --git a/types/condense-whitespace/index.d.ts b/types/condense-whitespace/index.d.ts
new file mode 100644
index 0000000000..403d0eeec1
--- /dev/null
+++ b/types/condense-whitespace/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for condense-whitespace 1.0
+// Project: https://github.com/sindresorhus/condense-whitespace
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function condenseWhitespace(str: string): string;
+
+export = condenseWhitespace;
diff --git a/types/condense-whitespace/tsconfig.json b/types/condense-whitespace/tsconfig.json
new file mode 100644
index 0000000000..8d5705205d
--- /dev/null
+++ b/types/condense-whitespace/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",
+        "condense-whitespace-tests.ts"
+    ]
+}
diff --git a/types/condense-whitespace/tslint.json b/types/condense-whitespace/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/condense-whitespace/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bac137341280d31ee0f8159ddad66b0fa144e5fa Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Thu, 7 Mar 2019 01:01:02 +0100
Subject: [PATCH 459/924] feat(node): v11.11

---
 types/node/globals.d.ts | 12 +++++++++++-
 types/node/index.d.ts   |  2 +-
 types/node/test/util.ts |  3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/node/globals.d.ts b/types/node/globals.d.ts
index 210830f7e8..36726f5cc0 100644
--- a/types/node/globals.d.ts
+++ b/types/node/globals.d.ts
@@ -465,7 +465,17 @@ declare namespace NodeJS {
         showProxy?: boolean;
         maxArrayLength?: number | null;
         breakLength?: number;
-        compact?: boolean;
+        /**
+         * Setting this to `false` causes each object key
+         * to be displayed on a new line. It will also add new lines to text that is
+         * longer than `breakLength`. If set to a number, the most `n` inner elements
+         * are united on a single line as long as all properties fit into
+         * `breakLength`. Short array elements are also grouped together. Note that no
+         * text will be reduced below 16 characters, no matter the `breakLength` size.
+         * For more information, see the example below.
+         * @default `true`
+         */
+        compact?: boolean | number;
         sorted?: boolean | ((a: string, b: string) => number);
     }
 
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 23b53a5f0d..1c22d95b69 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for non-npm package Node.js 11.10
+// Type definitions for non-npm package Node.js 11.11
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped>
diff --git a/types/node/test/util.ts b/types/node/test/util.ts
index 252e8824ae..3af024972e 100644
--- a/types/node/test/util.ts
+++ b/types/node/test/util.ts
@@ -30,6 +30,9 @@ import { readFile } from 'fs';
         sorted: true,
         getters: 'set',
     });
+    util.inspect(["This is nice"], {
+        compact: 42,
+    });
     assert(typeof util.inspect.custom === 'symbol');
 
     util.formatWithOptions({ colors: true }, 'See object %O', { foo: 42 });

From 78a310b4695760d5f2650017a287fcf355c18e4f Mon Sep 17 00:00:00 2001
From: Alex Szabo <alex.szabo@klarna.com>
Date: Thu, 7 Mar 2019 13:15:46 +0100
Subject: [PATCH 460/924] [@types/sequelize] Fix imports cases according to the
 source code of sequelize to allow for different import syntaxes other than
 require

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 35b790c0f9..6e25100255 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1379,7 +1379,7 @@ declare namespace sequelize {
          * Should the join model have timestamps
          */
         timestamps?: boolean;
-         
+
         /**
          * Belongs-To-Many creates a unique key when primary key is not present on through model. This unique key name can be overridden using uniqueKey option.
          */
@@ -5938,6 +5938,15 @@ declare namespace sequelize {
         cls: any;
         useCLS(namespace:cls.Namespace): Sequelize;
 
+        /**
+         * Default export for `import Sequelize from 'sequelize';` kind of imports
+         */
+        default: SequelizeStatic;
+
+        /**
+         * Export sequelize static on the instance for `import Sequelize from 'sequelize';` kind of imports
+         */
+        Sequelize: SequelizeStatic;
     }
 
     interface QueryOptionsTransactionRequired { }

From a2c1169fe1405516f33577a775eeb584792a65c8 Mon Sep 17 00:00:00 2001
From: Alex Szabo <alex.szabo@klarna.com>
Date: Thu, 7 Mar 2019 13:32:00 +0100
Subject: [PATCH 461/924] Add test entries for the different import types

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

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3e5fc74142..224c883459 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -26,6 +26,9 @@ var Post      = s.define<AnyInstance, AnyAttributes>( 'post', {} );
 var t : Sequelize.Transaction = null;
 s.transaction().then( ( a ) => t = a );
 
+var sequelizeAsDefaultImport = Sequelize.default;
+var sequelizeAsExportClause  = Sequelize.Sequelize;
+
 //
 //  Generics
 // ~~~~~~~~~~

From 58273fe4bb2f0f6c304432fa5c7c6d934576051d Mon Sep 17 00:00:00 2001
From: Alex Szabo <alex.szabo@klarna.com>
Date: Thu, 7 Mar 2019 13:32:10 +0100
Subject: [PATCH 462/924] Add test entries for the different import types

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

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 224c883459..063048ebd7 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1,6 +1,8 @@
 import Sequelize = require("sequelize");
 import Q = require('q');
 import Bluebird = require('bluebird');
+import SequelizeAsDefault from 'sequelize';
+import { Sequelize as SequelizeAsIndividualExport } from 'sequelize';
 
 //
 //  Fixtures
@@ -26,8 +28,6 @@ var Post      = s.define<AnyInstance, AnyAttributes>( 'post', {} );
 var t : Sequelize.Transaction = null;
 s.transaction().then( ( a ) => t = a );
 
-var sequelizeAsDefaultImport = Sequelize.default;
-var sequelizeAsExportClause  = Sequelize.Sequelize;
 
 //
 //  Generics

From b3e1195fe52f7dc3ed9cd8c82fbd14e89eb8d167 Mon Sep 17 00:00:00 2001
From: Damien SOREL <damien.sorel@sogelink.fr>
Date: Thu, 7 Mar 2019 13:37:18 +0100
Subject: [PATCH 463/924] Initial definition for @wordpress/jest-console

---
 types/wordpress__jest-console/index.d.ts      | 51 +++++++++++++++++++
 .../jest-console-tests.ts                     | 13 +++++
 types/wordpress__jest-console/tsconfig.json   | 24 +++++++++
 types/wordpress__jest-console/tslint.json     |  1 +
 4 files changed, 89 insertions(+)
 create mode 100644 types/wordpress__jest-console/index.d.ts
 create mode 100644 types/wordpress__jest-console/jest-console-tests.ts
 create mode 100644 types/wordpress__jest-console/tsconfig.json
 create mode 100644 types/wordpress__jest-console/tslint.json

diff --git a/types/wordpress__jest-console/index.d.ts b/types/wordpress__jest-console/index.d.ts
new file mode 100644
index 0000000000..ecda81d6f7
--- /dev/null
+++ b/types/wordpress__jest-console/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for @wordpress/jest-console 3.0
+// Project: https://github.com/wordpress/gutenberg/tree/master/packages/jest-console/readme.md
+// Definitions by: Damien Sorel <https://github.com/mistic100>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+/// <reference types="jest" />
+
+declare namespace jest {
+    interface Matchers<R> {
+        /**
+         * Ensure that `console.error` function was called.
+         */
+        toHaveErrored(): R;
+
+        /**
+         * Ensure that `console.error` function was called with specific arguments.
+         */
+        toHaveErroredWith(...args: any[]): R;
+
+        /**
+         * Ensure that `console.info` function was called.
+         */
+        toHaveInformed(): R;
+
+        /**
+         * Ensure that `console.info` function was called with specific arguments.
+         */
+        toHaveInformedWith(...args: any[]): R;
+
+        /**
+         * Ensure that `console.log` function was called.
+         */
+        toHaveLogged(): R;
+
+        /**
+         * Ensure that `console.log` function was called with specific arguments.
+         */
+        toHaveLoggedWith(...args: any[]): R;
+
+        /**
+         * Ensure that `console.warn` function was called.
+         */
+        toHaveWarned(): R;
+
+        /**
+         * Ensure that `console.warn` function was called with specific arguments.
+         */
+        toHaveWarnedWith(...args: any[]): R;
+    }
+}
diff --git a/types/wordpress__jest-console/jest-console-tests.ts b/types/wordpress__jest-console/jest-console-tests.ts
new file mode 100644
index 0000000000..7c8eec6968
--- /dev/null
+++ b/types/wordpress__jest-console/jest-console-tests.ts
@@ -0,0 +1,13 @@
+it('uses the console', () => {
+    expect(console).toHaveErrored();
+    expect(console).toHaveErroredWith('message');
+
+    expect(console).toHaveInformed();
+    expect(console).toHaveInformedWith('message');
+
+    expect(console).toHaveLogged();
+    expect(console).toHaveLoggedWith('message');
+
+    expect(console).toHaveWarned();
+    expect(console).toHaveWarnedWith('message');
+});
diff --git a/types/wordpress__jest-console/tsconfig.json b/types/wordpress__jest-console/tsconfig.json
new file mode 100644
index 0000000000..f21c4b6ce7
--- /dev/null
+++ b/types/wordpress__jest-console/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",
+        "jest-console-tests.ts"
+    ]
+}
diff --git a/types/wordpress__jest-console/tslint.json b/types/wordpress__jest-console/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wordpress__jest-console/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 19ebc96bce15d686843a9577affbad9acfdcdd8a Mon Sep 17 00:00:00 2001
From: Alex Szabo <alex.szabo@klarna.com>
Date: Thu, 7 Mar 2019 13:38:00 +0100
Subject: [PATCH 464/924] Try breaking tests

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 6e25100255..0d800c47f5 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -5941,7 +5941,7 @@ declare namespace sequelize {
         /**
          * Default export for `import Sequelize from 'sequelize';` kind of imports
          */
-        default: SequelizeStatic;
+        // default: SequelizeStatic;
 
         /**
          * Export sequelize static on the instance for `import Sequelize from 'sequelize';` kind of imports
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 063048ebd7..caecd33972 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -4,6 +4,14 @@ import Bluebird = require('bluebird');
 import SequelizeAsDefault from 'sequelize';
 import { Sequelize as SequelizeAsIndividualExport } from 'sequelize';
 
+//
+// Import checks
+// ~~~~~~~~~~~~~
+//
+Sequelize.Model.Instance
+SequelizeAsDefault.Model.Instance
+SequelizeAsIndividualExport.Model.Instance
+
 //
 //  Fixtures
 // ~~~~~~~~~~
@@ -28,7 +36,6 @@ var Post      = s.define<AnyInstance, AnyAttributes>( 'post', {} );
 var t : Sequelize.Transaction = null;
 s.transaction().then( ( a ) => t = a );
 
-
 //
 //  Generics
 // ~~~~~~~~~~

From e4d23a96625aee57bf6f792b7fdf00bf62e4a56f Mon Sep 17 00:00:00 2001
From: Alex Szabo <alex.szabo@klarna.com>
Date: Thu, 7 Mar 2019 13:41:46 +0100
Subject: [PATCH 465/924] Fix tests

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 0d800c47f5..6e25100255 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -5941,7 +5941,7 @@ declare namespace sequelize {
         /**
          * Default export for `import Sequelize from 'sequelize';` kind of imports
          */
-        // default: SequelizeStatic;
+        default: SequelizeStatic;
 
         /**
          * Export sequelize static on the instance for `import Sequelize from 'sequelize';` kind of imports

From 8e97f1789d6ac063ddb115bcb5b9b0642632e75b Mon Sep 17 00:00:00 2001
From: maruware <me@maruware.com>
Date: Thu, 7 Mar 2019 22:17:06 +0900
Subject: [PATCH 466/924] [sequelize] Add include option to
 HasManyGetAssociationsMixinOptions

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 35b790c0f9..7c1c290b95 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -281,6 +281,11 @@ declare namespace sequelize {
          * Apply a scope on the related model, or remove its default scope by passing false.
          */
         scope?: string | boolean;
+
+        /**
+         * Load further nested related models
+         */
+        include?: IncludeOptions;
     }
 
     /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3e5fc74142..e00d4f187b 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -239,6 +239,13 @@ warehouse.getProducts();
 warehouse.getProducts({ where: {}, scope: false });
 warehouse.getProducts({ where: {}, scope: false }).then((products) => products[0].id);
 
+interface ProductInstanceIncludeBarcode extends ProductInstance {
+    barcode: BarcodeInstance
+}
+warehouse.getProducts({ where: {}, scope: false, include: {model: Barcode, as: 'barcode'} }).then((products) => {
+    (products[0] as ProductInstanceIncludeBarcode).barcode
+});
+
 warehouse.setProducts();
 warehouse.setProducts([product]);
 warehouse.setProducts([product], { validate: true }).then(() => { });

From 6a5f2760b9f757ab4bf372ff9caa392ba182a689 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 7 Mar 2019 07:13:10 -0800
Subject: [PATCH 467/924] Try travis code from Wesley

---
 .travis.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa657d16d7..30cde88e5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,9 @@ sudo: false
 notifications:
   email: false
 
-jobs:
-  include:
-    - stage: build
-      script: npm install
-      script: npm run build
-      script: npm run test
-    - stage: codeowners
-      script: npm run update-codeowners
-stages:
- - name: codeowners
-   if: env(TRAVIS_EVENT_TYPE) = cron
\ No newline at end of file
+script:
+ - npm install
+ - npm run build
+ - npm run test
+ - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then npm run update-codeowners || travis_terminate
+   1; fi
\ No newline at end of file

From f95172ea59b77244102f2f5a3ad450346f8a4dae Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 7 Mar 2019 07:23:39 -0800
Subject: [PATCH 468/924] Do not need npm install or run build

---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 30cde88e5d..e3d7a6fcc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,5 @@ notifications:
   email: false
 
 script:
- - npm install
- - npm run build
  - npm run test
- - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then npm run update-codeowners || travis_terminate
-   1; fi
\ No newline at end of file
+ - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then npm run update-codeowners || travis_terminate 1; fi
\ No newline at end of file

From e06aadbe407509674cef01261556c3b1714eb849 Mon Sep 17 00:00:00 2001
From: chdanielmueller <daniel.mueller@surnet.ch>
Date: Thu, 7 Mar 2019 16:45:40 +0100
Subject: [PATCH 469/924] Including both options

---
 types/helmet/helmet-tests.ts | 13 +++++++++++++
 types/helmet/index.d.ts      |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/types/helmet/helmet-tests.ts b/types/helmet/helmet-tests.ts
index f73095b714..39414a7d5f 100644
--- a/types/helmet/helmet-tests.ts
+++ b/types/helmet/helmet-tests.ts
@@ -125,6 +125,13 @@ function hpkpTest() {
         includeSubDomains: false
     }));
 
+    // Deprecated: Use includeSubDomains instead. (Uppercase "D")
+    app.use(helmet.hpkp({
+        maxAge: 7776000000,
+        sha256s: ['AbCdEf123=', 'ZyXwVu456='],
+        includeSubdomains: false
+    }));
+
     app.use(helmet.hpkp({
         maxAge: 7776000000,
         sha256s: ['AbCdEf123=', 'ZyXwVu456='],
@@ -167,6 +174,12 @@ function hstsTest() {
       includeSubDomains: true
     }));
 
+    // Deprecated: Use includeSubDomains instead. (Uppercase "D")
+    app.use(helmet.hsts({
+      maxAge: 7776000000,
+      includeSubdomains: true
+    }));
+
     app.use(helmet.hsts({
       maxAge: 7776000000,
       preload: true
diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index 573395831b..1a8c713da1 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -134,6 +134,10 @@ declare namespace helmet {
     export interface IHelmetHpkpConfiguration {
         maxAge: number;
         sha256s: string[];
+        /**
+         * @deprecated Use includeSubDomains instead. (Uppercase "D")
+         */
+        includeSubdomains?: boolean;
         includeSubDomains?: boolean;
         reportUri?: string;
         reportOnly?: boolean;
@@ -142,6 +146,10 @@ declare namespace helmet {
 
     export interface IHelmetHstsConfiguration {
         maxAge?: number;
+        /**
+         * @deprecated Use includeSubDomains instead. (Uppercase "D")
+         */
+        includeSubdomains?: boolean;
         includeSubDomains?: boolean;
         preload?: boolean;
         setIf?: IHelmetSetIfFunction;

From ff7c8f87987004f2d5957937f935dc2c8124aa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Moura?= <joao.moura@b-i.com>
Date: Thu, 7 Mar 2019 15:49:35 +0000
Subject: [PATCH 470/924] Added type definitions for voucher-code-generator

---
 types/voucher-code-generator/index.d.ts       | 19 +++++++++++++++
 types/voucher-code-generator/tsconfig.json    | 23 +++++++++++++++++++
 types/voucher-code-generator/tslint.json      |  1 +
 .../voucher-code-generator-tests.ts           | 18 +++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 types/voucher-code-generator/index.d.ts
 create mode 100644 types/voucher-code-generator/tsconfig.json
 create mode 100644 types/voucher-code-generator/tslint.json
 create mode 100644 types/voucher-code-generator/voucher-code-generator-tests.ts

diff --git a/types/voucher-code-generator/index.d.ts b/types/voucher-code-generator/index.d.ts
new file mode 100644
index 0000000000..fd57466c26
--- /dev/null
+++ b/types/voucher-code-generator/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for voucher-code-generator 1.1
+// Project: http://www.voucherify.io/
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ If this module has methods, declare them as functions like so.
+ */
+export function charset(name: "numbers" | "alphabetic" | "alphanumeric"): string;
+export function generate(config?: generatorConfig): string[];
+
+/*~ You can declare types that are available via importing the module */
+export interface generatorConfig {
+    length?: number;
+    count?: number;
+    charset?: string;
+    prefix?: string;
+    postfix?: string;
+    pattern?: string;
+}
diff --git a/types/voucher-code-generator/tsconfig.json b/types/voucher-code-generator/tsconfig.json
new file mode 100644
index 0000000000..dc5d0025be
--- /dev/null
+++ b/types/voucher-code-generator/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",
+        "voucher-code-generator-tests.ts"
+    ]
+}
diff --git a/types/voucher-code-generator/tslint.json b/types/voucher-code-generator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/voucher-code-generator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/voucher-code-generator/voucher-code-generator-tests.ts b/types/voucher-code-generator/voucher-code-generator-tests.ts
new file mode 100644
index 0000000000..3232be37aa
--- /dev/null
+++ b/types/voucher-code-generator/voucher-code-generator-tests.ts
@@ -0,0 +1,18 @@
+import voucherGenerator  = require('voucher-code-generator');
+import { generatorConfig } from 'voucher-code-generator';
+
+const config: generatorConfig = {
+  length: 6,
+  count: 3,
+  charset: "0123456789",
+  prefix: "offer-",
+  postfix: "-2019",
+  pattern: "######"
+};
+
+voucherGenerator.charset('numbers');
+voucherGenerator.charset('alphabetic');
+voucherGenerator.charset('alphanumeric');
+
+voucherGenerator.generate();
+voucherGenerator.generate(config);

From 282744882ddc7b945fdf2d456644f5e7ed93b393 Mon Sep 17 00:00:00 2001
From: Daniel Cassidy <mail@danielcassidy.me.uk>
Date: Thu, 7 Mar 2019 15:49:16 +0000
Subject: [PATCH 471/924] trim-newlines: Add type definitions.

---
 types/trim-newlines/index.d.ts             | 13 ++++++++++++
 types/trim-newlines/trim-newlines-tests.ts | 10 ++++++++++
 types/trim-newlines/tsconfig.json          | 23 ++++++++++++++++++++++
 types/trim-newlines/tslint.json            |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/trim-newlines/index.d.ts
 create mode 100644 types/trim-newlines/trim-newlines-tests.ts
 create mode 100644 types/trim-newlines/tsconfig.json
 create mode 100644 types/trim-newlines/tslint.json

diff --git a/types/trim-newlines/index.d.ts b/types/trim-newlines/index.d.ts
new file mode 100644
index 0000000000..7abe323fe2
--- /dev/null
+++ b/types/trim-newlines/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for trim-newlines 2.0
+// Project: https://github.com/sindresorhus/trim-newlines#readme
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function trimNewlines(input: string): string;
+
+declare namespace trimNewlines {
+    function start(input: string): string;
+    function end(input: string): string;
+}
+
+export = trimNewlines;
diff --git a/types/trim-newlines/trim-newlines-tests.ts b/types/trim-newlines/trim-newlines-tests.ts
new file mode 100644
index 0000000000..e3bc17661a
--- /dev/null
+++ b/types/trim-newlines/trim-newlines-tests.ts
@@ -0,0 +1,10 @@
+import trimNewlines = require("trim-newlines");
+
+// $ExpectType string
+trimNewlines('\nunicorn\r\n');
+
+// $ExpectType string
+trimNewlines.start("\n\npony\n");
+
+// $ExpectType string
+trimNewlines.end("\ndonk\n\n");
diff --git a/types/trim-newlines/tsconfig.json b/types/trim-newlines/tsconfig.json
new file mode 100644
index 0000000000..8dbcfef306
--- /dev/null
+++ b/types/trim-newlines/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",
+        "trim-newlines-tests.ts"
+    ]
+}
diff --git a/types/trim-newlines/tslint.json b/types/trim-newlines/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/trim-newlines/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 11b2a55bdc1c075d56c24195333d1ecaf060e0d9 Mon Sep 17 00:00:00 2001
From: Gregory Assasie <gregory.assasie@mindera.com>
Date: Thu, 7 Mar 2019 16:18:05 +0000
Subject: [PATCH 472/924] Add isolateModule under jest namespace

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index deb9c92619..f038da0d49 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -154,6 +154,11 @@ declare namespace jest {
      * useful to isolate modules where local state might conflict between tests.
      */
     function resetModules(): typeof jest;
+    /**
+     * Creates a sandbox registry for the modules that are loaded inside the callback function..
+     * This is useful to isolate specific modules for every test so that local module state doesn't conflict between tests.
+     */
+    function isolateModules(fn: () => void): typeof jest;
     /**
      * Runs failed tests n-times until they pass or until the max number of retries is exhausted.
      * This only works with jest-circus!
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index c643ca6a57..07fc1675da 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -267,6 +267,7 @@ jest
     .mock("moduleName", jest.fn(), { virtual: true })
     .resetModuleRegistry()
     .resetModules()
+    .isolateModules(() => {})
     .retryTimes(3)
     .runAllImmediates()
     .runAllTicks()

From 37ee59cc6aa3dc7a7595094daac996f1f3d77d64 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Thu, 7 Mar 2019 16:33:55 +0000
Subject: [PATCH 473/924] Update CODEOWNERS

---
 .github/CODEOWNERS | 406 +++++++++++++++++++++++++++------------------
 1 file changed, 248 insertions(+), 158 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6477b03f07..5af21f27d2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -49,7 +49,7 @@
 /types/adal-angular/                                @unindented @aciccarello
 /types/add-zero/                                    @Roaders
 /types/adlib/                                       @Esri @MikeTschudi
-/types/adm-zip/                                     @jvilk @abner
+/types/adm-zip/                                     @jvilk @abner @BendingBender
 /types/adone/                                       @s0m3on3 @maxveres
 /types/aes-js/                                      @federicobond
 /types/aframe/                                      @devpaul @bertoritger @twastvedt
@@ -59,12 +59,14 @@
 /types/agora-rtc-sdk/                               @menthays
 /types/airbnb-prop-types/                           @milesj
 /types/ajv-errors/                                  @afshawnlotfi
+/types/ajv-merge-patch/                             @littlepiggy03
 /types/ale-url-parser/                              @msn0
 /types/alertify/                                    @jjeffery
 /types/alexa-sdk/                                   @petebeegle @hoo29 @pascalwhoop @blforce @rk-7 @alexmalcoci
 /types/alexa-voice-service/                         @dolanmiu
 /types/algebra.js/                                  @CaselIT
-/types/algoliasearch/                               @cbaptiste @haroenv @aherve @samouss @keichinger
+/types/algoliasearch/                               @cbaptiste @haroenv @aherve @samouss @keichinger @neryortez @antoinerousseau
+/types/algoliasearch-helper/                        @gburgett @haroenv @samouss
 /types/ali-app/                                     @taoqf
 /types/ali-oss/                                     @ptrdu
 /types/all-keys/                                    @BendingBender
@@ -160,7 +162,7 @@
 /types/angularlocalstorage/                         @horiuchi
 /types/angulartics/                                 @bateast2
 /types/animation-frame/                             @qinfchen
-/types/animejs/                                     @A-Babin
+/types/animejs/                                     @A-Babin @supaiku0
 /types/annyang/                                     @hisham @theluk
 /types/ansi/                                        @Gustavo6046
 /types/ansi-colors/                                 @rogierschouten @BendingBender
@@ -204,7 +206,7 @@
 /types/archy/                                       @vvakame
 /types/are-we-there-yet/                            @brianloveswords
 /types/argon2-browser/                              @ivangabriele
-/types/argparse/                                    @arcticwaters @tlaziuk @eps1lon
+/types/argparse/                                    @arcticwaters @tlaziuk @eps1lon @cakoose
 /types/args/                                        @Slessi
 /types/argv/                                        @hookclaw
 /types/arr-diff/                                    @BendingBender
@@ -273,7 +275,8 @@
 /types/await-timeout/                               @szhu
 /types/awesomplete/                                 @webbiesdk @bmdixon @tbekolay @chrislopresto
 /types/aws-iot-device-sdk/                          @niik @mlamp
-/types/aws-lambda/                                  @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev @ohookins @trevor-leach @jagregory @dalen
+/types/aws-lambda/                                  @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev @ohookins @trevor-leach @jagregory @dalen @loikg @skyzenr @richardcornelissen
+/types/aws-param-store/                             @jasonthomasgray
 /types/aws-serverless-express/                      @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                        @ajcrites
 /types/axe-webdriverjs/                             @JoshuaKGoldberg
@@ -295,7 +298,7 @@
 /types/babel-types/                                 @yortus @baxtersa @marvinhagemeister @bcherny
 /types/babel-webpack-plugin/                        @j-f1
 /types/babel__code-frame/                           @mohsen1 @ForbesLindesay
-/types/babel__core/                                 @yortus @marvinhagemeister @mgroenhoff
+/types/babel__core/                                 @yortus @marvinhagemeister @mgroenhoff @Jessidhia
 /types/babel__generator/                            @yortus @johnnyestilles @mgroenhoff
 /types/babel__template/                             @yortus @marvinhagemeister @mgroenhoff
 /types/babel__traverse/                             @yortus @marvinhagemeister @rpetrich @mgroenhoff
@@ -303,15 +306,15 @@
 /types/babylon/                                     @yortus @marvinhagemeister
 /types/babylon-walk/                                @czbuchi
 /types/babyparse/                                   @cdiddy77
-/types/backbone/                                    @borisyankov @nvivo @kenjiru @jjoekoullas
+/types/backbone/                                    @borisyankov @nvivo @kenjiru @jjoekoullas @jgonggrijp
 /types/backbone-associations/                       @craigbrett17
 /types/backbone-fetch-cache/                        @delphinus35
-/types/backbone-relational/                         @eirikhm
+/types/backbone-relational/                         @eirikhm @jgonggrijp
 /types/backbone.layoutmanager/                      @hejiang2000
 /types/backbone.localstorage/                       @lgrignon
-/types/backbone.marionette/                         @zhamid @nvivo @sventschui @razorness @confususs @jjoekoullas
+/types/backbone.marionette/                         @zhamid @nvivo @sventschui @razorness @confususs @jjoekoullas @jgonggrijp
 /types/backbone.paginator/                          @Nyamazing
-/types/backbone.radio/                              @alphaleonis
+/types/backbone.radio/                              @alphaleonis @jgonggrijp
 /types/backgrid/                                    @jlujan
 /types/backlog-js/                                  @vvatanabe
 /types/backo2/                                      @Retsam
@@ -375,6 +378,7 @@
 /types/bip38/                                       @micksatana
 /types/bip39/                                       @micksatana
 /types/bit-array/                                   @mudkipme
+/types/bit-twiddle/                                 @adamzerella
 /types/bitcoinjs-lib/                               @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh @kento1218
 /types/bitcore-lib/                                 @lautarodragan
 /types/bittorrent-protocol/                         @feross @tlaziuk
@@ -414,6 +418,7 @@
 /types/bootstrap/                                   @denisname
 /types/bootstrap/v3/                                @borisyankov @denisname
 /types/bootstrap-3-typeahead/                       @AndersonFriaca
+/types/bootstrap-colorpicker/                       @aleksandar-manukov
 /types/bootstrap-datepicker/                        @borisyankov
 /types/bootstrap-fileinput/                         @CheCoxshall
 /types/bootstrap-growl-ifightcrime/                 @AndersonFriaca
@@ -457,7 +462,7 @@
 /types/browserslist-useragent/                      @nju33
 /types/bs58/                                        @chrootsu @BendingBender
 /types/bs58/v3/                                     @chrootsu
-/types/bson/                                        @horiuchi @CaselIT
+/types/bson/                                        @horiuchi @CaselIT @justingrant
 /types/btoa/                                        @johngeorgewright @bricka
 /types/buble/                                       @Kocal
 /types/bucks/                                       @zaneli
@@ -469,6 +474,7 @@
 /types/buffer-xor/                                  @danwbyrne
 /types/buffers/                                     @rhencke
 /types/bufferstream/                                @Bartvds
+/types/build-output-script/                         @BendingBender
 /types/builtin-modules/                             @ajafff
 /types/bull/                                        @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga @koblas @bondz @wuha-team @aleccool213 @danmana @kjellmorten @pc-jedi
 /types/bull/v2/                                     @bgrieder @JProgrammer
@@ -480,11 +486,13 @@
 /types/bunyan-config/                               @cyrilschumacher
 /types/bunyan-format/                               @dex4er
 /types/bunyan-prettystream/                         @jasonswearingen @enlight
+/types/bunyan-seq/                                  @raybooysen
 /types/bunyan-winston-adapter/                      @stevehipwell
 /types/busboy/                                      @jacobbaskin
 /types/business-rules-engine/                       @rsamec
 /types/bwip-js/                                     @MugeSo
 /types/byline/                                      @reppners
+/types/byte-range/                                  @BendingBender
 /types/bytebuffer/                                  @cappellin
 /types/bytes/                                       @danny8002 @believer
 /types/bytewise/                                    @danwbyrne
@@ -501,6 +509,7 @@
 /types/camaro/                                      @tuananh
 /types/camelcase/                                   @samverschueren
 /types/camelcase-keys/                              @mhegazy
+/types/camljs/                                      @andrei-markeev
 /types/camo/                                        @lucasmciruzzi
 /types/cancan/                                      @Vincent-Pang
 /types/caniuse-api/                                 @davecardwell
@@ -511,16 +520,22 @@
 /types/canvasjs/                                    @brutalimp
 /types/capitalize/                                  @frederickfogerty
 /types/capture-console/                             @AustonZ
+/types/carbon__colors/                              @vpicone
+/types/carbon__layout/                              @vpicone
+/types/carbon__motion/                              @vpicone
+/types/carbon__themes/                              @vpicone
+/types/carbon__type/                                @vpicone
 /types/card-validator/                              @ChanceM
 /types/case-sensitive-paths-webpack-plugin/         @r3nya
 /types/caseless/                                    @downace @mastermatt
 /types/cash/                                        @akvlko
 /types/casperjs/                                    @jedmao @urielch
-/types/cassandra-driver/                            @Svjard @pc-jedi
+/types/cassandra-driver/                            @Svjard @pc-jedi @michal-b-kaminski
 /types/catbox/                                      @jasonswearingen @AJamesPhillips @saboya
 /types/catbox/v7/                                   @jasonswearingen @AJamesPhillips
 /types/catbox-memory/                               @SimonSchick
 /types/catbox-redis/                                @SimonSchick
+/types/cavy/                                        @tyler-hoffman
 /types/cbor/                                        @pushplay
 /types/ccap/                                        @taoqf
 /types/cesium/                                      @Zuzon @hnipps @szechyjs @golyalpha
@@ -561,11 +576,10 @@
 /types/check-types/                                 @idchlife
 /types/checkstyle-formatter/                        @mhegazy
 /types/checksum/                                    @rogierschouten
-/types/cheerio/                                     @blittle @wmaurer @umarniz @LiJinyao @chennakrishna8 @AzSiAz
+/types/cheerio/                                     @blittle @wmaurer @umarniz @LiJinyao @chennakrishna8 @AzSiAz @nwtgck
 /types/chess.js/                                    @JacobFischer
 /types/chessboardjs/                                @sliverb @davidmpaz
 /types/chmodr/                                      @BendingBender
-/types/chokidar/                                    @reppners @felixfbecker @bayssmekanique
 /types/chordsheetjs/                                @adamsbloom
 /types/chosen-js/                                   @borisyankov @denisname
 /types/chownr/                                      @BendingBender
@@ -576,6 +590,7 @@
 /types/chromecast-caf-receiver/                     @craigrbruce
 /types/chromecast-caf-sender/                       @samuelmaddock
 /types/chromedriver/                                @pe8ter
+/types/cipher-base/                                 @adamzerella
 /types/circuit-breaker-js/                          @DeTeam
 /types/circular-json/                               @jpevarnek
 /types/ckeditor/                                    @wittwert @stuartlong @viktorpegy
@@ -627,6 +642,7 @@
 /types/cls-hooked/                                  @aleung
 /types/clusterize.js/                               @Pr1st0n
 /types/cmd-shim/                                    @cspotcode
+/types/co/                                          @doniyor2109
 /types/co-body/                                     @geoffreak
 /types/co-views/                                    @devlee @geoffreak
 /types/code/                                        @prashaantt
@@ -646,6 +662,7 @@
 /types/color-name/                                  @Ailrun
 /types/color-namer/                                 @in19farkt
 /types/color-string/                                @BendingBender @danmarshall
+/types/color-support/                               @Yavanosta
 /types/colorbrewer/                                 @mtraynham
 /types/colornames/                                  @manuth
 /types/colresizable/                                @gilleswaeber
@@ -654,7 +671,7 @@
 /types/combine-source-map/                          @TeamworkGuy2
 /types/combined-stream/                             @felixge @tlaziuk @konpikwastaken
 /types/combokeys/                                   @iclanton
-/types/cometd/                                      @derekcicerone @unindented @alxHenry
+/types/cometd/                                      @derekcicerone @unindented @alxHenry @hagl
 /types/command-exists/                              @BendingBender
 /types/command-line-args/                           @75lb
 /types/command-line-args/v4/                        @CzBuCHi @75lb
@@ -672,6 +689,7 @@
 /types/compare-version/                             @jpevarnek
 /types/compare-versions/                            @LogvinovLeon
 /types/complex/                                     @AyaMorisawa @pavasich
+/types/complex.js/                                  @adamzerella
 /types/component-emitter/                           @psnider
 /types/compose-function/                            @denis-sokolov
 /types/compressible/                                @BendingBender
@@ -692,10 +710,11 @@
 /types/confit/                                      @ethanresnick
 /types/connect/                                     @SomaticIT @EvanHahn
 /types/connect-busboy/                              @pinguet62
-/types/connect-datadog/                             @moshegood
+/types/connect-datadog/                             @moshegood @xzyfer
 /types/connect-ensure-login/                        @0x6368656174
 /types/connect-flash/                               @AndreasGassmann
 /types/connect-history-api-fallback/                @douglasduteil
+/types/connect-history-api-fallback-exclusions/     @tonystonee
 /types/connect-livereload/                          @SomaticIT
 /types/connect-modrewrite/                          @tinganho
 /types/connect-mongo/                               @Syati
@@ -785,6 +804,7 @@
 /types/create-html-element/                         @BendingBender
 /types/create-react-class/                          @jgoz
 /types/create-subscription/                         @Asana @vsiao
+/types/create-xpub/                                 @BendingBender
 /types/createjs/                                    @evilangelist @gyohk
 /types/createjs-lib/                                @evilangelist @gyohk
 /types/credential/                                  @phuvo
@@ -814,6 +834,7 @@
 /types/css-to-style/                                @bengry
 /types/css-tree/                                    @erik-kallen
 /types/cssbeautify/                                 @rictic
+/types/cssesc/                                      @djcsdy
 /types/cssnano/                                     @odnamrataizem
 /types/csso/                                        @screendriver @erik-kallen
 /types/csurf/                                       @horiuchi
@@ -845,7 +866,7 @@
 /types/d3-box/                                      @lk-chen
 /types/d3-brush/                                    @tomwanzek @gustavderdrache @borisyankov
 /types/d3-chord/                                    @tomwanzek @gustavderdrache @borisyankov
-/types/d3-cloud/                                    @hansrwindhoff
+/types/d3-cloud/                                    @hansrwindhoff @locknono
 /types/d3-collection/                               @tomwanzek @gustavderdrache @borisyankov
 /types/d3-color/                                    @tomwanzek @gustavderdrache @borisyankov @denisname @ledragon
 /types/d3-contour/                                  @tomwanzek @Ledragon
@@ -855,7 +876,7 @@
 /types/d3-dsv/                                      @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-ease/                                     @tomwanzek @gustavderdrache @borisyankov
 /types/d3-fetch/                                    @ledragon @denisname
-/types/d3-force/                                    @tomwanzek @gustavderdrache @borisyankov
+/types/d3-force/                                    @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-format/                                   @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-geo/                                      @ledragon @tomwanzek @gustavderdrache @borisyankov
 /types/d3-graphviz/                                 @DomParfitt
@@ -894,6 +915,7 @@
 /types/dat.gui/                                     @gyohk @sonic3d @rroylance @singuerinc
 /types/data-driven/                                 @mrhen
 /types/datadog-metrics/                             @pushplay
+/types/datadog-statsd-metrics-collector/            @xzyfer
 /types/datadog-tracer/                              @dineshsaravanan
 /types/datatables.net/                              @Silver-Connection @omidkrad @pragmatrix @CNBoland
 /types/datatables.net-autofill/                     @andy-maca
@@ -904,6 +926,7 @@
 /types/datatables.net-rowreorder/                   @baywet
 /types/datatables.net-scroller/                     @RohdeK
 /types/datatables.net-select/                       @szechyjs
+/types/date-and-time/                               @danplisetsky
 /types/date-arithmetic/                             @HeeL
 /types/date.format.js/                              @balrob
 /types/dateformat/                                  @aicest @BendingBender
@@ -916,13 +939,12 @@
 /types/db-migrate-pg/                               @nickiannone
 /types/db.js/                                       @cgwrench
 /types/dc/                                          @hansrwindhoff @mtraynham @MatthiasJobst
-/types/dd-trace/                                    @ColinBradley @alloy
 /types/deasync/                                     @Sicilica
 /types/debessmann/                                  @vkorehov
 /types/debounce/                                    @denis-sokolov @joshuakgoldberg @wcarson
 /types/debounce-fn/                                 @BendingBender
 /types/debounce-promise/                            @whtsky
-/types/debug/                                       @swook @galtalmor @zamb3zi @brasten
+/types/debug/                                       @swook @galtalmor @zamb3zi @brasten @npenin
 /types/decamelize/                                  @samverschueren
 /types/decay/                                       @enaeseth
 /types/decode-entities/                             @waspothegreat
@@ -934,6 +956,7 @@
 /types/deep-assign/                                 @souldreamer
 /types/deep-diff/                                   @ZauberNerd
 /types/deep-equal/                                  @remojansen @janslow
+/types/deep-equal-in-any-order/                     @bcaudan
 /types/deep-extend/                                 @rhysd
 /types/deep-freeze/                                 @Bartvds @aluanhaddad
 /types/deep-freeze-es6/                             @mattbishop
@@ -946,8 +969,6 @@
 /types/defined/                                     @BendingBender
 /types/deglob/                                      @saadq
 /types/deku/                                        @pocka
-/types/del/                                         @AyaMorisawa @BendingBender @bitjson
-/types/del/v2/                                      @AyaMorisawa
 /types/delaunator/                                  @DenisCarriere @BTOdell
 /types/delete-empty/                                @Alorel
 /types/deline/                                      @iarroyo5
@@ -963,7 +984,6 @@
 /types/derhuerst__cli-on-key/                       @jacobbubu
 /types/destroy/                                     @BendingBender
 /types/destroy-on-hwm/                              @BendingBender
-/types/detect-browser/                              @rogierschouten @carusology
 /types/detect-character-encoding/                   @BendingBender
 /types/detect-hover/                                @thomastilkema
 /types/detect-indent/                               @Bartvds @BendingBender
@@ -997,7 +1017,7 @@
 /types/dir-resolve/                                 @andy-ms
 /types/dirname-regex/                               @BendingBender
 /types/discontinuous-range/                         @OiCMudkips
-/types/discord-rpc/                                 @jasonhaxstuff
+/types/discord-rpc/                                 @jasonhaxstuff @lolPants
 /types/discourse-sso/                               @championswimmer
 /types/dispatchr/                                   @Ragg-
 /types/disposable-email-domains/                    @geoffreak
@@ -1051,6 +1071,7 @@
 /types/draggabilly/                                 @jaydubu
 /types/dragster/                                    @zskovacs
 /types/dragula/                                     @pwelter34 @abruzzihraig
+/types/driftless/                                   @dandelany
 /types/drivelist/                                   @WholeMilk
 /types/dropbox-chooser/                             @quas94
 /types/dropboxjs/                                   @Steve-Fenton @xperiments
@@ -1083,7 +1104,7 @@
 /types/easy-xapi/                                   @DeadAlready
 /types/easy-xapi-utils/                             @DeadAlready
 /types/ebongarde-root/                              @Ebongarde
-/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia @iRON5
+/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia @iRON5 @bilalucar
 /types/ecma-proposal-math-extensions/               @ksm2
 /types/ecurve/                                      @mhegazy
 /types/ed25519/                                     @erikma
@@ -1182,7 +1203,7 @@
 /types/env-paths/                                   @danwbyrne
 /types/env-to-object/                               @MugeSo
 /types/envify/                                      @tkQubo
-/types/enzyme/                                      @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden @hotell
+/types/enzyme/                                      @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden @hotell @screendriver
 /types/enzyme-adapter-react-15/                     @tkrotoff
 /types/enzyme-adapter-react-15.4/                   @nali
 /types/enzyme-adapter-react-16/                     @tkrotoff
@@ -1221,12 +1242,13 @@
 /types/estree/                                      @RReverser
 /types/etag/                                        @BendingBender
 /types/eth-lightwallet/                             @LogvinovLeon
+/types/eth-sig-util/                                @quezak
 /types/ethereum-protocol/                           @LogvinovLeon
-/types/ethereumjs-abi/                              @LogvinovLeon
+/types/ethereumjs-abi/                              @LogvinovLeon @quezak
 /types/ethereumjs-tx/                               @LogvinovLeon @dmihal
 /types/ethereumjs-util/                             @cortopy
 /types/ethjs-signer/                                @doppio
-/types/eureka-js-client/                            @Schnillz @karl-run @tombarton
+/types/eureka-js-client/                            @Schnillz @karl-run @tombarton @jpsullivan
 /types/evaporate/                                   @kookster @chrisrhoden @ailrun
 /types/event-emitter/                               @LKay
 /types/event-emitter-es6/                           @ahstro
@@ -1253,9 +1275,11 @@
 /types/expect-puppeteer/                            @JoshuaKGoldberg @tkrotoff
 /types/expect.js/                                   @teppeis
 /types/expectations/                                @vvakame
+/types/expired/                                     @BendingBender
 /types/expired-storage/                             @intolerance
 /types/expirymanager/                               @DanielRose
-/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian
+/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164
+/types/expo/v31/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164
 /types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
 /types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
 /types/expo/v26/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
@@ -1313,7 +1337,8 @@
 /types/express-slow-down/                           @jdforsythe
 /types/express-socket.io-session/                   @AylaJK
 /types/express-to-koa/                              @xiaohanzhang
-/types/express-unless/                              @wokim
+/types/express-unless/                              @wokim @joaovieira @michal-b-kaminski
+/types/express-urlrewrite/                          @mgroenhoff
 /types/express-version-request/                     @weffe
 /types/express-version-route/                       @weffe
 /types/express-wechat-access/                       @simmons8616
@@ -1332,7 +1357,7 @@
 /types/eyes/                                        @brynbellomy
 /types/ez-plus/                                     @AndersonFriaca
 /types/f1/                                          @neolwc
-/types/fabric/                                      @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson @RogerioTeixeira @BradleyHill
+/types/fabric/                                      @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson @RogerioTeixeira @BradleyHill @bmkrol823 @glenngartner
 /types/facebook-instant-games/                      @menushka @oyvindjam
 /types/facebook-js-sdk/                             @amritk @mahmoudzohdi @fluidsonic
 /types/facebook-pixel/                              @noctishsu
@@ -1346,7 +1371,7 @@
 /types/falcor-router/                               @Quramy @cdhgee
 /types/famous/                                      @borisvasilenko
 /types/fancy-log/                                   @pine
-/types/fancybox/                                    @borisyankov
+/types/fancybox/                                    @borisyankov @SPWizard01
 /types/farbtastic/                                  @EnableSoftware
 /types/fast-json-stable-stringify/                  @BendingBender
 /types/fast-levenshtein/                            @mizunashi-mana
@@ -1355,12 +1380,8 @@
 /types/fast64/                                      @rarmatei
 /types/fastclick/                                   @shinnn
 /types/fastify-accepts/                             @leomelzer
-/types/fastify-cors/                                @jannikkeye
 /types/fastify-favicon/                             @tuelsch
-/types/fastify-jwt/                                 @jannikkeye
-/types/fastify-multipart/                           @jannikkeye
 /types/fastify-rate-limit/                          @pc-jedi
-/types/fastify-static/                              @leomelzer
 /types/favico.js/                                   @drowse314-dev-ymat
 /types/favicons/                                    @mohsen1 @metsawyr
 /types/fb/                                          @JoshStrobl
@@ -1375,7 +1396,7 @@
 /types/feathersjs__authentication-oauth1/           @j2L4e
 /types/feathersjs__authentication-oauth2/           @j2L4e @NickBolles
 /types/feathersjs__configuration/                   @j2L4e
-/types/feathersjs__errors/                          @j2L4e
+/types/feathersjs__errors/                          @j2L4e @RazzM13
 /types/feathersjs__express/                         @j2L4e @DadUndead
 /types/feathersjs__feathers/                        @j2L4e @AbraaoAlves @TimMensch
 /types/feathersjs__primus/                          @j2L4e
@@ -1467,11 +1488,12 @@
 /types/focus-within/                                @eramdam
 /types/fontfaceobserver/                            @RandScullard
 /types/fontoxml/                                    @rolandzwaga
+/types/force-graph/                                 @p-kimberley
 /types/forever-agent/                               @yavanosta
 /types/forever-monitor/                             @shuntksh @wrboyce
 /types/forge-apis/                                  @Autodesk-Forge
 /types/forge-di/                                    @adamcarr
-/types/forge-viewer/                                @Autodesk-Forge
+/types/forge-viewer/                                @Autodesk-Forge @alansmithnbs
 /types/form-data/                                   @soywiz @leonyu @BendingBender
 /types/form-serialize/                              @tyler-johnson
 /types/form-serializer/                             @flqw
@@ -1685,7 +1707,7 @@
 /types/geolite2/                                    @ffflorian
 /types/geometry-dom/                                @nakakura
 /types/geopattern/                                  @Gaelan
-/types/gestalt/                                     @serranoarevalo
+/types/gestalt/                                     @serranoarevalo @joshgachnang
 /types/get-caller-file/                             @ajafff
 /types/get-certain/                                 @BendingBender
 /types/get-emails/                                  @BendingBender
@@ -1708,7 +1730,8 @@
 /types/ghauth/                                      @Leko
 /types/gifffer/                                     @gatimus
 /types/gijgo/                                       @atatanasov
-/types/giraffe/                                     @darthapo
+/types/giphy-api/                                   @screendriver
+/types/giraffe/                                     @darthapo @jgonggrijp
 /types/git/                                         @vvakame
 /types/git-add-remote/                              @BendingBender
 /types/git-branch/                                  @rynclark
@@ -1735,6 +1758,8 @@
 /types/gl-react-native/                             @jussikinnula
 /types/gl-shader/                                   @MathiasPaumgarten
 /types/gl-texture2d/                                @MathiasPaumgarten
+/types/gl-vec3/                                     @adamzerella
+/types/gl-vec4/                                     @adamzerella
 /types/gldatepicker/                                @qcz
 /types/glidejs/                                     @milanjaros
 /types/glob/                                        @vvakame @voy @ajafff
@@ -1780,7 +1805,7 @@
 /types/google.script.client-side/                   @clomie
 /types/google.visualization/                        @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov @glebm @shrujalshah28
 /types/google__maps/                                @indrimuska
-/types/googlemaps/                                  @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss @bolatovumar @gauthierm
+/types/googlemaps/                                  @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss @bolatovumar @gauthierm @captain-igloo
 /types/googlemaps.infobubble/                       @Dashue
 /types/googlepay/                                   @Fluccioni @Radu-Raicea @fstanis
 /types/got/                                         @BendingBender @LinusU @ikokostya @stijnvn
@@ -1792,7 +1817,7 @@
 /types/gramps__rest-helpers/                        @claude
 /types/graphite-udp/                                @EricByers
 /types/graphlib-dot/                                @DomParfitt
-/types/graphql/                                     @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz @bradzacher @clayne11 @JCMais @langpavel
+/types/graphql/                                     @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz @bradzacher @clayne11 @JCMais @langpavel @mc0
 /types/graphql-date/                                @enaeseth
 /types/graphql-deduplicator/                        @lfades
 /types/graphql-depth-limit/                         @eritikass
@@ -1817,7 +1842,7 @@
 /types/gridstack/                                   @PascalSenn @ZoolWay @Sl1MBoy
 /types/grpc-error/                                  @danwbyrne
 /types/grunt/                                       @jeffmay @basarat
-/types/gsap/                                        @codebelt @ProbablePrime @philipbulley @leomeloxp
+/types/gsap/                                        @codebelt @ProbablePrime @philipbulley @leomeloxp @AdemHodzic
 /types/gtin/                                        @RafaelKr
 /types/guardian__prosemirror-invisibles/            @dddotsev
 /types/guid/                                        @maroy1986
@@ -1845,6 +1870,7 @@
 /types/gulp-file-include/                           @DanielRosenwasser
 /types/gulp-filter/                                 @tkrotoff
 /types/gulp-flatten/                                @k-kagurazaka
+/types/gulp-gh-pages/                               @ntnyq
 /types/gulp-gzip/                                   @tkQubo
 /types/gulp-help/                                   @tkQubo
 /types/gulp-help-doc/                               @Mikhus
@@ -1898,6 +1924,7 @@
 /types/gulp-util/                                   @jedmao
 /types/gulp-watch/                                  @tkrotoff
 /types/gulp-zip/                                    @dudeofawesome
+/types/gun/                                         @Jack-Works
 /types/gzip-js/                                     @rhysd
 /types/gzip-size/                                   @plantain-00 @jimivdw @andrewiggins
 /types/gzip-size/v3/                                @plantain-00
@@ -1905,7 +1932,6 @@
 /types/halfred/                                     @dherges
 /types/halogen/                                     @steller
 /types/hammerjs/                                    @milkisevil @codler
-/types/handlebars/                                  @borisyankov @evil-shrike
 /types/handlebars-helpers/                          @Toilal
 /types/hapi/                                        @rafaelsouzaf @jhsimms @SimonSchick @saboya
 /types/hapi/v17/                                    @rafaelsouzaf @jhsimms @SimonSchick @saboya
@@ -1954,6 +1980,7 @@
 /types/heroku-logger/                               @kylevogt
 /types/hex-rgb/                                     @BendingBender
 /types/hex-rgba/                                    @r3nya
+/types/hexo/                                        @kentarouTakeda
 /types/hexo-bunyan/                                 @segayuu
 /types/hexo-fs/                                     @segayuu
 /types/hexo-log/                                    @segayuu
@@ -1969,15 +1996,15 @@
 /types/history.js/                                  @borisyankov @gjunge
 /types/historykana/                                 @h-shiratsuki
 /types/hjson/                                       @crunchie84
-/types/hls.js/                                      @jgainfort @brookback @adripanico
+/types/hls.js/                                      @jgainfort @brookback @adripanico @beraliv
 /types/hoek/                                        @prashaantt
-/types/hoist-non-react-statics/                     @JounQin
+/types/hoist-non-react-statics/                     @JounQin @jamesreggio
 /types/holderjs/                                    @renjfk
 /types/hooker/                                      @misak113
 /types/hopscotch/                                   @pimterry @Aurimas1
 /types/host-validation/                             @dintopple
 /types/hosted-git-info/                             @OiyouYeahYou
-/types/howler/                                      @xperiments @tdukart @alien35 @nicholashza
+/types/howler/                                      @xperiments @alien35 @nicholashza @cjurango
 /types/hpp/                                         @kryops
 /types/html-entities/                               @xstoudi
 /types/html-minifier/                               @tkrotoff @rikuayanokozy
@@ -1990,6 +2017,7 @@
 /types/html-webpack-plugin/                         @deevus @bumbleblym @tlaziuk
 /types/html-webpack-template/                       @bumbleblym
 /types/html2canvas/                                 @rwhepburn @tan9 @sschocke @Ristaaf
+/types/html5plus/                                   @dcloudio
 /types/htmlbars-inline-precompile/                  @chriskrycho
 /types/htmlparser2/                                 @staticfunction @LinusU
 /types/htmltojsx/                                   @basarat
@@ -2009,9 +2037,10 @@
 /types/http-status/                                 @misak113
 /types/http-string-parser/                          @pine613
 /types/httperr/                                     @yortus
-/types/hubot/                                       @dirk @KeesCBakker
+/types/hubot/                                       @dirk @KeesCBakker @eeemil
 /types/hubspot-pace/                                @borislavjivkov
 /types/humane/                                      @jmvrbanac
+/types/humanize-ms/                                 @adamzerella
 /types/humanize-plus/                               @DenisCarriere
 /types/humanize-string/                             @ragnarok56
 /types/humanize-url/                                @BendingBender
@@ -2028,13 +2057,10 @@
 /types/i18next/                                     @mxl @deerawan @GiedriusGrabauskas @lenovouser @qqilihq @butchyyyy
 /types/i18next/v8/                                  @mxl @deerawan @GiedriusGrabauskas
 /types/i18next/v2/                                  @mxl @deerawan @GiedriusGrabauskas
-/types/i18next-browser-languagedetector/            @cyrilschumacher @GiedriusGrabauskas
-/types/i18next-browser-languagedetector/v0/         @cyrilschumacher @GiedriusGrabauskas
 /types/i18next-express-middleware/                  @cyrilschumacher
 /types/i18next-ko/                                  @dwaxweiler
 /types/i18next-node-fs-backend/                     @cyrilschumacher @lenovouser
 /types/i18next-sprintf-postprocessor/               @cyrilschumacher
-/types/i18next-xhr-backend/                         @jamuhl @GiedriusGrabauskas
 /types/i2c-bus/                                     @101100
 /types/iarna__toml/                                 @ajafff
 /types/iban/                                        @cyrilschumacher
@@ -2075,6 +2101,7 @@
 /types/in-range/                                    @DanielRosenwasser
 /types/inboxsdk/                                    @rdoursenaud @amiram
 /types/incremental-dom/                             @basarat @lanthaler @vvakame
+/types/indefinite/                                  @omaishr
 /types/indent-string/                               @mhegazy @BendingBender
 /types/inert/                                       @nycdotnet @AJamesPhillips @lenovouser
 /types/inert/v4/                                    @nycdotnet @AJamesPhillips
@@ -2085,8 +2112,12 @@
 /types/iniparser/                                   @chrootsu
 /types/init-package-json/                           @kfarnung
 /types/ink/                                         @cprecioso
+/types/ink-spinner/                                 @lukostry
+/types/ink-table/                                   @lukostry
+/types/ink-text-input/                              @lukostry
 /types/inline-css/                                  @philipisapain
 /types/inline-style-prefixer/                       @ahz @dpetrezselyova @franklixuefei
+/types/inputmask/                                   @dmester
 /types/inquirer/                                    @tkQubo @ppathan @jouderianjr @bang88 @bitjson @synarque @jrockwood @kwkelly @Ailrun
 /types/inquirer-npm-name/                           @manuth
 /types/insert-css/                                  @hvoecking
@@ -2097,8 +2128,6 @@
 /types/intercom-client/                             @jineshshah36 @peping
 /types/intercom-web/                                @fongandrew @salbahra @onatm
 /types/intercomjs/                                  @spencerwi
-/types/internal-ip/                                 @BendingBender
-/types/internal-ip/v2/                              @BendingBender
 /types/interpret/                                   @BendingBender
 /types/intl/                                        @RagibHasin
 /types/intl-locales-supported/                      @Slessi
@@ -2135,6 +2164,7 @@
 /types/is-array/                                    @pine
 /types/is-array-sorted/                             @BendingBender
 /types/is-binary-path/                              @DanielRosenwasser
+/types/is-blank/                                    @heygambo
 /types/is-buffer/                                   @rokt33r
 /types/is-callable/                                 @nieltg
 /types/is-charging/                                 @BendingBender
@@ -2156,11 +2186,12 @@
 /types/is-ip/                                       @coderslagoon
 /types/is-mobile/                                   @LogvinovLeon
 /types/is-my-json-valid/                            @kruncher
+/types/is-natural-number/                           @adamzerella
 /types/is-negated-glob/                             @ajafff
 /types/is-number/                                   @harryshipton
 /types/is-obj/                                      @forivall
 /types/is-object/                                   @wbhob
-/types/is-online/                                   @BendingBender
+/types/is-odd/                                      @adamzerella
 /types/is-path-cwd/                                 @DanielRosenwasser
 /types/is-path-in-cwd/                              @mhegazy
 /types/is-plain-obj/                                @BendingBender
@@ -2196,7 +2227,7 @@
 /types/iso-3166-2/                                  @sicilica
 /types/iso8601-localizer/                           @avielfedida
 /types/isomorphic-fetch/                            @toddlucas
-/types/isotope-layout/                              @avidenic @malinushj
+/types/isotope-layout/                              @avidenic @malinushj @SPWizard01
 /types/issue-parser/                                @Leko
 /types/issue-regex/                                 @BendingBender
 /types/istanbul/                                    @tkrotoff
@@ -2240,14 +2271,14 @@
 /types/jcanvas/                                     @rogierschouten
 /types/jdataview/                                   @RReverser
 /types/jdenticon/                                   @mtr
-/types/jest/                                        @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @joshuakgoldberg @UselessPickles @r3nya @hotell @sebald @andys8
+/types/jest/                                        @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @joshuakgoldberg @UselessPickles @r3nya @hotell @sebald @andys8 @antoinebrault
 /types/jest/v16/                                    @NoHomey @jwbay
 /types/jest-axe/                                    @JoshuaKGoldberg
 /types/jest-cli/                                    @lifeiscontent
 /types/jest-diff/                                   @myabc
 /types/jest-docblock/                               @ikatyang
 /types/jest-each/                                   @theutz @nickmccurdy
-/types/jest-environment-puppeteer/                  @joshuakgoldberg
+/types/jest-environment-puppeteer/                  @joshuakgoldberg @ifiokjr
 /types/jest-get-type/                               @myabc
 /types/jest-image-snapshot/                         @dawnmist
 /types/jest-in-case/                                @geovanisouza92
@@ -2267,7 +2298,7 @@
 /types/jjve/                                        @Nemo157
 /types/jmespath/                                    @pushplay
 /types/johnny-five/                                 @nakakura @ujvzolee @workshop2 @xtrimsystems @marcinobiedz
-/types/joi/                                         @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
+/types/joi/                                         @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick @afharo
 /types/joi/v13/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd @thewillg @SimonSchick
 /types/joi/v10/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @aconanlai
 /types/joi/v6/                                      @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
@@ -2423,8 +2454,10 @@
 /types/js.spec/                                     @mattbishop
 /types/jsbn/                                        @Evgenus @al2xed
 /types/jschannel/                                   @yitzchok @McFlat
+/types/jscodeshift/                                 @brieb
 /types/jscrollpane/                                 @qcz
 /types/jsdeferred/                                  @minodisk
+/types/jsdoc-to-markdown/                           @adamzerella
 /types/jsdom/                                       @leonard-thieu @palmfjord
 /types/jsen/                                        @vladeck
 /types/jsend/                                       @CaselIT
@@ -2452,13 +2485,14 @@
 /types/json-stringify-safe/                         @BendingBender
 /types/json2csv/                                    @juanjoDiaz
 /types/json2md/                                     @MartynasZilinskas
+/types/json2mq/                                     @ZhangYiJiang
 /types/json3/                                       @NN---
 /types/json5/                                       @Esemesek
 /types/json_ml/                                     @pluma
 /types/jsonabc/                                     @ffflorian
 /types/jsonapi-serializer/                          @chiangf
 /types/jsonata/                                     @nick121212
-/types/jsoneditor/                                  @alejo90 @errietta
+/types/jsoneditor/                                  @alejo90 @errietta @adamvig
 /types/jsoneditor-for-react/                        @joshuakgoldberg
 /types/jsoneditoronline/                            @vbortone
 /types/jsonfile/                                    @dbowring @BendingBender
@@ -2515,7 +2549,8 @@
 /types/jwt-simple/                                  @kenfdev @GaelMagnan
 /types/jwt-then/                                    @phenomax
 /types/k6/                                          @MajorBreakfast
-/types/kafka-node/                                  @dansitu @bkim54 @sfrooster @amiram
+/types/kafka-node/                                  @dansitu @bkim54 @sfrooster @amiram @insanehong
+/types/kafkajs/                                     @michal-b-kaminski
 /types/karma/                                       @tkrotoff @43081j @devoto13
 /types/karma/v1/                                    @tkrotoff @43081j
 /types/karma-chai/                                  @JayAndCatchFire
@@ -2525,7 +2560,7 @@
 /types/karma-jasmine/                               @michelsalib
 /types/karma-viewport/                              @karak
 /types/karma-webpack/                               @mtraynham
-/types/katex/                                       @mrand01 @knguyen0125
+/types/katex/                                       @mrand01 @knguyen0125 @dreamerblue
 /types/kcors/                                       @Xstoudi @izayoiko
 /types/kdbush/                                      @DenisCarriere @chrfrasco
 /types/kdbxweb/                                     @Roang-zero1
@@ -2548,7 +2583,8 @@
 /types/keyv__redis/                                 @BendingBender
 /types/keyv__sqlite/                                @BendingBender
 /types/kik-browser/                                 @joelday
-/types/klaw/                                        @mceachen
+/types/kissfft-js/                                  @racerhere
+/types/klaw/                                        @mceachen @p4sca1
 /types/klaw/v1/                                     @mceachen
 /types/klaw-sync/                                   @shiftkey
 /types/kms-json/                                    @sunnyone
@@ -2579,7 +2615,7 @@
 /types/koa-better-body/                             @danwbyrne
 /types/koa-bodyparser/                              @hellopao @anup-2s @hirochachacha
 /types/koa-bouncer/                                 @maruware
-/types/koa-bunyan-logger/                           @sjmcdowall
+/types/koa-bunyan-logger/                           @sjmcdowall @jankdc
 /types/koa-cache-control/                           @pe8ter
 /types/koa-compose/                                 @jkeylu
 /types/koa-compress/                                @hellopao
@@ -2593,7 +2629,7 @@
 /types/koa-hbs/                                     @jcbmln @mudkipme
 /types/koa-helmet/                                  @me
 /types/koa-html-minifier/                           @romain-faust
-/types/koa-joi-router/                              @wingsbob @move-zig @hirochachacha
+/types/koa-joi-router/                              @wingsbob @move-zig @hirochachacha @NotWoods
 /types/koa-json/                                    @brooklyndev
 /types/koa-json-error/                              @mudkipme
 /types/koa-log/                                     @havenchyk
@@ -2618,7 +2654,7 @@
 /types/koa-send/                                    @pe8ter @tlaziuk
 /types/koa-session/                                 @kerol2r20 @tlaziuk @hirochachacha
 /types/koa-session-minimal/                         @longztian
-/types/koa-sslify/                                  @wingsbob
+/types/koa-sslify/                                  @wingsbob @msokk
 /types/koa-static/                                  @hellopao @tlaziuk
 /types/koa-static-cache/                            @JounQin
 /types/koa-static-server/                           @wulunyi
@@ -2657,7 +2693,7 @@
 /types/ldap-filters/                                @pluma
 /types/ldapjs/                                      @cvillemure @peterkooijmans
 /types/leadfoot/                                    @theintern
-/types/leaflet/                                     @alejo90 @atd-schubert @mcauer
+/types/leaflet/                                     @alejo90 @atd-schubert @mcauer @ronikar
 /types/leaflet/v0/                                  @rgripper
 /types/leaflet-areaselect/                          @awallat
 /types/leaflet-curve/                               @onikiienko
@@ -2711,6 +2747,7 @@
 /types/libxslt/                                     @alejo90
 /types/license-checker/                             @rogierschouten @unindented
 /types/liftoff/                                     @BendingBender
+/types/lil-uri/                                     @wcarson
 /types/lil-uuid/                                    @Pr1st0n
 /types/lime-js/                                     @arthur-xavier
 /types/line-by-line/                                @etomsen
@@ -2726,6 +2763,7 @@
 /types/linkifyjs/                                   @szhu @ovidiubute
 /types/list-git-remotes/                            @BendingBender
 /types/list-stream/                                 @IanStorm
+/types/list.js/                                     @jeffreymeng
 /types/listr/                                       @durad
 /types/lls/                                         @borislavjivkov
 /types/load-google-maps-api/                        @oBusk
@@ -3045,7 +3083,7 @@
 /types/loglevel/                                    @Pro @szmeti @screendriver
 /types/logrotate-stream/                            @rogierschouten
 /types/lokijs/                                      @TeamworkGuy2 @thomasconner
-/types/lolex/                                       @Nemo157 @joshuakgoldberg @rogierschouten
+/types/lolex/                                       @Nemo157 @joshuakgoldberg @rogierschouten @zyishai
 /types/long/                                        @peterkooijmans
 /types/looks-same/                                  @xcatliu
 /types/loopback/                                    @kattsushi @enko @sequoia @drmikecrowe @karimsa
@@ -3059,6 +3097,7 @@
 /types/lowlight/                                    @NoHomey
 /types/lozad/                                       @plantain-00
 /types/lru-cache/                                   @Bartvds @BendingBender
+/types/lru-cache/v4/                                @Bartvds @BendingBender
 /types/lscache/                                     @Chris-Martinezz
 /types/ltx/                                         @PJakcson @BendingBender
 /types/luaparse/                                    @stpettersens
@@ -3077,7 +3116,7 @@
 /types/maildev/                                     @cyrilschumacher @zbarbuto
 /types/mailgen/                                     @vothanhkiet @jordanfarrer
 /types/mailgun-js/                                  @sampsonjoliver @andipaetzold
-/types/mailparser/                                  @psnider
+/types/mailparser/                                  @psnider @Avol-V
 /types/main-bower-files/                            @k-kagurazaka
 /types/make-dir/                                    @ikatyang @BendingBender
 /types/maker.js/                                    @danmarshall
@@ -3092,13 +3131,14 @@
 /types/mangopay2-nodejs-sdk/                        @ifiokjr
 /types/map-obj/                                     @BendingBender
 /types/mapbox/                                      @anahkiasen @Fluccioni
-/types/mapbox-gl/                                   @dobrud @patrickr
+/types/mapbox-gl/                                   @dobrud @patrickr @macobo
 /types/mapbox-gl-leaflet/                           @agorshkov23
 /types/mapbox__geo-viewport/                        @fnberta
 /types/mapbox__geojson-area/                        @n0nick
 /types/mapbox__polyline/                            @Kern0 @mklopets
 /types/mapbox__s3urls/                              @sebastianvera
 /types/mapbox__shelf-pack/                          @Perlmint
+/types/mapbox__sphericalmercator/                   @nhusher
 /types/mapnik/                                      @ipv4sec
 /types/mapsjs/                                      @davismj
 /types/mariasql/                                    @bennett000
@@ -3109,7 +3149,7 @@
 /types/markdown-it-lazy-headers/                    @knom
 /types/markdown-pdf/                                @MonsieurMan
 /types/markdownlint/                                @ark120202
-/types/marked/                                      @worr @BendingBender @CrossR @mwickett
+/types/marked/                                      @worr @BendingBender @CrossR @mwickett @htkzhtm
 /types/marked-terminal/                             @bkendall
 /types/marker-animate-unobtrusive/                  @viskin
 /types/markerclustererplus/                         @enanox @mxl
@@ -3177,7 +3217,7 @@
 /types/mem-fs-editor/                               @MyFoodBag
 /types/memcached/                                   @KentarouTakeda
 /types/memdown/                                     @MeirionHughes @danwbyrne
-/types/memjs/                                       @leizongmin
+/types/memjs/                                       @leizongmin @BendingBender
 /types/memoize-one/                                 @karol-majewski @franklixuefei
 /types/memoize-one/v3/                              @karol-majewski @franklixuefei
 /types/memoizee/                                    @juanpicado
@@ -3217,6 +3257,7 @@
 /types/micro-events/                                @AlexanderSychev
 /types/micromatch/                                  @glen-84 @vemoo
 /types/micromatch/v2/                               @glen-84
+/types/micromodal/                                  @wcarson
 /types/microrouter/                                 @mathieudutour
 /types/microservice-utilities/                      @runebaas
 /types/microsoft-ajax/                              @pjmagee
@@ -3279,6 +3320,7 @@
 /types/moment-duration-format/                      @SwintDC @TwoStone @leonard-thieu @bendykowski
 /types/moment-holiday/                              @rwdalpe
 /types/moment-jalaali/                              @alitaheri
+/types/moment-precise-range-plugin/                 @gricey432
 /types/moment-range/                                @Burgov @wilgert @franjuan @MartynasZilinskas @chemass
 /types/moment-round/                                @jacobbaskin
 /types/moment-shortformat/                          @whatasoda
@@ -3286,11 +3328,11 @@
 /types/moment-timezone/                             @michelsalib @alanblins @asermax
 /types/money-math/                                  @taoqf
 /types/mongo-sanitize/                              @CedricCazin
-/types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric @erikc5000
+/types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric @erikc5000 @Manc
 /types/mongodb/v2/                                  @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi
 /types/mongodb-memory-server/                       @dmitryrogozhny
 /types/mongodb-uri/                                 @mernxl
-/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier @frontendmonster @mingchen
+/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier @frontendmonster @mingchen @penumbra1
 /types/mongoose/v4/                                 @simonxca @horiuchi @lukasz-zak
 /types/mongoose-auto-increment/                     @AyaMorisawa
 /types/mongoose-deep-populate/                      @AyaMorisawa
@@ -3316,7 +3358,7 @@
 /types/mousetrap/                                   @qcz @alanhchoi
 /types/move-concurrently/                           @mgroenhoff
 /types/move-file/                                   @BendingBender
-/types/moveto/                                      @shermendev
+/types/moveto/                                      @shermendev @pea3nut
 /types/moviedb/                                     @basarat @0x6368656174
 /types/moxios/                                      @itoasuka
 /types/mozilla-readability/                         @charlesvdv
@@ -3344,6 +3386,7 @@
 /types/multiplexjs/                                 @KamyarNazeri
 /types/multisort/                                   @CzBuCHi
 /types/multistream/                                 @mrmlnc @kenzierocks
+/types/mumath/                                      @adamzerella
 /types/muri/                                        @jloveridge
 /types/murmurhash/                                  @atd-schubert
 /types/murmurhash-js/                               @cvle
@@ -3369,6 +3412,8 @@
 /types/nats-hemera/                                 @vforv
 /types/natsort/                                     @mgroenhoff
 /types/natural/                                     @dmoonfire
+/types/natural-compare/                             @doniyor2109
+/types/natural-compare-lite/                        @doniyor2109
 /types/natural-sort/                                @a-morales @fluggo
 /types/navermaps/                                   @ckboyjiy
 /types/navigation/                                  @grahammendick
@@ -3437,14 +3482,16 @@
 /types/nightwatch/                                  @rkavalap @schlesiger @ClaytonAstrom
 /types/nise/                                        @a-tarasyuk
 /types/nivo-slider/                                 @AndersonFriaca
-/types/noble/                                       @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
+/types/no-scroll/                                   @ZhangYiJiang
+/types/noble/                                       @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko @claytonkucera
 /types/noble-mac/                                   @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
 /types/nock/                                        @bonnici @horiuchi @afharo @mastermatt @damour @paambaati
 /types/nodal/                                       @charrondev
-/types/node/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela @kuehlein
-/types/node/v9/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude @r3nya @eyqs
-/types/node/v8/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude @r3nya
-/types/node/v7/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry
+/types/node/                                        @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @btoueg @brunoscheufler @smac89 @tellnes @touffy @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela @kuehlein @j-oliveras @bhongy
+/types/node/v10/                                    @Microsoft @DefinitelyTyped @jkomyno @a-tarasyuk @alvis @r3nya @brunoscheufler @smac89 @tellnes @DeividasBakanas @eyqs @Flarna @Hannes-Magnusson-CK @KSXGitHub @hoo29 @kjin @ajafff @islishude @mwiktorczyk @matthieusieben @mohsen1 @n-e @octo-sniffle @parambirs @eps1lon @SimonSchick @ThomasdenH @WilcoBakker @wwwy3y3 @ZaneHannanAU @jeremiergz @samuela @kuehlein @j-oliveras @bhongy
+/types/node/v9/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude @r3nya @eyqs @j-oliveras @bhongy
+/types/node/v8/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude @r3nya @j-oliveras @bhongy
+/types/node/v7/                                     @Microsoft @DefinitelyTyped @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry @j-oliveras
 /types/node/v6/                                     @Microsoft @DefinitelyTyped @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub @Archcry
 /types/node/v4/                                     @Microsoft @DefinitelyTyped @eps1lon @Archcry
 /types/node/v0/                                     @Microsoft @DefinitelyTyped
@@ -3457,9 +3504,9 @@
 /types/node-cron/                                   @maximelkin @burtek
 /types/node-dijkstra/                               @nokutu
 /types/node-dir/                                    @panuhorsmalahti
-/types/node-dogstatsd/                              @chrisbobo
+/types/node-dogstatsd/                              @chrisbobo @xzyfer
 /types/node-emoji/                                  @jonestristand @styu @rimiti
-/types/node-fetch/                                  @torstenwerner @nikcorg @vinaybedre
+/types/node-fetch/                                  @torstenwerner @nikcorg @vinaybedre @kyranet
 /types/node-fibers/                                 @caryhaynie
 /types/node-forge/                                  @westy92 @flynetworks @a-k-g @rafal2228 @beenotung @joeflateau @Apologiz @timhwang21 @supaiku0 @andersk
 /types/node-gcm/                                    @horiuchi
@@ -3471,6 +3518,7 @@
 /types/node-hue-api/                                @fjmorel
 /types/node-int64/                                  @x3cion @kevin-greene-ck
 /types/node-ipc/                                    @arvitaly @gjurgens
+/types/node-jose/                                   @nadunindunil
 /types/node-jsfl-runner/                            @mrand01
 /types/node-json-db/                                @kuzn-ilya
 /types/node-localstorage/                           @intolerance
@@ -3485,6 +3533,7 @@
 /types/node-redis-pubsub/                           @renekeijzer
 /types/node-resque/                                 @gordey4doronin
 /types/node-rsa/                                    @alitaheri @xm @ffflorian
+/types/node-sass/                                   @pspeter3 @chriseppstein
 /types/node-schedule/                               @cyrilschumacher @flowpl
 /types/node-slack/                                  @tkQubo
 /types/node-snap7/                                  @heilingbrunner
@@ -3523,7 +3572,6 @@
 /types/nopt/                                        @jbondc
 /types/normalize-package-data/                      @jdxcode
 /types/normalize-path/                              @BendingBender
-/types/normalize-url/                               @odin3 @BendingBender @mathieumg
 /types/notie/                                       @mateusdemboski
 /types/notify/                                      @hellochar
 /types/notifyjs/                                    @soundTricker @NateScarlet
@@ -3537,10 +3585,12 @@
 /types/npm-email/                                   @BendingBender
 /types/npm-keyword/                                 @BendingBender
 /types/npm-license-crawler/                         @ffflorian
+/types/npm-list-author-packages/                    @ffflorian
 /types/npm-name/                                    @BendingBender
 /types/npm-package-arg/                             @mgroenhoff @OiYouYeahYou
 /types/npm-packlist/                                @ajafff
 /types/npm-paths/                                   @BendingBender
+/types/npm-registry-package-info/                   @ffflorian
 /types/npm-run-path/                                @BendingBender
 /types/npm-user/                                    @BendingBender
 /types/npm-user-packages/                           @BendingBender
@@ -3548,6 +3598,7 @@
 /types/ns-api/                                      @Archcry
 /types/nslog/                                       @unindented
 /types/nsqjs/                                       @cezaryrk
+/types/nssm/                                        @hongaar
 /types/number-is-nan/                               @mhegazy
 /types/number-to-words/                             @frederickfogerty
 /types/numeral/                                     @vbortone @BehindTheMath @klujanrosas
@@ -3604,14 +3655,18 @@
 /types/one-time/                                    @BendingBender
 /types/onesignal-cordova-plugin/                    @broder
 /types/onetime/                                     @BendingBender
+/types/onetime/v2/                                  @BendingBender
 /types/oniguruma/                                   @smhxx
+/types/onionoo/                                     @BendingBender
 /types/onoff/                                       @marcel-ernst @Kallu609
 /types/ontime/                                      @Hirse
 /types/open/                                        @Bartvds
 /types/open-editor/                                 @BendingBender
+/types/open-graph/                                  @ffflorian
 /types/openapi-factory/                             @runebaas
 /types/opener/                                      @tikurahul
 /types/openfin/                                     @chrisbarker @rdepena @whyn07m3 @licui3936
+/types/openfin/v37/                                 @chrisbarker @rdepena @whyn07m3 @licui3936
 /types/openfin/v34/                                 @chrisbarker @rdepena @whyn07m3
 /types/openfin/v29/                                 @chrisbarker @rdepena
 /types/openfin/v17/                                 @chrisbarker
@@ -3659,25 +3714,19 @@
 /types/p-defer/                                     @SamVerschueren @BendingBender
 /types/p-do-whilst/                                 @BendingBender
 /types/p-each-series/                               @BendingBender
-/types/p-event/                                     @BendingBender
 /types/p-every/                                     @BendingBender
 /types/p-forever/                                   @BendingBender
 /types/p-is-promise/                                @BendingBender
 /types/p-lazy/                                      @BendingBender
-/types/p-limit/                                     @BendingBender @LinusU
 /types/p-loading/                                   @renjfk
 /types/p-locate/                                    @BendingBender
 /types/p-log/                                       @BendingBender
-/types/p-map/                                       @BendingBender
 /types/p-map-series/                                @BendingBender
 /types/p-memoize/                                   @forabi
 /types/p-min-delay/                                 @BendingBender
 /types/p-one/                                       @BendingBender
-/types/p-pipe/                                      @BendingBender
 /types/p-progress/                                  @icopp
 /types/p-props/                                     @BendingBender
-/types/p-queue/                                     @BendingBender @evanshortiss
-/types/p-queue/v2/                                  @BendingBender @evanshortiss
 /types/p-reduce/                                    @BendingBender
 /types/p-reflect/                                   @BendingBender
 /types/p-retry/                                     @BendingBender
@@ -3685,7 +3734,6 @@
 /types/p-settle/                                    @natesilva
 /types/p-some/                                      @BendingBender
 /types/p-tap/                                       @BendingBender
-/types/p-throttle/                                  @BendingBender
 /types/p-time/                                      @BendingBender
 /types/p-timeout/                                   @BendingBender
 /types/p-times/                                     @BendingBender
@@ -3694,7 +3742,7 @@
 /types/p-wait-for/v1/                               @BendingBender
 /types/p-waterfall/                                 @BendingBender
 /types/p-whilst/                                    @BendingBender
-/types/p2/                                          @clark-stevenson
+/types/p2/                                          @clark-stevenson @jramstedt
 /types/p5/                                          @p5-types
 /types/package-json/                                @jinwoo @BendingBender
 /types/packery/                                     @piraveen @hanssens
@@ -3716,7 +3764,7 @@
 /types/parity-pmr/                                  @leovujanic
 /types/parity-poe/                                  @leovujanic
 /types/park-miller/                                 @BendingBender
-/types/parse/                                       @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas @agoldis
+/types/parse/                                       @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas @agoldis @AlexandreHetu
 /types/parse/v1/                                    @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
 /types/parse-columns/                               @BendingBender
 /types/parse-filepath/                              @BendingBender
@@ -3811,6 +3859,7 @@
 /types/petit-dom/                                   @JamesMessinger
 /types/pg/                                          @pspeter3
 /types/pg/v6/                                       @pspeter3
+/types/pg-copy-streams/                             @fluggo
 /types/pg-ears/                                     @bradleyayers
 /types/pg-escape/                                   @khell
 /types/pg-format/                                   @zopf
@@ -3822,7 +3871,7 @@
 /types/phantom/                                     @horiuchi @llRandom
 /types/phantomcss/                                  @abauzac
 /types/phantomjs/                                   @jedhunsaker @keesey
-/types/phoenix/                                     @mciastek
+/types/phoenix/                                     @mciastek @John-Goff @princemaple
 /types/phone/                                       @DxCx
 /types/phone-formatter/                             @westy92
 /types/phonegap/                                    @borisyankov @DickvdBrink
@@ -3839,7 +3888,7 @@
 /types/pid-from-port/                               @BendingBender
 /types/pidusage/                                    @cyrilschumacher @mx601595686
 /types/pify/                                        @samverschueren @mad-mike @c7hm4r
-/types/pigpio/                                      @manerfan @erikma
+/types/pigpio/                                      @manerfan @erikma @park012241
 /types/pigpio-dht/                                  @erikma
 /types/pikaday/                                     @MidnightDesign @wake42 @mezoistvan
 /types/pikaday-time/                                @Sayan751
@@ -3857,6 +3906,7 @@
 /types/pkg-dir/                                     @NK-WEB-Git
 /types/pkg-up/                                      @forivall
 /types/pkg-versions/                                @BendingBender
+/types/pkgcloud/                                    @dantman
 /types/pkijs/                                       @microshine
 /types/platform/                                    @JakeH
 /types/playcanvas/                                  @Neoflash1979
@@ -3864,13 +3914,12 @@
 /types/playmusic/                                   @nickp10
 /types/pleasejs/                                    @nakakura
 /types/plist/                                       @higuri
-/types/plotly.js/                                   @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs @MercifulCode @soorajpudiyadath @jonfreedman @meganrm
+/types/plotly.js/                                   @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs @MercifulCode @soorajpudiyadath @jonfreedman @meganrm @zeroyoichihachi
 /types/plugapi/                                     @BNedry
 /types/plugin-error/                                @rogierschouten
 /types/plupload/                                    @patrickbussmann
 /types/plur/                                        @iRoachie
 /types/pluralize/                                   @ukyo @karol-majewski
-/types/png-async/                                   @kanreisa
 /types/png.js/                                      @ffflorian
 /types/pngjs/                                       @jason0x43
 /types/pngquant-bin/                                @hikoma
@@ -3899,9 +3948,11 @@
 /types/postcss-modules-local-by-default/            @huan086
 /types/postcss-modules-resolve-imports/             @huan086
 /types/postcss-modules-scope/                       @huan086
+/types/postcss-nested/                              @VorontsovMaxim
 /types/postcss-url/                                 @lenovouser
 /types/postman-collection/                          @kbuzby
 /types/postmark/                                    @benbayard @jineshshah36
+/types/postmate/                                    @wcarson
 /types/pouch-redux-middleware/                      @charrondev
 /types/pouchdb/                                     @AGBrown @geppy @fredgalvao
 /types/pouchdb-adapter-fruitdown/                   @spaulg @geppy @fredgalvao
@@ -3928,12 +3979,14 @@
 /types/preloadjs/                                   @endel
 /types/prelude-ls/                                  @AyaMorisawa
 /types/prettier/                                    @ikatyang
+/types/pretty/                                      @adamzerella
 /types/pretty-bytes/                                @plantain-00 @danielasy
 /types/pretty-bytes/v4/                             @plantain-00
 /types/pretty-format/                               @ikatyang
 /types/pretty-hrtime/                               @BendingBender
 /types/pretty-ms/                                   @BendingBender @ocboogie @silh
 /types/pretty-ms/v3/                                @BendingBender @ocboogie
+/types/pretty-time/                                 @adamzerella
 /types/preval.macro/                                @huan086
 /types/printf/                                      @AluisioASG
 /types/priorityqueuejs/                             @geoffreak
@@ -3942,6 +3995,7 @@
 /types/private-ip/                                  @coderslagoon
 /types/procfs-stats/                                @cyrilschumacher
 /types/progress/                                    @sebastian-lenz
+/types/progress-stream/                             @mickdekkers
 /types/progressbar/                                 @atd-schubert
 /types/progressjs/                                  @zaneli
 /types/proj4/                                       @DenisCarriere @BendingBender
@@ -3969,8 +4023,8 @@
 /types/prompt-sync-history/                         @MugeSo
 /types/promptly/                                    @danrspencer
 /types/prompts/                                     @Berkays @danielpa9708 @kamontat
-/types/prop-types/                                  @DovydasNavickas @ferdaber
-/types/proper-lockfile/                             @qlonik
+/types/prop-types/                                  @DovydasNavickas @ferdaber @eps1lon
+/types/proper-lockfile/                             @qlonik @LinusU
 /types/properties-reader/                           @Goldsmith42
 /types/prosemirror-collab/                          @bradleyayers @davidka @timjb @patsimm
 /types/prosemirror-commands/                        @bradleyayers @davidka @timjb @patsimm
@@ -3986,6 +4040,7 @@
 /types/prosemirror-schema-list/                     @bradleyayers @davidka @timjb @patsimm
 /types/prosemirror-state/                           @bradleyayers @davidka @timjb @patsimm
 /types/prosemirror-tables/                          @superchu @eshvedai @patsimm
+/types/prosemirror-test-builder/                    @ifiokjr
 /types/prosemirror-transform/                       @bradleyayers @davidka @timjb @patsimm
 /types/prosemirror-view/                            @bradleyayers @davidka @timjb @patsimm
 /types/proton-native/                               @khanhas @ltetzlaff
@@ -4004,7 +4059,7 @@
 /types/ptomasroos__react-native-multi-slider/       @Slessi
 /types/pty.js/                                      @enlight
 /types/public-ip/                                   @BendingBender
-/types/pubnub/                                      @bitbankinc @rollymaduk @vitosamson @FlorianDr @danduh
+/types/pubnub/                                      @bitbankinc @rollymaduk @vitosamson @FlorianDr @danduh @ChristianBoehlke
 /types/pubsub-js/                                   @borisyankov
 /types/pug/                                         @TonyPythoneer @19majkel94
 /types/pulltorefreshjs/                             @DanielRosenwasser @humpedli
@@ -4053,7 +4108,7 @@
 /types/radius/                                      @codeanimal
 /types/radix64/                                     @huan086
 /types/raf/                                         @BenLorantfy
-/types/ramda/                                       @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm @drewwyatt @jottenlips @minitesh
+/types/ramda/                                       @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm @drewwyatt @jottenlips @minitesh @krantisinh
 /types/random-boolean/                              @BendingBender
 /types/random-float/                                @BendingBender
 /types/random-int/                                  @BendingBender
@@ -4091,7 +4146,7 @@
 /types/rc/                                          @DanielRosenwasser @BendingBender
 /types/rc-progress/                                 @jussikinnula
 /types/rc-select/                                   @DenisTirilis
-/types/rc-slider/                                   @mantasmarcinkus @mattoni @paustint @j-fro @Deanna2
+/types/rc-slider/                                   @mantasmarcinkus @mattoni @paustint @j-fro @Deanna2 @nicholasmaddren @nulladdict
 /types/rc-switch/                                   @karol-majewski
 /types/rc-time-picker/                              @Hoff97
 /types/rc-tooltip/                                  @rhysd @ahstro @vsaarinen
@@ -4102,7 +4157,7 @@
 /types/rdflib/                                      @cenotelie
 /types/re-base/                                     @jordandrako
 /types/reach__router/                               @kingdaro
-/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Jessidhia @pshrmn @threepointone
+/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Jessidhia @pshrmn @threepointone @saranshkataria
 /types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz
 /types/react-adal/                                  @dkorolev1
 /types/react-albus/                                 @sseppola @conradreuter @kuirak
@@ -4116,10 +4171,10 @@
 /types/react-aria-modal/                            @forabi
 /types/react-autocomplete/                          @lstanden
 /types/react-autosuggest/                           @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
-/types/react-avatar-editor/                         @diogocorrea @gabsprates
+/types/react-avatar-editor/                         @diogocorrea @gabsprates @lsenta @davidspiess
 /types/react-beautiful-dnd/                         @varHarrie @bradleyayers @paustint @marknelissen @enricoboccadifuoco @lonyele
 /types/react-better-password/                       @mhuynh1
-/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87
+/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87 @ldthorne
 /types/react-blessed/                               @me
 /types/react-body-classname/                        @mhegazy
 /types/react-bootstrap/                             @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran @bes
@@ -4137,7 +4192,7 @@
 /types/react-calendar-timeline/                     @radziksh @acemac
 /types/react-cartographer/                          @trevonmckay
 /types/react-circular-progressbar/                  @lstanden
-/types/react-click-outside/                         @screendriver
+/types/react-click-outside/                         @screendriver @Ky6uk
 /types/react-close-on-escape/                       @JamesAlias
 /types/react-codemirror/                            @velveret @rudi-c
 /types/react-coinhive/                              @sktbcbbs
@@ -4166,15 +4221,16 @@
 /types/react-daterange-picker/                      @uncovertruth @MartynasZilinskas @donaldtf @vladflorescu94
 /types/react-dates/                                 @ArturAmpilogov @NathanNZ
 /types/react-daum-postcode/                         @Sa-ryong
+/types/react-dev-utils/                             @ark120202
 /types/react-dnd-multi-backend/                     @dawnmist @beeequeue
 /types/react-dnd-touch-backend/                     @mleko @dawnmist @beeequeue
 /types/react-document-meta/                         @ulrichb
 /types/react-document-title/                        @cleverguy25
-/types/react-dom/                                   @MartynasZilinskas @theruther4d
+/types/react-dom/                                   @MartynasZilinskas @theruther4d @Jessidhia
 /types/react-dom/v15/                               @MartynasZilinskas
 /types/react-dom-factories/                         @jgoz
 /types/react-dotdotdot/                             @jczyzewski
-/types/react-draft-wysiwyg/                         @imechZhangLY @brunoMaurice
+/types/react-draft-wysiwyg/                         @imechZhangLY @brunoMaurice @ldanet
 /types/react-dragtastic/                            @nscarcella
 /types/react-dropzone/                              @matdube @LynxEyes @goblindegook @benbayard @LKay @codeaid @jurosh @ekilah
 /types/react-dropzone/v3/                           @matdube @LynxEyes @goblindegook @benbayard @LKay
@@ -4224,7 +4280,6 @@
 /types/react-howler/                                @maksimovicdanijel
 /types/react-hyperscript/                           @tock203
 /types/react-icon-base/                             @apare @LKay
-/types/react-icons/                                 @apare @johnnyreilly @LKay
 /types/react-image-crop/                            @danielasy @chaaya
 /types/react-image-fallback/                        @8enSmith
 /types/react-image-gallery/                         @adamwpc
@@ -4240,11 +4295,11 @@
 /types/react-input-calendar/                        @stepancar
 /types/react-input-mask/                            @apare @dima7a14
 /types/react-input-mask/v1/                         @apare
-/types/react-instantsearch/                         @gburgett @jpowell
-/types/react-instantsearch-core/                    @gburgett @jpowell @davidfurlong
-/types/react-instantsearch-dom/                     @gburgett @jpowell
-/types/react-instantsearch-native/                  @gburgett @jpowell
-/types/react-intl/                                  @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos @lukyth @obedm503
+/types/react-instantsearch/                         @gburgett @jpowell @haroenv @samouss
+/types/react-instantsearch-core/                    @gburgett @jpowell @davidfurlong @haroenv @samouss
+/types/react-instantsearch-dom/                     @gburgett @jpowell @haroenv @samouss
+/types/react-instantsearch-native/                  @gburgett @jpowell @haroenv @samouss
+/types/react-intl/                                  @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos @lukyth @obedm503 @anion155
 /types/react-intl/v1/                               @bgrieder
 /types/react-intl-redux/                            @LKay
 /types/react-is/                                    @AviVahl @christianchown @eps1lon
@@ -4256,9 +4311,11 @@
 /types/react-json-tree/                             @gnestor @zainafzal08
 /types/react-jsonschema-form/                       @iamdanfox @iplus26 @phbou72 @LucianBuzzo @sthenault @sbusch
 /types/react-jss/                                   @eps1lon @jlaw90
+/types/react-kawaii/                                @ZhangYiJiang
 /types/react-lazyload/                              @m0a
 /types/react-lazylog/                               @benjaminRomano
 /types/react-leaflet/                               @danzel @davschne @yuit
+/types/react-leaflet/v1/                            @danzel @davschne @yuit
 /types/react-leaflet-markercluster/                 @Kimahriman
 /types/react-lifecycle-component/                   @pixelshaded
 /types/react-lifecycles-compat/                     @bySabi
@@ -4269,6 +4326,7 @@
 /types/react-mailchimp-subscribe/                   @osdiab
 /types/react-map-gl/                                @rimig @fnberta
 /types/react-maskedinput/                           @LKay @lavoaster @CarlosBonetti
+/types/react-material-ui-form-validator/            @FrankBrullo
 /types/react-mce/                                   @morphologue
 /types/react-mdl/                                   @bradzacher
 /types/react-measure/                               @asvetliakov @marcfallows
@@ -4276,9 +4334,10 @@
 /types/react-mixin/                                 @tkqubo
 /types/react-modal/                                 @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz @jpowell
 /types/react-motion/                                @stepancar @asvetliakov @dimitarnestorov
+/types/react-motion-loop/                           @j-em
 /types/react-motion-slider/                         @asvetliakov
 /types/react-motion-ui-pack/                        @jsonunger
-/types/react-native/                                @alloy @huhuanming @iRoachie @skn0tt @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff @a-tarasyuk @mvdam @esemesek @mrnickel @souvik-ghosh
+/types/react-native/                                @alloy @huhuanming @iRoachie @skn0tt @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff @a-tarasyuk @mvdam @esemesek @mrnickel @souvik-ghosh @nossbigg
 /types/react-native-android-taskdescription/        @christianchown
 /types/react-native-auth0/                          @ascariandrea @marknelissen
 /types/react-native-autocomplete-input/             @ifiokjr
@@ -4318,10 +4377,12 @@
 /types/react-native-mauron85-background-geolocation/ @djereg
 /types/react-native-mixpanel/                       @r3nya
 /types/react-native-modal-dropdown/                 @echoulen
+/types/react-native-modal-filter-picker/            @ywchang @nossbigg
 /types/react-native-modalbox/                       @iRoachie
 /types/react-native-multi-slider/                   @Slessi
 /types/react-native-navbar/                         @ryokik
 /types/react-native-orientation/                    @MoLow
+/types/react-native-percentage-circle/              @hmajid2301
 /types/react-native-permissions/                    @vincentlanglet
 /types/react-native-photo-view/                     @christianchown
 /types/react-native-platform-touchable/             @tngranados
@@ -4338,6 +4399,7 @@
 /types/react-native-sensor-manager/                 @SahinVardar
 /types/react-native-settings-list/                  @MrLuje
 /types/react-native-share/                          @marknelissen
+/types/react-native-snackbar-component/             @hmajid2301
 /types/react-native-snap-carousel/                  @jnbt @j-fro @gazaret @GuillaumeAmat @VitorLuizC
 /types/react-native-sortable-grid/                  @j-fro
 /types/react-native-sortable-list/                  @sivolobov @RookY2K
@@ -4348,7 +4410,7 @@
 /types/react-native-svg-uri/                        @iRoachie
 /types/react-native-swiper/                         @CaiHuan @huhuanming @mhcgrq
 /types/react-native-tab-navigator/                  @iRoachie
-/types/react-native-tab-view/                       @kaoDev @iRoachie @timwangdev
+/types/react-native-tab-view/                       @kaoDev @iRoachie @timwangdev @geriux
 /types/react-native-text-input-mask/                @RodrigoAWeber
 /types/react-native-toast-native/                   @bm-software
 /types/react-native-touch-id/                       @huhuanming @gazaret @jinshin1013
@@ -4357,7 +4419,7 @@
 /types/react-native-version-number/                 @VincentLanglet
 /types/react-native-video/                          @huhuanming
 /types/react-native-zeroconf/                       @mattapet
-/types/react-navigation/                            @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway @denissb @skovhus
+/types/react-navigation/                            @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway @denissb @skovhus @azrosen92 @hmajid2301
 /types/react-navigation/v2/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato @mickaelw @maxdavidson @alechill @builtbyproxy @jkillian @jeroenvervaeke @chagasaway
 /types/react-navigation/v1/                         @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
 /types/react-navigation-material-bottom-tabs/       @iRoachie
@@ -4372,8 +4434,8 @@
 /types/react-outside-click-handler/                 @zubivan
 /types/react-overlays/                              @aaronbeall @vitosamson @aarondancer
 /types/react-owl-carousel/                          @tbounsiar @igorissen @KennethanCeyer
-/types/react-paginate/                              @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke @sugarshin @SPWizard01
-/types/react-paginate/v5/                           @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
+/types/react-paginate/                              @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke @sugarshin @SPWizard01 @kevinrambaud
+/types/react-paginate/v5/                           @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke @kevinrambaud
 /types/react-paginate/v4/                           @deevus @wouterhardeman @pegel03 @archy-bold
 /types/react-panelgroup/                            @qgolsteyn
 /types/react-places-autocomplete/                   @guilhermehubner @r3nya @ApeNox @azizhk
@@ -4399,12 +4461,13 @@
 /types/react-redux-toastr/                          @Smiche @artyomsv @kulmajaba
 /types/react-relay/                                 @graphcool @voxmatt @alloy @npirotte @ckknight @kastermester @mattkrick
 /types/react-request/                               @dannycochran
+/types/react-resizable/                             @airhorns
 /types/react-resize-detector/                       @matthew-matvei @aMoniker @rdrgn
 /types/react-resolver/                              @forabi
 /types/react-responsive/                            @asvetliakov @alechill @xaviergonz
 /types/react-responsive/v1/                         @asvetliakov
 /types/react-rnd/                                   @Ragg- @fsubal @zyh825
-/types/react-router/                                @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran @8enSmith
+/types/react-router/                                @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran @8enSmith @wezleytsai
 /types/react-router/v3/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen @gillchristian @nulladdict
 /types/react-router/v2/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
 /types/react-router-bootstrap/                      @vlesierse @LKay @olmobrutall
@@ -4421,7 +4484,9 @@
 /types/react-rte/                                   @jclyons52
 /types/react-s-alert/                               @mitsuruog
 /types/react-scroll/                                @sudoplz @GiedriusGrabauskas
+/types/react-scroll-into-view-if-needed/            @angusfretwell @allanpope @jonathanly
 /types/react-scrollbar/                             @stephenjelfs
+/types/react-scrollspy/                             @ZhangYiJiang
 /types/react-select/                                @claasahl @jonfreedman
 /types/react-select/v1/                             @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic @darkartur @eps1lon @endurance @RCGuillaume
 /types/react-share/                                 @icopp
@@ -4451,19 +4516,19 @@
 /types/react-svg-inline/                            @kiyopikko
 /types/react-svg-pan-zoom/                          @huy-nguyen
 /types/react-swf/                                   @stepancar
-/types/react-swipe/                                 @DeividasBakanas
+/types/react-swipe/                                 @DeividasBakanas @AAlakkad
 /types/react-swipeable/                             @GiedriusGrabauskas @mctep @horiuchi
 /types/react-swipeable-views/                       @mxl @DeividasBakanas
 /types/react-syntax-highlighter/                    @NoHomey @ajgamble-milner
 /types/react-table/                                 @royxue @psakalo @Havret @andys8 @Gelio
 /types/react-table-filter/                          @gjsln
-/types/react-tabs/                                  @danez @Equationist
+/types/react-tabs/                                  @yu-i9 @danez @Equationist
 /types/react-tag-autocomplete/                      @jlismore
 /types/react-tag-input/                             @Ogglas @jankarres @matthewberryman
 /types/react-tagcloud/                              @wassname
 /types/react-tagsinput/                             @mykter
 /types/react-tap-event-plugin/                      @mxl
-/types/react-test-renderer/                         @arvitaly @lochbrunner @johnnyreilly @jgoz
+/types/react-test-renderer/                         @arvitaly @lochbrunner @johnnyreilly @jgoz @Jessidhia
 /types/react-test-renderer/v15/                     @arvitaly @lochbrunner @lochbrunner @johnnyreilly
 /types/react-tether/                                @ryprice
 /types/react-text-mask/                             @guilhermehubner @cavarzan @needpower
@@ -4491,14 +4556,14 @@
 /types/react-visibility-sensor/                     @JRasmusBm @gcangussu
 /types/react-webcam/                                @squat
 /types/react-weui/                                  @tairan
-/types/react-widgets/                               @rogierschouten @sanyatuning @frodehansen2 @r3nya @MBillemaz @georg94 @tzarger
+/types/react-widgets/                               @rogierschouten @sanyatuning @frodehansen2 @r3nya @MBillemaz @georg94 @tzarger @vegtelenseg
 /types/react-widgets-moment/                        @dawnmist
-/types/react-window/                                @martynaskadisa
+/types/react-window/                                @martynaskadisa @heyimalex
 /types/react-window-size/                           @jakejrichards
 /types/react-wow/                                   @mikepthomas
 /types/react-youtube/                               @kgtkr @salguerooo
 /types/react-youtube-embed/                         @charles-salmon
-/types/reactable/                                   @spielc
+/types/reactable/                                   @spielc @priscila-moneo
 /types/reactcss/                                    @chrisgervang @LKay
 /types/reactstrap/                                  @alihammad @mfal @danilobjr @FaithForHumans @timc13 @patrickrgaffney @prabodht @georg94
 /types/reactstrap/v4/                               @alihammad @mfal @danilobjr @fabiopaiva
@@ -4513,11 +4578,11 @@
 /types/readline-sync/                               @jonestristand
 /types/readline-transform/                          @dex4er
 /types/reapop/                                      @Barrokgl
-/types/rebass/                                      @rhysd @ryee-dev @jamesmckenzie
+/types/rebass/                                      @rhysd @ryee-dev @jamesmckenzie @gretzky @angusfretwell
 /types/rebass__grid/                                @antonvasin @vittorio @lhache @lavoaster
 /types/recaptcha2/                                  @l-jonas
 /types/recase/                                      @18steps
-/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok @RobertStigsson @kousaku-maron
+/types/recharts/                                    @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok @RobertStigsson @kousaku-maron @iflp
 /types/recharts-scale/                              @johnnyreilly
 /types/rechoir/                                     @BendingBender
 /types/recluster/                                   @dex4er
@@ -4553,7 +4618,8 @@
 /types/redux-first-router-link/                     @janb87
 /types/redux-first-router-restore-scroll/           @icopp
 /types/redux-first-routing/                         @tlaziuk
-/types/redux-form/                                  @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce @smifun @mshaaban088
+/types/redux-form/                                  @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce @smifun @mshaaban088 @esetnik @bwlt
+/types/redux-form/v7/                               @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce @smifun @mshaaban088 @esetnik
 /types/redux-form/v6/                               @carsonf @aikoven @LKay @bancek @mshaaban088
 /types/redux-form/v4/                               @aikoven
 /types/redux-immutable/                             @oizie @sebald @gavingregory @lukyth
@@ -4608,6 +4674,7 @@
 /types/remote-redux-devtools/                       @ColinEberhardt @unindented @mamodom @colindekker
 /types/remove-markdown/                             @RagibHasin
 /types/rename/                                      @Aankhen
+/types/repeat-element/                              @adamzerella
 /types/replace-ext/                                 @DeividasBakanas
 /types/replace-string/                              @BendingBender
 /types/replacestream/                               @dex4er
@@ -4630,6 +4697,7 @@
 /types/resemblejs/                                  @pimterry
 /types/reservoir/                                   @danvk
 /types/resize-img/                                  @higuri
+/types/resize-observer-browser/                     @chivesrs
 /types/resolve/                                     @marionebl @ajafff
 /types/resolve-cwd/                                 @BendingBender
 /types/resolve-from/                                @unional @BendingBender
@@ -4684,6 +4752,7 @@
 /types/rocksdb/                                     @MeirionHughes @danwbyrne
 /types/roll/                                        @icopp
 /types/rolling-rate-limiter/                        @l-jonas
+/types/rollup-plugin-buble/                         @Kocal
 /types/rollup-plugin-commonjs/                      @eoin-obrien
 /types/rollup-plugin-delete/                        @vladshcherbin
 /types/rollup-plugin-json/                          @asmockler @hotell
@@ -4707,6 +4776,7 @@
 /types/rss/                                         @secondwtq
 /types/rsvp/                                        @chriskrycho
 /types/rsync/                                       @philippstucki
+/types/rtlcss/                                      @adamzerella
 /types/rtree/                                       @oefirouz
 /types/run-parallel/                                @mrmlnc
 /types/run-parallel-limit/                          @mrmlnc
@@ -4776,13 +4846,15 @@
 /types/schema-registry/                             @bonzzy
 /types/schwifty/                                    @ozum
 /types/scoped-http-client/                          @mattvperry @rianadon
-/types/screenfull/                                  @icholy @lionelb @joelshepherd
+/types/screenfull/                                  @icholy @lionelb @joelshepherd @BendingBender
+/types/screenfull/v3/                               @icholy @lionelb @joelshepherd
 /types/screeps/                                     @MarkoSulamagi @NhanHo @bryanbecker @resir014 @Arcath @dmarcuse
 /types/screeps-profiler/                            @ramblurr
 /types/script-ext-html-webpack-plugin/              @davecardwell
 /types/scriptjs/                                    @ssttevee
 /types/scroll-into-view/                            @zivni
 /types/scroller/                                    @haskellcamargo
+/types/scrollparent/                                @Sintifo
 /types/scrollreveal/                                @Davidblkx
 /types/scrolltofixed/                               @bmdixon
 /types/scrypt/                                      @WhiteAbeLincoln
@@ -4846,7 +4918,7 @@
 /types/sequester/                                   @Strate
 /types/serialize-error/                             @thomasthiebaud
 /types/serialize-javascript/                        @lith-light-g @Pochodaydayup
-/types/serialport/                                  @codefoster @apearson
+/types/serialport/                                  @codefoster @apearson @cinderblock
 /types/serialport/v6/                               @codefoster @apearson
 /types/serialport/v4/                               @codefoster
 /types/serve-favicon/                               @urossmolnik
@@ -4854,7 +4926,7 @@
 /types/serve-static/                                @urossmolnik @LinusU
 /types/server/                                      @sant123 @iddan
 /types/server-destroy/                              @gyszalai
-/types/serverless/                                  @hassankhan
+/types/serverless/                                  @hassankhan @JonathanWilbur
 /types/servicenow/                                  @bryceg
 /types/session-file-store/                          @blendsdk @rokt33r
 /types/set-cookie-parser/                           @nickp10 @ilyaztsv
@@ -4866,7 +4938,7 @@
 /types/sha1/                                        @arcdev1
 /types/sha256/                                      @nhardy
 /types/shallow-equals/                              @rsolomon
-/types/shallowequal/                                @seansfkelley @BendingBender
+/types/shallowequal/                                @seansfkelley @BendingBender @arndissler
 /types/shallowequal/v0/                             @seansfkelley
 /types/shapefile/                                   @DenisCarriere @Thw0rted
 /types/sharedb/                                     @soney
@@ -4882,7 +4954,7 @@
 /types/shelljs/                                     @nikeee @voy @gkalpak @pheromonez @aldafu
 /types/shelljs-exec-proxy/                          @qlonik
 /types/shimmer/                                     @kjin
-/types/shipit/                                      @cyrilschumacher
+/types/shipit-cli/                                  @cyrilschumacher
 /types/shipit-utils/                                @cyrilschumacher
 /types/shopify-buy/                                 @openminder @straiforos @totemika
 /types/shorten-repo-url/                            @BendingBender
@@ -4954,18 +5026,19 @@
 /types/slackdown/                                   @nju33
 /types/slackify-html/                               @hypexr
 /types/slash/                                       @BendingBender
-/types/slate/                                       @andykent @majelbstoat @JanLoebel @YangusKhan @kalley @Kornil @isubasti @sgreav
+/types/slate/                                       @andykent @majelbstoat @JanLoebel @YangusKhan @kalley @Kornil @isubasti @sgreav @jackall3n
 /types/slate-base64-serializer/                     @YangusKhan
 /types/slate-html-serializer/                       @YangusKhan
 /types/slate-irc/                                   @elisee
 /types/slate-plain-serializer/                      @YangusKhan @mkiefel
-/types/slate-react/                                 @andykent @majelbstoat @JanLoebel @PatrickSachs @YangusKhan @isubasti @sgreav @Kornil
+/types/slate-react/                                 @andykent @majelbstoat @JanLoebel @PatrickSachs @YangusKhan @isubasti @sgreav @Kornil @jackall3n
 /types/sleep/                                       @rajarz
 /types/slice-ansi/                                  @dwieeb
 /types/slickgrid/                                   @jbaldwin
 /types/slideout/                                    @ToastHawaii
 /types/slimerjs/                                    @alexwall
 /types/slocket/                                     @BendingBender
+/types/slonik/                                      @sebald
 /types/slug/                                        @mhegazy
 /types/smart-fox-server/                            @ChanceM
 /types/smart-truncate/                              @oyalhi
@@ -4982,6 +5055,8 @@
 /types/snoowrap/                                    @vitosamson @TheAppleFreak @willwull
 /types/snowball-stemmers/                           @ryanvolum
 /types/snowboy/                                     @dolanmiu
+/types/sns-validator/                               @kevin68
+/types/sntp/                                        @adamzerella
 /types/socket.io/                                   @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
 /types/socket.io/v1/                                @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
 /types/socket.io-client/                            @progre @divillysausages @florentpoujol
@@ -4998,7 +5073,7 @@
 /types/socketty/                                    @Nax
 /types/sockjs/                                      @pmccloghrylaing
 /types/sockjs-client/                               @vladev @arusakov @BendingBender @renjfk
-/types/solidity-parser-antlr/                       @LogvinovLeon @albrow
+/types/solidity-parser-antlr/                       @LogvinovLeon @albrow @yxliang01
 /types/solr-client/                                 @liul85
 /types/solution-center-communicator/                @dami-gg
 /types/sonic-boom/                                  @alferpal
@@ -5008,7 +5083,7 @@
 /types/soundmanager2/                               @elton2048
 /types/soupbintcp/                                  @jewbre
 /types/source-list-map/                             @e-cloud
-/types/source-map-support/                          @Bartvds @jason0x43
+/types/source-map-support/                          @Bartvds @jason0x43 @natealcedo
 /types/space-pen/                                   @vvakame
 /types/spark-md5/                                   @bastienmoulia
 /types/sparkly/                                     @BendingBender
@@ -5024,13 +5099,14 @@
 /types/speakingurl/                                 @Goldsmith42
 /types/spected/                                     @benneq
 /types/spectrum/                                    @M-Zuber @Ailrun
+/types/spellchecker/                                @dalevfenton
 /types/split/                                       @marcinporebski
 /types/split.js/                                    @icholy
 /types/split2/                                      @mugeso
 /types/splunk-bunyan-logger/                        @bricka
 /types/splunk-logging/                              @bricka
 /types/spotify-api/                                 @skovmand
-/types/spotify-web-playback-sdk/                    @Festify @mraerino @NeoLegends
+/types/spotify-web-playback-sdk/                    @Festify @mraerino @NeoLegends @deini
 /types/sprintf/                                     @soywiz @BendingBender
 /types/sprintf-js/                                  @jasonswearingen @BendingBender @cdagli
 /types/sql-bricks/                                  @adn05 @paleo
@@ -5047,6 +5123,7 @@
 /types/ssh2-sftp-client/                            @igrayson @ascariandrea @kartik2406 @viamuli
 /types/ssh2-streams/                                @rbuckton
 /types/sshpk/                                       @mabels
+/types/ssri/                                        @huan086
 /types/stack-mapper/                                @rogierschouten
 /types/stack-trace/                                 @exceptionless
 /types/stack-utils/                                 @BendingBender
@@ -5084,14 +5161,16 @@
 /types/storybook__addon-actions/                    @joscha @jicjjang
 /types/storybook__addon-backgrounds/                @hyunseob @adhrinae
 /types/storybook__addon-centered/                   @kiyopikko
-/types/storybook__addon-info/                       @mkornblum @fyrkant
+/types/storybook__addon-info/                       @mkornblum @fyrkant @RunningCoderLee
 /types/storybook__addon-jest/                       @halfmatthalfcat
-/types/storybook__addon-knobs/                      @joscha @martynaskadisa @amacleay @MLoughry
+/types/storybook__addon-knobs/                      @joscha @martynaskadisa @amacleay @MLoughry @alanhchoi
 /types/storybook__addon-links/                      @joscha @jessepinho
 /types/storybook__addon-notes/                      @joscha @amacleay @MLoughry
 /types/storybook__addon-options/                    @joscha @simonhn @amacleay @gaetanmaisse @adam187
 /types/storybook__addon-storyshots/                 @bradleyayers
 /types/storybook__addon-viewport/                   @Vinnl
+/types/storybook__addons/                           @bmatcuk
+/types/storybook__channels/                         @bmatcuk
 /types/storybook__react/                            @joscha @wapgear @dandean
 /types/storybook__react-native/                     @joscha @wapgear @alechill @iRoachie @ceyhuno
 /types/storybook__vue/                              @pntgupta
@@ -5133,7 +5212,7 @@
 /types/strip-color/                                 @BendingBender
 /types/strip-indent/                                @BendingBender
 /types/strip-json-comments/                         @dmoonfire
-/types/stripe/                                      @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun @galtalmor @htunnicliff @squirly @tzarger @ifiokjr @SimonSchick @yultyyev @cpsoinos
+/types/stripe/                                      @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun @galtalmor @htunnicliff @squirly @tzarger @ifiokjr @SimonSchick @yultyyev @cpsoinos @saranshkataria @0xJoKe
 /types/stripe-checkout/                             @cgwrench
 /types/stripe-v2/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak @slangeder
@@ -5144,11 +5223,11 @@
 /types/strophe/                                     @DavidKDeutsch
 /types/strophe.js/                                  @DavidKDeutsch
 /types/structured-source/                           @azu
-/types/styled-components/                           @Igorbek @Igmat @lavoaster @Jessidhia
+/types/styled-components/                           @Igorbek @Igmat @lavoaster @Jessidhia @jkillian @eps1lon @flavordaaave
 /types/styled-components/v3/                        @Igorbek @Igmat
 /types/styled-jsx/                                  @R1ZZU
 /types/styled-react-modal/                          @Lavoaster
-/types/styled-system/                               @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster @jschuler @adam187 @gretzky
+/types/styled-system/                               @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster @jschuler @adam187 @gretzky @chrislopresto
 /types/styled-theming/                              @ArjanJ
 /types/stylelint/                                   @alan-agius4 @filipsalpe
 /types/stylelint/v7/                                @alan-agius4
@@ -5165,12 +5244,12 @@
 /types/summernote/                                  @wstaelens @nusantara-cloud
 /types/sumo-logger/                                 @forabi @clementallen
 /types/suncalc/                                     @horiuchi
-/types/superagent/                                  @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue @lukaselmer
+/types/superagent/                                  @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue @lukaselmer @theQuazz
 /types/superagent/v2/                               @varju @NicoZelaya @mxl
 /types/superagent-bunyan/                           @bricka
 /types/superagent-no-cache/                         @mxl
 /types/superagent-prefix/                           @mxl
-/types/supercluster/                                @DenisCarriere
+/types/supercluster/                                @DenisCarriere @Manc
 /types/superstruct/                                 @edwardsnare
 /types/supertest/                                   @varju @pietu
 /types/supertest-as-promised/                       @tkrotoff
@@ -5225,7 +5304,6 @@
 /types/table/                                       @evanshortiss @mrmlnc
 /types/tableau/                                     @protip
 /types/tableify/                                    @forivall
-/types/tabris-plugin-firebase/                      @eclipsesource
 /types/tabtab/                                      @vojtechhabarta @kamontat
 /types/tabulator/                                   @euginio
 /types/tail/                                        @spacejack
@@ -5235,6 +5313,7 @@
 /types/tar/                                         @SomaticIT @connor4312
 /types/tar-fs/                                      @Umoxfo
 /types/tar-stream/                                  @glicht
+/types/tarantool-driver/                            @zharkov-eu
 /types/task-graph-runner/                           @mgroenhoff
 /types/task-worklet/                                @karol-majewski
 /types/tcp-ping/                                    @stegano
@@ -5254,7 +5333,6 @@
 /types/terminal-link/                               @BendingBender
 /types/terminal-menu/                               @aravindarun
 /types/tern/                                        @nkappler
-/types/terser/                                      @JordiAnderl
 /types/terser-webpack-plugin/                       @Danscho
 /types/test-console/                                @roberto @guidoux @gbmoretti
 /types/test-listen/                                 @stephenmathieson
@@ -5274,14 +5352,14 @@
 /types/texzilla/                                    @m93a
 /types/tgfancy/                                     @Dabolus
 /types/theming/                                     @eps1lon
-/types/theo/                                        @petekp
+/types/theo/                                        @petekp @laitine
 /types/thepiratebay/                                @jsorrell
-/types/three/                                       @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk @elk941 @Methuselah96 @Dukuo @JulianSSS @devilsparta @KonstantinLukaschenko @danyim
+/types/three/                                       @gyohk @florentpoujol @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @Pro @efokschaner @PsychoSTS @apurvaojas @NotWoods @Methuselah96 @Dukuo @JulianSSS @devilsparta @KonstantinLukaschenko @danyim @saranshkataria @psuter
 /types/three-tds-loader/                            @KonstantinLukaschenko @sschoensee
 /types/thrift/                                      @kamek-pf @kevin-greene-ck @jessezhang91
 /types/throng/                                      @cyrilschumacher @tatethurston
 /types/throttle/                                    @BendingBender
-/types/throttle-debounce/                           @czbuchi @franklixuefei
+/types/throttle-debounce/                           @czbuchi @franklixuefei @oddsund
 /types/through/                                     @AndrewGaspar
 /types/through2/                                    @Bartvds @jedmao @valotas @TeamworkGuy2 @Alorel
 /types/through2/v0/                                 @Bartvds @jedmao
@@ -5305,13 +5383,14 @@
 /types/tiny-secp256k1/                              @eduhenke
 /types/tiny-slider-react/                           @screendriver
 /types/tinycolor2/                                  @M-Zuber @geertjansen @nvh @Ailrun
-/types/tinycon/                                     @dwaxweiler
+/types/tinycon/                                     @dwaxweiler @jaulz
 /types/tinycopy/                                    @vvatanabe
 /types/tinymce/                                     @martinduparc @ipoul @nicohartto
 /types/titanium/                                    @appcelerator @janvennemann
 /types/title/                                       @fa7ad
 /types/tldjs/                                       @geoffreak
 /types/tlds/                                        @ajshres
+/types/tmi.js/                                      @wpapsco
 /types/tmp/                                         @optical @Perlmint
 /types/to-absolute-glob/                            @ajafff
 /types/to-camel-case/                               @j-f1
@@ -5321,6 +5400,7 @@
 /types/to-title-case-gouch/                         @stpettersens
 /types/toastr/                                      @borisyankov
 /types/tocktimer/                                   @evanshortiss
+/types/tokenizr/                                    @aNickzz
 /types/tokgen/                                      @l-jonas
 /types/toobusy-js/                                  @atd-schubert @BendingBender
 /types/tooltipster/                                 @stephenlautier @pjmagee @VorobeY1326 @leonard-thieu @janhi @joeskeen
@@ -5361,6 +5441,7 @@
 /types/tspromise/                                   @soywiz
 /types/ttf2woff2/                                   @ThomasdenH
 /types/tunnel/                                      @BendingBender
+/types/turndown/                                    @sergey-zhidkov
 /types/tus-js-client/                               @kevhiggins @Acconut
 /types/tv4/                                         @Bartvds @psnider
 /types/tween.js/                                    @Amos47 @sunetos @jzarnikov @alexburner
@@ -5370,8 +5451,8 @@
 /types/twilio/                                      @nickiannone @ashleybrener
 /types/twilio-common/                               @gatimus
 /types/twilio-video/                                @minddocdev @darioblanco
-/types/twit/                                        @Volox @sapphiredev @abraham @siwalikm @plhery
-/types/twitch-ext/                                  @beheh
+/types/twit/                                        @Volox @sapphiredev @abraham @siwalikm @plhery @justgoscha
+/types/twitch-ext/                                  @beheh @FedeDR
 /types/twitter/                                     @BendingBender
 /types/twitter-for-web/                             @chitoku-k
 /types/twitter-stream-channels/                     @adrianbardan
@@ -5458,11 +5539,15 @@
 /types/urlsafe-base64/                              @tkrotoff
 /types/usage/                                       @pvomhoff
 /types/usb/                                         @underscorebrody @thegecko
+/types/use-persisted-state/                         @karol-majewski
+/types/use-set-interval/                            @screendriver
+/types/use-set-timeout/                             @screendriver
 /types/user-event/                                  @whtsky
 /types/user-home/                                   @mhegazy
 /types/useragent/                                   @geoffreak
 /types/username/                                    @kayahr @krivachy
 /types/utf8/                                        @zelein
+/types/utif/                                        @smajl @nkprince007 @massic80
 /types/util-deprecate/                              @BendingBender
 /types/util.promisify/                              @adamvoss
 /types/utils-merge/                                 @chrootsu
@@ -5496,7 +5581,7 @@
 /types/vertx3-eventbus-client/                      @oddeirik
 /types/vex-js/                                      @gdcohan
 /types/vexdb/                                       @MayorMonty
-/types/vexflow/                                     @rquiring @sebastianhaas @bohoffi @sschmidTU
+/types/vexflow/                                     @rquiring @sebastianhaas @bohoffi @sschmidTU @bneumann
 /types/vfile/                                       @bizen241 @rokt33r
 /types/vfile-location/                              @ikatyang @rokt33r
 /types/vfile-message/                               @rokt33r
@@ -5530,6 +5615,7 @@
 /types/vorpal/                                      @danwbyrne
 /types/vortex-web-client/                           @Pro
 /types/voximplant-websdk/                           @aylarov
+/types/vue-chartkick/                               @cnsmedia
 /types/vue-color/                                   @me
 /types/vue-markdown/                                @neodon
 /types/vue-resource/                                @kaorun343
@@ -5544,8 +5630,8 @@
 /types/w3c-image-capture/                           @cosium
 /types/w3c-permissions/                             @jberube
 /types/w3c-screen-orientation/                      @kenchris
-/types/w3c-web-usb/                                 @larsgk
-/types/wait-for-localhost/                          @BendingBender
+/types/w3c-web-usb/                                 @larsgk @thegecko
+/types/wait-on/                                     @ifiokjr
 /types/waitme/                                      @totpero
 /types/wake_on_lan/                                 @SrTobi
 /types/walk/                                        @poppa
@@ -5572,7 +5658,7 @@
 /types/web3/                                        @simon-jentzsch @nitzantomer @zurbo @yxliang01 @phra @naddison36 @icaroharry @linusnorton @jpeletier @anneau @matrushka @andrevmatos @levino @zlumer @archangel-irk @sogasg @donamk @dkent600 @nerddan @alexkvak
 /types/web3-eth-abi/                                @LogvinovLeon
 /types/web3-provider-engine/                        @LogvinovLeon
-/types/webappsec-credential-management/             @iainmcgin
+/types/webappsec-credential-management/             @iainmcgin @Hartimer
 /types/webassembly-js-api/                          @periklis @chicoxyzzy
 /types/webassembly-web-api/                         @jhenninger
 /types/webcl/                                       @NCARalph
@@ -5593,7 +5679,7 @@
 /types/webpack-config-utils/                        @hotell
 /types/webpack-dev-middleware/                      @bumbleblym @reduckted @chrisabrams
 /types/webpack-dev-middleware/v1/                   @bumbleblym @reduckted
-/types/webpack-dev-server/                          @maestroh @daveparslow @ZheyangSong @alan-agius4 @arturovt
+/types/webpack-dev-server/                          @maestroh @daveparslow @ZheyangSong @alan-agius4 @arturovt @davecardwell
 /types/webpack-dotenv-plugin/                       @kryops
 /types/webpack-env/                                 @use-strict @rhonsby
 /types/webpack-fail-plugin/                         @deevus
@@ -5610,6 +5696,7 @@
 /types/webpack-stream/                              @iclanton @bumbleblym
 /types/webpack-subresource-integrity/               @huan086
 /types/webpack-validator/                           @deevus
+/types/webpack-watched-glob-entries-plugin/         @ChaosinaCan
 /types/webpackbar/                                  @rynclark
 /types/webpagetest/                                 @ksm2
 /types/webprogbase-console-view/                    @veetaha
@@ -5660,10 +5747,12 @@
 /types/wiring-pi/                                   @NoHomey
 /types/wnumb/                                       @acoreyj
 /types/wonder.js/                                   @yyc-git
+/types/word-extractor/                              @saboya
 /types/word-list-json/                              @dovidm
 /types/word2vector/                                 @renekeijzer
 /types/wordcloud/                                   @joeskeen
 /types/words-to-numbers/                            @James-Frowen
+/types/wordwrap/                                    @ark120202
 /types/workbox-sw/                                  @wessberg
 /types/workbox-webpack-plugin/                      @kgroat
 /types/worker-threads-pool/                         @BendingBender
@@ -5724,7 +5813,7 @@
 /types/ydn-db/                                      @yathit @gabrielmaldi
 /types/year-days/                                   @BendingBender
 /types/yeoman-assert/                               @Toilal
-/types/yeoman-generator/                            @armorik83 @janslow @ikatyang @tasadar2
+/types/yeoman-generator/                            @armorik83 @janslow @ikatyang @tasadar2 @haggen
 /types/yeoman-test/                                 @ikatyang
 /types/yesql/                                       @Sumolari
 /types/yn/                                          @BendingBender
@@ -5736,6 +5825,7 @@
 /types/yosay/                                       @armorik83
 /types/youtube/                                     @DazWilkin @JoshuaKGoldberg @eliotfallon213 @terrymun @paulhobbel
 /types/youtube-dl/                                  @bsurai @moshfeu
+/types/youtube-player/                              @jurca
 /types/yui/                                         @giabao
 /types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray @vincentjames501 @robertbullen @sat0yu @dancrumb
 /types/z-schema/                                    @pgonzal

From f979ac085955be188222c0023c6836bc55bcc947 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <derek.finlinson@journeyteam.com>
Date: Thu, 7 Mar 2019 10:14:32 -0700
Subject: [PATCH 474/924] Fix openErrorDialog JSDoc

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index 597ad39ce8..b312175d4e 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4372,8 +4372,7 @@ declare namespace Xrm {
 
         /**
          * Displays an error dialog.
-         * @param confirmStrings The strings to be used in the confirm dialog.
-         * @param confirmOptions The height and width options for alert dialog
+         * @param errorOptions An object to specify the options for error dialog.         
          */
         openErrorDialog(errorOptions: Navigation.ErrorDialogOptions): Async.PromiseLike<any>;
 

From ade055321540c73dbed3339b08577712c18d3545 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <derek.finlinson@journeyteam.com>
Date: Thu, 7 Mar 2019 10:26:50 -0700
Subject: [PATCH 475/924] Fix lint error

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index b312175d4e..f7029be401 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4372,7 +4372,7 @@ declare namespace Xrm {
 
         /**
          * Displays an error dialog.
-         * @param errorOptions An object to specify the options for error dialog.         
+         * @param errorOptions An object to specify the options for error dialog.
          */
         openErrorDialog(errorOptions: Navigation.ErrorDialogOptions): Async.PromiseLike<any>;
 

From 944e5019c1cf7b3430d1f2cefad8928a7de3ae54 Mon Sep 17 00:00:00 2001
From: Sean Kelly <skelly@aaski.com>
Date: Thu, 7 Mar 2019 15:09:31 -0500
Subject: [PATCH 476/924] change tsconfig

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

diff --git a/types/dragscroll/tsconfig.json b/types/dragscroll/tsconfig.json
index bc17d2f0c7..20e259be9e 100644
--- a/types/dragscroll/tsconfig.json
+++ b/types/dragscroll/tsconfig.json
@@ -14,7 +14,7 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes": false
+        "strictFunctionTypes": true
     },
     "files": [
         "index.d.ts",

From 6b5fa0f70981a50237c1a8a8f21a599a959e3be5 Mon Sep 17 00:00:00 2001
From: Vinit Sood <vinitsood90@gmail.com>
Date: Thu, 7 Mar 2019 21:34:08 +0100
Subject: [PATCH 477/924] add definitions for ScreenOrientation and
 AppLoadingProps

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 338a1c2989..a0eb3c6237 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -16,6 +16,7 @@
 //                 Bartosz Dotryw <https://github.com/burtek>
 //                 Jason Killian <https://github.com/jkillian>
 //                 Satyajit Sahoo <https://github.com/satya164>
+//                 Vinit Sood <https://github.com/vinitsood> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -200,6 +201,9 @@ export interface AppLoadingProps {
 
     /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
     onError?: (error: Error) => void;
+
+    /**  Whether to hide the native splash screen as soon as you unmount the AppLoading component. */
+    autoHideSplash?: boolean
 }
 
 /**
@@ -2463,7 +2467,11 @@ export namespace ScreenOrientation {
 
     const Orientation: Orientations;
 
+    /** Deprecated in favour of ScreenOrientation.allowAsync. */
     function allow(orientation: keyof Orientations): void;
+
+    /** Allow a screen orientation. You can call this function multiple times with multiple orientations to allow multiple orientations. */
+    function allowAsync(orientation: keyof Orientations): void;
 }
 
 /**

From b809f105b58d4f45d4eb1e0535faa86958df150e Mon Sep 17 00:00:00 2001
From: vinitsood <vinitsood90@gmail.com>
Date: Thu, 7 Mar 2019 22:32:16 +0100
Subject: [PATCH 478/924] Update index.d.ts

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index a0eb3c6237..544db39e67 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -16,7 +16,7 @@
 //                 Bartosz Dotryw <https://github.com/burtek>
 //                 Jason Killian <https://github.com/jkillian>
 //                 Satyajit Sahoo <https://github.com/satya164>
-//                 Vinit Sood <https://github.com/vinitsood> 
+//                 Vinit Sood <https://github.com/vinitsood>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From e19962e533e61a8e79ea27ba3dd1958a24317bbd Mon Sep 17 00:00:00 2001
From: vinitsood <vinitsood90@gmail.com>
Date: Thu, 7 Mar 2019 22:38:47 +0100
Subject: [PATCH 479/924] Update index.d.ts

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 544db39e67..2752410316 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -203,7 +203,7 @@ export interface AppLoadingProps {
     onError?: (error: Error) => void;
 
     /**  Whether to hide the native splash screen as soon as you unmount the AppLoading component. */
-    autoHideSplash?: boolean
+    autoHideSplash?: boolean;
 }
 
 /**

From 12cb57ea101caa32cad33d11eb0d3acb2dd44245 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Thu, 7 Mar 2019 21:20:00 +0100
Subject: [PATCH 480/924] refactor: Use default TSLint configuration

---
 types/tape-async/index.d.ts                   | 34 ++++-----
 .../tape-async/test/tape-async.async.test.ts  |  8 +-
 .../test/tape-async.generators.test.ts        | 16 ++--
 types/tape-async/test/tape-async.test.ts      | 36 ++++-----
 types/tape-async/tslint.json                  | 74 +------------------
 5 files changed, 43 insertions(+), 125 deletions(-)

diff --git a/types/tape-async/index.d.ts b/types/tape-async/index.d.ts
index be104ec2b4..94447163db 100644
--- a/types/tape-async/index.d.ts
+++ b/types/tape-async/index.d.ts
@@ -9,13 +9,11 @@
 import tapeSync = require("tape");
 export = tape;
 
-declare function tape(name: string, cb: tape.TestCase): void
+declare function tape(name: string | tape.TestOptions, cb: tape.TestCase): void;
 declare function tape(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
 declare function tape(cb: tape.TestCase): void;
-declare function tape(opts: tape.TestOptions, cb: tape.TestCase): void;
 
 declare namespace tape {
-
 	interface TestCase {
 		(test: Test): void | Iterator<any> | PromiseLike<void>;
 	}
@@ -23,45 +21,41 @@ declare namespace tape {
 	/**
 	 * Available opts options for the tape function.
 	 */
-	interface TestOptions extends tapeSync.TestOptions {
-	}
+	type TestOptions = tapeSync.TestOptions;
 
 	/**
 	 * Options for the createStream function.
 	 */
-	interface StreamOptions extends tapeSync.StreamOptions {
-	}
+	type StreamOptions = tapeSync.StreamOptions;
 
 	/**
 	 * Generate a new test that will be skipped over.
 	 */
-	export function skip(name: string, cb: tape.TestCase): void;
-	export function skip(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
-	export function skip(cb: tape.TestCase): void;
-	export function skip(opts: tape.TestOptions, cb: tape.TestCase): void;
+	function skip(name: string | TestOptions, cb: TestCase): void;
+	function skip(name: string, opts: TestOptions, cb: TestCase): void;
+	function skip(cb: TestCase): void;
 
 	/**
 	 * The onFinish hook will get invoked when ALL tape tests have finished right before tape is about to print the test summary.
 	 */
-	export function onFinish(cb: () => void): void;
+	function onFinish(cb: () => void): void;
 
 	/**
 	 * Like test(name?, opts?, cb) except if you use .only this is the only test case that will run for the entire process, all other test cases using tape will be ignored.
 	 */
-	export function only(name: string, cb: tape.TestCase): void;
-	export function only(name: string, opts: tape.TestOptions, cb: tape.TestCase): void;
-	export function only(cb: tape.TestCase): void;
-	export function only(opts: tape.TestOptions, cb: tape.TestCase): void;
+	function only(name: string | TestOptions, cb: TestCase): void;
+	function only(name: string, opts: TestOptions, cb: TestCase): void;
+	function only(cb: TestCase): void;
 
 	/**
 	 * Create a new test harness instance, which is a function like test(), but with a new pending stack and test state.
 	 */
-	export function createHarness(): typeof tape;
+	function createHarness(): typeof tape;
 	/**
 	 * Create a stream of output, bypassing the default output stream that writes messages to console.log().
 	 * By default stream will be a text stream of TAP output, but you can get an object stream instead by setting opts.objectMode to true.
 	 */
-	export function createStream(opts?: tape.StreamOptions): NodeJS.ReadableStream;
+	function createStream(opts?: StreamOptions): NodeJS.ReadableStream;
 
 	interface Test extends tapeSync.Test {
 		/**
@@ -69,7 +63,7 @@ declare namespace tape {
 		 * cb(st) will only fire when t finishes.
 		 * Additional tests queued up after t will not be run until all subtests finish.
 		 */
-		test(name: string, cb: tape.TestCase): void;
-		test(name: string, opts: TestOptions, cb: tape.TestCase): void;
+		test(name: string, cb: TestCase): void;
+		test(name: string, opts: TestOptions, cb: TestCase): void;
 	}
 }
diff --git a/types/tape-async/test/tape-async.async.test.ts b/types/tape-async/test/tape-async.async.test.ts
index bb8e226009..4a6a53792c 100644
--- a/types/tape-async/test/tape-async.async.test.ts
+++ b/types/tape-async/test/tape-async.async.test.ts
@@ -2,10 +2,10 @@
 
 import tape = require("tape-async");
 
-var name: string;
-var cb: (test: tape.Test) => Promise<void>;
-var opts: tape.TestOptions;
-var t: tape.Test;
+let name: string;
+let cb: (test: tape.Test) => Promise<void>;
+let opts: tape.TestOptions;
+let t: tape.Test;
 
 tape(cb);
 tape(name, cb);
diff --git a/types/tape-async/test/tape-async.generators.test.ts b/types/tape-async/test/tape-async.generators.test.ts
index bf279030ef..940f207b5c 100644
--- a/types/tape-async/test/tape-async.generators.test.ts
+++ b/types/tape-async/test/tape-async.generators.test.ts
@@ -2,17 +2,17 @@
 
 import tape = require("tape-async");
 
-var name: string;
-var cb: (test: tape.Test) => IterableIterator<any>;
-var opts: tape.TestOptions;
-var t: tape.Test;
+let name: string;
+let cb: (test: tape.Test) => IterableIterator<any>;
+let opts: tape.TestOptions;
+let t: tape.Test;
 
 tape(cb);
 tape(name, cb);
 tape(opts, cb);
 tape(name, opts, cb);
 
-tape(name, function* (test: tape.Test): IterableIterator<void> {
+tape(name, function*(test: tape.Test): IterableIterator<void> {
 	t = test;
 });
 
@@ -26,12 +26,12 @@ tape.only(name, cb);
 tape.only(opts, cb);
 tape.only(name, opts, cb);
 
-tape(name, function* (test: tape.Test): IterableIterator<void> {
-	test.test(name, function* (st: tape.Test): IterableIterator<void> {
+tape(name, function*(test: tape.Test): IterableIterator<void> {
+	test.test(name, function*(st: tape.Test): IterableIterator<void> {
 		t = st;
 	});
 
-	test.test(name, opts, function* (st: tape.Test): IterableIterator<void> {
+	test.test(name, opts, function*(st: tape.Test): IterableIterator<void> {
 		t = st;
 	});
 });
diff --git a/types/tape-async/test/tape-async.test.ts b/types/tape-async/test/tape-async.test.ts
index 060da063be..71e06fffdb 100644
--- a/types/tape-async/test/tape-async.test.ts
+++ b/types/tape-async/test/tape-async.test.ts
@@ -1,9 +1,9 @@
 import tape = require("tape-async");
 
-var name: string;
-var cb: (test: tape.Test) => void;
-var opts: tape.TestOptions;
-var t: tape.Test;
+let name: string;
+let cb: (test: tape.Test) => void;
+let opts: tape.TestOptions;
+let t: tape.Test;
 
 tape(cb);
 tape(name, cb);
@@ -26,14 +26,12 @@ tape.only(name, opts, cb);
 
 tape.onFinish(() => {});
 
-
-var sopts: tape.StreamOptions;
-var rs: NodeJS.ReadableStream;
+let sopts: tape.StreamOptions;
+let rs: NodeJS.ReadableStream;
 rs = tape.createStream();
 rs = tape.createStream(sopts);
 
-
-var htest: typeof tape;
+let htest: typeof tape;
 htest = tape.createHarness();
 
 class CustomException extends Error {
@@ -42,19 +40,17 @@ class CustomException extends Error {
 	}
 }
 
-
 tape(name, (test: tape.Test) => {
+	let num: number;
+	let ms: number;
+	let value: any;
+	let actual: any;
+	let expected: any;
+	let err: any;
+	let fn = () => {};
+	let msg: string;
 
-	var num: number;
-	var ms: number;
-	var value: any;
-	var actual: any;
-	var expected: any;
-	var err: any;
-	var fn = function() {};
-	var msg: string;
-
-	var exceptionExpected: RegExp | (() => void);
+	let exceptionExpected: RegExp | (() => void);
 
 	test.plan(num);
 	test.end();
diff --git a/types/tape-async/tslint.json b/types/tape-async/tslint.json
index b5f5694bcd..f610afbb19 100644
--- a/types/tape-async/tslint.json
+++ b/types/tape-async/tslint.json
@@ -1,83 +1,11 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		"adjacent-overload-signatures": false,
-		"array-type": false,
-		"arrow-return-shorthand": false,
-		"ban-types": false,
-		"callable-types": false,
-		"comment-format": false,
 		"dt-header": false,
-		"eofline": false,
-		"export-just-namespace": false,
-		"import-spacing": false,
 		"indent": [
 			true,
 			"tabs"
 		],
-		"interface-name": false,
-		"interface-over-type-literal": false,
-		"jsdoc-format": false,
-		"max-line-length": false,
-		"member-access": false,
-		"new-parens": false,
-		"no-any-union": false,
-		"no-boolean-literal-compare": false,
-		"no-conditional-assignment": false,
-		"no-consecutive-blank-lines": false,
-		"no-construct": false,
-		"no-declare-current-package": false,
-		"no-duplicate-imports": false,
-		"no-duplicate-variable": false,
-		"no-empty-interface": false,
-		"no-for-in-array": false,
-		"no-inferrable-types": false,
-		"no-internal-module": false,
-		"no-irregular-whitespace": false,
-		"no-mergeable-namespace": false,
-		"no-misused-new": false,
-		"no-namespace": false,
-		"no-object-literal-type-assertion": false,
-		"no-padding": false,
-		"no-redundant-jsdoc": false,
-		"no-redundant-jsdoc-2": false,
-		"no-redundant-undefined": false,
-		"no-reference-import": false,
-		"no-relative-import-in-test": false,
-		"no-self-import": false,
-		"no-single-declare-module": false,
-		"no-string-throw": false,
-		"no-unnecessary-callback-wrapper": false,
-		"no-unnecessary-class": false,
-		"no-unnecessary-generics": false,
-		"no-unnecessary-qualifier": false,
-		"no-unnecessary-type-assertion": false,
-		"no-useless-files": false,
-		"no-var-keyword": false,
-		"no-var-requires": false,
-		"no-void-expression": false,
-		"no-trailing-whitespace": false,
-		"object-literal-key-quotes": false,
-		"object-literal-shorthand": false,
-		"one-line": false,
-		"one-variable-per-declaration": false,
-		"only-arrow-functions": false,
-		"prefer-conditional-expression": false,
-		"prefer-const": false,
-		"prefer-declare-function": false,
-		"prefer-for-of": false,
-		"prefer-method-signature": false,
-		"prefer-template": false,
-		"radix": false,
-		"semicolon": false,
-		"space-before-function-paren": false,
-		"space-within-parens": false,
-		"strict-export-declare-modifiers": false,
-		"trim-file": false,
-		"triple-equals": false,
-		"typedef-whitespace": false,
-		"unified-signatures": false,
-		"void-return": false,
-		"whitespace": false
+		"prefer-const": false
 	}
 }

From c88363cb73a11f6611fc1a0d65cb15f83ed4c5e5 Mon Sep 17 00:00:00 2001
From: Erik Christensen <erikchristensen@comcast.net>
Date: Thu, 7 Mar 2019 17:33:39 -0500
Subject: [PATCH 481/924] Fixed hasNext() on CommandCursor

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 3657a3a651..230f593094 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1848,9 +1848,9 @@ export type CommandCursorResult = object | null;
 /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html */
 export class CommandCursor extends Readable {
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#hasNext */
-    hasNext(): Promise<CommandCursorResult>;
+    hasNext(): Promise<boolean>;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#hasNext */
-    hasNext(callback: MongoCallback<CommandCursorResult>): void;
+    hasNext(callback: MongoCallback<boolean>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#batchSize */
     batchSize(value: number): CommandCursor;
     /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#clone */

From ddd5b10708299d939554766f758a248f849593ae Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Thu, 7 Mar 2019 23:45:00 +0100
Subject: [PATCH 482/924] fix: Use default dtslint configuration

---
 types/tape-async/index.d.ts                   |  2 +-
 .../tape-async/test/tape-async.async.test.ts  |  8 +++---
 .../test/tape-async.generators.test.ts        |  8 +++---
 types/tape-async/test/tape-async.test.ts      | 26 +++++++++----------
 types/tape-async/tslint.json                  |  4 +--
 5 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/types/tape-async/index.d.ts b/types/tape-async/index.d.ts
index 94447163db..c3ce0801d6 100644
--- a/types/tape-async/index.d.ts
+++ b/types/tape-async/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for tape-async v2.3
+// Type definitions for tape-async 2.3
 // Project: https://github.com/parro-it/tape-async
 // Definitions by: ExE Boss <https://github.com/ExE-Boss>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/tape-async/test/tape-async.async.test.ts b/types/tape-async/test/tape-async.async.test.ts
index 4a6a53792c..64b740de28 100644
--- a/types/tape-async/test/tape-async.async.test.ts
+++ b/types/tape-async/test/tape-async.async.test.ts
@@ -1,10 +1,8 @@
-// TypeScript Version: 2.1
-
 import tape = require("tape-async");
 
-let name: string;
-let cb: (test: tape.Test) => Promise<void>;
-let opts: tape.TestOptions;
+const name: string = undefined;
+const cb = async (test: tape.Test) => {};
+const opts: tape.TestOptions = {};
 let t: tape.Test;
 
 tape(cb);
diff --git a/types/tape-async/test/tape-async.generators.test.ts b/types/tape-async/test/tape-async.generators.test.ts
index 940f207b5c..7b6cc09eb4 100644
--- a/types/tape-async/test/tape-async.generators.test.ts
+++ b/types/tape-async/test/tape-async.generators.test.ts
@@ -1,10 +1,8 @@
-// TypeScript Version: 2.3
-
 import tape = require("tape-async");
 
-let name: string;
-let cb: (test: tape.Test) => IterableIterator<any>;
-let opts: tape.TestOptions;
+const name: string = undefined;
+const cb = function*(test: tape.Test): IterableIterator<void> {};
+const opts: tape.TestOptions = {};
 let t: tape.Test;
 
 tape(cb);
diff --git a/types/tape-async/test/tape-async.test.ts b/types/tape-async/test/tape-async.test.ts
index 71e06fffdb..c2ed921938 100644
--- a/types/tape-async/test/tape-async.test.ts
+++ b/types/tape-async/test/tape-async.test.ts
@@ -1,8 +1,8 @@
 import tape = require("tape-async");
 
-let name: string;
-let cb: (test: tape.Test) => void;
-let opts: tape.TestOptions;
+const name: string = undefined;
+const cb = (test: tape.Test) => {};
+const opts: tape.TestOptions = {};
 let t: tape.Test;
 
 tape(cb);
@@ -26,7 +26,7 @@ tape.only(name, opts, cb);
 
 tape.onFinish(() => {});
 
-let sopts: tape.StreamOptions;
+const sopts: tape.StreamOptions = undefined;
 let rs: NodeJS.ReadableStream;
 rs = tape.createStream();
 rs = tape.createStream(sopts);
@@ -41,16 +41,16 @@ class CustomException extends Error {
 }
 
 tape(name, (test: tape.Test) => {
-	let num: number;
-	let ms: number;
-	let value: any;
-	let actual: any;
-	let expected: any;
-	let err: any;
-	let fn = () => {};
-	let msg: string;
+	const num: number = undefined;
+	const ms: number = undefined;
+	const value: any = undefined;
+	const actual: any = undefined;
+	const expected: any = undefined;
+	const err: any = undefined;
+	const fn = () => {};
+	const msg: string = undefined;
 
-	let exceptionExpected: RegExp | (() => void);
+	const exceptionExpected: RegExp | (() => void) = undefined;
 
 	test.plan(num);
 	test.end();
diff --git a/types/tape-async/tslint.json b/types/tape-async/tslint.json
index f610afbb19..a541931a86 100644
--- a/types/tape-async/tslint.json
+++ b/types/tape-async/tslint.json
@@ -1,11 +1,9 @@
 {
 	"extends": "dtslint/dt.json",
 	"rules": {
-		"dt-header": false,
 		"indent": [
 			true,
 			"tabs"
-		],
-		"prefer-const": false
+		]
 	}
 }

From 9e9437f1392b5859c1cb5e81d442d6692f1c161d Mon Sep 17 00:00:00 2001
From: Hitomi Hatsukaze <gigigiaru776@yahoo.co.jp>
Date: Fri, 8 Mar 2019 08:02:27 +0900
Subject: [PATCH 483/924] Add Parser to marked types

---
 types/marked/index.d.ts      | 9 +++++++++
 types/marked/marked-tests.ts | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index 818620bb5e..595a51b7b1 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -114,6 +114,15 @@ declare namespace marked {
         br(): string;
     }
 
+    class Parser {
+        constructor(options?: MarkedOptions);
+        parse(src: TokensList): string;
+        next(): Token;
+        peek(): Token | number;
+        parseText(): string;
+        tok(): string
+    }
+
     class Lexer {
         rules: Rules;
         tokens: TokensList;
diff --git a/types/marked/marked-tests.ts b/types/marked/marked-tests.ts
index 0abfb48efb..563f78faf7 100644
--- a/types/marked/marked-tests.ts
+++ b/types/marked/marked-tests.ts
@@ -51,3 +51,8 @@ renderer.heading = (text, level, raw, slugger) => {
 
 const textRenderer = new marked.TextRenderer();
 console.log(textRenderer.strong(text));
+
+const parseTestText = "- list1\n  - list1.1\n\n listend";
+const parseTestTokens: marked.TokensList = marked.lexer(parseTestText, options);
+const parser = new marked.Parser()
+console.log(parser.parse(parseTestTokens));

From 5749616efe06d25c30fdeecfe7d5eb1900b37e53 Mon Sep 17 00:00:00 2001
From: Steve Calvert <scalvert@linkedin.com>
Date: Mon, 11 Feb 2019 10:44:25 -0800
Subject: [PATCH 484/924] [ember__runloop] Adding backburner types to -private
 subdirectory

---
 types/ember__runloop/-private/backburner.d.ts |  37 ++
 types/ember__runloop/ember__runloop-tests.ts  |  16 +
 types/ember__runloop/index.d.ts               | 614 +++++++++---------
 types/ember__runloop/tsconfig.json            |   1 +
 4 files changed, 362 insertions(+), 306 deletions(-)
 create mode 100644 types/ember__runloop/-private/backburner.d.ts

diff --git a/types/ember__runloop/-private/backburner.d.ts b/types/ember__runloop/-private/backburner.d.ts
new file mode 100644
index 0000000000..98e01b230b
--- /dev/null
+++ b/types/ember__runloop/-private/backburner.d.ts
@@ -0,0 +1,37 @@
+export interface QueueItem {
+  method: string;
+  target: object;
+  args: object[];
+  stack: string | undefined;
+}
+
+export interface DeferredActionQueues {
+  [index: string]: any;
+  queues: object;
+  schedule(
+    queueName: string,
+    target: any,
+    method: any,
+    args: any,
+    onceFlag: boolean,
+    stack: any
+  ): any;
+  flush(fromAutorun: boolean): any;
+}
+
+export interface DebugInfo {
+  autorun: Error | undefined | null;
+  counters: object;
+  timers: QueueItem[];
+  instanceStack: DeferredActionQueues[];
+}
+
+export interface Backburner {
+  join(...args: any[]): void;
+  on(...args: any[]): void;
+  scheduleOnce(...args: any[]): void;
+  schedule(queueName: string, target: object | null, method: () => void | string): void;
+  ensureInstance(): void;
+  DEBUG: boolean;
+  getDebugInfo(): DebugInfo;
+}
diff --git a/types/ember__runloop/ember__runloop-tests.ts b/types/ember__runloop/ember__runloop-tests.ts
index cf9cfd7db1..37d1fc18e4 100644
--- a/types/ember__runloop/ember__runloop-tests.ts
+++ b/types/ember__runloop/ember__runloop-tests.ts
@@ -1,9 +1,19 @@
 import { run } from '@ember/runloop';
 import EmberObject from '@ember/object';
+import { Backburner, DebugInfo, QueueItem, DeferredActionQueues } from '@ember/runloop/-private/backburner';
 
+run; // $ExpectType RunNamespace
 run.queues; // $ExpectType EmberRunQueues[]
 const queues: string[] = run.queues;
 
+// It will be the responsibility of each consuming package that needs access to the backburner property
+// to merge the private types in the public API.
+declare module '@ember/runloop' {
+  interface RunNamespace {
+    backburner: Backburner;
+  }
+}
+
 function testRun() {
     run(() => { // $ExpectType number
         // code to be executed within a RunLoop
@@ -198,3 +208,9 @@ function testThrottle() {
     run.throttle(runIt, 150);
     run.throttle(myContext, runIt, 150);
 }
+
+function testBackburner() {
+  const debugInfo: DebugInfo = run.backburner.getDebugInfo();
+  const queueItems: QueueItem[] = debugInfo.timers;
+  const deferredActionQueues: DeferredActionQueues[] = debugInfo.instanceStack;
+}
diff --git a/types/ember__runloop/index.d.ts b/types/ember__runloop/index.d.ts
index 79b3b5973b..9f1fd6c260 100644
--- a/types/ember__runloop/index.d.ts
+++ b/types/ember__runloop/index.d.ts
@@ -1,320 +1,322 @@
 // Type definitions for non-npm package @ember/runloop 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Frunloop
 // Definitions by: Mike North <https://github.com/mike-north>
+//                 Steve Calvert <https://github.com/scalvert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import { RunMethod, EmberRunQueues } from "@ember/runloop/-private/types";
 import { EmberRunTimer } from "@ember/runloop/types";
+import '@ember/runloop/-private/backburner';
 
-// tslint:disable-next-line:strict-export-declare-modifiers
-export const run: {
-    /**
-     * Runs the passed target and method inside of a RunLoop, ensuring any
-     * deferred actions including bindings and views updates are flushed at the
-     * end.
-     */
-    <Ret>(method: (...args: any[]) => Ret): Ret;
-    <Target, Ret>(target: Target, method: RunMethod<Target, Ret>): Ret;
-    /**
-     * If no run-loop is present, it creates a new one. If a run loop is
-     * present it will queue itself to run on the existing run-loops action
-     * queue.
-     */
-    join<Ret>(method: (...args: any[]) => Ret, ...args: any[]): Ret | undefined;
-    join<Target, Ret>(
-        target: Target,
-        method: RunMethod<Target, Ret>,
-        ...args: any[]
-    ): Ret | undefined;
-    /**
-     * Allows you to specify which context to call the specified function in while
-     * adding the execution of that function to the Ember run loop. This ability
-     * makes this method a great way to asynchronously integrate third-party libraries
-     * into your Ember application.
-     */
-    bind<Target, Ret>(
-        target: Target,
-        method: RunMethod<Target, Ret>,
-        ...args: any[]
-    ): (...args: any[]) => Ret;
-    /**
-     * Begins a new RunLoop. Any deferred actions invoked after the begin will
-     * be buffered until you invoke a matching call to `run.end()`. This is
-     * a lower-level way to use a RunLoop instead of using `run()`.
-     */
-    begin(): void;
-    /**
-     * Ends a RunLoop. This must be called sometime after you call
-     * `run.begin()` to flush any deferred actions. This is a lower-level way
-     * to use a RunLoop instead of using `run()`.
-     */
-    end(): void;
-    /**
-     * Adds the passed target/method and any optional arguments to the named
-     * queue to be executed at the end of the RunLoop. If you have not already
-     * started a RunLoop when calling this method one will be started for you
-     * automatically.
-     */
-    schedule<Target>(
-        queue: EmberRunQueues,
-        target: Target,
-        method: RunMethod<Target>,
-        ...args: any[]
-    ): EmberRunTimer;
-    schedule(
-        queue: EmberRunQueues,
-        method: (args: any[]) => any,
-        ...args: any[]
-    ): EmberRunTimer;
-    /**
-     * Invokes the passed target/method and optional arguments after a specified
-     * period of time. The last parameter of this method must always be a number
-     * of milliseconds.
-     */
-    later(method: (...args: any[]) => any, wait: number): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        wait: number
-    ): EmberRunTimer;
-    later<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        arg5: any,
-        wait: number
-    ): EmberRunTimer;
-    /**
-     * Schedule a function to run one time during the current RunLoop. This is equivalent
-     * to calling `scheduleOnce` with the "actions" queue.
-     */
-    once<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        ...args: any[]
-    ): EmberRunTimer;
-    /**
-     * Schedules a function to run one time in a given queue of the current RunLoop.
-     * Calling this method with the same queue/target/method combination will have
-     * no effect (past the initial call).
-     */
-    scheduleOnce<Target>(
-        queue: EmberRunQueues,
-        target: Target,
-        method: RunMethod<Target>,
-        ...args: any[]
-    ): EmberRunTimer;
-    /**
-     * Schedules an item to run from within a separate run loop, after
-     * control has been returned to the system. This is equivalent to calling
-     * `run.later` with a wait time of 1ms.
-     */
-    next<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        ...args: any[]
-    ): EmberRunTimer;
-    /**
-     * Cancels a scheduled item. Must be a value returned by `run.later()`,
-     * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
-     * `run.throttle()`.
-     */
-    cancel(timer: EmberRunTimer): boolean;
-    /**
-     * Delay calling the target method until the debounce period has elapsed
-     * with no additional debounce calls. If `debounce` is called again before
-     * the specified time has elapsed, the timer is reset and the entire period
-     * must pass again before the target method is called.
-     */
-    debounce(
-        method: (...args: any[]) => any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    debounce<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        arg5: any,
-        wait: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    /**
-     * Ensure that the target method is never called more frequently than
-     * the specified spacing period. The target method is called immediately.
-     */
-    throttle(
-        method: (...args: any[]) => any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
-    throttle<Target>(
-        target: Target,
-        method: RunMethod<Target>,
-        arg0: any,
-        arg1: any,
-        arg2: any,
-        arg3: any,
-        arg4: any,
-        arg5: any,
-        spacing: number,
-        immediate?: boolean
-    ): EmberRunTimer;
+export interface RunNamespace {
+  /**
+   * Runs the passed target and method inside of a RunLoop, ensuring any
+   * deferred actions including bindings and views updates are flushed at the
+   * end.
+   */
+  <Ret>(method: (...args: any[]) => Ret): Ret;
+  <Target, Ret>(target: Target, method: RunMethod<Target, Ret>): Ret;
+  /**
+   * If no run-loop is present, it creates a new one. If a run loop is
+   * present it will queue itself to run on the existing run-loops action
+   * queue.
+   */
+  join<Ret>(method: (...args: any[]) => Ret, ...args: any[]): Ret | undefined;
+  join<Target, Ret>(
+      target: Target,
+      method: RunMethod<Target, Ret>,
+      ...args: any[]
+  ): Ret | undefined;
+  /**
+   * Allows you to specify which context to call the specified function in while
+   * adding the execution of that function to the Ember run loop. This ability
+   * makes this method a great way to asynchronously integrate third-party libraries
+   * into your Ember application.
+   */
+  bind<Target, Ret>(
+      target: Target,
+      method: RunMethod<Target, Ret>,
+      ...args: any[]
+  ): (...args: any[]) => Ret;
+  /**
+   * Begins a new RunLoop. Any deferred actions invoked after the begin will
+   * be buffered until you invoke a matching call to `run.end()`. This is
+   * a lower-level way to use a RunLoop instead of using `run()`.
+   */
+  begin(): void;
+  /**
+   * Ends a RunLoop. This must be called sometime after you call
+   * `run.begin()` to flush any deferred actions. This is a lower-level way
+   * to use a RunLoop instead of using `run()`.
+   */
+  end(): void;
+  /**
+   * Adds the passed target/method and any optional arguments to the named
+   * queue to be executed at the end of the RunLoop. If you have not already
+   * started a RunLoop when calling this method one will be started for you
+   * automatically.
+   */
+  schedule<Target>(
+      queue: EmberRunQueues,
+      target: Target,
+      method: RunMethod<Target>,
+      ...args: any[]
+  ): EmberRunTimer;
+  schedule(
+      queue: EmberRunQueues,
+      method: (args: any[]) => any,
+      ...args: any[]
+  ): EmberRunTimer;
+  /**
+   * Invokes the passed target/method and optional arguments after a specified
+   * period of time. The last parameter of this method must always be a number
+   * of milliseconds.
+   */
+  later(method: (...args: any[]) => any, wait: number): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      wait: number
+  ): EmberRunTimer;
+  later<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      arg5: any,
+      wait: number
+  ): EmberRunTimer;
+  /**
+   * Schedule a function to run one time during the current RunLoop. This is equivalent
+   * to calling `scheduleOnce` with the "actions" queue.
+   */
+  once<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      ...args: any[]
+  ): EmberRunTimer;
+  /**
+   * Schedules a function to run one time in a given queue of the current RunLoop.
+   * Calling this method with the same queue/target/method combination will have
+   * no effect (past the initial call).
+   */
+  scheduleOnce<Target>(
+      queue: EmberRunQueues,
+      target: Target,
+      method: RunMethod<Target>,
+      ...args: any[]
+  ): EmberRunTimer;
+  /**
+   * Schedules an item to run from within a separate run loop, after
+   * control has been returned to the system. This is equivalent to calling
+   * `run.later` with a wait time of 1ms.
+   */
+  next<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      ...args: any[]
+  ): EmberRunTimer;
+  /**
+   * Cancels a scheduled item. Must be a value returned by `run.later()`,
+   * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
+   * `run.throttle()`.
+   */
+  cancel(timer: EmberRunTimer): boolean;
+  /**
+   * Delay calling the target method until the debounce period has elapsed
+   * with no additional debounce calls. If `debounce` is called again before
+   * the specified time has elapsed, the timer is reset and the entire period
+   * must pass again before the target method is called.
+   */
+  debounce(
+      method: (...args: any[]) => any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  debounce<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      arg5: any,
+      wait: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  /**
+   * Ensure that the target method is never called more frequently than
+   * the specified spacing period. The target method is called immediately.
+   */
+  throttle(
+      method: (...args: any[]) => any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
+  throttle<Target>(
+      target: Target,
+      method: RunMethod<Target>,
+      arg0: any,
+      arg1: any,
+      arg2: any,
+      arg3: any,
+      arg4: any,
+      arg5: any,
+      spacing: number,
+      immediate?: boolean
+  ): EmberRunTimer;
 
-    queues: EmberRunQueues[];
-};
+  queues: EmberRunQueues[];
+}
 
+export const run: RunNamespace;
 export const begin: typeof run.begin;
 export const bind: typeof run.bind;
 export const cancel: typeof run.cancel;
diff --git a/types/ember__runloop/tsconfig.json b/types/ember__runloop/tsconfig.json
index d06cb5216c..158a3d6459 100644
--- a/types/ember__runloop/tsconfig.json
+++ b/types/ember__runloop/tsconfig.json
@@ -28,6 +28,7 @@
         "index.d.ts",
         "types.d.ts",
         "-private/types.d.ts",
+        "-private/backburner.d.ts",
         "ember__runloop-tests.ts"
     ]
 }

From d1a0a77ca6c3c3033fdc4ee442c1aa872155d845 Mon Sep 17 00:00:00 2001
From: Steve Calvert <steve.calvert@gmail.com>
Date: Thu, 21 Feb 2019 16:09:28 -0800
Subject: [PATCH 485/924] Update index.d.ts

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

diff --git a/types/ember__runloop/index.d.ts b/types/ember__runloop/index.d.ts
index 9f1fd6c260..e8d7905c8f 100644
--- a/types/ember__runloop/index.d.ts
+++ b/types/ember__runloop/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for non-npm package @ember/runloop 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Frunloop
 // Definitions by: Mike North <https://github.com/mike-north>
-//                 Steve Calvert <https://github.com/scalvert>
+//                 Steve Calvert <https://github.com/scalvert> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From abfbff801feb1bf7b1769e2de518da9e6fb2a85e Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 11:42:23 -0800
Subject: [PATCH 486/924] [ember] remove dependency on handlebars types

---
 types/ember-data/tsconfig.json               | 1 +
 types/ember-feature-flags/tsconfig.json      | 1 +
 types/ember-mocha/tsconfig.json              | 1 +
 types/ember-modal-dialog/tsconfig.json       | 1 +
 types/ember-qunit/tsconfig.json              | 1 +
 types/ember-resolver/tsconfig.json           | 1 +
 types/ember-test-helpers/tsconfig.json       | 1 +
 types/ember/index.d.ts                       | 7 +++++--
 types/ember/test/ember-tests.ts              | 4 ++--
 types/ember/test/string.ts                   | 2 +-
 types/ember/tsconfig.json                    | 1 +
 types/ember__string/-private/handlebars.d.ts | 5 +++++
 types/ember__string/ember__string-tests.ts   | 4 ++--
 types/ember__string/index.d.ts               | 2 +-
 types/ember__string/tsconfig.json            | 4 +++-
 types/ember__test-helpers/tsconfig.json      | 1 +
 types/ember__test/tsconfig.json              | 1 +
 17 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 types/ember__string/-private/handlebars.d.ts

diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index f476362aaf..aadbbe7f5f 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-feature-flags/tsconfig.json b/types/ember-feature-flags/tsconfig.json
index 957a7a00f8..dc3260af3a 100644
--- a/types/ember-feature-flags/tsconfig.json
+++ b/types/ember-feature-flags/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-mocha/tsconfig.json b/types/ember-mocha/tsconfig.json
index 4e9b406e2e..c6c6a09f65 100644
--- a/types/ember-mocha/tsconfig.json
+++ b/types/ember-mocha/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-modal-dialog/tsconfig.json b/types/ember-modal-dialog/tsconfig.json
index 0b0b6f91fb..8fc7a37808 100644
--- a/types/ember-modal-dialog/tsconfig.json
+++ b/types/ember-modal-dialog/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-qunit/tsconfig.json b/types/ember-qunit/tsconfig.json
index df4899b37c..92a555a59f 100644
--- a/types/ember-qunit/tsconfig.json
+++ b/types/ember-qunit/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-resolver/tsconfig.json b/types/ember-resolver/tsconfig.json
index bc476c5723..7263220f71 100644
--- a/types/ember-resolver/tsconfig.json
+++ b/types/ember-resolver/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember-test-helpers/tsconfig.json b/types/ember-test-helpers/tsconfig.json
index 2e0ddf49b1..ca139535f3 100644
--- a/types/ember-test-helpers/tsconfig.json
+++ b/types/ember-test-helpers/tsconfig.json
@@ -35,6 +35,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index fbe058a643..d0f9896eb9 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -38,15 +38,17 @@ import {
     ComputedPropertyCallback,
     ObserverMethod
 } from '@ember/object/-private/types';
-import * as HandlebarsNamespace from 'handlebars';
+
 // Capitalization is intentional: this makes it much easier to re-export RSVP on
 // the Ember namespace.
 import Rsvp from 'rsvp';
+
 import { TemplateFactory } from 'htmlbars-inline-precompile';
 
 import { Registry as ServiceRegistry } from '@ember/service';
 import { Registry as ControllerRegistry } from '@ember/controller';
 import * as EmberStringNs from '@ember/string';
+import * as EmberStringHandlebarsNs from '@ember/string/-private/handlebars';
 // tslint:disable-next-line:no-duplicate-imports
 import * as EmberServiceNs from '@ember/service';
 import * as EmberPolyfillsNs from '@ember/polyfills';
@@ -424,11 +426,12 @@ export namespace Ember {
         function K(): any;
         function createFrame(objec: any): any;
         function Exception(message: string): void;
-        const SafeString: typeof HandlebarsNamespace.SafeString;
+        class SafeString extends EmberStringHandlebarsNs.SafeString {}
         function parse(string: string): any;
         function print(ast: any): void;
         const logger: typeof Logger;
         function log(level: string, str: string): void;
+        function registerHelper(name: string, helper: any): void;
     }
     namespace String {
         const camelize: typeof EmberStringNs.camelize;
diff --git a/types/ember/test/ember-tests.ts b/types/ember/test/ember-tests.ts
index 01aaab7452..eb317c3ab1 100755
--- a/types/ember/test/ember-tests.ts
+++ b/types/ember/test/ember-tests.ts
@@ -92,10 +92,10 @@ App.userController = Ember.Object.create({
     }),
 });
 
-Handlebars.registerHelper(
+Ember.Handlebars.registerHelper(
     'highlight',
     (property: string, options: any) =>
-        new Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+        new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
 const coolView = App.CoolView.create();
diff --git a/types/ember/test/string.ts b/types/ember/test/string.ts
index 4363b375f3..d812a52dd5 100644
--- a/types/ember/test/string.ts
+++ b/types/ember/test/string.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { SafeString } from 'handlebars';
+import { SafeString } from '@ember/string/-private/handlebars';
 
 const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w } = Ember.String;
 
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index be47225e72..6e494f5a03 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -36,6 +36,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember__string/-private/handlebars.d.ts b/types/ember__string/-private/handlebars.d.ts
new file mode 100644
index 0000000000..8d8dce118c
--- /dev/null
+++ b/types/ember__string/-private/handlebars.d.ts
@@ -0,0 +1,5 @@
+export class SafeString {
+    constructor(str: string);
+    toString(): string;
+    toHTML(): string;
+}
diff --git a/types/ember__string/ember__string-tests.ts b/types/ember__string/ember__string-tests.ts
index 500c67546e..c6474cd266 100644
--- a/types/ember__string/ember__string-tests.ts
+++ b/types/ember__string/ember__string-tests.ts
@@ -1,5 +1,5 @@
 import { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, loc, underscore, w, isHTMLSafe } from '@ember/string';
-import { SafeString } from 'handlebars';
+import { SafeString } from '@ember/string/-private/handlebars';
 
 dasherize(); // $ExpectError
 dasherize('blue man group'); // $ExpectType string
@@ -37,7 +37,7 @@ const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
 htmlSafe('lorem ipsum...'); // $ExpectType SafeString
 const regularString: string = htmlSafe('lorem ipsum...'); // $ExpectError
 
-function isSafeTest(a: string|Handlebars.SafeString) {
+function isSafeTest(a: string | SafeString) {
   if (isHTMLSafe(a)) {
       a = a.toString();
   }
diff --git a/types/ember__string/index.d.ts b/types/ember__string/index.d.ts
index c25da1f823..2a65c9b5df 100644
--- a/types/ember__string/index.d.ts
+++ b/types/ember__string/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { SafeString } from 'handlebars';
+import { SafeString } from "./-private/handlebars";
 
 export function camelize(str: string): string;
 export function capitalize(str: string): string;
diff --git a/types/ember__string/tsconfig.json b/types/ember__string/tsconfig.json
index 100fad10f5..a5a7ecc944 100644
--- a/types/ember__string/tsconfig.json
+++ b/types/ember__string/tsconfig.json
@@ -15,13 +15,15 @@
             "../"
         ],
         "paths": {
-            "@ember/string": ["ember__string"]
+            "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"]
         },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
+        "-private/handlebars.d.ts",
         "index.d.ts",
         "ember__string-tests.ts"
     ]
diff --git a/types/ember__test-helpers/tsconfig.json b/types/ember__test-helpers/tsconfig.json
index 7b167f14d5..35638865d8 100644
--- a/types/ember__test-helpers/tsconfig.json
+++ b/types/ember__test-helpers/tsconfig.json
@@ -38,6 +38,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],
diff --git a/types/ember__test/tsconfig.json b/types/ember__test/tsconfig.json
index da00f05337..bb95710392 100644
--- a/types/ember__test/tsconfig.json
+++ b/types/ember__test/tsconfig.json
@@ -36,6 +36,7 @@
             "@ember/runloop/*": ["ember__runloop/*"],
             "@ember/service": ["ember__service"],
             "@ember/string": ["ember__string"],
+            "@ember/string/*": ["ember__string/*"],
             "@ember/test": ["ember__test"],
             "@ember/test/*": ["ember__test/*"],
             "@ember/utils": ["ember__utils"],

From 18b5c68588aa8b20e1f5eeedaaa8a2fb2278b9b6 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 1 Mar 2019 09:17:38 -0800
Subject: [PATCH 487/924] remove trailing whitespace from @ember/runloop header

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

diff --git a/types/ember__runloop/index.d.ts b/types/ember__runloop/index.d.ts
index e8d7905c8f..9f1fd6c260 100644
--- a/types/ember__runloop/index.d.ts
+++ b/types/ember__runloop/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for non-npm package @ember/runloop 3.0
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Frunloop
 // Definitions by: Mike North <https://github.com/mike-north>
-//                 Steve Calvert <https://github.com/scalvert> 
+//                 Steve Calvert <https://github.com/scalvert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From 0a0d3df286534cff491eaa570192744f6b59cb7f Mon Sep 17 00:00:00 2001
From: Hitomi Hatsukaze <gigigiaru776@yahoo.co.jp>
Date: Fri, 8 Mar 2019 08:23:15 +0900
Subject: [PATCH 488/924] missing semi

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

diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index 595a51b7b1..74dfec5317 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -120,7 +120,7 @@ declare namespace marked {
         next(): Token;
         peek(): Token | number;
         parseText(): string;
-        tok(): string
+        tok(): string;
     }
 
     class Lexer {
diff --git a/types/marked/marked-tests.ts b/types/marked/marked-tests.ts
index 563f78faf7..2af775e397 100644
--- a/types/marked/marked-tests.ts
+++ b/types/marked/marked-tests.ts
@@ -54,5 +54,5 @@ console.log(textRenderer.strong(text));
 
 const parseTestText = "- list1\n  - list1.1\n\n listend";
 const parseTestTokens: marked.TokensList = marked.lexer(parseTestText, options);
-const parser = new marked.Parser()
+const parser = new marked.Parser();
 console.log(parser.parse(parseTestTokens));

From b8edb8089d64ec0342bcba907c24dd8af106a512 Mon Sep 17 00:00:00 2001
From: Martin Treurnicht <martin@treurnicht.io>
Date: Thu, 7 Mar 2019 15:05:20 -0800
Subject: [PATCH 489/924] Add expo-mixpanel-analytics type definitions

---
 .../expo-mixpanel-analytics-tests.ts          | 31 +++++++++++++++++++
 types/expo-mixpanel-analytics/index.d.ts      | 26 ++++++++++++++++
 types/expo-mixpanel-analytics/tsconfig.json   | 23 ++++++++++++++
 types/expo-mixpanel-analytics/tslint.json     |  1 +
 4 files changed, 81 insertions(+)
 create mode 100644 types/expo-mixpanel-analytics/expo-mixpanel-analytics-tests.ts
 create mode 100644 types/expo-mixpanel-analytics/index.d.ts
 create mode 100644 types/expo-mixpanel-analytics/tsconfig.json
 create mode 100644 types/expo-mixpanel-analytics/tslint.json

diff --git a/types/expo-mixpanel-analytics/expo-mixpanel-analytics-tests.ts b/types/expo-mixpanel-analytics/expo-mixpanel-analytics-tests.ts
new file mode 100644
index 0000000000..50dc0dffe4
--- /dev/null
+++ b/types/expo-mixpanel-analytics/expo-mixpanel-analytics-tests.ts
@@ -0,0 +1,31 @@
+import ExpoMixpanelAnalytics from 'expo-mixpanel-analytics';
+
+const analytics = new ExpoMixpanelAnalytics('5224da5bbbed3fdeaad0911820f1bf2x');
+
+analytics.identify("13793");
+
+analytics.track("Signed Up", { "Referred By": "Friend" });
+
+analytics.people_set({
+    $first_name: "Joe",
+    $last_name: "Doe",
+    $email: "joe.doe@example.com",
+    $created: "2013-04-01T13:20:00",
+    $phone: "4805551212",
+    Address: "1313 Mockingbird Lane",
+    Birthday: "1948-01-01"
+});
+
+analytics.people_set_once({ "First login date": "2013-04-01T13:20:00" });
+
+analytics.people_unset([ "Days Overdue" ]);
+
+analytics.people_increment({ "Coins Gathered": 12 });
+
+analytics.people_append({ "Power Ups": "Bubble Lead" });
+
+analytics.people_union({ "Items purchased": ["socks", "shirts"] });
+
+analytics.people_delete_user();
+
+analytics.reset();
diff --git a/types/expo-mixpanel-analytics/index.d.ts b/types/expo-mixpanel-analytics/index.d.ts
new file mode 100644
index 0000000000..6b51a15585
--- /dev/null
+++ b/types/expo-mixpanel-analytics/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for expo-mixpanel-analytics 0.0
+// Project: https://github.com/codekadiya/expo-mixpanel-analytics
+// Definitions by: Martin Treurnicht <https://github.com/martintreurnicht>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare class ExpoMixpanelAnalytics {
+    constructor(token: string);
+    identify(userId: string): void;
+    track(name: string, props: Props): void;
+    people_set(props: Props): void;
+    people_set_once(props: Props): void;
+    people_unset(keys: string[]): void;
+    people_increment(props: Props<number>): void;
+    people_append(props: Props): void;
+    people_union(props: Props<string[]>): void;
+    people_delete_user(): void;
+    reset(): void;
+    token: string;
+}
+
+interface Props<T = any> {
+    [key: string]: T;
+}
+
+export default ExpoMixpanelAnalytics;
diff --git a/types/expo-mixpanel-analytics/tsconfig.json b/types/expo-mixpanel-analytics/tsconfig.json
new file mode 100644
index 0000000000..57ee3b6a41
--- /dev/null
+++ b/types/expo-mixpanel-analytics/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",
+        "expo-mixpanel-analytics-tests.ts"
+    ]
+}
diff --git a/types/expo-mixpanel-analytics/tslint.json b/types/expo-mixpanel-analytics/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expo-mixpanel-analytics/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f39722faf8764a95f0ff8b5cc180017f6faa9f4c Mon Sep 17 00:00:00 2001
From: a631807682 <631807682@qq.com>
Date: Fri, 8 Mar 2019 10:26:59 +0800
Subject: [PATCH 490/924] feat(types/) Add type definitions for koa-log4

Add type definitions for koa-log4
---
 types/koa-log4/index.d.ts        | 17 +++++++++++++++++
 types/koa-log4/koa-log4-tests.ts | 18 ++++++++++++++++++
 types/koa-log4/package.json      |  6 ++++++
 types/koa-log4/tsconfig.json     | 23 +++++++++++++++++++++++
 types/koa-log4/tslint.json       |  1 +
 5 files changed, 65 insertions(+)
 create mode 100644 types/koa-log4/index.d.ts
 create mode 100644 types/koa-log4/koa-log4-tests.ts
 create mode 100644 types/koa-log4/package.json
 create mode 100644 types/koa-log4/tsconfig.json
 create mode 100644 types/koa-log4/tslint.json

diff --git a/types/koa-log4/index.d.ts b/types/koa-log4/index.d.ts
new file mode 100644
index 0000000000..e47cfc4e07
--- /dev/null
+++ b/types/koa-log4/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for koa-log4 2.3
+// Project: https://github.com/dominhhai/koa-log4js#readme
+// Definitions by: Cr. <https://github.com/a631807682>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import * as Koa from 'koa';
+import * as Log4js from 'log4js';
+
+export function koaLogger(logger4js: Log4js.Logger, optionsOrFormat?: Options | string): Koa.Middleware;
+
+export interface Options {
+    format?: string;
+    level?: Log4js.Level;
+}
+
+export * from 'log4js';
diff --git a/types/koa-log4/koa-log4-tests.ts b/types/koa-log4/koa-log4-tests.ts
new file mode 100644
index 0000000000..cb8d377eb8
--- /dev/null
+++ b/types/koa-log4/koa-log4-tests.ts
@@ -0,0 +1,18 @@
+import Koa = require('koa');
+import KoaLog4 = require('koa-log4');
+
+const DEFAULT_FORMAT = ':remote-addr - -' +
+    ' ":method :url HTTP/:http-version"' +
+    ' :status :content-length ":referrer"' +
+    ' ":user-agent"';
+
+const DEFAULT_OPTIONS: KoaLog4.Options = {
+    format: DEFAULT_FORMAT,
+    level: KoaLog4.levels.INFO
+};
+
+const koaLog4Mid = KoaLog4.koaLogger(KoaLog4.getLogger(), DEFAULT_OPTIONS);
+
+const app = new Koa();
+app.use(koaLog4Mid);
+app.listen(80);
diff --git a/types/koa-log4/package.json b/types/koa-log4/package.json
new file mode 100644
index 0000000000..5c070feace
--- /dev/null
+++ b/types/koa-log4/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "log4js": "^3.0.0"
+    }
+}
\ No newline at end of file
diff --git a/types/koa-log4/tsconfig.json b/types/koa-log4/tsconfig.json
new file mode 100644
index 0000000000..71abbe0755
--- /dev/null
+++ b/types/koa-log4/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes":false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "koa-log4-tests.ts"
+    ]
+}
diff --git a/types/koa-log4/tslint.json b/types/koa-log4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-log4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a716830bc976036f403c6a8466e966236c46b54b Mon Sep 17 00:00:00 2001
From: Adam Vernon <hanenbro@gmail.com>
Date: Mon, 4 Mar 2019 22:16:07 -0800
Subject: [PATCH 491/924] Add type definitions for seen-js

Update seen tsconfig and tests to use strict null checks
---
 types/seen/index.d.ts    | 795 +++++++++++++++++++++++++++++++++++++++
 types/seen/seen-tests.ts |  61 +++
 types/seen/tsconfig.json |  24 ++
 types/seen/tslint.json   |   1 +
 4 files changed, 881 insertions(+)
 create mode 100644 types/seen/index.d.ts
 create mode 100644 types/seen/seen-tests.ts
 create mode 100644 types/seen/tsconfig.json
 create mode 100644 types/seen/tslint.json

diff --git a/types/seen/index.d.ts b/types/seen/index.d.ts
new file mode 100644
index 0000000000..7e2e90b51f
--- /dev/null
+++ b/types/seen/index.d.ts
@@ -0,0 +1,795 @@
+// Type definitions for seen 0.2
+// Project: https://github.com/themadcreator/seen
+// Definitions by: Adam Vernon <https://github.com/admvx>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+/**
+ * The animator class is useful for creating an animation loop. We supply pre and post events for apply animation changes between frames.
+ */
+export class Animator {
+    dispatch: Events.Dispatcher;
+    timestamp: number;
+    frameDelay: number | null;
+    constructor();
+    animateFrame(): this;
+    frame(t?: boolean): this;
+    onAfter(handler: FrameHandler): this;
+    onBefore(handler: FrameHandler): this;
+    onFrame(handler: FrameHandler): this;
+    start(): this;
+    stop(): this;
+}
+
+export interface FrameHandler {
+    (timestamp: number, deltaTimestamp: number): void;
+}
+
+/**
+ * The Bounds object contains an axis-aligned bounding box.
+ */
+export class Bounds {
+    constructor();
+    add(p: Point): this;
+    center(): Point;
+    contains(p: Point): boolean;
+    copy(): this;
+    depth(): number;
+    height(): number;
+    intersect(box: Bounds): this;
+    maxX(): number;
+    maxY(): number;
+    maxZ(): number;
+    minX(): number;
+    minY(): number;
+    minZ(): number;
+    pad(x: number, y: number, z: number): this;
+    reset(): this;
+    valid(): boolean;
+    width(): number;
+    static points(points: Point[]): Bounds;
+    static xywh(x: number, y: number, w: number, h: number): Bounds;
+    static xyzwhd(x: number, y: number, z: number, w: number, h: number, d: number): Bounds;
+}
+
+/**
+ * The Camera model contains all three major components of the 3D to 2D tranformation.
+ *
+ * First, we transform object from world-space (the same space that the coordinates of surface points are in after all their transforms are applied) to camera space. Typically, this will place all
+ * viewable objects into a cube with coordinates: x = -1 to 1, y = -1 to 1, z = 1 to 2
+ *
+ * Second, we apply the projection trasform to create perspective parallax and what not.
+ *
+ * Finally, we rescale to the viewport size.
+ *
+ * These three steps allow us to easily create shapes whose coordinates match up to screen coordinates in the z = 0 plane.
+ */
+export class Camera extends Transformable {
+    projection: Matrix;
+    defaults: { projection: Matrix };
+    constructor(transform?: Matrix);
+}
+
+export class CanvasCirclePainter extends CanvasStyler {
+    circle(center: { x: number, y: number }, radius: number): CanvasCirclePainter;
+}
+
+export class CanvasLayerRenderContext extends RenderLayerContext {
+    constructor(ctx: CanvasRenderingContext2D);
+    circle(): CanvasCirclePainter;
+    path(): CanvasPathPainter;
+    rect(): CanvasRectPainter;
+    text(): CanvasTextPainter;
+}
+
+export class CanvasPathPainter extends CanvasStyler {
+    path(points: Point[]): this;
+}
+
+export class CanvasRectPainter extends CanvasStyler {
+    rect(width: number, height: number): this;
+}
+
+export class CanvasRenderContext extends RenderContext {
+    el: HTMLCanvasElement;
+    ctx: CanvasRenderingContext2D;
+    constructor(elementOrId: string | HTMLElement);
+    layer(layer: RenderLayerContext): this;
+    reset(): void;
+}
+
+export class CanvasStyler {
+    constructor(ctx: CanvasRenderingContext2D);
+    draw(style?: { stroke?: string, 'stroke-width'?: number, 'text-anchor'?: string }): this;
+    fill(style?: { fill?: string, 'fill-opacity'?: number, 'text-anchor'?: string }): this;
+}
+
+export class CanvasTextPainter {
+    constructor(ctx: CanvasRenderingContext2D);
+    fillText(m: Matrix, text: string, style?: { font: string, fill?: string, 'text-anchor'?: string }): this;
+}
+
+/**
+ * Color objects store RGB and Alpha values from 0 to 255.
+ */
+export class Color {
+    r: number;
+    g: number;
+    b: number;
+    a: number;
+    constructor(r?: number, g?: number, b?: number, a?: number);
+    addChannels(c: Color): this;
+    clamp(min?: number, max?: number): this;
+    copy(): this;
+    hex(): string;
+    minChannels(c: Color): this;
+    multiplyChannels(c: Color): this;
+    offset(n: number): this;
+    scale(n: number): this;
+    style(): string;
+}
+
+/**
+ * Adds simple mouse drag eventing to a DOM element. A ‘drag’ event is emitted as the user is dragging their mouse. This is the easiest way to add mouse- look or mouse-rotate to a scene.
+ */
+export class Drag {
+    el: HTMLElement;
+    inertia: boolean;
+    dispatch: Events.Dispatcher;
+    defaults: { inertia: boolean };
+    constructor(elementOrId: string | HTMLElement, options?: { inertia?: boolean });
+    on(type: string, listener: (e: { offset: number[], offsetRelative: number[] }) => void): Events.Dispatcher;
+}
+
+export class FillLayer extends RenderLayer {
+    constructor(width: number, height: number, fill: string);
+    render(context: RenderLayerContext): void;
+}
+
+export class Grad {
+    x: number;
+    y: number;
+    z: number;
+    constructor(x: number, y: number, z: number);
+    dot(x: number, y: number, z: number): number;
+}
+
+/**
+ * A class for computing mouse interia for interial scrolling
+ */
+export class InertialMouse {
+    xy: number[];
+    constructor();
+    damp(): this;
+    get(): [number, number];
+    reset(): this;
+    update(xy: [number, number]): this;
+    static inertiaExtinction: number;
+    static inertiaMsecDelay: number;
+    static smoothingTimeout: number;
+}
+
+export interface LightOptions {
+    point?: Point;
+    color?: Color;
+    intensity?: number;
+    normal?: Point;
+    enabled?: boolean;
+}
+
+/**
+ * This model object holds the attributes and transformation of a light source.
+ */
+export class Light extends Transformable {
+    type: string;
+    point: Point;
+    color: Color;
+    intensity: number;
+    normal: Point;
+    enabled: boolean;
+    id: string;
+    defaults: LightOptions;
+    constructor(type: 'point' | 'directional' | 'ambient', options?: LightOptions);
+    render(): void;
+}
+
+/**
+ * The LightRenderModel stores pre-computed values necessary for shading surfaces with the supplied Light.
+ */
+export class LightRenderModel {
+    colorIntensity: Color;
+    type: string;
+    intensity: number;
+    point: Point;
+    origin: Point;
+    normal: Point;
+    constructor(light: Light, transform: Matrix);
+}
+
+export interface MaterialOptions {
+    color?: Color;
+    metallic?: boolean;
+    specularColor?: Color;
+    specularExponent?: number;
+    shader?: Shader;
+}
+
+/**
+ * Material objects hold the attributes that desribe the color and finish of a surface.
+ */
+export class Material {
+    color: Color;
+    metallic: boolean;
+    specularColor: Color;
+    specularExponent: number;
+    shader: Shader;
+    defaults: MaterialOptions;
+    constructor(color?: Color, options?: MaterialOptions);
+    render(lights?: Light[], shader?: Shader, renderData?: RenderModel): Color;
+    static create(value?: Material | Color | string): Material;
+}
+
+/**
+ * The Matrix class stores transformations in the scene. These include: (1) Camera Projection and Viewport transformations. (2) Transformations of any Transformable type object, such as Shapes or
+ * Models
+ *
+ * Most of the methods on Matrix are destructive, so be sure to use .copy() when you want to preserve an object’s value.
+ */
+export class Matrix {
+    m: number[];
+    baked: number[];
+    constructor(m?: number[]);
+    bake(m?: number[]): this;
+    copy(): this;
+    matrix(m: number[]): this;
+    multiply(b: Matrix): this;
+    reset(): this;
+    rotx(theta: number): this;
+    roty(theta: number): this;
+    rotz(theta: number): this;
+    scale(x?: number, y?: number, z?: number): this;
+    translate(x?: number, y?: number, z?: number): this;
+    transpose(): this;
+}
+
+export class Mocap {
+    bvh: any;
+    constructor(bvh?: any);
+    createMocapModel(shapeFactory?: () => Shape): MocapModel;
+    static DEFAULT_SHAPE_FACTORY(joint?: any, endpoint?: Point): Shape;
+    static parse(source: string): Mocap;
+}
+
+export class MocapAnimator extends Animator {
+    constructor(mocap: MocapModel);
+    renderFrame(): void;
+}
+
+export class MocapModel {
+    constructor(model: Model, frames: any[], frameDelay?: number);
+    applyFrameTransforms(frameIndex: number): number;
+}
+
+/**
+ * The object model class. It stores Shapes, Lights, and other Models as well as a transformation matrix.
+ *
+ * Notably, models are hierarchical, like a tree. This means you can isolate the transformation of groups of shapes in the scene, as well as create chains of transformations for creating, for
+ * example, articulated skeletons.
+ */
+export class Model extends Transformable {
+    constructor();
+    add(...args: Array<Shape | Model | Light>): this;
+    append(): this;
+    eachRenderable(lightFn: (light: Light, matrix?: Matrix) => Model, shapeFn: (item: Shape | Model, lightModels?: Model[], matrix?: Matrix) => any): void;
+    eachShape(f: (shape: Shape) => any): void;
+    remove(...args: Array<Shape | Model | Light>): void;
+}
+
+export interface MouseEventOptions {
+    dragStart?: EventListener;
+    drag?: EventListener;
+    dragEnd?: EventListener;
+    mouseMove?: EventListener;
+    mouseDown?: EventListener;
+    mouseUp?: EventListener;
+    mouseWheel?: EventListener;
+}
+
+/**
+ * An event dispatcher for mouse and drag events on a single dom element. The available events are 'dragStart', 'drag', 'dragEnd', 'mouseMove', 'mouseDown', 'mouseUp', 'mouseWheel'
+ */
+export class MouseEvents {
+    el: HTMLElement;
+    dispatch: Events.Dispatcher;
+    constructor(elementOrId: string | HTMLElement, options?: MouseEventOptions);
+    attach(): void;
+    detach(): void;
+}
+
+/**
+ * Parser for Wavefront .obj files
+ *
+ * Note: Wavefront .obj array indicies are 1-based.
+ */
+export class ObjParser {
+    vertices: number[][];
+    faces: number[][];
+    commands: { v: (v: any) => any, f: (f: any) => any };
+    constructor();
+    mapFacePoints(faceMap: (points: Point[]) => any): void;
+    parse(contents: string): void;
+}
+
+/**
+ * Each Painter overrides the paint method. It uses the supplied RenderLayerContext‘s builders to create and style the geometry on screen.
+ */
+export class Painter {
+    constructor();
+    paint(renderModel: RenderModel, context: RenderLayerContext): void;
+}
+
+export class PathPainter extends Painter { }
+
+/**
+ * The Point object contains x,y,z, and w coordinates. Points support various arithmetic operations with other Points, scalars, or Matrices.
+ *
+ * Most of the methods on Point are destructive, so be sure to use .copy() when you want to preserve an object’s value.
+ */
+export class Point {
+    x: number;
+    y: number;
+    z: number;
+    w: number;
+    constructor(x?: number, y?: number, z?: number, w?: number);
+    add(q: Point): this;
+    copy(): this;
+    cross(q: Point): this;
+    divide(n: number): this;
+    dot(q: Point): number;
+    magnitude(): number;
+    magnitudeSquared(): number;
+    multiply(n: number): this;
+    normalize(): this;
+    perpendicular(): this;
+    round(): this;
+    set(p: Point): this;
+    subtract(q: Point): this;
+    transform(matrix: Matrix): this;
+    translate(x: number, y: number, z: number): this;
+}
+
+/**
+ * A Quaterionion class for computing quaterion multiplications. This creates more natural mouse rotations.
+ */
+export class Quaternion {
+    q: Point;
+    constructor();
+    multiply(q: Point): this;
+    toMatrix(): Matrix;
+    static axisAngle(x: number, y: number, z: number, angleRads: number): Quaternion;
+    static pixelsPerRadian: number;
+    static pointAngle(p: Point, angleRads: number): Quaternion;
+    static xyToTransform(x: number, y: number): Matrix;
+}
+
+export class RenderAnimator extends Animator { }
+
+/**
+ * The RenderContext uses RenderModels produced by the scene’s render method to paint the shapes into an HTML element. Since we support both SVG and Canvas painters, the RenderContext and
+ * RenderLayerContext define a common interface.
+ */
+export class RenderContext {
+    layers: RenderLayerContext[];
+    constructor();
+    animate(): RenderAnimator;
+    cleanup(): void;
+    layer(layer: RenderLayerContext): this;
+    render(): this;
+    reset(): void;
+    sceneLayer(scene: Scene): this;
+}
+
+export class RenderLayer {
+    constructor();
+    render(context: RenderLayerContext): void;
+}
+
+/**
+ * The RenderLayerContext defines the interface for producing painters that can paint various things into the current layer.
+ */
+export class RenderLayerContext {
+    constructor();
+    circle(): any;
+    cleanup(): void;
+    path(): any;
+    rect(): any;
+    reset(): void;
+    text(): any;
+}
+
+/**
+ * The RenderModel object contains the transformed and projected points as well as various data needed to shade and paint a Surface.
+ *
+ * Once initialized, the object will have a constant memory footprint down to Number primitives. Also, we compare each transform and projection to prevent unnecessary re-computation.
+ *
+ * If you need to force a re-computation, mark the surface as ‘dirty’.
+ */
+export class RenderModel {
+    constructor(surface: Surface, transform: Matrix, projection: Matrix, viewport: Matrix);
+    update(transform: Matrix, projection: Matrix, viewport: Matrix): void;
+}
+
+/**
+ * A Scene is the main object for a view of a scene.
+ */
+export class Scene {
+    constructor(options?: SceneOptions);
+    defaults(): SceneOptions;
+    flushCache(): void;
+    render(): Transformable[];
+}
+
+export interface SceneOptions {
+    model?: Model;
+    camera?: Camera;
+    viewport?: Viewport;
+    shader?: Shader;
+    cullBackfaces?: boolean;
+    fractionalPoints?: boolean;
+    cache?: boolean;
+}
+
+export class SceneLayer extends RenderLayer {
+    model: Model;
+    camera: Camera;
+    viewport: Viewport;
+    shader: Shader;
+    cullBackfaces: boolean;
+    fractionalPoints: boolean;
+    cache: boolean;
+    constructor(scene: Scene);
+    render(context: RenderLayerContext): void;
+}
+
+/**
+ * The Shader class is the base class for all shader objects.
+ */
+export class Shader {
+    constructor();
+    shade(lights: Light[], renderModel: RenderModel, material: Material): void;
+}
+
+/**
+ * The Phong shader implements the Phong shading model with a diffuse, specular, and ambient term.
+ *
+ * See https://en.wikipedia.org/wiki/Phong_reflection_model for more information
+ */
+export class Phong extends Shader { }
+
+/**
+ * The DiffusePhong shader implements the Phong shading model with a diffuse and ambient term (no specular).
+ */
+export class DiffusePhong extends Shader { }
+
+/**
+ * The Ambient shader colors surfaces from ambient light only.
+ */
+export class Ambient extends Shader { }
+
+/**
+ * The Flat shader colors surfaces with the material color, disregarding all light sources.
+ */
+export class Flat extends Shader { }
+
+/**
+ * A Shape contains a collection of surface. They may create a closed 3D shape, but not necessarily. For example, a cube is a closed shape, but a patch is not.
+ */
+export class Shape extends Transformable {
+    type: string;
+    surfaces: Surface[];
+    constructor(type: string, surfaces: Surface[]);
+    eachSurface(f: (s: Surface) => void): this;
+    fill(fill: string | Color): this;
+    stroke(stroke: string | Color): this;
+}
+
+export class Simplex3D {
+    perm: number[];
+    gradP: Grad[];
+    constructor(seed?: number);
+    noise(x: number, y: number, z: number): number;
+    seed(seed: number): void;
+}
+
+/**
+ * A Surface is a defined as a planar object in 3D space. These paths don’t necessarily need to be convex, but they should be non-degenerate. This library does not support shapes with holes.
+ */
+export class Surface {
+    points: Point[];
+    painter: Painter;
+    id: string;
+    cullBackfaces: boolean;
+    dirty: boolean | null;
+    fillMaterial: Material;
+    strokeMaterial: Material;
+    constructor(points: Point[], painter?: Painter);
+    fill(fill: string | Color): this;
+    stroke(stroke: string | Color): this;
+}
+
+export class SvgCirclePainter extends SvgStyler {
+    circle(center: Point, radius: number): this;
+}
+
+export class SvgLayerRenderContext extends RenderLayerContext {
+    constructor(group: SVGGElement);
+    circle(): SvgCirclePainter;
+    path(): SvgPathPainter;
+    rect(): SvgRectPainter;
+    text(): SvgTextPainter;
+}
+
+export class SvgPathPainter extends SvgStyler {
+    path(points: Point[]): this;
+}
+
+export class SvgRectPainter extends SvgStyler {
+    rect(width: number, height: number): this;
+}
+
+export class SvgRenderContext extends RenderContext {
+    svg: SVGSVGElement;
+    layers: SvgLayerRenderContext[];
+    constructor(svgElementOrId: string | HTMLElement);
+}
+
+export class SvgStyler {
+    constructor(elementFactory: (name: string) => HTMLElement);
+    clear(): this;
+    draw(style?: Partial<CSSStyleDeclaration>): this;
+    fill(style?: Partial<CSSStyleDeclaration>): this;
+}
+
+export class SvgTextPainter {
+    constructor(elementFactory: (name: string) => HTMLElement);
+    fillText(m: number[], text: string, style?: Partial<CSSStyleDeclaration>): void;
+}
+
+export class TextPainter extends Painter { }
+
+/**
+ * Transformable base class extended by Shape and Model.
+ *
+ * The advantages of keeping transforms in Matrix form are (1) lazy computation of point position (2) ability combine hierarchical transformations easily (3) ability to reset transformations to an
+ * original state.
+ *
+ * Resetting transformations is especially useful when you want to animate interpolated values. Instead of computing the difference at each animation step, you can compute the global interpolated
+ * value for that time step and apply that value directly to a matrix (once it is reset).
+ */
+export class Transformable {
+    baked: number[];
+    m: Matrix;
+    constructor();
+    transform(m: Matrix): this;
+    bake(m?: number[]): this;
+    matrix(m: number[]): this;
+    reset(): this;
+    rotx(theta: number): this;
+    roty(theta: number): this;
+    rotz(theta: number): this;
+    scale(x?: number, y?: number, z?: number): this;
+    translate(x?: number, y?: number, z?: number): this;
+}
+
+/**
+ * A transition object to manage to animation of shapes
+ */
+export class Transition {
+    duration: number;
+    defaults: { duration: number };
+    constructor(options?: { duration?: number });
+    firstFrame(): void;
+    frame(): void;
+    lastFrame(): void;
+    update(t?: number): boolean;
+}
+
+/**
+ * A seen.Animator for updating seen.Transtions. We include keyframing to make sure we wait for one transition to finish before starting the next one.
+ */
+export class TransitionAnimator extends Animator {
+    dispatch: Events.Dispatcher;
+    timestamp: number;
+    frameDelay: number | null;
+    queue: Transition[][];
+    transitions: Transition[];
+    add(txn: Transition): void;
+    keyframe(): void;
+    update(t?: number): void;
+}
+
+/**
+ * Adds simple mouse wheel eventing to a DOM element. A ‘zoom’ event is emitted as the user is scrolls their mouse wheel.
+ */
+export class Zoom {
+    el: HTMLElement;
+    speed: number;
+    dispatch: Events.Dispatcher;
+    defaults: { smooth: boolean };
+    constructor(elementOrId: string | HTMLElement, options?: { smooth?: boolean });
+}
+
+export const Painters: {
+    path: PathPainter,
+    text: TextPainter
+};
+export function C(r?: number, g?: number, b?: number, a?: number): Color;
+export function CanvasContext(elementOrId: string | HTMLElement, scene?: Scene): CanvasRenderContext;
+
+/**
+ * Create a render context for the element with the specified elementId. elementId should correspond to either an SVG or Canvas element.
+ */
+export function Context(elementOrId: string | HTMLElement, scene?: Scene): RenderContext;
+
+export function M(m?: number[]): Matrix;
+
+export function P(x?: number, y?: number, z?: number, w?: number): Point;
+
+export function SvgContext(elementOrId: string | HTMLElement, scene?: Scene): SvgRenderContext;
+
+/**
+ * It is not possible exactly render text in a scene with a perspective projection because Canvas and SVG support only affine transformations. So, in order to fake it, we create an affine transform
+ * that approximates the linear effects of a perspective projection on an unrendered planar surface that represents the text’s shape. We can use this transform directly in the text painter to warp
+ * the text.
+ *
+ * This fake projection will produce unrealistic results with large strings of text that are not broken into their own shapes.
+ */
+export const Affine: {
+    INITIAL_STATE_MATRIX: number[][],
+    ORTHONORMAL_BASIS(): Point[],
+    solveForAffineTransform(points: Point[]): number[]
+};
+
+export const BvhParser: {
+    SyntaxError(message: string, expected: string, found: string, location: any): void,
+    parse(input: string): any
+};
+
+export const Colors: {
+    CSS_RGBA_STRING_REGEX: RegExp,
+    black(): Color,
+    gray(): Color,
+    hex(hex: string): Color,
+    hsl(h: number, s: number, l: number, a?: number): Color,
+    parse(str: string): Color,
+    randomShape(shape: Shape, sat?: number, lit?: number): void,
+    randomSurfaces(shape: Shape, sat?: number, lit?: number): void,
+    randomSurfaces2(shape: Shape, drift?: number, sat?: number, lit?: number): void,
+    rgb(r: number, g: number, b: number, a?: number): Color,
+    white(): Color
+};
+
+export namespace Events {
+/**
+ * The Dispatcher class. These objects have methods that can be invoked like dispatch.eventName(). Listeners can be registered with dispatch.on('eventName.uniqueId', callback). Listeners can be
+ * removed with dispatch.on('eventName.uniqueId', null). Listeners can also be registered and removed with dispatch.eventName.on('name', callback).
+ *
+ * Note that only one listener with the name event name and id can be registered at once. If you to generate unique ids, you can use the seen.Util.uniqueId() method.
+ */
+    class Dispatcher {
+        constructor();
+        on(type: string, listener: EventListener): Dispatcher;
+    }
+
+/**
+ * Return a new dispatcher that creates event types using the supplied string argument list. The returned Dispatcher will have methods with the names of the event types.
+ */
+    function dispatch(): Dispatcher;
+
+    function Event(): void;
+}
+
+export const Lights: {
+    ambient(opts?: LightOptions): Light,
+    directional(opts?: LightOptions): Light,
+    point(opts?: LightOptions): Light
+};
+
+/**
+ * A few useful Matrix objects.
+ */
+export const Matrices: {
+    flipX(): Matrix,
+    flipY(): Matrix,
+    flipZ(): Matrix,
+    identity(): Matrix
+};
+
+export const Models: {
+    default(): Model
+};
+
+/**
+ * A few useful Point objects. Be sure that you don’t invoke destructive methods on these objects.
+ */
+export const Points: {
+    X(): Point,
+    Y(): Point,
+    Z(): Point,
+    ZERO(): Point
+};
+
+/**
+ * These projection methods return a 3D to 2D Matrix transformation. Each projection assumes the camera is located at (0,0,0).
+ */
+export const Projections: {
+    ortho(left?: number, right?: number, bottom?: number, top?: number, near?: number, far?: number): Matrix,
+    perspective(left?: number, right?: number, bottom?: number, top?: number, near?: number, far?: number): Matrix,
+    perspectiveFov(fovyInDegrees?: number, front?: number): Matrix
+};
+
+/**
+ * These shading functions compute the shading for a surface. To reduce code duplication, we aggregate them in a utils object.
+ */
+export const ShaderUtils: {
+    applyAmbient(c: Color, light: Light): void,
+    applyDiffuse(c: Color, light: Light, lightNormal: Point, surfaceNormal: Point, material?: Material): void,
+    applyDiffuseAndSpecular(c: Color, light: Light, lightNormal: Point, surfaceNormal: Point, material: Material): void
+};
+
+export const Shaders: {
+    ambient(): Ambient,
+    diffuse(): DiffusePhong,
+    flat(): Flat,
+    phong(): Phong
+};
+
+/**
+ * Shape primitives and shape-making methods
+ */
+export const Shapes: {
+    arrow(thickness?: number, tailLength?: number, tailWidth?: number, headLength?: number, headPointiness?: number): Shape,
+    cube(): Shape,
+    custom(s: Shape): Shape,
+    extrude(points: Point[], offset: Point): Shape,
+    icosahedron(): Shape,
+    mapPointsToSurfaces(points: Point[], coordinateMap: number[][]): Surface[],
+    obj(objContents: string, cullBackfaces?: boolean): Shape,
+    patch(nx?: number, ny?: number): Shape,
+    path(points: Point[]): Shape,
+    pipe(point1: Point, point2: Point, radius?: number, segments?: number): Shape,
+    pyramid(): Shape,
+    rectangle(point1: Point, point2: Point): Shape,
+    sphere(subdivisions?: number): Shape,
+    tetrahedron(): Shape,
+    text(text: string, surfaceOptions?: Partial<Surface>): Shape,
+    unitcube(): Shape
+};
+
+/**
+ * Utility methods
+ */
+export const Util: {
+    arraysEqual<T>(a: T[], b: T[]): boolean,
+    defaults<T>(obj: T, opts: Partial<T>, defaults: Partial<T>): void,
+    element(elementOrId: string | HTMLElement): HTMLElement,
+    uniqueId(prefix?: string): string
+};
+
+export interface Viewport {
+    prescale: Matrix;
+    postscale: Matrix;
+}
+
+export const Viewports: {
+    center(width?: number, height?: number, x?: number, y?: number): Viewport,
+    origin(width?: number, height?: number, x?: number, y?: number): Viewport
+};
+
+/**
+ * A global window event dispatcher. Attaches listeners only if window is defined.
+ */
+export const WindowEvents: {
+    on(type: string, listener: EventListener): Events.Dispatcher;
+};
diff --git a/types/seen/seen-tests.ts b/types/seen/seen-tests.ts
new file mode 100644
index 0000000000..05f23905ca
--- /dev/null
+++ b/types/seen/seen-tests.ts
@@ -0,0 +1,61 @@
+/**
+ * Converted to TypeScript from: http://seenjs.io/demo-noisy-sphere.html
+ */
+
+import { Shapes, Colors, Scene, Models, Viewports, Context, Simplex3D, Drag, Quaternion, RenderContext, Shape, Point, Surface, Matrix } from 'seen';
+
+const width = 900;
+const height = 500;
+
+const shape: Shape = Shapes.sphere(2).scale(150);
+Colors.randomSurfaces2(shape);
+
+const scene: Scene = new Scene({
+	fractionalPoints: true,
+	cullBackfaces: false,
+	model: Models["default"]().add(shape),
+	viewport: Viewports.center(width, height)
+});
+
+const context: RenderContext = Context('seen-canvas', scene).render();
+
+const ref: Surface[] = shape.surfaces;
+const originals: Point[][] = [];
+let surf: Surface;
+for (let j = 0, len: number = ref.length; j < len; j++) {
+	surf = ref[j];
+	originals.push(surf.points.map(p => {
+		return p.copy();
+	}));
+	surf.fillMaterial.color.a = 150;
+}
+
+const noiser: Simplex3D = new Simplex3D(Math.random());
+
+context.animate().onBefore((t, dt) => {
+	let n: number;
+	let p: Point;
+	let ref2: Point[];
+    const ref1: Surface[] = shape.surfaces;
+	for (let k  = 0, len1 = ref1.length; k < len1; k++) {
+		surf = ref1[k];
+		ref2 = surf.points;
+		for (let i = 0, l = 0, len2 = ref2.length; l < len2; i = ++l) {
+			p = ref2[i];
+			n = noiser.noise(p.x, p.y, p.z + t * 1e-4);
+			surf.points[i] = originals[k][i].copy().multiply(1 + n / 3);
+		}
+		surf.dirty = true;
+	}
+	return shape.rotx(dt * 1e-4).rotz(-dt * 1e-4);
+}).start();
+
+const dragger: Drag = new Drag(document.getElementById('seen-canvas')!, {
+	inertia: true
+});
+
+dragger.on('drag.rotate', (e) => {
+	const xform: Matrix = Quaternion.xyToTransform(e.offsetRelative[0], e.offsetRelative[1]);
+	shape.transform(xform);
+	return context.render();
+});
diff --git a/types/seen/tsconfig.json b/types/seen/tsconfig.json
new file mode 100644
index 0000000000..e56ea79e69
--- /dev/null
+++ b/types/seen/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",
+        "seen-tests.ts"
+    ]
+}
diff --git a/types/seen/tslint.json b/types/seen/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/seen/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 98aed985909e030e0c02e418747c996c70b468db Mon Sep 17 00:00:00 2001
From: Klaus Reimer <k.reimer@iplabs.de>
Date: Fri, 8 Mar 2019 07:41:32 +0100
Subject: [PATCH 492/924] Remove declare global

---
 types/offscreencanvas/index.d.ts | 92 +++++++++++++++-----------------
 1 file changed, 44 insertions(+), 48 deletions(-)

diff --git a/types/offscreencanvas/index.d.ts b/types/offscreencanvas/index.d.ts
index de3b3a7fe3..89e2b14df6 100644
--- a/types/offscreencanvas/index.d.ts
+++ b/types/offscreencanvas/index.d.ts
@@ -5,53 +5,49 @@
 
 // TypeScript Version: 3.1
 
-declare global {
-    // https://html.spec.whatwg.org/multipage/canvas.html#canvasdrawimage
-    interface CanvasDrawImage {
-        drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number): void;
-        drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number, dw: number, dh: number): void;
-        drawImage(image: CanvasImageSource | OffscreenCanvas, sx: number, sy: number, sw: number, sh: number,
-            dx: number, dy: number, dw: number, dh: number): void;
-    }
-
-    // https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#dom-createimagebitmap
-    function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas): Promise<ImageBitmap>;
-    function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas, sx: number, sy: number,
-        sw: number, sh: number): Promise<ImageBitmap>;
-
-    // https://html.spec.whatwg.org/multipage/canvas.html#dom-canvas-transfercontroltooffscreen
-    interface HTMLCanvasElement extends HTMLElement {
-        transferControlToOffscreen(): OffscreenCanvas;
-    }
-
-    // https://html.spec.whatwg.org/multipage/canvas.html#offscreencanvasrenderingcontext2d
-    interface OffscreenCanvasRenderingContext2D extends CanvasState, CanvasTransform, CanvasCompositing,
-            CanvasImageSmoothing, CanvasFillStrokeStyles, CanvasShadowStyles, CanvasFilters, CanvasRect,
-            CanvasDrawPath, CanvasText, CanvasDrawImage, CanvasImageData, CanvasPathDrawingStyles,
-            CanvasTextDrawingStyles, CanvasPath {
-        readonly canvas: OffscreenCanvas;
-    }
-    var OffscreenCanvasRenderingContext2D: {
-        prototype: OffscreenCanvasRenderingContext2D;
-        new (): OffscreenCanvasRenderingContext2D;
-    };
-
-    // https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
-    interface OffscreenCanvas extends EventTarget {
-        width: number;
-        height: number;
-        getContext(contextId: "2d", contextAttributes?: CanvasRenderingContext2DSettings):
-            OffscreenCanvasRenderingContext2D | null;
-        getContext(contextId: "webgl", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
-        getContext(contextId: string, contextAttributes?: {}): OffscreenCanvasRenderingContext2D
-            | WebGLRenderingContext | null;
-        transferToImageBitmap(): ImageBitmap;
-        convertToBlob(options?: { type?: string, quality?: number }): Promise<Blob>;
-    }
-    var OffscreenCanvas: {
-        prototype: OffscreenCanvas;
-        new (width: number, height: number): OffscreenCanvas;
-    };
+// https://html.spec.whatwg.org/multipage/canvas.html#canvasdrawimage
+interface CanvasDrawImage {
+    drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number): void;
+    drawImage(image: CanvasImageSource | OffscreenCanvas, dx: number, dy: number, dw: number, dh: number): void;
+    drawImage(image: CanvasImageSource | OffscreenCanvas, sx: number, sy: number, sw: number, sh: number,
+        dx: number, dy: number, dw: number, dh: number): void;
 }
 
-export { };
+// https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#dom-createimagebitmap
+declare function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas): Promise<ImageBitmap>;
+declare function createImageBitmap(image: ImageBitmapSource | OffscreenCanvas, sx: number, sy: number,
+    sw: number, sh: number): Promise<ImageBitmap>;
+
+// https://html.spec.whatwg.org/multipage/canvas.html#dom-canvas-transfercontroltooffscreen
+interface HTMLCanvasElement extends HTMLElement {
+    transferControlToOffscreen(): OffscreenCanvas;
+}
+
+// https://html.spec.whatwg.org/multipage/canvas.html#offscreencanvasrenderingcontext2d
+interface OffscreenCanvasRenderingContext2D extends CanvasState, CanvasTransform, CanvasCompositing,
+        CanvasImageSmoothing, CanvasFillStrokeStyles, CanvasShadowStyles, CanvasFilters, CanvasRect,
+        CanvasDrawPath, CanvasText, CanvasDrawImage, CanvasImageData, CanvasPathDrawingStyles,
+        CanvasTextDrawingStyles, CanvasPath {
+    readonly canvas: OffscreenCanvas;
+}
+declare var OffscreenCanvasRenderingContext2D: {
+    prototype: OffscreenCanvasRenderingContext2D;
+    new (): OffscreenCanvasRenderingContext2D;
+};
+
+// https://html.spec.whatwg.org/multipage/canvas.html#the-offscreencanvas-interface
+interface OffscreenCanvas extends EventTarget {
+    width: number;
+    height: number;
+    getContext(contextId: "2d", contextAttributes?: CanvasRenderingContext2DSettings):
+        OffscreenCanvasRenderingContext2D | null;
+    getContext(contextId: "webgl", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null;
+    getContext(contextId: string, contextAttributes?: {}): OffscreenCanvasRenderingContext2D
+        | WebGLRenderingContext | null;
+    transferToImageBitmap(): ImageBitmap;
+    convertToBlob(options?: { type?: string, quality?: number }): Promise<Blob>;
+}
+declare var OffscreenCanvas: {
+    prototype: OffscreenCanvas;
+    new (width: number, height: number): OffscreenCanvas;
+};

From 1642e414cf5cedf4a8d88fe80e32257751a97f7a Mon Sep 17 00:00:00 2001
From: Shikanime Deva <deva.shikanime@protonmail.com>
Date: Fri, 8 Mar 2019 11:47:15 +0100
Subject: [PATCH 493/924] Add SketchMSData wrapper

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

diff --git a/types/sketchapp/index.d.ts b/types/sketchapp/index.d.ts
index b45dcefe50..9d2f8e9ab4 100644
--- a/types/sketchapp/index.d.ts
+++ b/types/sketchapp/index.d.ts
@@ -17,9 +17,34 @@ type SketchMSLayerListExpandedType = 0 | 1 | 2;
 type SketchMSEncodedBase64BinaryPlist = string;
 type SketchMSNSColorArchive = SketchMSKeyValueArchive;
 type SketchMSLayer = SketchMSPage | SketchMSSymbolMaster;
+type SketchMSUserData = SketchMSUserDocument | SketchMSUserPage;
 interface SketchMSNestedSymbolOverride {
   symbolID: string;
 }
+interface SketchMSPreview {
+  source: string;
+  width: number;
+  height: number;
+}
+interface SketchMSUserPage {
+  [key: string]: {
+    scrollOrigin: SketchMSCurvePoint;
+    zoomValue: number;
+  };
+}
+interface SketchMSUserDocument {
+  document: {
+    pageListCollapsed: number;
+    pageListHeight: number;
+  }
+}
+interface SketchMSData {
+  pages: Array<SketchMSPage>;
+  previews: Array<SketchMSPreview>;
+  document: SketchMSDocumentData;
+  user: SketchMSUserData;
+  meta: SketchMSMetadata;
+}
 interface SketchMSStringAttribute {
   _class: 'stringAttribute';
   attributes: {

From 727f54e853c555ff3a6ddc3d10e578274537c04d Mon Sep 17 00:00:00 2001
From: Shikanime Deva <deva.shikanime@protonmail.com>
Date: Fri, 8 Mar 2019 11:47:55 +0100
Subject: [PATCH 494/924] Add SketchMSPath property on SketchMSLayer

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

diff --git a/types/sketchapp/index.d.ts b/types/sketchapp/index.d.ts
index 9d2f8e9ab4..a9505f6f49 100644
--- a/types/sketchapp/index.d.ts
+++ b/types/sketchapp/index.d.ts
@@ -108,8 +108,8 @@ interface SketchMSImageDataReference {
 }
 type SketchMSPointString = string;
 interface SketchMSPath {
-  _class: 'path';
-  isClosed: boolean;
+  _class: 'path' | 'shapePath' | 'rectangle' | 'oval' | 'triangle';
+  isClosed?: boolean;
   points: SketchMSCurvePoint[];
 }
 interface SketchMSCurvePoint {
@@ -380,6 +380,8 @@ interface SketchMSSymbolMaster {
   attributedString: SketchMSAttributedString;
   name: string;
   layers: SketchMSLayer[];
+  points: SketchMSPath;
+  isClosed?: boolean;
   isVisible: boolean;
   nameIsFixed: boolean;
   grid: SketchMSSimpleGrid;

From 072ad7ac8b3fd40bd3f23c13506f942044652fa2 Mon Sep 17 00:00:00 2001
From: Daniel Cassidy <mail@danielcassidy.me.uk>
Date: Fri, 8 Mar 2019 13:00:14 +0000
Subject: [PATCH 495/924] is-integer: add type definitions.

---
 types/is-integer/index.d.ts          |  8 ++++++++
 types/is-integer/is-integer-tests.ts | 16 ++++++++++++++++
 types/is-integer/tsconfig.json       | 23 +++++++++++++++++++++++
 types/is-integer/tslint.json         |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 types/is-integer/index.d.ts
 create mode 100644 types/is-integer/is-integer-tests.ts
 create mode 100644 types/is-integer/tsconfig.json
 create mode 100644 types/is-integer/tslint.json

diff --git a/types/is-integer/index.d.ts b/types/is-integer/index.d.ts
new file mode 100644
index 0000000000..46708e5068
--- /dev/null
+++ b/types/is-integer/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-integer 1.0
+// Project: https://github.com/parshap/js-is-integer#readme
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isInteger(val: any): boolean;
+
+export = isInteger;
diff --git a/types/is-integer/is-integer-tests.ts b/types/is-integer/is-integer-tests.ts
new file mode 100644
index 0000000000..f414281fc6
--- /dev/null
+++ b/types/is-integer/is-integer-tests.ts
@@ -0,0 +1,16 @@
+import isInteger = require("is-integer");
+
+// $ExpectType boolean
+isInteger("hello");
+
+// $ExpectType boolean
+isInteger(4);
+
+// $ExpectType boolean
+isInteger(4.0);
+
+// $ExpectType boolean
+isInteger(4.1);
+
+// $ExpectType boolean
+isInteger({});
diff --git a/types/is-integer/tsconfig.json b/types/is-integer/tsconfig.json
new file mode 100644
index 0000000000..7b4310e320
--- /dev/null
+++ b/types/is-integer/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",
+        "is-integer-tests.ts"
+    ]
+}
diff --git a/types/is-integer/tslint.json b/types/is-integer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-integer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a6b33c8499a189a8a13581ab956552d208db350f Mon Sep 17 00:00:00 2001
From: Shikanime Deva <deva.shikanime@protonmail.com>
Date: Fri, 8 Mar 2019 15:24:43 +0100
Subject: [PATCH 496/924] Lint and add contributor

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

diff --git a/types/sketchapp/index.d.ts b/types/sketchapp/index.d.ts
index a9505f6f49..79a9226508 100644
--- a/types/sketchapp/index.d.ts
+++ b/types/sketchapp/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for non-npm package the SketchApp 1.0
 // Project: https://github.com/xlayers/xlayers
 // Definitions by: Wassim Chegham <https://github.com/manekinekko>
+//                 Phetsinorath William <https://github.com/shikanime>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type SketchMSBorderPositionEnum = 0 | 1 | 2 | 3;
@@ -36,11 +37,11 @@ interface SketchMSUserDocument {
   document: {
     pageListCollapsed: number;
     pageListHeight: number;
-  }
+  };
 }
 interface SketchMSData {
-  pages: Array<SketchMSPage>;
-  previews: Array<SketchMSPreview>;
+  pages: SketchMSPage[];
+  previews: SketchMSPreview[];
   document: SketchMSDocumentData;
   user: SketchMSUserData;
   meta: SketchMSMetadata;

From 691680bcbbb447832067658dad98a4d371c2c707 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Fri, 8 Mar 2019 16:34:10 +0000
Subject: [PATCH 497/924] Update CODEOWNERS

---
 .github/CODEOWNERS | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5af21f27d2..d21cca9322 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -531,6 +531,7 @@
 /types/cash/                                        @akvlko
 /types/casperjs/                                    @jedmao @urielch
 /types/cassandra-driver/                            @Svjard @pc-jedi @michal-b-kaminski
+/types/cassanknex/                                  @bioball
 /types/catbox/                                      @jasonswearingen @AJamesPhillips @saboya
 /types/catbox/v7/                                   @jasonswearingen @AJamesPhillips
 /types/catbox-memory/                               @SimonSchick
@@ -653,6 +654,7 @@
 /types/coinlist/                                    @BendingBender
 /types/coinstring/                                  @mhegazy
 /types/collections/                                 @scarabedore
+/types/collectionsjs/                               @jaymeh
 /types/color/                                       @Airlun @jameswlane
 /types/color/v2/                                    @Airlun
 /types/color/v1/                                    @LKay
@@ -1085,6 +1087,7 @@
 /types/duplicate-package-checker-webpack-plugin/    @mtraynham
 /types/durandal/                                    @BlueSpire
 /types/dustjs-linkedin/                             @mdezem
+/types/dv/                                          @taoqf
 /types/dvtng-jss/                                   @Ptival
 /types/dw-bxslider-4/                               @namerci
 /types/dwt/                                         @yushulx @jbh @lincoln2018 @Tom-Dynamsoft
@@ -1172,7 +1175,7 @@
 /types/ember__object/                               @mike-north
 /types/ember__polyfills/                            @mike-north
 /types/ember__routing/                              @mike-north
-/types/ember__runloop/                              @mike-north
+/types/ember__runloop/                              @mike-north @scalvert
 /types/ember__service/                              @mike-north
 /types/ember__string/                               @mike-north
 /types/ember__test/                                 @mike-north
@@ -1426,7 +1429,7 @@
 /types/file-url/                                    @coderslagoon
 /types/filenamify/                                  @rokt33r
 /types/filenamify-url/                              @cprecioso
-/types/filesize/                                    @GiedriusGrabauskas @renchap @Ky6uk
+/types/filesize/                                    @GiedriusGrabauskas @renchap @Ky6uk @ffxsam
 /types/fill-pdf/                                    @westy92
 /types/filter-console/                              @BendingBender
 /types/filter-invalid-dom-props/                    @icopp
@@ -1758,6 +1761,7 @@
 /types/gl-react-native/                             @jussikinnula
 /types/gl-shader/                                   @MathiasPaumgarten
 /types/gl-texture2d/                                @MathiasPaumgarten
+/types/gl-vec2/                                     @adamzerella
 /types/gl-vec3/                                     @adamzerella
 /types/gl-vec4/                                     @adamzerella
 /types/gldatepicker/                                @qcz
@@ -1974,7 +1978,7 @@
 /types/hedron/                                      @dborysov
 /types/hellojs/                                     @PavelPZ @vuorinem @baywet
 /types/hellosign-embedded/                          @xt0rted
-/types/helmet/                                      @cyrilschumacher @EvanHahn @bluehatbrit
+/types/helmet/                                      @cyrilschumacher @EvanHahn @bluehatbrit @chdanielmueller
 /types/heredatalens/                                @denyo
 /types/heremaps/                                    @Josh-ES @denyo @fx88
 /types/heroku-logger/                               @kylevogt
@@ -2013,10 +2017,12 @@
 /types/html-tag-names/                              @sandersn
 /types/html-tags/                                   @BendingBender
 /types/html-to-text/                                @erykwarren
+/types/html-truncate/                               @adamzerella
 /types/html-void-elements/                          @rhysd
 /types/html-webpack-plugin/                         @deevus @bumbleblym @tlaziuk
 /types/html-webpack-template/                       @bumbleblym
 /types/html2canvas/                                 @rwhepburn @tan9 @sschocke @Ristaaf
+/types/html5-history/                               @akashishu777
 /types/html5plus/                                   @dcloudio
 /types/htmlbars-inline-precompile/                  @chriskrycho
 /types/htmlparser2/                                 @staticfunction @LinusU
@@ -2029,7 +2035,7 @@
 /types/http-errors/                                 @tkrotoff @BendingBender
 /types/http-graceful-shutdown/                      @dlee-nvisia
 /types/http-link-header/                            @screendriver
-/types/http-proxy/                                  @SomaticIT @Raigen @DanielMSchmidt
+/types/http-proxy/                                  @SomaticIT @Raigen @DanielMSchmidt @jabreu610
 /types/http-proxy-agent/                            @mrmlnc @steprescott
 /types/http-proxy-middleware/                       @zebMcCorkle @BendingBender
 /types/http-rx/                                     @L2jLiga
@@ -2506,7 +2512,7 @@
 /types/jsonrpc-serializer/                          @Akim95 @many20
 /types/jsonstream/                                  @Bartvds
 /types/jsontoxml/                                   @benstevens48
-/types/jsonwebtoken/                                @SomaticIT @danielheim @brikou @vpk @rlgod
+/types/jsonwebtoken/                                @SomaticIT @danielheim @brikou @vpk @rlgod @kettil
 /types/jsonwebtoken-promisified/                    @SomaticIT @danielheim @brikou @aneilbaboo
 /types/jspath/                                      @dex4er
 /types/jspdf/                                       @amberjs @lleios @jemerald
@@ -3325,7 +3331,7 @@
 /types/moment-round/                                @jacobbaskin
 /types/moment-shortformat/                          @whatasoda
 /types/moment-strftime2/                            @dex4er
-/types/moment-timezone/                             @michelsalib @alanblins @asermax
+/types/moment-timezone/                             @michelsalib @alanblins @asermax @borys-kupar
 /types/money-math/                                  @taoqf
 /types/mongo-sanitize/                              @CedricCazin
 /types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric @erikc5000 @Manc
@@ -3555,7 +3561,7 @@
 /types/node-zopfli-es/                              @Alorel
 /types/node_redis/                                  @borisyankov
 /types/nodecredstash/                               @migstopheles
-/types/nodegit/                                     @dolanmiu @tniessen
+/types/nodegit/                                     @dolanmiu @tniessen @pvigier
 /types/nodemailer/                                  @rogierschouten @dex4er @bioball
 /types/nodemailer/v3/                               @rogierschouten
 /types/nodemailer-direct-transport/                 @rogierschouten
@@ -3683,9 +3689,6 @@
 /types/optics-agent/                                @crevil
 /types/optimist/                                    @soywiz @chbrown
 /types/optimize-css-assets-webpack-plugin/          @odnamrataizem
-/types/ora/                                         @basarat @screendriver @BendingBender @azasypkin
-/types/ora/v1/                                      @basarat @screendriver @BendingBender @azasypkin
-/types/ora/v0/                                      @basarat @screendriver
 /types/oracle__oraclejet/                           @nolakara @jingxwu
 /types/oracledb/                                    @Bigous
 /types/orchestrator/                                @tkQubo @TeamworkGuy2
@@ -3853,6 +3856,7 @@
 /types/pegjs/                                       @vvakame @SrTobi @siegebell
 /types/pem/                                         @tony19 @DethAriel
 /types/pem-jwk/                                     @alessiopcc
+/types/pendo-io-browser/                            @aaronbeall
 /types/permit/                                      @jannikkeye
 /types/persona/                                     @Nycto
 /types/pet-finder-api/                              @me
@@ -3902,7 +3906,6 @@
 /types/piwik-tracker/                               @lbguilherme
 /types/pixelmatch/                                  @iamolegga
 /types/pixi.js/                                     @clark-stevenson
-/types/pkg-conf/                                    @jorgegonzalez
 /types/pkg-dir/                                     @NK-WEB-Git
 /types/pkg-up/                                      @forivall
 /types/pkg-versions/                                @BendingBender
@@ -3920,6 +3923,7 @@
 /types/plupload/                                    @patrickbussmann
 /types/plur/                                        @iRoachie
 /types/pluralize/                                   @ukyo @karol-majewski
+/types/plurals-cldr/                                @ChaosinaCan
 /types/png.js/                                      @ffflorian
 /types/pngjs/                                       @jason0x43
 /types/pngquant-bin/                                @hikoma
@@ -4182,7 +4186,7 @@
 /types/react-bootstrap-daterangepicker/             @ianks
 /types/react-bootstrap-table/                       @flaub @alelode @UJosue10 @dawnmist @Ogglas
 /types/react-bootstrap-table/v2/                    @flaub @alelode @UJosue10
-/types/react-bootstrap-typeahead/                   @Guymestef @radziksh @PaitoAnderson @arichter83 @dalevfenton
+/types/react-bootstrap-typeahead/                   @Guymestef @radziksh @PaitoAnderson @arichter83 @dalevfenton @KngHawkon
 /types/react-breadcrumbs/                           @guoyunhe
 /types/react-breadcrumbs-dynamic/                   @mitsuruog
 /types/react-broadcast/                             @kandros
@@ -4467,7 +4471,7 @@
 /types/react-responsive/                            @asvetliakov @alechill @xaviergonz
 /types/react-responsive/v1/                         @asvetliakov
 /types/react-rnd/                                   @Ragg- @fsubal @zyh825
-/types/react-router/                                @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran @8enSmith @wezleytsai
+/types/react-router/                                @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran @8enSmith @wezleytsai @eps1lon
 /types/react-router/v3/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen @gillchristian @nulladdict
 /types/react-router/v2/                             @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
 /types/react-router-bootstrap/                      @vlesierse @LKay @olmobrutall
@@ -4675,6 +4679,7 @@
 /types/remove-markdown/                             @RagibHasin
 /types/rename/                                      @Aankhen
 /types/repeat-element/                              @adamzerella
+/types/repeat-string/                               @adamzerella
 /types/replace-ext/                                 @DeividasBakanas
 /types/replace-string/                              @BendingBender
 /types/replacestream/                               @dex4er
@@ -4720,8 +4725,9 @@
 /types/restler/                                     @cyrilschumacher
 /types/restling/                                    @loghorn
 /types/restore-cursor/                              @BendingBender
-/types/resumablejs/                                 @DanielMcAssey
+/types/resumablejs/                                 @DanielMcAssey @Johns3n
 /types/rethinkdb/                                   @alexgorbatchev @AdrianFarmadin @kondi @hoishin
+/types/retinajs/                                    @senjyouhara
 /types/retry/                                       @krenor @BendingBender
 /types/retry-as-promised/                           @Raigen
 /types/rev-hash/                                    @ikatyang
@@ -4909,6 +4915,7 @@
 /types/semver-truncate/                             @BendingBender
 /types/sencha_touch/                                @brian428
 /types/send/                                        @MikeJerred
+/types/sendmail/                                    @saostad
 /types/seneca/                                      @psnider @kevynb
 /types/sequelize/                                   @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd @nrschultz @thomas-b @Antoine38660 @smff
 /types/sequelize/v3/                                @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
@@ -5310,6 +5317,7 @@
 /types/tapable/                                     @e-cloud @johnnyreilly
 /types/tapable/v0/                                  @e-cloud
 /types/tape/                                        @Bartvds @sodatea @DennisSchwartz @mikehenrty @rostrowski
+/types/tape-async/                                  @ExE-Boss
 /types/tar/                                         @SomaticIT @connor4312
 /types/tar-fs/                                      @Umoxfo
 /types/tar-stream/                                  @glicht
@@ -5508,6 +5516,7 @@
 /types/universal-analytics/                         @Bartvds @DarkerTV
 /types/universal-cookie/                            @tomi
 /types/unorm/                                       @chbrown
+/types/unsplash-js/                                 @markupcode
 /types/untildify/                                   @BendingBender
 /types/unused-filename/                             @BendingBender
 /types/unzip/                                       @coding2012
@@ -5585,7 +5594,7 @@
 /types/vfile/                                       @bizen241 @rokt33r
 /types/vfile-location/                              @ikatyang @rokt33r
 /types/vfile-message/                               @rokt33r
-/types/victory/                                     @asvetliakov @snerks @Havret @alredyExist @jlismore
+/types/victory/                                     @asvetliakov @snerks @Havret @allreadyExisted @jlismore
 /types/video.js/                                    @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas @gjanblaszczyk @sroucheray @AkxeOne @meikidd
 /types/viewability-helper/                          @lironzluf
 /types/viewerjs/                                    @lrh3321

From 62a4a451c71e44984211cac4845977a5a3cc98b9 Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Fri, 8 Mar 2019 18:36:00 +0000
Subject: [PATCH 498/924] Added Package

Added new package
---
 types/sunrise-sunset-js/index.d.ts               | 16 ++++++++++++++++
 .../sunrise-sunset-js/sunrise-sunset-js-tests.ts |  4 ++++
 types/sunrise-sunset-js/tsconfig.json            | 16 ++++++++++++++++
 types/sunrise-sunset-js/tslint.json              |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 types/sunrise-sunset-js/index.d.ts
 create mode 100644 types/sunrise-sunset-js/sunrise-sunset-js-tests.ts
 create mode 100644 types/sunrise-sunset-js/tsconfig.json
 create mode 100644 types/sunrise-sunset-js/tslint.json

diff --git a/types/sunrise-sunset-js/index.d.ts b/types/sunrise-sunset-js/index.d.ts
new file mode 100644
index 0000000000..b926ce6b50
--- /dev/null
+++ b/types/sunrise-sunset-js/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for sunrise-sunset-js 2.0
+// Project: https://github.com/udivankin/sunrise-sunset
+// Definitions by: Haseeb Majid <https://github.com/hmajid2301>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function getSunrise(
+    latitude: number,
+    longitude: number,
+    date?: Date
+): Date;
+
+export function getSunset(
+    latitude: number,
+    longitude: number,
+    date?: Date
+): Date;
diff --git a/types/sunrise-sunset-js/sunrise-sunset-js-tests.ts b/types/sunrise-sunset-js/sunrise-sunset-js-tests.ts
new file mode 100644
index 0000000000..30fc19218a
--- /dev/null
+++ b/types/sunrise-sunset-js/sunrise-sunset-js-tests.ts
@@ -0,0 +1,4 @@
+import { getSunrise, getSunset } from "sunrise-sunset-js";
+
+const sunset = getSunset(51.4541, -2.592);
+const sunrise = getSunrise(51.1788, -1.8262, new Date("2000-06-21"));
diff --git a/types/sunrise-sunset-js/tsconfig.json b/types/sunrise-sunset-js/tsconfig.json
new file mode 100644
index 0000000000..4221b604c2
--- /dev/null
+++ b/types/sunrise-sunset-js/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", "sunrise-sunset-js-tests.ts"]
+}
diff --git a/types/sunrise-sunset-js/tslint.json b/types/sunrise-sunset-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sunrise-sunset-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 27a13a3f677bd4892a132f92760b1ba2f16c2101 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Fri, 8 Mar 2019 10:58:57 -0800
Subject: [PATCH 499/924] Remove outdated test

---
 types/victory/victory-tests.tsx | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index df7e34b75b..32c9b3160d 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -655,19 +655,6 @@ test = (
     />
 );
 
-test = (
-    <VictoryScatter
-        data={[
-          {x: 1, y: 3},
-          {x: 2, y: 5},
-          {x: 3, y: 4},
-          {x: 4, y: 2},
-          {x: 5, y: 5}
-        ]}
-        size={(d, a) => (a ? 5 : 3)}
-    />
-);
-
 // VictoryPie test
 test = (
     <VictoryPie

From 46bf7c74b64fd7e2d25a83b089fe970222ba9c9b Mon Sep 17 00:00:00 2001
From: Jalyna <jalyna.schroeder@gmail.com>
Date: Wed, 6 Mar 2019 12:30:09 +0100
Subject: [PATCH 500/924] Added type defs for oakdex-pokedex

---
 types/oakdex-pokedex/index.d.ts              | 349 +++++++++++++
 types/oakdex-pokedex/oakdex-pokedex-tests.ts | 492 +++++++++++++++++++
 types/oakdex-pokedex/tsconfig.json           |  23 +
 types/oakdex-pokedex/tslint.json             |   3 +
 4 files changed, 867 insertions(+)
 create mode 100644 types/oakdex-pokedex/index.d.ts
 create mode 100644 types/oakdex-pokedex/oakdex-pokedex-tests.ts
 create mode 100644 types/oakdex-pokedex/tsconfig.json
 create mode 100644 types/oakdex-pokedex/tslint.json

diff --git a/types/oakdex-pokedex/index.d.ts b/types/oakdex-pokedex/index.d.ts
new file mode 100644
index 0000000000..8ca4fa709d
--- /dev/null
+++ b/types/oakdex-pokedex/index.d.ts
@@ -0,0 +1,349 @@
+// Type definitions for oakdex-pokedex 0.4
+// Project: https://github.com/jalyna/oakdex-pokedex
+// Definitions by: Jalyna Schroeder <https://github.com/jalyna>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Translations {
+    de: string;
+    en: string;
+    cz?: string;
+    dk?: string;
+    fr?: string;
+    gr?: string;
+    it?: string;
+    pl?: string;
+    tr?: string;
+    jp?: string;
+    es?: string;
+}
+
+export interface PokemonEvolution {
+    to: string;
+    level?: number;
+    happiness?: boolean;
+    trade?: boolean;
+    level_up?: boolean;
+    item?: string;
+    hold_item?: string;
+    move_learned?: string;
+    conditions?: string[];
+}
+
+export interface PokemonAbility {
+    name: string;
+    hidden?: boolean;
+}
+
+export interface StatObject {
+    hp: number;
+    atk: number;
+    def: number;
+    sp_atk: number;
+    sp_def: number;
+    speed: number;
+}
+
+export interface MegaEvolution {
+    types: string[];
+    ability: string;
+    height_us: string;
+    height_eu: string;
+    weight_us: string;
+    weight_eu: string;
+    base_stats: StatObject;
+    mega_stone: string;
+    image_suffix?: string;
+}
+
+export interface PokemonVariation {
+    condition?: string;
+    names: Translations;
+    types: string[];
+    height_us?: string;
+    height_eu?: string;
+    weight_us?: string;
+    weight_eu?: string;
+    base_stats?: StatObject;
+    pokeathlon_stats?: {
+        speed?: number[];
+        power?: number[];
+        stamina?: number[];
+        skill?: number[];
+        jump?: number[]
+    };
+    abilities?: string[];
+    image_suffix?: string;
+}
+
+export interface Learnset {
+    move: string;
+    level?: number;
+    tm?: string;
+    egg_move?: boolean;
+    variations?: string[];
+}
+
+export interface MoveLearnset {
+    games: string[];
+    learnset: Learnset[];
+}
+
+export interface Pokemon {
+    names: Translations;
+    categories: Translations;
+    national_id: number;
+    kanto_id: number | null;
+    johto_id: number | null;
+    hoenn_id: number | null;
+    sinnoh_id: number | null;
+    unova_id: number | null;
+    kalos_id: number | null;
+    alola_id: number | null;
+    ultra_alola_id: number | null;
+    pokedex_entries: {
+        [key: string]: Translations;
+    };
+    evolution_from: string | null;
+    evolutions: PokemonEvolution[];
+    types: string[];
+    abilities: PokemonAbility[];
+    gender_ratios: null | {
+        female: number;
+        male: number;
+    };
+    catch_rate: number;
+    egg_groups: string[];
+    hatch_time: number[];
+    height_us: string;
+    height_eu: string;
+    weight_us: string;
+    weight_eu: string;
+    base_exp_yield: number;
+    leveling_rate: string;
+    ev_yield: StatObject;
+    color: string;
+    base_friendship: number;
+    base_stats: StatObject;
+    pokeathlon_stats?: {
+        speed?: number[];
+        power?: number[];
+        stamina?: number[];
+        skill?: number[];
+        jump?: number[];
+    };
+    mega_evolutions: MegaEvolution[];
+    variation_names?: Translations;
+    variations: PokemonVariation[];
+    move_learnsets: MoveLearnset[];
+}
+
+export interface MoveStatusCondition {
+    condition: string;
+    probability: number;
+}
+
+export interface MoveStatModifier {
+    stat: string;
+    change_by: number;
+    affects_user?: boolean;
+}
+
+export interface MoveContest {
+    contest: string;
+    condition: string;
+    appeal: number;
+    jam: number;
+}
+
+export interface Move {
+    names: Translations;
+    index_number: number;
+    pp: number;
+    max_pp: number;
+    power: number;
+    accuracy: number;
+    type: string;
+    category: string;
+    priority: number;
+    target: string;
+    critical_hit: number;
+    pokedex_entries: {
+        [key: string]: Translations;
+    };
+    contests: MoveContest[];
+    makes_contact: boolean;
+    affected_by_protect: boolean;
+    affected_by_magic_coat: boolean;
+    affected_by_snatch: boolean;
+    affected_by_mirror_move: boolean;
+    affected_by_kings_rock: boolean;
+    in_battle_properties?: {
+        increased_critical_hit_ratio?: boolean;
+        status_conditions?: MoveStatusCondition[]
+    };
+    stat_modifiers?: MoveStatModifier[];
+}
+
+export interface Ability {
+    names: Translations;
+    index_number: number;
+    descriptions: Translations;
+}
+
+export interface PokemonType {
+    names: Translations;
+    color: string;
+    effectivness: {
+        Normal: number;
+        Fighting: number;
+        Flying: number;
+        Poison: number;
+        Ground: number;
+        Rock: number;
+        Bug: number;
+        Ghost: number;
+        Steel: number;
+        Fire: number;
+        Water: number;
+        Grass: number;
+        Electric: number;
+        Psychic: number;
+        Ice: number;
+        Dragon: number;
+        Dark: number;
+        Fairy: number;
+    };
+}
+
+export interface LocationPokemon {
+    pokemon: string;
+    location: string;
+    min_level: number;
+    max_level: number;
+    rarity: string;
+    games: string[];
+    day_times?: string[];
+    seasons?: string[];
+    variation?: string;
+}
+
+export interface Location {
+    names: Translations;
+    pokemon: LocationPokemon[];
+}
+
+export interface Region {
+    names: Translations;
+    locations: Location[];
+}
+
+export interface EggGroup {
+    names: Translations;
+}
+
+export interface Generation {
+    names: Translations;
+    dex_name: string;
+    number: number;
+    games: Translations[];
+}
+
+export interface Nature {
+    names: Translations;
+    increased_stat: string | null;
+    decreased_stat: string | null;
+    favorite_flavor: string | null;
+    disliked_flavor: string | null;
+}
+
+export interface ItemPrice {
+    games: string[];
+    buying: number;
+    selling: number;
+}
+
+export interface ItemPocket {
+    pocket: string;
+    generations: number[];
+}
+
+export interface ItemDescription {
+    translations: Translations;
+    games: string[];
+}
+
+export interface ItemPokemonChange {
+    field: string;
+    change_by_percent?: number;
+    revive?: boolean;
+    change_by?: number;
+    change?: string;
+    conditions?: string[];
+}
+
+export interface ItemMoveChange {
+    field: string;
+    change_by_percent?: number;
+    change_by?: number;
+    change_by_max?: number;
+}
+
+export interface ItemEffect {
+    condition: string;
+    target: string;
+    triggers_evolution?: boolean;
+    pokemon_changes?: ItemPokemonChange[];
+    move_changes?: ItemMoveChange[];
+}
+
+export interface Item {
+    names: Translations;
+    category: string;
+    descriptions: ItemDescription[];
+    prices: ItemPrice[];
+    pockets: ItemPocket[];
+    effects: ItemEffect[];
+    fling_power: number;
+}
+
+export interface Conditions {
+    [key: string]: any;
+}
+
+export function resetPokemon(): void;
+
+export function importPokemon(customPokemon: string[] | string | Pokemon[]): void;
+
+export function findPokemon(idOrName: string | number): Pokemon | null;
+
+export function findMove(name: string): Move | null;
+
+export function findAbility(name: string): Ability | null;
+
+export function findType(name: string): PokemonType | null;
+
+export function findRegion(name: string): Region | null;
+
+export function findEggGroup(name: string): EggGroup | null;
+
+export function findGeneration(name: string): Generation | null;
+
+export function findNature(name: string): Nature | null;
+
+export function findItem(name: string): Item | null;
+
+export function allPokemon(conditions?: Conditions): Pokemon[];
+
+export function allItems(conditions?: Conditions): Item[];
+
+export function allTypes(conditions?: Conditions): PokemonType[];
+
+export function allAbilities(conditions?: Conditions): Ability[];
+
+export function allRegions(conditions?: Conditions): Region[];
+
+export function allEggGroups(conditions?: Conditions): EggGroup[];
+
+export function allGenerations(conditions?: Conditions): Generation[];
+
+export function allNatures(conditions?: Conditions): Nature[];
diff --git a/types/oakdex-pokedex/oakdex-pokedex-tests.ts b/types/oakdex-pokedex/oakdex-pokedex-tests.ts
new file mode 100644
index 0000000000..670c348cbb
--- /dev/null
+++ b/types/oakdex-pokedex/oakdex-pokedex-tests.ts
@@ -0,0 +1,492 @@
+import {
+    Pokemon,
+    Move,
+    Ability,
+    PokemonType,
+    Region,
+    EggGroup,
+    Generation,
+    Nature,
+    Item
+} from 'oakdex-pokedex';
+
+// Pokemon
+() => {
+    const pikachu: Pokemon = {
+        names: {
+            fr: 'Pikachu',
+            de: 'Pikachu',
+            it: 'Pikachu',
+            en: 'Pikachu'
+        },
+        national_id: 25,
+        types: [
+        'Electric'
+        ],
+        abilities: [
+        {
+            name: 'Static'
+        },
+        {
+            name: 'Lightning Rod',
+            hidden: true
+        }
+        ],
+        gender_ratios: {
+            male: 50,
+            female: 50
+        },
+        catch_rate: 190,
+        egg_groups: [
+        'Field',
+        'Fairy'
+        ],
+        hatch_time: [
+        5355,
+        5609
+        ],
+        height_us: '1\'04"',
+        height_eu: '0.4 m',
+        weight_us: '13.2 lbs.',
+        weight_eu: '6.0 kg',
+        base_exp_yield: 105,
+        leveling_rate: 'Medium Fast',
+        ev_yield: {
+            hp: 0,
+            atk: 0,
+            def: 0,
+            sp_atk: 0,
+            sp_def: 0,
+            speed: 2
+        },
+        color: 'Yellow',
+        base_friendship: 70,
+        base_stats: {
+            hp: 35,
+            atk: 55,
+            def: 30,
+            sp_atk: 50,
+            sp_def: 40,
+            speed: 90
+        },
+        evolutions: [
+        {
+            to: 'Raichu',
+            item: 'Thunderstone'
+        }
+        ],
+        evolution_from: 'Pichu',
+        alola_id: 25,
+        categories: {
+            en: 'Mouse Pokémon',
+            de: 'Maus'
+        },
+        kanto_id: 25,
+        johto_id: 22,
+        hoenn_id: 163,
+        sinnoh_id: 104,
+        unova_id: null,
+        kalos_id: 36,
+        mega_evolutions: [],
+        variations: [
+        {
+            names: {
+                fr: 'Pikachu (Pokémon partenaire)',
+                de: 'Pikachu (Partner-Pokémon)',
+                it: 'Pikachu (Pokémon compagno)',
+                en: 'Pikachu (Partner Pokémon)'
+            },
+            types: [
+            'Electric'
+            ],
+            base_stats: {
+                hp: 45,
+                atk: 80,
+                def: 50,
+                sp_atk: 75,
+                sp_def: 60,
+                speed: 120
+            }
+        }
+        ],
+        pokedex_entries: {
+            Red: {
+                en: 'When several of these Pokémon gather, their electricity could build and cause lightning storms.',
+                de: 'Wenn sich mehrere dieser Pokémon versammeln, kann ihre Energie Blitzgewitter erzeugen.'
+            },
+            Blue: {
+                en: 'When several of these Pokémon gather, their electricity could build and cause lightning storms.',
+                de: 'Wenn sich mehrere dieser Pokémon versammeln, kann ihre Energie Blitzgewitter erzeugen.'
+            }
+        },
+        pokeathlon_stats: {
+            speed: [
+            3,
+            4
+            ],
+            power: [
+            3,
+            4
+            ],
+            stamina: [
+            3,
+            4
+            ],
+            skill: [
+            3,
+            4
+            ],
+            jump: [
+            3,
+            4
+            ]
+        },
+        ultra_alola_id: 32,
+        move_learnsets: [
+        {
+            games: [
+            'Red',
+            'Blue'
+            ],
+            learnset: [
+            {
+                move: 'Growl',
+                level: 1
+            },
+            {
+                move: 'Thunder Shock',
+                level: 1
+            },
+            {
+                move: 'Thunder Wave',
+                level: 9
+            },
+            {
+                move: 'Quick Attack',
+                level: 16
+            },
+            {
+                move: 'Swift',
+                level: 26
+            },
+            {
+                move: 'Agility',
+                level: 33
+            },
+            {
+                move: 'Thunder',
+                level: 43
+            },
+            {
+                move: 'Flash',
+                tm: 'HM5'
+            },
+            {
+                move: 'Mega Punch',
+                tm: 'TM1'
+            },
+            {
+                move: 'Mega Kick',
+                tm: 'TM5'
+            },
+            {
+                move: 'Toxic',
+                egg_move: true
+            }
+            ]
+        }
+        ]
+    };
+};
+
+// Move
+() => {
+    const tackle: Move = {
+        index_number: 33,
+        pp: 35,
+        max_pp: 56,
+        power: 50,
+        accuracy: 100,
+        category: 'physical',
+        priority: 0,
+        target: 'target_adjacent_single',
+        critical_hit: 0,
+        makes_contact: true,
+        affected_by_protect: true,
+        affected_by_magic_coat: false,
+        affected_by_snatch: false,
+        affected_by_mirror_move: false,
+        affected_by_kings_rock: true,
+        names: {
+            cz: 'Nárazový útok',
+            dk: 'Tackling',
+            fr: 'Charge',
+            de: 'Tackle',
+            gr: 'Εφόρμηση',
+            en: 'Tackle'
+        },
+        type: 'Normal',
+        contests: [
+        {
+            contest: 'Contests',
+            appeal: 4,
+            jam: 0,
+            condition: 'Tough'
+        },
+        {
+            contest: 'Super Contests',
+            appeal: 3,
+            jam: 0,
+            condition: 'Tough'
+        },
+        {
+            contest: 'Contest Spectaculars',
+            appeal: 4,
+            jam: 0,
+            condition: 'Tough'
+        }
+        ],
+        pokedex_entries: {
+            Gold: {
+                en: 'A full-body charge attack.',
+                de: 'Attacke mit vollem Körpereinsatz.'
+            },
+            Silver: {
+                en: 'A full-body charge attack.',
+                de: 'Attacke mit vollem Körpereinsatz.'
+            },
+            Crystal: {
+                en: 'A full-body charge attack.',
+                de: 'Attacke mit vollem Körpereinsatz.'
+            }
+        }
+    };
+};
+
+// Ability
+() => {
+    const airLock: Ability = {
+        index_number: 76,
+        names: {
+            fr: 'Air Lock',
+            de: 'Klimaschutz',
+            it: 'Riparo',
+            en: 'Air Lock'
+        },
+        descriptions: {
+            en: 'Eliminates the effects of weather.',
+            de: 'Example'
+        }
+    };
+};
+
+// EggGroup
+() => {
+    const bug: EggGroup = {
+        names: {
+            en: 'Bug',
+            jp: 'むし (虫) Mushi',
+            fr: 'Insecte',
+            de: 'Käfer',
+            it: 'Coleottero',
+            es: 'Bicho'
+        }
+    };
+};
+
+// Generation
+() => {
+    const gen1: Generation = {
+        number: 1,
+        dex_name: 'kanto_id',
+        names: {
+            en: 'Generation I',
+            de: 'Generation I'
+        },
+        games: [
+        {
+            en: 'Red',
+            de: 'Rot'
+        },
+        {
+            en: 'Blue',
+            de: 'Blau'
+        },
+        {
+            en: 'Yellow',
+            de: 'Gelb'
+        }
+        ]
+    };
+};
+
+// Item
+() => {
+    const potion: Item = {
+        names: {
+            en: 'Potion',
+            de: 'Trank',
+            fr: 'Potion',
+            es: 'Poción',
+            it: 'Pozione'
+        },
+        category: 'Potions',
+        descriptions: [
+        {
+            games: [
+            'Gold',
+            'Silver',
+            'Crystal'
+            ],
+            translations: {
+                en: 'Restores Pokémon HP by 20.',
+                de: 'Füllt die KP um 20 auf.'
+            }
+        }
+        ],
+        prices: [
+        {
+            games: [
+            'Red',
+            'Blue',
+            'Yellow'
+            ],
+            buying: 300,
+            selling: 150
+        },
+        {
+            games: [
+            'Sun',
+            'Moon',
+            'Ultra Sun',
+            'Ultra Moon'
+            ],
+            buying: 200,
+            selling: 100
+        }
+        ],
+        pockets: [
+        {
+            generations: [
+            1,
+            2,
+            3
+            ],
+            pocket: 'Items'
+        },
+        {
+            generations: [
+            4,
+            5,
+            6,
+            7
+            ],
+            pocket: 'Medicine'
+        }
+        ],
+        fling_power: 30,
+        effects: [
+        {
+            condition: 'Always',
+            target: 'Single Pokemon',
+            pokemon_changes: [
+            {
+                field: 'current_hp',
+                change_by: 20
+            }
+            ]
+        }
+        ]
+    };
+};
+
+// Nature
+() => {
+    const bold: Nature = {
+        names: {
+            en: 'Bold',
+            de: 'Kühn'
+        },
+        increased_stat: 'def',
+        decreased_stat: 'atk',
+        favorite_flavor: 'Sour',
+        disliked_flavor: 'Spicy'
+    };
+};
+
+// PokemonType
+() => {
+    const dragon: PokemonType = {
+        names: {
+            dk: 'Drage',
+            fr: 'Dragon',
+            de: 'Drache',
+            gr: 'Δράκου Drakou',
+            it: 'Drago',
+            pl: 'SmokSmoczy',
+            en: 'Dragon'
+        },
+        effectivness: {
+            Normal: 1,
+            Fighting: 1,
+            Flying: 1,
+            Poison: 1,
+            Ground: 1,
+            Rock: 1,
+            Bug: 1,
+            Ghost: 1,
+            Steel: 0.5,
+            Fire: 1,
+            Water: 1,
+            Grass: 1,
+            Electric: 1,
+            Psychic: 1,
+            Ice: 1,
+            Dragon: 2,
+            Dark: 1,
+            Fairy: 0
+        },
+        color: '#6F35FC'
+    };
+};
+
+// Region
+() => {
+    const alola: Region = {
+        names: {
+            en: 'Alola',
+            fr: 'Alola',
+            es: 'Alola',
+            de: 'Alola',
+            it: 'Alola'
+        },
+        locations: [
+        {
+            names: {
+                en: 'Route 1',
+                fr: 'Abords d\'Ekaeka',
+                es: 'Afueras de Hauoli',
+                de: 'Hauholi-Stadtrand',
+                it: 'Periferia di Hau\'oli'
+            },
+            pokemon: [
+            {
+                pokemon: 'Pikipek',
+                location: 'Walking',
+                min_level: 2,
+                max_level: 3,
+                rarity: 'common',
+                games: [
+                'Sun',
+                'Moon'
+                ],
+                day_times: [
+                'day',
+                'night'
+                ]
+            }
+            ]
+        }
+        ]
+    };
+};
diff --git a/types/oakdex-pokedex/tsconfig.json b/types/oakdex-pokedex/tsconfig.json
new file mode 100644
index 0000000000..0934229423
--- /dev/null
+++ b/types/oakdex-pokedex/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",
+        "oakdex-pokedex-tests.ts"
+    ]
+}
diff --git a/types/oakdex-pokedex/tslint.json b/types/oakdex-pokedex/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/oakdex-pokedex/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From 8ec4c20c30ccb36178cc9b400a2a0b1ac010e939 Mon Sep 17 00:00:00 2001
From: Vincent Pizzo <vincent.pizzo@singlewire.com>
Date: Fri, 8 Mar 2019 11:46:26 -0800
Subject: [PATCH 501/924] Remove no-duplicate-imports from lint

---
 types/react-csv/tslint.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/react-csv/tslint.json b/types/react-csv/tslint.json
index b2ecae2fd2..310959b38e 100644
--- a/types/react-csv/tslint.json
+++ b/types/react-csv/tslint.json
@@ -1,7 +1,4 @@
 {
   "extends": "dtslint/dt.json",
-  "rules": {
-    // TODO
-    "no-duplicate-imports": false
-  }
+  "rules": { }
 }

From 1b904ad0eff3ba61a81848fb4eb7afaafc4227f0 Mon Sep 17 00:00:00 2001
From: Vincent Pizzo <vincent.pizzo@singlewire.com>
Date: Fri, 8 Mar 2019 11:56:58 -0800
Subject: [PATCH 502/924] Combine imports into one

---
 types/react-csv/react-csv-tests.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/types/react-csv/react-csv-tests.tsx b/types/react-csv/react-csv-tests.tsx
index a075b8161f..a099d60626 100644
--- a/types/react-csv/react-csv-tests.tsx
+++ b/types/react-csv/react-csv-tests.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { MouseEventHandler } from "react";
 import { render } from "react-dom";
 import { CSVLink, CSVDownload } from "react-csv";
 
@@ -22,16 +21,16 @@ Raed,Labes
 Yezzi,Min l3b
 `;
 
-const syncOnClickReturn = (event: MouseEventHandler<HTMLAnchorElement>) => {
+const syncOnClickReturn = (event: React.MouseEventHandler<HTMLAnchorElement>) => {
     window.console.log(event);
     return true;
 };
-const syncOnClickVoid = (event: MouseEventHandler<HTMLAnchorElement>) => window.console.log(event);
-const asyncOnClickReturn = (event: MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+const syncOnClickVoid = (event: React.MouseEventHandler<HTMLAnchorElement>) => window.console.log(event);
+const asyncOnClickReturn = (event: React.MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
     window.console.log(event);
     done(true);
 };
-const asyncOnClickVoid = (event: MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+const asyncOnClickVoid = (event: React.MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
     window.console.log(event);
     done();
 };

From 19353307e3b509a9e408343792f5fda1695eb51a Mon Sep 17 00:00:00 2001
From: Evan Shortiss <evanshortiss@gmail.com>
Date: Fri, 8 Mar 2019 14:48:49 -0800
Subject: [PATCH 503/924] add support for gyronorm

---
 types/gyronorm/gyronorm-tests.ts | 21 ++++++++
 types/gyronorm/index.d.ts        | 88 ++++++++++++++++++++++++++++++++
 types/gyronorm/tsconfig.json     | 21 ++++++++
 types/gyronorm/tslint.json       |  3 ++
 4 files changed, 133 insertions(+)
 create mode 100644 types/gyronorm/gyronorm-tests.ts
 create mode 100644 types/gyronorm/index.d.ts
 create mode 100644 types/gyronorm/tsconfig.json
 create mode 100644 types/gyronorm/tslint.json

diff --git a/types/gyronorm/gyronorm-tests.ts b/types/gyronorm/gyronorm-tests.ts
new file mode 100644
index 0000000000..d944b72bd0
--- /dev/null
+++ b/types/gyronorm/gyronorm-tests.ts
@@ -0,0 +1,21 @@
+import * as gyronorm from 'gyronorm';
+
+const instance = new gyronorm.GyroNorm();
+const options: gyronorm.Options = {
+    frequency: 100
+};
+
+instance.init(options)
+    .then(() => {
+        instance.startLogging((data) => {
+            const { message, code } = data;
+        });
+
+        instance.start((data) => {
+            const motion = data.dm;
+            const orientation = data.do;
+        });
+    })
+    .catch(() => {
+        // init failure
+    });
diff --git a/types/gyronorm/index.d.ts b/types/gyronorm/index.d.ts
new file mode 100644
index 0000000000..2a1508da1f
--- /dev/null
+++ b/types/gyronorm/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for gyronorm 2.0
+// Project: https://github.com/dorukeker/gyronorm.js
+// Definitions by: Evan Shortiss <https://github.com/evanshortiss>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface MotionAndOrientationPayload {
+    do: {
+    alpha: number;
+    beta: number;
+    gamma: number;
+    absolute: number;
+    };
+
+    dm: {
+    x: number;
+    y: number;
+    z: number;
+
+    gx: number;
+    gy: number;
+    gz: number;
+
+    alpha: number;
+    beta: number;
+    gamma: number;
+    };
+}
+
+export interface Options {
+    /**
+     * How often GyroNorm returns data (in milliseconds)
+     */
+    frequency?: number;
+
+    /**
+     * If the gravity related values to be normalized
+     */
+    gravityNormalized?: boolean;
+
+    /**
+     * Can be GyroNorm.GAME or GyroNorm.WORLD. gn.GAME returns
+     * orientation values with respect to the head direction of the device.
+     * gn.WORLD returns the orientation values with respect to the actual
+     * north direction of the world.
+     */
+    orientationBase?: string;
+
+    /**
+     * How many digits after the decimal point will there be in the return values
+     */
+    decimalCount?: number;
+
+    /**
+     * Function to be called to log messages from gyronorm.js
+     */
+    logger?: LogListener;
+
+    /**
+     * If set to true it will return screen adjusted values
+     */
+    screenAdjusted?: boolean;
+}
+
+export interface LoggerData {
+    code: number;
+    message: string;
+}
+
+export type LogListener = (data: LoggerData) => void;
+
+export class GyroNorm {
+    constructor()
+
+    static GAME: string;
+    static WORLD: string;
+
+    static DEVICE_ORIENTATION: string;
+    static ACCELERATION: string;
+    static ACCELERATION_INCLUDING_GRAVITY: string;
+    static ROTATION_RATE: string;
+
+    init(options: Options): Promise<void>;
+
+    start(callback: (data: MotionAndOrientationPayload) => void): void;
+
+    startLogging(listener: LogListener): void;
+    stopLogging(): void;
+}
diff --git a/types/gyronorm/tsconfig.json b/types/gyronorm/tsconfig.json
new file mode 100644
index 0000000000..3035f3607b
--- /dev/null
+++ b/types/gyronorm/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "gyronorm-tests.ts",
+        "index.d.ts"
+    ]
+}
diff --git a/types/gyronorm/tslint.json b/types/gyronorm/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/gyronorm/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 9a99eec613e4400daa406df3d025b69de000d1c2 Mon Sep 17 00:00:00 2001
From: Evan Shortiss <evanshortiss@gmail.com>
Date: Fri, 8 Mar 2019 14:56:07 -0800
Subject: [PATCH 504/924] generate with dts

---
 types/gyronorm/tsconfig.json | 10 ++++++----
 types/gyronorm/tslint.json   |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/gyronorm/tsconfig.json b/types/gyronorm/tsconfig.json
index 3035f3607b..8b8dedb9c0 100644
--- a/types/gyronorm/tsconfig.json
+++ b/types/gyronorm/tsconfig.json
@@ -7,15 +7,17 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
+        "strictFunctionTypes": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "gyronorm-tests.ts",
-        "index.d.ts"
+        "index.d.ts",
+        "gyronorm-tests.ts"
     ]
 }
diff --git a/types/gyronorm/tslint.json b/types/gyronorm/tslint.json
index f93cf8562a..3db14f85ea 100644
--- a/types/gyronorm/tslint.json
+++ b/types/gyronorm/tslint.json
@@ -1,3 +1 @@
-{
-    "extends": "dtslint/dt.json"
-}
+{ "extends": "dtslint/dt.json" }

From c5d1aa342aa297ac2a690fb043e8bd018f97a4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Moura?= <joao.moura@b-i.com>
Date: Fri, 8 Mar 2019 23:36:43 +0000
Subject: [PATCH 505/924] Added my self has the contributor

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

diff --git a/types/voucher-code-generator/index.d.ts b/types/voucher-code-generator/index.d.ts
index fd57466c26..7f0cd7efdc 100644
--- a/types/voucher-code-generator/index.d.ts
+++ b/types/voucher-code-generator/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for voucher-code-generator 1.1
 // Project: http://www.voucherify.io/
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: João Moura <https://github.com/JWebCoder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*~ If this module has methods, declare them as functions like so.

From 71487ab2eb779bd20f5d9ce79d49f89b1160f7f6 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Sat, 9 Mar 2019 16:32:51 +0000
Subject: [PATCH 506/924] Update CODEOWNERS

---
 .github/CODEOWNERS | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d21cca9322..54d80df8e5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -74,6 +74,7 @@
 /types/allure-js-commons/                           @zaqqaz
 /types/almost-equal/                                @cmaddalozzo
 /types/alt/                                         @Shearerbeard
+/types/amap-js-api/                                 @breeze9527
 /types/amap-js-sdk/                                 @agasbzj
 /types/amazon-cognito-auth-js/                      @scottescue
 /types/amazon-product-api/                          @MattiLehtinen @alien35
@@ -507,7 +508,6 @@
 /types/callsites/                                   @BendingBender
 /types/calq/                                        @eirikhm
 /types/camaro/                                      @tuananh
-/types/camelcase/                                   @samverschueren
 /types/camelcase-keys/                              @mhegazy
 /types/camljs/                                      @andrei-markeev
 /types/camo/                                        @lucasmciruzzi
@@ -701,9 +701,7 @@
 /types/compute-stdev/                               @mrmlnc
 /types/concat-stream/                               @jmarianer
 /types/concaveman/                                  @DenisCarriere
-/types/conf/                                        @SamVerschueren @BendingBender
-/types/conf/v1/                                     @SamVerschueren @BendingBender
-/types/conf/v0/                                     @SamVerschueren
+/types/condense-whitespace/                         @djcsdy
 /types/confidence/                                  @jppellerin
 /types/config/                                      @RWander @forrestbice @jndonald3 @albertovasquez
 /types/config-yaml/                                 @me
@@ -722,7 +720,7 @@
 /types/connect-mongo/                               @Syati
 /types/connect-mongodb-session/                     @NattapongSiri
 /types/connect-pg-simple/                           @pasieronen
-/types/connect-redis/                               @xstoudi
+/types/connect-redis/                               @xstoudi @sbutler2901
 /types/connect-slashes/                             @samherrmann
 /types/connect-timeout/                             @cyrilschumacher
 /types/consola/                                     @Jungwoo-An
@@ -930,6 +928,7 @@
 /types/datatables.net-select/                       @szechyjs
 /types/date-and-time/                               @danplisetsky
 /types/date-arithmetic/                             @HeeL
+/types/date-now/                                    @adamzerella
 /types/date.format.js/                              @balrob
 /types/dateformat/                                  @aicest @BendingBender
 /types/dateformat/v1/                               @aicest
@@ -1071,6 +1070,7 @@
 /types/draft-js/                                    @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar @sulf @pablopunk @claudiopro
 /types/drag-timetable/                              @chinkan
 /types/draggabilly/                                 @jaydubu
+/types/dragscroll/                                  @spkellydev
 /types/dragster/                                    @zskovacs
 /types/dragula/                                     @pwelter34 @abruzzihraig
 /types/driftless/                                   @dandelany
@@ -1203,7 +1203,6 @@
 /types/entities/                                    @aliceklipper
 /types/env-ci/                                      @BendingBender
 /types/env-editor/                                  @BendingBender
-/types/env-paths/                                   @danwbyrne
 /types/env-to-object/                               @MugeSo
 /types/envify/                                      @tkQubo
 /types/enzyme/                                      @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden @hotell @screendriver
@@ -1281,7 +1280,7 @@
 /types/expired/                                     @BendingBender
 /types/expired-storage/                             @intolerance
 /types/expirymanager/                               @DanielRose
-/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164
+/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164 @vinitsood
 /types/expo/v31/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164
 /types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
 /types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
@@ -1290,6 +1289,7 @@
 /types/expo/v24/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
 /types/expo/v23/                                    @KonstantinKai
 /types/expo-localization/                           @burtek
+/types/expo-mixpanel-analytics/                     @martintreurnicht
 /types/expo__status-bar-height/                     @dawnmist
 /types/expo__vector-icons/                          @incleaf @robertying
 /types/express/                                     @borisyankov
@@ -1780,7 +1780,6 @@
 /types/global-tunnel-ng/                            @BendingBender
 /types/globalize/                                   @gcastre @afromogli @bryanforbes
 /types/globalize-compiler/                          @iclanton
-/types/globby/                                      @douglasduteil @ikatyang
 /types/globule/                                     @durad
 /types/glue/                                        @garfty
 /types/glue/v4/                                     @gjednaszewski
@@ -1929,6 +1928,7 @@
 /types/gulp-watch/                                  @tkrotoff
 /types/gulp-zip/                                    @dudeofawesome
 /types/gun/                                         @Jack-Works
+/types/gyronorm/                                    @evanshortiss
 /types/gzip-js/                                     @rhysd
 /types/gzip-size/                                   @plantain-00 @jimivdw @andrewiggins
 /types/gzip-size/v3/                                @plantain-00
@@ -2189,6 +2189,7 @@
 /types/is-glob/                                     @mrmlnc
 /types/is-hotkey/                                   @petester42 @kalley
 /types/is-installed-globally/                       @BendingBender
+/types/is-integer/                                  @djcsdy
 /types/is-ip/                                       @coderslagoon
 /types/is-mobile/                                   @LogvinovLeon
 /types/is-my-json-valid/                            @kruncher
@@ -2581,7 +2582,7 @@
 /types/keymirror/                                   @jfahrenkrug
 /types/keypress.js/                                 @rcchen
 /types/keysym/                                      @harryshipton
-/types/keytar/                                      @miniak @shiftkey @juturu
+/types/keytar/                                      @miniak @shiftkey @juturu @queeniema
 /types/keyv/                                        @Arylo @BendingBender
 /types/keyv__mongo/                                 @BendingBender
 /types/keyv__mysql/                                 @BendingBender
@@ -2639,6 +2640,7 @@
 /types/koa-json/                                    @brooklyndev
 /types/koa-json-error/                              @mudkipme
 /types/koa-log/                                     @havenchyk
+/types/koa-log4/                                    @a631807682
 /types/koa-logger/                                  @geoffreak @tlaziuk
 /types/koa-logger-winston/                          @stevehipwell
 /types/koa-morgan/                                  @vesse
@@ -3081,7 +3083,6 @@
 /types/lodash.zipobjectdeep/                        @bczengel @chrootsu @stepancar
 /types/lodash.zipwith/                              @bczengel @chrootsu @stepancar
 /types/log-symbols/                                 @BendingBender
-/types/log-update/                                  @BendingBender
 /types/logat/                                       @krvikash35
 /types/logform/                                     @DABH
 /types/logg/                                        @blittle
@@ -3124,7 +3125,6 @@
 /types/mailgun-js/                                  @sampsonjoliver @andipaetzold
 /types/mailparser/                                  @psnider @Avol-V
 /types/main-bower-files/                            @k-kagurazaka
-/types/make-dir/                                    @ikatyang @BendingBender
 /types/maker.js/                                    @danmarshall
 /types/makeup-expander/                             @darkwebdev
 /types/makeup-floating-label/                       @darkwebdev
@@ -3363,7 +3363,6 @@
 /types/motor-hat/                                   @muntyan
 /types/mousetrap/                                   @qcz @alanhchoi
 /types/move-concurrently/                           @mgroenhoff
-/types/move-file/                                   @BendingBender
 /types/moveto/                                      @shermendev @pea3nut
 /types/moviedb/                                     @basarat @0x6368656174
 /types/moxios/                                      @itoasuka
@@ -3617,6 +3616,7 @@
 /types/nw.js/                                       @alirdn
 /types/nwmatcher/                                   @woutervh-
 /types/o.js/                                        @IceOnFire @bradzacher @janhommes @jcchalte
+/types/oakdex-pokedex/                              @jalyna
 /types/oauth/                                       @nonAlgebraic @EduardoAC
 /types/oauth-shim/                                  @BendingBender
 /types/oauth.js/                                    @nobuoka
@@ -3647,13 +3647,13 @@
 /types/office-js-preview/                           @OfficeDev @Zlatkovsky @kbrandl @Rick-Kirkham @AlexJerabek @ElizabethSamuel-MSFT
 /types/office-runtime/                              @Zlatkovsky @mscharlock
 /types/offline-js/                                  @cgwrench
+/types/offscreencanvas/                             @kayahr
 /types/oibackoff/                                   @geoffreak
 /types/oidc-token-manager/                          @rosieks
 /types/oja/                                         @buffcode
 /types/okta__okta-vue/                              @innovation-team
 /types/ol/                                          @yairtawil
 /types/omggif/                                      @ffflorian
-/types/on-change/                                   @BendingBender
 /types/on-finished/                                 @czechboy0 @BendingBender
 /types/on-headers/                                  @jjeffery @BendingBender
 /types/on-wake-up/                                  @ajafff
@@ -3846,7 +3846,7 @@
 /types/pbf/                                         @cschwarz
 /types/pbkdf2/                                      @timonegk
 /types/pdf2image/                                   @taoqf
-/types/pdfjs-dist/                                  @jbaldwin
+/types/pdfjs-dist/                                  @jbaldwin @1999
 /types/pdfkit/                                      @erichillah
 /types/pdfmake/                                     @m1llen1um @radziksh @evolkmann
 /types/pdfobject/                                   @nielsboogaard
@@ -4094,7 +4094,6 @@
 /types/qs/                                          @RWander @leonyu @tehbelinda @zyml @artursvonda @CarlosBonetti
 /types/qs-middleware/                               @davecardwell
 /types/qtip2/                                       @Seltzer @leonard-thieu
-/types/query-string/                                @SamVerschueren @tkrotoff @huhuanming @MadaraUchiha @shssoichiro @jarrku
 /types/querystringify/                              @ilich
 /types/quick-lru/                                   @BendingBender
 /types/quick-lru/v1/                                @BendingBender
@@ -4112,7 +4111,7 @@
 /types/radius/                                      @codeanimal
 /types/radix64/                                     @huan086
 /types/raf/                                         @BenLorantfy
-/types/ramda/                                       @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm @drewwyatt @jottenlips @minitesh @krantisinh
+/types/ramda/                                       @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm @drewwyatt @jottenlips @minitesh @krantisinh @pirix-gh
 /types/random-boolean/                              @BendingBender
 /types/random-float/                                @BendingBender
 /types/random-int/                                  @BendingBender
@@ -4208,11 +4207,12 @@
 /types/react-copy-to-clipboard/                     @mabels @BernabeFelix
 /types/react-copy-write/                            @samhh @davej
 /types/react-countup/                               @danielbrodin
-/types/react-credit-cards/                          @vstrimaitis @olefrank
+/types/react-credit-cards/                          @vstrimaitis @olefrank @zzanol
 /types/react-cropper/                               @stepancar
 /types/react-css-collapse/                          @dford07
 /types/react-css-modules/                           @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/                @LKay
+/types/react-csv/                                   @vincentjames501
 /types/react-currency-formatter/                    @pastushenkoy @Jeka-Vasiliev
 /types/react-custom-scrollbars/                     @David-LeBlanc-git @kittimiyo
 /types/react-custom-scrollbars/v3/                  @David-LeBlanc-git
@@ -4226,7 +4226,7 @@
 /types/react-dates/                                 @ArturAmpilogov @NathanNZ
 /types/react-daum-postcode/                         @Sa-ryong
 /types/react-dev-utils/                             @ark120202
-/types/react-dnd-multi-backend/                     @dawnmist @beeequeue
+/types/react-dnd-multi-backend/                     @dawnmist @beeequeue @robcodemonkey
 /types/react-dnd-touch-backend/                     @mleko @dawnmist @beeequeue
 /types/react-document-meta/                         @ulrichb
 /types/react-document-title/                        @cleverguy25
@@ -4457,7 +4457,7 @@
 /types/react-rangeslider/                           @RichieRock
 /types/react-recaptcha/                             @mhegazy @zzanol
 /types/react-reconciler/                            @Methuselah96
-/types/react-redux/                                 @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris @soerenbf
+/types/react-redux/                                 @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris @soerenbf
 /types/react-redux/v6/                              @tkqubo @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa @apapirovski @surgeboris
 /types/react-redux/v5/                              @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
 /types/react-redux-epic/                            @forabi
@@ -4876,6 +4876,7 @@
 /types/seed-random/                                 @l-jonas
 /types/seededshuffle/                               @urish
 /types/seedrandom/                                  @kernhanda
+/types/seen/                                        @admvx
 /types/segment-analytics/                           @fongandrew
 /types/select2/                                     @borisyankov @denisname
 /types/select2/v3/                                  @borisyankov
@@ -5023,7 +5024,7 @@
 /types/sizzle/                                      @leonard-thieu
 /types/sjcl/                                        @Evgenus
 /types/skatejs/                                     @Hotell
-/types/sketchapp/                                   @manekinekko
+/types/sketchapp/                                   @manekinekko @shikanime
 /types/ski/                                         @AyaMorisawa
 /types/skin-tone/                                   @BendingBender
 /types/skyway/                                      @nakakura @izmhr
@@ -5251,6 +5252,7 @@
 /types/summernote/                                  @wstaelens @nusantara-cloud
 /types/sumo-logger/                                 @forabi @clementallen
 /types/suncalc/                                     @horiuchi
+/types/sunrise-sunset-js/                           @hmajid2301
 /types/superagent/                                  @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue @lukaselmer @theQuazz
 /types/superagent/v2/                               @varju @NicoZelaya @mxl
 /types/superagent-bunyan/                           @bricka
@@ -5313,6 +5315,7 @@
 /types/tableify/                                    @forivall
 /types/tabtab/                                      @vojtechhabarta @kamontat
 /types/tabulator/                                   @euginio
+/types/tabulator-tables/                            @jojoshua
 /types/tail/                                        @spacejack
 /types/tapable/                                     @e-cloud @johnnyreilly
 /types/tapable/v0/                                  @e-cloud
@@ -5440,6 +5443,7 @@
 /types/trianglify/                                  @unindented
 /types/trie-prefix-tree/                            @jlismore
 /types/trim/                                        @skysteve
+/types/trim-newlines/                               @djcsdy
 /types/triple-beam/                                 @danwbyrne
 /types/triplesec/                                   @threesquared
 /types/trunk8/                                      @niemyjski
@@ -5623,6 +5627,7 @@
 /types/voronoi-diagram/                             @michaelneu
 /types/vorpal/                                      @danwbyrne
 /types/vortex-web-client/                           @Pro
+/types/voucher-code-generator/                      @JWebCoder
 /types/voximplant-websdk/                           @aylarov
 /types/vue-chartkick/                               @cnsmedia
 /types/vue-color/                                   @me

From 7627c32ee231c2dd5e986f61e5724a80065ae839 Mon Sep 17 00:00:00 2001
From: Chnapy <richardhaddad@hotmail.fr>
Date: Sun, 10 Mar 2019 15:05:43 +0100
Subject: [PATCH 507/924] initial commit & typing done

---
 types/vara/index.d.ts    | 155 +++++++++++++++++++++++++++++++++++++++
 types/vara/tsconfig.json |  24 ++++++
 types/vara/tslint.json   |   1 +
 types/vara/vara-tests.ts |  43 +++++++++++
 4 files changed, 223 insertions(+)
 create mode 100644 types/vara/index.d.ts
 create mode 100644 types/vara/tsconfig.json
 create mode 100644 types/vara/tslint.json
 create mode 100644 types/vara/vara-tests.ts

diff --git a/types/vara/index.d.ts b/types/vara/index.d.ts
new file mode 100644
index 0000000000..da9b7a873c
--- /dev/null
+++ b/types/vara/index.d.ts
@@ -0,0 +1,155 @@
+// Type definitions for vara 1.1
+// Project: https://github.com/akzhy/vara#readme
+// Definitions by: Richard Haddad <https://github.com/Chnapy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Comments are from the documentation: http://vara.akzhy.com/documentation/
+ */
+
+/**
+ * The options given below will be applicable to every text created,
+ * however they will not override the options set above.
+ * They will work as secondary options.
+ */
+export interface TextProperties {
+    /**
+     * Size of the text
+     */
+    fontSize?: number;
+    /**
+     * Width / Thickness of the stroke
+     */
+    strokeWidth?: number;
+    /**
+     * Color of the text
+     */
+    color?: string;
+    /**
+     * Duration of the animation in milliseconds
+     */
+    duration?: number;
+    /**
+     * Text align, accepted values are left,center,right
+     */
+    textAlign?: 'left' | 'center' | 'right';
+    /**
+     * Whether to animate the text automatically
+     */
+    autoAnimation?: boolean;
+    /**
+     * Whether the animation should be in a queue
+     */
+    queued?: boolean;
+    /**
+     * Space between each character
+     */
+    letterSpacing?: number;
+}
+
+export interface TextStep extends TextProperties {
+    /**
+     * Text to be shown
+     */
+    text: string;
+    /**
+     * String or integer, for if animations are called manually or when using the get() method.
+     * Default is the index of the object.
+     */
+    id?: string | number;
+    /**
+     * x coordinate of the text
+     */
+    x?: number;
+    /**
+     * y coordinate of the text
+     */
+    y?: number;
+    /**
+     * Whether the x or y coordinate should be from its calculated position,
+     * ie the position if x or y coordinates were not applied
+     */
+    fromCurrentPosition?: {
+        x?: boolean;
+        y?: boolean;
+    };
+    /**
+     * Delay before the animation starts in milliseconds
+     */
+    delay?: number;
+}
+
+export interface TextElements {
+    /**
+     * Array of svg g elements, each representing a letter
+     */
+    characters: SVGGElement[];
+
+    /**
+     * Svg g wrapping the text block
+     */
+    container: SVGGElement;
+}
+
+export default class Vara {
+    constructor(queryDom: string, fontJSONSource: string,
+        textStep: TextStep[], textGlobals?: TextProperties);
+
+    /**
+     * Is used to execute a function when the font is loaded and the elements are created.
+     * ! Any other method should be called inside the function !
+     *
+     * @param onReady callback
+     */
+    ready(onReady: () => void): void;
+
+    /**
+     * If an id was given to the text during creation, it should be given as the argument.
+     * Otherwise use the index of the text block.
+     *
+     * @param id text ID or index
+     */
+    get(id: string | number): TextElements | false;
+
+    /**
+     * Used to animate texts with autoAnimation:false
+     * If an id was given to the text during creation, it should be given as the argument.
+     * Otherwise use the index of the text block.
+     *
+     * @param id text ID or index
+     * @param duration
+     */
+    draw(id: string | number, duration?: number): void;
+
+    /**
+     * Used to execute a function once animation ends, triggers every time a block of text is drawn.
+     *
+     * @param onEnd callback with the id of the drawn text, and an object containing the group DOM object,
+     * this is the same object that is returned when calling the get() method.
+     */
+    animationEnd(onEnd: (id: string | number, group: TextElements) => void): void;
+
+    /**
+     * Is used to play the animation of every text block, obeying delay and queue.
+     */
+    playAll(): void;
+
+    createNode(noneName: string, properties: { [k: string]: string; }): SVGElement;
+
+    getSVGData(): void;
+
+    preCreate(): void;
+
+    createText(): void;
+
+    animate(element: SVGElement, duration: number, delay: number, final: number): void;
+
+    getSectionPathLength(id: string | number): number;
+
+    analyseWidth(): {
+        width: number;
+        breakPoints: Array<Array<string | number>>;
+    };
+
+    setPosition(element: SVGGElement, obj: { x?: number; y?: number }, relative?: { x: boolean; y: boolean; }): void;
+}
diff --git a/types/vara/tsconfig.json b/types/vara/tsconfig.json
new file mode 100644
index 0000000000..2026a30e17
--- /dev/null
+++ b/types/vara/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",
+        "vara-tests.ts"
+    ]
+}
diff --git a/types/vara/tslint.json b/types/vara/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vara/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vara/vara-tests.ts b/types/vara/vara-tests.ts
new file mode 100644
index 0000000000..08fae19d45
--- /dev/null
+++ b/types/vara/vara-tests.ts
@@ -0,0 +1,43 @@
+import Vara from 'vara';
+
+const vara = new Vara('#root', 'font.json', [
+    {
+        text: 'first'
+    },
+    {
+        text: 'second',
+        fontSize: 24,
+        strokeWidth: .5,
+        color: 'black',
+        id: 'second',
+        duration: 2000,
+        textAlign: 'left',
+        x: 0,
+        y: 0,
+        fromCurrentPosition: {
+            x: true,
+            y: true,
+        },
+        autoAnimation: true,
+        queued: true,
+        delay: 0,
+        letterSpacing: 0
+    }
+], {
+        fontSize: 24,
+        strokeWidth: .5,
+        color: "black",
+        duration: 2000,
+        textAlign: "left",
+        autoAnimation: true,
+        queued: true,
+        letterSpacing: 0
+    }
+);
+
+// $ExpectType void
+vara.ready(() => {});
+
+// $ExpectType false | TextElements
+vara.get(0);
+vara.get('second');

From 05438e362f0ecb579e96288a200aa43b44c48243 Mon Sep 17 00:00:00 2001
From: Chnapy <richardhaddad@hotmail.fr>
Date: Sun, 10 Mar 2019 16:27:57 +0100
Subject: [PATCH 508/924] tests

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

diff --git a/types/vara/vara-tests.ts b/types/vara/vara-tests.ts
index 08fae19d45..4c76973292 100644
--- a/types/vara/vara-tests.ts
+++ b/types/vara/vara-tests.ts
@@ -41,3 +41,13 @@ vara.ready(() => {});
 // $ExpectType false | TextElements
 vara.get(0);
 vara.get('second');
+
+// $ExpectType void
+vara.draw(0);
+vara.draw(0, 1000);
+
+// $ExpectType void
+vara.animationEnd((id, group) => {});
+
+// $ExpectType void
+vara.playAll();

From a29a526c915dbf7d74b7e02a9806afbeea4f7f28 Mon Sep 17 00:00:00 2001
From: Olga Isakova <penumbra1@users.noreply.github.com>
Date: Sun, 10 Mar 2019 22:33:20 +0300
Subject: [PATCH 509/924] TS version back to 2.3

I tested with 3.3 and thought the comment referred to the latest compatible version. But yes, 3.3 is not a requirement.
---
 types/mongo-sanitize/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mongo-sanitize/index.d.ts b/types/mongo-sanitize/index.d.ts
index aedff46b0b..1c5308d55c 100644
--- a/types/mongo-sanitize/index.d.ts
+++ b/types/mongo-sanitize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/vkarpov15/mongo-sanitize
 // Definitions by: Cedric Cazin <https://github.com/CedricCazin>, Olga Isakova <https://github.com/penumbra1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3
+// TypeScript Version: 2.3
 
 declare function sanitize<T>(v: T): T;
 

From ac041e3704e81a56b7c12d1dd2be4d5a6e302706 Mon Sep 17 00:00:00 2001
From: Olga Isakova <penumbra1@users.noreply.github.com>
Date: Sun, 10 Mar 2019 23:45:18 +0300
Subject: [PATCH 510/924] Version 2.7

import foo from "foo" from CommonJS modules is only possible since TS v2.7
---
 types/mongo-sanitize/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mongo-sanitize/index.d.ts b/types/mongo-sanitize/index.d.ts
index 1c5308d55c..cf187384a4 100644
--- a/types/mongo-sanitize/index.d.ts
+++ b/types/mongo-sanitize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/vkarpov15/mongo-sanitize
 // Definitions by: Cedric Cazin <https://github.com/CedricCazin>, Olga Isakova <https://github.com/penumbra1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.7
 
 declare function sanitize<T>(v: T): T;
 

From 093c68df21c125dfad52486f8dc1ef0e51e2f4b2 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Mon, 11 Mar 2019 17:53:57 +1100
Subject: [PATCH 511/924] Added types for compatability

---
 types/is-date-object/index.d.ts               |  4 +--
 types/is-date-object/package.json             |  7 ++++++
 types/is-date-object/ts3.1/index.d.ts         |  5 ++++
 .../ts3.1/is-date-object-tests.ts             | 15 +++++++++++
 types/is-date-object/ts3.1/tsconfig.json      | 25 +++++++++++++++++++
 types/is-date-object/ts3.1/tslint.json        |  3 +++
 6 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 types/is-date-object/package.json
 create mode 100644 types/is-date-object/ts3.1/index.d.ts
 create mode 100644 types/is-date-object/ts3.1/is-date-object-tests.ts
 create mode 100644 types/is-date-object/ts3.1/tsconfig.json
 create mode 100644 types/is-date-object/ts3.1/tslint.json

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 75fc6b1796..7d22927284 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/ljharb/is-date-object
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3
+// TypeScript Version: 3.0
 
 declare function isDateObject(value: Date): true;
 declare function isDateObject(value?: object): boolean;
-declare function isDateObject(value?: null | boolean | string | number | symbol | bigint | []): false;
+declare function isDateObject(value?: null | boolean | string | number): false;
 
 export = isDateObject;
diff --git a/types/is-date-object/package.json b/types/is-date-object/package.json
new file mode 100644
index 0000000000..9e02feea42
--- /dev/null
+++ b/types/is-date-object/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": { "*": ["ts3.1/*"] }
+    }
+}
\ No newline at end of file
diff --git a/types/is-date-object/ts3.1/index.d.ts b/types/is-date-object/ts3.1/index.d.ts
new file mode 100644
index 0000000000..3d09650996
--- /dev/null
+++ b/types/is-date-object/ts3.1/index.d.ts
@@ -0,0 +1,5 @@
+declare function isDateObject(value: Date): true;
+declare function isDateObject(value?: object): boolean;
+declare function isDateObject(value?: null | boolean | string | number | symbol | bigint | []): false;
+
+export = isDateObject;
diff --git a/types/is-date-object/ts3.1/is-date-object-tests.ts b/types/is-date-object/ts3.1/is-date-object-tests.ts
new file mode 100644
index 0000000000..9946c42d54
--- /dev/null
+++ b/types/is-date-object/ts3.1/is-date-object-tests.ts
@@ -0,0 +1,15 @@
+import isDate = require("is-date-object");
+
+isDate();
+isDate(undefined);
+isDate(null);
+isDate(false);
+isDate(true);
+isDate(42);
+isDate('foo');
+isDate((): void => {});
+isDate([]);
+isDate({});
+isDate(/a/g);
+isDate(new RegExp('a', 'g'));
+isDate(new Date());
diff --git a/types/is-date-object/ts3.1/tsconfig.json b/types/is-date-object/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..7a40c93489
--- /dev/null
+++ b/types/is-date-object/ts3.1/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../../",
+      "typeRoots": [
+        "../../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "is-date-object-tests.ts"
+    ]
+}
diff --git a/types/is-date-object/ts3.1/tslint.json b/types/is-date-object/ts3.1/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/is-date-object/ts3.1/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From dbe82b6ea7ae4ae86c9a960d136eb438041c30b7 Mon Sep 17 00:00:00 2001
From: claneo <claneo@outlook.com>
Date: Mon, 11 Mar 2019 16:30:29 +0800
Subject: [PATCH 512/924] add generic type for Event listener

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

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 086d7c24b4..214532be59 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -312,7 +312,7 @@ declare namespace Cesium {
         clockRange: ClockRange;
         canAnimate: boolean;
         shouldAnimate: boolean;
-        onTick: Event;
+        onTick: Event<[Clock]>;
         constructor(options: {
             startTime?: JulianDate;
             stopTime?: JulianDate;
@@ -704,11 +704,11 @@ declare namespace Cesium {
         constructor(options?: { tilingScheme?: TilingScheme; ellipsoid?: Ellipsoid });
     }
 
-    class Event {
+    class Event<T extends any[] = any[]> {
         numberOfListeners: number;
-        addEventListener(listener: (...args: any[]) => void, scope?: any): Event.RemoveCallback;
-        removeEventListener(listener: (...args: any[]) => void, scope?: any): boolean;
-        raiseEvent(...args: any[]): void;
+        addEventListener(listener: (...args: T) => void, scope?: any): Event.RemoveCallback;
+        removeEventListener(listener: (...args: T) => void, scope?: any): boolean;
+        raiseEvent(...args: T): void;
     }
 
     namespace Event {
@@ -1512,7 +1512,7 @@ declare namespace Cesium {
         retry: boolean;
         error: Error;
         constructor(provider: ImageryProvider | TerrainProvider, message: string, x?: number, y?: number, level?: number, timesRetried?: number, error?: Error);
-        static handleError(previousError: TileProviderError, provider: ImageryProvider | TerrainProvider, event: Event,
+        static handleError(previousError: TileProviderError, provider: ImageryProvider | TerrainProvider, event: Event<[TileProviderError]>,
                             message: string, x: number, y: number, level: number, retryFunction: TileProviderError.RetryFunction,
                             errorDetails?: Error): TileProviderError;
         static handleSuccess(previousError: TileProviderError): void;
@@ -1562,7 +1562,7 @@ declare namespace Cesium {
     }
 
     class TimeIntervalCollection {
-        readonly changedEvent: Event;
+        readonly changedEvent: Event<[TimeIntervalCollection]>;
         readonly start: JulianDate;
         readonly isStartIncluded: boolean;
         readonly stop: JulianDate;
@@ -4388,8 +4388,8 @@ declare namespace Cesium {
         allowDataSourcesToSuspendAnimation: boolean;
         trackedEntity: Entity;
         selectedEntity: Entity;
-        readonly trackedEntityChanged: Event;
-        readonly selectedEntityChanged: Event;
+        readonly trackedEntityChanged: Event<[Entity?]>;
+        readonly selectedEntityChanged: Event<[Entity?]>;
         readonly shadowMap: ShadowMap;
         readonly vrButton: VRButton;
         shadows: boolean;

From 6e0377b4f5fe61fb59168f52af3ec4df24373c81 Mon Sep 17 00:00:00 2001
From: claneo <claneo@outlook.com>
Date: Mon, 11 Mar 2019 16:47:36 +0800
Subject: [PATCH 513/924] bump up typescript versionto 3.0 to support rest
 parameter

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

diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 214532be59..34f9fd148d 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -5,7 +5,7 @@
 //                 Jared Szechy <https://github.com/szechyjs>
 //                 Radek Goláň jr. <https://github.com/golyalpha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 // tslint:disable-next-line:export-just-namespace
 export = Cesium;

From fe4b22d147bba8a1a87bca37128d676584088d1c Mon Sep 17 00:00:00 2001
From: haracejacob <dkrahd12@gmail.com>
Date: Mon, 11 Mar 2019 19:24:03 +0900
Subject: [PATCH 514/924] Add where type to WhereOptions

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 9aba040234..f2a9d5f5b1 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3198,7 +3198,7 @@ declare namespace sequelize {
      */
     type Primitives = string | number | boolean | Buffer;
     type WhereOptions<T> = {
-        [P in keyof T]?: Primitives | Array<Primitives> | WhereLogic | (T[P] extends Primitives ? null : WhereOptions<T[P]>) | col | and | or | WhereGeometryOptions | WhereNested | null;
+        [P in keyof T]?: Primitives | Array<Primitives> | WhereLogic | (T[P] extends Primitives ? null : WhereOptions<T[P]>) | col | and | or | WhereGeometryOptions | WhereNested | where | null;
     };
 
     /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3a13906f06..3c91281a0c 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -997,6 +997,9 @@ User.findAll( { where: { $and:[ { username: { $not: "user" } }, { theDate: new D
 User.findAll( { where: { $or:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
 User.findAll( { where: { emails: { $overlap: ["me@mail.com", "you@mail.com"] } } } );
 
+var options: Sequelize.AnyFindOptions = { where: { $and: Sequelize.where( Sequelize.fn( 'char_length', Sequelize.col('username') ), 4 ) } };
+User.findAll( options );
+
 User.findById( 'a string' );
 User.findById( 42 );
 User.findById( Buffer.from('a buffer') );

From 041d920447f8e5fc9dbfd17962b7118c312b766e Mon Sep 17 00:00:00 2001
From: spcfran <f.x.rodriguez@hotmail.com>
Date: Mon, 11 Mar 2019 15:30:46 +0000
Subject: [PATCH 515/924] More Connection properties. Transport info &
 factories. Bump version

---
 types/autobahn/autobahn-tests.ts | 27 ++++++++++++++++++
 types/autobahn/index.d.ts        | 48 ++++++++++++++++++++++----------
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/types/autobahn/autobahn-tests.ts b/types/autobahn/autobahn-tests.ts
index 8f05c25141..420d95a3d1 100644
--- a/types/autobahn/autobahn-tests.ts
+++ b/types/autobahn/autobahn-tests.ts
@@ -46,4 +46,31 @@ function test_client() {
     if (!connection.isOpen && !connection.isRetrying && connection.session == null) {
         connection.open();
     }
+
+    var { isConnected, transport: { info: { protocol, type, url } }, defer } = connection;
+    console.log(isConnected, protocol, type, url, defer);
+}
+
+function test_custom_transport_factory() {
+    autobahn.transports.register('custom', CustomTransportFactory)
+    
+    var CustomFactoryFactory = autobahn.transports.get('');
+    var customFactory = new CustomFactoryFactory({});
+    var customTransport = customFactory.create()
+    console.log(customTransport.info);
+}
+
+class CustomTransportFactory {
+    create(): autobahn.ITransport {
+        return {
+            onopen() {},
+            onmessage(message: any[]) {},
+            onclose(details: autobahn.ICloseEventDetails) {},
+            send(message: any[]) {},
+            close(errorCode: number, reason?: string) {},
+            info: {type: 'custom'}
+        };
+    }
+
+    type: autobahn.TransportType = 'custom'
 }
diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 9c1d66fb85..cfa07c3518 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for AutobahnJS 0.9
-// Project: http://autobahn.ws/js/, https://github.com/crossbario/autobahn-js
-// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37>
+// Type definitions for AutobahnJS 18.10
+// Project: https://crossbar.io/autobahn/, https://github.com/crossbario/autobahn-js
+// Definitions by: Elad Zelingher <https://github.com/darkl>, Andy Hawkins <https://github.com/a904guy>, Wladimir Totino <https://github.com/valepu>, Mathias Teier <https://github.com/glenroy37>, Fran Rodriguez <https://github.com/spcfran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="when" />
@@ -190,9 +190,12 @@ declare namespace autobahn {
     export class Connection {
         constructor(options?: IConnectionOptions);
 
-        isOpen: boolean;
-        isRetrying: boolean;
-        session?: Session;
+        readonly isConnected: boolean;
+        readonly isOpen: boolean;
+        readonly isRetrying: boolean;
+        readonly transport: ITransport;
+        readonly session?: Session;
+        readonly defer?: DeferFactory;
 
         open(): void;
 
@@ -205,7 +208,7 @@ declare namespace autobahn {
     interface ITransportDefinition {
         url?: string;
         protocols?: string[];
-        type: string;
+        type: TransportType;
     }
 
     type DeferFactory = () => When.Promise<any>;
@@ -226,7 +229,7 @@ declare namespace autobahn {
         url?: string;
         protocols?: string[];
         onchallenge?: OnChallengeHandler;
-        realm?: string;
+        realm: string;
         authmethods?: string[];
         authid?: string;
     }
@@ -237,6 +240,19 @@ declare namespace autobahn {
         code: number;
     }
 
+    type DefaultTransportType = 'websocket' | 'longpoll' | 'rawsocket';
+    
+    // Workaround to get intellisense on type unions of 'literals' | string. 
+    // See https://github.com/Microsoft/TypeScript/issues/29729
+    type CustomTransportType = string & { zz_IGNORE_ME?: never };
+    type TransportType = DefaultTransportType | CustomTransportType;
+
+    interface ITransportInfo {
+        url?: string;
+        protocol?: string;
+        type: TransportType;
+    }
+
     interface ITransport {
         onopen: () => void;
         onmessage: (message: any[]) => void;
@@ -244,19 +260,23 @@ declare namespace autobahn {
 
         send(message: any[]): void;
         close(errorCode: number, reason?: string): void;
+        info: ITransportInfo;
     }
 
     interface ITransportFactory {
-        // constructor(options: any);
-        type: string;
+        type: TransportType;
         create(): ITransport;
     }
+    
+    interface ITransportFactoryFactory {
+        new (options: any): ITransportFactory;
+    }
 
     interface ITransports {
-        register(name: string, factory: any): void;
-        isRegistered(name: string): boolean;
-        get(name: string): any;
-        list(): string[];
+        register(name: TransportType, factory: ITransportFactoryFactory): void;
+        isRegistered(name: TransportType): boolean;
+        get(name: TransportType): ITransportFactoryFactory;
+        list(): TransportType[];
     }
 
     interface ILog {

From f0e6c9792866d15cf439a44717832c6f447cc3c8 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Mon, 11 Mar 2019 09:09:21 -0700
Subject: [PATCH 516/924] Add missing authors.

Uncovered by dtslint 0.5.4, which now requires that definitions cannot
be by "My Self", which is the default from dts-gen.
---
 types/axe-webdriverjs/index.d.ts            | 2 +-
 types/basicauth-middleware/index.d.ts       | 2 +-
 types/bip32/index.d.ts                      | 2 +-
 types/braft-editor/index.d.ts               | 2 +-
 types/cli-progress/index.d.ts               | 2 +-
 types/config-yaml/index.d.ts                | 2 +-
 types/jsreport-html-to-xlsx/index.d.ts      | 2 +-
 types/jsreport-html-to-xlsx/v1/index.d.ts   | 2 +-
 types/permit/index.d.ts                     | 2 +-
 types/pet-finder-api/index.d.ts             | 2 +-
 types/provinces/index.d.ts                  | 2 +-
 types/react-blessed/index.d.ts              | 2 +-
 types/react-native-tab-navigator/index.d.ts | 2 +-
 types/require-directory/index.d.ts          | 2 +-
 types/urlencode/index.d.ts                  | 2 +-
 types/vue-color/index.d.ts                  | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/axe-webdriverjs/index.d.ts b/types/axe-webdriverjs/index.d.ts
index 3c8ae27249..c3bf23f788 100644
--- a/types/axe-webdriverjs/index.d.ts
+++ b/types/axe-webdriverjs/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for axe-webdriverjs 2.0
 // Project: https://github.com/dequelabs/axe-webdriverjs#readme
-// Definitions by: My Self <https://github.com/JoshuaKGoldberg>
+// Definitions by: Joshua Goldberg <https://github.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/basicauth-middleware/index.d.ts b/types/basicauth-middleware/index.d.ts
index 21e3a27ad8..38aedd850b 100644
--- a/types/basicauth-middleware/index.d.ts
+++ b/types/basicauth-middleware/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for basicauth-middleware 3.1
 // Project: https://github.com/nchaulet/basicauth-middleware
-// Definitions by: My Self <https://github.com/nchaulet>
+// Definitions by: Nicolas Chaulet <https://github.com/nchaulet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
diff --git a/types/bip32/index.d.ts b/types/bip32/index.d.ts
index c536f741af..e76deef810 100644
--- a/types/bip32/index.d.ts
+++ b/types/bip32/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for bip32 1.0
 // Project: https://github.com/bitcoinjs/bip32#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: eduhenke <https://github.com/eduhenke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
index 62f339a41b..0edeb34b2c 100644
--- a/types/braft-editor/index.d.ts
+++ b/types/braft-editor/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for braft-editor 1.9
 // Project: https://github.com/margox/braft#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Jonny Yao <https://github.com/petitspois>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/cli-progress/index.d.ts b/types/cli-progress/index.d.ts
index 3ac9dfe8a3..4c2c516d37 100644
--- a/types/cli-progress/index.d.ts
+++ b/types/cli-progress/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for cli-progress 1.8
 // Project: https://github.com/AndiDittrich/Node.CLI-Progress
-// Definitions by: My Self <https://github.com/mhegazy>
+// Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
diff --git a/types/config-yaml/index.d.ts b/types/config-yaml/index.d.ts
index 6f2be7957b..2b4e07628d 100644
--- a/types/config-yaml/index.d.ts
+++ b/types/config-yaml/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for config-yaml 1.1
 // Project: https://github.com/neolao/config-yaml#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Arylo Yeung <https://github.com/Arylo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TypeScript Version: 2.1
diff --git a/types/jsreport-html-to-xlsx/index.d.ts b/types/jsreport-html-to-xlsx/index.d.ts
index 83ac765c1f..85850dcbe7 100644
--- a/types/jsreport-html-to-xlsx/index.d.ts
+++ b/types/jsreport-html-to-xlsx/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for jsreport-html-to-xlsx 2.0
 // Project: https://github.com/jsreport/jsreport-html-to-xlsx
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Tao Quifeng <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/jsreport-html-to-xlsx/v1/index.d.ts b/types/jsreport-html-to-xlsx/v1/index.d.ts
index 84b37480aa..8801d637a2 100644
--- a/types/jsreport-html-to-xlsx/v1/index.d.ts
+++ b/types/jsreport-html-to-xlsx/v1/index.d.ts
@@ -1,6 +1,6 @@
 // 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 by: Tao Quifeng <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/permit/index.d.ts b/types/permit/index.d.ts
index b0c2db9b42..961aee845b 100644
--- a/types/permit/index.d.ts
+++ b/types/permit/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for permit 0.2
 // Project: https://github.com/ianstormtaylor/permit#readme
-// Definitions by: My Self <https://github.com/jannikkeye>
+// Definitions by: Jannik Keye <https://github.com/jannikkeye>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
diff --git a/types/pet-finder-api/index.d.ts b/types/pet-finder-api/index.d.ts
index e438bda1c2..39855aab1a 100644
--- a/types/pet-finder-api/index.d.ts
+++ b/types/pet-finder-api/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for pet-finder-api 1.0
 // Project: https://github.com/drlukeangel/Pet-Finder-API-Javascript-Library
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: ncipollina <https://github.com/ncipollina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare function petFinder(api_key: string, api_secret: string, options?: any): petFinder.PetFinder;
 
diff --git a/types/provinces/index.d.ts b/types/provinces/index.d.ts
index 2601d14da4..17d59ee03d 100644
--- a/types/provinces/index.d.ts
+++ b/types/provinces/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for provinces 1.11
 // Project: https://github.com/substack/provinces
-// Definitions by: My Self <https://github.com/gatimus>
+// Definitions by: William Lohan <https://github.com/gatimus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare global {
diff --git a/types/react-blessed/index.d.ts b/types/react-blessed/index.d.ts
index 33c9fe2790..46d0e7e495 100644
--- a/types/react-blessed/index.d.ts
+++ b/types/react-blessed/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-blessed 0.3
 // Project: https://github.com/yomguithereal/react-blessed#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Century Guo <https://github.com/guoshencheng>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/react-native-tab-navigator/index.d.ts b/types/react-native-tab-navigator/index.d.ts
index 1586b7279a..7ee7a52cf2 100644
--- a/types/react-native-tab-navigator/index.d.ts
+++ b/types/react-native-tab-navigator/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-native-tab-navigator 0.3
 // Project: https://github.com/exponentjs/react-native-tab-navigator#readme
-// Definitions by: My Self <https://github.com/iRoachie>
+// Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/require-directory/index.d.ts b/types/require-directory/index.d.ts
index bd2b520865..5d45f66f00 100644
--- a/types/require-directory/index.d.ts
+++ b/types/require-directory/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for require-directory 2.1
 // Project: https://github.com/troygoode/node-require-directory/
-// Definitions by: My Self <https://github.com/Igmat>
+// Definitions by: Ihor Chulinda <https://github.com/Igmat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 /// <reference types="node" />
diff --git a/types/urlencode/index.d.ts b/types/urlencode/index.d.ts
index 451626cb79..a32e7bea25 100644
--- a/types/urlencode/index.d.ts
+++ b/types/urlencode/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for urlencode 1.1
 // Project: https://github.com/node-modules/urlencode
-// Definitions by: My Self <https://github.com/kimcoder>
+// Definitions by: kimcoder <https://github.com/kimcoder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface charsetParam {
diff --git a/types/vue-color/index.d.ts b/types/vue-color/index.d.ts
index 758d823589..0d59b5965e 100644
--- a/types/vue-color/index.d.ts
+++ b/types/vue-color/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for vue-color 2.4
 // Project: https://github.com/xiaokaike/vue-color#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Clément Flodrops <https://github.com/mildful>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

From 20c5200f9f0b1866d3693e39d367ef8975425e6d Mon Sep 17 00:00:00 2001
From: spcfran <f.x.rodriguez@hotmail.com>
Date: Mon, 11 Mar 2019 16:56:45 +0000
Subject: [PATCH 517/924] [autobahn] Fix rx.wamp tests by providing mandatory
 realm

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

diff --git a/types/rx.wamp/rx.wamp-tests.ts b/types/rx.wamp/rx.wamp-tests.ts
index 741b8e0de9..16a24c7e51 100644
--- a/types/rx.wamp/rx.wamp-tests.ts
+++ b/types/rx.wamp/rx.wamp-tests.ts
@@ -8,7 +8,7 @@ function nodeJS(session: autobahn.Session) {
 }
 
 function connection() {
-    var connectionSubscription = Rx.Observable.fromConnection({ url: "ws://localhost:9000" })
+    var connectionSubscription = Rx.Observable.fromConnection({ url: "ws://localhost:9000", realm: "realm1" })
         .subscribe(session => console.log("A new session was created"));
 
     //Close our current connection and don't retry
@@ -32,11 +32,11 @@ function subscribe_to_topics(session: autobahn.Session, options: autobahn.ISubsc
 }
 
 function new_in_version3(onResult: Rx.Observer<autobahn.ISubscription>) {
-    Rx.Observable.subscribeAsObservable(Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090" }), "wamp.my.foo", undefined, onResult);
+    Rx.Observable.subscribeAsObservable(Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090", realm: "realm1" }), "wamp.my.foo", undefined, onResult);
 }
 
 function new_in_version5(fooObserver: Rx.Observer<IWampEvent>) {
-    var connection = Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090" });
+    var connection = Rx.Observable.fromConnection({ url: "ws://myconnectionurl:9090", realm: "realm1" });
 
     //You can subscribe to as many items as you want
     var subscriber =

From d3bd440fbd8329b6e42d003ede04f6115cd1ca1a Mon Sep 17 00:00:00 2001
From: Conrad <hollie@live.co.za>
Date: Mon, 11 Mar 2019 19:49:48 +0200
Subject: [PATCH 518/924] @types/chart.js: changed getElementAtEvent to single
 array object (#33765)

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index c601631280..8da7ed0814 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -33,7 +33,7 @@ declare class Chart {
     clear: () => {};
     toBase64Image: () => string;
     generateLegend: () => {};
-    getElementAtEvent: (e: any) => {};
+    getElementAtEvent: (e: any) => [{}];
     getElementsAtEvent: (e: any) => Array<{}>;
     getDatasetAtEvent: (e: any) => Array<{}>;
     getDatasetMeta: (index: number) => Meta;

From 5070350d6003b440a8aca2241bfb5a15064e62a1 Mon Sep 17 00:00:00 2001
From: Sine <sine@sinewave.me>
Date: Mon, 11 Mar 2019 13:52:11 -0400
Subject: [PATCH 519/924] Relaxed React.ComponentType-extending definitions
 (#33729)

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

diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index 6adc628c31..ed0f9a78d3 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -20,10 +20,10 @@ export interface Options {
   header?: boolean;
   inline?: boolean;
   source?: boolean;
-  propTables?: React.ComponentType[] | false;
-  propTablesExclude?: React.ComponentType[];
+  propTables?: Array<React.ComponentType<any>> | false;
+  propTablesExclude?: Array<React.ComponentType<any>>;
   styles?: object;
-  components?: { [key: string]: React.ComponentType };
+  components?: { [key: string]: React.ComponentType<any> };
   marksyConf?: object;
   maxPropsIntoLine?: number;
   maxPropObjectKeys?: number;

From d4d4d3a2fac22cc68b9cd5a6a3c4d7575c51f5c9 Mon Sep 17 00:00:00 2001
From: Zhang Yi Jiang <mediumdeviation@gmail.com>
Date: Tue, 12 Mar 2019 01:53:12 +0800
Subject: [PATCH 520/924] Update React Leaflet with viewport, VideoOverlay,
 backport whenReady and DivOverlay  (#33679)

* Add onviewportchange map props

* Backport viewport related changes

* Backport DivOverlay

* Add whenReady prop

* Add VideoOverlay component

* Fic version number

* Fix viewport events

* Update Map instance viewport methods

* Add example code as tests

* Fix lint
---
 types/react-leaflet/index.d.ts                | 19 ++++-
 types/react-leaflet/react-leaflet-tests.tsx   | 37 +++++-----
 types/react-leaflet/v1/index.d.ts             | 52 ++++++++++++--
 .../react-leaflet/v1/react-leaflet-tests.tsx  | 71 +++++++++++++++++++
 4 files changed, 154 insertions(+), 25 deletions(-)

diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts
index 04fe17a04f..0b997341ce 100644
--- a/types/react-leaflet/index.d.ts
+++ b/types/react-leaflet/index.d.ts
@@ -146,6 +146,8 @@ export interface MapProps extends MapEvents, Leaflet.MapOptions, Leaflet.LocateO
     useFlyTo?: boolean;
     viewport?: Viewport;
     whenReady?: () => void;
+    onViewportChange?: (viewport: Viewport) => void;
+    onViewportChanged?: (viewport: Viewport) => void;
 }
 
 export class Map<P extends MapProps = MapProps, E extends Leaflet.Map = Leaflet.Map> extends MapEvented<P, E> {
@@ -155,8 +157,8 @@ export class Map<P extends MapProps = MapProps, E extends Leaflet.Map = Leaflet.
     viewport: Viewport;
     createLeafletElement(props: P): E;
     updateLeafletElement(fromProps: P, toProps: P): void;
-    onViewportChange: (viewport: Viewport | null) => void;
-    onViewportChanged: (viewport: Viewport | null) => void;
+    onViewportChange: () => void;
+    onViewportChanged: () => void;
     bindContainer(container: HTMLDivElement | null | undefined): void;
     shouldUpdateCenter(next: Leaflet.LatLngExpression, prev: Leaflet.LatLngExpression): boolean;
     shouldUpdateBounds(next: Leaflet.LatLngBoundsExpression, prev: Leaflet.LatLngBoundsExpression): boolean;
@@ -276,6 +278,19 @@ export class ImageOverlay<P extends ImageOverlayProps = ImageOverlayProps, E ext
     updateLeafletElement(fromProps: P, toProps: P): void;
 }
 
+export interface VideoOverlayProps extends Leaflet.VideoOverlayOptions, MapComponentProps {
+    attribution?: string;
+    bounds: Leaflet.LatLngBoundsExpression;
+    opacity?: number;
+    play?: boolean;
+    url: string | string[] | HTMLVideoElement;
+    zIndex?: number;
+}
+export class VideoOverlay<P extends VideoOverlayProps = VideoOverlayProps, E extends Leaflet.VideoOverlay = Leaflet.VideoOverlay> extends MapLayer<P, E> {
+    createLeafletElement(props: P): E;
+    updateLeafletElement(fromProps: P, toProps: P): void;
+}
+
 export class LayerGroup<P extends MapLayerProps = MapLayerProps, E extends Leaflet.LayerGroup = Leaflet.LayerGroup> extends MapLayer<P, E> {
     createLeafletElement(props: P): E;
 }
diff --git a/types/react-leaflet/react-leaflet-tests.tsx b/types/react-leaflet/react-leaflet-tests.tsx
index 5d1fc2ce7e..2d7a6b1078 100644
--- a/types/react-leaflet/react-leaflet-tests.tsx
+++ b/types/react-leaflet/react-leaflet-tests.tsx
@@ -634,17 +634,18 @@ export class VectorLayersExample extends Component<undefined, undefined> {
 }
 
 // viewport.js
-
-const viewportCenter: [number, number] = [51.505, -0.09];
-
-const DEFAULT_VIEWPORT = {
-    center: viewportCenter,
-    zoom: 13
+const DEFAULT_VIEWPORT: Viewport = {
+    center: [51.505, -0.09],
+    zoom: 13,
 };
 
-export class ViewportExample extends Component<undefined, { viewport: Viewport }> {
+interface ViewportExampleState {
+    viewport: Viewport;
+}
+
+class ViewportExample extends Component<undefined, ViewportExampleState> {
     state = {
-        viewport: DEFAULT_VIEWPORT
+        viewport: DEFAULT_VIEWPORT,
     };
 
     onClickReset = () => {
@@ -657,15 +658,15 @@ export class ViewportExample extends Component<undefined, { viewport: Viewport }
 
     render() {
         return (
-          <Map
-            onClick={this.onClickReset}
-            onViewportChanged={this.onViewportChanged}
-            viewport={this.state.viewport}>
-            <TileLayer
-              attribution='&amp;copy <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-              url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-            />
-          </Map>
+            <Map
+                onClick={this.onClickReset}
+                onViewportChanged={this.onViewportChanged}
+                viewport={this.state.viewport}>
+                <TileLayer
+                    attribution="&amp;copy <a href=&quot;http://osm.org/copyright&quot;>OpenStreetMap</a> contributors"
+                    url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                />
+            </Map>
         );
     }
 }
@@ -811,4 +812,4 @@ class CustomPolygon extends Path<PolygonProps, L.Polygon> {
         );
     }
 }
-const leafletComponent =  withLeaflet<PolygonProps>(CustomPolygon);
+const leafletComponent = withLeaflet<PolygonProps>(CustomPolygon);
diff --git a/types/react-leaflet/v1/index.d.ts b/types/react-leaflet/v1/index.d.ts
index c362a1f23c..ac35e98a72 100644
--- a/types/react-leaflet/v1/index.d.ts
+++ b/types/react-leaflet/v1/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-leaflet 1.1
+// Type definitions for react-leaflet 1.9
 // Project: https://github.com/PaulLeCam/react-leaflet
 // Definitions by: Dave Leaver <https://github.com/danzel>, David Schneider <https://github.com/davschne>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,6 +12,11 @@ import * as React from 'react';
 
 export type Children = React.ReactNode | React.ReactNode[];
 
+export interface Viewport {
+    center: [number, number] | null | undefined;
+    zoom: number | null | undefined;
+}
+
 export interface MapEvents {
     onclick?(event: Leaflet.LeafletMouseEvent): void;
     ondblclick?(event: Leaflet.LeafletMouseEvent): void;
@@ -140,18 +145,42 @@ export interface MapProps extends MapEvents, Leaflet.MapOptions, Leaflet.LocateO
     minZoom?: number;
     style?: React.CSSProperties;
     useFlyTo?: boolean;
+    viewport?: Viewport;
+    whenReady?: () => void;
     zoom?: number;
+    onViewportChange?: (viewport: Viewport) => void;
+    onViewportChanged?: (viewport: Viewport) => void;
 }
 
 export class Map<P extends MapProps = MapProps, E extends Leaflet.Map = Leaflet.Map> extends MapComponent<P, E> {
     className?: string;
     container: HTMLDivElement;
+    viewport: Viewport;
     getChildContext(): { layerContainer: E, map: E };
     createLeafletElement(props: P): E;
     updateLeafletElement(fromProps: P, toProps: P): void;
     bindContainer(container: HTMLDivElement): void;
     shouldUpdateCenter(next: Leaflet.LatLngExpression, prev: Leaflet.LatLngExpression): boolean;
     shouldUpdateBounds(next: Leaflet.LatLngBoundsExpression, prev: Leaflet.LatLngBoundsExpression): boolean;
+    onViewportChange: () => void;
+    onViewportChanged: () => void;
+}
+
+export interface DivOverlayProps extends Leaflet.DivOverlayOptions {
+    children: Children;
+    onClose?: () => void;
+    onOpen?: () => void;
+}
+
+export interface DivOverlayTypes extends Leaflet.Evented {
+    isOpen: () => boolean;
+    update: () => void;
+}
+
+export class DivOverlay<P extends DivOverlayProps, E extends DivOverlayTypes> extends MapComponent<P, E> {
+    onClose: () => void;
+    onOpen: () => void;
+    onRender: () => void;
 }
 
 export interface PaneProps {
@@ -213,6 +242,19 @@ export class ImageOverlay<P extends ImageOverlayProps = ImageOverlayProps, E ext
     getChildContext(): { popupContainer: E };
 }
 
+export interface VideoOverlayProps extends Leaflet.VideoOverlayOptions {
+    attribution?: string;
+    children?: Children;
+    bounds: Leaflet.LatLngBoundsExpression;
+    opacity?: number;
+    play?: boolean;
+    url: string | string[] | HTMLVideoElement;
+    zIndex?: number;
+}
+export class VideoOverlay<P extends VideoOverlayProps = VideoOverlayProps, E extends Leaflet.VideoOverlay = Leaflet.VideoOverlay> extends MapLayer<P, E> {
+    getChildContext(): { popupContainer: E };
+}
+
 export interface LayerGroupProps {
     children?: Children;
 }
@@ -284,10 +326,10 @@ export interface RectangleProps extends PathEvents, Leaflet.PolylineOptions {
 }
 export class Rectangle<P extends RectangleProps = RectangleProps, E extends Leaflet.Rectangle = Leaflet.Rectangle> extends Path<P, E> { }
 
-export interface PopupProps extends Leaflet.PopupOptions {
-    children?: Children;
+export interface PopupProps extends DivOverlayProps, Leaflet.PopupOptions {
     position?: Leaflet.LatLngExpression;
 }
+
 export class Popup<P extends PopupProps = PopupProps, E extends Leaflet.Popup = Leaflet.Popup> extends MapComponent<P, E> {
     onPopupOpen(arg: { popup: E }): void;
     onPopupClose(arg: { popup: E }): void;
@@ -295,9 +337,9 @@ export class Popup<P extends PopupProps = PopupProps, E extends Leaflet.Popup =
     removePopupContent(): void;
 }
 
-export interface TooltipProps extends Leaflet.TooltipOptions {
-    children?: Children;
+export interface TooltipProps extends DivOverlayProps, Leaflet.TooltipOptions {
 }
+
 export class Tooltip<P extends TooltipProps = TooltipProps, E extends Leaflet.Tooltip = Leaflet.Tooltip> extends MapComponent<P, E> {
     onTooltipOpen(arg: { tooltip: E }): void;
     onTooltipClose(arg: { tooltip: E }): void;
diff --git a/types/react-leaflet/v1/react-leaflet-tests.tsx b/types/react-leaflet/v1/react-leaflet-tests.tsx
index fe9825c465..cc461d1097 100644
--- a/types/react-leaflet/v1/react-leaflet-tests.tsx
+++ b/types/react-leaflet/v1/react-leaflet-tests.tsx
@@ -24,6 +24,8 @@ import {
     Rectangle,
     TileLayer,
     Tooltip,
+    Viewport,
+    VideoOverlay,
     WMSTileLayer,
     ZoomControl
 } from 'react-leaflet';
@@ -628,6 +630,75 @@ export class VectorLayersExample extends Component<undefined, undefined> {
     }
 }
 
+// viewport.js
+const DEFAULT_VIEWPORT: Viewport = {
+    center: [51.505, -0.09],
+    zoom: 13,
+};
+
+interface ViewportExampleState {
+    viewport: Viewport;
+}
+
+export class ViewportExample extends Component<undefined, ViewportExampleState> {
+    state = {
+        viewport: DEFAULT_VIEWPORT,
+    };
+
+    onClickReset = () => {
+        this.setState({ viewport: DEFAULT_VIEWPORT });
+    }
+
+    onViewportChanged = (viewport: Viewport) => {
+        this.setState({ viewport });
+    }
+
+    render() {
+        return (
+            <Map
+                onClick={this.onClickReset}
+                onViewportChanged={this.onViewportChanged}
+                viewport={this.state.viewport}>
+                <TileLayer
+                    attribution="&amp;copy <a href=&quot;http://osm.org/copyright&quot;>OpenStreetMap</a> contributors"
+                    url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                />
+            </Map>
+        );
+    }
+}
+
+// video-overlay.js
+interface VideoOverlayExampleState {
+    play: boolean;
+}
+
+export class VideoOverlayExample extends Component<undefined, VideoOverlayExampleState> {
+    state = {
+        play: true,
+    };
+
+    onTogglePlay = () => {
+        this.setState({ play: !this.state.play });
+    }
+
+    render() {
+        return (
+            <Map center={[25, -100]} onClick={this.onTogglePlay} zoom={4}>
+                <TileLayer
+                    attribution="&amp;copy <a href=&quot;http://osm.org/copyright&quot;>OpenStreetMap</a> contributors"
+                    url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+                />
+                <VideoOverlay
+                    bounds={[[32, -130], [13, -100]]}
+                    play={this.state.play}
+                    url="https://www.mapbox.com/bites/00188/patricia_nasa.webm"
+                />
+            </Map>
+        );
+    }
+}
+
 // wms-tile-layer.js
 interface WMSTileLayerExampleState {
     lat: number;

From 15238ee4236a963a32897ae47e7e8cb1c0147a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miika=20H=C3=A4nninen?= <miika.hanninen@gmail.com>
Date: Mon, 11 Mar 2019 19:54:42 +0200
Subject: [PATCH 521/924] (kue) Enable the use of the three-parameter
 ProcessCallback (#33720)

* Enable the use of the three-parameter ProcessCallback

* Add test for workerctx in the process callback
---
 types/kue/index.d.ts   | 14 ++++++++++++--
 types/kue/kue-tests.ts |  8 ++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/types/kue/index.d.ts b/types/kue/index.d.ts
index 9153039ff0..f6aa357e66 100644
--- a/types/kue/index.d.ts
+++ b/types/kue/index.d.ts
@@ -33,7 +33,8 @@ export declare class Queue extends events.EventEmitter {
     checkActiveJobTtl(ttlOptions: Object): void;
     watchStuckJobs(ms: number): void;
     setting(name: string, fn: Function): Queue;
-    process(type: string, n?: number | ProcessCallback, fn?: ProcessCallback): void;
+    process(type: string, fn?: ProcessCallback): void;
+    process(type: string, n: number, fn?: ProcessCallback): void;
     shutdown(timeout: number, fn: Function): Queue;
     shutdown(timeout: number, type: string, fn: Function): Queue;
     types(fn: Function): Queue;
@@ -63,7 +64,9 @@ interface Priorities {
 
 export type DoneCallback = (err?: any, result?: any) => void;
 export type JobCallback = (err?: any, job?: Job) => void;
-export type ProcessCallback = (job: Job, cb: DoneCallback) => void;
+export type ProcessCallback =
+    | ((job: Job, cb: DoneCallback) => void)
+    | ((job: Job, ctx: WorkerCtx, cb: DoneCallback) => void);
 
 export declare class Job extends events.EventEmitter {
     public id: number;
@@ -144,6 +147,13 @@ declare class Worker extends events.EventEmitter {
     resume(): boolean;
 }
 
+interface WorkerCtx {
+    pause(fn?: DoneCallback): void;
+    pause(timeout: number, fn?: DoneCallback): void;
+    resume(): void;
+    shutdown(): void;
+}
+
 interface Redis {
     configureFactory(options: Object, queue: Queue): void;
     createClient(): redisClientFactory.RedisClient;
diff --git a/types/kue/kue-tests.ts b/types/kue/kue-tests.ts
index 9234101e05..552bca1ddf 100644
--- a/types/kue/kue-tests.ts
+++ b/types/kue/kue-tests.ts
@@ -79,6 +79,14 @@ var processCb = function(job: kue.Job, done: kue.DoneCallback) {
 jobs.process('video conversion', 1, processCb);
 jobs.process('video conversion', processCb);
 
+// Use of WorkerCtx, https://github.com/Automattic/kue#pause-processing
+jobs.process('email', function(job, ctx, done) {
+    ctx.pause(5000, function (err) {
+        console.log('Worker is paused...');
+        setTimeout(function() { ctx.resume(); }, 10000);
+    });
+});
+
 function convertFrame(i: number, fn: Function) {
   setTimeout(() => fn(null, Math.random()), Math.random() * 50);
 }

From 06618cf2979dfaec7a6b00af79038ab854f1a50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baumeyer=20K=C3=A9vin?= <baumeyerkevin@gmail.com>
Date: Mon, 11 Mar 2019 18:55:07 +0100
Subject: [PATCH 522/924] Remove chai-http as it bundle its own type since
 v4.2.0 (#33722)

---
 notNeededPackages.json             |  18 ++--
 types/chai-http/chai-http-tests.ts | 141 -----------------------------
 types/chai-http/index.d.ts         |  78 ----------------
 types/chai-http/tsconfig.json      |  24 -----
 types/chai-http/tslint.json        |   1 -
 5 files changed, 12 insertions(+), 250 deletions(-)
 delete mode 100644 types/chai-http/chai-http-tests.ts
 delete mode 100644 types/chai-http/index.d.ts
 delete mode 100644 types/chai-http/tsconfig.json
 delete mode 100644 types/chai-http/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 24f1f0e0e0..7638e7304a 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -228,6 +228,12 @@
             "sourceRepoURL": "https://github.com/interactivethings/catalog",
             "asOfVersion": "3.5.0"
         },
+        {
+            "libraryName": "chai-http",
+            "typingsPackageName": "chai-http",
+            "sourceRepoURL": "https://github.com/chaijs/chai-http",
+            "asOfVersion": "4.2.0"
+        },
         {
             "libraryName": "chalk",
             "typingsPackageName": "chalk",
@@ -1176,12 +1182,6 @@
             "sourceRepoURL": "https://github.com/theoephraim/node-pg-migrate#readme",
             "asOfVersion": "2.15.0"
         },
-        {
-            "libraryName": "png-async",
-            "typingsPackageName": "png-async",
-            "sourceRepoURL": "https://github.com/kanreisa/node-png-async",
-            "asOfVersion": "0.9.4"
-        },
         {
             "libraryName": "node-waves",
             "typingsPackageName": "node-waves",
@@ -1344,6 +1344,12 @@
             "sourceRepoURL": "http://plottablejs.org/",
             "asOfVersion": "3.7.0"
         },
+        {
+            "libraryName": "png-async",
+            "typingsPackageName": "png-async",
+            "sourceRepoURL": "https://github.com/kanreisa/node-png-async",
+            "asOfVersion": "0.9.4"
+        },
         {
             "libraryName": "poly2tri.js",
             "typingsPackageName": "poly2tri",
diff --git a/types/chai-http/chai-http-tests.ts b/types/chai-http/chai-http-tests.ts
deleted file mode 100644
index 37a4df794e..0000000000
--- a/types/chai-http/chai-http-tests.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import fs = require('fs');
-import http = require('http');
-import chai = require('chai');
-import ChaiHttp = require('chai-http');
-import when = require('when');
-
-chai.use(ChaiHttp);
-
-// ReSharper disable WrongExpressionStatement
-
-// Add promise support if this does not exist natively.
-if (!global.Promise) {
-	chai.request.addPromises(when.promise);
-}
-
-declare const app: http.Server;
-
-chai.request(app).get('/');
-chai.request('http://localhost:8080').get('/');
-
-chai.request(app)
-	.put('/user/me')
-	.set('X-API-Key', 'foobar')
-	.send({ password: '123', confirmPassword: '123' });
-
-chai.request(app)
-	.post('/user/me')
-	.field('_method', 'put')
-	.field('password', '123')
-	.field('confirmPassword', '123');
-
-chai.request(app)
-	.post('/user/avatar')
-	.attach('imageField', fs.readFileSync('avatar.png'), 'avatar.png');
-
-chai.request(app)
-	.get('/protected')
-	.auth('user', 'pass');
-
-// HTTPS request, from: https://github.com/visionmedia/superagent/commit/6158efbf42cb93d77c1a70887284be783dd7dabe
-const ca = fs.readFileSync('ca.cert.pem');
-const key = fs.readFileSync('key.pem');
-const cert = fs.readFileSync('cert.pem');
-const callback = (err: any, res: ChaiHttp.Response) => {};
-
-chai.request(app)
-	.post('/secure')
-	.ca(ca)
-	.key(key)
-	.cert(cert)
-	.end(callback);
-
-const pfx = fs.readFileSync('cert.pfx');
-chai.request(app)
-	.post('/secure')
-	.pfx(pfx)
-	.end(callback);
-
-chai.request(app)
-	.get('/search')
-	.query({ name: 'foo', limit: 10 });
-
-chai.request(app)
-	.get('/download')
-	.buffer()
-	.parse((res, cb) => {
-		let data = '';
-		res.setEncoding('binary');
-		res.on('data', (chunk: any) => { data += chunk; });
-		res.on('end', () => { cb(undefined, new Buffer(data, 'binary')); });
-	});
-
-chai.request(app)
-	.put('/user/me')
-	.send({ passsword: '123', confirmPassword: '123' })
-	.end((err: any, res: ChaiHttp.Response) => {
-		chai.expect(err).to.be.null;
-		chai.expect(res).to.have.status(200);
-	});
-
-chai.request(app)
-	.put('/user/me')
-	.send({ passsword: '123', confirmPassword: '123' })
-	.then((res: ChaiHttp.Response) => chai.expect(res).to.have.status(200))
-	.catch((err: any) => { throw err; });
-
-chai.request(app)
-	.keepOpen()
-	.close((err: any) => { throw err; });
-
-const agent = chai.request.agent(app);
-
-agent
-	.post('/session')
-	.send({ username: 'me', password: '123' })
-	.then((res: ChaiHttp.Response) => {
-		chai.expect(res).to.have.cookie('sessionid');
-		// The `agent` now has the sessionid cookie saved, and will send it
-		// back to the server in the next request:
-		return agent.get('/user/me')
-			.then((res: ChaiHttp.Response) => chai.expect(res).to.have.status(200));
-	});
-
-agent.close((err: any) => { throw err; });
-
-function test1() {
-	const req = chai.request(app).get('/');
-	req.then((res: ChaiHttp.Response) => {
-		chai.expect(res).to.have.status(200);
-		chai.expect(res).to.have.header('content-type', 'text/plain');
-		chai.expect(res).to.have.header('content-type', /^text/);
-		chai.expect(res).to.have.headers;
-		chai.expect('127.0.0.1').to.be.an.ip;
-		chai.expect(res).to.be.json;
-		chai.expect(res).to.be.html;
-		chai.expect(res).to.be.text;
-		chai.expect(res).to.redirect;
-		chai.expect(res).to.redirectTo('http://example.com');
-		chai.expect(res).to.have.param('orderby');
-		chai.expect(res).to.have.param('orderby', 'date');
-		chai.expect(res).to.not.have.param('limit');
-		chai.expect(req).to.have.cookie('session_id');
-		chai.expect(req).to.have.cookie('session_id', '1234');
-		chai.expect(req).to.not.have.cookie('PHPSESSID');
-		chai.expect(res).to.have.cookie('session_id');
-		chai.expect(res).to.have.cookie('session_id', '1234');
-		chai.expect(res).to.not.have.cookie('PHPSESSID');
-		chai.expect(res.body).to.have.property('version', '4.0.0');
-		chai.expect(res.text).to.equal('<html><body></body></html>');
-	}, (err: any) => {
-		throw err;
-	});
-}
-
-when(chai.request(app).get('/')).done(() => console.log('success'), () => console.log('failure'));
-
-Promise.resolve(1)
-	.then(val => chai.request(app).get(`/user/${val}`))
-	.then(res => {
-		chai.expect(res).to.have.status(200);
-	});
diff --git a/types/chai-http/index.d.ts b/types/chai-http/index.d.ts
deleted file mode 100644
index de3caa13e7..0000000000
--- a/types/chai-http/index.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Type definitions for chai-http 3.0
-// Project: https://github.com/chaijs/chai-http
-// Definitions by: Wim Looman <https://github.com/Nemo157>
-//                 Liam Jones <https://github.com/G1itcher>
-//                 Federico Caselli <https://github.com/CaselIT>
-//                 Bas Luksenburg <https://github.com/bas-l>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-/// <reference types="chai" />
-
-import * as request from 'superagent';
-
-declare global {
-	namespace Chai {
-		interface ChaiStatic {
-			request: ChaiHttpRequest;
-		}
-
-		interface ChaiHttpRequest {
-			(server: any): ChaiHttp.Agent;
-			agent(server: any): ChaiHttp.Agent;
-			addPromises(promiseConstructor: any): void;
-		}
-
-		interface Assertion {
-			status(code: number): Assertion;
-			header(key: string, value?: string | RegExp): Assertion;
-			headers: Assertion;
-			json: Assertion;
-			text: Assertion;
-			html: Assertion;
-			redirect: Assertion;
-			redirectTo(location: string): Assertion;
-			param(key: string, value?: string): Assertion;
-			cookie(key: string, value?: string): Assertion;
-		}
-
-		interface TypeComparison {
-			ip: Assertion;
-		}
-	}
-
-	namespace ChaiHttp {
-		interface Promise<T> {
-			then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U): Promise<U>;
-		}
-
-		interface Response {
-			body: any;
-			type: string;
-			status: number;
-			text: string;
-			setEncoding(encoding: string): void;
-			on(event: string, fn: (...args: any[]) => void): void;
-		}
-
-		interface Agent  {
-			get(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			post(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			put(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			head(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			del(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			options(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			patch(url: string, callback?: (err: any, res: Response) => void): request.Request;
-			keepOpen(): Agent;
-			close(callback?: (err: any) => void): Agent;
-		}
-
-		interface TypeComparison {
-			ip: any;
-		}
-	}
-}
-
-declare function chaiHttp(chai: any, utils: any): void;
-export = chaiHttp;
diff --git a/types/chai-http/tsconfig.json b/types/chai-http/tsconfig.json
deleted file mode 100644
index 45d92cf188..0000000000
--- a/types/chai-http/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",
-        "chai-http-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/chai-http/tslint.json b/types/chai-http/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/chai-http/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 607a0d0b4f270032698eb42907d54a456002b752 Mon Sep 17 00:00:00 2001
From: TMTron <martin.trummer@tmtron.com>
Date: Mon, 11 Mar 2019 18:55:36 +0100
Subject: [PATCH 523/924] DataZoom.Slider: fillColor must be fillerColor
 (#33733)

---
 types/echarts/index.d.ts             | 1 +
 types/echarts/options/data-zoom.d.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 5d40c148f6..873060c5f4 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -6,6 +6,7 @@
 //                 Ovilia <https://github.com/Ovilia>
 //                 Roman <https://github.com/iRON5>
 //                 Bilal <https://github.com/bilalucar>
+//                 TMTron <https://github.com/tmtron>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/echarts/options/data-zoom.d.ts b/types/echarts/options/data-zoom.d.ts
index 2ed18582ef..fa57f73a14 100644
--- a/types/echarts/options/data-zoom.d.ts
+++ b/types/echarts/options/data-zoom.d.ts
@@ -66,7 +66,7 @@ declare namespace echarts {
                 show?: boolean;
                 backgroundColor?: string;
                 dataBackground?: object;
-                fillColor?: string;
+                fillerColor?: string;
                 borderColor?: string;
                 handleIcon?: string;
                 handleSize?: number;

From 0783a54bfa8b5711b9f9b6cb9e89ab946079ab98 Mon Sep 17 00:00:00 2001
From: H <umemoto@sencorp.co.jp>
Date: Tue, 12 Mar 2019 02:56:27 +0900
Subject: [PATCH 524/924] @types/vue-select: Fix VueSelectProps interface
 property (#33735)

* fix and add VueSelectProps interface  property.

* fix missing semi
---
 types/vue-select/index.d.ts          | 12 ++++++++++--
 types/vue-select/vue-select-tests.ts | 20 +++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/types/vue-select/index.d.ts b/types/vue-select/index.d.ts
index ff8767e189..e022fb65ea 100644
--- a/types/vue-select/index.d.ts
+++ b/types/vue-select/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vue-select 2.4
+// Type definitions for vue-select 2.5
 // Project: https://github.com/sagalbot/vue-select#readme
 // Definitions by: Ilia Beliaev <https://github.com/silh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,6 +14,7 @@ export interface VueSelectProps {
     value: any;
     options: any[];
     disabled: boolean;
+    clearable: boolean;
     maxHeight: string;
     searchable: boolean;
     multiple: boolean;
@@ -22,17 +23,24 @@ export interface VueSelectProps {
     clearSearchOnSelect: boolean;
     closeOnSelect: boolean;
     label: string;
+    autocomplete: string;
+    index: string | null;
     getOptionLabel: (option: any) => string;
-    onChange: OptionConsumer;
+    onChange: (val: any) => void;
+    onInput: (val: any) => void;
+    onTab: () => void;
     taggable: boolean;
     tabindex: number | null;
     pushTags: boolean;
     filterable: boolean;
+    filterBy: (option: any, label: string, search: string) => boolean;
+    filter: (options: any[], search: string) => boolean;
     createOption: (option: any) => any;
     resetOnOptionsChange: boolean;
     noDrop: boolean;
     inputId: string | null;
     dir: string;
+    selectOnTab: boolean;
 }
 
 export interface VueSelectData {
diff --git a/types/vue-select/vue-select-tests.ts b/types/vue-select/vue-select-tests.ts
index 8fea33b2dc..6d4b61b2a8 100644
--- a/types/vue-select/vue-select-tests.ts
+++ b/types/vue-select/vue-select-tests.ts
@@ -31,8 +31,18 @@ new Vue({
         optionToOption(option: any) {
             return option;
         },
+        onValChange(val: any) {
+        },
+        onVoidTab() {
+        },
         onSearch(search: string, loading: (b: boolean) => void) {
             loading(true);
+        },
+        optionFilterBy(option: any, label: string, search: string) {
+            return true;
+        },
+        optionsFilter(options: any[], search: string) {
+            return true;
         }
     },
     template: `
@@ -40,6 +50,7 @@ new Vue({
                 :value="value"
                 :options="options"
                 disable="false"
+                clearable="true"
                 maxHeight="200"
                 searchable="true"
                 multiple="false"
@@ -48,16 +59,23 @@ new Vue({
                 clearSearchOnSelect="false"
                 :closeOnSelect="false"
                 label="name"
+                autocomplete="off"
+                :index="null"
                 :getOptionLabel="getOptionLabel"
-                :onChange="optionConsumer"
+                :onChange="onValChange"
+                :onInput="onValChange"
+                :onTab="onVoidTab"
                 :taggable="true"
                 :tabindex="null"
                 pushTags="false"
+                :filterBy="optionFilterBy"
+                :filter="optionsFilter"
                 :createOption="optionToOption"
                 resetOnOptionsChange="false"
                 noDrop="true"
                 :inputId="null"
                 dir="someDir"
+                selectOnTab="false"
                 @search="onSearch"
                 @input="optionConsumer">
     </vue-select>

From cb392e576faacccd6c573c9984a7d3e03d7cc6ac Mon Sep 17 00:00:00 2001
From: Benjamin Humphrey <benjamin@dovetailapp.com>
Date: Tue, 12 Mar 2019 04:57:46 +1100
Subject: [PATCH 525/924] Remove type definitions for zapier-platform-core
 (#33757)

---
 notNeededPackages.json                        |   6 +
 types/zapier-platform-core/index.d.ts         | 119 ------------------
 types/zapier-platform-core/tsconfig.json      |  23 ----
 types/zapier-platform-core/tslint.json        |   1 -
 .../zapier-platform-core-tests.ts             | 100 ---------------
 5 files changed, 6 insertions(+), 243 deletions(-)
 delete mode 100644 types/zapier-platform-core/index.d.ts
 delete mode 100644 types/zapier-platform-core/tsconfig.json
 delete mode 100644 types/zapier-platform-core/tslint.json
 delete mode 100644 types/zapier-platform-core/zapier-platform-core-tests.ts

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 7638e7304a..bd141916cf 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -2040,6 +2040,12 @@
             "sourceRepoURL": "none",
             "asOfVersion": "2.1.0"
         },
+        {
+            "libraryName": "zapier-platform-core",
+            "typingsPackageName": "zapier-platform-core",
+            "sourceRepoURL": "https://github.com/zapier/zapier-platform-core",
+            "asOfVersion": "6.1.0"
+        },
         {
             "libraryName": "zetapush-js",
             "typingsPackageName": "zetapush-js",
diff --git a/types/zapier-platform-core/index.d.ts b/types/zapier-platform-core/index.d.ts
deleted file mode 100644
index ec9f3de919..0000000000
--- a/types/zapier-platform-core/index.d.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// Type definitions for zapier-platform-core 3.1
-// Project: https://github.com/zapier/zapier-platform-core, https://zapier.com
-// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-/// <reference types="node" />
-
-import * as http from "http";
-
-export function createAppHandler(appRawOrPath: object | string): (event: any, context: any, callback: any) => void;
-export function createAppTester(appRawOrPath: object | string): Promise<any>;
-export function integrationTestHandler(event: any, context: any, callback: any): any;
-export const version: string;
-
-export interface HttpRequestOptions {
-    url?: string;
-    method?: "POST" | "GET" | "OPTIONS" | "HEAD" | "DELETE" | "PATCH" | "PUT";
-    body?: string | Buffer | NodeJS.ReadableStream | object | null;
-    headers?: { [name: string]: string };
-    json?: object | any[] | null;
-    params?: object;
-    form?: object | null;
-    raw?: boolean;
-    redirect?: "manual" | "error" | "follow";
-    follow?: number;
-    compress?: boolean;
-    agent?: http.Agent | null;
-    timeout?: number;
-    size?: number;
-}
-
-export interface HttpResponse {
-    status: number;
-    content: string | Buffer;
-    json: object | undefined | Promise<object | undefined>;
-    body?: NodeJS.ReadableStream;
-    headers: { [key: string]: string };
-    getHeader(key: string): string | undefined;
-    throwForStatus(): void;
-    request: HttpRequestOptions;
-}
-
-export class HaltedError extends Error {}
-export class ExpiredAuthError extends Error {}
-export class RefreshAuthError extends Error {}
-
-export interface Z {
-    request(options: HttpRequestOptions): Promise<HttpResponse>;
-    request(url: string, options?: HttpRequestOptions): Promise<HttpResponse>;
-    JSON: typeof JSON;
-    console: Console;
-    hash(alg: string, data: string): any;
-    errors: {
-        RefreshAuthError: {
-            new (message?: string): HaltedError;
-            new (message?: string): ExpiredAuthError;
-            new (message?: string): RefreshAuthError;
-        };
-    };
-    stashFile: (promise: Promise<HttpResponse>, knownLength?: number | string, filename?: string, contentType?: string) => Promise<string>;
-    dehydrate: <T>(callback: (z: Z, bundle: Bundle<T>) => any, inputData: T) => string;
-}
-
-export interface AuthData {
-    access_token: string;
-    refresh_token?: string;
-}
-
-export interface Bundle<InputData = {}> {
-    authData: AuthData;
-    inputData: InputData;
-}
-
-export interface AuthorizeUrlBundle<InputData = {}> {
-    inputData: InputData;
-}
-
-export interface GetAccessTokenBundle<InputData = {}> {
-    inputData: InputData & {
-        code: string;
-    };
-}
-
-export interface RefreshAccessTokenBundle<InputData> {
-    inputData: InputData;
-    authData: AuthData;
-}
-
-export interface OAuth2Authentication<InputData = {}> {
-    type: "oauth2";
-    connectionLabel: string;
-    oauth2Config: {
-        authorizeUrl:
-            | string
-            | ((
-                  z: Z,
-                  bundle: AuthorizeUrlBundle<InputData>
-              ) => string | Promise<string>)
-            | HttpRequestOptions;
-        getAccessToken:
-            | ((
-                  z: Z,
-                  bundle: GetAccessTokenBundle<InputData>
-              ) => AuthData | Promise<AuthData>)
-            | HttpRequestOptions;
-        refreshAccessToken?:
-            | ((
-                  z: Z,
-                  bundle: RefreshAccessTokenBundle<InputData>
-              ) => AuthData | Promise<AuthData>)
-            | HttpRequestOptions;
-        autoRefresh: boolean;
-        scope?: string;
-    };
-    test:
-        | ((z: Z, bundle: Bundle<InputData>) => boolean | Promise<boolean>)
-        | { url: string };
-}
diff --git a/types/zapier-platform-core/tsconfig.json b/types/zapier-platform-core/tsconfig.json
deleted file mode 100644
index c197914893..0000000000
--- a/types/zapier-platform-core/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "zapier-platform-core-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/zapier-platform-core/tslint.json b/types/zapier-platform-core/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/zapier-platform-core/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/zapier-platform-core/zapier-platform-core-tests.ts b/types/zapier-platform-core/zapier-platform-core-tests.ts
deleted file mode 100644
index 6c6c490edd..0000000000
--- a/types/zapier-platform-core/zapier-platform-core-tests.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import * as zapier from "zapier-platform-core";
-
-const BASE_URL = "http://example.com";
-const OAUTH2_CLIENT_ID = "12345";
-const OAUTH2_CLIENT_SECRET = "abcdef";
-
-const authentication: zapier.OAuth2Authentication = {
-    type: "oauth2",
-    connectionLabel: "User account",
-    oauth2Config: {
-        authorizeUrl: `${BASE_URL}/oauth2/authorize`,
-
-        getAccessToken: async (z, bundle) => {
-            const response = await z.request(`${BASE_URL}/oauth2/access`, {
-                method: "POST",
-                body: {
-                    code: bundle.inputData.code,
-                    client_id: OAUTH2_CLIENT_ID,
-                    client_secret: OAUTH2_CLIENT_SECRET,
-                    grant_type: "authorization_code"
-                }
-            });
-
-            if (response.status !== 200) {
-                throw new Error(
-                    "Unable to fetch access token: " + response.content
-                );
-            }
-
-            if (typeof response.content !== "string") {
-                throw new Error(
-                    `Unable to response content, expected string but got ${typeof response.content}.`
-                );
-            }
-
-            const result = z.JSON.parse(response.content);
-            return {
-                access_token: result.access_token,
-                refresh_token: result.refresh_token
-            };
-        },
-
-        refreshAccessToken: async (z, bundle) => {
-            if (!bundle.authData.refresh_token) {
-                throw new Error(
-                    "Required `bundle.authData.refresh_token` field missing."
-                );
-            }
-
-            const response = await z.request(`${BASE_URL}/oauth2/refresh`, {
-                method: "POST",
-                body: {
-                    refresh_token: bundle.authData.refresh_token,
-                    client_id: OAUTH2_CLIENT_ID,
-                    client_secret: OAUTH2_CLIENT_SECRET,
-                    grant_type: "refresh_token"
-                }
-            });
-
-            if (response.status !== 200) {
-                throw new Error(
-                    "Unable to fetch access token: " + response.content
-                );
-            }
-
-            if (typeof response.content !== "string") {
-                throw new Error(
-                    `Unable to response content, expected string but got ${typeof response.content}.`
-                );
-            }
-
-            const result = z.JSON.parse(response.content);
-            return {
-                access_token: result.access_token,
-                refresh_token: bundle.authData.refresh_token
-            };
-        },
-
-        autoRefresh: true,
-
-        scope: "read,write"
-    },
-
-    test: async z => {
-        const response = await z.request(`${BASE_URL}/oauth2/test`);
-
-        if (response.status === 401) {
-            throw new Error("The access token you supplied is not valid");
-        }
-
-        return true;
-    }
-};
-
-zapier.version;
-
-const testCreateAppTester = async () => {
-    const zapierApp = {};
-    const appTester = await zapier.createAppTester(zapierApp);
-};

From 5e9a081b548887ae1dd24db41fa49d3d71869bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20S=C3=A4mskar?= <mattias.samskar@gmail.com>
Date: Mon, 11 Mar 2019 18:58:09 +0100
Subject: [PATCH 526/924] Add definitions for Expo SplashScreen (#33766)

---
 types/expo/expo-tests.tsx     | 6 ++++++
 types/expo/index.d.ts         | 9 +++++++++
 types/expo/v30/expo-tests.tsx | 8 +++++++-
 types/expo/v30/index.d.ts     | 9 +++++++++
 types/expo/v31/expo-tests.tsx | 6 ++++++
 types/expo/v31/index.d.ts     | 9 +++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index ab34955ce2..c113b22576 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -49,6 +49,7 @@ import {
     registerRootComponent,
     ScreenOrientation,
     SecureStore,
+    SplashScreen,
     Svg,
     Updates
 } from 'expo';
@@ -1295,3 +1296,8 @@ async () => {
     response13.forEach((_: Contacts.Container) => _);
 };
 // #endregion
+
+// #region SplashScreen
+SplashScreen.hide();
+SplashScreen.preventAutoHide();
+// #endregion
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 2752410316..4ca39cd202 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -17,6 +17,7 @@
 //                 Jason Killian <https://github.com/jkillian>
 //                 Satyajit Sahoo <https://github.com/satya164>
 //                 Vinit Sood <https://github.com/vinitsood>
+//                 Mattias Sämskar <https://github.com/mattiassamskar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -2545,6 +2546,14 @@ export namespace Speech {
     function resume(): void;
 }
 
+/**
+ * SplashScreen
+ */
+export namespace SplashScreen {
+    function hide(): void;
+    function preventAutoHide(): void;
+}
+
 /**
  * SQLite
  */
diff --git a/types/expo/v30/expo-tests.tsx b/types/expo/v30/expo-tests.tsx
index 61467bd5d1..2d2b58c08f 100644
--- a/types/expo/v30/expo-tests.tsx
+++ b/types/expo/v30/expo-tests.tsx
@@ -41,7 +41,8 @@ import {
     Updates,
     MediaLibrary,
     Haptic,
-    Constants
+    Constants,
+    SplashScreen
 } from 'expo';
 
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
@@ -951,3 +952,8 @@ async () => {
     const userAgent: string = await Constants.getWebViewUserAgentAsync();
 };
 // #endregion
+
+// #region SplashScreen
+SplashScreen.hide();
+SplashScreen.preventAutoHide();
+// #endregion
diff --git a/types/expo/v30/index.d.ts b/types/expo/v30/index.d.ts
index f1b318414e..e6712b78ce 100644
--- a/types/expo/v30/index.d.ts
+++ b/types/expo/v30/index.d.ts
@@ -11,6 +11,7 @@
 //                 Tina Roh <https://github.com/tinaroh>
 //                 Nathan Phillip Brink <https://github.com/binki>
 //                 Martin Olsson <https://github.com/mo>
+//                 Mattias Sämskar <https://github.com/mattiassamskar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1996,6 +1997,14 @@ export namespace Speech {
     function resume(): void;
 }
 
+/**
+ * SplashScreen
+ */
+export namespace SplashScreen {
+    function hide(): void;
+    function preventAutoHide(): void;
+}
+
 /**
  * SQLite
  */
diff --git a/types/expo/v31/expo-tests.tsx b/types/expo/v31/expo-tests.tsx
index 10045e57e6..c03764f56f 100644
--- a/types/expo/v31/expo-tests.tsx
+++ b/types/expo/v31/expo-tests.tsx
@@ -48,6 +48,7 @@ import {
     registerRootComponent,
     ScreenOrientation,
     SecureStore,
+    SplashScreen,
     Svg,
     Updates
 } from 'expo';
@@ -1261,3 +1262,8 @@ async () => {
     response13.forEach((_: Contacts.Container) => _);
 };
 // #endregion
+
+// #region SplashScreen
+SplashScreen.hide();
+SplashScreen.preventAutoHide();
+// #endregion
diff --git a/types/expo/v31/index.d.ts b/types/expo/v31/index.d.ts
index a3ce2caced..5b64de88e7 100644
--- a/types/expo/v31/index.d.ts
+++ b/types/expo/v31/index.d.ts
@@ -16,6 +16,7 @@
 //                 Bartosz Dotryw <https://github.com/burtek>
 //                 Jason Killian <https://github.com/jkillian>
 //                 Satyajit Sahoo <https://github.com/satya164>
+//                 Mattias Sämskar <https://github.com/mattiassamskar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -2455,6 +2456,14 @@ export namespace Speech {
     function resume(): void;
 }
 
+/**
+ * SplashScreen
+ */
+export namespace SplashScreen {
+    function hide(): void;
+    function preventAutoHide(): void;
+}
+
 /**
  * SQLite
  */

From e91bf8fbad8467e7e5d3cd0357b55eba21c9e4c3 Mon Sep 17 00:00:00 2001
From: Dominik Strebinger <computerbaer@gmail.com>
Date: Mon, 11 Mar 2019 18:58:32 +0100
Subject: [PATCH 527/924] Update VueScrollTo Options (#33615)

---
 types/vue-scrollto/index.d.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/types/vue-scrollto/index.d.ts b/types/vue-scrollto/index.d.ts
index 47371283d9..e020d29533 100644
--- a/types/vue-scrollto/index.d.ts
+++ b/types/vue-scrollto/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vue-scrollto 2.7
+// Type definitions for vue-scrollto 2.14
 // Project: https://github.com/rigor789/vue-scrollto#readme
 // Definitions by: Kovács Vince <https://github.com/vincekovacs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,13 +19,19 @@ declare namespace VueScrollTo {
         easing?: string;
         // The offset that should be applied when scrolling. Default: 0
         offset?: number;
+        // Indicates if scrolling should be performed, even if the scroll target is already in view. Default: true
+        force?: boolean;
         // Indicates if user can cancel the scroll or not. Default: true
         cancelable?: boolean;
-        // A callback function that should be called when scrolling has ended. Default: noop
-        onDone?: (() => void) | false;
+        // A callback function that should be called when scrolling has started. Receives the target element as a
+        // parameter. Default: noop
+        onStart?: ((element: Element) => void) | false;
+        // A callback function that should be called when scrolling has ended. Receives the target element as a
+        // parameter. Default: noop
+        onDone?: ((element: Element) => void) | false;
         // A callback function that should be called when scrolling has been aborted by the user (user scrolled, clicked
-        // etc.). Default: noop
-        onCancel?: (() => void) | false;
+        // etc.). Receives the abort event and the target element as parameters. Default: noop
+        onCancel?: ((event: Event, element: Element) => void) | false;
         // Whether or not we want scrolling on the x axis. Default: true
         x?: boolean;
         // Whether or not we want scrolling on the y axis. Default: true

From a3528daaf0b06c5ed3864bf4c28a0c438fd374a3 Mon Sep 17 00:00:00 2001
From: Borys Kupar <kupar.b@gmail.com>
Date: Mon, 11 Mar 2019 19:00:47 +0100
Subject: [PATCH 528/924] [moment-timezone] Fixed
 moment-timezone/moment-timezone import, rearranged exports (#33714)

---
 types/moment-timezone/index.d.ts           | 61 +---------------------
 types/moment-timezone/moment-timezone.d.ts | 55 +++++++++++++++++++
 types/moment-timezone/tsconfig.json        |  1 -
 3 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index 9d365f01b4..8824a165d6 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -6,65 +6,6 @@
 //                 Borys Kupar <https://github.com/borys-kupar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import moment = require('moment');
+import moment = require('./moment-timezone');
 
-// require("moment-timezone") === require("moment")
 export = moment;
-
-declare module "moment" {
-    interface MomentZone {
-        name: string;
-        abbrs: string[];
-        untils: number[];
-        offsets: number[];
-        population: number;
-
-        abbr(timestamp: number): string;
-        offset(timestamp: number): number;
-        utcOffset(timestamp: number): number;
-        parse(timestamp: number): number;
-    }
-
-    interface MomentTimezone {
-        (): moment.Moment;
-        (timezone: string): moment.Moment;
-        (date: number, timezone: string): moment.Moment;
-        (date: number[], timezone: string): moment.Moment;
-        (date: string, timezone: string): moment.Moment;
-        (date: string, format: moment.MomentFormatSpecification, timezone: string): moment.Moment;
-        (date: string, format: moment.MomentFormatSpecification, strict: boolean, timezone: string): moment.Moment;
-        (date: string, format: moment.MomentFormatSpecification, language: string, timezone: string): moment.Moment;
-        (date: string, format: moment.MomentFormatSpecification, language: string, strict: boolean, timezone: string): moment.Moment;
-        (date: Date, timezone: string): moment.Moment;
-        (date: moment.Moment, timezone: string): moment.Moment;
-        (date: any, timezone: string): moment.Moment;
-
-        zone(timezone: string): MomentZone | null;
-
-        add(packedZoneString: string): void;
-        add(packedZoneString: string[]): void;
-
-        link(packedLinkString: string): void;
-        link(packedLinkString: string[]): void;
-
-        load(data: {
-            version: string;
-            links: string[];
-            zones: string[];
-        }): void;
-
-        names(): string[];
-        guess(ignoreCache?: boolean): string;
-
-        setDefault(timezone?: string): MomentTimezone;
-    }
-
-    interface Moment {
-        tz(): string | undefined;
-        tz(timezone: string, keepLocalTime?: boolean): moment.Moment;
-        zoneAbbr(): string;
-        zoneName(): string;
-    }
-
-    const tz: MomentTimezone;
-}
diff --git a/types/moment-timezone/moment-timezone.d.ts b/types/moment-timezone/moment-timezone.d.ts
index 4f06f7e4f1..71da391ffa 100644
--- a/types/moment-timezone/moment-timezone.d.ts
+++ b/types/moment-timezone/moment-timezone.d.ts
@@ -1,3 +1,58 @@
 import moment = require('moment');
 
+// require("moment-timezone") === require("moment")
 export = moment;
+
+declare module 'moment' {
+  interface MomentZone {
+    name: string;
+    abbrs: string[];
+    untils: number[];
+    offsets: number[];
+    population: number;
+
+    abbr(timestamp: number): string;
+    offset(timestamp: number): number;
+    utcOffset(timestamp: number): number;
+    parse(timestamp: number): number;
+  }
+
+  interface MomentTimezone {
+    (): moment.Moment;
+    (timezone: string): moment.Moment;
+    (date: number, timezone: string): moment.Moment;
+    (date: number[], timezone: string): moment.Moment;
+    (date: string, timezone: string): moment.Moment;
+    (date: string, format: moment.MomentFormatSpecification, timezone: string): moment.Moment;
+    (date: string, format: moment.MomentFormatSpecification, strict: boolean, timezone: string): moment.Moment;
+    (date: string, format: moment.MomentFormatSpecification, language: string, timezone: string): moment.Moment;
+    (date: string, format: moment.MomentFormatSpecification, language: string, strict: boolean, timezone: string): moment.Moment;
+    (date: Date, timezone: string): moment.Moment;
+    (date: moment.Moment, timezone: string): moment.Moment;
+    (date: any, timezone: string): moment.Moment;
+
+    zone(timezone: string): MomentZone | null;
+
+    add(packedZoneString: string): void;
+    add(packedZoneString: string[]): void;
+
+    link(packedLinkString: string): void;
+    link(packedLinkString: string[]): void;
+
+    load(data: { version: string; links: string[]; zones: string[] }): void;
+
+    names(): string[];
+    guess(ignoreCache?: boolean): string;
+
+    setDefault(timezone?: string): MomentTimezone;
+  }
+
+  interface Moment {
+    tz(): string | undefined;
+    tz(timezone: string, keepLocalTime?: boolean): moment.Moment;
+    zoneAbbr(): string;
+    zoneName(): string;
+  }
+
+  const tz: MomentTimezone;
+}
diff --git a/types/moment-timezone/tsconfig.json b/types/moment-timezone/tsconfig.json
index 55ec6cf7bb..5b29fa3ff5 100644
--- a/types/moment-timezone/tsconfig.json
+++ b/types/moment-timezone/tsconfig.json
@@ -18,7 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "moment-timezone.d.ts",
         "moment-timezone-tests.ts"
     ]
 }

From d0af366f23c592c7976e564e94bc3bc13c9bece7 Mon Sep 17 00:00:00 2001
From: Piotr <37638629+tanfonto@users.noreply.github.com>
Date: Mon, 11 Mar 2019 19:03:34 +0100
Subject: [PATCH 529/924] clone-deep npm package typings (#33750)

* clone-deep types

* inlined InstanceClone
---
 types/clone-deep/clone-deep-tests.ts | 16 ++++++++++++++++
 types/clone-deep/index.d.ts          | 10 ++++++++++
 types/clone-deep/tsconfig.json       | 17 +++++++++++++++++
 types/clone-deep/tslint.json         |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 types/clone-deep/clone-deep-tests.ts
 create mode 100644 types/clone-deep/index.d.ts
 create mode 100644 types/clone-deep/tsconfig.json
 create mode 100644 types/clone-deep/tslint.json

diff --git a/types/clone-deep/clone-deep-tests.ts b/types/clone-deep/clone-deep-tests.ts
new file mode 100644
index 0000000000..0e99c6fbb2
--- /dev/null
+++ b/types/clone-deep/clone-deep-tests.ts
@@ -0,0 +1,16 @@
+import cloneDeep from 'clone-deep';
+
+cloneDeep<object>(Object.create(null)); // $ExpectType object
+cloneDeep<object>({}); // $ExpectType object
+cloneDeep({}); // $ExpectType {}
+cloneDeep(new Array()); // $ExpectType any[]
+cloneDeep<any[]>([]); // $ExpectType any[]
+cloneDeep<number>(42); // $ExpectType number
+cloneDeep<string>('clone'); // $ExpectType string
+cloneDeep<object>({}, true); // $ExpectType object
+cloneDeep({}, true); // $ExpectType {}
+cloneDeep<number>(42, true); // $ExpectType number
+cloneDeep<object>({}, _ => ({})); // $ExpectType object
+cloneDeep({}, _ => ({})); // $ExpectType {}
+cloneDeep<object>({}, _ => 42); // $ExpectError
+cloneDeep(42, _ => ({})); // $ExpectError
diff --git a/types/clone-deep/index.d.ts b/types/clone-deep/index.d.ts
new file mode 100644
index 0000000000..0ca60e6180
--- /dev/null
+++ b/types/clone-deep/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for clone-deep 4.0
+// Project: https://github.com/jonschlinkert/clone-deep
+// Definitions by: Tanfonto <https://github.com/tanfonto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+export default function cloneDeep<T>(
+  val: T,
+  instanceClone?: true | ((val: T) => T)
+): T;
diff --git a/types/clone-deep/tsconfig.json b/types/clone-deep/tsconfig.json
new file mode 100644
index 0000000000..d584681520
--- /dev/null
+++ b/types/clone-deep/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": ["index.d.ts", "clone-deep-tests.ts"]
+}
diff --git a/types/clone-deep/tslint.json b/types/clone-deep/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clone-deep/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 25e3419e81455377253ee4d569294bcf52438731 Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@users.noreply.github.com>
Date: Mon, 11 Mar 2019 19:06:05 +0100
Subject: [PATCH 530/924] new package: protocol-buffers-schema (#33745)

* bootstraped folder structure for "protocol-buffers-schema"

* npx prettier --write .\types\protocol-buffers-schema\**

* drafted types for protocol-buffers-schema

* moved types into dedicated file

* added "strictFunctionTypes"-flag

* drafted index.d.ts

* added missing files to tsconfig

* npx prettier --write .\types\protocol-buffers-schema\**

* added "node" to types in tsconfig

* removed redundant "export" keywords

* added reference to node type(s)

* added test case
---
 types/protocol-buffers-schema/index.d.ts      | 17 ++++
 types/protocol-buffers-schema/parse.d.ts      |  9 +++
 .../protocol-buffers-schema-tests.ts          | 21 +++++
 types/protocol-buffers-schema/stringify.d.ts  |  5 ++
 types/protocol-buffers-schema/tokenize.d.ts   |  5 ++
 types/protocol-buffers-schema/tsconfig.json   | 23 ++++++
 types/protocol-buffers-schema/tslint.json     |  1 +
 types/protocol-buffers-schema/types.d.ts      | 81 +++++++++++++++++++
 8 files changed, 162 insertions(+)
 create mode 100644 types/protocol-buffers-schema/index.d.ts
 create mode 100644 types/protocol-buffers-schema/parse.d.ts
 create mode 100644 types/protocol-buffers-schema/protocol-buffers-schema-tests.ts
 create mode 100644 types/protocol-buffers-schema/stringify.d.ts
 create mode 100644 types/protocol-buffers-schema/tokenize.d.ts
 create mode 100644 types/protocol-buffers-schema/tsconfig.json
 create mode 100644 types/protocol-buffers-schema/tslint.json
 create mode 100644 types/protocol-buffers-schema/types.d.ts

diff --git a/types/protocol-buffers-schema/index.d.ts b/types/protocol-buffers-schema/index.d.ts
new file mode 100644
index 0000000000..2d80831cf1
--- /dev/null
+++ b/types/protocol-buffers-schema/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for protocol-buffers-schema 3.3
+// Project: https://github.com/mafintosh/protocol-buffers-schema
+// Definitions by: Claas Ahlrichs <https://github.com/claasahl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+/// <reference types="node" />
+
+import { Schema } from "./types";
+declare namespace parse {
+    function parse(buffer: string | Buffer): Schema;
+    function stringify(schema: Schema): string;
+}
+
+declare function parse(buffer: string | Buffer): Schema;
+
+export = parse;
diff --git a/types/protocol-buffers-schema/parse.d.ts b/types/protocol-buffers-schema/parse.d.ts
new file mode 100644
index 0000000000..3bf80fa1cf
--- /dev/null
+++ b/types/protocol-buffers-schema/parse.d.ts
@@ -0,0 +1,9 @@
+import { Schema } from "./types";
+declare namespace parse {
+    function parse(buffer: string | Buffer): Schema;
+    function stringify(schema: Schema): string;
+}
+
+declare function parse(buffer: string | Buffer): Schema;
+
+export = parse;
diff --git a/types/protocol-buffers-schema/protocol-buffers-schema-tests.ts b/types/protocol-buffers-schema/protocol-buffers-schema-tests.ts
new file mode 100644
index 0000000000..7b68e9bab0
--- /dev/null
+++ b/types/protocol-buffers-schema/protocol-buffers-schema-tests.ts
@@ -0,0 +1,21 @@
+import schema from "protocol-buffers-schema";
+
+const proto = `syntax = "proto2";
+
+message Point {
+  required int32 x = 1;
+  required int32 y=2;
+  optional string label = 3;
+}
+
+message Line {
+  required Point start = 1;
+  required Point end = 2;
+  optional string label = 3;
+}`;
+
+// pass a buffer or string to schema.parse
+const sch = schema.parse(proto);
+
+// will print out the schema as a javascript object
+console.log(sch);
diff --git a/types/protocol-buffers-schema/stringify.d.ts b/types/protocol-buffers-schema/stringify.d.ts
new file mode 100644
index 0000000000..708a4ff394
--- /dev/null
+++ b/types/protocol-buffers-schema/stringify.d.ts
@@ -0,0 +1,5 @@
+import { Schema } from "./types";
+
+declare function stringify(schema: Schema): string;
+
+export = stringify;
diff --git a/types/protocol-buffers-schema/tokenize.d.ts b/types/protocol-buffers-schema/tokenize.d.ts
new file mode 100644
index 0000000000..dfe51a143c
--- /dev/null
+++ b/types/protocol-buffers-schema/tokenize.d.ts
@@ -0,0 +1,5 @@
+import { Schema } from "./types";
+
+declare function tokenize(schema: Schema): string[];
+
+export = tokenize;
diff --git a/types/protocol-buffers-schema/tsconfig.json b/types/protocol-buffers-schema/tsconfig.json
new file mode 100644
index 0000000000..76e4087db4
--- /dev/null
+++ b/types/protocol-buffers-schema/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "parse.d.ts",
+        "stringify.d.ts",
+        "tokenize.d.ts",
+        "protocol-buffers-schema-tests.ts"
+    ]
+}
diff --git a/types/protocol-buffers-schema/tslint.json b/types/protocol-buffers-schema/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/protocol-buffers-schema/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/protocol-buffers-schema/types.d.ts b/types/protocol-buffers-schema/types.d.ts
new file mode 100644
index 0000000000..12a0a3bdf5
--- /dev/null
+++ b/types/protocol-buffers-schema/types.d.ts
@@ -0,0 +1,81 @@
+export interface Option {
+    [key: string]: string | boolean;
+}
+
+export interface Options {
+    [key: string]: string | boolean | Option | Option[];
+}
+
+export interface Enum {
+    name: string;
+    values: {
+        [key: string]: {
+            value: number;
+            options: Options;
+        };
+    };
+    options: Options;
+}
+
+export interface FieldOptions {
+    [key: string]: string;
+}
+
+export interface Field {
+    name: string;
+    type: string;
+    tag: number;
+    map: {
+        from: string;
+        to: string;
+    };
+    oneof: null | string;
+    required: boolean;
+    repeated: boolean;
+    options: FieldOptions;
+}
+
+export interface Message {
+    name: string;
+    enums: Enum[];
+    extends: Extend[];
+    extensions: Extension[];
+    messages: Message[];
+    fields: Field[];
+}
+
+export interface Extend {
+    name: string;
+    message: Message;
+}
+
+export interface Extension {
+    from: number;
+    to: number;
+}
+
+export interface Service {
+    name: string;
+    methods: Method[];
+    options: Options;
+}
+
+export interface Method {
+    name: string;
+    input_type: string;
+    output_type: string;
+    client_streaming: boolean;
+    server_streaming: boolean;
+    options: Options;
+}
+
+export interface Schema {
+    syntax: number;
+    package: null | string;
+    imports: string[];
+    enums: Enum[];
+    messages: Message[];
+    options: Options;
+    extends: Extend[];
+    service?: Service[];
+}

From 8146f412637c087eebb61dcf83b257cd3631abbf Mon Sep 17 00:00:00 2001
From: Spencer Miskoviak <5247455+skovy@users.noreply.github.com>
Date: Mon, 11 Mar 2019 11:06:53 -0700
Subject: [PATCH 531/924] Add type definitions for css-modules-loader-core
 (#33744)

---
 .../css-modules-loader-core-tests.ts          | 24 +++++++++
 types/css-modules-loader-core/index.d.ts      | 50 +++++++++++++++++++
 types/css-modules-loader-core/package.json    |  6 +++
 types/css-modules-loader-core/tsconfig.json   | 24 +++++++++
 types/css-modules-loader-core/tslint.json     |  1 +
 5 files changed, 105 insertions(+)
 create mode 100644 types/css-modules-loader-core/css-modules-loader-core-tests.ts
 create mode 100644 types/css-modules-loader-core/index.d.ts
 create mode 100644 types/css-modules-loader-core/package.json
 create mode 100644 types/css-modules-loader-core/tsconfig.json
 create mode 100644 types/css-modules-loader-core/tslint.json

diff --git a/types/css-modules-loader-core/css-modules-loader-core-tests.ts b/types/css-modules-loader-core/css-modules-loader-core-tests.ts
new file mode 100644
index 0000000000..d8fe2966d7
--- /dev/null
+++ b/types/css-modules-loader-core/css-modules-loader-core-tests.ts
@@ -0,0 +1,24 @@
+/// <reference types="node" />
+
+import Core, { Source } from "css-modules-loader-core";
+
+const core = new Core();
+const emptyPlugins = new Core([]);
+const withPlugins = new Core([
+    Core.values,
+    Core.localByDefault,
+    Core.extractImports,
+    Core.scope
+]);
+const withDefaultPlugins = new Core(Core.defaultPlugins);
+
+// $ExpectError
+const noArray = new Core(Core.values);
+
+// Validating the source can be anything that has toString() defined
+const bufferSource: Source = new Buffer("str");
+
+core.load("str").then(({ injectableSource, exportTokens }) => {
+    const str: string = injectableSource;
+    exportTokens["key"] = "value";
+});
diff --git a/types/css-modules-loader-core/index.d.ts b/types/css-modules-loader-core/index.d.ts
new file mode 100644
index 0000000000..d7bd533ac1
--- /dev/null
+++ b/types/css-modules-loader-core/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for css-modules-loader-core 1.1
+// Project: https://github.com/css-modules/css-modules-loader-core
+// Definitions by: Spencer Miskoviak <https://github.com/skovy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+import { Plugin } from "postcss";
+
+declare namespace Core {
+    type Source =
+        | string
+        | {
+              toString(): string;
+          };
+
+    type PathFetcher = (
+        file: string,
+        relativeTo: string,
+        depTrace: string
+    ) => void;
+
+    interface ExportTokens {
+        [index: string]: string;
+    }
+
+    interface Result {
+        injectableSource: string;
+        exportTokens: ExportTokens;
+    }
+}
+
+declare class Core {
+    static values: Plugin<{}>;
+    static localByDefault: Plugin<{}>;
+    static extractImports: Plugin<{}>;
+    static scope: Plugin<{}>;
+    static defaultPlugins: Array<Plugin<{}>>;
+
+    constructor(plugins?: Array<Plugin<any>>);
+
+    load(
+        source: Core.Source,
+        sourcePath?: string,
+        trace?: string,
+        pathFetcher?: Core.PathFetcher
+    ): Promise<Core.Result>;
+}
+
+export = Core;
+export as namespace Core;
diff --git a/types/css-modules-loader-core/package.json b/types/css-modules-loader-core/package.json
new file mode 100644
index 0000000000..06a694067a
--- /dev/null
+++ b/types/css-modules-loader-core/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "postcss": "7.x.x"
+  }
+}
diff --git a/types/css-modules-loader-core/tsconfig.json b/types/css-modules-loader-core/tsconfig.json
new file mode 100644
index 0000000000..a4b15a0258
--- /dev/null
+++ b/types/css-modules-loader-core/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,        
+        "esModuleInterop": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "css-modules-loader-core-tests.ts"
+    ]
+}
diff --git a/types/css-modules-loader-core/tslint.json b/types/css-modules-loader-core/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/css-modules-loader-core/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3db0bee205f0f14af38b7899ba44ed5aa4c38b5e Mon Sep 17 00:00:00 2001
From: samuel kwok <kwokyinlun@gmail.com>
Date: Tue, 12 Mar 2019 03:14:05 +0900
Subject: [PATCH 532/924] Copy ramda commonjs package type declaration file
 (#33334)

---
 types/ramda/index.d.ts                       | 246 +++++++++++++++++++
 types/ramda/src/F.d.ts                       |   2 +
 types/ramda/src/T.d.ts                       |   2 +
 types/ramda/src/add.d.ts                     |   2 +
 types/ramda/src/addIndex.d.ts                |   2 +
 types/ramda/src/adjust.d.ts                  |   2 +
 types/ramda/src/all.d.ts                     |   2 +
 types/ramda/src/allPass.d.ts                 |   2 +
 types/ramda/src/always.d.ts                  |   2 +
 types/ramda/src/and.d.ts                     |   2 +
 types/ramda/src/any.d.ts                     |   2 +
 types/ramda/src/anyPass.d.ts                 |   2 +
 types/ramda/src/ap.d.ts                      |   2 +
 types/ramda/src/aperture.d.ts                |   2 +
 types/ramda/src/append.d.ts                  |   2 +
 types/ramda/src/apply.d.ts                   |   2 +
 types/ramda/src/applySpec.d.ts               |   2 +
 types/ramda/src/applyTo.d.ts                 |   2 +
 types/ramda/src/ascend.d.ts                  |   2 +
 types/ramda/src/assoc.d.ts                   |   2 +
 types/ramda/src/assocPath.d.ts               |   2 +
 types/ramda/src/binary.d.ts                  |   2 +
 types/ramda/src/bind.d.ts                    |   2 +
 types/ramda/src/both.d.ts                    |   2 +
 types/ramda/src/call.d.ts                    |   2 +
 types/ramda/src/chain.d.ts                   |   2 +
 types/ramda/src/clamp.d.ts                   |   2 +
 types/ramda/src/clone.d.ts                   |   2 +
 types/ramda/src/comparator.d.ts              |   2 +
 types/ramda/src/complement.d.ts              |   2 +
 types/ramda/src/compose.d.ts                 |   2 +
 types/ramda/src/composeK.d.ts                |   2 +
 types/ramda/src/composeP.d.ts                |   2 +
 types/ramda/src/concat.d.ts                  |   2 +
 types/ramda/src/cond.d.ts                    |   2 +
 types/ramda/src/construct.d.ts               |   2 +
 types/ramda/src/constructN.d.ts              |   2 +
 types/ramda/src/contains.d.ts                |   2 +
 types/ramda/src/converge.d.ts                |   2 +
 types/ramda/src/countBy.d.ts                 |   2 +
 types/ramda/src/curry.d.ts                   |   2 +
 types/ramda/src/curryN.d.ts                  |   2 +
 types/ramda/src/dec.d.ts                     |   2 +
 types/ramda/src/defaultTo.d.ts               |   2 +
 types/ramda/src/descend.d.ts                 |   2 +
 types/ramda/src/difference.d.ts              |   2 +
 types/ramda/src/differenceWith.d.ts          |   2 +
 types/ramda/src/dissoc.d.ts                  |   2 +
 types/ramda/src/dissocPath.d.ts              |   2 +
 types/ramda/src/divide.d.ts                  |   2 +
 types/ramda/src/drop.d.ts                    |   2 +
 types/ramda/src/dropLast.d.ts                |   2 +
 types/ramda/src/dropLastWhile.d.ts           |   2 +
 types/ramda/src/either.d.ts                  |   2 +
 types/ramda/src/empty.d.ts                   |   2 +
 types/ramda/src/endsWith.d.ts                |   2 +
 types/ramda/src/eqBy.d.ts                    |   2 +
 types/ramda/src/eqProps.d.ts                 |   2 +
 types/ramda/src/equals.d.ts                  |   2 +
 types/ramda/src/evolve.d.ts                  |   2 +
 types/ramda/src/filter.d.ts                  |   2 +
 types/ramda/src/find.d.ts                    |   2 +
 types/ramda/src/findIndex.d.ts               |   2 +
 types/ramda/src/findLast.d.ts                |   2 +
 types/ramda/src/findLastIndex.d.ts           |   2 +
 types/ramda/src/flatten.d.ts                 |   2 +
 types/ramda/src/flip.d.ts                    |   2 +
 types/ramda/src/forEach.d.ts                 |   2 +
 types/ramda/src/forEachObjIndexed.d.ts       |   2 +
 types/ramda/src/fromPairs.d.ts               |   2 +
 types/ramda/src/groupBy.d.ts                 |   2 +
 types/ramda/src/groupWith.d.ts               |   2 +
 types/ramda/src/gt.d.ts                      |   2 +
 types/ramda/src/gte.d.ts                     |   2 +
 types/ramda/src/has.d.ts                     |   2 +
 types/ramda/src/hasIn.d.ts                   |   2 +
 types/ramda/src/head.d.ts                    |   2 +
 types/ramda/src/identical.d.ts               |   2 +
 types/ramda/src/identity.d.ts                |   2 +
 types/ramda/src/ifElse.d.ts                  |   2 +
 types/ramda/src/inc.d.ts                     |   2 +
 types/ramda/src/includes.d.ts                |   2 +
 types/ramda/src/indexBy.d.ts                 |   2 +
 types/ramda/src/indexOf.d.ts                 |   2 +
 types/ramda/src/init.d.ts                    |   2 +
 types/ramda/src/innerJoin.d.ts               |   2 +
 types/ramda/src/insert.d.ts                  |   2 +
 types/ramda/src/insertAll.d.ts               |   2 +
 types/ramda/src/intersection.d.ts            |   2 +
 types/ramda/src/intersectionWith.d.ts        |   2 +
 types/ramda/src/intersperse.d.ts             |   2 +
 types/ramda/src/into.d.ts                    |   2 +
 types/ramda/src/invert.d.ts                  |   2 +
 types/ramda/src/invertObj.d.ts               |   2 +
 types/ramda/src/invoker.d.ts                 |   2 +
 types/ramda/src/is.d.ts                      |   2 +
 types/ramda/src/isArrayLike.d.ts             |   2 +
 types/ramda/src/isEmpty.d.ts                 |   2 +
 types/ramda/src/isNaN.d.ts                   |   2 +
 types/ramda/src/isNil.d.ts                   |   2 +
 types/ramda/src/join.d.ts                    |   2 +
 types/ramda/src/juxt.d.ts                    |   2 +
 types/ramda/src/keys.d.ts                    |   2 +
 types/ramda/src/keysIn.d.ts                  |   2 +
 types/ramda/src/last.d.ts                    |   2 +
 types/ramda/src/lastIndexOf.d.ts             |   2 +
 types/ramda/src/length.d.ts                  |   2 +
 types/ramda/src/lens.d.ts                    |   2 +
 types/ramda/src/lensIndex.d.ts               |   2 +
 types/ramda/src/lensPath.d.ts                |   2 +
 types/ramda/src/lensProp.d.ts                |   2 +
 types/ramda/src/lift.d.ts                    |   2 +
 types/ramda/src/lt.d.ts                      |   2 +
 types/ramda/src/lte.d.ts                     |   2 +
 types/ramda/src/map.d.ts                     |   2 +
 types/ramda/src/mapAccum.d.ts                |   2 +
 types/ramda/src/mapAccumRight.d.ts           |   2 +
 types/ramda/src/mapObjIndexed.d.ts           |   2 +
 types/ramda/src/match.d.ts                   |   2 +
 types/ramda/src/mathMod.d.ts                 |   2 +
 types/ramda/src/max.d.ts                     |   2 +
 types/ramda/src/maxBy.d.ts                   |   2 +
 types/ramda/src/mean.d.ts                    |   2 +
 types/ramda/src/median.d.ts                  |   2 +
 types/ramda/src/memoize.d.ts                 |   2 +
 types/ramda/src/memoizeWith.d.ts             |   2 +
 types/ramda/src/merge.d.ts                   |   2 +
 types/ramda/src/mergeAll.d.ts                |   2 +
 types/ramda/src/mergeDeepLeft.d.ts           |   2 +
 types/ramda/src/mergeDeepRight.d.ts          |   2 +
 types/ramda/src/mergeDeepWith.d.ts           |   2 +
 types/ramda/src/mergeDeepWithKey.d.ts        |   2 +
 types/ramda/src/mergeWith.d.ts               |   2 +
 types/ramda/src/mergeWithKey.d.ts            |   2 +
 types/ramda/src/min.d.ts                     |   2 +
 types/ramda/src/minBy.d.ts                   |   2 +
 types/ramda/src/modulo.d.ts                  |   2 +
 types/ramda/src/move.d.ts                    |   2 +
 types/ramda/src/multiply.d.ts                |   2 +
 types/ramda/src/nAry.d.ts                    |   2 +
 types/ramda/src/negate.d.ts                  |   2 +
 types/ramda/src/none.d.ts                    |   2 +
 types/ramda/src/not.d.ts                     |   2 +
 types/ramda/src/nth.d.ts                     |   2 +
 types/ramda/src/nthArg.d.ts                  |   2 +
 types/ramda/src/objOf.d.ts                   |   2 +
 types/ramda/src/of.d.ts                      |   2 +
 types/ramda/src/omit.d.ts                    |   2 +
 types/ramda/src/once.d.ts                    |   2 +
 types/ramda/src/or.d.ts                      |   2 +
 types/ramda/src/over.d.ts                    |   2 +
 types/ramda/src/pair.d.ts                    |   2 +
 types/ramda/src/partial.d.ts                 |   2 +
 types/ramda/src/partialRight.d.ts            |   2 +
 types/ramda/src/partition.d.ts               |   2 +
 types/ramda/src/path.d.ts                    |   2 +
 types/ramda/src/pathEq.d.ts                  |   2 +
 types/ramda/src/pathOr.d.ts                  |   2 +
 types/ramda/src/pathSatisfies.d.ts           |   2 +
 types/ramda/src/pick.d.ts                    |   2 +
 types/ramda/src/pickAll.d.ts                 |   2 +
 types/ramda/src/pickBy.d.ts                  |   2 +
 types/ramda/src/pipe.d.ts                    |   2 +
 types/ramda/src/pipeK.d.ts                   |   2 +
 types/ramda/src/pipeP.d.ts                   |   2 +
 types/ramda/src/pluck.d.ts                   |   2 +
 types/ramda/src/prepend.d.ts                 |   2 +
 types/ramda/src/product.d.ts                 |   2 +
 types/ramda/src/project.d.ts                 |   2 +
 types/ramda/src/prop.d.ts                    |   2 +
 types/ramda/src/propEq.d.ts                  |   2 +
 types/ramda/src/propIs.d.ts                  |   2 +
 types/ramda/src/propOr.d.ts                  |   2 +
 types/ramda/src/propSatisfies.d.ts           |   2 +
 types/ramda/src/props.d.ts                   |   2 +
 types/ramda/src/range.d.ts                   |   2 +
 types/ramda/src/reduce.d.ts                  |   2 +
 types/ramda/src/reduceBy.d.ts                |   2 +
 types/ramda/src/reduceRight.d.ts             |   2 +
 types/ramda/src/reduceWhile.d.ts             |   2 +
 types/ramda/src/reduced.d.ts                 |   2 +
 types/ramda/src/reject.d.ts                  |   2 +
 types/ramda/src/remove.d.ts                  |   2 +
 types/ramda/src/repeat.d.ts                  |   2 +
 types/ramda/src/replace.d.ts                 |   2 +
 types/ramda/src/reverse.d.ts                 |   2 +
 types/ramda/src/scan.d.ts                    |   2 +
 types/ramda/src/set.d.ts                     |   2 +
 types/ramda/src/slice.d.ts                   |   2 +
 types/ramda/src/sort.d.ts                    |   2 +
 types/ramda/src/sortBy.d.ts                  |   2 +
 types/ramda/src/sortWith.d.ts                |   2 +
 types/ramda/src/split.d.ts                   |   2 +
 types/ramda/src/splitAt.d.ts                 |   2 +
 types/ramda/src/splitEvery.d.ts              |   2 +
 types/ramda/src/splitWhen.d.ts               |   2 +
 types/ramda/src/startsWith.d.ts              |   2 +
 types/ramda/src/subtract.d.ts                |   2 +
 types/ramda/src/sum.d.ts                     |   2 +
 types/ramda/src/symmetricDifference.d.ts     |   2 +
 types/ramda/src/symmetricDifferenceWith.d.ts |   2 +
 types/ramda/src/tail.d.ts                    |   2 +
 types/ramda/src/take.d.ts                    |   2 +
 types/ramda/src/takeLast.d.ts                |   2 +
 types/ramda/src/takeLastWhile.d.ts           |   2 +
 types/ramda/src/takeWhile.d.ts               |   2 +
 types/ramda/src/tap.d.ts                     |   2 +
 types/ramda/src/test.d.ts                    |   2 +
 types/ramda/src/times.d.ts                   |   2 +
 types/ramda/src/toLower.d.ts                 |   2 +
 types/ramda/src/toPairs.d.ts                 |   2 +
 types/ramda/src/toPairsIn.d.ts               |   2 +
 types/ramda/src/toString.d.ts                |   2 +
 types/ramda/src/toUpper.d.ts                 |   2 +
 types/ramda/src/transduce.d.ts               |   2 +
 types/ramda/src/transpose.d.ts               |   2 +
 types/ramda/src/traverse.d.ts                |   2 +
 types/ramda/src/trim.d.ts                    |   2 +
 types/ramda/src/tryCatch.d.ts                |   2 +
 types/ramda/src/type.d.ts                    |   2 +
 types/ramda/src/unapply.d.ts                 |   2 +
 types/ramda/src/unary.d.ts                   |   2 +
 types/ramda/src/uncurryN.d.ts                |   2 +
 types/ramda/src/unfold.d.ts                  |   2 +
 types/ramda/src/union.d.ts                   |   2 +
 types/ramda/src/unionWith.d.ts               |   2 +
 types/ramda/src/uniq.d.ts                    |   2 +
 types/ramda/src/uniqBy.d.ts                  |   2 +
 types/ramda/src/uniqWith.d.ts                |   2 +
 types/ramda/src/unless.d.ts                  |   2 +
 types/ramda/src/unnest.d.ts                  |   2 +
 types/ramda/src/until.d.ts                   |   2 +
 types/ramda/src/update.d.ts                  |   2 +
 types/ramda/src/useWith.d.ts                 |   2 +
 types/ramda/src/values.d.ts                  |   2 +
 types/ramda/src/valuesIn.d.ts                |   2 +
 types/ramda/src/view.d.ts                    |   2 +
 types/ramda/src/when.d.ts                    |   2 +
 types/ramda/src/where.d.ts                   |   2 +
 types/ramda/src/whereEq.d.ts                 |   2 +
 types/ramda/src/without.d.ts                 |   2 +
 types/ramda/src/wrap.d.ts                    |   2 +
 types/ramda/src/xprod.d.ts                   |   2 +
 types/ramda/src/zip.d.ts                     |   2 +
 types/ramda/src/zipObj.d.ts                  |   2 +
 types/ramda/src/zipWith.d.ts                 |   2 +
 246 files changed, 736 insertions(+)
 create mode 100644 types/ramda/src/F.d.ts
 create mode 100644 types/ramda/src/T.d.ts
 create mode 100644 types/ramda/src/add.d.ts
 create mode 100644 types/ramda/src/addIndex.d.ts
 create mode 100644 types/ramda/src/adjust.d.ts
 create mode 100644 types/ramda/src/all.d.ts
 create mode 100644 types/ramda/src/allPass.d.ts
 create mode 100644 types/ramda/src/always.d.ts
 create mode 100644 types/ramda/src/and.d.ts
 create mode 100644 types/ramda/src/any.d.ts
 create mode 100644 types/ramda/src/anyPass.d.ts
 create mode 100644 types/ramda/src/ap.d.ts
 create mode 100644 types/ramda/src/aperture.d.ts
 create mode 100644 types/ramda/src/append.d.ts
 create mode 100644 types/ramda/src/apply.d.ts
 create mode 100644 types/ramda/src/applySpec.d.ts
 create mode 100644 types/ramda/src/applyTo.d.ts
 create mode 100644 types/ramda/src/ascend.d.ts
 create mode 100644 types/ramda/src/assoc.d.ts
 create mode 100644 types/ramda/src/assocPath.d.ts
 create mode 100644 types/ramda/src/binary.d.ts
 create mode 100644 types/ramda/src/bind.d.ts
 create mode 100644 types/ramda/src/both.d.ts
 create mode 100644 types/ramda/src/call.d.ts
 create mode 100644 types/ramda/src/chain.d.ts
 create mode 100644 types/ramda/src/clamp.d.ts
 create mode 100644 types/ramda/src/clone.d.ts
 create mode 100644 types/ramda/src/comparator.d.ts
 create mode 100644 types/ramda/src/complement.d.ts
 create mode 100644 types/ramda/src/compose.d.ts
 create mode 100644 types/ramda/src/composeK.d.ts
 create mode 100644 types/ramda/src/composeP.d.ts
 create mode 100644 types/ramda/src/concat.d.ts
 create mode 100644 types/ramda/src/cond.d.ts
 create mode 100644 types/ramda/src/construct.d.ts
 create mode 100644 types/ramda/src/constructN.d.ts
 create mode 100644 types/ramda/src/contains.d.ts
 create mode 100644 types/ramda/src/converge.d.ts
 create mode 100644 types/ramda/src/countBy.d.ts
 create mode 100644 types/ramda/src/curry.d.ts
 create mode 100644 types/ramda/src/curryN.d.ts
 create mode 100644 types/ramda/src/dec.d.ts
 create mode 100644 types/ramda/src/defaultTo.d.ts
 create mode 100644 types/ramda/src/descend.d.ts
 create mode 100644 types/ramda/src/difference.d.ts
 create mode 100644 types/ramda/src/differenceWith.d.ts
 create mode 100644 types/ramda/src/dissoc.d.ts
 create mode 100644 types/ramda/src/dissocPath.d.ts
 create mode 100644 types/ramda/src/divide.d.ts
 create mode 100644 types/ramda/src/drop.d.ts
 create mode 100644 types/ramda/src/dropLast.d.ts
 create mode 100644 types/ramda/src/dropLastWhile.d.ts
 create mode 100644 types/ramda/src/either.d.ts
 create mode 100644 types/ramda/src/empty.d.ts
 create mode 100644 types/ramda/src/endsWith.d.ts
 create mode 100644 types/ramda/src/eqBy.d.ts
 create mode 100644 types/ramda/src/eqProps.d.ts
 create mode 100644 types/ramda/src/equals.d.ts
 create mode 100644 types/ramda/src/evolve.d.ts
 create mode 100644 types/ramda/src/filter.d.ts
 create mode 100644 types/ramda/src/find.d.ts
 create mode 100644 types/ramda/src/findIndex.d.ts
 create mode 100644 types/ramda/src/findLast.d.ts
 create mode 100644 types/ramda/src/findLastIndex.d.ts
 create mode 100644 types/ramda/src/flatten.d.ts
 create mode 100644 types/ramda/src/flip.d.ts
 create mode 100644 types/ramda/src/forEach.d.ts
 create mode 100644 types/ramda/src/forEachObjIndexed.d.ts
 create mode 100644 types/ramda/src/fromPairs.d.ts
 create mode 100644 types/ramda/src/groupBy.d.ts
 create mode 100644 types/ramda/src/groupWith.d.ts
 create mode 100644 types/ramda/src/gt.d.ts
 create mode 100644 types/ramda/src/gte.d.ts
 create mode 100644 types/ramda/src/has.d.ts
 create mode 100644 types/ramda/src/hasIn.d.ts
 create mode 100644 types/ramda/src/head.d.ts
 create mode 100644 types/ramda/src/identical.d.ts
 create mode 100644 types/ramda/src/identity.d.ts
 create mode 100644 types/ramda/src/ifElse.d.ts
 create mode 100644 types/ramda/src/inc.d.ts
 create mode 100644 types/ramda/src/includes.d.ts
 create mode 100644 types/ramda/src/indexBy.d.ts
 create mode 100644 types/ramda/src/indexOf.d.ts
 create mode 100644 types/ramda/src/init.d.ts
 create mode 100644 types/ramda/src/innerJoin.d.ts
 create mode 100644 types/ramda/src/insert.d.ts
 create mode 100644 types/ramda/src/insertAll.d.ts
 create mode 100644 types/ramda/src/intersection.d.ts
 create mode 100644 types/ramda/src/intersectionWith.d.ts
 create mode 100644 types/ramda/src/intersperse.d.ts
 create mode 100644 types/ramda/src/into.d.ts
 create mode 100644 types/ramda/src/invert.d.ts
 create mode 100644 types/ramda/src/invertObj.d.ts
 create mode 100644 types/ramda/src/invoker.d.ts
 create mode 100644 types/ramda/src/is.d.ts
 create mode 100644 types/ramda/src/isArrayLike.d.ts
 create mode 100644 types/ramda/src/isEmpty.d.ts
 create mode 100644 types/ramda/src/isNaN.d.ts
 create mode 100644 types/ramda/src/isNil.d.ts
 create mode 100644 types/ramda/src/join.d.ts
 create mode 100644 types/ramda/src/juxt.d.ts
 create mode 100644 types/ramda/src/keys.d.ts
 create mode 100644 types/ramda/src/keysIn.d.ts
 create mode 100644 types/ramda/src/last.d.ts
 create mode 100644 types/ramda/src/lastIndexOf.d.ts
 create mode 100644 types/ramda/src/length.d.ts
 create mode 100644 types/ramda/src/lens.d.ts
 create mode 100644 types/ramda/src/lensIndex.d.ts
 create mode 100644 types/ramda/src/lensPath.d.ts
 create mode 100644 types/ramda/src/lensProp.d.ts
 create mode 100644 types/ramda/src/lift.d.ts
 create mode 100644 types/ramda/src/lt.d.ts
 create mode 100644 types/ramda/src/lte.d.ts
 create mode 100644 types/ramda/src/map.d.ts
 create mode 100644 types/ramda/src/mapAccum.d.ts
 create mode 100644 types/ramda/src/mapAccumRight.d.ts
 create mode 100644 types/ramda/src/mapObjIndexed.d.ts
 create mode 100644 types/ramda/src/match.d.ts
 create mode 100644 types/ramda/src/mathMod.d.ts
 create mode 100644 types/ramda/src/max.d.ts
 create mode 100644 types/ramda/src/maxBy.d.ts
 create mode 100644 types/ramda/src/mean.d.ts
 create mode 100644 types/ramda/src/median.d.ts
 create mode 100644 types/ramda/src/memoize.d.ts
 create mode 100644 types/ramda/src/memoizeWith.d.ts
 create mode 100644 types/ramda/src/merge.d.ts
 create mode 100644 types/ramda/src/mergeAll.d.ts
 create mode 100644 types/ramda/src/mergeDeepLeft.d.ts
 create mode 100644 types/ramda/src/mergeDeepRight.d.ts
 create mode 100644 types/ramda/src/mergeDeepWith.d.ts
 create mode 100644 types/ramda/src/mergeDeepWithKey.d.ts
 create mode 100644 types/ramda/src/mergeWith.d.ts
 create mode 100644 types/ramda/src/mergeWithKey.d.ts
 create mode 100644 types/ramda/src/min.d.ts
 create mode 100644 types/ramda/src/minBy.d.ts
 create mode 100644 types/ramda/src/modulo.d.ts
 create mode 100644 types/ramda/src/move.d.ts
 create mode 100644 types/ramda/src/multiply.d.ts
 create mode 100644 types/ramda/src/nAry.d.ts
 create mode 100644 types/ramda/src/negate.d.ts
 create mode 100644 types/ramda/src/none.d.ts
 create mode 100644 types/ramda/src/not.d.ts
 create mode 100644 types/ramda/src/nth.d.ts
 create mode 100644 types/ramda/src/nthArg.d.ts
 create mode 100644 types/ramda/src/objOf.d.ts
 create mode 100644 types/ramda/src/of.d.ts
 create mode 100644 types/ramda/src/omit.d.ts
 create mode 100644 types/ramda/src/once.d.ts
 create mode 100644 types/ramda/src/or.d.ts
 create mode 100644 types/ramda/src/over.d.ts
 create mode 100644 types/ramda/src/pair.d.ts
 create mode 100644 types/ramda/src/partial.d.ts
 create mode 100644 types/ramda/src/partialRight.d.ts
 create mode 100644 types/ramda/src/partition.d.ts
 create mode 100644 types/ramda/src/path.d.ts
 create mode 100644 types/ramda/src/pathEq.d.ts
 create mode 100644 types/ramda/src/pathOr.d.ts
 create mode 100644 types/ramda/src/pathSatisfies.d.ts
 create mode 100644 types/ramda/src/pick.d.ts
 create mode 100644 types/ramda/src/pickAll.d.ts
 create mode 100644 types/ramda/src/pickBy.d.ts
 create mode 100644 types/ramda/src/pipe.d.ts
 create mode 100644 types/ramda/src/pipeK.d.ts
 create mode 100644 types/ramda/src/pipeP.d.ts
 create mode 100644 types/ramda/src/pluck.d.ts
 create mode 100644 types/ramda/src/prepend.d.ts
 create mode 100644 types/ramda/src/product.d.ts
 create mode 100644 types/ramda/src/project.d.ts
 create mode 100644 types/ramda/src/prop.d.ts
 create mode 100644 types/ramda/src/propEq.d.ts
 create mode 100644 types/ramda/src/propIs.d.ts
 create mode 100644 types/ramda/src/propOr.d.ts
 create mode 100644 types/ramda/src/propSatisfies.d.ts
 create mode 100644 types/ramda/src/props.d.ts
 create mode 100644 types/ramda/src/range.d.ts
 create mode 100644 types/ramda/src/reduce.d.ts
 create mode 100644 types/ramda/src/reduceBy.d.ts
 create mode 100644 types/ramda/src/reduceRight.d.ts
 create mode 100644 types/ramda/src/reduceWhile.d.ts
 create mode 100644 types/ramda/src/reduced.d.ts
 create mode 100644 types/ramda/src/reject.d.ts
 create mode 100644 types/ramda/src/remove.d.ts
 create mode 100644 types/ramda/src/repeat.d.ts
 create mode 100644 types/ramda/src/replace.d.ts
 create mode 100644 types/ramda/src/reverse.d.ts
 create mode 100644 types/ramda/src/scan.d.ts
 create mode 100644 types/ramda/src/set.d.ts
 create mode 100644 types/ramda/src/slice.d.ts
 create mode 100644 types/ramda/src/sort.d.ts
 create mode 100644 types/ramda/src/sortBy.d.ts
 create mode 100644 types/ramda/src/sortWith.d.ts
 create mode 100644 types/ramda/src/split.d.ts
 create mode 100644 types/ramda/src/splitAt.d.ts
 create mode 100644 types/ramda/src/splitEvery.d.ts
 create mode 100644 types/ramda/src/splitWhen.d.ts
 create mode 100644 types/ramda/src/startsWith.d.ts
 create mode 100644 types/ramda/src/subtract.d.ts
 create mode 100644 types/ramda/src/sum.d.ts
 create mode 100644 types/ramda/src/symmetricDifference.d.ts
 create mode 100644 types/ramda/src/symmetricDifferenceWith.d.ts
 create mode 100644 types/ramda/src/tail.d.ts
 create mode 100644 types/ramda/src/take.d.ts
 create mode 100644 types/ramda/src/takeLast.d.ts
 create mode 100644 types/ramda/src/takeLastWhile.d.ts
 create mode 100644 types/ramda/src/takeWhile.d.ts
 create mode 100644 types/ramda/src/tap.d.ts
 create mode 100644 types/ramda/src/test.d.ts
 create mode 100644 types/ramda/src/times.d.ts
 create mode 100644 types/ramda/src/toLower.d.ts
 create mode 100644 types/ramda/src/toPairs.d.ts
 create mode 100644 types/ramda/src/toPairsIn.d.ts
 create mode 100644 types/ramda/src/toString.d.ts
 create mode 100644 types/ramda/src/toUpper.d.ts
 create mode 100644 types/ramda/src/transduce.d.ts
 create mode 100644 types/ramda/src/transpose.d.ts
 create mode 100644 types/ramda/src/traverse.d.ts
 create mode 100644 types/ramda/src/trim.d.ts
 create mode 100644 types/ramda/src/tryCatch.d.ts
 create mode 100644 types/ramda/src/type.d.ts
 create mode 100644 types/ramda/src/unapply.d.ts
 create mode 100644 types/ramda/src/unary.d.ts
 create mode 100644 types/ramda/src/uncurryN.d.ts
 create mode 100644 types/ramda/src/unfold.d.ts
 create mode 100644 types/ramda/src/union.d.ts
 create mode 100644 types/ramda/src/unionWith.d.ts
 create mode 100644 types/ramda/src/uniq.d.ts
 create mode 100644 types/ramda/src/uniqBy.d.ts
 create mode 100644 types/ramda/src/uniqWith.d.ts
 create mode 100644 types/ramda/src/unless.d.ts
 create mode 100644 types/ramda/src/unnest.d.ts
 create mode 100644 types/ramda/src/until.d.ts
 create mode 100644 types/ramda/src/update.d.ts
 create mode 100644 types/ramda/src/useWith.d.ts
 create mode 100644 types/ramda/src/values.d.ts
 create mode 100644 types/ramda/src/valuesIn.d.ts
 create mode 100644 types/ramda/src/view.d.ts
 create mode 100644 types/ramda/src/when.d.ts
 create mode 100644 types/ramda/src/where.d.ts
 create mode 100644 types/ramda/src/whereEq.d.ts
 create mode 100644 types/ramda/src/without.d.ts
 create mode 100644 types/ramda/src/wrap.d.ts
 create mode 100644 types/ramda/src/xprod.d.ts
 create mode 100644 types/ramda/src/zip.d.ts
 create mode 100644 types/ramda/src/zipObj.d.ts
 create mode 100644 types/ramda/src/zipWith.d.ts

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index e0313e5957..2124c0b928 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -278,6 +278,252 @@
 /// <reference path="./es/includes.d.ts" />
 /// <reference path="./tools.d.ts" />
 
+/// <reference path="./src/add.d.ts" />
+/// <reference path="./src/addIndex.d.ts" />
+/// <reference path="./src/adjust.d.ts" />
+/// <reference path="./src/all.d.ts" />
+/// <reference path="./src/allPass.d.ts" />
+/// <reference path="./src/always.d.ts" />
+/// <reference path="./src/and.d.ts" />
+/// <reference path="./src/any.d.ts" />
+/// <reference path="./src/anyPass.d.ts" />
+/// <reference path="./src/ap.d.ts" />
+/// <reference path="./src/aperture.d.ts" />
+/// <reference path="./src/append.d.ts" />
+/// <reference path="./src/apply.d.ts" />
+/// <reference path="./src/applySpec.d.ts" />
+/// <reference path="./src/applyTo.d.ts" />
+/// <reference path="./src/ascend.d.ts" />
+/// <reference path="./src/assoc.d.ts" />
+/// <reference path="./src/assocPath.d.ts" />
+/// <reference path="./src/binary.d.ts" />
+/// <reference path="./src/bind.d.ts" />
+/// <reference path="./src/both.d.ts" />
+/// <reference path="./src/call.d.ts" />
+/// <reference path="./src/chain.d.ts" />
+/// <reference path="./src/clamp.d.ts" />
+/// <reference path="./src/clone.d.ts" />
+/// <reference path="./src/comparator.d.ts" />
+/// <reference path="./src/complement.d.ts" />
+/// <reference path="./src/compose.d.ts" />
+/// <reference path="./src/composeK.d.ts" />
+/// <reference path="./src/composeP.d.ts" />
+/// <reference path="./src/concat.d.ts" />
+/// <reference path="./src/cond.d.ts" />
+/// <reference path="./src/construct.d.ts" />
+/// <reference path="./src/constructN.d.ts" />
+/// <reference path="./src/contains.d.ts" />
+/// <reference path="./src/converge.d.ts" />
+/// <reference path="./src/countBy.d.ts" />
+/// <reference path="./src/curry.d.ts" />
+/// <reference path="./src/curryN.d.ts" />
+/// <reference path="./src/dec.d.ts" />
+/// <reference path="./src/defaultTo.d.ts" />
+/// <reference path="./src/descend.d.ts" />
+/// <reference path="./src/difference.d.ts" />
+/// <reference path="./src/differenceWith.d.ts" />
+/// <reference path="./src/dissoc.d.ts" />
+/// <reference path="./src/dissocPath.d.ts" />
+/// <reference path="./src/divide.d.ts" />
+/// <reference path="./src/drop.d.ts" />
+/// <reference path="./src/dropLast.d.ts" />
+/// <reference path="./src/dropLastWhile.d.ts" />
+/// <reference path="./src/either.d.ts" />
+/// <reference path="./src/empty.d.ts" />
+/// <reference path="./src/endsWith.d.ts" />
+/// <reference path="./src/eqBy.d.ts" />
+/// <reference path="./src/eqProps.d.ts" />
+/// <reference path="./src/equals.d.ts" />
+/// <reference path="./src/evolve.d.ts" />
+/// <reference path="./src/F.d.ts" />
+/// <reference path="./src/filter.d.ts" />
+/// <reference path="./src/find.d.ts" />
+/// <reference path="./src/findIndex.d.ts" />
+/// <reference path="./src/findLast.d.ts" />
+/// <reference path="./src/findLastIndex.d.ts" />
+/// <reference path="./src/flatten.d.ts" />
+/// <reference path="./src/flip.d.ts" />
+/// <reference path="./src/forEach.d.ts" />
+/// <reference path="./src/forEachObjIndexed.d.ts" />
+/// <reference path="./src/fromPairs.d.ts" />
+/// <reference path="./src/groupBy.d.ts" />
+/// <reference path="./src/groupWith.d.ts" />
+/// <reference path="./src/gt.d.ts" />
+/// <reference path="./src/gte.d.ts" />
+/// <reference path="./src/has.d.ts" />
+/// <reference path="./src/hasIn.d.ts" />
+/// <reference path="./src/head.d.ts" />
+/// <reference path="./src/identical.d.ts" />
+/// <reference path="./src/identity.d.ts" />
+/// <reference path="./src/ifElse.d.ts" />
+/// <reference path="./src/inc.d.ts" />
+/// <reference path="./src/indexBy.d.ts" />
+/// <reference path="./src/indexOf.d.ts" />
+/// <reference path="./src/init.d.ts" />
+/// <reference path="./src/innerJoin.d.ts" />
+/// <reference path="./src/insertAll.d.ts" />
+/// <reference path="./src/insert.d.ts" />
+/// <reference path="./src/intersection.d.ts" />
+/// <reference path="./src/intersectionWith.d.ts" />
+/// <reference path="./src/intersperse.d.ts" />
+/// <reference path="./src/into.d.ts" />
+/// <reference path="./src/invert.d.ts" />
+/// <reference path="./src/invertObj.d.ts" />
+/// <reference path="./src/invoker.d.ts" />
+/// <reference path="./src/isArrayLike.d.ts" />
+/// <reference path="./src/is.d.ts" />
+/// <reference path="./src/isEmpty.d.ts" />
+/// <reference path="./src/isNaN.d.ts" />
+/// <reference path="./src/isNil.d.ts" />
+/// <reference path="./src/join.d.ts" />
+/// <reference path="./src/juxt.d.ts" />
+/// <reference path="./src/keys.d.ts" />
+/// <reference path="./src/keysIn.d.ts" />
+/// <reference path="./src/last.d.ts" />
+/// <reference path="./src/lastIndexOf.d.ts" />
+/// <reference path="./src/length.d.ts" />
+/// <reference path="./src/lens.d.ts" />
+/// <reference path="./src/lensIndex.d.ts" />
+/// <reference path="./src/lensPath.d.ts" />
+/// <reference path="./src/lensProp.d.ts" />
+/// <reference path="./src/lift.d.ts" />
+/// <reference path="./src/lt.d.ts" />
+/// <reference path="./src/lte.d.ts" />
+/// <reference path="./src/mapAccum.d.ts" />
+/// <reference path="./src/mapAccumRight.d.ts" />
+/// <reference path="./src/map.d.ts" />
+/// <reference path="./src/mapObjIndexed.d.ts" />
+/// <reference path="./src/match.d.ts" />
+/// <reference path="./src/mathMod.d.ts" />
+/// <reference path="./src/maxBy.d.ts" />
+/// <reference path="./src/max.d.ts" />
+/// <reference path="./src/mean.d.ts" />
+/// <reference path="./src/median.d.ts" />
+/// <reference path="./src/memoize.d.ts" />
+/// <reference path="./src/memoizeWith.d.ts" />
+/// <reference path="./src/mergeAll.d.ts" />
+/// <reference path="./src/mergeDeepLeft.d.ts" />
+/// <reference path="./src/mergeDeepRight.d.ts" />
+/// <reference path="./src/mergeDeepWith.d.ts" />
+/// <reference path="./src/mergeDeepWithKey.d.ts" />
+/// <reference path="./src/merge.d.ts" />
+/// <reference path="./src/mergeWith.d.ts" />
+/// <reference path="./src/mergeWithKey.d.ts" />
+/// <reference path="./src/minBy.d.ts" />
+/// <reference path="./src/min.d.ts" />
+/// <reference path="./src/modulo.d.ts" />
+/// <reference path="./src/move.d.ts" />
+/// <reference path="./src/multiply.d.ts" />
+/// <reference path="./src/nAry.d.ts" />
+/// <reference path="./src/negate.d.ts" />
+/// <reference path="./src/none.d.ts" />
+/// <reference path="./src/not.d.ts" />
+/// <reference path="./src/nthArg.d.ts" />
+/// <reference path="./src/nth.d.ts" />
+/// <reference path="./src/objOf.d.ts" />
+/// <reference path="./src/of.d.ts" />
+/// <reference path="./src/omit.d.ts" />
+/// <reference path="./src/once.d.ts" />
+/// <reference path="./src/or.d.ts" />
+/// <reference path="./src/over.d.ts" />
+/// <reference path="./src/pair.d.ts" />
+/// <reference path="./src/partial.d.ts" />
+/// <reference path="./src/partialRight.d.ts" />
+/// <reference path="./src/partition.d.ts" />
+/// <reference path="./src/path.d.ts" />
+/// <reference path="./src/pathEq.d.ts" />
+/// <reference path="./src/pathOr.d.ts" />
+/// <reference path="./src/pathSatisfies.d.ts" />
+/// <reference path="./src/pickAll.d.ts" />
+/// <reference path="./src/pickBy.d.ts" />
+/// <reference path="./src/pick.d.ts" />
+/// <reference path="./src/pipe.d.ts" />
+/// <reference path="./src/pipeK.d.ts" />
+/// <reference path="./src/pipeP.d.ts" />
+/// <reference path="./src/pluck.d.ts" />
+/// <reference path="./src/prepend.d.ts" />
+/// <reference path="./src/product.d.ts" />
+/// <reference path="./src/project.d.ts" />
+/// <reference path="./src/prop.d.ts" />
+/// <reference path="./src/propEq.d.ts" />
+/// <reference path="./src/propIs.d.ts" />
+/// <reference path="./src/propOr.d.ts" />
+/// <reference path="./src/propSatisfies.d.ts" />
+/// <reference path="./src/props.d.ts" />
+/// <reference path="./src/range.d.ts" />
+/// <reference path="./src/reduceBy.d.ts" />
+/// <reference path="./src/reduced.d.ts" />
+/// <reference path="./src/reduce.d.ts" />
+/// <reference path="./src/reduceRight.d.ts" />
+/// <reference path="./src/reduceWhile.d.ts" />
+/// <reference path="./src/reject.d.ts" />
+/// <reference path="./src/remove.d.ts" />
+/// <reference path="./src/repeat.d.ts" />
+/// <reference path="./src/replace.d.ts" />
+/// <reference path="./src/reverse.d.ts" />
+/// <reference path="./src/scan.d.ts" />
+/// <reference path="./src/set.d.ts" />
+/// <reference path="./src/slice.d.ts" />
+/// <reference path="./src/sortBy.d.ts" />
+/// <reference path="./src/sort.d.ts" />
+/// <reference path="./src/sortWith.d.ts" />
+/// <reference path="./src/splitAt.d.ts" />
+/// <reference path="./src/split.d.ts" />
+/// <reference path="./src/splitEvery.d.ts" />
+/// <reference path="./src/splitWhen.d.ts" />
+/// <reference path="./src/startsWith.d.ts" />
+/// <reference path="./src/subtract.d.ts" />
+/// <reference path="./src/sum.d.ts" />
+/// <reference path="./src/symmetricDifference.d.ts" />
+/// <reference path="./src/symmetricDifferenceWith.d.ts" />
+/// <reference path="./src/tail.d.ts" />
+/// <reference path="./src/take.d.ts" />
+/// <reference path="./src/takeLast.d.ts" />
+/// <reference path="./src/takeLastWhile.d.ts" />
+/// <reference path="./src/takeWhile.d.ts" />
+/// <reference path="./src/tap.d.ts" />
+/// <reference path="./src/T.d.ts" />
+/// <reference path="./src/test.d.ts" />
+/// <reference path="./src/times.d.ts" />
+/// <reference path="./src/toLower.d.ts" />
+/// <reference path="./src/toPairs.d.ts" />
+/// <reference path="./src/toPairsIn.d.ts" />
+/// <reference path="./src/toString.d.ts" />
+/// <reference path="./src/toUpper.d.ts" />
+/// <reference path="./src/transduce.d.ts" />
+/// <reference path="./src/transpose.d.ts" />
+/// <reference path="./src/traverse.d.ts" />
+/// <reference path="./src/trim.d.ts" />
+/// <reference path="./src/tryCatch.d.ts" />
+/// <reference path="./src/type.d.ts" />
+/// <reference path="./src/unapply.d.ts" />
+/// <reference path="./src/unary.d.ts" />
+/// <reference path="./src/uncurryN.d.ts" />
+/// <reference path="./src/unfold.d.ts" />
+/// <reference path="./src/union.d.ts" />
+/// <reference path="./src/unionWith.d.ts" />
+/// <reference path="./src/uniqBy.d.ts" />
+/// <reference path="./src/uniq.d.ts" />
+/// <reference path="./src/uniqWith.d.ts" />
+/// <reference path="./src/unless.d.ts" />
+/// <reference path="./src/unnest.d.ts" />
+/// <reference path="./src/until.d.ts" />
+/// <reference path="./src/update.d.ts" />
+/// <reference path="./src/useWith.d.ts" />
+/// <reference path="./src/values.d.ts" />
+/// <reference path="./src/valuesIn.d.ts" />
+/// <reference path="./src/view.d.ts" />
+/// <reference path="./src/when.d.ts" />
+/// <reference path="./src/where.d.ts" />
+/// <reference path="./src/whereEq.d.ts" />
+/// <reference path="./src/without.d.ts" />
+/// <reference path="./src/wrap.d.ts" />
+/// <reference path="./src/xprod.d.ts" />
+/// <reference path="./src/zip.d.ts" />
+/// <reference path="./src/zipObj.d.ts" />
+/// <reference path="./src/zipWith.d.ts" />
+/// <reference path="./src/includes.d.ts" />
+
 declare let R: R.Static;
 
 declare namespace R {
diff --git a/types/ramda/src/F.d.ts b/types/ramda/src/F.d.ts
new file mode 100644
index 0000000000..bdc0d570d9
--- /dev/null
+++ b/types/ramda/src/F.d.ts
@@ -0,0 +1,2 @@
+import { F } from '../index';
+export default F;
diff --git a/types/ramda/src/T.d.ts b/types/ramda/src/T.d.ts
new file mode 100644
index 0000000000..634808e684
--- /dev/null
+++ b/types/ramda/src/T.d.ts
@@ -0,0 +1,2 @@
+import { T } from '../index';
+export default T;
diff --git a/types/ramda/src/add.d.ts b/types/ramda/src/add.d.ts
new file mode 100644
index 0000000000..b7b3ee887c
--- /dev/null
+++ b/types/ramda/src/add.d.ts
@@ -0,0 +1,2 @@
+import { add } from '../index';
+export default add;
diff --git a/types/ramda/src/addIndex.d.ts b/types/ramda/src/addIndex.d.ts
new file mode 100644
index 0000000000..9f27967dcb
--- /dev/null
+++ b/types/ramda/src/addIndex.d.ts
@@ -0,0 +1,2 @@
+import { addIndex } from '../index';
+export default addIndex;
diff --git a/types/ramda/src/adjust.d.ts b/types/ramda/src/adjust.d.ts
new file mode 100644
index 0000000000..22b65ec38e
--- /dev/null
+++ b/types/ramda/src/adjust.d.ts
@@ -0,0 +1,2 @@
+import { adjust } from '../index';
+export default adjust;
diff --git a/types/ramda/src/all.d.ts b/types/ramda/src/all.d.ts
new file mode 100644
index 0000000000..a2f6d934f9
--- /dev/null
+++ b/types/ramda/src/all.d.ts
@@ -0,0 +1,2 @@
+import { all } from '../index';
+export default all;
diff --git a/types/ramda/src/allPass.d.ts b/types/ramda/src/allPass.d.ts
new file mode 100644
index 0000000000..d44ac20e9d
--- /dev/null
+++ b/types/ramda/src/allPass.d.ts
@@ -0,0 +1,2 @@
+import { allPass } from '../index';
+export default allPass;
diff --git a/types/ramda/src/always.d.ts b/types/ramda/src/always.d.ts
new file mode 100644
index 0000000000..aadc94983b
--- /dev/null
+++ b/types/ramda/src/always.d.ts
@@ -0,0 +1,2 @@
+import { always } from '../index';
+export default always;
diff --git a/types/ramda/src/and.d.ts b/types/ramda/src/and.d.ts
new file mode 100644
index 0000000000..3d505f6ec3
--- /dev/null
+++ b/types/ramda/src/and.d.ts
@@ -0,0 +1,2 @@
+import { and } from '../index';
+export default and;
diff --git a/types/ramda/src/any.d.ts b/types/ramda/src/any.d.ts
new file mode 100644
index 0000000000..1e77e505e9
--- /dev/null
+++ b/types/ramda/src/any.d.ts
@@ -0,0 +1,2 @@
+import { any } from '../index';
+export default any;
diff --git a/types/ramda/src/anyPass.d.ts b/types/ramda/src/anyPass.d.ts
new file mode 100644
index 0000000000..d8e7fc8f0d
--- /dev/null
+++ b/types/ramda/src/anyPass.d.ts
@@ -0,0 +1,2 @@
+import { anyPass } from '../index';
+export default anyPass;
diff --git a/types/ramda/src/ap.d.ts b/types/ramda/src/ap.d.ts
new file mode 100644
index 0000000000..5bf98d7fbd
--- /dev/null
+++ b/types/ramda/src/ap.d.ts
@@ -0,0 +1,2 @@
+import { ap } from '../index';
+export default ap;
diff --git a/types/ramda/src/aperture.d.ts b/types/ramda/src/aperture.d.ts
new file mode 100644
index 0000000000..7536b091b8
--- /dev/null
+++ b/types/ramda/src/aperture.d.ts
@@ -0,0 +1,2 @@
+import { aperture } from '../index';
+export default aperture;
diff --git a/types/ramda/src/append.d.ts b/types/ramda/src/append.d.ts
new file mode 100644
index 0000000000..88a4e7cde2
--- /dev/null
+++ b/types/ramda/src/append.d.ts
@@ -0,0 +1,2 @@
+import { append } from '../index';
+export default append;
diff --git a/types/ramda/src/apply.d.ts b/types/ramda/src/apply.d.ts
new file mode 100644
index 0000000000..53d90689ed
--- /dev/null
+++ b/types/ramda/src/apply.d.ts
@@ -0,0 +1,2 @@
+import { apply } from '../index';
+export default apply;
diff --git a/types/ramda/src/applySpec.d.ts b/types/ramda/src/applySpec.d.ts
new file mode 100644
index 0000000000..57e5b8018c
--- /dev/null
+++ b/types/ramda/src/applySpec.d.ts
@@ -0,0 +1,2 @@
+import { applySpec } from '../index';
+export default applySpec;
diff --git a/types/ramda/src/applyTo.d.ts b/types/ramda/src/applyTo.d.ts
new file mode 100644
index 0000000000..30869542db
--- /dev/null
+++ b/types/ramda/src/applyTo.d.ts
@@ -0,0 +1,2 @@
+import { applyTo } from '../index';
+export default applyTo;
diff --git a/types/ramda/src/ascend.d.ts b/types/ramda/src/ascend.d.ts
new file mode 100644
index 0000000000..e4c4e1199b
--- /dev/null
+++ b/types/ramda/src/ascend.d.ts
@@ -0,0 +1,2 @@
+import { ascend } from '../index';
+export default ascend;
diff --git a/types/ramda/src/assoc.d.ts b/types/ramda/src/assoc.d.ts
new file mode 100644
index 0000000000..5acc97a0aa
--- /dev/null
+++ b/types/ramda/src/assoc.d.ts
@@ -0,0 +1,2 @@
+import { assoc } from '../index';
+export default assoc;
diff --git a/types/ramda/src/assocPath.d.ts b/types/ramda/src/assocPath.d.ts
new file mode 100644
index 0000000000..040671bf38
--- /dev/null
+++ b/types/ramda/src/assocPath.d.ts
@@ -0,0 +1,2 @@
+import { assocPath } from '../index';
+export default assocPath;
diff --git a/types/ramda/src/binary.d.ts b/types/ramda/src/binary.d.ts
new file mode 100644
index 0000000000..259cb96e82
--- /dev/null
+++ b/types/ramda/src/binary.d.ts
@@ -0,0 +1,2 @@
+import { binary } from '../index';
+export default binary;
diff --git a/types/ramda/src/bind.d.ts b/types/ramda/src/bind.d.ts
new file mode 100644
index 0000000000..fe108f09a7
--- /dev/null
+++ b/types/ramda/src/bind.d.ts
@@ -0,0 +1,2 @@
+import { bind } from '../index';
+export default bind;
diff --git a/types/ramda/src/both.d.ts b/types/ramda/src/both.d.ts
new file mode 100644
index 0000000000..8061154cdd
--- /dev/null
+++ b/types/ramda/src/both.d.ts
@@ -0,0 +1,2 @@
+import { both } from '../index';
+export default both;
diff --git a/types/ramda/src/call.d.ts b/types/ramda/src/call.d.ts
new file mode 100644
index 0000000000..35b6fda88c
--- /dev/null
+++ b/types/ramda/src/call.d.ts
@@ -0,0 +1,2 @@
+import { call } from '../index';
+export default call;
diff --git a/types/ramda/src/chain.d.ts b/types/ramda/src/chain.d.ts
new file mode 100644
index 0000000000..53aafe210a
--- /dev/null
+++ b/types/ramda/src/chain.d.ts
@@ -0,0 +1,2 @@
+import { chain } from '../index';
+export default chain;
diff --git a/types/ramda/src/clamp.d.ts b/types/ramda/src/clamp.d.ts
new file mode 100644
index 0000000000..1376643cbf
--- /dev/null
+++ b/types/ramda/src/clamp.d.ts
@@ -0,0 +1,2 @@
+import { clamp } from '../index';
+export default clamp;
diff --git a/types/ramda/src/clone.d.ts b/types/ramda/src/clone.d.ts
new file mode 100644
index 0000000000..b95f842554
--- /dev/null
+++ b/types/ramda/src/clone.d.ts
@@ -0,0 +1,2 @@
+import { clone } from '../index';
+export default clone;
diff --git a/types/ramda/src/comparator.d.ts b/types/ramda/src/comparator.d.ts
new file mode 100644
index 0000000000..34023dea00
--- /dev/null
+++ b/types/ramda/src/comparator.d.ts
@@ -0,0 +1,2 @@
+import { comparator } from '../index';
+export default comparator;
diff --git a/types/ramda/src/complement.d.ts b/types/ramda/src/complement.d.ts
new file mode 100644
index 0000000000..b5d31fee50
--- /dev/null
+++ b/types/ramda/src/complement.d.ts
@@ -0,0 +1,2 @@
+import { complement } from '../index';
+export default complement;
diff --git a/types/ramda/src/compose.d.ts b/types/ramda/src/compose.d.ts
new file mode 100644
index 0000000000..dca4578840
--- /dev/null
+++ b/types/ramda/src/compose.d.ts
@@ -0,0 +1,2 @@
+import { compose } from '../index';
+export default compose;
diff --git a/types/ramda/src/composeK.d.ts b/types/ramda/src/composeK.d.ts
new file mode 100644
index 0000000000..646005a0b6
--- /dev/null
+++ b/types/ramda/src/composeK.d.ts
@@ -0,0 +1,2 @@
+import { composeK } from '../index';
+export default composeK;
diff --git a/types/ramda/src/composeP.d.ts b/types/ramda/src/composeP.d.ts
new file mode 100644
index 0000000000..ca0a96fb25
--- /dev/null
+++ b/types/ramda/src/composeP.d.ts
@@ -0,0 +1,2 @@
+import { composeP } from '../index';
+export default composeP;
diff --git a/types/ramda/src/concat.d.ts b/types/ramda/src/concat.d.ts
new file mode 100644
index 0000000000..9ae333cf95
--- /dev/null
+++ b/types/ramda/src/concat.d.ts
@@ -0,0 +1,2 @@
+import { concat } from '../index';
+export default concat;
diff --git a/types/ramda/src/cond.d.ts b/types/ramda/src/cond.d.ts
new file mode 100644
index 0000000000..0ab4930b0e
--- /dev/null
+++ b/types/ramda/src/cond.d.ts
@@ -0,0 +1,2 @@
+import { cond } from '../index';
+export default cond;
diff --git a/types/ramda/src/construct.d.ts b/types/ramda/src/construct.d.ts
new file mode 100644
index 0000000000..736871cb61
--- /dev/null
+++ b/types/ramda/src/construct.d.ts
@@ -0,0 +1,2 @@
+import { construct } from '../index';
+export default construct;
diff --git a/types/ramda/src/constructN.d.ts b/types/ramda/src/constructN.d.ts
new file mode 100644
index 0000000000..d9efc76cf3
--- /dev/null
+++ b/types/ramda/src/constructN.d.ts
@@ -0,0 +1,2 @@
+import { constructN } from '../index';
+export default constructN;
diff --git a/types/ramda/src/contains.d.ts b/types/ramda/src/contains.d.ts
new file mode 100644
index 0000000000..d193bc6109
--- /dev/null
+++ b/types/ramda/src/contains.d.ts
@@ -0,0 +1,2 @@
+import { contains } from '../index';
+export default contains;
diff --git a/types/ramda/src/converge.d.ts b/types/ramda/src/converge.d.ts
new file mode 100644
index 0000000000..181c0bd7e9
--- /dev/null
+++ b/types/ramda/src/converge.d.ts
@@ -0,0 +1,2 @@
+import { converge } from '../index';
+export default converge;
diff --git a/types/ramda/src/countBy.d.ts b/types/ramda/src/countBy.d.ts
new file mode 100644
index 0000000000..03d46e23f0
--- /dev/null
+++ b/types/ramda/src/countBy.d.ts
@@ -0,0 +1,2 @@
+import { countBy } from '../index';
+export default countBy;
diff --git a/types/ramda/src/curry.d.ts b/types/ramda/src/curry.d.ts
new file mode 100644
index 0000000000..0d94abf560
--- /dev/null
+++ b/types/ramda/src/curry.d.ts
@@ -0,0 +1,2 @@
+import { curry } from '../index';
+export default curry;
diff --git a/types/ramda/src/curryN.d.ts b/types/ramda/src/curryN.d.ts
new file mode 100644
index 0000000000..dca634c3b8
--- /dev/null
+++ b/types/ramda/src/curryN.d.ts
@@ -0,0 +1,2 @@
+import { curryN } from '../index';
+export default curryN;
diff --git a/types/ramda/src/dec.d.ts b/types/ramda/src/dec.d.ts
new file mode 100644
index 0000000000..605681f0d8
--- /dev/null
+++ b/types/ramda/src/dec.d.ts
@@ -0,0 +1,2 @@
+import { dec } from '../index';
+export default dec;
diff --git a/types/ramda/src/defaultTo.d.ts b/types/ramda/src/defaultTo.d.ts
new file mode 100644
index 0000000000..9c61199544
--- /dev/null
+++ b/types/ramda/src/defaultTo.d.ts
@@ -0,0 +1,2 @@
+import { defaultTo } from '../index';
+export default defaultTo;
diff --git a/types/ramda/src/descend.d.ts b/types/ramda/src/descend.d.ts
new file mode 100644
index 0000000000..d0ff2b6d54
--- /dev/null
+++ b/types/ramda/src/descend.d.ts
@@ -0,0 +1,2 @@
+import { descend } from '../index';
+export default descend;
diff --git a/types/ramda/src/difference.d.ts b/types/ramda/src/difference.d.ts
new file mode 100644
index 0000000000..1ef0096735
--- /dev/null
+++ b/types/ramda/src/difference.d.ts
@@ -0,0 +1,2 @@
+import { difference } from '../index';
+export default difference;
diff --git a/types/ramda/src/differenceWith.d.ts b/types/ramda/src/differenceWith.d.ts
new file mode 100644
index 0000000000..5a2366f6e0
--- /dev/null
+++ b/types/ramda/src/differenceWith.d.ts
@@ -0,0 +1,2 @@
+import { differenceWith } from '../index';
+export default differenceWith;
diff --git a/types/ramda/src/dissoc.d.ts b/types/ramda/src/dissoc.d.ts
new file mode 100644
index 0000000000..0ed3e2def9
--- /dev/null
+++ b/types/ramda/src/dissoc.d.ts
@@ -0,0 +1,2 @@
+import { dissoc } from '../index';
+export default dissoc;
diff --git a/types/ramda/src/dissocPath.d.ts b/types/ramda/src/dissocPath.d.ts
new file mode 100644
index 0000000000..83c705d80f
--- /dev/null
+++ b/types/ramda/src/dissocPath.d.ts
@@ -0,0 +1,2 @@
+import { dissocPath } from '../index';
+export default dissocPath;
diff --git a/types/ramda/src/divide.d.ts b/types/ramda/src/divide.d.ts
new file mode 100644
index 0000000000..45c27a4d21
--- /dev/null
+++ b/types/ramda/src/divide.d.ts
@@ -0,0 +1,2 @@
+import { divide } from '../index';
+export default divide;
diff --git a/types/ramda/src/drop.d.ts b/types/ramda/src/drop.d.ts
new file mode 100644
index 0000000000..fb89bef7f0
--- /dev/null
+++ b/types/ramda/src/drop.d.ts
@@ -0,0 +1,2 @@
+import { drop } from '../index';
+export default drop;
diff --git a/types/ramda/src/dropLast.d.ts b/types/ramda/src/dropLast.d.ts
new file mode 100644
index 0000000000..2402f890f1
--- /dev/null
+++ b/types/ramda/src/dropLast.d.ts
@@ -0,0 +1,2 @@
+import { dropLast } from '../index';
+export default dropLast;
diff --git a/types/ramda/src/dropLastWhile.d.ts b/types/ramda/src/dropLastWhile.d.ts
new file mode 100644
index 0000000000..82950dd98b
--- /dev/null
+++ b/types/ramda/src/dropLastWhile.d.ts
@@ -0,0 +1,2 @@
+import { dropLastWhile } from '../index';
+export default dropLastWhile;
diff --git a/types/ramda/src/either.d.ts b/types/ramda/src/either.d.ts
new file mode 100644
index 0000000000..130f0c4e7f
--- /dev/null
+++ b/types/ramda/src/either.d.ts
@@ -0,0 +1,2 @@
+import { either } from '../index';
+export default either;
diff --git a/types/ramda/src/empty.d.ts b/types/ramda/src/empty.d.ts
new file mode 100644
index 0000000000..2cb6e8fade
--- /dev/null
+++ b/types/ramda/src/empty.d.ts
@@ -0,0 +1,2 @@
+import { empty } from '../index';
+export default empty;
diff --git a/types/ramda/src/endsWith.d.ts b/types/ramda/src/endsWith.d.ts
new file mode 100644
index 0000000000..f23a961bbc
--- /dev/null
+++ b/types/ramda/src/endsWith.d.ts
@@ -0,0 +1,2 @@
+import { endsWith } from '../index';
+export default endsWith;
diff --git a/types/ramda/src/eqBy.d.ts b/types/ramda/src/eqBy.d.ts
new file mode 100644
index 0000000000..3ed508587a
--- /dev/null
+++ b/types/ramda/src/eqBy.d.ts
@@ -0,0 +1,2 @@
+import { eqBy } from '../index';
+export default eqBy;
diff --git a/types/ramda/src/eqProps.d.ts b/types/ramda/src/eqProps.d.ts
new file mode 100644
index 0000000000..e33b163311
--- /dev/null
+++ b/types/ramda/src/eqProps.d.ts
@@ -0,0 +1,2 @@
+import { eqProps } from '../index';
+export default eqProps;
diff --git a/types/ramda/src/equals.d.ts b/types/ramda/src/equals.d.ts
new file mode 100644
index 0000000000..6d4c8050e1
--- /dev/null
+++ b/types/ramda/src/equals.d.ts
@@ -0,0 +1,2 @@
+import { equals } from '../index';
+export default equals;
diff --git a/types/ramda/src/evolve.d.ts b/types/ramda/src/evolve.d.ts
new file mode 100644
index 0000000000..21ec9896a3
--- /dev/null
+++ b/types/ramda/src/evolve.d.ts
@@ -0,0 +1,2 @@
+import { evolve } from '../index';
+export default evolve;
diff --git a/types/ramda/src/filter.d.ts b/types/ramda/src/filter.d.ts
new file mode 100644
index 0000000000..a4f7133638
--- /dev/null
+++ b/types/ramda/src/filter.d.ts
@@ -0,0 +1,2 @@
+import { filter } from '../index';
+export default filter;
diff --git a/types/ramda/src/find.d.ts b/types/ramda/src/find.d.ts
new file mode 100644
index 0000000000..a8c2905bed
--- /dev/null
+++ b/types/ramda/src/find.d.ts
@@ -0,0 +1,2 @@
+import { find } from '../index';
+export default find;
diff --git a/types/ramda/src/findIndex.d.ts b/types/ramda/src/findIndex.d.ts
new file mode 100644
index 0000000000..88c14e28fc
--- /dev/null
+++ b/types/ramda/src/findIndex.d.ts
@@ -0,0 +1,2 @@
+import { findIndex } from '../index';
+export default findIndex;
diff --git a/types/ramda/src/findLast.d.ts b/types/ramda/src/findLast.d.ts
new file mode 100644
index 0000000000..3d8ad5c7fa
--- /dev/null
+++ b/types/ramda/src/findLast.d.ts
@@ -0,0 +1,2 @@
+import { findLast } from '../index';
+export default findLast;
diff --git a/types/ramda/src/findLastIndex.d.ts b/types/ramda/src/findLastIndex.d.ts
new file mode 100644
index 0000000000..ae1edaeb14
--- /dev/null
+++ b/types/ramda/src/findLastIndex.d.ts
@@ -0,0 +1,2 @@
+import { findLastIndex } from '../index';
+export default findLastIndex;
diff --git a/types/ramda/src/flatten.d.ts b/types/ramda/src/flatten.d.ts
new file mode 100644
index 0000000000..75a19402dc
--- /dev/null
+++ b/types/ramda/src/flatten.d.ts
@@ -0,0 +1,2 @@
+import { flatten } from '../index';
+export default flatten;
diff --git a/types/ramda/src/flip.d.ts b/types/ramda/src/flip.d.ts
new file mode 100644
index 0000000000..164e607f33
--- /dev/null
+++ b/types/ramda/src/flip.d.ts
@@ -0,0 +1,2 @@
+import { flip } from '../index';
+export default flip;
diff --git a/types/ramda/src/forEach.d.ts b/types/ramda/src/forEach.d.ts
new file mode 100644
index 0000000000..c5f7a57837
--- /dev/null
+++ b/types/ramda/src/forEach.d.ts
@@ -0,0 +1,2 @@
+import { forEach } from '../index';
+export default forEach;
diff --git a/types/ramda/src/forEachObjIndexed.d.ts b/types/ramda/src/forEachObjIndexed.d.ts
new file mode 100644
index 0000000000..a098026381
--- /dev/null
+++ b/types/ramda/src/forEachObjIndexed.d.ts
@@ -0,0 +1,2 @@
+import { forEachObjIndexed } from '../index';
+export default forEachObjIndexed;
diff --git a/types/ramda/src/fromPairs.d.ts b/types/ramda/src/fromPairs.d.ts
new file mode 100644
index 0000000000..0cb1778350
--- /dev/null
+++ b/types/ramda/src/fromPairs.d.ts
@@ -0,0 +1,2 @@
+import { fromPairs } from '../index';
+export default fromPairs;
diff --git a/types/ramda/src/groupBy.d.ts b/types/ramda/src/groupBy.d.ts
new file mode 100644
index 0000000000..af2b32083b
--- /dev/null
+++ b/types/ramda/src/groupBy.d.ts
@@ -0,0 +1,2 @@
+import { groupBy } from '../index';
+export default groupBy;
diff --git a/types/ramda/src/groupWith.d.ts b/types/ramda/src/groupWith.d.ts
new file mode 100644
index 0000000000..f9dca6c16b
--- /dev/null
+++ b/types/ramda/src/groupWith.d.ts
@@ -0,0 +1,2 @@
+import { groupWith } from '../index';
+export default groupWith;
diff --git a/types/ramda/src/gt.d.ts b/types/ramda/src/gt.d.ts
new file mode 100644
index 0000000000..4cdb70d336
--- /dev/null
+++ b/types/ramda/src/gt.d.ts
@@ -0,0 +1,2 @@
+import { gt } from '../index';
+export default gt;
diff --git a/types/ramda/src/gte.d.ts b/types/ramda/src/gte.d.ts
new file mode 100644
index 0000000000..2b878eabc6
--- /dev/null
+++ b/types/ramda/src/gte.d.ts
@@ -0,0 +1,2 @@
+import { gte } from '../index';
+export default gte;
diff --git a/types/ramda/src/has.d.ts b/types/ramda/src/has.d.ts
new file mode 100644
index 0000000000..88c79bfdb0
--- /dev/null
+++ b/types/ramda/src/has.d.ts
@@ -0,0 +1,2 @@
+import { has } from '../index';
+export default has;
diff --git a/types/ramda/src/hasIn.d.ts b/types/ramda/src/hasIn.d.ts
new file mode 100644
index 0000000000..4cad709e64
--- /dev/null
+++ b/types/ramda/src/hasIn.d.ts
@@ -0,0 +1,2 @@
+import { hasIn } from '../index';
+export default hasIn;
diff --git a/types/ramda/src/head.d.ts b/types/ramda/src/head.d.ts
new file mode 100644
index 0000000000..bb1f3dd7b9
--- /dev/null
+++ b/types/ramda/src/head.d.ts
@@ -0,0 +1,2 @@
+import { head } from '../index';
+export default head;
diff --git a/types/ramda/src/identical.d.ts b/types/ramda/src/identical.d.ts
new file mode 100644
index 0000000000..6f2ccf4f94
--- /dev/null
+++ b/types/ramda/src/identical.d.ts
@@ -0,0 +1,2 @@
+import { identical } from '../index';
+export default identical;
diff --git a/types/ramda/src/identity.d.ts b/types/ramda/src/identity.d.ts
new file mode 100644
index 0000000000..ba0936116e
--- /dev/null
+++ b/types/ramda/src/identity.d.ts
@@ -0,0 +1,2 @@
+import { identity } from '../index';
+export default identity;
diff --git a/types/ramda/src/ifElse.d.ts b/types/ramda/src/ifElse.d.ts
new file mode 100644
index 0000000000..46674829d7
--- /dev/null
+++ b/types/ramda/src/ifElse.d.ts
@@ -0,0 +1,2 @@
+import { ifElse } from '../index';
+export default ifElse;
diff --git a/types/ramda/src/inc.d.ts b/types/ramda/src/inc.d.ts
new file mode 100644
index 0000000000..c173b2dd8e
--- /dev/null
+++ b/types/ramda/src/inc.d.ts
@@ -0,0 +1,2 @@
+import { inc } from '../index';
+export default inc;
diff --git a/types/ramda/src/includes.d.ts b/types/ramda/src/includes.d.ts
new file mode 100644
index 0000000000..b6b04d949f
--- /dev/null
+++ b/types/ramda/src/includes.d.ts
@@ -0,0 +1,2 @@
+import { includes } from '../index';
+export default includes;
diff --git a/types/ramda/src/indexBy.d.ts b/types/ramda/src/indexBy.d.ts
new file mode 100644
index 0000000000..93b29ec7cd
--- /dev/null
+++ b/types/ramda/src/indexBy.d.ts
@@ -0,0 +1,2 @@
+import { indexBy } from '../index';
+export default indexBy;
diff --git a/types/ramda/src/indexOf.d.ts b/types/ramda/src/indexOf.d.ts
new file mode 100644
index 0000000000..22aa4b44db
--- /dev/null
+++ b/types/ramda/src/indexOf.d.ts
@@ -0,0 +1,2 @@
+import { indexOf } from '../index';
+export default indexOf;
diff --git a/types/ramda/src/init.d.ts b/types/ramda/src/init.d.ts
new file mode 100644
index 0000000000..03849db7b0
--- /dev/null
+++ b/types/ramda/src/init.d.ts
@@ -0,0 +1,2 @@
+import { init } from '../index';
+export default init;
diff --git a/types/ramda/src/innerJoin.d.ts b/types/ramda/src/innerJoin.d.ts
new file mode 100644
index 0000000000..de01332837
--- /dev/null
+++ b/types/ramda/src/innerJoin.d.ts
@@ -0,0 +1,2 @@
+import { innerJoin } from '../index';
+export default innerJoin;
diff --git a/types/ramda/src/insert.d.ts b/types/ramda/src/insert.d.ts
new file mode 100644
index 0000000000..3fdde857fa
--- /dev/null
+++ b/types/ramda/src/insert.d.ts
@@ -0,0 +1,2 @@
+import { insert } from '../index';
+export default insert;
diff --git a/types/ramda/src/insertAll.d.ts b/types/ramda/src/insertAll.d.ts
new file mode 100644
index 0000000000..a9fd784995
--- /dev/null
+++ b/types/ramda/src/insertAll.d.ts
@@ -0,0 +1,2 @@
+import { insertAll } from '../index';
+export default insertAll;
diff --git a/types/ramda/src/intersection.d.ts b/types/ramda/src/intersection.d.ts
new file mode 100644
index 0000000000..1ec1aadbe4
--- /dev/null
+++ b/types/ramda/src/intersection.d.ts
@@ -0,0 +1,2 @@
+import { intersection } from '../index';
+export default intersection;
diff --git a/types/ramda/src/intersectionWith.d.ts b/types/ramda/src/intersectionWith.d.ts
new file mode 100644
index 0000000000..773c36acbe
--- /dev/null
+++ b/types/ramda/src/intersectionWith.d.ts
@@ -0,0 +1,2 @@
+import { intersectionWith } from '../index';
+export default intersectionWith;
diff --git a/types/ramda/src/intersperse.d.ts b/types/ramda/src/intersperse.d.ts
new file mode 100644
index 0000000000..b4420de34a
--- /dev/null
+++ b/types/ramda/src/intersperse.d.ts
@@ -0,0 +1,2 @@
+import { intersperse } from '../index';
+export default intersperse;
diff --git a/types/ramda/src/into.d.ts b/types/ramda/src/into.d.ts
new file mode 100644
index 0000000000..3daa53afdd
--- /dev/null
+++ b/types/ramda/src/into.d.ts
@@ -0,0 +1,2 @@
+import { into } from '../index';
+export default into;
diff --git a/types/ramda/src/invert.d.ts b/types/ramda/src/invert.d.ts
new file mode 100644
index 0000000000..825773f5dc
--- /dev/null
+++ b/types/ramda/src/invert.d.ts
@@ -0,0 +1,2 @@
+import { invert } from '../index';
+export default invert;
diff --git a/types/ramda/src/invertObj.d.ts b/types/ramda/src/invertObj.d.ts
new file mode 100644
index 0000000000..8fd0f1fe7d
--- /dev/null
+++ b/types/ramda/src/invertObj.d.ts
@@ -0,0 +1,2 @@
+import { invertObj } from '../index';
+export default invertObj;
diff --git a/types/ramda/src/invoker.d.ts b/types/ramda/src/invoker.d.ts
new file mode 100644
index 0000000000..1930a78917
--- /dev/null
+++ b/types/ramda/src/invoker.d.ts
@@ -0,0 +1,2 @@
+import { invoker } from '../index';
+export default invoker;
diff --git a/types/ramda/src/is.d.ts b/types/ramda/src/is.d.ts
new file mode 100644
index 0000000000..262d14160d
--- /dev/null
+++ b/types/ramda/src/is.d.ts
@@ -0,0 +1,2 @@
+import { is } from '../index';
+export default is;
diff --git a/types/ramda/src/isArrayLike.d.ts b/types/ramda/src/isArrayLike.d.ts
new file mode 100644
index 0000000000..04aa464805
--- /dev/null
+++ b/types/ramda/src/isArrayLike.d.ts
@@ -0,0 +1,2 @@
+import { isArrayLike } from '../index';
+export default isArrayLike;
diff --git a/types/ramda/src/isEmpty.d.ts b/types/ramda/src/isEmpty.d.ts
new file mode 100644
index 0000000000..bea7bb8d08
--- /dev/null
+++ b/types/ramda/src/isEmpty.d.ts
@@ -0,0 +1,2 @@
+import { isEmpty } from '../index';
+export default isEmpty;
diff --git a/types/ramda/src/isNaN.d.ts b/types/ramda/src/isNaN.d.ts
new file mode 100644
index 0000000000..5dbe28177a
--- /dev/null
+++ b/types/ramda/src/isNaN.d.ts
@@ -0,0 +1,2 @@
+import { isNaN } from '../index';
+export default isNaN;
diff --git a/types/ramda/src/isNil.d.ts b/types/ramda/src/isNil.d.ts
new file mode 100644
index 0000000000..bce78e7c70
--- /dev/null
+++ b/types/ramda/src/isNil.d.ts
@@ -0,0 +1,2 @@
+import { isNil } from '../index';
+export default isNil;
diff --git a/types/ramda/src/join.d.ts b/types/ramda/src/join.d.ts
new file mode 100644
index 0000000000..7505b7e769
--- /dev/null
+++ b/types/ramda/src/join.d.ts
@@ -0,0 +1,2 @@
+import { join } from '../index';
+export default join;
diff --git a/types/ramda/src/juxt.d.ts b/types/ramda/src/juxt.d.ts
new file mode 100644
index 0000000000..23e342f53d
--- /dev/null
+++ b/types/ramda/src/juxt.d.ts
@@ -0,0 +1,2 @@
+import { juxt } from '../index';
+export default juxt;
diff --git a/types/ramda/src/keys.d.ts b/types/ramda/src/keys.d.ts
new file mode 100644
index 0000000000..b44e894b7a
--- /dev/null
+++ b/types/ramda/src/keys.d.ts
@@ -0,0 +1,2 @@
+import { keys } from '../index';
+export default keys;
diff --git a/types/ramda/src/keysIn.d.ts b/types/ramda/src/keysIn.d.ts
new file mode 100644
index 0000000000..a54fb92a6d
--- /dev/null
+++ b/types/ramda/src/keysIn.d.ts
@@ -0,0 +1,2 @@
+import { keysIn } from '../index';
+export default keysIn;
diff --git a/types/ramda/src/last.d.ts b/types/ramda/src/last.d.ts
new file mode 100644
index 0000000000..f8ea740735
--- /dev/null
+++ b/types/ramda/src/last.d.ts
@@ -0,0 +1,2 @@
+import { last } from '../index';
+export default last;
diff --git a/types/ramda/src/lastIndexOf.d.ts b/types/ramda/src/lastIndexOf.d.ts
new file mode 100644
index 0000000000..c34fe55a03
--- /dev/null
+++ b/types/ramda/src/lastIndexOf.d.ts
@@ -0,0 +1,2 @@
+import { lastIndexOf } from '../index';
+export default lastIndexOf;
diff --git a/types/ramda/src/length.d.ts b/types/ramda/src/length.d.ts
new file mode 100644
index 0000000000..7ef1d90dd5
--- /dev/null
+++ b/types/ramda/src/length.d.ts
@@ -0,0 +1,2 @@
+import { length } from '../index';
+export default length;
diff --git a/types/ramda/src/lens.d.ts b/types/ramda/src/lens.d.ts
new file mode 100644
index 0000000000..03688e0c4f
--- /dev/null
+++ b/types/ramda/src/lens.d.ts
@@ -0,0 +1,2 @@
+import { lens } from '../index';
+export default lens;
diff --git a/types/ramda/src/lensIndex.d.ts b/types/ramda/src/lensIndex.d.ts
new file mode 100644
index 0000000000..d85cd88c2f
--- /dev/null
+++ b/types/ramda/src/lensIndex.d.ts
@@ -0,0 +1,2 @@
+import { lensIndex } from '../index';
+export default lensIndex;
diff --git a/types/ramda/src/lensPath.d.ts b/types/ramda/src/lensPath.d.ts
new file mode 100644
index 0000000000..67b60fbf3c
--- /dev/null
+++ b/types/ramda/src/lensPath.d.ts
@@ -0,0 +1,2 @@
+import { lensPath } from '../index';
+export default lensPath;
diff --git a/types/ramda/src/lensProp.d.ts b/types/ramda/src/lensProp.d.ts
new file mode 100644
index 0000000000..fc8db9e32d
--- /dev/null
+++ b/types/ramda/src/lensProp.d.ts
@@ -0,0 +1,2 @@
+import { lensProp } from '../index';
+export default lensProp;
diff --git a/types/ramda/src/lift.d.ts b/types/ramda/src/lift.d.ts
new file mode 100644
index 0000000000..73e4cba184
--- /dev/null
+++ b/types/ramda/src/lift.d.ts
@@ -0,0 +1,2 @@
+import { lift } from '../index';
+export default lift;
diff --git a/types/ramda/src/lt.d.ts b/types/ramda/src/lt.d.ts
new file mode 100644
index 0000000000..71360d1c43
--- /dev/null
+++ b/types/ramda/src/lt.d.ts
@@ -0,0 +1,2 @@
+import { lt } from '../index';
+export default lt;
diff --git a/types/ramda/src/lte.d.ts b/types/ramda/src/lte.d.ts
new file mode 100644
index 0000000000..980ef22037
--- /dev/null
+++ b/types/ramda/src/lte.d.ts
@@ -0,0 +1,2 @@
+import { lte } from '../index';
+export default lte;
diff --git a/types/ramda/src/map.d.ts b/types/ramda/src/map.d.ts
new file mode 100644
index 0000000000..6883cb62f6
--- /dev/null
+++ b/types/ramda/src/map.d.ts
@@ -0,0 +1,2 @@
+import { map } from '../index';
+export default map;
diff --git a/types/ramda/src/mapAccum.d.ts b/types/ramda/src/mapAccum.d.ts
new file mode 100644
index 0000000000..356c715787
--- /dev/null
+++ b/types/ramda/src/mapAccum.d.ts
@@ -0,0 +1,2 @@
+import { mapAccum } from '../index';
+export default mapAccum;
diff --git a/types/ramda/src/mapAccumRight.d.ts b/types/ramda/src/mapAccumRight.d.ts
new file mode 100644
index 0000000000..817e73bb97
--- /dev/null
+++ b/types/ramda/src/mapAccumRight.d.ts
@@ -0,0 +1,2 @@
+import { mapAccumRight } from '../index';
+export default mapAccumRight;
diff --git a/types/ramda/src/mapObjIndexed.d.ts b/types/ramda/src/mapObjIndexed.d.ts
new file mode 100644
index 0000000000..3ef1eca52d
--- /dev/null
+++ b/types/ramda/src/mapObjIndexed.d.ts
@@ -0,0 +1,2 @@
+import { mapObjIndexed } from '../index';
+export default mapObjIndexed;
diff --git a/types/ramda/src/match.d.ts b/types/ramda/src/match.d.ts
new file mode 100644
index 0000000000..a24f0bd6d0
--- /dev/null
+++ b/types/ramda/src/match.d.ts
@@ -0,0 +1,2 @@
+import { match } from '../index';
+export default match;
diff --git a/types/ramda/src/mathMod.d.ts b/types/ramda/src/mathMod.d.ts
new file mode 100644
index 0000000000..0b0205c822
--- /dev/null
+++ b/types/ramda/src/mathMod.d.ts
@@ -0,0 +1,2 @@
+import { mathMod } from '../index';
+export default mathMod;
diff --git a/types/ramda/src/max.d.ts b/types/ramda/src/max.d.ts
new file mode 100644
index 0000000000..fcb09338c0
--- /dev/null
+++ b/types/ramda/src/max.d.ts
@@ -0,0 +1,2 @@
+import { max } from '../index';
+export default max;
diff --git a/types/ramda/src/maxBy.d.ts b/types/ramda/src/maxBy.d.ts
new file mode 100644
index 0000000000..4d00e7e572
--- /dev/null
+++ b/types/ramda/src/maxBy.d.ts
@@ -0,0 +1,2 @@
+import { maxBy } from '../index';
+export default maxBy;
diff --git a/types/ramda/src/mean.d.ts b/types/ramda/src/mean.d.ts
new file mode 100644
index 0000000000..8babcc3374
--- /dev/null
+++ b/types/ramda/src/mean.d.ts
@@ -0,0 +1,2 @@
+import { mean } from '../index';
+export default mean;
diff --git a/types/ramda/src/median.d.ts b/types/ramda/src/median.d.ts
new file mode 100644
index 0000000000..f7386692ff
--- /dev/null
+++ b/types/ramda/src/median.d.ts
@@ -0,0 +1,2 @@
+import { median } from '../index';
+export default median;
diff --git a/types/ramda/src/memoize.d.ts b/types/ramda/src/memoize.d.ts
new file mode 100644
index 0000000000..a32d4d0016
--- /dev/null
+++ b/types/ramda/src/memoize.d.ts
@@ -0,0 +1,2 @@
+import { memoize } from '../index';
+export default memoize;
diff --git a/types/ramda/src/memoizeWith.d.ts b/types/ramda/src/memoizeWith.d.ts
new file mode 100644
index 0000000000..8eb2abd416
--- /dev/null
+++ b/types/ramda/src/memoizeWith.d.ts
@@ -0,0 +1,2 @@
+import { memoizeWith } from '../index';
+export default memoizeWith;
diff --git a/types/ramda/src/merge.d.ts b/types/ramda/src/merge.d.ts
new file mode 100644
index 0000000000..9786c2b611
--- /dev/null
+++ b/types/ramda/src/merge.d.ts
@@ -0,0 +1,2 @@
+import { merge } from '../index';
+export default merge;
diff --git a/types/ramda/src/mergeAll.d.ts b/types/ramda/src/mergeAll.d.ts
new file mode 100644
index 0000000000..8bb141f82f
--- /dev/null
+++ b/types/ramda/src/mergeAll.d.ts
@@ -0,0 +1,2 @@
+import { mergeAll } from '../index';
+export default mergeAll;
diff --git a/types/ramda/src/mergeDeepLeft.d.ts b/types/ramda/src/mergeDeepLeft.d.ts
new file mode 100644
index 0000000000..332df578d3
--- /dev/null
+++ b/types/ramda/src/mergeDeepLeft.d.ts
@@ -0,0 +1,2 @@
+import { mergeDeepLeft } from '../index';
+export default mergeDeepLeft;
diff --git a/types/ramda/src/mergeDeepRight.d.ts b/types/ramda/src/mergeDeepRight.d.ts
new file mode 100644
index 0000000000..c589924ca5
--- /dev/null
+++ b/types/ramda/src/mergeDeepRight.d.ts
@@ -0,0 +1,2 @@
+import { mergeDeepRight } from '../index';
+export default mergeDeepRight;
diff --git a/types/ramda/src/mergeDeepWith.d.ts b/types/ramda/src/mergeDeepWith.d.ts
new file mode 100644
index 0000000000..cd5523b224
--- /dev/null
+++ b/types/ramda/src/mergeDeepWith.d.ts
@@ -0,0 +1,2 @@
+import { mergeDeepWith } from '../index';
+export default mergeDeepWith;
diff --git a/types/ramda/src/mergeDeepWithKey.d.ts b/types/ramda/src/mergeDeepWithKey.d.ts
new file mode 100644
index 0000000000..70f6ace1db
--- /dev/null
+++ b/types/ramda/src/mergeDeepWithKey.d.ts
@@ -0,0 +1,2 @@
+import { mergeDeepWithKey } from '../index';
+export default mergeDeepWithKey;
diff --git a/types/ramda/src/mergeWith.d.ts b/types/ramda/src/mergeWith.d.ts
new file mode 100644
index 0000000000..0270c71977
--- /dev/null
+++ b/types/ramda/src/mergeWith.d.ts
@@ -0,0 +1,2 @@
+import { mergeWith } from '../index';
+export default mergeWith;
diff --git a/types/ramda/src/mergeWithKey.d.ts b/types/ramda/src/mergeWithKey.d.ts
new file mode 100644
index 0000000000..b32e625cfc
--- /dev/null
+++ b/types/ramda/src/mergeWithKey.d.ts
@@ -0,0 +1,2 @@
+import { mergeWithKey } from '../index';
+export default mergeWithKey;
diff --git a/types/ramda/src/min.d.ts b/types/ramda/src/min.d.ts
new file mode 100644
index 0000000000..af0dca8faa
--- /dev/null
+++ b/types/ramda/src/min.d.ts
@@ -0,0 +1,2 @@
+import { min } from '../index';
+export default min;
diff --git a/types/ramda/src/minBy.d.ts b/types/ramda/src/minBy.d.ts
new file mode 100644
index 0000000000..14377eea93
--- /dev/null
+++ b/types/ramda/src/minBy.d.ts
@@ -0,0 +1,2 @@
+import { minBy } from '../index';
+export default minBy;
diff --git a/types/ramda/src/modulo.d.ts b/types/ramda/src/modulo.d.ts
new file mode 100644
index 0000000000..4c32f3ce8f
--- /dev/null
+++ b/types/ramda/src/modulo.d.ts
@@ -0,0 +1,2 @@
+import { modulo } from '../index';
+export default modulo;
diff --git a/types/ramda/src/move.d.ts b/types/ramda/src/move.d.ts
new file mode 100644
index 0000000000..3df4ee626e
--- /dev/null
+++ b/types/ramda/src/move.d.ts
@@ -0,0 +1,2 @@
+import { move } from '../index';
+export default move;
diff --git a/types/ramda/src/multiply.d.ts b/types/ramda/src/multiply.d.ts
new file mode 100644
index 0000000000..56d3a59380
--- /dev/null
+++ b/types/ramda/src/multiply.d.ts
@@ -0,0 +1,2 @@
+import { multiply } from '../index';
+export default multiply;
diff --git a/types/ramda/src/nAry.d.ts b/types/ramda/src/nAry.d.ts
new file mode 100644
index 0000000000..a9bce85047
--- /dev/null
+++ b/types/ramda/src/nAry.d.ts
@@ -0,0 +1,2 @@
+import { nAry } from '../index';
+export default nAry;
diff --git a/types/ramda/src/negate.d.ts b/types/ramda/src/negate.d.ts
new file mode 100644
index 0000000000..8410d94a22
--- /dev/null
+++ b/types/ramda/src/negate.d.ts
@@ -0,0 +1,2 @@
+import { negate } from '../index';
+export default negate;
diff --git a/types/ramda/src/none.d.ts b/types/ramda/src/none.d.ts
new file mode 100644
index 0000000000..6c545e7261
--- /dev/null
+++ b/types/ramda/src/none.d.ts
@@ -0,0 +1,2 @@
+import { none } from '../index';
+export default none;
diff --git a/types/ramda/src/not.d.ts b/types/ramda/src/not.d.ts
new file mode 100644
index 0000000000..10c4c56cfc
--- /dev/null
+++ b/types/ramda/src/not.d.ts
@@ -0,0 +1,2 @@
+import { not } from '../index';
+export default not;
diff --git a/types/ramda/src/nth.d.ts b/types/ramda/src/nth.d.ts
new file mode 100644
index 0000000000..b5cef1993a
--- /dev/null
+++ b/types/ramda/src/nth.d.ts
@@ -0,0 +1,2 @@
+import { nth } from '../index';
+export default nth;
diff --git a/types/ramda/src/nthArg.d.ts b/types/ramda/src/nthArg.d.ts
new file mode 100644
index 0000000000..5d61bb24f6
--- /dev/null
+++ b/types/ramda/src/nthArg.d.ts
@@ -0,0 +1,2 @@
+import { nthArg } from '../index';
+export default nthArg;
diff --git a/types/ramda/src/objOf.d.ts b/types/ramda/src/objOf.d.ts
new file mode 100644
index 0000000000..0a2b7c3075
--- /dev/null
+++ b/types/ramda/src/objOf.d.ts
@@ -0,0 +1,2 @@
+import { objOf } from '../index';
+export default objOf;
diff --git a/types/ramda/src/of.d.ts b/types/ramda/src/of.d.ts
new file mode 100644
index 0000000000..252569b5e6
--- /dev/null
+++ b/types/ramda/src/of.d.ts
@@ -0,0 +1,2 @@
+import { of } from '../index';
+export default of;
diff --git a/types/ramda/src/omit.d.ts b/types/ramda/src/omit.d.ts
new file mode 100644
index 0000000000..e7e9f796e9
--- /dev/null
+++ b/types/ramda/src/omit.d.ts
@@ -0,0 +1,2 @@
+import { omit } from '../index';
+export default omit;
diff --git a/types/ramda/src/once.d.ts b/types/ramda/src/once.d.ts
new file mode 100644
index 0000000000..f49febf008
--- /dev/null
+++ b/types/ramda/src/once.d.ts
@@ -0,0 +1,2 @@
+import { once } from '../index';
+export default once;
diff --git a/types/ramda/src/or.d.ts b/types/ramda/src/or.d.ts
new file mode 100644
index 0000000000..933ca7b2d2
--- /dev/null
+++ b/types/ramda/src/or.d.ts
@@ -0,0 +1,2 @@
+import { or } from '../index';
+export default or;
diff --git a/types/ramda/src/over.d.ts b/types/ramda/src/over.d.ts
new file mode 100644
index 0000000000..deee3577da
--- /dev/null
+++ b/types/ramda/src/over.d.ts
@@ -0,0 +1,2 @@
+import { over } from '../index';
+export default over;
diff --git a/types/ramda/src/pair.d.ts b/types/ramda/src/pair.d.ts
new file mode 100644
index 0000000000..2a1cea9de0
--- /dev/null
+++ b/types/ramda/src/pair.d.ts
@@ -0,0 +1,2 @@
+import { pair } from '../index';
+export default pair;
diff --git a/types/ramda/src/partial.d.ts b/types/ramda/src/partial.d.ts
new file mode 100644
index 0000000000..acbb16bac3
--- /dev/null
+++ b/types/ramda/src/partial.d.ts
@@ -0,0 +1,2 @@
+import { partial } from '../index';
+export default partial;
diff --git a/types/ramda/src/partialRight.d.ts b/types/ramda/src/partialRight.d.ts
new file mode 100644
index 0000000000..5b3bb4b0fa
--- /dev/null
+++ b/types/ramda/src/partialRight.d.ts
@@ -0,0 +1,2 @@
+import { partialRight } from '../index';
+export default partialRight;
diff --git a/types/ramda/src/partition.d.ts b/types/ramda/src/partition.d.ts
new file mode 100644
index 0000000000..28086418d7
--- /dev/null
+++ b/types/ramda/src/partition.d.ts
@@ -0,0 +1,2 @@
+import { partition } from '../index';
+export default partition;
diff --git a/types/ramda/src/path.d.ts b/types/ramda/src/path.d.ts
new file mode 100644
index 0000000000..edf4fa57b0
--- /dev/null
+++ b/types/ramda/src/path.d.ts
@@ -0,0 +1,2 @@
+import { path } from '../index';
+export default path;
diff --git a/types/ramda/src/pathEq.d.ts b/types/ramda/src/pathEq.d.ts
new file mode 100644
index 0000000000..27856ca3bc
--- /dev/null
+++ b/types/ramda/src/pathEq.d.ts
@@ -0,0 +1,2 @@
+import { pathEq } from '../index';
+export default pathEq;
diff --git a/types/ramda/src/pathOr.d.ts b/types/ramda/src/pathOr.d.ts
new file mode 100644
index 0000000000..1af55adc0c
--- /dev/null
+++ b/types/ramda/src/pathOr.d.ts
@@ -0,0 +1,2 @@
+import { pathOr } from '../index';
+export default pathOr;
diff --git a/types/ramda/src/pathSatisfies.d.ts b/types/ramda/src/pathSatisfies.d.ts
new file mode 100644
index 0000000000..e2493400a2
--- /dev/null
+++ b/types/ramda/src/pathSatisfies.d.ts
@@ -0,0 +1,2 @@
+import { pathSatisfies } from '../index';
+export default pathSatisfies;
diff --git a/types/ramda/src/pick.d.ts b/types/ramda/src/pick.d.ts
new file mode 100644
index 0000000000..67b2477a48
--- /dev/null
+++ b/types/ramda/src/pick.d.ts
@@ -0,0 +1,2 @@
+import { pick } from '../index';
+export default pick;
diff --git a/types/ramda/src/pickAll.d.ts b/types/ramda/src/pickAll.d.ts
new file mode 100644
index 0000000000..d7e7719077
--- /dev/null
+++ b/types/ramda/src/pickAll.d.ts
@@ -0,0 +1,2 @@
+import { pickAll } from '../index';
+export default pickAll;
diff --git a/types/ramda/src/pickBy.d.ts b/types/ramda/src/pickBy.d.ts
new file mode 100644
index 0000000000..4a047dc4ab
--- /dev/null
+++ b/types/ramda/src/pickBy.d.ts
@@ -0,0 +1,2 @@
+import { pickBy } from '../index';
+export default pickBy;
diff --git a/types/ramda/src/pipe.d.ts b/types/ramda/src/pipe.d.ts
new file mode 100644
index 0000000000..ef1d61098b
--- /dev/null
+++ b/types/ramda/src/pipe.d.ts
@@ -0,0 +1,2 @@
+import { pipe } from '../index';
+export default pipe;
diff --git a/types/ramda/src/pipeK.d.ts b/types/ramda/src/pipeK.d.ts
new file mode 100644
index 0000000000..bca50e6fff
--- /dev/null
+++ b/types/ramda/src/pipeK.d.ts
@@ -0,0 +1,2 @@
+import { pipeK } from '../index';
+export default pipeK;
diff --git a/types/ramda/src/pipeP.d.ts b/types/ramda/src/pipeP.d.ts
new file mode 100644
index 0000000000..c69b96d23c
--- /dev/null
+++ b/types/ramda/src/pipeP.d.ts
@@ -0,0 +1,2 @@
+import { pipeP } from '../index';
+export default pipeP;
diff --git a/types/ramda/src/pluck.d.ts b/types/ramda/src/pluck.d.ts
new file mode 100644
index 0000000000..8bdb4ccbe4
--- /dev/null
+++ b/types/ramda/src/pluck.d.ts
@@ -0,0 +1,2 @@
+import { pluck } from '../index';
+export default pluck;
diff --git a/types/ramda/src/prepend.d.ts b/types/ramda/src/prepend.d.ts
new file mode 100644
index 0000000000..9d3fde51b4
--- /dev/null
+++ b/types/ramda/src/prepend.d.ts
@@ -0,0 +1,2 @@
+import { prepend } from '../index';
+export default prepend;
diff --git a/types/ramda/src/product.d.ts b/types/ramda/src/product.d.ts
new file mode 100644
index 0000000000..32aed3c0ee
--- /dev/null
+++ b/types/ramda/src/product.d.ts
@@ -0,0 +1,2 @@
+import { product } from '../index';
+export default product;
diff --git a/types/ramda/src/project.d.ts b/types/ramda/src/project.d.ts
new file mode 100644
index 0000000000..4c1b11c6ed
--- /dev/null
+++ b/types/ramda/src/project.d.ts
@@ -0,0 +1,2 @@
+import { project } from '../index';
+export default project;
diff --git a/types/ramda/src/prop.d.ts b/types/ramda/src/prop.d.ts
new file mode 100644
index 0000000000..c990b9aca5
--- /dev/null
+++ b/types/ramda/src/prop.d.ts
@@ -0,0 +1,2 @@
+import { prop } from '../index';
+export default prop;
diff --git a/types/ramda/src/propEq.d.ts b/types/ramda/src/propEq.d.ts
new file mode 100644
index 0000000000..1e04cb564c
--- /dev/null
+++ b/types/ramda/src/propEq.d.ts
@@ -0,0 +1,2 @@
+import { propEq } from '../index';
+export default propEq;
diff --git a/types/ramda/src/propIs.d.ts b/types/ramda/src/propIs.d.ts
new file mode 100644
index 0000000000..1be4e6bd04
--- /dev/null
+++ b/types/ramda/src/propIs.d.ts
@@ -0,0 +1,2 @@
+import { propIs } from '../index';
+export default propIs;
diff --git a/types/ramda/src/propOr.d.ts b/types/ramda/src/propOr.d.ts
new file mode 100644
index 0000000000..2935d077be
--- /dev/null
+++ b/types/ramda/src/propOr.d.ts
@@ -0,0 +1,2 @@
+import { propOr } from '../index';
+export default propOr;
diff --git a/types/ramda/src/propSatisfies.d.ts b/types/ramda/src/propSatisfies.d.ts
new file mode 100644
index 0000000000..1b4ff52788
--- /dev/null
+++ b/types/ramda/src/propSatisfies.d.ts
@@ -0,0 +1,2 @@
+import { propSatisfies } from '../index';
+export default propSatisfies;
diff --git a/types/ramda/src/props.d.ts b/types/ramda/src/props.d.ts
new file mode 100644
index 0000000000..b856c60b00
--- /dev/null
+++ b/types/ramda/src/props.d.ts
@@ -0,0 +1,2 @@
+import { props } from '../index';
+export default props;
diff --git a/types/ramda/src/range.d.ts b/types/ramda/src/range.d.ts
new file mode 100644
index 0000000000..a507ebe4a9
--- /dev/null
+++ b/types/ramda/src/range.d.ts
@@ -0,0 +1,2 @@
+import { range } from '../index';
+export default range;
diff --git a/types/ramda/src/reduce.d.ts b/types/ramda/src/reduce.d.ts
new file mode 100644
index 0000000000..eb3b427d00
--- /dev/null
+++ b/types/ramda/src/reduce.d.ts
@@ -0,0 +1,2 @@
+import { reduce } from '../index';
+export default reduce;
diff --git a/types/ramda/src/reduceBy.d.ts b/types/ramda/src/reduceBy.d.ts
new file mode 100644
index 0000000000..655c96ef18
--- /dev/null
+++ b/types/ramda/src/reduceBy.d.ts
@@ -0,0 +1,2 @@
+import { reduceBy } from '../index';
+export default reduceBy;
diff --git a/types/ramda/src/reduceRight.d.ts b/types/ramda/src/reduceRight.d.ts
new file mode 100644
index 0000000000..3e72f7c309
--- /dev/null
+++ b/types/ramda/src/reduceRight.d.ts
@@ -0,0 +1,2 @@
+import { reduceRight } from '../index';
+export default reduceRight;
diff --git a/types/ramda/src/reduceWhile.d.ts b/types/ramda/src/reduceWhile.d.ts
new file mode 100644
index 0000000000..aaa836d38d
--- /dev/null
+++ b/types/ramda/src/reduceWhile.d.ts
@@ -0,0 +1,2 @@
+import { reduceWhile } from '../index';
+export default reduceWhile;
diff --git a/types/ramda/src/reduced.d.ts b/types/ramda/src/reduced.d.ts
new file mode 100644
index 0000000000..f36739bbe2
--- /dev/null
+++ b/types/ramda/src/reduced.d.ts
@@ -0,0 +1,2 @@
+import { reduced } from '../index';
+export default reduced;
diff --git a/types/ramda/src/reject.d.ts b/types/ramda/src/reject.d.ts
new file mode 100644
index 0000000000..600c706f68
--- /dev/null
+++ b/types/ramda/src/reject.d.ts
@@ -0,0 +1,2 @@
+import { reject } from '../index';
+export default reject;
diff --git a/types/ramda/src/remove.d.ts b/types/ramda/src/remove.d.ts
new file mode 100644
index 0000000000..023edada47
--- /dev/null
+++ b/types/ramda/src/remove.d.ts
@@ -0,0 +1,2 @@
+import { remove } from '../index';
+export default remove;
diff --git a/types/ramda/src/repeat.d.ts b/types/ramda/src/repeat.d.ts
new file mode 100644
index 0000000000..3d8218a1a4
--- /dev/null
+++ b/types/ramda/src/repeat.d.ts
@@ -0,0 +1,2 @@
+import { repeat } from '../index';
+export default repeat;
diff --git a/types/ramda/src/replace.d.ts b/types/ramda/src/replace.d.ts
new file mode 100644
index 0000000000..dc735ab2cf
--- /dev/null
+++ b/types/ramda/src/replace.d.ts
@@ -0,0 +1,2 @@
+import { replace } from '../index';
+export default replace;
diff --git a/types/ramda/src/reverse.d.ts b/types/ramda/src/reverse.d.ts
new file mode 100644
index 0000000000..2d1b2d9390
--- /dev/null
+++ b/types/ramda/src/reverse.d.ts
@@ -0,0 +1,2 @@
+import { reverse } from '../index';
+export default reverse;
diff --git a/types/ramda/src/scan.d.ts b/types/ramda/src/scan.d.ts
new file mode 100644
index 0000000000..8971cff9b7
--- /dev/null
+++ b/types/ramda/src/scan.d.ts
@@ -0,0 +1,2 @@
+import { scan } from '../index';
+export default scan;
diff --git a/types/ramda/src/set.d.ts b/types/ramda/src/set.d.ts
new file mode 100644
index 0000000000..5023a0b854
--- /dev/null
+++ b/types/ramda/src/set.d.ts
@@ -0,0 +1,2 @@
+import { set } from '../index';
+export default set;
diff --git a/types/ramda/src/slice.d.ts b/types/ramda/src/slice.d.ts
new file mode 100644
index 0000000000..6fdc54e59b
--- /dev/null
+++ b/types/ramda/src/slice.d.ts
@@ -0,0 +1,2 @@
+import { slice } from '../index';
+export default slice;
diff --git a/types/ramda/src/sort.d.ts b/types/ramda/src/sort.d.ts
new file mode 100644
index 0000000000..9f4977e5c5
--- /dev/null
+++ b/types/ramda/src/sort.d.ts
@@ -0,0 +1,2 @@
+import { sort } from '../index';
+export default sort;
diff --git a/types/ramda/src/sortBy.d.ts b/types/ramda/src/sortBy.d.ts
new file mode 100644
index 0000000000..ff4eec72f4
--- /dev/null
+++ b/types/ramda/src/sortBy.d.ts
@@ -0,0 +1,2 @@
+import { sortBy } from '../index';
+export default sortBy;
diff --git a/types/ramda/src/sortWith.d.ts b/types/ramda/src/sortWith.d.ts
new file mode 100644
index 0000000000..e8e386a2fd
--- /dev/null
+++ b/types/ramda/src/sortWith.d.ts
@@ -0,0 +1,2 @@
+import { sortWith } from '../index';
+export default sortWith;
diff --git a/types/ramda/src/split.d.ts b/types/ramda/src/split.d.ts
new file mode 100644
index 0000000000..c89a30372b
--- /dev/null
+++ b/types/ramda/src/split.d.ts
@@ -0,0 +1,2 @@
+import { split } from '../index';
+export default split;
diff --git a/types/ramda/src/splitAt.d.ts b/types/ramda/src/splitAt.d.ts
new file mode 100644
index 0000000000..2f505a21e3
--- /dev/null
+++ b/types/ramda/src/splitAt.d.ts
@@ -0,0 +1,2 @@
+import { splitAt } from '../index';
+export default splitAt;
diff --git a/types/ramda/src/splitEvery.d.ts b/types/ramda/src/splitEvery.d.ts
new file mode 100644
index 0000000000..21329e9593
--- /dev/null
+++ b/types/ramda/src/splitEvery.d.ts
@@ -0,0 +1,2 @@
+import { splitEvery } from '../index';
+export default splitEvery;
diff --git a/types/ramda/src/splitWhen.d.ts b/types/ramda/src/splitWhen.d.ts
new file mode 100644
index 0000000000..fad94d5bfa
--- /dev/null
+++ b/types/ramda/src/splitWhen.d.ts
@@ -0,0 +1,2 @@
+import { splitWhen } from '../index';
+export default splitWhen;
diff --git a/types/ramda/src/startsWith.d.ts b/types/ramda/src/startsWith.d.ts
new file mode 100644
index 0000000000..88811ae146
--- /dev/null
+++ b/types/ramda/src/startsWith.d.ts
@@ -0,0 +1,2 @@
+import { startsWith } from '../index';
+export default startsWith;
diff --git a/types/ramda/src/subtract.d.ts b/types/ramda/src/subtract.d.ts
new file mode 100644
index 0000000000..2bac6a6c9f
--- /dev/null
+++ b/types/ramda/src/subtract.d.ts
@@ -0,0 +1,2 @@
+import { subtract } from '../index';
+export default subtract;
diff --git a/types/ramda/src/sum.d.ts b/types/ramda/src/sum.d.ts
new file mode 100644
index 0000000000..5aad66d4e2
--- /dev/null
+++ b/types/ramda/src/sum.d.ts
@@ -0,0 +1,2 @@
+import { sum } from '../index';
+export default sum;
diff --git a/types/ramda/src/symmetricDifference.d.ts b/types/ramda/src/symmetricDifference.d.ts
new file mode 100644
index 0000000000..d11802d977
--- /dev/null
+++ b/types/ramda/src/symmetricDifference.d.ts
@@ -0,0 +1,2 @@
+import { symmetricDifference } from '../index';
+export default symmetricDifference;
diff --git a/types/ramda/src/symmetricDifferenceWith.d.ts b/types/ramda/src/symmetricDifferenceWith.d.ts
new file mode 100644
index 0000000000..9ee8a2b855
--- /dev/null
+++ b/types/ramda/src/symmetricDifferenceWith.d.ts
@@ -0,0 +1,2 @@
+import { symmetricDifferenceWith } from '../index';
+export default symmetricDifferenceWith;
diff --git a/types/ramda/src/tail.d.ts b/types/ramda/src/tail.d.ts
new file mode 100644
index 0000000000..5a949add56
--- /dev/null
+++ b/types/ramda/src/tail.d.ts
@@ -0,0 +1,2 @@
+import { tail } from '../index';
+export default tail;
diff --git a/types/ramda/src/take.d.ts b/types/ramda/src/take.d.ts
new file mode 100644
index 0000000000..35806f3171
--- /dev/null
+++ b/types/ramda/src/take.d.ts
@@ -0,0 +1,2 @@
+import { take } from '../index';
+export default take;
diff --git a/types/ramda/src/takeLast.d.ts b/types/ramda/src/takeLast.d.ts
new file mode 100644
index 0000000000..145934b186
--- /dev/null
+++ b/types/ramda/src/takeLast.d.ts
@@ -0,0 +1,2 @@
+import { takeLast } from '../index';
+export default takeLast;
diff --git a/types/ramda/src/takeLastWhile.d.ts b/types/ramda/src/takeLastWhile.d.ts
new file mode 100644
index 0000000000..0d6f344445
--- /dev/null
+++ b/types/ramda/src/takeLastWhile.d.ts
@@ -0,0 +1,2 @@
+import { takeLastWhile } from '../index';
+export default takeLastWhile;
diff --git a/types/ramda/src/takeWhile.d.ts b/types/ramda/src/takeWhile.d.ts
new file mode 100644
index 0000000000..c3f71dd0fd
--- /dev/null
+++ b/types/ramda/src/takeWhile.d.ts
@@ -0,0 +1,2 @@
+import { takeWhile } from '../index';
+export default takeWhile;
diff --git a/types/ramda/src/tap.d.ts b/types/ramda/src/tap.d.ts
new file mode 100644
index 0000000000..329108173e
--- /dev/null
+++ b/types/ramda/src/tap.d.ts
@@ -0,0 +1,2 @@
+import { tap } from '../index';
+export default tap;
diff --git a/types/ramda/src/test.d.ts b/types/ramda/src/test.d.ts
new file mode 100644
index 0000000000..64a6289599
--- /dev/null
+++ b/types/ramda/src/test.d.ts
@@ -0,0 +1,2 @@
+import { test } from '../index';
+export default test;
diff --git a/types/ramda/src/times.d.ts b/types/ramda/src/times.d.ts
new file mode 100644
index 0000000000..141c101e23
--- /dev/null
+++ b/types/ramda/src/times.d.ts
@@ -0,0 +1,2 @@
+import { times } from '../index';
+export default times;
diff --git a/types/ramda/src/toLower.d.ts b/types/ramda/src/toLower.d.ts
new file mode 100644
index 0000000000..4086a90f75
--- /dev/null
+++ b/types/ramda/src/toLower.d.ts
@@ -0,0 +1,2 @@
+import { toLower } from '../index';
+export default toLower;
diff --git a/types/ramda/src/toPairs.d.ts b/types/ramda/src/toPairs.d.ts
new file mode 100644
index 0000000000..5a6d3b24c2
--- /dev/null
+++ b/types/ramda/src/toPairs.d.ts
@@ -0,0 +1,2 @@
+import { toPairs } from '../index';
+export default toPairs;
diff --git a/types/ramda/src/toPairsIn.d.ts b/types/ramda/src/toPairsIn.d.ts
new file mode 100644
index 0000000000..70a879e200
--- /dev/null
+++ b/types/ramda/src/toPairsIn.d.ts
@@ -0,0 +1,2 @@
+import { toPairsIn } from '../index';
+export default toPairsIn;
diff --git a/types/ramda/src/toString.d.ts b/types/ramda/src/toString.d.ts
new file mode 100644
index 0000000000..c731b264be
--- /dev/null
+++ b/types/ramda/src/toString.d.ts
@@ -0,0 +1,2 @@
+import { toString } from '../index';
+export default toString;
diff --git a/types/ramda/src/toUpper.d.ts b/types/ramda/src/toUpper.d.ts
new file mode 100644
index 0000000000..0a91bccfed
--- /dev/null
+++ b/types/ramda/src/toUpper.d.ts
@@ -0,0 +1,2 @@
+import { toUpper } from '../index';
+export default toUpper;
diff --git a/types/ramda/src/transduce.d.ts b/types/ramda/src/transduce.d.ts
new file mode 100644
index 0000000000..de33a7380c
--- /dev/null
+++ b/types/ramda/src/transduce.d.ts
@@ -0,0 +1,2 @@
+import { transduce } from '../index';
+export default transduce;
diff --git a/types/ramda/src/transpose.d.ts b/types/ramda/src/transpose.d.ts
new file mode 100644
index 0000000000..8ed6535fb2
--- /dev/null
+++ b/types/ramda/src/transpose.d.ts
@@ -0,0 +1,2 @@
+import { transpose } from '../index';
+export default transpose;
diff --git a/types/ramda/src/traverse.d.ts b/types/ramda/src/traverse.d.ts
new file mode 100644
index 0000000000..cb4fdc0b1e
--- /dev/null
+++ b/types/ramda/src/traverse.d.ts
@@ -0,0 +1,2 @@
+import { traverse } from '../index';
+export default traverse;
diff --git a/types/ramda/src/trim.d.ts b/types/ramda/src/trim.d.ts
new file mode 100644
index 0000000000..f0000b80bb
--- /dev/null
+++ b/types/ramda/src/trim.d.ts
@@ -0,0 +1,2 @@
+import { trim } from '../index';
+export default trim;
diff --git a/types/ramda/src/tryCatch.d.ts b/types/ramda/src/tryCatch.d.ts
new file mode 100644
index 0000000000..3c9edd9f79
--- /dev/null
+++ b/types/ramda/src/tryCatch.d.ts
@@ -0,0 +1,2 @@
+import { tryCatch } from '../index';
+export default tryCatch;
diff --git a/types/ramda/src/type.d.ts b/types/ramda/src/type.d.ts
new file mode 100644
index 0000000000..de115bb279
--- /dev/null
+++ b/types/ramda/src/type.d.ts
@@ -0,0 +1,2 @@
+import { type } from '../index';
+export default type;
diff --git a/types/ramda/src/unapply.d.ts b/types/ramda/src/unapply.d.ts
new file mode 100644
index 0000000000..7ad4b767e0
--- /dev/null
+++ b/types/ramda/src/unapply.d.ts
@@ -0,0 +1,2 @@
+import { unapply } from '../index';
+export default unapply;
diff --git a/types/ramda/src/unary.d.ts b/types/ramda/src/unary.d.ts
new file mode 100644
index 0000000000..c022aec354
--- /dev/null
+++ b/types/ramda/src/unary.d.ts
@@ -0,0 +1,2 @@
+import { unary } from '../index';
+export default unary;
diff --git a/types/ramda/src/uncurryN.d.ts b/types/ramda/src/uncurryN.d.ts
new file mode 100644
index 0000000000..b6962cc979
--- /dev/null
+++ b/types/ramda/src/uncurryN.d.ts
@@ -0,0 +1,2 @@
+import { uncurryN } from '../index';
+export default uncurryN;
diff --git a/types/ramda/src/unfold.d.ts b/types/ramda/src/unfold.d.ts
new file mode 100644
index 0000000000..2ebaff6fe5
--- /dev/null
+++ b/types/ramda/src/unfold.d.ts
@@ -0,0 +1,2 @@
+import { unfold } from '../index';
+export default unfold;
diff --git a/types/ramda/src/union.d.ts b/types/ramda/src/union.d.ts
new file mode 100644
index 0000000000..9fac243b43
--- /dev/null
+++ b/types/ramda/src/union.d.ts
@@ -0,0 +1,2 @@
+import { union } from '../index';
+export default union;
diff --git a/types/ramda/src/unionWith.d.ts b/types/ramda/src/unionWith.d.ts
new file mode 100644
index 0000000000..8bf20a51b7
--- /dev/null
+++ b/types/ramda/src/unionWith.d.ts
@@ -0,0 +1,2 @@
+import { unionWith } from '../index';
+export default unionWith;
diff --git a/types/ramda/src/uniq.d.ts b/types/ramda/src/uniq.d.ts
new file mode 100644
index 0000000000..be0a00aef0
--- /dev/null
+++ b/types/ramda/src/uniq.d.ts
@@ -0,0 +1,2 @@
+import { uniq } from '../index';
+export default uniq;
diff --git a/types/ramda/src/uniqBy.d.ts b/types/ramda/src/uniqBy.d.ts
new file mode 100644
index 0000000000..f85de9e4e0
--- /dev/null
+++ b/types/ramda/src/uniqBy.d.ts
@@ -0,0 +1,2 @@
+import { uniqBy } from '../index';
+export default uniqBy;
diff --git a/types/ramda/src/uniqWith.d.ts b/types/ramda/src/uniqWith.d.ts
new file mode 100644
index 0000000000..42442bffc3
--- /dev/null
+++ b/types/ramda/src/uniqWith.d.ts
@@ -0,0 +1,2 @@
+import { uniqWith } from '../index';
+export default uniqWith;
diff --git a/types/ramda/src/unless.d.ts b/types/ramda/src/unless.d.ts
new file mode 100644
index 0000000000..3727700625
--- /dev/null
+++ b/types/ramda/src/unless.d.ts
@@ -0,0 +1,2 @@
+import { unless } from '../index';
+export default unless;
diff --git a/types/ramda/src/unnest.d.ts b/types/ramda/src/unnest.d.ts
new file mode 100644
index 0000000000..ccbb4be0e8
--- /dev/null
+++ b/types/ramda/src/unnest.d.ts
@@ -0,0 +1,2 @@
+import { unnest } from '../index';
+export default unnest;
diff --git a/types/ramda/src/until.d.ts b/types/ramda/src/until.d.ts
new file mode 100644
index 0000000000..ab26247fea
--- /dev/null
+++ b/types/ramda/src/until.d.ts
@@ -0,0 +1,2 @@
+import { until } from '../index';
+export default until;
diff --git a/types/ramda/src/update.d.ts b/types/ramda/src/update.d.ts
new file mode 100644
index 0000000000..c3eba99c72
--- /dev/null
+++ b/types/ramda/src/update.d.ts
@@ -0,0 +1,2 @@
+import { update } from '../index';
+export default update;
diff --git a/types/ramda/src/useWith.d.ts b/types/ramda/src/useWith.d.ts
new file mode 100644
index 0000000000..0d1f54e80f
--- /dev/null
+++ b/types/ramda/src/useWith.d.ts
@@ -0,0 +1,2 @@
+import { useWith } from '../index';
+export default useWith;
diff --git a/types/ramda/src/values.d.ts b/types/ramda/src/values.d.ts
new file mode 100644
index 0000000000..8664d8cc67
--- /dev/null
+++ b/types/ramda/src/values.d.ts
@@ -0,0 +1,2 @@
+import { values } from '../index';
+export default values;
diff --git a/types/ramda/src/valuesIn.d.ts b/types/ramda/src/valuesIn.d.ts
new file mode 100644
index 0000000000..d80b32fc67
--- /dev/null
+++ b/types/ramda/src/valuesIn.d.ts
@@ -0,0 +1,2 @@
+import { valuesIn } from '../index';
+export default valuesIn;
diff --git a/types/ramda/src/view.d.ts b/types/ramda/src/view.d.ts
new file mode 100644
index 0000000000..3c11fa0ae9
--- /dev/null
+++ b/types/ramda/src/view.d.ts
@@ -0,0 +1,2 @@
+import { view } from '../index';
+export default view;
diff --git a/types/ramda/src/when.d.ts b/types/ramda/src/when.d.ts
new file mode 100644
index 0000000000..57de7e19a7
--- /dev/null
+++ b/types/ramda/src/when.d.ts
@@ -0,0 +1,2 @@
+import { when } from '../index';
+export default when;
diff --git a/types/ramda/src/where.d.ts b/types/ramda/src/where.d.ts
new file mode 100644
index 0000000000..4c49c2dc25
--- /dev/null
+++ b/types/ramda/src/where.d.ts
@@ -0,0 +1,2 @@
+import { where } from '../index';
+export default where;
diff --git a/types/ramda/src/whereEq.d.ts b/types/ramda/src/whereEq.d.ts
new file mode 100644
index 0000000000..4bdffa1d24
--- /dev/null
+++ b/types/ramda/src/whereEq.d.ts
@@ -0,0 +1,2 @@
+import { whereEq } from '../index';
+export default whereEq;
diff --git a/types/ramda/src/without.d.ts b/types/ramda/src/without.d.ts
new file mode 100644
index 0000000000..be9b8584ed
--- /dev/null
+++ b/types/ramda/src/without.d.ts
@@ -0,0 +1,2 @@
+import { without } from '../index';
+export default without;
diff --git a/types/ramda/src/wrap.d.ts b/types/ramda/src/wrap.d.ts
new file mode 100644
index 0000000000..a855106989
--- /dev/null
+++ b/types/ramda/src/wrap.d.ts
@@ -0,0 +1,2 @@
+import { wrap } from '../index';
+export default wrap;
diff --git a/types/ramda/src/xprod.d.ts b/types/ramda/src/xprod.d.ts
new file mode 100644
index 0000000000..2e3fd865ea
--- /dev/null
+++ b/types/ramda/src/xprod.d.ts
@@ -0,0 +1,2 @@
+import { xprod } from '../index';
+export default xprod;
diff --git a/types/ramda/src/zip.d.ts b/types/ramda/src/zip.d.ts
new file mode 100644
index 0000000000..609fe7bb29
--- /dev/null
+++ b/types/ramda/src/zip.d.ts
@@ -0,0 +1,2 @@
+import { zip } from '../index';
+export default zip;
diff --git a/types/ramda/src/zipObj.d.ts b/types/ramda/src/zipObj.d.ts
new file mode 100644
index 0000000000..dcc28311bc
--- /dev/null
+++ b/types/ramda/src/zipObj.d.ts
@@ -0,0 +1,2 @@
+import { zipObj } from '../index';
+export default zipObj;
diff --git a/types/ramda/src/zipWith.d.ts b/types/ramda/src/zipWith.d.ts
new file mode 100644
index 0000000000..df6890c369
--- /dev/null
+++ b/types/ramda/src/zipWith.d.ts
@@ -0,0 +1,2 @@
+import { zipWith } from '../index';
+export default zipWith;

From d959efd3fe9de8df8403c12145e71a9b159982e7 Mon Sep 17 00:00:00 2001
From: Lorenzo Rapetti <lorenzo.rapetti.94@gmail.com>
Date: Mon, 11 Mar 2019 19:24:18 +0100
Subject: [PATCH 533/924] [@types/node-notifier] Update typings (#33419)

* Update node-notifier typings

* Add typings for NotificationCallback
---
 types/node-notifier/index.d.ts             | 111 ++++++++++++++++-----
 types/node-notifier/node-notifier-tests.ts |  49 +++++----
 2 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/types/node-notifier/index.d.ts b/types/node-notifier/index.d.ts
index dad13583b9..7846a9b246 100644
--- a/types/node-notifier/index.d.ts
+++ b/types/node-notifier/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for node-notifier
+// Type definitions for node-notifier 5.4.0
 // Project: https://github.com/mikaelbr/node-notifier
 // Definitions by: Qubo <https://github.com/tkQubo>
+//                 Lorenzo Rapetti <https://github.com/loryman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -14,12 +15,30 @@ declare module "node-notifier" {
 
     namespace nodeNotifier {
         interface NodeNotifier extends NodeJS.EventEmitter {
+            notify(
+                notification?: NotificationCenter.Notification,
+                callback?: NotificationCallback
+            ): NotificationCenter;
+            notify(
+                notification?: WindowsToaster.Notification,
+                callback?: NotificationCallback
+            ): WindowsToaster;
+            notify(
+                notification?: WindowsBalloon.Notification,
+                callback?: NotificationCallback
+            ): WindowsBalloon;
+            notify(
+                notification?: NotifySend.Notification,
+                callback?: NotificationCallback
+            ): NotifySend;
+            notify(notification?: Growl.Notification, callback?: NotificationCallback): Growl;
             notify(notification?: Notification, callback?: NotificationCallback): NodeNotifier;
-            NotificationCenter: NotificationCenter;
-            NotifySend: NotifySend;
-            WindowsToaster: WindowsToaster;
-            WindowsBalloon: WindowsBalloon;
-            Growl: Growl;
+            notify(notification?: string, callback?: NotificationCallback): NodeNotifier;
+            NotificationCenter: typeof NotificationCenter;
+            NotifySend: typeof NotifySend;
+            WindowsToaster: typeof WindowsToaster;
+            WindowsBalloon: typeof WindowsBalloon;
+            Growl: typeof Growl;
         }
 
         interface Notification {
@@ -27,15 +46,25 @@ declare module "node-notifier" {
             message?: string;
             /** Absolute path (not balloons) */
             icon?: string;
-            /** Only Notification Center or Windows Toasters */
-            sound?: boolean;
             /** Wait with callback until user action is taken on notification */
             wait?: boolean;
         }
 
-        interface NotificationCallback {
-            (err: any, response: any): any;
-        }
+        interface NotificationMetadata {
+            activationType?: string;
+            activationAt?: string;
+            deliveredAt?: string;
+            activationValue?: string;
+            activationValueIndex?: string;
+          }
+
+          interface NotificationCallback {
+            (
+              err: Error | null,
+              response: string,
+              metadata?: NotificationMetadata,
+            ): void;
+          }
 
         interface Option {
             withFallback?: boolean;
@@ -58,11 +87,31 @@ declare module "node-notifier/notifiers/notificationcenter" {
 
     namespace NotificationCenter {
         interface Notification extends notifier.Notification {
+            /**
+             * Case Sensitive string for location of sound file, or use one of macOS' native sounds.
+             */
+            sound?: boolean | string;
             subtitle?: string;
             /** Attach image? (Absolute path) */
             contentImage?: string;
             /** URL to open on click */
             open?: string;
+            /**
+             * The amount of seconds before the notification closes.
+             * Takes precedence over wait if both are defined.
+             */
+            timeout?: number;
+            /** Label for cancel button */
+            closeLabel?: string;
+            /** Action label or list of labels in case of dropdown. */
+            actions?: string | string[];
+            /** Label to be used if there are multiple actions */
+            dropdownLabel?: string;
+            /**
+             * If notification should take input.
+             * Value passed as third argument in callback and event emitter.
+             */
+            reply?: boolean;
         }
     }
 
@@ -101,7 +150,27 @@ declare module "node-notifier/notifiers/toaster" {
 
     class WindowsToaster {
         constructor(option?: notifier.Option);
-        notify(notification?: notifier.Notification, callback?: notifier.NotificationCallback): WindowsToaster;
+        notify(notification?: WindowsToaster.Notification, callback?: notifier.NotificationCallback): WindowsToaster;
+    }
+
+    namespace WindowsToaster {
+        interface Notification extends notifier.Notification {
+            /**
+             * Defined by http://msdn.microsoft.com/en-us/library/windows/apps/hh761492.aspx
+             */
+            sound?: boolean | string;
+            /** ID to use for closing notification. */
+            id?: number;
+            /** App.ID and app Name. Defaults to no value, causing SnoreToast text to be visible. */
+            appID?: string;
+            /** Refer to previously created notification to close. */
+            remove?: number;
+            /**
+             * Creates a shortcut <path> in the start menu which point to the
+             * executable <application>, appID used for the notifications.
+            */
+            install?: string;
+        }
     }
 
     export = WindowsToaster;
@@ -122,19 +191,13 @@ declare module "node-notifier/notifiers/growl" {
             port?: number;
         }
 
-        interface Notification {
-            title?: string;
-            message?: string;
-            /** Absolute path (not balloons) */
-            icon?: string;
-            /** Wait with callback until user action is taken on notification */
-            wait?: boolean;
+        interface Notification extends notifier.Notification {
             /** whether or not to sticky the notification (defaults to false) */
-             sticky?: boolean;
+            sticky?: boolean;
             /** type of notification to use (defaults to the first registered type) */
-            label: string;
+            label?: string;
             /** the priority of the notification from lowest (-2) to highest (2) */
-            priority: number;
+            priority?: number;
         }
     }
 
@@ -153,12 +216,12 @@ declare module "node-notifier/notifiers/balloon" {
         interface Notification {
             title?: string;
             message?: string;
-            /** Only Notification Center or Windows Toasters */
-            sound?: boolean;
             /** How long to show balloons in ms */
             time?: number;
             /** Wait with callback until user action is taken on notification */
             wait?: boolean;
+            /** The notification type */
+            type?: 'info' | 'warn' | 'error';
         }
     }
 
diff --git a/types/node-notifier/node-notifier-tests.ts b/types/node-notifier/node-notifier-tests.ts
index 7e6ce74c14..6162196c86 100644
--- a/types/node-notifier/node-notifier-tests.ts
+++ b/types/node-notifier/node-notifier-tests.ts
@@ -4,6 +4,8 @@
 import notifier = require('node-notifier');
 import * as path from 'path';
 
+notifier.notify();
+notifier.notify('Hello there');
 notifier.notify({
     title: 'My awesome title',
     message: 'Hello from node, Mr. User!',
@@ -22,8 +24,8 @@ notifier.on('timeout', function (notifierObject: any, options: any) {
     // Happens if `wait: true` and notification closes
 });
 
-const options = { };
 
+const options = { };
 
 import NotificationCenter = require('node-notifier/notifiers/notificationcenter');
 new NotificationCenter(options).notify();
@@ -41,35 +43,38 @@ import WindowsBalloon = require('node-notifier/notifiers/balloon');
 new WindowsBalloon(options).notify();
 
 
-var nn = require('node-notifier');
-
-new nn.NotificationCenter(options).notify();
-new nn.NotifySend(options).notify();
-new nn.WindowsToaster(options).notify(options);
-new nn.WindowsBalloon(options).notify(options);
-new nn.Growl(options).notify(options);
+new notifier.NotificationCenter(options).notify();
+new notifier.NotifySend(options).notify();
+new notifier.WindowsToaster(options).notify(options);
+new notifier.WindowsBalloon(options).notify(options);
+new notifier.Growl(options).notify(options);
 
 
 //
 // All notification options with their defaults:
 //
 
-var NotificationCenter2 = require('node-notifier').NotificationCenter;
+const NotificationCenter2 = notifier.NotificationCenter;
 
-var notifier2 = new NotificationCenter2({
+const notifier2 = new NotificationCenter2({
     withFallback: false, // use Growl if <= 10.8?
     customPath: void 0 // Relative path if you want to use your fork of terminal-notifier
 });
 
 notifier2.notify({
-    'title': void 0,
-    'subtitle': void 0,
-    'message': void 0,
-    'sound': false, // Case Sensitive string of sound file (see below)
-    'icon': 'Terminal Icon', // Set icon? (Absolute path to image)
-    'contentImage': void 0, // Attach image? (Absolute path)
-    'open': void 0, // URL to open on click
-    'wait': false // if wait for notification to end
+    title: void 0,
+    subtitle: void 0,
+    message: void 0,
+    sound: false, // Case Sensitive string of sound file (see below)
+    icon: 'Terminal Icon', // Set icon? (Absolute path to image)
+    contentImage: void 0, // Attach image? (Absolute path)
+    open: void 0, // URL to open on click
+    wait: false, // if wait for notification to end
+    actions: ['Action 1', 'Action 2'],
+    closeLabel: 'Close',
+    dropdownLabel: 'Dropdown',
+    reply: true,
+    timeout: 10
 }, function(error: any, response: any) {
     console.log(response);
 });
@@ -78,9 +83,9 @@ notifier2.notify({
 // Usage WindowsToaster
 //
 
-var WindowsToaster2 = require('node-notifier').WindowsToaster;
+const WindowsToaster2 = notifier.WindowsToaster;
 
-var notifier3 = new WindowsToaster2({
+const notifier3 = new WindowsToaster2({
     withFallback: false, // Fallback to Growl or Balloons?
     customPath: void 0 // Relative path if you want to use your fork of toast.exe
 });
@@ -91,6 +96,10 @@ notifier3.notify({
     icon: void 0, // absolute path to an icon
     sound: false, // true | false.
     wait: false, // if wait for notification to end
+    appID: '',
+    id: 1,
+    install: '/',
+    remove: 1
 }, function(error: any, response: any) {
     console.log(response);
 });

From 9f755db629c3643106386afb2f87853fbe25726b Mon Sep 17 00:00:00 2001
From: Roman Nuritdinov <ky6uk.kun@gmail.com>
Date: Mon, 11 Mar 2019 20:26:32 +0200
Subject: [PATCH 534/924] Allow `null` value for some props of
 `react-datepicker` (#33585)

---
 types/react-datepicker/index.d.ts                 | 9 +++++----
 types/react-datepicker/react-datepicker-tests.tsx | 8 ++++++++
 types/react-datepicker/tsconfig.json              | 4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index ce7ebcfab9..c957411347 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -9,6 +9,7 @@
 //                 Sean Kelley <https://github.com/seansfkelley>
 //                 Justin Grant <https://github.com/justingrant>
 //                 Jake Boone <https://github.com/jakeboone02>
+//                 Roman Nuritdinov <https://github.com/Ky6uk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -41,7 +42,7 @@ export interface ReactDatePickerProps {
 	disabled?: boolean;
 	disabledKeyboardNavigation?: boolean;
 	dropdownMode?: 'scroll' | 'select';
-	endDate?: Date;
+	endDate?: Date | null;
 	excludeDates?: Date[];
 	excludeTimes?: Date[];
 	filterDate?(date: Date): boolean;
@@ -57,9 +58,9 @@ export interface ReactDatePickerProps {
 	inline?: boolean;
 	isClearable?: boolean;
 	locale?: string;
-	maxDate?: Date;
+	maxDate?: Date | null;
 	maxTime?: Date;
-	minDate?: Date;
+	minDate?: Date | null;
 	minTime?: Date;
 	monthsShown?: number;
 	name?: string;
@@ -112,7 +113,7 @@ export interface ReactDatePickerProps {
 	showTimeSelectOnly?: boolean;
 	showWeekNumbers?: boolean;
 	showYearDropdown?: boolean;
-	startDate?: Date;
+	startDate?: Date | null;
 	startOpen?: boolean;
 	tabIndex?: number;
 	timeCaption?: string;
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 9486d043eb..1188f53763 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -121,6 +121,14 @@ const defaultLocale = getDefaultLocale();
 	<span />
 </DatePicker>;
 
+<DatePicker
+    minDate={null}
+    maxDate={null}
+    startDate={null}
+    endDate={null}
+    onChange={() => null}
+/>;
+
 function handleRef(ref: DatePicker | null) {
     if (ref) {
         ref.setBlur();
diff --git a/types/react-datepicker/tsconfig.json b/types/react-datepicker/tsconfig.json
index 39a236a343..a52b1ad104 100644
--- a/types/react-datepicker/tsconfig.json
+++ b/types/react-datepicker/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -22,4 +22,4 @@
         "index.d.ts",
         "react-datepicker-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From a03ef191027bf0219a332605215bed9097272fda Mon Sep 17 00:00:00 2001
From: Emily Marigold Klassen <forivall@gmail.com>
Date: Mon, 11 Mar 2019 11:27:26 -0700
Subject: [PATCH 535/924] Use export assignment for caseless (#33633)

---
 types/caseless/caseless-tests.ts | 22 ++++++++--------
 types/caseless/index.d.ts        | 45 +++++++++++++++++---------------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/types/caseless/caseless-tests.ts b/types/caseless/caseless-tests.ts
index 57eaae605e..39f6277350 100644
--- a/types/caseless/caseless-tests.ts
+++ b/types/caseless/caseless-tests.ts
@@ -1,9 +1,9 @@
-import caseless, { Caseless, httpify, Httpified } from "caseless";
+import caseless = require("caseless");
 
-new Caseless(); // $ExpectError
+new caseless.Caseless(); // $ExpectError
 
 // tslint:disable-next-line: prefer-const
-let c1: Caseless;
+let c1: caseless.Caseless;
 
 caseless(); // $ExpectType Caseless
 caseless({}); // $ExpectType Caseless
@@ -30,16 +30,16 @@ c2.swap(10); // $ExpectError
 
 c2.del('foo'); // $ExpectType boolean
 
-httpify(null, {}); // $ExpectError
-httpify(1, {}); // $ExpectError
-httpify("2", {}); // $ExpectError
-httpify({}, null); // $ExpectError
-httpify({}, 1); // $ExpectError
-httpify({}, "2"); // $ExpectError
+caseless.httpify(null, {}); // $ExpectError
+caseless.httpify(1, {}); // $ExpectError
+caseless.httpify("2", {}); // $ExpectError
+caseless.httpify({}, null); // $ExpectError
+caseless.httpify({}, 1); // $ExpectError
+caseless.httpify({}, "2"); // $ExpectError
 
-httpify({}, {}); // $ExpectType Caseless
+caseless.httpify({}, {}); // $ExpectType Caseless
 
-const request: Httpified = {}; // $ExpectError
+const request: caseless.Httpified = {}; // $ExpectError
 
 request.setHeader({}); // $ExpectType void
 request.setHeader('foo', 'bar'); // $ExpectType string | false
diff --git a/types/caseless/index.d.ts b/types/caseless/index.d.ts
index 9b19f8a150..3955664993 100644
--- a/types/caseless/index.d.ts
+++ b/types/caseless/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mikeal/caseless
 // Definitions by: downace <https://github.com/downace>
 //                 Matt R. Wilson <https://github.com/mastermatt>
+//                 Emily Klassen <https://github.com/forivall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -9,26 +10,28 @@ type KeyType = string;
 type ValueType = any;
 type RawDict = object;
 
-export interface Caseless {
-    set(name: KeyType, value: ValueType, clobber?: boolean): KeyType | false;
-    set(dict: RawDict): void;
-    has(name: KeyType): KeyType | false;
-    get(name: KeyType): ValueType | undefined;
-    swap(name: KeyType): void;
-    del(name: KeyType): boolean;
+declare function caseless(dict?: RawDict): caseless.Caseless;
+
+declare namespace caseless {
+    function httpify(resp: object, headers: RawDict): Caseless;
+
+    interface Caseless {
+        set(name: KeyType, value: ValueType, clobber?: boolean): KeyType | false;
+        set(dict: RawDict): void;
+        has(name: KeyType): KeyType | false;
+        get(name: KeyType): ValueType | undefined;
+        swap(name: KeyType): void;
+        del(name: KeyType): boolean;
+    }
+
+    interface Httpified {
+      headers: RawDict;
+      setHeader(name: KeyType, value: ValueType, clobber?: boolean): KeyType | false;
+      setHeader(dict: RawDict): void;
+      hasHeader(name: KeyType): KeyType | false;
+      getHeader(name: KeyType): ValueType | undefined;
+      removeHeader(name: KeyType): boolean;
+    }
 }
 
-export interface Httpified {
-  headers: RawDict;
-  setHeader(name: KeyType, value: ValueType, clobber?: boolean): KeyType | false;
-  setHeader(dict: RawDict): void;
-  hasHeader(name: KeyType): KeyType | false;
-  getHeader(name: KeyType): ValueType | undefined;
-  removeHeader(name: KeyType): boolean;
-}
-
-export function httpify(resp: object, headers: RawDict): Caseless;
-
-declare function caseless(dict?: RawDict): Caseless;
-
-export default caseless;
+export = caseless;

From 771847f9bf265bdfc672588d257d613bfef8f33b Mon Sep 17 00:00:00 2001
From: nickroberts <djparadyme@gmail.com>
Date: Mon, 11 Mar 2019 14:36:27 -0400
Subject: [PATCH 536/924] :sparkles: Add get / set and other Cluster properties
 / methods (#33655)

---
 types/ioredis/index.d.ts       | 10 ++++++++++
 types/ioredis/ioredis-tests.ts | 29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index 99c99dcf04..869dc364c9 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -875,10 +875,20 @@ declare namespace IORedis {
 
     type NodeRole = 'master' | 'slave' | 'all';
 
+    type CallbackFunction<T = any> = (err?: NodeJS.ErrnoException | null, result?: T) => void;
+
     interface Cluster extends NodeJS.EventEmitter, Commander {
         connect(callback: () => void): Promise<any>;
         disconnect(): void;
         nodes(role?: NodeRole): Redis[];
+        quit(callback?: CallbackFunction<'OK'>): Promise<'OK'>;
+        get(key: KeyType, callback: (err: Error, res: string | null) => void): void;
+        get(key: KeyType): Promise<string | null>;
+        set(key: KeyType, value: any, expiryMode?: string | any[], time?: number | string, setMode?: number | string): Promise<string>;
+        set(key: KeyType, value: any, callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, setMode: string | any[], callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, expiryMode: string, time: number | string, callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, expiryMode: string, time: number | string, setMode: number | string, callback: (err: Error, res: string) => void): void;
     }
 
     interface ClusterStatic extends NodeJS.EventEmitter, Commander {
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index f3cafe1f18..57ee06a5f3 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -226,3 +226,32 @@ cluster.nodes().map(node => {
         .exec()
         .then(result => console.log(result));
 });
+cluster.set('foo', 'bar');
+cluster.get('foo', (err, result) => {
+    if (err) {
+        console.error(err);
+    }
+    console.log(result);
+});
+cluster.get('foo')
+    .then(result => console.log(result))
+    .catch(reason => console.error(reason));
+cluster.connect(() => {
+    console.log('connect');
+})
+.then(result => console.log(result))
+.then(reason => console.error(reason));
+cluster.disconnect();
+cluster.quit(result => {
+    console.log(result);
+});
+const getBuiltinCommandsResult = cluster.getBuiltinCommands();
+console.log(getBuiltinCommandsResult);
+const createBuiltinCommandResult = cluster.createBuiltinCommand('createBuiltinCommand');
+console.log(createBuiltinCommandResult);
+const defineCommandResult = cluster.defineCommand('defineCommand', {
+    numberOfKeys: 1,
+    lua: 'lua'
+});
+console.log(defineCommandResult);
+cluster.sendCommand();

From 804ead1f523ee862bd3820447c45bcd8951a29ce Mon Sep 17 00:00:00 2001
From: slikts <dabas@untu.ms>
Date: Mon, 11 Mar 2019 20:38:58 +0200
Subject: [PATCH 537/924] Make exported props non-nullable (#33649)

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

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 6aad7c3c8c..c0c2a8fc25 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -51,12 +51,12 @@ export interface SortingRule {
 }
 
 export interface TableProps<D = any, ResolvedData = D> extends
-    Partial<TextProps>,
-    Partial<ComponentDecoratorProps>,
-    Partial<ControlledStateCallbackProps>,
-    Partial<PivotingProps>,
-    Partial<ControlledStateOverrideProps>,
-    Partial<ComponentProps> {
+    TextProps,
+    ComponentDecoratorProps,
+    ControlledStateCallbackProps,
+    PivotingProps,
+    ControlledStateOverrideProps,
+    ComponentProps {
     /** Default: [] */
     data: D[];
 

From 819546fdacefe7912d6274bb5d9587e570659870 Mon Sep 17 00:00:00 2001
From: Aziz Khambati <aziz.h.khambati@gmail.com>
Date: Tue, 12 Mar 2019 00:11:04 +0530
Subject: [PATCH 538/924] [redux-batched-subscribe] Update redux version

---
 types/redux-batched-subscribe/index.d.ts   | 9 +++++++--
 types/redux-batched-subscribe/package.json | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/redux-batched-subscribe/index.d.ts b/types/redux-batched-subscribe/index.d.ts
index e3f5345591..30d75759d1 100644
--- a/types/redux-batched-subscribe/index.d.ts
+++ b/types/redux-batched-subscribe/index.d.ts
@@ -1,11 +1,16 @@
 // Type definitions for redux-batched-subscribe 0.1
 // Project: https://github.com/tappleby/redux-batched-subscribe
 // Definitions by: Dibyo Majumdar <https://github.com/mDibyo>
+//                 Aziz Khambati <https://github.com/azizhk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { GenericStoreEnhancer } from 'redux';
+import { StoreEnhancer } from "redux";
 
 export type NotifyFunction = () => void;
 export type BatchFunction = (notify: NotifyFunction) => void;
 
-export function batchedSubscribe(batch: BatchFunction): GenericStoreEnhancer;
+export interface StoreExtension {
+    subscribeImmediate: () => void;
+}
+
+export function batchedSubscribe(batch: BatchFunction): StoreEnhancer<StoreExtension>;
diff --git a/types/redux-batched-subscribe/package.json b/types/redux-batched-subscribe/package.json
index f5b5c699de..7f5b19d45b 100644
--- a/types/redux-batched-subscribe/package.json
+++ b/types/redux-batched-subscribe/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": ">=1.0.0 <4.0.0"
+        "redux": "^4.0.0"
     }
 }

From f685467def932fc58448f9a6b72a94837ef61211 Mon Sep 17 00:00:00 2001
From: Thomas Levy <tychomonger@gmail.com>
Date: Mon, 11 Mar 2019 11:41:19 -0700
Subject: [PATCH 539/924] add support for getInstance method on
 react-onclickoutside refs (#33606)

---
 types/react-onclickoutside/index.d.ts         | 29 ++++++++++++++++---
 .../react-onclickoutside-tests.tsx            | 10 +++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/types/react-onclickoutside/index.d.ts b/types/react-onclickoutside/index.d.ts
index fd31f35869..02fd4eebe4 100644
--- a/types/react-onclickoutside/index.d.ts
+++ b/types/react-onclickoutside/index.d.ts
@@ -2,11 +2,14 @@
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 //                 Boris Sergeyev <https://github.com/surgeboris>
+//                 Thomas Levy <https://github.com/NilSet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 import * as React from "react";
 
+export {};
+
 export interface HandleClickOutside<T> {
     handleClickOutside: React.MouseEventHandler<T>;
 }
@@ -38,7 +41,25 @@ export interface ClickOutComponentClass<P> extends React.ComponentClass<P> {
 
 export type OnClickOutProps<P> = WithoutInjectedClickOutProps<P> & AdditionalProps;
 
-export default function OnClickOut<P>(
-    component: ComponentConstructor<P> | ClickOutComponentClass<P>,
-    config?: ConfigObject
-): React.ComponentClass<OnClickOutProps<P>>;
+interface WrapperClass<P, C> {
+    new (): WrapperInstance<P, C>;
+}
+
+interface WrapperInstance<P, C>
+    extends React.Component<OnClickOutProps<JSX.LibraryManagedAttributes<C, P>>> {
+    getInstance(): C extends typeof React.Component ? InstanceType<C> : never;
+}
+
+type PropsOf<T> = T extends (
+    props: infer P,
+    context?: any
+) => React.ReactElement | null // Try to infer for SFCs
+    ? P
+    : T extends new (props: infer P, context?: any) => React.Component // Otherwise try to infer for classes
+    ? P
+    : never;
+
+export default function OnClickOut<
+    C extends ComponentConstructor<P> | ClickOutComponentClass<P>,
+    P = PropsOf<C>
+>(component: C, config?: ConfigObject): WrapperClass<P, C>;
diff --git a/types/react-onclickoutside/react-onclickoutside-tests.tsx b/types/react-onclickoutside/react-onclickoutside-tests.tsx
index e7ee43e30d..21732498e8 100644
--- a/types/react-onclickoutside/react-onclickoutside-tests.tsx
+++ b/types/react-onclickoutside/react-onclickoutside-tests.tsx
@@ -48,6 +48,10 @@ class TestComponent extends React.Component<{ disableOnClickOutside(): void; ena
         console.log('this.handleClickOutside');
     }
 
+    logProps = () => {
+        console.log(this.props);
+    }
+
     render() {
         this.props.disableOnClickOutside();
         this.props.enableOnClickOutside();
@@ -58,12 +62,18 @@ class TestComponent extends React.Component<{ disableOnClickOutside(): void; ena
 }
 
 const WrappedComponent = onClickOutside(TestComponent);
+const wrappedComponentRef: React.RefObject<InstanceType<typeof WrappedComponent>> = React.createRef();
 
 render(
     <WrappedComponent
+        ref={wrappedComponentRef}
         eventTypes="whatever"
         preventDefault
         stopPropagation
     />,
     document.getElementById("main")
 );
+
+if (wrappedComponentRef.current) {
+  wrappedComponentRef.current.getInstance().logProps();
+}

From 9dedb3f3a5af1411b76272a9e9ce07f068343556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= <me@jiripudil.cz>
Date: Mon, 11 Mar 2019 19:41:51 +0100
Subject: [PATCH 540/924] Fix addContextToolbar predicate type (#33609)

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

diff --git a/types/tinymce/index.d.ts b/types/tinymce/index.d.ts
index e50feb0b5d..eba9bc29bf 100644
--- a/types/tinymce/index.d.ts
+++ b/types/tinymce/index.d.ts
@@ -394,7 +394,7 @@ export class Editor extends util.Observable {
 
   addCommand(name: string, callback: (ui: boolean, value: {}) => boolean, scope?: {}): void;
 
-  addContextToolbar(predicate: () => boolean, items: string): void;
+  addContextToolbar(predicate: ((el: Node) => boolean) | string, items: string): void;
 
   addMenuItem(name: string, settings: {}): void;
 

From ec1e3312130c9fb607bb74915722ab23139ec62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= <jeremie@astori.fr>
Date: Mon, 11 Mar 2019 14:42:13 -0400
Subject: [PATCH 541/924] @storybook/addon-a11y: Deprecate checkA11y in favor
 of withA11y (#33627)

See https://github.com/storybooks/storybook/blob/f2b625bab05720c4c323af3e612e7d03adbd3b92/addons/a11y/src/index.js#L66-L70 and https://github.com/storybooks/storybook/blob/next/MIGRATION.md#addon-a11y-uses-parameters-decorator-renamed.
---
 types/storybook__addon-a11y/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/storybook__addon-a11y/index.d.ts b/types/storybook__addon-a11y/index.d.ts
index 7e7ac3b89e..fa82d44867 100644
--- a/types/storybook__addon-a11y/index.d.ts
+++ b/types/storybook__addon-a11y/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @storybook/addon-a11y 3.3
+// Type definitions for @storybook/addon-a11y 5.0
 // Project: https://github.com/storybooks/storybook
 // Definitions by: HyunSeob <https://github.com/hyunseob>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,4 +6,5 @@
 
 import { StoryDecorator } from '@storybook/react';
 
-export const checkA11y: StoryDecorator;
+export const checkA11y: StoryDecorator; // Deprecated
+export const withA11y: StoryDecorator;

From 728bc739a0163f0761d0d625e68b799471996f07 Mon Sep 17 00:00:00 2001
From: Jarrett Meyer <meyer_jarrett@lilly.com>
Date: Mon, 11 Mar 2019 15:22:18 -0400
Subject: [PATCH 542/924] Adds nodeSort() functions to d3-sankey

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

diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index 4f70bbbe61..c05f3031b2 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -337,6 +337,18 @@ export interface SankeyLayout<Data, N extends SankeyExtraProperties, L extends S
      * @param iterations Number of relaxation iterations, which defaults to 32.
      */
     iterations(iterations: number): this;
+
+    /**
+     * Returns the node comparison function which defaults to undefined.
+     */
+    nodeSort(): ((a: SankeyNode<N, L>, b: SankeyNode<N, L>) => number) | undefined;
+
+    /**
+     * Set the node comparison function and return this Sankey layout generator.
+     *
+     * @param compare Node comparison function.
+     */
+    nodeSort(compare: (a: SankeyNode<N, L>, b: SankeyNode<N, L>) => number): this;
 }
 
 /**

From e0eaf5058a1a8cc51786531198dc78c96c0075f2 Mon Sep 17 00:00:00 2001
From: Jarrett Meyer <meyer_jarrett@lilly.com>
Date: Mon, 11 Mar 2019 15:31:06 -0400
Subject: [PATCH 543/924] bump version

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

diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index c05f3031b2..f5394a1b26 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 0.7.1
+// Last module patch version validated against: 0.11.0
 
 import { Link } from 'd3-shape';
 

From 9c114e3ed506c0fbafe7569d49c155073d5d3e92 Mon Sep 17 00:00:00 2001
From: psaxton <psaxton@gmail.com>
Date: Mon, 11 Mar 2019 14:00:27 -0600
Subject: [PATCH 544/924] Adding type mappings for the logging library ROARR.js
 (#33753)

* Adding type mappings for the logging library ROARR.js

See Issue #33751

Tests work and lint reports 0 problems

* Fix tsconfig settings
---
 types/roarr/index.d.ts     | 296 +++++++++++++++++++++++++++++++++++++
 types/roarr/roarr-tests.ts |  17 +++
 types/roarr/tsconfig.json  |  23 +++
 types/roarr/tslint.json    |   1 +
 4 files changed, 337 insertions(+)
 create mode 100644 types/roarr/index.d.ts
 create mode 100644 types/roarr/roarr-tests.ts
 create mode 100644 types/roarr/tsconfig.json
 create mode 100644 types/roarr/tslint.json

diff --git a/types/roarr/index.d.ts b/types/roarr/index.d.ts
new file mode 100644
index 0000000000..7b64597146
--- /dev/null
+++ b/types/roarr/index.d.ts
@@ -0,0 +1,296 @@
+// Type definitions for roarr 2.13
+// Project: https://github.com/gajus/roarr#readme
+// Definitions by: Philip Saxton <https://github.com/psaxton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace log;
+
+export default log;
+
+declare let log: Roarr.RoarrType;
+
+declare namespace Roarr {
+	interface MessageContextType {
+		logLevel?: number;
+		[name: string]: any;
+	}
+
+	interface SprintfArgumentType { toString(): string; }
+
+	interface RoarrType {
+		(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Creates a child logger appending the provided context object to the previous logger context.
+		 *
+		 * @param context
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr.child({ module: "myModule" });
+		 *
+		 * log.debug("My Message");
+		 * // {"context":{"logLevel":20},"Message":"My Message","sequence":0,"time":1531914529921,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#child
+		 */
+		child(context: MessageContextType): RoarrType;
+
+		/**
+		 * Returns the current context.
+		 */
+		getContext(): MessageContextType;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 10 (LogLevel.Trace)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.trace('foo');
+		 * // {"context":{"logLevel":10},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		trace(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		trace(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 20 (LogLevel.Debug)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.debug('foo');
+		 * // {"context":{"logLevel":20},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		debug(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		debug(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 30 (LogLevel.Info)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.info('foo');
+		 * // {"context":{"logLevel":30},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		info(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		info(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 40 (LogLevel.Warn)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.warn('foo');
+		 * // {"context":{"logLevel":40},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		warn(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		warn(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 50 (LogLevel.Error)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.error('foo');
+		 * // {"context":{"logLevel":50},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		error(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		error(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		/**
+		 * Convenience method for logging a message with logLevel context property value set to 60 (LogLevel.Fatal)
+		 *
+		 * @example
+		 * import Roarr from 'roarr';
+		 *
+		 * const log = Roarr;
+		 *
+		 * log.fatal('foo');
+		 * // {"context":{"logLevel":60},"message":"foo","sequence":0,"time":1506776210000,"version":"1.0.0"}
+		 *
+		 * @see https://www.npmjs.com/package/roarr#trace
+		 */
+		fatal(
+			context: MessageContextType,
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+
+		fatal(
+			message: string,
+			_0?: SprintfArgumentType,
+			_1?: SprintfArgumentType,
+			_2?: SprintfArgumentType,
+			_3?: SprintfArgumentType,
+			_4?: SprintfArgumentType,
+			_5?: SprintfArgumentType,
+			_6?: SprintfArgumentType,
+			_7?: SprintfArgumentType
+		): void;
+	}
+}
diff --git a/types/roarr/roarr-tests.ts b/types/roarr/roarr-tests.ts
new file mode 100644
index 0000000000..0e0129ddc2
--- /dev/null
+++ b/types/roarr/roarr-tests.ts
@@ -0,0 +1,17 @@
+import Roarr from "roarr";
+
+const log = Roarr.child({ module: "roarr-tests" });
+
+log({ logLevel: 10 }, "Simple log statement");
+log.trace("Trace log statement");
+log.trace({ context: "trace" }, "Trace log statement");
+log.debug("Debug log statement");
+log.debug({ context: "debug" }, "Debug log statement");
+log.info("Info log statement");
+log.info({ context: "info" }, "Info log statement");
+log.warn("Warn log statement");
+log.warn({ context: "warn" }, "Warn log statement");
+log.error("Error log statement");
+log.error({ context: "error" }, "Error log statement");
+log.fatal("Fatal log statement");
+log.fatal({ context: "fatal" }, "Fatal log statement");
diff --git a/types/roarr/tsconfig.json b/types/roarr/tsconfig.json
new file mode 100644
index 0000000000..ce5385f894
--- /dev/null
+++ b/types/roarr/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",
+        "roarr-tests.ts"
+    ]
+}
diff --git a/types/roarr/tslint.json b/types/roarr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/roarr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From aca13d4ee541aa46b34045338fcac104f00ff667 Mon Sep 17 00:00:00 2001
From: Aviad Pineles <paviad2@gmail.com>
Date: Mon, 11 Mar 2019 22:01:49 +0200
Subject: [PATCH 545/924] [chart.js] Export plugin registration types (#33614)

* Export plugin registration types

Export the types `PluginServiceGlobalRegistration` and `PluginServiceRegistrationOptions` since they are publicly visible to the user.

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts
---
 types/chart.js/index.d.ts | 112 +++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 8da7ed0814..5a3116618d 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -60,62 +60,8 @@ declare class Chart {
     static Tooltip: Chart.ChartTooltipsStaticConfiguration;
 }
 declare class PluginServiceStatic {
-    register(plugin: PluginServiceGlobalRegistration & PluginServiceRegistrationOptions): void;
-    unregister(plugin: PluginServiceGlobalRegistration & PluginServiceRegistrationOptions): void;
-}
-
-interface PluginServiceGlobalRegistration {
-    id?: string;
-}
-
-interface PluginServiceRegistrationOptions {
-    beforeInit?(chartInstance: Chart, options?: any): void;
-    afterInit?(chartInstance: Chart, options?: any): void;
-
-    beforeUpdate?(chartInstance: Chart, options?: any): void;
-    afterUpdate?(chartInstance: Chart, options?: any): void;
-
-    beforeLayout?(chartInstance: Chart, options?: any): void;
-    afterLayout?(chartInstance: Chart, options?: any): void;
-
-    beforeDatasetsUpdate?(chartInstance: Chart, options?: any): void;
-    afterDatasetsUpdate?(chartInstance: Chart, options?: any): void;
-
-    beforeDatasetUpdate?(chartInstance: Chart, options?: any): void;
-    afterDatasetUpdate?(chartInstance: Chart, options?: any): void;
-
-    // This is called at the start of a render. It is only called once, even if the animation will run for a number of frames. Use beforeDraw or afterDraw
-    // to do something on each animation frame
-    beforeRender?(chartInstance: Chart, options?: any): void;
-    afterRender?(chartInstance: Chart, options?: any): void;
-
-    // Easing is for animation
-    beforeDraw?(chartInstance: Chart, easing: string, options?: any): void;
-    afterDraw?(chartInstance: Chart, easing: string, options?: any): void;
-
-    // Before the datasets are drawn but after scales are drawn
-    beforeDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
-    afterDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
-
-    beforeDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
-    afterDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
-
-    // Called before drawing the `tooltip`. If any plugin returns `false`,
-    // the tooltip drawing is cancelled until another `render` is triggered.
-    beforeTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
-    // Called after drawing the `tooltip`. Note that this hook will not,
-    // be called if the tooltip drawing has been previously cancelled.
-    afterTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
-
-    // Called when an event occurs on the chart
-    beforeEvent?(chartInstance: Chart, event: Event, options?: any): void;
-    afterEvent?(chartInstance: Chart, event: Event, options?: any): void;
-
-    resize?(chartInstance: Chart, newChartSize: Chart.ChartSize, options?: any): void;
-    destroy?(chartInstance: Chart): void;
-
-    /** @deprecated since version 2.5.0. Use `afterLayout` instead. */
-    afterScaleUpdate?(chartInstance: Chart, options?: any): void;
+    register(plugin: Chart.PluginServiceGlobalRegistration & Chart.PluginServiceRegistrationOptions): void;
+    unregister(plugin: Chart.PluginServiceGlobalRegistration & Chart.PluginServiceRegistrationOptions): void;
 }
 
 interface Meta {
@@ -683,6 +629,60 @@ declare namespace Chart {
         x: number;
         y: number;
     }
+
+    interface PluginServiceGlobalRegistration {
+        id?: string;
+    }
+
+    interface PluginServiceRegistrationOptions {
+        beforeInit?(chartInstance: Chart, options?: any): void;
+        afterInit?(chartInstance: Chart, options?: any): void;
+
+        beforeUpdate?(chartInstance: Chart, options?: any): void;
+        afterUpdate?(chartInstance: Chart, options?: any): void;
+
+        beforeLayout?(chartInstance: Chart, options?: any): void;
+        afterLayout?(chartInstance: Chart, options?: any): void;
+
+        beforeDatasetsUpdate?(chartInstance: Chart, options?: any): void;
+        afterDatasetsUpdate?(chartInstance: Chart, options?: any): void;
+
+        beforeDatasetUpdate?(chartInstance: Chart, options?: any): void;
+        afterDatasetUpdate?(chartInstance: Chart, options?: any): void;
+
+        // This is called at the start of a render. It is only called once, even if the animation will run for a number of frames. Use beforeDraw or afterDraw
+        // to do something on each animation frame
+        beforeRender?(chartInstance: Chart, options?: any): void;
+        afterRender?(chartInstance: Chart, options?: any): void;
+
+        // Easing is for animation
+        beforeDraw?(chartInstance: Chart, easing: string, options?: any): void;
+        afterDraw?(chartInstance: Chart, easing: string, options?: any): void;
+
+        // Before the datasets are drawn but after scales are drawn
+        beforeDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
+        afterDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
+
+        beforeDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
+        afterDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
+
+        // Called before drawing the `tooltip`. If any plugin returns `false`,
+        // the tooltip drawing is cancelled until another `render` is triggered.
+        beforeTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
+        // Called after drawing the `tooltip`. Note that this hook will not,
+        // be called if the tooltip drawing has been previously cancelled.
+        afterTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
+
+        // Called when an event occurs on the chart
+        beforeEvent?(chartInstance: Chart, event: Event, options?: any): void;
+        afterEvent?(chartInstance: Chart, event: Event, options?: any): void;
+
+        resize?(chartInstance: Chart, newChartSize: ChartSize, options?: any): void;
+        destroy?(chartInstance: Chart): void;
+
+        /** @deprecated since version 2.5.0. Use `afterLayout` instead. */
+        afterScaleUpdate?(chartInstance: Chart, options?: any): void;
+    }
 }
 
 export = Chart;

From 79863ec50a35487b3e17f16e67685221e405b747 Mon Sep 17 00:00:00 2001
From: Lorenzo Rapetti <lorenzo.rapetti.94@gmail.com>
Date: Mon, 11 Mar 2019 21:02:47 +0100
Subject: [PATCH 546/924] [@types/istanbul-lib-coverage] Update typings
 (#33646)

* Update istanbul-lib-coverage typings

* Remove patch number from version
---
 types/istanbul-lib-coverage/index.d.ts        | 34 +++++++++++++------
 .../istanbul-lib-coverage-tests.ts            | 23 ++++++++-----
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/types/istanbul-lib-coverage/index.d.ts b/types/istanbul-lib-coverage/index.d.ts
index 67203308de..c8a96d606f 100644
--- a/types/istanbul-lib-coverage/index.d.ts
+++ b/types/istanbul-lib-coverage/index.d.ts
@@ -1,14 +1,27 @@
-// Type definitions for istanbul-lib-coverage 1.1
+// Type definitions for istanbul-lib-coverage 2.0
 // Project: https://github.com/istanbuljs/istanbuljs
 // Definitions by: Jason Cheatham <https://github.com/jason0x43>
+//                 Lorenzo Rapetti <https://github.com/loryman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-export interface CoverageSummary {
+export interface CoverageSummaryData {
+    lines: Totals;
+	statements: Totals;
+	branches: Totals;
+    functions: Totals;
+}
+
+export class CoverageSummary {
+    constructor(data: CoverageSummary | CoverageSummaryData);
+    merge(obj: CoverageSummary): CoverageSummary;
+    toJSON(): CoverageSummaryData;
+    isEmpty(): boolean;
+    data: CoverageSummaryData;
 	lines: Totals;
 	statements: Totals;
 	branches: Totals;
-	functions: Totals;
+    functions: Totals;
 }
 
 export interface CoverageMapData {
@@ -16,13 +29,14 @@ export interface CoverageMapData {
 }
 
 export class CoverageMap {
-	constructor(data: CoverageMapData);
-	addFileCoverage(pathOrObject: string | FileCoverageData): void;
+	constructor(data: CoverageMapData | CoverageMap);
+	addFileCoverage(pathOrObject: string | FileCoverage | FileCoverageData): void;
 	files(): string[];
 	fileCoverageFor(filename: string): FileCoverage;
-	filter(callback: (key: string) => boolean): void;
+    filter(callback: (key: string) => boolean): void;
+    getCoverageSummary(): CoverageSummary;
 	merge(data: CoverageMapData | CoverageMap): void;
-	toJSON(): object;
+	toJSON(): CoverageMapData;
 	data: CoverageMapData;
 }
 
@@ -74,7 +88,7 @@ export interface Coverage {
 }
 
 export class FileCoverage implements FileCoverageData {
-	constructor(data: string | FileCoverageData);
+	constructor(data: string | FileCoverage | FileCoverageData);
 	merge(other: FileCoverageData): void;
 	getBranchCoverageByLine(): { [line: number]: Coverage };
 	getLineCoverage(): { [line: number]: number };
@@ -100,5 +114,5 @@ export const classes: {
 };
 
 export function createCoverageMap(data?: CoverageMap | CoverageMapData): CoverageMap;
-export function createCoverageSummary(obj?: CoverageSummary): CoverageSummary;
-export function createFileCoverage(pathOrObject: string | FileCoverageData): FileCoverage;
+export function createCoverageSummary(obj?: CoverageSummary | CoverageSummaryData): CoverageSummary;
+export function createFileCoverage(pathOrObject: string | FileCoverage | FileCoverageData): FileCoverage;
diff --git a/types/istanbul-lib-coverage/istanbul-lib-coverage-tests.ts b/types/istanbul-lib-coverage/istanbul-lib-coverage-tests.ts
index a9b694b7b9..44c0ddf306 100644
--- a/types/istanbul-lib-coverage/istanbul-lib-coverage-tests.ts
+++ b/types/istanbul-lib-coverage/istanbul-lib-coverage-tests.ts
@@ -1,13 +1,13 @@
 import {
-	CoverageMapData,
-	CoverageSummary,
+    CoverageMapData,
+    CoverageSummaryData,
 	FileCoverageData,
 	createCoverageSummary,
 	createCoverageMap,
 	createFileCoverage
 } from 'istanbul-lib-coverage';
 
-const summaryData: CoverageSummary = {
+const summaryData: CoverageSummaryData = {
 	lines: { total: 0, covered: 0, skipped: 0, pct: 0 },
 	statements: { total: 0, covered: 0, skipped: 0, pct: 0 },
 	functions: { total: 0, covered: 0, skipped: 0, pct: 0 },
@@ -26,11 +26,13 @@ const fileCoverageData: FileCoverageData = {
 	b: {}
 };
 
-const summary = createCoverageSummary(summaryData);
-summary.branches;
-summary.lines;
-summary.functions;
-summary.statements;
+const summary1 = createCoverageSummary(summaryData);
+summary1.data;
+summary1.branches;
+summary1.lines;
+summary1.functions;
+summary1.statements;
+const summary2 = createCoverageSummary(summary1);
 
 const map1 = createCoverageMap(coverageMapData);
 map1.data;
@@ -44,6 +46,11 @@ fileCoverage2.data;
 const fileCoverage3 = createFileCoverage(fileCoverageData);
 fileCoverage3.data;
 
+// CoverageSummary methods and properties
+summary1.isEmpty();
+summary1.toJSON();
+summary1.merge(summary2);
+
 // CoverageMap methods and properties
 map1.addFileCoverage('foo.js');
 map1.addFileCoverage(fileCoverageData);

From 1e3e89fe6fc5ef185710ef475e43ba0e1c42bb0f Mon Sep 17 00:00:00 2001
From: Andrew Leedham <AndrewLeedham@outlook.com>
Date: Mon, 11 Mar 2019 20:21:07 +0000
Subject: [PATCH 547/924] [@types/browserslist] Added error.d.ts to
 browserslist (#33772)

* Added error.d.ts to browserslist

* Upgrade browserslist version number

* Added type test

* Removed patch version and add space to test

* Set browserslist to always be true
---
 types/browserslist/browserslist-tests.ts | 3 +++
 types/browserslist/error.d.ts            | 6 ++++++
 types/browserslist/index.d.ts            | 3 ++-
 types/browserslist/tsconfig.json         | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 types/browserslist/error.d.ts

diff --git a/types/browserslist/browserslist-tests.ts b/types/browserslist/browserslist-tests.ts
index d5e88e5b5d..4617fc2490 100644
--- a/types/browserslist/browserslist-tests.ts
+++ b/types/browserslist/browserslist-tests.ts
@@ -1,4 +1,5 @@
 import browserslist from "browserslist";
+import BrowserslistError from "browserslist/error";
 
 browserslist(); // $ExpectType string[]
 browserslist(""); // $ExpectType string[]
@@ -20,3 +21,5 @@ for (const opt of opts) {
 
 browserslist.coverage([""]); // $ExpectType number
 browserslist.coverage([""], { "": { "": 0 } }); // $ExpectType number
+
+new BrowserslistError('error'); // $ExpectType BrowserslistError
diff --git a/types/browserslist/error.d.ts b/types/browserslist/error.d.ts
new file mode 100644
index 0000000000..1c3e584471
--- /dev/null
+++ b/types/browserslist/error.d.ts
@@ -0,0 +1,6 @@
+declare class BrowserslistError extends Error {
+    constructor(message: any);
+    browserslist: true;
+}
+
+export = BrowserslistError;
diff --git a/types/browserslist/index.d.ts b/types/browserslist/index.d.ts
index 7c4a0add0c..8850a45129 100644
--- a/types/browserslist/index.d.ts
+++ b/types/browserslist/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for browserslist 4.3
+// Type definitions for browserslist 4.4
 // Project: https://github.com/browserslist/browserslist#readme
 // Definitions by: Dave Cardwell <https://github.com/davecardwell>
+//                 Andrew Leedham <https://github.com/AndrewLeedham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
diff --git a/types/browserslist/tsconfig.json b/types/browserslist/tsconfig.json
index cf68d8bf64..4dbd0e9b45 100644
--- a/types/browserslist/tsconfig.json
+++ b/types/browserslist/tsconfig.json
@@ -13,5 +13,5 @@
         "forceConsistentCasingInFileNames": true,
         "esModuleInterop": true
     },
-    "files": ["index.d.ts", "browserslist-tests.ts"]
+    "files": ["index.d.ts", "browserslist-tests.ts", "error.d.ts"]
 }

From d3b2bbcd82bf5634c431f5658ace7685d9f797b0 Mon Sep 17 00:00:00 2001
From: Min-Young Wu <mwu368@gmail.com>
Date: Mon, 11 Mar 2019 13:21:27 -0700
Subject: [PATCH 548/924] [bookshelf] Adding withSchema SyncOption (#33723)

PR where the option was added:
https://github.com/bookshelf/bookshelf/pull/1638
---
 types/bookshelf/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/bookshelf/index.d.ts b/types/bookshelf/index.d.ts
index 7467b3178f..2edb269875 100644
--- a/types/bookshelf/index.d.ts
+++ b/types/bookshelf/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bookshelfjs v0.9.4
+// Type definitions for bookshelfjs v0.13.0
 // Project: http://bookshelfjs.org/
 // Definitions by: Andrew Schurman <https://github.com/arcticwaters>, Vesa Poikajärvi <https://github.com/vesse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -317,6 +317,7 @@ declare namespace Bookshelf {
 	interface SyncOptions {
 		transacting?: Knex.Transaction;
 		debug?: boolean;
+		withSchema?: string;
 	}
 
 	interface CollectionOptions<T> {

From 5544e7433f9e29d97284161a45984b5e2b6db101 Mon Sep 17 00:00:00 2001
From: Drew Delianides <111170+delianides@users.noreply.github.com>
Date: Mon, 11 Mar 2019 14:29:31 -0600
Subject: [PATCH 549/924] [Stripe] Coupon Add Name Attribute (#33752)

* Added name attribute to coupon.

* amended coupon tests
---
 types/stripe/index.d.ts      | 11 +++++++++++
 types/stripe/stripe-tests.ts |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 772a4bdb87..33f253016d 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -18,6 +18,7 @@
 //                 Corey Psoinos <https://github.com/cpsoinos>
 //                 Saransh Kataria <https://github.com/saranshkataria>
 //                 Jonas Keisel <https://github.com/0xJoKe>
+//                 Andrew Delianides <https://github.com/delianides>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -1254,6 +1255,11 @@ declare namespace Stripe {
 
             metadata: IMetadata;
 
+            /**
+             * Name of the coupon displayed to customers on for instance invoices or receipts.
+             */
+            name: string;
+
             /**
              * Percent that will be taken off the subtotal of any invoices for this customer for the duration
              * of the coupon. For example, a coupon with percent_off of 50 will make a $100 invoice $50 instead.
@@ -1312,6 +1318,11 @@ declare namespace Stripe {
              */
             max_redemptions?: number;
 
+            /**
+             * Name of the coupon displayed to customers on, for instance invoices, or receipts. By default the id is shown if name is not set.
+             */
+            name?: string;
+
             /**
              * A positive integer between 1 and 100 that represents the discount the coupon will apply (required if amount_off is not passed)
              */
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index bffadadb23..3cfe1e9f5f 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -855,6 +855,7 @@ const event: Stripe.events.IEvent = stripe.webhooks.constructEvent(
 // ##################################################################################
 
 stripe.coupons.create({
+    name: '25% Off',
     percent_off: 25,
     duration: 'repeating',
     duration_in_months: 3,
@@ -863,6 +864,7 @@ stripe.coupons.create({
     // asynchronously called
     });
 stripe.coupons.create({
+    name: '25% Off',
     percent_off: 25,
     duration: 'repeating',
     duration_in_months: 3,

From 1eeccafd4e15cf617660ceb4a57823b70c4be36b Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Mon, 11 Mar 2019 22:06:23 +0100
Subject: [PATCH 550/924] chore(node): reduce usage of `Function` (#33527)

---
 .../glosses/collections/buffer_list.d.ts      |   2 +-
 types/bunyan/index.d.ts                       |   4 +-
 types/node/assert.d.ts                        |  16 +-
 types/node/cluster.d.ts                       |  28 +-
 types/node/crypto.d.ts                        |  11 +-
 types/node/dgram.d.ts                         |   2 +-
 types/node/domain.d.ts                        |  12 +-
 types/node/globals.d.ts                       |  31 +-
 types/node/http.d.ts                          |  33 +-
 types/node/http2.d.ts                         |   2 +-
 types/node/net.d.ts                           |  56 +-
 types/node/node-tests.ts                      | 480 ------------------
 types/node/os.d.ts                            |  11 +-
 types/node/path.d.ts                          |   8 +-
 types/node/punycode.d.ts                      |   2 +-
 types/node/querystring.d.ts                   |   4 +-
 types/node/readline.d.ts                      |   2 +-
 types/node/stream.d.ts                        |   6 +-
 types/node/test/assert.ts                     |  43 ++
 types/node/test/cluster.ts                    |  11 +
 types/node/test/crypto.ts                     |   4 +-
 types/node/test/http2.ts                      |   2 -
 types/node/test/os.ts                         | 177 +++++++
 types/node/test/path.ts                       | 167 ++++++
 types/node/test/querystring.ts                |  42 ++
 types/node/test/readline.ts                   |   2 +-
 types/node/test/tls.ts                        |  34 +-
 types/node/tls.d.ts                           |  50 +-
 types/node/tsconfig.json                      |  13 +-
 types/node/worker_threads.d.ts                |  18 +-
 30 files changed, 621 insertions(+), 652 deletions(-)
 create mode 100644 types/node/test/assert.ts
 create mode 100644 types/node/test/cluster.ts
 create mode 100644 types/node/test/os.ts
 create mode 100644 types/node/test/path.ts
 create mode 100644 types/node/test/querystring.ts

diff --git a/types/adone/glosses/collections/buffer_list.d.ts b/types/adone/glosses/collections/buffer_list.d.ts
index b2a4157385..482055fecc 100644
--- a/types/adone/glosses/collections/buffer_list.d.ts
+++ b/types/adone/glosses/collections/buffer_list.d.ts
@@ -30,7 +30,7 @@ declare namespace adone.collection {
         /**
          * Ends the stream
          */
-        end(chunk?: Buffer): void;
+        end(chunk?: Buffer | string): void;
         end(chunk?: () => void): void;
 
         /**
diff --git a/types/bunyan/index.d.ts b/types/bunyan/index.d.ts
index f6f0b287aa..1e5c64d625 100644
--- a/types/bunyan/index.d.ts
+++ b/types/bunyan/index.d.ts
@@ -259,7 +259,7 @@ declare namespace Logger {
         limit?: number;
     }
 
-    class RingBuffer extends EventEmitter implements NodeJS.WritableStream {
+    class RingBuffer extends EventEmitter {
         constructor(options: RingBufferOptions);
 
         writable: boolean;
@@ -277,7 +277,7 @@ declare namespace Logger {
         period?: string;
     }
 
-    class RotatingFileStream extends EventEmitter implements NodeJS.WritableStream {
+    class RotatingFileStream extends EventEmitter {
         constructor(options: RotatingFileStreamOptions);
 
         writable: boolean;
diff --git a/types/node/assert.d.ts b/types/node/assert.d.ts
index d73353c5d8..319e5b4d40 100644
--- a/types/node/assert.d.ts
+++ b/types/node/assert.d.ts
@@ -33,17 +33,17 @@ declare module "assert" {
         function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
         function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): void;
 
-        function throws(block: Function, message?: string | Error): void;
-        function throws(block: Function, error: RegExp | Function | Object | Error, message?: string | Error): void;
-        function doesNotThrow(block: Function, message?: string | Error): void;
-        function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
+        function throws(block: () => any, message?: string | Error): void;
+        function throws(block: () => any, error: RegExp | Function | Object | Error, message?: string | Error): void;
+        function doesNotThrow(block: () => any, message?: string | Error): void;
+        function doesNotThrow(block: () => any, error: RegExp | Function, message?: string | Error): void;
 
         function ifError(value: any): void;
 
-        function rejects(block: Function | Promise<any>, message?: string | Error): Promise<void>;
-        function rejects(block: Function | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
-        function doesNotReject(block: Function | Promise<any>, message?: string | Error): Promise<void>;
-        function doesNotReject(block: Function | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
+        function rejects(block: (() => Promise<any>) | Promise<any>, message?: string | Error): Promise<void>;
+        function rejects(block: (() => Promise<any>) | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
+        function doesNotReject(block: (() => Promise<any>) | Promise<any>, message?: string | Error): Promise<void>;
+        function doesNotReject(block: (() => Promise<any>) | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
 
         const strict: typeof internal;
     }
diff --git a/types/node/cluster.d.ts b/types/node/cluster.d.ts
index f089a41ebb..fae80659d8 100644
--- a/types/node/cluster.d.ts
+++ b/types/node/cluster.d.ts
@@ -92,7 +92,7 @@ declare module "cluster" {
 
     interface Cluster extends events.EventEmitter {
         Worker: Worker;
-        disconnect(callback?: Function): void;
+        disconnect(callback?: () => void): void;
         fork(env?: any): Worker;
         isMaster: boolean;
         isWorker: boolean;
@@ -121,7 +121,7 @@ declare module "cluster" {
         addListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
         addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
         addListener(event: "online", listener: (worker: Worker) => void): this;
-        addListener(event: "setup", listener: (settings: any) => void): this;
+        addListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
         emit(event: "disconnect", worker: Worker): boolean;
@@ -130,7 +130,7 @@ declare module "cluster" {
         emit(event: "listening", worker: Worker, address: Address): boolean;
         emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
         emit(event: "online", worker: Worker): boolean;
-        emit(event: "setup", settings: any): boolean;
+        emit(event: "setup", settings: ClusterSettings): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
         on(event: "disconnect", listener: (worker: Worker) => void): this;
@@ -139,7 +139,7 @@ declare module "cluster" {
         on(event: "listening", listener: (worker: Worker, address: Address) => void): this;
         on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
         on(event: "online", listener: (worker: Worker) => void): this;
-        on(event: "setup", listener: (settings: any) => void): this;
+        on(event: "setup", listener: (settings: ClusterSettings) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
         once(event: "disconnect", listener: (worker: Worker) => void): this;
@@ -148,7 +148,7 @@ declare module "cluster" {
         once(event: "listening", listener: (worker: Worker, address: Address) => void): this;
         once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
         once(event: "online", listener: (worker: Worker) => void): this;
-        once(event: "setup", listener: (settings: any) => void): this;
+        once(event: "setup", listener: (settings: ClusterSettings) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "disconnect", listener: (worker: Worker) => void): this;
@@ -157,7 +157,7 @@ declare module "cluster" {
         prependListener(event: "listening", listener: (worker: Worker, address: Address) => void): this;
         prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;  // the handle is a net.Socket or net.Server object, or undefined.
         prependListener(event: "online", listener: (worker: Worker) => void): this;
-        prependListener(event: "setup", listener: (settings: any) => void): this;
+        prependListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): this;
@@ -167,10 +167,10 @@ declare module "cluster" {
         // the handle is a net.Socket or net.Server object, or undefined.
         prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): this;
         prependOnceListener(event: "online", listener: (worker: Worker) => void): this;
-        prependOnceListener(event: "setup", listener: (settings: any) => void): this;
+        prependOnceListener(event: "setup", listener: (settings: ClusterSettings) => void): this;
     }
 
-    function disconnect(callback?: Function): void;
+    function disconnect(callback?: () => void): void;
     function fork(env?: any): Worker;
     const isMaster: boolean;
     const isWorker: boolean;
@@ -200,7 +200,7 @@ declare module "cluster" {
      // the handle is a net.Socket or net.Server object, or undefined.
     function addListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
     function addListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function addListener(event: "setup", listener: (settings: any) => void): Cluster;
+    function addListener(event: "setup", listener: (settings: ClusterSettings) => void): Cluster;
 
     function emit(event: string | symbol, ...args: any[]): boolean;
     function emit(event: "disconnect", worker: Worker): boolean;
@@ -209,7 +209,7 @@ declare module "cluster" {
     function emit(event: "listening", worker: Worker, address: Address): boolean;
     function emit(event: "message", worker: Worker, message: any, handle: net.Socket | net.Server): boolean;
     function emit(event: "online", worker: Worker): boolean;
-    function emit(event: "setup", settings: any): boolean;
+    function emit(event: "setup", settings: ClusterSettings): boolean;
 
     function on(event: string, listener: (...args: any[]) => void): Cluster;
     function on(event: "disconnect", listener: (worker: Worker) => void): Cluster;
@@ -218,7 +218,7 @@ declare module "cluster" {
     function on(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
     function on(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
     function on(event: "online", listener: (worker: Worker) => void): Cluster;
-    function on(event: "setup", listener: (settings: any) => void): Cluster;
+    function on(event: "setup", listener: (settings: ClusterSettings) => void): Cluster;
 
     function once(event: string, listener: (...args: any[]) => void): Cluster;
     function once(event: "disconnect", listener: (worker: Worker) => void): Cluster;
@@ -227,7 +227,7 @@ declare module "cluster" {
     function once(event: "listening", listener: (worker: Worker, address: Address) => void): Cluster;
     function once(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;  // the handle is a net.Socket or net.Server object, or undefined.
     function once(event: "online", listener: (worker: Worker) => void): Cluster;
-    function once(event: "setup", listener: (settings: any) => void): Cluster;
+    function once(event: "setup", listener: (settings: ClusterSettings) => void): Cluster;
 
     function removeListener(event: string, listener: (...args: any[]) => void): Cluster;
     function removeAllListeners(event?: string): Cluster;
@@ -244,7 +244,7 @@ declare module "cluster" {
      // the handle is a net.Socket or net.Server object, or undefined.
     function prependListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
     function prependListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function prependListener(event: "setup", listener: (settings: any) => void): Cluster;
+    function prependListener(event: "setup", listener: (settings: ClusterSettings) => void): Cluster;
 
     function prependOnceListener(event: string, listener: (...args: any[]) => void): Cluster;
     function prependOnceListener(event: "disconnect", listener: (worker: Worker) => void): Cluster;
@@ -254,7 +254,7 @@ declare module "cluster" {
      // the handle is a net.Socket or net.Server object, or undefined.
     function prependOnceListener(event: "message", listener: (worker: Worker, message: any, handle: net.Socket | net.Server) => void): Cluster;
     function prependOnceListener(event: "online", listener: (worker: Worker) => void): Cluster;
-    function prependOnceListener(event: "setup", listener: (settings: any) => void): Cluster;
+    function prependOnceListener(event: "setup", listener: (settings: ClusterSettings) => void): Cluster;
 
     function eventNames(): string[];
 }
diff --git a/types/node/crypto.d.ts b/types/node/crypto.d.ts
index 99c6e236f5..aa10a615f1 100644
--- a/types/node/crypto.d.ts
+++ b/types/node/crypto.d.ts
@@ -185,10 +185,8 @@ declare module "crypto" {
     interface Cipher extends NodeJS.ReadWriteStream {
         update(data: BinaryLike): Buffer;
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-        update(data: Binary, output_encoding: HexBase64BinaryEncoding): string;
-        update(data: Binary, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
-        // second arg ignored
-        update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: Binary, input_encoding: undefined, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: string, input_encoding: Utf8AsciiBinaryEncoding | undefined, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding?: boolean): this;
@@ -227,9 +225,8 @@ declare module "crypto" {
     interface Decipher extends NodeJS.ReadWriteStream {
         update(data: Binary): Buffer;
         update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-        update(data: Binary, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
-        // second arg is ignored
-        update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: Binary, input_encoding: undefined, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: string, input_encoding: HexBase64BinaryEncoding | undefined, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding?: boolean): this;
diff --git a/types/node/dgram.d.ts b/types/node/dgram.d.ts
index 93759406c7..4e0ec6fda7 100644
--- a/types/node/dgram.d.ts
+++ b/types/node/dgram.d.ts
@@ -39,7 +39,7 @@ declare module "dgram" {
         bind(port?: number, address?: string, callback?: () => void): void;
         bind(port?: number, callback?: () => void): void;
         bind(callback?: () => void): void;
-        bind(options: BindOptions, callback?: Function): void;
+        bind(options: BindOptions, callback?: () => void): void;
         close(callback?: () => void): void;
         address(): AddressInfo | string;
         setBroadcast(flag: boolean): void;
diff --git a/types/node/domain.d.ts b/types/node/domain.d.ts
index 6a30decfa5..45e388c461 100644
--- a/types/node/domain.d.ts
+++ b/types/node/domain.d.ts
@@ -2,12 +2,12 @@ declare module "domain" {
     import * as events from "events";
 
     class Domain extends events.EventEmitter implements NodeJS.Domain {
-        run(fn: Function): void;
-        add(emitter: events.EventEmitter): void;
-        remove(emitter: events.EventEmitter): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
-        members: any[];
+        run<T>(fn: (...args: any[]) => T, ...args: any[]): T;
+        add(emitter: events.EventEmitter | NodeJS.Timer): void;
+        remove(emitter: events.EventEmitter | NodeJS.Timer): void;
+        bind<T extends Function>(cb: T): T;
+        intercept<T extends Function>(cb: T): T;
+        members: Array<events.EventEmitter | NodeJS.Timer>;
         enter(): void;
         exit(): void;
     }
diff --git a/types/node/globals.d.ts b/types/node/globals.d.ts
index 36726f5cc0..d10007d194 100644
--- a/types/node/globals.d.ts
+++ b/types/node/globals.d.ts
@@ -360,7 +360,7 @@ declare const Buffer: {
      * Creates a new Buffer using the passed {data}
      * @param data data to create a new Buffer
      */
-    from(data: any[]): Buffer;
+    from(data: number[]): Buffer;
     from(data: Uint8Array): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
@@ -611,12 +611,11 @@ declare namespace NodeJS {
 
     interface WritableStream extends EventEmitter {
         writable: boolean;
-        write(buffer: Buffer | string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        end(cb?: Function): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
+        write(buffer: Buffer | Uint8Array | string, cb?: (err?: Error | null) => void): boolean;
+        write(str: string, encoding?: string, cb?: (err?: Error | null) => void): boolean;
+        end(cb?: () => void): void;
+        end(data: string | Uint8Array | Buffer, cb?: () => void): void;
+        end(str: string, encoding?: string, cb?: () => void): void;
     }
 
     interface ReadWriteStream extends ReadableStream, WritableStream { }
@@ -624,11 +623,11 @@ declare namespace NodeJS {
     interface Events extends EventEmitter { }
 
     interface Domain extends Events {
-        run(fn: Function): void;
-        add(emitter: Events): void;
-        remove(emitter: Events): void;
-        bind(cb: (err: Error, data: any) => any): any;
-        intercept(cb: (data: any) => any): any;
+        run<T>(fn: (...args: any[]) => T, ...args: any[]): T;
+        add(emitter: EventEmitter | Timer): void;
+        remove(emitter: EventEmitter | Timer): void;
+        bind<T extends Function>(cb: T): T;
+        intercept<T extends Function>(cb: T): T;
 
         addListener(event: string, listener: (...args: any[]) => void): this;
         on(event: string, listener: (...args: any[]) => void): this;
@@ -712,9 +711,9 @@ declare namespace NodeJS {
         readonly writableLength: number;
         columns?: number;
         rows?: number;
-        _write(chunk: any, encoding: string, callback: Function): void;
-        _destroy(err: Error | null, callback: Function): void;
-        _final(callback: Function): void;
+        _write(chunk: any, encoding: string, callback: (err?: null | Error) => void): void;
+        _destroy(err: Error | null, callback: (err?: null | Error) => void): void;
+        _final(callback: (err?: null | Error) => void): void;
         setDefaultEncoding(encoding: string): this;
         cork(): void;
         uncork(): void;
@@ -726,7 +725,7 @@ declare namespace NodeJS {
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
         _read(size: number): void;
-        _destroy(err: Error | null, callback: Function): void;
+        _destroy(err: Error | null, callback: (err?: null | Error) => void): void;
         push(chunk: any, encoding?: string): boolean;
         destroy(error?: Error): void;
     }
diff --git a/types/node/http.d.ts b/types/node/http.d.ts
index 913cf98a37..a13dca0943 100644
--- a/types/node/http.d.ts
+++ b/types/node/http.d.ts
@@ -1,8 +1,8 @@
 declare module "http" {
     import * as events from "events";
-    import * as net from "net";
     import * as stream from "stream";
     import { URL } from "url";
+    import { Socket, Server as NetServer } from "net";
 
     // incoming headers will never contain number
     interface IncomingHttpHeaders {
@@ -85,7 +85,7 @@ declare module "http" {
         timeout?: number;
         setHost?: boolean;
         // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L278
-        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: net.Socket) => void) => net.Socket;
+        createConnection?: (options: ClientRequestArgs, oncreate: (err: Error, socket: Socket) => void) => Socket;
     }
 
     interface ServerOptions {
@@ -95,7 +95,7 @@ declare module "http" {
 
     type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
 
-    class Server extends net.Server {
+    class Server extends NetServer {
         constructor(requestListener?: RequestListener);
         constructor(options: ServerOptions, requestListener?: RequestListener);
 
@@ -120,7 +120,7 @@ declare module "http" {
         sendDate: boolean;
         finished: boolean;
         headersSent: boolean;
-        connection: net.Socket;
+        connection: Socket;
 
         constructor();
 
@@ -142,8 +142,8 @@ declare module "http" {
 
         constructor(req: IncomingMessage);
 
-        assignSocket(socket: net.Socket): void;
-        detachSocket(socket: net.Socket): void;
+        assignSocket(socket: Socket): void;
+        detachSocket(socket: Socket): void;
         // https://github.com/nodejs/node/blob/master/test/parallel/test-http-write-callbacks.js#L53
         // no args in writeContinue callback
         writeContinue(callback?: () => void): void;
@@ -153,27 +153,27 @@ declare module "http" {
 
     // https://github.com/nodejs/node/blob/master/lib/_http_client.js#L77
     class ClientRequest extends OutgoingMessage {
-        connection: net.Socket;
-        socket: net.Socket;
+        connection: Socket;
+        socket: Socket;
         aborted: number;
 
         constructor(url: string | URL | ClientRequestArgs, cb?: (res: IncomingMessage) => void);
 
         readonly path: string;
         abort(): void;
-        onSocket(socket: net.Socket): void;
+        onSocket(socket: Socket): void;
         setTimeout(timeout: number, callback?: () => void): this;
         setNoDelay(noDelay?: boolean): void;
         setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
     }
 
     class IncomingMessage extends stream.Readable {
-        constructor(socket: net.Socket);
+        constructor(socket: Socket);
 
         httpVersion: string;
         httpVersionMajor: number;
         httpVersionMinor: number;
-        connection: net.Socket;
+        connection: Socket;
         headers: IncomingHttpHeaders;
         rawHeaders: string[];
         trailers: { [key: string]: string | undefined };
@@ -195,7 +195,7 @@ declare module "http" {
          * Only valid for response obtained from http.ClientRequest.
          */
         statusMessage?: string;
-        socket: net.Socket;
+        socket: Socket;
         destroy(error?: Error): void;
     }
 
@@ -226,8 +226,12 @@ declare module "http" {
     class Agent {
         maxFreeSockets: number;
         maxSockets: number;
-        sockets: any;
-        requests: any;
+        readonly sockets: {
+            readonly [key: string]: Socket[];
+        };
+        readonly requests: {
+            readonly [key: string]: IncomingMessage[];
+        };
 
         constructor(opts?: AgentOptions);
 
@@ -249,7 +253,6 @@ declare module "http" {
 
     function createServer(requestListener?: RequestListener): Server;
     function createServer(options: ServerOptions, requestListener?: RequestListener): Server;
-    function createClient(port?: number, host?: string): any;
 
     // although RequestOptions are passed as ClientRequestArgs to ClientRequest directly,
     // create interface RequestOptions would make the naming more clear to developers
diff --git a/types/node/http2.d.ts b/types/node/http2.d.ts
index 48e35190d4..6e6f0e0b62 100644
--- a/types/node/http2.d.ts
+++ b/types/node/http2.d.ts
@@ -558,7 +558,7 @@ declare module "http2" {
         prependOnceListener(event: "aborted", listener: (hadError: boolean, code: number) => void): this;
     }
 
-    export class Http2ServerResponse extends events.EventEmitter {
+    export class Http2ServerResponse extends stream.Stream {
         private constructor();
         addTrailers(trailers: OutgoingHttpHeaders): void;
         connection: net.Socket | tls.TLSSocket;
diff --git a/types/node/net.d.ts b/types/node/net.d.ts
index d011f6297c..1cf524d394 100644
--- a/types/node/net.d.ts
+++ b/types/node/net.d.ts
@@ -38,22 +38,18 @@ declare module "net" {
         constructor(options?: SocketConstructorOpts);
 
         // Extended base methods
-        write(buffer: Buffer): boolean;
-        write(buffer: Buffer, cb?: Function): boolean;
-        write(str: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, cb?: Function): boolean;
-        write(str: string, encoding?: string, fd?: string): boolean;
-        write(data: any, encoding?: string, callback?: Function): void;
+        write(buffer: Buffer | Uint8Array | string, cb?: (err?: Error) => void): boolean;
+        write(str: Buffer | Uint8Array | string, encoding?: string, cb?: (err?: Error) => void): boolean;
 
-        connect(options: SocketConnectOpts, connectionListener?: Function): this;
-        connect(port: number, host: string, connectionListener?: Function): this;
-        connect(port: number, connectionListener?: Function): this;
-        connect(path: string, connectionListener?: Function): this;
+        connect(options: SocketConnectOpts, connectionListener?: () => void): this;
+        connect(port: number, host: string, connectionListener?: () => void): this;
+        connect(port: number, connectionListener?: () => void): this;
+        connect(path: string, connectionListener?: () => void): this;
 
         setEncoding(encoding?: string): this;
         pause(): this;
         resume(): this;
-        setTimeout(timeout: number, callback?: Function): this;
+        setTimeout(timeout: number, callback?: () => void): this;
         setNoDelay(noDelay?: boolean): this;
         setKeepAlive(enable?: boolean, initialDelay?: number): this;
         address(): AddressInfo | string;
@@ -72,11 +68,9 @@ declare module "net" {
         readonly remotePort?: number;
 
         // Extended base methods
-        end(): void;
-        end(buffer: Buffer, cb?: Function): void;
-        end(str: string, cb?: Function): void;
-        end(str: string, encoding?: string, cb?: Function): void;
-        end(data?: any, encoding?: string): void;
+        end(cb?: () => void): void;
+        end(buffer: Buffer | Uint8Array | string, cb?: () => void): void;
+        end(str: Buffer | Uint8Array | string, encoding?: string, cb?: () => void): void;
 
         /**
          * events.EventEmitter
@@ -169,15 +163,15 @@ declare module "net" {
         constructor(connectionListener?: (socket: Socket) => void);
         constructor(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void);
 
-        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: Function): this;
-        listen(port?: number, hostname?: string, listeningListener?: Function): this;
-        listen(port?: number, backlog?: number, listeningListener?: Function): this;
-        listen(port?: number, listeningListener?: Function): this;
-        listen(path: string, backlog?: number, listeningListener?: Function): this;
-        listen(path: string, listeningListener?: Function): this;
-        listen(options: ListenOptions, listeningListener?: Function): this;
-        listen(handle: any, backlog?: number, listeningListener?: Function): this;
-        listen(handle: any, listeningListener?: Function): this;
+        listen(port?: number, hostname?: string, backlog?: number, listeningListener?: () => void): this;
+        listen(port?: number, hostname?: string, listeningListener?: () => void): this;
+        listen(port?: number, backlog?: number, listeningListener?: () => void): this;
+        listen(port?: number, listeningListener?: () => void): this;
+        listen(path: string, backlog?: number, listeningListener?: () => void): this;
+        listen(path: string, listeningListener?: () => void): this;
+        listen(options: ListenOptions, listeningListener?: () => void): this;
+        listen(handle: any, backlog?: number, listeningListener?: () => void): this;
+        listen(handle: any, listeningListener?: () => void): this;
         close(callback?: (err?: Error) => void): this;
         address(): AddressInfo | string | null;
         getConnections(cb: (error: Error | null, count: number) => void): void;
@@ -243,12 +237,12 @@ declare module "net" {
 
     function createServer(connectionListener?: (socket: Socket) => void): Server;
     function createServer(options?: { allowHalfOpen?: boolean, pauseOnConnect?: boolean }, connectionListener?: (socket: Socket) => void): Server;
-    function connect(options: NetConnectOpts, connectionListener?: Function): Socket;
-    function connect(port: number, host?: string, connectionListener?: Function): Socket;
-    function connect(path: string, connectionListener?: Function): Socket;
-    function createConnection(options: NetConnectOpts, connectionListener?: Function): Socket;
-    function createConnection(port: number, host?: string, connectionListener?: Function): Socket;
-    function createConnection(path: string, connectionListener?: Function): Socket;
+    function connect(options: NetConnectOpts, connectionListener?: () => void): Socket;
+    function connect(port: number, host?: string, connectionListener?: () => void): Socket;
+    function connect(path: string, connectionListener?: () => void): Socket;
+    function createConnection(options: NetConnectOpts, connectionListener?: () => void): Socket;
+    function createConnection(port: number, host?: string, connectionListener?: () => void): Socket;
+    function createConnection(path: string, connectionListener?: () => void): Socket;
     function isIP(input: string): number;
     function isIPv4(input: string): boolean;
     function isIPv6(input: string): boolean;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 900a8fa21a..17a00de039 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2,16 +2,10 @@ import assert = require("assert");
 import * as fs from "fs";
 import * as events from "events";
 import events2 = require("events");
-import * as zlib from "zlib";
 import * as url from "url";
 import * as util from "util";
-import * as tls from "tls";
 import * as http from "http";
 import * as https from "https";
-import * as querystring from "querystring";
-import * as path from "path";
-import * as cluster from "cluster";
-import * as os from "os";
 import * as vm from "vm";
 import * as console2 from "console";
 import * as string_decoder from "string_decoder";
@@ -23,50 +17,6 @@ import * as inspector from "inspector";
 import * as trace_events from "trace_events";
 import Module = require("module");
 
-//////////////////////////////////////////////////////////
-/// Assert Tests : https://nodejs.org/api/assert.html ///
-//////////////////////////////////////////////////////////
-
-{
-    {
-        assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
-
-        assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
-
-        assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
-
-        assert.doesNotThrow(() => {
-            const b = false;
-            if (b) { throw new Error("a hammer at your face"); }
-        }, () => 1, "What the...*crunch*");
-
-        assert.equal(3, "3", "uses == comparator");
-
-        assert.fail('stuff broke');
-
-        assert.fail('actual', 'expected', 'message');
-
-        assert.fail(1, 2, undefined, '>');
-
-        assert.ifError(0);
-
-        assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
-
-        assert.notEqual(1, 2, "uses != comparator");
-
-        assert.notStrictEqual(2, "2", "uses === comparator");
-
-        assert.ok(true);
-        assert.ok(1);
-
-        assert.strictEqual(1, 1, "uses === comparator");
-
-        assert.throws(() => { throw new Error("a hammer at your face"); }, Error, "DODGED IT");
-
-        assert.strict.strict.deepEqual([[[1, 2, 3]], 4, 5], [[[1, 2, '3']], 4, 5]);
-    }
-}
-
 ////////////////////////////////////////////////////
 /// Events tests : http://nodejs.org/api/events.html
 ////////////////////////////////////////////////////
@@ -633,221 +583,6 @@ import Module = require("module");
     }
 }
 
-////////////////////////////////////////////////////
-/// Querystring tests : https://nodejs.org/api/querystring.html
-////////////////////////////////////////////////////
-
-{
-    interface SampleObject { a: string; }
-
-    {
-        const obj: SampleObject = { a: "" };
-        const sep = '';
-        const eq = '';
-        const options: querystring.StringifyOptions = {};
-        let result: string;
-
-        result = querystring.stringify(obj);
-        result = querystring.stringify(obj, sep);
-        result = querystring.stringify(obj, sep, eq);
-        result = querystring.stringify(obj, sep, eq);
-        result = querystring.stringify(obj, sep, eq, options);
-    }
-
-    {
-        const str = '';
-        const sep = '';
-        const eq = '';
-        const options: querystring.ParseOptions = {};
-        let result: querystring.ParsedUrlQuery;
-
-        result = querystring.parse(str);
-        result = querystring.parse(str, sep);
-        result = querystring.parse(str, sep, eq);
-        result = querystring.parse(str, sep, eq, options);
-    }
-
-    {
-        const str = '';
-        let result: string;
-
-        result = querystring.escape(str);
-        result = querystring.unescape(str);
-    }
-}
-
-////////////////////////////////////////////////////
-/// path tests : http://nodejs.org/api/path.html
-////////////////////////////////////////////////////
-
-{
-    path.normalize('/foo/bar//baz/asdf/quux/..');
-
-    path.join('/foo', 'bar', 'baz/asdf', 'quux', '..');
-    // returns
-    // '/foo/bar/baz/asdf'
-
-    try {
-        path.join('foo', 'bar');
-    } catch (error) { }
-
-    path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile');
-    // Is similar to:
-    //
-    // cd foo/bar
-    // cd /tmp/file/
-    // cd ..
-    //    cd a/../subfile
-    // pwd
-
-    path.resolve('/foo/bar', './baz');
-    // returns
-    //    '/foo/bar/baz'
-
-    path.resolve('/foo/bar', '/tmp/file/');
-    // returns
-    //    '/tmp/file'
-
-    path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif');
-    // if currently in /home/myself/node, it returns
-    //    '/home/myself/node/wwwroot/static_files/gif/image.gif'
-
-    path.isAbsolute('/foo/bar'); // true
-    path.isAbsolute('/baz/..');  // true
-    path.isAbsolute('qux/');     // false
-    path.isAbsolute('.');        // false
-
-    path.isAbsolute('//server');  // true
-    path.isAbsolute('C:/foo/..'); // true
-    path.isAbsolute('bar\\baz');   // false
-    path.isAbsolute('.');         // false
-
-    path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb');
-    // returns
-    //    '..\\..\\impl\\bbb'
-
-    path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb');
-    // returns
-    //    '../../impl/bbb'
-
-    path.dirname('/foo/bar/baz/asdf/quux');
-    // returns
-    //    '/foo/bar/baz/asdf'
-
-    path.basename('/foo/bar/baz/asdf/quux.html');
-    // returns
-    //    'quux.html'
-
-    path.basename('/foo/bar/baz/asdf/quux.html', '.html');
-    // returns
-    //    'quux'
-
-    path.extname('index.html');
-    // returns
-    //    '.html'
-
-    path.extname('index.coffee.md');
-    // returns
-    //    '.md'
-
-    path.extname('index.');
-    // returns
-    //    '.'
-
-    path.extname('index');
-    // returns
-    //    ''
-
-    'foo/bar/baz'.split(path.sep);
-    // returns
-    //        ['foo', 'bar', 'baz']
-
-    'foo\\bar\\baz'.split(path.sep);
-    // returns
-    //        ['foo', 'bar', 'baz']
-
-    process.env["PATH"]; // $ExpectType string | undefined
-
-    path.parse('/home/user/dir/file.txt');
-    // returns
-    //    {
-    //        root : "/",
-    //        dir : "/home/user/dir",
-    //        base : "file.txt",
-    //        ext : ".txt",
-    //        name : "file"
-    //    }
-
-    path.parse('C:\\path\\dir\\index.html');
-    // returns
-    //    {
-    //        root : "C:\",
-    //        dir : "C:\path\dir",
-    //        base : "index.html",
-    //        ext : ".html",
-    //        name : "index"
-    //    }
-
-    path.format({
-        root: "/",
-        dir: "/home/user/dir",
-        base: "file.txt",
-        ext: ".txt",
-        name: "file"
-    });
-    // returns
-    //    '/home/user/dir/file.txt'
-
-    path.format({
-        root: "/",
-        dir: "/home/user/dir",
-        ext: ".txt",
-        name: "file"
-    });
-    // returns
-    //    '/home/user/dir/file.txt'
-
-    path.format({
-        dir: "/home/user/dir",
-        base: "file.txt"
-    });
-    // returns
-    //    '/home/user/dir/file.txt'
-
-    path.posix.format({
-        root: "/",
-        dir: "/home/user/dir",
-        base: "file.txt",
-        ext: ".txt",
-        name: "file"
-    });
-    // returns
-    //    '/home/user/dir/file.txt'
-
-    path.posix.format({
-        dir: "/home/user/dir",
-        base: "file.txt"
-    });
-    // returns
-    //    '/home/user/dir/file.txt'
-
-    path.win32.format({
-        root: "C:\\",
-        dir: "C:\\home\\user\\dir",
-        ext: ".txt",
-        name: "file"
-    });
-    // returns
-    //    'C:\home\user\dir\file.txt'
-
-    path.win32.format({
-        dir: "C:\\home\\user\\dir",
-        base: "file.txt"
-    });
-    // returns
-    //    'C:\home\user\dir\file.txt'
-}
-
 ////////////////////////////////////////////////////
 /// string_decoder tests : https://nodejs.org/api/string_decoder.html
 ////////////////////////////////////////////////////
@@ -863,200 +598,6 @@ import Module = require("module");
     const end2: string = decoder1.end(new Buffer('test'));
 }
 
-//////////////////////////////////////////////////////////////////////
-/// cluster tests: https://nodejs.org/api/cluster.html ///
-//////////////////////////////////////////////////////////////////////
-
-{
-    {
-        cluster.fork();
-        Object.keys(cluster.workers).forEach(key => {
-            const worker = cluster.workers[key];
-            if (worker && worker.isDead()) {
-                console.log('worker %d is dead', worker.process.pid);
-            }
-        });
-    }
-}
-
-////////////////////////////////////////////////////
-/// os tests : https://nodejs.org/api/os.html
-////////////////////////////////////////////////////
-
-{
-    {
-        let result: string;
-
-        result = os.tmpdir();
-        result = os.homedir();
-        result = os.endianness();
-        result = os.hostname();
-        result = os.type();
-        result = os.arch();
-        result = os.release();
-        result = os.EOL;
-    }
-
-    {
-        let result: number;
-
-        result = os.uptime();
-        result = os.totalmem();
-        result = os.freemem();
-    }
-
-    {
-        let result: number[];
-
-        result = os.loadavg();
-    }
-
-    {
-        let result: os.CpuInfo[];
-
-        result = os.cpus();
-    }
-
-    {
-        let result: { [index: string]: os.NetworkInterfaceInfo[] };
-
-        result = os.networkInterfaces();
-    }
-
-    {
-        let result: number;
-
-        result = os.constants.signals.SIGHUP;
-        result = os.constants.signals.SIGINT;
-        result = os.constants.signals.SIGQUIT;
-        result = os.constants.signals.SIGILL;
-        result = os.constants.signals.SIGTRAP;
-        result = os.constants.signals.SIGABRT;
-        result = os.constants.signals.SIGIOT;
-        result = os.constants.signals.SIGBUS;
-        result = os.constants.signals.SIGFPE;
-        result = os.constants.signals.SIGKILL;
-        result = os.constants.signals.SIGUSR1;
-        result = os.constants.signals.SIGSEGV;
-        result = os.constants.signals.SIGUSR2;
-        result = os.constants.signals.SIGPIPE;
-        result = os.constants.signals.SIGALRM;
-        result = os.constants.signals.SIGTERM;
-        result = os.constants.signals.SIGCHLD;
-        result = os.constants.signals.SIGSTKFLT;
-        result = os.constants.signals.SIGCONT;
-        result = os.constants.signals.SIGSTOP;
-        result = os.constants.signals.SIGTSTP;
-        result = os.constants.signals.SIGTTIN;
-        result = os.constants.signals.SIGTTOU;
-        result = os.constants.signals.SIGURG;
-        result = os.constants.signals.SIGXCPU;
-        result = os.constants.signals.SIGXFSZ;
-        result = os.constants.signals.SIGVTALRM;
-        result = os.constants.signals.SIGPROF;
-        result = os.constants.signals.SIGWINCH;
-        result = os.constants.signals.SIGIO;
-        result = os.constants.signals.SIGPOLL;
-        result = os.constants.signals.SIGPWR;
-        result = os.constants.signals.SIGSYS;
-        result = os.constants.signals.SIGUNUSED;
-    }
-
-    {
-        let result: number;
-
-        result = os.constants.errno.E2BIG;
-        result = os.constants.errno.EACCES;
-        result = os.constants.errno.EADDRINUSE;
-        result = os.constants.errno.EADDRNOTAVAIL;
-        result = os.constants.errno.EAFNOSUPPORT;
-        result = os.constants.errno.EAGAIN;
-        result = os.constants.errno.EALREADY;
-        result = os.constants.errno.EBADF;
-        result = os.constants.errno.EBADMSG;
-        result = os.constants.errno.EBUSY;
-        result = os.constants.errno.ECANCELED;
-        result = os.constants.errno.ECHILD;
-        result = os.constants.errno.ECONNABORTED;
-        result = os.constants.errno.ECONNREFUSED;
-        result = os.constants.errno.ECONNRESET;
-        result = os.constants.errno.EDEADLK;
-        result = os.constants.errno.EDESTADDRREQ;
-        result = os.constants.errno.EDOM;
-        result = os.constants.errno.EDQUOT;
-        result = os.constants.errno.EEXIST;
-        result = os.constants.errno.EFAULT;
-        result = os.constants.errno.EFBIG;
-        result = os.constants.errno.EHOSTUNREACH;
-        result = os.constants.errno.EIDRM;
-        result = os.constants.errno.EILSEQ;
-        result = os.constants.errno.EINPROGRESS;
-        result = os.constants.errno.EINTR;
-        result = os.constants.errno.EINVAL;
-        result = os.constants.errno.EIO;
-        result = os.constants.errno.EISCONN;
-        result = os.constants.errno.EISDIR;
-        result = os.constants.errno.ELOOP;
-        result = os.constants.errno.EMFILE;
-        result = os.constants.errno.EMLINK;
-        result = os.constants.errno.EMSGSIZE;
-        result = os.constants.errno.EMULTIHOP;
-        result = os.constants.errno.ENAMETOOLONG;
-        result = os.constants.errno.ENETDOWN;
-        result = os.constants.errno.ENETRESET;
-        result = os.constants.errno.ENETUNREACH;
-        result = os.constants.errno.ENFILE;
-        result = os.constants.errno.ENOBUFS;
-        result = os.constants.errno.ENODATA;
-        result = os.constants.errno.ENODEV;
-        result = os.constants.errno.ENOENT;
-        result = os.constants.errno.ENOEXEC;
-        result = os.constants.errno.ENOLCK;
-        result = os.constants.errno.ENOLINK;
-        result = os.constants.errno.ENOMEM;
-        result = os.constants.errno.ENOMSG;
-        result = os.constants.errno.ENOPROTOOPT;
-        result = os.constants.errno.ENOSPC;
-        result = os.constants.errno.ENOSR;
-        result = os.constants.errno.ENOSTR;
-        result = os.constants.errno.ENOSYS;
-        result = os.constants.errno.ENOTCONN;
-        result = os.constants.errno.ENOTDIR;
-        result = os.constants.errno.ENOTEMPTY;
-        result = os.constants.errno.ENOTSOCK;
-        result = os.constants.errno.ENOTSUP;
-        result = os.constants.errno.ENOTTY;
-        result = os.constants.errno.ENXIO;
-        result = os.constants.errno.EOPNOTSUPP;
-        result = os.constants.errno.EOVERFLOW;
-        result = os.constants.errno.EPERM;
-        result = os.constants.errno.EPIPE;
-        result = os.constants.errno.EPROTO;
-        result = os.constants.errno.EPROTONOSUPPORT;
-        result = os.constants.errno.EPROTOTYPE;
-        result = os.constants.errno.ERANGE;
-        result = os.constants.errno.EROFS;
-        result = os.constants.errno.ESPIPE;
-        result = os.constants.errno.ESRCH;
-        result = os.constants.errno.ESTALE;
-        result = os.constants.errno.ETIME;
-        result = os.constants.errno.ETIMEDOUT;
-        result = os.constants.errno.ETXTBSY;
-        result = os.constants.errno.EWOULDBLOCK;
-        result = os.constants.errno.EXDEV;
-    }
-
-    {
-        const prio = os.getPriority();
-        os.setPriority(prio + 1);
-
-        const prio2 = os.getPriority(1);
-        os.setPriority(2, prio + 1);
-
-        os.setPriority(os.constants.priority.PRIORITY_LOW);
-    }
-}
-
 ////////////////////////////////////////////////////
 /// vm tests : https://nodejs.org/api/vm.html
 ////////////////////////////////////////////////////
@@ -1655,27 +1196,6 @@ import * as constants from 'constants';
     });
 }
 
-////////////////////////////////////////////////////
-/// zlib tests : http://nodejs.org/api/zlib.html ///
-////////////////////////////////////////////////////
-
-{
-    {
-        const gzipped = zlib.gzipSync('test');
-        const unzipped = zlib.gunzipSync(gzipped.toString());
-    }
-
-    {
-        const deflate = zlib.deflateSync('test');
-        const inflate = zlib.inflateSync(deflate.toString());
-    }
-
-    {
-        const gzip = zlib.createGzip();
-        const written: number = gzip.bytesWritten;
-    }
-}
-
 ///////////////////////////////////////////////////////////
 /// Inspector Tests                                     ///
 ///////////////////////////////////////////////////////////
diff --git a/types/node/os.d.ts b/types/node/os.d.ts
index c85d217f91..4182e50748 100644
--- a/types/node/os.d.ts
+++ b/types/node/os.d.ts
@@ -28,6 +28,14 @@ declare module "os" {
         scopeid: number;
     }
 
+    interface UserInfo<T> {
+        username: T;
+        uid: number;
+        gid: number;
+        shell: T;
+        homedir: T;
+    }
+
     type NetworkInterfaceInfo = NetworkInterfaceInfoIPv4 | NetworkInterfaceInfoIPv6;
 
     function hostname(): string;
@@ -40,7 +48,8 @@ declare module "os" {
     function release(): string;
     function networkInterfaces(): { [index: string]: NetworkInterfaceInfo[] };
     function homedir(): string;
-    function userInfo(options?: { encoding: string }): { username: string, uid: number, gid: number, shell: any, homedir: string };
+    function userInfo(options: { encoding: 'buffer' }): UserInfo<Buffer>;
+    function userInfo(options?: { encoding: string }): UserInfo<string>;
     const constants: {
         UV_UDP_REUSEADDR: number;
         signals: {
diff --git a/types/node/path.d.ts b/types/node/path.d.ts
index bbc17098f4..2f4a549186 100644
--- a/types/node/path.d.ts
+++ b/types/node/path.d.ts
@@ -129,8 +129,8 @@ declare module "path" {
 
     namespace posix {
         function normalize(p: string): string;
-        function join(...paths: any[]): string;
-        function resolve(...pathSegments: any[]): string;
+        function join(...paths: string[]): string;
+        function resolve(...pathSegments: string[]): string;
         function isAbsolute(p: string): boolean;
         function relative(from: string, to: string): string;
         function dirname(p: string): string;
@@ -144,8 +144,8 @@ declare module "path" {
 
     namespace win32 {
         function normalize(p: string): string;
-        function join(...paths: any[]): string;
-        function resolve(...pathSegments: any[]): string;
+        function join(...paths: string[]): string;
+        function resolve(...pathSegments: string[]): string;
         function isAbsolute(p: string): boolean;
         function relative(from: string, to: string): string;
         function dirname(p: string): string;
diff --git a/types/node/punycode.d.ts b/types/node/punycode.d.ts
index efc55622f1..75d2811d03 100644
--- a/types/node/punycode.d.ts
+++ b/types/node/punycode.d.ts
@@ -8,5 +8,5 @@ declare module "punycode" {
         decode(string: string): number[];
         encode(codePoints: number[]): string;
     }
-    const version: any;
+    const version: string;
 }
diff --git a/types/node/querystring.d.ts b/types/node/querystring.d.ts
index f54d352c6c..30d82eb178 100644
--- a/types/node/querystring.d.ts
+++ b/types/node/querystring.d.ts
@@ -1,11 +1,11 @@
 declare module "querystring" {
     interface StringifyOptions {
-        encodeURIComponent?: Function;
+        encodeURIComponent?: (str: string) => string;
     }
 
     interface ParseOptions {
         maxKeys?: number;
-        decodeURIComponent?: Function;
+        decodeURIComponent?: (str: string) => string;
     }
 
     interface ParsedUrlQuery { [key: string]: string | string[]; }
diff --git a/types/node/readline.d.ts b/types/node/readline.d.ts
index 011cf7ad64..c2518d8dab 100644
--- a/types/node/readline.d.ts
+++ b/types/node/readline.d.ts
@@ -110,7 +110,7 @@ declare module "readline" {
     type ReadLine = Interface; // type forwarded for backwards compatiblity
 
     type Completer = (line: string) => CompleterResult;
-    type AsyncCompleter = (line: string, callback: (err: any, result: CompleterResult) => void) => any;
+    type AsyncCompleter = (line: string, callback: (err?: null | Error, result?: CompleterResult) => void) => any;
 
     type CompleterResult = [string[], string];
 
diff --git a/types/node/stream.d.ts b/types/node/stream.d.ts
index 2b0e1c72ac..ab6730c83b 100644
--- a/types/node/stream.d.ts
+++ b/types/node/stream.d.ts
@@ -31,7 +31,7 @@ declare module "stream" {
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): this;
             push(chunk: any, encoding?: string): boolean;
-            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            _destroy(error: Error | null, callback: (error?: Error | null) => void): void;
             destroy(error?: Error): void;
 
             /**
@@ -112,7 +112,7 @@ declare module "stream" {
             constructor(opts?: WritableOptions);
             _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
-            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            _destroy(error: Error | null, callback: (error?: Error | null) => void): void;
             _final(callback: (error?: Error | null) => void): void;
             write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
             write(chunk: any, encoding?: string, cb?: (error: Error | null | undefined) => void): boolean;
@@ -212,8 +212,8 @@ declare module "stream" {
             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
             _destroy(error: Error | null, callback: (error: Error | null) => void): void;
             _final(callback: (error?: Error | null) => void): void;
-            write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
             write(chunk: any, encoding?: string, cb?: (error: Error | null | undefined) => void): boolean;
+            write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
             setDefaultEncoding(encoding: string): this;
             end(cb?: () => void): void;
             end(chunk: any, cb?: () => void): void;
diff --git a/types/node/test/assert.ts b/types/node/test/assert.ts
new file mode 100644
index 0000000000..9e979ddf21
--- /dev/null
+++ b/types/node/test/assert.ts
@@ -0,0 +1,43 @@
+import * as assert from 'assert';
+
+assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
+
+assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
+
+assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
+
+assert.doesNotThrow(() => {
+    const b = false;
+    if (b) { throw new Error("a hammer at your face"); }
+}, () => 1, "What the...*crunch*");
+
+assert.equal(3, "3", "uses == comparator");
+
+assert.fail('stuff broke');
+
+assert.fail('actual', 'expected', 'message');
+
+assert.fail(1, 2, undefined, '>');
+
+assert.ifError(0);
+
+assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
+
+assert.notEqual(1, 2, "uses != comparator");
+
+assert.notStrictEqual(2, "2", "uses === comparator");
+
+assert.ok(true);
+assert.ok(1);
+
+assert.strictEqual(1, 1, "uses === comparator");
+
+assert.throws(() => { throw new Error("a hammer at your face"); }, Error, "DODGED IT");
+
+assert.rejects(async () => 1);
+assert.rejects(Promise.resolve(1));
+
+assert.doesNotReject(async () => 1);
+assert.doesNotReject(Promise.resolve(1));
+
+assert.strict.strict.deepEqual([[[1, 2, 3]], 4, 5], [[[1, 2, '3']], 4, 5]);
diff --git a/types/node/test/cluster.ts b/types/node/test/cluster.ts
new file mode 100644
index 0000000000..0a23a5636b
--- /dev/null
+++ b/types/node/test/cluster.ts
@@ -0,0 +1,11 @@
+import * as cluster from 'cluster';
+
+cluster.fork();
+Object.keys(cluster.workers).forEach(key => {
+    const worker = cluster.workers[key];
+    if (worker && worker.isDead()) {
+        console.log('worker %d is dead', worker.process.pid);
+    }
+});
+
+cluster.on('setup', (settings: cluster.ClusterSettings) => {});
diff --git a/types/node/test/crypto.ts b/types/node/test/crypto.ts
index 4dbe6e06ff..76e6e11e57 100644
--- a/types/node/test/crypto.ts
+++ b/types/node/test/crypto.ts
@@ -135,7 +135,7 @@ import { promisify } from 'util';
     decipher.setAAD(aad, {
         plaintextLength: ciphertext.length
     });
-    const receivedPlaintext: string = decipher.update(ciphertext, null, 'utf8');
+    const receivedPlaintext: string = decipher.update(ciphertext, undefined, 'utf8');
     decipher.final();
 }
 
@@ -158,7 +158,7 @@ import { promisify } from 'util';
     decipher.setAAD(aad, {
         plaintextLength: ciphertext.length
     });
-    const receivedPlaintext: string = decipher.update(ciphertext, null, 'utf8');
+    const receivedPlaintext: string = decipher.update(ciphertext, undefined, 'utf8');
     decipher.final();
 }
 
diff --git a/types/node/test/http2.ts b/types/node/test/http2.ts
index 0bada91a97..76d6044d02 100644
--- a/types/node/test/http2.ts
+++ b/types/node/test/http2.ts
@@ -326,8 +326,6 @@ import { URL } from 'url';
         response.end('', 'utf8', () => {});
         response.end(Buffer.from([]));
         response.end(Buffer.from([]), () => {});
-        response.end(Buffer.from([]), 'utf8');
-        response.end(Buffer.from([]), 'utf8', () => {});
 
         request.on('aborted', (hadError: boolean, code: number) => {});
         request.on('close', () => {});
diff --git a/types/node/test/os.ts b/types/node/test/os.ts
new file mode 100644
index 0000000000..bdd4f2bf6c
--- /dev/null
+++ b/types/node/test/os.ts
@@ -0,0 +1,177 @@
+import * as os from 'os';
+{
+    let result: string;
+
+    result = os.tmpdir();
+    result = os.homedir();
+    result = os.endianness();
+    result = os.hostname();
+    result = os.type();
+    result = os.arch();
+    result = os.release();
+    result = os.EOL;
+}
+
+{
+    const a: os.UserInfo<string> = os.userInfo();
+    const b: os.UserInfo<Buffer> = os.userInfo({ encoding: 'buffer' });
+}
+
+{
+    let result: number;
+
+    result = os.uptime();
+    result = os.totalmem();
+    result = os.freemem();
+}
+
+{
+    let result: number[];
+
+    result = os.loadavg();
+}
+
+{
+    let result: os.CpuInfo[];
+
+    result = os.cpus();
+}
+
+{
+    let result: { [index: string]: os.NetworkInterfaceInfo[] };
+
+    result = os.networkInterfaces();
+}
+
+{
+    let result: number;
+
+    result = os.constants.signals.SIGHUP;
+    result = os.constants.signals.SIGINT;
+    result = os.constants.signals.SIGQUIT;
+    result = os.constants.signals.SIGILL;
+    result = os.constants.signals.SIGTRAP;
+    result = os.constants.signals.SIGABRT;
+    result = os.constants.signals.SIGIOT;
+    result = os.constants.signals.SIGBUS;
+    result = os.constants.signals.SIGFPE;
+    result = os.constants.signals.SIGKILL;
+    result = os.constants.signals.SIGUSR1;
+    result = os.constants.signals.SIGSEGV;
+    result = os.constants.signals.SIGUSR2;
+    result = os.constants.signals.SIGPIPE;
+    result = os.constants.signals.SIGALRM;
+    result = os.constants.signals.SIGTERM;
+    result = os.constants.signals.SIGCHLD;
+    result = os.constants.signals.SIGSTKFLT;
+    result = os.constants.signals.SIGCONT;
+    result = os.constants.signals.SIGSTOP;
+    result = os.constants.signals.SIGTSTP;
+    result = os.constants.signals.SIGTTIN;
+    result = os.constants.signals.SIGTTOU;
+    result = os.constants.signals.SIGURG;
+    result = os.constants.signals.SIGXCPU;
+    result = os.constants.signals.SIGXFSZ;
+    result = os.constants.signals.SIGVTALRM;
+    result = os.constants.signals.SIGPROF;
+    result = os.constants.signals.SIGWINCH;
+    result = os.constants.signals.SIGIO;
+    result = os.constants.signals.SIGPOLL;
+    result = os.constants.signals.SIGPWR;
+    result = os.constants.signals.SIGSYS;
+    result = os.constants.signals.SIGUNUSED;
+}
+
+{
+    let result: number;
+
+    result = os.constants.errno.E2BIG;
+    result = os.constants.errno.EACCES;
+    result = os.constants.errno.EADDRINUSE;
+    result = os.constants.errno.EADDRNOTAVAIL;
+    result = os.constants.errno.EAFNOSUPPORT;
+    result = os.constants.errno.EAGAIN;
+    result = os.constants.errno.EALREADY;
+    result = os.constants.errno.EBADF;
+    result = os.constants.errno.EBADMSG;
+    result = os.constants.errno.EBUSY;
+    result = os.constants.errno.ECANCELED;
+    result = os.constants.errno.ECHILD;
+    result = os.constants.errno.ECONNABORTED;
+    result = os.constants.errno.ECONNREFUSED;
+    result = os.constants.errno.ECONNRESET;
+    result = os.constants.errno.EDEADLK;
+    result = os.constants.errno.EDESTADDRREQ;
+    result = os.constants.errno.EDOM;
+    result = os.constants.errno.EDQUOT;
+    result = os.constants.errno.EEXIST;
+    result = os.constants.errno.EFAULT;
+    result = os.constants.errno.EFBIG;
+    result = os.constants.errno.EHOSTUNREACH;
+    result = os.constants.errno.EIDRM;
+    result = os.constants.errno.EILSEQ;
+    result = os.constants.errno.EINPROGRESS;
+    result = os.constants.errno.EINTR;
+    result = os.constants.errno.EINVAL;
+    result = os.constants.errno.EIO;
+    result = os.constants.errno.EISCONN;
+    result = os.constants.errno.EISDIR;
+    result = os.constants.errno.ELOOP;
+    result = os.constants.errno.EMFILE;
+    result = os.constants.errno.EMLINK;
+    result = os.constants.errno.EMSGSIZE;
+    result = os.constants.errno.EMULTIHOP;
+    result = os.constants.errno.ENAMETOOLONG;
+    result = os.constants.errno.ENETDOWN;
+    result = os.constants.errno.ENETRESET;
+    result = os.constants.errno.ENETUNREACH;
+    result = os.constants.errno.ENFILE;
+    result = os.constants.errno.ENOBUFS;
+    result = os.constants.errno.ENODATA;
+    result = os.constants.errno.ENODEV;
+    result = os.constants.errno.ENOENT;
+    result = os.constants.errno.ENOEXEC;
+    result = os.constants.errno.ENOLCK;
+    result = os.constants.errno.ENOLINK;
+    result = os.constants.errno.ENOMEM;
+    result = os.constants.errno.ENOMSG;
+    result = os.constants.errno.ENOPROTOOPT;
+    result = os.constants.errno.ENOSPC;
+    result = os.constants.errno.ENOSR;
+    result = os.constants.errno.ENOSTR;
+    result = os.constants.errno.ENOSYS;
+    result = os.constants.errno.ENOTCONN;
+    result = os.constants.errno.ENOTDIR;
+    result = os.constants.errno.ENOTEMPTY;
+    result = os.constants.errno.ENOTSOCK;
+    result = os.constants.errno.ENOTSUP;
+    result = os.constants.errno.ENOTTY;
+    result = os.constants.errno.ENXIO;
+    result = os.constants.errno.EOPNOTSUPP;
+    result = os.constants.errno.EOVERFLOW;
+    result = os.constants.errno.EPERM;
+    result = os.constants.errno.EPIPE;
+    result = os.constants.errno.EPROTO;
+    result = os.constants.errno.EPROTONOSUPPORT;
+    result = os.constants.errno.EPROTOTYPE;
+    result = os.constants.errno.ERANGE;
+    result = os.constants.errno.EROFS;
+    result = os.constants.errno.ESPIPE;
+    result = os.constants.errno.ESRCH;
+    result = os.constants.errno.ESTALE;
+    result = os.constants.errno.ETIME;
+    result = os.constants.errno.ETIMEDOUT;
+    result = os.constants.errno.ETXTBSY;
+    result = os.constants.errno.EWOULDBLOCK;
+    result = os.constants.errno.EXDEV;
+}
+
+{
+    const prio = os.getPriority();
+    os.setPriority(prio + 1);
+
+    const prio2 = os.getPriority(1);
+    os.setPriority(2, prio + 1);
+
+    os.setPriority(os.constants.priority.PRIORITY_LOW);
+}
diff --git a/types/node/test/path.ts b/types/node/test/path.ts
new file mode 100644
index 0000000000..92b6b426e7
--- /dev/null
+++ b/types/node/test/path.ts
@@ -0,0 +1,167 @@
+import * as path from 'path';
+
+path.normalize('/foo/bar//baz/asdf/quux/..');
+
+path.join('/foo', 'bar', 'baz/asdf', 'quux', '..');
+// returns
+// '/foo/bar/baz/asdf'
+
+try {
+    path.join('foo', 'bar');
+} catch (error) { }
+
+path.resolve('foo/bar', '/tmp/file/', '..', 'a/../subfile');
+// Is similar to:
+//
+// cd foo/bar
+// cd /tmp/file/
+// cd ..
+//    cd a/../subfile
+// pwd
+
+path.resolve('/foo/bar', './baz');
+// returns
+//    '/foo/bar/baz'
+
+path.resolve('/foo/bar', '/tmp/file/');
+// returns
+//    '/tmp/file'
+
+path.resolve('wwwroot', 'static_files/png/', '../gif/image.gif');
+// if currently in /home/myself/node, it returns
+//    '/home/myself/node/wwwroot/static_files/gif/image.gif'
+
+path.isAbsolute('/foo/bar'); // true
+path.isAbsolute('/baz/..');  // true
+path.isAbsolute('qux/');     // false
+path.isAbsolute('.');        // false
+
+path.isAbsolute('//server');  // true
+path.isAbsolute('C:/foo/..'); // true
+path.isAbsolute('bar\\baz');   // false
+path.isAbsolute('.');         // false
+
+path.relative('C:\\orandea\\test\\aaa', 'C:\\orandea\\impl\\bbb');
+// returns
+//    '..\\..\\impl\\bbb'
+
+path.relative('/data/orandea/test/aaa', '/data/orandea/impl/bbb');
+// returns
+//    '../../impl/bbb'
+
+path.dirname('/foo/bar/baz/asdf/quux');
+// returns
+//    '/foo/bar/baz/asdf'
+
+path.basename('/foo/bar/baz/asdf/quux.html');
+// returns
+//    'quux.html'
+
+path.basename('/foo/bar/baz/asdf/quux.html', '.html');
+// returns
+//    'quux'
+
+path.extname('index.html');
+// returns
+//    '.html'
+
+path.extname('index.coffee.md');
+// returns
+//    '.md'
+
+path.extname('index.');
+// returns
+//    '.'
+
+path.extname('index');
+// returns
+//    ''
+
+'foo/bar/baz'.split(path.sep);
+// returns
+//        ['foo', 'bar', 'baz']
+
+'foo\\bar\\baz'.split(path.sep);
+// returns
+//        ['foo', 'bar', 'baz']
+
+process.env["PATH"]; // $ExpectType string | undefined
+
+path.parse('/home/user/dir/file.txt');
+// returns
+//    {
+//        root : "/",
+//        dir : "/home/user/dir",
+//        base : "file.txt",
+//        ext : ".txt",
+//        name : "file"
+//    }
+
+path.parse('C:\\path\\dir\\index.html');
+// returns
+//    {
+//        root : "C:\",
+//        dir : "C:\path\dir",
+//        base : "index.html",
+//        ext : ".html",
+//        name : "index"
+//    }
+
+path.format({
+    root: "/",
+    dir: "/home/user/dir",
+    base: "file.txt",
+    ext: ".txt",
+    name: "file"
+});
+// returns
+//    '/home/user/dir/file.txt'
+
+path.format({
+    root: "/",
+    dir: "/home/user/dir",
+    ext: ".txt",
+    name: "file"
+});
+// returns
+//    '/home/user/dir/file.txt'
+
+path.format({
+    dir: "/home/user/dir",
+    base: "file.txt"
+});
+// returns
+//    '/home/user/dir/file.txt'
+
+path.posix.format({
+    root: "/",
+    dir: "/home/user/dir",
+    base: "file.txt",
+    ext: ".txt",
+    name: "file"
+});
+// returns
+//    '/home/user/dir/file.txt'
+
+path.posix.format({
+    dir: "/home/user/dir",
+    base: "file.txt"
+});
+// returns
+//    '/home/user/dir/file.txt'
+
+path.win32.format({
+    root: "C:\\",
+    dir: "C:\\home\\user\\dir",
+    ext: ".txt",
+    name: "file"
+});
+// returns
+//    'C:\home\user\dir\file.txt'
+
+path.win32.format({
+    dir: "C:\\home\\user\\dir",
+    base: "file.txt"
+});
+// returns
+//    'C:\home\user\dir\file.txt'
diff --git a/types/node/test/querystring.ts b/types/node/test/querystring.ts
new file mode 100644
index 0000000000..15c19de76c
--- /dev/null
+++ b/types/node/test/querystring.ts
@@ -0,0 +1,42 @@
+import * as querystring from 'querystring';
+
+interface SampleObject { a: string; }
+
+{
+    const obj: SampleObject = { a: "" };
+    const sep = '';
+    const eq = '';
+    const options: querystring.StringifyOptions = {
+        encodeURIComponent: (d: string) => d,
+    };
+    let result: string;
+
+    result = querystring.stringify(obj);
+    result = querystring.stringify(obj, sep);
+    result = querystring.stringify(obj, sep, eq);
+    result = querystring.stringify(obj, sep, eq);
+    result = querystring.stringify(obj, sep, eq, options);
+}
+
+{
+    const str = '';
+    const sep = '';
+    const eq = '';
+    const options: querystring.ParseOptions = {
+        decodeURIComponent: (d: string) => d,
+    };
+    let result: querystring.ParsedUrlQuery;
+
+    result = querystring.parse(str);
+    result = querystring.parse(str, sep);
+    result = querystring.parse(str, sep, eq);
+    result = querystring.parse(str, sep, eq, options);
+}
+
+{
+    const str = '';
+    let result: string;
+
+    result = querystring.escape(str);
+    result = querystring.unescape(str);
+}
diff --git a/types/node/test/readline.ts b/types/node/test/readline.ts
index a49eead8ec..0f8fe477cb 100644
--- a/types/node/test/readline.ts
+++ b/types/node/test/readline.ts
@@ -115,7 +115,7 @@ const rl: readline.ReadLine = readline.createInterface(new stream.Readable());
 
     _rl = _rl.addListener("close", () => { });
     _rl = _rl.addListener("line", (input) => {
-        const _input: any = input;
+        const _input: string = input;
     });
     _rl = _rl.addListener("pause", () => { });
     _rl = _rl.addListener("resume", () => { });
diff --git a/types/node/test/tls.ts b/types/node/test/tls.ts
index 807e41393f..4b329c150f 100644
--- a/types/node/test/tls.ts
+++ b/types/node/test/tls.ts
@@ -21,7 +21,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
     let _server = createServer({});
     let _boolean: boolean;
     const _func1 = (err: Error, resp: Buffer) => { };
-    const _func2 = (err: Error, sessionData: any) => { };
+    const _func2 = (err: Error, sessionData: Buffer) => { };
     /**
      * events.EventEmitter
      * 1. tlsClientError
@@ -36,8 +36,8 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _tlsSocket: TLSSocket = tlsSocket;
     });
     _server = _server.addListener("newSession", (sessionId, sessionData, callback) => {
-        const _sessionId: any = sessionId;
-        const _sessionData: any = sessionData;
+        const _sessionId: Buffer = sessionId;
+        const _sessionData: Buffer = sessionData;
         const _func1 = callback;
     });
     _server = _server.addListener("OCSPRequest", (certificate, issuer, callback) => {
@@ -46,7 +46,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _callback: Function = callback;
     });
     _server = _server.addListener("resumeSession", (sessionId, callback) => {
-        const _sessionId: any = sessionId;
+        const _sessionId: Buffer = sessionId;
         const _func2 = callback;
     });
     _server = _server.addListener("secureConnection", (tlsSocket) => {
@@ -55,7 +55,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
 
     const _err: Error = new Error();
     const _tlsSocket: TLSSocket = connect(1);
-    const _any: any = 1;
+    const _any: Buffer = Buffer.from('asd');
     const _func: Function = () => {};
     const _buffer: Buffer = Buffer.from('a');
     _boolean = _server.emit("tlsClientError", _err, _tlsSocket);
@@ -69,8 +69,8 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _tlsSocket: TLSSocket = tlsSocket;
     });
     _server = _server.on("newSession", (sessionId, sessionData, callback) => {
-        const _sessionId: any = sessionId;
-        const _sessionData: any = sessionData;
+        const _sessionId: Buffer = sessionId;
+        const _sessionData: Buffer = sessionData;
         const _func1 = callback;
     });
     _server = _server.on("OCSPRequest", (certificate, issuer, callback) => {
@@ -79,7 +79,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _callback: Function = callback;
     });
     _server = _server.on("resumeSession", (sessionId, callback) => {
-        const _sessionId: any = sessionId;
+        const _sessionId: Buffer = sessionId;
         const _func2 = callback;
     });
     _server = _server.on("secureConnection", (tlsSocket) => {
@@ -91,8 +91,8 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _tlsSocket: TLSSocket = tlsSocket;
     });
     _server = _server.once("newSession", (sessionId, sessionData, callback) => {
-        const _sessionId: any = sessionId;
-        const _sessionData: any = sessionData;
+        const _sessionId: Buffer = sessionId;
+        const _sessionData: Buffer = sessionData;
         const _func1 = callback;
     });
     _server = _server.once("OCSPRequest", (certificate, issuer, callback) => {
@@ -101,7 +101,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _callback: Function = callback;
     });
     _server = _server.once("resumeSession", (sessionId, callback) => {
-        const _sessionId: any = sessionId;
+        const _sessionId: Buffer = sessionId;
         const _func2 = callback;
     });
     _server = _server.once("secureConnection", (tlsSocket) => {
@@ -113,8 +113,8 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _tlsSocket: TLSSocket = tlsSocket;
     });
     _server = _server.prependListener("newSession", (sessionId, sessionData, callback) => {
-        const _sessionId: any = sessionId;
-        const _sessionData: any = sessionData;
+        const _sessionId: Buffer = sessionId;
+        const _sessionData: Buffer = sessionData;
         const _func1 = callback;
     });
     _server = _server.prependListener("OCSPRequest", (certificate, issuer, callback) => {
@@ -123,7 +123,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _callback: Function = callback;
     });
     _server = _server.prependListener("resumeSession", (sessionId, callback) => {
-        const _sessionId: any = sessionId;
+        const _sessionId: Buffer = sessionId;
         const _func2 = callback;
     });
     _server = _server.prependListener("secureConnection", (tlsSocket) => {
@@ -135,8 +135,8 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _tlsSocket: TLSSocket = tlsSocket;
     });
     _server = _server.prependOnceListener("newSession", (sessionId, sessionData, callback) => {
-        const _sessionId: any = sessionId;
-        const _sessionData: any = sessionData;
+        const _sessionId: Buffer = sessionId;
+        const _sessionData: Buffer = sessionData;
         const _func1 = callback;
     });
     _server = _server.prependOnceListener("OCSPRequest", (certificate, issuer, callback) => {
@@ -145,7 +145,7 @@ import { createSecureContext, SecureContext, ConnectionOptions, connect, getCiph
         const _callback: Function = callback;
     });
     _server = _server.prependOnceListener("resumeSession", (sessionId, callback) => {
-        const _sessionId: any = sessionId;
+        const _sessionId: Buffer = sessionId;
         const _func2 = callback;
     });
     _server = _server.prependOnceListener("secureConnection", (tlsSocket) => {
diff --git a/types/node/tls.d.ts b/types/node/tls.d.ts
index ef9a7bd4b0..bf46cb190e 100644
--- a/types/node/tls.d.ts
+++ b/types/node/tls.d.ts
@@ -180,13 +180,13 @@ declare module "tls" {
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
          */
-        getSession(): any;
+        getSession(): Buffer | undefined;
         /**
          * NOTE: Works only with client TLS sockets.
          * Useful only for debugging, for session reuse provide session option to tls.connect().
          * @returns TLS session ticket or undefined if none was negotiated.
          */
-        getTLSTicket(): any;
+        getTLSTicket(): Buffer | undefined;
         /**
          * Initiate TLS renegotiation process.
          *
@@ -196,8 +196,9 @@ declare module "tls" {
          * requestCert (See tls.createServer() for details).
          * @param callback - callback(err) will be executed with null as err, once the renegotiation
          * is successfully completed.
+         * @return `undefined` when socket is destroy, `false` if negotiaion can't be initiated.
          */
-        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): any;
+        renegotiate(options: { rejectUnauthorized?: boolean, requestCert?: boolean }, callback: (err: Error | null) => void): undefined | boolean;
         /**
          * Set maximum TLS fragment size (default and maximum value is: 16384, minimum is: 512).
          * Smaller fragment size decreases buffering latency on the client: large fragments are buffered by
@@ -291,50 +292,50 @@ declare module "tls" {
          */
         addListener(event: string, listener: (...args: any[]) => void): this;
         addListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        addListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        addListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        addListener(event: "newSession", listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        addListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        addListener(event: "resumeSession", listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
         addListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
         emit(event: string | symbol, ...args: any[]): boolean;
         emit(event: "tlsClientError", err: Error, tlsSocket: TLSSocket): boolean;
-        emit(event: "newSession", sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void): boolean;
-        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: Function): boolean;
-        emit(event: "resumeSession", sessionId: any, callback: (err: Error, sessionData: any) => void): boolean;
+        emit(event: "newSession", sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void): boolean;
+        emit(event: "OCSPRequest", certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void): boolean;
+        emit(event: "resumeSession", sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void): boolean;
         emit(event: "secureConnection", tlsSocket: TLSSocket): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
         on(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        on(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        on(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        on(event: "newSession", listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        on(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        on(event: "resumeSession", listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
         on(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
         once(event: string, listener: (...args: any[]) => void): this;
         once(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        once(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        once(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        once(event: "newSession", listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        once(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        once(event: "resumeSession", listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
         once(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
         prependListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        prependListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        prependListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependListener(event: "newSession", listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        prependListener(event: "resumeSession", listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
         prependListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
         prependOnceListener(event: "tlsClientError", listener: (err: Error, tlsSocket: TLSSocket) => void): this;
-        prependOnceListener(event: "newSession", listener: (sessionId: any, sessionData: any, callback: (err: Error, resp: Buffer) => void) => void): this;
-        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: Function) => void): this;
-        prependOnceListener(event: "resumeSession", listener: (sessionId: any, callback: (err: Error, sessionData: any) => void) => void): this;
+        prependOnceListener(event: "newSession", listener: (sessionId: Buffer, sessionData: Buffer, callback: (err: Error, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "OCSPRequest", listener: (certificate: Buffer, issuer: Buffer, callback: (err: Error | null, resp: Buffer) => void) => void): this;
+        prependOnceListener(event: "resumeSession", listener: (sessionId: Buffer, callback: (err: Error, sessionData: Buffer) => void) => void): this;
         prependOnceListener(event: "secureConnection", listener: (tlsSocket: TLSSocket) => void): this;
     }
 
     interface SecurePair {
-        encrypted: any;
-        cleartext: any;
+        encrypted: TLSSocket;
+        cleartext: TLSSocket;
     }
 
     type SecureVersion = 'TLSv1.2' | 'TLSv1.1' | 'TLSv1';
@@ -388,6 +389,9 @@ declare module "tls" {
     function connect(options: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
     function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
     function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () => void): TLSSocket;
+    /**
+     * @deprecated
+     */
     function createSecurePair(credentials?: SecureContext, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair;
     function createSecureContext(details: SecureContextOptions): SecureContext;
     function getCiphers(): string[];
diff --git a/types/node/tsconfig.json b/types/node/tsconfig.json
index 831c9861f0..139affdd3e 100644
--- a/types/node/tsconfig.json
+++ b/types/node/tsconfig.json
@@ -42,25 +42,30 @@
         "vm.d.ts",
         "worker_threads.d.ts",
         "zlib.d.ts",
-        "node-tests.ts",
 
+        "node-tests.ts",
+        "test/assert.ts",
         "test/buffer.ts",
         "test/child_process.ts",
+        "test/cluster.ts",
         "test/crypto.ts",
         "test/dgram.ts",
         "test/global.ts",
         "test/http.ts",
         "test/http2.ts",
         "test/net.ts",
+        "test/os.ts",
+        "test/path.ts",
         "test/perf_hooks.ts",
+        "test/querystring.ts",
         "test/readline.ts",
+        "test/repl.ts",
         "test/stream.ts",
+        "test/tls.ts",
         "test/tty.ts",
         "test/util.ts",
-        "test/repl.ts",
         "test/worker_threads.ts",
-        "test/zlib.ts",
-        "test/tls.ts"
+        "test/zlib.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/node/worker_threads.d.ts b/types/node/worker_threads.d.ts
index b011b8ff32..8173e7b59f 100644
--- a/types/node/worker_threads.d.ts
+++ b/types/node/worker_threads.d.ts
@@ -72,51 +72,51 @@ declare module "worker_threads" {
         postMessage(value: any, transferList?: Array<ArrayBuffer | MessagePort>): void;
         ref(): void;
         unref(): void;
-        terminate(callback?: (err: any, exitCode: number) => void): void;
+        terminate(callback?: (err: Error, exitCode: number) => void): void;
 
-        addListener(event: "error", listener: (err: any) => void): this;
+        addListener(event: "error", listener: (err: Error) => void): this;
         addListener(event: "exit", listener: (exitCode: number) => void): this;
         addListener(event: "message", listener: (value: any) => void): this;
         addListener(event: "online", listener: () => void): this;
         addListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        emit(event: "error", err: any): boolean;
+        emit(event: "error", err: Error): boolean;
         emit(event: "exit", exitCode: number): boolean;
         emit(event: "message", value: any): boolean;
         emit(event: "online"): boolean;
         emit(event: string | symbol, ...args: any[]): boolean;
 
-        on(event: "error", listener: (err: any) => void): this;
+        on(event: "error", listener: (err: Error) => void): this;
         on(event: "exit", listener: (exitCode: number) => void): this;
         on(event: "message", listener: (value: any) => void): this;
         on(event: "online", listener: () => void): this;
         on(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        once(event: "error", listener: (err: any) => void): this;
+        once(event: "error", listener: (err: Error) => void): this;
         once(event: "exit", listener: (exitCode: number) => void): this;
         once(event: "message", listener: (value: any) => void): this;
         once(event: "online", listener: () => void): this;
         once(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        prependListener(event: "error", listener: (err: any) => void): this;
+        prependListener(event: "error", listener: (err: Error) => void): this;
         prependListener(event: "exit", listener: (exitCode: number) => void): this;
         prependListener(event: "message", listener: (value: any) => void): this;
         prependListener(event: "online", listener: () => void): this;
         prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        prependOnceListener(event: "error", listener: (err: any) => void): this;
+        prependOnceListener(event: "error", listener: (err: Error) => void): this;
         prependOnceListener(event: "exit", listener: (exitCode: number) => void): this;
         prependOnceListener(event: "message", listener: (value: any) => void): this;
         prependOnceListener(event: "online", listener: () => void): this;
         prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        removeListener(event: "error", listener: (err: any) => void): this;
+        removeListener(event: "error", listener: (err: Error) => void): this;
         removeListener(event: "exit", listener: (exitCode: number) => void): this;
         removeListener(event: "message", listener: (value: any) => void): this;
         removeListener(event: "online", listener: () => void): this;
         removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-        off(event: "error", listener: (err: any) => void): this;
+        off(event: "error", listener: (err: Error) => void): this;
         off(event: "exit", listener: (exitCode: number) => void): this;
         off(event: "message", listener: (value: any) => void): this;
         off(event: "online", listener: () => void): this;

From a087a250a24838379f2f61917bea241590b57f42 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Mon, 11 Mar 2019 14:09:22 -0700
Subject: [PATCH 551/924] Adjust @babel/traverse to not rely on the exact
 string of the nodepath type in its test to fixup test with ts@next (#33782)

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

diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
index 98a0338021..2bc5a404d6 100644
--- a/types/babel__traverse/babel__traverse-tests.ts
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -1,17 +1,15 @@
-import traverse, { Visitor } from "@babel/traverse";
+import traverse, { Visitor, NodePath } from "@babel/traverse";
 import * as t from "@babel/types";
 
 // Examples from: https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md
 const MyVisitor: Visitor = {
     Identifier: {
         enter(path) {
-            // $ExpectType NodePath<Identifier>
-            path;
+            const x: NodePath<t.Identifier> = path;
             console.log("Entered!");
         },
         exit(path) {
-            // $ExpectType NodePath<Identifier>
-            path;
+            const x: NodePath<t.Identifier> = path;
             console.log("Exited!");
         }
     }

From 611972ea6d5bbefb61d3e2a2c7c77ce3a69d36a1 Mon Sep 17 00:00:00 2001
From: Olivier Adam <olivier.adam@m4x.org>
Date: Mon, 11 Mar 2019 22:38:17 +0100
Subject: [PATCH 552/924] add integer indexing method

---
 types/datatables.net/index.d.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index f367d5bf40..80a1b66561 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1682,21 +1682,21 @@ declare namespace DataTables {
     }
 
     interface ObjectColumnData {
-        _: string | FunctionColumnData;
-        filter?: string | FunctionColumnData;
-        display?: string | FunctionColumnData;
-        type?: string | FunctionColumnData;
-        sort?: string | FunctionColumnData;
+        _: string | number | FunctionColumnData;
+        filter?: string | number | FunctionColumnData;
+        display?: string | number | FunctionColumnData;
+        type?: string | number | FunctionColumnData;
+        sort?: string | number | FunctionColumnData;
     }
 
     type FunctionColumnRender = (data: any, type: any, row: any, meta: CellMetaSettings) => any;
 
     interface ObjectColumnRender {
-        _?: string | FunctionColumnRender;
-        filter?: string | FunctionColumnRender;
-        display?: string | FunctionColumnRender;
-        type?: string | FunctionColumnRender;
-        sort?: string | FunctionColumnRender;
+        _?: string | number | FunctionColumnRender;
+        filter?: string | number | FunctionColumnRender;
+        display?: string | number | FunctionColumnRender;
+        type?: string | number | FunctionColumnRender;
+        sort?: string | number | FunctionColumnRender;
     }
 
     interface CellMetaSettings {

From 020446253500c45f84f41546ae6a82694098d432 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Mon, 11 Mar 2019 14:53:20 -0700
Subject: [PATCH 553/924] Fix lodash types exhibiting bug fixed in tsatnext
 (#33784)

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

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index befe845f94..4f3c0f363c 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -6608,10 +6608,10 @@ fp.now(); // $ExpectType number
     _(undefined).defaultTo({ a: "" }); // $ExpectType { a: string; }
 
     _.chain(42).defaultTo(42); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(undefined).defaultTo(42); // $ExpectType LoDashExplicitWrapper<42>
-    _.chain(null).defaultTo(42); // $ExpectType LoDashExplicitWrapper<42>
+    const z1: _.LoDashExplicitWrapper<number> = _.chain(undefined).defaultTo(42);
+    const z2: _.LoDashExplicitWrapper<number> = _.chain(null).defaultTo(42);
     _.chain(NaN).defaultTo(42); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(undefined).defaultTo("default"); // $ExpectType LoDashExplicitWrapper<"default">
+    const z3: _.LoDashExplicitWrapper<string> =  _.chain(undefined).defaultTo("default");
     _.chain(undefined).defaultTo([true]); // $ExpectType LoDashExplicitWrapper<boolean[]>
     _.chain(undefined).defaultTo({ a: "" }); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
 

From bfb70da14c574d8db1e308d4362e9a71e6e84231 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wwigham@gmail.com>
Date: Mon, 11 Mar 2019 15:23:05 -0700
Subject: [PATCH 554/924] Fix ramda evolvable type for ts@next (#33785)

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 2124c0b928..917715c3e7 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -609,11 +609,14 @@ declare namespace R {
 
     // Represents all objects evolvable with Evolver E
     type Evolvable<E extends Evolver> = {
-        [P in keyof E]?: E[P] extends (value: infer V) => any ? V :
-            E[P] extends Evolver ? Evolvable<E[P]> :
-            never
+        [P in keyof E]?: Evolved<E[P]>;
     };
 
+    type Evolved<T> =
+        T extends (value: infer V) => any ? V :
+        T extends Evolver ? Evolvable<T> :
+        never;
+
     interface Placeholder { __isRamdaPlaceholder__: true; }
 
     interface Reduced<T> {

From 08257fbe2b37d78e0046b6dcf790360fccc68d07 Mon Sep 17 00:00:00 2001
From: Markus <stahlstift@gmail.com>
Date: Mon, 11 Mar 2019 23:25:41 +0100
Subject: [PATCH 555/924] Added new types for trouter (#33557)

* Added types for trouter

* Fixes

* fix: include all valid HTTP methods

* feat: add use(); bump to 3.0

* fix: change export

Co-Authored-By: lukeed <luke.edwards05@gmail.com>

* fix: use require in test

* fix: incorrect import statement

Co-Authored-By: lukeed <luke.edwards05@gmail.com>

* fix: use namespace

* fix: remove `false` return option;

- part of 3.0 release
---
 types/trouter/index.d.ts       | 78 ++++++++++++++++++++++++++++++++++
 types/trouter/trouter-tests.ts | 52 +++++++++++++++++++++++
 types/trouter/tsconfig.json    | 23 ++++++++++
 types/trouter/tslint.json      |  1 +
 4 files changed, 154 insertions(+)
 create mode 100644 types/trouter/index.d.ts
 create mode 100644 types/trouter/trouter-tests.ts
 create mode 100644 types/trouter/tsconfig.json
 create mode 100644 types/trouter/tslint.json

diff --git a/types/trouter/index.d.ts b/types/trouter/index.d.ts
new file mode 100644
index 0000000000..435a611971
--- /dev/null
+++ b/types/trouter/index.d.ts
@@ -0,0 +1,78 @@
+// Type definitions for trouter 3.0
+// Project: https://github.com/lukeed/trouter
+// Definitions by: Markus Lanz <https://github.com/stahlstift>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare namespace Trouter {
+    interface FindResult<T> {
+        params: { [k: string]: string; };
+        handlers: T[];
+    }
+
+    type HTTPMethod =
+        | 'ACL'
+        | 'BIND'
+        | 'CHECKOUT'
+        | 'CONNECT'
+        | 'COPY'
+        | 'DELETE'
+        | 'GET'
+        | 'HEAD'
+        | 'LINK'
+        | 'LOCK'
+        | 'M-SEARCH'
+        | 'MERGE'
+        | 'MKACTIVITY'
+        | 'MKCALENDAR'
+        | 'MKCOL'
+        | 'MOVE'
+        | 'NOTIFY'
+        | 'OPTIONS'
+        | 'PATCH'
+        | 'POST'
+        | 'PROPFIND'
+        | 'PROPPATCH'
+        | 'PURGE'
+        | 'PUT'
+        | 'REBIND'
+        | 'REPORT'
+        | 'SEARCH'
+        | 'SOURCE'
+        | 'SUBSCRIBE'
+        | 'TRACE'
+        | 'UNBIND'
+        | 'UNLINK'
+        | 'UNLOCK'
+        | 'UNSUBSCRIBE';
+}
+
+declare class Trouter<T = any> {
+    use(pattern: string, ...handlers: T[]): this;
+
+    find(method: Trouter.HTTPMethod, url: string): Trouter.FindResult<T>;
+
+    add(method: Trouter.HTTPMethod, pattern: string, ...handlers: T[]): this;
+
+    all(pattern: string, ...handlers: T[]): this;
+
+    get(pattern: string, ...handlers: T[]): this;
+
+    head(pattern: string, ...handlers: T[]): this;
+
+    patch(pattern: string, ...handlers: T[]): this;
+
+    options(pattern: string, ...handlers: T[]): this;
+
+    connect(pattern: string, ...handlers: T[]): this;
+
+    delete(pattern: string, ...handlers: T[]): this;
+
+    trace(pattern: string, ...handlers: T[]): this;
+
+    post(pattern: string, ...handlers: T[]): this;
+
+    put(pattern: string, ...handlers: T[]): this;
+}
+
+export = Trouter;
diff --git a/types/trouter/trouter-tests.ts b/types/trouter/trouter-tests.ts
new file mode 100644
index 0000000000..80346e3d79
--- /dev/null
+++ b/types/trouter/trouter-tests.ts
@@ -0,0 +1,52 @@
+import Trouter = require('trouter');
+
+// Default type is "any" for handlers
+const router = new Trouter();
+router.add('GET', '/user/:name/:id', 'test', 'test2', 'test3');
+
+// Typed handler example
+type Handler = (typedValue: number, couldBeAResponse: string) => void;
+
+const typed = new Trouter<Handler>();
+typed.get('/user/:id', (t: number, s: string) => {
+});
+const findResult = typed.find('GET', '/users/1');
+if (findResult.handlers.length > 0) {
+    findResult.handlers[0](42, "asdf");
+}
+const notFound = typed.find('GET', '/not-existent');
+if (notFound.handlers.length === 0) {
+    // no match...
+}
+
+// Find
+const findTest = new Trouter();
+findTest.add('GET', '/user/:id', 'handler');
+const fresult = findTest.find('GET', '/user/1');
+if (fresult.params.id) {
+    // do something awesome!
+    fresult.handlers[0] === 'handler';
+}
+
+// Full API
+const full = new Trouter();
+full.all('/somepattern', 'a handler');
+full.get('/somepattern', 'a handler');
+full.head('/somepattern', 'a handler');
+full.patch('/somepattern', 'a handler');
+full.options('/somepattern', 'a handler');
+full.connect('/somepattern', 'a handler');
+full.delete('/somepattern', 'a handler');
+full.trace('/somepattern', 'a handler');
+full.post('/somepattern', 'a handler');
+full.put('/somepattern', 'a handler');
+
+full.add('GET', '/somepatternm', 'a handler');
+full.add('HEAD', '/somepatternm', 'a handler');
+full.add('PATCH', '/somepatternm', 'a handler');
+full.add('OPTIONS', '/somepatternm', 'a handler');
+full.add('CONNECT', '/somepatternm', 'a handler');
+full.add('DELETE', '/somepatternm', 'a handler');
+full.add('TRACE', '/somepatternm', 'a handler');
+full.add('POST', '/somepatternm', 'a handler');
+full.add('PUT', '/somepatternm', 'a handler');
diff --git a/types/trouter/tsconfig.json b/types/trouter/tsconfig.json
new file mode 100644
index 0000000000..70dfaf7976
--- /dev/null
+++ b/types/trouter/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",
+        "trouter-tests.ts"
+    ]
+}
diff --git a/types/trouter/tslint.json b/types/trouter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/trouter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 46e664589abe3f13ca566b1464c55c5554ff7e8c Mon Sep 17 00:00:00 2001
From: Ziyu Wang <odduid@gmail.com>
Date: Tue, 12 Mar 2019 11:54:17 +1100
Subject: [PATCH 556/924] strict null checks for redux-actions

---
 types/redux-actions/index.d.ts             | 17 +++++++++++------
 types/redux-actions/redux-actions-tests.ts | 20 ++++++++++++++------
 types/redux-actions/tsconfig.json          |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 6891563ab9..0ecb215572 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -5,6 +5,7 @@
 //                 Alec Hill <https://github.com/alechill>
 //                 Alexey Pelykh <https://github.com/alexey-pelykh>
 //                 Thiago de Andrade <https://github.com/7hi4g0>
+//                 Ziyu <https://github.com/oddui>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -17,7 +18,7 @@ export interface BaseAction {
 }
 
 export interface Action<Payload> extends BaseAction {
-    payload?: Payload;
+    payload: Payload;
     error?: boolean;
 }
 
@@ -66,6 +67,10 @@ export type Reducer<State, Payload> = (state: State, action: Action<Payload>) =>
 
 export type ReducerMeta<State, Payload, Meta> = (state: State, action: ActionMeta<Payload, Meta>) => State;
 
+export type ReduxReducer<State, Payload> = (state: State | undefined, action: Action<Payload>) => State;
+
+export type ReduxReducerMeta<State, Payload, Meta> = (state: State | undefined, action: ActionMeta<Payload, Meta>) => State;
+
 /** argument inferring borrowed from lodash definitions */
 export type ActionFunction0<R> = () => R;
 export type ActionFunction1<T1, R> = (t1: T1) => R;
@@ -148,13 +153,13 @@ export function handleAction<State, Payload>(
     actionType: string | ActionFunctions<Payload> | CombinedActionType,
     reducer: Reducer<State, Payload> | ReducerNextThrow<State, Payload>,
     initialState: State
-): Reducer<State, Payload>;
+): ReduxReducer<State, Payload>;
 
 export function handleAction<State, Payload, Meta>(
     actionType: string | ActionWithMetaFunctions<Payload, Meta> | CombinedActionType,
     reducer: ReducerMeta<State, Payload, Meta> | ReducerNextThrowMeta<State, Payload, Meta>,
     initialState: State
-): Reducer<State, Payload>;
+): ReduxReducerMeta<State, Payload, Meta>;
 
 export interface Options {
     prefix?: string;
@@ -165,19 +170,19 @@ export function handleActions<StateAndPayload>(
     reducerMap: ReducerMap<StateAndPayload, StateAndPayload>,
     initialState: StateAndPayload,
     options?: Options
-): Reducer<StateAndPayload, StateAndPayload>;
+): ReduxReducer<StateAndPayload, StateAndPayload>;
 
 export function handleActions<State, Payload>(
     reducerMap: ReducerMap<State, Payload>,
     initialState: State,
     options?: Options
-): Reducer<State, Payload>;
+): ReduxReducer<State, Payload>;
 
 export function handleActions<State, Payload, Meta>(
     reducerMap: ReducerMapMeta<State, Payload, Meta>,
     initialState: State,
     options?: Options
-): ReducerMeta<State, Payload, Meta>;
+): ReduxReducerMeta<State, Payload, Meta>;
 
 // https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/combineActions.js#L21
 export function combineActions(...actionTypes: Array<ActionFunctions<any> | string | symbol>): CombinedActionType;
diff --git a/types/redux-actions/redux-actions-tests.ts b/types/redux-actions/redux-actions-tests.ts
index 207e4746b7..27f33a2843 100644
--- a/types/redux-actions/redux-actions-tests.ts
+++ b/types/redux-actions/redux-actions-tests.ts
@@ -1,7 +1,6 @@
 import * as ReduxActions from 'redux-actions';
 
 let state: number;
-const minimalAction: ReduxActions.BaseAction = { type: 'INCREMENT' };
 
 const incrementAction: () => ReduxActions.Action<number> = ReduxActions.createAction<number>(
     'INCREMENT', () => 1
@@ -11,14 +10,13 @@ const multiplyAction: (...args: number[]) => ReduxActions.Action<number> = Redux
     'MULTIPLY'
 );
 
-const action: ReduxActions.Action<number> = incrementAction();
-
 const actionHandler = ReduxActions.handleAction<number, number>(
     'INCREMENT',
     (state: number, action: ReduxActions.Action<number>) => state + action.payload,
     0
 );
 
+state = actionHandler(undefined, incrementAction());
 state = actionHandler(0, incrementAction());
 
 const actionHandlerWithReduceMap = ReduxActions.handleAction<number, number>(
@@ -31,6 +29,7 @@ const actionHandlerWithReduceMap = ReduxActions.handleAction<number, number>(
     0
 );
 
+state = actionHandlerWithReduceMap(undefined, multiplyAction(10));
 state = actionHandlerWithReduceMap(0, multiplyAction(10));
 
 const actionsHandler = ReduxActions.handleActions({
@@ -38,7 +37,8 @@ const actionsHandler = ReduxActions.handleActions({
     MULTIPLY: (state: number, action: ReduxActions.Action<number>) => state * action.payload
 }, 0);
 
-state = actionsHandler(0, { type: 'INCREMENT' });
+state = actionsHandler(undefined, incrementAction());
+state = actionsHandler(0, incrementAction());
 
 const actionsHandlerWithInitialState = ReduxActions.handleActions({
     INCREMENT: {
@@ -49,7 +49,8 @@ const actionsHandlerWithInitialState = ReduxActions.handleActions({
     }
 }, 0);
 
-state = actionsHandlerWithInitialState(0, { type: 'INCREMENT' });
+state = actionsHandlerWithInitialState(undefined, incrementAction());
+state = actionsHandlerWithInitialState(0, incrementAction());
 
 const actionsHandlerWithRecursiveReducerMap = ReduxActions.handleActions<number, number>({
     ADJUST: {
@@ -58,6 +59,7 @@ const actionsHandlerWithRecursiveReducerMap = ReduxActions.handleActions<number,
     }
 }, 0);
 
+state = actionsHandlerWithRecursiveReducerMap(undefined, { type: 'ADJUST/UP', payload: 1 });
 state = actionsHandlerWithRecursiveReducerMap(0, { type: 'ADJUST/UP', payload: 1 });
 
 const actionsHandlerWithOptions = ReduxActions.handleActions({
@@ -65,7 +67,8 @@ const actionsHandlerWithOptions = ReduxActions.handleActions({
     MULTIPLY: (state: number, action: ReduxActions.Action<number>) => state * action.payload
 }, 0, {prefix: 'TEST'});
 
-state = actionsHandlerWithOptions(0, { type: 'TEST/INCREMENT' });
+state = actionsHandlerWithOptions(undefined, { type: 'TEST/INCREMENT', payload: 1 });
+state = actionsHandlerWithOptions(0, { type: 'TEST/INCREMENT', payload: 1 });
 
 const actionsHandlerWithRecursiveReducerMapAndOptions = ReduxActions.handleActions<number, number>({
     ADJUST: {
@@ -74,6 +77,7 @@ const actionsHandlerWithRecursiveReducerMapAndOptions = ReduxActions.handleActio
     }
 }, 0, {namespace: '--'});
 
+state = actionsHandlerWithRecursiveReducerMapAndOptions(undefined, { type: 'ADJUST--UP', payload: 1 });
 state = actionsHandlerWithRecursiveReducerMapAndOptions(0, { type: 'ADJUST--UP', payload: 1 });
 
 // ----------------------------------------------------------------------------------------------------
@@ -117,6 +121,7 @@ const typedActionHandler = ReduxActions.handleAction<TypedState, TypedPayload>(
 const actionNoArgs = typedIncrementAction();
 actionNoArgs.payload.increase = 1;
 
+typedState = typedActionHandler(undefined, actionNoArgs);
 typedState = typedActionHandler({ value: 0 }, actionNoArgs);
 
 const typedIncrementAction1TypedArg: (value: number) =>
@@ -144,6 +149,7 @@ const typedActionHandlerReducerMap = ReduxActions.handleActions(
     {value: 1}
 );
 
+typedState = typedActionHandlerReducerMap(undefined, actionFrom1Arg);
 typedState = typedActionHandlerReducerMap({ value: 0 }, actionFrom1Arg);
 
 const typedIncrementByActionWithMetaAnyArgs: (...args: any[]) => ReduxActions.ActionMeta<TypedPayload, MetaType> =
@@ -167,6 +173,7 @@ const typedActionHandlerWithMeta = ReduxActions.handleAction<TypedState, TypedPa
     {value: 1}
 );
 
+typedState = typedActionHandlerWithMeta(undefined, typedIncrementByActionWithMetaAnyArgs(10));
 typedState = typedActionHandlerWithMeta({ value: 0 }, typedIncrementByActionWithMetaAnyArgs(10));
 
 const typedActionHandlerReducerMetaMap = ReduxActions.handleActions<TypedState, TypedPayload, MetaType>(
@@ -181,6 +188,7 @@ const typedActionHandlerReducerMetaMap = ReduxActions.handleActions<TypedState,
     {value: 1}
 );
 
+typedState = typedActionHandlerReducerMetaMap(undefined, actionMetaFromAnyArgs);
 typedState = typedActionHandlerReducerMetaMap({ value: 0 }, actionMetaFromAnyArgs);
 
 const typedActionWithMeta1TypedArg: (value: number) => ReduxActions.ActionMeta<TypedPayload, MetaType> =
diff --git a/types/redux-actions/tsconfig.json b/types/redux-actions/tsconfig.json
index ea4f7f1a53..8a88909508 100644
--- a/types/redux-actions/tsconfig.json
+++ b/types/redux-actions/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [

From 87294f57f69d42287df551c65f271c620e66a696 Mon Sep 17 00:00:00 2001
From: Ziyu Wang <odduid@gmail.com>
Date: Tue, 12 Mar 2019 12:03:50 +1100
Subject: [PATCH 557/924] increment version number to match redux-actions

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

diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index 0ecb215572..f0654eab08 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redux-actions 2.3
+// Type definitions for redux-actions 2.6
 // Project: https://github.com/redux-utilities/redux-actions
 // Definitions by: Jack Hsu <https://github.com/jaysoo>,
 //                 Alex Gorbatchev <https://github.com/alexgorbatchev>,

From 036c90be607c9dfc8c3c50a6ca33c1f90ef53c18 Mon Sep 17 00:00:00 2001
From: Max Bo <mbo@atlassian.com>
Date: Tue, 12 Mar 2019 13:30:38 +1100
Subject: [PATCH 558/924] Add Max Bo to react-google-recaptcah definitions file

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

diff --git a/types/react-google-recaptcha/index.d.ts b/types/react-google-recaptcha/index.d.ts
index b705aaf8f6..6c557a79c6 100644
--- a/types/react-google-recaptcha/index.d.ts
+++ b/types/react-google-recaptcha/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for React Google Recaptcha 1.0
 // Project: https://github.com/dozoisch/react-google-recaptcha
-// Definitions by: Koala Human <https://github.com/KoalaHuman>, Tom Sturge <https://github.com/tomsturge>
+// Definitions by: Koala Human <https://github.com/KoalaHuman>
+//                 Tom Sturge <https://github.com/tomsturge>
+//                 Max Bo <https://github.com/MaxwellBo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 

From 80f8fc9d2188307ace500565a4af911abef4ecc4 Mon Sep 17 00:00:00 2001
From: Max Bo <mbo@atlassian.com>
Date: Tue, 12 Mar 2019 13:40:10 +1100
Subject: [PATCH 559/924] Major version bump 0.1 -> 1.0 for
 react-google-recaptcha

---
 types/react-google-recaptcha/v0/index.d.ts    | 84 +++++++++++++++++++
 .../v0/react-google-recaptcha-tests.tsx       | 15 ++++
 types/react-google-recaptcha/v0/tsconfig.json | 28 +++++++
 types/react-google-recaptcha/v0/tslint.json   |  1 +
 4 files changed, 128 insertions(+)
 create mode 100644 types/react-google-recaptcha/v0/index.d.ts
 create mode 100644 types/react-google-recaptcha/v0/react-google-recaptcha-tests.tsx
 create mode 100644 types/react-google-recaptcha/v0/tsconfig.json
 create mode 100644 types/react-google-recaptcha/v0/tslint.json

diff --git a/types/react-google-recaptcha/v0/index.d.ts b/types/react-google-recaptcha/v0/index.d.ts
new file mode 100644
index 0000000000..6636e6c5b6
--- /dev/null
+++ b/types/react-google-recaptcha/v0/index.d.ts
@@ -0,0 +1,84 @@
+// Type definitions for React Google Recaptcha 0.10
+// Project: https://github.com/dozoisch/react-google-recaptcha
+// Definitions by: Koala Human <https://github.com/KoalaHuman>, Tom Sturge <https://github.com/tomsturge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export default ReCAPTCHA;
+
+declare class ReCAPTCHA extends React.Component<ReCAPTCHAProps> {
+	/**
+	 * Resets the reCAPTCHA widget
+	 */
+	reset(): void;
+	/**
+	 * Programatically invoke the reCAPTCHA check. Used if the invisible reCAPTCHA is on a div instead of a button
+	 */
+	execute(): void;
+
+	/**
+	 * Gets the response for the reCAPTCHA widget.
+	 * @return the response of the reCAPTCHA widget.
+	 */
+	getValue(): string | null;
+
+	/**
+	 * Gets the widgetId of reCAPTCHA widget
+	 * @return widgetId | null
+	 */
+	getWidgetId(): number | null;
+}
+
+type Theme = "light" | "dark";
+type Type = "image" | "audio";
+type Size = "compact" | "normal" | "invisible";
+type Badge = "bottomright" | "bottomleft" | "inline";
+
+export interface ReCAPTCHAProps {
+	/**
+	 *  The API client key
+	 */
+	sitekey: string;
+	/**
+	 *  The function to be called when the user successfully completes the normal or compat captcha.
+	 * 	It will also be called with null, when captcha expires
+	 *  @param token string or null
+	 */
+	onChange?: (token: string|null) => void;
+	/**
+	 *  Optional light or dark theme of the widget
+	 *  @default "light"
+	 */
+	theme?: Theme;
+	/**
+	 * Optional image or audio The type of initial captcha
+	 * @default "image"
+	 */
+	type?: Type;
+	/**
+	 *  Optional the tabindex of the element
+	 *  @default 0
+	 */
+	tabindex?: number;
+	/**
+	 *  Optional callback, called when a challenge expires and has to be redone by the user.
+	 */
+	onExpired?: () => void;
+	/**
+	 *  Optional set the stoken parameter, which allows the captcha to be used from different domains,
+	 *  @see reCAPTCHA secure-token
+	 */
+	stoken?: string;
+	/**
+	 *  Optional compact, normal or invisible. This allows you to change the size or do an invisible captcha
+	 */
+	size?: Size;
+	/**
+	 * Optional. The badge location for g-recaptcha with size of "invisible".
+	 *
+	 * @default "bottomright"
+	 */
+	badge?: Badge;
+}
diff --git a/types/react-google-recaptcha/v0/react-google-recaptcha-tests.tsx b/types/react-google-recaptcha/v0/react-google-recaptcha-tests.tsx
new file mode 100644
index 0000000000..deb3eb3a66
--- /dev/null
+++ b/types/react-google-recaptcha/v0/react-google-recaptcha-tests.tsx
@@ -0,0 +1,15 @@
+import ReCAPTCHA from 'react-google-recaptcha';
+import * as React from 'react';
+
+const basicRecapchta = <ReCAPTCHA sitekey="xxx" onChange={a => a}/>;
+const invisibleRecaptcha: React.SFC = () => {
+    const recaptchaRef = React.createRef<ReCAPTCHA>();
+
+    return (
+	    <ReCAPTCHA
+  	        ref={recaptchaRef}
+	        sitekey="xxx"
+	        size="invisible"
+	    />
+    );
+};
diff --git a/types/react-google-recaptcha/v0/tsconfig.json b/types/react-google-recaptcha/v0/tsconfig.json
new file mode 100644
index 0000000000..cbcd80d948
--- /dev/null
+++ b/types/react-google-recaptcha/v0/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-google-recaptcha": [ "react-google-recaptcha/v0" ]
+        },
+        "types": [],
+        "jsx": "react",
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-google-recaptcha-tests.tsx"
+    ]
+}
diff --git a/types/react-google-recaptcha/v0/tslint.json b/types/react-google-recaptcha/v0/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-google-recaptcha/v0/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ca7d069c55f1c9586f588554386bcebdc0071bff Mon Sep 17 00:00:00 2001
From: Daniel Friesen <daniel@nadir-seen-fire.com>
Date: Mon, 11 Mar 2019 21:57:05 -0700
Subject: [PATCH 560/924] [cache-manager] Export interfaces

This allows variables where caches may be set to be explicitly typed.
---
 types/cache-manager/cache-manager-tests.ts |  2 +-
 types/cache-manager/index.d.ts             | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/types/cache-manager/cache-manager-tests.ts b/types/cache-manager/cache-manager-tests.ts
index 30a8472a8b..d8ab154aa1 100644
--- a/types/cache-manager/cache-manager-tests.ts
+++ b/types/cache-manager/cache-manager-tests.ts
@@ -1,6 +1,6 @@
 import * as cacheManager from 'cache-manager'
 
-const memoryCache = cacheManager.caching({ store: 'memory', max: 100, ttl: 10/*seconds*/ });
+const memoryCache: cacheManager.Cache = cacheManager.caching({ store: 'memory', max: 100, ttl: 10/*seconds*/ });
 const ttl = 5;
 
 memoryCache.set('foo', 'bar', { ttl: ttl }, (err) => {
diff --git a/types/cache-manager/index.d.ts b/types/cache-manager/index.d.ts
index fcd4458767..5898b0fa24 100644
--- a/types/cache-manager/index.d.ts
+++ b/types/cache-manager/index.d.ts
@@ -3,17 +3,17 @@
 // Definitions by: Simon Gausmann <https://github.com/GausSim>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-interface CachingConfig {
+export interface CachingConfig {
     ttl: number;
 }
 
-interface StoreConfig extends CachingConfig {
+export interface StoreConfig extends CachingConfig {
     store: string;
     max?: number;
     isCacheableValue?: (value: any) => boolean;
 }
 
-interface Cache {
+export interface Cache {
     set<T>(key: string, value: T, options: CachingConfig, callback?: (error: any) => void): void;
     set<T>(key: string, value: T, ttl: number, callback?: (error: any) => void): void;
     set<T>(key: string, value: T, options: CachingConfig): Promise<any>;
@@ -31,12 +31,5 @@ interface Cache {
     del(key: string): Promise<any>;
 }
 
-
-
-declare namespace cacheManager {
-    function caching(IConfig: StoreConfig): Cache;
-    function multiCaching(Caches: Cache[]): Cache;
-}
-
-export = cacheManager;
-
+export function caching(IConfig: StoreConfig): Cache;
+export function multiCaching(Caches: Cache[]): Cache;

From dd6e4b2deebdd4e2b0a2d1e4d42fd1449ea17069 Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Mon, 11 Mar 2019 22:08:44 -0700
Subject: [PATCH 561/924] added maxFontSizeMultiplier to text ios props

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index a96ffd41eb..786af04312 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -17,6 +17,7 @@
 //                 Ryan Nickel <https://github.com/mrnickel>
 //                 Souvik Ghosh <https://github.com/souvik-ghosh>
 //                 Cheng Gibson <https://github.com/nossbigg>
+//                 Saransh Kataria <https://github.com/saranshkataria>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -808,6 +809,14 @@ export interface TextPropsIOS {
      * default, a gray oval highlights the text on press down.
      */
     suppressHighlighting?: boolean;
+
+    /**
+     * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
+     * - null/undefined (default): inherit from the parent node or the global default (0)
+     * - 0: no max, ignore parent/global default
+     * - >= 1: sets the maxFontSizeMultiplier of this node to this value
+     */
+    maxFontSizeMultiplier?: number;
 }
 
 export interface TextPropsAndroid {

From d11cb50ef1e5ea929f9beb80700c0ded58612f90 Mon Sep 17 00:00:00 2001
From: Aziz Khambati <aziz.h.khambati@gmail.com>
Date: Tue, 12 Mar 2019 11:22:29 +0530
Subject: [PATCH 562/924] Add subscribeImmediate tests

---
 types/redux-batched-subscribe/index.d.ts                  | 8 ++++----
 .../redux-batched-subscribe-tests.ts                      | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/types/redux-batched-subscribe/index.d.ts b/types/redux-batched-subscribe/index.d.ts
index 30d75759d1..3cf9f68721 100644
--- a/types/redux-batched-subscribe/index.d.ts
+++ b/types/redux-batched-subscribe/index.d.ts
@@ -4,13 +4,13 @@
 //                 Aziz Khambati <https://github.com/azizhk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { StoreEnhancer } from "redux";
+import { Store, StoreEnhancer, Action, AnyAction } from "redux";
 
 export type NotifyFunction = () => void;
 export type BatchFunction = (notify: NotifyFunction) => void;
 
-export interface StoreExtension {
-    subscribeImmediate: () => void;
+export interface StoreExtension<S = any, A extends Action = AnyAction> {
+    subscribeImmediate: Store<S, A>["subscribe"];
 }
 
-export function batchedSubscribe(batch: BatchFunction): StoreEnhancer<StoreExtension>;
+export function batchedSubscribe<S = any, A extends Action = AnyAction>(batch: BatchFunction): StoreEnhancer<StoreExtension<S, A>>;
diff --git a/types/redux-batched-subscribe/redux-batched-subscribe-tests.ts b/types/redux-batched-subscribe/redux-batched-subscribe-tests.ts
index 6fa3e891b3..d46f8af7d3 100644
--- a/types/redux-batched-subscribe/redux-batched-subscribe-tests.ts
+++ b/types/redux-batched-subscribe/redux-batched-subscribe-tests.ts
@@ -23,7 +23,13 @@ const asyncNotify: BatchFunction = (() => {
     };
 })();
 
-const store: Store<State> = createStore(
+const store = createStore(
     rootReducer,
     batchedSubscribe(asyncNotify)
 );
+
+const unsubscribe = store.subscribeImmediate(() => {
+    store.getState();
+});
+
+unsubscribe();

From fb7e15e59d542b2d0b01a71e4d4578c823e77219 Mon Sep 17 00:00:00 2001
From: Adam Zerella <adamzerella@users.noreply.github.com>
Date: Mon, 11 Mar 2019 17:53:57 +1100
Subject: [PATCH 563/924] Added types for compatability

---
 types/is-date-object/index.d.ts               |  4 +--
 types/is-date-object/package.json             |  7 ++++++
 types/is-date-object/ts3.2/index.d.ts         |  5 ++++
 .../ts3.2/is-date-object-tests.ts             | 15 +++++++++++
 types/is-date-object/ts3.2/tsconfig.json      | 25 +++++++++++++++++++
 types/is-date-object/ts3.2/tslint.json        |  3 +++
 6 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 types/is-date-object/package.json
 create mode 100644 types/is-date-object/ts3.2/index.d.ts
 create mode 100644 types/is-date-object/ts3.2/is-date-object-tests.ts
 create mode 100644 types/is-date-object/ts3.2/tsconfig.json
 create mode 100644 types/is-date-object/ts3.2/tslint.json

diff --git a/types/is-date-object/index.d.ts b/types/is-date-object/index.d.ts
index 75fc6b1796..4087d37f88 100644
--- a/types/is-date-object/index.d.ts
+++ b/types/is-date-object/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/ljharb/is-date-object
 // Definitions by:  Adam Zerella <https://github.com/adamzerella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3
+// TypeScript Version: 3.0
 
 declare function isDateObject(value: Date): true;
 declare function isDateObject(value?: object): boolean;
-declare function isDateObject(value?: null | boolean | string | number | symbol | bigint | []): false;
+declare function isDateObject(value?: null | boolean | string | number | []): false;
 
 export = isDateObject;
diff --git a/types/is-date-object/package.json b/types/is-date-object/package.json
new file mode 100644
index 0000000000..6af74c39ab
--- /dev/null
+++ b/types/is-date-object/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.2.0-0": { "*": ["ts3.2/*"] }
+    }
+}
\ No newline at end of file
diff --git a/types/is-date-object/ts3.2/index.d.ts b/types/is-date-object/ts3.2/index.d.ts
new file mode 100644
index 0000000000..9ebd5eb2b0
--- /dev/null
+++ b/types/is-date-object/ts3.2/index.d.ts
@@ -0,0 +1,5 @@
+declare function isDateObject(value: Date): true;
+declare function isDateObject(value: object): boolean;
+declare function isDateObject(value: undefined | null | boolean | string | number | symbol | bigint | []): false;
+
+export = isDateObject;
diff --git a/types/is-date-object/ts3.2/is-date-object-tests.ts b/types/is-date-object/ts3.2/is-date-object-tests.ts
new file mode 100644
index 0000000000..9946c42d54
--- /dev/null
+++ b/types/is-date-object/ts3.2/is-date-object-tests.ts
@@ -0,0 +1,15 @@
+import isDate = require("is-date-object");
+
+isDate();
+isDate(undefined);
+isDate(null);
+isDate(false);
+isDate(true);
+isDate(42);
+isDate('foo');
+isDate((): void => {});
+isDate([]);
+isDate({});
+isDate(/a/g);
+isDate(new RegExp('a', 'g'));
+isDate(new Date());
diff --git a/types/is-date-object/ts3.2/tsconfig.json b/types/is-date-object/ts3.2/tsconfig.json
new file mode 100644
index 0000000000..7a40c93489
--- /dev/null
+++ b/types/is-date-object/ts3.2/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+        "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../../",
+      "typeRoots": [
+        "../../"
+      ],
+      "types": [
+
+      ],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+      "index.d.ts",
+      "is-date-object-tests.ts"
+    ]
+}
diff --git a/types/is-date-object/ts3.2/tslint.json b/types/is-date-object/ts3.2/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/is-date-object/ts3.2/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 503f0a5aafc8b842c190c93354527a7a763235b9 Mon Sep 17 00:00:00 2001
From: Aziz Khambati <aziz.h.khambati@gmail.com>
Date: Tue, 12 Mar 2019 11:36:26 +0530
Subject: [PATCH 564/924] Remove Generics

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

diff --git a/types/redux-batched-subscribe/index.d.ts b/types/redux-batched-subscribe/index.d.ts
index 3cf9f68721..78d7a385bf 100644
--- a/types/redux-batched-subscribe/index.d.ts
+++ b/types/redux-batched-subscribe/index.d.ts
@@ -9,8 +9,8 @@ import { Store, StoreEnhancer, Action, AnyAction } from "redux";
 export type NotifyFunction = () => void;
 export type BatchFunction = (notify: NotifyFunction) => void;
 
-export interface StoreExtension<S = any, A extends Action = AnyAction> {
-    subscribeImmediate: Store<S, A>["subscribe"];
+export interface StoreExtension {
+    subscribeImmediate: Store["subscribe"];
 }
 
-export function batchedSubscribe<S = any, A extends Action = AnyAction>(batch: BatchFunction): StoreEnhancer<StoreExtension<S, A>>;
+export function batchedSubscribe(batch: BatchFunction): StoreEnhancer<StoreExtension>;

From ce22cdd27c42d0f4bc4de4fa82fe608d7d46c7b5 Mon Sep 17 00:00:00 2001
From: Aziz Khambati <aziz.h.khambati@gmail.com>
Date: Tue, 12 Mar 2019 11:42:47 +0530
Subject: [PATCH 565/924] Add Typescript Version

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

diff --git a/types/redux-batched-subscribe/index.d.ts b/types/redux-batched-subscribe/index.d.ts
index 78d7a385bf..b892fbbf90 100644
--- a/types/redux-batched-subscribe/index.d.ts
+++ b/types/redux-batched-subscribe/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Dibyo Majumdar <https://github.com/mDibyo>
 //                 Aziz Khambati <https://github.com/azizhk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Store, StoreEnhancer, Action, AnyAction } from "redux";
 

From 11312712a8cc005d4a04b4afd5eade8839fc35e0 Mon Sep 17 00:00:00 2001
From: Aziz Khambati <aziz.h.khambati@gmail.com>
Date: Tue, 12 Mar 2019 11:52:48 +0530
Subject: [PATCH 566/924] Remove imports

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

diff --git a/types/redux-batched-subscribe/index.d.ts b/types/redux-batched-subscribe/index.d.ts
index b892fbbf90..aacb421eda 100644
--- a/types/redux-batched-subscribe/index.d.ts
+++ b/types/redux-batched-subscribe/index.d.ts
@@ -5,7 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { Store, StoreEnhancer, Action, AnyAction } from "redux";
+import { Store, StoreEnhancer } from 'redux';
 
 export type NotifyFunction = () => void;
 export type BatchFunction = (notify: NotifyFunction) => void;

From 425ddf9e29d2cb37dfd37ea16b1ff4862c38d691 Mon Sep 17 00:00:00 2001
From: mrsekut <k.cloudspider@gmail.com>
Date: Tue, 12 Mar 2019 16:22:22 +0900
Subject: [PATCH 567/924] Update Optional argument of push method

---
 types/redux-form/index.d.ts          | 1 +
 types/redux-form/lib/FieldArray.d.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 752dccd876..7005abf1de 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -14,6 +14,7 @@
 //                 Mohamed Shaaban <https://github.com/mshaaban088>
 //                 Ethan Setnik <https://github.com/esetnik>
 //                 Walter Barbagallo <https://github.com/bwlt>
+//                 Kota Marusue <https://github.com/mrsekut>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 import {
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index b84d04ad5a..026e75633f 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -40,7 +40,7 @@ export interface FieldArrayFieldsProps<FieldValue> {
     length: number;
     map<R>(callback: FieldIterate<FieldValue, R>): R[];
     pop(): FieldValue;
-    push(value: FieldValue): void;
+    push(value?: FieldValue): void;
     remove(index: number): void;
     shift(): FieldValue;
     swap(indexA: number, indexB: number): void;

From 75b774829ed6abcae5ac69c4f0564d86bbf860c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danilo=20B=C3=BCrger?= <info@danilobuerger.de>
Date: Tue, 12 Mar 2019 10:57:29 +0100
Subject: [PATCH 568/924] [react-native] allow redeclaring require when node
 typing is present

Fixes
```
Subsequent variable declarations must have the same type.  Variable
'require' must be of type 'NodeRequire', but here has type
'ReactNativeRequireFunction'.
```
Caused by https://github.com/DefinitelyTyped/DefinitelyTyped/pull/33302
---
 types/react-native/index.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index a96ffd41eb..413053ee10 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -9297,9 +9297,11 @@ export const PointPropType: React.Validator<PointPropType>;
 export const ViewPropTypes: React.ValidationMap<ViewProps>;
 
 declare global {
-    type ReactNativeRequireFunction = (name: string) => any;
+    interface NodeRequire {
+        (id: string): any;
+    }
 
-    var require: ReactNativeRequireFunction;
+    var require: NodeRequire;
 
     /**
      * Console polyfill

From 2e71f1e05419eb4da824aab6fbf46217d06af326 Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Tue, 12 Mar 2019 07:34:45 -0700
Subject: [PATCH 569/924] added maxFontSizeMultiplier to textinput props and
 added null attribute

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 786af04312..c2a51ef882 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -809,14 +809,6 @@ export interface TextPropsIOS {
      * default, a gray oval highlights the text on press down.
      */
     suppressHighlighting?: boolean;
-
-    /**
-     * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
-     * - null/undefined (default): inherit from the parent node or the global default (0)
-     * - 0: no max, ignore parent/global default
-     * - >= 1: sets the maxFontSizeMultiplier of this node to this value
-     */
-    maxFontSizeMultiplier?: number;
 }
 
 export interface TextPropsAndroid {
@@ -912,6 +904,14 @@ export interface TextProps extends TextPropsIOS, TextPropsAndroid, Accessibility
      * Used to reference react managed views from native code.
      */
     nativeID?: string;
+    
+    /**
+     * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
+     * - null/undefined (default): inherit from the parent node or the global default (0)
+     * - 0: no max, ignore parent/global default
+     * - >= 1: sets the maxFontSizeMultiplier of this node to this value
+     */
+    maxFontSizeMultiplier?: number | null;
 }
 
 /**
@@ -1436,6 +1436,14 @@ export interface TextInputProps extends ViewProps, TextInputIOSProps, TextInputA
      * or set/update maxLength to prevent unwanted edits without flicker.
      */
     value?: string;
+    
+    /**
+     * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
+     * - null/undefined (default): inherit from the parent node or the global default (0)
+     * - 0: no max, ignore parent/global default
+     * - >= 1: sets the maxFontSizeMultiplier of this node to this value
+     */
+    maxFontSizeMultiplier?: number | null;
 }
 
 /**

From f36136da1e77f5af731a8dfca1791719436b50e3 Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Tue, 12 Mar 2019 09:07:07 -0700
Subject: [PATCH 570/924] removed trailing whitespaces

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index c2a51ef882..9975858c3e 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -904,7 +904,7 @@ export interface TextProps extends TextPropsIOS, TextPropsAndroid, Accessibility
      * Used to reference react managed views from native code.
      */
     nativeID?: string;
-    
+
     /**
      * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
      * - null/undefined (default): inherit from the parent node or the global default (0)
@@ -1436,7 +1436,7 @@ export interface TextInputProps extends ViewProps, TextInputIOSProps, TextInputA
      * or set/update maxLength to prevent unwanted edits without flicker.
      */
     value?: string;
-    
+
     /**
      * Specifies largest possible scale a font can reach when allowFontScaling is enabled. Possible values:
      * - null/undefined (default): inherit from the parent node or the global default (0)

From 616a95fe99ab3f6f28f392a870fe0619d1fd5104 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 09:35:43 -0700
Subject: [PATCH 571/924] Remove incorrect 'export default', part 1

---
 types/add-zero/add-zero-tests.ts              |  2 +-
 types/add-zero/index.d.ts                     |  3 +-
 types/atob/atob-tests.ts                      |  2 +-
 types/atob/index.d.ts                         |  3 +-
 types/buble/index.d.ts                        |  2 +-
 types/clamp-js-main/clamp-js-main-tests.ts    |  3 +-
 types/clamp-js-main/index.d.ts                | 29 ++++++++++---------
 types/crpc/crpc-tests.ts                      |  2 +-
 types/crpc/index.d.ts                         |  7 +++--
 types/dlv/dlv-tests.ts                        |  2 +-
 types/dlv/index.d.ts                          |  3 +-
 types/flushable/flushable-tests.ts            |  2 +-
 types/flushable/index.d.ts                    |  3 +-
 .../htmlbars-inline-precompile-tests.ts       |  2 +-
 types/htmlbars-inline-precompile/index.d.ts   |  3 +-
 15 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/types/add-zero/add-zero-tests.ts b/types/add-zero/add-zero-tests.ts
index ac0509d26d..852f1eddb9 100644
--- a/types/add-zero/add-zero-tests.ts
+++ b/types/add-zero/add-zero-tests.ts
@@ -1,3 +1,3 @@
-import addZero from "add-zero";
+import addZero = require("add-zero");
 
 addZero(5, 2);
diff --git a/types/add-zero/index.d.ts b/types/add-zero/index.d.ts
index 907364a62d..15c21d4d11 100644
--- a/types/add-zero/index.d.ts
+++ b/types/add-zero/index.d.ts
@@ -3,4 +3,5 @@
 // Definitions by: Giles Roadnight <https://github.com/Roaders>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function addZero(value: string | number, digits?: number): string;
+export = addZero;
+declare function addZero(value: string | number, digits?: number): string;
diff --git a/types/atob/atob-tests.ts b/types/atob/atob-tests.ts
index e2e2618387..e9ec4589a5 100644
--- a/types/atob/atob-tests.ts
+++ b/types/atob/atob-tests.ts
@@ -1,3 +1,3 @@
-import atob from 'atob';
+import atob = require('atob');
 
 atob('foo');
diff --git a/types/atob/index.d.ts b/types/atob/index.d.ts
index 1feb3481e8..0da09c74b5 100644
--- a/types/atob/index.d.ts
+++ b/types/atob/index.d.ts
@@ -4,4 +4,5 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-export default function(str: string): string;
+export = _default;
+declare function _default(str: string): string;
diff --git a/types/buble/index.d.ts b/types/buble/index.d.ts
index db3cb0a7b7..5ac6a96ac6 100644
--- a/types/buble/index.d.ts
+++ b/types/buble/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for buble 0.19
-// Project: https://github.com/Rich-Harris/buble#README
+// Project: https://github.com/bublejs/buble
 // Definitions by: Hugo Alliaume <https://github.com/Kocal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
diff --git a/types/clamp-js-main/clamp-js-main-tests.ts b/types/clamp-js-main/clamp-js-main-tests.ts
index f903b82a06..c85eaed664 100644
--- a/types/clamp-js-main/clamp-js-main-tests.ts
+++ b/types/clamp-js-main/clamp-js-main-tests.ts
@@ -1,4 +1,5 @@
-import clamp, { ClampOptions, ClampResponse } from 'clamp-js-main';
+import clamp = require('clamp-js-main');
+import { ClampOptions, ClampResponse } from 'clamp-js-main';
 
 const element: HTMLElement = document.createElement('div');
 element.style.setProperty('width', '5px');
diff --git a/types/clamp-js-main/index.d.ts b/types/clamp-js-main/index.d.ts
index 75286172cb..80cf322896 100644
--- a/types/clamp-js-main/index.d.ts
+++ b/types/clamp-js-main/index.d.ts
@@ -3,18 +3,21 @@
 // Definitions by: Sinziana Nicolae <https://github.com/sinziananicolae>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface ClampOptions {
-    clamp?: number|string;
-    useNativeClamp?: boolean;
-    splitOnChars?: string[];
-    animate?: boolean;
-    truncationChar?: string;
-    truncationHTML?: string | null;
+declare namespace clamp {
+    interface ClampOptions {
+        clamp?: number|string;
+        useNativeClamp?: boolean;
+        splitOnChars?: string[];
+        animate?: boolean;
+        truncationChar?: string;
+        truncationHTML?: string | null;
+    }
+
+    interface ClampResponse {
+        original: string;
+        clamped: string;
+    }
 }
 
-export interface ClampResponse {
-    original: string;
-    clamped: string;
-}
-
-export default function clamp(element: HTMLElement, options?: ClampOptions): ClampResponse;
+export = clamp;
+declare function clamp(element: HTMLElement, options?: clamp.ClampOptions): clamp.ClampResponse;
diff --git a/types/crpc/crpc-tests.ts b/types/crpc/crpc-tests.ts
index ade069cbba..b9b59ba718 100644
--- a/types/crpc/crpc-tests.ts
+++ b/types/crpc/crpc-tests.ts
@@ -1,3 +1,3 @@
-import crpc from 'crpc';
+import crpc = require('crpc');
 
 const client = crpc('https://example.com/');
diff --git a/types/crpc/index.d.ts b/types/crpc/index.d.ts
index 8947443c42..a599dacab5 100644
--- a/types/crpc/index.d.ts
+++ b/types/crpc/index.d.ts
@@ -4,6 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
-export type Client = <TRes>(path: string, body: any, options?: {} | null) => Promise<TRes>;
+declare namespace crpc {
+    type Client = <TRes>(path: string, body: any, options?: {} | null) => Promise<TRes>;
+}
 
-export default function crpc(baseUrl: string, options?: {}): Client;
+export = crpc;
+declare function crpc(baseUrl: string, options?: {}): crpc.Client;
diff --git a/types/dlv/dlv-tests.ts b/types/dlv/dlv-tests.ts
index abe4b259c3..64f7c54898 100644
--- a/types/dlv/dlv-tests.ts
+++ b/types/dlv/dlv-tests.ts
@@ -1,4 +1,4 @@
-import dlv from 'dlv';
+import dlv = require('dlv');
 
 const obj = {
 	undef: undefined,
diff --git a/types/dlv/index.d.ts b/types/dlv/index.d.ts
index 5813ec0595..093f905259 100644
--- a/types/dlv/index.d.ts
+++ b/types/dlv/index.d.ts
@@ -9,4 +9,5 @@
  * return a default if the full key path does not exist or the value is
  * undefined
  */
-export default function dlv(object: object, key: string | string[], defaultValue?: any): any;
+export = dlv;
+declare function dlv(object: object, key: string | string[], defaultValue?: any): any;
diff --git a/types/flushable/flushable-tests.ts b/types/flushable/flushable-tests.ts
index 3d4bf565dc..7621810a38 100644
--- a/types/flushable/flushable-tests.ts
+++ b/types/flushable/flushable-tests.ts
@@ -3,7 +3,7 @@
  * from the package's README
  */
 
-import flushable from 'flushable';
+import flushable = require('flushable');
 
 // prints a message to the console after 1 second
 const operation = flushable(flushed => {
diff --git a/types/flushable/index.d.ts b/types/flushable/index.d.ts
index eb3a08a214..7592cf2ecf 100644
--- a/types/flushable/index.d.ts
+++ b/types/flushable/index.d.ts
@@ -14,7 +14,8 @@ export interface FlushableOperation {
     flush: () => void;
 }
 
-export default function flushable(
+export = flushable;
+declare function flushable(
     onComplete: FlushableOnCompleteHandler,
     delay: number
 ): FlushableOperation;
diff --git a/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts b/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
index c8adb26d1a..30bdfed7e4 100644
--- a/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
+++ b/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
@@ -1,4 +1,4 @@
-import hbs from 'htmlbars-inline-precompile';
+import hbs = require('htmlbars-inline-precompile');
 
 const likeThisDotRender = (s: string | string[]) => {};
 
diff --git a/types/htmlbars-inline-precompile/index.d.ts b/types/htmlbars-inline-precompile/index.d.ts
index 3cc8e36066..7c5ce2d84d 100644
--- a/types/htmlbars-inline-precompile/index.d.ts
+++ b/types/htmlbars-inline-precompile/index.d.ts
@@ -13,4 +13,5 @@
 // [Babel plugin]: https://github.com/ember-cli/babel-plugin-htmlbars-inline-precompile#babel-plugin-htmlbars-inline-precompile-
 // [output]: https://github.com/emberjs/ember-test-helpers/blob/77f9a53da9d8c19a85b3122788caadbcc59274c2/lib/ember-test-helpers/-legacy-overrides.js#L17-L42
 
-export default function hbs(tagged: TemplateStringsArray): string | string[];
+export = hbs;
+declare function hbs(tagged: TemplateStringsArray): string | string[];

From 630a02b27036c92f63ab84826ab584b4b2940f9f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 09:55:52 -0700
Subject: [PATCH 572/924] Undo non-npm package htmlbars

---
 types/flushable/index.d.ts                    | 22 ++++++++++---------
 .../htmlbars-inline-precompile-tests.ts       |  2 +-
 types/htmlbars-inline-precompile/index.d.ts   |  3 +--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/types/flushable/index.d.ts b/types/flushable/index.d.ts
index 7592cf2ecf..e3c23b3835 100644
--- a/types/flushable/index.d.ts
+++ b/types/flushable/index.d.ts
@@ -3,19 +3,21 @@
 // Definitions by: Parth Mehta <https://github.com/pash90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export type FlushableOnCompleteHandler = (flushed: boolean) => any;
+declare namespace flushable {
+    type FlushableOnCompleteHandler = (flushed: boolean) => any;
 
-export interface FlushableOperation {
-    /** Returns whether or not the callback has been executed */
-    pending: () => boolean;
-    /** Stops the callback from being executed */
-    cancel: () => void;
-    /** Immediately executes the callback */
-    flush: () => void;
+    interface FlushableOperation {
+        /** Returns whether or not the callback has been executed */
+        pending: () => boolean;
+        /** Stops the callback from being executed */
+        cancel: () => void;
+        /** Immediately executes the callback */
+        flush: () => void;
+    }
 }
 
 export = flushable;
 declare function flushable(
-    onComplete: FlushableOnCompleteHandler,
+    onComplete: flushable.FlushableOnCompleteHandler,
     delay: number
-): FlushableOperation;
+): flushable.FlushableOperation;
diff --git a/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts b/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
index 30bdfed7e4..c8adb26d1a 100644
--- a/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
+++ b/types/htmlbars-inline-precompile/htmlbars-inline-precompile-tests.ts
@@ -1,4 +1,4 @@
-import hbs = require('htmlbars-inline-precompile');
+import hbs from 'htmlbars-inline-precompile';
 
 const likeThisDotRender = (s: string | string[]) => {};
 
diff --git a/types/htmlbars-inline-precompile/index.d.ts b/types/htmlbars-inline-precompile/index.d.ts
index 7c5ce2d84d..3cc8e36066 100644
--- a/types/htmlbars-inline-precompile/index.d.ts
+++ b/types/htmlbars-inline-precompile/index.d.ts
@@ -13,5 +13,4 @@
 // [Babel plugin]: https://github.com/ember-cli/babel-plugin-htmlbars-inline-precompile#babel-plugin-htmlbars-inline-precompile-
 // [output]: https://github.com/emberjs/ember-test-helpers/blob/77f9a53da9d8c19a85b3122788caadbcc59274c2/lib/ember-test-helpers/-legacy-overrides.js#L17-L42
 
-export = hbs;
-declare function hbs(tagged: TemplateStringsArray): string | string[];
+export default function hbs(tagged: TemplateStringsArray): string | string[];

From c45a7038110c017c7503f3f8d42bfbcb1799ec3d Mon Sep 17 00:00:00 2001
From: Alan Choi <alanhchoi@gmail.com>
Date: Wed, 13 Mar 2019 02:40:52 +0900
Subject: [PATCH 573/924] update select options type (#33796)

accept every type that <option> tag's value attribute can take
---
 types/storybook__addon-knobs/index.d.ts             |  8 ++++++--
 .../storybook__addon-knobs-tests.tsx                | 13 +++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index dbfd84a13d..dd512af5d0 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -52,8 +52,12 @@ export function object<T>(name: string, value: T, groupId?: string): T;
 export function radios<T>(name: string, options: { [s: string]: T }, value?: T, groupId?: string): string;
 
 export function select<T>(name: string, options: { [s: string]: T }, value: T, groupId?: string): T;
-export function select<T extends string>(name: string, options: ReadonlyArray<T>, value: T, groupId?: string): T;
-export function select(name: string, options: ReadonlyArray<string>, value: string, groupId?: string): string;
+export function select<
+    T extends Exclude<
+        React.OptionHTMLAttributes<HTMLOptionElement>['value'],
+        undefined
+    >
+>(name: string, options: ReadonlyArray<T>, value: T, groupId?: string): T;
 
 export function date(name: string, value?: Date, groupId?: string): Date;
 
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index d09447f75d..0e95a757ba 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -93,16 +93,17 @@ stories.add('dynamic knobs', () => {
   );
 });
 
-const readonlyOptionsArray: ReadonlyArray<string> = ['hi'];
-select('With readonly string array', readonlyOptionsArray, readonlyOptionsArray[0]);
+// readonly option array: element can be typed string | number | string[]
+select('With readonly string array', ['hi'], 'hi');
+select('With readonly number array', [1, 2, 3, 4], 1);
+select('With readonly string[] array', [['a'], ['b', 'c']], ['a']);
+select('With mixed-typed element array', [1, 'hi', ['a']], 1);
 
 type StringLiteralType = 'Apple' | 'Banana' | 'Grapes';
 const stringLiteralArray: StringLiteralType[] = ['Apple', 'Banana', 'Grapes'];
 
-let selectedFruit: StringLiteralType;
-
 // type of value returned from `select` must be `StringLiteralType`.
-selectedFruit = select('With string literal array', stringLiteralArray, stringLiteralArray[0]);
+const _: StringLiteralType = select('With string literal array', stringLiteralArray, stringLiteralArray[0]);
 
 const optionsObject = {
   Apple: { taste: 'sweet', color: 'red' },
@@ -112,7 +113,7 @@ select('With object', optionsObject, optionsObject.Apple);
 
 const genericArray = array('With regular array', ['hi', 'there']);
 
-const userInputArray = array('With readonly array', readonlyOptionsArray);
+const userInputArray = array('With readonly array', ['hi']);
 userInputArray.push('Make sure that the output is still mutable although the input need not be!');
 
 // groups

From 5417a76f37fdfd677deac66b745d2a3c862b0099 Mon Sep 17 00:00:00 2001
From: Jojoshua <Jojoshua@gmail.com>
Date: Tue, 12 Mar 2019 13:41:15 -0400
Subject: [PATCH 574/924] Tabulator-tables  - Minor fixes to optional types
 (#33789)

* Fix optional types

* Fix optionals

* Fix optionals
---
 types/tabulator-tables/index.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
index 328cf80865..751a97a7f2 100644
--- a/types/tabulator-tables/index.d.ts
+++ b/types/tabulator-tables/index.d.ts
@@ -90,11 +90,11 @@ declare namespace Tabulator {
             | boolean;
 
         /** The clipboardCopied event is triggered whenever data is copied to the clipboard. */
-        clipboardCopied: () => void;
+        clipboardCopied?: () => void;
         /** The clipboardPasted event is triggered whenever data is successfuly pasted into the table. */
-        clipboardPasted: () => void;
+        clipboardPasted?: () => void;
         /** The clipboardPasteError event is triggered whenever an atempt to paste data into the table has failed because it was rejected by the paste parser. */
-        clipboardPasteError: () => void;
+        clipboardPasteError?: () => void;
     }
 
     interface OptionsPersistentConfiguration {
@@ -744,9 +744,9 @@ declare namespace Tabulator {
         history?: boolean;
 
         /** The historyUndo event is triggered when the undo action is triggered. */
-        historyUndo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
+        historyUndo?: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
         /** The historyRedo event is triggered when the redo action is triggered. */
-        historyRedo: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
+        historyRedo?: (action: HistoryAction, component: CellComponent | RowComponent, data: any) => void;
     }
 
     interface ColumnLayout {
@@ -1177,7 +1177,7 @@ You can pass an optional additional property with sorter, sorterParams that shou
 
     interface RowComponent {
         /** The getData function returns the data object for the row.*/
-        getData: () => {};
+        getData: () => any;
         /** The getElement function returns the DOM node for the row.*/
         getElement: () => HTMLElement;
 
@@ -1424,9 +1424,9 @@ declare class Tabulator {
     getData: (activeOnly?: boolean) => any[];
     getDataCount: (activeOnly?: boolean) => number;
     /** The searchRows function allows you to retreive an array of row components that match any filters you pass in. it accepts the same arguments as the setFilter function. */
-    searchRows: Tabulator.FilterFunction;
+    searchRows: (field: string, type: Tabulator.FilterType, value: any) => Tabulator.RowComponent[];
     /** The searchData function allows you to retreive an array of table row data that match any filters you pass in. it accepts the same arguments as the setFilter function. */
-    searchData: Tabulator.FilterFunction;
+    searchData: (field: string, type: Tabulator.FilterType, value: any) => any[];
     /** You can retrieve the table data as a simple HTML table using the getHtml function. */
     getHtml: (activeOnly?: boolean) => void;
     /** You can retrieve the current AJAX URL of the table with the getAjaxUrl function.

From b9654a8bcb7ecb04c8c7611c6fa7b0244040480c Mon Sep 17 00:00:00 2001
From: Alex Jerabek <38896772+AlexJerabek@users.noreply.github.com>
Date: Tue, 12 Mar 2019 10:41:31 -0700
Subject: [PATCH 575/924] Updating Excel and Word Preview (#33779)

---
 types/office-js-preview/index.d.ts | 3048 ++++++++++++++++++++--------
 1 file changed, 2205 insertions(+), 843 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index c36864f3dd..57f2c43830 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -18899,7 +18899,6 @@ declare namespace Excel {
         address?: boolean;
         addressLocal?: boolean;
         format?: Excel.CellPropertiesFormatLoadOptions;
-        hasSpill?: boolean;
         hidden?: boolean;
         hyperlink?: boolean;
         style?: boolean;
@@ -18947,7 +18946,6 @@ declare namespace Excel {
     interface CellProperties extends SettableCellProperties {
         address?: string;
         addressLocal?: string;
-        hasSpill?: boolean;
         hidden?: boolean;
     }
     /** Represents the input parameter of setRowProperties. */
@@ -18962,7 +18960,6 @@ declare namespace Excel {
         rowIndex?: number;
         address?: string;
         addressLocal?: string;
-        hasSpill?: boolean;
     }
     /** Represents the input parameter of setColumnProperties. */
     interface SettableColumnProperties extends SettableCellProperties {
@@ -18976,7 +18973,6 @@ declare namespace Excel {
         columnIndex?: number;
         address?: string;
         addressLocal?: string;
-        hasSpill?: boolean;
     }
     /** Represents the returned format properties of getCellProperties or format input parameter of setCellProperties. */
     interface CellPropertiesFormat {
@@ -19328,7 +19324,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Provides information about the workbook AutoSave setting changed event.
+     * Provides information about the workbook's onAutoSaveSettingChanged event.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -20058,7 +20054,7 @@ declare namespace Excel {
     interface ShapeActivatedEventArgs {
         /**
          *
-         * Gets the id of the shape that is activated.
+         * Gets the id of the activated shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -20091,7 +20087,7 @@ declare namespace Excel {
     interface ShapeDeactivatedEventArgs {
         /**
          *
-         * Gets the id of the shape that is deactivated.
+         * Gets the id of the shape deactivated shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -20421,6 +20417,14 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly names: Excel.NamedItemCollection;
+        /**
+         *
+         * Represents a collection of PivotTableStyles associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly pivotTableStyles: Excel.PivotTableStyleCollection;
         /**
          *
          * Represents a collection of PivotTables associated with the workbook. Read-only.
@@ -20449,6 +20453,14 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.4]
          */
         readonly settings: Excel.SettingCollection;
+        /**
+         *
+         * Represents a collection of SlicerStyles associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly slicerStyles: Excel.SlicerStyleCollection;
         /**
          *
          * Represents a collection of Slicers associated with the workbook. Read-only.
@@ -20464,6 +20476,14 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         readonly styles: Excel.StyleCollection;
+        /**
+         *
+         * Represents a collection of TableStyles associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly tableStyles: Excel.TableStyleCollection;
         /**
          *
          * Represents a collection of tables associated with the workbook. Read-only.
@@ -20471,6 +20491,14 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly tables: Excel.TableCollection;
+        /**
+         *
+         * Represents a collection of TimelineStyles associated with the workbook. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly timelineStyles: Excel.TimelineStyleCollection;
         /**
          *
          * Represents a collection of worksheets associated with the workbook. Read-only.
@@ -20480,7 +20508,7 @@ declare namespace Excel {
         readonly worksheets: Excel.WorksheetCollection;
         /**
          *
-         * True if the workbook is in auto save mode.
+         * Specifies whether or not the workbook is in autosave mode. Read-Only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -20505,8 +20533,8 @@ declare namespace Excel {
         chartDataPointTrack: boolean;
         /**
          *
-         * True if no changes have been made to the specified workbook since it was last saved.
-            You can set this property to True if you want to close a modified workbook without either saving it or being prompted to save it.
+         * Specifies whether or not changes have been made since the workbook was last saved.
+            You can set this property to true if you want to close a modified workbook without either saving it or being prompted to save it.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -20521,7 +20549,7 @@ declare namespace Excel {
         readonly name: string;
         /**
          *
-         * True if the workbook has ever been saved locally or online.
+         * Specifies whether or not the workbook has ever been saved locally or online. Read-Only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -20689,7 +20717,7 @@ declare namespace Excel {
         }): Excel.Workbook;
         /**
          *
-         * Occurs when AutoSave setting is changed on the workbook.
+         * Occurs when the autoSave setting is changed on the workbook.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          *
@@ -21053,7 +21081,7 @@ declare namespace Excel {
         copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
-         * Deletes the worksheet from the workbook. Note that if the worksheet's visibility is set to "VeryHidden", the delete operation will fail with a GeneralException.
+         * Deletes the worksheet from the workbook.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -21309,11 +21337,11 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param base64File Required. Base64 string representing the source workbook.
-         * @param sheetNamesToInsert Optional. The speified worksheet names to insert. By default it will insert all worksheets from the source workbook.
-         * @param positionType Optional. Insert position type, see Excel.WorksheetPositionType for details. Default is "Start".
-         * @param relativeTo Optional. The referencing worksheet object or worksheet name/id in the current workbook. Default is null and based on the postionType parameter it will insert worksheets at the start or end of the current workbook.
-         * @returns An array where each item represents the Id of the new inserted worksheet.
+         * @param base64File Required. The base64-encoded string representing the source workbook file.
+         * @param sheetNamesToInsert Optional. The names of individual worksheets to insert. By default, all the worksheets from the source workbook are inserted.
+         * @param positionType Optional. Where in the current workbook the new worksheets will be inserted. See Excel.WorksheetPositionType for details. Default is "Start".
+         * @param relativeTo Optional. The worksheet in the current workbook that is referenced for the positionType parameter. Default is null and, based on positionType, it will insert worksheets at the start or end of the current workbook.
+         * @returns An array of ids corresponding to each newly inserted worksheet.
          */
         addFromBase64(base64File: string, sheetNamesToInsert?: string[], positionType?: Excel.WorksheetPositionType, relativeTo?: Worksheet | string): OfficeExtension.ClientResult<string[]>;
         /**
@@ -21322,11 +21350,11 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          *
-         * @param base64File Required. Base64 string representing the source workbook.
-         * @param sheetNamesToInsert Optional. The speified worksheet names to insert. By default it will insert all worksheets from the source workbook.
-         * @param positionType Optional. Insert position type, see Excel.WorksheetPositionType for details. Default is "Start".
-         * @param relativeTo Optional. The referencing worksheet object or worksheet name/id in the current workbook. Default is null and based on the postionType parameter it will insert worksheets at the start or end of the current workbook.
-         * @returns An array where each item represents the Id of the new inserted worksheet.
+         * @param base64File Required. The base64-encoded string representing the source workbook file.
+         * @param sheetNamesToInsert Optional. The names of individual worksheets to insert. By default, all the worksheets from the source workbook are inserted.
+         * @param positionType Optional. Where in the current workbook the new worksheets will be inserted. See Excel.WorksheetPositionType for details. Default is "Start".
+         * @param relativeTo Optional. The worksheet in the current workbook that is referenced for the positionType parameter. Default is null and, based on positionType, it will insert worksheets at the start or end of the current workbook.
+         * @returns An array of ids corresponding to each newly inserted worksheet.
          */
         addFromBase64(base64File: string, sheetNamesToInsert?: string[], positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Worksheet | string): OfficeExtension.ClientResult<string[]>;
         /**
@@ -22110,7 +22138,7 @@ declare namespace Excel {
         findOrNullObject(text: string, criteria: Excel.SearchCriteria): Excel.Range;
         /**
          *
-         * Does FlashFill to current range. Flash Fill will automatically fills data when it senses a pattern, so the range must be single column range and have data around in order to find pattern.
+         * Does FlashFill to current range.Flash Fill will automatically fills data when it senses a pattern, so the range must be single column range and have data around in order to find pattern.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -22351,7 +22379,7 @@ declare namespace Excel {
         getSpecialCellsOrNullObject(cellType: "ConditionalFormats" | "DataValidations" | "Blanks" | "Constants" | "Formulas" | "SameConditionalFormat" | "SameDataValidation" | "Visible", cellValueType?: "All" | "Errors" | "ErrorsLogical" | "ErrorsNumbers" | "ErrorsText" | "ErrorsLogicalNumber" | "ErrorsLogicalText" | "ErrorsNumberText" | "Logical" | "LogicalNumbers" | "LogicalText" | "LogicalNumbersText" | "Numbers" | "NumbersText" | "Text"): Excel.RangeAreas;
         /**
          *
-         * Gets the range object containing the anchor cell for a cell getting spilled into. Fails if applied to a range with more than one cell. Read only.
+         * Gets the range object containing the anchor cell for a cell getting spilled into. Fails if applied to a range with more than one cell. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -22359,12 +22387,30 @@ declare namespace Excel {
         getSpillParent(): Excel.Range;
         /**
          *
-         * Gets the range object containing the spill range when called on an anchor cell. Fails if applied to a range with more than one cell. Read only.
+         * Gets the range object containing the anchor cell for a cell getting spilled into. Read-only.
+            If it is not a spill cell or more than once cells are give, a null object will be returned.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getSpillParentOrNullObject(): Excel.Range;
+        /**
+         *
+         * Gets the range object containing the spill range when called on an anchor cell. Fails if applied to a range with more than one cell. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
         getSpillingToRange(): Excel.Range;
+        /**
+         *
+         * Gets the range object containing the spill range when called on an anchor cell. Read-only.
+            If the range is not an anchor cell or spill range can't be found, a null object will be returned.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getSpillingToRangeOrNullObject(): Excel.Range;
         /**
          *
          * Returns a Range object that represents the surrounding region for the top-left cell in this range. A surrounding region is a range bounded by any combination of blank rows and blank columns relative to this range.
@@ -22473,7 +22519,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        setCellProperties(cellPropertiesData: SettableCellProperties[][]): void;
+        setCellProperties(cellPropertiesData: SettableCellProperties[][] | OfficeExtension.ClientResult<SettableCellProperties[][]>): void;
         /**
          *
          * Updates the range based on a single-dimensional array of column properties, encapsulating things like font, fill, borders, alignment, and so forth.
@@ -22481,7 +22527,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        setColumnProperties(columnPropertiesData: SettableColumnProperties[]): void;
+        setColumnProperties(columnPropertiesData: SettableColumnProperties[] | OfficeExtension.ClientResult<SettableColumnProperties[]>): void;
         /**
          *
          * Set a range to be recalculated when the next recalculation occurs.
@@ -22497,7 +22543,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        setRowProperties(rowPropertiesData: SettableRowProperties[]): void;
+        setRowProperties(rowPropertiesData: SettableRowProperties[] | OfficeExtension.ClientResult<SettableRowProperties[]>): void;
         /**
          *
          * Displays the card for an active cell if it has rich value content.
@@ -35324,6 +35370,730 @@ declare namespace Excel {
         */
         toJSON(): Excel.Interfaces.StyleCollectionData;
     }
+    /**
+     *
+     * Represents a collection of TableStyles.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class TableStyleCollection extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.TableStyle[];
+        /**
+         *
+         * Creates a blank TableStyle with the specified name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name The unique name for the new TableStyle. Will throw an invalid argument exception if the name is already in use.
+         * @param makeUniqueName Optional, defaults to false. If true, will append numbers to the name in order to make it unique, if needed.
+         * @returns The newly created TableStyle.
+         */
+        add(name: string, makeUniqueName?: boolean): Excel.TableStyle;
+        /**
+         *
+         * Gets the number of table styles in the collection.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the default TableStyle for the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The TableStyle object that is the current default TableStyle.
+         */
+        getDefault(): Excel.TableStyle;
+        /**
+         *
+         * Gets a TableStyle by name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the TableStyle to be retrieved.
+         * @returns The TableStyle object whose name matches the input.
+         */
+        getItem(name: string): Excel.TableStyle;
+        /**
+         *
+         * Gets a TableStyle by name. If the TableStyle does not exist, will return a null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the TableStyle to be retrieved.
+         * @returns The TableStyle object whose name matches the input.
+         */
+        getItemOrNullObject(name: string): Excel.TableStyle;
+        /**
+         *
+         * Sets the default TableStyle for use in the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param newDefaultStyle The TableStyle object or name of the TableStyle object that should be the new default.
+         */
+        setDefault(newDefaultStyle: TableStyle | string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableStyleCollection` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableStyleCollection` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableStyleCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.TableStyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableStyleCollection;
+        load(option?: string | string[]): Excel.TableStyleCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.TableStyleCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Excel.TableStyleCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.TableStyleCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
+        toJSON(): Excel.Interfaces.TableStyleCollectionData;
+    }
+    /**
+     *
+     * Represents a TableStyle, which defines the style elements by region of the Table.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class TableStyle extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /**
+         *
+         * Gets the name of the TableStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        name: string;
+        /**
+         *
+         * True means that this TableStyle object is read-only. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly readOnly: boolean;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TableStyle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.TableStyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Excel.TableStyle): void;
+        /**
+         *
+         * Deletes the TableStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        delete(): void;
+        /**
+         *
+         * Creates a duplicate of this TableStyle with copies of all the style elements.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The new TableStyle object that has been duplicated from this TableStyle.
+         */
+        duplicate(): Excel.TableStyle;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableStyle` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableStyle` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableStyle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.TableStyleLoadOptions): Excel.TableStyle;
+        load(option?: string | string[]): Excel.TableStyle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TableStyle;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Excel.TableStyle object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.TableStyleData`) that contains shallow copies of any loaded child properties from the original object.
+        */
+        toJSON(): Excel.Interfaces.TableStyleData;
+    }
+    /**
+     *
+     * Represents a collection of PivotTable styles.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class PivotTableStyleCollection extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.PivotTableStyle[];
+        /**
+         *
+         * Creates a blank PivotTableStyle with the specified name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name The unique name for the new PivotTableStyle. Will throw an invalid argument exception if the name is already in use.
+         * @param makeUniqueName Optional, defaults to false. If true, will append numbers to the name in order to make it unique, if needed.
+         * @returns The newly created PivotTableStyle.
+         */
+        add(name: string, makeUniqueName?: boolean): Excel.PivotTableStyle;
+        /**
+         *
+         * Gets the number of PivotTable styles in the collection.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the default PivotTableStyle for the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The PivotTableStyle object that is the current default PivotTableStyle.
+         */
+        getDefault(): Excel.PivotTableStyle;
+        /**
+         *
+         * Gets a PivotTableStyle by name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the PivotTableStyle to be retrieved.
+         * @returns The PivotTableStyle object whose name matches the input.
+         */
+        getItem(name: string): Excel.PivotTableStyle;
+        /**
+         *
+         * Gets a PivotTableStyle by name. If the PivotTableStyle does not exist, will return a null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the PivotTableStyle to be retrieved.
+         * @returns The PivotTableStyle object whose name matches the input.
+         */
+        getItemOrNullObject(name: string): Excel.PivotTableStyle;
+        /**
+         *
+         * Sets the default PivotTableStyle for use in the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param newDefaultStyle The PivotTableStyle object or name of the PivotTableStyle object that should be the new default.
+         */
+        setDefault(newDefaultStyle: PivotTableStyle | string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.PivotTableStyleCollection` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.PivotTableStyleCollection` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.PivotTableStyleCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.PivotTableStyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.PivotTableStyleCollection;
+        load(option?: string | string[]): Excel.PivotTableStyleCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.PivotTableStyleCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Excel.PivotTableStyleCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.PivotTableStyleCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
+        toJSON(): Excel.Interfaces.PivotTableStyleCollectionData;
+    }
+    /**
+     *
+     * Represents a PivotTable Style, which defines style elements by PivotTable region.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class PivotTableStyle extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /**
+         *
+         * Gets the name of the PivotTableStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        name: string;
+        /**
+         *
+         * True means that this PivotTableStyle object is read-only. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly readOnly: boolean;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.PivotTableStyle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.PivotTableStyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Excel.PivotTableStyle): void;
+        /**
+         *
+         * Deletes the PivotTableStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        delete(): void;
+        /**
+         *
+         * Creates a duplicate of this PivotTableStyle with copies of all the style elements.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The new PivotTableStyle object that has been duplicated from this PivotTableStyle.
+         */
+        duplicate(): Excel.PivotTableStyle;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.PivotTableStyle` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.PivotTableStyle` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.PivotTableStyle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.PivotTableStyleLoadOptions): Excel.PivotTableStyle;
+        load(option?: string | string[]): Excel.PivotTableStyle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.PivotTableStyle;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Excel.PivotTableStyle object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.PivotTableStyleData`) that contains shallow copies of any loaded child properties from the original object.
+        */
+        toJSON(): Excel.Interfaces.PivotTableStyleData;
+    }
+    /**
+     *
+     * Represents a collection of SlicerStyle objects.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class SlicerStyleCollection extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.SlicerStyle[];
+        /**
+         *
+         * Creates a blank SlicerStyle with the specified name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name The unique name for the new SlicerStyle. Will throw an invalid argument exception if the name is already in use.
+         * @param makeUniqueName Optional, defaults to false. If true, will append numbers to the name in order to make it unique, if needed.
+         * @returns The newly created SlicerStyle.
+         */
+        add(name: string, makeUniqueName?: boolean): Excel.SlicerStyle;
+        /**
+         *
+         * Gets the number of slicer styles in the collection.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the default SlicerStyle for the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The SlicerStyle object that is the current default SlicerStyle.
+         */
+        getDefault(): Excel.SlicerStyle;
+        /**
+         *
+         * Gets a SlicerStyle by name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the SlicerStyle to be retrieved.
+         * @returns The SlicerStyle object whose name matches the input.
+         */
+        getItem(name: string): Excel.SlicerStyle;
+        /**
+         *
+         * Gets a SlicerStyle by name. If the SlicerStyle does not exist, will return a null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the SlicerStyle to be retrieved.
+         * @returns The SlicerStyle object whose name matches the input.
+         */
+        getItemOrNullObject(name: string): Excel.SlicerStyle;
+        /**
+         *
+         * Sets the default SlicerStyle for use in the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param newDefaultStyle The SlicerStyle object or name of the SlicerStyle object that should be the new default.
+         */
+        setDefault(newDefaultStyle: SlicerStyle | string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.SlicerStyleCollection` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.SlicerStyleCollection` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.SlicerStyleCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.SlicerStyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.SlicerStyleCollection;
+        load(option?: string | string[]): Excel.SlicerStyleCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.SlicerStyleCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Excel.SlicerStyleCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.SlicerStyleCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
+        toJSON(): Excel.Interfaces.SlicerStyleCollectionData;
+    }
+    /**
+     *
+     * Represents a Slicer Style, which defines style elements by region of the slicer.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class SlicerStyle extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /**
+         *
+         * Gets the name of the SlicerStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        name: string;
+        /**
+         *
+         * True means that this SlicerStyle object is read-only. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly readOnly: boolean;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.SlicerStyle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.SlicerStyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Excel.SlicerStyle): void;
+        /**
+         *
+         * Deletes the SlicerStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        delete(): void;
+        /**
+         *
+         * Creates a duplicate of this SlicerStyle with copies of all the style elements.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The new SlicerStyle object that has been duplicated from this SlicerStyle.
+         */
+        duplicate(): Excel.SlicerStyle;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.SlicerStyle` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.SlicerStyle` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.SlicerStyle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.SlicerStyleLoadOptions): Excel.SlicerStyle;
+        load(option?: string | string[]): Excel.SlicerStyle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.SlicerStyle;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Excel.SlicerStyle object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.SlicerStyleData`) that contains shallow copies of any loaded child properties from the original object.
+        */
+        toJSON(): Excel.Interfaces.SlicerStyleData;
+    }
+    /**
+     *
+     * Represents a collection of TimelineStyles.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class TimelineStyleCollection extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /** Gets the loaded child items in this collection. */
+        readonly items: Excel.TimelineStyle[];
+        /**
+         *
+         * Creates a blank TimelineStyle with the specified name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name The unique name for the new TimelineStyle. Will throw an invalid argument exception if the name is already in use.
+         * @param makeUniqueName Optional, defaults to false. If true, will append numbers to the name in order to make it unique, if needed.
+         * @returns The newly created TimelineStyle.
+         */
+        add(name: string, makeUniqueName?: boolean): Excel.TimelineStyle;
+        /**
+         *
+         * Gets the number of timeline styles in the collection.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getCount(): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Gets the default TimelineStyle for the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The TimelineStyle object that is the current default TimelineStyle.
+         */
+        getDefault(): Excel.TimelineStyle;
+        /**
+         *
+         * Gets a TimelineStyle by name.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the TimelineStyle to be retrieved.
+         * @returns The TimelineStyle object whose name matches the input.
+         */
+        getItem(name: string): Excel.TimelineStyle;
+        /**
+         *
+         * Gets a TimelineStyle by name. If the TimelineStyle does not exist, will return a null object.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param name Name of the TimelineStyle to be retrieved.
+         * @returns The TimelineStyle object whose name matches the input.
+         */
+        getItemOrNullObject(name: string): Excel.TimelineStyle;
+        /**
+         *
+         * Sets the default TimelineStyle for use in the parent object's scope.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param newDefaultStyle The TimelineStyle object or name of the TimelineStyle object that should be the new default.
+         */
+        setDefault(newDefaultStyle: TimelineStyle | string): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TimelineStyleCollection` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TimelineStyleCollection` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TimelineStyleCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.TimelineStyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TimelineStyleCollection;
+        load(option?: string | string[]): Excel.TimelineStyleCollection;
+        load(option?: OfficeExtension.LoadOption): Excel.TimelineStyleCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Excel.TimelineStyleCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.TimelineStyleCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
+        toJSON(): Excel.Interfaces.TimelineStyleCollectionData;
+    }
+    /**
+     *
+     * Represents a Timeline style, which defines style elements by region in the Timeline.
+     *
+     * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+     * @beta
+     */
+    class TimelineStyle extends OfficeExtension.ClientObject {
+        /** The request context associated with the object. This connects the add-in's process to the Office host application's process. */
+        context: RequestContext; 
+        /**
+         *
+         * Gets the name of the TimelineStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        name: string;
+        /**
+         *
+         * True means that this TimelineStyle object is read-only. Read-only.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly readOnly: boolean;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TimelineStyle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.TimelineStyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
+        /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
+        set(properties: Excel.TimelineStyle): void;
+        /**
+         *
+         * Deletes the TableStyle.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        delete(): void;
+        /**
+         *
+         * Creates a duplicate of this TimelineStyle with copies of all the style elements.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         * @returns The new TimelineStyle object that has been duplicated from this TimelineStyle.
+         */
+        duplicate(): Excel.TimelineStyle;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TimelineStyle` - Where option is a comma-delimited string or an array of strings that specify the properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TimelineStyle` - Where option.select is a comma-delimited string that specifies the properties to load, and options.expand is a comma-delimited string that specifies the navigation properties to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TimelineStyle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.TimelineStyleLoadOptions): Excel.TimelineStyle;
+        load(option?: string | string[]): Excel.TimelineStyle;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.TimelineStyle;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Excel.TimelineStyle object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Excel.Interfaces.TimelineStyleData`) that contains shallow copies of any loaded child properties from the original object.
+        */
+        toJSON(): Excel.Interfaces.TimelineStyleData;
+    }
     /**
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -35966,7 +36736,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        getStartCell(): Excel.Range;
+        getCellAfterBreak(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          *
@@ -36266,12 +37036,36 @@ declare namespace Excel {
         readonly replies: Excel.CommentReplyCollection;
         /**
          *
-         * Get/Set the content.
+         * Get author email of the comment.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly authorEmail: string;
+        /**
+         *
+         * Get author name of the comment.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly authorName: string;
+        /**
+         *
+         * Get or set the content.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
         content: string;
+        /**
+         *
+         * Get creation time of the comment. Will return null if the comment is converted from note, as in this case, the comment will not has created date.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly creationDate: Date;
         /**
          *
          * Represents the comment identifier. Read-only.
@@ -36310,6 +37104,14 @@ declare namespace Excel {
          * @beta
          */
         delete(): void;
+        /**
+         *
+         * Get location of the comment.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getLocation(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          *
@@ -36435,12 +37237,36 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Get/Set the content.
+         * Get author email of the comment reply.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly authorEmail: string;
+        /**
+         *
+         * Get author name of the comment reply.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly authorName: string;
+        /**
+         *
+         * Get or set the content.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
         content: string;
+        /**
+         *
+         * Get creation time of the comment reply.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        readonly creationDate: Date;
         /**
          *
          * Represents the comment reply identifier. Read-only.
@@ -36479,6 +37305,14 @@ declare namespace Excel {
          * @beta
          */
         delete(): void;
+        /**
+         *
+         * Get location of the comment reply.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        getLocation(): Excel.Range;
         /**
          *
          * Get its parent comment of this reply.
@@ -36516,7 +37350,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents all the shapes in the worksheet.
+     * Represents a collection of all the shapes in the worksheet.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -36528,27 +37362,27 @@ declare namespace Excel {
         readonly items: Excel.Shape[];
         /**
          *
-         * Adds a geometric shape to worksheet. Returns a Shape object that represents the new shape.
+         * Adds a geometric shape to the worksheet. Returns a Shape object that represents the new shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param geometricShapeType Represents the geometric type of the shape. See Excel.GeometricShapeType for details.
+         * @param geometricShapeType Represents the type of the geometric shape. See Excel.GeometricShapeType for details.
          */
         addGeometricShape(geometricShapeType: Excel.GeometricShapeType): Excel.Shape;
         /**
          *
-         * Adds a geometric shape to worksheet. Returns a Shape object that represents the new shape.
+         * Adds a geometric shape to the worksheet. Returns a Shape object that represents the new shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param geometricShapeType Represents the geometric type of the shape. See Excel.GeometricShapeType for details.
+         * @param geometricShapeType Represents the type of the geometric shape. See Excel.GeometricShapeType for details.
          */
         addGeometricShape(geometricShapeType: "LineInverse" | "Triangle" | "RightTriangle" | "Rectangle" | "Diamond" | "Parallelogram" | "Trapezoid" | "NonIsoscelesTrapezoid" | "Pentagon" | "Hexagon" | "Heptagon" | "Octagon" | "Decagon" | "Dodecagon" | "Star4" | "Star5" | "Star6" | "Star7" | "Star8" | "Star10" | "Star12" | "Star16" | "Star24" | "Star32" | "RoundRectangle" | "Round1Rectangle" | "Round2SameRectangle" | "Round2DiagonalRectangle" | "SnipRoundRectangle" | "Snip1Rectangle" | "Snip2SameRectangle" | "Snip2DiagonalRectangle" | "Plaque" | "Ellipse" | "Teardrop" | "HomePlate" | "Chevron" | "PieWedge" | "Pie" | "BlockArc" | "Donut" | "NoSmoking" | "RightArrow" | "LeftArrow" | "UpArrow" | "DownArrow" | "StripedRightArrow" | "NotchedRightArrow" | "BentUpArrow" | "LeftRightArrow" | "UpDownArrow" | "LeftUpArrow" | "LeftRightUpArrow" | "QuadArrow" | "LeftArrowCallout" | "RightArrowCallout" | "UpArrowCallout" | "DownArrowCallout" | "LeftRightArrowCallout" | "UpDownArrowCallout" | "QuadArrowCallout" | "BentArrow" | "UturnArrow" | "CircularArrow" | "LeftCircularArrow" | "LeftRightCircularArrow" | "CurvedRightArrow" | "CurvedLeftArrow" | "CurvedUpArrow" | "CurvedDownArrow" | "SwooshArrow" | "Cube" | "Can" | "LightningBolt" | "Heart" | "Sun" | "Moon" | "SmileyFace" | "IrregularSeal1" | "IrregularSeal2" | "FoldedCorner" | "Bevel" | "Frame" | "HalfFrame" | "Corner" | "DiagonalStripe" | "Chord" | "Arc" | "LeftBracket" | "RightBracket" | "LeftBrace" | "RightBrace" | "BracketPair" | "BracePair" | "Callout1" | "Callout2" | "Callout3" | "AccentCallout1" | "AccentCallout2" | "AccentCallout3" | "BorderCallout1" | "BorderCallout2" | "BorderCallout3" | "AccentBorderCallout1" | "AccentBorderCallout2" | "AccentBorderCallout3" | "WedgeRectCallout" | "WedgeRRectCallout" | "WedgeEllipseCallout" | "CloudCallout" | "Cloud" | "Ribbon" | "Ribbon2" | "EllipseRibbon" | "EllipseRibbon2" | "LeftRightRibbon" | "VerticalScroll" | "HorizontalScroll" | "Wave" | "DoubleWave" | "Plus" | "FlowChartProcess" | "FlowChartDecision" | "FlowChartInputOutput" | "FlowChartPredefinedProcess" | "FlowChartInternalStorage" | "FlowChartDocument" | "FlowChartMultidocument" | "FlowChartTerminator" | "FlowChartPreparation" | "FlowChartManualInput" | "FlowChartManualOperation" | "FlowChartConnector" | "FlowChartPunchedCard" | "FlowChartPunchedTape" | "FlowChartSummingJunction" | "FlowChartOr" | "FlowChartCollate" | "FlowChartSort" | "FlowChartExtract" | "FlowChartMerge" | "FlowChartOfflineStorage" | "FlowChartOnlineStorage" | "FlowChartMagneticTape" | "FlowChartMagneticDisk" | "FlowChartMagneticDrum" | "FlowChartDisplay" | "FlowChartDelay" | "FlowChartAlternateProcess" | "FlowChartOffpageConnector" | "ActionButtonBlank" | "ActionButtonHome" | "ActionButtonHelp" | "ActionButtonInformation" | "ActionButtonForwardNext" | "ActionButtonBackPrevious" | "ActionButtonEnd" | "ActionButtonBeginning" | "ActionButtonReturn" | "ActionButtonDocument" | "ActionButtonSound" | "ActionButtonMovie" | "Gear6" | "Gear9" | "Funnel" | "MathPlus" | "MathMinus" | "MathMultiply" | "MathDivide" | "MathEqual" | "MathNotEqual" | "CornerTabs" | "SquareTabs" | "PlaqueTabs" | "ChartX" | "ChartStar" | "ChartPlus"): Excel.Shape;
         /**
          *
-         * Group a subset of shapes in a worksheet. Returns a Shape object that represents the new group of shapes.
+         * Groups a subset of shapes in this collection's worksheet. Returns a Shape object that represents the new group of shapes.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36558,12 +37392,12 @@ declare namespace Excel {
         addGroup(values: Array<string | Shape>): Excel.Shape;
         /**
          *
-         * Creates an image from a base64 string and adds it to worksheet. Returns the Shape object that represents the new Image.
+         * Creates an image from a base64-encoded string and adds it to the worksheet. Returns the Shape object that represents the new image.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param base64ImageString A base64 encoded image in JPEG or PNG formats.
+         * @param base64ImageString A base64-encoded string representing an image in either JPEG or PNG format.
          */
         addImage(base64ImageString: string): Excel.Shape;
         /**
@@ -36573,10 +37407,10 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param startLeft The distance, in points, from the start left of the line to the left side of the worksheet.
-         * @param startTop The distance, in points, from the start top of the line to the top of the worksheet.
-         * @param endLeft The distance, in points, from the end left of the line to the left of the worksheet.
-         * @param endTop The distance, in points, from the end top of the line to the top of the worksheet.
+         * @param startLeft The distance, in points, from the start of the line to the left side of the worksheet.
+         * @param startTop The distance, in points, from the start of the line to the top of the worksheet.
+         * @param endLeft The distance, in points, from the end of the line to the left of the worksheet.
+         * @param endTop The distance, in points, from the end of the line to the top of the worksheet.
          * @param connectorType Represents the connector type. See Excel.ConnectorType for details.
          */
         addLine(startLeft: number, startTop: number, endLeft: number, endTop: number, connectorType?: Excel.ConnectorType): Excel.Shape;
@@ -36587,26 +37421,26 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param startLeft The distance, in points, from the start left of the line to the left side of the worksheet.
-         * @param startTop The distance, in points, from the start top of the line to the top of the worksheet.
-         * @param endLeft The distance, in points, from the end left of the line to the left of the worksheet.
-         * @param endTop The distance, in points, from the end top of the line to the top of the worksheet.
+         * @param startLeft The distance, in points, from the start of the line to the left side of the worksheet.
+         * @param startTop The distance, in points, from the start of the line to the top of the worksheet.
+         * @param endLeft The distance, in points, from the end of the line to the left of the worksheet.
+         * @param endTop The distance, in points, from the end of the line to the top of the worksheet.
          * @param connectorType Represents the connector type. See Excel.ConnectorType for details.
          */
         addLine(startLeft: number, startTop: number, endLeft: number, endTop: number, connectorType?: "Straight" | "Elbow" | "Curve"): Excel.Shape;
         /**
          *
-         * Creates an SVG from a XML string and adds it to worksheet. Returns a Shape object that represents the new Image.
+         * Creates a scalable vector graphic (SVG) from an XML string and adds it to the worksheet. Returns a Shape object that represents the new image.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param xmlImageString An XML string that represents an SVG.
+         * @param xml An XML string that represents the SVG.
          */
-        addSVG(xmlImageString: string): Excel.Shape;
+        addSvg(xml: string): Excel.Shape;
         /**
          *
-         * Adds a textbox to worksheet by telling it's text content. Returns a Shape object that represents the new text box.
+         * Adds a text box to the worksheet with the provided text as the content. Returns a Shape object that represents the new text box.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36634,12 +37468,12 @@ declare namespace Excel {
         getItem(name: string): Excel.Shape;
         /**
          *
-         * Gets a shape based on its position in the collection.
+         * Gets a shape using its position in the collection.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
+         * @param index The zero-based index of the shape to be retrieved.
          */
         getItemAt(index: number): Excel.Shape;
         /**
@@ -36668,7 +37502,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a generic shape object in the worksheet.
+     * Represents a generic shape object in the worksheet. A shape could be a geometric shape, a line, a group of shapes, etc.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -36678,7 +37512,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Returns the fill formatting of the shape object. Read-only.
+         * Returns the fill formatting of this shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36686,7 +37520,7 @@ declare namespace Excel {
         readonly fill: Excel.ShapeFill;
         /**
          *
-         * Returns the geometric shape for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GeometricShape.
+         * Returns the geometric shape associated with the shape. An error will be thrown if the shape type is not "GeometricShape".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36694,7 +37528,7 @@ declare namespace Excel {
         readonly geometricShape: Excel.GeometricShape;
         /**
          *
-         * Returns the shape group for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GroupShape.
+         * Returns the shape group associated with the shape. An error will be thrown if the shape type is not "GroupShape".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36702,7 +37536,7 @@ declare namespace Excel {
         readonly group: Excel.ShapeGroup;
         /**
          *
-         * Returns the image for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+         * Returns the image associated with the shape. An error will be thrown if the shape type is not "Image".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36710,7 +37544,7 @@ declare namespace Excel {
         readonly image: Excel.Image;
         /**
          *
-         * Returns the line object for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+         * Returns the line associated with the shape. An error will be thrown if the shape type is not "Line".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36718,7 +37552,7 @@ declare namespace Excel {
         readonly line: Excel.Line;
         /**
          *
-         * Returns the line formatting of the shape object. Read-only.
+         * Returns the line formatting of this shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36726,7 +37560,7 @@ declare namespace Excel {
         readonly lineFormat: Excel.ShapeLineFormat;
         /**
          *
-         * Represents the parent group of the specified shape.
+         * Represents the parent group of this shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36734,7 +37568,7 @@ declare namespace Excel {
         readonly parentGroup: Excel.Shape;
         /**
          *
-         * Returns the textFrame object of a shape. Read only.
+         * Returns the text frame object of this shape. Read only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36742,7 +37576,7 @@ declare namespace Excel {
         readonly textFrame: Excel.TextFrame;
         /**
          *
-         * Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+         * Returns or sets the alternative description text for a Shape object.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36750,7 +37584,7 @@ declare namespace Excel {
         altTextDescription: string;
         /**
          *
-         * Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+         * Returns or sets the alternative title text for a Shape object.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36758,7 +37592,7 @@ declare namespace Excel {
         altTextTitle: string;
         /**
          *
-         * Returns the number of connection sites on the specified shape. Read-only.
+         * Returns the number of connection sites on this shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36766,7 +37600,7 @@ declare namespace Excel {
         readonly connectionSiteCount: number;
         /**
          *
-         * Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+         * Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36775,7 +37609,7 @@ declare namespace Excel {
         /**
          *
          * Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36791,8 +37625,8 @@ declare namespace Excel {
         readonly id: string;
         /**
          *
-         * The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+         * The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36800,7 +37634,7 @@ declare namespace Excel {
         left: number;
         /**
          *
-         * Represents the level of the specified shape. Level 0 means the shape is not part of any group, level 1 means the shape is part of a top-level group, etc.
+         * Represents the level of the specified shape. For example, a level of 0 means that the shape is not part of any groups, a level of 1 means the shape is part of a top-level group, and a level of 2 means the shape is part of a sub-group of the top level.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36808,7 +37642,7 @@ declare namespace Excel {
         readonly level: number;
         /**
          *
-         * Represents if the aspect ratio locked, in boolean, of the shape.
+         * Specifies whether or not the aspect ratio of this shape is locked.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36824,7 +37658,7 @@ declare namespace Excel {
         name: string;
         /**
          *
-         * Represents the placment, value that represents the way the object is attached to the cells below it.
+         * Represents how the object is attached to the cells below it.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36840,8 +37674,8 @@ declare namespace Excel {
         rotation: number;
         /**
          *
-         * The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+         * The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36849,15 +37683,15 @@ declare namespace Excel {
         top: number;
         /**
          *
-         * Returns the type of the specified shape. Read-only. See Excel.ShapeType for detail.
+         * Returns the type of this shape. See Excel.ShapeType for details. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        readonly type: Excel.ShapeType | "Unknown" | "Image" | "GeometricShape" | "Group" | "Line";
+        readonly type: Excel.ShapeType | "Unsupported" | "Image" | "GeometricShape" | "Group" | "Line";
         /**
          *
-         * Represents the visibility, in boolean, of the specified shape.
+         * Represents the visibility of this shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36866,7 +37700,7 @@ declare namespace Excel {
         /**
          *
          * Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36874,7 +37708,7 @@ declare namespace Excel {
         width: number;
         /**
          *
-         * Returns the position of the specified shape in the z-order, the very bottom shape's z-order value is 0. Read-only.
+         * Returns the position of the specified shape in the z-order, with 0 representing the bottom of the order stack. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -36896,12 +37730,32 @@ declare namespace Excel {
         set(properties: Excel.Shape): void;
         /**
          *
-         * Deletes the Shape
+         * Removes the shape from the worksheet.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
         delete(): void;
+        /**
+         *
+         * Converts the shape to an image and returns the image as a base64-encoded string. The DPI is 96. The only supported formats are `Excel.PictureFormat.BMP`, `Excel.PictureFormat.PNG`, `Excel.PictureFormat.JPEG`, and `Excel.PictureFormat.GIF`.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param format Specifies the format of the image.
+         */
+        getAsImage(format: Excel.PictureFormat): OfficeExtension.ClientResult<string>;
+        /**
+         *
+         * Converts the shape to an image and returns the image as a base64-encoded string. The DPI is 96. The only supported formats are `Excel.PictureFormat.BMP`, `Excel.PictureFormat.PNG`, `Excel.PictureFormat.JPEG`, and `Excel.PictureFormat.GIF`.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         *
+         * @param format Specifies the format of the image.
+         */
+        getAsImage(format: "UNKNOWN" | "BMP" | "JPEG" | "GIF" | "PNG" | "SVG"): OfficeExtension.ClientResult<string>;
         /**
          *
          * Moves the shape horizontally by the specified number of points.
@@ -36909,18 +37763,18 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param increment Specifies how far the shape is to be moved horizontally, in points. A positive value moves the shape to the right; a negative value moves it to the left. If the sheet is RTL, IncrementLeft with a positive value should move the shape to the left instead of right.
+         * @param increment The increment, in points, the shape will be horizontally moved. A positive value moves the shape to the right and a negative value moves it to the left. If the sheet is right-to-left oriented, this is reversed: positive values will move the shape to the left and negative values will move it to the right.
          */
         incrementLeft(increment: number): void;
         /**
          *
-         * Changes the rotation of the shape around the z-axis by the specified number of degrees.
-            Use the Rotation property to set the absolute rotation of the shape.
+         * Rotates the shape clockwise around the z-axis by the specified number of degrees.
+            Use the `rotation` property to set the absolute rotation of the shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param increment Specifies how far the shape is to be rotated horizontally, in degrees. A positive value rotates the shape clockwise; a negative value rotates it counterclockwise.
+         * @param increment How many degrees the shape will be rotated. A positive value rotates the shape clockwise; a negative value rotates it counterclockwise.
          */
         incrementRotation(increment: number): void;
         /**
@@ -36930,93 +37784,77 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param increment Specifies how far the shape is to be moved vertically, in points. A positive value moves the shape down; a negative value moves it up.
+         * @param increment The increment, in points, the shape will be vertically moved. in points. A positive value moves the shape down and a negative value moves it up.
          */
         incrementTop(increment: number): void;
         /**
          *
-         * Saves the shape as a picture and returns the picture in the form of base64 encoded string, using the DPI sets to 96. Only support saves as to Excel.PictureFormat.BMP, Excel.PictureFormat.PNG, Excel.PictureFormat.JPEG and Excel.PictureFormat.GIF.
-         *
-         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
-         * @beta
-         */
-        saveAsPicture(format: Excel.PictureFormat): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Saves the shape as a picture and returns the picture in the form of base64 encoded string, using the DPI sets to 96. Only support saves as to Excel.PictureFormat.BMP, Excel.PictureFormat.PNG, Excel.PictureFormat.JPEG and Excel.PictureFormat.GIF.
-         *
-         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
-         * @beta
-         */
-        saveAsPicture(format: "UNKNOWN" | "BMP" | "JPEG" | "GIF" | "PNG" | "SVG"): OfficeExtension.ClientResult<string>;
-        /**
-         *
-         * Scales the height of the shape by a specified factor. For pictures, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current height.
+         * Scales the height of the shape by a specified factor. For images, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current height.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
          * @param scaleFactor Specifies the ratio between the height of the shape after you resize it and the current or original height.
-         * @param scaleType OriginalSize to scale the shape relative to its original size. CurrentSize to scale it relative to its current size. You can specify OriginalSize for this argument only if the specified shape is a picture.
-         * @param scaleFrom Optional. One of the constants of ShapeScaleFrom which specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
+         * @param scaleType Specifies whether the shape is scaled relative to its original or current size. The original size scaling option only works for images.
+         * @param scaleFrom Optional. Specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
          */
         scaleHeight(scaleFactor: number, scaleType: Excel.ShapeScaleType, scaleFrom?: Excel.ShapeScaleFrom): void;
         /**
          *
-         * Scales the height of the shape by a specified factor. For pictures, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current height.
+         * Scales the height of the shape by a specified factor. For images, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current height.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
          * @param scaleFactor Specifies the ratio between the height of the shape after you resize it and the current or original height.
-         * @param scaleType OriginalSize to scale the shape relative to its original size. CurrentSize to scale it relative to its current size. You can specify OriginalSize for this argument only if the specified shape is a picture.
-         * @param scaleFrom Optional. One of the constants of ShapeScaleFrom which specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
+         * @param scaleType Specifies whether the shape is scaled relative to its original or current size. The original size scaling option only works for images.
+         * @param scaleFrom Optional. Specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
          */
         scaleHeight(scaleFactor: number, scaleType: "CurrentSize" | "OriginalSize", scaleFrom?: "ScaleFromTopLeft" | "ScaleFromMiddle" | "ScaleFromBottomRight"): void;
         /**
          *
-         * Scales the width of the shape by a specified factor. For pictures, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current width.
+         * Scales the width of the shape by a specified factor. For images, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current width.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
          * @param scaleFactor Specifies the ratio between the width of the shape after you resize it and the current or original width.
-         * @param scaleType OriginalSize to scale the shape relative to its original size. CurrentSize to scale it relative to its current size. You can specify OriginalSize for this argument only if the specified shape is a picture.
-         * @param scaleFrom Optional. One of the constants of ShapeScaleFrom which specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
+         * @param scaleType Specifies whether the shape is scaled relative to its original or current size. The original size scaling option only works for images.
+         * @param scaleFrom Optional. Specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
          */
         scaleWidth(scaleFactor: number, scaleType: Excel.ShapeScaleType, scaleFrom?: Excel.ShapeScaleFrom): void;
         /**
          *
-         * Scales the width of the shape by a specified factor. For pictures, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current width.
+         * Scales the width of the shape by a specified factor. For images, you can indicate whether you want to scale the shape relative to the original or the current size. Shapes other than pictures are always scaled relative to their current width.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
          * @param scaleFactor Specifies the ratio between the width of the shape after you resize it and the current or original width.
-         * @param scaleType OriginalSize to scale the shape relative to its original size. CurrentSize to scale it relative to its current size. You can specify OriginalSize for this argument only if the specified shape is a picture.
-         * @param scaleFrom Optional. One of the constants of ShapeScaleFrom which specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
+         * @param scaleType Specifies whether the shape is scaled relative to its original or current size. The original size scaling option only works for images.
+         * @param scaleFrom Optional. Specifies which part of the shape retains its position when the shape is scaled. If omitted, it represents the shape's upper left corner retains its position.
          */
         scaleWidth(scaleFactor: number, scaleType: "CurrentSize" | "OriginalSize", scaleFrom?: "ScaleFromTopLeft" | "ScaleFromMiddle" | "ScaleFromBottomRight"): void;
         /**
          *
-         * Moves the specified shape in front of or behind other shapes in the collection (that is, changes the shape's position in the z-order).
+         * Moves the specified shape up or down the collection's z-order, which shifts it in front of or behind other shapes.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param value where to move the specified shape relative to the other shapes. See Excel.ShapeZOrder for detail.
+         * @param position Where to move the shape in the z-order stack relative to the other shapes. See Excel.ShapeZOrder for details.
          */
-        setZOrder(value: Excel.ShapeZOrder): void;
+        setZOrder(position: Excel.ShapeZOrder): void;
         /**
          *
-         * Moves the specified shape in front of or behind other shapes in the collection (that is, changes the shape's position in the z-order).
+         * Moves the specified shape up or down the collection's z-order, which shifts it in front of or behind other shapes.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param value where to move the specified shape relative to the other shapes. See Excel.ShapeZOrder for detail.
+         * @param position Where to move the shape in the z-order stack relative to the other shapes. See Excel.ShapeZOrder for details.
          */
-        setZOrder(value: "BringToFront" | "BringForward" | "SendToBack" | "SendBackward"): void;
+        setZOrder(position: "BringToFront" | "BringForward" | "SendToBack" | "SendBackward"): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          *
@@ -37050,7 +37888,7 @@ declare namespace Excel {
         readonly onActivated: OfficeExtension.EventHandlers<Excel.ShapeActivatedEventArgs>;
         /**
          *
-         * Occurs when the shape is activated.
+         * Occurs when the shape is deactivated.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          *
@@ -37066,7 +37904,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a geometric shape object inside a worksheet. A geometric shape can be a line, rectangle, block arrow, equation, flowchart, start, banner, callout or basic shape in Excel.
+     * Represents a geometric shape inside a worksheet. A geometric shape can be a rectangle, block arrow, equation symbol, flowchart item, star, banner, callout, or any other basic shape in Excel.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37076,7 +37914,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Returns the shape object for the geometric shape. Read-only.
+         * Returns the Shape object for the geometric shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37084,7 +37922,7 @@ declare namespace Excel {
         readonly shape: Excel.Shape;
         /**
          *
-         * Represents the shape identifier. Read-only.
+         * Returns the shape identifier. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37119,7 +37957,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents an image object in the worksheet.
+     * Represents an image in the worksheet. To get the corresponding Shape object, use Image.shape.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37129,7 +37967,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Returns the shape object for the image. Read-only.
+         * Returns the Shape object associated with the image. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37145,7 +37983,7 @@ declare namespace Excel {
         readonly id: string;
         /**
          *
-         * Returns the format for the image. Read-only.
+         * Returns the format of the image. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37180,7 +38018,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a shape group object inside a worksheet.
+     * Represents a shape group inside a worksheet. To get the corresponding Shape object, use `ShapeGroup.shape`.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37190,7 +38028,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Returns the shape object for the group. Read-only.
+         * Returns the Shape object associated with the group. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37198,7 +38036,7 @@ declare namespace Excel {
         readonly shape: Excel.Shape;
         /**
          *
-         * Returns the shape collection in the group. Read-only.
+         * Returns the collection of Shape objects. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37249,7 +38087,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a shape collection inside a shape group.
+     * Represents the shape collection inside a shape group.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37261,7 +38099,7 @@ declare namespace Excel {
         readonly items: Excel.Shape[];
         /**
          *
-         * Returns the number of shapes in the group shape. Read-only.
+         * Returns the number of shapes in the shape group. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37274,7 +38112,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param name Name of the shape to be retrieved.
+         * @param name The name of the shape to be retrieved.
          */
         getItem(name: string): Excel.Shape;
         /**
@@ -37284,7 +38122,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param index Index value of the object to be retrieved. Zero-indexed.
+         * @param index The zero-based index value of the object to be retrieved.
          */
         getItemAt(index: number): Excel.Shape;
         /**
@@ -37313,7 +38151,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a Line object inside a worksheet.
+     * Represents a line inside a worksheet. To get the corresponding Shape object, use `Line.shape`.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37323,7 +38161,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Represents the shape object that the beginning of the specified line is attached to. Read-only.
+         * Represents the shape to which the beginning of the specified line is attached. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37331,7 +38169,7 @@ declare namespace Excel {
         readonly beginConnectedShape: Excel.Shape;
         /**
          *
-         * Represents the shape object that the end of the specified line is attached to. Read-only.
+         * Represents the shape to which the end of the specified line is attached. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37339,7 +38177,7 @@ declare namespace Excel {
         readonly endConnectedShape: Excel.Shape;
         /**
          *
-         * Returns the shape object for the line. Read-only.
+         * Returns the Shape object associated with the line. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37352,7 +38190,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        beginArrowHeadLength: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+        beginArrowheadLength: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
         /**
          *
          * Represents the style of the arrowhead at the beginning of the specified line.
@@ -37360,7 +38198,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        beginArrowHeadStyle: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+        beginArrowheadStyle: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
         /**
          *
          * Represents the width of the arrowhead at the beginning of the specified line.
@@ -37368,10 +38206,10 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        beginArrowHeadWidth: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+        beginArrowheadWidth: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
         /**
          *
-         * Represents an integer that specifies the connection site that the beginning of a connector is connected to. Read-only. Returns null when the beginning of the line is not attached to any shape.
+         * Represents the connection site to which the beginning of a connector is connected. Read-only. Returns null when the beginning of the line is not attached to any shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37384,7 +38222,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        endArrowHeadLength: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+        endArrowheadLength: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
         /**
          *
          * Represents the style of the arrowhead at the end of the specified line.
@@ -37392,7 +38230,7 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        endArrowHeadStyle: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+        endArrowheadStyle: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
         /**
          *
          * Represents the width of the arrowhead at the end of the specified line.
@@ -37400,10 +38238,10 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        endArrowHeadWidth: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+        endArrowheadWidth: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
         /**
          *
-         * Represents an integer that specifies the connection site that the end of a connector is connected to. Read-only. Returns null when the end of the line is not attached to any shape.
+         * Represents the connection site to which the end of a connector is connected. Read-only. Returns null when the end of the line is not attached to any shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37419,7 +38257,7 @@ declare namespace Excel {
         readonly id: string;
         /**
          *
-         * Represents whether the beginning of the specified line is connected to a shape. Read-only.
+         * Specifies whether or not the beginning of the specified line is connected to a shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37427,7 +38265,7 @@ declare namespace Excel {
         readonly isBeginConnected: boolean;
         /**
          *
-         * Represents whether the end of the specified line is connected to a shape. Read-only.
+         * Specifies whether or not the end of the specified line is connected to a shape. Read-only.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37462,18 +38300,10 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param shape The shape to attach the beginning of the connector to.
-         * @param connectionSite The connection site on the shape which the beginning of the connector attach to. Must be an integer between 0 and the connection site count(not included) of the specified shape.
+         * @param shape The shape to connect.
+         * @param connectionSite The connection site on the shape to which the beginning of the connector is attached. Must be an integer between 0 (inclusive) and the connection-site count of the specified shape (exclusive).
          */
-        beginConnect(shape: Excel.Shape, connectionSite: number): void;
-        /**
-         *
-         * Detaches the beginning of the specified connector from the shape it's attached to.
-         *
-         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
-         * @beta
-         */
-        beginDisconnect(): void;
+        connectBeginShape(shape: Excel.Shape, connectionSite: number): void;
         /**
          *
          * Attaches the end of the specified connector to a specified shape.
@@ -37481,18 +38311,26 @@ declare namespace Excel {
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param shape The shape to attach the end of the connector to.
-         * @param connectionSite The connection site on the shape which the end of the connector attach to. Must be an integer between 0 and the connection site count(not included) of the specified shape.
+         * @param shape The shape to connect.
+         * @param connectionSite The connection site on the shape to which the end of the connector is attached. Must be an integer between 0 (inclusive) and the connection-site count of the specified shape (exclusive).
          */
-        endConnect(shape: Excel.Shape, connectionSite: number): void;
+        connectEndShape(shape: Excel.Shape, connectionSite: number): void;
         /**
          *
-         * Detaches the end of the specified connector from the shape it's attached to.
+         * Detaches the beginning of the specified connector from a shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        endDisconnect(): void;
+        disconnectBeginShape(): void;
+        /**
+         *
+         * Detaches the end of the specified connector from a shape.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        disconnectEndShape(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          *
@@ -37522,7 +38360,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents the fill formatting for a shape object.
+     * Represents the fill formatting of a shape object.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37532,15 +38370,15 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Represents the shape fill fore color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+         * Represents the shape fill foreground color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        foreColor: string;
+        foregroundColor: string;
         /**
          *
-         * Returns or sets the degree of transparency of the specified fill as a value from 0.0 (opaque) through 1.0 (clear). For API not supported shape types  or special fill type with inconsistent transparencies, return null. For example, gradient fill type could have inconsistent transparencies.
+         * Returns or sets the transparency percentage of the fill as a value from 0.0 (opaque) through 1.0 (clear). Returns null if the shape type does not support transparency or the shape fill has inconsistent transparency, such as with a gradient fill type.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37548,7 +38386,7 @@ declare namespace Excel {
         transparency: number;
         /**
          *
-         * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for detail.
+         * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37570,7 +38408,7 @@ declare namespace Excel {
         set(properties: Excel.ShapeFill): void;
         /**
          *
-         * Clears the fill formatting of a shape object.
+         * Clears the fill formatting of this shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37578,7 +38416,7 @@ declare namespace Excel {
         clear(): void;
         /**
          *
-         * Sets the fill formatting of a shape object to a uniform color, fill type changeing to Solid Fill.
+         * Sets the fill formatting of the shape to a uniform color. This changes the fill type to "Solid".
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37615,7 +38453,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents the line formatting for the shape object. For picture and geometric shape, line formatting represents the border of shape object.
+     * Represents the line formatting for the shape object. For images and geometric shapes, line formatting represents the border of the shape.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37633,7 +38471,7 @@ declare namespace Excel {
         color: string;
         /**
          *
-         * Represents the line style of the shape. Returns null when line is not visible or has mixed line dash style property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+         * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent dash styles. See Excel.ShapeLineStyle for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37641,7 +38479,7 @@ declare namespace Excel {
         dashStyle: Excel.ShapeLineDashStyle | "Dash" | "DashDot" | "DashDotDot" | "LongDash" | "LongDashDot" | "RoundDot" | "Solid" | "SquareDot" | "LongDashDotDot" | "SystemDash" | "SystemDot" | "SystemDashDot";
         /**
          *
-         * Represents the line style of the shape object. Returns null when line is not visible or has mixed line visible property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+         * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent styles. See Excel.ShapeLineStyle for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37649,7 +38487,7 @@ declare namespace Excel {
         style: Excel.ShapeLineStyle | "Single" | "ThickBetweenThin" | "ThickThin" | "ThinThick" | "ThinThin";
         /**
          *
-         * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has mixed line transparency property (e.g. group type of shape).
+         * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has inconsistent transparencies.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37657,7 +38495,7 @@ declare namespace Excel {
         transparency: number;
         /**
          *
-         * Represents whether the line formatting of a shape element is visible. Returns null when the shape has mixed line visible property (e.g. group type of shape).
+         * Represents whether or not the line formatting of a shape element is visible. Returns null when the shape has inconsistent visibilities.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37665,7 +38503,7 @@ declare namespace Excel {
         visible: boolean;
         /**
          *
-         * Represents weight of the line, in points. Returns null when the line is not visible or has mixed line weight property (e.g. group type of shape).
+         * Represents the weight of the line, in points. Returns null when the line is not visible or there are inconsistent line weights.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37714,7 +38552,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents the text frame for a shape object.
+     * Represents the text frame of a shape object.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37724,7 +38562,7 @@ declare namespace Excel {
         context: RequestContext; 
         /**
          *
-         * Represents the text range in the text frame.
+         * Represents the text that is attached to a shape in the text frame, and properties and methods for manipulating the text. See Excel.TextRange for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37732,12 +38570,12 @@ declare namespace Excel {
         readonly textRange: Excel.TextRange;
         /**
          *
-         * Gets or sets the auto sizing settings for the text frame. A text frame can be set to auto size the text to fit the text frame, or auto size the text frame to fit the text, or without auto sizing.
+         * Gets or sets the automatic sizing settings for the text frame. A text frame can be set to automatically fit the text to the text frame, to automatically fit the text frame to the text, or not perform any automatic sizing.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        autoSize: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
+        autoSizeSetting: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
         /**
          *
          * Represents the bottom margin, in points, of the text frame.
@@ -37748,7 +38586,7 @@ declare namespace Excel {
         bottomMargin: number;
         /**
          *
-         * Specifies whether the TextFrame contains text.
+         * Specifies whether the text frame contains text.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37756,20 +38594,20 @@ declare namespace Excel {
         readonly hasText: boolean;
         /**
          *
-         * Represents the horizontal alignment of the text frame.
+         * Represents the horizontal alignment of the text frame. See Excel.ShapeTextHorizontalAlignment for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        horizontalAlignment: Excel.ShapeTextHorizontalAlignType | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed" | "ShapeTextHorizontalAlignType_MaxEnumIDs";
+        horizontalAlignment: Excel.ShapeTextHorizontalAlignment | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed";
         /**
          *
-         * Represents the horizontal overflow type of the text frame.
+         * Represents the horizontal overflow behavior of the text frame. See Excel.ShapeTextHorizontalOverflow for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        horizontalOverflow: Excel.ShapeTextHorzOverflowType | "Overflow" | "Clip" | "ShapeTextHorzOverflowType_MaxEnumIDs";
+        horizontalOverflow: Excel.ShapeTextHorizontalOverflow | "Overflow" | "Clip";
         /**
          *
          * Represents the left margin, in points, of the text frame.
@@ -37780,20 +38618,20 @@ declare namespace Excel {
         leftMargin: number;
         /**
          *
-         * Represents the text orientation of the text frame.
+         * Represents the text orientation of the text frame. See Excel.ShapeTextOrientation for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        orientation: Excel.ShapeTextOrientationType | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL" | "ShapeTextOrientationType_MaxEnumIDs";
+        orientation: Excel.ShapeTextOrientation | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL";
         /**
          *
-         * Represents the reading order of the text frame, RTL or LTR.
+         * Represents the reading order of the text frame, either left-to-right or right-to-left. See Excel.ShapeTextReadingOrder for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        readingOrder: Excel.ShapeTextReadingOrder | "LTR" | "RTL";
+        readingOrder: Excel.ShapeTextReadingOrder | "LeftToRight" | "RightToLeft";
         /**
          *
          * Represents the right margin, in points, of the text frame.
@@ -37812,20 +38650,20 @@ declare namespace Excel {
         topMargin: number;
         /**
          *
-         * Represents the vertical alignment of the text frame.
+         * Represents the vertical alignment of the text frame. See Excel.ShapeTextVerticalAlignment for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        verticalAlignment: Excel.ShapeTextVerticalAlignType | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed" | "ShapeTextVerticalAlignType_MaxEnumIDs";
+        verticalAlignment: Excel.ShapeTextVerticalAlignment | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed";
         /**
          *
-         * Represents the vertical overflow type of the text frame.
+         * Represents the vertical overflow behavior of the text frame. See Excel.ShapeTextVerticalOverflow for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
-        verticalOverflow: Excel.ShapeTextVertOverflowType | "Overflow" | "Ellipsis" | "Clip" | "ShapeTextVertOverflowType_MaxEnumIDs";
+        verticalOverflow: Excel.ShapeTextVerticalOverflow | "Overflow" | "Ellipsis" | "Clip";
         /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
          *
          * @remarks
@@ -37842,7 +38680,7 @@ declare namespace Excel {
         set(properties: Excel.TextFrame): void;
         /**
          *
-         * Deletes all the text in the textframe.
+         * Deletes all the text in the text frame.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37876,6 +38714,9 @@ declare namespace Excel {
         toJSON(): Excel.Interfaces.TextFrameData;
     }
     /**
+     *
+     * Contains the text that is attached to a shape, in addition to properties and methods for manipulating the text.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -37914,15 +38755,15 @@ declare namespace Excel {
         set(properties: Excel.TextRange): void;
         /**
          *
-         * Returns a TextRange object for characters in the given range.
+         * Returns a TextRange object for the substring in the given range.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          *
-         * @param start Position of the first character in the returned range.
-         * @param length Optional. The number of characters to be returned. If omitted, it represents the number of characters from "start" to the end of the last paragraph in TextRange.
+         * @param start The zero-based index of the first character to get from the text range.
+         * @param length Optional. The number of characters to be returned in the new text range. If length is omitted, all the characters from start to the end of the text range's last paragraph will be returned.
          */
-        getCharacters(start: number, length?: number): Excel.TextRange;
+        getSubstring(start: number, length?: number): Excel.TextRange;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          *
@@ -37952,7 +38793,7 @@ declare namespace Excel {
     }
     /**
      *
-     * This object represents the font attributes (font name, font size, color, etc.) for a TextRange in the Shape.
+     * Represents the font attributes, such as font name, font size, and color, for a shape's TextRange object.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -37970,7 +38811,7 @@ declare namespace Excel {
         bold: boolean;
         /**
          *
-         * HTML color code representation of the text color. E.g. #FF0000 represents Red. Returns null if the TextRange includes text fragments with different colors.
+         * The HTML color code representation of the text color (e.g. "#FF0000" represents red). Returns null if the TextRange includes text fragments with different colors.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37978,7 +38819,7 @@ declare namespace Excel {
         color: string;
         /**
          *
-         * Represents the italic status of font. Return null if the TextRange includes both italic and non-italic text fragments.
+         * Represents the italic status of font. Returns null if the TextRange includes both italic and non-italic text fragments.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37986,7 +38827,7 @@ declare namespace Excel {
         italic: boolean;
         /**
          *
-         * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, represents corresponding font name; otherwise represents Latin font name.
+         * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, this is the corresponding font name; otherwise it is the Latin font name.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -37994,7 +38835,7 @@ declare namespace Excel {
         name: string;
         /**
          *
-         * Represents font size in points (e.g. 11). Return null if the TextRange includes text fragments with different font sizes.
+         * Represents font size in points (e.g. 11). Returns null if the TextRange includes text fragments with different font sizes.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -38002,7 +38843,7 @@ declare namespace Excel {
         size: number;
         /**
          *
-         * Type of underline applied to the font. Return null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
+         * Type of underline applied to the font. Returns null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -39084,6 +39925,9 @@ declare namespace Excel {
         power = "Power"
     }
     /**
+     *
+     * Specifies where in the z-order a shape should be moved relative to other shapes.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -39094,17 +39938,23 @@ declare namespace Excel {
         sendBackward = "SendBackward"
     }
     /**
+     *
+     * Specifies the type of a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum ShapeType {
-        unknown = "Unknown",
+        unsupported = "Unsupported",
         image = "Image",
         geometricShape = "GeometricShape",
         group = "Group",
         line = "Line"
     }
     /**
+     *
+     * Specifies whether the shape is scaled relative to its original or current size.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -39113,6 +39963,9 @@ declare namespace Excel {
         originalSize = "OriginalSize"
     }
     /**
+     *
+     * Specifies which part of the shape retains its position when the shape is scaled.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -39122,18 +39975,54 @@ declare namespace Excel {
         scaleFromBottomRight = "ScaleFromBottomRight"
     }
     /**
+     *
+     * Specifies a shape's fill type.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum ShapeFillType {
+        /**
+         *
+         * No fill.
+         *
+         */
         noFill = "NoFill",
+        /**
+         *
+         * Solid fill.
+         *
+         */
         solid = "Solid",
+        /**
+         *
+         * Gradient fill.
+         *
+         */
         gradient = "Gradient",
+        /**
+         *
+         * Pattern fill.
+         *
+         */
         pattern = "Pattern",
+        /**
+         *
+         * Picture and texture fill.
+         *
+         */
         pictureAndTexture = "PictureAndTexture",
+        /**
+         *
+         * Mixed fill.
+         *
+         */
         mixed = "Mixed"
     }
     /**
+     *
+     * The type of underline applied to a font.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -39157,29 +40046,88 @@ declare namespace Excel {
         wavyDouble = "WavyDouble"
     }
     /**
+     *
+     * The format of the image.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum PictureFormat {
         unknown = "UNKNOWN",
+        /**
+         *
+         * Bitmap image.
+         *
+         */
         bmp = "BMP",
+        /**
+         *
+         * Joint Photographic Experts Group.
+         *
+         */
         jpeg = "JPEG",
+        /**
+         *
+         * Graphics Interchange Format.
+         *
+         */
         gif = "GIF",
+        /**
+         *
+         * Portable Network Graphics.
+         *
+         */
         png = "PNG",
+        /**
+         *
+         * Scalable Vector Graphic.
+         *
+         */
         svg = "SVG"
     }
     /**
+     *
+     * The style for a line.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum ShapeLineStyle {
+        /**
+         *
+         * Single line.
+         *
+         */
         single = "Single",
+        /**
+         *
+         * Thick line with a thin line on each side.
+         *
+         */
         thickBetweenThin = "ThickBetweenThin",
+        /**
+         *
+         * Thick line next to thin line. For horizontal lines, the thick line is above the thin line. For vertical lines, the thick line is to the left of the thin line.
+         *
+         */
         thickThin = "ThickThin",
+        /**
+         *
+         * Thick line next to thin line. For horizontal lines, the thick line is below the thin line. For vertical lines, the thick line is to the right of the thin line.
+         *
+         */
         thinThick = "ThinThick",
+        /**
+         *
+         * Two thin lines.
+         *
+         */
         thinThin = "ThinThin"
     }
     /**
+     *
+     * The dash style for a line.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -39201,7 +40149,7 @@ declare namespace Excel {
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ArrowHeadLength {
+    enum ArrowheadLength {
         short = "Short",
         medium = "Medium",
         long = "Long"
@@ -39210,7 +40158,7 @@ declare namespace Excel {
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ArrowHeadStyle {
+    enum ArrowheadStyle {
         none = "None",
         triangle = "Triangle",
         stealth = "Stealth",
@@ -39222,7 +40170,7 @@ declare namespace Excel {
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ArrowHeadWidth {
+    enum ArrowheadWidth {
         narrow = "Narrow",
         medium = "Medium",
         wide = "Wide"
@@ -40529,6 +41477,9 @@ declare namespace Excel {
         fetchingData = "FetchingData"
     }
     /**
+     *
+     * Specifies the shape type for a GeometricShape object.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
@@ -40883,12 +41834,30 @@ declare namespace Excel {
         text = "Text"
     }
     /**
+     *
+     * Specifies the way that an object is attached to its underlying cells.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum Placement {
+        /**
+         *
+         * The object is moved with the cells.
+         *
+         */
         twoCell = "TwoCell",
+        /**
+         *
+         * The object is moved and sized with the cells.
+         *
+         */
         oneCell = "OneCell",
+        /**
+         *
+         * The object is free floating.
+         *
+         */
         absolute = "Absolute"
     }
     /**
@@ -40919,85 +41888,136 @@ declare namespace Excel {
         rectangularGradient = "RectangularGradient"
     }
     /**
+     *
+     * Specifies the horizontal alignment for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ShapeTextHorizontalAlignType {
+    enum ShapeTextHorizontalAlignment {
         left = "Left",
         center = "Center",
         right = "Right",
         justify = "Justify",
         justifyLow = "JustifyLow",
         distributed = "Distributed",
-        thaiDistributed = "ThaiDistributed",
-        shapeTextHorizontalAlignType_MaxEnumIDs = "ShapeTextHorizontalAlignType_MaxEnumIDs"
+        thaiDistributed = "ThaiDistributed"
     }
     /**
+     *
+     * Specifies the vertical alignment for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ShapeTextVerticalAlignType {
+    enum ShapeTextVerticalAlignment {
         top = "Top",
         middle = "Middle",
         bottom = "Bottom",
         justified = "Justified",
-        distributed = "Distributed",
-        shapeTextVerticalAlignType_MaxEnumIDs = "ShapeTextVerticalAlignType_MaxEnumIDs"
+        distributed = "Distributed"
     }
     /**
+     *
+     * Specifies the vertical overflow for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ShapeTextVertOverflowType {
+    enum ShapeTextVerticalOverflow {
+        /**
+         *
+         * Allow text to overflow the text frame vertically (can be from the top, bottom, or both depending on the text alignment).
+         *
+         */
         overflow = "Overflow",
+        /**
+         *
+         * Hide text that does not fit vertically within the text frame, and add an ellipsis (...) at the end of the visible text.
+         *
+         */
         ellipsis = "Ellipsis",
-        clip = "Clip",
-        shapeTextVertOverflowType_MaxEnumIDs = "ShapeTextVertOverflowType_MaxEnumIDs"
+        /**
+         *
+         * Hide text that does not fit vertically within the text frame.
+         *
+         */
+        clip = "Clip"
     }
     /**
+     *
+     * Specifies the horizontal overflow for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ShapeTextHorzOverflowType {
+    enum ShapeTextHorizontalOverflow {
         overflow = "Overflow",
-        clip = "Clip",
-        shapeTextHorzOverflowType_MaxEnumIDs = "ShapeTextHorzOverflowType_MaxEnumIDs"
+        clip = "Clip"
     }
     /**
+     *
+     * Specifies the reading order for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum ShapeTextReadingOrder {
-        ltr = "LTR",
-        rtl = "RTL"
+        leftToRight = "LeftToRight",
+        rightToLeft = "RightToLeft"
     }
     /**
+     *
+     * Specifies the orientation for the text frame in a shape.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
-    enum ShapeTextOrientationType {
+    enum ShapeTextOrientation {
         horizontal = "Horizontal",
         vertical = "Vertical",
         vertical270 = "Vertical270",
         wordArtVertical = "WordArtVertical",
         eastAsianVertical = "EastAsianVertical",
         mongolianVertical = "MongolianVertical",
-        wordArtVerticalRTL = "WordArtVerticalRTL",
-        shapeTextOrientationType_MaxEnumIDs = "ShapeTextOrientationType_MaxEnumIDs"
+        wordArtVerticalRTL = "WordArtVerticalRTL"
     }
     /**
+     *
+     * Determines the type of automatic sizing allowed.
+     *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
      */
     enum ShapeAutoSize {
+        /**
+         *
+         * No autosizing.
+         *
+         */
         autoSizeNone = "AutoSizeNone",
+        /**
+         *
+         * The text is adjusted to fit the shape.
+         *
+         */
         autoSizeTextToFitShape = "AutoSizeTextToFitShape",
+        /**
+         *
+         * The shape is adjusted to fit the text.
+         *
+         */
         autoSizeShapeToFitText = "AutoSizeShapeToFitText",
+        /**
+         *
+         * A combination of automatic sizing schemes are used.
+         *
+         */
         autoSizeMixed = "AutoSizeMixed"
     }
     /**
      *
-     * Specifies the close behavior for workbook.close API.
+     * Specifies the close behavior for Workbook.close API.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -41018,7 +42038,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Specifies the save behavior for workbook.save API.
+     * Specifies the save behavior for Workbook.save API.
      *
      * [Api set: ExcelApi BETA (PREVIEW ONLY)]
      * @beta
@@ -44978,8 +45998,8 @@ declare namespace Excel {
             chartDataPointTrack?: boolean;
             /**
              *
-             * True if no changes have been made to the specified workbook since it was last saved.
-            You can set this property to True if you want to close a modified workbook without either saving it or being prompted to save it.
+             * Specifies whether or not changes have been made since the workbook was last saved.
+            You can set this property to true if you want to close a modified workbook without either saving it or being prompted to save it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -48783,6 +49803,66 @@ declare namespace Excel {
         interface StyleCollectionUpdateData {
             items?: Excel.Interfaces.StyleData[];
         }
+        /** An interface for updating data on the TableStyleCollection object, for use in "tableStyleCollection.set({ ... })". */
+        interface TableStyleCollectionUpdateData {
+            items?: Excel.Interfaces.TableStyleData[];
+        }
+        /** An interface for updating data on the TableStyle object, for use in "tableStyle.set({ ... })". */
+        interface TableStyleUpdateData {
+            /**
+             *
+             * Gets the name of the TableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+        }
+        /** An interface for updating data on the PivotTableStyleCollection object, for use in "pivotTableStyleCollection.set({ ... })". */
+        interface PivotTableStyleCollectionUpdateData {
+            items?: Excel.Interfaces.PivotTableStyleData[];
+        }
+        /** An interface for updating data on the PivotTableStyle object, for use in "pivotTableStyle.set({ ... })". */
+        interface PivotTableStyleUpdateData {
+            /**
+             *
+             * Gets the name of the PivotTableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+        }
+        /** An interface for updating data on the SlicerStyleCollection object, for use in "slicerStyleCollection.set({ ... })". */
+        interface SlicerStyleCollectionUpdateData {
+            items?: Excel.Interfaces.SlicerStyleData[];
+        }
+        /** An interface for updating data on the SlicerStyle object, for use in "slicerStyle.set({ ... })". */
+        interface SlicerStyleUpdateData {
+            /**
+             *
+             * Gets the name of the SlicerStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+        }
+        /** An interface for updating data on the TimelineStyleCollection object, for use in "timelineStyleCollection.set({ ... })". */
+        interface TimelineStyleCollectionUpdateData {
+            items?: Excel.Interfaces.TimelineStyleData[];
+        }
+        /** An interface for updating data on the TimelineStyle object, for use in "timelineStyle.set({ ... })". */
+        interface TimelineStyleUpdateData {
+            /**
+             *
+             * Gets the name of the TimelineStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+        }
         /** An interface for updating data on the PageLayout object, for use in "pageLayout.set({ ... })". */
         interface PageLayoutUpdateData {
             /**
@@ -49078,7 +50158,7 @@ declare namespace Excel {
         interface CommentUpdateData {
             /**
              *
-             * Get/Set the content.
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49093,7 +50173,7 @@ declare namespace Excel {
         interface CommentReplyUpdateData {
             /**
              *
-             * Get/Set the content.
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49108,7 +50188,7 @@ declare namespace Excel {
         interface ShapeUpdateData {
             /**
             *
-            * Returns the fill formatting of the shape object.
+            * Returns the fill formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -49116,7 +50196,7 @@ declare namespace Excel {
             fill?: Excel.Interfaces.ShapeFillUpdateData;
             /**
             *
-            * Returns the line formatting of the shape object.
+            * Returns the line formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -49124,7 +50204,7 @@ declare namespace Excel {
             lineFormat?: Excel.Interfaces.ShapeLineFormatUpdateData;
             /**
              *
-             * Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative description text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49132,7 +50212,7 @@ declare namespace Excel {
             altTextDescription?: string;
             /**
              *
-             * Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative title text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49140,7 +50220,7 @@ declare namespace Excel {
             altTextTitle?: string;
             /**
              *
-             * Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+             * Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49149,7 +50229,7 @@ declare namespace Excel {
             /**
              *
              * Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49157,8 +50237,8 @@ declare namespace Excel {
             height?: number;
             /**
              *
-             * The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49166,7 +50246,7 @@ declare namespace Excel {
             left?: number;
             /**
              *
-             * Represents if the aspect ratio locked, in boolean, of the shape.
+             * Specifies whether or not the aspect ratio of this shape is locked.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49182,7 +50262,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents the placment, value that represents the way the object is attached to the cells below it.
+             * Represents how the object is attached to the cells below it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49198,8 +50278,8 @@ declare namespace Excel {
             rotation?: number;
             /**
              *
-             * The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49207,7 +50287,7 @@ declare namespace Excel {
             top?: number;
             /**
              *
-             * Represents the visibility, in boolean, of the specified shape.
+             * Represents the visibility of this shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49216,7 +50296,7 @@ declare namespace Excel {
             /**
              *
              * Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49236,7 +50316,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadLength?: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+            beginArrowheadLength?: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
             /**
              *
              * Represents the style of the arrowhead at the beginning of the specified line.
@@ -49244,7 +50324,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadStyle?: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+            beginArrowheadStyle?: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
             /**
              *
              * Represents the width of the arrowhead at the beginning of the specified line.
@@ -49252,7 +50332,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadWidth?: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+            beginArrowheadWidth?: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
             /**
              *
              * Represents the length of the arrowhead at the end of the specified line.
@@ -49260,7 +50340,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadLength?: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+            endArrowheadLength?: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
             /**
              *
              * Represents the style of the arrowhead at the end of the specified line.
@@ -49268,7 +50348,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadStyle?: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+            endArrowheadStyle?: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
             /**
              *
              * Represents the width of the arrowhead at the end of the specified line.
@@ -49276,7 +50356,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadWidth?: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+            endArrowheadWidth?: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
             /**
              *
              * Represents the connector type for the line.
@@ -49290,15 +50370,15 @@ declare namespace Excel {
         interface ShapeFillUpdateData {
             /**
              *
-             * Represents the shape fill fore color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+             * Represents the shape fill foreground color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            foreColor?: string;
+            foregroundColor?: string;
             /**
              *
-             * Returns or sets the degree of transparency of the specified fill as a value from 0.0 (opaque) through 1.0 (clear). For API not supported shape types  or special fill type with inconsistent transparencies, return null. For example, gradient fill type could have inconsistent transparencies.
+             * Returns or sets the transparency percentage of the fill as a value from 0.0 (opaque) through 1.0 (clear). Returns null if the shape type does not support transparency or the shape fill has inconsistent transparency, such as with a gradient fill type.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49317,7 +50397,7 @@ declare namespace Excel {
             color?: string;
             /**
              *
-             * Represents the line style of the shape. Returns null when line is not visible or has mixed line dash style property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent dash styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49325,7 +50405,7 @@ declare namespace Excel {
             dashStyle?: Excel.ShapeLineDashStyle | "Dash" | "DashDot" | "DashDotDot" | "LongDash" | "LongDashDot" | "RoundDot" | "Solid" | "SquareDot" | "LongDashDotDot" | "SystemDash" | "SystemDot" | "SystemDashDot";
             /**
              *
-             * Represents the line style of the shape object. Returns null when line is not visible or has mixed line visible property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49333,7 +50413,7 @@ declare namespace Excel {
             style?: Excel.ShapeLineStyle | "Single" | "ThickBetweenThin" | "ThickThin" | "ThinThick" | "ThinThin";
             /**
              *
-             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has mixed line transparency property (e.g. group type of shape).
+             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has inconsistent transparencies.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49341,7 +50421,7 @@ declare namespace Excel {
             transparency?: number;
             /**
              *
-             * Represents whether the line formatting of a shape element is visible. Returns null when the shape has mixed line visible property (e.g. group type of shape).
+             * Represents whether or not the line formatting of a shape element is visible. Returns null when the shape has inconsistent visibilities.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49349,7 +50429,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Represents weight of the line, in points. Returns null when the line is not visible or has mixed line weight property (e.g. group type of shape).
+             * Represents the weight of the line, in points. Returns null when the line is not visible or there are inconsistent line weights.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49360,12 +50440,12 @@ declare namespace Excel {
         interface TextFrameUpdateData {
             /**
              *
-             * Gets or sets the auto sizing settings for the text frame. A text frame can be set to auto size the text to fit the text frame, or auto size the text frame to fit the text, or without auto sizing.
+             * Gets or sets the automatic sizing settings for the text frame. A text frame can be set to automatically fit the text to the text frame, to automatically fit the text frame to the text, or not perform any automatic sizing.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            autoSize?: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
+            autoSizeSetting?: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
             /**
              *
              * Represents the bottom margin, in points, of the text frame.
@@ -49376,20 +50456,20 @@ declare namespace Excel {
             bottomMargin?: number;
             /**
              *
-             * Represents the horizontal alignment of the text frame.
+             * Represents the horizontal alignment of the text frame. See Excel.ShapeTextHorizontalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            horizontalAlignment?: Excel.ShapeTextHorizontalAlignType | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed" | "ShapeTextHorizontalAlignType_MaxEnumIDs";
+            horizontalAlignment?: Excel.ShapeTextHorizontalAlignment | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed";
             /**
              *
-             * Represents the horizontal overflow type of the text frame.
+             * Represents the horizontal overflow behavior of the text frame. See Excel.ShapeTextHorizontalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            horizontalOverflow?: Excel.ShapeTextHorzOverflowType | "Overflow" | "Clip" | "ShapeTextHorzOverflowType_MaxEnumIDs";
+            horizontalOverflow?: Excel.ShapeTextHorizontalOverflow | "Overflow" | "Clip";
             /**
              *
              * Represents the left margin, in points, of the text frame.
@@ -49400,20 +50480,20 @@ declare namespace Excel {
             leftMargin?: number;
             /**
              *
-             * Represents the text orientation of the text frame.
+             * Represents the text orientation of the text frame. See Excel.ShapeTextOrientation for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            orientation?: Excel.ShapeTextOrientationType | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL" | "ShapeTextOrientationType_MaxEnumIDs";
+            orientation?: Excel.ShapeTextOrientation | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL";
             /**
              *
-             * Represents the reading order of the text frame, RTL or LTR.
+             * Represents the reading order of the text frame, either left-to-right or right-to-left. See Excel.ShapeTextReadingOrder for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            readingOrder?: Excel.ShapeTextReadingOrder | "LTR" | "RTL";
+            readingOrder?: Excel.ShapeTextReadingOrder | "LeftToRight" | "RightToLeft";
             /**
              *
              * Represents the right margin, in points, of the text frame.
@@ -49432,20 +50512,20 @@ declare namespace Excel {
             topMargin?: number;
             /**
              *
-             * Represents the vertical alignment of the text frame.
+             * Represents the vertical alignment of the text frame. See Excel.ShapeTextVerticalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            verticalAlignment?: Excel.ShapeTextVerticalAlignType | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed" | "ShapeTextVerticalAlignType_MaxEnumIDs";
+            verticalAlignment?: Excel.ShapeTextVerticalAlignment | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed";
             /**
              *
-             * Represents the vertical overflow type of the text frame.
+             * Represents the vertical overflow behavior of the text frame. See Excel.ShapeTextVerticalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            verticalOverflow?: Excel.ShapeTextVertOverflowType | "Overflow" | "Ellipsis" | "Clip" | "ShapeTextVertOverflowType_MaxEnumIDs";
+            verticalOverflow?: Excel.ShapeTextVerticalOverflow | "Overflow" | "Ellipsis" | "Clip";
         }
         /** An interface for updating data on the TextRange object, for use in "textRange.set({ ... })". */
         interface TextRangeUpdateData {
@@ -49478,7 +50558,7 @@ declare namespace Excel {
             bold?: boolean;
             /**
              *
-             * HTML color code representation of the text color. E.g. #FF0000 represents Red. Returns null if the TextRange includes text fragments with different colors.
+             * The HTML color code representation of the text color (e.g. "#FF0000" represents red). Returns null if the TextRange includes text fragments with different colors.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49486,7 +50566,7 @@ declare namespace Excel {
             color?: string;
             /**
              *
-             * Represents the italic status of font. Return null if the TextRange includes both italic and non-italic text fragments.
+             * Represents the italic status of font. Returns null if the TextRange includes both italic and non-italic text fragments.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49494,7 +50574,7 @@ declare namespace Excel {
             italic?: boolean;
             /**
              *
-             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, represents corresponding font name; otherwise represents Latin font name.
+             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, this is the corresponding font name; otherwise it is the Latin font name.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49502,7 +50582,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents font size in points (e.g. 11). Return null if the TextRange includes text fragments with different font sizes.
+             * Represents font size in points (e.g. 11). Returns null if the TextRange includes text fragments with different font sizes.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49510,7 +50590,7 @@ declare namespace Excel {
             size?: number;
             /**
              *
-             * Type of underline applied to the font. Return null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
+             * Type of underline applied to the font. Returns null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49731,6 +50811,14 @@ declare namespace Excel {
             names?: Excel.Interfaces.NamedItemData[];
             /**
             *
+            * Represents a collection of PivotTableStyles associated with the workbook. Read-only.
+            *
+            * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+            * @beta
+            */
+            pivotTableStyles?: Excel.Interfaces.PivotTableStyleData[];
+            /**
+            *
             * Represents a collection of PivotTables associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.3]
@@ -49759,6 +50847,14 @@ declare namespace Excel {
             settings?: Excel.Interfaces.SettingData[];
             /**
             *
+            * Represents a collection of SlicerStyles associated with the workbook. Read-only.
+            *
+            * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+            * @beta
+            */
+            slicerStyles?: Excel.Interfaces.SlicerStyleData[];
+            /**
+            *
             * Represents a collection of Slicers associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
@@ -49774,6 +50870,14 @@ declare namespace Excel {
             styles?: Excel.Interfaces.StyleData[];
             /**
             *
+            * Represents a collection of TableStyles associated with the workbook. Read-only.
+            *
+            * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+            * @beta
+            */
+            tableStyles?: Excel.Interfaces.TableStyleData[];
+            /**
+            *
             * Represents a collection of tables associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
@@ -49781,6 +50885,14 @@ declare namespace Excel {
             tables?: Excel.Interfaces.TableData[];
             /**
             *
+            * Represents a collection of TimelineStyles associated with the workbook. Read-only.
+            *
+            * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+            * @beta
+            */
+            timelineStyles?: Excel.Interfaces.TimelineStyleData[];
+            /**
+            *
             * Represents a collection of worksheets associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
@@ -49788,7 +50900,7 @@ declare namespace Excel {
             worksheets?: Excel.Interfaces.WorksheetData[];
             /**
              *
-             * True if the workbook is in auto save mode.
+             * Specifies whether or not the workbook is in autosave mode. Read-Only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49813,8 +50925,8 @@ declare namespace Excel {
             chartDataPointTrack?: boolean;
             /**
              *
-             * True if no changes have been made to the specified workbook since it was last saved.
-            You can set this property to True if you want to close a modified workbook without either saving it or being prompted to save it.
+             * Specifies whether or not changes have been made since the workbook was last saved.
+            You can set this property to true if you want to close a modified workbook without either saving it or being prompted to save it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -49829,7 +50941,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * True if the workbook has ever been saved locally or online.
+             * Specifies whether or not the workbook has ever been saved locally or online. Read-Only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -54583,6 +55695,98 @@ declare namespace Excel {
         interface StyleCollectionData {
             items?: Excel.Interfaces.StyleData[];
         }
+        /** An interface describing the data returned by calling "tableStyleCollection.toJSON()". */
+        interface TableStyleCollectionData {
+            items?: Excel.Interfaces.TableStyleData[];
+        }
+        /** An interface describing the data returned by calling "tableStyle.toJSON()". */
+        interface TableStyleData {
+            /**
+             *
+             * Gets the name of the TableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+            /**
+             *
+             * True means that this TableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /** An interface describing the data returned by calling "pivotTableStyleCollection.toJSON()". */
+        interface PivotTableStyleCollectionData {
+            items?: Excel.Interfaces.PivotTableStyleData[];
+        }
+        /** An interface describing the data returned by calling "pivotTableStyle.toJSON()". */
+        interface PivotTableStyleData {
+            /**
+             *
+             * Gets the name of the PivotTableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+            /**
+             *
+             * True means that this PivotTableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /** An interface describing the data returned by calling "slicerStyleCollection.toJSON()". */
+        interface SlicerStyleCollectionData {
+            items?: Excel.Interfaces.SlicerStyleData[];
+        }
+        /** An interface describing the data returned by calling "slicerStyle.toJSON()". */
+        interface SlicerStyleData {
+            /**
+             *
+             * Gets the name of the SlicerStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+            /**
+             *
+             * True means that this SlicerStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /** An interface describing the data returned by calling "timelineStyleCollection.toJSON()". */
+        interface TimelineStyleCollectionData {
+            items?: Excel.Interfaces.TimelineStyleData[];
+        }
+        /** An interface describing the data returned by calling "timelineStyle.toJSON()". */
+        interface TimelineStyleData {
+            /**
+             *
+             * Gets the name of the TimelineStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: string;
+            /**
+             *
+             * True means that this TimelineStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
         /** An interface describing the data returned by calling "pageLayout.toJSON()". */
         interface PageLayoutData {
             /**
@@ -54905,12 +56109,36 @@ declare namespace Excel {
             replies?: Excel.Interfaces.CommentReplyData[];
             /**
              *
-             * Get/Set the content.
+             * Get author email of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: string;
+            /**
+             *
+             * Get author name of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: string;
+            /**
+             *
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: string;
+            /**
+             *
+             * Get creation time of the comment. Will return null if the comment is converted from note, as in this case, the comment will not has created date.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: Date;
             /**
              *
              * Represents the comment identifier. Read-only.
@@ -54936,12 +56164,36 @@ declare namespace Excel {
         interface CommentReplyData {
             /**
              *
-             * Get/Set the content.
+             * Get author email of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: string;
+            /**
+             *
+             * Get author name of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: string;
+            /**
+             *
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: string;
+            /**
+             *
+             * Get creation time of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: Date;
             /**
              *
              * Represents the comment reply identifier. Read-only.
@@ -54967,7 +56219,7 @@ declare namespace Excel {
         interface ShapeData {
             /**
             *
-            * Returns the fill formatting of the shape object. Read-only.
+            * Returns the fill formatting of this shape. Read-only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -54975,7 +56227,7 @@ declare namespace Excel {
             fill?: Excel.Interfaces.ShapeFillData;
             /**
             *
-            * Returns the line formatting of the shape object. Read-only.
+            * Returns the line formatting of this shape. Read-only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -54983,7 +56235,7 @@ declare namespace Excel {
             lineFormat?: Excel.Interfaces.ShapeLineFormatData;
             /**
              *
-             * Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative description text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -54991,7 +56243,7 @@ declare namespace Excel {
             altTextDescription?: string;
             /**
              *
-             * Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative title text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -54999,7 +56251,7 @@ declare namespace Excel {
             altTextTitle?: string;
             /**
              *
-             * Returns the number of connection sites on the specified shape. Read-only.
+             * Returns the number of connection sites on this shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55007,7 +56259,7 @@ declare namespace Excel {
             connectionSiteCount?: number;
             /**
              *
-             * Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+             * Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55016,7 +56268,7 @@ declare namespace Excel {
             /**
              *
              * Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55032,8 +56284,8 @@ declare namespace Excel {
             id?: string;
             /**
              *
-             * The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55041,7 +56293,7 @@ declare namespace Excel {
             left?: number;
             /**
              *
-             * Represents the level of the specified shape. Level 0 means the shape is not part of any group, level 1 means the shape is part of a top-level group, etc.
+             * Represents the level of the specified shape. For example, a level of 0 means that the shape is not part of any groups, a level of 1 means the shape is part of a top-level group, and a level of 2 means the shape is part of a sub-group of the top level.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55049,7 +56301,7 @@ declare namespace Excel {
             level?: number;
             /**
              *
-             * Represents if the aspect ratio locked, in boolean, of the shape.
+             * Specifies whether or not the aspect ratio of this shape is locked.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55065,7 +56317,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents the placment, value that represents the way the object is attached to the cells below it.
+             * Represents how the object is attached to the cells below it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55081,8 +56333,8 @@ declare namespace Excel {
             rotation?: number;
             /**
              *
-             * The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55090,15 +56342,15 @@ declare namespace Excel {
             top?: number;
             /**
              *
-             * Returns the type of the specified shape. Read-only. See Excel.ShapeType for detail.
+             * Returns the type of this shape. See Excel.ShapeType for details. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            type?: Excel.ShapeType | "Unknown" | "Image" | "GeometricShape" | "Group" | "Line";
+            type?: Excel.ShapeType | "Unsupported" | "Image" | "GeometricShape" | "Group" | "Line";
             /**
              *
-             * Represents the visibility, in boolean, of the specified shape.
+             * Represents the visibility of this shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55107,7 +56359,7 @@ declare namespace Excel {
             /**
              *
              * Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55115,7 +56367,7 @@ declare namespace Excel {
             width?: number;
             /**
              *
-             * Returns the position of the specified shape in the z-order, the very bottom shape's z-order value is 0. Read-only.
+             * Returns the position of the specified shape in the z-order, with 0 representing the bottom of the order stack. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55126,7 +56378,7 @@ declare namespace Excel {
         interface GeometricShapeData {
             /**
              *
-             * Represents the shape identifier. Read-only.
+             * Returns the shape identifier. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55145,7 +56397,7 @@ declare namespace Excel {
             id?: string;
             /**
              *
-             * Returns the format for the image. Read-only.
+             * Returns the format of the image. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55156,7 +56408,7 @@ declare namespace Excel {
         interface ShapeGroupData {
             /**
             *
-            * Returns the shape collection in the group. Read-only.
+            * Returns the collection of Shape objects. Read-only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -55184,7 +56436,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadLength?: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+            beginArrowheadLength?: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
             /**
              *
              * Represents the style of the arrowhead at the beginning of the specified line.
@@ -55192,7 +56444,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadStyle?: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+            beginArrowheadStyle?: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
             /**
              *
              * Represents the width of the arrowhead at the beginning of the specified line.
@@ -55200,10 +56452,10 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadWidth?: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+            beginArrowheadWidth?: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
             /**
              *
-             * Represents an integer that specifies the connection site that the beginning of a connector is connected to. Read-only. Returns null when the beginning of the line is not attached to any shape.
+             * Represents the connection site to which the beginning of a connector is connected. Read-only. Returns null when the beginning of the line is not attached to any shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55216,7 +56468,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadLength?: Excel.ArrowHeadLength | "Short" | "Medium" | "Long";
+            endArrowheadLength?: Excel.ArrowheadLength | "Short" | "Medium" | "Long";
             /**
              *
              * Represents the style of the arrowhead at the end of the specified line.
@@ -55224,7 +56476,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadStyle?: Excel.ArrowHeadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
+            endArrowheadStyle?: Excel.ArrowheadStyle | "None" | "Triangle" | "Stealth" | "Diamond" | "Oval" | "Open";
             /**
              *
              * Represents the width of the arrowhead at the end of the specified line.
@@ -55232,10 +56484,10 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadWidth?: Excel.ArrowHeadWidth | "Narrow" | "Medium" | "Wide";
+            endArrowheadWidth?: Excel.ArrowheadWidth | "Narrow" | "Medium" | "Wide";
             /**
              *
-             * Represents an integer that specifies the connection site that the end of a connector is connected to. Read-only. Returns null when the end of the line is not attached to any shape.
+             * Represents the connection site to which the end of a connector is connected. Read-only. Returns null when the end of the line is not attached to any shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55251,7 +56503,7 @@ declare namespace Excel {
             id?: string;
             /**
              *
-             * Represents whether the beginning of the specified line is connected to a shape. Read-only.
+             * Specifies whether or not the beginning of the specified line is connected to a shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55259,7 +56511,7 @@ declare namespace Excel {
             isBeginConnected?: boolean;
             /**
              *
-             * Represents whether the end of the specified line is connected to a shape. Read-only.
+             * Specifies whether or not the end of the specified line is connected to a shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55278,15 +56530,15 @@ declare namespace Excel {
         interface ShapeFillData {
             /**
              *
-             * Represents the shape fill fore color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+             * Represents the shape fill foreground color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            foreColor?: string;
+            foregroundColor?: string;
             /**
              *
-             * Returns or sets the degree of transparency of the specified fill as a value from 0.0 (opaque) through 1.0 (clear). For API not supported shape types  or special fill type with inconsistent transparencies, return null. For example, gradient fill type could have inconsistent transparencies.
+             * Returns or sets the transparency percentage of the fill as a value from 0.0 (opaque) through 1.0 (clear). Returns null if the shape type does not support transparency or the shape fill has inconsistent transparency, such as with a gradient fill type.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55294,7 +56546,7 @@ declare namespace Excel {
             transparency?: number;
             /**
              *
-             * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for detail.
+             * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55313,7 +56565,7 @@ declare namespace Excel {
             color?: string;
             /**
              *
-             * Represents the line style of the shape. Returns null when line is not visible or has mixed line dash style property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent dash styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55321,7 +56573,7 @@ declare namespace Excel {
             dashStyle?: Excel.ShapeLineDashStyle | "Dash" | "DashDot" | "DashDotDot" | "LongDash" | "LongDashDot" | "RoundDot" | "Solid" | "SquareDot" | "LongDashDotDot" | "SystemDash" | "SystemDot" | "SystemDashDot";
             /**
              *
-             * Represents the line style of the shape object. Returns null when line is not visible or has mixed line visible property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55329,7 +56581,7 @@ declare namespace Excel {
             style?: Excel.ShapeLineStyle | "Single" | "ThickBetweenThin" | "ThickThin" | "ThinThick" | "ThinThin";
             /**
              *
-             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has mixed line transparency property (e.g. group type of shape).
+             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has inconsistent transparencies.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55337,7 +56589,7 @@ declare namespace Excel {
             transparency?: number;
             /**
              *
-             * Represents whether the line formatting of a shape element is visible. Returns null when the shape has mixed line visible property (e.g. group type of shape).
+             * Represents whether or not the line formatting of a shape element is visible. Returns null when the shape has inconsistent visibilities.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55345,7 +56597,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Represents weight of the line, in points. Returns null when the line is not visible or has mixed line weight property (e.g. group type of shape).
+             * Represents the weight of the line, in points. Returns null when the line is not visible or there are inconsistent line weights.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55356,12 +56608,12 @@ declare namespace Excel {
         interface TextFrameData {
             /**
              *
-             * Gets or sets the auto sizing settings for the text frame. A text frame can be set to auto size the text to fit the text frame, or auto size the text frame to fit the text, or without auto sizing.
+             * Gets or sets the automatic sizing settings for the text frame. A text frame can be set to automatically fit the text to the text frame, to automatically fit the text frame to the text, or not perform any automatic sizing.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            autoSize?: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
+            autoSizeSetting?: Excel.ShapeAutoSize | "AutoSizeNone" | "AutoSizeTextToFitShape" | "AutoSizeShapeToFitText" | "AutoSizeMixed";
             /**
              *
              * Represents the bottom margin, in points, of the text frame.
@@ -55372,7 +56624,7 @@ declare namespace Excel {
             bottomMargin?: number;
             /**
              *
-             * Specifies whether the TextFrame contains text.
+             * Specifies whether the text frame contains text.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55380,20 +56632,20 @@ declare namespace Excel {
             hasText?: boolean;
             /**
              *
-             * Represents the horizontal alignment of the text frame.
+             * Represents the horizontal alignment of the text frame. See Excel.ShapeTextHorizontalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            horizontalAlignment?: Excel.ShapeTextHorizontalAlignType | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed" | "ShapeTextHorizontalAlignType_MaxEnumIDs";
+            horizontalAlignment?: Excel.ShapeTextHorizontalAlignment | "Left" | "Center" | "Right" | "Justify" | "JustifyLow" | "Distributed" | "ThaiDistributed";
             /**
              *
-             * Represents the horizontal overflow type of the text frame.
+             * Represents the horizontal overflow behavior of the text frame. See Excel.ShapeTextHorizontalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            horizontalOverflow?: Excel.ShapeTextHorzOverflowType | "Overflow" | "Clip" | "ShapeTextHorzOverflowType_MaxEnumIDs";
+            horizontalOverflow?: Excel.ShapeTextHorizontalOverflow | "Overflow" | "Clip";
             /**
              *
              * Represents the left margin, in points, of the text frame.
@@ -55404,20 +56656,20 @@ declare namespace Excel {
             leftMargin?: number;
             /**
              *
-             * Represents the text orientation of the text frame.
+             * Represents the text orientation of the text frame. See Excel.ShapeTextOrientation for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            orientation?: Excel.ShapeTextOrientationType | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL" | "ShapeTextOrientationType_MaxEnumIDs";
+            orientation?: Excel.ShapeTextOrientation | "Horizontal" | "Vertical" | "Vertical270" | "WordArtVertical" | "EastAsianVertical" | "MongolianVertical" | "WordArtVerticalRTL";
             /**
              *
-             * Represents the reading order of the text frame, RTL or LTR.
+             * Represents the reading order of the text frame, either left-to-right or right-to-left. See Excel.ShapeTextReadingOrder for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            readingOrder?: Excel.ShapeTextReadingOrder | "LTR" | "RTL";
+            readingOrder?: Excel.ShapeTextReadingOrder | "LeftToRight" | "RightToLeft";
             /**
              *
              * Represents the right margin, in points, of the text frame.
@@ -55436,20 +56688,20 @@ declare namespace Excel {
             topMargin?: number;
             /**
              *
-             * Represents the vertical alignment of the text frame.
+             * Represents the vertical alignment of the text frame. See Excel.ShapeTextVerticalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            verticalAlignment?: Excel.ShapeTextVerticalAlignType | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed" | "ShapeTextVerticalAlignType_MaxEnumIDs";
+            verticalAlignment?: Excel.ShapeTextVerticalAlignment | "Top" | "Middle" | "Bottom" | "Justified" | "Distributed";
             /**
              *
-             * Represents the vertical overflow type of the text frame.
+             * Represents the vertical overflow behavior of the text frame. See Excel.ShapeTextVerticalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            verticalOverflow?: Excel.ShapeTextVertOverflowType | "Overflow" | "Ellipsis" | "Clip" | "ShapeTextVertOverflowType_MaxEnumIDs";
+            verticalOverflow?: Excel.ShapeTextVerticalOverflow | "Overflow" | "Ellipsis" | "Clip";
         }
         /** An interface describing the data returned by calling "textRange.toJSON()". */
         interface TextRangeData {
@@ -55482,7 +56734,7 @@ declare namespace Excel {
             bold?: boolean;
             /**
              *
-             * HTML color code representation of the text color. E.g. #FF0000 represents Red. Returns null if the TextRange includes text fragments with different colors.
+             * The HTML color code representation of the text color (e.g. "#FF0000" represents red). Returns null if the TextRange includes text fragments with different colors.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55490,7 +56742,7 @@ declare namespace Excel {
             color?: string;
             /**
              *
-             * Represents the italic status of font. Return null if the TextRange includes both italic and non-italic text fragments.
+             * Represents the italic status of font. Returns null if the TextRange includes both italic and non-italic text fragments.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55498,7 +56750,7 @@ declare namespace Excel {
             italic?: boolean;
             /**
              *
-             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, represents corresponding font name; otherwise represents Latin font name.
+             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, this is the corresponding font name; otherwise it is the Latin font name.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55506,7 +56758,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents font size in points (e.g. 11). Return null if the TextRange includes text fragments with different font sizes.
+             * Represents font size in points (e.g. 11). Returns null if the TextRange includes text fragments with different font sizes.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55514,7 +56766,7 @@ declare namespace Excel {
             size?: number;
             /**
              *
-             * Type of underline applied to the font. Return null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
+             * Type of underline applied to the font. Returns null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55831,7 +57083,7 @@ declare namespace Excel {
             tables?: Excel.Interfaces.TableCollectionLoadOptions;
             /**
              *
-             * True if the workbook is in auto save mode.
+             * Specifies whether or not the workbook is in autosave mode. Read-Only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55856,8 +57108,8 @@ declare namespace Excel {
             chartDataPointTrack?: boolean;
             /**
              *
-             * True if no changes have been made to the specified workbook since it was last saved.
-            You can set this property to True if you want to close a modified workbook without either saving it or being prompted to save it.
+             * Specifies whether or not changes have been made since the workbook was last saved.
+            You can set this property to true if you want to close a modified workbook without either saving it or being prompted to save it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -55872,7 +57124,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * True if the workbook has ever been saved locally or online.
+             * Specifies whether or not the workbook has ever been saved locally or online. Read-Only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63097,6 +64349,214 @@ declare namespace Excel {
              */
             wrapText?: boolean;
         }
+        /**
+         *
+         * Represents a collection of TableStyles.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface TableStyleCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the TableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True means that this TableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a TableStyle, which defines the style elements by region of the Table.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface TableStyleLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the name of the TableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * True means that this TableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of PivotTable styles.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface PivotTableStyleCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the PivotTableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True means that this PivotTableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a PivotTable Style, which defines style elements by PivotTable region.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface PivotTableStyleLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the name of the PivotTableStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * True means that this PivotTableStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of SlicerStyle objects.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface SlicerStyleCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the SlicerStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True means that this SlicerStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a Slicer Style, which defines style elements by region of the slicer.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface SlicerStyleLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the name of the SlicerStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * True means that this SlicerStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a collection of TimelineStyles.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface TimelineStyleCollectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Gets the name of the TimelineStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True means that this TimelineStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
+        /**
+         *
+         * Represents a Timeline style, which defines style elements by region in the Timeline.
+         *
+         * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+         * @beta
+         */
+        interface TimelineStyleLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Gets the name of the TimelineStyle.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            name?: boolean;
+            /**
+             *
+             * True means that this TimelineStyle object is read-only. Read-only.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            readOnly?: boolean;
+        }
         /**
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -63653,12 +65113,36 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Get/Set the content.
+             * For EACH ITEM in the collection: Get author email of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get author name of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get creation time of the comment. Will return null if the comment is converted from note, as in this case, the comment will not has created date.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: boolean;
             /**
              *
              * For EACH ITEM in the collection: Represents the comment identifier. Read-only.
@@ -63687,12 +65171,36 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Get/Set the content.
+             * Get author email of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: boolean;
+            /**
+             *
+             * Get author name of the comment.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: boolean;
+            /**
+             *
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: boolean;
+            /**
+             *
+             * Get creation time of the comment. Will return null if the comment is converted from note, as in this case, the comment will not has created date.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: boolean;
             /**
              *
              * Represents the comment identifier. Read-only.
@@ -63721,12 +65229,36 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Get/Set the content.
+             * For EACH ITEM in the collection: Get author email of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get author name of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: Get creation time of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: boolean;
             /**
              *
              * For EACH ITEM in the collection: Represents the comment reply identifier. Read-only.
@@ -63755,12 +65287,36 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Get/Set the content.
+             * Get author email of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorEmail?: boolean;
+            /**
+             *
+             * Get author name of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            authorName?: boolean;
+            /**
+             *
+             * Get or set the content.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
             content?: boolean;
+            /**
+             *
+             * Get creation time of the comment reply.
+             *
+             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
+             * @beta
+             */
+            creationDate?: boolean;
             /**
              *
              * Represents the comment reply identifier. Read-only.
@@ -63780,7 +65336,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents all the shapes in the worksheet.
+         * Represents a collection of all the shapes in the worksheet.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -63789,7 +65345,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * For EACH ITEM in the collection: Returns the fill formatting of the shape object.
+            * For EACH ITEM in the collection: Returns the fill formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63797,7 +65353,7 @@ declare namespace Excel {
             fill?: Excel.Interfaces.ShapeFillLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the geometric shape for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GeometricShape.
+            * For EACH ITEM in the collection: Returns the geometric shape associated with the shape. An error will be thrown if the shape type is not "GeometricShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63805,7 +65361,7 @@ declare namespace Excel {
             geometricShape?: Excel.Interfaces.GeometricShapeLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the shape group for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GroupShape.
+            * For EACH ITEM in the collection: Returns the shape group associated with the shape. An error will be thrown if the shape type is not "GroupShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63813,7 +65369,7 @@ declare namespace Excel {
             group?: Excel.Interfaces.ShapeGroupLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the image for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * For EACH ITEM in the collection: Returns the image associated with the shape. An error will be thrown if the shape type is not "Image".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63821,7 +65377,7 @@ declare namespace Excel {
             image?: Excel.Interfaces.ImageLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the line object for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * For EACH ITEM in the collection: Returns the line associated with the shape. An error will be thrown if the shape type is not "Line".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63829,7 +65385,7 @@ declare namespace Excel {
             line?: Excel.Interfaces.LineLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the line formatting of the shape object.
+            * For EACH ITEM in the collection: Returns the line formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63837,7 +65393,7 @@ declare namespace Excel {
             lineFormat?: Excel.Interfaces.ShapeLineFormatLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Represents the parent group of the specified shape.
+            * For EACH ITEM in the collection: Represents the parent group of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63845,7 +65401,7 @@ declare namespace Excel {
             parentGroup?: Excel.Interfaces.ShapeLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the textFrame object of a shape. Read only.
+            * For EACH ITEM in the collection: Returns the text frame object of this shape. Read only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -63853,7 +65409,7 @@ declare namespace Excel {
             textFrame?: Excel.Interfaces.TextFrameLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+             * For EACH ITEM in the collection: Returns or sets the alternative description text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63861,7 +65417,7 @@ declare namespace Excel {
             altTextDescription?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+             * For EACH ITEM in the collection: Returns or sets the alternative title text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63869,7 +65425,7 @@ declare namespace Excel {
             altTextTitle?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the number of connection sites on the specified shape. Read-only.
+             * For EACH ITEM in the collection: Returns the number of connection sites on this shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63877,7 +65433,7 @@ declare namespace Excel {
             connectionSiteCount?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+             * For EACH ITEM in the collection: Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63886,7 +65442,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63902,8 +65458,8 @@ declare namespace Excel {
             id?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * For EACH ITEM in the collection: The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63911,7 +65467,7 @@ declare namespace Excel {
             left?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the level of the specified shape. Level 0 means the shape is not part of any group, level 1 means the shape is part of a top-level group, etc.
+             * For EACH ITEM in the collection: Represents the level of the specified shape. For example, a level of 0 means that the shape is not part of any groups, a level of 1 means the shape is part of a top-level group, and a level of 2 means the shape is part of a sub-group of the top level.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63919,7 +65475,7 @@ declare namespace Excel {
             level?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents if the aspect ratio locked, in boolean, of the shape.
+             * For EACH ITEM in the collection: Specifies whether or not the aspect ratio of this shape is locked.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63935,7 +65491,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the placment, value that represents the way the object is attached to the cells below it.
+             * For EACH ITEM in the collection: Represents how the object is attached to the cells below it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63951,8 +65507,8 @@ declare namespace Excel {
             rotation?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * For EACH ITEM in the collection: The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63960,7 +65516,7 @@ declare namespace Excel {
             top?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the type of the specified shape. Read-only. See Excel.ShapeType for detail.
+             * For EACH ITEM in the collection: Returns the type of this shape. See Excel.ShapeType for details. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63968,7 +65524,7 @@ declare namespace Excel {
             type?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the visibility, in boolean, of the specified shape.
+             * For EACH ITEM in the collection: Represents the visibility of this shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63977,7 +65533,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63985,7 +65541,7 @@ declare namespace Excel {
             width?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the position of the specified shape in the z-order, the very bottom shape's z-order value is 0. Read-only.
+             * For EACH ITEM in the collection: Returns the position of the specified shape in the z-order, with 0 representing the bottom of the order stack. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -63994,7 +65550,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a generic shape object in the worksheet.
+         * Represents a generic shape object in the worksheet. A shape could be a geometric shape, a line, a group of shapes, etc.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64003,7 +65559,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Returns the fill formatting of the shape object.
+            * Returns the fill formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64011,7 +65567,7 @@ declare namespace Excel {
             fill?: Excel.Interfaces.ShapeFillLoadOptions;
             /**
             *
-            * Returns the geometric shape for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GeometricShape.
+            * Returns the geometric shape associated with the shape. An error will be thrown if the shape type is not "GeometricShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64019,7 +65575,7 @@ declare namespace Excel {
             geometricShape?: Excel.Interfaces.GeometricShapeLoadOptions;
             /**
             *
-            * Returns the shape group for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GroupShape.
+            * Returns the shape group associated with the shape. An error will be thrown if the shape type is not "GroupShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64027,7 +65583,7 @@ declare namespace Excel {
             group?: Excel.Interfaces.ShapeGroupLoadOptions;
             /**
             *
-            * Returns the image for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * Returns the image associated with the shape. An error will be thrown if the shape type is not "Image".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64035,7 +65591,7 @@ declare namespace Excel {
             image?: Excel.Interfaces.ImageLoadOptions;
             /**
             *
-            * Returns the line object for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * Returns the line associated with the shape. An error will be thrown if the shape type is not "Line".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64043,7 +65599,7 @@ declare namespace Excel {
             line?: Excel.Interfaces.LineLoadOptions;
             /**
             *
-            * Returns the line formatting of the shape object.
+            * Returns the line formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64051,7 +65607,7 @@ declare namespace Excel {
             lineFormat?: Excel.Interfaces.ShapeLineFormatLoadOptions;
             /**
             *
-            * Represents the parent group of the specified shape.
+            * Represents the parent group of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64059,7 +65615,7 @@ declare namespace Excel {
             parentGroup?: Excel.Interfaces.ShapeLoadOptions;
             /**
             *
-            * Returns the textFrame object of a shape. Read only.
+            * Returns the text frame object of this shape. Read only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64067,7 +65623,7 @@ declare namespace Excel {
             textFrame?: Excel.Interfaces.TextFrameLoadOptions;
             /**
              *
-             * Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative description text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64075,7 +65631,7 @@ declare namespace Excel {
             altTextDescription?: boolean;
             /**
              *
-             * Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+             * Returns or sets the alternative title text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64083,7 +65639,7 @@ declare namespace Excel {
             altTextTitle?: boolean;
             /**
              *
-             * Returns the number of connection sites on the specified shape. Read-only.
+             * Returns the number of connection sites on this shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64091,7 +65647,7 @@ declare namespace Excel {
             connectionSiteCount?: boolean;
             /**
              *
-             * Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+             * Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64100,7 +65656,7 @@ declare namespace Excel {
             /**
              *
              * Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64116,8 +65672,8 @@ declare namespace Excel {
             id?: boolean;
             /**
              *
-             * The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64125,7 +65681,7 @@ declare namespace Excel {
             left?: boolean;
             /**
              *
-             * Represents the level of the specified shape. Level 0 means the shape is not part of any group, level 1 means the shape is part of a top-level group, etc.
+             * Represents the level of the specified shape. For example, a level of 0 means that the shape is not part of any groups, a level of 1 means the shape is part of a top-level group, and a level of 2 means the shape is part of a sub-group of the top level.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64133,7 +65689,7 @@ declare namespace Excel {
             level?: boolean;
             /**
              *
-             * Represents if the aspect ratio locked, in boolean, of the shape.
+             * Specifies whether or not the aspect ratio of this shape is locked.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64149,7 +65705,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * Represents the placment, value that represents the way the object is attached to the cells below it.
+             * Represents how the object is attached to the cells below it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64165,8 +65721,8 @@ declare namespace Excel {
             rotation?: boolean;
             /**
              *
-             * The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64174,7 +65730,7 @@ declare namespace Excel {
             top?: boolean;
             /**
              *
-             * Returns the type of the specified shape. Read-only. See Excel.ShapeType for detail.
+             * Returns the type of this shape. See Excel.ShapeType for details. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64182,7 +65738,7 @@ declare namespace Excel {
             type?: boolean;
             /**
              *
-             * Represents the visibility, in boolean, of the specified shape.
+             * Represents the visibility of this shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64191,7 +65747,7 @@ declare namespace Excel {
             /**
              *
              * Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64199,7 +65755,7 @@ declare namespace Excel {
             width?: boolean;
             /**
              *
-             * Returns the position of the specified shape in the z-order, the very bottom shape's z-order value is 0. Read-only.
+             * Returns the position of the specified shape in the z-order, with 0 representing the bottom of the order stack. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64208,7 +65764,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a geometric shape object inside a worksheet. A geometric shape can be a line, rectangle, block arrow, equation, flowchart, start, banner, callout or basic shape in Excel.
+         * Represents a geometric shape inside a worksheet. A geometric shape can be a rectangle, block arrow, equation symbol, flowchart item, star, banner, callout, or any other basic shape in Excel.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64217,7 +65773,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Returns the shape object for the geometric shape.
+            * Returns the Shape object for the geometric shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64225,7 +65781,7 @@ declare namespace Excel {
             shape?: Excel.Interfaces.ShapeLoadOptions;
             /**
              *
-             * Represents the shape identifier. Read-only.
+             * Returns the shape identifier. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64234,7 +65790,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents an image object in the worksheet.
+         * Represents an image in the worksheet. To get the corresponding Shape object, use Image.shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64243,7 +65799,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Returns the shape object for the image.
+            * Returns the Shape object associated with the image.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64259,7 +65815,7 @@ declare namespace Excel {
             id?: boolean;
             /**
              *
-             * Returns the format for the image. Read-only.
+             * Returns the format of the image. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64268,7 +65824,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a shape group object inside a worksheet.
+         * Represents a shape group inside a worksheet. To get the corresponding Shape object, use `ShapeGroup.shape`.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64277,7 +65833,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Returns the shape object for the group.
+            * Returns the Shape object associated with the group.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64294,7 +65850,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a shape collection inside a shape group.
+         * Represents the shape collection inside a shape group.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64303,7 +65859,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * For EACH ITEM in the collection: Returns the fill formatting of the shape object.
+            * For EACH ITEM in the collection: Returns the fill formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64311,7 +65867,7 @@ declare namespace Excel {
             fill?: Excel.Interfaces.ShapeFillLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the geometric shape for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GeometricShape.
+            * For EACH ITEM in the collection: Returns the geometric shape associated with the shape. An error will be thrown if the shape type is not "GeometricShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64319,7 +65875,7 @@ declare namespace Excel {
             geometricShape?: Excel.Interfaces.GeometricShapeLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the shape group for the shape object. Error will be thrown, if the shape object is other shape type (Like, Image, SmartArt, etc.) rather than GroupShape.
+            * For EACH ITEM in the collection: Returns the shape group associated with the shape. An error will be thrown if the shape type is not "GroupShape".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64327,7 +65883,7 @@ declare namespace Excel {
             group?: Excel.Interfaces.ShapeGroupLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the image for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * For EACH ITEM in the collection: Returns the image associated with the shape. An error will be thrown if the shape type is not "Image".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64335,7 +65891,7 @@ declare namespace Excel {
             image?: Excel.Interfaces.ImageLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the line object for the shape object. Error will be thrown, if the shape object is other shape type (Like, GeometricShape, SmartArt, etc.) rather than Image.
+            * For EACH ITEM in the collection: Returns the line associated with the shape. An error will be thrown if the shape type is not "Line".
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64343,7 +65899,7 @@ declare namespace Excel {
             line?: Excel.Interfaces.LineLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the line formatting of the shape object.
+            * For EACH ITEM in the collection: Returns the line formatting of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64351,7 +65907,7 @@ declare namespace Excel {
             lineFormat?: Excel.Interfaces.ShapeLineFormatLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Represents the parent group of the specified shape.
+            * For EACH ITEM in the collection: Represents the parent group of this shape.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64359,7 +65915,7 @@ declare namespace Excel {
             parentGroup?: Excel.Interfaces.ShapeLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the textFrame object of a shape. Read only.
+            * For EACH ITEM in the collection: Returns the text frame object of this shape. Read only.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64367,7 +65923,7 @@ declare namespace Excel {
             textFrame?: Excel.Interfaces.TextFrameLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Returns or sets the alternative descriptive text string for a Shape object when the object is saved to a Web page.
+             * For EACH ITEM in the collection: Returns or sets the alternative description text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64375,7 +65931,7 @@ declare namespace Excel {
             altTextDescription?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns or sets the alternative title text string for a Shape object when the object is saved to a Web page.
+             * For EACH ITEM in the collection: Returns or sets the alternative title text for a Shape object.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64383,7 +65939,7 @@ declare namespace Excel {
             altTextTitle?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the number of connection sites on the specified shape. Read-only.
+             * For EACH ITEM in the collection: Returns the number of connection sites on this shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64391,7 +65947,7 @@ declare namespace Excel {
             connectionSiteCount?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the geometric shape type of the specified shape. See Excel.GeometricShapeType for detail. Returns null if the shape is not geometric, for example, get GeometricShapeType of a line or a chart will return null.
+             * For EACH ITEM in the collection: Represents the geometric shape type of this geometric shape. See Excel.GeometricShapeType for details. Returns null if the shape type is not "GeometricShape".
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64400,7 +65956,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the height, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64416,8 +65972,8 @@ declare namespace Excel {
             id?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: The distance, in points, from the left side of the shape to the left of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * For EACH ITEM in the collection: The distance, in points, from the left side of the shape to the left side of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64425,7 +65981,7 @@ declare namespace Excel {
             left?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the level of the specified shape. Level 0 means the shape is not part of any group, level 1 means the shape is part of a top-level group, etc.
+             * For EACH ITEM in the collection: Represents the level of the specified shape. For example, a level of 0 means that the shape is not part of any groups, a level of 1 means the shape is part of a top-level group, and a level of 2 means the shape is part of a sub-group of the top level.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64433,7 +65989,7 @@ declare namespace Excel {
             level?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents if the aspect ratio locked, in boolean, of the shape.
+             * For EACH ITEM in the collection: Specifies whether or not the aspect ratio of this shape is locked.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64449,7 +66005,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the placment, value that represents the way the object is attached to the cells below it.
+             * For EACH ITEM in the collection: Represents how the object is attached to the cells below it.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64465,8 +66021,8 @@ declare namespace Excel {
             rotation?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: The distance, in points, from the top edge of the shape to the top of the worksheet.
-            Throws an invalid argument exception when set with negative value as input.
+             * For EACH ITEM in the collection: The distance, in points, from the top edge of the shape to the top edge of the worksheet.
+            Throws an invalid argument exception when set with a negative value as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64474,7 +66030,7 @@ declare namespace Excel {
             top?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the type of the specified shape. Read-only. See Excel.ShapeType for detail.
+             * For EACH ITEM in the collection: Returns the type of this shape. See Excel.ShapeType for details. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64482,7 +66038,7 @@ declare namespace Excel {
             type?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the visibility, in boolean, of the specified shape.
+             * For EACH ITEM in the collection: Represents the visibility of this shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64491,7 +66047,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the width, in points, of the shape.
-            Throws an invalid argument exception when set with negative value or zero as input.
+            Throws an invalid argument exception when set with a negative value or zero as input.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64499,7 +66055,7 @@ declare namespace Excel {
             width?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Returns the position of the specified shape in the z-order, the very bottom shape's z-order value is 0. Read-only.
+             * For EACH ITEM in the collection: Returns the position of the specified shape in the z-order, with 0 representing the bottom of the order stack. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64508,7 +66064,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a Line object inside a worksheet.
+         * Represents a line inside a worksheet. To get the corresponding Shape object, use `Line.shape`.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64517,7 +66073,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Represents the shape object that the beginning of the specified line is attached to.
+            * Represents the shape to which the beginning of the specified line is attached.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64525,7 +66081,7 @@ declare namespace Excel {
             beginConnectedShape?: Excel.Interfaces.ShapeLoadOptions;
             /**
             *
-            * Represents the shape object that the end of the specified line is attached to.
+            * Represents the shape to which the end of the specified line is attached.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64533,7 +66089,7 @@ declare namespace Excel {
             endConnectedShape?: Excel.Interfaces.ShapeLoadOptions;
             /**
             *
-            * Returns the shape object for the line.
+            * Returns the Shape object associated with the line.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64546,7 +66102,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadLength?: boolean;
+            beginArrowheadLength?: boolean;
             /**
              *
              * Represents the style of the arrowhead at the beginning of the specified line.
@@ -64554,7 +66110,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadStyle?: boolean;
+            beginArrowheadStyle?: boolean;
             /**
              *
              * Represents the width of the arrowhead at the beginning of the specified line.
@@ -64562,10 +66118,10 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            beginArrowHeadWidth?: boolean;
+            beginArrowheadWidth?: boolean;
             /**
              *
-             * Represents an integer that specifies the connection site that the beginning of a connector is connected to. Read-only. Returns null when the beginning of the line is not attached to any shape.
+             * Represents the connection site to which the beginning of a connector is connected. Read-only. Returns null when the beginning of the line is not attached to any shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64578,7 +66134,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadLength?: boolean;
+            endArrowheadLength?: boolean;
             /**
              *
              * Represents the style of the arrowhead at the end of the specified line.
@@ -64586,7 +66142,7 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadStyle?: boolean;
+            endArrowheadStyle?: boolean;
             /**
              *
              * Represents the width of the arrowhead at the end of the specified line.
@@ -64594,10 +66150,10 @@ declare namespace Excel {
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            endArrowHeadWidth?: boolean;
+            endArrowheadWidth?: boolean;
             /**
              *
-             * Represents an integer that specifies the connection site that the end of a connector is connected to. Read-only. Returns null when the end of the line is not attached to any shape.
+             * Represents the connection site to which the end of a connector is connected. Read-only. Returns null when the end of the line is not attached to any shape.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64613,7 +66169,7 @@ declare namespace Excel {
             id?: boolean;
             /**
              *
-             * Represents whether the beginning of the specified line is connected to a shape. Read-only.
+             * Specifies whether or not the beginning of the specified line is connected to a shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64621,7 +66177,7 @@ declare namespace Excel {
             isBeginConnected?: boolean;
             /**
              *
-             * Represents whether the end of the specified line is connected to a shape. Read-only.
+             * Specifies whether or not the end of the specified line is connected to a shape. Read-only.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64638,7 +66194,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents the fill formatting for a shape object.
+         * Represents the fill formatting of a shape object.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64647,15 +66203,15 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Represents the shape fill fore color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
+             * Represents the shape fill foreground color in HTML color format, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            foreColor?: boolean;
+            foregroundColor?: boolean;
             /**
              *
-             * Returns or sets the degree of transparency of the specified fill as a value from 0.0 (opaque) through 1.0 (clear). For API not supported shape types  or special fill type with inconsistent transparencies, return null. For example, gradient fill type could have inconsistent transparencies.
+             * Returns or sets the transparency percentage of the fill as a value from 0.0 (opaque) through 1.0 (clear). Returns null if the shape type does not support transparency or the shape fill has inconsistent transparency, such as with a gradient fill type.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64663,7 +66219,7 @@ declare namespace Excel {
             transparency?: boolean;
             /**
              *
-             * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for detail.
+             * Returns the fill type of the shape. Read-only. See Excel.ShapeFillType for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64672,7 +66228,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents the line formatting for the shape object. For picture and geometric shape, line formatting represents the border of shape object.
+         * Represents the line formatting for the shape object. For images and geometric shapes, line formatting represents the border of the shape.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64689,7 +66245,7 @@ declare namespace Excel {
             color?: boolean;
             /**
              *
-             * Represents the line style of the shape. Returns null when line is not visible or has mixed line dash style property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent dash styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64697,7 +66253,7 @@ declare namespace Excel {
             dashStyle?: boolean;
             /**
              *
-             * Represents the line style of the shape object. Returns null when line is not visible or has mixed line visible property (e.g. group type of shape). See Excel.ShapeLineStyle for details.
+             * Represents the line style of the shape. Returns null when the line is not visible or there are inconsistent styles. See Excel.ShapeLineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64705,7 +66261,7 @@ declare namespace Excel {
             style?: boolean;
             /**
              *
-             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has mixed line transparency property (e.g. group type of shape).
+             * Represents the degree of transparency of the specified line as a value from 0.0 (opaque) through 1.0 (clear). Returns null when the shape has inconsistent transparencies.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64713,7 +66269,7 @@ declare namespace Excel {
             transparency?: boolean;
             /**
              *
-             * Represents whether the line formatting of a shape element is visible. Returns null when the shape has mixed line visible property (e.g. group type of shape).
+             * Represents whether or not the line formatting of a shape element is visible. Returns null when the shape has inconsistent visibilities.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64721,7 +66277,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Represents weight of the line, in points. Returns null when the line is not visible or has mixed line weight property (e.g. group type of shape).
+             * Represents the weight of the line, in points. Returns null when the line is not visible or there are inconsistent line weights.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64730,7 +66286,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents the text frame for a shape object.
+         * Represents the text frame of a shape object.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64739,7 +66295,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Represents the text range in the text frame.
+            * Represents the text that is attached to a shape in the text frame, and properties and methods for manipulating the text. See Excel.TextRange for details.
             *
             * [Api set: ExcelApi BETA (PREVIEW ONLY)]
             * @beta
@@ -64747,12 +66303,12 @@ declare namespace Excel {
             textRange?: Excel.Interfaces.TextRangeLoadOptions;
             /**
              *
-             * Gets or sets the auto sizing settings for the text frame. A text frame can be set to auto size the text to fit the text frame, or auto size the text frame to fit the text, or without auto sizing.
+             * Gets or sets the automatic sizing settings for the text frame. A text frame can be set to automatically fit the text to the text frame, to automatically fit the text frame to the text, or not perform any automatic sizing.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
              */
-            autoSize?: boolean;
+            autoSizeSetting?: boolean;
             /**
              *
              * Represents the bottom margin, in points, of the text frame.
@@ -64763,7 +66319,7 @@ declare namespace Excel {
             bottomMargin?: boolean;
             /**
              *
-             * Specifies whether the TextFrame contains text.
+             * Specifies whether the text frame contains text.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64771,7 +66327,7 @@ declare namespace Excel {
             hasText?: boolean;
             /**
              *
-             * Represents the horizontal alignment of the text frame.
+             * Represents the horizontal alignment of the text frame. See Excel.ShapeTextHorizontalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64779,7 +66335,7 @@ declare namespace Excel {
             horizontalAlignment?: boolean;
             /**
              *
-             * Represents the horizontal overflow type of the text frame.
+             * Represents the horizontal overflow behavior of the text frame. See Excel.ShapeTextHorizontalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64795,7 +66351,7 @@ declare namespace Excel {
             leftMargin?: boolean;
             /**
              *
-             * Represents the text orientation of the text frame.
+             * Represents the text orientation of the text frame. See Excel.ShapeTextOrientation for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64803,7 +66359,7 @@ declare namespace Excel {
             orientation?: boolean;
             /**
              *
-             * Represents the reading order of the text frame, RTL or LTR.
+             * Represents the reading order of the text frame, either left-to-right or right-to-left. See Excel.ShapeTextReadingOrder for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64827,7 +66383,7 @@ declare namespace Excel {
             topMargin?: boolean;
             /**
              *
-             * Represents the vertical alignment of the text frame.
+             * Represents the vertical alignment of the text frame. See Excel.ShapeTextVerticalAlignment for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64835,7 +66391,7 @@ declare namespace Excel {
             verticalAlignment?: boolean;
             /**
              *
-             * Represents the vertical overflow type of the text frame.
+             * Represents the vertical overflow behavior of the text frame. See Excel.ShapeTextVerticalOverflow for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64843,6 +66399,9 @@ declare namespace Excel {
             verticalOverflow?: boolean;
         }
         /**
+         *
+         * Contains the text that is attached to a shape, in addition to properties and methods for manipulating the text.
+         *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
          */
@@ -64867,7 +66426,7 @@ declare namespace Excel {
         }
         /**
          *
-         * This object represents the font attributes (font name, font size, color, etc.) for a TextRange in the Shape.
+         * Represents the font attributes, such as font name, font size, and color, for a shape's TextRange object.
          *
          * [Api set: ExcelApi BETA (PREVIEW ONLY)]
          * @beta
@@ -64884,7 +66443,7 @@ declare namespace Excel {
             bold?: boolean;
             /**
              *
-             * HTML color code representation of the text color. E.g. #FF0000 represents Red. Returns null if the TextRange includes text fragments with different colors.
+             * The HTML color code representation of the text color (e.g. "#FF0000" represents red). Returns null if the TextRange includes text fragments with different colors.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64892,7 +66451,7 @@ declare namespace Excel {
             color?: boolean;
             /**
              *
-             * Represents the italic status of font. Return null if the TextRange includes both italic and non-italic text fragments.
+             * Represents the italic status of font. Returns null if the TextRange includes both italic and non-italic text fragments.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64900,7 +66459,7 @@ declare namespace Excel {
             italic?: boolean;
             /**
              *
-             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, represents corresponding font name; otherwise represents Latin font name.
+             * Represents font name (e.g. "Calibri"). If the text is Complex Script or East Asian language, this is the corresponding font name; otherwise it is the Latin font name.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64908,7 +66467,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * Represents font size in points (e.g. 11). Return null if the TextRange includes text fragments with different font sizes.
+             * Represents font size in points (e.g. 11). Returns null if the TextRange includes text fragments with different font sizes.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -64916,7 +66475,7 @@ declare namespace Excel {
             size?: boolean;
             /**
              *
-             * Type of underline applied to the font. Return null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
+             * Type of underline applied to the font. Returns null if the TextRange includes text fragments with different underline styles. See Excel.ShapeFontUnderlineStyle for details.
              *
              * [Api set: ExcelApi BETA (PREVIEW ONLY)]
              * @beta
@@ -65297,6 +66856,10 @@ declare namespace Word {
          * Create a new instance of Word.Application object
          */
         static newObject(context: OfficeExtension.ClientRequestContext): Word.Application;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Application object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ApplicationData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): {
             [key: string]: string;
         };
@@ -65711,6 +67274,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Body;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Body object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.BodyData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.BodyData;
     }
     /**
@@ -65850,7 +67417,7 @@ declare namespace Word {
         readonly id: number;
         /**
          *
-         * Gets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
+         * Gets or sets the placeholder text of the content control. Dimmed text will be displayed when the content control is empty.
          *
          * [Api set: WordApi 1.1]
          */
@@ -66085,7 +67652,7 @@ declare namespace Word {
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'. This method is only supported if the content control encompasses one or more paragraphs in entirety.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
@@ -66095,7 +67662,7 @@ declare namespace Word {
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'. This method is only supported if the content control encompasses one or more paragraphs in entirety.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
@@ -66221,9 +67788,9 @@ declare namespace Word {
          * Occurs when data within the content control are changed. To get the new text, load this content control in the handler. To get the old text, do not load it.
          *
          * [Api set: WordApi BETA (PREVIEW ONLY)]
-         * @beta
          *
          * @eventproperty
+         * @beta
          */
         readonly onDataChanged: OfficeExtension.EventHandlers<Word.ContentControlEventArgs>;
         /**
@@ -66231,9 +67798,9 @@ declare namespace Word {
          * Occurs when the content control is deleted. Do not load this content control in the handler, otherwise you won't be able to get its original properties.
          *
          * [Api set: WordApi BETA (PREVIEW ONLY)]
-         * @beta
          *
          * @eventproperty
+         * @beta
          */
         readonly onDeleted: OfficeExtension.EventHandlers<Word.ContentControlEventArgs>;
         /**
@@ -66241,9 +67808,9 @@ declare namespace Word {
          * Occurs when selection within the content control is changed.
          *
          * [Api set: WordApi BETA (PREVIEW ONLY)]
-         * @beta
          *
          * @eventproperty
+         * @beta
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Word.ContentControlEventArgs>;
         /**
@@ -66254,6 +67821,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ContentControl;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.ContentControl object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ContentControlData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.ContentControlData;
     }
     /**
@@ -66361,6 +67932,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ContentControlCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.ContentControlCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ContentControlCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.ContentControlCollectionData;
     }
     /**
@@ -66443,6 +68018,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomProperty;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.CustomProperty object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.CustomPropertyData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.CustomPropertyData;
     }
     /**
@@ -66524,6 +68103,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomPropertyCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.CustomPropertyCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.CustomPropertyCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.CustomPropertyCollectionData;
     }
     /**
@@ -66693,6 +68276,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomXmlPart;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.CustomXmlPart object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.CustomXmlPartData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.CustomXmlPartData;
     }
     /**
@@ -66781,6 +68368,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomXmlPartCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.CustomXmlPartCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.CustomXmlPartCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.CustomXmlPartCollectionData;
     }
     /**
@@ -66865,6 +68456,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.CustomXmlPartScopedCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.CustomXmlPartScopedCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.CustomXmlPartScopedCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.CustomXmlPartScopedCollectionData;
     }
     /**
@@ -67011,9 +68606,9 @@ declare namespace Word {
          * Occurs when a content control is added. Run context.sync() in the handler to get the new content control's properties.
          *
          * [Api set: WordApi BETA (PREVIEW ONLY)]
-         * @beta
          *
          * @eventproperty
+         * @beta
          */
         readonly onContentControlAdded: OfficeExtension.EventHandlers<Word.ContentControlEventArgs>;
         /**
@@ -67024,6 +68619,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Document;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Document object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.DocumentData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.DocumentData;
     }
     /**
@@ -67040,6 +68639,7 @@ declare namespace Word {
          * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         readonly body: Word.Body;
         /**
@@ -67047,6 +68647,7 @@ declare namespace Word {
          * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         readonly contentControls: Word.ContentControlCollection;
         /**
@@ -67054,6 +68655,7 @@ declare namespace Word {
          * Gets the custom XML parts in the document. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.4]
+         * @beta
          */
         readonly customXmlParts: Word.CustomXmlPartCollection;
         /**
@@ -67061,6 +68663,7 @@ declare namespace Word {
          * Gets the properties of the document. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         readonly properties: Word.DocumentProperties;
         /**
@@ -67068,6 +68671,7 @@ declare namespace Word {
          * Gets the collection of section objects in the document. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         readonly sections: Word.SectionCollection;
         /**
@@ -67075,6 +68679,7 @@ declare namespace Word {
          * Gets the add-in's settings in the document. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.4]
+         * @beta
          */
         readonly settings: Word.SettingCollection;
         /**
@@ -67082,6 +68687,7 @@ declare namespace Word {
          * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         readonly saved: boolean;
         /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
@@ -67103,6 +68709,7 @@ declare namespace Word {
          * Deletes a bookmark, if exists, from the document.
          *
          * [Api set: WordApiHiddenDocument 1.4]
+         * @beta
          *
          * @param name Required. The bookmark name, which is case-insensitive.
          */
@@ -67112,6 +68719,7 @@ declare namespace Word {
          * Gets a bookmark's range. Throws if the bookmark does not exist.
          *
          * [Api set: WordApiHiddenDocument 1.4]
+         * @beta
          *
          * @param name Required. The bookmark name, which is case-insensitive.
          */
@@ -67121,6 +68729,7 @@ declare namespace Word {
          * Gets a bookmark's range. Returns a null object if the bookmark does not exist.
          *
          * [Api set: WordApiHiddenDocument 1.4]
+         * @beta
          *
          * @param name Required. The bookmark name, which is case-insensitive.
          */
@@ -67137,6 +68746,7 @@ declare namespace Word {
          * Saves the document. This will use the Word default file naming convention if the document has not been saved before.
          *
          * [Api set: WordApiHiddenDocument 1.3]
+         * @beta
          */
         save(): void;
         /**
@@ -67168,6 +68778,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.DocumentCreated;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.DocumentCreated object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.DocumentCreatedData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.DocumentCreatedData;
     }
     /**
@@ -67348,6 +68962,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.DocumentProperties;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.DocumentProperties object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.DocumentPropertiesData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.DocumentPropertiesData;
     }
     /**
@@ -67479,6 +69097,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Font;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Font object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.FontData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.FontData;
     }
     /**
@@ -67843,6 +69465,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.InlinePicture;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.InlinePicture object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.InlinePictureData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.InlinePictureData;
     }
     /**
@@ -67896,6 +69522,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.InlinePictureCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.InlinePictureCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.InlinePictureCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.InlinePictureCollectionData;
     }
     /**
@@ -68131,6 +69761,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.List;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.List object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ListData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.ListData;
     }
     /**
@@ -68211,6 +69845,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ListCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.ListCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ListCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.ListCollectionData;
     }
     /**
@@ -68313,6 +69951,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ListItem;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.ListItem object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ListItemData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.ListItemData;
     }
     /**
@@ -68903,6 +70545,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Paragraph;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Paragraph object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ParagraphData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.ParagraphData;
     }
     /**
@@ -68970,6 +70616,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.ParagraphCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.ParagraphCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.ParagraphCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.ParagraphCollectionData;
     }
     /**
@@ -69518,6 +71168,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Range;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Range object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.RangeData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.RangeData;
     }
     /**
@@ -69571,6 +71225,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.RangeCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.RangeCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.RangeCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.RangeCollectionData;
     }
     /**
@@ -69671,6 +71329,10 @@ declare namespace Word {
          * Create a new instance of Word.SearchOptions object
          */
         static newObject(context: OfficeExtension.ClientRequestContext): Word.SearchOptions;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.SearchOptions object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.SearchOptionsData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.SearchOptionsData;
     }
     /**
@@ -69782,6 +71444,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Section;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Section object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.SectionData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.SectionData;
     }
     /**
@@ -69835,6 +71501,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.SectionCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.SectionCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.SectionCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.SectionCollectionData;
     }
     /**
@@ -69918,6 +71588,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Setting;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Setting object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.SettingData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.SettingData;
     }
     /**
@@ -70005,6 +71679,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.SettingCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.SettingCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.SettingCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.SettingCollectionData;
     }
     /**
@@ -70576,6 +72254,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.Table;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.Table object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.TableData;
     }
     /**
@@ -70629,6 +72311,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.TableCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.TableCollectionData;
     }
     /**
@@ -70918,6 +72604,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableRow;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.TableRow object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableRowData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.TableRowData;
     }
     /**
@@ -70971,6 +72661,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableRowCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.TableRowCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableRowCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.TableRowCollectionData;
     }
     /**
@@ -71241,6 +72935,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCell;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.TableCell object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableCellData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.TableCellData;
     }
     /**
@@ -71294,6 +72992,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableCellCollection;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original `Word.TableCellCollection` object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableCellCollectionData`) that contains an "items" array with shallow copies of any loaded properties from the collection's items.
+        */
         toJSON(): Word.Interfaces.TableCellCollectionData;
     }
     /**
@@ -71369,6 +73071,10 @@ declare namespace Word {
          * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
          */
         untrack(): Word.TableBorder;
+        /**
+        * Overrides the JavaScript `toJSON()` method in order to provide more useful output when an API object is passed to `JSON.stringify()`. (`JSON.stringify`, in turn, calls the `toJSON` method of the object that is passed to it.)
+        * Whereas the original Word.TableBorder object is an API object, the `toJSON` method returns a plain JavaScript object (typed as `Word.Interfaces.TableBorderData`) that contains shallow copies of any loaded child properties from the original object.
+        */
         toJSON(): Word.Interfaces.TableBorderData;
     }
     /**
@@ -72409,6 +74115,7 @@ declare namespace Word {
             * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc..
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             body?: Word.Interfaces.BodyUpdateData;
             /**
@@ -72416,6 +74123,7 @@ declare namespace Word {
             * Gets the properties of the document.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             properties?: Word.Interfaces.DocumentPropertiesUpdateData;
         }
@@ -73129,48 +74837,6 @@ declare namespace Word {
             paragraphs?: Word.Interfaces.ParagraphData[];
             /**
             *
-            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Throws if there isn't a parent body. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBody?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the parent body of the body. For example, a table cell body's parent body could be a header. Returns a null object if there isn't a parent body. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBodyOrNullObject?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the content control that contains the body. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the body. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the parent section of the body. Throws if there isn't a parent section. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentSection?: Word.Interfaces.SectionData;
-            /**
-            *
-            * Gets the parent section of the body. Returns a null object if there isn't a parent section. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentSectionOrNullObject?: Word.Interfaces.SectionData;
-            /**
-            *
             * Gets the collection of table objects in the body. Read-only.
             *
             * [Api set: WordApi 1.3]
@@ -73244,55 +74910,6 @@ declare namespace Word {
             paragraphs?: Word.Interfaces.ParagraphData[];
             /**
             *
-            * Gets the parent body of the content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBody?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the content control that contains the content control. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the content control. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the table that contains the content control. Throws if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the table cell that contains the content control. Throws if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCell?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table cell that contains the content control. Returns a null object if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table that contains the content control. Returns a null object if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableOrNullObject?: Word.Interfaces.TableData;
-            /**
-            *
             * Gets the collection of table objects in the content control. Read-only.
             *
             * [Api set: WordApi 1.3]
@@ -73517,6 +75134,7 @@ declare namespace Word {
             * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc.. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             body?: Word.Interfaces.BodyData;
             /**
@@ -73524,6 +75142,7 @@ declare namespace Word {
             * Gets the collection of content control objects in the document. This includes content controls in the body of the document, headers, footers, textboxes, etc.. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             contentControls?: Word.Interfaces.ContentControlData[];
             /**
@@ -73531,6 +75150,7 @@ declare namespace Word {
             * Gets the custom XML parts in the document. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.4]
+            * @beta
             */
             customXmlParts?: Word.Interfaces.CustomXmlPartData[];
             /**
@@ -73538,6 +75158,7 @@ declare namespace Word {
             * Gets the properties of the document. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             properties?: Word.Interfaces.DocumentPropertiesData;
             /**
@@ -73545,6 +75166,7 @@ declare namespace Word {
             * Gets the collection of section objects in the document. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             sections?: Word.Interfaces.SectionData[];
             /**
@@ -73552,6 +75174,7 @@ declare namespace Word {
             * Gets the add-in's settings in the document. Read-only.
             *
             * [Api set: WordApiHiddenDocument 1.4]
+            * @beta
             */
             settings?: Word.Interfaces.SettingData[];
             /**
@@ -73559,6 +75182,7 @@ declare namespace Word {
              * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
              *
              * [Api set: WordApiHiddenDocument 1.3]
+             * @beta
              */
             saved?: boolean;
         }
@@ -73773,55 +75397,6 @@ declare namespace Word {
         }
         /** An interface describing the data returned by calling "inlinePicture.toJSON()". */
         interface InlinePictureData {
-            /**
-            *
-            * Gets the parent paragraph that contains the inline image. Read-only.
-            *
-            * [Api set: WordApi 1.2]
-            */
-            paragraph?: Word.Interfaces.ParagraphData;
-            /**
-            *
-            * Gets the content control that contains the inline image. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the inline image. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the table that contains the inline image. Throws if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the table cell that contains the inline image. Throws if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCell?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table cell that contains the inline image. Returns a null object if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table that contains the inline image. Returns a null object if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableOrNullObject?: Word.Interfaces.TableData;
             /**
              *
              * Gets or sets a string that represents the alternative text associated with the inline image.
@@ -73938,13 +75513,6 @@ declare namespace Word {
         }
         /** An interface describing the data returned by calling "paragraph.toJSON()". */
         interface ParagraphData {
-            /**
-            *
-            * Gets the collection of content control objects in the paragraph. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            contentControls?: Word.Interfaces.ContentControlData[];
             /**
             *
             * Gets the text format of the paragraph. Use this to get and set font name, size, color, and other properties. Read-only.
@@ -73961,13 +75529,6 @@ declare namespace Word {
             inlinePictures?: Word.Interfaces.InlinePictureData[];
             /**
             *
-            * Gets the List to which this paragraph belongs. Throws if the paragraph is not in a list. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            list?: Word.Interfaces.ListData;
-            /**
-            *
             * Gets the ListItem for the paragraph. Throws if the paragraph is not part of a list. Read-only.
             *
             * [Api set: WordApi 1.3]
@@ -73980,62 +75541,6 @@ declare namespace Word {
             * [Api set: WordApi 1.3]
             */
             listItemOrNullObject?: Word.Interfaces.ListItemData;
-            /**
-            *
-            * Gets the List to which this paragraph belongs. Returns a null object if the paragraph is not in a list. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            listOrNullObject?: Word.Interfaces.ListData;
-            /**
-            *
-            * Gets the parent body of the paragraph. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBody?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the content control that contains the paragraph. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the paragraph. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the table that contains the paragraph. Throws if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the table cell that contains the paragraph. Throws if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCell?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table cell that contains the paragraph. Returns a null object if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table that contains the paragraph. Returns a null object if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableOrNullObject?: Word.Interfaces.TableData;
             /**
              *
              * Gets or sets the alignment for a paragraph. The value can be 'left', 'centered', 'right', or 'justified'.
@@ -74155,13 +75660,6 @@ declare namespace Word {
         }
         /** An interface describing the data returned by calling "range.toJSON()". */
         interface RangeData {
-            /**
-            *
-            * Gets the collection of content control objects in the range. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            contentControls?: Word.Interfaces.ContentControlData[];
             /**
             *
             * Gets the text format of the range. Use this to get and set font name, size, color, and other properties. Read-only.
@@ -74176,76 +75674,6 @@ declare namespace Word {
             * [Api set: WordApi 1.2]
             */
             inlinePictures?: Word.Interfaces.InlinePictureData[];
-            /**
-            *
-            * Gets the collection of list objects in the range. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            lists?: Word.Interfaces.ListData[];
-            /**
-            *
-            * Gets the collection of paragraph objects in the range. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            paragraphs?: Word.Interfaces.ParagraphData[];
-            /**
-            *
-            * Gets the parent body of the range. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBody?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the content control that contains the range. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.1]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the range. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the table that contains the range. Throws if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the table cell that contains the range. Throws if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCell?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table cell that contains the range. Returns a null object if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table that contains the range. Returns a null object if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableOrNullObject?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the collection of table objects in the range. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            tables?: Word.Interfaces.TableData[];
             /**
              *
              * Gets the first hyperlink in the range, or sets a hyperlink on the range. All hyperlinks in the range are deleted when you set a new hyperlink on the range. Use a '#' to separate the address part from the optional location part.
@@ -74386,55 +75814,6 @@ declare namespace Word {
             font?: Word.Interfaces.FontData;
             /**
             *
-            * Gets the parent body of the table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentBody?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the content control that contains the table. Throws if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControl?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the content control that contains the table. Returns a null object if there isn't a parent content control. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentContentControlOrNullObject?: Word.Interfaces.ContentControlData;
-            /**
-            *
-            * Gets the table that contains this table. Throws if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
-            /**
-            *
-            * Gets the table cell that contains this table. Throws if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCell?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table cell that contains this table. Returns a null object if it is not contained in a table cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableCellOrNullObject?: Word.Interfaces.TableCellData;
-            /**
-            *
-            * Gets the table that contains this table. Returns a null object if it is not contained in a table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTableOrNullObject?: Word.Interfaces.TableData;
-            /**
-            *
             * Gets all of the table rows. Read-only.
             *
             * [Api set: WordApi 1.3]
@@ -74587,13 +75966,6 @@ declare namespace Word {
             * [Api set: WordApi 1.3]
             */
             font?: Word.Interfaces.FontData;
-            /**
-            *
-            * Gets parent table. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
             /**
              *
              * Gets the number of cells in the row. Read-only.
@@ -74664,20 +76036,6 @@ declare namespace Word {
             * [Api set: WordApi 1.3]
             */
             body?: Word.Interfaces.BodyData;
-            /**
-            *
-            * Gets the parent row of the cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentRow?: Word.Interfaces.TableRowData;
-            /**
-            *
-            * Gets the parent table of the cell. Read-only.
-            *
-            * [Api set: WordApi 1.3]
-            */
-            parentTable?: Word.Interfaces.TableData;
             /**
              *
              * Gets the index of the cell in its row. Read-only.
@@ -75363,6 +76721,7 @@ declare namespace Word {
             * Gets the body object of the document. The body is the text that excludes headers, footers, footnotes, textboxes, etc..
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             body?: Word.Interfaces.BodyLoadOptions;
             /**
@@ -75370,6 +76729,7 @@ declare namespace Word {
             * Gets the properties of the document.
             *
             * [Api set: WordApiHiddenDocument 1.3]
+            * @beta
             */
             properties?: Word.Interfaces.DocumentPropertiesLoadOptions;
             /**
@@ -75377,6 +76737,7 @@ declare namespace Word {
              * Indicates whether the changes in the document have been saved. A value of true indicates that the document hasn't changed since it was saved. Read-only.
              *
              * [Api set: WordApiHiddenDocument 1.3]
+             * @beta
              */
             saved?: boolean;
         }
@@ -81021,6 +82382,7 @@ declare namespace OneNote {
     }
     enum ErrorCodes {
         generalException = "GeneralException",
+        operationAborted = "OperationAborted",
     }
     module Interfaces {
         /**

From 128b735ca0b672f658b53567345cfab38d67fb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20H=C3=BCbelbauer?= <tomas@hubelbauer.net>
Date: Tue, 12 Mar 2019 18:43:33 +0100
Subject: [PATCH 576/924] Propagate event type to components in
 react-big-calendar (#33773)

* Propagate event type to components

Currently components which accept the event always have its type set to `object` even though the props are already generic because nowhere else in the types is their generic argument actually set.

* Use the generic argument default

* Update tests

* Remove redundant type argument

* Add missing arguments

* Add missing space

* Rename missing symbol

* Add missing import

* Add missing props access
---
 types/react-big-calendar/index.d.ts           | 28 +++++++++----------
 .../react-big-calendar-tests.tsx              | 26 ++++++++---------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 85914eda10..465c0a722c 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -113,9 +113,9 @@ export interface HeaderProps {
     localizer: DateLocalizer;
 }
 
-export interface Components {
-    event?: React.ComponentType<EventProps>;
-    eventWrapper?: React.ComponentType<EventWrapperProps>;
+export interface Components<TEvent extends Event = Event> {
+    event?: React.ComponentType<EventProps<TEvent>>;
+    eventWrapper?: React.ComponentType<EventWrapperProps<TEvent>>;
     eventContainerWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     dayWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     dateCellWrapper?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
@@ -158,29 +158,29 @@ export interface ToolbarProps {
     children?: React.ReactNode;
 }
 
-export interface EventProps<T extends Event = Event> {
-    event: T;
+export interface EventProps<TEvent extends Event = Event> {
+    event: TEvent;
     title: string;
 }
 
-export interface EventWrapperProps<T extends Event = Event> {
+export interface EventWrapperProps<TEvent extends Event = Event> {
     // https://github.com/intljusticemission/react-big-calendar/blob/27a2656b40ac8729634d24376dff8ea781a66d50/src/TimeGridEvent.js#L28
     style?: React.CSSProperties & { xOffset: number };
     className: string;
-    event: T;
+    event: TEvent;
     isRtl: boolean;
     getters: {
-        eventProp?: EventPropGetter<T>;
+        eventProp?: EventPropGetter<TEvent>;
         slotProp?: SlotPropGetter;
         dayProp?: DayPropGetter;
     };
     onClick: (e: React.MouseEvent<HTMLElement>) => void;
     onDoubleClick: (e: React.MouseEvent<HTMLElement>) => void;
     accessors: {
-        title?: (event: T) => string;
-        tooltip?: (event: T) => string;
-        end?: (event: T) => Date;
-        start?: (event: T) => Date;
+        title?: (event: TEvent) => string;
+        tooltip?: (event: TEvent) => string;
+        end?: (event: TEvent) => Date;
+        start?: (event: TEvent) => Date;
     };
     selected: boolean;
     label: string;
@@ -263,7 +263,7 @@ export interface BigCalendarProps<TEvent extends Event = Event, TResource extend
     scrollToTime?: Date;
     culture?: string;
     formats?: Formats;
-    components?: Components;
+    components?: Components<TEvent>;
     messages?: Messages;
     titleAccessor?: keyof TEvent | ((event: TEvent) => string);
     allDayAccessor?: keyof TEvent | ((event: TEvent) => boolean);
@@ -293,7 +293,7 @@ export default class BigCalendar<TEvent extends Event = Event, TResource extends
     components: {
         dateCellWrapper: React.ComponentType,
         dayWrapper: React.ComponentType,
-        eventWrapper: React.ComponentType,
+        eventWrapper: React.ComponentType<TEvent>,
     };
     /**
      * create DateLocalizer from globalize
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index 6b7c252f97..bfcd9d3f0e 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import BigCalendar, { BigCalendarProps, Navigate, View, DateRange, DateLocalizer, ToolbarProps, EventWrapperProps } from "react-big-calendar";
+import BigCalendar, { BigCalendarProps, Navigate, View, DateRange, DateLocalizer, ToolbarProps, EventProps, EventWrapperProps } from "react-big-calendar";
 import withDragAndDrop from "react-big-calendar/lib/addons/dragAndDrop";
 
 // Don't want to add this as a dependency, because it is only used for tests.
@@ -93,7 +93,7 @@ class CalendarResource {
     class FullAPIExample extends React.Component<BigCalendarProps<CalendarEvent, CalendarResource>> {
         render() {
             return (
-              <MyCalendar  {...this.props}
+              <MyCalendar {...this.props}
               date={new Date()}
               getNow={() => new Date()}
               view={'day'}
@@ -217,24 +217,22 @@ const customSlotPropGetter = (date: Date) => {
     else return {};
 };
 
-function Event(event: any) {
+function Event(props: EventProps<CalendarEvent>) {
     return (
         <span>
-            <strong>{event.title}</strong>
-            {event.desc && ':  ' + event.desc}
+            <strong>{props.event.title}</strong>
+            {props.event.desc && ':  ' + props.event.desc}
         </span>
     );
 }
 
-class EventWrapper extends React.Component<EventWrapperProps> {
-    render() {
-        const { continuesEarlier, event, label, accessors = {}, style } = this.props;
-        return (
-            <div style={style}>
-                <div>{continuesEarlier}-{label}-{accessors.title && event && accessors.title(event)}}</div>
-            </div>
-        );
-    }
+function EventWrapper(props: EventWrapperProps<CalendarEvent>) {
+    const { continuesEarlier, event, label, accessors = {}, style } = props;
+    return (
+        <div style={style}>
+            <div>{continuesEarlier}-{label}-{accessors.title && event && accessors.title(event)}}</div>
+        </div>
+    );
 }
 
 class Toolbar extends React.Component<ToolbarProps> {

From 3eb866bd83d8bfef1ee68b345010cc850c50df4f Mon Sep 17 00:00:00 2001
From: Grzegorz Redlicki <redlicki.grzegorz@gmail.com>
Date: Tue, 12 Mar 2019 18:44:04 +0100
Subject: [PATCH 577/924] @types/aws-lambda: There are no types for the
 communication with Application Load Balancer (#33763)

* Add the additional types for the usage of Application Load Balancer

* Change the long name "Application Load Balancer" to shorter one "ALB"

* Add ALBCallback for the completeness of the communication with the ALB
---
 types/aws-lambda/aws-lambda-tests.ts | 52 ++++++++++++++++++++++++++++
 types/aws-lambda/index.d.ts          | 31 +++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index dc5f9b3eba..edc2015616 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -8,10 +8,14 @@ declare let num: number;
 declare let error: Error;
 declare let bool: boolean;
 declare let boolOrUndefined: boolean | undefined;
+declare let boolOrNumOrStr: boolean | number | string;
 declare let numOrUndefined: number | undefined;
 declare let apiGwEvtReqCtx: AWSLambda.APIGatewayEventRequestContext;
 declare let apiGwEvtReqCtxOpt: AWSLambda.APIGatewayEventRequestContext | null | undefined;
 declare let apiGwEvt: AWSLambda.APIGatewayEvent;
+declare let albEvtReqCtx: AWSLambda.ALBEventRequestContext;
+declare let albEvt: AWSLambda.ALBEvent;
+declare let albRes: AWSLambda.ALBResult;
 declare let customAuthorizerEvt: AWSLambda.CustomAuthorizerEvent;
 declare let clientCtx: AWSLambda.ClientContext;
 declare let clientCtxOrUndefined: AWSLambda.ClientContext | undefined;
@@ -125,6 +129,27 @@ str = apiGwEvt.stageVariables!["example"];
 apiGwEvtReqCtx = apiGwEvt.requestContext;
 str = apiGwEvt.resource;
 
+/* Application Load Balancer Event Request Context */
+str = albEvtReqCtx.elb.targetGroupArn;
+
+/* Application Load Balancer Event */
+str = albEvt.httpMethod;
+str = albEvt.path;
+str = albEvt.queryStringParameters!["example"];
+str = albEvt.headers!["example"];
+str = albEvt.multiValueQueryStringParameters!["example"][0];
+str = albEvt.multiValueHeaders!["example"][0];
+strOrNull = albEvt.body;
+bool = albEvt.isBase64Encoded;
+
+/* Application Load Balancer Result */
+num = albRes.statusCode;
+str = albRes.statusDescription;
+boolOrNumOrStr = albRes.headers!["example"];
+boolOrNumOrStr = albRes.multiValueHeaders!["example"][0];
+str = albRes.body;
+bool = albRes.isBase64Encoded;
+
 /* API Gateway CustomAuthorizer Event */
 str = customAuthorizerEvt.type;
 str = customAuthorizerEvt.methodArn;
@@ -879,6 +904,33 @@ const inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
 // Test using default Callback type still works.
 const defaultCallbackHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
 
+const albSyncHandler: AWSLambda.ALBHandler = (
+    event: AWSLambda.ALBEvent,
+    context: AWSLambda.Context,
+    cb: AWSLambda.ALBCallback,
+) => {
+    cb(null, {
+        statusCode: 200,
+        statusDescription: '200 OK',
+        headers: { },
+        body: '',
+        isBase64Encoded: false,
+    });
+};
+const albAsyncHandler: AWSLambda.ALBHandler = async (
+    event: AWSLambda.ALBEvent,
+    context: AWSLambda.Context,
+    cb: AWSLambda.ALBCallback,
+) => {
+    return {
+        statusCode: 200,
+        statusDescription: '200 OK',
+        headers: { },
+        body: '',
+        isBase64Encoded: false,
+    };
+};
+
 // Specific types
 let s3Handler: AWSLambda.S3Handler = (event: AWSLambda.S3Event, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 // Test old name
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 910324d7ab..72a0edabf9 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -28,6 +28,7 @@
 //                 Loïk Gaonac'h <https://github.com/loikg>
 //                 Roberto Zen <https://github.com/skyzenr>
 //                 Richard Cornelissen <https://github.com/richardcornelissen>
+//                 Grzegorz Redlicki <https://github.com/redlickigrzegorz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -86,6 +87,24 @@ export interface APIGatewayProxyEvent {
 }
 export type APIGatewayEvent = APIGatewayProxyEvent; // Old name
 
+// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-functions.html
+export interface ALBEventRequestContext {
+    elb: {
+        targetGroupArn: string;
+    };
+}
+export interface ALBEvent {
+    requestContext: ALBEventRequestContext;
+    httpMethod: string;
+    path: string;
+    queryStringParameters?: { [parameter: string]: string }; // URL encoded
+    headers?: { [header: string]: string };
+    multiValueQueryStringParameters?: { [parameter: string]: string[] }; // URL encoded
+    multiValueHeaders?: { [header: string]: string[] };
+    body: string | null;
+    isBase64Encoded: boolean;
+}
+
 // API Gateway CustomAuthorizer "event"
 export interface CustomAuthorizerEvent {
     type: string;
@@ -474,6 +493,15 @@ export interface APIGatewayProxyResult {
 }
 export type ProxyResult = APIGatewayProxyResult; // Old name
 
+export interface ALBResult {
+    statusCode: number;
+    statusDescription: string;
+    headers?: { [header: string]: boolean | number | string };
+    multiValueHeaders?: { [header: string]: Array<boolean | number | string> };
+    body: string;
+    isBase64Encoded: boolean;
+}
+
 /**
  * API Gateway CustomAuthorizer AuthResponse.
  * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
@@ -1058,6 +1086,9 @@ export type APIGatewayProxyCallback = Callback<APIGatewayProxyResult>;
 export type ProxyHandler = APIGatewayProxyHandler; // Old name
 export type ProxyCallback = APIGatewayProxyCallback; // Old name
 
+export type ALBHandler = Handler<ALBEvent, ALBResult>;
+export type ALBCallback = Callback<ALBResult>;
+
 // TODO: IoT
 
 export type CodePipelineHandler = Handler<CodePipelineEvent, void>;

From b1a104ea4f8b2b4ef1460d5b66aa7021dd609ebe Mon Sep 17 00:00:00 2001
From: Dimitri Benin <BendingBender@users.noreply.github.com>
Date: Tue, 12 Mar 2019 17:45:16 +0000
Subject: [PATCH 578/924] Deprecate types for packages that provide their own
 types (#33755)

* Remove upstreamed types

* Remove more packages
---
 notNeededPackages.json                        | 114 ++++++++++++++++++
 types/boxen/boxen-tests.ts                    |  37 ------
 types/boxen/index.d.ts                        | 114 ------------------
 types/boxen/tsconfig.json                     |  23 ----
 types/boxen/tslint.json                       |   1 -
 .../cacheable-request-tests.ts                |   2 -
 .../copy-text-to-clipboard-tests.ts           |   8 --
 types/copy-text-to-clipboard/index.d.ts       |   8 --
 types/copy-text-to-clipboard/tsconfig.json    |  24 ----
 types/copy-text-to-clipboard/tslint.json      |   6 -
 types/cp-file/cp-file-tests.ts                |  19 ---
 types/cp-file/index.d.ts                      |  28 -----
 types/cp-file/tsconfig.json                   |  23 ----
 types/cp-file/tslint.json                     |   1 -
 types/cpy/cpy-tests.ts                        |  18 ---
 types/cpy/index.d.ts                          |  31 -----
 types/cpy/tsconfig.json                       |  23 ----
 types/cpy/tslint.json                         |   1 -
 types/decamelize/decamelize-tests.ts          |   4 -
 types/decamelize/index.d.ts                   |   9 --
 types/decamelize/tsconfig.json                |  23 ----
 types/decamelize/tslint.json                  |   1 -
 types/file-type/file-type-tests.ts            |   8 --
 types/file-type/index.d.ts                    |  34 ------
 types/file-type/tsconfig.json                 |  23 ----
 types/file-type/tslint.json                   |   1 -
 types/got/got-tests.ts                        |   5 -
 types/got/v8/got-tests.ts                     |   5 -
 .../humanize-string/humanize-string-tests.ts  |   4 -
 types/humanize-string/index.d.ts              |   8 --
 types/humanize-string/tsconfig.json           |  23 ----
 types/humanize-string/tslint.json             |   1 -
 types/image-type/image-type-tests.ts          |   4 -
 types/image-type/index.d.ts                   |  12 --
 types/image-type/tsconfig.json                |  23 ----
 types/image-type/tslint.json                  |   1 -
 types/is-svg/index.d.ts                       |  13 --
 types/is-svg/is-svg-tests.ts                  |  11 --
 types/is-svg/tsconfig.json                    |  23 ----
 types/is-svg/tslint.json                      |   1 -
 types/keyv/keyv-tests.ts                      |   5 -
 types/npm-name/index.d.ts                     |  12 --
 types/npm-name/npm-name-tests.ts              |  12 --
 types/npm-name/tsconfig.json                  |  23 ----
 types/npm-name/tslint.json                    |   1 -
 types/npm-run-path/index.d.ts                 |  45 -------
 types/npm-run-path/npm-run-path-tests.ts      |  16 ---
 types/npm-run-path/tsconfig.json              |  23 ----
 types/npm-run-path/tslint.json                |   1 -
 types/p-some/index.d.ts                       |  22 ----
 types/p-some/p-some-tests.ts                  |  34 ------
 types/p-some/tsconfig.json                    |  23 ----
 types/p-some/tslint.json                      |   1 -
 types/path-key/index.d.ts                     |  17 ---
 types/path-key/path-key-tests.ts              |   5 -
 types/path-key/tsconfig.json                  |  23 ----
 types/path-key/tslint.json                    |   1 -
 types/ps-list/index.d.ts                      |  24 ----
 types/ps-list/ps-list-tests.ts                |  13 --
 types/ps-list/tsconfig.json                   |  23 ----
 types/ps-list/tslint.json                     |   1 -
 types/quick-lru/index.d.ts                    |  26 ----
 types/quick-lru/quick-lru-tests.ts            |  25 ----
 types/quick-lru/tsconfig.json                 |  24 ----
 types/quick-lru/tslint.json                   |   1 -
 types/quick-lru/v1/index.d.ts                 |  26 ----
 types/quick-lru/v1/quick-lru-tests.ts         |  29 -----
 types/quick-lru/v1/tsconfig.json              |  29 -----
 types/quick-lru/v1/tslint.json                |   1 -
 types/read-chunk/index.d.ts                   |  29 -----
 types/read-chunk/read-chunk-tests.ts          |   9 --
 types/read-chunk/tsconfig.json                |  23 ----
 types/read-chunk/tslint.json                  |  79 ------------
 types/sindresorhus__slugify/index.d.ts        |  42 -------
 .../sindresorhus__slugify-tests.ts            |  29 -----
 types/sindresorhus__slugify/tsconfig.json     |  19 ---
 types/sindresorhus__slugify/tslint.json       |   1 -
 types/time-span/index.d.ts                    |  18 ---
 types/time-span/time-span-tests.ts            |   9 --
 types/time-span/tsconfig.json                 |  23 ----
 types/time-span/tslint.json                   |   1 -
 types/trash/index.d.ts                        |  22 ----
 types/trash/trash-tests.ts                    |  20 ---
 types/trash/tsconfig.json                     |  24 ----
 types/trash/tslint.json                       |   1 -
 85 files changed, 114 insertions(+), 1439 deletions(-)
 delete mode 100644 types/boxen/boxen-tests.ts
 delete mode 100644 types/boxen/index.d.ts
 delete mode 100644 types/boxen/tsconfig.json
 delete mode 100644 types/boxen/tslint.json
 delete mode 100644 types/copy-text-to-clipboard/copy-text-to-clipboard-tests.ts
 delete mode 100644 types/copy-text-to-clipboard/index.d.ts
 delete mode 100644 types/copy-text-to-clipboard/tsconfig.json
 delete mode 100644 types/copy-text-to-clipboard/tslint.json
 delete mode 100644 types/cp-file/cp-file-tests.ts
 delete mode 100644 types/cp-file/index.d.ts
 delete mode 100644 types/cp-file/tsconfig.json
 delete mode 100644 types/cp-file/tslint.json
 delete mode 100644 types/cpy/cpy-tests.ts
 delete mode 100644 types/cpy/index.d.ts
 delete mode 100644 types/cpy/tsconfig.json
 delete mode 100644 types/cpy/tslint.json
 delete mode 100644 types/decamelize/decamelize-tests.ts
 delete mode 100644 types/decamelize/index.d.ts
 delete mode 100644 types/decamelize/tsconfig.json
 delete mode 100644 types/decamelize/tslint.json
 delete mode 100644 types/file-type/file-type-tests.ts
 delete mode 100644 types/file-type/index.d.ts
 delete mode 100644 types/file-type/tsconfig.json
 delete mode 100644 types/file-type/tslint.json
 delete mode 100644 types/humanize-string/humanize-string-tests.ts
 delete mode 100644 types/humanize-string/index.d.ts
 delete mode 100644 types/humanize-string/tsconfig.json
 delete mode 100644 types/humanize-string/tslint.json
 delete mode 100644 types/image-type/image-type-tests.ts
 delete mode 100644 types/image-type/index.d.ts
 delete mode 100644 types/image-type/tsconfig.json
 delete mode 100644 types/image-type/tslint.json
 delete mode 100644 types/is-svg/index.d.ts
 delete mode 100644 types/is-svg/is-svg-tests.ts
 delete mode 100644 types/is-svg/tsconfig.json
 delete mode 100644 types/is-svg/tslint.json
 delete mode 100644 types/npm-name/index.d.ts
 delete mode 100644 types/npm-name/npm-name-tests.ts
 delete mode 100644 types/npm-name/tsconfig.json
 delete mode 100644 types/npm-name/tslint.json
 delete mode 100644 types/npm-run-path/index.d.ts
 delete mode 100644 types/npm-run-path/npm-run-path-tests.ts
 delete mode 100644 types/npm-run-path/tsconfig.json
 delete mode 100644 types/npm-run-path/tslint.json
 delete mode 100644 types/p-some/index.d.ts
 delete mode 100644 types/p-some/p-some-tests.ts
 delete mode 100644 types/p-some/tsconfig.json
 delete mode 100644 types/p-some/tslint.json
 delete mode 100644 types/path-key/index.d.ts
 delete mode 100644 types/path-key/path-key-tests.ts
 delete mode 100644 types/path-key/tsconfig.json
 delete mode 100644 types/path-key/tslint.json
 delete mode 100644 types/ps-list/index.d.ts
 delete mode 100644 types/ps-list/ps-list-tests.ts
 delete mode 100644 types/ps-list/tsconfig.json
 delete mode 100644 types/ps-list/tslint.json
 delete mode 100644 types/quick-lru/index.d.ts
 delete mode 100644 types/quick-lru/quick-lru-tests.ts
 delete mode 100644 types/quick-lru/tsconfig.json
 delete mode 100644 types/quick-lru/tslint.json
 delete mode 100644 types/quick-lru/v1/index.d.ts
 delete mode 100644 types/quick-lru/v1/quick-lru-tests.ts
 delete mode 100644 types/quick-lru/v1/tsconfig.json
 delete mode 100644 types/quick-lru/v1/tslint.json
 delete mode 100644 types/read-chunk/index.d.ts
 delete mode 100644 types/read-chunk/read-chunk-tests.ts
 delete mode 100644 types/read-chunk/tsconfig.json
 delete mode 100644 types/read-chunk/tslint.json
 delete mode 100644 types/sindresorhus__slugify/index.d.ts
 delete mode 100644 types/sindresorhus__slugify/sindresorhus__slugify-tests.ts
 delete mode 100644 types/sindresorhus__slugify/tsconfig.json
 delete mode 100644 types/sindresorhus__slugify/tslint.json
 delete mode 100644 types/time-span/index.d.ts
 delete mode 100644 types/time-span/time-span-tests.ts
 delete mode 100644 types/time-span/tsconfig.json
 delete mode 100644 types/time-span/tslint.json
 delete mode 100644 types/trash/index.d.ts
 delete mode 100644 types/trash/trash-tests.ts
 delete mode 100644 types/trash/tsconfig.json
 delete mode 100644 types/trash/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index bd141916cf..1dade039df 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -198,6 +198,12 @@
             "sourceRepoURL": "https://github.com/ded/bowser",
             "asOfVersion": "1.1.1"
         },
+        {
+            "libraryName": "boxen",
+            "typingsPackageName": "boxen",
+            "sourceRepoURL": "https://github.com/sindresorhus/boxen",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "Bugsnag Browser",
             "typingsPackageName": "bugsnag-js",
@@ -294,6 +300,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/constant-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "copy-text-to-clipboard",
+            "typingsPackageName": "copy-text-to-clipboard",
+            "sourceRepoURL": "https://github.com/sindresorhus/copy-text-to-clipboard",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "cordova-plugin-battery-status",
             "typingsPackageName": "cordova-plugin-battery-status",
@@ -408,6 +420,18 @@
             "sourceRepoURL": "https://github.com/jayphelps/core-decorators.js",
             "asOfVersion": "0.20.0"
         },
+        {
+            "libraryName": "cp-file",
+            "typingsPackageName": "cp-file",
+            "sourceRepoURL": "https://github.com/sindresorhus/cp-file",
+            "asOfVersion": "6.1.0"
+        },
+        {
+            "libraryName": "cpy",
+            "typingsPackageName": "cpy",
+            "sourceRepoURL": "https://github.com/sindresorhus/cpy",
+            "asOfVersion": "7.1.0"
+        },
         {
             "libraryName": "cypress",
             "typingsPackageName": "cypress",
@@ -426,6 +450,12 @@
             "sourceRepoURL": "https://github.com/DataDog/dd-trace-js",
             "asOfVersion": "0.9.0"
         },
+        {
+            "libraryName": "decamelize",
+            "typingsPackageName": "decamelize",
+            "sourceRepoURL": "https://github.com/sindresorhus/decamelize",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "decimal.js",
             "typingsPackageName": "decimal.js",
@@ -642,6 +672,12 @@
             "sourceRepoURL": "https://github.com/taylorhakes/fecha",
             "asOfVersion": "2.3.1"
         },
+        {
+            "libraryName": "file-type",
+            "typingsPackageName": "file-type",
+            "sourceRepoURL": "https://github.com/sindresorhus/file-type",
+            "asOfVersion": "10.9.0"
+        },
         {
             "libraryName": "FineUploader",
             "typingsPackageName": "fine-uploader",
@@ -786,6 +822,12 @@
             "sourceRepoURL": "https://github.com/prettymuchbryce/node-http-status",
             "asOfVersion": "1.2.0"
         },
+        {
+            "libraryName": "humanize-string",
+            "typingsPackageName": "humanize-string",
+            "sourceRepoURL": "ttps://github.com/sindresorhus/humanize-string",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "i18next-browser-languagedetector",
             "typingsPackageName": "i18next-browser-languagedetector",
@@ -810,6 +852,12 @@
             "sourceRepoURL": "https://github.com/bpmn-io/ids",
             "asOfVersion": "0.2.2"
         },
+        {
+            "libraryName": "image-type",
+            "typingsPackageName": "image-type",
+            "sourceRepoURL": "https://github.com/sindresorhus/image-type",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "immutability-helper",
             "typingsPackageName": "immutability-helper",
@@ -894,6 +942,12 @@
             "sourceRepoURL": "https://github.com/jonschlinkert/is-plain-object",
             "asOfVersion": "2.0.4"
         },
+        {
+            "libraryName": "is-svg",
+            "typingsPackageName": "is-svg",
+            "sourceRepoURL": "https://github.com/sindresorhus/is-svg",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "is-upper-case",
             "typingsPackageName": "is-upper-case",
@@ -1200,6 +1254,18 @@
             "sourceRepoURL": "https://github.com/paularmstrong/normalizr",
             "asOfVersion": "2.0.18"
         },
+        {
+            "libraryName": "npm-name",
+            "typingsPackageName": "npm-name",
+            "sourceRepoURL": "https://github.com/sindresorhus/npm-name",
+            "asOfVersion": "5.2.0"
+        },
+        {
+            "libraryName": "npm-run-path",
+            "typingsPackageName": "npm-run-path",
+            "sourceRepoURL": "https://github.com/sindresorhus/npm-run-path",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "Nuka Carousel",
             "typingsPackageName": "nuka-carousel",
@@ -1260,6 +1326,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/p-queue",
             "asOfVersion": "3.2.1"
         },
+        {
+            "libraryName": "p-some",
+            "typingsPackageName": "p-some",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-some",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "p-throttle",
             "typingsPackageName": "p-throttle",
@@ -1290,6 +1362,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/path-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "path-key",
+            "typingsPackageName": "path-key",
+            "sourceRepoURL": "https://github.com/sindresorhus/path-key",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "path-to-regexp",
             "typingsPackageName": "path-to-regexp",
@@ -1380,6 +1458,12 @@
             "sourceRepoURL": "https://github.com/angular/protractor",
             "asOfVersion": "4.0.0"
         },
+        {
+            "libraryName": "ps-list",
+            "typingsPackageName": "ps-list",
+            "sourceRepoURL": "https://github.com/sindresorhus/ps-list",
+            "asOfVersion": "6.2.0"
+        },
         {
             "libraryName": "qiniu",
             "typingsPackageName": "qiniu",
@@ -1398,6 +1482,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/query-string",
             "asOfVersion": "6.3.0"
         },
+        {
+            "libraryName": "quick-lru",
+            "typingsPackageName": "quick-lru",
+            "sourceRepoURL": "https://github.com/sindresorhus/quick-lru",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "Raven JS",
             "typingsPackageName": "raven-js",
@@ -1524,6 +1614,12 @@
             "sourceRepoURL": "https://github.com/tanem/react-svg",
             "asOfVersion": "5.0.0"
         },
+        {
+            "libraryName": "read-chunk",
+            "typingsPackageName": "read-chunk",
+            "sourceRepoURL": "https://github.com/sindresorhus/read-chunk",
+            "asOfVersion": "3.1.0"
+        },
         {
             "libraryName": "realm",
             "typingsPackageName": "realm",
@@ -1698,6 +1794,12 @@
             "sourceRepoURL": "https://github.com/zeh/simplesignal",
             "asOfVersion": "1.0.0"
         },
+        {
+            "libraryName": "@sindresorhus/slugify",
+            "typingsPackageName": "sindresorhus__slugify",
+            "sourceRepoURL": "https://github.com/sindresorhus/slugify",
+            "asOfVersion": "0.9.0"
+        },
         {
             "libraryName": "sip.js",
             "typingsPackageName": "sip.js",
@@ -1824,6 +1926,12 @@
             "sourceRepoURL": "https://github.com/terser-js/terser",
             "asOfVersion": "3.12.0"
         },
+        {
+            "libraryName": "time-span",
+            "typingsPackageName": "time-span",
+            "sourceRepoURL": "https://github.com/sindresorhus/time-span",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "timezonecomplete",
             "typingsPackageName": "timezonecomplete",
@@ -1836,6 +1944,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/title-case",
             "asOfVersion": "1.1.2"
         },
+        {
+            "libraryName": "trash",
+            "typingsPackageName": "trash",
+            "sourceRepoURL": "https://github.com/sindresorhus/trash",
+            "asOfVersion": "5.0.0"
+        },
         {
             "libraryName": "TsMonad",
             "typingsPackageName": "tsmonad",
diff --git a/types/boxen/boxen-tests.ts b/types/boxen/boxen-tests.ts
deleted file mode 100644
index 303e5dd7fa..0000000000
--- a/types/boxen/boxen-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import boxen = require('boxen');
-
-boxen('unicorn'); // $ExpectType string
-boxen('unicorn', { borderColor: 'black' }); // $ExpectType string
-boxen('unicorn', { borderStyle: 'double' }); // $ExpectType string
-boxen('unicorn', { borderStyle: 'foo' }); // $ExpectError
-// $ExpectType string
-boxen('unicorn', {
-    borderStyle: {
-        topLeft: '+',
-        topRight: '+',
-        bottomLeft: '+',
-        bottomRight: '+',
-        horizontal: '-',
-        vertical: '|',
-    },
-});
-boxen('unicorn', { dimBorder: true }); // $ExpectType string
-boxen('unicorn', { padding: 1 }); // $ExpectType string
-boxen('unicorn', { padding: { top: 1 } }); // $ExpectType string
-boxen('unicorn', { padding: { right: 1 } }); // $ExpectType string
-boxen('unicorn', { padding: { bottom: 1 } }); // $ExpectType string
-boxen('unicorn', { padding: { left: 1 } }); // $ExpectType string
-boxen('unicorn', { margin: 1 }); // $ExpectType string
-boxen('unicorn', { margin: { top: 1 } }); // $ExpectType string
-boxen('unicorn', { margin: { right: 1 } }); // $ExpectType string
-boxen('unicorn', { margin: { bottom: 1 } }); // $ExpectType string
-boxen('unicorn', { margin: { left: 1 } }); // $ExpectType string
-boxen('unicorn', { float: 'right' }); // $ExpectType string
-boxen('unicorn', { float: 'center' }); // $ExpectType string
-boxen('unicorn', { float: 'left' }); // $ExpectType string
-boxen('unicorn', { float: 'foo' }); // $ExpectError
-boxen('unicorn', { backgroundColor: 'white' }); // $ExpectType string
-boxen('unicorn', { align: 'left' }); // $ExpectType string
-boxen('unicorn', { align: 'center' }); // $ExpectType string
-boxen('unicorn', { align: 'right' }); // $ExpectType string
-boxen('unicorn', { align: 'foo' }); // $ExpectError
diff --git a/types/boxen/index.d.ts b/types/boxen/index.d.ts
deleted file mode 100644
index 94b68bb5c7..0000000000
--- a/types/boxen/index.d.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// Type definitions for boxen 2.1
-// Project: https://github.com/sindresorhus/boxen#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-import { BoxDefinition, BoxNames } from 'cli-boxes';
-
-export = boxen;
-
-/**
- * Create boxes in the terminal
- * @param input Text inside the box.
- */
-declare function boxen(input: string, options?: boxen.Options): string;
-
-declare namespace boxen {
-    interface Options {
-        /**
-         * Color of the box border.
-         * Values: `black` `red` `green` `yellow` `blue` `magenta` `cyan` `white` `gray` or a hex value like `#ff0000`
-         */
-        borderColor?: string;
-
-        /**
-         * Style of the box border.
-         * Can be any of the above predefined styles or an object.
-         *
-         * Predefined values:
-         * - `single`
-         * ```
-         * ┌───┐
-         * │foo│
-         * └───┘
-         * ```
-         * - `double`
-         * ```
-         * ╔═══╗
-         * ║foo║
-         * ╚═══╝
-         * ```
-         * - `round` (`single` sides with round corners)
-         * ```
-         * ╭───╮
-         * │foo│
-         * ╰───╯
-         * ```
-         * - `single-double` (`single` on top and bottom, `double` on right and left)
-         * ```
-         * ╓───╖
-         * ║foo║
-         * ╙───╜
-         * ```
-         * - `double-single` (`double` on top and bottom, `single` on right and left)
-         * ```
-         * ╒═══╕
-         * │foo│
-         * ╘═══╛
-         * ```
-         * - `classic`
-         * ```
-         * +---+
-         * |foo|
-         * +---+
-         * ```
-         */
-        borderStyle?: BoxNames | BoxDefinition;
-
-        /**
-         * Reduce opacity of the border.
-         * @default false
-         */
-        dimBorder?: boolean;
-
-        /**
-         * Space between the text and box border.
-         * When a number is specified, the left/right padding is 3 times the top/bottom to make it look nice.
-         * @default 0
-         */
-        padding?: number | PositionOptions;
-
-        /**
-         * Space around the box.
-         * When a number is specified, the left/right margin is 3 times the top/bottom to make it look nice.
-         * @default 0
-         */
-        margin?: number | PositionOptions;
-
-        /**
-         * Float the box on the available terminal screen space.
-         * @default 'left'
-         */
-        float?: 'right' | 'center' | 'left';
-
-        /**
-         * Color of the background.
-         * Values: `black` `red` `green` `yellow` `blue` `magenta` `cyan` `white` `gray` or a hex value like `#ff0000`
-         */
-        backgroundColor?: string;
-
-        /**
-         * Align the text in the box based on the widest line.
-         * @default 'left'
-         */
-        align?: 'left' | 'center' | 'right';
-    }
-
-    interface PositionOptions {
-        top?: number;
-        right?: number;
-        bottom?: number;
-        left?: number;
-    }
-}
diff --git a/types/boxen/tsconfig.json b/types/boxen/tsconfig.json
deleted file mode 100644
index 6d34147e83..0000000000
--- a/types/boxen/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "boxen-tests.ts"
-    ]
-}
diff --git a/types/boxen/tslint.json b/types/boxen/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/boxen/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/cacheable-request/cacheable-request-tests.ts b/types/cacheable-request/cacheable-request-tests.ts
index 95458c14b7..f6964c8ec8 100644
--- a/types/cacheable-request/cacheable-request-tests.ts
+++ b/types/cacheable-request/cacheable-request-tests.ts
@@ -1,7 +1,6 @@
 import * as http from 'http';
 import * as https from 'https';
 import CacheableRequest = require('cacheable-request');
-import QuickLRU = require('quick-lru');
 
 // You can do
 let cacheableRequest = new CacheableRequest(http.request);
@@ -14,7 +13,6 @@ cacheableRequest = new CacheableRequest(https.request);
 
 cacheableRequest = new CacheableRequest(http.request, 'redis://user:pass@localhost:6379');
 cacheableRequest = new CacheableRequest(http.request, new Map());
-cacheableRequest = new CacheableRequest(http.request, new QuickLRU({ maxSize: 1000 }));
 
 cacheableRequest('example.com', res => {
     res; // $ExpectType ServerResponse | ResponseLike
diff --git a/types/copy-text-to-clipboard/copy-text-to-clipboard-tests.ts b/types/copy-text-to-clipboard/copy-text-to-clipboard-tests.ts
deleted file mode 100644
index 4a1e63b28c..0000000000
--- a/types/copy-text-to-clipboard/copy-text-to-clipboard-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import copy = require('copy-text-to-clipboard');
-
-const button: HTMLButtonElement | null = <HTMLButtonElement> document.getElementById('my-button');
-if (button) {
-    button.addEventListener('click', () => {
-        copy('🦄🌈');
-    });
-}
diff --git a/types/copy-text-to-clipboard/index.d.ts b/types/copy-text-to-clipboard/index.d.ts
deleted file mode 100644
index 56493778d0..0000000000
--- a/types/copy-text-to-clipboard/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for copy-text-to-clipboard 1.0
-// Project: https://github.com/sindresorhus/copy-text-to-clipboard#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = copy;
-
-declare function copy(text: string): boolean;
diff --git a/types/copy-text-to-clipboard/tsconfig.json b/types/copy-text-to-clipboard/tsconfig.json
deleted file mode 100644
index 2889d9fdc6..0000000000
--- a/types/copy-text-to-clipboard/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "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",
-        "copy-text-to-clipboard-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/copy-text-to-clipboard/tslint.json b/types/copy-text-to-clipboard/tslint.json
deleted file mode 100644
index 1c36270d47..0000000000
--- a/types/copy-text-to-clipboard/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-angle-bracket-type-assertion": false
-    }
-}
diff --git a/types/cp-file/cp-file-tests.ts b/types/cp-file/cp-file-tests.ts
deleted file mode 100644
index 173a650e8f..0000000000
--- a/types/cp-file/cp-file-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import cpFile = require('cp-file');
-
-cpFile('src/unicorn.png', 'dist/unicorn.png').then(() => {});
-cpFile('src/unicorn.png', 'dist/unicorn.png', {overwrite: false}).then(() => {});
-cpFile('src/unicorn.png', 'dist/unicorn.png')
-    .on('progress', data => {
-        let str: string;
-        let num: number;
-
-        str = data.src;
-        str = data.dest;
-        num = data.size;
-        num = data.written;
-        num = data.percent;
-    })
-    .then(() => {});
-
-cpFile.sync('src/unicorn.png', 'dist/unicorn.png');
-cpFile.sync('src/unicorn.png', 'dist/unicorn.png', {overwrite: false});
diff --git a/types/cp-file/index.d.ts b/types/cp-file/index.d.ts
deleted file mode 100644
index d0966f4c85..0000000000
--- a/types/cp-file/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for cp-file 4.2
-// Project: https://github.com/sindresorhus/cp-file#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = cpFile;
-
-declare function cpFile(source: string, destination: string, options?: cpFile.Options): Promise<void> & cpFile.ProgressEmitter;
-
-declare namespace cpFile {
-    function sync(source: string, destination: string, options?: Options): void;
-
-    interface ProgressEmitter {
-        on(event: 'progress', handler: (data: ProgressData) => void): Promise<void>;
-    }
-
-    interface Options {
-        overwrite?: boolean;
-    }
-
-    interface ProgressData {
-        src: string;
-        dest: string;
-        size: number;
-        written: number;
-        percent: number;
-    }
-}
diff --git a/types/cp-file/tsconfig.json b/types/cp-file/tsconfig.json
deleted file mode 100644
index 12138d0002..0000000000
--- a/types/cp-file/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cp-file-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cp-file/tslint.json b/types/cp-file/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/cp-file/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/cpy/cpy-tests.ts b/types/cpy/cpy-tests.ts
deleted file mode 100644
index 1800ab35bf..0000000000
--- a/types/cpy/cpy-tests.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import cpy = require('cpy');
-
-cpy(['src/*.png', '!src/goat.png'], 'dist').then(() => {});
-cpy('foo.js', 'destination', {
-    rename: basename => `prefix-${basename}`,
-    cwd: '/',
-    parents: true,
-    stat: true,
-    overwrite: false,
-});
-cpy('foo.js', 'destination')
-    .on('progress', progress => {
-        let num: number;
-        num = progress.completedFiles;
-        num = progress.totalFiles;
-        num = progress.completedSize;
-    })
-    .then(() => {});
diff --git a/types/cpy/index.d.ts b/types/cpy/index.d.ts
deleted file mode 100644
index b6ca781137..0000000000
--- a/types/cpy/index.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-// Type definitions for cpy 5.1
-// Project: https://github.com/sindresorhus/cpy#readme
-// Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import glob = require('glob');
-import cpFile = require('cp-file');
-
-export = cpy;
-declare function cpy(files: string | string[], destination: string, opts?: cpy.Options): Promise<void> & cpy.ProgressEmitter;
-
-declare namespace cpy {
-    interface ProgressEmitter {
-        on(event: 'progress', handler: (progress: ProgressData) => void): Promise<void>;
-    }
-
-    type Options = CpyOptions & glob.IOptions & cpFile.Options;
-
-    interface CpyOptions {
-        cwd?: string;
-        parents?: boolean;
-        rename?: string | ((basename: string) => string);
-    }
-
-    interface ProgressData {
-        completedFiles: number;
-        totalFiles: number;
-        completedSize: number;
-    }
-}
diff --git a/types/cpy/tsconfig.json b/types/cpy/tsconfig.json
deleted file mode 100644
index 90098461b2..0000000000
--- a/types/cpy/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "cpy-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/cpy/tslint.json b/types/cpy/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/cpy/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/decamelize/decamelize-tests.ts b/types/decamelize/decamelize-tests.ts
deleted file mode 100644
index 836c67e64c..0000000000
--- a/types/decamelize/decamelize-tests.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import decamelize = require('decamelize');
-
-decamelize('unicornRainbow');
-decamelize('unicornRainbow', '-');
diff --git a/types/decamelize/index.d.ts b/types/decamelize/index.d.ts
deleted file mode 100644
index e159cd43bb..0000000000
--- a/types/decamelize/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for decamelize 1.2
-// Project: https://github.com/sindresorhus/decamelize
-// Definitions by: Sam Verschueren <https://github.com/samverschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = decamelize;
-
-declare function decamelize(input: string, separator?: string): string;
-declare namespace decamelize {}
diff --git a/types/decamelize/tsconfig.json b/types/decamelize/tsconfig.json
deleted file mode 100644
index 54bea1b020..0000000000
--- a/types/decamelize/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "decamelize-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/decamelize/tslint.json b/types/decamelize/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/decamelize/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/file-type/file-type-tests.ts b/types/file-type/file-type-tests.ts
deleted file mode 100644
index d49a964829..0000000000
--- a/types/file-type/file-type-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import fileType = require("file-type");
-
-// $ExpectType FileTypeResult | null
-fileType(new Buffer([0xFF, 0xD8, 0xFF]));
-fileType(new Uint8Array([0xFF, 0xD8, 0xFF]));
-
-// $ExpectType number
-fileType.minimumBytes;
diff --git a/types/file-type/index.d.ts b/types/file-type/index.d.ts
deleted file mode 100644
index c902dc384e..0000000000
--- a/types/file-type/index.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Type definitions for file-type 10.6
-// Project: https://github.com/sindresorhus/file-type
-// Definitions by: KIM Jaesuck a.k.a. gim tcaesvk <https://github.com/tcaesvk>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-export = FileType;
-
-/**
- * The file type is detected by checking the
- * [magic number](http://en.wikipedia.org/wiki/Magic_number_(programming)#Magic_numbers_in_files) of the buffer.
- *
- * @param buf It only needs the first `.minimumBytes` bytes. The exception is detection of
- *            `docx`, `pptx`, and `xlsx` which potentially requires reading the whole file.
- * @returns an Object with:
- * - ext - One of the [supported file types](https://github.com/sindresorhus/file-type/blob/master/readme.md#supported-file-types)
- * - mime - The [MIME type](http://en.wikipedia.org/wiki/Internet_media_type)
- */
-declare function FileType(buf: Buffer | Uint8Array): FileType.FileTypeResult | null;
-
-declare namespace FileType {
-    interface FileTypeResult {
-        ext: string;
-        mime: string;
-    }
-
-    /**
-     * The minimum amount of bytes needed to detect a file type. Currently,
-     * it's 4100 bytes, but it can change, so don't hard-code it.
-     */
-    const minimumBytes: number;
-}
diff --git a/types/file-type/tsconfig.json b/types/file-type/tsconfig.json
deleted file mode 100644
index 1894b908af..0000000000
--- a/types/file-type/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "file-type-tests.ts"
-    ]
-}
diff --git a/types/file-type/tslint.json b/types/file-type/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/file-type/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index afaac89ba4..467211a87d 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -6,7 +6,6 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';
 import * as url from 'url';
-import QuickLRU = require('quick-lru');
 import tough = require('tough-cookie');
 
 let str: string;
@@ -252,10 +251,6 @@ got('todomvc', {
     cache: new Keyv(),
 }).then(res => res.fromCache);
 
-got('todomvc', {
-    cache: new QuickLRU({maxSize: 10}),
-}).then(res => res.fromCache);
-
 got(new url.URL('http://todomvc.com'));
 
 got(url.parse('http://todomvc.com'));
diff --git a/types/got/v8/got-tests.ts b/types/got/v8/got-tests.ts
index 5e115e96ac..04204d38a9 100644
--- a/types/got/v8/got-tests.ts
+++ b/types/got/v8/got-tests.ts
@@ -6,7 +6,6 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';
 import * as url from 'url';
-import QuickLRU = require('quick-lru');
 
 let str: string;
 let buf: Buffer;
@@ -251,10 +250,6 @@ got('todomvc', {
     cache: new Keyv(),
 }).then(res => res.fromCache);
 
-got('todomvc', {
-    cache: new QuickLRU({maxSize: 10}),
-}).then(res => res.fromCache);
-
 got(new url.URL('http://todomvc.com'));
 
 got(url.parse('http://todomvc.com'));
diff --git a/types/humanize-string/humanize-string-tests.ts b/types/humanize-string/humanize-string-tests.ts
deleted file mode 100644
index 851746f088..0000000000
--- a/types/humanize-string/humanize-string-tests.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import humanizeString = require('humanize-string');
-
-humanizeString('UnicornsAndRainbows');
-humanizeString('unicorns_and-Rainbows_andPonies  ');
diff --git a/types/humanize-string/index.d.ts b/types/humanize-string/index.d.ts
deleted file mode 100644
index ba8bc4e867..0000000000
--- a/types/humanize-string/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for humanize-string 1.0
-// Project: https://github.com/sindresorhus/humanize-string/
-// Definitions by: Kevin Nacios <https://github.com/ragnarok56>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function humanizeString(text: string): string;
-
-export = humanizeString;
diff --git a/types/humanize-string/tsconfig.json b/types/humanize-string/tsconfig.json
deleted file mode 100644
index 715a620e55..0000000000
--- a/types/humanize-string/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "humanize-string-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/humanize-string/tslint.json b/types/humanize-string/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/humanize-string/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/image-type/image-type-tests.ts b/types/image-type/image-type-tests.ts
deleted file mode 100644
index ea9951d6f2..0000000000
--- a/types/image-type/image-type-tests.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import imageType = require('file-type');
-
-imageType(new Buffer([0xFF, 0xD8, 0xFF]));
-imageType(new Uint8Array([0xFF, 0xD8, 0xFF]));
diff --git a/types/image-type/index.d.ts b/types/image-type/index.d.ts
deleted file mode 100644
index 2c5abcfd87..0000000000
--- a/types/image-type/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for image-type 3.0
-// Project: https://github.com/sindresorhus/image-type#readme
-// Definitions by: Florian Keller <https://github.com/ffflorian>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-import FileType = require('file-type');
-
-declare function ImageType(buf: Buffer | Uint8Array): FileType.FileTypeResult | null;
-
-export = ImageType;
diff --git a/types/image-type/tsconfig.json b/types/image-type/tsconfig.json
deleted file mode 100644
index 2c7c57ebba..0000000000
--- a/types/image-type/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "image-type-tests.ts"
-    ]
-}
diff --git a/types/image-type/tslint.json b/types/image-type/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/image-type/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/is-svg/index.d.ts b/types/is-svg/index.d.ts
deleted file mode 100644
index 54ebb84457..0000000000
--- a/types/is-svg/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for is-svg 3.0
-// Project: https://github.com/sindresorhus/is-svg#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-declare function isSvg(input?: string | Buffer | false | null): boolean;
-
-// So that `import * as X` is possible
-declare namespace isSvg {}
-
-export = isSvg;
diff --git a/types/is-svg/is-svg-tests.ts b/types/is-svg/is-svg-tests.ts
deleted file mode 100644
index 73ba29062c..0000000000
--- a/types/is-svg/is-svg-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as isSvg from 'is-svg';
-
-const data = '<svg></svg>';
-let result = false;
-
-result = isSvg(data);
-result = isSvg(Buffer.from(data));
-result = isSvg(false);
-result = isSvg(null);
-result = isSvg(undefined);
-result = isSvg();
diff --git a/types/is-svg/tsconfig.json b/types/is-svg/tsconfig.json
deleted file mode 100644
index 2621a88907..0000000000
--- a/types/is-svg/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "is-svg-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/is-svg/tslint.json b/types/is-svg/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/is-svg/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/keyv/keyv-tests.ts b/types/keyv/keyv-tests.ts
index d8b0ccd910..0ab7236f80 100644
--- a/types/keyv/keyv-tests.ts
+++ b/types/keyv/keyv-tests.ts
@@ -1,5 +1,4 @@
 import Keyv = require('keyv');
-import QuickLRU = require('quick-lru');
 
 new Keyv({
     uri: 'redis://user:pass@localhost:6379',
@@ -21,10 +20,6 @@ new Keyv<boolean>({ deserialize: JSON.parse });
 
 new Keyv<boolean>({ store: new Map() });
 
-const lru = new QuickLRU<string, boolean>({ maxSize: 1000 });
-const opts: Keyv.Options<boolean> = { store: lru };
-new Keyv(opts);
-
 new Keyv('mongodb://user:pass@localhost:27017/dbname', { namespace: 'mongodb' });
 new Keyv('redis://user:pass@localhost:6379');
 new Keyv('sqlite://path/to/database.sqlite');
diff --git a/types/npm-name/index.d.ts b/types/npm-name/index.d.ts
deleted file mode 100644
index e4830f377e..0000000000
--- a/types/npm-name/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for npm-name 5.0
-// Project: https://github.com/sindresorhus/npm-name#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = npmName;
-
-declare function npmName(name: string): Promise<boolean>;
-
-declare namespace npmName {
-    function many<T extends string>(names: T[]): Promise<Map<T, boolean>>;
-}
diff --git a/types/npm-name/npm-name-tests.ts b/types/npm-name/npm-name-tests.ts
deleted file mode 100644
index cb8283699c..0000000000
--- a/types/npm-name/npm-name-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import npmName = require('npm-name');
-
-// $ExpectType Promise<boolean>
-npmName('chalk');
-
-npmName.many(['chalk', '@sindresorhus/is', 'abc123']).then(result => {
-    // $ExpectType Map<"chalk" | "@sindresorhus/is" | "abc123", boolean>
-    result;
-
-    // $ExpectType boolean | undefined
-    result.get('chalk');
-});
diff --git a/types/npm-name/tsconfig.json b/types/npm-name/tsconfig.json
deleted file mode 100644
index c60a7df652..0000000000
--- a/types/npm-name/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "npm-name-tests.ts"
-    ]
-}
diff --git a/types/npm-name/tslint.json b/types/npm-name/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/npm-name/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/npm-run-path/index.d.ts b/types/npm-run-path/index.d.ts
deleted file mode 100644
index 6a052e0450..0000000000
--- a/types/npm-run-path/index.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for npm-run-path 2.0
-// Project: https://github.com/sindresorhus/npm-run-path#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = npmRunPath;
-
-/**
- * Get your [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) prepended with locally installed binaries.
- */
-declare function npmRunPath(options?: npmRunPath.Options): string;
-
-declare namespace npmRunPath {
-    function env(options?: EnvOptions): ProcessEnv;
-
-    interface Options {
-        /**
-         * Working directory.
-         */
-        cwd?: string;
-        /**
-         * PATH to be appended.
-         * Set it to an empty string to exclude the default [PATH](https://github.com/sindresorhus/path-key).
-         * @default PATH
-         */
-        path?: string;
-    }
-
-    interface EnvOptions {
-        /**
-         * Working directory.
-         */
-        cwd?: string;
-        /**
-         * Accepts an object of environment variables, like `process.env`, and modifies the PATH using the correct
-         * [PATH key](https://github.com/sindresorhus/path-key). Use this if you're modifying the PATH for use
-         * in the `child_process` options.
-         */
-        env?: ProcessEnv;
-    }
-
-    interface ProcessEnv {
-        [key: string]: string | undefined;
-    }
-}
diff --git a/types/npm-run-path/npm-run-path-tests.ts b/types/npm-run-path/npm-run-path-tests.ts
deleted file mode 100644
index 4cff236373..0000000000
--- a/types/npm-run-path/npm-run-path-tests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/// <reference types="node" />
-
-import childProcess = require('child_process');
-import npmRunPath = require('npm-run-path');
-
-npmRunPath(); // $ExpectType string
-npmRunPath({ cwd: '/foo' }); // $ExpectType string
-npmRunPath({ path: '/usr/local/bin' }); // $ExpectType string
-
-npmRunPath.env(); // $ExpectType ProcessEnv
-npmRunPath.env({ cwd: '/foo' }); // $ExpectType ProcessEnv
-npmRunPath.env({ env: process.env }); // $ExpectType ProcessEnv
-
-childProcess.execFileSync('foo', {
-    env: npmRunPath.env(),
-});
diff --git a/types/npm-run-path/tsconfig.json b/types/npm-run-path/tsconfig.json
deleted file mode 100644
index d6738a23ca..0000000000
--- a/types/npm-run-path/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "npm-run-path-tests.ts"
-    ]
-}
diff --git a/types/npm-run-path/tslint.json b/types/npm-run-path/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/npm-run-path/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-some/index.d.ts b/types/p-some/index.d.ts
deleted file mode 100644
index e22fd8d7ea..0000000000
--- a/types/p-some/index.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for p-some 2.0
-// Project: https://github.com/sindresorhus/p-some#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import AggregateErrorModule = require('aggregate-error');
-
-export = pSome;
-
-declare function pSome<T>(values: Array<Value<T>> | Iterable<Value<T>>, options: pSome.Options<T>): Promise<T[]>;
-
-type Value<T> = T | PromiseLike<T>;
-
-declare namespace pSome {
-    interface Options<T> {
-        count: number;
-        filter?(value: T): boolean;
-    }
-
-    const AggregateError: typeof AggregateErrorModule;
-}
diff --git a/types/p-some/p-some-tests.ts b/types/p-some/p-some-tests.ts
deleted file mode 100644
index d3ea9aa3b0..0000000000
--- a/types/p-some/p-some-tests.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import got = require('got');
-import pSome = require('p-some');
-
-pSome([
-    got.head('github.com').then(() => 'github'),
-    got.head('google.com').then(() => 'google'),
-    got.head('twitter.com').then(() => 'twitter'),
-    got.head('medium.com').then(() => 'medium')
-], {count: 2}).then(([first, second]) => {
-    console.log(first, second);
-});
-
-pSome<string | number>([
-    got.head('github.com').then(() => 1),
-    got.head('google.com').then(() => 'google'),
-], {count: 2}).then(([first, second]) => {
-    const str: string | number = first;
-});
-
-pSome(new Set([
-    got.head('github.com').then(() => 'github'),
-    got.head('google.com').then(() => 'google'),
-    got.head('twitter.com').then(() => 'twitter'),
-    got.head('medium.com').then(() => 'medium')
-]), {
-    count: 3,
-    filter(str: string) {
-        return false;
-    }
-}).then(first => {
-    const str: string[] = first;
-});
-
-throw new pSome.AggregateError([]);
diff --git a/types/p-some/tsconfig.json b/types/p-some/tsconfig.json
deleted file mode 100644
index d8bca7e13a..0000000000
--- a/types/p-some/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-some-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-some/tslint.json b/types/p-some/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-some/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/path-key/index.d.ts b/types/path-key/index.d.ts
deleted file mode 100644
index e93e334248..0000000000
--- a/types/path-key/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for path-key 2.0
-// Project: https://github.com/sindresorhus/path-key#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-export = pathKey;
-
-declare function pathKey(options?: pathKey.Options): string;
-
-declare namespace pathKey {
-    interface Options {
-        env?: { [key: string]: any };
-        platform?: NodeJS.Platform;
-    }
-}
diff --git a/types/path-key/path-key-tests.ts b/types/path-key/path-key-tests.ts
deleted file mode 100644
index 820a8431de..0000000000
--- a/types/path-key/path-key-tests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import pathKey = require('path-key');
-
-pathKey(); // $ExpectType string
-pathKey({ env: {} }); // $ExpectType string
-pathKey({ platform: 'win32' }); // $ExpectType string
diff --git a/types/path-key/tsconfig.json b/types/path-key/tsconfig.json
deleted file mode 100644
index 3e1f0bf50f..0000000000
--- a/types/path-key/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "path-key-tests.ts"
-    ]
-}
diff --git a/types/path-key/tslint.json b/types/path-key/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/path-key/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/ps-list/index.d.ts b/types/ps-list/index.d.ts
deleted file mode 100644
index 2ace498667..0000000000
--- a/types/ps-list/index.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Type definitions for ps-list 6.0
-// Project: https://github.com/sindresorhus/ps-list#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-export = psList;
-
-declare function psList(options?: psList.Options): Promise<psList.ProcessDescriptor[]>;
-
-declare namespace psList {
-    interface Options {
-        all?: boolean;
-    }
-
-    interface ProcessDescriptor {
-        pid: number;
-        name: string;
-        ppid: number;
-        cmd?: string;
-        cpu?: number;
-        memory?: number;
-    }
-}
diff --git a/types/ps-list/ps-list-tests.ts b/types/ps-list/ps-list-tests.ts
deleted file mode 100644
index 17ecffe4ff..0000000000
--- a/types/ps-list/ps-list-tests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import psList = require('ps-list');
-
-(async () => {
-    const processes: psList.ProcessDescriptor[] = await psList();
-    psList({ all: false });
-
-    processes[0].pid; // $ExpectType number
-    processes[0].name; // $ExpectType string
-    processes[0].ppid; // $ExpectType number
-    processes[0].cmd; // $ExpectType string | undefined
-    processes[0].cpu; // $ExpectType number | undefined
-    processes[0].memory; // $ExpectType number | undefined
-})();
diff --git a/types/ps-list/tsconfig.json b/types/ps-list/tsconfig.json
deleted file mode 100644
index 4138547b6c..0000000000
--- a/types/ps-list/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "ps-list-tests.ts"
-    ]
-}
diff --git a/types/ps-list/tslint.json b/types/ps-list/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/ps-list/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/quick-lru/index.d.ts b/types/quick-lru/index.d.ts
deleted file mode 100644
index 65e15c60a4..0000000000
--- a/types/quick-lru/index.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for quick-lru 2.0
-// Project: https://github.com/sindresorhus/quick-lru#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = QuickLRU;
-
-declare class QuickLRU<K, V> implements Iterable<[K, V]> {
-    readonly size: number;
-    constructor(options: QuickLRU.Options);
-    [Symbol.iterator](): Iterator<[K, V]>;
-    set(key: K, value: V): this;
-    get(key: K): V | undefined;
-    has(key: K): boolean;
-    peek(key: K): V | undefined;
-    delete(key: K): boolean;
-    clear(): void;
-    keys(): Iterable<K>;
-    values(): Iterable<V>;
-}
-
-declare namespace QuickLRU {
-    interface Options {
-        maxSize: number;
-    }
-}
diff --git a/types/quick-lru/quick-lru-tests.ts b/types/quick-lru/quick-lru-tests.ts
deleted file mode 100644
index 5a3c5fb8f8..0000000000
--- a/types/quick-lru/quick-lru-tests.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import QuickLRU = require('quick-lru');
-
-const lru = new QuickLRU<string, number>({ maxSize: 1000 });
-new QuickLRU<string, number>(); // $ExpectError
-
-lru.set('🦄', 1).set('🌈', 2); // $ExpectType QuickLRU<string, number>
-lru.get('🦄'); // $ExpectType number | undefined
-lru.has('🦄'); // $ExpectType boolean
-lru.peek('🦄'); // $ExpectType number | undefined
-lru.delete('🦄'); // $ExpectType boolean
-lru.clear(); // $ExpectType void
-lru.size; // $ExpectType number
-
-for (const [key, value] of lru) {
-    key; // $ExpectType string
-    value; // $ExpectType number
-}
-
-for (const key of lru.keys()) {
-    key; // $ExpectType string
-}
-
-for (const value of lru.values()) {
-    value; // $ExpectType number
-}
diff --git a/types/quick-lru/tsconfig.json b/types/quick-lru/tsconfig.json
deleted file mode 100644
index 788f560163..0000000000
--- a/types/quick-lru/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2015",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "quick-lru-tests.ts"
-    ]
-}
diff --git a/types/quick-lru/tslint.json b/types/quick-lru/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/quick-lru/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/quick-lru/v1/index.d.ts b/types/quick-lru/v1/index.d.ts
deleted file mode 100644
index 7ce12e397c..0000000000
--- a/types/quick-lru/v1/index.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// Type definitions for quick-lru 1.1
-// Project: https://github.com/sindresorhus/quick-lru#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = QuickLRU;
-
-declare class QuickLRU<K, V> implements Iterable<[K, V]> {
-    readonly size: number;
-    constructor(options?: QuickLRU.Options);
-    [Symbol.iterator](): Iterator<[K, V]>;
-    set(key: K, value: V): this;
-    get(key: K): V | undefined;
-    has(key: K): boolean;
-    peek(key: K): V | undefined;
-    delete(key: K): void;
-    clear(): void;
-    keys(): Iterable<K>;
-    values(): Iterable<V>;
-}
-
-declare namespace QuickLRU {
-    interface Options {
-        maxSize: number;
-    }
-}
diff --git a/types/quick-lru/v1/quick-lru-tests.ts b/types/quick-lru/v1/quick-lru-tests.ts
deleted file mode 100644
index 140e25bcd8..0000000000
--- a/types/quick-lru/v1/quick-lru-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import QuickLRU = require('quick-lru');
-
-let num: number;
-let numu: number | undefined;
-let str: string;
-let bool: boolean;
-
-const lru = new QuickLRU<string, number>({maxSize: 1000});
-
-lru.set('🦄', 1).set('🌈', 2);
-numu = lru.get('🦄');
-bool = lru.has('🦄');
-numu = lru.peek('🦄');
-lru.delete('🦄');
-lru.clear();
-num = lru.size;
-
-for (const [key, value] of lru) {
-    str = key;
-    num = value;
-}
-
-for (const key of lru.keys()) {
-    str = key;
-}
-
-for (const value of lru.values()) {
-    num = value;
-}
diff --git a/types/quick-lru/v1/tsconfig.json b/types/quick-lru/v1/tsconfig.json
deleted file mode 100644
index ae4a2956c7..0000000000
--- a/types/quick-lru/v1/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es2015",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "quick-lru": [
-                "quick-lru/v1"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "quick-lru-tests.ts"
-    ]
-}
diff --git a/types/quick-lru/v1/tslint.json b/types/quick-lru/v1/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/quick-lru/v1/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/read-chunk/index.d.ts b/types/read-chunk/index.d.ts
deleted file mode 100644
index d11a7a334b..0000000000
--- a/types/read-chunk/index.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Type definitions for read-chunk v2.1.0
-// Project: https://github.com/sindresorhus/read-chunk
-// Definitions by: crispybee <https://github.com/crispybee>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-export = ReadChunk;
-
-    /**
-     * Asynchronous: Reads a chunk from a file. Returns a Promise<Buffer>.
-     * @param {string} filePath The path to the file.
-     * @param {number} startingPosition Position to start reading.
-     * @param {number} length Number of bytes to read.
-     * @return {Promise<Buffer>} Returns a Promise<Buffer>.
-     */
-declare function ReadChunk(filePath: string, startingPosition: number, length: number): Promise<Buffer>;
-
-declare namespace ReadChunk {
-    /**
-     * Synchronous: Reads a chunk from a file. Returns a Buffer.
-     * @param {string} filePath The path to the file.
-     * @param {number} startingPosition Position to start reading.
-     * @param {number} length Number of bytes to read.
-     * @return {Buffer} Returns a Buffer.
-     */
-    function sync(filePath: string, startingPosition: number, length: number): Buffer;
-}
-
diff --git a/types/read-chunk/read-chunk-tests.ts b/types/read-chunk/read-chunk-tests.ts
deleted file mode 100644
index 187d1a02b1..0000000000
--- a/types/read-chunk/read-chunk-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import readChunk = require('read-chunk');
-
-let chunk: Buffer = readChunk.sync('foo.txt', 1, 3);
-
-readChunk('foo.txt', 1, 3).then(value => {
-    console.log(value);
-}).catch(error => {
-    console.log(error);
-});
diff --git a/types/read-chunk/tsconfig.json b/types/read-chunk/tsconfig.json
deleted file mode 100644
index 041ee0f648..0000000000
--- a/types/read-chunk/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "read-chunk-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/read-chunk/tslint.json b/types/read-chunk/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/read-chunk/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/types/sindresorhus__slugify/index.d.ts b/types/sindresorhus__slugify/index.d.ts
deleted file mode 100644
index e3cecc77f2..0000000000
--- a/types/sindresorhus__slugify/index.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Type definitions for @sindresorhus/slugify 0.6
-// Project: https://github.com/sindresorhus/slugify
-// Definitions by: Carlos Precioso <https://github.com/cprecioso>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace slugify {
-    interface Options {
-        /**
-         * @default "-"
-         */
-        separator?: string;
-
-        /**
-         * Make the slug lowercase.
-         * @default true
-         */
-        lowercase?: boolean;
-
-        /**
-         * Convert camelcase to separate words. Internally it does `fooBar` → `foo bar`.
-         * @default true
-         */
-        decamelize?: boolean;
-
-        /**
-         * Specifying this only replaces the default if you set an item with the same key, like &.
-         * The replacements are run on the original string before any other transformations.
-         *
-         * Add a leading and trailing space to the replacement to have it separated by dashes.
-         *
-         * @default [ ['&', ' and '], ['🦄', ' unicorn '], ['♥', ' love '] ]
-         */
-        customReplacements?: ReadonlyArray<[string, string]>;
-    }
-}
-
-/**
- * Slugify a string
- */
-declare function slugify(input: string, options?: slugify.Options): string;
-
-export = slugify;
diff --git a/types/sindresorhus__slugify/sindresorhus__slugify-tests.ts b/types/sindresorhus__slugify/sindresorhus__slugify-tests.ts
deleted file mode 100644
index 50a45a2ba0..0000000000
--- a/types/sindresorhus__slugify/sindresorhus__slugify-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import slugify = require("@sindresorhus/slugify");
-
-slugify("I ♥ Dogs");
-
-slugify("  Déjà Vu!  ");
-
-slugify("fooBar 123 $#%");
-
-slugify("I ♥ 🦄 & 🐶", { customReplacements: [["🐶", "dog"]] });
-
-slugify("BAR and baz");
-
-slugify("BAR and baz", { separator: "_" });
-
-slugify("Déjà Vu!");
-
-slugify("Déjà Vu!", { lowercase: false });
-
-slugify("fooBar");
-
-slugify("fooBar", { decamelize: false });
-
-slugify("Foo@unicorn", {
-    customReplacements: [["@", "at"]]
-});
-
-slugify("foo@unicorn", {
-    customReplacements: [["@", " at "]]
-});
diff --git a/types/sindresorhus__slugify/tsconfig.json b/types/sindresorhus__slugify/tsconfig.json
deleted file mode 100644
index 24230965e5..0000000000
--- a/types/sindresorhus__slugify/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": ["es6"],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": ["../"],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "paths": {
-            "@sindresorhus/slugify": ["sindresorhus__slugify"]
-        }
-    },
-    "files": ["index.d.ts", "sindresorhus__slugify-tests.ts"]
-}
diff --git a/types/sindresorhus__slugify/tslint.json b/types/sindresorhus__slugify/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/sindresorhus__slugify/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/time-span/index.d.ts b/types/time-span/index.d.ts
deleted file mode 100644
index 327c3fd189..0000000000
--- a/types/time-span/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for time-span 2.0
-// Project: https://github.com/sindresorhus/time-span#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-//                 Mike Dvorscak <https://github.com/mdvorscak>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace timeSpan {
-    interface TimeSpanObject {
-        (): number;
-        rounded(): number;
-        sec(): number;
-        nano(): number;
-    }
-}
-
-declare function timeSpan(): timeSpan.TimeSpanObject;
-
-export = timeSpan;
diff --git a/types/time-span/time-span-tests.ts b/types/time-span/time-span-tests.ts
deleted file mode 100644
index de5e8dfc53..0000000000
--- a/types/time-span/time-span-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import timeSpan = require('time-span');
-
-const end = timeSpan();
-
-let endTime: number;
-endTime = end();
-endTime = end.rounded();
-endTime = end.sec();
-endTime = end.nano();
diff --git a/types/time-span/tsconfig.json b/types/time-span/tsconfig.json
deleted file mode 100644
index b17a400526..0000000000
--- a/types/time-span/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "time-span-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/time-span/tslint.json b/types/time-span/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/time-span/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
deleted file mode 100644
index 07852a80fd..0000000000
--- a/types/trash/index.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// Type definitions for trash 4.3
-// Project: https://github.com/sindresorhus/trash#readme
-// Definitions by: Matthew James <https://github.com/matthew-matvei>
-//                 Keiichiro Amemiya <https://github.com/hoishin>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Move files and folders to the trash
- *
- * @param paths Accepts paths and [glob patterns](https://github.com/sindresorhus/globby#globbing-patterns).
- * @param options.glob Enable globbing when matching file paths
- */
-declare function trash(paths: string | string[], options?: trash.Options): Promise<void>;
-
-declare namespace trash {
-    interface Options {
-        glob: boolean;
-    }
-}
-
-export = trash;
diff --git a/types/trash/trash-tests.ts b/types/trash/trash-tests.ts
deleted file mode 100644
index fb040e2c8f..0000000000
--- a/types/trash/trash-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import trash = require('trash');
-
-async function testTrashNoArgsSinglePath() {
-    await trash('/path/to/item1');
-}
-
-async function testTrashNoArgsMultiPath() {
-    await trash(['/path/to/item1', '/path/to/item2']);
-}
-
-async function testTrashWithArgs() {
-    const options: trash.Options = { glob: false };
-    await trash(['/path/to/item1', '/path/to/item2'], options);
-}
-
-function testTrashPerDocumentation() {
-    (async () => {
-        await trash(['*.png', '!rainbow.png']);
-    })();
-}
diff --git a/types/trash/tsconfig.json b/types/trash/tsconfig.json
deleted file mode 100644
index c60478e474..0000000000
--- a/types/trash/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "target": "es2015",
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "trash-tests.ts"
-    ]
-}
diff --git a/types/trash/tslint.json b/types/trash/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/trash/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 087cbdb2f71679a0d2c5b3a57caa257582d7417c Mon Sep 17 00:00:00 2001
From: Kanitkorn Sujautra <lukyth@users.noreply.github.com>
Date: Wed, 13 Mar 2019 02:45:51 +0900
Subject: [PATCH 579/924] [react-beautiful-dnd] Update type for
 react-beautiful-dnd 10.1 (#33791)

Release note: https://github.com/atlassian/react-beautiful-dnd/releases/tag/v10.1.0
---
 types/react-beautiful-dnd/index.d.ts                   |  5 ++++-
 .../react-beautiful-dnd/react-beautiful-dnd-tests.tsx  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index a743ce6f78..926a8f7e9f 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-beautiful-dnd 10.0
+// Type definitions for react-beautiful-dnd 10.1
 // Project: https://github.com/atlassian/react-beautiful-dnd
 // Definitions by: varHarrie <https://github.com/varHarrie>
 //                 Bradley Ayers <https://github.com/bradleyayers>
@@ -6,6 +6,7 @@
 //                 Mark Nelissen <https://github.com/marknelissen>
 //                 Enrico Boccadifuoco <https://github.com/enricoboccadifuoco>
 //                 Taeheon Kim <https://github.com/lonyele>
+//                 Kanitkorn Sujautra <https://github.com/lukyth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -111,6 +112,7 @@ export interface DroppableProvided {
 export interface DroppableStateSnapshot {
     isDraggingOver: boolean;
     draggingOverWith?: DraggableId;
+    draggingFromThisWith?: DraggableId;
 }
 
 export interface DroppableProps {
@@ -205,6 +207,7 @@ export interface DraggableProps {
     disableInteractiveElementBlocking?: boolean;
     children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement;
     type?: TypeId;
+    shouldRespectForceTouch?: boolean;
 }
 
 export class Draggable extends React.Component<DraggableProps> { }
diff --git a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
index ceb6757992..c169d8631a 100644
--- a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
+++ b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { DragDropContext, Draggable, Droppable, DropResult, DragStart, DragUpdate, ResponderProvided } from 'react-beautiful-dnd';
+import { DragDropContext, Draggable, Droppable, DropResult, DragStart, DragUpdate, ResponderProvided, DroppableStateSnapshot } from 'react-beautiful-dnd';
 
 interface Item {
   id: string;
@@ -30,8 +30,8 @@ const getItemStyle = (isDragging: boolean, draggableStyle: any) => ({
   ...draggableStyle
 });
 
-const getListStyle = (isDraggingOver: any) => ({
-  background: isDraggingOver ? 'lightblue' : 'lightgrey',
+const getListStyle = (snapshot: DroppableStateSnapshot) => ({
+  background: snapshot.draggingFromThisWith ? 'lightpink' : snapshot.isDraggingOver ? 'lightblue' : 'lightgrey',
   width: 250
 });
 
@@ -87,9 +87,9 @@ class App extends React.Component<{}, AppState> {
       <DragDropContext onBeforeDragStart={this.onBeforeDragStart} onDragStart={this.onDragStart} onDragUpdate={this.onDragUpdate} onDragEnd={this.onDragEnd}>
         <Droppable droppableId="droppable" ignoreContainerClipping={false} isCombineEnabled={true}>
           {(provided, snapshot) => (
-            <div ref={provided.innerRef} style={getListStyle(snapshot.isDraggingOver)} {...provided.droppableProps}>
+            <div ref={provided.innerRef} style={getListStyle(snapshot)} {...provided.droppableProps}>
               {this.state.items.map((item, index) => (
-                <Draggable key={item.id} draggableId={item.id} index={index}>
+                <Draggable key={item.id} draggableId={item.id} index={index} shouldRespectForceTouch={false}>
                   {(provided, snapshot) => (
                     <div>
                       <div

From b32984c30a9466a354ec87270da6f32e8d8c20ca Mon Sep 17 00:00:00 2001
From: Tyrone Dougherty <tyrone@tyronedougherty.com>
Date: Wed, 13 Mar 2019 04:47:06 +1100
Subject: [PATCH 580/924] Add maxHeadersCount and headersTimeout properties to
 HTTPS module in @types/node (#33764)

* Add maxHeadersCount and headersTimeout properties to the https module within @types/node

* Update typing for Node HTTP/S Server's maxHeadersCount property to include null, and add link to documentation

* Add type definitions for Node's HTTP/S Server headersTimeout and maxHeadersCount properties to Node v10

* Add tests for maxHeadersCount and headersTimeout properties

* Fix tests for HTTP Server types

* Update node version in docs for node v10

* Update doc link to be formatted with JSDoc
---
 types/node/http.d.ts      |  8 +++++++-
 types/node/https.d.ts     | 12 ++++++++++++
 types/node/node-tests.ts  |  2 ++
 types/node/test/http.ts   |  3 ++-
 types/node/v10/http.d.ts  | 13 ++++++++++++-
 types/node/v10/https.d.ts | 12 ++++++++++++
 types/node/v10/index.d.ts |  2 +-
 7 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/types/node/http.d.ts b/types/node/http.d.ts
index a13dca0943..03f2c41c97 100644
--- a/types/node/http.d.ts
+++ b/types/node/http.d.ts
@@ -101,11 +101,17 @@ declare module "http" {
 
         setTimeout(msecs?: number, callback?: () => void): this;
         setTimeout(callback: () => void): this;
-        maxHeadersCount: number;
+        /**
+         * Limits maximum incoming headers count. If set to 0, no limit will be applied.
+         * @default 2000
+         * {@link https://nodejs.org/api/http.html#http_server_maxheaderscount}
+         */
+        maxHeadersCount: number | null;
         timeout: number;
         /**
          * Limit the amount of time the parser will wait to receive the complete HTTP headers.
          * @default 40000
+         * {@link https://nodejs.org/api/http.html#http_server_headerstimeout}
          */
         headersTimeout: number;
         keepAliveTimeout: number;
diff --git a/types/node/https.d.ts b/types/node/https.d.ts
index 2c7064f4df..dea042ec98 100644
--- a/types/node/https.d.ts
+++ b/types/node/https.d.ts
@@ -26,7 +26,19 @@ declare module "https" {
 
         setTimeout(callback: () => void): this;
         setTimeout(msecs?: number, callback?: () => void): this;
+        /**
+         * Limits maximum incoming headers count. If set to 0, no limit will be applied.
+         * @default 2000
+         * {@link https://nodejs.org/api/http.html#http_server_maxheaderscount}
+         */
+        maxHeadersCount: number | null;
         timeout: number;
+        /**
+         * Limit the amount of time the parser will wait to receive the complete HTTP headers.
+         * @default 40000
+         * {@link https://nodejs.org/api/http.html#http_server_headerstimeout}
+         */
+        headersTimeout: number;
         keepAliveTimeout: number;
     }
 
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 17a00de039..cbc51e1837 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -579,6 +579,8 @@ import Module = require("module");
         const timeout: number = server.timeout;
         const listening: boolean = server.listening;
         const keepAliveTimeout: number = server.keepAliveTimeout;
+        const maxHeadersCount: number | null = server.maxHeadersCount;
+        const headersTimeout: number = server.headersTimeout;
         server.setTimeout().setTimeout(1000).setTimeout(() => {}).setTimeout(100, () => {});
     }
 }
diff --git a/types/node/test/http.ts b/types/node/test/http.ts
index 462722a8ff..014142fdb1 100644
--- a/types/node/test/http.ts
+++ b/types/node/test/http.ts
@@ -28,7 +28,8 @@ import * as net from 'net';
     server = http.createServer({ ServerResponse: MyServerResponse }, reqListener);
 
     // test public props
-    const maxHeadersCount: number = server.maxHeadersCount;
+    const maxHeadersCount: number | null = server.maxHeadersCount;
+    const headersTimeout: number = server.headersTimeout;
     const timeout: number = server.timeout;
     const listening: boolean = server.listening;
     const keepAliveTimeout: number = server.keepAliveTimeout;
diff --git a/types/node/v10/http.d.ts b/types/node/v10/http.d.ts
index b55ab680cf..cb764e45d8 100644
--- a/types/node/v10/http.d.ts
+++ b/types/node/v10/http.d.ts
@@ -101,8 +101,19 @@ declare module "http" {
 
         setTimeout(msecs?: number, callback?: () => void): this;
         setTimeout(callback: () => void): this;
-        maxHeadersCount: number;
+        /**
+         * Limits maximum incoming headers count. If set to 0, no limit will be applied.
+         * @default 2000
+         * {@link https://nodejs.org/api/http.html#http_server_maxheaderscount}
+         */
+        maxHeadersCount: number | null;
         timeout: number;
+        /**
+         * Limit the amount of time the parser will wait to receive the complete HTTP headers.
+         * @default 40000
+         * {@link https://nodejs.org/api/http.html#http_server_headerstimeout}
+         */
+        headersTimeout: number;
         keepAliveTimeout: number;
     }
 
diff --git a/types/node/v10/https.d.ts b/types/node/v10/https.d.ts
index 2c7064f4df..dea042ec98 100644
--- a/types/node/v10/https.d.ts
+++ b/types/node/v10/https.d.ts
@@ -26,7 +26,19 @@ declare module "https" {
 
         setTimeout(callback: () => void): this;
         setTimeout(msecs?: number, callback?: () => void): this;
+        /**
+         * Limits maximum incoming headers count. If set to 0, no limit will be applied.
+         * @default 2000
+         * {@link https://nodejs.org/api/http.html#http_server_maxheaderscount}
+         */
+        maxHeadersCount: number | null;
         timeout: number;
+        /**
+         * Limit the amount of time the parser will wait to receive the complete HTTP headers.
+         * @default 40000
+         * {@link https://nodejs.org/api/http.html#http_server_headerstimeout}
+         */
+        headersTimeout: number;
         keepAliveTimeout: number;
     }
 
diff --git a/types/node/v10/index.d.ts b/types/node/v10/index.d.ts
index cf67202129..ea1d259bcb 100644
--- a/types/node/v10/index.d.ts
+++ b/types/node/v10/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 10.12
+// Type definitions for Node.js 10.14
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped>

From e4b587fab1a571c9e0ffd65d4d24f24f72324921 Mon Sep 17 00:00:00 2001
From: Marek <marekurbanowicz@gmail.com>
Date: Tue, 12 Mar 2019 18:47:52 +0100
Subject: [PATCH 581/924] Improve type of constructor argument (#33781)

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

diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 24aeb75050..981c6dd356 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for Mongoose 4.7.2
+// Type definitions for Mongoose 4.7.3
 // Project: http://mongoosejs.com/
 // Definitions by: simonxca <https://github.com/simonxca>
 //                 horiuchi <https://github.com/horiuchi>
 //                 lukasz-zak <https://github.com/lukasz-zak>
+//                 murbanowicz <https://github.com/murbanowicz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -2445,7 +2446,7 @@ declare module "mongoose" {
      *   Model#ensureIndexes. If an error occurred it is passed with the event.
      *   The fields, options, and index name are also passed.
      */
-    new(doc?: any): T;
+    new(doc?: Partial<T>): T;
 
     /**
      * Finds a single document by its _id field. findById(id) is almost*

From 87dcc1193d262f0652ce1202396641e222bb6ea1 Mon Sep 17 00:00:00 2001
From: Nikolay Martynenko <martynenko.nikolay@gmail.com>
Date: Tue, 12 Mar 2019 20:48:33 +0300
Subject: [PATCH 582/924] Signatures of slate-react utils functions corrected
 according to documentation (#33790)

* Signatures of slate-react utils functions corrected

* slate-react utils definitions revised
---
 types/slate-react/index.d.ts | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/types/slate-react/index.d.ts b/types/slate-react/index.d.ts
index b8ef50f3fb..b4f2752ad5 100644
--- a/types/slate-react/index.d.ts
+++ b/types/slate-react/index.d.ts
@@ -372,20 +372,11 @@ export type SlateType =
     | "text"
     | "files";
 
-export function cloneFragment(
-    event: Event,
-    value: Value,
-    fragment?: Document,
-    callback?: () => void
-): void;
+export function cloneFragment(event: Event | React.SyntheticEvent, editor: CoreEditor, callback?: () => void): void;
 export function findDOMNode(node: Node, win?: Window): Element;
 export function findDOMRange(range: Range, win?: Window): Range;
-export function findNode(element: Element, value: Value): Node;
-export function findRange(selection: Selection, value: Value): Range;
-export function getEventRange(event: Event, value: Value): Range;
-export function getEventTransfer(event: Event): { type: SlateType; node: Node };
-export function setEventTransfer(
-    event: Event,
-    type: SlateType,
-    data: any
-): void;
+export function findNode(element: Element, editor: CoreEditor): Node;
+export function findRange(selection: Selection | Range, editor: CoreEditor): Range;
+export function getEventRange(event: Event | React.SyntheticEvent, editor: CoreEditor): Range;
+export function getEventTransfer(event: Event | React.SyntheticEvent): { type: SlateType; node: Node };
+export function setEventTransfer(event: Event | React.SyntheticEvent, type: SlateType, data: any): void;

From c2691e529dda885ead7a76d555e27d489c9d9945 Mon Sep 17 00:00:00 2001
From: Wojciech Owczarczyk <voodoorider@gmail.com>
Date: Tue, 12 Mar 2019 18:50:12 +0100
Subject: [PATCH 583/924] IWatcher listener or expression param type (#33759)

* IWatcher listener or expression param type

'field' parameter in IWatcher's expression or listener functions is an IFieldConfigurationObject, not a string.

* Extracted a common type from IFieldConfigurationObject and created two subtypes
---
 types/angular-formly/index.d.ts | 50 +++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/types/angular-formly/index.d.ts b/types/angular-formly/index.d.ts
index 55c4743fc9..0e73056eaf 100644
--- a/types/angular-formly/index.d.ts
+++ b/types/angular-formly/index.d.ts
@@ -83,9 +83,10 @@ declare namespace AngularFormly {
 	}
 
 	interface ISelectOption {
-		name: string;
+		name?: string;
 		value?: string;
 		group?: string;
+		[key: string]: any;
 	}
 
 	/**
@@ -149,14 +150,37 @@ declare namespace AngularFormly {
 	 */
 	interface IWatcher {
 		deep?: boolean; //Defaults to false
-		expression?: string | { (field: string, scope: ITemplateScope): boolean };
-		listener: (field: string, newValue: any, oldValue: any, scope: ITemplateScope, stopWatching: Function) => void;
+		expression?: string | { (field: IFieldRuntimeObject, scope: ITemplateScope): boolean };
+		listener: (field: IFieldRuntimeObject, newValue: any, oldValue: any, scope: ITemplateScope, stopWatching: Function) => void;
 		type?: string; //Defaults to $watch but can be set to $watchCollection or $watchGroup
 	}
 
+	interface IFieldRuntimeObject extends IFieldObject {
+		model: {
+			[key: string]: any;
+		};
+	}
+
+	interface IFieldConfigurationObject extends IFieldObject {
+		/**
+		 * By default, the model passed to the formly-field directive is the same as the model passed to the
+		 * formly-form. However, if the field has a model specified, then it is used for that field (and that
+		 * field only). In addition, a deep watch is added to the formly-field directive's scope to run the
+		 * expressionProperties when the specified model changes.
+		 *
+		 * Note, the formly-form directive will allow you to specify a string which is an (almost) formly
+		 * expression which allows you to define the model as relative to the scope of the form.
+		 *
+		 * see http://docs.angular-formly.com/docs/field-configuration-object#model-object--string
+		 */
+		model?: string | {
+			[key: string]: any;
+		};
+	}
+
 
 	// see http://docs.angular-formly.com/docs/field-configuration-object
-	interface IFieldConfigurationObject {
+	interface IFieldObject {
 
 
 		/**
@@ -279,22 +303,6 @@ declare namespace AngularFormly {
 		link?: ng.IDirectiveLinkFn;
 
 
-		/**
-		 * By default, the model passed to the formly-field directive is the same as the model passed to the
-		 * formly-form. However, if the field has a model specified, then it is used for that field (and that
-		 * field only). In addition, a deep watch is added to the formly-field directive's scope to run the
-		 * expressionProperties when the specified model changes.
-		 *
-		 * Note, the formly-form directive will allow you to specify a string which is an (almost) formly
-		 * expression which allows you to define the model as relative to the scope of the form.
-		 *
-		 * see http://docs.angular-formly.com/docs/field-configuration-object#model-object--string
-		 */
-		model?: string | {
-			[key: string]: any;
-		};
-
-
 		/**
 		 * Allows you to take advantage of ng-model-options directive. Formly's built-in templateManipulator (see
 		 * below) will add this attribute to your ng-model element automatically if this property exists. Note,
@@ -617,7 +625,7 @@ declare namespace AngularFormly {
 		//The index of the field the form is on (in ng-repeat)
 		index: number;
 		//the model of the form (or the model specified by the field if it was specified).
-		model?: string | {
+		model?: {
 			[key: string]: any;
 		};
 		//Shortcut to options.validation.errorExistsAndShouldBeVisible

From 7be483f05499c3fbc973b16ae6fcc158844cb563 Mon Sep 17 00:00:00 2001
From: delprzemo <46647622+delprzemo@users.noreply.github.com>
Date: Tue, 12 Mar 2019 18:51:42 +0100
Subject: [PATCH 584/924] Falafel (#33804)

* Add types for falafel package

* Fix code smells for falafel type

* Remove code smells in falafel typing

* Fix code smells for falafel typing

* Fix code smells for falafel typing
---
 types/falafel/falafel-tests.ts | 14 ++++++++++++++
 types/falafel/index.d.ts       |  9 +++++++++
 types/falafel/tsconfig.json    | 23 +++++++++++++++++++++++
 types/falafel/tslint.json      |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/falafel/falafel-tests.ts
 create mode 100644 types/falafel/index.d.ts
 create mode 100644 types/falafel/tsconfig.json
 create mode 100644 types/falafel/tslint.json

diff --git a/types/falafel/falafel-tests.ts b/types/falafel/falafel-tests.ts
new file mode 100644
index 0000000000..babacf5829
--- /dev/null
+++ b/types/falafel/falafel-tests.ts
@@ -0,0 +1,14 @@
+import falafel = require("falafel");
+
+const src = `( ${() => {
+  const xs = [ 1, 2, [ 3, 4 ] ];
+  const ys = [ 5, 6 ];
+}})()`;
+
+falafel(src, (node: any) => {});
+
+const src2 = "(function () {var xs = [ 1, 2, [ 3, 4 ] ];})()";
+
+falafel(src2, (node: any) => {});
+
+falafel(src2, {parser: null, ecmaVersion: 6, plugins: { jsx: true }}, (node: any) => {});
diff --git a/types/falafel/index.d.ts b/types/falafel/index.d.ts
new file mode 100644
index 0000000000..fae949b760
--- /dev/null
+++ b/types/falafel/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for falafel 2.1
+// Project: https://github.com/substack/node-falafel
+// Definitions by: Przemysław Struciński <https://github.com/delprzemo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare function falafel(src: string, opts: ((...args: any[]) => void) | object, fn?: (...args: any[]) => void): string;
+
+export = falafel;
diff --git a/types/falafel/tsconfig.json b/types/falafel/tsconfig.json
new file mode 100644
index 0000000000..92f20392c9
--- /dev/null
+++ b/types/falafel/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",
+        "falafel-tests.ts"
+    ]
+}
diff --git a/types/falafel/tslint.json b/types/falafel/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/falafel/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2da32b58d6f7d3ba5cbedbf63caca07e7eb8356d Mon Sep 17 00:00:00 2001
From: andretshurotshka <andwebar@gmail.com>
Date: Tue, 12 Mar 2019 22:52:10 +0500
Subject: [PATCH 585/924] Fix typo in typingsPackageName of @xmpp/jid (#33783)

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 1dade039df..c062663070 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -2138,7 +2138,7 @@
         },
         {
             "libraryName": "@xmpp/jid",
-            "typingsPackageName": "xmpp-jid",
+            "typingsPackageName": "xmpp__jid",
             "sourceRepoURL": "github.com/node-xmpp/node-xmpp/",
             "asOfVersion": "1.2.0"
         },

From ae47f923655b5fd6f31c32ca939159f3da4baf6b Mon Sep 17 00:00:00 2001
From: Nikolay Borzov <nikolay.n.borzov@gmail.com>
Date: Tue, 12 Mar 2019 21:53:20 +0400
Subject: [PATCH 586/924] [tampermonkey] Tampermonkey 4.8 (#33746)

---
 types/tampermonkey/index.d.ts            | 397 +++++++++++++++++++++++
 types/tampermonkey/tampermonkey-tests.ts | 334 +++++++++++++++++++
 types/tampermonkey/tsconfig.json         |  24 ++
 types/tampermonkey/tslint.json           |   1 +
 4 files changed, 756 insertions(+)
 create mode 100644 types/tampermonkey/index.d.ts
 create mode 100644 types/tampermonkey/tampermonkey-tests.ts
 create mode 100644 types/tampermonkey/tsconfig.json
 create mode 100644 types/tampermonkey/tslint.json

diff --git a/types/tampermonkey/index.d.ts b/types/tampermonkey/index.d.ts
new file mode 100644
index 0000000000..80a49fbae0
--- /dev/null
+++ b/types/tampermonkey/index.d.ts
@@ -0,0 +1,397 @@
+// Type definitions for non-npm package Tampermonkey 4.x
+// Project: https://tampermonkey.net
+// Definitions by: Steven Wang <https://github.com/silverwzw>
+//                 Nikolay Borzov <https://github.com/nikolay-borzov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// This definition is based on the API reference of Tampermonkey
+// https://tampermonkey.net/documentation.php
+// TypeScript Version: 3.3
+
+declare namespace Tampermonkey {
+    type ValueChangeListener = (
+        name: string,
+        oldValue: any,
+        newValue: any,
+        remote: boolean
+    ) => void;
+
+    // Response
+
+    enum ReadyState {
+        Unsent = 0,
+        Opened = 1,
+        HeadersReceived = 2,
+        Loading = 3,
+        Done = 4
+    }
+
+    interface ResponseBase {
+        readonly responseHeaders: string;
+        readonly readyState: ReadyState;
+        readonly response: any;
+        readonly responseText: string;
+        readonly responseXML: Document | null;
+        readonly status: number;
+        readonly statusText: string;
+    }
+
+    interface ProgressResponseBase {
+        done: number;
+        lengthComputable: boolean;
+        loaded: number;
+        position: number;
+        total: number;
+        totalSize: number;
+    }
+
+    interface ErrorResponse extends ResponseBase {
+        readonly error: string;
+    }
+
+    interface Response<TContext> extends ResponseBase {
+        readonly finalUrl: string;
+        readonly context: TContext;
+    }
+
+    interface ProgressResponse<TContext>
+        extends Response<TContext>,
+            ProgressResponseBase {}
+
+    // Request
+
+    interface RequestHeaders {
+        readonly [header: string]: string;
+    }
+
+    type RequestEventListener<TResponse> = (
+        this: TResponse,
+        response: TResponse
+    ) => void;
+
+    interface Request<TContext = object> {
+        method?: 'GET' | 'HEAD' | 'POST';
+        /** Destination URL */
+        url: string;
+        /**
+         * i.e. user-agent, referer... (some special headers are not supported
+         * by Safari and Android browsers)
+         */
+        headers?: RequestHeaders;
+        /** String to send via a POST request */
+        data?: string;
+        /** Send the data string in binary mode */
+        binary?: boolean;
+        /** Timeout in ms */
+        timeout?: number;
+        /** Property which will be added to the response object */
+        context?: TContext;
+        responseType?: 'arraybuffer' | 'blob' | 'json';
+        /** MIME type for the request */
+        overrideMimeType?: string;
+        /** Don't send cookies with the requests (please see the fetch notes) */
+        anonymous?: boolean;
+        /**
+         * (Beta) Use a fetch instead of a xhr request(at Chrome this causes
+         * `xhr.abort`, `details.timeout` and `xhr.onprogress` to not work and
+         * makes `xhr.onreadystatechange` receive only readyState 4 events)
+         */
+        fetch?: boolean;
+        /** Username for authentication */
+        username?: string;
+        password?: string;
+
+        // Events
+
+        /** Callback to be executed if the request was aborted */
+        onabort?(): void;
+        /** Callback to be executed if the request ended up with an error */
+        onerror?: RequestEventListener<ErrorResponse>;
+        /** Callback to be executed if the request started to load */
+        onloadstart?: RequestEventListener<Response<TContext>>;
+        /** Callback to be executed if the request made some progress */
+        onprogress?: RequestEventListener<ProgressResponse<TContext>>;
+        /** Callback to be executed if the request's ready state changed */
+        onreadystatechange?: RequestEventListener<Response<TContext>>;
+        /** Callback to be executed if the request failed due to a timeout */
+        ontimeout?(): void;
+        /** Callback to be executed if the request was loaded */
+        onload?: RequestEventListener<Response<TContext>>;
+    }
+
+    // Download Response
+
+    interface DownloadProgressResponse extends ProgressResponseBase {
+        readonly finalUrl: string;
+    }
+
+    interface DownloadErrorResponse {
+        /**
+         * Error reason
+         * - `not_enabled` - the download feature isn't enabled by the user
+         * - `not_whitelisted` - the requested file extension is not
+         * whitelisted
+         * - `not_permitted` - the user enabled the download feature, but did
+         * not give the downloads permission
+         * - `not_supported` - the download feature isn't supported by the
+         * browser/version
+         * - `not_succeeded` - the download wasn't started or failed, the
+         * details attribute may provide more information
+         */
+        error:
+            | 'not_enabled'
+            | 'not_whitelisted'
+            | 'not_permitted'
+            | 'not_supported'
+            | 'not_succeeded';
+        /** Detail about that error */
+        details?: string;
+    }
+
+    // Download Request
+
+    interface DownloadRequest {
+        /** URL from where the data should be downloaded */
+        url: string;
+        /**
+         * Filename - for security reasons the file extension needs to be
+         * whitelisted at Tampermonkey options page
+         */
+        name: string;
+        headers?: RequestHeaders;
+        /** Show 'Save As' dialog */
+        saveAs?: boolean;
+        timeout?: number;
+        /** Callback to be executed if this download ended up with an error */
+        onerror?: RequestEventListener<DownloadErrorResponse>;
+        /** Callback to be executed if this download finished */
+        ontimeout?(): void;
+        /** Callback to be executed if this download finished */
+        onload?(): void;
+        /** Callback to be executed if this download failed due to a timeout */
+        onprogress?: RequestEventListener<DownloadProgressResponse>;
+    }
+
+    interface AbortHandle<TReturn> {
+        abort(): TReturn;
+    }
+
+    interface OpenTabOptions {
+        /** Decides whether the new tab should be focused */
+        active?: boolean;
+        /** Inserts the new tab after the current one */
+        insert?: boolean;
+        /** Makes the browser re-focus the current tab on close */
+        setParent?: boolean;
+    }
+
+    interface OpenTabObject {
+        /** Closes tab */
+        close(): void;
+        /** Set closed listener */
+        onclosed?(): void;
+        closed: boolean;
+    }
+
+    interface NotificationThis extends Notification {
+        id: string;
+    }
+
+    type NotificationOnClick = (this: NotificationThis) => void;
+    /** `clicked` is `true` when `text` was set */
+    type NotificationOnDone = (this: NotificationThis, clicked: boolean) => void;
+
+    interface Notification {
+        /** Text of the notification (optional if highlight is set) */
+        text?: string;
+        /** Notification title. If not specified the script name is used */
+        title?: string;
+        image?: string;
+        /** Flag whether to highlight the tab that sends the notification */
+        highlight?: boolean;
+        /** Time after that the notification will be hidden. `0` = disabled */
+        timeout?: number;
+        /**
+         * Called when the notification is closed (no matter if this was
+         * triggered by a timeout or a click) or the tab was highlighted
+         */
+        onclick?: NotificationOnClick;
+        /** Called in case the user clicks the notification */
+        ondone?: NotificationOnDone;
+    }
+
+    interface TextNotification extends Notification {
+        /** Text of the notification (optional if highlight is set) */
+        text: string;
+    }
+
+    interface HighlightNotification extends Notification {
+        text?: undefined;
+        highlight: true;
+    }
+
+    type NotificationDetails = TextNotification | HighlightNotification;
+}
+
+/**
+ * The unsafeWindow object provides full access to the pages javascript
+ * functions and variables
+ */
+declare var unsafeWindow: Window;
+
+// Styles
+
+/**
+ * Adds the given style to the document and returns the injected style element.
+ */
+declare function GM_addStyle(css: string): HTMLStyleElement;
+
+// Storage
+
+/** Sets the value of `name` to the storage */
+declare function GM_setValue(name: string, value: any): void;
+
+/**
+ * Adds a change listener to the storage and returns the listener ID.
+ * The `remote` argument of the callback function shows whether this value was
+ * modified from the instance of another tab (`true`) or within this script
+ * instance (`false`). Therefore this functionality can be used by scripts of
+ * different browser tabs to communicate with each other.
+ * @param name Name of the observed variable
+ */
+declare function GM_addValueChangeListener(
+    name: string,
+    listener: Tampermonkey.ValueChangeListener
+): number;
+
+/** Removes a change listener by its ID */
+declare function GM_removeValueChangeListener(listenerId: number): void;
+
+/** Gets the value of 'name' from storage */
+declare function GM_getValue<TValue>(
+    name: string,
+    defaultValue?: TValue
+): TValue;
+
+/** Deletes 'name' from storage */
+declare function GM_deleteValue(name: string): void;
+
+/** Lists all names of the storage */
+declare function GM_listValues(): string[];
+
+// Resources
+
+/** Get the content of a predefined `@resource` tag at the script header */
+declare function GM_getResourceText(name: string): string;
+
+/**
+ * Get the base64 encoded URI of a predefined `@resource` tag at the script
+ * header
+ */
+declare function GM_getResourceURL(name: string): string;
+
+// Menu commands
+
+/**
+ * Register a menu to be displayed at the Tampermonkey menu at pages where this
+ * script runs and returns a menu command ID.
+ */
+declare function GM_registerMenuCommand(
+    name: string,
+    onClick: () => void,
+    accessKey?: string
+): number;
+
+/**
+ *  Unregister a menu command that was previously registered by
+ * `GM_registerMenuCommand` with the given menu command ID.
+ */
+declare function GM_unregisterMenuCommand(menuCommandId: number): void;
+
+// Requests
+
+/** Makes an xmlHttpRequest */
+declare function GM_xmlhttpRequest<TContext = any>(
+    details: Tampermonkey.Request<TContext> // tslint:disable-line:no-unnecessary-generics
+): Tampermonkey.AbortHandle<void>;
+
+/** Downloads a given URL to the local disk */
+declare function GM_download(
+    details: Tampermonkey.DownloadRequest
+): Tampermonkey.AbortHandle<boolean>;
+declare function GM_download(
+    url: string,
+    name: string
+): Tampermonkey.AbortHandle<boolean>;
+
+// Tabs
+
+/** Saves the tab object to reopen it after a page unload */
+declare function GM_saveTab(obj: object): void;
+
+/** Gets a object that is persistent as long as this tab is open */
+declare function GM_getTab(callback: (obj: any) => void): void;
+
+/** Gets all tab objects as a hash to communicate with other script instances */
+declare function GM_getTabs(
+    callback: (tabsMap: { [tabId: number]: any }) => void
+): void;
+
+// Utils
+
+/** Log a message to the console */
+declare function GM_log(...message: any[]): void;
+
+/**
+ * Opens a new tab with this url.
+ * The options object can have the following properties:
+ * - `active` decides whether the new tab should be focused,
+ * - `insert` that inserts the new tab after the current one and
+ * - `setParent` makes the browser re-focus the current tab on close.
+ *
+ * Otherwise the new tab is just appended.
+ * If `options` is boolean (loadInBackground) it has the opposite meaning of
+ * active and was added to achieve Greasemonkey 3.x compatibility.
+ *
+ * If neither active nor loadInBackground is given, then the tab will not be
+ * focused.
+ * @returns Object with the function `close`, the listener `onclosed` and a flag
+ * called `closed`.
+ */
+declare function GM_openInTab(
+    url: string,
+    options?: Tampermonkey.OpenTabOptions | boolean
+): Tampermonkey.OpenTabObject;
+
+/**
+ * Shows a HTML5 Desktop notification and/or highlight the current tab.
+ * @param ondone If specified used instead of `details.ondone`
+ */
+declare function GM_notification(
+    details: Tampermonkey.NotificationDetails,
+    ondone?: Tampermonkey.NotificationOnDone
+): void;
+
+/**
+ * Shows a HTML5 Desktop notification and/or highlight the current tab.
+ * @param text Text of the notification
+ * @param title Notification title. If not specified the script name is used
+ * @param onclick Called in case the user clicks the notification
+ */
+declare function GM_notification(
+    text: string,
+    title?: string,
+    image?: string,
+    onclick?: Tampermonkey.NotificationOnClick
+): void;
+
+/**
+ * Copies data into the clipboard.
+ * The parameter 'info' can be an object like
+ * `{ type: 'text', mimetype: 'text/plain'}` or just a string expressing the
+ * type ("text" or "html").
+ */
+declare function GM_setClipboard(
+    data: string,
+    info?: string | { type?: string; mimetype?: string }
+): void;
diff --git a/types/tampermonkey/tampermonkey-tests.ts b/types/tampermonkey/tampermonkey-tests.ts
new file mode 100644
index 0000000000..445a72dbe9
--- /dev/null
+++ b/types/tampermonkey/tampermonkey-tests.ts
@@ -0,0 +1,334 @@
+// unsafeWindow
+
+let title: string = unsafeWindow.document.title;
+
+// GM_addStyle
+
+const scriptTag: HTMLStyleElement = GM_addStyle('a { font-wight: bold }');
+
+// GM_setValue
+
+interface AppState {
+    form: { name: string };
+}
+
+GM_setValue('a', 'foobar');
+GM_setValue('b', 123);
+GM_setValue('c', true);
+GM_setValue('d', { form: { name: 'Bob' } });
+
+// GM_addValueChangeListener
+
+GM_addValueChangeListener(
+    'a',
+    (name: string, oldValue: string, newValue: string, remote: boolean) => {}
+);
+GM_addValueChangeListener(
+    'b',
+    (name, oldValue: number, newValue: number, remote) => {}
+);
+GM_addValueChangeListener(
+    'c',
+    (name, oldValue: boolean, newValue: boolean, remote) => {}
+);
+const dValueChangeListenerId = GM_addValueChangeListener(
+    'd',
+    (name, oldValue: AppState, newValue: AppState, remote) => {}
+);
+
+// GM_removeValueChangeListener
+
+GM_removeValueChangeListener(dValueChangeListenerId);
+
+// GM_getValue
+
+const a: string = GM_getValue('a', 'foobar');
+const b: number = GM_getValue('b', 123);
+const c: boolean = GM_getValue('c', true);
+const d: any = GM_getValue('d', null);
+const e: string = GM_getValue('e');
+const f: number = GM_getValue('f');
+const g: boolean = GM_getValue('g');
+const h: AppState = GM_getValue('h');
+
+// GM_deleteValue
+
+GM_deleteValue('d');
+
+// GM_listValues
+
+GM_listValues().forEach((name: string) => {
+    console.log(name + ':', GM_getValue(name));
+});
+
+// GM_getResourceText
+
+const template: string = GM_getResourceText('template');
+
+// GM_getResourceURL
+
+const templateURL: string = GM_getResourceURL('template');
+
+// GM_registerMenuCommand
+
+GM_registerMenuCommand('Hello, world (simple)', () => {
+    GM_log('Hello, world (simple) clicked');
+});
+const commandId = GM_registerMenuCommand(
+    'Hello, world!',
+    () => {
+        GM_log('Hello, world clicked');
+    },
+    'h'
+);
+
+// GM_unregisterMenuCommand
+
+GM_unregisterMenuCommand(commandId);
+
+// GM_xmlhttpRequest
+
+// Bare Minimum
+const abortHandle = GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://www.example.com/',
+    onload(response) {
+        alert(response.responseText);
+    }
+});
+
+abortHandle.abort();
+
+// GET request
+GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://www.example.net/',
+    headers: {
+        'User-Agent': 'Mozilla/5.0',
+        Accept: 'text/xml'
+    },
+    onload(response) {
+        let responseXML = response.responseXML;
+        // Inject responseXML into existing Object (only appropriate for XML content).
+        if (!responseXML) {
+            responseXML = new DOMParser().parseFromString(
+                response.responseText,
+                'text/xml'
+            );
+        }
+
+        GM_log(
+            [
+                response.status,
+                response.statusText,
+                response.readyState,
+                response.responseHeaders,
+                response.responseText,
+                response.finalUrl,
+                responseXML
+            ].join('\n')
+        );
+    }
+});
+
+// POST request
+GM_xmlhttpRequest({
+    method: 'POST',
+    url: 'http://www.example.net/login',
+    data: 'username=johndoe&password=xyz123',
+    headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+    },
+    onload(response) {
+        if (response.responseText.indexOf('Logged in as') > -1) {
+            location.href = 'http://www.example.net/dashboard';
+        }
+    }
+});
+
+// HEAD request
+GM_xmlhttpRequest({
+    url: 'http://www.example.com',
+    method: 'HEAD',
+    onload(response) {
+        GM_log(response.responseHeaders);
+    }
+});
+
+// All options
+interface RequestContext {
+    form: {
+        name: string
+    };
+}
+
+GM_xmlhttpRequest<RequestContext>({
+    method: 'POST',
+    url: 'http://example.com/',
+    headers: { 'User-Agent': 'greasemonkey' },
+    data: 'foo=1&bar=2',
+    binary: false,
+    timeout: 10,
+    context: {
+        form: {
+            name: 'Alice'
+        }
+    },
+    responseType: 'json',
+    overrideMimeType: 'text/plain',
+    anonymous: false,
+    username: 'guest',
+    password: 'abc123',
+    onabort() {},
+    onerror(response) {
+        GM_log(response.error);
+    },
+    onloadstart(response) {
+        GM_log(response.context.form.name);
+    },
+    onload(response) {
+        GM_log(response.context.form.name);
+    },
+    onprogress(response) {
+        GM_log(response.context.form.name, response.loaded);
+    },
+    onreadystatechange(response) {
+        GM_log(response.context.form.name);
+    },
+    ontimeout() {}
+});
+
+// Responses
+GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://example.com/',
+    onload: response => {
+        const readyState: number = response.readyState;
+        const responseHeaders: string = response.responseHeaders;
+        const responseText: string = response.responseText;
+        const status: number = response.status;
+        const statusText: string = response.statusText;
+        const context: any = response.context;
+        const finalUrl: string = response.finalUrl;
+    },
+    onprogress: response => {
+        const status: number = response.status;
+        const lengthComputable: boolean = response.lengthComputable;
+        const loaded: number = response.loaded;
+        const total: number = response.total;
+    }
+});
+
+// GM_download
+
+const downloadHandle = GM_download({
+    url: 'http://tampermonkey.net/crx/tampermonkey.xml',
+    name: 'tampermonkey.xml',
+    headers: { 'User-Agent': 'greasemonkey' },
+    saveAs: true,
+    timeout: 3000,
+    onerror(response) {
+        GM_log(response.error, response.details);
+    },
+    ontimeout() {},
+    onload() {},
+    onprogress(response) {
+        GM_log(response.finalUrl, response.loaded, response.total);
+    }
+});
+
+downloadHandle.abort();
+
+GM_download('http://tampermonkey.net/crx/tampermonkey.xml', 'tampermonkey.xml');
+
+// GM_saveTab
+
+interface TabState {
+    form: { name: string };
+}
+
+const tabState: TabState = {
+    form: {
+        name: 'Alice'
+    }
+};
+
+GM_saveTab(tabState);
+
+// GM_getTab
+
+GM_getTab((savedTabState: TabState) => {
+    GM_log(savedTabState.form.name);
+});
+
+// GM_getTabs
+
+GM_getTabs(tabsMap => {
+    GM_log(tabsMap[0]);
+});
+
+// GM_log
+
+GM_log('Hello, World!');
+GM_log('Hello, World!', 'Again');
+
+// GM_openInTab
+
+GM_openInTab('http://www.example.com/');
+
+GM_openInTab('http://www.example.com/', true);
+
+const openTabObject = GM_openInTab('http://www.example.com/', {
+    active: true,
+    insert: true,
+    setParent: true
+});
+
+openTabObject.onclosed = () => {
+    GM_log('Tab closed', openTabObject.closed);
+};
+
+openTabObject.close();
+
+// GM_notification
+
+const textNotification: Tampermonkey.NotificationDetails = {
+    text: 'Notification text',
+    title: 'Notification title',
+    image: 'https://tampermonkey.net/favicon.ico',
+    timeout: 5000,
+    onclick() {
+        GM_log(`Notification with id ${this.id} is clicked`);
+    },
+    ondone(clicked) {
+        GM_log(`Notification with id ${this.id} is clicked ${clicked}`);
+    }
+};
+
+const highlightNotification: Tampermonkey.NotificationDetails = {
+    highlight: true,
+    onclick: textNotification.onclick,
+    ondone: textNotification.ondone
+};
+
+GM_notification(textNotification);
+GM_notification(highlightNotification);
+GM_notification(textNotification, textNotification.ondone);
+
+GM_notification(
+    'Notification text',
+    'Notification title',
+    'https://tampermonkey.net/favicon.ico',
+    function() {
+        GM_log(`Notification with id ${this.id} is clicked`);
+    }
+);
+
+// GM_setClipboard
+
+GM_setClipboard('Some text in clipboard');
+GM_setClipboard('<b>Some text in clipboard</b>', 'text');
+GM_setClipboard('<b>Some text in clipboard</b>', {
+    type: 'text',
+    mimetype: 'text/plain'
+});
diff --git a/types/tampermonkey/tsconfig.json b/types/tampermonkey/tsconfig.json
new file mode 100644
index 0000000000..7ac9df967f
--- /dev/null
+++ b/types/tampermonkey/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",
+        "tampermonkey-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/tampermonkey/tslint.json b/types/tampermonkey/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tampermonkey/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a9eaf4b98c9d6836794ceaab493cba0cf4f531a4 Mon Sep 17 00:00:00 2001
From: Nikolay Borzov <nikolay.n.borzov@gmail.com>
Date: Tue, 12 Mar 2019 21:54:20 +0400
Subject: [PATCH 587/924] [greasemonkey] Greasemonkey API 4.x (#33734)

- Haven't added typings for sync response (no info in the docs)
- Enable all dtslint rules
- Create `GM` namespace
---
 types/greasemonkey/greasemonkey-tests.ts    | 308 ++++++------
 types/greasemonkey/index.d.ts               | 499 +++++++++++---------
 types/greasemonkey/tslint.json              |  80 +---
 types/greasemonkey/v3/greasemonkey-tests.ts | 220 +++++++++
 types/greasemonkey/v3/index.d.ts            | 235 +++++++++
 types/greasemonkey/v3/tsconfig.json         |  29 ++
 types/greasemonkey/v3/tslint.json           |  79 ++++
 7 files changed, 997 insertions(+), 453 deletions(-)
 create mode 100644 types/greasemonkey/v3/greasemonkey-tests.ts
 create mode 100644 types/greasemonkey/v3/index.d.ts
 create mode 100644 types/greasemonkey/v3/tsconfig.json
 create mode 100644 types/greasemonkey/v3/tslint.json

diff --git a/types/greasemonkey/greasemonkey-tests.ts b/types/greasemonkey/greasemonkey-tests.ts
index 52799d0126..199be11a13 100644
--- a/types/greasemonkey/greasemonkey-tests.ts
+++ b/types/greasemonkey/greasemonkey-tests.ts
@@ -1,220 +1,224 @@
+// unsafeWindow
 
+const title: string = unsafeWindow.document.title;
 
-////////////////
-// Global variable
-////////////////
+// GM.info
 
-var title: string = unsafeWindow.document.title;
+const scriptDescription: string = GM.info.script.description;
+const scriptExcludes: string[] = GM.info.script.excludes;
+const scriptIncludes: string[] = GM.info.script.includes;
+const scriptMatches: string[] = GM.info.script.matches;
+const scriptName: string = GM.info.script.name;
+const scriptNamespace: string = GM.info.script.namespace;
+const scriptResources = GM.info.script.resources['foo'];
+const scriptResourceName: string = scriptResources.name;
+const scriptResourceMimeType: string = scriptResources.mimetype;
+const scriptResourceURL: string = scriptResources.url;
+const scriptRunAt: string = GM.info.script.runAt;
+const scriptVersion: string = GM.info.script.version;
+const scriptMetaStr: string = GM.info.scriptMetaStr;
+const scriptHandler: string = GM.info.scriptHandler;
+const gmVersion: string = GM.info.version;
 
-var scriptDescription: string = GM_info.script.description;
-var scriptExcludes: string[]  = GM_info.script.excludes;
-var scriptIncludes: string[]  = GM_info.script.includes;
-var scriptMatches: string[]   = GM_info.script.matches;
-var scriptName: string        = GM_info.script.name;
-var scriptNamespace: string   = GM_info.script.namespace;
-var scriptResouces: Object    = GM_info.script.resources;
-var scriptRunAt: string       = GM_info.script['run-at'];
-var scriptUnwrap: boolean     = GM_info.script.unwrap;
-var scriptVersion: string     = GM_info.script.version;
-var scriptMetsStr: string     = GM_info.scriptMetaStr;
-var scriptWillUpdate: boolean = GM_info.scriptWillUpdate;
-var gmVersion: string         = GM_info.version;
+// GM.setValue
 
-////////////////
-// Values
-////////////////
+GM.setValue('a', 'foobar');
+GM.setValue('b', 123);
+GM.setValue('c', true);
+GM.setValue('d', null);
+// NG: GM.setValue('x', new Date());
 
-GM_setValue('a', 'foobar');
-GM_setValue('b', 123);
-GM_setValue('c', true);
-GM_setValue('d', null);
-// NG: GM_setValue('x', new Date());
+// GM.getValue
 
-var a: string  = GM_getValue('a', 'foobar');
-var b: number  = GM_getValue('b', 123);
-var c: boolean = GM_getValue('c', true);
-var d: any     = GM_getValue('d', null);
-var e: string  = GM_getValue('e');
-var f: number  = GM_getValue('f');
-var g: boolean = GM_getValue('g');
-// NG: var x: string  = GM_getValue('x', 123);
+async function getStringValueWithDefault() {
+    const a: string = await GM.getValue('a', 'foobar');
+    return a;
+}
 
-GM_deleteValue('d');
+async function getNumberValueWithDefault() {
+    const b: number = await GM.getValue('b', 123);
+    // NG: var x: string  = GM.getValue('x', 123);
+    return b;
+}
 
-GM_listValues().forEach((name: string) => {
-    console.log(name + ":", GM_getValue(name));
+async function getBooleanWithDefault() {
+    const c: boolean = await GM.getValue('c', true);
+    return c;
+}
+
+async function getStringValue() {
+    const e: string = await GM.getValue('e');
+    return e;
+}
+
+async function getNumberValue() {
+    const f: number = await GM.getValue('f');
+    return f;
+}
+
+async function getBoolean() {
+    const g: boolean = await GM.getValue('g');
+    return g;
+}
+
+// GN.deleteValue
+
+GM.deleteValue('d').then(() => {
+    console.log('Success');
 });
 
-////////////////
-// Resources
-////////////////
+// GM.listValues
 
-var prototypeSource: string = GM_getResourceText('prototype');
-var prototypeURL: string    = GM_getResourceURL('prototype');
+GM.listValues().then(values =>
+    values.forEach(async (name: string) => {
+        console.log(name + ':', await GM.getValue(name));
+    })
+);
 
-////////////////
-// Utilities
-////////////////
+// GM.getResourceUrl
 
-GM_addStyle("body { color: white; background-color: black; } img { border: 0; }");
+GM.getResourceUrl('some_res').then(url => {
+    console.log('Resource url:', url);
+});
 
-GM_log("Hello, World!");
+// GM.notification
 
-GM_openInTab("http://www.example.com/");
+GM.notification('A new widget is available at the frobber.', 'New widget!');
+GM.notification(
+    'A new widget is available at the frobber.',
+    'New widget!',
+    'https://wiki.greasespot.net/images/f/f3/Book.png',
+    () => {
+        console.log('Notification clicked');
+    }
+);
 
-GM_registerMenuCommand("Hello, world (simple)", helloSimple);
-GM_registerMenuCommand("Hello, world!", hello, "h");
-// NG (Old Style): GM_registerMenuCommand("Hello, world! (again)", hello2, "e", "shift alt", "w");
-function helloSimple() {}
-function hello() {}
+// GM.openInTab
 
-GM_setClipboard('http://www.example.com/short-url-code');
+GM.openInTab('https://wiki.greasespot.net/GM.openInTab');
+GM.openInTab('https://wiki.greasespot.net/GM.openInTab', true);
 
-////////////////
-// XMLHttpRequest
-////////////////
+// GM.setClipboard
 
-//// Examples from Greasemonkey Wiki
+GM.setClipboard('Text from clipboard');
+
+// GM.xmlHttpRequest
 
 // Bare Minimum
-
-GM_xmlhttpRequest({
-    method: "GET",
-    url: "http://www.example.com/",
-    onload: function(response) {
+GM.xmlHttpRequest({
+    method: 'GET',
+    url: 'http://www.example.com/',
+    onload(response) {
         alert(response.responseText);
     }
 });
 
 // GET request
-
-GM_xmlhttpRequest({
-    method: "GET",
-    url: "http://www.example.net/",
+GM.xmlHttpRequest({
+    method: 'GET',
+    url: 'http://www.example.net/',
     headers: {
-        "User-Agent": "Mozilla/5.0",    // If not specified, navigator.userAgent will be used.
-        "Accept": "text/xml"            // If not specified, browser defaults will be used.
+        'User-Agent': 'Mozilla/5.0',
+        Accept: 'text/xml'
     },
-    onload: function(response) {
-        var responseXML = (<any>response).responseXML;
-        // Inject responseXML into existing Object (only appropriate for XML content).
-        if (!responseXML) {
-            responseXML = new DOMParser()
-                .parseFromString(response.responseText, "text/xml");
+    onload(response) {
+        let responseXML = null;
+
+        if (!response.responseXML) {
+            responseXML = new DOMParser().parseFromString(
+                response.responseText,
+                'text/xml'
+            );
         }
 
-        GM_log([
-            response.status,
-            response.statusText,
-            response.readyState,
-            response.responseHeaders,
-            response.responseText,
-            response.finalUrl,
-            responseXML
-        ].join("\n"));
+        console.log(
+            [
+                response.status,
+                response.statusText,
+                response.readyState,
+                response.responseHeaders,
+                response.responseText,
+                response.finalUrl,
+                responseXML
+            ].join('\n')
+        );
     }
 });
 
 // POST request
-
-GM_xmlhttpRequest({
-    method: "POST",
-    url: "http://www.example.net/login",
-    data: "username=johndoe&password=xyz123",
+GM.xmlHttpRequest({
+    method: 'POST',
+    url: 'http://www.example.net/login',
+    data: 'username=johndoe&password=xyz123',
     headers: {
-        "Content-Type": "application/x-www-form-urlencoded"
+        'Content-Type': 'application/x-www-form-urlencoded'
     },
-    onload: function(response) {
-        if (response.responseText.indexOf("Logged in as") > -1) {
-            location.href = "http://www.example.net/dashboard";
+    onload(response) {
+        if (response.responseText.indexOf('Logged in as') > -1) {
+            location.href = 'http://www.example.net/dashboard';
         }
     }
 });
 
 // HEAD request
-
-GM_xmlhttpRequest({
-    url: "http://www.example.com",
-    method: "HEAD",
-    onload: function(response) {
-        GM_log(response.responseHeaders);
+GM.xmlHttpRequest({
+    url: 'http://www.example.com',
+    method: 'HEAD',
+    onload(response) {
+        console.log(response.responseHeaders);
     }
 });
 
-//// Checkk all options
+interface MyRequestContext {
+    userId: string;
+}
 
-var result = GM_xmlhttpRequest({
+// All options
+GM.xmlHttpRequest({
     binary: false,
     context: {},
     data: 'foo=1&bar=2',
     headers: { 'User-Agent': 'greasemonkey' },
     method: 'POST',
-    onabort: (response: GMXMLHttpRequestResponse) => { },
-    onerror: (response: GMXMLHttpRequestResponse) => { },
-    onload: (response: GMXMLHttpRequestResponse) => { },
-    onprogress: (response: GMXMLHttpRequestProgressResponse) => { },
-    onreadystatechange: (response: GMXMLHttpRequestResponse) => { },
-    ontimeout: (response: GMXMLHttpRequestResponse) => { },
+    onabort: (response: GM.Response<MyRequestContext>) => {},
+    onerror: (response: GM.Response<MyRequestContext>) => {},
+    onload: (response: GM.Response<MyRequestContext>) => {},
+    onprogress: (response: GM.ProgressResponse<MyRequestContext>) => {},
+    onreadystatechange: (response: GM.Response<MyRequestContext>) => {},
+    ontimeout: (response: GM.Response<MyRequestContext>) => {},
     overrideMimeType: 'text/plain',
     password: 'abc123',
     synchronous: false,
     timeout: 10,
     upload: {
-        onabort: (response: GMXMLHttpRequestResponse) => { },
-        onerror: (response: GMXMLHttpRequestResponse) => { },
-        onload: (response: GMXMLHttpRequestResponse) => { },
-        onprogress: (response: GMXMLHttpRequestProgressResponse) => { }
+        onabort: (response: GM.Response<MyRequestContext>) => {},
+        onerror: (response: GM.Response<MyRequestContext>) => {},
+        onload: (response: GM.Response<MyRequestContext>) => {},
+        onprogress: (response: GM.ProgressResponse<MyRequestContext>) => {}
     },
     url: 'http://example.com/',
     user: 'guest'
 });
 
-//// Check responses
+// Response
 
-GM_xmlhttpRequest({
+GM.xmlHttpRequest({
     method: 'GET',
     url: 'http://example.com/',
-    onload: (response: GMXMLHttpRequestResponse) => {
-        var readyState: number      = response.readyState;
-        var responseHeaders: string = response.responseHeaders;
-        var responseText: string    = response.responseText;
-        var status: number          = response.status;
-        var statusText: string      = response.statusText;
-        var context: any            = response.context;
-        var finalUrl: string        = response.finalUrl;
+    onload: (response: GM.Response<MyRequestContext>) => {
+        const readyState: number = response.readyState;
+        const responseHeaders: string = response.responseHeaders;
+        const responseText: string = response.responseText;
+        const status: number = response.status;
+        const statusText: string = response.statusText;
+        const context: any = response.context;
+        const finalUrl: string = response.finalUrl;
         // NG: var loaded: number   = response.loaded;
     },
-    onprogress: (response: GMXMLHttpRequestProgressResponse) => {
-        var status: number = response.status;
-        var lengthComputable: boolean = response.lengthComputable;
-        var loaded: number = response.loaded;
-        var total: number = response.total;
+    onprogress: (response: GM.ProgressResponse<MyRequestContext>) => {
+        const status: number = response.status;
+        const lengthComputable: boolean = response.lengthComputable;
+        const loaded: number = response.loaded;
+        const total: number = response.total;
     }
 });
-
-//// Synchronous
-
-var syncResult: GMXMLHttpRequestSyncResult = GM_xmlhttpRequest({
-    method: 'GET',
-    url: 'http://example.com/',
-    synchronous: true
-});
-
-syncResult.abort();
-var finalUrl: string        = syncResult.finalUrl;
-var readyState: number      = syncResult.readyState;
-var responseHeaders: string = syncResult.responseHeaders;
-var responseText: string    = syncResult.responseText;
-(function() { var status: number = syncResult.status; })();		// conflict with state defined in lib.d.ts
-var statusText: string      = syncResult.statusText;
-
-//// Asynchronous
-
-var asyncResult: GMXMLHttpRequestAsyncResult = GM_xmlhttpRequest({
-    method: 'GET',
-    url: 'http://example.com/',
-    synchronous: false
-});
-
-asyncResult.abort();
-// NG: var status: number = asyncResult.status;
diff --git a/types/greasemonkey/index.d.ts b/types/greasemonkey/index.d.ts
index a05c9de7f3..451086b697 100644
--- a/types/greasemonkey/index.d.ts
+++ b/types/greasemonkey/index.d.ts
@@ -1,14 +1,149 @@
-// Type definitions for Greasemonkey
+// Type definitions for Greasemonkey 4.x
 // Project: http://www.greasespot.net/
 // Definitions by: Kota Saito <https://github.com/kotas>
+//                 Nikolay Borzov <https://github.com/nikolay-borzov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// This definition is based on the API reference of Greasemonkey.
-// http://wiki.greasespot.net/Greasemonkey_Manual:API
+// This definition is based on the API reference of Greasemonkey
+// https://wiki.greasespot.net/Greasemonkey_Manual:API
+// TypeScript Version: 3.2
 
-////////////////
-// Global variable
-////////////////
+declare namespace GM {
+    interface ScriptInfo {
+        description: string;
+        excludes: string[];
+        includes: string[];
+        matches: string[];
+        name: string;
+        namespace?: string;
+        /**
+         * An object keyed by resource name.
+         * Each value is an object with keys `name` and `mimetype` and `url`
+         * with string values.
+         */
+        resources: {
+            [resourceName: string]: {
+                name: string
+                mimetype: string
+                url: string
+            }
+        };
+        /** @default 'end' */
+        runAt: 'start' | 'end' | 'idle';
+        uuid: string;
+        version: string;
+    }
+
+    type Value = string | boolean | number;
+
+    interface Response<TContext> {
+        readonly responseHeaders: string;
+        readonly finalUrl: string;
+        /** The same object passed into the original request */
+        readonly context?: TContext;
+
+        readonly readyState: 1 | 2 | 3 | 4;
+        readonly response: any;
+        readonly responseText: string;
+        readonly responseXML: Document | false;
+        readonly status: number;
+        readonly statusText: string;
+    }
+
+    interface ProgressResponse<TContext> extends Response<TContext> {
+        lengthComputable: boolean;
+        loaded: number;
+        total: number;
+    }
+
+    interface Request<TContext = any> {
+        // Fields
+
+        /**
+         * The URL to make the request to. Must be an absolute URL, beginning
+         * with the scheme. May be relative to the current page.
+         */
+        url: string;
+        /** String type of HTTP request to make (E.G. "GET", "POST") */
+        method:
+            | 'GET'
+            | 'POST'
+            | 'PUT'
+            | 'DELETE'
+            | 'PATCH'
+            | 'HEAD'
+            | 'TRACE'
+            | 'OPTIONS'
+            | 'CONNECT';
+        /**
+         * When true, the data is sent as a Blob
+         * @default false
+         */
+        binary?: boolean;
+        /**
+         * Any object (Compatibility: 1.10+). This object will also be the
+         * context property of the Response Object.
+         */
+        context?: TContext;
+        /**
+         * Data to send in the request body. Usually for POST method requests.
+         * If the data field contains form-encoded data, you usually must also
+         * set the header `'Content-Type': 'application/x-www-form-urlencoded'`
+         * in the `headers` field.
+         */
+        data?: string;
+        /** A set of headers to include in the request */
+        headers?: {
+            [header: string]: string
+        };
+        /**
+         * A MIME type to specify with the request (e.g.
+         * "text/html; charset=ISO-8859-1")
+         */
+        overrideMimeType?: string;
+        /** User name to use for authentication purposes. */
+        user?: string;
+        /** Password to use for authentication purposes */
+        password?: string;
+        /**
+         * When `true`, this is a synchronous request.
+         * Be careful: The entire Firefox UI will be locked and frozen until the
+         * request completes.In this mode, more data will be available in the
+         * return value.
+         */
+        synchronous?: boolean;
+        /**
+         * The number of milliseconds to wait before terminating the call. Zero
+         * (the default) means wait forever.
+         */
+        timeout?: number;
+        /**
+         * Object containing optional function callbacks to monitor the upload
+         * of data.
+         */
+        upload?: {
+            onabort?(response: Response<TContext>): void
+            onerror?(response: Response<TContext>): void
+            onload?(response: Response<TContext>): void
+            onprogress?(response: ProgressResponse<TContext>): void
+        };
+
+        // Event handlers
+
+        /** Will be called when the request is aborted */
+        onabort?(response: Response<TContext>): void;
+        /** Will be called if an error occurs while processing the request */
+        onerror?(response: Response<TContext>): void;
+        /** Will be called when the request has completed successfully */
+        onload?(response: Response<TContext>): void;
+        /** Will be called when the request progress changes */
+        onprogress?(response: ProgressResponse<TContext>): void;
+        /** Will be called repeatedly while the request is in progress */
+        onreadystatechange?(response: Response<TContext>): void;
+        /** Will be called if/when the request times out */
+        ontimeout?(response: Response<TContext>): void;
+    }
+}
 
 /**
  * Window object of the content page where the user script is running on.
@@ -16,220 +151,140 @@
  */
 declare var unsafeWindow: Window;
 
-/**
- * Meta data about the running user script.
- * @see {@link http://wiki.greasespot.net/GM_info}
- */
-declare var GM_info: {
-    script: {
-        description: string;
-        excludes: string[];
-        includes: string[];
-        matches: string[];
-        name: string;
-        namespace: string;
-        resources: Object;
-        "run-at": string;
-        unwrap: boolean;
-        version: string;
-    };
-    scriptMetaStr: string;
-    scriptWillUpdate: boolean;
-    version: string;
+declare var GM: {
+    // Headers
+
+    /**
+     * Meta data about the running user script.
+     * @see {@link https://wiki.greasespot.net/GM.info}
+     */
+    info: {
+        /** An object containing data about the currently running script */
+        script: GM.ScriptInfo
+        /**
+         * A string, the entire literal Metadata Block (without the delimiters)
+         * for the currently running script
+         */
+        scriptMetaStr: string
+        /**
+         * The name of the user script engine handling this script's execution.
+         * The string `Greasemonkey`
+         */
+        scriptHandler: string
+        /** The version of Greasemonkey, a string e.g. `4.0` */
+        version: string
+    }
+
+    // Values
+
+    /**
+     * Allows user script authors to persist simple values across page loads and
+     * across origins.
+     * Strings, booleans, and integers are currently the only allowed data types.
+     * @see {@link https://wiki.greasespot.net/GM.setValue}
+     * @param name The unique (within this script) name for this value.
+     * Should be restricted to valid Javascript identifier characters.
+     * @param value Any valid value of these types. Any other type may cause
+     * undefined behavior, including crashes
+     * @returns A Promise, resolved successfully with no value on success,
+     * rejected with no value on failure
+     */
+    setValue(name: string, value: GM.Value): Promise<void>
+
+    /**
+     * Retrieves a value that was set with `GM.setValue`
+     * @see {@link https://wiki.greasespot.net/GM.getValue}
+     * @param name The property name to get
+     * @param defaultValue The default value to be returned when none has
+     * previously been set
+     * @returns A Promise, rejected in case of error and otherwise resolved with:
+     * - When this name has been set - `string`, `integer` or `boolean` as
+     * previously set
+     * - When this name has not been set, and default is provided - The value
+     * passed as default
+     * - When this name has not been set, and default is not provided -
+     * `undefined`
+     * @example
+     * // Retrieving the value associated with the name 'timezoneOffset' with a default value defined:
+     * const timezoneOffset = await GM.getValue("timezoneOffset", -5)
+     * @example
+     * // For structured data used `JSON.stringify()` to place an object into storage and then `JSON.parse()` to convert it back
+     * const storedObject = JSON.parse(await GM.getValue('foo', '{}'));
+     */
+    getValue<TValue = GM.Value>(
+        name: string,
+        defaultValue?: TValue
+    ): Promise<TValue | undefined>
+
+    /**
+     * Deletes an existing name / value pair from storage.
+     * @see {@link https://wiki.greasespot.net/GM.deleteValue}
+     * @param name Property name to delete
+     * @returns A Promise, resolved successfully with no value on success,
+     * rejected with no value on failure.
+     */
+    deleteValue(name: string): Promise<void>
+
+    /**
+     * Retrieves an array of preference names that this script has stored
+     * @see {@link https://wiki.greasespot.net/GM.listValues}
+     * @returns A Promise, rejected in case of error and otherwise resolved with
+     * an string[] for previously set values
+     */
+    listValues(): Promise<string[]>
+
+    // Resources
+
+    /**
+     * Given a defined `@resource`, this method returns it as a URL
+     * @see {@link https://wiki.greasespot.net/GM.getResourceUrl}
+     * @param resourceName The name provided when the `@resource` was defined
+     * @returns A Promise, rejected on failure and resolved with a string URL on
+     * success.
+     * Treat the result as opaque string. It will work where you need a URL
+     * (for a `<link>` or `<style>` for CSS, for an `<img>` tag, or similar).
+     */
+    getResourceUrl(resourceName: string): Promise<string>
+
+    // Other
+
+    /**
+     * Displays a notification to the user, using the underlying operating
+     * system's notification mechanism
+     * @see {@link https://wiki.greasespot.net/GM.notification}
+     * @param text The main notification text
+     * @param title The title of the notification
+     * @param image The URL for an image to display in the dialog. If not
+     * provided, the Greasemonkey logo by default.
+     * @param onClick Callback, triggered when the notification's button is
+     * clicked.
+     */
+    notification(
+        text: string,
+        title: string,
+        image?: string,
+        onClick?: () => void
+    ): void
+
+    /**
+     * Opens the specified URL in a new tab.
+     * @see {@link https://wiki.greasespot.net/GM.openInTab}
+     * @param url The URL to navigate the new tab to
+     * @param openInBackground Force tab to/to not open in a background tab.
+     * Default (unspecified) behavior honors Firefox configuration.
+     */
+    openInTab(url: string, openInBackground?: boolean): void
+
+    /**
+     * Sets the current contents of the operating system's clipboard
+     * @see {@link https://wiki.greasespot.net/GM.setClipboard}
+     */
+    setClipboard(text: string): void
+
+    /**
+     * Performs a similar function to the standard XMLHttpRequest object, but
+     * allows these requests to cross the [same origin policy]{@link https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy} boundaries.
+     * @see {@link https://wiki.greasespot.net/GM.xmlHttpRequest}
+     */
+    xmlHttpRequest(details: GM.Request): void
 };
-
-////////////////
-// Values
-////////////////
-
-/**
- * Deletes an existing name / value pair from the script storage.
- * @param  name  a name of the pair to delete.
- * @see    {@link http://wiki.greasespot.net/GM_deleteValue}
- */
-declare function GM_deleteValue(name: string): void;
-
-/**
- * Retrieves a value from the script storage.
- * @param    name          a name to retrieve.
- * @param    defaultValue  a value to be returned when the name does not exist.
- * @returns  a retrieved value, or passed default value, or undefined.
- * @see      {@link http://wiki.greasespot.net/GM_getValue}
- */
-declare function GM_getValue(name: string, defaultValue?: any): any;
-declare function GM_getValue(name: string, defaultValue?: string): string;
-declare function GM_getValue(name: string, defaultValue?: number): number;
-declare function GM_getValue(name: string, defaultValue?: boolean): boolean;
-
-/**
- * Retrieves an array of names stored in the script storage.
- * @returns  an array of names in the storage.
- * @see      {@link http://wiki.greasespot.net/GM_listValues}
- */
-declare function GM_listValues(): string[];
-
-/**
- * Stores a name / value pair to the script storage.
- * @param  name   a name of the pair.
- * @param  value  a value to be stored.
- * @see    {@link http://wiki.greasespot.net/GM_setValue}
- */
-declare function GM_setValue(name: string, value: string): void;
-declare function GM_setValue(name: string, value: boolean): void;
-declare function GM_setValue(name: string, value: number): void;
-
-////////////////
-// Resources
-////////////////
-
-/**
- * Gets a content of a resouce defined by {@link http://wiki.greasespot.net/Metadata_Block#.40resource|@resource}.
- * @param    resourceName  a name of the resource to get.
- * @returns  the content of the resource.
- * @see      {@link http://wiki.greasespot.net/GM_getResourceText}
- */
-declare function GM_getResourceText(resourceName: string): string;
-
-/**
- * Gets a URL of a resource defined by {@link http://wiki.greasespot.net/Metadata_Block#.40resource|@resource}.
- * @param    resourceName  a name of the resource.
- * @returns  a URL that returns the content of the resource.
- * @see      {@link http://wiki.greasespot.net/GM_getResourceURL}
- */
-declare function GM_getResourceURL(resourceName: string): string;
-
-////////////////
-// Utilities
-////////////////
-
-/**
- * Adds CSS to the content page.
- * @param  css  a CSS string. It can have multiple style definitions.
- * @see    {@link http://wiki.greasespot.net/GM_addStyle}
- */
-declare function GM_addStyle(css: string): void;
-
-/**
- * Writes a message as a log to the console with the script identifier.
- * @param  message  a message to be written.
- * @see    {@link http://wiki.greasespot.net/GM_log}
- */
-declare function GM_log(message: any): void;
-
-/**
- * Opens a URL in a new tab.
- * @param    url  a URL to open.
- * @returns  window object of the opened tab.
- * @see      {@link http://wiki.greasespot.net/GM_openInTab}
- */
-declare function GM_openInTab(url: string): Window;
-
-/**
- * Registers an item as a submenu of User Script Commands.
- * @param  caption      a caption of the menu item.
- * @param  commandFunc  a function to be invoked when the item has been selected.
- * @param  accessKey    a single character that can be used to select the item by keyboard.
- *                      It should be a letter in the caption.
- * @see    {@link http://wiki.greasespot.net/GM_registerMenuCommand}
- */
-declare function GM_registerMenuCommand(caption: string, commandFunc: Function, accessKey?: string): void;
-
-/**
- * Sets a text to the clipboard of the opeating system.
- * @param  text  a text to be set to the clipboard.
- * @see    {@link http://wiki.greasespot.net/GM_setClipboard}
- */
-declare function GM_setClipboard(text: string): void;
-
-////////////////
-// XMLHttpRequest
-////////////////
-
-/**
- * Request options for {@link GM_xmlhttpRequest}.
- * @see {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Arguments}
- */
-interface GMXMLHttpRequestOptions {
-    binary?: boolean;
-    context?: any;
-    data?: string;
-    headers?: Object;
-    method: string;
-    onabort?: (response: GMXMLHttpRequestResponse) => any;
-    onerror?: (response: GMXMLHttpRequestResponse) => any;
-    onload?: (response: GMXMLHttpRequestResponse) => any;
-    onprogress?: (response: GMXMLHttpRequestProgressResponse) => any;
-    onreadystatechange?: (response: GMXMLHttpRequestResponse) => any;
-    ontimeout?: (response: GMXMLHttpRequestResponse) => any;
-    overrideMimeType?: string;
-    password?: string;
-    synchronous?: boolean;
-    timeout?: number;
-    upload?: {
-        onabort?: (response: GMXMLHttpRequestResponse) => any;
-        onerror?: (response: GMXMLHttpRequestResponse) => any;
-        onload?: (response: GMXMLHttpRequestResponse) => any;
-        onprogress?: (response: GMXMLHttpRequestProgressResponse) => any;
-    };
-    url: string;
-    user?: string;
-}
-
-/**
- * Response object for general events of {@link GM_xmlhttpRequest}.
- * @see {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Response_Object}
- */
-interface GMXMLHttpRequestResponse {
-    readyState: number;
-    responseHeaders: string;
-    responseText: string;
-    status: number;
-    statusText: string;
-    context: any;
-    finalUrl: string;
-}
-
-/**
- * Response object for onprogress event of {@link GM_xmlhttpRequest}.
- */
-interface GMXMLHttpRequestProgressResponse extends GMXMLHttpRequestResponse {
-    lengthComputable: boolean;
-    loaded: number;
-    total: number;
-}
-
-/**
- * Returned object by {@link GM_xmlhttpRequest} in asynchronous mode.
- */
-interface GMXMLHttpRequestAsyncResult {
-    abort(): void;
-}
-
-/**
- * Returned object by {@link GM_xmlhttpRequest} in synchronouse mode.
- */
-interface GMXMLHttpRequestSyncResult {
-    abort(): void;
-    finalUrl: string;
-    readyState: number;
-    responseHeaders: string;
-    responseText: string;
-    status: number;
-    statusText: string;
-}
-
-/**
- * Returned object by {@link GM_xmlhttpRequest}.
- * @see  {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Returns}
- */
-interface GMXMLHttpRequestResult extends GMXMLHttpRequestAsyncResult, GMXMLHttpRequestSyncResult {
-}
-
-/**
- * Sends a HTTP request to a URL.
- * @param    options  options and callbacks for HTTP request.
- * @returns  an object which can abort the request.
- *           If the request is sent in the synchronous mode, it also contains the response information.
- * @see      {@link http://wiki.greasespot.net/GM_setClipboard}
- */
-declare function GM_xmlhttpRequest(options: GMXMLHttpRequestOptions): GMXMLHttpRequestResult;
diff --git a/types/greasemonkey/tslint.json b/types/greasemonkey/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/greasemonkey/tslint.json
+++ b/types/greasemonkey/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/greasemonkey/v3/greasemonkey-tests.ts b/types/greasemonkey/v3/greasemonkey-tests.ts
new file mode 100644
index 0000000000..52799d0126
--- /dev/null
+++ b/types/greasemonkey/v3/greasemonkey-tests.ts
@@ -0,0 +1,220 @@
+
+
+////////////////
+// Global variable
+////////////////
+
+var title: string = unsafeWindow.document.title;
+
+var scriptDescription: string = GM_info.script.description;
+var scriptExcludes: string[]  = GM_info.script.excludes;
+var scriptIncludes: string[]  = GM_info.script.includes;
+var scriptMatches: string[]   = GM_info.script.matches;
+var scriptName: string        = GM_info.script.name;
+var scriptNamespace: string   = GM_info.script.namespace;
+var scriptResouces: Object    = GM_info.script.resources;
+var scriptRunAt: string       = GM_info.script['run-at'];
+var scriptUnwrap: boolean     = GM_info.script.unwrap;
+var scriptVersion: string     = GM_info.script.version;
+var scriptMetsStr: string     = GM_info.scriptMetaStr;
+var scriptWillUpdate: boolean = GM_info.scriptWillUpdate;
+var gmVersion: string         = GM_info.version;
+
+////////////////
+// Values
+////////////////
+
+GM_setValue('a', 'foobar');
+GM_setValue('b', 123);
+GM_setValue('c', true);
+GM_setValue('d', null);
+// NG: GM_setValue('x', new Date());
+
+var a: string  = GM_getValue('a', 'foobar');
+var b: number  = GM_getValue('b', 123);
+var c: boolean = GM_getValue('c', true);
+var d: any     = GM_getValue('d', null);
+var e: string  = GM_getValue('e');
+var f: number  = GM_getValue('f');
+var g: boolean = GM_getValue('g');
+// NG: var x: string  = GM_getValue('x', 123);
+
+GM_deleteValue('d');
+
+GM_listValues().forEach((name: string) => {
+    console.log(name + ":", GM_getValue(name));
+});
+
+////////////////
+// Resources
+////////////////
+
+var prototypeSource: string = GM_getResourceText('prototype');
+var prototypeURL: string    = GM_getResourceURL('prototype');
+
+////////////////
+// Utilities
+////////////////
+
+GM_addStyle("body { color: white; background-color: black; } img { border: 0; }");
+
+GM_log("Hello, World!");
+
+GM_openInTab("http://www.example.com/");
+
+GM_registerMenuCommand("Hello, world (simple)", helloSimple);
+GM_registerMenuCommand("Hello, world!", hello, "h");
+// NG (Old Style): GM_registerMenuCommand("Hello, world! (again)", hello2, "e", "shift alt", "w");
+function helloSimple() {}
+function hello() {}
+
+GM_setClipboard('http://www.example.com/short-url-code');
+
+////////////////
+// XMLHttpRequest
+////////////////
+
+//// Examples from Greasemonkey Wiki
+
+// Bare Minimum
+
+GM_xmlhttpRequest({
+    method: "GET",
+    url: "http://www.example.com/",
+    onload: function(response) {
+        alert(response.responseText);
+    }
+});
+
+// GET request
+
+GM_xmlhttpRequest({
+    method: "GET",
+    url: "http://www.example.net/",
+    headers: {
+        "User-Agent": "Mozilla/5.0",    // If not specified, navigator.userAgent will be used.
+        "Accept": "text/xml"            // If not specified, browser defaults will be used.
+    },
+    onload: function(response) {
+        var responseXML = (<any>response).responseXML;
+        // Inject responseXML into existing Object (only appropriate for XML content).
+        if (!responseXML) {
+            responseXML = new DOMParser()
+                .parseFromString(response.responseText, "text/xml");
+        }
+
+        GM_log([
+            response.status,
+            response.statusText,
+            response.readyState,
+            response.responseHeaders,
+            response.responseText,
+            response.finalUrl,
+            responseXML
+        ].join("\n"));
+    }
+});
+
+// POST request
+
+GM_xmlhttpRequest({
+    method: "POST",
+    url: "http://www.example.net/login",
+    data: "username=johndoe&password=xyz123",
+    headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+    },
+    onload: function(response) {
+        if (response.responseText.indexOf("Logged in as") > -1) {
+            location.href = "http://www.example.net/dashboard";
+        }
+    }
+});
+
+// HEAD request
+
+GM_xmlhttpRequest({
+    url: "http://www.example.com",
+    method: "HEAD",
+    onload: function(response) {
+        GM_log(response.responseHeaders);
+    }
+});
+
+//// Checkk all options
+
+var result = GM_xmlhttpRequest({
+    binary: false,
+    context: {},
+    data: 'foo=1&bar=2',
+    headers: { 'User-Agent': 'greasemonkey' },
+    method: 'POST',
+    onabort: (response: GMXMLHttpRequestResponse) => { },
+    onerror: (response: GMXMLHttpRequestResponse) => { },
+    onload: (response: GMXMLHttpRequestResponse) => { },
+    onprogress: (response: GMXMLHttpRequestProgressResponse) => { },
+    onreadystatechange: (response: GMXMLHttpRequestResponse) => { },
+    ontimeout: (response: GMXMLHttpRequestResponse) => { },
+    overrideMimeType: 'text/plain',
+    password: 'abc123',
+    synchronous: false,
+    timeout: 10,
+    upload: {
+        onabort: (response: GMXMLHttpRequestResponse) => { },
+        onerror: (response: GMXMLHttpRequestResponse) => { },
+        onload: (response: GMXMLHttpRequestResponse) => { },
+        onprogress: (response: GMXMLHttpRequestProgressResponse) => { }
+    },
+    url: 'http://example.com/',
+    user: 'guest'
+});
+
+//// Check responses
+
+GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://example.com/',
+    onload: (response: GMXMLHttpRequestResponse) => {
+        var readyState: number      = response.readyState;
+        var responseHeaders: string = response.responseHeaders;
+        var responseText: string    = response.responseText;
+        var status: number          = response.status;
+        var statusText: string      = response.statusText;
+        var context: any            = response.context;
+        var finalUrl: string        = response.finalUrl;
+        // NG: var loaded: number   = response.loaded;
+    },
+    onprogress: (response: GMXMLHttpRequestProgressResponse) => {
+        var status: number = response.status;
+        var lengthComputable: boolean = response.lengthComputable;
+        var loaded: number = response.loaded;
+        var total: number = response.total;
+    }
+});
+
+//// Synchronous
+
+var syncResult: GMXMLHttpRequestSyncResult = GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://example.com/',
+    synchronous: true
+});
+
+syncResult.abort();
+var finalUrl: string        = syncResult.finalUrl;
+var readyState: number      = syncResult.readyState;
+var responseHeaders: string = syncResult.responseHeaders;
+var responseText: string    = syncResult.responseText;
+(function() { var status: number = syncResult.status; })();		// conflict with state defined in lib.d.ts
+var statusText: string      = syncResult.statusText;
+
+//// Asynchronous
+
+var asyncResult: GMXMLHttpRequestAsyncResult = GM_xmlhttpRequest({
+    method: 'GET',
+    url: 'http://example.com/',
+    synchronous: false
+});
+
+asyncResult.abort();
+// NG: var status: number = asyncResult.status;
diff --git a/types/greasemonkey/v3/index.d.ts b/types/greasemonkey/v3/index.d.ts
new file mode 100644
index 0000000000..8b9c9c7cbe
--- /dev/null
+++ b/types/greasemonkey/v3/index.d.ts
@@ -0,0 +1,235 @@
+// Type definitions for Greasemonkey 3.x
+// Project: http://www.greasespot.net/
+// Definitions by: Kota Saito <https://github.com/kotas>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// This definition is based on the API reference of Greasemonkey.
+// http://wiki.greasespot.net/Greasemonkey_Manual:API
+
+////////////////
+// Global variable
+////////////////
+
+/**
+ * Window object of the content page where the user script is running on.
+ * @see {@link http://wiki.greasespot.net/UnsafeWindow}
+ */
+declare var unsafeWindow: Window;
+
+/**
+ * Meta data about the running user script.
+ * @see {@link http://wiki.greasespot.net/GM_info}
+ */
+declare var GM_info: {
+    script: {
+        description: string;
+        excludes: string[];
+        includes: string[];
+        matches: string[];
+        name: string;
+        namespace: string;
+        resources: Object;
+        "run-at": string;
+        unwrap: boolean;
+        version: string;
+    };
+    scriptMetaStr: string;
+    scriptWillUpdate: boolean;
+    version: string;
+};
+
+////////////////
+// Values
+////////////////
+
+/**
+ * Deletes an existing name / value pair from the script storage.
+ * @param  name  a name of the pair to delete.
+ * @see    {@link http://wiki.greasespot.net/GM_deleteValue}
+ */
+declare function GM_deleteValue(name: string): void;
+
+/**
+ * Retrieves a value from the script storage.
+ * @param    name          a name to retrieve.
+ * @param    defaultValue  a value to be returned when the name does not exist.
+ * @returns  a retrieved value, or passed default value, or undefined.
+ * @see      {@link http://wiki.greasespot.net/GM_getValue}
+ */
+declare function GM_getValue(name: string, defaultValue?: any): any;
+declare function GM_getValue(name: string, defaultValue?: string): string;
+declare function GM_getValue(name: string, defaultValue?: number): number;
+declare function GM_getValue(name: string, defaultValue?: boolean): boolean;
+
+/**
+ * Retrieves an array of names stored in the script storage.
+ * @returns  an array of names in the storage.
+ * @see      {@link http://wiki.greasespot.net/GM_listValues}
+ */
+declare function GM_listValues(): string[];
+
+/**
+ * Stores a name / value pair to the script storage.
+ * @param  name   a name of the pair.
+ * @param  value  a value to be stored.
+ * @see    {@link http://wiki.greasespot.net/GM_setValue}
+ */
+declare function GM_setValue(name: string, value: string): void;
+declare function GM_setValue(name: string, value: boolean): void;
+declare function GM_setValue(name: string, value: number): void;
+
+////////////////
+// Resources
+////////////////
+
+/**
+ * Gets a content of a resouce defined by {@link http://wiki.greasespot.net/Metadata_Block#.40resource|@resource}.
+ * @param    resourceName  a name of the resource to get.
+ * @returns  the content of the resource.
+ * @see      {@link http://wiki.greasespot.net/GM_getResourceText}
+ */
+declare function GM_getResourceText(resourceName: string): string;
+
+/**
+ * Gets a URL of a resource defined by {@link http://wiki.greasespot.net/Metadata_Block#.40resource|@resource}.
+ * @param    resourceName  a name of the resource.
+ * @returns  a URL that returns the content of the resource.
+ * @see      {@link http://wiki.greasespot.net/GM_getResourceURL}
+ */
+declare function GM_getResourceURL(resourceName: string): string;
+
+////////////////
+// Utilities
+////////////////
+
+/**
+ * Adds CSS to the content page.
+ * @param  css  a CSS string. It can have multiple style definitions.
+ * @see    {@link http://wiki.greasespot.net/GM_addStyle}
+ */
+declare function GM_addStyle(css: string): void;
+
+/**
+ * Writes a message as a log to the console with the script identifier.
+ * @param  message  a message to be written.
+ * @see    {@link http://wiki.greasespot.net/GM_log}
+ */
+declare function GM_log(message: any): void;
+
+/**
+ * Opens a URL in a new tab.
+ * @param    url  a URL to open.
+ * @returns  window object of the opened tab.
+ * @see      {@link http://wiki.greasespot.net/GM_openInTab}
+ */
+declare function GM_openInTab(url: string): Window;
+
+/**
+ * Registers an item as a submenu of User Script Commands.
+ * @param  caption      a caption of the menu item.
+ * @param  commandFunc  a function to be invoked when the item has been selected.
+ * @param  accessKey    a single character that can be used to select the item by keyboard.
+ *                      It should be a letter in the caption.
+ * @see    {@link http://wiki.greasespot.net/GM_registerMenuCommand}
+ */
+declare function GM_registerMenuCommand(caption: string, commandFunc: Function, accessKey?: string): void;
+
+/**
+ * Sets a text to the clipboard of the opeating system.
+ * @param  text  a text to be set to the clipboard.
+ * @see    {@link http://wiki.greasespot.net/GM_setClipboard}
+ */
+declare function GM_setClipboard(text: string): void;
+
+////////////////
+// XMLHttpRequest
+////////////////
+
+/**
+ * Request options for {@link GM_xmlhttpRequest}.
+ * @see {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Arguments}
+ */
+interface GMXMLHttpRequestOptions {
+    binary?: boolean;
+    context?: any;
+    data?: string;
+    headers?: Object;
+    method: string;
+    onabort?: (response: GMXMLHttpRequestResponse) => any;
+    onerror?: (response: GMXMLHttpRequestResponse) => any;
+    onload?: (response: GMXMLHttpRequestResponse) => any;
+    onprogress?: (response: GMXMLHttpRequestProgressResponse) => any;
+    onreadystatechange?: (response: GMXMLHttpRequestResponse) => any;
+    ontimeout?: (response: GMXMLHttpRequestResponse) => any;
+    overrideMimeType?: string;
+    password?: string;
+    synchronous?: boolean;
+    timeout?: number;
+    upload?: {
+        onabort?: (response: GMXMLHttpRequestResponse) => any;
+        onerror?: (response: GMXMLHttpRequestResponse) => any;
+        onload?: (response: GMXMLHttpRequestResponse) => any;
+        onprogress?: (response: GMXMLHttpRequestProgressResponse) => any;
+    };
+    url: string;
+    user?: string;
+}
+
+/**
+ * Response object for general events of {@link GM_xmlhttpRequest}.
+ * @see {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Response_Object}
+ */
+interface GMXMLHttpRequestResponse {
+    readyState: number;
+    responseHeaders: string;
+    responseText: string;
+    status: number;
+    statusText: string;
+    context: any;
+    finalUrl: string;
+}
+
+/**
+ * Response object for onprogress event of {@link GM_xmlhttpRequest}.
+ */
+interface GMXMLHttpRequestProgressResponse extends GMXMLHttpRequestResponse {
+    lengthComputable: boolean;
+    loaded: number;
+    total: number;
+}
+
+/**
+ * Returned object by {@link GM_xmlhttpRequest} in asynchronous mode.
+ */
+interface GMXMLHttpRequestAsyncResult {
+    abort(): void;
+}
+
+/**
+ * Returned object by {@link GM_xmlhttpRequest} in synchronouse mode.
+ */
+interface GMXMLHttpRequestSyncResult {
+    abort(): void;
+    finalUrl: string;
+    readyState: number;
+    responseHeaders: string;
+    responseText: string;
+    status: number;
+    statusText: string;
+}
+
+/**
+ * Returned object by {@link GM_xmlhttpRequest}.
+ * @see  {@link http://wiki.greasespot.net/GM_xmlhttpRequest#Returns}
+ */
+interface GMXMLHttpRequestResult extends GMXMLHttpRequestAsyncResult, GMXMLHttpRequestSyncResult {
+}
+
+/**
+ * Sends a HTTP request to a URL.
+ * @param    options  options and callbacks for HTTP request.
+ * @returns  an object which can abort the request.
+ *           If the request is sent in the synchronous mode, it also contains the response information.
+ * @see      {@link http://wiki.greasespot.net/GM_setClipboard}
+ */
+declare function GM_xmlhttpRequest(options: GMXMLHttpRequestOptions): GMXMLHttpRequestResult;
diff --git a/types/greasemonkey/v3/tsconfig.json b/types/greasemonkey/v3/tsconfig.json
new file mode 100644
index 0000000000..99631af101
--- /dev/null
+++ b/types/greasemonkey/v3/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "greasemonkey": [
+                "greasemonkey/v3"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "greasemonkey-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/greasemonkey/v3/tslint.json b/types/greasemonkey/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/greasemonkey/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From a0ac17fe074b942beaa6624c1d916d34a4d8da82 Mon Sep 17 00:00:00 2001
From: Alex Plumb <alexplumb@users.noreply.github.com>
Date: Tue, 12 Mar 2019 14:55:49 -0300
Subject: [PATCH 588/924] [linkify-it] Update type definition to support
 breaking changes (#33669)

* Update typings to support breaking changes

* Add semicolon

* Update version number

* Get it working with the example in the readme

* Fix test

* Fix header
---
 types/linkify-it/index.d.ts          | 12 +++++---
 types/linkify-it/linkify-it-tests.ts | 45 +++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/types/linkify-it/index.d.ts b/types/linkify-it/index.d.ts
index ae12f98524..110e0364f3 100644
--- a/types/linkify-it/index.d.ts
+++ b/types/linkify-it/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for linkify-it 2.0.3
+// Type definitions for linkify-it 2.1.0
 // Project: https://github.com/markdown-it/linkify-it
-// Definitions by: Lindsey Smith <https://github.com/praxxis>, Robert Coie <https://github.com/rapropos/typed-linkify-it>
+// Definitions by: Lindsey Smith <https://github.com/praxxis>, Robert Coie <https://github.com/rapropos/typed-linkify-it>, Alex Plumb <https://github.com/alexplumb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare const LinkifyIt: {
     (
@@ -15,11 +16,11 @@ declare const LinkifyIt: {
 };
 
 declare namespace LinkifyIt {
-    type Validate = (text: string, pos: number, self: LinkifyIt) => number;
+    type Validate = (text: string, pos: number, self: LinkifyIt) => number | boolean;
 
     interface FullRule {
         validate: string | RegExp | Validate;
-        normalize?(match: string): string;
+        normalize?: (match: Match) => void;
     }
 
     type Rule = string | FullRule;
@@ -52,6 +53,9 @@ declare namespace LinkifyIt {
         test(text: string): boolean;
         testSchemaAt(text: string, schemaName: string, pos: number): number;
         tlds(list: string | string[], keepOld?: boolean): LinkifyIt;
+        re: {
+            [key: string]: RegExp;
+        };
     }
 }
 
diff --git a/types/linkify-it/linkify-it-tests.ts b/types/linkify-it/linkify-it-tests.ts
index 6186fe2b7f..09e8a11c9c 100644
--- a/types/linkify-it/linkify-it-tests.ts
+++ b/types/linkify-it/linkify-it-tests.ts
@@ -40,7 +40,17 @@ linkifier.add("@", {
         return 42;
     },
     normalize: match => {
-        return "forty-two";
+        match.url = "forty-two";
+    }
+});
+
+// complex rule
+linkifier.add("skype:", {
+    validate: (text, pos, self) => {
+        return 42;
+    },
+    normalize: match => {
+        match.url = "forty-two";
     }
 });
 
@@ -48,3 +58,36 @@ linkifier.add("@", {
 linkifier.add("custom:", {
     validate: /^\/\/\d+/
 });
+
+// Use example from documentation
+linkifier.add('@', {
+    validate: (text, pos, self) => {
+        const tail = text.slice(pos);
+
+        if (!self.re.twitter) {
+            self.re.twitter =  new RegExp(
+                `^([a-zA-Z0-9_]){1,15}(?!_)(?=$|${self.re.src_ZPCc})`
+            );
+        }
+
+        if (self.re.twitter.test(tail)) {
+            // Linkifier allows punctuation chars before prefix,
+            // but we additionally disable `@` ("@@mention" is invalid)
+            if (pos >= 2 && tail[pos - 2] === '@') {
+                return false;
+            }
+
+            const match = tail.match(self.re.twitter);
+
+            if (match) {
+                return match[0].length;
+            }
+
+            return false;
+        }
+        return 0;
+    },
+    normalize: (match) => {
+      match.url = `https://twitter.com/${match.url.replace(/^@/, '')}`;
+    }
+});

From cfb61d28ad32f00e4adcc2e82bba67be16fca0a8 Mon Sep 17 00:00:00 2001
From: Jesse Rogers <djrquazz@gmail.com>
Date: Tue, 12 Mar 2019 13:56:14 -0400
Subject: [PATCH 589/924] [superagent] Add #maxResponseSize method to
 SuperAgent.Request (#33668)

---
 types/superagent/index.d.ts             | 1 +
 types/superagent/superagent-tests.ts    | 6 ++++++
 types/superagent/v2/index.d.ts          | 1 +
 types/superagent/v2/superagent-tests.ts | 6 ++++++
 4 files changed, 14 insertions(+)

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 3c6dbaec8c..fd314a3a32 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -158,6 +158,7 @@ declare namespace request {
         use(fn: Plugin): this;
         withCredentials(): this;
         write(data: string | Buffer, encoding?: string): this;
+        maxResponseSize(size: number): this;
     }
 
     type Plugin = (req: SuperAgentRequest) => void;
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index e7b032907a..4ecc0ca2a0 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -168,6 +168,12 @@ request.get('/user')
 request.get('/user')
     .accept('png');
 
+// Setting max response size
+request
+    .get('/search')
+    .maxResponseSize(1000)
+    .end(callback);
+
 // Query strings
 request
     .post('/')
diff --git a/types/superagent/v2/index.d.ts b/types/superagent/v2/index.d.ts
index 140ae0aefc..e2b8438080 100644
--- a/types/superagent/v2/index.d.ts
+++ b/types/superagent/v2/index.d.ts
@@ -119,6 +119,7 @@ declare namespace request {
         withCredentials(): this;
         write(data: string | Buffer, encoding?: string): this;
         parse(fn: (res: Response, callback: (err: Error | null, body: any) => void) => void): this;
+        maxResponseSize(size: number): this;
     }
 
     type Plugin = (req: Request) => void;
diff --git a/types/superagent/v2/superagent-tests.ts b/types/superagent/v2/superagent-tests.ts
index a9ff954e4d..32fd6fe333 100644
--- a/types/superagent/v2/superagent-tests.ts
+++ b/types/superagent/v2/superagent-tests.ts
@@ -163,6 +163,12 @@ request.get('/user')
 request.get('/user')
     .accept('png');
 
+// Setting max response size
+request
+    .get('/search')
+    .maxResponseSize(1000)
+    .end(callback);
+
 // Query strings
 request
     .post('/')

From 35fe3cad4bea91abe1e29d48d5556d6324e49fc6 Mon Sep 17 00:00:00 2001
From: Josh Oppenheim <elanjoshrand@gmail.com>
Date: Tue, 12 Mar 2019 13:58:26 -0400
Subject: [PATCH 590/924] ReceiveQueueMessageOptions and
 ReceiveSubscriptionOptions  are same (#33672)

---
 types/azure-sb/index.d.ts | 139 ++++++++++++++++++++++----------------
 1 file changed, 79 insertions(+), 60 deletions(-)

diff --git a/types/azure-sb/index.d.ts b/types/azure-sb/index.d.ts
index acb0bed06a..cf458d4080 100644
--- a/types/azure-sb/index.d.ts
+++ b/types/azure-sb/index.d.ts
@@ -4,25 +4,31 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-export import ServiceBusService = require('./lib/servicebusservice');
-export import NotificationHubService = require('./lib/notificationhubservice');
-export import WrapService = require('./lib/wrapservice');
+export import ServiceBusService = require("./lib/servicebusservice");
+export import NotificationHubService = require("./lib/notificationhubservice");
+export import WrapService = require("./lib/wrapservice");
 
-export function createServiceBusService(namespaceOrConnectionString?: string,
-                                        accessKey?: string,
-                                        issuer?: string,
-                                        acsNamespace?: string,
-                                        host?: string,
-                                        authenticationProvider?: object): ServiceBusService;
+export function createServiceBusService(
+    namespaceOrConnectionString?: string,
+    accessKey?: string,
+    issuer?: string,
+    acsNamespace?: string,
+    host?: string,
+    authenticationProvider?: object
+): ServiceBusService;
 
-export function createNotificationHubService(hubName: string,
-                                             endpointOrConnectionString?: string,
-                                             sharedAccessKeyName?: string,
-                                             sharedAccessKeyValue?: string): NotificationHubService;
+export function createNotificationHubService(
+    hubName: string,
+    endpointOrConnectionString?: string,
+    sharedAccessKeyName?: string,
+    sharedAccessKeyValue?: string
+): NotificationHubService;
 
-export function createWrapService(acsHost: string,
-                                  issuer?: string,
-                                  accessKey?: string): WrapService;
+export function createWrapService(
+    acsHost: string,
+    issuer?: string,
+    accessKey?: string
+): WrapService;
 
 export namespace Azure.ServiceBus {
     export type Duration = string;
@@ -33,12 +39,12 @@ export namespace Azure.ServiceBus {
     }
 
     export interface ReceiveQueueMessageOptions {
+        isPeekLock?: boolean;
         timeoutIntervalInS?: number;
     }
 
-    export interface ReceiveSubscriptionMessageOptions extends ReceiveQueueMessageOptions {
-        isPeekLock?: boolean;
-    }
+    export interface ReceiveSubscriptionMessageOptions
+        extends ReceiveQueueMessageOptions {}
 
     interface IBrokerPropertiesResponse {
         readonly DeliveryCount: number;
@@ -150,21 +156,21 @@ export namespace Azure.ServiceBus {
         readonly expiredPushChannel?: string;
         tags?: Array<string>;
         templates?: {
-          [name: string]: {
-            body: string;
-            headers?: any;
-            expiry?: string;
-            tags?: Array<string>;
-          };
+            [name: string]: {
+                body: string;
+                headers?: any;
+                expiry?: string;
+                tags?: Array<string>;
+            };
         };
         secondaryTile?: {
-          [titleId: string]: {
-            pushChannel: string;
-            tags?: Array<string>;
-            templates?: any;
-          };
+            [titleId: string]: {
+                pushChannel: string;
+                tags?: Array<string>;
+                templates?: any;
+            };
         };
-      }
+    }
 
     export interface Response {
         body: Dictionary<string | object>;
@@ -185,23 +191,23 @@ export namespace Azure.ServiceBus {
 
     export namespace Results.Models {
         export enum EntityStatus {
-            Active = 'Active',
-            Creating = 'Creating',
-            Deleting = 'Deleting',
-            Disabled = 'Disabled',
-            ReceiveDisabled = 'ReceiveDisabled',
-            Renaming = 'Renaming',
-            Restoring = 'Restoring',
-            SendDisabled = 'SendDisabled',
-            Unknown = 'Unknown'
+            Active = "Active",
+            Creating = "Creating",
+            Deleting = "Deleting",
+            Disabled = "Disabled",
+            ReceiveDisabled = "ReceiveDisabled",
+            Renaming = "Renaming",
+            Restoring = "Restoring",
+            SendDisabled = "SendDisabled",
+            Unknown = "Unknown"
         }
 
         export enum EntityAvailabilityStatus {
-            Available = 'Available',
-            Limited = 'Limited',
-            Renaming = 'Renaming',
-            Restoring = 'Restoring',
-            Unknown = 'Unknown'
+            Available = "Available",
+            Limited = "Limited",
+            Renaming = "Renaming",
+            Restoring = "Restoring",
+            Unknown = "Unknown"
         }
 
         interface Base {
@@ -240,11 +246,12 @@ export namespace Azure.ServiceBus {
         //   [x: string]: string | Dictionary<string | object>;
         // }
 
-        export const ActiveMessageCount = 'd2p1:ActiveMessageCount';
-        export const DeadLetterMessageCount = 'd2p1:DeadLetterMessageCount';
-        export const ScheduledMessageCount = 'd2p1:ScheduledMessageCount';
-        export const TransferMessageCount = 'd2p1:TransferMessageCount';
-        export const TransferDeadLetterMessageCount = 'd2p1:TransferDeadLetterMessageCount';
+        export const ActiveMessageCount = "d2p1:ActiveMessageCount";
+        export const DeadLetterMessageCount = "d2p1:DeadLetterMessageCount";
+        export const ScheduledMessageCount = "d2p1:ScheduledMessageCount";
+        export const TransferMessageCount = "d2p1:TransferMessageCount";
+        export const TransferDeadLetterMessageCount =
+            "d2p1:TransferDeadLetterMessageCount";
 
         export interface Topic extends ExtendedBase {
             AccessedAt: DateString;
@@ -314,31 +321,43 @@ export namespace Azure.ServiceBus {
     /*
      * Callbacks
      */
-    export type ResponseCallback = (error: Error | null, response: Response) => void;
+    export type ResponseCallback = (
+        error: Error | null,
+        response: Response
+    ) => void;
 
-    export type ResultAndResponseCallback = (error: Error | null,
-                                             result: boolean | Results.Models.Base | Results.Models.Base[],
-                                             response: Response) => void;
+    export type ResultAndResponseCallback = (
+        error: Error | null,
+        result: boolean | Results.Models.Base | Results.Models.Base[],
+        response: Response
+    ) => void;
 
-    export type TypedResultAndResponseCallback<T> = (error: Error | null,
-                                                     result: T,
-                                                     response: Response) => void;
+    export type TypedResultAndResponseCallback<T> = (
+        error: Error | null,
+        result: T,
+        response: Response
+    ) => void;
 
     /*
      * Options interfaces with all properties as optional
      */
     export type BrokerProperties = Partial<IBrokerProperties>;
-    export type BrokerPropertiesResponse = IBrokerPropertiesResponse & Partial<IBrokerProperties>;
+    export type BrokerPropertiesResponse = IBrokerPropertiesResponse &
+        Partial<IBrokerProperties>;
     export type CreateQueueOptions = Partial<IQueueOptions>;
     export type CreateTopicOptions = Partial<ICreateTopicOptions>;
-    export type CreateTopicIfNotExistsOptions = Partial<ICreateTopicIfNotExistsOptions>;
+    export type CreateTopicIfNotExistsOptions = Partial<
+        ICreateTopicIfNotExistsOptions
+    >;
     export type CreateSubscriptionOptions = Partial<ICreateSubscriptionOptions>;
     export type ListSubscriptionsOptions = Partial<PaginationOptions>;
     export type ListRulesOptions = Partial<PaginationOptions>;
     export type ListTopicsOptions = Partial<PaginationOptions>;
     export type ListQueuesOptions = Partial<PaginationOptions>;
     export type CreateRuleOptions = Partial<ICreateRuleOptions>;
-    export type CreateNotificationHubOptions = Partial<ICreateNotificationHubOptions>;
+    export type CreateNotificationHubOptions = Partial<
+        ICreateNotificationHubOptions
+    >;
     export type ListNotificationHubsOptions = Partial<PaginationOptions>;
 
     export type MessageOrName = Message | string;

From de6ae2ea6f5972a07a2d73c85e8b049c3fe63789 Mon Sep 17 00:00:00 2001
From: Spencer Miskoviak <5247455+skovy@users.noreply.github.com>
Date: Tue, 12 Mar 2019 10:59:04 -0700
Subject: [PATCH 591/924] [reserved-words] add type definitions for the
 reserved-words package (#33741)

* add reserved-words type definitions

* Review feedback: remove namespace, esModuleInterop and add KEYWORDS
---
 types/reserved-words/index.d.ts              | 40 ++++++++++++++++++++
 types/reserved-words/reserved-words-tests.ts | 24 ++++++++++++
 types/reserved-words/tsconfig.json           | 23 +++++++++++
 types/reserved-words/tslint.json             |  1 +
 4 files changed, 88 insertions(+)
 create mode 100644 types/reserved-words/index.d.ts
 create mode 100644 types/reserved-words/reserved-words-tests.ts
 create mode 100644 types/reserved-words/tsconfig.json
 create mode 100644 types/reserved-words/tslint.json

diff --git a/types/reserved-words/index.d.ts b/types/reserved-words/index.d.ts
new file mode 100644
index 0000000000..b01b539324
--- /dev/null
+++ b/types/reserved-words/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for reserved-words 0.1
+// Project: https://github.com/zxqfox/reserved-words#readme
+// Definitions by: Spencer Miskoviak <https://github.com/skovy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+export type Dialect =
+    | "es3"
+    | 3
+    | "es5"
+    | 5
+    | "es2015"
+    | 6
+    | "es7"
+    | 7
+    | "es6"
+    | "next";
+
+export interface Keywords {
+    [index: string]: {
+        [index: string]: true;
+    };
+}
+
+export const KEYWORDS: Keywords;
+
+/**
+ * Checks a word for being a reserved word and returns true if the provided
+ * identifier string is a reserved word in some ECMAScript dialect.
+ *
+ * @param word word to check
+ * @param dialect dialect or version
+ * @param strict strict mode additionally checks whether word is a keyword or
+ * future reserved word under strict mode.
+ */
+export function check(
+    word: string,
+    dialect?: Dialect,
+    strict?: boolean
+): boolean;
diff --git a/types/reserved-words/reserved-words-tests.ts b/types/reserved-words/reserved-words-tests.ts
new file mode 100644
index 0000000000..b664d12871
--- /dev/null
+++ b/types/reserved-words/reserved-words-tests.ts
@@ -0,0 +1,24 @@
+import { check, Dialect, KEYWORDS } from "reserved-words";
+
+const dialect: Dialect = "es3";
+
+// $ExpectType boolean
+check("while");
+
+// $ExpectType boolean
+check("while", "es6");
+
+// $ExpectType boolean
+check("while", "es6", true);
+
+// $ExpectType boolean
+check("yield", 3);
+
+// $ExpectError
+check("yield", 1);
+
+// $ExpectError
+check("yield", "es4");
+
+// $ExpectType true
+KEYWORDS["6-strict"]["break"];
diff --git a/types/reserved-words/tsconfig.json b/types/reserved-words/tsconfig.json
new file mode 100644
index 0000000000..104c0d9ca9
--- /dev/null
+++ b/types/reserved-words/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "reserved-words-tests.ts"
+    ]
+}
diff --git a/types/reserved-words/tslint.json b/types/reserved-words/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/reserved-words/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 64ad0ec6c22a618e000ce16b8baad15f4f9daa9f Mon Sep 17 00:00:00 2001
From: Aaron Ross <superhawk610@gmail.com>
Date: Tue, 12 Mar 2019 13:59:20 -0400
Subject: [PATCH 592/924] add dns_sd static export (#33676)

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

diff --git a/types/mdns/index.d.ts b/types/mdns/index.d.ts
index a51d6cf04a..1ec301f4dd 100644
--- a/types/mdns/index.d.ts
+++ b/types/mdns/index.d.ts
@@ -118,6 +118,7 @@ declare namespace MDNS {
     var Browser:BrowserStatic;
     var ServiceType:ServiceType;
     var rst:DefaultResolverSequenceTasks;
+    var dns_sd:any;
 
     // static functions
 

From 25e94bd60087f9eecb6ace433f299d93abd73a84 Mon Sep 17 00:00:00 2001
From: Roy Freij <roy.freij@gmail.com>
Date: Tue, 12 Mar 2019 19:00:36 +0100
Subject: [PATCH 593/924]  Added namespace for camelcase-keys (#33683)

* Added namespace for camelcase-keys

* Updated version
---
 types/camelcase-keys/index.d.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/camelcase-keys/index.d.ts b/types/camelcase-keys/index.d.ts
index f6be6b7f03..e29a576e6b 100644
--- a/types/camelcase-keys/index.d.ts
+++ b/types/camelcase-keys/index.d.ts
@@ -1,7 +1,15 @@
-// Type definitions for camelcase-keys 4.0
+// Type definitions for camelcase-keys 4.1
 // Project: https://github.com/sindresorhus/camelcase-keys#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export = camelcaseKeys;
 declare function camelcaseKeys(input: any, options?: { exclude?: string[] | RegExp[], deep?: boolean }): any;
+
+declare namespace camelcaseKeys {
+    interface Options {
+        deep?: boolean;
+        exclude?: Array<string | RegExp>;
+    }
+}

From f8758c64adc43a687bc59d74cba0e4dfba43309d Mon Sep 17 00:00:00 2001
From: "A.T" <atkit@users.noreply.github.com>
Date: Tue, 12 Mar 2019 19:01:05 +0100
Subject: [PATCH 594/924] Added playbackRate parameter to onPlaybackRateChange
 callback, and specified types for resizeMode/posterResizeMode (#33686)

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

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 4ce9bf9b2d..88e19ae7a9 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -57,7 +57,8 @@ export interface VideoProperties extends ViewProps {
   /* Wrapper component */
   // Opaque type returned by require('./video.mp4')
   source: { uri?: string } | number;
-  resizeMode?: string;
+  resizeMode?: "stretch" | "contain" | "cover" | "none"; // via Image#resizeMode
+  posterResizeMode?: "stretch" | "contain" | "cover" | "none"; // via Image#resizeMode
   poster?: string;
   repeat?: boolean;
   paused?: boolean;
@@ -92,7 +93,7 @@ export interface VideoProperties extends ViewProps {
   onReadyForDisplay?(): void;
   onPlaybackStalled?(): void;
   onPlaybackResume?(): void;
-  onPlaybackRateChange?(): void;
+  onPlaybackRateChange?(data: { playbackRate: number }): void;
   onAudioFocusChanged?(): void;
   onAudioBecomingNoisy?(): void;
   selectedTextTrack?: {
diff --git a/types/react-native-video/react-native-video-tests.tsx b/types/react-native-video/react-native-video-tests.tsx
index 2df7edfccd..d747c9890b 100644
--- a/types/react-native-video/react-native-video-tests.tsx
+++ b/types/react-native-video/react-native-video-tests.tsx
@@ -9,4 +9,6 @@ import Video from 'react-native-video';
         console.log(data.canPlayFastForward, data.canPlayReverse, data.canPlaySlowForward, data.canPlaySlowReverse,
         data.canStepBackward, data.canStepForward, data.currentTime, data.duration, data.naturalSize.height, data.naturalSize.width, data.naturalSize.orientation);
     }}
+    onPlaybackRateChange={({playbackRate}) => console.log(playbackRate)}
+    posterResizeMode={"cover"}
 />;

From 45307b03ae6b740ad616032f950e014da6b91eee Mon Sep 17 00:00:00 2001
From: bangbang93 <bangbang93@163.com>
Date: Wed, 13 Mar 2019 02:01:32 +0800
Subject: [PATCH 595/924] add dts for dingtalk-robot-sender (#33802)

* add dts for dingtalk-robot-sender

* downgrade axios
---
 .../dingtalk-robot-sender-tests.ts            |  15 ++
 types/dingtalk-robot-sender/index.d.ts        | 154 ++++++++++++++++++
 types/dingtalk-robot-sender/package.json      |   6 +
 types/dingtalk-robot-sender/tsconfig.json     |  23 +++
 types/dingtalk-robot-sender/tslint.json       |   1 +
 5 files changed, 199 insertions(+)
 create mode 100644 types/dingtalk-robot-sender/dingtalk-robot-sender-tests.ts
 create mode 100644 types/dingtalk-robot-sender/index.d.ts
 create mode 100644 types/dingtalk-robot-sender/package.json
 create mode 100644 types/dingtalk-robot-sender/tsconfig.json
 create mode 100644 types/dingtalk-robot-sender/tslint.json

diff --git a/types/dingtalk-robot-sender/dingtalk-robot-sender-tests.ts b/types/dingtalk-robot-sender/dingtalk-robot-sender-tests.ts
new file mode 100644
index 0000000000..9dc40de55b
--- /dev/null
+++ b/types/dingtalk-robot-sender/dingtalk-robot-sender-tests.ts
@@ -0,0 +1,15 @@
+import ChatBot = require('dingtalk-robot-sender');
+
+const bot = new ChatBot({
+  baseUrl: 'https://oapi.dingtalk.com/robot/send',
+  accessToken: 'some token',
+});
+
+bot.send({
+  msgtype: 'text',
+  text: {
+    content: '123',
+  },
+});
+
+bot.text('123');
diff --git a/types/dingtalk-robot-sender/index.d.ts b/types/dingtalk-robot-sender/index.d.ts
new file mode 100644
index 0000000000..1a8613c68e
--- /dev/null
+++ b/types/dingtalk-robot-sender/index.d.ts
@@ -0,0 +1,154 @@
+// Type definitions for dingtalk-robot-sender 1.1
+// Project: https://github.com/x-cold/dingtalk-robot
+// Definitions by: bangbang93 <https://github.com/bangbang93>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+import { AxiosResponse } from 'axios';
+
+interface WebHookOptions {
+    webhook: string;
+    httpclient?: any;
+}
+
+interface BaseUrlOptions {
+    baseUrl: string;
+    accessToken: string;
+    httpclient?: any;
+}
+
+declare namespace Message {
+  interface Text {
+    msgtype: 'text';
+    text: {
+        content: string;
+    };
+    at?: {
+        atMobiles: string[];
+        isAtAll: boolean;
+    };
+  }
+
+  interface Link {
+    msgtype: 'link';
+    link: {
+      text: string;
+      title: string;
+      picUrl: string;
+      messageUrl: string;
+    };
+  }
+
+  interface Markdown {
+    msgtype: 'markdown';
+    markdown: {
+      title: string;
+      text: string;
+      atMobiles: string[];
+      isAtAll: boolean;
+    };
+  }
+
+  interface ActionCard {
+    msgtype: 'actionCard';
+    actionCard: {
+      title: string;
+      text: string;
+      singleTitle?: string;
+      singleURL?: string;
+      hideAvatar: '0' | '1';
+      btnOrientation: '0' | '1';
+      btns?: Array<{
+        title: string;
+        actionURL: string;
+      }>;
+    };
+  }
+
+  interface FeedCardItem {
+    msgtype: 'feedCard';
+    feedCard: {
+      title: string;
+      messageURL: string;
+      picURL: string;
+    };
+  }
+}
+
+type MessageType = Message.Text | Message.Link | Message.Markdown | Message.ActionCard | Message.FeedCardItem;
+
+declare class ChatBot {
+    /**
+     * 机器人工厂，所有的消息推送项目都会调用 this.webhook 接口进行发送
+     *
+     * @param options.webhook 完整的接口地址
+     * @param options.baseUrl 接口地址
+     * @param options.accessToken accessToken
+     * @param options.httpclient 例如 urllib / axios
+     */
+    constructor(options: WebHookOptions | BaseUrlOptions);
+
+    /**
+     * 发送钉钉消息
+     *
+     * @param content 发动的消息对象
+     * @return
+     */
+     send(content: MessageType): Promise<AxiosResponse>;
+
+    /**
+     * 发送纯文本消息，支持@群内成员
+     *
+     * @param content 消息内容
+     * @param at 群内@成员的手机号
+     * @return
+     */
+    text(content: string, at?: Message.Text['at']): Promise<AxiosResponse>;
+
+    /**
+     * 发送单个图文链接
+     *
+     * @param link.title 标题
+     * @param link.text 消息内容
+     * @param link.messageUrl 跳转的Url
+     * @param link.picUrl 图片的链接
+     * @return
+     */
+    link(link: Message.Link['link']): Promise<AxiosResponse>;
+
+    /**
+     * 发送Markdown消息
+     *
+     * @param title 标题
+     * @param text 消息内容(支持Markdown)
+     * @return
+     */
+    markdown(title: string, text: string, at: Message.Text['at']): Promise<AxiosResponse>;
+
+    /**
+     * 发送actionCard(动作卡片)
+     * Ps: 支持多个按钮，支持Markdown
+     *
+     * @param card.title 标题
+     * @param card.text 消息内容
+     * @param card.hideAvatar 隐藏发送者头像(1隐藏，0显示，默认为0)
+     * @param card.btnOrientation 按钮排列的方向(0竖直，1横向，默认为0)
+     * @param card.btn.title 某个按钮标题
+     * @param card.btn.actionURL 某个按钮链接
+     * @return
+     */
+    actionCard(card: Message.ActionCard['actionCard']): Promise<AxiosResponse>;
+
+    /**
+     * 发送feedCard，支持多图文链接
+     * Ps: links可包含多个link，建议不要超过4个
+     *
+     * @param link.title 标题
+     * @param link.text 消息内容
+     * @param link.messageUrl 跳转的Url
+     * @param link.picUrl 图片的链接
+     * @return
+     */
+    feedCard(links: Message.FeedCardItem[]): Promise<AxiosResponse>;
+  }
+
+  export = ChatBot;
diff --git a/types/dingtalk-robot-sender/package.json b/types/dingtalk-robot-sender/package.json
new file mode 100644
index 0000000000..ab98e74e0b
--- /dev/null
+++ b/types/dingtalk-robot-sender/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "axios": "^0.16.1"
+    }
+}
diff --git a/types/dingtalk-robot-sender/tsconfig.json b/types/dingtalk-robot-sender/tsconfig.json
new file mode 100644
index 0000000000..2643990400
--- /dev/null
+++ b/types/dingtalk-robot-sender/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",
+        "dingtalk-robot-sender-tests.ts"
+    ]
+}
diff --git a/types/dingtalk-robot-sender/tslint.json b/types/dingtalk-robot-sender/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dingtalk-robot-sender/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6a36646bbf955adfe9818c8254a3942ba407dc20 Mon Sep 17 00:00:00 2001
From: Connor Schlesiger <connor@schlesiger.ca>
Date: Tue, 12 Mar 2019 14:02:40 -0400
Subject: [PATCH 596/924] [@types/why-did-you-update] Add missing properties to
 `Options` interface (#33810)

* Add missing properties to `Options` interface

The options interface was missing some options outlined here: https://github.com/maicki/why-did-you-update#options

* Make notifier optional
---
 types/why-did-you-update/index.d.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/types/why-did-you-update/index.d.ts b/types/why-did-you-update/index.d.ts
index f9d1a60939..6761e94cce 100644
--- a/types/why-did-you-update/index.d.ts
+++ b/types/why-did-you-update/index.d.ts
@@ -7,9 +7,25 @@
 /// <reference types="react" />
 
 declare module "why-did-you-update" {
+    interface Diffs {
+        name: string;
+        prev: any;
+        next: any;
+        type: any;
+    }
+    
 	interface Options {
 		include?: RegExp;
 		exclude?: RegExp;
+        groupByComment?: boolean;
+        collapseComponentGroups?: boolean;
+        notifier?: (
+            groupByComponent: boolean,
+            collapseComponentGroups: boolean,
+            displayName: string,
+            diffs: Diffs[]
+        ) => void;
 	}
+    
 	export function whyDidYouUpdate(react: typeof React, options?: Options): void;
 }

From 9f22e47992ab214c5b09be59d8c28b757dbb5a2d Mon Sep 17 00:00:00 2001
From: jonasrk <jonasrk@users.noreply.github.com>
Date: Tue, 12 Mar 2019 18:05:51 +0000
Subject: [PATCH 597/924] react-native-share - url is optional (#33768)

url is optional -> see https://github.com/react-native-community/react-native-share/blame/master/README.md#L192
---
 types/react-native-share/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-share/index.d.ts b/types/react-native-share/index.d.ts
index bf382a8b2c..7ea5025a6e 100644
--- a/types/react-native-share/index.d.ts
+++ b/types/react-native-share/index.d.ts
@@ -23,7 +23,7 @@ interface ShareSingleReturn {
 }
 
 interface Options {
-    url: string;
+    url?: string;
     urls?: string[];
     type?: string;
     message?: string;

From 4cce72c390b746dd85543b4a8379cf4977582893 Mon Sep 17 00:00:00 2001
From: Sunil Pai <threepointone@oculus.com>
Date: Tue, 12 Mar 2019 20:06:02 +0000
Subject: [PATCH 598/924] remove Sunil Pai from author list (#33647)

I don't know typescript/these types well enough to comment on the PRs, so removing myself from the list. Thank you!
---
 types/react/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index dd7756d2b2..973c87ec1f 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -20,7 +20,6 @@
 //                 Frank Li <https://github.com/franklixuefei>
 //                 Jessica Franco <https://github.com/Jessidhia>
 //                 Paul Sherman <https://github.com/pshrmn>
-//                 Sunil Pai <https://github.com/threepointone>
 //                 Saransh Kataria <https://github.com/saranshkataria>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8

From ba8a93471a11256fab489d95ab481d7a2a2384ac Mon Sep 17 00:00:00 2001
From: Chris Moyer <kopertop@gmail.com>
Date: Tue, 12 Mar 2019 17:08:04 -0400
Subject: [PATCH 599/924] algoliasearch: Added "clickAnalytics" boolean option
 (#33816)

* Added "clickAnalytics" boolean option to Algoliasearch.

The clickAnalytics definition allows us to track clicks using
"search-insights". See: https://www.algolia.com/doc/api-reference/api-parameters/clickAnalytics/

* algoliasearch: Added "clickAnalytics" to tests

* algoliasearch: Bumped version number
---
 types/algoliasearch/algoliasearch-tests.ts | 1 +
 types/algoliasearch/index.d.ts             | 8 +++++++-
 types/algoliasearch/lite/index.d.ts        | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index 1d588f2090..fa6e29dbab 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -148,6 +148,7 @@ let _algoliaQueryParameters: QueryParameters = {
   tagFilters: [''],
   facetFilters: [''],
   analytics: false,
+  clickAnalytics: true,
   analyticsTags: [''],
   synonyms: true,
   replaceSynonymsInHighlight: false,
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 1dc50603c7..86cedc9b93 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for algoliasearch-client-js 3.30.0
+// Type definitions for algoliasearch-client-js 3.30.1
 // Project: https://github.com/algolia/algoliasearch-client-js
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 //                 Haroen Viaene <https://github.com/haroenv>
@@ -1426,6 +1426,12 @@ declare namespace algoliasearch {
      * https://www.algolia.com/doc/api-reference/api-parameters/analytics/
      */
     analytics?: boolean;
+    /**
+     * If set to true, enables the Click Analytics feature
+     * default false
+     * https://www.algolia.com/doc/api-reference/api-parameters/clickAnalytics/
+     */
+    clickAnalytics?: boolean;
     /**
      * If set, tag your query with the specified identifiers
      * default: []
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index 74c4b1bf15..2fd13ec2d0 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for algoliasearch-client-js 3.30.0
+// Type definitions for algoliasearch-client-js 3.30.1
 // Project: https://github.com/algolia/algoliasearch-client-js
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 //                 Haroen Viaene <https://github.com/haroenv>
@@ -506,6 +506,12 @@ declare namespace algoliasearch {
      * https://www.algolia.com/doc/api-reference/api-parameters/analytics/
      */
     analytics?: boolean;
+    /**
+     * If set to true, enables the Click Analytics feature
+     * default false
+     * https://www.algolia.com/doc/api-reference/api-parameters/clickAnalytics/
+     */
+    clickAnalytics?: boolean;
     /**
      * If set, tag your query with the specified identifiers
      * default: []

From 1382be09e5853f4abb510f5a5424850ec0773195 Mon Sep 17 00:00:00 2001
From: Flexmonster Pivot Table <flexmonster@users.noreply.github.com>
Date: Tue, 12 Mar 2019 20:08:35 -0100
Subject: [PATCH 600/924] update package to version 2.7 (#33812)

* Updated to 2.7 API

* update package to version 2.7

the package was updated to version 2.7

* 2.7 version tests update

* 2.6 tsconfig update

* package update
---
 types/flexmonster/flexmonster-tests.ts |   6 +-
 types/flexmonster/index.d.ts           | 106 ++++++++++++++++++++-----
 2 files changed, 91 insertions(+), 21 deletions(-)

diff --git a/types/flexmonster/flexmonster-tests.ts b/types/flexmonster/flexmonster-tests.ts
index fb9840c6cb..2deb24ccfc 100644
--- a/types/flexmonster/flexmonster-tests.ts
+++ b/types/flexmonster/flexmonster-tests.ts
@@ -1,7 +1,11 @@
 import Flexmonster = require('flexmonster');
 
 new Flexmonster({
+    componentFolder: '',
     container: 'pivot-container',
+    global: {},
     height: '550px',
-    width: '100%'
+    width: '100%',
+    report: {},
+    toolbar: true
 });
diff --git a/types/flexmonster/index.d.ts b/types/flexmonster/index.d.ts
index fad76ca64d..eeb8ed56d7 100644
--- a/types/flexmonster/index.d.ts
+++ b/types/flexmonster/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for flexmonster 2.6
+// Type definitions for flexmonster 2.7
 // Project: https://flexmonster.com/
 // Definitions by:  Flexmonster <https://github.com/flexmonster>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.9
 
 export as namespace Flexmonster;
 
@@ -10,7 +10,7 @@ declare const Flexmonster: FlexmonsterConstructor;
 export = Flexmonster;
 
 interface FlexmonsterConstructor {
-    new (params: Flexmonster.Params): Flexmonster.Pivot;
+    new(params: Flexmonster.Params): Flexmonster.Pivot;
     (params: Flexmonster.Params): Flexmonster.Pivot;
 }
 
@@ -75,7 +75,7 @@ declare namespace Flexmonster {
         clear(): void;
         clearFilter(hierarchyName: string): void;
         clearXMLACache(proxyUrl: string, databaseId: string, callbackHandler: ((reponse: object) => void) | string, cubeId: string, measuresGroupId: string,
-        username?: string, password?: string): void;
+            username?: string, password?: string): void;
         closeFieldsList(): void;
         collapseAllData(): void;
         collapseData(hierarchyName: string): void;
@@ -93,8 +93,7 @@ declare namespace Flexmonster {
         getColumns(): Hierarchy[];
         getCondition(id: string): ConditionalFormat;
         getData(options: { slice?: Slice }, callbackHandler: ((rawData: any) => void) | string, updateHandler?: ((rawData: any) => void) | string): void;
-        getFilter(hierarchyName: string): FilterItem[];
-        getFilterProperties(hierarchyName: string): FilterProperties;
+        getFilter(hierarchyName: string): Filter;
         getFormat(measureName: string): Format;
         getMeasures(): Measure[];
         getMembers(hierarchyName: string, memberName: string, callbackHandler: ((members: Member[]) => void) | string): Member[];
@@ -123,13 +122,11 @@ declare namespace Flexmonster {
         removeSelection(): void;
         runQuery(slice: Slice): void;
         save(filename: string, destination: string, callbackHandler?: (() => void) | string, url?: string, embedData?: boolean): string;
-        setBottomX(hierarchyName: string, num: number, measure: MeasureObject): void;
-        setFilter(hierarchyName: string, items: string[], negation?: boolean): void;
+        setFilter(hierarchyName: string, filter: Filter): void;
         setFormat(format: Format, measureName: string): void;
         setOptions(options: Options): void;
         setReport(report: Report): void;
         setSort(hierarchyName: string, sortName: string, customSorting?: string[]): void;
-        setTopX(hierarchyName: string, num: number, measure: MeasureObject): void;
         showCharts(type?: string, multiple?: boolean): void;
         showGrid(): void;
         showGridAndCharts(type?: string, position?: string, multiple?: boolean): void;
@@ -140,18 +137,18 @@ declare namespace Flexmonster {
         version: string;
         fusioncharts?: {
             getData(options: { type: string; slice?: Slice; prepareDataFunction?: (rawData: any) => any }, callbackHandler: ((rawData: any) => void) | string,
-            updateHandler?: ((rawData: any) => void) | string): void;
+                updateHandler?: ((rawData: any) => void) | string): void;
             getNumberFormat(format: object): object;
         };
         googlecharts?: {
             getData(options: { type?: string; slice?: Slice; prepareDataFunction?: (rawData: any) => any }, callbackHandler: ((rawData: any) => void) | string,
-            updateHandler?: ((rawData: any) => void) | string): void;
+                updateHandler?: ((rawData: any) => void) | string): void;
             getNumberFormat(format: object): object;
             getNumberFormatPattern(format: object): string;
         };
         highcharts?: {
             getData(options: { type?: string; slice?: Slice; xAxisType?: string; valuesOnly?: boolean, withDrilldown?: boolean, prepareDataFunction?: (rawData: any) => any },
-            callbackHandler: ((rawData: any) => void) | string, updateHandler?: ((rawData: any) => void) | string): void;
+                callbackHandler: ((rawData: any) => void) | string, updateHandler?: ((rawData: any) => void) | string): void;
             getAxisFormat(format: object): string;
             getPointXFormat(format: object): string;
             getPointYFormat(format: object): string;
@@ -194,7 +191,11 @@ declare namespace Flexmonster {
         username?: string;
         password?: string;
         requestHeader?: object;
-        subquery?: string;
+        subquery?: string | object;
+        // elasticsearch
+        host?: string | string[] | object;
+        index?: string;
+        mapping?: object;
     }
 
     interface Slice {
@@ -256,6 +257,11 @@ declare namespace Flexmonster {
             grandTotalsPosition?: string;
             drillThroughMaxRows?: number;
         };
+        filter?: {
+            timezoneOffset?: number;
+            weekOffset?: number;
+            dateFormat?: string;
+        };
         configuratorActive?: boolean;
         configuratorButton?: boolean;
         dateTimezoneOffset?: number;
@@ -354,18 +360,78 @@ declare namespace Flexmonster {
     interface Hierarchy {
         caption?: string;
         dimensionName?: string;
-        filter?: {
-            members?: string[];
-            negation?: boolean;
-            measure?: MeasureObject;
-            quantity?: number;
-            type?: string;
-        };
+        filter?: Filter;
         sortName?: string;
         sortOrder?: string[];
         uniqueName?: string;
     }
 
+    interface Filter {
+        members?: string[];
+        exclude?: string[];
+        include?: string[];
+        query?: NumberQuery | LabelQuery | DateQuery | TimeQuery | ValueQuery;
+        measure?: string | MeasureObject;
+    }
+
+    interface NumberQuery {
+        equal?: number;
+        not_equal?: number;
+        greater?: number;
+        greater_equal?: number;
+        less?: number;
+        less_equal?: number;
+        between?: number[];
+        not_between?: number[];
+    }
+
+    interface LabelQuery {
+        equal?: string;
+        not_equal?: string;
+        begin?: string;
+        not_begin?: string;
+        end?: string;
+        not_end?: string;
+        contain?: string;
+        not_contain?: string;
+        greater?: string;
+        greater_equal?: string;
+        less?: string;
+        less_equal?: string;
+        between?: string[];
+        not_between?: string[];
+    }
+
+    interface DateQuery {
+        equal?: string;
+        not_equal?: string;
+        before?: string;
+        before_equal?: string;
+        after?: string;
+        after_equal?: string;
+        between?: string[];
+        not_between?: string[];
+        last?: string;
+        current?: string;
+        next?: string;
+    }
+
+    interface TimeQuery {
+        equal?: string;
+        not_equal?: string;
+        greater?: string;
+        greater_equal?: string;
+        less?: string;
+        less_equal?: string;
+        between?: string[];
+        not_between?: string[];
+    }
+
+    interface ValueQuery extends NumberQuery {
+        top?: number;
+        bottom?: number;
+    }
+
     interface Measure {
         uniqueName?: string;
         active?: boolean;

From 4da4730d44877f19abe9e076af3407b2d8cc6ae4 Mon Sep 17 00:00:00 2001
From: Sachin A <asachin92@gmail.com>
Date: Tue, 12 Mar 2019 14:12:54 -0700
Subject: [PATCH 601/924]  mkcert npm package typings (#33819)

* mkcert package typings

* Fixed linting errors

* Fixed tests
---
 types/mkcert/index.d.ts      | 33 +++++++++++++++++++++++++++++++++
 types/mkcert/mkcert-tests.ts |  4 ++++
 types/mkcert/tsconfig.json   | 23 +++++++++++++++++++++++
 types/mkcert/tslint.json     |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/mkcert/index.d.ts
 create mode 100644 types/mkcert/mkcert-tests.ts
 create mode 100644 types/mkcert/tsconfig.json
 create mode 100644 types/mkcert/tslint.json

diff --git a/types/mkcert/index.d.ts b/types/mkcert/index.d.ts
new file mode 100644
index 0000000000..ce2e844b48
--- /dev/null
+++ b/types/mkcert/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for mkcert 1.2
+// Project: https://github.com/Subash/mkcert/
+// Definitions by: Sachin Arunkumar <https://github.com/asachin96>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Type which represent's generated certificate
+export interface Certificate {
+    cert: string;
+    key: string;
+}
+
+// Type which represent's CA certificate generation input parameters
+export interface CACertificateInfo {
+    organization: string;
+    countryCode: string;
+    state: string;
+    locality: string;
+    validityDays: number;
+}
+
+// Type which represent's certificate generation input parameters
+export interface CertificateInfo {
+    domains: string[];
+    validityDays: number;
+    caKey: string;
+    caCert: string;
+}
+
+// Api to create a Certificate Authority
+export function createCA(caCerticateInfo: CACertificateInfo): Promise<Certificate>;
+
+// Api to create a Certificate
+export function createCert(certicateInfo: CertificateInfo): Promise<Certificate>;
diff --git a/types/mkcert/mkcert-tests.ts b/types/mkcert/mkcert-tests.ts
new file mode 100644
index 0000000000..218ca0e693
--- /dev/null
+++ b/types/mkcert/mkcert-tests.ts
@@ -0,0 +1,4 @@
+import { createCA, createCert } from 'mkcert';
+
+createCA({countryCode: "US", locality: "Redmond", organization: "test cert", state: "WA", validityDays: 365}); // $ExpectType Promise<Certificate>
+createCert({domains: ["localhost"], caKey : "test key", caCert: "test cert", validityDays: 365}); // $ExpectType Promise<Certificate>
diff --git a/types/mkcert/tsconfig.json b/types/mkcert/tsconfig.json
new file mode 100644
index 0000000000..e01c1ea6ed
--- /dev/null
+++ b/types/mkcert/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",
+        "mkcert-tests.ts"
+    ]
+}
diff --git a/types/mkcert/tslint.json b/types/mkcert/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mkcert/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6e1c152112b41eb5068a5dcb2064f2ea73a6dc3c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 15:38:40 -0700
Subject: [PATCH 602/924] Bump boxen deprecation version

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index c062663070..16ff9b10a3 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -202,7 +202,7 @@
             "libraryName": "boxen",
             "typingsPackageName": "boxen",
             "sourceRepoURL": "https://github.com/sindresorhus/boxen",
-            "asOfVersion": "3.0.0"
+            "asOfVersion": "3.0.1"
         },
         {
             "libraryName": "Bugsnag Browser",

From 9f7290f1d39a73c690bdc8159f5d58800e2030e4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 15:49:06 -0700
Subject: [PATCH 603/924] Bump deprecated version of copy-text-to-clipboard

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 16ff9b10a3..6cda9244a1 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -304,7 +304,7 @@
             "libraryName": "copy-text-to-clipboard",
             "typingsPackageName": "copy-text-to-clipboard",
             "sourceRepoURL": "https://github.com/sindresorhus/copy-text-to-clipboard",
-            "asOfVersion": "2.0.0"
+            "asOfVersion": "2.0.1"
         },
         {
             "libraryName": "cordova-plugin-battery-status",

From 86c6593d92fda1bbd3178452a5a165935ba565f9 Mon Sep 17 00:00:00 2001
From: saranshkataria <saransh@wisdomgeek.com>
Date: Tue, 12 Mar 2019 16:22:58 -0700
Subject: [PATCH 604/924] added tests for maxFontSizeMultiplier

---
 types/react-native/test/index.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 622e2b28c8..74f8b6a9b5 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -834,6 +834,8 @@ const NativeIDTest = () => (
     </ScrollView>
 );
 
+const MaxFontSizeMultiplierTest = () => <Text maxFontSizeMultiplier={0}>Text</Text>;
+
 const ShareTest = () => {
     Share.share(
         { title: "title", message: "message" },

From a63ed23daeb99a0c9d26af5b290de666eaafaf19 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:27:21 -0700
Subject: [PATCH 605/924] Bump deprecated version of other failing packages

---
 notNeededPackages.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 6cda9244a1..5f998b0b6c 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -424,13 +424,13 @@
             "libraryName": "cp-file",
             "typingsPackageName": "cp-file",
             "sourceRepoURL": "https://github.com/sindresorhus/cp-file",
-            "asOfVersion": "6.1.0"
+            "asOfVersion": "6.1.1"
         },
         {
             "libraryName": "cpy",
             "typingsPackageName": "cpy",
             "sourceRepoURL": "https://github.com/sindresorhus/cpy",
-            "asOfVersion": "7.1.0"
+            "asOfVersion": "7.1.1"
         },
         {
             "libraryName": "cypress",
@@ -454,7 +454,7 @@
             "libraryName": "decamelize",
             "typingsPackageName": "decamelize",
             "sourceRepoURL": "https://github.com/sindresorhus/decamelize",
-            "asOfVersion": "3.0.0"
+            "asOfVersion": "3.0.1"
         },
         {
             "libraryName": "decimal.js",
@@ -676,7 +676,7 @@
             "libraryName": "file-type",
             "typingsPackageName": "file-type",
             "sourceRepoURL": "https://github.com/sindresorhus/file-type",
-            "asOfVersion": "10.9.0"
+            "asOfVersion": "10.9.1"
         },
         {
             "libraryName": "FineUploader",
@@ -825,8 +825,8 @@
         {
             "libraryName": "humanize-string",
             "typingsPackageName": "humanize-string",
-            "sourceRepoURL": "ttps://github.com/sindresorhus/humanize-string",
-            "asOfVersion": "2.0.0"
+            "sourceRepoURL": "https://github.com/sindresorhus/humanize-string",
+            "asOfVersion": "2.0.1"
         },
         {
             "libraryName": "i18next-browser-languagedetector",
@@ -856,7 +856,7 @@
             "libraryName": "image-type",
             "typingsPackageName": "image-type",
             "sourceRepoURL": "https://github.com/sindresorhus/image-type",
-            "asOfVersion": "4.0.0"
+            "asOfVersion": "4.0.1"
         },
         {
             "libraryName": "immutability-helper",
@@ -946,7 +946,7 @@
             "libraryName": "is-svg",
             "typingsPackageName": "is-svg",
             "sourceRepoURL": "https://github.com/sindresorhus/is-svg",
-            "asOfVersion": "4.0.0"
+            "asOfVersion": "4.0.1"
         },
         {
             "libraryName": "is-upper-case",
@@ -1258,13 +1258,13 @@
             "libraryName": "npm-name",
             "typingsPackageName": "npm-name",
             "sourceRepoURL": "https://github.com/sindresorhus/npm-name",
-            "asOfVersion": "5.2.0"
+            "asOfVersion": "5.2.1"
         },
         {
             "libraryName": "npm-run-path",
             "typingsPackageName": "npm-run-path",
             "sourceRepoURL": "https://github.com/sindresorhus/npm-run-path",
-            "asOfVersion": "3.0.0"
+            "asOfVersion": "3.0.1"
         },
         {
             "libraryName": "Nuka Carousel",
@@ -1330,7 +1330,7 @@
             "libraryName": "p-some",
             "typingsPackageName": "p-some",
             "sourceRepoURL": "https://github.com/sindresorhus/p-some",
-            "asOfVersion": "4.0.0"
+            "asOfVersion": "4.0.1"
         },
         {
             "libraryName": "p-throttle",
@@ -1366,7 +1366,7 @@
             "libraryName": "path-key",
             "typingsPackageName": "path-key",
             "sourceRepoURL": "https://github.com/sindresorhus/path-key",
-            "asOfVersion": "3.0.0"
+            "asOfVersion": "3.0.1"
         },
         {
             "libraryName": "path-to-regexp",
@@ -1462,7 +1462,7 @@
             "libraryName": "ps-list",
             "typingsPackageName": "ps-list",
             "sourceRepoURL": "https://github.com/sindresorhus/ps-list",
-            "asOfVersion": "6.2.0"
+            "asOfVersion": "6.2.1"
         },
         {
             "libraryName": "qiniu",
@@ -1798,7 +1798,7 @@
             "libraryName": "@sindresorhus/slugify",
             "typingsPackageName": "sindresorhus__slugify",
             "sourceRepoURL": "https://github.com/sindresorhus/slugify",
-            "asOfVersion": "0.9.0"
+            "asOfVersion": "0.9.1"
         },
         {
             "libraryName": "sip.js",
@@ -1930,7 +1930,7 @@
             "libraryName": "time-span",
             "typingsPackageName": "time-span",
             "sourceRepoURL": "https://github.com/sindresorhus/time-span",
-            "asOfVersion": "3.0.0"
+            "asOfVersion": "3.0.1"
         },
         {
             "libraryName": "timezonecomplete",
@@ -1948,7 +1948,7 @@
             "libraryName": "trash",
             "typingsPackageName": "trash",
             "sourceRepoURL": "https://github.com/sindresorhus/trash",
-            "asOfVersion": "5.0.0"
+            "asOfVersion": "5.0.1"
         },
         {
             "libraryName": "TsMonad",
@@ -2140,7 +2140,7 @@
             "libraryName": "@xmpp/jid",
             "typingsPackageName": "xmpp__jid",
             "sourceRepoURL": "github.com/node-xmpp/node-xmpp/",
-            "asOfVersion": "1.2.0"
+            "asOfVersion": "1.2.1"
         },
         {
             "libraryName": "xterm.js",
@@ -2158,7 +2158,7 @@
             "libraryName": "zapier-platform-core",
             "typingsPackageName": "zapier-platform-core",
             "sourceRepoURL": "https://github.com/zapier/zapier-platform-core",
-            "asOfVersion": "6.1.0"
+            "asOfVersion": "6.1.1"
         },
         {
             "libraryName": "zetapush-js",

From 3968316064969df7982db45e6c5c06a600cd0087 Mon Sep 17 00:00:00 2001
From: Pine <octref@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:32:57 -0700
Subject: [PATCH 606/924] [@types/vscode] Add 1.14 Extension API (#33815)

* @types/vscode

* Add vscode 1.14 extension API types

* Update tsconfig

* Oops, changed wrong tsconfig.json

* Move dt-header to true

* Wrong file again

* Fix header

* Update license and use full name of Visual Studio Code
---
 types/vscode/index.d.ts      | 8423 ++++++++++++++++++++++++++++++++++
 types/vscode/tsconfig.json   |   16 +
 types/vscode/tslint.json     |   80 +
 types/vscode/vscode-tests.ts |   24 +
 4 files changed, 8543 insertions(+)
 create mode 100644 types/vscode/index.d.ts
 create mode 100644 types/vscode/tsconfig.json
 create mode 100644 types/vscode/tslint.json
 create mode 100644 types/vscode/vscode-tests.ts

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
new file mode 100644
index 0000000000..2af36e84b7
--- /dev/null
+++ b/types/vscode/index.d.ts
@@ -0,0 +1,8423 @@
+// Type definitions for Visual Studio Code 1.14
+// Project: https://github.com/microsoft/vscode-extension-vscode
+// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License.
+ *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Type Definition for Visual Studio Code 1.14 Extension API
+ */
+
+declare module 'vscode' {
+
+	/**
+	 * The version of the editor.
+	 */
+	export const version: string;
+
+	/**
+	 * Represents a reference to a command. Provides a title which
+	 * will be used to represent a command in the UI and, optionally,
+	 * an array of arguments which will be passed to the command handler
+	 * function when invoked.
+	 */
+	export interface Command {
+		/**
+		 * Title of the command, like `save`.
+		 */
+		title: string;
+
+		/**
+		 * The identifier of the actual command handler.
+		 * @see [commands.registerCommand](#commands.registerCommand).
+		 */
+		command: string;
+
+		/**
+		 * A tooltip for for command, when represented in the UI.
+		 */
+		tooltip?: string;
+
+		/**
+		 * Arguments that the command handler should be
+		 * invoked with.
+		 */
+		arguments?: any[];
+	}
+
+	/**
+	 * Represents a line of text, such as a line of source code.
+	 *
+	 * TextLine objects are __immutable__. When a [document](#TextDocument) changes,
+	 * previously retrieved lines will not represent the latest state.
+	 */
+	export interface TextLine {
+
+		/**
+		 * The zero-based line number.
+		 */
+		readonly lineNumber: number;
+
+		/**
+		 * The text of this line without the line separator characters.
+		 */
+		readonly text: string;
+
+		/**
+		 * The range this line covers without the line separator characters.
+		 */
+		readonly range: Range;
+
+		/**
+		 * The range this line covers with the line separator characters.
+		 */
+		readonly rangeIncludingLineBreak: Range;
+
+		/**
+		 * The offset of the first character which is not a whitespace character as defined
+		 * by `/\s/`. **Note** that if a line is all whitespaces the length of the line is returned.
+		 */
+		readonly firstNonWhitespaceCharacterIndex: number;
+
+		/**
+		 * Whether this line is whitespace only, shorthand
+		 * for [TextLine.firstNonWhitespaceCharacterIndex](#TextLine.firstNonWhitespaceCharacterIndex) === [TextLine.text.length](#TextLine.text).
+		 */
+		readonly isEmptyOrWhitespace: boolean;
+	}
+
+	/**
+	 * Represents a text document, such as a source file. Text documents have
+	 * [lines](#TextLine) and knowledge about an underlying resource like a file.
+	 */
+	export interface TextDocument {
+
+		/**
+		 * The associated uri for this document.
+		 *
+		 * *Note* that most documents use the `file`-scheme, which means they are files on disk. However, **not** all documents are
+		 * saved on disk and therefore the `scheme` must be checked before trying to access the underlying file or siblings on disk.
+		 *
+		 * @see [FileSystemProvider](#FileSystemProvider)
+		 * @see [TextDocumentContentProvider](#TextDocumentContentProvider)
+		 */
+		readonly uri: Uri;
+
+		/**
+		 * The file system path of the associated resource. Shorthand
+		 * notation for [TextDocument.uri.fsPath](#TextDocument.uri). Independent of the uri scheme.
+		 */
+		readonly fileName: string;
+
+		/**
+		 * Is this document representing an untitled file which has never been saved yet. *Note* that
+		 * this does not mean the document will be saved to disk, use [`uri.scheme`](#Uri.scheme)
+		 * to figure out where a document will be [saved](#FileSystemProvider), e.g. `file`, `ftp` etc.
+		 */
+		readonly isUntitled: boolean;
+
+		/**
+		 * The identifier of the language associated with this document.
+		 */
+		readonly languageId: string;
+
+		/**
+		 * The version number of this document (it will strictly increase after each
+		 * change, including undo/redo).
+		 */
+		readonly version: number;
+
+		/**
+		 * `true` if there are unpersisted changes.
+		 */
+		readonly isDirty: boolean;
+
+		/**
+		 * `true` if the document have been closed. A closed document isn't synchronized anymore
+		 * and won't be re-used when the same resource is opened again.
+		 */
+		readonly isClosed: boolean;
+
+		/**
+		 * Save the underlying file.
+		 *
+		 * @return A promise that will resolve to true when the file
+		 * has been saved. If the file was not dirty or the save failed,
+		 * will return false.
+		 */
+		save(): Thenable<boolean>;
+
+		/**
+		 * The [end of line](#EndOfLine) sequence that is predominately
+		 * used in this document.
+		 */
+		readonly eol: EndOfLine;
+
+		/**
+		 * The number of lines in this document.
+		 */
+		readonly lineCount: number;
+
+		/**
+		 * Returns a text line denoted by the line number. Note
+		 * that the returned object is *not* live and changes to the
+		 * document are not reflected.
+		 *
+		 * @param line A line number in [0, lineCount).
+		 * @return A [line](#TextLine).
+		 */
+		lineAt(line: number): TextLine;
+
+		/**
+		 * Returns a text line denoted by the position. Note
+		 * that the returned object is *not* live and changes to the
+		 * document are not reflected.
+		 *
+		 * The position will be [adjusted](#TextDocument.validatePosition).
+		 *
+		 * @see [TextDocument.lineAt](#TextDocument.lineAt)
+		 * @param position A position.
+		 * @return A [line](#TextLine).
+		 */
+		lineAt(position: Position): TextLine;
+
+		/**
+		 * Converts the position to a zero-based offset.
+		 *
+		 * The position will be [adjusted](#TextDocument.validatePosition).
+		 *
+		 * @param position A position.
+		 * @return A valid zero-based offset.
+		 */
+		offsetAt(position: Position): number;
+
+		/**
+		 * Converts a zero-based offset to a position.
+		 *
+		 * @param offset A zero-based offset.
+		 * @return A valid [position](#Position).
+		 */
+		positionAt(offset: number): Position;
+
+		/**
+		 * Get the text of this document. A substring can be retrieved by providing
+		 * a range. The range will be [adjusted](#TextDocument.validateRange).
+		 *
+		 * @param range Include only the text included by the range.
+		 * @return The text inside the provided range or the entire text.
+		 */
+		getText(range?: Range): string;
+
+		/**
+		 * Get a word-range at the given position. By default words are defined by
+		 * common separators, like space, -, _, etc. In addition, per language custom
+		 * [word definitions](#LanguageConfiguration.wordPattern) can be defined. It
+		 * is also possible to provide a custom regular expression.
+		 *
+		 * * *Note 1:* A custom regular expression must not match the empty string and
+		 * if it does, it will be ignored.
+		 * * *Note 2:* A custom regular expression will fail to match multiline strings
+		 * and in the name of speed regular expressions should not match words with
+		 * spaces. Use [`TextLine.text`](#TextLine.text) for more complex, non-wordy, scenarios.
+		 *
+		 * The position will be [adjusted](#TextDocument.validatePosition).
+		 *
+		 * @param position A position.
+		 * @param regex Optional regular expression that describes what a word is.
+		 * @return A range spanning a word, or `undefined`.
+		 */
+		getWordRangeAtPosition(position: Position, regex?: RegExp): Range | undefined;
+
+		/**
+		 * Ensure a range is completely contained in this document.
+		 *
+		 * @param range A range.
+		 * @return The given range or a new, adjusted range.
+		 */
+		validateRange(range: Range): Range;
+
+		/**
+		 * Ensure a position is contained in the range of this document.
+		 *
+		 * @param position A position.
+		 * @return The given position or a new, adjusted position.
+		 */
+		validatePosition(position: Position): Position;
+	}
+
+	/**
+	 * Represents a line and character position, such as
+	 * the position of the cursor.
+	 *
+	 * Position objects are __immutable__. Use the [with](#Position.with) or
+	 * [translate](#Position.translate) methods to derive new positions
+	 * from an existing position.
+	 */
+	export class Position {
+
+		/**
+		 * The zero-based line value.
+		 */
+		readonly line: number;
+
+		/**
+		 * The zero-based character value.
+		 */
+		readonly character: number;
+
+		/**
+		 * @param line A zero-based line value.
+		 * @param character A zero-based character value.
+		 */
+		constructor(line: number, character: number);
+
+		/**
+		 * Check if this position is before `other`.
+		 *
+		 * @param other A position.
+		 * @return `true` if position is on a smaller line
+		 * or on the same line on a smaller character.
+		 */
+		isBefore(other: Position): boolean;
+
+		/**
+		 * Check if this position is before or equal to `other`.
+		 *
+		 * @param other A position.
+		 * @return `true` if position is on a smaller line
+		 * or on the same line on a smaller or equal character.
+		 */
+		isBeforeOrEqual(other: Position): boolean;
+
+		/**
+		 * Check if this position is after `other`.
+		 *
+		 * @param other A position.
+		 * @return `true` if position is on a greater line
+		 * or on the same line on a greater character.
+		 */
+		isAfter(other: Position): boolean;
+
+		/**
+		 * Check if this position is after or equal to `other`.
+		 *
+		 * @param other A position.
+		 * @return `true` if position is on a greater line
+		 * or on the same line on a greater or equal character.
+		 */
+		isAfterOrEqual(other: Position): boolean;
+
+		/**
+		 * Check if this position is equal to `other`.
+		 *
+		 * @param other A position.
+		 * @return `true` if the line and character of the given position are equal to
+		 * the line and character of this position.
+		 */
+		isEqual(other: Position): boolean;
+
+		/**
+		 * Compare this to `other`.
+		 *
+		 * @param other A position.
+		 * @return A number smaller than zero if this position is before the given position,
+		 * a number greater than zero if this position is after the given position, or zero when
+		 * this and the given position are equal.
+		 */
+		compareTo(other: Position): number;
+
+		/**
+		 * Create a new position relative to this position.
+		 *
+		 * @param lineDelta Delta value for the line value, default is `0`.
+		 * @param characterDelta Delta value for the character value, default is `0`.
+		 * @return A position which line and character is the sum of the current line and
+		 * character and the corresponding deltas.
+		 */
+		translate(lineDelta?: number, characterDelta?: number): Position;
+
+		/**
+		 * Derived a new position relative to this position.
+		 *
+		 * @param change An object that describes a delta to this position.
+		 * @return A position that reflects the given delta. Will return `this` position if the change
+		 * is not changing anything.
+		 */
+		translate(change: { lineDelta?: number; characterDelta?: number; }): Position;
+
+		/**
+		 * Create a new position derived from this position.
+		 *
+		 * @param line Value that should be used as line value, default is the [existing value](#Position.line)
+		 * @param character Value that should be used as character value, default is the [existing value](#Position.character)
+		 * @return A position where line and character are replaced by the given values.
+		 */
+		with(line?: number, character?: number): Position;
+
+		/**
+		 * Derived a new position from this position.
+		 *
+		 * @param change An object that describes a change to this position.
+		 * @return A position that reflects the given change. Will return `this` position if the change
+		 * is not changing anything.
+		 */
+		with(change: { line?: number; character?: number; }): Position;
+	}
+
+	/**
+	 * A range represents an ordered pair of two positions.
+	 * It is guaranteed that [start](#Range.start).isBeforeOrEqual([end](#Range.end))
+	 *
+	 * Range objects are __immutable__. Use the [with](#Range.with),
+	 * [intersection](#Range.intersection), or [union](#Range.union) methods
+	 * to derive new ranges from an existing range.
+	 */
+	export class Range {
+
+		/**
+		 * The start position. It is before or equal to [end](#Range.end).
+		 */
+		readonly start: Position;
+
+		/**
+		 * The end position. It is after or equal to [start](#Range.start).
+		 */
+		readonly end: Position;
+
+		/**
+		 * Create a new range from two positions. If `start` is not
+		 * before or equal to `end`, the values will be swapped.
+		 *
+		 * @param start A position.
+		 * @param end A position.
+		 */
+		constructor(start: Position, end: Position);
+
+		/**
+		 * Create a new range from number coordinates. It is a shorter equivalent of
+		 * using `new Range(new Position(startLine, startCharacter), new Position(endLine, endCharacter))`
+		 *
+		 * @param startLine A zero-based line value.
+		 * @param startCharacter A zero-based character value.
+		 * @param endLine A zero-based line value.
+		 * @param endCharacter A zero-based character value.
+		 */
+		constructor(startLine: number, startCharacter: number, endLine: number, endCharacter: number);
+
+		/**
+		 * `true` if `start` and `end` are equal.
+		 */
+		isEmpty: boolean;
+
+		/**
+		 * `true` if `start.line` and `end.line` are equal.
+		 */
+		isSingleLine: boolean;
+
+		/**
+		 * Check if a position or a range is contained in this range.
+		 *
+		 * @param positionOrRange A position or a range.
+		 * @return `true` if the position or range is inside or equal
+		 * to this range.
+		 */
+		contains(positionOrRange: Position | Range): boolean;
+
+		/**
+		 * Check if `other` equals this range.
+		 *
+		 * @param other A range.
+		 * @return `true` when start and end are [equal](#Position.isEqual) to
+		 * start and end of this range.
+		 */
+		isEqual(other: Range): boolean;
+
+		/**
+		 * Intersect `range` with this range and returns a new range or `undefined`
+		 * if the ranges have no overlap.
+		 *
+		 * @param range A range.
+		 * @return A range of the greater start and smaller end positions. Will
+		 * return undefined when there is no overlap.
+		 */
+		intersection(range: Range): Range | undefined;
+
+		/**
+		 * Compute the union of `other` with this range.
+		 *
+		 * @param other A range.
+		 * @return A range of smaller start position and the greater end position.
+		 */
+		union(other: Range): Range;
+
+		/**
+		 * Derived a new range from this range.
+		 *
+		 * @param start A position that should be used as start. The default value is the [current start](#Range.start).
+		 * @param end A position that should be used as end. The default value is the [current end](#Range.end).
+		 * @return A range derived from this range with the given start and end position.
+		 * If start and end are not different `this` range will be returned.
+		 */
+		with(start?: Position, end?: Position): Range;
+
+		/**
+		 * Derived a new range from this range.
+		 *
+		 * @param change An object that describes a change to this range.
+		 * @return A range that reflects the given change. Will return `this` range if the change
+		 * is not changing anything.
+		 */
+		with(change: { start?: Position, end?: Position }): Range;
+	}
+
+	/**
+	 * Represents a text selection in an editor.
+	 */
+	export class Selection extends Range {
+
+		/**
+		 * The position at which the selection starts.
+		 * This position might be before or after [active](#Selection.active).
+		 */
+		anchor: Position;
+
+		/**
+		 * The position of the cursor.
+		 * This position might be before or after [anchor](#Selection.anchor).
+		 */
+		active: Position;
+
+		/**
+		 * Create a selection from two positions.
+		 *
+		 * @param anchor A position.
+		 * @param active A position.
+		 */
+		constructor(anchor: Position, active: Position);
+
+		/**
+		 * Create a selection from four coordinates.
+		 *
+		 * @param anchorLine A zero-based line value.
+		 * @param anchorCharacter A zero-based character value.
+		 * @param activeLine A zero-based line value.
+		 * @param activeCharacter A zero-based character value.
+		 */
+		constructor(anchorLine: number, anchorCharacter: number, activeLine: number, activeCharacter: number);
+
+		/**
+		 * A selection is reversed if [active](#Selection.active).isBefore([anchor](#Selection.anchor)).
+		 */
+		isReversed: boolean;
+	}
+
+	/**
+	 * Represents sources that can cause [selection change events](#window.onDidChangeTextEditorSelection).
+	*/
+	export enum TextEditorSelectionChangeKind {
+		/**
+		 * Selection changed due to typing in the editor.
+		 */
+		Keyboard = 1,
+		/**
+		 * Selection change due to clicking in the editor.
+		 */
+		Mouse = 2,
+		/**
+		 * Selection changed because a command ran.
+		 */
+		Command = 3
+	}
+
+	/**
+	 * Represents an event describing the change in a [text editor's selections](#TextEditor.selections).
+	 */
+	export interface TextEditorSelectionChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the selections have changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's selections](#TextEditor.selections).
+		 */
+		selections: Selection[];
+		/**
+		 * The [change kind](#TextEditorSelectionChangeKind) which has triggered this
+		 * event. Can be `undefined`.
+		 */
+		kind?: TextEditorSelectionChangeKind;
+	}
+
+	/**
+	 * Represents an event describing the change in a [text editor's visible ranges](#TextEditor.visibleRanges).
+	 */
+	export interface TextEditorVisibleRangesChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the visible ranges have changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's visible ranges](#TextEditor.visibleRanges).
+		 */
+		visibleRanges: Range[];
+	}
+
+	/**
+	 * Represents an event describing the change in a [text editor's options](#TextEditor.options).
+	 */
+	export interface TextEditorOptionsChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the options have changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's options](#TextEditor.options).
+		 */
+		options: TextEditorOptions;
+	}
+
+	/**
+	 * Represents an event describing the change of a [text editor's view column](#TextEditor.viewColumn).
+	 */
+	export interface TextEditorViewColumnChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the view column has changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's view column](#TextEditor.viewColumn).
+		 */
+		viewColumn: ViewColumn;
+	}
+
+	/**
+	 * Rendering style of the cursor.
+	 */
+	export enum TextEditorCursorStyle {
+		/**
+		 * Render the cursor as a vertical thick line.
+		 */
+		Line = 1,
+		/**
+		 * Render the cursor as a block filled.
+		 */
+		Block = 2,
+		/**
+		 * Render the cursor as a thick horizontal line.
+		 */
+		Underline = 3,
+		/**
+		 * Render the cursor as a vertical thin line.
+		 */
+		LineThin = 4,
+		/**
+		 * Render the cursor as a block outlined.
+		 */
+		BlockOutline = 5,
+		/**
+		 * Render the cursor as a thin horizontal line.
+		 */
+		UnderlineThin = 6
+	}
+
+	/**
+	 * Rendering style of the line numbers.
+	 */
+	export enum TextEditorLineNumbersStyle {
+		/**
+		 * Do not render the line numbers.
+		 */
+		Off = 0,
+		/**
+		 * Render the line numbers.
+		 */
+		On = 1,
+		/**
+		 * Render the line numbers with values relative to the primary cursor location.
+		 */
+		Relative = 2
+	}
+
+	/**
+	 * Represents a [text editor](#TextEditor)'s [options](#TextEditor.options).
+	 */
+	export interface TextEditorOptions {
+
+		/**
+		 * The size in spaces a tab takes. This is used for two purposes:
+		 *  - the rendering width of a tab character;
+		 *  - the number of spaces to insert when [insertSpaces](#TextEditorOptions.insertSpaces) is true.
+		 *
+		 * When getting a text editor's options, this property will always be a number (resolved).
+		 * When setting a text editor's options, this property is optional and it can be a number or `"auto"`.
+		 */
+		tabSize?: number | string;
+
+		/**
+		 * When pressing Tab insert [n](#TextEditorOptions.tabSize) spaces.
+		 * When getting a text editor's options, this property will always be a boolean (resolved).
+		 * When setting a text editor's options, this property is optional and it can be a boolean or `"auto"`.
+		 */
+		insertSpaces?: boolean | string;
+
+		/**
+		 * The rendering style of the cursor in this editor.
+		 * When getting a text editor's options, this property will always be present.
+		 * When setting a text editor's options, this property is optional.
+		 */
+		cursorStyle?: TextEditorCursorStyle;
+
+		/**
+		 * Render relative line numbers w.r.t. the current line number.
+		 * When getting a text editor's options, this property will always be present.
+		 * When setting a text editor's options, this property is optional.
+		 */
+		lineNumbers?: TextEditorLineNumbersStyle;
+	}
+
+	/**
+	 * Represents a handle to a set of decorations
+	 * sharing the same [styling options](#DecorationRenderOptions) in a [text editor](#TextEditor).
+	 *
+	 * To get an instance of a `TextEditorDecorationType` use
+	 * [createTextEditorDecorationType](#window.createTextEditorDecorationType).
+	 */
+	export interface TextEditorDecorationType {
+
+		/**
+		 * Internal representation of the handle.
+		 */
+		readonly key: string;
+
+		/**
+		 * Remove this decoration type and all decorations on all text editors using it.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Represents different [reveal](#TextEditor.revealRange) strategies in a text editor.
+	 */
+	export enum TextEditorRevealType {
+		/**
+		 * The range will be revealed with as little scrolling as possible.
+		 */
+		Default = 0,
+		/**
+		 * The range will always be revealed in the center of the viewport.
+		 */
+		InCenter = 1,
+		/**
+		 * If the range is outside the viewport, it will be revealed in the center of the viewport.
+		 * Otherwise, it will be revealed with as little scrolling as possible.
+		 */
+		InCenterIfOutsideViewport = 2,
+		/**
+		 * The range will always be revealed at the top of the viewport.
+		 */
+		AtTop = 3
+	}
+
+	/**
+	 * Represents different positions for rendering a decoration in an [overview ruler](#DecorationRenderOptions.overviewRulerLane).
+	 * The overview ruler supports three lanes.
+	 */
+	export enum OverviewRulerLane {
+		Left = 1,
+		Center = 2,
+		Right = 4,
+		Full = 7
+	}
+
+	/**
+	 * Describes the behavior of decorations when typing/editing at their edges.
+	 */
+	export enum DecorationRangeBehavior {
+		/**
+		 * The decoration's range will widen when edits occur at the start or end.
+		 */
+		OpenOpen = 0,
+		/**
+		 * The decoration's range will not widen when edits occur at the start of end.
+		 */
+		ClosedClosed = 1,
+		/**
+		 * The decoration's range will widen when edits occur at the start, but not at the end.
+		 */
+		OpenClosed = 2,
+		/**
+		 * The decoration's range will widen when edits occur at the end, but not at the start.
+		 */
+		ClosedOpen = 3
+	}
+
+	/**
+	 * Represents options to configure the behavior of showing a [document](#TextDocument) in an [editor](#TextEditor).
+	 */
+	export interface TextDocumentShowOptions {
+		/**
+		 * An optional view column in which the [editor](#TextEditor) should be shown.
+		 * The default is the [active](#ViewColumn.Active), other values are adjusted to
+		 * be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
+		 * not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside) to open the
+		 * editor to the side of the currently active one.
+		 */
+		viewColumn?: ViewColumn;
+
+		/**
+		 * An optional flag that when `true` will stop the [editor](#TextEditor) from taking focus.
+		 */
+		preserveFocus?: boolean;
+
+		/**
+		 * An optional flag that controls if an [editor](#TextEditor)-tab will be replaced
+		 * with the next editor or if it will be kept.
+		 */
+		preview?: boolean;
+
+		/**
+		 * An optional selection to apply for the document in the [editor](#TextEditor).
+		 */
+		selection?: Range;
+	}
+
+	/**
+	 * A reference to one of the workbench colors as defined in https://code.visualstudio.com/docs/getstarted/theme-color-reference.
+	 * Using a theme color is preferred over a custom color as it gives theme authors and users the possibility to change the color.
+	 */
+	export class ThemeColor {
+
+		/**
+		 * Creates a reference to a theme color.
+		 * @param id of the color. The available colors are listed in https://code.visualstudio.com/docs/getstarted/theme-color-reference.
+		 */
+		constructor(id: string);
+	}
+
+	/**
+	 * A reference to a named icon. Currently only [File](#ThemeIcon.File) and [Folder](#ThemeIcon.Folder) are supported.
+	 * Using a theme icon is preferred over a custom icon as it gives theme authors the possibility to change the icons.
+	 */
+	export class ThemeIcon {
+		/**
+		 * Reference to a icon representing a file. The icon is taken from the current file icon theme or a placeholder icon.
+		 */
+		static readonly File: ThemeIcon;
+
+		/**
+		 * Reference to a icon representing a folder. The icon is taken from the current file icon theme or a placeholder icon.
+		 */
+		static readonly Folder: ThemeIcon;
+
+		private constructor(id: string);
+	}
+
+	/**
+	 * Represents theme specific rendering styles for a [text editor decoration](#TextEditorDecorationType).
+	 */
+	export interface ThemableDecorationRenderOptions {
+		/**
+		 * Background color of the decoration. Use rgba() and define transparent background colors to play well with other decorations.
+		 * Alternatively a color from the color registry can be [referenced](#ThemeColor).
+		 */
+		backgroundColor?: string | ThemeColor;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		outline?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'outline' for setting one or more of the individual outline properties.
+		 */
+		outlineColor?: string | ThemeColor;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'outline' for setting one or more of the individual outline properties.
+		 */
+		outlineStyle?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'outline' for setting one or more of the individual outline properties.
+		 */
+		outlineWidth?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		border?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'border' for setting one or more of the individual border properties.
+		 */
+		borderColor?: string | ThemeColor;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'border' for setting one or more of the individual border properties.
+		 */
+		borderRadius?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'border' for setting one or more of the individual border properties.
+		 */
+		borderSpacing?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'border' for setting one or more of the individual border properties.
+		 */
+		borderStyle?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 * Better use 'border' for setting one or more of the individual border properties.
+		 */
+		borderWidth?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		fontStyle?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		fontWeight?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		textDecoration?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		cursor?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		color?: string | ThemeColor;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		opacity?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		letterSpacing?: string;
+
+		/**
+		 * An **absolute path** or an URI to an image to be rendered in the gutter.
+		 */
+		gutterIconPath?: string | Uri;
+
+		/**
+		 * Specifies the size of the gutter icon.
+		 * Available values are 'auto', 'contain', 'cover' and any percentage value.
+		 * For further information: https://msdn.microsoft.com/en-us/library/jj127316(v=vs.85).aspx
+		 */
+		gutterIconSize?: string;
+
+		/**
+		 * The color of the decoration in the overview ruler. Use rgba() and define transparent colors to play well with other decorations.
+		 */
+		overviewRulerColor?: string | ThemeColor;
+
+		/**
+		 * Defines the rendering options of the attachment that is inserted before the decorated text
+		 */
+		before?: ThemableDecorationAttachmentRenderOptions;
+
+		/**
+		 * Defines the rendering options of the attachment that is inserted after the decorated text
+		 */
+		after?: ThemableDecorationAttachmentRenderOptions;
+	}
+
+	export interface ThemableDecorationAttachmentRenderOptions {
+		/**
+		 * Defines a text content that is shown in the attachment. Either an icon or a text can be shown, but not both.
+		 */
+		contentText?: string;
+		/**
+		 * An **absolute path** or an URI to an image to be rendered in the attachment. Either an icon
+		 * or a text can be shown, but not both.
+		 */
+		contentIconPath?: string | Uri;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		border?: string;
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		borderColor?: string | ThemeColor;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		fontStyle?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		fontWeight?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		textDecoration?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		color?: string | ThemeColor;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		backgroundColor?: string | ThemeColor;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		margin?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		width?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		height?: string;
+	}
+
+	/**
+	 * Represents rendering styles for a [text editor decoration](#TextEditorDecorationType).
+	 */
+	export interface DecorationRenderOptions extends ThemableDecorationRenderOptions {
+		/**
+		 * Should the decoration be rendered also on the whitespace after the line text.
+		 * Defaults to `false`.
+		 */
+		isWholeLine?: boolean;
+
+		/**
+		 * Customize the growing behavior of the decoration when edits occur at the edges of the decoration's range.
+		 * Defaults to `DecorationRangeBehavior.OpenOpen`.
+		 */
+		rangeBehavior?: DecorationRangeBehavior;
+
+		/**
+		 * The position in the overview ruler where the decoration should be rendered.
+		 */
+		overviewRulerLane?: OverviewRulerLane;
+
+		/**
+		 * Overwrite options for light themes.
+		 */
+		light?: ThemableDecorationRenderOptions;
+
+		/**
+		 * Overwrite options for dark themes.
+		 */
+		dark?: ThemableDecorationRenderOptions;
+	}
+
+	/**
+	 * Represents options for a specific decoration in a [decoration set](#TextEditorDecorationType).
+	 */
+	export interface DecorationOptions {
+
+		/**
+		 * Range to which this decoration is applied. The range must not be empty.
+		 */
+		range: Range;
+
+		/**
+		 * A message that should be rendered when hovering over the decoration.
+		 */
+		hoverMessage?: MarkedString | MarkedString[];
+
+		/**
+		 * Render options applied to the current decoration. For performance reasons, keep the
+		 * number of decoration specific options small, and use decoration types wherever possible.
+		 */
+		renderOptions?: DecorationInstanceRenderOptions;
+	}
+
+	export interface ThemableDecorationInstanceRenderOptions {
+		/**
+		 * Defines the rendering options of the attachment that is inserted before the decorated text
+		 */
+		before?: ThemableDecorationAttachmentRenderOptions;
+
+		/**
+		 * Defines the rendering options of the attachment that is inserted after the decorated text
+		 */
+		after?: ThemableDecorationAttachmentRenderOptions;
+	}
+
+	export interface DecorationInstanceRenderOptions extends ThemableDecorationInstanceRenderOptions {
+		/**
+		 * Overwrite options for light themes.
+		 */
+		light?: ThemableDecorationInstanceRenderOptions;
+
+		/**
+		 * Overwrite options for dark themes.
+		 */
+		dark?: ThemableDecorationInstanceRenderOptions;
+	}
+
+	/**
+	 * Represents an editor that is attached to a [document](#TextDocument).
+	 */
+	export interface TextEditor {
+
+		/**
+		 * The document associated with this text editor. The document will be the same for the entire lifetime of this text editor.
+		 */
+		readonly document: TextDocument;
+
+		/**
+		 * The primary selection on this text editor. Shorthand for `TextEditor.selections[0]`.
+		 */
+		selection: Selection;
+
+		/**
+		 * The selections in this text editor. The primary selection is always at index 0.
+		 */
+		selections: Selection[];
+
+		/**
+		 * The current visible ranges in the editor (vertically).
+		 * This accounts only for vertical scrolling, and not for horizontal scrolling.
+		 */
+		readonly visibleRanges: Range[];
+
+		/**
+		 * Text editor options.
+		 */
+		options: TextEditorOptions;
+
+		/**
+		 * The column in which this editor shows. Will be `undefined` in case this
+		 * isn't one of the main editors, e.g an embedded editor, or when the editor
+		 * column is larger than three.
+		 */
+		viewColumn?: ViewColumn;
+
+		/**
+		 * Perform an edit on the document associated with this text editor.
+		 *
+		 * The given callback-function is invoked with an [edit-builder](#TextEditorEdit) which must
+		 * be used to make edits. Note that the edit-builder is only valid while the
+		 * callback executes.
+		 *
+		 * @param callback A function which can create edits using an [edit-builder](#TextEditorEdit).
+		 * @param options The undo/redo behavior around this edit. By default, undo stops will be created before and after this edit.
+		 * @return A promise that resolves with a value indicating if the edits could be applied.
+		 */
+		edit(callback: (editBuilder: TextEditorEdit) => void, options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable<boolean>;
+
+		/**
+		 * Insert a [snippet](#SnippetString) and put the editor into snippet mode. "Snippet mode"
+		 * means the editor adds placeholders and additional cursors so that the user can complete
+		 * or accept the snippet.
+		 *
+		 * @param snippet The snippet to insert in this edit.
+		 * @param location Position or range at which to insert the snippet, defaults to the current editor selection or selections.
+		 * @param options The undo/redo behavior around this edit. By default, undo stops will be created before and after this edit.
+		 * @return A promise that resolves with a value indicating if the snippet could be inserted. Note that the promise does not signal
+		 * that the snippet is completely filled-in or accepted.
+		 */
+		insertSnippet(snippet: SnippetString, location?: Position | Range | Position[] | Range[], options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable<boolean>;
+
+		/**
+		 * Adds a set of decorations to the text editor. If a set of decorations already exists with
+		 * the given [decoration type](#TextEditorDecorationType), they will be replaced.
+		 *
+		 * @see [createTextEditorDecorationType](#window.createTextEditorDecorationType).
+		 *
+		 * @param decorationType A decoration type.
+		 * @param rangesOrOptions Either [ranges](#Range) or more detailed [options](#DecorationOptions).
+		 */
+		setDecorations(decorationType: TextEditorDecorationType, rangesOrOptions: Range[] | DecorationOptions[]): void;
+
+		/**
+		 * Scroll as indicated by `revealType` in order to reveal the given range.
+		 *
+		 * @param range A range.
+		 * @param revealType The scrolling strategy for revealing `range`.
+		 */
+		revealRange(range: Range, revealType?: TextEditorRevealType): void;
+
+		/**
+		 * ~~Show the text editor.~~
+		 *
+		 * @deprecated Use [window.showTextDocument](#window.showTextDocument) instead.
+		 *
+		 * @param column The [column](#ViewColumn) in which to show this editor.
+		 * This method shows unexpected behavior and will be removed in the next major update.
+		 */
+		show(column?: ViewColumn): void;
+
+		/**
+		 * ~~Hide the text editor.~~
+		 *
+		 * @deprecated Use the command `workbench.action.closeActiveEditor` instead.
+		 * This method shows unexpected behavior and will be removed in the next major update.
+		 */
+		hide(): void;
+	}
+
+	/**
+	 * Represents an end of line character sequence in a [document](#TextDocument).
+	 */
+	export enum EndOfLine {
+		/**
+		 * The line feed `\n` character.
+		 */
+		LF = 1,
+		/**
+		 * The carriage return line feed `\r\n` sequence.
+		 */
+		CRLF = 2
+	}
+
+	/**
+	 * A complex edit that will be applied in one transaction on a TextEditor.
+	 * This holds a description of the edits and if the edits are valid (i.e. no overlapping regions, document was not changed in the meantime, etc.)
+	 * they can be applied on a [document](#TextDocument) associated with a [text editor](#TextEditor).
+	 *
+	 */
+	export interface TextEditorEdit {
+		/**
+		 * Replace a certain text region with a new value.
+		 * You can use \r\n or \n in `value` and they will be normalized to the current [document](#TextDocument).
+		 *
+		 * @param location The range this operation should remove.
+		 * @param value The new text this operation should insert after removing `location`.
+		 */
+		replace(location: Position | Range | Selection, value: string): void;
+
+		/**
+		 * Insert text at a location.
+		 * You can use \r\n or \n in `value` and they will be normalized to the current [document](#TextDocument).
+		 * Although the equivalent text edit can be made with [replace](#TextEditorEdit.replace), `insert` will produce a different resulting selection (it will get moved).
+		 *
+		 * @param location The position where the new text should be inserted.
+		 * @param value The new text this operation should insert.
+		 */
+		insert(location: Position, value: string): void;
+
+		/**
+		 * Delete a certain text region.
+		 *
+		 * @param location The range this operation should remove.
+		 */
+		delete(location: Range | Selection): void;
+
+		/**
+		 * Set the end of line sequence.
+		 *
+		 * @param endOfLine The new end of line for the [document](#TextDocument).
+		 */
+		setEndOfLine(endOfLine: EndOfLine): void;
+	}
+
+	/**
+	 * A universal resource identifier representing either a file on disk
+	 * or another resource, like untitled resources.
+	 */
+	export class Uri {
+
+		/**
+		 * Create an URI from a string, e.g. `http://www.msft.com/some/path`,
+		 * `file:///usr/home`, or `scheme:with/path`.
+		 *
+		 * @see [Uri.toString](#Uri.toString)
+		 * @param value The string value of an Uri.
+		 * @return A new Uri instance.
+		 */
+		static parse(value: string): Uri;
+
+		/**
+		 * Create an URI from a file system path. The [scheme](#Uri.scheme)
+		 * will be `file`.
+		 *
+		 * The *difference* between `Uri#parse` and `Uri#file` is that the latter treats the argument
+		 * as path, not as stringified-uri. E.g. `Uri.file(path)` is *not* the same as
+		 * `Uri.parse('file://' + path)` because the path might contain characters that are
+		 * interpreted (# and ?). See the following sample:
+		 * ```ts
+		const good = URI.file('/coding/c#/project1');
+		good.scheme === 'file';
+		good.path === '/coding/c#/project1';
+		good.fragment === '';
+
+		const bad = URI.parse('file://' + '/coding/c#/project1');
+		bad.scheme === 'file';
+		bad.path === '/coding/c'; // path is now broken
+		bad.fragment === '/project1';
+		```
+		 *
+		 * @param path A file system or UNC path.
+		 * @return A new Uri instance.
+		 */
+		static file(path: string): Uri;
+
+		/**
+		 * Use the `file` and `parse` factory functions to create new `Uri` objects.
+		 */
+		private constructor(scheme: string, authority: string, path: string, query: string, fragment: string);
+
+		/**
+		 * Scheme is the `http` part of `http://www.msft.com/some/path?query#fragment`.
+		 * The part before the first colon.
+		 */
+		readonly scheme: string;
+
+		/**
+		 * Authority is the `www.msft.com` part of `http://www.msft.com/some/path?query#fragment`.
+		 * The part between the first double slashes and the next slash.
+		 */
+		readonly authority: string;
+
+		/**
+		 * Path is the `/some/path` part of `http://www.msft.com/some/path?query#fragment`.
+		 */
+		readonly path: string;
+
+		/**
+		 * Query is the `query` part of `http://www.msft.com/some/path?query#fragment`.
+		 */
+		readonly query: string;
+
+		/**
+		 * Fragment is the `fragment` part of `http://www.msft.com/some/path?query#fragment`.
+		 */
+		readonly fragment: string;
+
+		/**
+		 * The string representing the corresponding file system path of this Uri.
+		 *
+		 * Will handle UNC paths and normalize windows drive letters to lower-case. Also
+		 * uses the platform specific path separator.
+		 *
+		 * * Will *not* validate the path for invalid characters and semantics.
+		 * * Will *not* look at the scheme of this Uri.
+		 * * The resulting string shall *not* be used for display purposes but
+		 * for disk operations, like `readFile` et al.
+		 *
+		 * The *difference* to the [`path`](#Uri.path)-property is the use of the platform specific
+		 * path separator and the handling of UNC paths. The sample below outlines the difference:
+		 * ```ts
+		const u = URI.parse('file://server/c$/folder/file.txt')
+		u.authority === 'server'
+		u.path === '/shares/c$/file.txt'
+		u.fsPath === '\\server\c$\folder\file.txt'
+		```
+		 */
+		readonly fsPath: string;
+
+		/**
+		 * Derive a new Uri from this Uri.
+		 *
+		 * ```ts
+		 * let file = Uri.parse('before:some/file/path');
+		 * let other = file.with({ scheme: 'after' });
+		 * assert.ok(other.toString() === 'after:some/file/path');
+		 * ```
+		 *
+		 * @param change An object that describes a change to this Uri. To unset components use `null` or
+		 *  the empty string.
+		 * @return A new Uri that reflects the given change. Will return `this` Uri if the change
+		 *  is not changing anything.
+		 */
+		with(change: { scheme?: string; authority?: string; path?: string; query?: string; fragment?: string }): Uri;
+
+		/**
+		 * Returns a string representation of this Uri. The representation and normalization
+		 * of a URI depends on the scheme.
+		 *
+		 * * The resulting string can be safely used with [Uri.parse](#Uri.parse).
+		 * * The resulting string shall *not* be used for display purposes.
+		 *
+		 * @param skipEncoding Do not percentage-encode the result, defaults to `false`. Note that
+		 *	the `#` and `?` characters occurring in the path will always be encoded.
+		 * @returns A string representation of this Uri.
+		 */
+		toString(skipEncoding?: boolean): string;
+
+		/**
+		 * Returns a JSON representation of this Uri.
+		 *
+		 * @return An object.
+		 */
+		toJSON(): any;
+	}
+
+	/**
+	 * A cancellation token is passed to an asynchronous or long running
+	 * operation to request cancellation, like cancelling a request
+	 * for completion items because the user continued to type.
+	 *
+	 * To get an instance of a `CancellationToken` use a
+	 * [CancellationTokenSource](#CancellationTokenSource).
+	 */
+	export interface CancellationToken {
+
+		/**
+		 * Is `true` when the token has been cancelled, `false` otherwise.
+		 */
+		isCancellationRequested: boolean;
+
+		/**
+		 * An [event](#Event) which fires upon cancellation.
+		 */
+		onCancellationRequested: Event<any>;
+	}
+
+	/**
+	 * A cancellation source creates and controls a [cancellation token](#CancellationToken).
+	 */
+	export class CancellationTokenSource {
+
+		/**
+		 * The cancellation token of this source.
+		 */
+		token: CancellationToken;
+
+		/**
+		 * Signal cancellation on the token.
+		 */
+		cancel(): void;
+
+		/**
+		 * Dispose object and free resources.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Represents a type which can release resources, such
+	 * as event listening or a timer.
+	 */
+	export class Disposable {
+
+		/**
+		 * Combine many disposable-likes into one. Use this method
+		 * when having objects with a dispose function which are not
+		 * instances of Disposable.
+		 *
+		 * @param disposableLikes Objects that have at least a `dispose`-function member.
+		 * @return Returns a new disposable which, upon dispose, will
+		 * dispose all provided disposables.
+		 */
+		static from(...disposableLikes: { dispose: () => any }[]): Disposable;
+
+		/**
+		 * Creates a new Disposable calling the provided function
+		 * on dispose.
+		 * @param callOnDispose Function that disposes something.
+		 */
+		constructor(callOnDispose: Function);
+
+		/**
+		 * Dispose this object.
+		 */
+		dispose(): any;
+	}
+
+	/**
+	 * Represents a typed event.
+	 *
+	 * A function that represents an event to which you subscribe by calling it with
+	 * a listener function as argument.
+	 *
+	 * @sample `item.onDidChange(function(event) { console.log("Event happened: " + event); });`
+	 */
+	export interface Event<T> {
+
+		/**
+		 * A function that represents an event to which you subscribe by calling it with
+		 * a listener function as argument.
+		 *
+		 * @param listener The listener function will be called when the event happens.
+		 * @param thisArgs The `this`-argument which will be used when calling the event listener.
+		 * @param disposables An array to which a [disposable](#Disposable) will be added.
+		 * @return A disposable which unsubscribes the event listener.
+		 */
+		(listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]): Disposable;
+	}
+
+	/**
+	 * An event emitter can be used to create and manage an [event](#Event) for others
+	 * to subscribe to. One emitter always owns one event.
+	 *
+	 * Use this class if you want to provide event from within your extension, for instance
+	 * inside a [TextDocumentContentProvider](#TextDocumentContentProvider) or when providing
+	 * API to other extensions.
+	 */
+	export class EventEmitter<T> {
+
+		/**
+		 * The event listeners can subscribe to.
+		 */
+		event: Event<T>;
+
+		/**
+		 * Notify all subscribers of the [event](EventEmitter#event). Failure
+		 * of one or more listener will not fail this function call.
+		 *
+		 * @param data The event object.
+		 */
+		fire(data?: T): void;
+
+		/**
+		 * Dispose this object and free resources.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * A file system watcher notifies about changes to files and folders
+	 * on disk.
+	 *
+	 * To get an instance of a `FileSystemWatcher` use
+	 * [createFileSystemWatcher](#workspace.createFileSystemWatcher).
+	 */
+	export interface FileSystemWatcher extends Disposable {
+
+		/**
+		 * true if this file system watcher has been created such that
+		 * it ignores creation file system events.
+		 */
+		ignoreCreateEvents: boolean;
+
+		/**
+		 * true if this file system watcher has been created such that
+		 * it ignores change file system events.
+		 */
+		ignoreChangeEvents: boolean;
+
+		/**
+		 * true if this file system watcher has been created such that
+		 * it ignores delete file system events.
+		 */
+		ignoreDeleteEvents: boolean;
+
+		/**
+		 * An event which fires on file/folder creation.
+		 */
+		onDidCreate: Event<Uri>;
+
+		/**
+		 * An event which fires on file/folder change.
+		 */
+		onDidChange: Event<Uri>;
+
+		/**
+		 * An event which fires on file/folder deletion.
+		 */
+		onDidDelete: Event<Uri>;
+	}
+
+	/**
+	 * A text document content provider allows to add readonly documents
+	 * to the editor, such as source from a dll or generated html from md.
+	 *
+	 * Content providers are [registered](#workspace.registerTextDocumentContentProvider)
+	 * for a [uri-scheme](#Uri.scheme). When a uri with that scheme is to
+	 * be [loaded](#workspace.openTextDocument) the content provider is
+	 * asked.
+	 */
+	export interface TextDocumentContentProvider {
+
+		/**
+		 * An event to signal a resource has changed.
+		 */
+		onDidChange?: Event<Uri>;
+
+		/**
+		 * Provide textual content for a given uri.
+		 *
+		 * The editor will use the returned string-content to create a readonly
+		 * [document](#TextDocument). Resources allocated should be released when
+		 * the corresponding document has been [closed](#workspace.onDidCloseTextDocument).
+		 *
+		 * @param uri An uri which scheme matches the scheme this provider was [registered](#workspace.registerTextDocumentContentProvider) for.
+		 * @param token A cancellation token.
+		 * @return A string or a thenable that resolves to such.
+		 */
+		provideTextDocumentContent(uri: Uri, token: CancellationToken): ProviderResult<string>;
+	}
+
+	/**
+	 * Represents an item that can be selected from
+	 * a list of items.
+	 */
+	export interface QuickPickItem {
+
+		/**
+		 * A human readable string which is rendered prominent.
+		 */
+		label: string;
+
+		/**
+		 * A human readable string which is rendered less prominent.
+		 */
+		description?: string;
+
+		/**
+		 * A human readable string which is rendered less prominent.
+		 */
+		detail?: string;
+
+		/**
+		 * Optional flag indicating if this item is picked initially.
+		 * (Only honored when the picker allows multiple selections.)
+		 *
+		 * @see [QuickPickOptions.canPickMany](#QuickPickOptions.canPickMany)
+		 */
+		picked?: boolean;
+	}
+
+	/**
+	 * Options to configure the behavior of the quick pick UI.
+	 */
+	export interface QuickPickOptions {
+		/**
+		 * An optional flag to include the description when filtering the picks.
+		 */
+		matchOnDescription?: boolean;
+
+		/**
+		 * An optional flag to include the detail when filtering the picks.
+		 */
+		matchOnDetail?: boolean;
+
+		/**
+		 * An optional string to show as place holder in the input box to guide the user what to pick on.
+		 */
+		placeHolder?: string;
+
+		/**
+		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
+		 */
+		ignoreFocusOut?: boolean;
+
+		/**
+		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
+		 */
+		canPickMany?: boolean;
+
+		/**
+		 * An optional function that is invoked whenever an item is selected.
+		 */
+		onDidSelectItem?(item: QuickPickItem | string): any;
+	}
+
+	/**
+	 * Options to configure the behaviour of the [workspace folder](#WorkspaceFolder) pick UI.
+	 */
+	export interface WorkspaceFolderPickOptions {
+
+		/**
+		 * An optional string to show as place holder in the input box to guide the user what to pick on.
+		 */
+		placeHolder?: string;
+
+		/**
+		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
+		 */
+		ignoreFocusOut?: boolean;
+	}
+
+	/**
+	 * Options to configure the behaviour of a file open dialog.
+	 *
+	 * * Note 1: A dialog can select files, folders, or both. This is not true for Windows
+	 * which enforces to open either files or folder, but *not both*.
+	 * * Note 2: Explicitly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
+	 * and the editor then silently adjusts the options to select files.
+	 */
+	export interface OpenDialogOptions {
+		/**
+		 * The resource the dialog shows when opened.
+		 */
+		defaultUri?: Uri;
+
+		/**
+		 * A human-readable string for the open button.
+		 */
+		openLabel?: string;
+
+		/**
+		 * Allow to select files, defaults to `true`.
+		 */
+		canSelectFiles?: boolean;
+
+		/**
+		 * Allow to select folders, defaults to `false`.
+		 */
+		canSelectFolders?: boolean;
+
+		/**
+		 * Allow to select many files or folders.
+		 */
+		canSelectMany?: boolean;
+
+		/**
+		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
+		 * like "TypeScript", and an array of extensions, e.g.
+		 * ```ts
+		 * {
+		 * 	'Images': ['png', 'jpg']
+		 * 	'TypeScript': ['ts', 'tsx']
+		 * }
+		 * ```
+		 */
+		filters?: { [name: string]: string[] };
+	}
+
+	/**
+	 * Options to configure the behaviour of a file save dialog.
+	 */
+	export interface SaveDialogOptions {
+		/**
+		 * The resource the dialog shows when opened.
+		 */
+		defaultUri?: Uri;
+
+		/**
+		 * A human-readable string for the save button.
+		 */
+		saveLabel?: string;
+
+		/**
+		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
+		 * like "TypeScript", and an array of extensions, e.g.
+		 * ```ts
+		 * {
+		 * 	'Images': ['png', 'jpg']
+		 * 	'TypeScript': ['ts', 'tsx']
+		 * }
+		 * ```
+		 */
+		filters?: { [name: string]: string[] };
+	}
+
+	/**
+	 * Represents an action that is shown with an information, warning, or
+	 * error message.
+	 *
+	 * @see [showInformationMessage](#window.showInformationMessage)
+	 * @see [showWarningMessage](#window.showWarningMessage)
+	 * @see [showErrorMessage](#window.showErrorMessage)
+	 */
+	export interface MessageItem {
+
+		/**
+		 * A short title like 'Retry', 'Open Log' etc.
+		 */
+		title: string;
+
+		/**
+		 * A hint for modal dialogs that the item should be triggered
+		 * when the user cancels the dialog (e.g. by pressing the ESC
+		 * key).
+		 *
+		 * Note: this option is ignored for non-modal messages.
+		 */
+		isCloseAffordance?: boolean;
+	}
+
+	/**
+	 * Options to configure the behavior of the message.
+	 *
+	 * @see [showInformationMessage](#window.showInformationMessage)
+	 * @see [showWarningMessage](#window.showWarningMessage)
+	 * @see [showErrorMessage](#window.showErrorMessage)
+	 */
+	export interface MessageOptions {
+
+		/**
+		 * Indicates that this message should be modal.
+		 */
+		modal?: boolean;
+	}
+
+	/**
+	 * Options to configure the behavior of the input box UI.
+	 */
+	export interface InputBoxOptions {
+
+		/**
+		 * The value to prefill in the input box.
+		 */
+		value?: string;
+
+		/**
+		 * Selection of the prefilled [`value`](#InputBoxOptions.value). Defined as tuple of two number where the
+		 * first is the inclusive start index and the second the exclusive end index. When `undefined` the whole
+		 * word will be selected, when empty (start equals end) only the cursor will be set,
+		 * otherwise the defined range will be selected.
+		 */
+		valueSelection?: [number, number];
+
+		/**
+		 * The text to display underneath the input box.
+		 */
+		prompt?: string;
+
+		/**
+		 * An optional string to show as place holder in the input box to guide the user what to type.
+		 */
+		placeHolder?: string;
+
+		/**
+		 * Set to `true` to show a password prompt that will not show the typed value.
+		 */
+		password?: boolean;
+
+		/**
+		 * Set to `true` to keep the input box open when focus moves to another part of the editor or to another window.
+		 */
+		ignoreFocusOut?: boolean;
+
+		/**
+		 * An optional function that will be called to validate input and to give a hint
+		 * to the user.
+		 *
+		 * @param value The current value of the input box.
+		 * @return A human readable string which is presented as diagnostic message.
+		 * Return `undefined`, `null`, or the empty string when 'value' is valid.
+		 */
+		validateInput?(value: string): string | undefined | null | Thenable<string | undefined | null>;
+	}
+
+	/**
+	 * A relative pattern is a helper to construct glob patterns that are matched
+	 * relatively to a base path. The base path can either be an absolute file path
+	 * or a [workspace folder](#WorkspaceFolder).
+	 */
+	export class RelativePattern {
+
+		/**
+		 * A base file path to which this pattern will be matched against relatively.
+		 */
+		base: string;
+
+		/**
+		 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
+		 * relative to the base path.
+		 *
+		 * Example: Given a base of `/home/work/folder` and a file path of `/home/work/folder/index.js`,
+		 * the file glob pattern will match on `index.js`.
+		 */
+		pattern: string;
+
+		/**
+		 * Creates a new relative pattern object with a base path and pattern to match. This pattern
+		 * will be matched on file paths relative to the base path.
+		 *
+		 * @param base A base file path to which this pattern will be matched against relatively.
+		 * @param pattern A file glob pattern like `*.{ts,js}` that will be matched on file paths
+		 * relative to the base path.
+		 */
+		constructor(base: WorkspaceFolder | string, pattern: string)
+	}
+
+	/**
+	 * A file glob pattern to match file paths against. This can either be a glob pattern string
+	 * (like `**​/*.{ts,js}` or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+	 *
+	 * Glob patterns can have the following syntax:
+	 * * `*` to match one or more characters in a path segment
+	 * * `?` to match on one character in a path segment
+	 * * `**` to match any number of path segments, including none
+	 * * `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+	 * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+	 */
+	export type GlobPattern = string | RelativePattern;
+
+	/**
+	 * A document filter denotes a document by different properties like
+	 * the [language](#TextDocument.languageId), the [scheme](#Uri.scheme) of
+	 * its resource, or a glob-pattern that is applied to the [path](#TextDocument.fileName).
+	 *
+	 * @sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
+	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', scheme: 'untitled', pattern: '**​/package.json' }`
+	 */
+	export interface DocumentFilter {
+
+		/**
+		 * A language id, like `typescript`.
+		 */
+		language?: string;
+
+		/**
+		 * A Uri [scheme](#Uri.scheme), like `file` or `untitled`.
+		 */
+		scheme?: string;
+
+		/**
+		 * A [glob pattern](#GlobPattern) that is matched on the absolute path of the document. Use a [relative pattern](#RelativePattern)
+		 * to filter documents to a [workspace folder](#WorkspaceFolder).
+		 */
+		pattern?: GlobPattern;
+	}
+
+	/**
+	 * A language selector is the combination of one or many language identifiers
+	 * and [language filters](#DocumentFilter).
+	 *
+	 * *Note* that a document selector that is just a language identifier selects *all*
+	 * documents, even those that are not saved on disk. Only use such selectors when
+	 * a feature works without further context, e.g without the need to resolve related
+	 * 'files'.
+	 *
+	 * @sample `let sel:DocumentSelector = { scheme: 'file', language: 'typescript' }`;
+	 */
+	export type DocumentSelector = DocumentFilter | string | Array<DocumentFilter | string>;
+
+	/**
+	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
+	 * may return. For once this is the actual result type `T`, like `Hover`, or a thenable that resolves
+	 * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
+	 * thenable.
+	 *
+	 * The snippets below are all valid implementations of the [`HoverProvider`](#HoverProvider):
+	 *
+	 * ```ts
+	 * let a: HoverProvider = {
+	 * 	provideHover(doc, pos, token): ProviderResult<Hover> {
+	 * 		return new Hover('Hello World');
+	 * 	}
+	 * }
+	 *
+	 * let b: HoverProvider = {
+	 * 	provideHover(doc, pos, token): ProviderResult<Hover> {
+	 * 		return new Promise(resolve => {
+	 * 			resolve(new Hover('Hello World'));
+	 * 	 	});
+	 * 	}
+	 * }
+	 *
+	 * let c: HoverProvider = {
+	 * 	provideHover(doc, pos, token): ProviderResult<Hover> {
+	 * 		return; // undefined
+	 * 	}
+	 * }
+	 * ```
+	 */
+	export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
+
+	/**
+	 * Kind of a code action.
+	 *
+	 * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+	 *
+	 * Code action kinds are used by VS Code for UI elements such as the refactoring context menu. Users
+	 * can also trigger code actions with a specific kind with the `editor.action.codeAction` command.
+	 */
+	export class CodeActionKind {
+		/**
+		 * Empty kind.
+		 */
+		static readonly Empty: CodeActionKind;
+
+		/**
+		 * Base kind for quickfix actions: `quickfix`.
+		 *
+		 * Quick fix actions address a problem in the code and are shown in the normal code action context menu.
+		 */
+		static readonly QuickFix: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring actions: `refactor`
+		 *
+		 * Refactoring actions are shown in the refactoring context menu.
+		 */
+		static readonly Refactor: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring extraction actions: `refactor.extract`
+		 *
+		 * Example extract actions:
+		 *
+		 * - Extract method
+		 * - Extract function
+		 * - Extract variable
+		 * - Extract interface from class
+		 * - ...
+		 */
+		static readonly RefactorExtract: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring inline actions: `refactor.inline`
+		 *
+		 * Example inline actions:
+		 *
+		 * - Inline function
+		 * - Inline variable
+		 * - Inline constant
+		 * - ...
+		 */
+		static readonly RefactorInline: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring rewrite actions: `refactor.rewrite`
+		 *
+		 * Example rewrite actions:
+		 *
+		 * - Convert JavaScript function to class
+		 * - Add or remove parameter
+		 * - Encapsulate field
+		 * - Make method static
+		 * - Move method to base class
+		 * - ...
+		 */
+		static readonly RefactorRewrite: CodeActionKind;
+
+		/**
+		 * Base kind for source actions: `source`
+		 *
+		 * Source code actions apply to the entire file and can be run on save
+		 * using `editor.codeActionsOnSave`. They also are shown in `source` context menu.
+		 */
+		static readonly Source: CodeActionKind;
+
+		/**
+		 * Base kind for an organize imports source action: `source.organizeImports`.
+		 */
+		static readonly SourceOrganizeImports: CodeActionKind;
+
+		private constructor(value: string);
+
+		/**
+		 * String value of the kind, e.g. `"refactor.extract.function"`.
+		 */
+		readonly value?: string;
+
+		/**
+		 * Create a new kind by appending a more specific selector to the current kind.
+		 *
+		 * Does not modify the current kind.
+		 */
+		append(parts: string): CodeActionKind;
+
+		/**
+		 * Does this kind contain `other`?
+		 *
+		 * The kind `"refactor"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`, but not `"unicorn.refactor.extract"` or `"refactory.extract"`
+		 *
+		 * @param other Kind to check.
+		 */
+		contains(other: CodeActionKind): boolean;
+	}
+
+	/**
+	 * Contains additional diagnostic information about the context in which
+	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
+	 */
+	export interface CodeActionContext {
+		/**
+		 * An array of diagnostics.
+		 */
+		readonly diagnostics: Diagnostic[];
+
+		/**
+		 * Requested kind of actions to return.
+		 *
+		 * Actions not of this kind are filtered out before being shown by the lightbulb.
+		 */
+		readonly only?: CodeActionKind;
+	}
+
+	/**
+	 * A code action represents a change that can be performed in code, e.g. to fix a problem or
+	 * to refactor code.
+	 *
+	 * A CodeAction must set either [`edit`](CodeAction#edit) and/or a [`command`](CodeAction#command). If both are supplied, the `edit` is applied first, then the command is executed.
+	 */
+	export class CodeAction {
+
+		/**
+		 * A short, human-readable, title for this code action.
+		 */
+		title: string;
+
+		/**
+		 * A [workspace edit](#WorkspaceEdit) this code action performs.
+		 */
+		edit?: WorkspaceEdit;
+
+		/**
+		 * [Diagnostics](#Diagnostic) that this code action resolves.
+		 */
+		diagnostics?: Diagnostic[];
+
+		/**
+		 * A [command](#Command) this code action executes.
+		 */
+		command?: Command;
+
+		/**
+		 * [Kind](#CodeActionKind) of the code action.
+		 *
+		 * Used to filter code actions.
+		 */
+		kind?: CodeActionKind;
+
+		/**
+		 * Creates a new code action.
+		 *
+		 * A code action must have at least a [title](#CodeAction.title) and [edits](#CodeAction.edit)
+		 * and/or a [command](#CodeAction.command).
+		 *
+		 * @param title The title of the code action.
+		 * @param kind The kind of the code action.
+		 */
+		constructor(title: string, kind?: CodeActionKind);
+	}
+
+	/**
+	 * The code action interface defines the contract between extensions and
+	 * the [light bulb](https://code.visualstudio.com/docs/editor/editingevolved#_code-action) feature.
+	 *
+	 * A code action can be any command that is [known](#commands.getCommands) to the system.
+	 */
+	export interface CodeActionProvider {
+		/**
+		 * Provide commands for the given document and range.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param range The selector or range for which the command was invoked. This will always be a selection if
+		 * there is a currently active editor.
+		 * @param context Context carrying additional information.
+		 * @param token A cancellation token.
+		 * @return An array of commands, quick fixes, or refactorings or a thenable of such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
+	}
+
+	/**
+	 * Metadata about the type of code actions that a [CodeActionProvider](#CodeActionProvider) providers
+	 */
+	export interface CodeActionProviderMetadata {
+		/**
+		 * [CodeActionKinds](#CodeActionKind) that this provider may return.
+		 *
+		 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the provider
+		 * may list our every specific kind they provide, such as `CodeActionKind.Refactor.Extract.append('function`)`
+		 */
+		readonly providedCodeActionKinds?: ReadonlyArray<CodeActionKind>;
+	}
+
+	/**
+	 * A code lens represents a [command](#Command) that should be shown along with
+	 * source text, like the number of references, a way to run tests, etc.
+	 *
+	 * A code lens is _unresolved_ when no command is associated to it. For performance
+	 * reasons the creation of a code lens and resolving should be done to two stages.
+	 *
+	 * @see [CodeLensProvider.provideCodeLenses](#CodeLensProvider.provideCodeLenses)
+	 * @see [CodeLensProvider.resolveCodeLens](#CodeLensProvider.resolveCodeLens)
+	 */
+	export class CodeLens {
+
+		/**
+		 * The range in which this code lens is valid. Should only span a single line.
+		 */
+		range: Range;
+
+		/**
+		 * The command this code lens represents.
+		 */
+		command?: Command;
+
+		/**
+		 * `true` when there is a command associated.
+		 */
+		readonly isResolved: boolean;
+
+		/**
+		 * Creates a new code lens object.
+		 *
+		 * @param range The range to which this code lens applies.
+		 * @param command The command associated to this code lens.
+		 */
+		constructor(range: Range, command?: Command);
+	}
+
+	/**
+	 * A code lens provider adds [commands](#Command) to source text. The commands will be shown
+	 * as dedicated horizontal lines in between the source text.
+	 */
+	export interface CodeLensProvider {
+
+		/**
+		 * An optional event to signal that the code lenses from this provider have changed.
+		 */
+		onDidChangeCodeLenses?: Event<void>;
+
+		/**
+		 * Compute a list of [lenses](#CodeLens). This call should return as fast as possible and if
+		 * computing the commands is expensive implementors should only return code lens objects with the
+		 * range set and implement [resolve](#CodeLensProvider.resolveCodeLens).
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of code lenses or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideCodeLenses(document: TextDocument, token: CancellationToken): ProviderResult<CodeLens[]>;
+
+		/**
+		 * This function will be called for each visible code lens, usually when scrolling and after
+		 * calls to [compute](#CodeLensProvider.provideCodeLenses)-lenses.
+		 *
+		 * @param codeLens code lens that must be resolved.
+		 * @param token A cancellation token.
+		 * @return The given, resolved code lens or thenable that resolves to such.
+		 */
+		resolveCodeLens?(codeLens: CodeLens, token: CancellationToken): ProviderResult<CodeLens>;
+	}
+
+	/**
+	 * Information about where a symbol is defined.
+	 *
+	 * Provides additional metadata over normal [location](#Location) definitions, including the range of
+	 * the defining symbol
+	 */
+	export interface DefinitionLink {
+		/**
+		 * Span of the symbol being defined in the source file.
+		 *
+		 * Used as the underlined span for mouse definition hover. Defaults to the word range at
+		 * the definition position.
+		 */
+		originSelectionRange?: Range;
+
+		/**
+		 * The resource identifier of the definition.
+		 */
+		targetUri: Uri;
+
+		/**
+		 * The full range of the definition.
+		 *
+		 * For a class definition for example, this would be the entire body of the class definition.
+		 */
+		targetRange: Range;
+
+		/**
+		 * The span of the symbol definition.
+		 *
+		 * For a class definition, this would be the class name itself in the class definition.
+		 */
+		targetSelectionRange?: Range;
+	}
+
+	/**
+	 * The definition of a symbol represented as one or many [locations](#Location).
+	 * For most programming languages there is only one location at which a symbol is
+	 * defined.
+	 */
+	export type Definition = Location | Location[];
+
+	/**
+	 * The definition provider interface defines the contract between extensions and
+	 * the [go to definition](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-definition)
+	 * and peek definition features.
+	 */
+	export interface DefinitionProvider {
+
+		/**
+		 * Provide the definition of the symbol at the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+	}
+
+	/**
+	 * The implementation provider interface defines the contract between extensions and
+	 * the go to implementation feature.
+	 */
+	export interface ImplementationProvider {
+
+		/**
+		 * Provide the implementations of the symbol at the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+	}
+
+	/**
+	 * The type definition provider defines the contract between extensions and
+	 * the go to type definition feature.
+	 */
+	export interface TypeDefinitionProvider {
+
+		/**
+		 * Provide the type definition of the symbol at the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return A definition or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+	}
+
+	/**
+	 * The MarkdownString represents human readable text that supports formatting via the
+	 * markdown syntax. Standard markdown is supported, also tables, but no embedded html.
+	 */
+	export class MarkdownString {
+
+		/**
+		 * The markdown string.
+		 */
+		value: string;
+
+		/**
+		 * Indicates that this markdown string is from a trusted source. Only *trusted*
+		 * markdown supports links that execute commands, e.g. `[Run it](command:myCommandId)`.
+		 */
+		isTrusted?: boolean;
+
+		/**
+		 * Creates a new markdown string with the given value.
+		 *
+		 * @param value Optional, initial value.
+		 */
+		constructor(value?: string);
+
+		/**
+		 * Appends and escapes the given string to this markdown string.
+		 * @param value Plain text.
+		 */
+		appendText(value: string): MarkdownString;
+
+		/**
+		 * Appends the given string 'as is' to this markdown string.
+		 * @param value Markdown string.
+		 */
+		appendMarkdown(value: string): MarkdownString;
+
+		/**
+		 * Appends the given string as codeblock using the provided language.
+		 * @param value A code snippet.
+		 * @param language An optional [language identifier](#languages.getLanguages).
+		 */
+		appendCodeblock(value: string, language?: string): MarkdownString;
+	}
+
+	/**
+	 * ~~MarkedString can be used to render human readable text. It is either a markdown string
+	 * or a code-block that provides a language and a code snippet. Note that
+	 * markdown strings will be sanitized - that means html will be escaped.~~
+	 *
+	 * @deprecated This type is deprecated, please use [`MarkdownString`](#MarkdownString) instead.
+	 */
+	export type MarkedString = MarkdownString | string | { language: string; value: string };
+
+	/**
+	 * A hover represents additional information for a symbol or word. Hovers are
+	 * rendered in a tooltip-like widget.
+	 */
+	export class Hover {
+
+		/**
+		 * The contents of this hover.
+		 */
+		contents: MarkedString[];
+
+		/**
+		 * The range to which this hover applies. When missing, the
+		 * editor will use the range at the current position or the
+		 * current position itself.
+		 */
+		range?: Range;
+
+		/**
+		 * Creates a new hover object.
+		 *
+		 * @param contents The contents of the hover.
+		 * @param range The range to which the hover applies.
+		 */
+		constructor(contents: MarkedString | MarkedString[], range?: Range);
+	}
+
+	/**
+	 * The hover provider interface defines the contract between extensions and
+	 * the [hover](https://code.visualstudio.com/docs/editor/intellisense)-feature.
+	 */
+	export interface HoverProvider {
+
+		/**
+		 * Provide a hover for the given position and document. Multiple hovers at the same
+		 * position will be merged by the editor. A hover can have a range which defaults
+		 * to the word range at the position when omitted.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return A hover or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideHover(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Hover>;
+	}
+
+	/**
+	 * A document highlight kind.
+	 */
+	export enum DocumentHighlightKind {
+
+		/**
+		 * A textual occurrence.
+		 */
+		Text = 0,
+
+		/**
+		 * Read-access of a symbol, like reading a variable.
+		 */
+		Read = 1,
+
+		/**
+		 * Write-access of a symbol, like writing to a variable.
+		 */
+		Write = 2
+	}
+
+	/**
+	 * A document highlight is a range inside a text document which deserves
+	 * special attention. Usually a document highlight is visualized by changing
+	 * the background color of its range.
+	 */
+	export class DocumentHighlight {
+
+		/**
+		 * The range this highlight applies to.
+		 */
+		range: Range;
+
+		/**
+		 * The highlight kind, default is [text](#DocumentHighlightKind.Text).
+		 */
+		kind?: DocumentHighlightKind;
+
+		/**
+		 * Creates a new document highlight object.
+		 *
+		 * @param range The range the highlight applies to.
+		 * @param kind The highlight kind, default is [text](#DocumentHighlightKind.Text).
+		 */
+		constructor(range: Range, kind?: DocumentHighlightKind);
+	}
+
+	/**
+	 * The document highlight provider interface defines the contract between extensions and
+	 * the word-highlight-feature.
+	 */
+	export interface DocumentHighlightProvider {
+
+		/**
+		 * Provide a set of document highlights, like all occurrences of a variable or
+		 * all exit-points of a function.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentHighlights(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]>;
+	}
+
+	/**
+	 * A symbol kind.
+	 */
+	export enum SymbolKind {
+		File = 0,
+		Module = 1,
+		Namespace = 2,
+		Package = 3,
+		Class = 4,
+		Method = 5,
+		Property = 6,
+		Field = 7,
+		Constructor = 8,
+		Enum = 9,
+		Interface = 10,
+		Function = 11,
+		Variable = 12,
+		Constant = 13,
+		String = 14,
+		Number = 15,
+		Boolean = 16,
+		Array = 17,
+		Object = 18,
+		Key = 19,
+		Null = 20,
+		EnumMember = 21,
+		Struct = 22,
+		Event = 23,
+		Operator = 24,
+		TypeParameter = 25
+	}
+
+	/**
+	 * Represents information about programming constructs like variables, classes,
+	 * interfaces etc.
+	 */
+	export class SymbolInformation {
+
+		/**
+		 * The name of this symbol.
+		 */
+		name: string;
+
+		/**
+		 * The name of the symbol containing this symbol.
+		 */
+		containerName: string;
+
+		/**
+		 * The kind of this symbol.
+		 */
+		kind: SymbolKind;
+
+		/**
+		 * The location of this symbol.
+		 */
+		location: Location;
+
+		/**
+		 * Creates a new symbol information object.
+		 *
+		 * @param name The name of the symbol.
+		 * @param kind The kind of the symbol.
+		 * @param containerName The name of the symbol containing the symbol.
+		 * @param location The location of the symbol.
+		 */
+		constructor(name: string, kind: SymbolKind, containerName: string, location: Location);
+
+		/**
+		 * ~~Creates a new symbol information object.~~
+		 *
+		 * @deprecated Please use the constructor taking a [location](#Location) object.
+		 *
+		 * @param name The name of the symbol.
+		 * @param kind The kind of the symbol.
+		 * @param range The range of the location of the symbol.
+		 * @param uri The resource of the location of symbol, defaults to the current document.
+		 * @param containerName The name of the symbol containing the symbol.
+		 */
+		constructor(name: string, kind: SymbolKind, range: Range, uri?: Uri, containerName?: string);
+	}
+
+	/**
+	 * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document
+	 * symbols can be hierarchical and they have two ranges: one that encloses its definition and one that points to
+	 * its most interesting range, e.g. the range of an identifier.
+	 */
+	export class DocumentSymbol {
+
+		/**
+		 * The name of this symbol.
+		 */
+		name: string;
+
+		/**
+		 * More detail for this symbol, e.g the signature of a function.
+		 */
+		detail: string;
+
+		/**
+		 * The kind of this symbol.
+		 */
+		kind: SymbolKind;
+
+		/**
+		 * The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g comments and code.
+		 */
+		range: Range;
+
+		/**
+		 * The range that should be selected and reveal when this symbol is being picked, e.g the name of a function.
+		 * Must be contained by the [`range`](#DocumentSymbol.range).
+		 */
+		selectionRange: Range;
+
+		/**
+		 * Children of this symbol, e.g. properties of a class.
+		 */
+		children: DocumentSymbol[];
+
+		/**
+		 * Creates a new document symbol.
+		 *
+		 * @param name The name of the symbol.
+		 * @param detail Details for the symbol.
+		 * @param kind The kind of the symbol.
+		 * @param range The full range of the symbol.
+		 * @param selectionRange The range that should be reveal.
+		 */
+		constructor(name: string, detail: string, kind: SymbolKind, range: Range, selectionRange: Range);
+	}
+
+	/**
+	 * The document symbol provider interface defines the contract between extensions and
+	 * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-symbol)-feature.
+	 */
+	export interface DocumentSymbolProvider {
+
+		/**
+		 * Provide symbol information for the given document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | DocumentSymbol[]>;
+	}
+
+	/**
+	 * The workspace symbol provider interface defines the contract between extensions and
+	 * the [symbol search](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name)-feature.
+	 */
+	export interface WorkspaceSymbolProvider {
+
+		/**
+		 * Project-wide search for a symbol matching the given query string.
+		 *
+		 * The `query`-parameter should be interpreted in a *relaxed way* as the editor will apply its own highlighting
+		 * and scoring on the results. A good rule of thumb is to match case-insensitive and to simply check that the
+		 * characters of *query* appear in their order in a candidate symbol. Don't use prefix, substring, or similar
+		 * strict matching.
+		 *
+		 * To improve performance implementors can implement `resolveWorkspaceSymbol` and then provide symbols with partial
+		 * [location](#SymbolInformation.location)-objects, without a `range` defined. The editor will then call
+		 * `resolveWorkspaceSymbol` for selected symbols only, e.g. when opening a workspace symbol.
+		 *
+		 * @param query A non-empty query string.
+		 * @param token A cancellation token.
+		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideWorkspaceSymbols(query: string, token: CancellationToken): ProviderResult<SymbolInformation[]>;
+
+		/**
+		 * Given a symbol fill in its [location](#SymbolInformation.location). This method is called whenever a symbol
+		 * is selected in the UI. Providers can implement this method and return incomplete symbols from
+		 * [`provideWorkspaceSymbols`](#WorkspaceSymbolProvider.provideWorkspaceSymbols) which often helps to improve
+		 * performance.
+		 *
+		 * @param symbol The symbol that is to be resolved. Guaranteed to be an instance of an object returned from an
+		 * earlier call to `provideWorkspaceSymbols`.
+		 * @param token A cancellation token.
+		 * @return The resolved symbol or a thenable that resolves to that. When no result is returned,
+		 * the given `symbol` is used.
+		 */
+		resolveWorkspaceSymbol?(symbol: SymbolInformation, token: CancellationToken): ProviderResult<SymbolInformation>;
+	}
+
+	/**
+	 * Value-object that contains additional information when
+	 * requesting references.
+	 */
+	export interface ReferenceContext {
+
+		/**
+		 * Include the declaration of the current symbol.
+		 */
+		includeDeclaration: boolean;
+	}
+
+	/**
+	 * The reference provider interface defines the contract between extensions and
+	 * the [find references](https://code.visualstudio.com/docs/editor/editingevolved#_peek)-feature.
+	 */
+	export interface ReferenceProvider {
+
+		/**
+		 * Provide a set of project-wide references for the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param context
+		 * @param token A cancellation token.
+		 * @return An array of locations or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideReferences(document: TextDocument, position: Position, context: ReferenceContext, token: CancellationToken): ProviderResult<Location[]>;
+	}
+
+	/**
+	 * A text edit represents edits that should be applied
+	 * to a document.
+	 */
+	export class TextEdit {
+
+		/**
+		 * Utility to create a replace edit.
+		 *
+		 * @param range A range.
+		 * @param newText A string.
+		 * @return A new text edit object.
+		 */
+		static replace(range: Range, newText: string): TextEdit;
+
+		/**
+		 * Utility to create an insert edit.
+		 *
+		 * @param position A position, will become an empty range.
+		 * @param newText A string.
+		 * @return A new text edit object.
+		 */
+		static insert(position: Position, newText: string): TextEdit;
+
+		/**
+		 * Utility to create a delete edit.
+		 *
+		 * @param range A range.
+		 * @return A new text edit object.
+		 */
+		static delete(range: Range): TextEdit;
+
+		/**
+		 * Utility to create an eol-edit.
+		 *
+		 * @param eol An eol-sequence
+		 * @return A new text edit object.
+		 */
+		static setEndOfLine(eol: EndOfLine): TextEdit;
+
+		/**
+		 * The range this edit applies to.
+		 */
+		range: Range;
+
+		/**
+		 * The string this edit will insert.
+		 */
+		newText: string;
+
+		/**
+		 * The eol-sequence used in the document.
+		 *
+		 * *Note* that the eol-sequence will be applied to the
+		 * whole document.
+		 */
+		newEol: EndOfLine;
+
+		/**
+		 * Create a new TextEdit.
+		 *
+		 * @param range A range.
+		 * @param newText A string.
+		 */
+		constructor(range: Range, newText: string);
+	}
+
+	/**
+	 * A workspace edit is a collection of textual and files changes for
+	 * multiple resources and documents.
+	 *
+	 * Use the [applyEdit](#workspace.applyEdit)-function to apply a workspace edit.
+	 */
+	export class WorkspaceEdit {
+
+		/**
+		 * The number of affected resources of textual or resource changes.
+		 */
+		readonly size: number;
+
+		/**
+		 * Replace the given range with given text for the given resource.
+		 *
+		 * @param uri A resource identifier.
+		 * @param range A range.
+		 * @param newText A string.
+		 */
+		replace(uri: Uri, range: Range, newText: string): void;
+
+		/**
+		 * Insert the given text at the given position.
+		 *
+		 * @param uri A resource identifier.
+		 * @param position A position.
+		 * @param newText A string.
+		 */
+		insert(uri: Uri, position: Position, newText: string): void;
+
+		/**
+		 * Delete the text at the given range.
+		 *
+		 * @param uri A resource identifier.
+		 * @param range A range.
+		 */
+		delete(uri: Uri, range: Range): void;
+
+		/**
+		 * Check if a text edit for a resource exists.
+		 *
+		 * @param uri A resource identifier.
+		 * @return `true` if the given resource will be touched by this edit.
+		 */
+		has(uri: Uri): boolean;
+
+		/**
+		 * Set (and replace) text edits for a resource.
+		 *
+		 * @param uri A resource identifier.
+		 * @param edits An array of text edits.
+		 */
+		set(uri: Uri, edits: TextEdit[]): void;
+
+		/**
+		 * Get the text edits for a resource.
+		 *
+		 * @param uri A resource identifier.
+		 * @return An array of text edits.
+		 */
+		get(uri: Uri): TextEdit[];
+
+		/**
+		 * Create a regular file.
+		 *
+		 * @param uri Uri of the new file..
+		 * @param options Defines if an existing file should be overwritten or be
+		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
+		 */
+		createFile(uri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
+
+		/**
+		 * Delete a file or folder.
+		 *
+		 * @param uri The uri of the file that is to be deleted.
+		 */
+		deleteFile(uri: Uri, options?: { recursive?: boolean, ignoreIfNotExists?: boolean }): void;
+
+		/**
+		 * Rename a file or folder.
+		 *
+		 * @param oldUri The existing file.
+		 * @param newUri The new location.
+		 * @param options Defines if existing files should be overwritten or be
+		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
+		 */
+		renameFile(oldUri: Uri, newUri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
+
+
+		/**
+		 * Get all text edits grouped by resource.
+		 *
+		 * @return A shallow copy of `[Uri, TextEdit[]]`-tuples.
+		 */
+		entries(): [Uri, TextEdit[]][];
+	}
+
+	/**
+	 * A snippet string is a template which allows to insert text
+	 * and to control the editor cursor when insertion happens.
+	 *
+	 * A snippet can define tab stops and placeholders with `$1`, `$2`
+	 * and `${3:foo}`. `$0` defines the final tab stop, it defaults to
+	 * the end of the snippet. Variables are defined with `$name` and
+	 * `${name:default value}`. The full snippet syntax is documented
+	 * [here](http://code.visualstudio.com/docs/editor/userdefinedsnippets#_creating-your-own-snippets).
+	 */
+	export class SnippetString {
+
+		/**
+		 * The snippet string.
+		 */
+		value: string;
+
+		constructor(value?: string);
+
+		/**
+		 * Builder-function that appends the given string to
+		 * the [`value`](#SnippetString.value) of this snippet string.
+		 *
+		 * @param string A value to append 'as given'. The string will be escaped.
+		 * @return This snippet string.
+		 */
+		appendText(string: string): SnippetString;
+
+		/**
+		 * Builder-function that appends a tabstop (`$1`, `$2` etc) to
+		 * the [`value`](#SnippetString.value) of this snippet string.
+		 *
+		 * @param number The number of this tabstop, defaults to an auto-increment
+		 * value starting at 1.
+		 * @return This snippet string.
+		 */
+		appendTabstop(number?: number): SnippetString;
+
+		/**
+		 * Builder-function that appends a placeholder (`${1:value}`) to
+		 * the [`value`](#SnippetString.value) of this snippet string.
+		 *
+		 * @param value The value of this placeholder - either a string or a function
+		 * with which a nested snippet can be created.
+		 * @param number The number of this tabstop, defaults to an auto-increment
+		 * value starting at 1.
+		 * @return This snippet string.
+		 */
+		appendPlaceholder(value: string | ((snippet: SnippetString) => any), number?: number): SnippetString;
+
+		/**
+		 * Builder-function that appends a variable (`${VAR}`) to
+		 * the [`value`](#SnippetString.value) of this snippet string.
+		 *
+		 * @param name The name of the variable - excluding the `$`.
+		 * @param defaultValue The default value which is used when the variable name cannot
+		 * be resolved - either a string or a function with which a nested snippet can be created.
+		 * @return This snippet string.
+		 */
+		appendVariable(name: string, defaultValue: string | ((snippet: SnippetString) => any)): SnippetString;
+	}
+
+	/**
+	 * The rename provider interface defines the contract between extensions and
+	 * the [rename](https://code.visualstudio.com/docs/editor/editingevolved#_rename-symbol)-feature.
+	 */
+	export interface RenameProvider {
+
+		/**
+		 * Provide an edit that describes changes that have to be made to one
+		 * or many resources to rename a symbol to a different name.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param newName The new name of the symbol. If the given name is not valid, the provider must return a rejected promise.
+		 * @param token A cancellation token.
+		 * @return A workspace edit or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit>;
+
+		/**
+		 * Optional function for resolving and validating a position *before* running rename. The result can
+		 * be a range or a range and a placeholder text. The placeholder text should be the identifier of the symbol
+		 * which is being renamed - when omitted the text in the returned range is used.
+		 *
+		 * @param document The document in which rename will be invoked.
+		 * @param position The position at which rename will be invoked.
+		 * @param token A cancellation token.
+		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
+		 */
+		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
+	}
+
+	/**
+	 * Value-object describing what options formatting should use.
+	 */
+	export interface FormattingOptions {
+
+		/**
+		 * Size of a tab in spaces.
+		 */
+		tabSize: number;
+
+		/**
+		 * Prefer spaces over tabs.
+		 */
+		insertSpaces: boolean;
+
+		/**
+		 * Signature for further properties.
+		 */
+		[key: string]: boolean | number | string;
+	}
+
+	/**
+	 * The document formatting provider interface defines the contract between extensions and
+	 * the formatting-feature.
+	 */
+	export interface DocumentFormattingEditProvider {
+
+		/**
+		 * Provide formatting edits for a whole document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param options Options controlling formatting.
+		 * @param token A cancellation token.
+		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentFormattingEdits(document: TextDocument, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
+	}
+
+	/**
+	 * The document formatting provider interface defines the contract between extensions and
+	 * the formatting-feature.
+	 */
+	export interface DocumentRangeFormattingEditProvider {
+
+		/**
+		 * Provide formatting edits for a range in a document.
+		 *
+		 * The given range is a hint and providers can decide to format a smaller
+		 * or larger range. Often this is done by adjusting the start and end
+		 * of the range to full syntax nodes.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param range The range which should be formatted.
+		 * @param options Options controlling formatting.
+		 * @param token A cancellation token.
+		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
+	}
+
+	/**
+	 * The document formatting provider interface defines the contract between extensions and
+	 * the formatting-feature.
+	 */
+	export interface OnTypeFormattingEditProvider {
+
+		/**
+		 * Provide formatting edits after a character has been typed.
+		 *
+		 * The given position and character should hint to the provider
+		 * what range the position to expand to, like find the matching `{`
+		 * when `}` has been entered.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param ch The character that has been typed.
+		 * @param options Options controlling formatting.
+		 * @param token A cancellation token.
+		 * @return A set of text edits or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideOnTypeFormattingEdits(document: TextDocument, position: Position, ch: string, options: FormattingOptions, token: CancellationToken): ProviderResult<TextEdit[]>;
+	}
+
+	/**
+	 * Represents a parameter of a callable-signature. A parameter can
+	 * have a label and a doc-comment.
+	 */
+	export class ParameterInformation {
+
+		/**
+		 * The label of this signature. *Note*: Must be a substring of its
+		 * containing signature information's [label](#SignatureInformation.label).
+		 */
+		label: string;
+
+		/**
+		 * The human-readable doc-comment of this signature. Will be shown
+		 * in the UI but can be omitted.
+		 */
+		documentation?: string | MarkdownString;
+
+		/**
+		 * Creates a new parameter information object.
+		 *
+		 * @param label A label string.
+		 * @param documentation A doc string.
+		 */
+		constructor(label: string, documentation?: string | MarkdownString);
+	}
+
+	/**
+	 * Represents the signature of something callable. A signature
+	 * can have a label, like a function-name, a doc-comment, and
+	 * a set of parameters.
+	 */
+	export class SignatureInformation {
+
+		/**
+		 * The label of this signature. Will be shown in
+		 * the UI.
+		 */
+		label: string;
+
+		/**
+		 * The human-readable doc-comment of this signature. Will be shown
+		 * in the UI but can be omitted.
+		 */
+		documentation?: string | MarkdownString;
+
+		/**
+		 * The parameters of this signature.
+		 */
+		parameters: ParameterInformation[];
+
+		/**
+		 * Creates a new signature information object.
+		 *
+		 * @param label A label string.
+		 * @param documentation A doc string.
+		 */
+		constructor(label: string, documentation?: string | MarkdownString);
+	}
+
+	/**
+	 * Signature help represents the signature of something
+	 * callable. There can be multiple signatures but only one
+	 * active and only one active parameter.
+	 */
+	export class SignatureHelp {
+
+		/**
+		 * One or more signatures.
+		 */
+		signatures: SignatureInformation[];
+
+		/**
+		 * The active signature.
+		 */
+		activeSignature: number;
+
+		/**
+		 * The active parameter of the active signature.
+		 */
+		activeParameter: number;
+	}
+
+	/**
+	 * The signature help provider interface defines the contract between extensions and
+	 * the [parameter hints](https://code.visualstudio.com/docs/editor/intellisense)-feature.
+	 */
+	export interface SignatureHelpProvider {
+
+		/**
+		 * Provide help for the signature at the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return Signature help or a thenable that resolves to such. The lack of a result can be
+		 * signaled by returning `undefined` or `null`.
+		 */
+		provideSignatureHelp(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<SignatureHelp>;
+	}
+
+	/**
+	 * Completion item kinds.
+	 */
+	export enum CompletionItemKind {
+		Text = 0,
+		Method = 1,
+		Function = 2,
+		Constructor = 3,
+		Field = 4,
+		Variable = 5,
+		Class = 6,
+		Interface = 7,
+		Module = 8,
+		Property = 9,
+		Unit = 10,
+		Value = 11,
+		Enum = 12,
+		Keyword = 13,
+		Snippet = 14,
+		Color = 15,
+		Reference = 17,
+		File = 16,
+		Folder = 18,
+		EnumMember = 19,
+		Constant = 20,
+		Struct = 21,
+		Event = 22,
+		Operator = 23,
+		TypeParameter = 24
+	}
+
+	/**
+	 * A completion item represents a text snippet that is proposed to complete text that is being typed.
+	 *
+	 * It is sufficient to create a completion item from just a [label](#CompletionItem.label). In that
+	 * case the completion item will replace the [word](#TextDocument.getWordRangeAtPosition)
+	 * until the cursor with the given label or [insertText](#CompletionItem.insertText). Otherwise the
+	 * the given [edit](#CompletionItem.textEdit) is used.
+	 *
+	 * When selecting a completion item in the editor its defined or synthesized text edit will be applied
+	 * to *all* cursors/selections whereas [additionalTextEdits](CompletionItem.additionalTextEdits) will be
+	 * applied as provided.
+	 *
+	 * @see [CompletionItemProvider.provideCompletionItems](#CompletionItemProvider.provideCompletionItems)
+	 * @see [CompletionItemProvider.resolveCompletionItem](#CompletionItemProvider.resolveCompletionItem)
+	 */
+	export class CompletionItem {
+
+		/**
+		 * The label of this completion item. By default
+		 * this is also the text that is inserted when selecting
+		 * this completion.
+		 */
+		label: string;
+
+		/**
+		 * The kind of this completion item. Based on the kind
+		 * an icon is chosen by the editor.
+		 */
+		kind?: CompletionItemKind;
+
+		/**
+		 * A human-readable string with additional information
+		 * about this item, like type or symbol information.
+		 */
+		detail?: string;
+
+		/**
+		 * A human-readable string that represents a doc-comment.
+		 */
+		documentation?: string | MarkdownString;
+
+		/**
+		 * A string that should be used when comparing this item
+		 * with other items. When `falsy` the [label](#CompletionItem.label)
+		 * is used.
+		 */
+		sortText?: string;
+
+		/**
+		 * A string that should be used when filtering a set of
+		 * completion items. When `falsy` the [label](#CompletionItem.label)
+		 * is used.
+		 */
+		filterText?: string;
+
+		/**
+		 * Select this item when showing. *Note* that only one completion item can be selected and
+		 * that the editor decides which item that is. The rule is that the *first* item of those
+		 * that match best is selected.
+		 */
+		preselect?: boolean;
+
+		/**
+		 * A string or snippet that should be inserted in a document when selecting
+		 * this completion. When `falsy` the [label](#CompletionItem.label)
+		 * is used.
+		 */
+		insertText?: string | SnippetString;
+
+		/**
+		 * A range of text that should be replaced by this completion item.
+		 *
+		 * Defaults to a range from the start of the [current word](#TextDocument.getWordRangeAtPosition) to the
+		 * current position.
+		 *
+		 * *Note:* The range must be a [single line](#Range.isSingleLine) and it must
+		 * [contain](#Range.contains) the position at which completion has been [requested](#CompletionItemProvider.provideCompletionItems).
+		 */
+		range?: Range;
+
+		/**
+		 * An optional set of characters that when pressed while this completion is active will accept it first and
+		 * then type that character. *Note* that all commit characters should have `length=1` and that superfluous
+		 * characters will be ignored.
+		 */
+		commitCharacters?: string[];
+
+		/**
+		 * @deprecated Use `CompletionItem.insertText` and `CompletionItem.range` instead.
+		 *
+		 * ~~An [edit](#TextEdit) which is applied to a document when selecting
+		 * this completion. When an edit is provided the value of
+		 * [insertText](#CompletionItem.insertText) is ignored.~~
+		 *
+		 * ~~The [range](#Range) of the edit must be single-line and on the same
+		 * line completions were [requested](#CompletionItemProvider.provideCompletionItems) at.~~
+		 */
+		textEdit?: TextEdit;
+
+		/**
+		 * An optional array of additional [text edits](#TextEdit) that are applied when
+		 * selecting this completion. Edits must not overlap with the main [edit](#CompletionItem.textEdit)
+		 * nor with themselves.
+		 */
+		additionalTextEdits?: TextEdit[];
+
+		/**
+		 * An optional [command](#Command) that is executed *after* inserting this completion. *Note* that
+		 * additional modifications to the current document should be described with the
+		 * [additionalTextEdits](#CompletionItem.additionalTextEdits)-property.
+		 */
+		command?: Command;
+
+		/**
+		 * Creates a new completion item.
+		 *
+		 * Completion items must have at least a [label](#CompletionItem.label) which then
+		 * will be used as insert text as well as for sorting and filtering.
+		 *
+		 * @param label The label of the completion.
+		 * @param kind The [kind](#CompletionItemKind) of the completion.
+		 */
+		constructor(label: string, kind?: CompletionItemKind);
+	}
+
+	/**
+	 * Represents a collection of [completion items](#CompletionItem) to be presented
+	 * in the editor.
+	 */
+	export class CompletionList {
+
+		/**
+		 * This list is not complete. Further typing should result in recomputing
+		 * this list.
+		 */
+		isIncomplete?: boolean;
+
+		/**
+		 * The completion items.
+		 */
+		items: CompletionItem[];
+
+		/**
+		 * Creates a new completion list.
+		 *
+		 * @param items The completion items.
+		 * @param isIncomplete The list is not complete.
+		 */
+		constructor(items?: CompletionItem[], isIncomplete?: boolean);
+	}
+
+	/**
+	 * How a [completion provider](#CompletionItemProvider) was triggered
+	 */
+	export enum CompletionTriggerKind {
+		/**
+		 * Completion was triggered normally.
+		 */
+		Invoke = 0,
+		/**
+		 * Completion was triggered by a trigger character.
+		 */
+		TriggerCharacter = 1,
+		/**
+		 * Completion was re-triggered as current completion list is incomplete
+		 */
+		TriggerForIncompleteCompletions = 2
+	}
+
+	/**
+	 * Contains additional information about the context in which
+	 * [completion provider](#CompletionItemProvider.provideCompletionItems) is triggered.
+	 */
+	export interface CompletionContext {
+		/**
+		 * How the completion was triggered.
+		 */
+		readonly triggerKind: CompletionTriggerKind;
+
+		/**
+		 * Character that triggered the completion item provider.
+		 *
+		 * `undefined` if provider was not triggered by a character.
+		 *
+		 * The trigger character is already in the document when the completion provider is triggered.
+		 */
+		readonly triggerCharacter?: string;
+	}
+
+	/**
+	 * The completion item provider interface defines the contract between extensions and
+	 * [IntelliSense](https://code.visualstudio.com/docs/editor/intellisense).
+	 *
+	 * Providers can delay the computation of the [`detail`](#CompletionItem.detail)
+	 * and [`documentation`](#CompletionItem.documentation) properties by implementing the
+	 * [`resolveCompletionItem`](#CompletionItemProvider.resolveCompletionItem)-function. However, properties that
+	 * are needed for the initial sorting and filtering, like `sortText`, `filterText`, `insertText`, and `range`, must
+	 * not be changed during resolve.
+	 *
+	 * Providers are asked for completions either explicitly by a user gesture or -depending on the configuration-
+	 * implicitly when typing words or trigger characters.
+	 */
+	export interface CompletionItemProvider {
+
+		/**
+		 * Provide completion items for the given position and document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param position The position at which the command was invoked.
+		 * @param token A cancellation token.
+		 * @param context How the completion was triggered.
+		 *
+		 * @return An array of completions, a [completion list](#CompletionList), or a thenable that resolves to either.
+		 * The lack of a result can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext): ProviderResult<CompletionItem[] | CompletionList>;
+
+		/**
+		 * Given a completion item fill in more data, like [doc-comment](#CompletionItem.documentation)
+		 * or [details](#CompletionItem.detail).
+		 *
+		 * The editor will only resolve a completion item once.
+		 *
+		 * @param item A completion item currently active in the UI.
+		 * @param token A cancellation token.
+		 * @return The resolved completion item or a thenable that resolves to of such. It is OK to return the given
+		 * `item`. When no result is returned, the given `item` will be used.
+		 */
+		resolveCompletionItem?(item: CompletionItem, token: CancellationToken): ProviderResult<CompletionItem>;
+	}
+
+
+	/**
+	 * A document link is a range in a text document that links to an internal or external resource, like another
+	 * text document or a web site.
+	 */
+	export class DocumentLink {
+
+		/**
+		 * The range this link applies to.
+		 */
+		range: Range;
+
+		/**
+		 * The uri this link points to.
+		 */
+		target?: Uri;
+
+		/**
+		 * Creates a new document link.
+		 *
+		 * @param range The range the document link applies to. Must not be empty.
+		 * @param target The uri the document link points to.
+		 */
+		constructor(range: Range, target?: Uri);
+	}
+
+	/**
+	 * The document link provider defines the contract between extensions and feature of showing
+	 * links in the editor.
+	 */
+	export interface DocumentLinkProvider {
+
+		/**
+		 * Provide links for the given document. Note that the editor ships with a default provider that detects
+		 * `http(s)` and `file` links.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of [document links](#DocumentLink) or a thenable that resolves to such. The lack of a result
+		 * can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentLinks(document: TextDocument, token: CancellationToken): ProviderResult<DocumentLink[]>;
+
+		/**
+		 * Given a link fill in its [target](#DocumentLink.target). This method is called when an incomplete
+		 * link is selected in the UI. Providers can implement this method and return incomplete links
+		 * (without target) from the [`provideDocumentLinks`](#DocumentLinkProvider.provideDocumentLinks) method which
+		 * often helps to improve performance.
+		 *
+		 * @param link The link that is to be resolved.
+		 * @param token A cancellation token.
+		 */
+		resolveDocumentLink?(link: DocumentLink, token: CancellationToken): ProviderResult<DocumentLink>;
+	}
+
+	/**
+	 * Represents a color in RGBA space.
+	 */
+	export class Color {
+
+		/**
+		 * The red component of this color in the range [0-1].
+		 */
+		readonly red: number;
+
+		/**
+		 * The green component of this color in the range [0-1].
+		 */
+		readonly green: number;
+
+		/**
+		 * The blue component of this color in the range [0-1].
+		 */
+		readonly blue: number;
+
+		/**
+		 * The alpha component of this color in the range [0-1].
+		 */
+		readonly alpha: number;
+
+		/**
+		 * Creates a new color instance.
+		 *
+		 * @param red The red component.
+		 * @param green The green component.
+		 * @param blue The blue component.
+		 * @param alpha The alpha component.
+		 */
+		constructor(red: number, green: number, blue: number, alpha: number);
+	}
+
+	/**
+	 * Represents a color range from a document.
+	 */
+	export class ColorInformation {
+
+		/**
+		 * The range in the document where this color appears.
+		 */
+		range: Range;
+
+		/**
+		 * The actual color value for this color range.
+		 */
+		color: Color;
+
+		/**
+		 * Creates a new color range.
+		 *
+		 * @param range The range the color appears in. Must not be empty.
+		 * @param color The value of the color.
+		 * @param format The format in which this color is currently formatted.
+		 */
+		constructor(range: Range, color: Color);
+	}
+
+	/**
+	 * A color presentation object describes how a [`color`](#Color) should be represented as text and what
+	 * edits are required to refer to it from source code.
+	 *
+	 * For some languages one color can have multiple presentations, e.g. css can represent the color red with
+	 * the constant `Red`, the hex-value `#ff0000`, or in rgba and hsla forms. In csharp other representations
+	 * apply, e.g `System.Drawing.Color.Red`.
+	 */
+	export class ColorPresentation {
+
+		/**
+		 * The label of this color presentation. It will be shown on the color
+		 * picker header. By default this is also the text that is inserted when selecting
+		 * this color presentation.
+		 */
+		label: string;
+
+		/**
+		 * An [edit](#TextEdit) which is applied to a document when selecting
+		 * this presentation for the color.  When `falsy` the [label](#ColorPresentation.label)
+		 * is used.
+		 */
+		textEdit?: TextEdit;
+
+		/**
+		 * An optional array of additional [text edits](#TextEdit) that are applied when
+		 * selecting this color presentation. Edits must not overlap with the main [edit](#ColorPresentation.textEdit) nor with themselves.
+		 */
+		additionalTextEdits?: TextEdit[];
+
+		/**
+		 * Creates a new color presentation.
+		 *
+		 * @param label The label of this color presentation.
+		 */
+		constructor(label: string);
+	}
+
+	/**
+	 * The document color provider defines the contract between extensions and feature of
+	 * picking and modifying colors in the editor.
+	 */
+	export interface DocumentColorProvider {
+
+		/**
+		 * Provide colors for the given document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of [color information](#ColorInformation) or a thenable that resolves to such. The lack of a result
+		 * can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentColors(document: TextDocument, token: CancellationToken): ProviderResult<ColorInformation[]>;
+
+		/**
+		 * Provide [representations](#ColorPresentation) for a color.
+		 *
+		 * @param color The color to show and insert.
+		 * @param context A context object with additional information
+		 * @param token A cancellation token.
+		 * @return An array of color presentations or a thenable that resolves to such. The lack of a result
+		 * can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
+	}
+
+	/**
+	 * A line based folding range. To be valid, start and end line must a zero or larger and smaller than the number of lines in the document.
+	 * Invalid ranges will be ignored.
+	 */
+	export class FoldingRange {
+
+		/**
+		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+		 */
+		start: number;
+
+		/**
+		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
+		 */
+		end: number;
+
+		/**
+		 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
+		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
+		 * like 'Fold all comments'. See
+		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
+		 * If not set, the range is originated from a syntax element.
+		 */
+		kind?: FoldingRangeKind;
+
+		/**
+		 * Creates a new folding range.
+		 *
+		 * @param start The start line of the folded range.
+		 * @param end The end line of the folded range.
+		 * @param kind The kind of the folding range.
+		 */
+		constructor(start: number, end: number, kind?: FoldingRangeKind);
+	}
+
+	/**
+	 * An enumeration of specific folding range kinds. The kind is an optional field of a [FoldingRange](#FoldingRange)
+	 * and is used to distinguish specific folding ranges such as ranges originated from comments. The kind is used by commands like
+	 * `Fold all comments` or `Fold all regions`.
+	 * If the kind is not set on the range, the range originated from a syntax element other than comments, imports or region markers.
+	 */
+	export enum FoldingRangeKind {
+		/**
+		 * Kind for folding range representing a comment.
+		 */
+		Comment = 1,
+		/**
+		 * Kind for folding range representing a import.
+		 */
+		Imports = 2,
+		/**
+		 * Kind for folding range representing regions originating from folding markers like `#region` and `#endregion`.
+		 */
+		Region = 3
+	}
+
+	/**
+	 * Folding context (for future use)
+	 */
+	export interface FoldingContext {
+	}
+
+	/**
+	 * The folding range provider interface defines the contract between extensions and
+	 * [Folding](https://code.visualstudio.com/docs/editor/codebasics#_folding) in the editor.
+	 */
+	export interface FoldingRangeProvider {
+		/**
+		 * Returns a list of folding ranges or null and undefined if the provider
+		 * does not want to participate or was cancelled.
+		 * @param document The document in which the command was invoked.
+		 * @param context Additional context information (for future use)
+		 * @param token A cancellation token.
+		 */
+		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
+	}
+
+	/**
+	 * A tuple of two characters, like a pair of
+	 * opening and closing brackets.
+	 */
+	export type CharacterPair = [string, string];
+
+	/**
+	 * Describes how comments for a language work.
+	 */
+	export interface CommentRule {
+
+		/**
+		 * The line comment token, like `// this is a comment`
+		 */
+		lineComment?: string;
+
+		/**
+		 * The block comment character pair, like `/* block comment *&#47;`
+		 */
+		blockComment?: CharacterPair;
+	}
+
+	/**
+	 * Describes indentation rules for a language.
+	 */
+	export interface IndentationRule {
+		/**
+		 * If a line matches this pattern, then all the lines after it should be unindented once (until another rule matches).
+		 */
+		decreaseIndentPattern: RegExp;
+		/**
+		 * If a line matches this pattern, then all the lines after it should be indented once (until another rule matches).
+		 */
+		increaseIndentPattern: RegExp;
+		/**
+		 * If a line matches this pattern, then **only the next line** after it should be indented once.
+		 */
+		indentNextLinePattern?: RegExp;
+		/**
+		 * If a line matches this pattern, then its indentation should not be changed and it should not be evaluated against the other rules.
+		 */
+		unIndentedLinePattern?: RegExp;
+	}
+
+	/**
+	 * Describes what to do with the indentation when pressing Enter.
+	 */
+	export enum IndentAction {
+		/**
+		 * Insert new line and copy the previous line's indentation.
+		 */
+		None = 0,
+		/**
+		 * Insert new line and indent once (relative to the previous line's indentation).
+		 */
+		Indent = 1,
+		/**
+		 * Insert two new lines:
+		 *  - the first one indented which will hold the cursor
+		 *  - the second one at the same indentation level
+		 */
+		IndentOutdent = 2,
+		/**
+		 * Insert new line and outdent once (relative to the previous line's indentation).
+		 */
+		Outdent = 3
+	}
+
+	/**
+	 * Describes what to do when pressing Enter.
+	 */
+	export interface EnterAction {
+		/**
+		 * Describe what to do with the indentation.
+		 */
+		indentAction: IndentAction;
+		/**
+		 * Describes text to be appended after the new line and after the indentation.
+		 */
+		appendText?: string;
+		/**
+		 * Describes the number of characters to remove from the new line's indentation.
+		 */
+		removeText?: number;
+	}
+
+	/**
+	 * Describes a rule to be evaluated when pressing Enter.
+	 */
+	export interface OnEnterRule {
+		/**
+		 * This rule will only execute if the text before the cursor matches this regular expression.
+		 */
+		beforeText: RegExp;
+		/**
+		 * This rule will only execute if the text after the cursor matches this regular expression.
+		 */
+		afterText?: RegExp;
+		/**
+		 * The action to execute.
+		 */
+		action: EnterAction;
+	}
+
+	/**
+	 * The language configuration interfaces defines the contract between extensions
+	 * and various editor features, like automatic bracket insertion, automatic indentation etc.
+	 */
+	export interface LanguageConfiguration {
+		/**
+		 * The language's comment settings.
+		 */
+		comments?: CommentRule;
+		/**
+		 * The language's brackets.
+		 * This configuration implicitly affects pressing Enter around these brackets.
+		 */
+		brackets?: CharacterPair[];
+		/**
+		 * The language's word definition.
+		 * If the language supports Unicode identifiers (e.g. JavaScript), it is preferable
+		 * to provide a word definition that uses exclusion of known separators.
+		 * e.g.: A regex that matches anything except known separators (and dot is allowed to occur in a floating point number):
+		 *   /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g
+		 */
+		wordPattern?: RegExp;
+		/**
+		 * The language's indentation settings.
+		 */
+		indentationRules?: IndentationRule;
+		/**
+		 * The language's rules to be evaluated when pressing Enter.
+		 */
+		onEnterRules?: OnEnterRule[];
+
+		/**
+		 * **Deprecated** Do not use.
+		 *
+		 * @deprecated Will be replaced by a better API soon.
+		 */
+		__electricCharacterSupport?: {
+			/**
+			 * This property is deprecated and will be **ignored** from
+			 * the editor.
+			 * @deprecated
+			 */
+			brackets?: any;
+			/**
+			 * This property is deprecated and not fully supported anymore by
+			 * the editor (scope and lineStart are ignored).
+			 * Use the the autoClosingPairs property in the language configuration file instead.
+			 * @deprecated
+			 */
+			docComment?: {
+				scope: string;
+				open: string;
+				lineStart: string;
+				close?: string;
+			};
+		};
+
+		/**
+		 * **Deprecated** Do not use.
+		 *
+		 * @deprecated * Use the the autoClosingPairs property in the language configuration file instead.
+		 */
+		__characterPairSupport?: {
+			autoClosingPairs: {
+				open: string;
+				close: string;
+				notIn?: string[];
+			}[];
+		};
+	}
+
+	/**
+	 * The configuration target
+	 */
+	export enum ConfigurationTarget {
+		/**
+		 * Global configuration
+		*/
+		Global = 1,
+
+		/**
+		 * Workspace configuration
+		 */
+		Workspace = 2,
+
+		/**
+		 * Workspace folder configuration
+		 */
+		WorkspaceFolder = 3
+	}
+
+	/**
+	 * Represents the configuration. It is a merged view of
+	 *
+	 * - Default configuration
+	 * - Global configuration
+	 * - Workspace configuration (if available)
+	 * - Workspace folder configuration of the requested resource (if available)
+	 *
+	 * *Global configuration* comes from User Settings and shadows Defaults.
+	 *
+	 * *Workspace configuration* comes from Workspace Settings and shadows Global configuration.
+	 *
+	 * *Workspace Folder configuration* comes from `.vscode` folder under one of the [workspace folders](#workspace.workspaceFolders).
+	 *
+	 * *Note:* Workspace and Workspace Folder configurations contains `launch` and `tasks` settings. Their basename will be
+	 * part of the section identifier. The following snippets shows how to retrieve all configurations
+	 * from `launch.json`:
+	 *
+	 * ```ts
+	 * // launch.json configuration
+	 * const config = workspace.getConfiguration('launch', vscode.window.activeTextEditor.document.uri);
+	 *
+	 * // retrieve values
+	 * const values = config.get('configurations');
+	 * ```
+	 *
+	 * Refer to [Settings](https://code.visualstudio.com/docs/getstarted/settings) for more information.
+	 */
+	export interface WorkspaceConfiguration {
+
+		/**
+		 * Return a value from this configuration.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @return The value `section` denotes or `undefined`.
+		 */
+		get<T>(section: string): T | undefined;
+
+		/**
+		 * Return a value from this configuration.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @param defaultValue A value should be returned when no value could be found, is `undefined`.
+		 * @return The value `section` denotes or the default.
+		 */
+		get<T>(section: string, defaultValue: T): T;
+
+		/**
+		 * Check if this configuration has a certain value.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @return `true` if the section doesn't resolve to `undefined`.
+		 */
+		has(section: string): boolean;
+
+		/**
+		 * Retrieve all information about a configuration setting. A configuration value
+		 * often consists of a *default* value, a global or installation-wide value,
+		 * a workspace-specific value and a folder-specific value.
+		 *
+		 * The *effective* value (returned by [`get`](#WorkspaceConfiguration.get))
+		 * is computed like this: `defaultValue` overwritten by `globalValue`,
+		 * `globalValue` overwritten by `workspaceValue`. `workspaceValue` overwritten by `workspaceFolderValue`.
+		 * Refer to [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings)
+		 * for more information.
+		 *
+		 * *Note:* The configuration name must denote a leaf in the configuration tree
+		 * (`editor.fontSize` vs `editor`) otherwise no result is returned.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @return Information about a configuration setting or `undefined`.
+		 */
+		inspect<T>(section: string): { key: string; defaultValue?: T; globalValue?: T; workspaceValue?: T, workspaceFolderValue?: T } | undefined;
+
+		/**
+		 * Update a configuration value. The updated configuration values are persisted.
+		 *
+		 * A value can be changed in
+		 *
+		 * - [Global configuration](#ConfigurationTarget.Global): Changes the value for all instances of the editor.
+		 * - [Workspace configuration](#ConfigurationTarget.Workspace): Changes the value for current workspace, if available.
+		 * - [Workspace folder configuration](#ConfigurationTarget.WorkspaceFolder): Changes the value for the
+		 * [Workspace folder](#workspace.workspaceFolders) to which the current [configuration](#WorkspaceConfiguration) is scoped to.
+		 *
+		 * *Note 1:* Setting a global value in the presence of a more specific workspace value
+		 * has no observable effect in that workspace, but in others. Setting a workspace value
+		 * in the presence of a more specific folder value has no observable effect for the resources
+		 * under respective [folder](#workspace.workspaceFolders), but in others. Refer to
+		 * [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings) for more information.
+		 *
+		 * *Note 2:* To remove a configuration value use `undefined`, like so: `config.update('somekey', undefined)`
+		 *
+		 * Will throw error when
+		 * - Writing a configuration which is not registered.
+		 * - Writing a configuration to workspace or folder target when no workspace is opened
+		 * - Writing a configuration to folder target when there is no folder settings
+		 * - Writing to folder target without passing a resource when getting the configuration (`workspace.getConfiguration(section, resource)`)
+		 * - Writing a window configuration to folder target
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @param value The new value.
+		 * @param configurationTarget The [configuration target](#ConfigurationTarget) or a boolean value.
+		 *	- If `true` configuration target is `ConfigurationTarget.Global`.
+		 *	- If `false` configuration target is `ConfigurationTarget.Workspace`.
+		 *	- If `undefined` or `null` configuration target is
+		 *	`ConfigurationTarget.WorkspaceFolder` when configuration is resource specific
+		 *	`ConfigurationTarget.Workspace` otherwise.
+		 */
+		update(section: string, value: any, configurationTarget?: ConfigurationTarget | boolean): Thenable<void>;
+
+		/**
+		 * Readable dictionary that backs this configuration.
+		 */
+		readonly [key: string]: any;
+	}
+
+	/**
+	 * Represents a location inside a resource, such as a line
+	 * inside a text file.
+	 */
+	export class Location {
+
+		/**
+		 * The resource identifier of this location.
+		 */
+		uri: Uri;
+
+		/**
+		 * The document range of this location.
+		 */
+		range: Range;
+
+		/**
+		 * Creates a new location object.
+		 *
+		 * @param uri The resource identifier.
+		 * @param rangeOrPosition The range or position. Positions will be converted to an empty range.
+		 */
+		constructor(uri: Uri, rangeOrPosition: Range | Position);
+	}
+
+	/**
+	 * The event that is fired when diagnostics change.
+	 */
+	export interface DiagnosticChangeEvent {
+
+		/**
+		 * An array of resources for which diagnostics have changed.
+		 */
+		readonly uris: Uri[];
+	}
+
+	/**
+	 * Represents the severity of diagnostics.
+	 */
+	export enum DiagnosticSeverity {
+
+		/**
+		 * Something not allowed by the rules of a language or other means.
+		 */
+		Error = 0,
+
+		/**
+		 * Something suspicious but allowed.
+		 */
+		Warning = 1,
+
+		/**
+		 * Something to inform about but not a problem.
+		 */
+		Information = 2,
+
+		/**
+		 * Something to hint to a better way of doing it, like proposing
+		 * a refactoring.
+		 */
+		Hint = 3
+	}
+
+	/**
+	 * Represents a related message and source code location for a diagnostic. This should be
+	 * used to point to code locations that cause or related to a diagnostics, e.g when duplicating
+	 * a symbol in a scope.
+	 */
+	export class DiagnosticRelatedInformation {
+
+		/**
+		 * The location of this related diagnostic information.
+		 */
+		location: Location;
+
+		/**
+		 * The message of this related diagnostic information.
+		 */
+		message: string;
+
+		/**
+		 * Creates a new related diagnostic information object.
+		 *
+		 * @param location The location.
+		 * @param message The message.
+		 */
+		constructor(location: Location, message: string);
+	}
+
+	/**
+	 * Additional metadata about the type of a diagnostic.
+	 */
+	export enum DiagnosticTag {
+		/**
+		 * Unused or unnecessary code.
+		 *
+		 * Diagnostics with this tag are rendered faded out. The amount of fading
+		 * is controlled by the `"editorUnnecessaryCode.opacity"` theme color. For
+		 * example, `"editorUnnecessaryCode.opacity": "#000000c0"` will render the
+		 * code with 75% opacity. For high contrast themes, use the
+		 * `"editorUnnecessaryCode.border"` theme color to underline unnecessary code
+		 * instead of fading it out.
+		 */
+		Unnecessary = 1,
+	}
+
+	/**
+	 * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
+	 * are only valid in the scope of a file.
+	 */
+	export class Diagnostic {
+
+		/**
+		 * The range to which this diagnostic applies.
+		 */
+		range: Range;
+
+		/**
+		 * The human-readable message.
+		 */
+		message: string;
+
+		/**
+		 * The severity, default is [error](#DiagnosticSeverity.Error).
+		 */
+		severity: DiagnosticSeverity;
+
+		/**
+		 * A human-readable string describing the source of this
+		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 */
+		source?: string;
+
+		/**
+		 * A code or identifier for this diagnostic.
+		 * Should be used for later processing, e.g. when providing [code actions](#CodeActionContext).
+		 */
+		code?: string | number;
+
+		/**
+		 * An array of related diagnostic information, e.g. when symbol-names within
+		 * a scope collide all definitions can be marked via this property.
+		 */
+		relatedInformation?: DiagnosticRelatedInformation[];
+
+		/**
+		 * Additional metadata about the diagnostic.
+		 */
+		tags?: DiagnosticTag[];
+
+		/**
+		 * Creates a new diagnostic object.
+		 *
+		 * @param range The range to which this diagnostic applies.
+		 * @param message The human-readable message.
+		 * @param severity The severity, default is [error](#DiagnosticSeverity.Error).
+		 */
+		constructor(range: Range, message: string, severity?: DiagnosticSeverity);
+	}
+
+	/**
+	 * A diagnostics collection is a container that manages a set of
+	 * [diagnostics](#Diagnostic). Diagnostics are always scopes to a
+	 * diagnostics collection and a resource.
+	 *
+	 * To get an instance of a `DiagnosticCollection` use
+	 * [createDiagnosticCollection](#languages.createDiagnosticCollection).
+	 */
+	export interface DiagnosticCollection {
+
+		/**
+		 * The name of this diagnostic collection, for instance `typescript`. Every diagnostic
+		 * from this collection will be associated with this name. Also, the task framework uses this
+		 * name when defining [problem matchers](https://code.visualstudio.com/docs/editor/tasks#_defining-a-problem-matcher).
+		 */
+		readonly name: string;
+
+		/**
+		 * Assign diagnostics for given resource. Will replace
+		 * existing diagnostics for that resource.
+		 *
+		 * @param uri A resource identifier.
+		 * @param diagnostics Array of diagnostics or `undefined`
+		 */
+		set(uri: Uri, diagnostics: Diagnostic[] | undefined): void;
+
+		/**
+		 * Replace all entries in this collection.
+		 *
+		 * Diagnostics of multiple tuples of the same uri will be merged, e.g
+		 * `[[file1, [d1]], [file1, [d2]]]` is equivalent to `[[file1, [d1, d2]]]`.
+		 * If a diagnostics item is `undefined` as in `[file1, undefined]`
+		 * all previous but not subsequent diagnostics are removed.
+		 *
+		 * @param entries An array of tuples, like `[[file1, [d1, d2]], [file2, [d3, d4, d5]]]`, or `undefined`.
+		 */
+		set(entries: [Uri, Diagnostic[] | undefined][]): void;
+
+		/**
+		 * Remove all diagnostics from this collection that belong
+		 * to the provided `uri`. The same as `#set(uri, undefined)`.
+		 *
+		 * @param uri A resource identifier.
+		 */
+		delete(uri: Uri): void;
+
+		/**
+		 * Remove all diagnostics from this collection. The same
+		 * as calling `#set(undefined)`;
+		 */
+		clear(): void;
+
+		/**
+		 * Iterate over each entry in this collection.
+		 *
+		 * @param callback Function to execute for each entry.
+		 * @param thisArg The `this` context used when invoking the handler function.
+		 */
+		forEach(callback: (uri: Uri, diagnostics: Diagnostic[], collection: DiagnosticCollection) => any, thisArg?: any): void;
+
+		/**
+		 * Get the diagnostics for a given resource. *Note* that you cannot
+		 * modify the diagnostics-array returned from this call.
+		 *
+		 * @param uri A resource identifier.
+		 * @returns An immutable array of [diagnostics](#Diagnostic) or `undefined`.
+		 */
+		get(uri: Uri): Diagnostic[] | undefined;
+
+		/**
+		 * Check if this collection contains diagnostics for a
+		 * given resource.
+		 *
+		 * @param uri A resource identifier.
+		 * @returns `true` if this collection has diagnostic for the given resource.
+		 */
+		has(uri: Uri): boolean;
+
+		/**
+		 * Dispose and free associated resources. Calls
+		 * [clear](#DiagnosticCollection.clear).
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Denotes a location of an editor in the window. Editors can be arranged in a grid
+	 * and each column represents one editor location in that grid by counting the editors
+	 * in order of their appearance.
+	 */
+	export enum ViewColumn {
+		/**
+		 * A *symbolic* editor column representing the currently active column. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Active`.
+		 */
+		Active = -1,
+		/**
+		 * A *symbolic* editor column representing the column to the side of the active one. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Beside`.
+		 */
+		Beside = -2,
+		/**
+		 * The first editor column.
+		 */
+		One = 1,
+		/**
+		 * The second editor column.
+		 */
+		Two = 2,
+		/**
+		 * The third editor column.
+		 */
+		Three = 3,
+		/**
+		 * The fourth editor column.
+		 */
+		Four = 4,
+		/**
+		 * The fifth editor column.
+		 */
+		Five = 5,
+		/**
+		 * The sixth editor column.
+		 */
+		Six = 6,
+		/**
+		 * The seventh editor column.
+		 */
+		Seven = 7,
+		/**
+		 * The eighth editor column.
+		 */
+		Eight = 8,
+		/**
+		 * The ninth editor column.
+		 */
+		Nine = 9
+	}
+
+	/**
+	 * An output channel is a container for readonly textual information.
+	 *
+	 * To get an instance of an `OutputChannel` use
+	 * [createOutputChannel](#window.createOutputChannel).
+	 */
+	export interface OutputChannel {
+
+		/**
+		 * The human-readable name of this output channel.
+		 */
+		readonly name: string;
+
+		/**
+		 * Append the given value to the channel.
+		 *
+		 * @param value A string, falsy values will not be printed.
+		 */
+		append(value: string): void;
+
+		/**
+		 * Append the given value and a line feed character
+		 * to the channel.
+		 *
+		 * @param value A string, falsy values will be printed.
+		 */
+		appendLine(value: string): void;
+
+		/**
+		 * Removes all output from the channel.
+		 */
+		clear(): void;
+
+		/**
+		 * Reveal this channel in the UI.
+		 *
+		 * @param preserveFocus When `true` the channel will not take focus.
+		 */
+		show(preserveFocus?: boolean): void;
+
+		/**
+		 * ~~Reveal this channel in the UI.~~
+		 *
+		 * @deprecated Use the overload with just one parameter (`show(preserveFocus?: boolean): void`).
+		 *
+		 * @param column This argument is **deprecated** and will be ignored.
+		 * @param preserveFocus When `true` the channel will not take focus.
+		 */
+		show(column?: ViewColumn, preserveFocus?: boolean): void;
+
+		/**
+		 * Hide this channel from the UI.
+		 */
+		hide(): void;
+
+		/**
+		 * Dispose and free associated resources.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Represents the alignment of status bar items.
+	 */
+	export enum StatusBarAlignment {
+
+		/**
+		 * Aligned to the left side.
+		 */
+		Left = 1,
+
+		/**
+		 * Aligned to the right side.
+		 */
+		Right = 2
+	}
+
+	/**
+	 * A status bar item is a status bar contribution that can
+	 * show text and icons and run a command on click.
+	 */
+	export interface StatusBarItem {
+
+		/**
+		 * The alignment of this item.
+		 */
+		readonly alignment: StatusBarAlignment;
+
+		/**
+		 * The priority of this item. Higher value means the item should
+		 * be shown more to the left.
+		 */
+		readonly priority: number;
+
+		/**
+		 * The text to show for the entry. You can embed icons in the text by leveraging the syntax:
+		 *
+		 * `My text $(icon-name) contains icons like $(icon-name) this one.`
+		 *
+		 * Where the icon-name is taken from the [octicon](https://octicons.github.com) icon set, e.g.
+		 * `light-bulb`, `thumbsup`, `zap` etc.
+		 */
+		text: string;
+
+		/**
+		 * The tooltip text when you hover over this entry.
+		 */
+		tooltip: string | undefined;
+
+		/**
+		 * The foreground color for this entry.
+		 */
+		color: string | ThemeColor | undefined;
+
+		/**
+		 * The identifier of a command to run on click. The command must be
+		 * [known](#commands.getCommands).
+		 */
+		command: string | undefined;
+
+		/**
+		 * Shows the entry in the status bar.
+		 */
+		show(): void;
+
+		/**
+		 * Hide the entry in the status bar.
+		 */
+		hide(): void;
+
+		/**
+		 * Dispose and free associated resources. Call
+		 * [hide](#StatusBarItem.hide).
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Defines a generalized way of reporting progress updates.
+	 */
+	export interface Progress<T> {
+
+		/**
+		 * Report a progress update.
+		 * @param value A progress item, like a message and/or an
+		 * report on how much work finished
+		 */
+		report(value: T): void;
+	}
+
+	/**
+	 * An individual terminal instance within the integrated terminal.
+	 */
+	export interface Terminal {
+
+		/**
+		 * The name of the terminal.
+		 */
+		readonly name: string;
+
+		/**
+		 * The process ID of the shell process.
+		 */
+		readonly processId: Thenable<number>;
+
+		/**
+		 * Send text to the terminal. The text is written to the stdin of the underlying pty process
+		 * (shell) of the terminal.
+		 *
+		 * @param text The text to send.
+		 * @param addNewLine Whether to add a new line to the text being sent, this is normally
+		 * required to run a command in the terminal. The character(s) added are \n or \r\n
+		 * depending on the platform. This defaults to `true`.
+		 */
+		sendText(text: string, addNewLine?: boolean): void;
+
+		/**
+		 * Show the terminal panel and reveal this terminal in the UI.
+		 *
+		 * @param preserveFocus When `true` the terminal will not take focus.
+		 */
+		show(preserveFocus?: boolean): void;
+
+		/**
+		 * Hide the terminal panel if this terminal is currently showing.
+		 */
+		hide(): void;
+
+		/**
+		 * Dispose and free associated resources.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * Represents an extension.
+	 *
+	 * To get an instance of an `Extension` use [getExtension](#extensions.getExtension).
+	 */
+	export interface Extension<T> {
+
+		/**
+		 * The canonical extension identifier in the form of: `publisher.name`.
+		 */
+		readonly id: string;
+
+		/**
+		 * The absolute file path of the directory containing this extension.
+		 */
+		readonly extensionPath: string;
+
+		/**
+		 * `true` if the extension has been activated.
+		 */
+		readonly isActive: boolean;
+
+		/**
+		 * The parsed contents of the extension's package.json.
+		 */
+		readonly packageJSON: any;
+
+		/**
+		 * The public API exported by this extension. It is an invalid action
+		 * to access this field before this extension has been activated.
+		 */
+		readonly exports: T;
+
+		/**
+		 * Activates this extension and returns its public API.
+		 *
+		 * @return A promise that will resolve when this extension has been activated.
+		 */
+		activate(): Thenable<T>;
+	}
+
+	/**
+	 * An extension context is a collection of utilities private to an
+	 * extension.
+	 *
+	 * An instance of an `ExtensionContext` is provided as the first
+	 * parameter to the `activate`-call of an extension.
+	 */
+	export interface ExtensionContext {
+
+		/**
+		 * An array to which disposables can be added. When this
+		 * extension is deactivated the disposables will be disposed.
+		 */
+		subscriptions: { dispose(): any }[];
+
+		/**
+		 * A memento object that stores state in the context
+		 * of the currently opened [workspace](#workspace.workspaceFolders).
+		 */
+		workspaceState: Memento;
+
+		/**
+		 * A memento object that stores state independent
+		 * of the current opened [workspace](#workspace.workspaceFolders).
+		 */
+		globalState: Memento;
+
+		/**
+		 * The absolute file path of the directory containing the extension.
+		 */
+		extensionPath: string;
+
+		/**
+		 * Get the absolute path of a resource contained in the extension.
+		 *
+		 * @param relativePath A relative path to a resource contained in the extension.
+		 * @return The absolute path of the resource.
+		 */
+		asAbsolutePath(relativePath: string): string;
+
+		/**
+		 * An absolute file path of a workspace specific directory in which the extension
+		 * can store private state. The directory might not exist on disk and creation is
+		 * up to the extension. However, the parent directory is guaranteed to be existent.
+		 *
+		 * Use [`workspaceState`](#ExtensionContext.workspaceState) or
+		 * [`globalState`](#ExtensionContext.globalState) to store key value data.
+		 */
+		storagePath: string | undefined;
+
+		/**
+		 * An absolute file path of a directory in which the extension can create log files.
+		 * The directory might not exist on disk and creation is up to the extension. However,
+		 * the parent directory is guaranteed to be existent.
+		 */
+		logPath: string;
+	}
+
+	/**
+	 * A memento represents a storage utility. It can store and retrieve
+	 * values.
+	 */
+	export interface Memento {
+
+		/**
+		 * Return a value.
+		 *
+		 * @param key A string.
+		 * @return The stored value or `undefined`.
+		 */
+		get<T>(key: string): T | undefined;
+
+		/**
+		 * Return a value.
+		 *
+		 * @param key A string.
+		 * @param defaultValue A value that should be returned when there is no
+		 * value (`undefined`) with the given key.
+		 * @return The stored value or the defaultValue.
+		 */
+		get<T>(key: string, defaultValue: T): T;
+
+		/**
+		 * Store a value. The value must be JSON-stringifyable.
+		 *
+		 * @param key A string.
+		 * @param value A value. MUST not contain cyclic references.
+		 */
+		update(key: string, value: any): Thenable<void>;
+	}
+
+	/**
+	 * Controls the behaviour of the terminal's visibility.
+	 */
+	export enum TaskRevealKind {
+		/**
+		 * Always brings the terminal to front if the task is executed.
+		 */
+		Always = 1,
+
+		/**
+		 * Only brings the terminal to front if a problem is detected executing the task
+		 * (e.g. the task couldn't be started because).
+		 */
+		Silent = 2,
+
+		/**
+		 * The terminal never comes to front when the task is executed.
+		 */
+		Never = 3
+	}
+
+	/**
+	 * Controls how the task channel is used between tasks
+	 */
+	export enum TaskPanelKind {
+
+		/**
+		 * Shares a panel with other tasks. This is the default.
+		 */
+		Shared = 1,
+
+		/**
+		 * Uses a dedicated panel for this tasks. The panel is not
+		 * shared with other tasks.
+		 */
+		Dedicated = 2,
+
+		/**
+		 * Creates a new panel whenever this task is executed.
+		 */
+		New = 3
+	}
+
+	/**
+	 * Controls how the task is presented in the UI.
+	 */
+	export interface TaskPresentationOptions {
+		/**
+		 * Controls whether the task output is reveal in the user interface.
+		 * Defaults to `RevealKind.Always`.
+		 */
+		reveal?: TaskRevealKind;
+
+		/**
+		 * Controls whether the command associated with the task is echoed
+		 * in the user interface.
+		 */
+		echo?: boolean;
+
+		/**
+		 * Controls whether the panel showing the task output is taking focus.
+		 */
+		focus?: boolean;
+
+		/**
+		 * Controls if the task panel is used for this task only (dedicated),
+		 * shared between tasks (shared) or if a new panel is created on
+		 * every task execution (new). Defaults to `TaskInstanceKind.Shared`
+		 */
+		panel?: TaskPanelKind;
+
+		/**
+		 * Controls whether to show the "Terminal will be reused by tasks, press any key to close it" message.
+		 */
+		showReuseMessage?: boolean;
+	}
+
+	/**
+	 * A grouping for tasks. The editor by default supports the
+	 * 'Clean', 'Build', 'RebuildAll' and 'Test' group.
+	 */
+	export class TaskGroup {
+
+		/**
+		 * The clean task group;
+		 */
+		static Clean: TaskGroup;
+
+		/**
+		 * The build task group;
+		 */
+		static Build: TaskGroup;
+
+		/**
+		 * The rebuild all task group;
+		 */
+		static Rebuild: TaskGroup;
+
+		/**
+		 * The test all task group;
+		 */
+		static Test: TaskGroup;
+
+		private constructor(id: string, label: string);
+	}
+
+
+	/**
+	 * A structure that defines a task kind in the system.
+	 * The value must be JSON-stringifyable.
+	 */
+	export interface TaskDefinition {
+		/**
+		 * The task definition describing the task provided by an extension.
+		 * Usually a task provider defines more properties to identify
+		 * a task. They need to be defined in the package.json of the
+		 * extension under the 'taskDefinitions' extension point. The npm
+		 * task definition for example looks like this
+		 * ```typescript
+		 * interface NpmTaskDefinition extends TaskDefinition {
+		 *     script: string;
+		 * }
+		 * ```
+		 *
+		 * Note that type identifier starting with a '$' are reserved for internal
+		 * usages and shouldn't be used by extensions.
+		 */
+		readonly type: string;
+
+		/**
+		 * Additional attributes of a concrete task definition.
+		 */
+		[name: string]: any;
+	}
+
+	/**
+	 * Options for a process execution
+	 */
+	export interface ProcessExecutionOptions {
+		/**
+		 * The current working directory of the executed program or shell.
+		 * If omitted the tools current workspace root is used.
+		 */
+		cwd?: string;
+
+		/**
+		 * The additional environment of the executed program or shell. If omitted
+		 * the parent process' environment is used. If provided it is merged with
+		 * the parent process' environment.
+		 */
+		env?: { [key: string]: string };
+	}
+
+	/**
+	 * The execution of a task happens as an external process
+	 * without shell interaction.
+	 */
+	export class ProcessExecution {
+
+		/**
+		 * Creates a process execution.
+		 *
+		 * @param process The process to start.
+		 * @param options Optional options for the started process.
+		 */
+		constructor(process: string, options?: ProcessExecutionOptions);
+
+		/**
+		 * Creates a process execution.
+		 *
+		 * @param process The process to start.
+		 * @param args Arguments to be passed to the process.
+		 * @param options Optional options for the started process.
+		 */
+		constructor(process: string, args: string[], options?: ProcessExecutionOptions);
+
+		/**
+		 * The process to be executed.
+		 */
+		process: string;
+
+		/**
+		 * The arguments passed to the process. Defaults to an empty array.
+		 */
+		args: string[];
+
+		/**
+		 * The process options used when the process is executed.
+		 * Defaults to undefined.
+		 */
+		options?: ProcessExecutionOptions;
+	}
+
+	/**
+	 * The shell quoting options.
+	 */
+	export interface ShellQuotingOptions {
+
+		/**
+		 * The character used to do character escaping. If a string is provided only spaces
+		 * are escaped. If a `{ escapeChar, charsToEscape }` literal is provide all characters
+		 * in `charsToEscape` are escaped using the `escapeChar`.
+		 */
+		escape?: string | {
+			/**
+			 * The escape character.
+			 */
+			escapeChar: string;
+			/**
+			 * The characters to escape.
+			 */
+			charsToEscape: string;
+		};
+
+		/**
+		 * The character used for strong quoting. The string's length must be 1.
+		 */
+		strong?: string;
+
+		/**
+		 * The character used for weak quoting. The string's length must be 1.
+		 */
+		weak?: string;
+	}
+
+	/**
+	 * Options for a shell execution
+	 */
+	export interface ShellExecutionOptions {
+		/**
+		 * The shell executable.
+		 */
+		executable?: string;
+
+		/**
+		 * The arguments to be passed to the shell executable used to run the task. Most shells
+		 * require special arguments to execute a command. For  example `bash` requires the `-c`
+		 * argument to execute a command, `PowerShell` requires `-Command` and `cmd` requires both
+		 * `/d` and `/c`.
+		 */
+		shellArgs?: string[];
+
+		/**
+		 * The shell quotes supported by this shell.
+		 */
+		shellQuoting?: ShellQuotingOptions;
+
+		/**
+		 * The current working directory of the executed shell.
+		 * If omitted the tools current workspace root is used.
+		 */
+		cwd?: string;
+
+		/**
+		 * The additional environment of the executed shell. If omitted
+		 * the parent process' environment is used. If provided it is merged with
+		 * the parent process' environment.
+		 */
+		env?: { [key: string]: string };
+	}
+
+	/**
+	 * Defines how an argument should be quoted if it contains
+	 * spaces or unsupported characters.
+	 */
+	export enum ShellQuoting {
+
+		/**
+		 * Character escaping should be used. This for example
+		 * uses \ on bash and ` on PowerShell.
+		 */
+		Escape = 1,
+
+		/**
+		 * Strong string quoting should be used. This for example
+		 * uses " for Windows cmd and ' for bash and PowerShell.
+		 * Strong quoting treats arguments as literal strings.
+		 * Under PowerShell echo 'The value is $(2 * 3)' will
+		 * print `The value is $(2 * 3)`
+		 */
+		Strong = 2,
+
+		/**
+		 * Weak string quoting should be used. This for example
+		 * uses " for Windows cmd, bash and PowerShell. Weak quoting
+		 * still performs some kind of evaluation inside the quoted
+		 * string.  Under PowerShell echo "The value is $(2 * 3)"
+		 * will print `The value is 6`
+		 */
+		Weak = 3
+	}
+
+	/**
+	 * A string that will be quoted depending on the used shell.
+	 */
+	export interface ShellQuotedString {
+		/**
+		 * The actual string value.
+		 */
+		value: string;
+
+		/**
+		 * The quoting style to use.
+		 */
+		quoting: ShellQuoting;
+	}
+
+	export class ShellExecution {
+		/**
+		 * Creates a shell execution with a full command line.
+		 *
+		 * @param commandLine The command line to execute.
+		 * @param options Optional options for the started the shell.
+		 */
+		constructor(commandLine: string, options?: ShellExecutionOptions);
+
+		/**
+		 * Creates a shell execution with a command and arguments. For the real execution VS Code will
+		 * construct a command line from the command and the arguments. This is subject to interpretation
+		 * especially when it comes to quoting. If full control over the command line is needed please
+		 * use the constructor that creates a `ShellExecution` with the full command line.
+		 *
+		 * @param command The command to execute.
+		 * @param args The command arguments.
+		 * @param options Optional options for the started the shell.
+		 */
+		constructor(command: string | ShellQuotedString, args: (string | ShellQuotedString)[], options?: ShellExecutionOptions);
+
+		/**
+		 * The shell command line. Is `undefined` if created with a command and arguments.
+		 */
+		commandLine: string;
+
+		/**
+		 * The shell command. Is `undefined` if created with a full command line.
+		 */
+		command: string | ShellQuotedString;
+
+		/**
+		 * The shell args. Is `undefined` if created with a full command line.
+		 */
+		args: (string | ShellQuotedString)[];
+
+		/**
+		 * The shell options used when the command line is executed in a shell.
+		 * Defaults to undefined.
+		 */
+		options?: ShellExecutionOptions;
+	}
+
+	/**
+	 * The scope of a task.
+	 */
+	export enum TaskScope {
+		/**
+		 * The task is a global task
+		 */
+		Global = 1,
+
+		/**
+		 * The task is a workspace task
+		 */
+		Workspace = 2
+	}
+
+	/**
+	 * A task to execute
+	 */
+	export class Task {
+
+		/**
+		 * ~~Creates a new task.~~
+		 *
+		 * @deprecated Use the new constructors that allow specifying a target for the task.
+		 *
+		 * @param definition The task definition as defined in the taskDefinitions extension point.
+		 * @param name The task's name. Is presented in the user interface.
+		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
+		 * @param execution The process or shell execution.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
+		 */
+		constructor(taskDefinition: TaskDefinition, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
+
+		/**
+		 * Creates a new task.
+		 *
+		 * @param definition The task definition as defined in the taskDefinitions extension point.
+		 * @param target Specifies the task's target. It is either a global or a workspace task or a task for a specific workspace folder.
+		 * @param name The task's name. Is presented in the user interface.
+		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
+		 * @param execution The process or shell execution.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
+		 */
+		constructor(taskDefinition: TaskDefinition, target: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
+
+		/**
+		 * The task's definition.
+		 */
+		definition: TaskDefinition;
+
+		/**
+		 * The task's scope.
+		 */
+		scope?: TaskScope.Global | TaskScope.Workspace | WorkspaceFolder;
+
+		/**
+		 * The task's name
+		 */
+		name: string;
+
+		/**
+		 * The task's execution engine
+		 */
+		execution: ProcessExecution | ShellExecution;
+
+		/**
+		 * Whether the task is a background task or not.
+		 */
+		isBackground: boolean;
+
+		/**
+		 * A human-readable string describing the source of this
+		 * shell task, e.g. 'gulp' or 'npm'.
+		 */
+		source: string;
+
+		/**
+		 * The task group this tasks belongs to. See TaskGroup
+		 * for a predefined set of available groups.
+		 * Defaults to undefined meaning that the task doesn't
+		 * belong to any special group.
+		 */
+		group?: TaskGroup;
+
+		/**
+		 * The presentation options. Defaults to an empty literal.
+		 */
+		presentationOptions: TaskPresentationOptions;
+
+		/**
+		 * The problem matchers attached to the task. Defaults to an empty
+		 * array.
+		 */
+		problemMatchers: string[];
+	}
+
+	/**
+	 * A task provider allows to add tasks to the task service.
+	 * A task provider is registered via #tasks.registerTaskProvider.
+	 */
+	export interface TaskProvider {
+		/**
+		 * Provides tasks.
+		 * @param token A cancellation token.
+		 * @return an array of tasks
+		 */
+		provideTasks(token?: CancellationToken): ProviderResult<Task[]>;
+
+		/**
+		 * Resolves a task that has no [`execution`](#Task.execution) set. Tasks are
+		 * often created from information found in the `tasks.json`-file. Such tasks miss
+		 * the information on how to execute them and a task provider must fill in
+		 * the missing information in the `resolveTask`-method. This method will not be
+		 * called for tasks returned from the above `provideTasks` method since those
+		 * tasks are always fully resolved. A valid default implementation for the
+		 * `resolveTask` method is to return `undefined`.
+		 *
+		 * @param task The task to resolve.
+		 * @param token A cancellation token.
+		 * @return The resolved task
+		 */
+		resolveTask(task: Task, token?: CancellationToken): ProviderResult<Task>;
+	}
+
+	/**
+	 * An object representing an executed Task. It can be used
+	 * to terminate a task.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	export interface TaskExecution {
+		/**
+		 * The task that got started.
+		 */
+		task: Task;
+
+		/**
+		 * Terminates the task execution.
+		 */
+		terminate(): void;
+	}
+
+	/**
+	 * An event signaling the start of a task execution.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	interface TaskStartEvent {
+		/**
+		 * The task item representing the task that got started.
+		 */
+		execution: TaskExecution;
+	}
+
+	/**
+	 * An event signaling the end of an executed task.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	interface TaskEndEvent {
+		/**
+		 * The task item representing the task that finished.
+		 */
+		execution: TaskExecution;
+	}
+
+	/**
+	 * An event signaling the start of a process execution
+	 * triggered through a task
+	 */
+	export interface TaskProcessStartEvent {
+
+		/**
+		 * The task execution for which the process got started.
+		 */
+		execution: TaskExecution;
+
+		/**
+		 * The underlying process id.
+		 */
+		processId: number;
+	}
+
+	/**
+	 * An event signaling the end of a process execution
+	 * triggered through a task
+	 */
+	export interface TaskProcessEndEvent {
+
+		/**
+		 * The task execution for which the process got started.
+		 */
+		execution: TaskExecution;
+
+		/**
+		 * The process's exit code.
+		 */
+		exitCode: number;
+	}
+
+	export interface TaskFilter {
+		/**
+		 * The task version as used in the tasks.json file.
+		 * The string support the package.json semver notation.
+		 */
+		version?: string;
+
+		/**
+		 * The task type to return;
+		 */
+		type?: string;
+	}
+
+	/**
+	 * Namespace for tasks functionality.
+	 */
+	export namespace tasks {
+
+		/**
+		 * Register a task provider.
+		 *
+		 * @param type The task kind type this provider is registered for.
+		 * @param provider A task provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
+
+		/**
+		 * Fetches all tasks available in the systems. This includes tasks
+		 * from `tasks.json` files as well as tasks from task providers
+		 * contributed through extensions.
+		 *
+		 * @param filter a filter to filter the return tasks.
+		 */
+		export function fetchTasks(filter?: TaskFilter): Thenable<Task[]>;
+
+		/**
+		 * Executes a task that is managed by VS Code. The returned
+		 * task execution can be used to terminate the task.
+		 *
+		 * @param task the task to execute
+		 */
+		export function executeTask(task: Task): Thenable<TaskExecution>;
+
+		/**
+		 * The currently active task executions or an empty array.
+		 *
+		 * @readonly
+		 */
+		export let taskExecutions: ReadonlyArray<TaskExecution>;
+
+		/**
+		 * Fires when a task starts.
+		 */
+		export const onDidStartTask: Event<TaskStartEvent>;
+
+		/**
+		 * Fires when a task ends.
+		 */
+		export const onDidEndTask: Event<TaskEndEvent>;
+
+		/**
+		 * Fires when the underlying process has been started.
+		 * This event will not fire for tasks that don't
+		 * execute an underlying process.
+		 */
+		export const onDidStartTaskProcess: Event<TaskProcessStartEvent>;
+
+		/**
+		 * Fires when the underlying process has ended.
+		 * This event will not fire for tasks that don't
+		 * execute an underlying process.
+		 */
+		export const onDidEndTaskProcess: Event<TaskProcessEndEvent>;
+	}
+
+	/**
+	 * Enumeration of file types. The types `File` and `Directory` can also be
+	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
+	 * `FileType.Directory | FileType.SymbolicLink`.
+	 */
+	export enum FileType {
+		/**
+		 * The file type is unknown.
+		 */
+		Unknown = 0,
+		/**
+		 * A regular file.
+		 */
+		File = 1,
+		/**
+		 * A directory.
+		 */
+		Directory = 2,
+		/**
+		 * A symbolic link to a file.
+		 */
+		SymbolicLink = 64
+	}
+
+	/**
+	 * The `FileStat`-type represents metadata about a file
+	 */
+	export interface FileStat {
+		/**
+		 * The type of the file, e.g. is a regular file, a directory, or symbolic link
+		 * to a file.
+		 */
+		type: FileType;
+		/**
+		 * The creation timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+		 */
+		ctime: number;
+		/**
+		 * The modification timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+		 */
+		mtime: number;
+		/**
+		 * The size in bytes.
+		 */
+		size: number;
+	}
+
+	/**
+	 * A type that filesystem providers should use to signal errors.
+	 *
+	 * This class has factory methods for common error-cases, like `EntryNotFound` when
+	 * a file or folder doesn't exist, use them like so: `throw vscode.FileSystemError.EntryNotFound(someUri);`
+	 */
+	export class FileSystemError extends Error {
+
+		/**
+		 * Create an error to signal that a file or folder wasn't found.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileNotFound(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file or folder already exists, e.g. when
+		 * creating but not overwriting a file.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileExists(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file is not a folder.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileNotADirectory(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file is a folder.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileIsADirectory(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that an operation lacks required permissions.
+		 * @param messageOrUri Message or uri.
+		 */
+		static NoPermissions(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that the file system is unavailable or too busy to
+		 * complete a request.
+		 * @param messageOrUri Message or uri.
+		 */
+		static Unavailable(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Creates a new filesystem error.
+		 *
+		 * @param messageOrUri Message or uri.
+		 */
+		constructor(messageOrUri?: string | Uri);
+	}
+
+	/**
+	 * Enumeration of file change types.
+	 */
+	export enum FileChangeType {
+
+		/**
+		 * The contents or metadata of a file have changed.
+		 */
+		Changed = 1,
+
+		/**
+		 * A file has been created.
+		 */
+		Created = 2,
+
+		/**
+		 * A file has been deleted.
+		 */
+		Deleted = 3,
+	}
+
+	/**
+	 * The event filesystem providers must use to signal a file change.
+	 */
+	export interface FileChangeEvent {
+
+		/**
+		 * The type of change.
+		 */
+		type: FileChangeType;
+
+		/**
+		 * The uri of the file that has changed.
+		 */
+		uri: Uri;
+	}
+
+	/**
+	 * The filesystem provider defines what the editor needs to read, write, discover,
+	 * and to manage files and folders. It allows extensions to serve files from remote places,
+	 * like ftp-servers, and to seamlessly integrate those into the editor.
+	 *
+	 * * *Note 1:* The filesystem provider API works with [uris](#Uri) and assumes hierarchical
+	 * paths, e.g. `foo:/my/path` is a child of `foo:/my/` and a parent of `foo:/my/path/deeper`.
+	 * * *Note 2:* There is an activation event `onFileSystem:<scheme>` that fires when a file
+	 * or folder is being accessed.
+	 * * *Note 3:* The word 'file' is often used to denote all [kinds](#FileType) of files, e.g.
+	 * folders, symbolic links, and regular files.
+	 */
+	export interface FileSystemProvider {
+
+		/**
+		 * An event to signal that a resource has been created, changed, or deleted. This
+		 * event should fire for resources that are being [watched](#FileSystemProvider.watch)
+		 * by clients of this provider.
+		 */
+		readonly onDidChangeFile: Event<FileChangeEvent[]>;
+
+		/**
+		 * Subscribe to events in the file or folder denoted by `uri`.
+		 *
+		 * The editor will call this function for files and folders. In the latter case, the
+		 * options differ from defaults, e.g. what files/folders to exclude from watching
+		 * and if subfolders, sub-subfolder, etc. should be watched (`recursive`).
+		 *
+		 * @param uri The uri of the file to be watched.
+		 * @param options Configures the watch.
+		 * @returns A disposable that tells the provider to stop watching the `uri`.
+		 */
+		watch(uri: Uri, options: { recursive: boolean; excludes: string[] }): Disposable;
+
+		/**
+		 * Retrieve metadata about a file.
+		 *
+		 * Note that the metadata for symbolic links should be the metadata of the file they refer to.
+		 * Still, the [SymbolicLink](#FileType.SymbolicLink)-type must be used in addition to the actual type, e.g.
+		 * `FileType.SymbolicLink | FileType.Directory`.
+		 *
+		 * @param uri The uri of the file to retrieve metadata about.
+		 * @return The file metadata about the file.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		stat(uri: Uri): FileStat | Thenable<FileStat>;
+
+		/**
+		 * Retrieve all entries of a [directory](#FileType.Directory).
+		 *
+		 * @param uri The uri of the folder.
+		 * @return An array of name/type-tuples or a thenable that resolves to such.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		readDirectory(uri: Uri): [string, FileType][] | Thenable<[string, FileType][]>;
+
+		/**
+		 * Create a new directory (Note, that new files are created via `write`-calls).
+		 *
+		 * @param uri The uri of the new folder.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		createDirectory(uri: Uri): void | Thenable<void>;
+
+		/**
+		 * Read the entire contents of a file.
+		 *
+		 * @param uri The uri of the file.
+		 * @return An array of bytes or a thenable that resolves to such.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		readFile(uri: Uri): Uint8Array | Thenable<Uint8Array>;
+
+		/**
+		 * Write data to a file, replacing its entire contents.
+		 *
+		 * @param uri The uri of the file.
+		 * @param content The new content of the file.
+		 * @param options Defines if missing files should or must be created.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist and `create` is not set.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist and `create` is set, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists, `create` is set but `overwrite` is not set.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		writeFile(uri: Uri, content: Uint8Array, options: { create: boolean, overwrite: boolean }): void | Thenable<void>;
+
+		/**
+		 * Delete a file.
+		 *
+		 * @param uri The resource that is to be deleted.
+		 * @param options Defines if deletion of folders is recursive.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		delete(uri: Uri, options: { recursive: boolean }): void | Thenable<void>;
+
+		/**
+		 * Rename a file or folder.
+		 *
+		 * @param oldUri The existing file.
+		 * @param newUri The new location.
+		 * @param options Defines if existing files should be overwritten.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `oldUri` doesn't exist.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `newUri` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `newUri` exists and when the `overwrite` option is not `true`.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		rename(oldUri: Uri, newUri: Uri, options: { overwrite: boolean }): void | Thenable<void>;
+
+		/**
+		 * Copy files or folders. Implementing this function is optional but it will speedup
+		 * the copy operation.
+		 *
+		 * @param source The existing file.
+		 * @param destination The destination location.
+		 * @param options Defines if existing files should be overwriten.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `source` doesn't exist.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `destination` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `destination` exists and when the `overwrite` option is not `true`.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		copy?(source: Uri, destination: Uri, options: { overwrite: boolean }): void | Thenable<void>;
+	}
+
+	/**
+	 * Content settings for a webview.
+	 */
+	export interface WebviewOptions {
+		/**
+		 * Controls whether scripts are enabled in the webview content or not.
+		 *
+		 * Defaults to false (scripts-disabled).
+		 */
+		readonly enableScripts?: boolean;
+
+		/**
+		 * Controls whether command uris are enabled in webview content or not.
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableCommandUris?: boolean;
+
+		/**
+		 * Root paths from which the webview can load local (filesystem) resources using the `vscode-resource:` scheme.
+		 *
+		 * Default to the root folders of the current workspace plus the extension's install directory.
+		 *
+		 * Pass in an empty array to disallow access to any local resources.
+		 */
+		readonly localResourceRoots?: ReadonlyArray<Uri>;
+	}
+
+	/**
+	 * A webview displays html content, like an iframe.
+	 */
+	export interface Webview {
+		/**
+		 * Content settings for the webview.
+		 */
+		options: WebviewOptions;
+
+		/**
+		 * Contents of the webview.
+		 *
+		 * Should be a complete html document.
+		 */
+		html: string;
+
+		/**
+		 * Fired when the webview content posts a message.
+		 */
+		readonly onDidReceiveMessage: Event<any>;
+
+		/**
+		 * Post a message to the webview content.
+		 *
+		 * Messages are only delivered if the webview is visible.
+		 *
+		 * @param message Body of the message.
+		 */
+		postMessage(message: any): Thenable<boolean>;
+	}
+
+	/**
+	 * Content settings for a webview panel.
+	 */
+	export interface WebviewPanelOptions {
+		/**
+		 * Controls if the find widget is enabled in the panel.
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableFindWidget?: boolean;
+
+		/**
+		 * Controls if the webview panel's content (iframe) is kept around even when the panel
+		 * is no longer visible.
+		 *
+		 * Normally the webview panel's html context is created when the panel becomes visible
+		 * and destroyed when it is is hidden. Extensions that have complex state
+		 * or UI can set the `retainContextWhenHidden` to make VS Code keep the webview
+		 * context around, even when the webview moves to a background tab. When a webview using
+		 * `retainContextWhenHidden` becomes hidden, its scripts and other dynamic content are suspended.
+		 * When the panel becomes visible again, the context is automatically restored
+		 * in the exact same state it was in originally. You cannot send messages to a
+		 * hidden webview, even with `retainContextWhenHidden` enabled.
+		 *
+		 * `retainContextWhenHidden` has a high memory overhead and should only be used if
+		 * your panel's context cannot be quickly saved and restored.
+		 */
+		readonly retainContextWhenHidden?: boolean;
+	}
+
+	/**
+	 * A panel that contains a webview.
+	 */
+	interface WebviewPanel {
+		/**
+		 * Identifies the type of the webview panel, such as `'markdown.preview'`.
+		 */
+		readonly viewType: string;
+
+		/**
+		 * Title of the panel shown in UI.
+		 */
+		title: string;
+
+		/**
+		 * Icon for the panel shown in UI.
+		 */
+		iconPath?: Uri | { light: Uri; dark: Uri };
+
+		/**
+		 * Webview belonging to the panel.
+		 */
+		readonly webview: Webview;
+
+		/**
+		 * Content settings for the webview panel.
+		 */
+		readonly options: WebviewPanelOptions;
+
+		/**
+		 * Editor position of the panel. This property is only set if the webview is in
+		 * one of the editor view columns.
+		 */
+		readonly viewColumn?: ViewColumn;
+
+		/**
+		 * Whether the panel is active (focused by the user).
+		 */
+		readonly active: boolean;
+
+		/**
+		 * Whether the panel is visible.
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Fired when the panel's view state changes.
+		 */
+		readonly onDidChangeViewState: Event<WebviewPanelOnDidChangeViewStateEvent>;
+
+		/**
+		 * Fired when the panel is disposed.
+		 *
+		 * This may be because the user closed the panel or because `.dispose()` was
+		 * called on it.
+		 *
+		 * Trying to use the panel after it has been disposed throws an exception.
+		 */
+		readonly onDidDispose: Event<void>;
+
+		/**
+		 * Show the webview panel in a given column.
+		 *
+		 * A webview panel may only show in a single column at a time. If it is already showing, this
+		 * method moves it to a new column.
+		 *
+		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
+		 * @param preserveFocus When `true`, the webview will not take focus.
+		 */
+		reveal(viewColumn?: ViewColumn, preserveFocus?: boolean): void;
+
+		/**
+		 * Dispose of the webview panel.
+		 *
+		 * This closes the panel if it showing and disposes of the resources owned by the webview.
+		 * Webview panels are also disposed when the user closes the webview panel. Both cases
+		 * fire the `onDispose` event.
+		 */
+		dispose(): any;
+	}
+
+	/**
+	 * Event fired when a webview panel's view state changes.
+	 */
+	export interface WebviewPanelOnDidChangeViewStateEvent {
+		/**
+		 * Webview panel whose view state changed.
+		 */
+		readonly webviewPanel: WebviewPanel;
+	}
+
+	/**
+	 * Restore webview panels that have been persisted when vscode shuts down.
+	 *
+	 * There are two types of webview persistence:
+	 *
+	 * - Persistence within a session.
+	 * - Persistence across sessions (across restarts of VS Code).
+	 *
+	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
+	 *
+	 * Persistence within a session allows a webview to save its state when it becomes hidden
+	 * and restore its content from this state when it becomes visible again. It is powered entirely
+	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
+	 * any json serializable object. To restore the state again, call `getState()`
+	 *
+	 * ```js
+	 * // Within the webview
+	 * const vscode = acquireVsCodeApi();
+	 *
+	 * // Get existing state
+	 * const oldState = vscode.getState() || { value: 0 };
+	 *
+	 * // Update state
+	 * setState({ value: oldState.value + 1 })
+	 * ```
+	 *
+	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown,
+	 * VS Code will save off the state from `setState` of all webviews that have a serializer. When the
+	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
+	 * The extension can then restore the old `WebviewPanel` from this state.
+	 */
+	interface WebviewPanelSerializer {
+		/**
+		 * Restore a webview panel from its seriailzed `state`.
+		 *
+		 * Called when a serialized webview first becomes visible.
+		 *
+		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel. The
+		 * serializer must restore the webview's `.html` and hook up all webview events.
+		 * @param state Persisted state from the webview content.
+		 *
+		 * @return Thanble indicating that the webview has been fully restored.
+		 */
+		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
+	}
+
+	/**
+	 * Namespace describing the environment the editor runs in.
+	 */
+	export namespace env {
+
+		/**
+		 * The application name of the editor, like 'VS Code'.
+		 *
+		 * @readonly
+		 */
+		export let appName: string;
+
+		/**
+		 * The application root folder from which the editor is running.
+		 *
+		 * @readonly
+		 */
+		export let appRoot: string;
+
+		/**
+		 * Represents the preferred user-language, like `de-CH`, `fr`, or `en-US`.
+		 *
+		 * @readonly
+		 */
+		export let language: string;
+
+		/**
+		 * A unique identifier for the computer.
+		 *
+		 * @readonly
+		 */
+		export let machineId: string;
+
+		/**
+		 * A unique identifier for the current session.
+		 * Changes each time the editor is started.
+		 *
+		 * @readonly
+		 */
+		export let sessionId: string;
+	}
+
+	/**
+	 * Namespace for dealing with commands. In short, a command is a function with a
+	 * unique identifier. The function is sometimes also called _command handler_.
+	 *
+	 * Commands can be added to the editor using the [registerCommand](#commands.registerCommand)
+	 * and [registerTextEditorCommand](#commands.registerTextEditorCommand) functions. Commands
+	 * can be executed [manually](#commands.executeCommand) or from a UI gesture. Those are:
+	 *
+	 * * palette - Use the `commands`-section in `package.json` to make a command show in
+	 * the [command palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette).
+	 * * keybinding - Use the `keybindings`-section in `package.json` to enable
+	 * [keybindings](https://code.visualstudio.com/docs/getstarted/keybindings#_customizing-shortcuts)
+	 * for your extension.
+	 *
+	 * Commands from other extensions and from the editor itself are accessible to an extension. However,
+	 * when invoking an editor command not all argument types are supported.
+	 *
+	 * This is a sample that registers a command handler and adds an entry for that command to the palette. First
+	 * register a command handler with the identifier `extension.sayHello`.
+	 * ```javascript
+	 * commands.registerCommand('extension.sayHello', () => {
+	 * 	window.showInformationMessage('Hello World!');
+	 * });
+	 * ```
+	 * Second, bind the command identifier to a title under which it will show in the palette (`package.json`).
+	 * ```json
+	 * {
+	 * 	"contributes": {
+	 * 		"commands": [{
+	 * 			"command": "extension.sayHello",
+	 * 			"title": "Hello World"
+	 * 		}]
+	 * 	}
+	 * }
+	 * ```
+	 */
+	export namespace commands {
+
+		/**
+		 * Registers a command that can be invoked via a keyboard shortcut,
+		 * a menu item, an action, or directly.
+		 *
+		 * Registering a command with an existing command identifier twice
+		 * will cause an error.
+		 *
+		 * @param command A unique identifier for the command.
+		 * @param callback A command handler function.
+		 * @param thisArg The `this` context used when invoking the handler function.
+		 * @return Disposable which unregisters this command on disposal.
+		 */
+		export function registerCommand(command: string, callback: (...args: any[]) => any, thisArg?: any): Disposable;
+
+		/**
+		 * Registers a text editor command that can be invoked via a keyboard shortcut,
+		 * a menu item, an action, or directly.
+		 *
+		 * Text editor commands are different from ordinary [commands](#commands.registerCommand) as
+		 * they only execute when there is an active editor when the command is called. Also, the
+		 * command handler of an editor command has access to the active editor and to an
+		 * [edit](#TextEditorEdit)-builder.
+		 *
+		 * @param command A unique identifier for the command.
+		 * @param callback A command handler function with access to an [editor](#TextEditor) and an [edit](#TextEditorEdit).
+		 * @param thisArg The `this` context used when invoking the handler function.
+		 * @return Disposable which unregisters this command on disposal.
+		 */
+		export function registerTextEditorCommand(command: string, callback: (textEditor: TextEditor, edit: TextEditorEdit, ...args: any[]) => void, thisArg?: any): Disposable;
+
+		/**
+		 * Executes the command denoted by the given command identifier.
+		 *
+		 * * *Note 1:* When executing an editor command not all types are allowed to
+		 * be passed as arguments. Allowed are the primitive types `string`, `boolean`,
+		 * `number`, `undefined`, and `null`, as well as [`Position`](#Position), [`Range`](#Range), [`Uri`](#Uri) and [`Location`](#Location).
+		 * * *Note 2:* There are no restrictions when executing commands that have been contributed
+		 * by extensions.
+		 *
+		 * @param command Identifier of the command to execute.
+		 * @param rest Parameters passed to the command function.
+		 * @return A thenable that resolves to the returned value of the given command. `undefined` when
+		 * the command handler function doesn't return anything.
+		 */
+		export function executeCommand<T>(command: string, ...rest: any[]): Thenable<T | undefined>;
+
+		/**
+		 * Retrieve the list of all available commands. Commands starting an underscore are
+		 * treated as internal commands.
+		 *
+		 * @param filterInternal Set `true` to not see internal commands (starting with an underscore)
+		 * @return Thenable that resolves to a list of command ids.
+		 */
+		export function getCommands(filterInternal?: boolean): Thenable<string[]>;
+	}
+
+	/**
+	 * Represents the state of a window.
+	 */
+	export interface WindowState {
+
+		/**
+		 * Whether the current window is focused.
+		 */
+		readonly focused: boolean;
+	}
+
+	/**
+	 * A uri handler is responsible for handling system-wide [uris](#Uri).
+	 *
+	 * @see [window.registerUriHandler](#window.registerUriHandler).
+	 */
+	export interface UriHandler {
+
+		/**
+		 * Handle the provided system-wide [uri](#Uri).
+		 *
+		 * @see [window.registerUriHandler](#window.registerUriHandler).
+		 */
+		handleUri(uri: Uri): ProviderResult<void>;
+	}
+
+	/**
+	 * Namespace for dealing with the current window of the editor. That is visible
+	 * and active editors, as well as, UI elements to show messages, selections, and
+	 * asking for user input.
+	 */
+	export namespace window {
+
+		/**
+		 * The currently active editor or `undefined`. The active editor is the one
+		 * that currently has focus or, when none has focus, the one that has changed
+		 * input most recently.
+		 */
+		export let activeTextEditor: TextEditor | undefined;
+
+		/**
+		 * The currently visible editors or an empty array.
+		 */
+		export let visibleTextEditors: TextEditor[];
+
+		/**
+		 * An [event](#Event) which fires when the [active editor](#window.activeTextEditor)
+		 * has changed. *Note* that the event also fires when the active editor changes
+		 * to `undefined`.
+		 */
+		export const onDidChangeActiveTextEditor: Event<TextEditor | undefined>;
+
+		/**
+		 * An [event](#Event) which fires when the array of [visible editors](#window.visibleTextEditors)
+		 * has changed.
+		 */
+		export const onDidChangeVisibleTextEditors: Event<TextEditor[]>;
+
+		/**
+		 * An [event](#Event) which fires when the selection in an editor has changed.
+		 */
+		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
+
+		/**
+		 * An [event](#Event) which fires when the visible ranges of an editor has changed.
+		 */
+		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
+
+		/**
+		 * An [event](#Event) which fires when the options of an editor have changed.
+		 */
+		export const onDidChangeTextEditorOptions: Event<TextEditorOptionsChangeEvent>;
+
+		/**
+		 * An [event](#Event) which fires when the view column of an editor has changed.
+		 */
+		export const onDidChangeTextEditorViewColumn: Event<TextEditorViewColumnChangeEvent>;
+
+		/**
+		 * The currently opened terminals or an empty array.
+		 */
+		export const terminals: ReadonlyArray<Terminal>;
+
+		/**
+		 * An [event](#Event) which fires when a terminal has been created, either through the
+		 * [createTerminal](#window.createTerminal) API or commands.
+		 */
+		export const onDidOpenTerminal: Event<Terminal>;
+
+		/**
+		 * An [event](#Event) which fires when a terminal is disposed.
+		 */
+		export const onDidCloseTerminal: Event<Terminal>;
+
+		/**
+		 * Represents the current window's state.
+		 *
+		 * @readonly
+		 */
+		export let state: WindowState;
+
+		/**
+		 * An [event](#Event) which fires when the focus state of the current window
+		 * changes. The value of the event represents whether the window is focused.
+		 */
+		export const onDidChangeWindowState: Event<WindowState>;
+
+		/**
+		 * Show the given document in a text editor. A [column](#ViewColumn) can be provided
+		 * to control where the editor is being shown. Might change the [active editor](#window.activeTextEditor).
+		 *
+		 * @param document A text document to be shown.
+		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [active](#ViewColumn.Active), other values
+		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside)
+		 * to open the editor to the side of the currently active one.
+		 * @param preserveFocus When `true` the editor will not take focus.
+		 * @return A promise that resolves to an [editor](#TextEditor).
+		 */
+		export function showTextDocument(document: TextDocument, column?: ViewColumn, preserveFocus?: boolean): Thenable<TextEditor>;
+
+		/**
+		 * Show the given document in a text editor. [Options](#TextDocumentShowOptions) can be provided
+		 * to control options of the editor is being shown. Might change the [active editor](#window.activeTextEditor).
+		 *
+		 * @param document A text document to be shown.
+		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @return A promise that resolves to an [editor](#TextEditor).
+		 */
+		export function showTextDocument(document: TextDocument, options?: TextDocumentShowOptions): Thenable<TextEditor>;
+
+		/**
+		 * A short-hand for `openTextDocument(uri).then(document => showTextDocument(document, options))`.
+		 *
+		 * @see [openTextDocument](#openTextDocument)
+		 *
+		 * @param uri A resource identifier.
+		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @return A promise that resolves to an [editor](#TextEditor).
+		 */
+		export function showTextDocument(uri: Uri, options?: TextDocumentShowOptions): Thenable<TextEditor>;
+
+		/**
+		 * Create a TextEditorDecorationType that can be used to add decorations to text editors.
+		 *
+		 * @param options Rendering options for the decoration type.
+		 * @return A new decoration type instance.
+		 */
+		export function createTextEditorDecorationType(options: DecorationRenderOptions): TextEditorDecorationType;
+
+		/**
+		 * Show an information message to users. Optionally provide an array of items which will be presented as
+		 * clickable buttons.
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showInformationMessage(message: string, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show an information message to users. Optionally provide an array of items which will be presented as
+		 * clickable buttons.
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showInformationMessage(message: string, options: MessageOptions, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show an information message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showInformationMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Show an information message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showInformationMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Show a warning message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showWarningMessage(message: string, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show a warning message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showWarningMessage(message: string, options: MessageOptions, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show a warning message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showWarningMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Show a warning message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showWarningMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Show an error message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show an error message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showErrorMessage(message: string, options: MessageOptions, ...items: string[]): Thenable<string | undefined>;
+
+		/**
+		 * Show an error message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showErrorMessage<T extends MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Show an error message.
+		 *
+		 * @see [showInformationMessage](#window.showInformationMessage)
+		 *
+		 * @param message The message to show.
+		 * @param options Configures the behaviour of the message.
+		 * @param items A set of items that will be rendered as actions in the message.
+		 * @return A thenable that resolves to the selected item or `undefined` when being dismissed.
+		 */
+		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
+
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of strings, or a promise that resolves to an array of strings.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
+
+		/**
+		 * Shows a selection list.
+		 *
+		 * @param items An array of strings, or a promise that resolves to an array of strings.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selection or `undefined`.
+		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
+
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of items, or a promise that resolves to an array of items.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
+
+		/**
+		 * Shows a selection list.
+		 *
+		 * @param items An array of items, or a promise that resolves to an array of items.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected item or `undefined`.
+		 */
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
+
+		/**
+		 * Shows a selection list of [workspace folders](#workspace.workspaceFolders) to pick from.
+		 * Returns `undefined` if no folder is open.
+		 *
+		 * @param options Configures the behavior of the workspace folder list.
+		 * @return A promise that resolves to the workspace folder or `undefined`.
+		 */
+		export function showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions): Thenable<WorkspaceFolder | undefined>;
+
+		/**
+		 * Shows a file open dialog to the user which allows to select a file
+		 * for opening-purposes.
+		 *
+		 * @param options Options that control the dialog.
+		 * @returns A promise that resolves to the selected resources or `undefined`.
+		 */
+		export function showOpenDialog(options: OpenDialogOptions): Thenable<Uri[] | undefined>;
+
+		/**
+		 * Shows a file save dialog to the user which allows to select a file
+		 * for saving-purposes.
+		 *
+		 * @param options Options that control the dialog.
+		 * @returns A promise that resolves to the selected resource or `undefined`.
+		 */
+		export function showSaveDialog(options: SaveDialogOptions): Thenable<Uri | undefined>;
+
+		/**
+		 * Opens an input box to ask the user for input.
+		 *
+		 * The returned value will be `undefined` if the input box was canceled (e.g. pressing ESC). Otherwise the
+		 * returned value will be the string typed by the user or an empty string if the user did not type
+		 * anything but dismissed the input box with OK.
+		 *
+		 * @param options Configures the behavior of the input box.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to a string the user provided or to `undefined` in case of dismissal.
+		 */
+		export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined>;
+
+		/**
+		 * Creates a [QuickPick](#QuickPick) to let the user pick an item from a list
+		 * of items of type T.
+		 *
+		 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+		 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
+		 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+		 *
+		 * @return A new [QuickPick](#QuickPick).
+		 */
+		export function createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
+
+		/**
+		 * Creates a [InputBox](#InputBox) to let the user enter some text input.
+		 *
+		 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+		 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
+		 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+		 *
+		 * @return A new [InputBox](#InputBox).
+		 */
+		export function createInputBox(): InputBox;
+
+		/**
+		 * Creates a new [output channel](#OutputChannel) with the given name.
+		 *
+		 * @param name Human-readable string which will be used to represent the channel in the UI.
+		 */
+		export function createOutputChannel(name: string): OutputChannel;
+
+		/**
+		 * Create and show a new webview panel.
+		 *
+		 * @param viewType Identifies the type of the webview panel.
+		 * @param title Title of the panel.
+		 * @param showOptions Where to show the webview in the editor. If preserveFocus is set, the new webview will not take focus.
+		 * @param options Settings for the new panel.
+		 *
+		 * @return New webview panel.
+		 */
+		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { viewColumn: ViewColumn, preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
+
+		/**
+		 * Set a message to the status bar. This is a short hand for the more powerful
+		 * status bar [items](#window.createStatusBarItem).
+		 *
+		 * @param text The message to show, supports icon substitution as in status bar [items](#StatusBarItem.text).
+		 * @param hideAfterTimeout Timeout in milliseconds after which the message will be disposed.
+		 * @return A disposable which hides the status bar message.
+		 */
+		export function setStatusBarMessage(text: string, hideAfterTimeout: number): Disposable;
+
+		/**
+		 * Set a message to the status bar. This is a short hand for the more powerful
+		 * status bar [items](#window.createStatusBarItem).
+		 *
+		 * @param text The message to show, supports icon substitution as in status bar [items](#StatusBarItem.text).
+		 * @param hideWhenDone Thenable on which completion (resolve or reject) the message will be disposed.
+		 * @return A disposable which hides the status bar message.
+		 */
+		export function setStatusBarMessage(text: string, hideWhenDone: Thenable<any>): Disposable;
+
+		/**
+		 * Set a message to the status bar. This is a short hand for the more powerful
+		 * status bar [items](#window.createStatusBarItem).
+		 *
+		 * *Note* that status bar messages stack and that they must be disposed when no
+		 * longer used.
+		 *
+		 * @param text The message to show, supports icon substitution as in status bar [items](#StatusBarItem.text).
+		 * @return A disposable which hides the status bar message.
+		 */
+		export function setStatusBarMessage(text: string): Disposable;
+
+		/**
+		 * ~~Show progress in the Source Control viewlet while running the given callback and while
+		 * its returned promise isn't resolve or rejected.~~
+		 *
+		 * @deprecated Use `withProgress` instead.
+		 *
+		 * @param task A callback returning a promise. Progress increments can be reported with
+		 * the provided [progress](#Progress)-object.
+		 * @return The thenable the task did return.
+		 */
+		export function withScmProgress<R>(task: (progress: Progress<number>) => Thenable<R>): Thenable<R>;
+
+		/**
+		 * Show progress in the editor. Progress is shown while running the given callback
+		 * and while the promise it returned isn't resolved nor rejected. The location at which
+		 * progress should show (and other details) is defined via the passed [`ProgressOptions`](#ProgressOptions).
+		 *
+		 * @param task A callback returning a promise. Progress state can be reported with
+		 * the provided [progress](#Progress)-object.
+		 *
+		 * To report discrete progress, use `increment` to indicate how much work has been completed. Each call with
+		 * a `increment` value will be summed up and reflected as overall progress until 100% is reached (a value of
+		 * e.g. `10` accounts for `10%` of work done).
+		 * Note that currently only `ProgressLocation.Notification` is capable of showing discrete progress.
+		 *
+		 * To monitor if the operation has been cancelled by the user, use the provided [`CancellationToken`](#CancellationToken).
+		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
+		 * long running operation.
+		 *
+		 * @return The thenable the task-callback returned.
+		 */
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
+
+		/**
+		 * Creates a status bar [item](#StatusBarItem).
+		 *
+		 * @param alignment The alignment of the item.
+		 * @param priority The priority of the item. Higher values mean the item should be shown more to the left.
+		 * @return A new status bar item.
+		 */
+		export function createStatusBarItem(alignment?: StatusBarAlignment, priority?: number): StatusBarItem;
+
+		/**
+		 * Creates a [Terminal](#Terminal). The cwd of the terminal will be the workspace directory
+		 * if it exists, regardless of whether an explicit customStartPath setting exists.
+		 *
+		 * @param name Optional human-readable string which will be used to represent the terminal in the UI.
+		 * @param shellPath Optional path to a custom shell executable to be used in the terminal.
+		 * @param shellArgs Optional args for the custom shell executable, this does not work on Windows (see #8429)
+		 * @return A new Terminal.
+		 */
+		export function createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): Terminal;
+
+		/**
+		 * Creates a [Terminal](#Terminal). The cwd of the terminal will be the workspace directory
+		 * if it exists, regardless of whether an explicit customStartPath setting exists.
+		 *
+		 * @param options A TerminalOptions object describing the characteristics of the new terminal.
+		 * @return A new Terminal.
+		 */
+		export function createTerminal(options: TerminalOptions): Terminal;
+
+		/**
+		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
+		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
+		 *
+		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
+		 *
+		 * @param viewId Id of the view contributed using the extension point `views`.
+		 * @param treeDataProvider A [TreeDataProvider](#TreeDataProvider) that provides tree data for the view
+		 */
+		export function registerTreeDataProvider<T>(viewId: string, treeDataProvider: TreeDataProvider<T>): Disposable;
+
+		/**
+		 * Create a [TreeView](#TreeView) for the view contributed using the extension point `views`.
+		 * @param viewId Id of the view contributed using the extension point `views`.
+		 * @param options Options object to provide [TreeDataProvider](#TreeDataProvider) for the view.
+		 * @returns a [TreeView](#TreeView).
+		 */
+		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
+
+		/**
+		 * Registers a [uri handler](#UriHandler) capable of handling system-wide [uris](#Uri).
+		 * In case there are multiple windows open, the topmost window will handle the uri.
+		 * A uri handler is scoped to the extension it is contributed from; it will only
+		 * be able to handle uris which are directed to the extension itself. A uri must respect
+		 * the following rules:
+		 *
+		 * - The uri-scheme must be the product name;
+		 * - The uri-authority must be the extension id (eg. `my.extension`);
+		 * - The uri-path, -query and -fragment parts are arbitrary.
+		 *
+		 * For example, if the `my.extension` extension registers a uri handler, it will only
+		 * be allowed to handle uris with the prefix `product-name://my.extension`.
+		 *
+		 * An extension can only register a single uri handler in its entire activation lifetime.
+		 *
+		 * * *Note:* There is an activation event `onUri` that fires when a uri directed for
+		 * the current extension is about to be handled.
+		 *
+		 * @param handler The uri handler to register for this extension.
+		 */
+		export function registerUriHandler(handler: UriHandler): Disposable;
+
+		/**
+		 * Registers a webview panel serializer.
+		 *
+		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation event and
+		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given `viewType`.
+		 *
+		 * @param viewType Type of the webview panel that can be serialized.
+		 * @param serializer Webview serializer.
+		 */
+		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
+	}
+
+	/**
+	 * The event that is fired when an element in the [TreeView](#TreeView) is expanded or collapsed
+	 */
+	export interface TreeViewExpansionEvent<T> {
+
+		/**
+		 * Element that is expanded or collapsed.
+		 */
+		readonly element: T;
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's selection](#TreeView.selection)
+	 */
+	export interface TreeViewSelectionChangeEvent<T> {
+
+		/**
+		 * Selected elements.
+		 */
+		readonly selection: T[];
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's visibility](#TreeView.visible)
+	 */
+	export interface TreeViewVisibilityChangeEvent {
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
+
+	}
+
+	/**
+	 * Represents a Tree view
+	 */
+	export interface TreeView<T> extends Disposable {
+
+		/**
+		 * Event that is fired when an element is expanded
+		 */
+		readonly onDidExpandElement: Event<TreeViewExpansionEvent<T>>;
+
+		/**
+		 * Event that is fired when an element is collapsed
+		 */
+		readonly onDidCollapseElement: Event<TreeViewExpansionEvent<T>>;
+
+		/**
+		 * Currently selected elements.
+		 */
+		readonly selection: T[];
+
+		/**
+		 * Event that is fired when the [selection](#TreeView.selection) has changed
+		 */
+		readonly onDidChangeSelection: Event<TreeViewSelectionChangeEvent<T>>;
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Event that is fired when [visibility](TreeView.visible) has changed
+		 */
+		readonly onDidChangeVisibility: Event<TreeViewVisibilityChangeEvent>;
+
+		/**
+		 * Reveals the given element in the tree view.
+		 * If the tree view is not visible then the tree view is shown and element is revealed.
+		 *
+		 * By default revealed element is selected and not focused.
+		 * In order to not to select, set the option `select` to `false`.
+		 * In order to focus, set the option `focus` to `true`.
+		 *
+		 * **NOTE:** [TreeDataProvider](#TreeDataProvider) is required to implement [getParent](#TreeDataProvider.getParent) method to access this API.
+		 */
+		reveal(element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void>;
+	}
+
+	/**
+	 * A data provider that provides tree data
+	 */
+	export interface TreeDataProvider<T> {
+		/**
+		 * An optional event to signal that an element or root has changed.
+		 * This will trigger the view to update the changed element/root and its children recursively (if shown).
+		 * To signal that root has changed, do not pass any argument or pass `undefined` or `null`.
+		 */
+		onDidChangeTreeData?: Event<T | undefined | null>;
+
+		/**
+		 * Get [TreeItem](#TreeItem) representation of the `element`
+		 *
+		 * @param element The element for which [TreeItem](#TreeItem) representation is asked for.
+		 * @return [TreeItem](#TreeItem) representation of the element
+		 */
+		getTreeItem(element: T): TreeItem | Thenable<TreeItem>;
+
+		/**
+		 * Get the children of `element` or root if no element is passed.
+		 *
+		 * @param element The element from which the provider gets children. Can be `undefined`.
+		 * @return Children of `element` or root if no element is passed.
+		 */
+		getChildren(element?: T): ProviderResult<T[]>;
+
+		/**
+		 * Optional method to return the parent of `element`.
+		 * Return `null` or `undefined` if `element` is a child of root.
+		 *
+		 * **NOTE:** This method should be implemented in order to access [reveal](#TreeView.reveal) API.
+		 *
+		 * @param element The element for which the parent has to be returned.
+		 * @return Parent of `element`.
+		 */
+		getParent?(element: T): ProviderResult<T>;
+	}
+
+	export class TreeItem {
+		/**
+		 * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri).
+		 */
+		label?: string;
+
+		/**
+		 * Optional id for the tree item that has to be unique across tree. The id is used to preserve the selection and expansion state of the tree item.
+		 *
+		 * If not provided, an id is generated using the tree item's label. **Note** that when labels change, ids will change and that selection and expansion state cannot be kept stable anymore.
+		 */
+		id?: string;
+
+		/**
+		 * The icon path or [ThemeIcon](#ThemeIcon) for the tree item.
+		 * When `falsy`, [Folder Theme Icon](#ThemeIcon.Folder) is assigned, if item is collapsible otherwise [File Theme Icon](#ThemeIcon.File).
+		 * When a [ThemeIcon](#ThemeIcon) is specified, icon is derived from the current file icon theme for the specified theme icon using [resourceUri](#TreeItem.resourceUri) (if provided).
+		 */
+		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
+
+		/**
+		 * The [uri](#Uri) of the resource representing this item.
+		 *
+		 * Will be used to derive the [label](#TreeItem.label), when it is not provided.
+		 * Will be used to derive the icon from current icon theme, when [iconPath](#TreeItem.iconPath) has [ThemeIcon](#ThemeIcon) value.
+		 */
+		resourceUri?: Uri;
+
+		/**
+		 * The tooltip text when you hover over this item.
+		 */
+		tooltip?: string | undefined;
+
+		/**
+		 * The [command](#Command) that should be executed when the tree item is selected.
+		 */
+		command?: Command;
+
+		/**
+		 * [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item.
+		 */
+		collapsibleState?: TreeItemCollapsibleState;
+
+		/**
+		 * Context value of the tree item. This can be used to contribute item specific actions in the tree.
+		 * For example, a tree item is given a context value as `folder`. When contributing actions to `view/item/context`
+		 * using `menus` extension point, you can specify context value for key `viewItem` in `when` expression like `viewItem == folder`.
+		 * ```
+		 *	"contributes": {
+		 *		"menus": {
+		 *			"view/item/context": [
+		 *				{
+		 *					"command": "extension.deleteFolder",
+		 *					"when": "viewItem == folder"
+		 *				}
+		 *			]
+		 *		}
+		 *	}
+		 * ```
+		 * This will show action `extension.deleteFolder` only for items with `contextValue` is `folder`.
+		 */
+		contextValue?: string;
+
+		/**
+		 * @param label A human-readable string describing this item
+		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
+		 */
+		constructor(label: string, collapsibleState?: TreeItemCollapsibleState);
+
+		/**
+		 * @param resourceUri The [uri](#Uri) of the resource representing this item.
+		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
+		 */
+		constructor(resourceUri: Uri, collapsibleState?: TreeItemCollapsibleState);
+	}
+
+	/**
+	 * Collapsible state of the tree item
+	 */
+	export enum TreeItemCollapsibleState {
+		/**
+		 * Determines an item can be neither collapsed nor expanded. Implies it has no children.
+		 */
+		None = 0,
+		/**
+		 * Determines an item is collapsed
+		 */
+		Collapsed = 1,
+		/**
+		 * Determines an item is expanded
+		 */
+		Expanded = 2
+	}
+
+	/**
+	 * Value-object describing what options a terminal should use.
+	 */
+	export interface TerminalOptions {
+		/**
+		 * A human-readable string which will be used to represent the terminal in the UI.
+		 */
+		name?: string;
+
+		/**
+		 * A path to a custom shell executable to be used in the terminal.
+		 */
+		shellPath?: string;
+
+		/**
+		 * Args for the custom shell executable, this does not work on Windows (see #8429)
+		 */
+		shellArgs?: string[];
+
+		/**
+		 * A path for the current working directory to be used for the terminal.
+		 */
+		cwd?: string;
+
+		/**
+		 * Object with environment variables that will be added to the VS Code process.
+		 */
+		env?: { [key: string]: string | null };
+	}
+
+	/**
+	 * A location in the editor at which progress information can be shown. It depends on the
+	 * location how progress is visually represented.
+	 */
+	export enum ProgressLocation {
+
+		/**
+		 * Show progress for the source control viewlet, as overlay for the icon and as progress bar
+		 * inside the viewlet (when visible). Neither supports cancellation nor discrete progress.
+		 */
+		SourceControl = 1,
+
+		/**
+		 * Show progress in the status bar of the editor. Neither supports cancellation nor discrete progress.
+		 */
+		Window = 10,
+
+		/**
+		 * Show progress as notification with an optional cancel button. Supports to show infinite and discrete progress.
+		 */
+		Notification = 15
+	}
+
+	/**
+	 * Value-object describing where and how progress should show.
+	 */
+	export interface ProgressOptions {
+
+		/**
+		 * The location at which progress should show.
+		 */
+		location: ProgressLocation;
+
+		/**
+		 * A human-readable string which will be used to describe the
+		 * operation.
+		 */
+		title?: string;
+
+		/**
+		 * Controls if a cancel button should show to allow the user to
+		 * cancel the long running operation.  Note that currently only
+		 * `ProgressLocation.Notification` is supporting to show a cancel
+		 * button.
+		 */
+		cancellable?: boolean;
+	}
+
+	/**
+	 * A light-weight user input UI that is intially not visible. After
+	 * configuring it through its properties the extension can make it
+	 * visible by calling [QuickInput.show](#QuickInput.show).
+	 *
+	 * There are several reasons why this UI might have to be hidden and
+	 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+	 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+	 * the user pressing Esc, some other input UI opening, etc.)
+	 *
+	 * A user pressing Enter or some other gesture implying acceptance
+	 * of the current state does not automatically hide this UI component.
+	 * It is up to the extension to decide whether to accept the user's input
+	 * and if the UI should indeed be hidden through a call to [QuickInput.hide](#QuickInput.hide).
+	 *
+	 * When the extension no longer needs this input UI, it should
+	 * [QuickInput.dispose](#QuickInput.dispose) it to allow for freeing up
+	 * any resources associated with it.
+	 *
+	 * See [QuickPick](#QuickPick) and [InputBox](#InputBox) for concrete UIs.
+	 */
+	export interface QuickInput {
+
+		/**
+		 * An optional title.
+		 */
+		title: string | undefined;
+
+		/**
+		 * An optional current step count.
+		 */
+		step: number | undefined;
+
+		/**
+		 * An optional total step count.
+		 */
+		totalSteps: number | undefined;
+
+		/**
+		 * If the UI should allow for user input. Defaults to true.
+		 *
+		 * Change this to false, e.g., while validating user input or
+		 * loading data for the next step in user input.
+		 */
+		enabled: boolean;
+
+		/**
+		 * If the UI should show a progress indicator. Defaults to false.
+		 *
+		 * Change this to true, e.g., while loading more data or validating
+		 * user input.
+		 */
+		busy: boolean;
+
+		/**
+		 * If the UI should stay open even when loosing UI focus. Defaults to false.
+		 */
+		ignoreFocusOut: boolean;
+
+		/**
+		 * Makes the input UI visible in its current configuration. Any other input
+		 * UI will first fire an [QuickInput.onDidHide](#QuickInput.onDidHide) event.
+		 */
+		show(): void;
+
+		/**
+		 * Hides this input UI. This will also fire an [QuickInput.onDidHide](#QuickInput.onDidHide)
+		 * event.
+		 */
+		hide(): void;
+
+		/**
+		 * An event signaling when this input UI is hidden.
+		 *
+		 * There are several reasons why this UI might have to be hidden and
+		 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
+		 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
+		 * the user pressing Esc, some other input UI opening, etc.)
+		 */
+		onDidHide: Event<void>;
+
+		/**
+		 * Dispose of this input UI and any associated resources. If it is still
+		 * visible, it is first hidden. After this call the input UI is no longer
+		 * functional and no additional methods or properties on it should be
+		 * accessed. Instead a new input UI should be created.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user pick an item from a
+	 * list of items of type T. The items can be filtered through a filter text field and
+	 * there is an option [canSelectMany](#QuickPick.canSelectMany) to allow for
+	 * selecting multiple items.
+	 *
+	 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
+	 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
+	 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
+	 */
+	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
+
+		/**
+		 * Current value of the filter text.
+		 */
+		value: string;
+
+		/**
+		 * Optional placeholder in the filter text.
+		 */
+		placeholder: string | undefined;
+
+		/**
+		 * An event signaling when the value of the filter text has changed.
+		 */
+		readonly onDidChangeValue: Event<string>;
+
+		/**
+		 * An event signaling when the user indicated acceptance of the selected item(s).
+		 */
+		readonly onDidAccept: Event<void>;
+
+		/**
+		 * Buttons for actions in the UI.
+		 */
+		buttons: ReadonlyArray<QuickInputButton>;
+
+		/**
+		 * An event signaling when a button was triggered.
+		 */
+		readonly onDidTriggerButton: Event<QuickInputButton>;
+
+		/**
+		 * Items to pick from.
+		 */
+		items: ReadonlyArray<T>;
+
+		/**
+		 * If multiple items can be selected at the same time. Defaults to false.
+		 */
+		canSelectMany: boolean;
+
+		/**
+		 * If the filter text should also be matched against the description of the items. Defaults to false.
+		 */
+		matchOnDescription: boolean;
+
+		/**
+		 * If the filter text should also be matched against the detail of the items. Defaults to false.
+		 */
+		matchOnDetail: boolean;
+
+		/**
+		 * Active items. This can be read and updated by the extension.
+		 */
+		activeItems: ReadonlyArray<T>;
+
+		/**
+		 * An event signaling when the active items have changed.
+		 */
+		readonly onDidChangeActive: Event<T[]>;
+
+		/**
+		 * Selected items. This can be read and updated by the extension.
+		 */
+		selectedItems: ReadonlyArray<T>;
+
+		/**
+		 * An event signaling when the selected items have changed.
+		 */
+		readonly onDidChangeSelection: Event<T[]>;
+	}
+
+	/**
+	 * A concrete [QuickInput](#QuickInput) to let the user input a text value.
+	 *
+	 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
+	 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
+	 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
+	 */
+	export interface InputBox extends QuickInput {
+
+		/**
+		 * Current input value.
+		 */
+		value: string;
+
+		/**
+		 * Optional placeholder in the filter text.
+		 */
+		placeholder: string | undefined;
+
+		/**
+		 * If the input value should be hidden. Defaults to false.
+		 */
+		password: boolean;
+
+		/**
+		 * An event signaling when the value has changed.
+		 */
+		readonly onDidChangeValue: Event<string>;
+
+		/**
+		 * An event signaling when the user indicated acceptance of the input value.
+		 */
+		readonly onDidAccept: Event<void>;
+
+		/**
+		 * Buttons for actions in the UI.
+		 */
+		buttons: ReadonlyArray<QuickInputButton>;
+
+		/**
+		 * An event signaling when a button was triggered.
+		 */
+		readonly onDidTriggerButton: Event<QuickInputButton>;
+
+		/**
+		 * An optional prompt text providing some ask or explanation to the user.
+		 */
+		prompt: string | undefined;
+
+		/**
+		 * An optional validation message indicating a problem with the current input value.
+		 */
+		validationMessage: string | undefined;
+	}
+
+	/**
+	 * Button for an action in a [QuickPick](#QuickPick) or [InputBox](#InputBox).
+	 */
+	export interface QuickInputButton {
+
+		/**
+		 * Icon for the button.
+		 */
+		readonly iconPath: Uri | { light: Uri; dark: Uri } | ThemeIcon;
+
+		/**
+		 * An optional tooltip.
+		 */
+		readonly tooltip?: string | undefined;
+	}
+
+	/**
+	 * Predefined buttons for [QuickPick](#QuickPick) and [InputBox](#InputBox).
+	 */
+	export class QuickInputButtons {
+
+		/**
+		 * A back button for [QuickPick](#QuickPick) and [InputBox](#InputBox).
+		 *
+		 * When a navigation 'back' button is needed this one should be used for consistency.
+		 * It comes with a predefined icon, tooltip and location.
+		 */
+		static readonly Back: QuickInputButton;
+
+		/**
+		 * @hidden
+		 */
+		private constructor();
+	}
+
+	/**
+	 * An event describing an individual change in the text of a [document](#TextDocument).
+	 */
+	export interface TextDocumentContentChangeEvent {
+		/**
+		 * The range that got replaced.
+		 */
+		range: Range;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		rangeOffset: number;
+		/**
+		 * The length of the range that got replaced.
+		 */
+		rangeLength: number;
+		/**
+		 * The new text for the range.
+		 */
+		text: string;
+	}
+
+	/**
+	 * An event describing a transactional [document](#TextDocument) change.
+	 */
+	export interface TextDocumentChangeEvent {
+
+		/**
+		 * The affected document.
+		 */
+		document: TextDocument;
+
+		/**
+		 * An array of content changes.
+		 */
+		contentChanges: TextDocumentContentChangeEvent[];
+	}
+
+	/**
+	 * Represents reasons why a text document is saved.
+	 */
+	export enum TextDocumentSaveReason {
+
+		/**
+		 * Manually triggered, e.g. by the user pressing save, by starting debugging,
+		 * or by an API call.
+		 */
+		Manual = 1,
+
+		/**
+		 * Automatic after a delay.
+		 */
+		AfterDelay = 2,
+
+		/**
+		 * When the editor lost focus.
+		 */
+		FocusOut = 3
+	}
+
+	/**
+	 * An event that is fired when a [document](#TextDocument) will be saved.
+	 *
+	 * To make modifications to the document before it is being saved, call the
+	 * [`waitUntil`](#TextDocumentWillSaveEvent.waitUntil)-function with a thenable
+	 * that resolves to an array of [text edits](#TextEdit).
+	 */
+	export interface TextDocumentWillSaveEvent {
+
+		/**
+		 * The document that will be saved.
+		 */
+		document: TextDocument;
+
+		/**
+		 * The reason why save was triggered.
+		 */
+		reason: TextDocumentSaveReason;
+
+		/**
+		 * Allows to pause the event loop and to apply [pre-save-edits](#TextEdit).
+		 * Edits of subsequent calls to this function will be applied in order. The
+		 * edits will be *ignored* if concurrent modifications of the document happened.
+		 *
+		 * *Note:* This function can only be called during event dispatch and not
+		 * in an asynchronous manner:
+		 *
+		 * ```ts
+		 * workspace.onWillSaveTextDocument(event => {
+		 * 	// async, will *throw* an error
+		 * 	setTimeout(() => event.waitUntil(promise));
+		 *
+		 * 	// sync, OK
+		 * 	event.waitUntil(promise);
+		 * })
+		 * ```
+		 *
+		 * @param thenable A thenable that resolves to [pre-save-edits](#TextEdit).
+		 */
+		waitUntil(thenable: Thenable<TextEdit[]>): void;
+
+		/**
+		 * Allows to pause the event loop until the provided thenable resolved.
+		 *
+		 * *Note:* This function can only be called during event dispatch.
+		 *
+		 * @param thenable A thenable that delays saving.
+		 */
+		waitUntil(thenable: Thenable<any>): void;
+	}
+
+	/**
+	 * An event describing a change to the set of [workspace folders](#workspace.workspaceFolders).
+	 */
+	export interface WorkspaceFoldersChangeEvent {
+		/**
+		 * Added workspace folders.
+		 */
+		readonly added: WorkspaceFolder[];
+
+		/**
+		 * Removed workspace folders.
+		 */
+		readonly removed: WorkspaceFolder[];
+	}
+
+	/**
+	 * A workspace folder is one of potentially many roots opened by the editor. All workspace folders
+	 * are equal which means there is no notion of an active or master workspace folder.
+	 */
+	export interface WorkspaceFolder {
+
+		/**
+		 * The associated uri for this workspace folder.
+		 *
+		 * *Note:* The [Uri](#Uri)-type was intentionally chosen such that future releases of the editor can support
+		 * workspace folders that are not stored on the local disk, e.g. `ftp://server/workspaces/foo`.
+		 */
+		readonly uri: Uri;
+
+		/**
+		 * The name of this workspace folder. Defaults to
+		 * the basename of its [uri-path](#Uri.path)
+		 */
+		readonly name: string;
+
+		/**
+		 * The ordinal number of this workspace folder.
+		 */
+		readonly index: number;
+	}
+
+	/**
+	 * Namespace for dealing with the current workspace. A workspace is the representation
+	 * of the folder that has been opened. There is no workspace when just a file but not a
+	 * folder has been opened.
+	 *
+	 * The workspace offers support for [listening](#workspace.createFileSystemWatcher) to fs
+	 * events and for [finding](#workspace.findFiles) files. Both perform well and run _outside_
+	 * the editor-process so that they should be always used instead of nodejs-equivalents.
+	 */
+	export namespace workspace {
+
+		/**
+		 * ~~The folder that is open in the editor. `undefined` when no folder
+		 * has been opened.~~
+		 *
+		 * @deprecated Use [`workspaceFolders`](#workspace.workspaceFolders) instead.
+		 *
+		 * @readonly
+		 */
+		export let rootPath: string | undefined;
+
+		/**
+		 * List of workspace folders or `undefined` when no folder is open.
+		 * *Note* that the first entry corresponds to the value of `rootPath`.
+		 *
+		 * @readonly
+		 */
+		export let workspaceFolders: WorkspaceFolder[] | undefined;
+
+		/**
+		 * The name of the workspace. `undefined` when no folder
+		 * has been opened.
+		 *
+		 * @readonly
+		 */
+		export let name: string | undefined;
+
+		/**
+		 * An event that is emitted when a workspace folder is added or removed.
+		 */
+		export const onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
+
+		/**
+		 * Returns the [workspace folder](#WorkspaceFolder) that contains a given uri.
+		 * * returns `undefined` when the given uri doesn't match any workspace folder
+		 * * returns the *input* when the given uri is a workspace folder itself
+		 *
+		 * @param uri An uri.
+		 * @return A workspace folder or `undefined`
+		 */
+		export function getWorkspaceFolder(uri: Uri): WorkspaceFolder | undefined;
+
+		/**
+		 * Returns a path that is relative to the workspace folder or folders.
+		 *
+		 * When there are no [workspace folders](#workspace.workspaceFolders) or when the path
+		 * is not contained in them, the input is returned.
+		 *
+		 * @param pathOrUri A path or uri. When a uri is given its [fsPath](#Uri.fsPath) is used.
+		 * @param includeWorkspaceFolder When `true` and when the given path is contained inside a
+		 * workspace folder the name of the workspace is prepended. Defaults to `true` when there are
+		 * multiple workspace folders and `false` otherwise.
+		 * @return A path relative to the root or the input.
+		 */
+		export function asRelativePath(pathOrUri: string | Uri, includeWorkspaceFolder?: boolean): string;
+
+		/**
+		 * This method replaces `deleteCount` [workspace folders](#workspace.workspaceFolders) starting at index `start`
+		 * by an optional set of `workspaceFoldersToAdd` on the `vscode.workspace.workspaceFolders` array. This "splice"
+		 * behavior can be used to add, remove and change workspace folders in a single operation.
+		 *
+		 * If the first workspace folder is added, removed or changed, the currently executing extensions (including the
+		 * one that called this method) will be terminated and restarted so that the (deprecated) `rootPath` property is
+		 * updated to point to the first workspace folder.
+		 *
+		 * Use the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) event to get notified when the
+		 * workspace folders have been updated.
+		 *
+		 * **Example:** adding a new workspace folder at the end of workspace folders
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(workspace.workspaceFolders ? workspace.workspaceFolders.length : 0, null, { uri: ...});
+		 * ```
+		 *
+		 * **Example:** removing the first workspace folder
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(0, 1);
+		 * ```
+		 *
+		 * **Example:** replacing an existing workspace folder with a new one
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(0, 1, { uri: ...});
+		 * ```
+		 *
+		 * It is valid to remove an existing workspace folder and add it again with a different name
+		 * to rename that folder.
+		 *
+		 * **Note:** it is not valid to call [updateWorkspaceFolders()](#updateWorkspaceFolders) multiple times
+		 * without waiting for the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) to fire.
+		 *
+		 * @param start the zero-based location in the list of currently opened [workspace folders](#WorkspaceFolder)
+		 * from which to start deleting workspace folders.
+		 * @param deleteCount the optional number of workspace folders to remove.
+		 * @param workspaceFoldersToAdd the optional variable set of workspace folders to add in place of the deleted ones.
+		 * Each workspace is identified with a mandatory URI and an optional name.
+		 * @return true if the operation was successfully started and false otherwise if arguments were used that would result
+		 * in invalid workspace folder state (e.g. 2 folders with the same URI).
+		 */
+		export function updateWorkspaceFolders(start: number, deleteCount: number | undefined | null, ...workspaceFoldersToAdd: { uri: Uri, name?: string }[]): boolean;
+
+		/**
+		 * Creates a file system watcher.
+		 *
+		 * A glob pattern that filters the file events on their absolute path must be provided. Optionally,
+		 * flags to ignore certain kinds of events can be provided. To stop listening to events the watcher must be disposed.
+		 *
+		 * *Note* that only files within the current [workspace folders](#workspace.workspaceFolders) can be watched.
+		 *
+		 * @param globPattern A [glob pattern](#GlobPattern) that is applied to the absolute paths of created, changed,
+		 * and deleted files. Use a [relative pattern](#RelativePattern) to limit events to a certain [workspace folder](#WorkspaceFolder).
+		 * @param ignoreCreateEvents Ignore when files have been created.
+		 * @param ignoreChangeEvents Ignore when files have been changed.
+		 * @param ignoreDeleteEvents Ignore when files have been deleted.
+		 * @return A new file system watcher instance.
+		 */
+		export function createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
+
+		/**
+		 * Find files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
+		 *
+		 * @sample `findFiles('**​/*.js', '**​/node_modules/**', 10)`
+		 * @param include A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
+		 * will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
+		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
+		 * @param exclude  A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
+		 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
+		 * apply, when `null` no excludes will apply.
+		 * @param maxResults An upper-bound for the result.
+		 * @param token A token that can be used to signal cancellation to the underlying search engine.
+		 * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
+		 * [workspace folders](#workspace.workspaceFolders) are opened.
+		 */
+		export function findFiles(include: GlobPattern, exclude?: GlobPattern | null, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
+
+		/**
+		 * Save all dirty files.
+		 *
+		 * @param includeUntitled Also save files that have been created during this session.
+		 * @return A thenable that resolves when the files have been saved.
+		 */
+		export function saveAll(includeUntitled?: boolean): Thenable<boolean>;
+
+		/**
+		 * Make changes to one or many resources or create, delete, and rename resources as defined by the given
+		 * [workspace edit](#WorkspaceEdit).
+		 *
+		 * All changes of a workspace edit are applied in the same order in which they have been added. If
+		 * multiple textual inserts are made at the same position, these strings appear in the resulting text
+		 * in the order the 'inserts' were made. Invalid sequences like 'delete file a' -> 'insert text in file a'
+		 * cause failure of the operation.
+		 *
+		 * When applying a workspace edit that consists only of text edits an 'all-or-nothing'-strategy is used.
+		 * A workspace edit with resource creations or deletions aborts the operation, e.g. consective edits will
+		 * not be attempted, when a single edit fails.
+		 *
+		 * @param edit A workspace edit.
+		 * @return A thenable that resolves when the edit could be applied.
+		 */
+		export function applyEdit(edit: WorkspaceEdit): Thenable<boolean>;
+
+		/**
+		 * All text documents currently known to the system.
+		 *
+		 * @readonly
+		 */
+		export let textDocuments: TextDocument[];
+
+		/**
+		 * Opens a document. Will return early if this document is already open. Otherwise
+		 * the document is loaded and the [didOpen](#workspace.onDidOpenTextDocument)-event fires.
+		 *
+		 * The document is denoted by an [uri](#Uri). Depending on the [scheme](#Uri.scheme) the
+		 * following rules apply:
+		 * * `file`-scheme: Open a file on disk, will be rejected if the file does not exist or cannot be loaded.
+		 * * `untitled`-scheme: A new file that should be saved on disk, e.g. `untitled:c:\frodo\new.js`. The language
+		 * will be derived from the file name.
+		 * * For all other schemes the registered text document content [providers](#TextDocumentContentProvider) are consulted.
+		 *
+		 * *Note* that the lifecycle of the returned document is owned by the editor and not by the extension. That means an
+		 * [`onDidClose`](#workspace.onDidCloseTextDocument)-event can occur at any time after opening it.
+		 *
+		 * @param uri Identifies the resource to open.
+		 * @return A promise that resolves to a [document](#TextDocument).
+		 */
+		export function openTextDocument(uri: Uri): Thenable<TextDocument>;
+
+		/**
+		 * A short-hand for `openTextDocument(Uri.file(fileName))`.
+		 *
+		 * @see [openTextDocument](#openTextDocument)
+		 * @param fileName A name of a file on disk.
+		 * @return A promise that resolves to a [document](#TextDocument).
+		 */
+		export function openTextDocument(fileName: string): Thenable<TextDocument>;
+
+		/**
+		 * Opens an untitled text document. The editor will prompt the user for a file
+		 * path when the document is to be saved. The `options` parameter allows to
+		 * specify the *language* and/or the *content* of the document.
+		 *
+		 * @param options Options to control how the document will be created.
+		 * @return A promise that resolves to a [document](#TextDocument).
+		 */
+		export function openTextDocument(options?: { language?: string; content?: string; }): Thenable<TextDocument>;
+
+		/**
+		 * Register a text document content provider.
+		 *
+		 * Only one provider can be registered per scheme.
+		 *
+		 * @param scheme The uri-scheme to register for.
+		 * @param provider A content provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTextDocumentContentProvider(scheme: string, provider: TextDocumentContentProvider): Disposable;
+
+		/**
+		 * An event that is emitted when a [text document](#TextDocument) is opened or when the language id
+		 * of a text document [has been changed](#languages.setTextDocumentLanguage).
+		 *
+		 * To add an event listener when a visible text document is opened, use the [TextEditor](#TextEditor) events in the
+		 * [window](#window) namespace. Note that:
+		 *
+		 * - The event is emitted before the [document](#TextDocument) is updated in the
+		 * [active text editor](#window.activeTextEditor)
+		 * - When a [text document](#TextDocument) is already open (e.g.: open in another [visible text editor](#window.visibleTextEditors)) this event is not emitted
+		 *
+		 */
+		export const onDidOpenTextDocument: Event<TextDocument>;
+
+		/**
+		 * An event that is emitted when a [text document](#TextDocument) is disposed or when the language id
+		 * of a text document [has been changed](#languages.setTextDocumentLanguage).
+		 *
+		 * To add an event listener when a visible text document is closed, use the [TextEditor](#TextEditor) events in the
+		 * [window](#window) namespace. Note that this event is not emitted when a [TextEditor](#TextEditor) is closed
+		 * but the document remains open in another [visible text editor](#window.visibleTextEditors).
+		 */
+		export const onDidCloseTextDocument: Event<TextDocument>;
+
+		/**
+		 * An event that is emitted when a [text document](#TextDocument) is changed. This usually happens
+		 * when the [contents](#TextDocument.getText) changes but also when other things like the
+		 * [dirty](#TextDocument.isDirty)-state changes.
+		 */
+		export const onDidChangeTextDocument: Event<TextDocumentChangeEvent>;
+
+		/**
+		 * An event that is emitted when a [text document](#TextDocument) will be saved to disk.
+		 *
+		 * *Note 1:* Subscribers can delay saving by registering asynchronous work. For the sake of data integrity the editor
+		 * might save without firing this event. For instance when shutting down with dirty files.
+		 *
+		 * *Note 2:* Subscribers are called sequentially and they can [delay](#TextDocumentWillSaveEvent.waitUntil) saving
+		 * by registering asynchronous work. Protection against misbehaving listeners is implemented as such:
+		 *  * there is an overall time budget that all listeners share and if that is exhausted no further listener is called
+		 *  * listeners that take a long time or produce errors frequently will not be called anymore
+		 *
+		 * The current thresholds are 1.5 seconds as overall time budget and a listener can misbehave 3 times before being ignored.
+		 */
+		export const onWillSaveTextDocument: Event<TextDocumentWillSaveEvent>;
+
+		/**
+		 * An event that is emitted when a [text document](#TextDocument) is saved to disk.
+		 */
+		export const onDidSaveTextDocument: Event<TextDocument>;
+
+		/**
+		 * Get a workspace configuration object.
+		 *
+		 * When a section-identifier is provided only that part of the configuration
+		 * is returned. Dots in the section-identifier are interpreted as child-access,
+		 * like `{ myExt: { setting: { doIt: true }}}` and `getConfiguration('myExt.setting').get('doIt') === true`.
+		 *
+		 * When a resource is provided, configuration scoped to that resource is returned.
+		 *
+		 * @param section A dot-separated identifier.
+		 * @param resource A resource for which the configuration is asked for
+		 * @return The full configuration or a subset.
+		 */
+		export function getConfiguration(section?: string, resource?: Uri | null): WorkspaceConfiguration;
+
+		/**
+		 * An event that is emitted when the [configuration](#WorkspaceConfiguration) changed.
+		 */
+		export const onDidChangeConfiguration: Event<ConfigurationChangeEvent>;
+
+		/**
+		 * ~~Register a task provider.~~
+		 *
+		 * @deprecated Use the corresponding function on the `tasks` namespace instead
+		 *
+		 * @param type The task kind type this provider is registered for.
+		 * @param provider A task provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
+
+		/**
+		 * Register a filesystem provider for a given scheme, e.g. `ftp`.
+		 *
+		 * There can only be one provider per scheme and an error is being thrown when a scheme
+		 * has been claimed by another provider or when it is reserved.
+		 *
+		 * @param scheme The uri-[scheme](#Uri.scheme) the provider registers for.
+		 * @param provider The filesystem provider.
+		 * @param options Immutable metadata about the provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean }): Disposable;
+	}
+
+	/**
+	 * An event describing the change in Configuration
+	 */
+	export interface ConfigurationChangeEvent {
+
+		/**
+		 * Returns `true` if the given section for the given resource (if provided) is affected.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @param resource A resource Uri.
+		 * @return `true` if the given section for the given resource (if provided) is affected.
+		 */
+		affectsConfiguration(section: string, resource?: Uri): boolean;
+	}
+
+	/**
+	 * Namespace for participating in language-specific editor [features](https://code.visualstudio.com/docs/editor/editingevolved),
+	 * like IntelliSense, code actions, diagnostics etc.
+	 *
+	 * Many programming languages exist and there is huge variety in syntaxes, semantics, and paradigms. Despite that, features
+	 * like automatic word-completion, code navigation, or code checking have become popular across different tools for different
+	 * programming languages.
+	 *
+	 * The editor provides an API that makes it simple to provide such common features by having all UI and actions already in place and
+	 * by allowing you to participate by providing data only. For instance, to contribute a hover all you have to do is provide a function
+	 * that can be called with a [TextDocument](#TextDocument) and a [Position](#Position) returning hover info. The rest, like tracking the
+	 * mouse, positioning the hover, keeping the hover stable etc. is taken care of by the editor.
+	 *
+	 * ```javascript
+	 * languages.registerHoverProvider('javascript', {
+	 * 	provideHover(document, position, token) {
+	 * 		return new Hover('I am a hover!');
+	 * 	}
+	 * });
+	 * ```
+	 *
+	 * Registration is done using a [document selector](#DocumentSelector) which is either a language id, like `javascript` or
+	 * a more complex [filter](#DocumentFilter) like `{ language: 'typescript', scheme: 'file' }`. Matching a document against such
+	 * a selector will result in a [score](#languages.match) that is used to determine if and how a provider shall be used. When
+	 * scores are equal the provider that came last wins. For features that allow full arity, like [hover](#languages.registerHoverProvider),
+	 * the score is only checked to be `>0`, for other features, like [IntelliSense](#languages.registerCompletionItemProvider) the
+	 * score is used for determining the order in which providers are asked to participate.
+	 */
+	export namespace languages {
+
+		/**
+		 * Return the identifiers of all known languages.
+		 * @return Promise resolving to an array of identifier strings.
+		 */
+		export function getLanguages(): Thenable<string[]>;
+
+		/**
+		 * Set (and change) the [language](#TextDocument.languageId) that is associated
+		 * with the given document.
+		 *
+		 * *Note* that calling this function will trigger the [`onDidCloseTextDocument`](#workspace.onDidCloseTextDocument) event
+		 * followed by the [`onDidOpenTextDocument`](#workspace.onDidOpenTextDocument) event.
+		 *
+		 * @param document The document which language is to be changed
+		 * @param languageId The new language identifier.
+		 * @returns A thenable that resolves with the updated document.
+		 */
+		export function setTextDocumentLanguage(document: TextDocument, languageId: string): Thenable<TextDocument>;
+
+		/**
+		 * Compute the match between a document [selector](#DocumentSelector) and a document. Values
+		 * greater than zero mean the selector matches the document.
+		 *
+		 * A match is computed according to these rules:
+		 * 1. When [`DocumentSelector`](#DocumentSelector) is an array, compute the match for each contained `DocumentFilter` or language identifier and take the maximum value.
+		 * 2. A string will be desugared to become the `language`-part of a [`DocumentFilter`](#DocumentFilter), so `"fooLang"` is like `{ language: "fooLang" }`.
+		 * 3. A [`DocumentFilter`](#DocumentFilter) will be matched against the document by comparing its parts with the document. The following rules apply:
+		 *  1. When the `DocumentFilter` is empty (`{}`) the result is `0`
+		 *  2. When `scheme`, `language`, or `pattern` are defined but one doesn’t match, the result is `0`
+		 *  3. Matching against `*` gives a score of `5`, matching via equality or via a glob-pattern gives a score of `10`
+		 *  4. The result is the maximum value of each match
+		 *
+		 * Samples:
+		 * ```js
+		 * // default document from disk (file-scheme)
+		 * doc.uri; //'file:///my/file.js'
+		 * doc.languageId; // 'javascript'
+		 * match('javascript', doc); // 10;
+		 * match({language: 'javascript'}, doc); // 10;
+		 * match({language: 'javascript', scheme: 'file'}, doc); // 10;
+		 * match('*', doc); // 5
+		 * match('fooLang', doc); // 0
+		 * match(['fooLang', '*'], doc); // 5
+		 *
+		 * // virtual document, e.g. from git-index
+		 * doc.uri; // 'git:/my/file.js'
+		 * doc.languageId; // 'javascript'
+		 * match('javascript', doc); // 10;
+		 * match({language: 'javascript', scheme: 'git'}, doc); // 10;
+		 * match('*', doc); // 5
+		 * ```
+		 *
+		 * @param selector A document selector.
+		 * @param document A text document.
+		 * @return A number `>0` when the selector matches and `0` when the selector does not match.
+		 */
+		export function match(selector: DocumentSelector, document: TextDocument): number;
+
+		/**
+		 * An [event](#Event) which fires when the global set of diagnostics changes. This is
+		 * newly added and removed diagnostics.
+		 */
+		export const onDidChangeDiagnostics: Event<DiagnosticChangeEvent>;
+
+		/**
+		 * Get all diagnostics for a given resource. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @param resource A resource
+		 * @returns An array of [diagnostics](#Diagnostic) objects or an empty array.
+		 */
+		export function getDiagnostics(resource: Uri): Diagnostic[];
+
+		/**
+		 * Get all diagnostics. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @returns An array of uri-diagnostics tuples or an empty array.
+		 */
+		export function getDiagnostics(): [Uri, Diagnostic[]][];
+
+		/**
+		 * Create a diagnostics collection.
+		 *
+		 * @param name The [name](#DiagnosticCollection.name) of the collection.
+		 * @return A new diagnostic collection.
+		 */
+		export function createDiagnosticCollection(name?: string): DiagnosticCollection;
+
+		/**
+		 * Register a completion provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and groups of equal score are sequentially asked for
+		 * completion items. The process stops when one or many providers of a group return a
+		 * result. A failing provider (rejected promise or exception) will not fail the whole
+		 * operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A completion provider.
+		 * @param triggerCharacters Trigger completion when the user types one of the characters, like `.` or `:`.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerCompletionItemProvider(selector: DocumentSelector, provider: CompletionItemProvider, ...triggerCharacters: string[]): Disposable;
+
+		/**
+		 * Register a code action provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A code action provider.
+		 * @param metadata Metadata about the kind of code actions the provider providers.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider, metadata?: CodeActionProviderMetadata): Disposable;
+
+		/**
+		 * Register a code lens provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A code lens provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerCodeLensProvider(selector: DocumentSelector, provider: CodeLensProvider): Disposable;
+
+		/**
+		 * Register a definition provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A definition provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDefinitionProvider(selector: DocumentSelector, provider: DefinitionProvider): Disposable;
+
+		/**
+		 * Register an implementation provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider An implementation provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerImplementationProvider(selector: DocumentSelector, provider: ImplementationProvider): Disposable;
+
+		/**
+		 * Register a type definition provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A type definition provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTypeDefinitionProvider(selector: DocumentSelector, provider: TypeDefinitionProvider): Disposable;
+
+		/**
+		 * Register a hover provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A hover provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerHoverProvider(selector: DocumentSelector, provider: HoverProvider): Disposable;
+
+		/**
+		 * Register a document highlight provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and groups sequentially asked for document highlights.
+		 * The process stops when a provider returns a `non-falsy` or `non-failure` result.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A document highlight provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDocumentHighlightProvider(selector: DocumentSelector, provider: DocumentHighlightProvider): Disposable;
+
+		/**
+		 * Register a document symbol provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A document symbol provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDocumentSymbolProvider(selector: DocumentSelector, provider: DocumentSymbolProvider): Disposable;
+
+		/**
+		 * Register a workspace symbol provider.
+		 *
+		 * Multiple providers can be registered. In that case providers are asked in parallel and
+		 * the results are merged. A failing provider (rejected promise or exception) will not cause
+		 * a failure of the whole operation.
+		 *
+		 * @param provider A workspace symbol provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerWorkspaceSymbolProvider(provider: WorkspaceSymbolProvider): Disposable;
+
+		/**
+		 * Register a reference provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A reference provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerReferenceProvider(selector: DocumentSelector, provider: ReferenceProvider): Disposable;
+
+		/**
+		 * Register a reference provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and the best-matching provider is used. Failure
+		 * of the selected provider will cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A rename provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerRenameProvider(selector: DocumentSelector, provider: RenameProvider): Disposable;
+
+		/**
+		 * Register a formatting provider for a document.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and the best-matching provider is used. Failure
+		 * of the selected provider will cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A document formatting edit provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDocumentFormattingEditProvider(selector: DocumentSelector, provider: DocumentFormattingEditProvider): Disposable;
+
+		/**
+		 * Register a formatting provider for a document range.
+		 *
+		 * *Note:* A document range provider is also a [document formatter](#DocumentFormattingEditProvider)
+		 * which means there is no need to [register](registerDocumentFormattingEditProvider) a document
+		 * formatter when also registering a range provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and the best-matching provider is used. Failure
+		 * of the selected provider will cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A document range formatting edit provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDocumentRangeFormattingEditProvider(selector: DocumentSelector, provider: DocumentRangeFormattingEditProvider): Disposable;
+
+		/**
+		 * Register a formatting provider that works on type. The provider is active when the user enables the setting `editor.formatOnType`.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and the best-matching provider is used. Failure
+		 * of the selected provider will cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider An on type formatting edit provider.
+		 * @param firstTriggerCharacter A character on which formatting should be triggered, like `}`.
+		 * @param moreTriggerCharacter More trigger characters.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerOnTypeFormattingEditProvider(selector: DocumentSelector, provider: OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacter: string[]): Disposable;
+
+		/**
+		 * Register a signature help provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are sorted
+		 * by their [score](#languages.match) and called sequentially until a provider returns a
+		 * valid result.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A signature help provider.
+		 * @param triggerCharacters Trigger signature help when the user types one of the characters, like `,` or `(`.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerSignatureHelpProvider(selector: DocumentSelector, provider: SignatureHelpProvider, ...triggerCharacters: string[]): Disposable;
+
+		/**
+		 * Register a document link provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A document link provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDocumentLinkProvider(selector: DocumentSelector, provider: DocumentLinkProvider): Disposable;
+
+		/**
+		 * Register a color provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A color provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
+
+		/**
+		 * Register a folding range provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged.
+		 * If multiple folding ranges start at the same position, only the range of the first registered provider is used.
+		 * If a folding range overlaps with an other range that has a smaller position, it is also ignored.
+		 *
+		 * A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A folding range provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider): Disposable;
+
+		/**
+		 * Set a [language configuration](#LanguageConfiguration) for a language.
+		 *
+		 * @param language A language identifier like `typescript`.
+		 * @param configuration Language configuration.
+		 * @return A [disposable](#Disposable) that unsets this configuration.
+		 */
+		export function setLanguageConfiguration(language: string, configuration: LanguageConfiguration): Disposable;
+	}
+
+	/**
+	 * Represents the input box in the Source Control viewlet.
+	 */
+	export interface SourceControlInputBox {
+
+		/**
+		 * Setter and getter for the contents of the input box.
+		 */
+		value: string;
+
+		/**
+		 * A string to show as place holder in the input box to guide the user.
+		 */
+		placeholder: string;
+	}
+
+	interface QuickDiffProvider {
+
+		/**
+		 * Provide a [uri](#Uri) to the original resource of any given resource uri.
+		 *
+		 * @param uri The uri of the resource open in a text editor.
+		 * @param token A cancellation token.
+		 * @return A thenable that resolves to uri of the matching original resource.
+		 */
+		provideOriginalResource?(uri: Uri, token: CancellationToken): ProviderResult<Uri>;
+	}
+
+	/**
+	 * The theme-aware decorations for a
+	 * [source control resource state](#SourceControlResourceState).
+	 */
+	export interface SourceControlResourceThemableDecorations {
+
+		/**
+		 * The icon path for a specific
+		 * [source control resource state](#SourceControlResourceState).
+		 */
+		readonly iconPath?: string | Uri;
+	}
+
+	/**
+	 * The decorations for a [source control resource state](#SourceControlResourceState).
+	 * Can be independently specified for light and dark themes.
+	 */
+	export interface SourceControlResourceDecorations extends SourceControlResourceThemableDecorations {
+
+		/**
+		 * Whether the [source control resource state](#SourceControlResourceState) should
+		 * be striked-through in the UI.
+		 */
+		readonly strikeThrough?: boolean;
+
+		/**
+		 * Whether the [source control resource state](#SourceControlResourceState) should
+		 * be faded in the UI.
+		 */
+		readonly faded?: boolean;
+
+		/**
+		 * The title for a specific
+		 * [source control resource state](#SourceControlResourceState).
+		 */
+		readonly tooltip?: string;
+
+		/**
+		 * The light theme decorations.
+		 */
+		readonly light?: SourceControlResourceThemableDecorations;
+
+		/**
+		 * The dark theme decorations.
+		 */
+		readonly dark?: SourceControlResourceThemableDecorations;
+	}
+
+	/**
+	 * An source control resource state represents the state of an underlying workspace
+	 * resource within a certain [source control group](#SourceControlResourceGroup).
+	 */
+	export interface SourceControlResourceState {
+
+		/**
+		 * The [uri](#Uri) of the underlying resource inside the workspace.
+		 */
+		readonly resourceUri: Uri;
+
+		/**
+		 * The [command](#Command) which should be run when the resource
+		 * state is open in the Source Control viewlet.
+		 */
+		readonly command?: Command;
+
+		/**
+		 * The [decorations](#SourceControlResourceDecorations) for this source control
+		 * resource state.
+		 */
+		readonly decorations?: SourceControlResourceDecorations;
+	}
+
+	/**
+	 * A source control resource group is a collection of
+	 * [source control resource states](#SourceControlResourceState).
+	 */
+	export interface SourceControlResourceGroup {
+
+		/**
+		 * The id of this source control resource group.
+		 */
+		readonly id: string;
+
+		/**
+		 * The label of this source control resource group.
+		 */
+		label: string;
+
+		/**
+		 * Whether this source control resource group is hidden when it contains
+		 * no [source control resource states](#SourceControlResourceState).
+		 */
+		hideWhenEmpty?: boolean;
+
+		/**
+		 * This group's collection of
+		 * [source control resource states](#SourceControlResourceState).
+		 */
+		resourceStates: SourceControlResourceState[];
+
+		/**
+		 * Dispose this source control resource group.
+		 */
+		dispose(): void;
+	}
+
+	/**
+	 * An source control is able to provide [resource states](#SourceControlResourceState)
+	 * to the editor and interact with the editor in several source control related ways.
+	 */
+	export interface SourceControl {
+
+		/**
+		 * The id of this source control.
+		 */
+		readonly id: string;
+
+		/**
+		 * The human-readable label of this source control.
+		 */
+		readonly label: string;
+
+		/**
+		 * The (optional) Uri of the root of this source control.
+		 */
+		readonly rootUri: Uri | undefined;
+
+		/**
+		 * The [input box](#SourceControlInputBox) for this source control.
+		 */
+		readonly inputBox: SourceControlInputBox;
+
+		/**
+		 * The UI-visible count of [resource states](#SourceControlResourceState) of
+		 * this source control.
+		 *
+		 * Equals to the total number of [resource state](#SourceControlResourceState)
+		 * of this source control, if undefined.
+		 */
+		count?: number;
+
+		/**
+		 * An optional [quick diff provider](#QuickDiffProvider).
+		 */
+		quickDiffProvider?: QuickDiffProvider;
+
+		/**
+		 * Optional commit template string.
+		 *
+		 * The Source Control viewlet will populate the Source Control
+		 * input with this value when appropriate.
+		 */
+		commitTemplate?: string;
+
+		/**
+		 * Optional accept input command.
+		 *
+		 * This command will be invoked when the user accepts the value
+		 * in the Source Control input.
+		 */
+		acceptInputCommand?: Command;
+
+		/**
+		 * Optional status bar commands.
+		 *
+		 * These commands will be displayed in the editor's status bar.
+		 */
+		statusBarCommands?: Command[];
+
+		/**
+		 * Create a new [resource group](#SourceControlResourceGroup).
+		 */
+		createResourceGroup(id: string, label: string): SourceControlResourceGroup;
+
+		/**
+		 * Dispose this source control.
+		 */
+		dispose(): void;
+	}
+
+	export namespace scm {
+
+		/**
+		 * ~~The [input box](#SourceControlInputBox) for the last source control
+		 * created by the extension.~~
+		 *
+		 * @deprecated Use SourceControl.inputBox instead
+		 */
+		export const inputBox: SourceControlInputBox;
+
+		/**
+		 * Creates a new [source control](#SourceControl) instance.
+		 *
+		 * @param id An `id` for the source control. Something short, eg: `git`.
+		 * @param label A human-readable string for the source control. Eg: `Git`.
+		 * @param rootUri An optional Uri of the root of the source control. Eg: `Uri.parse(workspaceRoot)`.
+		 * @return An instance of [source control](#SourceControl).
+		 */
+		export function createSourceControl(id: string, label: string, rootUri?: Uri): SourceControl;
+	}
+
+	/**
+	 * Configuration for a debug session.
+	 */
+	export interface DebugConfiguration {
+		/**
+		 * The type of the debug session.
+		 */
+		type: string;
+
+		/**
+		 * The name of the debug session.
+		 */
+		name: string;
+
+		/**
+		 * The request type of the debug session.
+		 */
+		request: string;
+
+		/**
+		 * Additional debug type specific properties.
+		 */
+		[key: string]: any;
+	}
+
+	/**
+	 * A debug session.
+	 */
+	export interface DebugSession {
+
+		/**
+		 * The unique ID of this debug session.
+		 */
+		readonly id: string;
+
+		/**
+		 * The debug session's type from the [debug configuration](#DebugConfiguration).
+		 */
+		readonly type: string;
+
+		/**
+		 * The debug session's name from the [debug configuration](#DebugConfiguration).
+		 */
+		readonly name: string;
+
+		/**
+		 * Send a custom request to the debug adapter.
+		 */
+		customRequest(command: string, args?: any): Thenable<any>;
+	}
+
+	/**
+	 * A custom Debug Adapter Protocol event received from a [debug session](#DebugSession).
+	 */
+	export interface DebugSessionCustomEvent {
+		/**
+		 * The [debug session](#DebugSession) for which the custom event was received.
+		 */
+		session: DebugSession;
+
+		/**
+		 * Type of event.
+		 */
+		event: string;
+
+		/**
+		 * Event specific information.
+		 */
+		body?: any;
+	}
+
+	/**
+	 * A debug configuration provider allows to add the initial debug configurations to a newly created launch.json
+	 * and to resolve a launch configuration before it is used to start a new debug session.
+	 * A debug configuration provider is registered via #debug.registerDebugConfigurationProvider.
+	 */
+	export interface DebugConfigurationProvider {
+		/**
+		 * Provides initial [debug configuration](#DebugConfiguration). If more than one debug configuration provider is
+		 * registered for the same type, debug configurations are concatenated in arbitrary order.
+		 *
+		 * @param folder The workspace folder for which the configurations are used or undefined for a folderless setup.
+		 * @param token A cancellation token.
+		 * @return An array of [debug configurations](#DebugConfiguration).
+		 */
+		provideDebugConfigurations?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]>;
+
+		/**
+		 * Resolves a [debug configuration](#DebugConfiguration) by filling in missing values or by adding/changing/removing attributes.
+		 * If more than one debug configuration provider is registered for the same type, the resolveDebugConfiguration calls are chained
+		 * in arbitrary order and the initial debug configuration is piped through the chain.
+		 * Returning the value 'undefined' prevents the debug session from starting.
+		 * Returning the value 'null' prevents the debug session from starting and opens the underlying debug configuration instead.
+		 *
+		 * @param folder The workspace folder from which the configuration originates from or undefined for a folderless setup.
+		 * @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
+		 * @param token A cancellation token.
+		 * @return The resolved debug configuration or undefined or null.
+		 */
+		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
+	}
+
+	/**
+	 * Represents the debug console.
+	 */
+	export interface DebugConsole {
+		/**
+		 * Append the given value to the debug console.
+		 *
+		 * @param value A string, falsy values will not be printed.
+		 */
+		append(value: string): void;
+
+		/**
+		 * Append the given value and a line feed character
+		 * to the debug console.
+		 *
+		 * @param value A string, falsy values will be printed.
+		 */
+		appendLine(value: string): void;
+	}
+
+	/**
+	 * An event describing the changes to the set of [breakpoints](#Breakpoint).
+	 */
+	export interface BreakpointsChangeEvent {
+		/**
+		 * Added breakpoints.
+		 */
+		readonly added: Breakpoint[];
+
+		/**
+		 * Removed breakpoints.
+		 */
+		readonly removed: Breakpoint[];
+
+		/**
+		 * Changed breakpoints.
+		 */
+		readonly changed: Breakpoint[];
+	}
+
+	/**
+	 * The base class of all breakpoint types.
+	 */
+	export class Breakpoint {
+		/**
+		 * Is breakpoint enabled.
+		 */
+		readonly enabled: boolean;
+		/**
+		 * An optional expression for conditional breakpoints.
+		 */
+		readonly condition?: string;
+		/**
+		 * An optional expression that controls how many hits of the breakpoint are ignored.
+		 */
+		readonly hitCondition?: string;
+		/**
+		 * An optional message that gets logged when this breakpoint is hit. Embedded expressions within {} are interpolated by the debug adapter.
+		 */
+		readonly logMessage?: string;
+
+		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a source location.
+	 */
+	export class SourceBreakpoint extends Breakpoint {
+		/**
+		 * The source and line position of this breakpoint.
+		 */
+		readonly location: Location;
+
+		/**
+		 * Create a new breakpoint for a source location.
+		 */
+		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a function name.
+	 */
+	export class FunctionBreakpoint extends Breakpoint {
+		/**
+		 * The name of the function to which this breakpoint is attached.
+		 */
+		readonly functionName: string;
+
+		/**
+		 * Create a new function breakpoint.
+		 */
+		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
+	}
+
+	/**
+	 * Namespace for debug functionality.
+	 */
+	export namespace debug {
+
+		/**
+		 * The currently active [debug session](#DebugSession) or `undefined`. The active debug session is the one
+		 * represented by the debug action floating window or the one currently shown in the drop down menu of the debug action floating window.
+		 * If no debug session is active, the value is `undefined`.
+		 */
+		export let activeDebugSession: DebugSession | undefined;
+
+		/**
+		 * The currently active [debug console](#DebugConsole).
+		 */
+		export let activeDebugConsole: DebugConsole;
+
+		/**
+		 * List of breakpoints.
+		 */
+		export let breakpoints: Breakpoint[];
+
+
+		/**
+		 * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
+		 * has changed. *Note* that the event also fires when the active debug session changes
+		 * to `undefined`.
+		 */
+		export const onDidChangeActiveDebugSession: Event<DebugSession | undefined>;
+
+		/**
+		 * An [event](#Event) which fires when a new [debug session](#DebugSession) has been started.
+		 */
+		export const onDidStartDebugSession: Event<DebugSession>;
+
+		/**
+		 * An [event](#Event) which fires when a custom DAP event is received from the [debug session](#DebugSession).
+		 */
+		export const onDidReceiveDebugSessionCustomEvent: Event<DebugSessionCustomEvent>;
+
+		/**
+		 * An [event](#Event) which fires when a [debug session](#DebugSession) has terminated.
+		 */
+		export const onDidTerminateDebugSession: Event<DebugSession>;
+
+		/**
+		 * An [event](#Event) that is emitted when the set of breakpoints is added, removed, or changed.
+		 */
+		export const onDidChangeBreakpoints: Event<BreakpointsChangeEvent>;
+
+
+		/**
+		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specific debug type.
+		 * More than one provider can be registered for the same type.
+		 *
+		 * @param type The debug type for which the provider is registered.
+		 * @param provider The [debug configuration provider](#DebugConfigurationProvider) to register.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider): Disposable;
+
+		/**
+		 * Start debugging by using either a named launch or named compound configuration,
+		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
+		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
+		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
+		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
+		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
+		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
+		 * @return A thenable that resolves when debugging could be successfully started.
+		 */
+		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+
+		/**
+		 * Add breakpoints.
+		 * @param breakpoints The breakpoints to add.
+		*/
+		export function addBreakpoints(breakpoints: Breakpoint[]): void;
+
+		/**
+		 * Remove breakpoints.
+		 * @param breakpoints The breakpoints to remove.
+		 */
+		export function removeBreakpoints(breakpoints: Breakpoint[]): void;
+	}
+
+	/**
+	 * Namespace for dealing with installed extensions. Extensions are represented
+	 * by an [extension](#Extension)-interface which enables reflection on them.
+	 *
+	 * Extension writers can provide APIs to other extensions by returning their API public
+	 * surface from the `activate`-call.
+	 *
+	 * ```javascript
+	 * export function activate(context: vscode.ExtensionContext) {
+	 * 	let api = {
+	 * 		sum(a, b) {
+	 * 			return a + b;
+	 * 		},
+	 * 		mul(a, b) {
+	 * 			return a * b;
+	 * 		}
+	 * 	};
+	 * 	// 'export' public api-surface
+	 * 	return api;
+	 * }
+	 * ```
+	 * When depending on the API of another extension add an `extensionDependency`-entry
+	 * to `package.json`, and use the [getExtension](#extensions.getExtension)-function
+	 * and the [exports](#Extension.exports)-property, like below:
+	 *
+	 * ```javascript
+	 * let mathExt = extensions.getExtension('genius.math');
+	 * let importedApi = mathExt.exports;
+	 *
+	 * console.log(importedApi.mul(42, 1));
+	 * ```
+	 */
+	export namespace extensions {
+
+		/**
+		 * Get an extension by its full identifier in the form of: `publisher.name`.
+		 *
+		 * @param extensionId An extension identifier.
+		 * @return An extension or `undefined`.
+		 */
+		export function getExtension(extensionId: string): Extension<any> | undefined;
+
+		/**
+		 * Get an extension its full identifier in the form of: `publisher.name`.
+		 *
+		 * @param extensionId An extension identifier.
+		 * @return An extension or `undefined`.
+		 */
+		export function getExtension<T>(extensionId: string): Extension<T> | undefined;
+
+		/**
+		 * All extensions currently known to the system.
+		 */
+		export let all: Extension<any>[];
+	}
+}
+
+/**
+ * Thenable is a common denominator between ES6 promises, Q, jquery.Deferred, WinJS.Promise,
+ * and others. This API makes no assumption about what promise library is being used which
+ * enables reusing existing code without migrating to a specific promise implementation. Still,
+ * we recommend the use of native promises which are available in this editor.
+ */
+interface Thenable<T> {
+	/**
+	* Attaches callbacks for the resolution and/or rejection of the Promise.
+	* @param onfulfilled The callback to execute when the Promise is resolved.
+	* @param onrejected The callback to execute when the Promise is rejected.
+	* @returns A Promise for the completion of which ever callback is executed.
+	*/
+	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
+	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
+}
diff --git a/types/vscode/tsconfig.json b/types/vscode/tsconfig.json
new file mode 100644
index 0000000000..432506ca06
--- /dev/null
+++ b/types/vscode/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", "vscode-tests.ts"]
+}
diff --git a/types/vscode/tslint.json b/types/vscode/tslint.json
new file mode 100644
index 0000000000..e8a511fe11
--- /dev/null
+++ b/types/vscode/tslint.json
@@ -0,0 +1,80 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"dt-header": true,
+		"adjacent-overload-signatures": false,
+		"array-type": false,
+		"arrow-return-shorthand": false,
+		"ban-types": false,
+		"callable-types": false,
+		"comment-format": 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-angle-bracket-type-assertion": 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/vscode/vscode-tests.ts b/types/vscode/vscode-tests.ts
new file mode 100644
index 0000000000..b5030ab1f8
--- /dev/null
+++ b/types/vscode/vscode-tests.ts
@@ -0,0 +1,24 @@
+import * as vscode from 'vscode';
+
+vscode.commands.registerCommand('extension.helloWorld', () => {
+	vscode.window.showInformationMessage('Hello World!');
+});
+
+vscode.languages.registerCompletionItemProvider('markdown', {
+	provideCompletionItems() {
+		return [];
+	}
+});
+
+const nodeDependenciesProvider: vscode.TreeDataProvider<string> = {
+	getChildren() {
+		return [];
+	},
+	getTreeItem(el: string) {
+		return {
+			id: el
+		};
+	}
+};
+
+vscode.window.registerTreeDataProvider('nodeDependencies', nodeDependenciesProvider);

From b9a3c70030c6a6a58e553ceda8d7d6c1907398e9 Mon Sep 17 00:00:00 2001
From: Andrew <andvinco@gmail.com>
Date: Tue, 12 Mar 2019 16:33:32 -0700
Subject: [PATCH 607/924] add detached to ForkOptions (#33818)

* add detached to ForkOptions

* update v10

* update definition of ForkOptions for node v11

* update for v9
---
 types/node/child_process.d.ts     | 1 +
 types/node/v10/child_process.d.ts | 1 +
 types/node/v8/index.d.ts          | 1 +
 types/node/v9/index.d.ts          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/types/node/child_process.d.ts b/types/node/child_process.d.ts
index 4e9c882e1b..d1e14df580 100644
--- a/types/node/child_process.d.ts
+++ b/types/node/child_process.d.ts
@@ -264,6 +264,7 @@ declare module "child_process" {
         execArgv?: string[];
         silent?: boolean;
         stdio?: StdioOptions;
+        detached?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
diff --git a/types/node/v10/child_process.d.ts b/types/node/v10/child_process.d.ts
index 1114247bee..442e8ae654 100644
--- a/types/node/v10/child_process.d.ts
+++ b/types/node/v10/child_process.d.ts
@@ -258,6 +258,7 @@ declare module "child_process" {
         execArgv?: string[];
         silent?: boolean;
         stdio?: StdioOptions;
+        detached?: boolean;
         windowsVerbatimArguments?: boolean;
         uid?: number;
         gid?: number;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 83deb05d33..ecc15b68f1 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2259,6 +2259,7 @@ declare module "child_process" {
         execArgv?: string[];
         silent?: boolean;
         stdio?: any[];
+        detached?: boolean;
         uid?: number;
         gid?: number;
         windowsVerbatimArguments?: boolean;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index ce36ad42d0..55cb883f8c 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2669,6 +2669,7 @@ declare module "child_process" {
         execArgv?: string[];
         silent?: boolean;
         stdio?: any[];
+        detached?: boolean;
         uid?: number;
         gid?: number;
         windowsVerbatimArguments?: boolean;

From 708214ef048c95e4a28f7835f49e2927b0ebc2e9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:36:10 -0700
Subject: [PATCH 608/924] Change 'export default' to 'export =', part 2
 (#33823)

* Change 'export default' to 'export ='

For packages that don't actually export a 'default' property.

* 7 more packages
---
 types/complex/complex-tests.ts                |   2 +-
 types/complex/index.d.ts                      |   3 +-
 types/core-object/core-object-tests.ts        |  12 +-
 types/core-object/index.d.ts                  |  17 +-
 .../electron-load-devtool-tests.ts            |   2 +-
 types/electron-load-devtool/index.d.ts        |   2 +-
 .../express-correlation-id-tests.ts           |   2 +-
 types/express-correlation-id/index.d.ts       |   2 +-
 .../express-sitemap-xml-tests.ts              |   4 +-
 types/express-sitemap-xml/index.d.ts          |  30 +-
 types/idyll-compiler/idyll-compiler-tests.ts  |   2 +-
 types/idyll-compiler/index.d.ts               |  60 ++-
 types/mapbox__sphericalmercator/index.d.ts    |   4 +-
 .../mapbox__sphericalmercator-tests.ts        |   2 +-
 types/memoize-one/index.d.ts                  |   8 +-
 types/memoize-one/memoize-one-tests.ts        |   4 +-
 types/ml-levenberg-marquardt/index.d.ts       |   2 +-
 .../ml-levenberg-marquardt-tests.ts           |   2 +-
 types/native-toast/index.d.ts                 |  48 +-
 types/native-toast/native-toast-tests.ts      |   6 +-
 types/palx/index.d.ts                         |  40 +-
 types/palx/palx-tests.ts                      |   4 +-
 types/parse-ms/index.d.ts                     |   3 +-
 types/parse-ms/parse-ms-tests.ts              |   2 +-
 types/parse5-html-rewriting-stream/index.d.ts |   3 +-
 .../parse5-html-rewriting-stream-tests.ts     |   2 +-
 types/powerbi-visuals-tools/index.d.ts        |   4 +-
 .../powerbi-visuals-tools-tests.ts            |   2 +-
 types/promise-polyfill/index.d.ts             |  10 +-
 .../promise-polyfill-tests.ts                 |   2 +-
 types/promised-temp/index.d.ts                |  12 +-
 types/promised-temp/promised-temp-tests.ts    |   8 +-
 types/prosemirror-test-builder/index.d.ts     | 152 +++---
 .../prosemirror-test-builder-tests.ts         |  16 +-
 types/protractor-browser-logs/index.d.ts      |  45 +-
 .../protractor-browser-logs-tests.ts          |   2 +-
 types/reconnectingwebsocket/index.d.ts        |  25 +-
 .../reconnectingwebsocket-tests.ts            |   4 +-
 types/recorder-js/index.d.ts                  |   2 +-
 types/recorder-js/recorder-js-tests.ts        |   2 +-
 types/redux-sentry-middleware/index.d.ts      |  21 +-
 .../redux-sentry-middleware-tests.ts          |   2 +-
 types/redux-storage-engine-jsurl/index.d.ts   |   3 +-
 .../redux-storage-engine-jsurl-tests.ts       |   2 +-
 types/rollup-plugin-buble/index.d.ts          |  13 +-
 .../rollup-plugin-buble-tests.ts              |   2 +-
 types/rollup-plugin-node-builtins/index.d.ts  |  11 +-
 .../rollup-plugin-node-builtins-tests.ts      |   2 +-
 types/rollup-plugin-sourcemaps/index.d.ts     |  17 +-
 .../rollup-plugin-sourcemaps-tests.ts         |   2 +-
 types/sqlanywhere/index.d.ts                  |   4 -
 types/supercluster/index.d.ts                 | 205 +++----
 types/supercluster/supercluster-tests.ts      |  14 +-
 types/task-worklet/index.d.ts                 |  28 +-
 types/task-worklet/task-worklet-tests.ts      |   2 +-
 types/websocket-async/index.d.ts              |   2 +-
 .../websocket-async/websocket-async-tests.ts  |   2 +-
 types/word-list-json/index.d.ts               |   4 +-
 types/word-list-json/word-list-json-tests.ts  |   2 +-
 types/workbox-sw/index.d.ts                   |   2 +-
 types/workbox-sw/workbox-sw-tests.ts          |   2 +-
 types/xxhashjs/index.d.ts                     |   5 +-
 types/xxhashjs/xxhashjs-tests.ts              |   2 +-
 types/yog2-kernel/index.d.ts                  | 148 +++---
 types/yog2-kernel/yog2-kernel-tests.ts        |  16 +-
 types/yoga-layout/index.d.ts                  | 501 +++++++++---------
 types/yoga-layout/yoga-layout-tests.ts        |   3 +-
 types/zen-push/index.d.ts                     |   2 +-
 types/zen-push/zen-push-tests.ts              |   2 +-
 69 files changed, 804 insertions(+), 771 deletions(-)

diff --git a/types/complex/complex-tests.ts b/types/complex/complex-tests.ts
index 8268f0c135..7979c80435 100644
--- a/types/complex/complex-tests.ts
+++ b/types/complex/complex-tests.ts
@@ -1,4 +1,4 @@
-import Complex from 'complex';
+import Complex = require('complex');
 
 let z: Complex = new Complex(2, 3);
 z = Complex.from(2, 3);
diff --git a/types/complex/index.d.ts b/types/complex/index.d.ts
index 3f44ba8e1e..4b3ad612e1 100644
--- a/types/complex/index.d.ts
+++ b/types/complex/index.d.ts
@@ -4,7 +4,8 @@
 //                 Paul Vasich <https://github.com/pavasich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default class Complex {
+export = Complex;
+declare class Complex {
     /**
      * @param real The real part of the number
      * @param im The imaginary part of the number
diff --git a/types/core-object/core-object-tests.ts b/types/core-object/core-object-tests.ts
index b434ee97fc..dfdc0f4073 100644
--- a/types/core-object/core-object-tests.ts
+++ b/types/core-object/core-object-tests.ts
@@ -1,5 +1,5 @@
 import { Mix, MethodNames } from 'core-object/-private/utils';
-import CoreObject, { ExtendOptions, ExtendThisType } from 'core-object';
+import CoreObject = require('core-object');
 
 //////////// Mix ////////////
 
@@ -24,14 +24,14 @@ names3; // $ExpectType "a"
 
 //////////// ExtendOptions ////////////
 
-const extendOptions1: ExtendOptions<{}> = { a: 1, b: 'hi' };
-const extendOptions2: ExtendOptions<{ a: number }> = { b: 'hi' };
-const extendOptions3: ExtendOptions<{ a: number }> = { a: 5 };
-const extendOptions4: ExtendOptions<{ a: number }> = { a: 'hi' }; // $ExpectError
+const extendOptions1: CoreObject.ExtendOptions<{}> = { a: 1, b: 'hi' };
+const extendOptions2: CoreObject.ExtendOptions<{ a: number }> = { b: 'hi' };
+const extendOptions3: CoreObject.ExtendOptions<{ a: number }> = { a: 5 };
+const extendOptions4: CoreObject.ExtendOptions<{ a: number }> = { a: 'hi' }; // $ExpectError
 
 //////////// ExtendThisType ////////////
 
-declare function extendThisType1<T>(options: T & ExtendThisType<{ prop: string; method: () => number }, T>): void;
+declare function extendThisType1<T>(options: T & CoreObject.ExtendThisType<{ prop: string; method: () => number }, T>): void;
 extendThisType1({
     otherMethod() {
         this.prop; // $ExpectType string
diff --git a/types/core-object/index.d.ts b/types/core-object/index.d.ts
index aa4566cac2..7a6131bac4 100644
--- a/types/core-object/index.d.ts
+++ b/types/core-object/index.d.ts
@@ -6,18 +6,21 @@
 
 import { Mix, Super, Constructor } from './-private/utils';
 
-/** The type of options allowed to be passed to `Base.extend()` */
-export type ExtendOptions<Base> = { [K in keyof Base]?: Base[K] } & Record<string, any>;
+declare namespace CoreObject {
+    /** The type of options allowed to be passed to `Base.extend()` */
+    type ExtendOptions<Base> = { [K in keyof Base]?: Base[K] } & Record<string, any>;
 
-/** The `this` type for any methods on the options passed to `Base.extend()` */
-export type ExtendThisType<Base, Ext> = ThisType<Mix<Base, Ext> & { _super: Super<Base> }>;
+    /** The `this` type for any methods on the options passed to `Base.extend()` */
+    type ExtendThisType<Base, Ext> = ThisType<Mix<Base, Ext> & { _super: Super<Base> }>;
+}
 
-export default class CoreObject {
+declare class CoreObject {
     // TODO restrict to `Record<string, unknown>` once we can restrict to 3.0+ on DT
     init(options?: Record<string, any>): void;
 
-    static extend<BaseClass extends Constructor<any>, Ext extends ExtendOptions<InstanceType<BaseClass>>>(
+    static extend<BaseClass extends Constructor<any>, Ext extends CoreObject.ExtendOptions<InstanceType<BaseClass>>>(
         this: BaseClass,
-        options: Ext & ExtendThisType<InstanceType<BaseClass>, Ext>
+        options: Ext & CoreObject.ExtendThisType<InstanceType<BaseClass>, Ext>
     ): BaseClass & Constructor<Mix<InstanceType<BaseClass>, Ext>>;
 }
+export = CoreObject;
diff --git a/types/electron-load-devtool/electron-load-devtool-tests.ts b/types/electron-load-devtool/electron-load-devtool-tests.ts
index 5c41673adc..83b7b4240d 100644
--- a/types/electron-load-devtool/electron-load-devtool-tests.ts
+++ b/types/electron-load-devtool/electron-load-devtool-tests.ts
@@ -1,4 +1,4 @@
-import loadDevtool from 'electron-load-devtool';
+import loadDevtool = require('electron-load-devtool');
 
 loadDevtool(loadDevtool.REDUX_DEVTOOLS);
 loadDevtool(loadDevtool.EMBER_INSPECTOR);
diff --git a/types/electron-load-devtool/index.d.ts b/types/electron-load-devtool/index.d.ts
index 6e8379fdf6..049166cec0 100644
--- a/types/electron-load-devtool/index.d.ts
+++ b/types/electron-load-devtool/index.d.ts
@@ -23,4 +23,4 @@ interface ElectronLoadDevtoolOptions {
 
 declare const electronLoadDevtool: ElectronLoadDevtool;
 
-export default electronLoadDevtool;
+export = electronLoadDevtool;
diff --git a/types/express-correlation-id/express-correlation-id-tests.ts b/types/express-correlation-id/express-correlation-id-tests.ts
index 20c9b872de..afa9ffb50a 100644
--- a/types/express-correlation-id/express-correlation-id-tests.ts
+++ b/types/express-correlation-id/express-correlation-id-tests.ts
@@ -1,5 +1,5 @@
 import * as express from "express";
-import correlator from "express-correlation-id";
+import correlator = require("express-correlation-id");
 
 const app = express();
 app.use(correlator());
diff --git a/types/express-correlation-id/index.d.ts b/types/express-correlation-id/index.d.ts
index fa09b65071..2deb41cb78 100644
--- a/types/express-correlation-id/index.d.ts
+++ b/types/express-correlation-id/index.d.ts
@@ -11,4 +11,4 @@ declare const correlator: {
     getId(): string | undefined;
 };
 
-export default correlator;
+export = correlator;
diff --git a/types/express-sitemap-xml/express-sitemap-xml-tests.ts b/types/express-sitemap-xml/express-sitemap-xml-tests.ts
index 9882f11c2a..2952038195 100644
--- a/types/express-sitemap-xml/express-sitemap-xml-tests.ts
+++ b/types/express-sitemap-xml/express-sitemap-xml-tests.ts
@@ -1,8 +1,8 @@
 import * as express from 'express';
 
-import expressSitemapXml, { LeafObject } from 'express-sitemap-xml';
+import expressSitemapXml = require('express-sitemap-xml');
 
-const page2Leaf: LeafObject = {
+const page2Leaf: expressSitemapXml.LeafObject = {
     changeFreq: 'weekly',
     lastMod: new Date(),
     url: '/page2'
diff --git a/types/express-sitemap-xml/index.d.ts b/types/express-sitemap-xml/index.d.ts
index 1926878bb5..f68b8c134b 100644
--- a/types/express-sitemap-xml/index.d.ts
+++ b/types/express-sitemap-xml/index.d.ts
@@ -6,22 +6,22 @@
 
 import * as express from 'express';
 
-export interface LeafObject {
-    changeFreq?: string;
-    lastMod?: string | Date;
-    url: string;
-}
-
-export type SitemapLeaf = string | LeafObject;
-
-export interface Sitemap {
-    [leaf: string]: string;
-}
-
-declare function expressSitemapXml(getUrls: (() => (SitemapLeaf[] | Promise<SitemapLeaf[]>)), base: string): express.RequestHandler;
+declare function expressSitemapXml(getUrls: (() => (expressSitemapXml.SitemapLeaf[] | Promise<expressSitemapXml.SitemapLeaf[]>)), base: string): express.RequestHandler;
 
 declare namespace expressSitemapXml {
-    function buildSitemaps(urls: SitemapLeaf[], base: string): Promise<Sitemap>;
+    interface LeafObject {
+        changeFreq?: string;
+        lastMod?: string | Date;
+        url: string;
+    }
+
+    type SitemapLeaf = string | LeafObject;
+
+    interface Sitemap {
+        [leaf: string]: string;
+    }
+
+   function buildSitemaps(urls: SitemapLeaf[], base: string): Promise<Sitemap>;
 }
 
-export default expressSitemapXml;
+export = expressSitemapXml;
diff --git a/types/idyll-compiler/idyll-compiler-tests.ts b/types/idyll-compiler/idyll-compiler-tests.ts
index c131a8600d..a6e9c8bad2 100644
--- a/types/idyll-compiler/idyll-compiler-tests.ts
+++ b/types/idyll-compiler/idyll-compiler-tests.ts
@@ -1,4 +1,4 @@
-import compile from "idyll-compiler";
+import compile = require("idyll-compiler");
 
 // Dummy log
 const log = (msg: string) => {};
diff --git a/types/idyll-compiler/index.d.ts b/types/idyll-compiler/index.d.ts
index 91b25eeb29..9399f21679 100644
--- a/types/idyll-compiler/index.d.ts
+++ b/types/idyll-compiler/index.d.ts
@@ -4,37 +4,39 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-export type PropType = "variable" | "value" | "expression";
-export type PropData = string | number | boolean;
-export type PropKey = string;
-export type PropValue = [PropType, PropData];
-export type Property = [PropKey, PropValue];
-type __RecursiveNode<T> = [string, Property[], T[]];
-export interface TreeNode extends __RecursiveNode<Node> {}
-export type Node = TreeNode | string;
-export type AST = Node[];
+declare namespace compiler {
+    type PropType = "variable" | "value" | "expression";
+    type PropData = string | number | boolean;
+    type PropKey = string;
+    type PropValue = [PropType, PropData];
+    type Property = [PropKey, PropValue];
+    type __RecursiveNode<T> = [string, Property[], T[]];
+    interface TreeNode extends __RecursiveNode<Node> {}
+    type Node = TreeNode | string;
+    type AST = Node[];
 
-export type PostProcessor =
-    | ((ast: AST) => AST)
-    | ((ast: AST, callback: (err: any, value: AST) => void) => void);
+    type PostProcessor =
+        | ((ast: AST) => AST)
+        | ((ast: AST, callback: (err: any, value: AST) => void) => void);
 
-export interface Options {
-    spellcheck?: boolean;
+    interface Options {
+        spellcheck?: boolean;
 
-    smartquotes?: boolean;
+        smartquotes?: boolean;
 
-    /**
-     * If false and there is no postprocessors, compiler returns the AST synchronously
-     * Otherwise, a promise is returned
-     *
-     */
-    async?: boolean;
+        /**
+         * If false and there is no postprocessors, compiler returns the AST synchronously
+         * Otherwise, a promise is returned
+         *
+         */
+        async?: boolean;
 
-    /**
-     * compiler plugins
-     * If provided, compiler always compiles asynchronously
-     */
-    postProcessors?: PostProcessor[];
+        /**
+         * compiler plugins
+         * If provided, compiler always compiles asynchronously
+         */
+        postProcessors?: PostProcessor[];
+    }
 }
 
 /**
@@ -48,8 +50,8 @@ export interface Options {
  */
 declare function compiler(
     input: string,
-    options?: Options,
+    options?: compiler.Options,
     callback?: () => void
-): Promise<AST> | AST;
+): Promise<compiler.AST> | compiler.AST;
 
-export default compiler;
+export = compiler;
diff --git a/types/mapbox__sphericalmercator/index.d.ts b/types/mapbox__sphericalmercator/index.d.ts
index 3ed6dfbe9e..bd0a0733ef 100644
--- a/types/mapbox__sphericalmercator/index.d.ts
+++ b/types/mapbox__sphericalmercator/index.d.ts
@@ -19,7 +19,7 @@ type XYPoint = [number, number];
 type BoundingBox = [number, number, number, number];
 type Projection = 'WGS84' | '900913';
 
-export default class SphericalMercator {
+declare class SphericalMercator {
     constructor(options: { size: number })
     px(ll: LatLngPoint, zoom: number): XYPoint;
     ll(px: XYPoint, zoom: number): LatLngPoint;
@@ -29,3 +29,5 @@ export default class SphericalMercator {
     forward(ll: LatLngPoint): XYPoint;
     inverse(xy: XYPoint): LatLngPoint;
 }
+
+export = SphericalMercator;
diff --git a/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts b/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts
index 25caac746f..43e8783843 100644
--- a/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts
+++ b/types/mapbox__sphericalmercator/mapbox__sphericalmercator-tests.ts
@@ -1,4 +1,4 @@
-import SphericalMercator from '@mapbox/sphericalmercator';
+import SphericalMercator = require('@mapbox/sphericalmercator');
 
 const sm = new SphericalMercator({ size: 100 });
 
diff --git a/types/memoize-one/index.d.ts b/types/memoize-one/index.d.ts
index e8ec195875..c4675fabcd 100644
--- a/types/memoize-one/index.d.ts
+++ b/types/memoize-one/index.d.ts
@@ -3,7 +3,9 @@
 // Definitions by: Karol Majewski <https://github.com/karol-majewski>, Frank Li <https://github.com/franklixuefei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function memoizeOne<T extends (...args: any[]) => any>(resultFn: T, isEqual?: EqualityFn): T;
-export type EqualityFn = (a: any, b: any, index: number) => boolean;
+declare function memoizeOne<T extends (...args: any[]) => any>(resultFn: T, isEqual?: memoizeOne.EqualityFn): T;
+declare namespace memoizeOne {
+    type EqualityFn = (a: any, b: any, index: number) => boolean;
+}
 
-export default memoizeOne;
+export = memoizeOne;
diff --git a/types/memoize-one/memoize-one-tests.ts b/types/memoize-one/memoize-one-tests.ts
index a9c565b500..3479fa0599 100644
--- a/types/memoize-one/memoize-one-tests.ts
+++ b/types/memoize-one/memoize-one-tests.ts
@@ -1,4 +1,4 @@
-import memoizeOne, { EqualityFn } from 'memoize-one';
+import memoizeOne = require('memoize-one');
 
 declare function add(a: number, b: number): number ;
 declare function lousyEqualityFn(a: any, b: any): boolean;
@@ -32,4 +32,4 @@ memoizeOne(add, (a: string, b: string) => 0); // $ExpectError
 /**
  * The `EqualityFn` type is publicly accessible.
  */
-const simpleIsEqual: EqualityFn = (x: number, y: number): boolean => (x === y);
+const simpleIsEqual: memoizeOne.EqualityFn = (x: number, y: number): boolean => (x === y);
diff --git a/types/ml-levenberg-marquardt/index.d.ts b/types/ml-levenberg-marquardt/index.d.ts
index fd2f0d1038..effd1ee9ad 100644
--- a/types/ml-levenberg-marquardt/index.d.ts
+++ b/types/ml-levenberg-marquardt/index.d.ts
@@ -73,4 +73,4 @@ declare namespace LM {
 /** Implementation of the Levenberg-Marquardt curve fitting method. */
 declare function LM(d: LM.Data, fn: LM.FittedFunction, o?: Partial<LM.Options>): LM.Result;
 
-export default LM;
+export = LM;
diff --git a/types/ml-levenberg-marquardt/ml-levenberg-marquardt-tests.ts b/types/ml-levenberg-marquardt/ml-levenberg-marquardt-tests.ts
index 514af7f901..f447670812 100644
--- a/types/ml-levenberg-marquardt/ml-levenberg-marquardt-tests.ts
+++ b/types/ml-levenberg-marquardt/ml-levenberg-marquardt-tests.ts
@@ -1,4 +1,4 @@
-import LM from 'ml-levenberg-marquardt';
+import LM = require('ml-levenberg-marquardt');
 
 function sinFunction([a, b]: number[]) {
   return (t: number) => a * Math.sin(b * t);
diff --git a/types/native-toast/index.d.ts b/types/native-toast/index.d.ts
index 1b9e532255..4e9ffdac74 100644
--- a/types/native-toast/index.d.ts
+++ b/types/native-toast/index.d.ts
@@ -4,31 +4,33 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare const toast: {
-    (options: ToastOptions): Toast,
-    success: (options: ToastOptions) => Toast,
-    warning: (options: ToastOptions) => Toast,
-    info: (options: ToastOptions) => Toast,
-    error: (options: ToastOptions) => Toast,
+    (options: toast.ToastOptions): toast.Toast,
+    success: (options: toast.ToastOptions) => toast.Toast,
+    warning: (options: toast.ToastOptions) => toast.Toast,
+    info: (options: toast.ToastOptions) => toast.Toast,
+    error: (options: toast.ToastOptions) => toast.Toast,
 };
 
-export default toast;
+export = toast;
 
-export interface ToastOptions {
-    message?: string;
-    position?: "center" | "west" | "east" | "south" | "south-west" | "south-east" | "north" | "north-west" | "north-east";
-    timeout?: number;
-    el?: HTMLElement;
-    rounded?: boolean;
-    type?: "success" | "warning" | "info" | "error";
-    debug?: boolean;
-    edge?: boolean;
-    icon?: boolean;
-    closeOnClick?: boolean;
-    elements?: HTMLElement[];
-}
+declare namespace toast {
+    interface ToastOptions {
+        message?: string;
+        position?: "center" | "west" | "east" | "south" | "south-west" | "south-east" | "north" | "north-west" | "north-east";
+        timeout?: number;
+        el?: HTMLElement;
+        rounded?: boolean;
+        type?: "success" | "warning" | "info" | "error";
+        debug?: boolean;
+        edge?: boolean;
+        icon?: boolean;
+        closeOnClick?: boolean;
+        elements?: HTMLElement[];
+    }
 
-export interface Toast {
-    show(): void;
-    hide(): void;
-    destroy(): void;
+    interface Toast {
+        show(): void;
+        hide(): void;
+        destroy(): void;
+    }
 }
diff --git a/types/native-toast/native-toast-tests.ts b/types/native-toast/native-toast-tests.ts
index 73d6890549..3f634c66ed 100644
--- a/types/native-toast/native-toast-tests.ts
+++ b/types/native-toast/native-toast-tests.ts
@@ -1,6 +1,6 @@
-import toast, { Toast, ToastOptions } from "native-toast";
+import toast = require("native-toast");
 
-let t: Toast;
+let t: toast.Toast;
 
 t = toast({
   message: "Team created",
@@ -12,7 +12,7 @@ t = toast({
 t.hide();
 t.show();
 
-const o: ToastOptions = {
+const o: toast.ToastOptions = {
   message: "test",
   position: "west"
 };
diff --git a/types/palx/index.d.ts b/types/palx/index.d.ts
index 0f4804b48f..46f2bb5e55 100644
--- a/types/palx/index.d.ts
+++ b/types/palx/index.d.ts
@@ -3,23 +3,25 @@
 // Definitions by: Mike Fowler <https://github.com/mikefowler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function palx(hex: string, options?: {}): PalxPalette;
-
-export interface PalxPalette {
-    [name: string]: string | string[];
-    base: string;
-    black: string;
-    blue: string[];
-    cyan: string[];
-    fuschia: string[];
-    gray: string[];
-    green: string[];
-    indigo: string[];
-    lime: string[];
-    orange: string[];
-    pink: string[];
-    red: string[];
-    teal: string[];
-    violet: string[];
-    yellow: string[];
+export = palx;
+declare function palx(hex: string, options?: {}): palx.PalxPalette;
+declare namespace palx {
+    interface PalxPalette {
+        [name: string]: string | string[];
+        base: string;
+        black: string;
+        blue: string[];
+        cyan: string[];
+        fuschia: string[];
+        gray: string[];
+        green: string[];
+        indigo: string[];
+        lime: string[];
+        orange: string[];
+        pink: string[];
+        red: string[];
+        teal: string[];
+        violet: string[];
+        yellow: string[];
+    }
 }
diff --git a/types/palx/palx-tests.ts b/types/palx/palx-tests.ts
index eec99070d1..be054b2078 100644
--- a/types/palx/palx-tests.ts
+++ b/types/palx/palx-tests.ts
@@ -1,3 +1,3 @@
-import * as palx from 'palx';
+import palx = require('palx');
 
-palx.default('#b4da55'); // $ExpectType PalxPalette
+palx('#b4da55'); // $ExpectType PalxPalette
diff --git a/types/parse-ms/index.d.ts b/types/parse-ms/index.d.ts
index 1a8a63d4a2..62087873d4 100644
--- a/types/parse-ms/index.d.ts
+++ b/types/parse-ms/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Giles Roadnight <https://github.com/Roaders>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export default function parseMs(ms: number): {
+export = parseMs;
+declare function parseMs(ms: number): {
     days: number;
     hours: number;
     minutes: number;
diff --git a/types/parse-ms/parse-ms-tests.ts b/types/parse-ms/parse-ms-tests.ts
index 2b747ad5a8..dbb4640518 100644
--- a/types/parse-ms/parse-ms-tests.ts
+++ b/types/parse-ms/parse-ms-tests.ts
@@ -1,3 +1,3 @@
-import parseMs from "parse-ms";
+import parseMs = require("parse-ms");
 
 const { days, hours, milliseconds, minutes, seconds } = parseMs(3000);
diff --git a/types/parse5-html-rewriting-stream/index.d.ts b/types/parse5-html-rewriting-stream/index.d.ts
index cb905c3162..4722f7d096 100644
--- a/types/parse5-html-rewriting-stream/index.d.ts
+++ b/types/parse5-html-rewriting-stream/index.d.ts
@@ -14,7 +14,7 @@ import * as stream from 'stream';
  * not affected by parser error-recovery mechanisms as in the classical
  * parsing-serialization roundtrip.
  */
-export default class RewritingStream extends stream.Transform {
+declare class RewritingStream extends stream.Transform {
     on(event: string, listener: (...args: any[]) => void): this;
 
     /**
@@ -78,3 +78,4 @@ export default class RewritingStream extends stream.Transform {
      */
     emitRaw(html: string): void;
 }
+export = RewritingStream;
diff --git a/types/parse5-html-rewriting-stream/parse5-html-rewriting-stream-tests.ts b/types/parse5-html-rewriting-stream/parse5-html-rewriting-stream-tests.ts
index f134e4807b..25e0a4aec6 100644
--- a/types/parse5-html-rewriting-stream/parse5-html-rewriting-stream-tests.ts
+++ b/types/parse5-html-rewriting-stream/parse5-html-rewriting-stream-tests.ts
@@ -1,4 +1,4 @@
-import RewritingStream from 'parse5-html-rewriting-stream';
+import RewritingStream = require('parse5-html-rewriting-stream');
 
 const rewritingStream = new RewritingStream();
 rewritingStream.on('startTag', (startTag, rawHtml) => {
diff --git a/types/powerbi-visuals-tools/index.d.ts b/types/powerbi-visuals-tools/index.d.ts
index 0b7fcf2192..7d137c6605 100644
--- a/types/powerbi-visuals-tools/index.d.ts
+++ b/types/powerbi-visuals-tools/index.d.ts
@@ -1342,5 +1342,5 @@ declare namespace powerbi.extensibility.visual {
         host: IVisualHost;
     }
 }
-
-export default powerbi;
+// tslint:disable-next-line:export-just-namespace
+export = powerbi;
diff --git a/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts b/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
index d6bce0acea..8a40786d34 100644
--- a/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
+++ b/types/powerbi-visuals-tools/powerbi-visuals-tools-tests.ts
@@ -1,4 +1,4 @@
-import powerbi from './index';
+import powerbi = require('./index');
 
 import IVisualPlugin = powerbi.visuals.plugins.IVisualPlugin;
 import IVisual = powerbi.extensibility.visual.IVisual;
diff --git a/types/promise-polyfill/index.d.ts b/types/promise-polyfill/index.d.ts
index 5708cd05c4..e6f11521dd 100644
--- a/types/promise-polyfill/index.d.ts
+++ b/types/promise-polyfill/index.d.ts
@@ -4,10 +4,12 @@
 //                 Daniel Cassidy <https://github.com/djcsdy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface PromisePolyfillConstructor extends PromiseConstructor {
-    _immediateFn?: (handler: (() => void) | string) => void;
+declare namespace Promise {
+    interface PromisePolyfillConstructor extends PromiseConstructor {
+        _immediateFn?: (handler: (() => void) | string) => void;
+    }
 }
 
-declare const Promise: PromisePolyfillConstructor;
+declare const Promise: Promise.PromisePolyfillConstructor;
 
-export default Promise;
+export = Promise;
diff --git a/types/promise-polyfill/promise-polyfill-tests.ts b/types/promise-polyfill/promise-polyfill-tests.ts
index cfdd803126..ff21a0714c 100644
--- a/types/promise-polyfill/promise-polyfill-tests.ts
+++ b/types/promise-polyfill/promise-polyfill-tests.ts
@@ -1,4 +1,4 @@
-import Promise from "promise-polyfill";
+import Promise = require("promise-polyfill");
 
 const prom1 = new Promise<number>((resolve, reject) => {
 	resolve(12);
diff --git a/types/promised-temp/index.d.ts b/types/promised-temp/index.d.ts
index e7dc2556b7..8269c12949 100644
--- a/types/promised-temp/index.d.ts
+++ b/types/promised-temp/index.d.ts
@@ -6,8 +6,9 @@
 /// <reference types="node" />
 
 import * as fs from 'fs';
-import { AffixOptions, OpenFile, Stats } from "temp";
-export { AffixOptions, OpenFile, Stats } from "temp";
+import { AffixOptions, AffixOptions as _A,
+         OpenFile, OpenFile as _O,
+         Stats, Stats as _S } from "temp";
 
 interface TempStatic {
     dir: string;
@@ -19,6 +20,11 @@ interface TempStatic {
     cleanup(): Promise<boolean | Stats>;
     createWriteStream(affixes?: string | AffixOptions): Promise<fs.WriteStream>;
 }
+declare namespace PromisedTemp {
+    type AffixOptions = _A;
+    type OpenFile = _O;
+    type Stats = _S;
+}
 
 declare var PromisedTemp: TempStatic;
-export default PromisedTemp;
+export = PromisedTemp;
diff --git a/types/promised-temp/promised-temp-tests.ts b/types/promised-temp/promised-temp-tests.ts
index 24f0b73fa2..9bf7ca6fa0 100644
--- a/types/promised-temp/promised-temp-tests.ts
+++ b/types/promised-temp/promised-temp-tests.ts
@@ -1,8 +1,8 @@
 import * as fs from "fs";
-import temp, { AffixOptions, OpenFile, Stats } from "promised-temp";
+import temp = require("promised-temp");
 
 function testCleanup() {
-    temp.cleanup().then((result: boolean | Stats) => {
+    temp.cleanup().then((result: boolean | temp.Stats) => {
         if (typeof result === "boolean") {
             const x = result;
         } else {
@@ -13,13 +13,13 @@ function testCleanup() {
 }
 
 function testOpen() {
-    temp.open({ dir: "tempDir", prefix: "pref", suffix: "suff" }).then((result: OpenFile) => {
+    temp.open({ dir: "tempDir", prefix: "pref", suffix: "suff" }).then((result: temp.OpenFile) => {
         const { path, fd } = result;
         path.length;
         fd.toPrecision(5);
     });
 
-    temp.open("strPrefix").then((result: OpenFile) => {
+    temp.open("strPrefix").then((result: temp.OpenFile) => {
         const { path, fd } = result;
         path.length;
         fd.toPrecision(5);
diff --git a/types/prosemirror-test-builder/index.d.ts b/types/prosemirror-test-builder/index.d.ts
index f6c01420c4..246f674035 100644
--- a/types/prosemirror-test-builder/index.d.ts
+++ b/types/prosemirror-test-builder/index.d.ts
@@ -6,23 +6,6 @@
 
 import { Node as ProsemirrorNode, Schema } from 'prosemirror-model';
 
-export interface NodeTypeAttributes extends Record<string, any> {
-    nodeType: string;
-}
-
-export interface MarkTypeAttributes extends Record<string, any> {
-    markType: string;
-}
-
-export interface TaggedFlatObject<S extends Schema = any> {
-    tag: Record<string, number>;
-    flat: Array<TaggedProsemirrorNode<S> | TaggedFlatObject<S>>;
-}
-
-export interface TaggedProsemirrorNode<S extends Schema = any>
-    extends TaggedFlatObject<S>,
-        ProsemirrorNode {}
-
 type TestNodesUnion =
     | 'p'
     | 'pre'
@@ -49,78 +32,97 @@ type TestNodesUnion =
     | 'hard_break';
 type TestMarksUnion = 'a' | 'link' | 'em' | 'strong' | 'code';
 
-export type TestSchema = Schema<TestNodesUnion, TestMarksUnion>;
-
-type Args = Array<string | TaggedProsemirrorNode | TaggedFlatObject>;
+type Args = Array<string | prosemirrorTestBuilder.TaggedProsemirrorNode | prosemirrorTestBuilder.TaggedFlatObject>;
 
 type NodeBuilderMethod<S extends Schema = any> = (
     ...args: Args
-) => TaggedProsemirrorNode<S>;
+) => prosemirrorTestBuilder.TaggedProsemirrorNode<S>;
 
 type MarkBuilderMethod<S extends Schema = any> = (
     ...args: Args
-) => TaggedFlatObject<S>;
+) => prosemirrorTestBuilder.TaggedFlatObject<S>;
 
-export interface EqMethod {
-    eq(param: EqMethod): boolean;
-}
+declare namespace prosemirrorTestBuilder {
+    interface NodeTypeAttributes extends Record<string, any> {
+        nodeType: string;
+    }
 
-export type Builder = <
-    Obj extends Record<
+    interface MarkTypeAttributes extends Record<string, any> {
+        markType: string;
+    }
+
+    interface TaggedFlatObject<S extends Schema = any> {
+        tag: Record<string, number>;
+        flat: Array<TaggedProsemirrorNode<S> | TaggedFlatObject<S>>;
+    }
+
+    interface TaggedProsemirrorNode<S extends Schema = any>
+        extends TaggedFlatObject<S>,
+    ProsemirrorNode {}
+
+    type TestSchema = Schema<TestNodesUnion, TestMarksUnion>;
+
+    interface EqMethod {
+        eq(param: EqMethod): boolean;
+    }
+
+    type Builder = <
+        Obj extends Record<
         string,
-        NodeTypeAttributes | MarkTypeAttributes
-    > = Record<string, NodeTypeAttributes | MarkTypeAttributes>,
+    NodeTypeAttributes | MarkTypeAttributes
+        > = Record<string, NodeTypeAttributes | MarkTypeAttributes>,
     N extends string = string,
     M extends string = string
->(
-    testSchema: Schema<N, M>,
-    names: Obj,
-) => Record<N, NodeBuilderMethod<Schema<N, M>>> &
-    Record<M, MarkBuilderMethod<Schema<N, M>>> &
-    {
-        [P in keyof Obj]: Obj[P] extends NodeTypeAttributes
-            ? NodeBuilderMethod<Schema<N, M>>
-            : MarkBuilderMethod<Schema<N, M>>
-    };
+        >(
+            testSchema: Schema<N, M>,
+            names: Obj,
+        ) => Record<N, NodeBuilderMethod<Schema<N, M>>> &
+        Record<M, MarkBuilderMethod<Schema<N, M>>> &
+        {
+            [P in keyof Obj]: Obj[P] extends NodeTypeAttributes
+                ? NodeBuilderMethod<Schema<N, M>>
+                : MarkBuilderMethod<Schema<N, M>>
+        };
 
-export interface ProsemirrorTestBuilder {
-    schema: TestSchema;
-    builders: Builder;
-    eq(a: EqMethod, b: EqMethod): boolean;
-    p: NodeBuilderMethod<TestSchema>;
-    pre: NodeBuilderMethod<TestSchema>;
-    h1: NodeBuilderMethod<TestSchema>;
-    h2: NodeBuilderMethod<TestSchema>;
-    h3: NodeBuilderMethod<TestSchema>;
-    li: NodeBuilderMethod<TestSchema>;
-    ul: NodeBuilderMethod<TestSchema>;
-    ol: NodeBuilderMethod<TestSchema>;
-    br: NodeBuilderMethod<TestSchema>;
-    img: NodeBuilderMethod<TestSchema>;
-    hr: NodeBuilderMethod<TestSchema>;
-    a: MarkBuilderMethod<TestSchema>;
+    interface ProsemirrorTestBuilder {
+        schema: TestSchema;
+        builders: Builder;
+        eq(a: EqMethod, b: EqMethod): boolean;
+        p: NodeBuilderMethod<TestSchema>;
+        pre: NodeBuilderMethod<TestSchema>;
+        h1: NodeBuilderMethod<TestSchema>;
+        h2: NodeBuilderMethod<TestSchema>;
+        h3: NodeBuilderMethod<TestSchema>;
+        li: NodeBuilderMethod<TestSchema>;
+        ul: NodeBuilderMethod<TestSchema>;
+        ol: NodeBuilderMethod<TestSchema>;
+        br: NodeBuilderMethod<TestSchema>;
+        img: NodeBuilderMethod<TestSchema>;
+        hr: NodeBuilderMethod<TestSchema>;
+        a: MarkBuilderMethod<TestSchema>;
 
-    // From schema list
-    ordered_list: NodeBuilderMethod<TestSchema>;
-    bullet_list: NodeBuilderMethod<TestSchema>;
-    list_item: NodeBuilderMethod<TestSchema>;
-    doc: NodeBuilderMethod<TestSchema>;
+        // From schema list
+        ordered_list: NodeBuilderMethod<TestSchema>;
+        bullet_list: NodeBuilderMethod<TestSchema>;
+        list_item: NodeBuilderMethod<TestSchema>;
+        doc: NodeBuilderMethod<TestSchema>;
 
-    // From schema basic
-    paragraph: NodeBuilderMethod<TestSchema>;
-    blockquote: NodeBuilderMethod<TestSchema>;
-    horizontal_rule: NodeBuilderMethod<TestSchema>;
-    heading: NodeBuilderMethod<TestSchema>;
-    code_block: NodeBuilderMethod<TestSchema>;
-    text: NodeBuilderMethod<TestSchema>;
-    image: NodeBuilderMethod<TestSchema>;
-    hard_break: NodeBuilderMethod<TestSchema>;
-    link: MarkBuilderMethod<TestSchema>;
-    em: MarkBuilderMethod<TestSchema>;
-    strong: MarkBuilderMethod<TestSchema>;
-    code: MarkBuilderMethod<TestSchema>;
+        // From schema basic
+        paragraph: NodeBuilderMethod<TestSchema>;
+        blockquote: NodeBuilderMethod<TestSchema>;
+        horizontal_rule: NodeBuilderMethod<TestSchema>;
+        heading: NodeBuilderMethod<TestSchema>;
+        code_block: NodeBuilderMethod<TestSchema>;
+        text: NodeBuilderMethod<TestSchema>;
+        image: NodeBuilderMethod<TestSchema>;
+        hard_break: NodeBuilderMethod<TestSchema>;
+        link: MarkBuilderMethod<TestSchema>;
+        em: MarkBuilderMethod<TestSchema>;
+        strong: MarkBuilderMethod<TestSchema>;
+        code: MarkBuilderMethod<TestSchema>;
+    }
 }
 
-declare const prosemirrorTestBuilder: ProsemirrorTestBuilder;
+declare const prosemirrorTestBuilder: prosemirrorTestBuilder.ProsemirrorTestBuilder;
 
-export default prosemirrorTestBuilder;
+export = prosemirrorTestBuilder;
diff --git a/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts b/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts
index dd5aa0c345..8257e51748 100644
--- a/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts
+++ b/types/prosemirror-test-builder/prosemirror-test-builder-tests.ts
@@ -6,7 +6,7 @@ import {
     TextSelection,
     Transaction,
 } from 'prosemirror-state';
-import pm, { TaggedProsemirrorNode } from 'prosemirror-test-builder';
+import pm = require('prosemirror-test-builder');
 
 export type DispatchFunction = (tr: Transaction) => void;
 export type CommandFunction = (
@@ -14,7 +14,7 @@ export type CommandFunction = (
     dispatch?: DispatchFunction,
 ) => boolean;
 
-function selectionFor(docNode: TaggedProsemirrorNode) {
+function selectionFor(docNode: pm.TaggedProsemirrorNode) {
     const aTag = docNode.tag.a;
     if (aTag != null) {
         const $aTag = docNode.resolve(aTag);
@@ -32,20 +32,20 @@ function selectionFor(docNode: TaggedProsemirrorNode) {
     return Selection.atStart(docNode);
 }
 
-function createState(d: TaggedProsemirrorNode) {
+function createState(d: pm.TaggedProsemirrorNode) {
     return EditorState.create({ doc: d, selection: selectionFor(d) });
 }
 
 export function apply(
-    docNode: TaggedProsemirrorNode,
+    docNode: pm.TaggedProsemirrorNode,
     command: CommandFunction,
-    result?: TaggedProsemirrorNode,
-): [boolean, TaggedProsemirrorNode] {
+    result?: pm.TaggedProsemirrorNode,
+): [boolean, pm.TaggedProsemirrorNode] {
     let state = createState(docNode);
     command(state, tr => (state = state.apply(tr)));
 
     if (!pm.eq(state.doc, result || docNode)) {
-        return [false, state.doc as TaggedProsemirrorNode];
+        return [false, state.doc as pm.TaggedProsemirrorNode];
     }
 
     if (result && result.tag.a != null) {
@@ -54,7 +54,7 @@ export function apply(
             result || docNode,
         ];
     }
-    return [true, state.doc as TaggedProsemirrorNode];
+    return [true, state.doc as pm.TaggedProsemirrorNode];
 }
 
 const { p, doc, builders } = pm;
diff --git a/types/protractor-browser-logs/index.d.ts b/types/protractor-browser-logs/index.d.ts
index a75b3eb0ec..354579df4e 100644
--- a/types/protractor-browser-logs/index.d.ts
+++ b/types/protractor-browser-logs/index.d.ts
@@ -8,26 +8,29 @@ import * as webdriver from 'selenium-webdriver';
 import Entry = webdriver.logging.Entry;
 import { ProtractorBrowser } from 'protractor/built';
 
-export interface BrowserLogOptions {
-    reporters?: Array<(entries: Entry[]) => void>;
+declare namespace browserLogs {
+    interface BrowserLogOptions {
+        reporters?: Array<(entries: Entry[]) => void>;
+    }
+
+    type matchPredicateFunction = (entry: Entry) => boolean;
+    type matchPredicate = string | RegExp | matchPredicateFunction;
+    interface BrowserLogs {
+        ERROR: matchPredicateFunction;
+        WARNING: matchPredicateFunction;
+        DEBUG: matchPredicateFunction;
+        INFO: matchPredicateFunction;
+        LOG: matchPredicateFunction;
+
+        or(a: matchPredicateFunction, b: matchPredicateFunction): matchPredicateFunction;
+        and(a: matchPredicateFunction, b: matchPredicateFunction): matchPredicateFunction;
+        reset(): void;
+        logs(): Entry[];
+        verify(): void;
+        ignore(... matches: matchPredicate[]): matchPredicateFunction[];
+        expect(... matches: matchPredicate[]): matchPredicateFunction[];
+    }
 }
 
-export type matchPredicateFunction = (entry: Entry) => boolean;
-export type matchPredicate = string | RegExp | matchPredicateFunction;
-export interface BrowserLogs {
-    ERROR: matchPredicateFunction;
-    WARNING: matchPredicateFunction;
-    DEBUG: matchPredicateFunction;
-    INFO: matchPredicateFunction;
-    LOG: matchPredicateFunction;
-
-    or(a: matchPredicateFunction, b: matchPredicateFunction): matchPredicateFunction;
-    and(a: matchPredicateFunction, b: matchPredicateFunction): matchPredicateFunction;
-    reset(): void;
-    logs(): Entry[];
-    verify(): void;
-    ignore(... matches: matchPredicate[]): matchPredicateFunction[];
-    expect(... matches: matchPredicate[]): matchPredicateFunction[];
-}
-
-export default function browserLogs(browser: ProtractorBrowser, options?: BrowserLogOptions): BrowserLogs;
+export = browserLogs;
+declare function browserLogs(browser: ProtractorBrowser, options?: browserLogs.BrowserLogOptions): browserLogs.BrowserLogs;
diff --git a/types/protractor-browser-logs/protractor-browser-logs-tests.ts b/types/protractor-browser-logs/protractor-browser-logs-tests.ts
index 82da49b580..12a255a5a4 100644
--- a/types/protractor-browser-logs/protractor-browser-logs-tests.ts
+++ b/types/protractor-browser-logs/protractor-browser-logs-tests.ts
@@ -1,5 +1,5 @@
 import { browser } from 'protractor/built';
-import browserLogs from 'protractor-browser-logs';
+import browserLogs = require('protractor-browser-logs');
 import * as webdriver from 'selenium-webdriver';
 import Entry = webdriver.logging.Entry;
 
diff --git a/types/reconnectingwebsocket/index.d.ts b/types/reconnectingwebsocket/index.d.ts
index c07dec7474..e05052c24f 100644
--- a/types/reconnectingwebsocket/index.d.ts
+++ b/types/reconnectingwebsocket/index.d.ts
@@ -3,19 +3,21 @@
 // Definitions by: Nicholas Guarracino <https://github.com/nguarracino>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface Options {
-    automaticOpen?: boolean;
-    binaryType?: 'blob' | 'arraybuffer';
-    debug?: boolean;
-    maxReconnectAttempts?: number | null;
-    maxReconnectInterval?: number;
-    reconnectDecay?: number;
-    reconnectInterval?: number;
-    timeoutInterval?: number;
+declare namespace ReconnectingWebSocket {
+    interface Options {
+        automaticOpen?: boolean;
+        binaryType?: 'blob' | 'arraybuffer';
+        debug?: boolean;
+        maxReconnectAttempts?: number | null;
+        maxReconnectInterval?: number;
+        reconnectDecay?: number;
+        reconnectInterval?: number;
+        timeoutInterval?: number;
+    }
 }
 
-export default class ReconnectingWebSocket {
-    constructor(url: string, protocols?: string[], options?: Options);
+declare class ReconnectingWebSocket {
+    constructor(url: string, protocols?: string[], options?: ReconnectingWebSocket.Options);
 
     static debugAll: boolean;
 
@@ -41,3 +43,4 @@ export default class ReconnectingWebSocket {
     reconnectAttempts: number;
     url: string;
 }
+export = ReconnectingWebSocket;
diff --git a/types/reconnectingwebsocket/reconnectingwebsocket-tests.ts b/types/reconnectingwebsocket/reconnectingwebsocket-tests.ts
index 300055a062..b3572a4ae5 100644
--- a/types/reconnectingwebsocket/reconnectingwebsocket-tests.ts
+++ b/types/reconnectingwebsocket/reconnectingwebsocket-tests.ts
@@ -1,6 +1,6 @@
-import ReconnectingWebSocket, { Options } from "reconnectingwebsocket";
+import ReconnectingWebSocket = require("reconnectingwebsocket");
 
-const options: Options = {
+const options: ReconnectingWebSocket.Options = {
     automaticOpen: false,
     binaryType: "blob",
     debug: false,
diff --git a/types/recorder-js/index.d.ts b/types/recorder-js/index.d.ts
index 6cc672492c..7bc03e65e9 100644
--- a/types/recorder-js/index.d.ts
+++ b/types/recorder-js/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export default Recorder;
+export = Recorder;
 
 declare class Recorder {
     constructor(audioContext: AudioContext, config?: Recorder.RecorderConfig);
diff --git a/types/recorder-js/recorder-js-tests.ts b/types/recorder-js/recorder-js-tests.ts
index 2dee4a08ab..d7374f787c 100644
--- a/types/recorder-js/recorder-js-tests.ts
+++ b/types/recorder-js/recorder-js-tests.ts
@@ -1,7 +1,7 @@
 // The following code comes from:
 // https://www.npmjs.com/package/recorder-js#usage
 
-import Recorder from 'recorder-js';
+import Recorder = require('recorder-js');
 
 const audioContext = new AudioContext();
 let isRecording = false;
diff --git a/types/redux-sentry-middleware/index.d.ts b/types/redux-sentry-middleware/index.d.ts
index 5713391dd3..5b57ae5bbb 100644
--- a/types/redux-sentry-middleware/index.d.ts
+++ b/types/redux-sentry-middleware/index.d.ts
@@ -7,15 +7,18 @@
 import { Action, Middleware } from "redux";
 import * as Sentry from "@sentry/browser";
 
-export interface SentryMiddlewareOptions<T> {
-    breadcrumbDataFromAction?: (action: Action) => any;
-    actionTransformer?: (action: Action) => Action;
-    stateTransformer?: (state: T) => T;
-    breadcrumbCategory?: string;
-    filterBreadcrumbActions?: (action: Action) => boolean;
-    getUserContext?: (state: T) => Sentry.User;
-    getTags?: (state: T) => Sentry.SentryEvent['tags'];
+declare namespace createSentryMiddleware {
+    interface Options<T> {
+        breadcrumbDataFromAction?: (action: Action) => any;
+        actionTransformer?: (action: Action) => Action;
+        stateTransformer?: (state: T) => T;
+        breadcrumbCategory?: string;
+        filterBreadcrumbActions?: (action: Action) => boolean;
+        getUserContext?: (state: T) => Sentry.User;
+        getTags?: (state: T) => Sentry.SentryEvent['tags'];
+    }
 }
 
 // tslint:disable-next-line: no-unnecessary-generics
-export default function createSentryMiddleware<T>(sentry: typeof Sentry, options?: SentryMiddlewareOptions<T>): Middleware;
+declare function createSentryMiddleware<T>(sentry: typeof Sentry, options?: createSentryMiddleware.Options<T>): Middleware;
+export = createSentryMiddleware;
diff --git a/types/redux-sentry-middleware/redux-sentry-middleware-tests.ts b/types/redux-sentry-middleware/redux-sentry-middleware-tests.ts
index b72fb01b7f..f888029467 100644
--- a/types/redux-sentry-middleware/redux-sentry-middleware-tests.ts
+++ b/types/redux-sentry-middleware/redux-sentry-middleware-tests.ts
@@ -1,5 +1,5 @@
 import * as Sentry from "@sentry/browser";
-import createSentryMiddleware from "redux-sentry-middleware";
+import createSentryMiddleware = require("redux-sentry-middleware");
 import { applyMiddleware, createStore } from "redux";
 
 const middleware = createSentryMiddleware(Sentry);
diff --git a/types/redux-storage-engine-jsurl/index.d.ts b/types/redux-storage-engine-jsurl/index.d.ts
index c5c0dbe4c5..f3b4254e07 100644
--- a/types/redux-storage-engine-jsurl/index.d.ts
+++ b/types/redux-storage-engine-jsurl/index.d.ts
@@ -5,4 +5,5 @@
 
 import { StorageEngine } from 'redux-storage';
 
-export default function createEngine(): StorageEngine;
+export = createEngine;
+declare function createEngine(): StorageEngine;
diff --git a/types/redux-storage-engine-jsurl/redux-storage-engine-jsurl-tests.ts b/types/redux-storage-engine-jsurl/redux-storage-engine-jsurl-tests.ts
index 6bddc3518d..3e23a4e73e 100644
--- a/types/redux-storage-engine-jsurl/redux-storage-engine-jsurl-tests.ts
+++ b/types/redux-storage-engine-jsurl/redux-storage-engine-jsurl-tests.ts
@@ -1,5 +1,5 @@
 import { createLoader } from "redux-storage";
-import createUrlEngine from "redux-storage-engine-jsurl";
+import createUrlEngine = require("redux-storage-engine-jsurl");
 
 const urlStorageEngine = createUrlEngine();
 
diff --git a/types/rollup-plugin-buble/index.d.ts b/types/rollup-plugin-buble/index.d.ts
index d6e3414346..ea108ae618 100644
--- a/types/rollup-plugin-buble/index.d.ts
+++ b/types/rollup-plugin-buble/index.d.ts
@@ -9,10 +9,13 @@
 import { Plugin } from 'rollup';
 import { TransformOptions } from 'buble';
 
-export interface Options extends TransformOptions {
-    // Every files will be parsed by default, but you can specify which files to include or exclude
-    include?: Array<string | RegExp> | string | RegExp | null;
-    exclude?: Array<string | RegExp> | string | RegExp | null;
+declare namespace buble {
+    interface Options extends TransformOptions {
+        // Every files will be parsed by default, but you can specify which files to include or exclude
+        include?: Array<string | RegExp> | string | RegExp | null;
+        exclude?: Array<string | RegExp> | string | RegExp | null;
+    }
 }
 
-export default function buble(options?: Options): Plugin;
+export = buble;
+declare function buble(options?: buble.Options): Plugin;
diff --git a/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts b/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts
index d020539f8b..faf6597e51 100644
--- a/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts
+++ b/types/rollup-plugin-buble/rollup-plugin-buble-tests.ts
@@ -1,4 +1,4 @@
-import buble from 'rollup-plugin-buble';
+import buble = require('rollup-plugin-buble');
 
 // No options (default)
 (() => {
diff --git a/types/rollup-plugin-node-builtins/index.d.ts b/types/rollup-plugin-node-builtins/index.d.ts
index e839485ac9..936a276b02 100644
--- a/types/rollup-plugin-node-builtins/index.d.ts
+++ b/types/rollup-plugin-node-builtins/index.d.ts
@@ -8,9 +8,12 @@
 
 import { Plugin } from 'rollup';
 
-export interface Options {
-    crypto?: boolean;
-    fs?: boolean;
+declare namespace builtins {
+    interface Options {
+        crypto?: boolean;
+        fs?: boolean;
+    }
 }
 
-export default function builtins(options?: Options): Plugin;
+export = builtins;
+declare function builtins(options?: builtins.Options): Plugin;
diff --git a/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts b/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts
index 53e488cd00..2533cbbae2 100644
--- a/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts
+++ b/types/rollup-plugin-node-builtins/rollup-plugin-node-builtins-tests.ts
@@ -1,4 +1,4 @@
-import builtins from 'rollup-plugin-node-builtins';
+import builtins = require('rollup-plugin-node-builtins');
 
 // No options (default)
 (() => {
diff --git a/types/rollup-plugin-sourcemaps/index.d.ts b/types/rollup-plugin-sourcemaps/index.d.ts
index d477648bb0..8ec039d7ac 100644
--- a/types/rollup-plugin-sourcemaps/index.d.ts
+++ b/types/rollup-plugin-sourcemaps/index.d.ts
@@ -7,13 +7,16 @@
 /// <reference types="node" />
 import { Plugin } from 'rollup';
 
-export type ReadFileCallback = (err: NodeJS.ErrnoException, data: string) => void;
-export type ReadFileFunction = (file: string | Buffer | number, encoding: string, callback: ReadFileCallback) => void;
+declare namespace sourcemaps {
+    type ReadFileCallback = (err: NodeJS.ErrnoException, data: string) => void;
+    type ReadFileFunction = (file: string | Buffer | number, encoding: string, callback: ReadFileCallback) => void;
 
-export interface Options {
-    include?: Array<string | RegExp> | string | RegExp | null;
-    exclude?: Array<string | RegExp> | string | RegExp | null;
-    readFile?: ReadFileFunction;
+    interface Options {
+        include?: Array<string | RegExp> | string | RegExp | null;
+        exclude?: Array<string | RegExp> | string | RegExp | null;
+        readFile?: ReadFileFunction;
+    }
 }
 
-export default function sourcemaps(options?: Options): Plugin;
+export = sourcemaps;
+declare function sourcemaps(options?: sourcemaps.Options): Plugin;
diff --git a/types/rollup-plugin-sourcemaps/rollup-plugin-sourcemaps-tests.ts b/types/rollup-plugin-sourcemaps/rollup-plugin-sourcemaps-tests.ts
index 2fc5cf75b9..c302baf5d2 100644
--- a/types/rollup-plugin-sourcemaps/rollup-plugin-sourcemaps-tests.ts
+++ b/types/rollup-plugin-sourcemaps/rollup-plugin-sourcemaps-tests.ts
@@ -1,4 +1,4 @@
-import sourcemaps from 'rollup-plugin-sourcemaps';
+import sourcemaps = require('rollup-plugin-sourcemaps');
 import * as fs from 'fs';
 
  // $ExpectType Plugin
diff --git a/types/sqlanywhere/index.d.ts b/types/sqlanywhere/index.d.ts
index 148babd6ec..92a3cce123 100644
--- a/types/sqlanywhere/index.d.ts
+++ b/types/sqlanywhere/index.d.ts
@@ -42,7 +42,3 @@ export interface Statement {
     getMoreResults(): any[];
     drop(cb: (err: Error | undefined) => void): void;
 }
-declare const _default: {
-    createConnection: typeof createConnection;
-};
-export default _default;
diff --git a/types/supercluster/index.d.ts b/types/supercluster/index.d.ts
index 74ef517d7e..2659fdebb9 100644
--- a/types/supercluster/index.d.ts
+++ b/types/supercluster/index.d.ts
@@ -9,79 +9,119 @@ import * as GeoJSON from 'geojson';
 
 export as namespace supercluster;
 
-export interface Options<P, C> {
-    /**
-     * Minimum zoom level at which clusters are generated.
-     *
-     * @default 0
-     */
-    minZoom?: number;
+declare namespace Supercluster {
+    interface Options<P, C> {
+        /**
+         * Minimum zoom level at which clusters are generated.
+         *
+         * @default 0
+         */
+        minZoom?: number;
+
+        /**
+         * Maximum zoom level at which clusters are generated.
+         *
+         * @default 16
+         */
+        maxZoom?: number;
+
+        /**
+         * Cluster radius, in pixels.
+         *
+         * @default 40
+         */
+        radius?: number;
+
+        /**
+         * (Tiles) Tile extent. Radius is calculated relative to this value.
+         *
+         * @default 512
+         */
+        extent?: number;
+
+        /**
+         * Size of the KD-tree leaf node. Affects performance.
+         *
+         * @default 64
+         */
+        nodeSize?: number;
+
+        /**
+         * Whether timing info should be logged.
+         *
+         * @default false
+         */
+        log?: boolean;
+
+        /**
+         * A function that returns cluster properties corresponding to a single point.
+         *
+         * @example
+         * (props) => ({sum: props.myValue})
+         */
+        map?: (props: P) => C;
+
+        /**
+         * A reduce function that merges properties of two clusters into one.
+         *
+         * @example
+         * (accumulated, props) => { accumulated.sum += props.sum; }
+         */
+        reduce?: (accumulated: C, props: Readonly<C>) => void;
+    }
 
     /**
-     * Maximum zoom level at which clusters are generated.
-     *
-     * @default 16
+     * Default properties type, allowing any properties.
+     * Try to avoid this for better typesafety by using proper types.
      */
-    maxZoom?: number;
+    interface AnyProps {
+        [name: string]: any;
+    }
 
     /**
-     * Cluster radius, in pixels.
-     *
-     * @default 40
+     * [GeoJSON Feature](https://tools.ietf.org/html/rfc7946#section-3.2),
+     * with the geometry being a
+     * [GeoJSON Point](https://tools.ietf.org/html/rfc7946#section-3.1.2).
      */
-    radius?: number;
+    type PointFeature<P> = GeoJSON.Feature<GeoJSON.Point, P>;
 
-    /**
-     * (Tiles) Tile extent. Radius is calculated relative to this value.
-     *
-     * @default 512
-     */
-    extent?: number;
+    interface ClusterProperties {
+        /**
+         * Always `true` to indicate that the Feature is a Cluster and not
+         * an individual point.
+         */
+        cluster: true;
+        /** Cluster ID */
+        cluster_id: number;
+        /** Number of points in the cluster. */
+        point_count: number;
+        /**
+         * Abbreviated number of points in the cluster as string if the number
+         * is 1000 or greater (e.g. `1.3k` if the number is 1298).
+         *
+         * For less than 1000 points it is the same value as `point_count`.
+         */
+        point_count_abbreviated: string | number;
+    }
 
-    /**
-     * Size of the KD-tree leaf node. Affects performance.
-     *
-     * @default 64
-     */
-    nodeSize?: number;
+    type ClusterFeature<C> = PointFeature<ClusterProperties & C>;
 
-    /**
-     * Whether timing info should be logged.
-     *
-     * @default false
-     */
-    log?: boolean;
+    interface TileFeature<C, P> {
+        type: 1;
+        geometry: Array<[number, number]>;
+        tags: (ClusterProperties & C) | P;
+    }
 
-    /**
-     * A function that returns cluster properties corresponding to a single point.
-     *
-     * @example
-     * (props) => ({sum: props.myValue})
-     */
-    map?: (props: P) => C;
-
-    /**
-     * A reduce function that merges properties of two clusters into one.
-     *
-     * @example
-     * (accumulated, props) => { accumulated.sum += props.sum; }
-     */
-    reduce?: (accumulated: C, props: Readonly<C>) => void;
-}
-
-/**
- * Default properties type, allowing any properties.
- * Try to avoid this for better typesafety by using proper types.
- */
-export interface AnyProps {
-    [name: string]: any;
+    interface Tile<C, P> {
+        features: Array<TileFeature<C, P>>;
+    }
 }
 
 /**
  * A very fast geospatial point clustering library for browsers and Node.
  */
-export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps, C extends GeoJSON.GeoJsonProperties = AnyProps> {
-    constructor(options?: Options<P, C>);
+declare class Supercluster<P extends GeoJSON.GeoJsonProperties = Supercluster.AnyProps, C extends GeoJSON.GeoJsonProperties = Supercluster.AnyProps> {
+    constructor(options?: Supercluster.Options<P, C>);
 
     /**
      * Loads an array of GeoJSON Feature objects. Each feature's geometry
@@ -89,7 +129,7 @@ export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps
      *
      * @param points Array of GeoJSON Features, the geometries being GeoJSON Points.
      */
-    load(points: Array<PointFeature<P>>): Supercluster<P, C>;
+    load(points: Array<Supercluster.PointFeature<P>>): Supercluster<P, C>;
 
     /**
      * Returns an array of clusters and points as `GeoJSON.Feature` objects
@@ -98,14 +138,14 @@ export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps
      * @param bbox Bounding box (`[westLng, southLat, eastLng, northLat]`).
      * @param zoom Zoom level.
      */
-    getClusters(bbox: GeoJSON.BBox, zoom: number): Array<ClusterFeature<C> | PointFeature<P>>;
+    getClusters(bbox: GeoJSON.BBox, zoom: number): Array<Supercluster.ClusterFeature<C> | Supercluster.PointFeature<P>>;
 
     /**
      * For a given zoom and x/y coordinates, returns a
      * [geojson-vt](https://github.com/mapbox/geojson-vt)-compatible JSON
      * tile object with cluster any point features.
      */
-    getTile(zoom: number, x: number, y: number): Tile<C, P> | null;
+    getTile(zoom: number, x: number, y: number): Supercluster.Tile<C, P> | null;
 
     /**
      * Returns the children of a cluster (on the next zoom level).
@@ -113,7 +153,7 @@ export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps
      * @param clusterId Cluster ID (`cluster_id` value from feature properties).
      * @throws {Error} If `clusterId` does not exist.
      */
-    getChildren(clusterId: number): Array<ClusterFeature<C> | PointFeature<P>>;
+    getChildren(clusterId: number): Array<Supercluster.ClusterFeature<C> | Supercluster.PointFeature<P>>;
 
     /**
      * Returns all the points of a cluster (with pagination support).
@@ -122,7 +162,7 @@ export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps
      * @param limit The number of points to return (set to `Infinity` for all points).
      * @param offset The amount of points to skip (for pagination).
      */
-    getLeaves(clusterId: number, limit?: number, offset?: number): Array<ClusterFeature<C> | PointFeature<P>>; // Cluster[];
+    getLeaves(clusterId: number, limit?: number, offset?: number): Array<Supercluster.ClusterFeature<C> | Supercluster.PointFeature<P>>; // Cluster[];
 
     /**
      * Returns the zoom level on which the cluster expands into several
@@ -132,41 +172,4 @@ export default class Supercluster<P extends GeoJSON.GeoJsonProperties = AnyProps
      */
     getClusterExpansionZoom(clusterId: number): number;
 }
-
-/**
- * [GeoJSON Feature](https://tools.ietf.org/html/rfc7946#section-3.2),
- * with the geometry being a
- * [GeoJSON Point](https://tools.ietf.org/html/rfc7946#section-3.1.2).
- */
-export type PointFeature<P> = GeoJSON.Feature<GeoJSON.Point, P>;
-
-export interface ClusterProperties {
-    /**
-     * Always `true` to indicate that the Feature is a Cluster and not
-     * an individual point.
-     */
-    cluster: true;
-    /** Cluster ID */
-    cluster_id: number;
-    /** Number of points in the cluster. */
-    point_count: number;
-    /**
-     * Abbreviated number of points in the cluster as string if the number
-     * is 1000 or greater (e.g. `1.3k` if the number is 1298).
-     *
-     * For less than 1000 points it is the same value as `point_count`.
-     */
-    point_count_abbreviated: string | number;
-}
-
-export type ClusterFeature<C> = PointFeature<ClusterProperties & C>;
-
-export interface TileFeature<C, P> {
-    type: 1;
-    geometry: Array<[number, number]>;
-    tags: (ClusterProperties & C) | P;
-}
-
-export interface Tile<C, P> {
-    features: Array<TileFeature<C, P>>;
-}
+export = Supercluster;
diff --git a/types/supercluster/supercluster-tests.ts b/types/supercluster/supercluster-tests.ts
index 6da89ef104..5c6ec15f1b 100644
--- a/types/supercluster/supercluster-tests.ts
+++ b/types/supercluster/supercluster-tests.ts
@@ -1,4 +1,4 @@
-import Supercluster, { PointFeature, ClusterProperties } from 'supercluster';
+import Supercluster = require('supercluster');
 
 //
 // Test 1: strictly typed
@@ -12,7 +12,7 @@ interface TestClusterProps {
 	myTestClusterName: string;
 }
 
-const points: Array<PointFeature<TestPointProps>> = [
+const points: Array<Supercluster.PointFeature<TestPointProps>> = [
 	{
 		type: 'Feature',
 		properties: { myTestFeatureName: 'a' },
@@ -50,8 +50,8 @@ index.load(points);
 const clusters = index.getClusters([-180, -85, 180, 85], 2);
 const firstProps = clusters[0].properties; // Either cluster or point properties
 // Generic cluster properties
-(<ClusterProperties> firstProps).cluster;
-(<ClusterProperties> firstProps).point_count;
+(<Supercluster.ClusterProperties> firstProps).cluster;
+(<Supercluster.ClusterProperties> firstProps).point_count;
 // Custom cluster properties
 (<TestClusterProps> firstProps).myTestClusterName;
 // Custom point properties
@@ -62,8 +62,8 @@ const tile = index.getTile(0, 0, 0);
 if (tile) {
 	const tileProps = tile.features[0].tags; // Either cluster or point properties
 	// Generic cluster properties
-	(<ClusterProperties> tileProps).cluster;
-	(<ClusterProperties> tileProps).point_count;
+	(<Supercluster.ClusterProperties> tileProps).cluster;
+	(<Supercluster.ClusterProperties> tileProps).point_count;
 	// Custom cluster properties
 	(<TestClusterProps> tileProps).myTestClusterName;
 	// Custom point properties
@@ -96,6 +96,6 @@ index2.load([
 ]);
 const clusters2 = index2.getClusters([-180, -85, 180, 85], 2);
 const firstProps2 = clusters2[0].properties;
-(<ClusterProperties> firstProps2).cluster_id;
+(<Supercluster.ClusterProperties> firstProps2).cluster_id;
 firstProps2.testPropertyA;
 firstProps2.testPropertyB;
diff --git a/types/task-worklet/index.d.ts b/types/task-worklet/index.d.ts
index f9895adc8a..eae9166d10 100644
--- a/types/task-worklet/index.d.ts
+++ b/types/task-worklet/index.d.ts
@@ -6,7 +6,7 @@
 
 declare class TaskQueue {
     constructor(options?: Options);
-    postTask(taskName: string, ...args: any[]): Task;
+    postTask(taskName: string, ...args: any[]): TaskQueue.Task;
     addModule(moduleURL: string): Promise<void>;
 }
 
@@ -14,18 +14,20 @@ interface Options {
     size?: number;
 }
 
-export interface Task<T = any> {
-    id: number;
-    state: State;
-    result: Promise<T>;
+declare namespace TaskQueue {
+    interface Task<T = any> {
+        id: number;
+        state: State;
+        result: Promise<T>;
+    }
+
+    type State =
+        | 'cancelled'
+        | 'completed'
+        | 'fulfilled'
+        | 'pending'
+        | 'scheduled';
 }
 
-export type State =
-    | 'cancelled'
-    | 'completed'
-    | 'fulfilled'
-    | 'pending'
-    | 'scheduled';
-
-export default TaskQueue;
+export = TaskQueue;
 export as namespace TaskQueue;
diff --git a/types/task-worklet/task-worklet-tests.ts b/types/task-worklet/task-worklet-tests.ts
index c4abfe898b..faaf597d41 100644
--- a/types/task-worklet/task-worklet-tests.ts
+++ b/types/task-worklet/task-worklet-tests.ts
@@ -1,4 +1,4 @@
-import TaskQueue, { Task, State } from 'task-worklet';
+import TaskQueue = require('task-worklet');
 
 interface Fetcher {
   name: 'fetch';
diff --git a/types/websocket-async/index.d.ts b/types/websocket-async/index.d.ts
index 36bb12e08e..eec1e9f532 100644
--- a/types/websocket-async/index.d.ts
+++ b/types/websocket-async/index.d.ts
@@ -84,4 +84,4 @@ declare class WebSocketClient {
     private _reset(): void;
 }
 
-export default WebSocketClient;
+export = WebSocketClient;
diff --git a/types/websocket-async/websocket-async-tests.ts b/types/websocket-async/websocket-async-tests.ts
index f32192be95..f2ff5719c4 100644
--- a/types/websocket-async/websocket-async-tests.ts
+++ b/types/websocket-async/websocket-async-tests.ts
@@ -1,4 +1,4 @@
-import WebSocketClient from 'websocket-async';
+import WebSocketClient = require('websocket-async');
 
 const connection = new WebSocketClient();
 connection.connect('');
diff --git a/types/word-list-json/index.d.ts b/types/word-list-json/index.d.ts
index e221d3795f..ecd6f7214e 100644
--- a/types/word-list-json/index.d.ts
+++ b/types/word-list-json/index.d.ts
@@ -8,8 +8,6 @@ interface Lengths {
     [key: string]: number;
 }
 
-export const lengths: Lengths;
-
 type wordsArray = string[];
 interface Words extends wordsArray {
     lengths: Lengths;
@@ -17,4 +15,4 @@ interface Words extends wordsArray {
 
 declare const words: Words;
 
-export default words;
+export = words;
diff --git a/types/word-list-json/word-list-json-tests.ts b/types/word-list-json/word-list-json-tests.ts
index d12edf731d..0d6ed80d58 100644
--- a/types/word-list-json/word-list-json-tests.ts
+++ b/types/word-list-json/word-list-json-tests.ts
@@ -1,4 +1,4 @@
-import wordListJson from 'word-list-json';
+import wordListJson = require('word-list-json');
 
 wordListJson.lengths; // $ExpectType Lengths
 
diff --git a/types/workbox-sw/index.d.ts b/types/workbox-sw/index.d.ts
index a169714094..30d9244dd6 100644
--- a/types/workbox-sw/index.d.ts
+++ b/types/workbox-sw/index.d.ts
@@ -1421,4 +1421,4 @@ declare class WorkboxNamespace {
 	static skipWaiting (): void;
 }
 
-export default WorkboxNamespace;
+export = WorkboxNamespace;
diff --git a/types/workbox-sw/workbox-sw-tests.ts b/types/workbox-sw/workbox-sw-tests.ts
index 37855310d5..f8cdadabee 100644
--- a/types/workbox-sw/workbox-sw-tests.ts
+++ b/types/workbox-sw/workbox-sw-tests.ts
@@ -1,4 +1,4 @@
-import WorkboxSW from "workbox-sw";
+import WorkboxSW = require("workbox-sw");
 
 // $ExpectError
 WorkboxSW.core.setLogLevel(5); // $ExpectType void
diff --git a/types/xxhashjs/index.d.ts b/types/xxhashjs/index.d.ts
index 9c9d7e4318..e689edd0ae 100644
--- a/types/xxhashjs/index.d.ts
+++ b/types/xxhashjs/index.d.ts
@@ -10,7 +10,7 @@ export as namespace XXH;
 
 // Ideally we would have a type definition for the "cuint" package.
 // The following interface `UINT` is to resolve the bare minimum.
-interface UINT {
+export interface UINT {
 	toNumber(): number;
 	toString(radix?: number): string;
 }
@@ -28,6 +28,3 @@ export interface HashInterface {
 
 export const h32: HashInterface;
 export const h64: HashInterface;
-
-declare const defaultExport: { h32: typeof h32, h64: typeof h64 };
-export default defaultExport;
diff --git a/types/xxhashjs/xxhashjs-tests.ts b/types/xxhashjs/xxhashjs-tests.ts
index 889bf9bb40..91072500de 100644
--- a/types/xxhashjs/xxhashjs-tests.ts
+++ b/types/xxhashjs/xxhashjs-tests.ts
@@ -1,4 +1,4 @@
-import XXH from 'xxhashjs';
+import * as XXH from 'xxhashjs';
 
 // Test data
 const seed = 0xABCD;
diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts
index dfe474b0b1..15551bd6e1 100644
--- a/types/yog2-kernel/index.d.ts
+++ b/types/yog2-kernel/index.d.ts
@@ -10,84 +10,82 @@ import * as ral from "node-ral";
 import * as log from "yog-log";
 import * as yogBigpipe from "yog-bigpipe";
 
-declare global {
-    const yog: yog.Yog;
-}
-
-export interface YogBootstrapOption {
-    // 设置yog根目录，默认使用启动文件的目录
-    rootPath?: string;
-    // 设置plugins目录
-    pluginsPath?: string;
-    // 设置conf目录
-    confPath?: string;
-    // 设置app，未设置则直接使用express
-    app?: express.Express;
-}
-export interface Request extends express.Request {
-    CURRENT_APP: string;
-    ral: typeof ral.RAL;
-    ralP: typeof ral.RALPromise;
-}
-export interface Response extends express.Response {
-    bigpipe: yogBigpipe.BigPipe;
-}
-
-export interface ActionObject {
-    get?: express.RequestHandler;
-    post?: express.RequestHandler;
-    put?: express.RequestHandler;
-    delete?: express.RequestHandler;
-    del?: express.RequestHandler;
-    copy?: express.RequestHandler;
-    head?: express.RequestHandler;
-    options?: express.RequestHandler;
-    purge?: express.RequestHandler;
-    lock?: express.RequestHandler;
-    unlock?: express.RequestHandler;
-    propfind?: express.RequestHandler;
-    view?: express.RequestHandler;
-    link?: express.RequestHandler;
-    unlick?: express.RequestHandler;
-    patch?: express.RequestHandler;
-    [key: string]: any;
-}
-
-export interface Router extends express.Router {
-    action(actionName: string): express.RequestHandler | ActionObject;
-    wrapAsync(fn: (req: Request, resp: Response, next: express.NextFunction) => any): express.RequestHandler;
-}
-
-export namespace yog {
-    class Yog {
-        express: typeof express;
-        app: express.Express;
-        _: typeof _;
-
-        log: log.Logger;
-
-        // 当 yog.conf.promise.overrideRAL 为true时，可以当作promise使用
-        ral: typeof ral.RAL | typeof ral.RALPromise;
-        RAL: typeof ral.RAL;
-
+export as namespace yog;
+declare namespace yog {
+    interface YogBootstrapOption {
+        // 设置yog根目录，默认使用启动文件的目录
+        rootPath?: string;
+        // 设置plugins目录
+        pluginsPath?: string;
+        // 设置conf目录
+        confPath?: string;
+        // 设置app，未设置则直接使用express
+        app?: express.Express;
+    }
+    interface Request extends express.Request {
+        CURRENT_APP: string;
+        ral: typeof ral.RAL;
         ralP: typeof ral.RALPromise;
+    }
+    interface Response extends express.Response {
+        bigpipe: yogBigpipe.BigPipe;
+    }
 
-        view: {
-            // 清除viewcache
-            cleanCache(): void;
-        };
+    interface ActionObject {
+        get?: express.RequestHandler;
+        post?: express.RequestHandler;
+        put?: express.RequestHandler;
+        delete?: express.RequestHandler;
+        del?: express.RequestHandler;
+        copy?: express.RequestHandler;
+        head?: express.RequestHandler;
+        options?: express.RequestHandler;
+        purge?: express.RequestHandler;
+        lock?: express.RequestHandler;
+        unlock?: express.RequestHandler;
+        propfind?: express.RequestHandler;
+        view?: express.RequestHandler;
+        link?: express.RequestHandler;
+        unlick?: express.RequestHandler;
+        patch?: express.RequestHandler;
+        [key: string]: any;
+    }
 
-        // debug模式时存在
-        reloadApp?(appName: string): void;
-        // debug模式时存在
-        reloadView?(): void;
-        // debug模式时存在
-        reloadIsomorphic?(): void;
-
-        ROOT_PATH: string;
-
-        bootstrap(option: YogBootstrapOption, callback?: () => void): void;
+    interface Router extends express.Router {
+        action(actionName: string): express.RequestHandler | ActionObject;
+        wrapAsync(fn: (req: Request, resp: Response, next: express.NextFunction) => any): express.RequestHandler;
     }
 }
 
-export default yog;
+declare class Yog {
+    express: typeof express;
+    app: express.Express;
+    _: typeof _;
+
+    log: log.Logger;
+
+    // 当 yog.conf.promise.overrideRAL 为true时，可以当作promise使用
+    ral: typeof ral.RAL | typeof ral.RALPromise;
+    RAL: typeof ral.RAL;
+
+    ralP: typeof ral.RALPromise;
+
+    view: {
+        // 清除viewcache
+        cleanCache(): void;
+    };
+
+    // debug模式时存在
+    reloadApp?(appName: string): void;
+    // debug模式时存在
+    reloadView?(): void;
+    // debug模式时存在
+    reloadIsomorphic?(): void;
+
+    ROOT_PATH: string;
+
+    bootstrap(option: yog.YogBootstrapOption, callback?: () => void): void;
+}
+
+declare const yog: Yog;
+export = yog;
diff --git a/types/yog2-kernel/yog2-kernel-tests.ts b/types/yog2-kernel/yog2-kernel-tests.ts
index 7f88134b10..9d82a76eec 100644
--- a/types/yog2-kernel/yog2-kernel-tests.ts
+++ b/types/yog2-kernel/yog2-kernel-tests.ts
@@ -1,11 +1,11 @@
-import * as yog2Kernel from 'yog2-kernel';
+import yog2Kernel = require('yog2-kernel');
 import { Request, Response, NextFunction } from 'express';
 
-yog.log.notice('some debug');
-yog.log.debug('some debug');
-yog.log.trace('some debug');
-yog.log.warning('some debug');
-yog.log.fatal('some debug');
+yog2Kernel.log.notice('some debug');
+yog2Kernel.log.debug('some debug');
+yog2Kernel.log.trace('some debug');
+yog2Kernel.log.warning('some debug');
+yog2Kernel.log.fatal('some debug');
 
 const handler = async function(req: yog2Kernel.Request, resp: yog2Kernel.Response, next: NextFunction) {
     const test = await req.ralP("test", {});
@@ -27,8 +27,8 @@ const handler31 = router.wrapAsync(function(req: yog2Kernel.Request, resp: yog2K
 const handler33 = router.wrapAsync(function(req: Request, resp: Response) { });
 const handler4 = router.wrapAsync(function(req: Request, resp: Response, next: NextFunction) { });
 
-yog.bootstrap({});
+yog2Kernel.bootstrap({});
 
-yog.bootstrap({
+yog2Kernel.bootstrap({
     rootPath: ''
 });
diff --git a/types/yoga-layout/index.d.ts b/types/yoga-layout/index.d.ts
index 4014834802..444931f832 100644
--- a/types/yoga-layout/index.d.ts
+++ b/types/yoga-layout/index.d.ts
@@ -4,83 +4,83 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-export const ALIGN_AUTO: 0;
-export const ALIGN_COUNT: 8;
-export const ALIGN_FLEX_START: 1;
-export const ALIGN_CENTER: 2;
-export const ALIGN_FLEX_END: 3;
-export const ALIGN_STRETCH: 4;
-export const ALIGN_BASELINE: 5;
-export const ALIGN_SPACE_BETWEEN: 6;
-export const ALIGN_SPACE_AROUND: 7;
-export const DIMENSION_COUNT: 2;
-export const DIMENSION_WIDTH: 0;
-export const DIMENSION_HEIGHT: 1;
-export const DIRECTION_COUNT: 3;
-export const DIRECTION_INHERIT: 0;
-export const DIRECTION_LTR: 1;
-export const DIRECTION_RTL: 2;
-export const DISPLAY_COUNT: 2;
-export const DISPLAY_FLEX: 0;
-export const DISPLAY_NONE: 1;
-export const EDGE_COUNT: 9;
-export const EDGE_LEFT: 0;
-export const EDGE_TOP: 1;
-export const EDGE_RIGHT: 2;
-export const EDGE_BOTTOM: 3;
-export const EDGE_START: 4;
-export const EDGE_END: 5;
-export const EDGE_HORIZONTAL: 6;
-export const EDGE_VERTICAL: 7;
-export const EDGE_ALL: 8;
-export const EXPERIMENTAL_FEATURE_COUNT: 1;
-export const EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS: 0;
-export const FLEX_DIRECTION_COUNT: 4;
-export const FLEX_DIRECTION_COLUMN: 0;
-export const FLEX_DIRECTION_COLUMN_REVERSE: 1;
-export const FLEX_DIRECTION_ROW: 2;
-export const FLEX_DIRECTION_ROW_REVERSE: 3;
-export const JUSTIFY_COUNT: 6;
-export const JUSTIFY_FLEX_START: 0;
-export const JUSTIFY_CENTER: 1;
-export const JUSTIFY_FLEX_END: 2;
-export const JUSTIFY_SPACE_BETWEEN: 3;
-export const JUSTIFY_SPACE_AROUND: 4;
-export const JUSTIFY_SPACE_EVENLY: 5;
-export const LOG_LEVEL_COUNT: 6;
-export const LOG_LEVEL_ERROR: 0;
-export const LOG_LEVEL_WARN: 1;
-export const LOG_LEVEL_INFO: 2;
-export const LOG_LEVEL_DEBUG: 3;
-export const LOG_LEVEL_VERBOSE: 4;
-export const LOG_LEVEL_FATAL: 5;
-export const MEASURE_MODE_COUNT: 3;
-export const MEASURE_MODE_UNDEFINED: 0;
-export const MEASURE_MODE_EXACTLY: 1;
-export const MEASURE_MODE_AT_MOST: 2;
-export const NODE_TYPE_COUNT: 2;
-export const NODE_TYPE_DEFAULT: 0;
-export const NODE_TYPE_TEXT: 1;
-export const OVERFLOW_COUNT: 3;
-export const OVERFLOW_VISIBLE: 0;
-export const OVERFLOW_HIDDEN: 1;
-export const OVERFLOW_SCROLL: 2;
-export const POSITION_TYPE_COUNT: 2;
-export const POSITION_TYPE_RELATIVE: 0;
-export const POSITION_TYPE_ABSOLUTE: 1;
-export const PRINT_OPTIONS_COUNT: 3;
-export const PRINT_OPTIONS_LAYOUT: 1;
-export const PRINT_OPTIONS_STYLE: 2;
-export const PRINT_OPTIONS_CHILDREN: 4;
-export const UNIT_COUNT: 4;
-export const UNIT_UNDEFINED: 0;
-export const UNIT_POINT: 1;
-export const UNIT_PERCENT: 2;
-export const UNIT_AUTO: 3;
-export const WRAP_COUNT: 3;
-export const WRAP_NO_WRAP: 0;
-export const WRAP_WRAP: 1;
-export const WRAP_WRAP_REVERSE: 2;
+declare const ALIGN_AUTO: 0;
+declare const ALIGN_COUNT: 8;
+declare const ALIGN_FLEX_START: 1;
+declare const ALIGN_CENTER: 2;
+declare const ALIGN_FLEX_END: 3;
+declare const ALIGN_STRETCH: 4;
+declare const ALIGN_BASELINE: 5;
+declare const ALIGN_SPACE_BETWEEN: 6;
+declare const ALIGN_SPACE_AROUND: 7;
+declare const DIMENSION_COUNT: 2;
+declare const DIMENSION_WIDTH: 0;
+declare const DIMENSION_HEIGHT: 1;
+declare const DIRECTION_COUNT: 3;
+declare const DIRECTION_INHERIT: 0;
+declare const DIRECTION_LTR: 1;
+declare const DIRECTION_RTL: 2;
+declare const DISPLAY_COUNT: 2;
+declare const DISPLAY_FLEX: 0;
+declare const DISPLAY_NONE: 1;
+declare const EDGE_COUNT: 9;
+declare const EDGE_LEFT: 0;
+declare const EDGE_TOP: 1;
+declare const EDGE_RIGHT: 2;
+declare const EDGE_BOTTOM: 3;
+declare const EDGE_START: 4;
+declare const EDGE_END: 5;
+declare const EDGE_HORIZONTAL: 6;
+declare const EDGE_VERTICAL: 7;
+declare const EDGE_ALL: 8;
+declare const EXPERIMENTAL_FEATURE_COUNT: 1;
+declare const EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS: 0;
+declare const FLEX_DIRECTION_COUNT: 4;
+declare const FLEX_DIRECTION_COLUMN: 0;
+declare const FLEX_DIRECTION_COLUMN_REVERSE: 1;
+declare const FLEX_DIRECTION_ROW: 2;
+declare const FLEX_DIRECTION_ROW_REVERSE: 3;
+declare const JUSTIFY_COUNT: 6;
+declare const JUSTIFY_FLEX_START: 0;
+declare const JUSTIFY_CENTER: 1;
+declare const JUSTIFY_FLEX_END: 2;
+declare const JUSTIFY_SPACE_BETWEEN: 3;
+declare const JUSTIFY_SPACE_AROUND: 4;
+declare const JUSTIFY_SPACE_EVENLY: 5;
+declare const LOG_LEVEL_COUNT: 6;
+declare const LOG_LEVEL_ERROR: 0;
+declare const LOG_LEVEL_WARN: 1;
+declare const LOG_LEVEL_INFO: 2;
+declare const LOG_LEVEL_DEBUG: 3;
+declare const LOG_LEVEL_VERBOSE: 4;
+declare const LOG_LEVEL_FATAL: 5;
+declare const MEASURE_MODE_COUNT: 3;
+declare const MEASURE_MODE_UNDEFINED: 0;
+declare const MEASURE_MODE_EXACTLY: 1;
+declare const MEASURE_MODE_AT_MOST: 2;
+declare const NODE_TYPE_COUNT: 2;
+declare const NODE_TYPE_DEFAULT: 0;
+declare const NODE_TYPE_TEXT: 1;
+declare const OVERFLOW_COUNT: 3;
+declare const OVERFLOW_VISIBLE: 0;
+declare const OVERFLOW_HIDDEN: 1;
+declare const OVERFLOW_SCROLL: 2;
+declare const POSITION_TYPE_COUNT: 2;
+declare const POSITION_TYPE_RELATIVE: 0;
+declare const POSITION_TYPE_ABSOLUTE: 1;
+declare const PRINT_OPTIONS_COUNT: 3;
+declare const PRINT_OPTIONS_LAYOUT: 1;
+declare const PRINT_OPTIONS_STYLE: 2;
+declare const PRINT_OPTIONS_CHILDREN: 4;
+declare const UNIT_COUNT: 4;
+declare const UNIT_UNDEFINED: 0;
+declare const UNIT_POINT: 1;
+declare const UNIT_PERCENT: 2;
+declare const UNIT_AUTO: 3;
+declare const WRAP_COUNT: 3;
+declare const WRAP_NO_WRAP: 0;
+declare const WRAP_WRAP: 1;
+declare const WRAP_WRAP_REVERSE: 2;
 
 interface ConstantsStatic {
    readonly ALIGN_AUTO: typeof ALIGN_AUTO;
@@ -162,167 +162,176 @@ interface ConstantsStatic {
    readonly WRAP_WRAP_REVERSE: typeof WRAP_WRAP_REVERSE;
 }
 
-declare const Constans: ConstantsStatic;
+declare namespace Yoga {
+    type YogaJustifyContent =
+        | typeof JUSTIFY_CENTER
+        | typeof JUSTIFY_FLEX_END
+        | typeof JUSTIFY_FLEX_START
+        | typeof JUSTIFY_SPACE_AROUND
+        | typeof JUSTIFY_SPACE_BETWEEN
+        | typeof JUSTIFY_SPACE_EVENLY;
 
-export type YogaJustifyContent =
-    | typeof JUSTIFY_CENTER
-    | typeof JUSTIFY_FLEX_END
-    | typeof JUSTIFY_FLEX_START
-    | typeof JUSTIFY_SPACE_AROUND
-    | typeof JUSTIFY_SPACE_BETWEEN
-    | typeof JUSTIFY_SPACE_EVENLY;
+    type YogaAlign =
+        | typeof ALIGN_AUTO
+        | typeof ALIGN_BASELINE
+        | typeof ALIGN_CENTER
+        | typeof ALIGN_FLEX_END
+        | typeof ALIGN_FLEX_START
+        | typeof ALIGN_SPACE_AROUND
+        | typeof ALIGN_SPACE_BETWEEN
+        | typeof ALIGN_STRETCH;
 
-export type YogaAlign =
-    | typeof ALIGN_AUTO
-    | typeof ALIGN_BASELINE
-    | typeof ALIGN_CENTER
-    | typeof ALIGN_FLEX_END
-    | typeof ALIGN_FLEX_START
-    | typeof ALIGN_SPACE_AROUND
-    | typeof ALIGN_SPACE_BETWEEN
-    | typeof ALIGN_STRETCH;
+    type YogaFlexDirection =
+        | typeof FLEX_DIRECTION_COLUMN
+        | typeof FLEX_DIRECTION_COLUMN_REVERSE
+        | typeof FLEX_DIRECTION_COUNT
+        | typeof FLEX_DIRECTION_ROW
+        | typeof FLEX_DIRECTION_ROW_REVERSE;
 
-export type YogaFlexDirection =
-    | typeof FLEX_DIRECTION_COLUMN
-    | typeof FLEX_DIRECTION_COLUMN_REVERSE
-    | typeof FLEX_DIRECTION_COUNT
-    | typeof FLEX_DIRECTION_ROW
-    | typeof FLEX_DIRECTION_ROW_REVERSE;
+    type YogaDirection =
+        | typeof DIRECTION_INHERIT
+        | typeof DIRECTION_LTR
+        | typeof DIRECTION_RTL;
 
-export type YogaDirection =
-    | typeof DIRECTION_INHERIT
-    | typeof DIRECTION_LTR
-    | typeof DIRECTION_RTL;
+    type YogaFlexWrap =
+        | typeof WRAP_NO_WRAP
+        | typeof WRAP_WRAP
+        | typeof WRAP_WRAP_REVERSE;
 
-export type YogaFlexWrap =
-    | typeof WRAP_NO_WRAP
-    | typeof WRAP_WRAP
-    | typeof WRAP_WRAP_REVERSE;
+    type YogaEdge =
+        | typeof EDGE_LEFT
+        | typeof EDGE_TOP
+        | typeof EDGE_RIGHT
+        | typeof EDGE_BOTTOM
+        | typeof EDGE_START
+        | typeof EDGE_END
+        | typeof EDGE_HORIZONTAL
+        | typeof EDGE_VERTICAL
+        | typeof EDGE_ALL;
 
-export type YogaEdge =
-    | typeof EDGE_LEFT
-    | typeof EDGE_TOP
-    | typeof EDGE_RIGHT
-    | typeof EDGE_BOTTOM
-    | typeof EDGE_START
-    | typeof EDGE_END
-    | typeof EDGE_HORIZONTAL
-    | typeof EDGE_VERTICAL
-    | typeof EDGE_ALL;
+    type YogaDisplay =
+        | typeof DISPLAY_FLEX
+        | typeof DISPLAY_NONE;
 
-export type YogaDisplay =
-    | typeof DISPLAY_FLEX
-    | typeof DISPLAY_NONE;
+    type YogaUnit =
+        | typeof UNIT_AUTO
+        | typeof UNIT_PERCENT
+        | typeof UNIT_POINT
+        | typeof UNIT_UNDEFINED;
 
-export type YogaUnit =
-    | typeof UNIT_AUTO
-    | typeof UNIT_PERCENT
-    | typeof UNIT_POINT
-    | typeof UNIT_UNDEFINED;
+    type YogaOverflow =
+        | typeof OVERFLOW_HIDDEN
+        | typeof OVERFLOW_SCROLL
+        | typeof OVERFLOW_VISIBLE;
 
-export type YogaOverflow =
-    | typeof OVERFLOW_HIDDEN
-    | typeof OVERFLOW_SCROLL
-    | typeof OVERFLOW_VISIBLE;
+    type YogaPositionType =
+        | typeof POSITION_TYPE_ABSOLUTE
+        | typeof POSITION_TYPE_RELATIVE;
 
-export type YogaPositionType =
-    | typeof POSITION_TYPE_ABSOLUTE
-    | typeof POSITION_TYPE_RELATIVE;
+    type YogaExperimentalFeature = typeof EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS;
 
-export type YogaExperimentalFeature = typeof EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS;
+    interface YogaNode {
+        calculateLayout(
+            width?: number,
+            height?: number,
+            direction?: YogaDirection,
+        ): void;
+        copyStyle(node: YogaNode): void;
+        free(): void;
+        freeRecursive(): void;
+        getAlignContent(): YogaAlign;
+        getAlignItems(): YogaAlign;
+        getAlignSelf(): YogaAlign;
+        getAspectRatio(): number;
+        getBorder(edge: YogaEdge): number;
+        getChild(index: number): YogaNode;
+        getChildCount(): number;
+        getComputedBorder(edge: YogaEdge): number;
+        getComputedBottom(): number;
+        getComputedHeight(): number;
+        getComputedLayout(): Layout;
+        getComputedLeft(): number;
+        getComputedMargin(edge: YogaEdge): number;
+        getComputedPadding(edge: YogaEdge): number;
+        getComputedRight(): number;
+        getComputedTop(): number;
+        getComputedWidth(): number;
+        getDisplay(): YogaDisplay;
+        getFlexBasis(): number;
+        getFlexDirection(): YogaFlexDirection;
+        getFlexGrow(): number;
+        getFlexShrink(): number;
+        getFlexWrap(): YogaFlexWrap;
+        getHeight(): Value;
+        getJustifyContent(): YogaJustifyContent;
+        getMargin(edge: YogaEdge): Value;
+        getMaxHeight(): Value;
+        getMaxWidth(): Value;
+        getMinHeight(): Value;
+        getMinWidth(): Value;
+        getOverflow(): YogaOverflow;
+        getPadding(edge: YogaEdge): Value;
+        getParent(): YogaNode | null;
+        getPosition(edge: YogaEdge): Value;
+        getPositionType(): YogaPositionType;
+        getWidth(): Value;
+        insertChild(child: YogaNode, index: number): void;
+        isDirty(): boolean;
+        markDirty(): void;
+        removeChild(child: YogaNode): void;
+        reset(): void;
+        setAlignContent(alignContent: YogaAlign): void;
+        setAlignItems(alignItems: YogaAlign): void;
+        setAlignSelf(alignSelf: YogaAlign): void;
+        setAspectRatio(aspectRatio: number): void;
+        setBorder(edge: YogaEdge, borderWidth: number): void;
+        setDisplay(display: YogaDisplay): void;
+        setFlex(flex: number): void;
+        setFlexBasis(flexBasis: number | string): void;
+        setFlexBasisPercent(flexBasis: number): void;
+        setFlexDirection(flexDirection: YogaFlexDirection): void;
+        setFlexGrow(flexGrow: number): void;
+        setFlexShrink(flexShrink: number): void;
+        setFlexWrap(flexWrap: YogaFlexWrap): void;
+        setHeight(height: number | string): void;
+        setHeightAuto(): void;
+        setHeightPercent(height: number): void;
+        setJustifyContent(justifyContent: YogaJustifyContent): void;
+        setMargin(edge: YogaEdge, margin: number): void;
+        setMarginAuto(edge: YogaEdge): void;
+        setMarginPercent(edge: YogaEdge, margin: number): void;
+        setMaxHeight(maxHeight: number | string): void;
+        setMaxHeightPercent(maxHeight: number): void;
+        setMaxWidth(maxWidth: number | string): void;
+        setMaxWidthPercent(maxWidth: number): void;
+        setMeasureFunc(measureFunc: (() => any) | null): void;
+        setMinHeight(minHeight: number | string): void;
+        setMinHeightPercent(minHeight: number): void;
+        setMinWidth(minWidth: number | string): void;
+        setMinWidthPercent(minWidth: number): void;
+        setOverflow(overflow: YogaOverflow): void;
+        setPadding(edge: YogaEdge, padding: number | string): void;
+        setPaddingPercent(edge: YogaEdge, padding: number): void;
+        setPosition(edge: YogaEdge, position: number | string): void;
+        setPositionPercent(edge: YogaEdge, position: number): void;
+        setPositionType(positionType: YogaPositionType): void;
+        setWidth(width: number | string): void;
+        setWidthAuto(): void;
+        setWidthPercent(width: number): void;
+        unsetMeasureFun(): void;
+    }
 
-export interface YogaNode {
-    calculateLayout(
-        width?: number,
-        height?: number,
-        direction?: YogaDirection,
-    ): void;
-    copyStyle(node: YogaNode): void;
-    free(): void;
-    freeRecursive(): void;
-    getAlignContent(): YogaAlign;
-    getAlignItems(): YogaAlign;
-    getAlignSelf(): YogaAlign;
-    getAspectRatio(): number;
-    getBorder(edge: YogaEdge): number;
-    getChild(index: number): YogaNode;
-    getChildCount(): number;
-    getComputedBorder(edge: YogaEdge): number;
-    getComputedBottom(): number;
-    getComputedHeight(): number;
-    getComputedLayout(): Layout;
-    getComputedLeft(): number;
-    getComputedMargin(edge: YogaEdge): number;
-    getComputedPadding(edge: YogaEdge): number;
-    getComputedRight(): number;
-    getComputedTop(): number;
-    getComputedWidth(): number;
-    getDisplay(): YogaDisplay;
-    getFlexBasis(): number;
-    getFlexDirection(): YogaFlexDirection;
-    getFlexGrow(): number;
-    getFlexShrink(): number;
-    getFlexWrap(): YogaFlexWrap;
-    getHeight(): Value;
-    getJustifyContent(): YogaJustifyContent;
-    getMargin(edge: YogaEdge): Value;
-    getMaxHeight(): Value;
-    getMaxWidth(): Value;
-    getMinHeight(): Value;
-    getMinWidth(): Value;
-    getOverflow(): YogaOverflow;
-    getPadding(edge: YogaEdge): Value;
-    getParent(): YogaNode | null;
-    getPosition(edge: YogaEdge): Value;
-    getPositionType(): YogaPositionType;
-    getWidth(): Value;
-    insertChild(child: YogaNode, index: number): void;
-    isDirty(): boolean;
-    markDirty(): void;
-    removeChild(child: YogaNode): void;
-    reset(): void;
-    setAlignContent(alignContent: YogaAlign): void;
-    setAlignItems(alignItems: YogaAlign): void;
-    setAlignSelf(alignSelf: YogaAlign): void;
-    setAspectRatio(aspectRatio: number): void;
-    setBorder(edge: YogaEdge, borderWidth: number): void;
-    setDisplay(display: YogaDisplay): void;
-    setFlex(flex: number): void;
-    setFlexBasis(flexBasis: number | string): void;
-    setFlexBasisPercent(flexBasis: number): void;
-    setFlexDirection(flexDirection: YogaFlexDirection): void;
-    setFlexGrow(flexGrow: number): void;
-    setFlexShrink(flexShrink: number): void;
-    setFlexWrap(flexWrap: YogaFlexWrap): void;
-    setHeight(height: number | string): void;
-    setHeightAuto(): void;
-    setHeightPercent(height: number): void;
-    setJustifyContent(justifyContent: YogaJustifyContent): void;
-    setMargin(edge: YogaEdge, margin: number): void;
-    setMarginAuto(edge: YogaEdge): void;
-    setMarginPercent(edge: YogaEdge, margin: number): void;
-    setMaxHeight(maxHeight: number | string): void;
-    setMaxHeightPercent(maxHeight: number): void;
-    setMaxWidth(maxWidth: number | string): void;
-    setMaxWidthPercent(maxWidth: number): void;
-    setMeasureFunc(measureFunc: (() => any) | null): void;
-    setMinHeight(minHeight: number | string): void;
-    setMinHeightPercent(minHeight: number): void;
-    setMinWidth(minWidth: number | string): void;
-    setMinWidthPercent(minWidth: number): void;
-    setOverflow(overflow: YogaOverflow): void;
-    setPadding(edge: YogaEdge, padding: number | string): void;
-    setPaddingPercent(edge: YogaEdge, padding: number): void;
-    setPosition(edge: YogaEdge, position: number | string): void;
-    setPositionPercent(edge: YogaEdge, position: number): void;
-    setPositionType(positionType: YogaPositionType): void;
-    setWidth(width: number | string): void;
-    setWidthAuto(): void;
-    setWidthPercent(width: number): void;
-    unsetMeasureFun(): void;
+    interface YogaConfig {
+        isExperimentalFeatureEnabled(feature: YogaExperimentalFeature): boolean;
+        setExperimentalFeatureEnabled(
+            feature: YogaExperimentalFeature,
+            enabled: boolean,
+        ): void;
+        setPointScaleFactor(factor: number): void;
+    }
 }
 
-export class Layout {
+declare class Layout {
     readonly left: number;
     readonly right: number;
     readonly top: number;
@@ -350,7 +359,7 @@ export class Layout {
     toString(): string;
 }
 
-export class Size {
+declare class Size {
     static fromJS(dim: { width: number, height: number }): Size;
 
     readonly width: number;
@@ -363,52 +372,36 @@ export class Size {
     toString(): string;
 }
 
-export class Value {
-    readonly unit: YogaUnit | number;
+declare class Value {
+    readonly unit: Yoga.YogaUnit | number;
     readonly value: number;
 
-    constructor(unit: YogaUnit | number, value: number);
+    constructor(unit: Yoga.YogaUnit | number, value: number);
 
-    fromJS(expose: (unit: YogaUnit | number, value: number) => any): void;
+    fromJS(expose: (unit: Yoga.YogaUnit | number, value: number) => any): void;
 
     toString(): string;
     valueOf(): number;
 }
 
-export interface YogaConfig {
-    isExperimentalFeatureEnabled(feature: YogaExperimentalFeature): boolean;
-    setExperimentalFeatureEnabled(
-        feature: YogaExperimentalFeature,
-        enabled: boolean,
-    ): void;
-    setPointScaleFactor(factor: number): void;
-}
-
 interface NodeStatic {
-    create(): YogaNode;
-    createDefault(): YogaNode;
-    createWithConfig(config: YogaConfig): YogaNode;
-    destroy(node: YogaNode): any;
+    create(): Yoga.YogaNode;
+    createDefault(): Yoga.YogaNode;
+    createWithConfig(config: Yoga.YogaConfig): Yoga.YogaNode;
+    destroy(node: Yoga.YogaNode): any;
 }
 
-export const Node: NodeStatic;
-
 interface ConfigStatic {
-    create(): YogaConfig;
-    destroy(config: YogaConfig): any;
+    create(): Yoga.YogaConfig;
+    destroy(config: Yoga.YogaConfig): any;
 }
 
-export const Config: ConfigStatic;
-
 interface YogaStatic extends ConstantsStatic {
-    Node: typeof Node;
-    Config: typeof Config;
-    Layout: typeof Layout;
-    Size: typeof Size;
-    Value: typeof Value;
+    Node: NodeStatic;
+    Config: ConfigStatic;
     getInstanceCount(): number;
 }
 
 declare const Yoga: YogaStatic;
 
-export default Yoga;
+export = Yoga;
diff --git a/types/yoga-layout/yoga-layout-tests.ts b/types/yoga-layout/yoga-layout-tests.ts
index c2effbef23..ab0559ba6b 100644
--- a/types/yoga-layout/yoga-layout-tests.ts
+++ b/types/yoga-layout/yoga-layout-tests.ts
@@ -1,4 +1,5 @@
-import yoga, { Node, Config, Size, Value, DISPLAY_FLEX } from 'yoga-layout';
+import yoga = require('yoga-layout');
+const { Node, Config, DISPLAY_FLEX } = yoga;
 
 const cfg = Config.create();
 
diff --git a/types/zen-push/index.d.ts b/types/zen-push/index.d.ts
index f5d7e5046d..3906a9ba4f 100644
--- a/types/zen-push/index.d.ts
+++ b/types/zen-push/index.d.ts
@@ -13,4 +13,4 @@ declare class PushStream<T> {
     complete(x?: any): void;
 }
 
-export default PushStream;
+export = PushStream;
diff --git a/types/zen-push/zen-push-tests.ts b/types/zen-push/zen-push-tests.ts
index 70feab99f6..1472d3b7f8 100644
--- a/types/zen-push/zen-push-tests.ts
+++ b/types/zen-push/zen-push-tests.ts
@@ -1,4 +1,4 @@
-import PushStream from 'zen-push';
+import PushStream = require('zen-push');
 import Observable = require('zen-observable');
 
 function assert(val: boolean) {

From f1260115f622fa7b9b9edd3a166471ce2465d0d2 Mon Sep 17 00:00:00 2001
From: Satya Rohith <gsatyarohith@gmail.com>
Date: Fri, 8 Mar 2019 13:37:58 +0530
Subject: [PATCH 609/924] feat: add type definitions for viewport-list

---
 types/viewport-list/index.d.ts             | 15 ++++++++++++++
 types/viewport-list/tsconfig.json          | 23 ++++++++++++++++++++++
 types/viewport-list/tslint.json            |  1 +
 types/viewport-list/viewport-list-tests.ts |  3 +++
 4 files changed, 42 insertions(+)
 create mode 100644 types/viewport-list/index.d.ts
 create mode 100644 types/viewport-list/tsconfig.json
 create mode 100644 types/viewport-list/tslint.json
 create mode 100644 types/viewport-list/viewport-list-tests.ts

diff --git a/types/viewport-list/index.d.ts b/types/viewport-list/index.d.ts
new file mode 100644
index 0000000000..2c27ebdb06
--- /dev/null
+++ b/types/viewport-list/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for viewport-list 5.1
+// Project: https://github.com/kevva/viewport-list#readme
+// Definitions by: Satya Rohith <https://github.com/satyarohith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = viewportList;
+
+/**
+ * Returns a list of devices and their veiwports
+ *
+ * @param items - An array of device names to fetch
+ * @returns - An array of viewports
+ */
+declare function viewportList(items?: string[]): object[];
diff --git a/types/viewport-list/tsconfig.json b/types/viewport-list/tsconfig.json
new file mode 100644
index 0000000000..73bcb18350
--- /dev/null
+++ b/types/viewport-list/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",
+        "viewport-list-tests.ts"
+    ]
+}
diff --git a/types/viewport-list/tslint.json b/types/viewport-list/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/viewport-list/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/viewport-list/viewport-list-tests.ts b/types/viewport-list/viewport-list-tests.ts
new file mode 100644
index 0000000000..973296b666
--- /dev/null
+++ b/types/viewport-list/viewport-list-tests.ts
@@ -0,0 +1,3 @@
+import viewportList = require('viewport-list');
+
+viewportList(); // $ExpectType object[]

From 75a3655fa58c58ef44f2b173644e7ea4c9580ca4 Mon Sep 17 00:00:00 2001
From: Satya Rohith <gsatyarohith@gmail.com>
Date: Fri, 8 Mar 2019 11:16:59 +0530
Subject: [PATCH 610/924] feat: add type definitions for easydate

---
 types/easydate/easydate-tests.ts | 10 ++++++++++
 types/easydate/index.d.ts        | 14 ++++++++++++++
 types/easydate/tsconfig.json     | 23 +++++++++++++++++++++++
 types/easydate/tslint.json       |  3 +++
 4 files changed, 50 insertions(+)
 create mode 100644 types/easydate/easydate-tests.ts
 create mode 100644 types/easydate/index.d.ts
 create mode 100644 types/easydate/tsconfig.json
 create mode 100644 types/easydate/tslint.json

diff --git a/types/easydate/easydate-tests.ts b/types/easydate/easydate-tests.ts
new file mode 100644
index 0000000000..56231f5937
--- /dev/null
+++ b/types/easydate/easydate-tests.ts
@@ -0,0 +1,10 @@
+import easydate = require('easydate');
+
+easydate('d/M/Y');
+easydate('Y-d-M', {adjust: true, timeZone: 'local'});
+easydate('d-M-Y @ h:m', '2015-11-03T16:06:00.000Z');
+easydate('Y-d-M', {
+    adjust: true,
+    timeZone: 'utc',
+    setDate: '2015-11-03T16:06:00.000Z'
+});
diff --git a/types/easydate/index.d.ts b/types/easydate/index.d.ts
new file mode 100644
index 0000000000..3109273bbd
--- /dev/null
+++ b/types/easydate/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for easydate 2.2
+// Project: https://github.com/roryrjb/easydate
+// Definitions by: Satya Rohith <https://github.com/satyarohith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = easydate;
+
+interface DateConfig {
+    setDate?: string;
+    timeZone?: 'utc' | 'local';
+    adjust?: boolean;
+}
+
+declare function easydate(pattern: string, config?: DateConfig | string): string;
diff --git a/types/easydate/tsconfig.json b/types/easydate/tsconfig.json
new file mode 100644
index 0000000000..cdf985291b
--- /dev/null
+++ b/types/easydate/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",
+        "easydate-tests.ts"
+    ]
+}
diff --git a/types/easydate/tslint.json b/types/easydate/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/easydate/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From d3684b19f4d96a0266f258e43136f3b933a7ce5a Mon Sep 17 00:00:00 2001
From: Satya Rohith <gsatyarohith@gmail.com>
Date: Fri, 8 Mar 2019 12:42:02 +0530
Subject: [PATCH 611/924] feat: add type definitions for get-res

---
 types/get-res/get-res-tests.ts |  3 +++
 types/get-res/index.d.ts       | 14 ++++++++++++++
 types/get-res/tsconfig.json    | 23 +++++++++++++++++++++++
 types/get-res/tslint.json      |  1 +
 4 files changed, 41 insertions(+)
 create mode 100644 types/get-res/get-res-tests.ts
 create mode 100644 types/get-res/index.d.ts
 create mode 100644 types/get-res/tsconfig.json
 create mode 100644 types/get-res/tslint.json

diff --git a/types/get-res/get-res-tests.ts b/types/get-res/get-res-tests.ts
new file mode 100644
index 0000000000..d767a6d054
--- /dev/null
+++ b/types/get-res/get-res-tests.ts
@@ -0,0 +1,3 @@
+import getRes = require('get-res');
+
+getRes(); // $ExpectType Promise<object[]>
diff --git a/types/get-res/index.d.ts b/types/get-res/index.d.ts
new file mode 100644
index 0000000000..36fb22d94c
--- /dev/null
+++ b/types/get-res/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for get-res 3.0
+// Project: https://github.com/kevva/get-res#readme
+// Definitions by: Satya Rohith <https://github.com/satyarohith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = getRes;
+
+/**
+ * Get ten most popular screen resolutions
+ *
+ * @returns An array with the details of ten most popular screen resolutions
+ */
+declare function getRes(): Promise<object[]>;
diff --git a/types/get-res/tsconfig.json b/types/get-res/tsconfig.json
new file mode 100644
index 0000000000..aad9127e1b
--- /dev/null
+++ b/types/get-res/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-res-tests.ts"
+    ]
+}
diff --git a/types/get-res/tslint.json b/types/get-res/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/get-res/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e8b76b688456d2389a7850d1a2930da5a7f0dedf Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 13 Mar 2019 10:00:20 -0700
Subject: [PATCH 612/924] Cleanup from tslint 5.14

---
 types/auth-header/index.d.ts                     |  2 +-
 types/jquery.transit/jquery.transit-tests.ts     | 14 +++++++-------
 types/material__base/index.d.ts                  |  2 +-
 types/material__checkbox/index.d.ts              |  2 +-
 types/material__dialog/index.d.ts                |  2 +-
 types/material__dom/index.d.ts                   |  2 +-
 types/material__form-field/index.d.ts            |  2 +-
 types/material__icon-toggle/index.d.ts           |  2 +-
 types/material__list/index.d.ts                  |  2 +-
 types/material__radio/index.d.ts                 |  2 +-
 types/material__ripple/index.d.ts                |  2 +-
 types/material__select/index.d.ts                |  2 +-
 types/material__slider/index.d.ts                |  2 +-
 types/material__snackbar/index.d.ts              |  2 +-
 types/material__tabs/tab-bar/index.d.ts          |  2 +-
 types/material__tabs/tab/index.d.ts              |  2 +-
 types/material__textfield/helper-text/index.d.ts |  2 +-
 types/material__toolbar/index.d.ts               |  2 +-
 types/nodal/nodal-tests.ts                       |  6 +++---
 types/node-static/index.d.ts                     |  2 +-
 types/node-xmpp-core/index.d.ts                  |  2 +-
 types/node/v8/node-tests.ts                      | 16 ++++++++--------
 types/node/v9/node-tests.ts                      | 16 ++++++++--------
 .../passport-oauth2-client-password-tests.ts     |  2 +-
 types/q/index.d.ts                               |  2 +-
 25 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/types/auth-header/index.d.ts b/types/auth-header/index.d.ts
index fab462be9e..d5b5a27f77 100644
--- a/types/auth-header/index.d.ts
+++ b/types/auth-header/index.d.ts
@@ -7,7 +7,7 @@
 type Params =
     | Array<[string, string | ReadonlyArray<string>]>
     | {[key: string]: string | ReadonlyArray<string>};
-export {Params};
+export { Params };
 
 export interface TokenOptions {
     scheme: string;
diff --git a/types/jquery.transit/jquery.transit-tests.ts b/types/jquery.transit/jquery.transit-tests.ts
index 4f3b41f228..f4e1118799 100644
--- a/types/jquery.transit/jquery.transit-tests.ts
+++ b/types/jquery.transit/jquery.transit-tests.ts
@@ -20,7 +20,7 @@ class Assert {
 	static passedTests: number = 0;
 
 	static Results() {
-		console.log('Tests succeeded - ' + this.passedTests + '/' + this.totalTests + '; Tests failed - ' + (this.totalTests - this.passedTests) + '/' + this.totalTests);
+		console.log('Tests succeeded - ' + Assert.passedTests + '/' + Assert.totalTests + '; Tests failed - ' + (Assert.totalTests - Assert.passedTests) + '/' + Assert.totalTests);
 	}
 
 	static AssertionFailed(actual: any, expected: any, test: string) {
@@ -28,21 +28,21 @@ class Assert {
 	}
 
 	static Equal(actual: any, expected: any, test?: string) {
-		this.totalTests++;
+		Assert.totalTests++;
 		if (actual === expected) {
-			this.passedTests++;
+			Assert.passedTests++;
 			return;
 		}
-		this.AssertionFailed(actual, expected, test);
+		Assert.AssertionFailed(actual, expected, test);
 	}
 
 	static NotEqual(actual: any, expected: any, test?: string) {
-		this.totalTests++;
+		Assert.totalTests++;
 		if (actual !== expected) {
-			this.passedTests++;
+			Assert.passedTests++;
 			return;
 		}
-		this.AssertionFailed(actual, expected, test);
+		Assert.AssertionFailed(actual, expected, test);
 	}
 }
 
diff --git a/types/material__base/index.d.ts b/types/material__base/index.d.ts
index 1ce92aafa7..1fdceb6f9f 100644
--- a/types/material__base/index.d.ts
+++ b/types/material__base/index.d.ts
@@ -24,4 +24,4 @@
 import MDCFoundation, { MDCNumbers, MDCStrings } from './foundation';
 import MDCComponent from './component';
 
-export {MDCNumbers, MDCStrings, MDCFoundation, MDCComponent};
+export { MDCNumbers, MDCStrings, MDCFoundation, MDCComponent };
diff --git a/types/material__checkbox/index.d.ts b/types/material__checkbox/index.d.ts
index 36047917f3..72c4b80948 100644
--- a/types/material__checkbox/index.d.ts
+++ b/types/material__checkbox/index.d.ts
@@ -27,7 +27,7 @@ import { MDCSelectionControl } from 'material__selection-control';
 import MDCCheckboxFoundation from './foundation';
 import { MDCRipple } from 'material__ripple';
 
-export {MDCCheckboxAdapter, MDCCheckboxFoundation};
+export { MDCCheckboxAdapter, MDCCheckboxFoundation };
 
 export class MDCCheckbox extends MDCComponent<MDCCheckboxAdapter, MDCCheckboxFoundation> implements MDCSelectionControl {
     static attachTo(root: Element): MDCCheckbox;
diff --git a/types/material__dialog/index.d.ts b/types/material__dialog/index.d.ts
index cfb1649ada..5902170318 100644
--- a/types/material__dialog/index.d.ts
+++ b/types/material__dialog/index.d.ts
@@ -25,7 +25,7 @@ import MDCDialogFoundation from './foundation';
 import MDCDialogAdapter from './adapter';
 import * as util from './util';
 
-export {MDCDialogAdapter, MDCDialogFoundation, util};
+export { MDCDialogAdapter, MDCDialogFoundation, util };
 
 export class MDCDialog extends MDCComponent<MDCDialogAdapter, MDCDialogFoundation> {
     static attachTo(root: Element): MDCDialog;
diff --git a/types/material__dom/index.d.ts b/types/material__dom/index.d.ts
index b9f18cf598..9430391f6a 100644
--- a/types/material__dom/index.d.ts
+++ b/types/material__dom/index.d.ts
@@ -29,4 +29,4 @@
 
 import * as ponyfill from './ponyfill';
 
-export {ponyfill};
+export { ponyfill };
diff --git a/types/material__form-field/index.d.ts b/types/material__form-field/index.d.ts
index 6b9b124cf8..0ff56c7259 100644
--- a/types/material__form-field/index.d.ts
+++ b/types/material__form-field/index.d.ts
@@ -26,7 +26,7 @@ import MDCFormFieldFoundation from './foundation';
 import MDCFormFieldAdapter from './adapter';
 import { MDCSelectionControl } from 'material__selection-control';
 
-export {MDCFormFieldAdapter, MDCFormFieldFoundation};
+export { MDCFormFieldAdapter, MDCFormFieldFoundation };
 
 export class MDCFormField extends MDCComponent<MDCFormFieldAdapter, MDCFormFieldFoundation> {
     static attachTo(root: Element): MDCFormField;
diff --git a/types/material__icon-toggle/index.d.ts b/types/material__icon-toggle/index.d.ts
index 314ee91015..82d9485fee 100644
--- a/types/material__icon-toggle/index.d.ts
+++ b/types/material__icon-toggle/index.d.ts
@@ -26,7 +26,7 @@ import MDCIconToggleFoundation from './foundation';
 import MDCIconToggleAdapter from './adapter';
 import { MDCRipple } from 'material__ripple';
 
-export {MDCIconToggleAdapter, MDCIconToggleFoundation};
+export { MDCIconToggleAdapter, MDCIconToggleFoundation };
 
 export class MDCIconToggle extends MDCComponent<MDCIconToggleAdapter, MDCIconToggleFoundation> {
     static attachTo(root: Element): MDCIconToggle;
diff --git a/types/material__list/index.d.ts b/types/material__list/index.d.ts
index 80619ae4d4..28530d0c3d 100644
--- a/types/material__list/index.d.ts
+++ b/types/material__list/index.d.ts
@@ -51,4 +51,4 @@ export class MDCList {
   getDefaultFoundation(): MDCListFoundation;
 }
 
-export { MDCListFoundation};
+export {  MDCListFoundation };
diff --git a/types/material__radio/index.d.ts b/types/material__radio/index.d.ts
index 93dc5e5cd8..0f691a77c0 100644
--- a/types/material__radio/index.d.ts
+++ b/types/material__radio/index.d.ts
@@ -27,7 +27,7 @@ import MDCRadioAdapter from './adapter';
 import MDCRadioFoundation from './foundation';
 import { MDCRipple } from 'material__ripple';
 
-export {MDCRadioAdapter, MDCRadioFoundation};
+export { MDCRadioAdapter, MDCRadioFoundation };
 
 export class MDCRadio extends MDCComponent<MDCRadioAdapter, MDCRadioFoundation> implements MDCSelectionControl {
     static attachTo(root: Element): MDCRadio;
diff --git a/types/material__ripple/index.d.ts b/types/material__ripple/index.d.ts
index 7e756327c9..13c0f423f3 100644
--- a/types/material__ripple/index.d.ts
+++ b/types/material__ripple/index.d.ts
@@ -26,7 +26,7 @@ import MDCRippleAdapter from './adapter';
 import MDCRippleFoundation from './foundation';
 import * as util from './util';
 
-export {MDCRippleAdapter, MDCRippleFoundation, util};
+export { MDCRippleAdapter, MDCRippleFoundation, util };
 
 export class MDCRipple extends MDCComponent<MDCRippleAdapter, MDCRippleFoundation> {
     static attachTo(root: Element, options?: { isUnbounded?: boolean; }): MDCRipple;
diff --git a/types/material__select/index.d.ts b/types/material__select/index.d.ts
index 5f4a0b385c..bca3ffea09 100644
--- a/types/material__select/index.d.ts
+++ b/types/material__select/index.d.ts
@@ -26,7 +26,7 @@ import MDCSelectAdapter from './adapter';
 import { MDCFloatingLabel } from 'material__floating-label';
 import { MDCLineRipple } from 'material__line-ripple';
 
-export {MDCSelectAdapter, MDCSelectFoundation};
+export { MDCSelectAdapter, MDCSelectFoundation };
 
 export class MDCSelect extends MDCComponent<MDCSelectAdapter, MDCSelectFoundation> {
     static attachTo(root: Element): MDCSelect;
diff --git a/types/material__slider/index.d.ts b/types/material__slider/index.d.ts
index 9ba457074d..397845166c 100644
--- a/types/material__slider/index.d.ts
+++ b/types/material__slider/index.d.ts
@@ -25,7 +25,7 @@ import MDCComponent from 'material__base/component';
 import MDCSliderFoundation from './foundation';
 import MDCSliderAdapter from './adapter';
 
-export {MDCSliderAdapter, MDCSliderFoundation};
+export { MDCSliderAdapter, MDCSliderFoundation };
 
 export class MDCSlider extends MDCComponent<MDCSliderAdapter, MDCSliderFoundation> {
     static attachTo(root: Element): MDCSlider;
diff --git a/types/material__snackbar/index.d.ts b/types/material__snackbar/index.d.ts
index 58dbce3f19..daecf26078 100644
--- a/types/material__snackbar/index.d.ts
+++ b/types/material__snackbar/index.d.ts
@@ -24,7 +24,7 @@ import { MDCComponent } from 'material__base';
 import MDCSnackbarAdapter from './adapter';
 import MDCSnackbarFoundation, { MDCSnackbarData } from './foundation';
 
-export {MDCSnackbarAdapter, MDCSnackbarFoundation};
+export { MDCSnackbarAdapter, MDCSnackbarFoundation };
 
 export class MDCSnackbar extends MDCComponent<MDCSnackbarAdapter, MDCSnackbarFoundation> {
     static attachTo(root: Element): MDCSnackbar;
diff --git a/types/material__tabs/tab-bar/index.d.ts b/types/material__tabs/tab-bar/index.d.ts
index d50d841105..fc840138be 100644
--- a/types/material__tabs/tab-bar/index.d.ts
+++ b/types/material__tabs/tab-bar/index.d.ts
@@ -20,7 +20,7 @@ import { MDCTab } from '../tab';
 import MDCTabBarFoundation from './foundation';
 import MDCTabBarAdapter from './adapter';
 
-export {MDCTabBarAdapter, MDCTabBarFoundation};
+export { MDCTabBarAdapter, MDCTabBarFoundation };
 
 export class MDCTabBar extends MDCComponent<MDCTabBarAdapter, MDCTabBarFoundation> {
     static attachTo(root: Element): MDCTabBar;
diff --git a/types/material__tabs/tab/index.d.ts b/types/material__tabs/tab/index.d.ts
index 43fc8b4ec6..531cd88f26 100644
--- a/types/material__tabs/tab/index.d.ts
+++ b/types/material__tabs/tab/index.d.ts
@@ -18,7 +18,7 @@ import MDCComponent from 'material__base/component';
 import MDCTabFoundation from './foundation';
 import MDCTabAdapter from './adapter';
 
-export {MDCTabAdapter, MDCTabFoundation};
+export { MDCTabAdapter, MDCTabFoundation };
 
 export class MDCTab extends MDCComponent<MDCTabAdapter, MDCTabFoundation> {
     static attachTo(root: Element): MDCTab;
diff --git a/types/material__textfield/helper-text/index.d.ts b/types/material__textfield/helper-text/index.d.ts
index 7b94f38264..57b356271a 100644
--- a/types/material__textfield/helper-text/index.d.ts
+++ b/types/material__textfield/helper-text/index.d.ts
@@ -20,7 +20,7 @@ import MDCComponent from 'material__base/component';
 import MDCTextFieldHelperTextAdapter from './adapter';
 import MDCTextFieldHelperTextFoundation from './foundation';
 
-export {MDCTextFieldHelperTextAdapter, MDCTextFieldHelperTextFoundation};
+export { MDCTextFieldHelperTextAdapter, MDCTextFieldHelperTextFoundation };
 
 export class MDCTextFieldHelperText extends MDCComponent<MDCTextFieldHelperTextAdapter, MDCTextFieldHelperTextFoundation> {
     static attachTo(root: Element): MDCTextFieldHelperText;
diff --git a/types/material__toolbar/index.d.ts b/types/material__toolbar/index.d.ts
index c7458e9a58..0b9a0b419c 100644
--- a/types/material__toolbar/index.d.ts
+++ b/types/material__toolbar/index.d.ts
@@ -25,7 +25,7 @@ import { MDCComponent } from 'material__base';
 import MDCToolbarFoundation from './foundation';
 import MDCToolbarAdapter from './adapter';
 
-export {MDCToolbarAdapter, MDCToolbarFoundation};
+export { MDCToolbarAdapter, MDCToolbarFoundation };
 
 export class MDCToolbar extends MDCComponent<MDCToolbarAdapter, MDCToolbarFoundation> {
     static attachTo(root: Element): MDCToolbar;
diff --git a/types/nodal/nodal-tests.ts b/types/nodal/nodal-tests.ts
index f48adadd62..8bb60b6d14 100644
--- a/types/nodal/nodal-tests.ts
+++ b/types/nodal/nodal-tests.ts
@@ -84,7 +84,7 @@ class AccessToken extends Nodal.Model {
 
           new AccessToken({
             user_id: user.get('id'),
-            access_token: this.generateAccessTokenString(user.get('id'), user.get('email'), new Date().valueOf()),
+            access_token: AccessToken.generateAccessTokenString(user.get('id'), user.get('email'), new Date().valueOf()),
             token_type: 'bearer',
             expires_at: (new Date(new Date().valueOf() + (30 * 24 * 60 * 60 * 1000))),
             ip_address: params.ip_address
@@ -94,7 +94,7 @@ class AccessToken extends Nodal.Model {
   }
 
   public static verify (params: any, callback: Function) {
-    this.query()
+    AccessToken.query()
       .join('user')
       .where({
         access_token: params.auth.access_token,
@@ -116,7 +116,7 @@ class AccessToken extends Nodal.Model {
   }
 
   public static logout (params: any, callback: Function) {
-    this.verify(params, (err: Error, accessToken: AccessToken) => {
+    AccessToken.verify(params, (err: Error, accessToken: AccessToken) => {
       if (err) {
         return callback(err);
       }
diff --git a/types/node-static/index.d.ts b/types/node-static/index.d.ts
index f33d381468..65cb434f08 100644
--- a/types/node-static/index.d.ts
+++ b/types/node-static/index.d.ts
@@ -53,4 +53,4 @@ export class Server {
 }
 
 export const version: [number, number, number];
-export {mime};
+export { mime };
diff --git a/types/node-xmpp-core/index.d.ts b/types/node-xmpp-core/index.d.ts
index 43ce7f7238..701815fcdc 100644
--- a/types/node-xmpp-core/index.d.ts
+++ b/types/node-xmpp-core/index.d.ts
@@ -8,7 +8,7 @@ import { Element } from 'ltx';
 import { EventEmitter } from 'events';
 
 // fixme: not ideal
-export {createElement, Element, escapeXML, escapeXMLText} from 'ltx';
+export { createElement, Element, escapeXML, escapeXMLText } from 'ltx';
 
 export class Connection extends EventEmitter {
     constructor(opts?: any);
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 0ca392ab33..312f2d7acb 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -800,14 +800,14 @@ namespace util_tests {
             }
 
             static test(): void {
-                var cfn = util.callbackify(this.fn);
-                var cfnE = util.callbackify(this.fnE);
-                var cfnT1 = util.callbackify(this.fnT1);
-                var cfnT1E = util.callbackify(this.fnT1E);
-                var cfnTResult = util.callbackify(this.fnTResult);
-                var cfnTResultE = util.callbackify(this.fnTResultE);
-                var cfnT1TResult = util.callbackify(this.fnT1TResult);
-                var cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+                var cfn = util.callbackify(callbackifyTest.fn);
+                var cfnE = util.callbackify(callbackifyTest.fnE);
+                var cfnT1 = util.callbackify(callbackifyTest.fnT1);
+                var cfnT1E = util.callbackify(callbackifyTest.fnT1E);
+                var cfnTResult = util.callbackify(callbackifyTest.fnTResult);
+                var cfnTResultE = util.callbackify(callbackifyTest.fnTResultE);
+                var cfnT1TResult = util.callbackify(callbackifyTest.fnT1TResult);
+                var cfnT1TResultE = util.callbackify(callbackifyTest.fnT1TResultE);
 
                 cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
                 cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index 7d29ffbf95..d454667ea8 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -826,14 +826,14 @@ namespace util_tests {
             }
 
             static test(): void {
-                var cfn = util.callbackify(this.fn);
-                var cfnE = util.callbackify(this.fnE);
-                var cfnT1 = util.callbackify(this.fnT1);
-                var cfnT1E = util.callbackify(this.fnT1E);
-                var cfnTResult = util.callbackify(this.fnTResult);
-                var cfnTResultE = util.callbackify(this.fnTResultE);
-                var cfnT1TResult = util.callbackify(this.fnT1TResult);
-                var cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+                var cfn = util.callbackify(callbackifyTest.fn);
+                var cfnE = util.callbackify(callbackifyTest.fnE);
+                var cfnT1 = util.callbackify(callbackifyTest.fnT1);
+                var cfnT1E = util.callbackify(callbackifyTest.fnT1E);
+                var cfnTResult = util.callbackify(callbackifyTest.fnTResult);
+                var cfnTResultE = util.callbackify(callbackifyTest.fnTResultE);
+                var cfnT1TResult = util.callbackify(callbackifyTest.fnT1TResult);
+                var cfnT1TResultE = util.callbackify(callbackifyTest.fnT1TResultE);
 
                 cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
                 cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
diff --git a/types/passport-oauth2-client-password/passport-oauth2-client-password-tests.ts b/types/passport-oauth2-client-password/passport-oauth2-client-password-tests.ts
index 69e03cd6d4..84d7da4431 100644
--- a/types/passport-oauth2-client-password/passport-oauth2-client-password-tests.ts
+++ b/types/passport-oauth2-client-password/passport-oauth2-client-password-tests.ts
@@ -17,7 +17,7 @@ class Client implements IClient {
     public clientSecret: string;
 
     static findOne(client: IClient, callback: (err: any, client: Client) => void): void {
-        callback(null, new this);
+        callback(null, new Client);
     }
 }
 //#endregion
diff --git a/types/q/index.d.ts b/types/q/index.d.ts
index 7926965cf8..5dc94f67d2 100644
--- a/types/q/index.d.ts
+++ b/types/q/index.d.ts
@@ -331,7 +331,7 @@ declare namespace Q {
 	/**
 	 * Alias for fcall()
 	 */
-	export {fcall as try};
+	export { fcall as try };
 
 	/**
 	 * Returns a promise for the result of calling the named method of an object with the given variadic arguments.

From 079b3543d96b9794d0ae1e82a466adc37c51ec39 Mon Sep 17 00:00:00 2001
From: Sebastian Vera <u.verainf@gmail.com>
Date: Wed, 13 Mar 2019 18:06:01 +0100
Subject: [PATCH 613/924] Add missing option's concurrently attribute to
 Sequelize addIndex method

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 9aba040234..73e3f3c222 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -5025,6 +5025,11 @@ declare namespace sequelize {
          * A hash of attributes to limit your index(Filtered Indexes - MSSQL & PostgreSQL only)
          */
         where?: AnyWhereOptions;
+
+        /**
+         * Pass CONCURRENT so other operations run while the index is created - PostgresSQL only. Default is false
+         */
+        concurrently?: boolean;
     }
 
     /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3a13906f06..588b3728d2 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1186,6 +1186,7 @@ queryInterface.addIndex( { schema : 'a', tableName : 'c' }, ['d', 'e'], { loggin
 queryInterface.showIndex( { schema : 'schema', tableName : 'table' }, { logging : function() {} } );
 queryInterface.addIndex( 'Group', ['from'] );
 queryInterface.addIndex( 'Group', ['from'], { indexName: 'group_from' } );
+queryInterface.addIndex("Group", ["from"], { concurrently: true });
 queryInterface.describeTable( '_Users', { logging : function() {} } );
 queryInterface.createTable( 's', { table_id : { type : Sequelize.INTEGER, primaryKey : true, autoIncrement : true } } );
 /* NOTE https://github.com/DefinitelyTyped/DefinitelyTyped/pull/5590

From a4599ab327062ac175f22c3ba7a8c71d570f271f Mon Sep 17 00:00:00 2001
From: Jojoshua <Jojoshua@gmail.com>
Date: Wed, 13 Mar 2019 13:18:37 -0400
Subject: [PATCH 614/924] Fix field required. Replace tick with tickCross
 (#33832)

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

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
index 751a97a7f2..ba03cbabae 100644
--- a/types/tabulator-tables/index.d.ts
+++ b/types/tabulator-tables/index.d.ts
@@ -753,7 +753,7 @@ declare namespace Tabulator {
         /** title - Required This is the title that will be displayed in the header for this column */
         title: string;
         /** field - Required (not required in icon/button columns) this is the key for this column in the data array*/
-        field?: string;
+        field: string;
         /** visible - (boolean, default - true) determines if the column is visible. (see Column Visibility for more details */
         visible?: boolean;
 
@@ -1006,7 +1006,7 @@ You can pass an optional additional property with sorter, sorterParams that shou
     type Formatter = "plaintext" | "textarea" | "html" | "money" | "image" | "datetime" | "datetimediff" | "link" | "tickCross" | "color" | "star" | "traffic" | "progress" | "lookup" | "buttonTick" | "buttonCross" | "rownum" | "handle" | ((cell: CellComponent, formatterParams: {}, onRendered: EmptyCallback) => string | HTMLElement);
     type FormatterParams = MoneyParams | ImageParams | LinkParams | DateTimeParams | DateTimeDifferenceParams | TickCrossParams | TrafficParams | StarRatingParams | JSONRecord | ((cell: CellComponent) => {});
 
-    type Editor = true | "input" | "textarea" | "number" | "range" | "tick" | "star" | "select" | "autocomplete" | ((cell: CellComponent, onRendered: EmptyCallback, success: ValueVoidCallback, cancel: ValueVoidCallback, editorParams: {}) => HTMLElement | false);
+    type Editor = true | "input" | "textarea" | "number" | "range" | "tickCross" | "star" | "select" | "autocomplete" | ((cell: CellComponent, onRendered: EmptyCallback, success: ValueVoidCallback, cancel: ValueVoidCallback, editorParams: {}) => HTMLElement | false);
 
     type EditorParams = NumberParams | CheckboxParams | SelectParams | AutoCompleteParams | ((cell: CellComponent) => {});
 
diff --git a/types/tabulator-tables/tabulator-tables-tests.ts b/types/tabulator-tables/tabulator-tables-tests.ts
index 3a33817b4f..424aec4aa2 100644
--- a/types/tabulator-tables/tabulator-tables-tests.ts
+++ b/types/tabulator-tables/tabulator-tables-tests.ts
@@ -85,7 +85,7 @@ let row1: Tabulator.RowComponent;
 let row2: Tabulator.RowComponent;
 
 // column definitions
-let colDef: Tabulator.ColumnDefinition = { title: "title" };
+let colDef: Tabulator.ColumnDefinition = { title: "title", field: "" };
 colDef.sorter = customSorter;
 
 // prettier-ignore

From c44def78ccc5d8fe940da29c2f4a40cc187504a2 Mon Sep 17 00:00:00 2001
From: orblazer <orblazer.minecraft@gmail.com>
Date: Wed, 13 Mar 2019 18:19:56 +0100
Subject: [PATCH 615/924] mongoose: Add replaceOne and updateOne to
 MongooseDocument (#33814)

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 7b02fb96d6..44f3b1111a 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -19,6 +19,7 @@
 //                 Frontend Monster <https://github.com/frontendmonster>
 //                 Ming Chen <https://github.com/mingchen>
 //                 Olga Isakova <https://github.com/penumbra1>
+//                 Orblazer <https://github.com/orblazer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1431,11 +1432,19 @@ declare module "mongoose" {
      */
     unmarkModified(path: string): void;
 
+    /** Sends an replaceOne command with this document _id as the query selector.  */
+    replaceOne(replacement: any, callback?: (err: any, raw: any) => void): Query<any>;
+
     /** Sends an update command with this document _id as the query selector.  */
     update(doc: any, callback?: (err: any, raw: any) => void): Query<any>;
     update(doc: any, options: ModelUpdateOptions,
       callback?: (err: any, raw: any) => void): Query<any>;
 
+    /** Sends an updateOne command with this document _id as the query selector.  */
+    updateOne(doc: any, callback?: (err: any, raw: any) => void): Query<any>;
+    updateOne(doc: any, options: ModelUpdateOptions,
+      callback?: (err: any, raw: any) => void): Query<any>;
+
     /**
      * Executes registered validation rules for this document.
      * @param optional options internal options

From e5542b34f715024507107906f3d672f0ee017006 Mon Sep 17 00:00:00 2001
From: David <moraleja39@gmail.com>
Date: Wed, 13 Mar 2019 18:21:12 +0100
Subject: [PATCH 616/924] Updated for credential 2.0.0 (#33767)

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

diff --git a/types/credential/credential-tests.ts b/types/credential/credential-tests.ts
index 9d1a59ec65..81b6c368c0 100644
--- a/types/credential/credential-tests.ts
+++ b/types/credential/credential-tests.ts
@@ -11,15 +11,20 @@ var newPassword = 'I have a really great password.';
 pw.hash(newPassword, function(err, hash) {
     if (err) { throw err; }
     console.log('Store the password hash.', hash);
+    if (typeof hash === "string") {
+        console.log('The hash is a string, as expected');
+    } else {
+        console.log('The has is NOT a string');
+    }
 });
 
-var storedHash = {
+var storedHash = JSON.stringify({
     "hash": "gNofnhlBl36AdRyktwATxKoqWKa6hsIEzwCmW/YXN//7PtiJwCRbepV9fUKu0L9TJELCKoDiBy6rGM8ov7lg2yLY",
     "salt": "yyN3KUzlr4KrKWMM2K3d2Ddxf8OTq+vkKG+mtnmQVIibxSJz8drfzkYzqcH0EM+PVKR/1nClRr/CPDuJsq+FOcIw",
     "keyLength": 66,
     "hashMethod": "pbkdf2",
     "iterations": 181019
-};
+});
 var userInput = 'I have a really great password.';
 
 pw.verify(storedHash, userInput, function(err, isValid) {
diff --git a/types/credential/index.d.ts b/types/credential/index.d.ts
index 16b588dd72..cec4719468 100644
--- a/types/credential/index.d.ts
+++ b/types/credential/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for credential
+// Type definitions for credential 2.0
 // Project: https://github.com/ericelliott/credential
 // Definitions by: Phú <https://github.com/phuvo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,24 +10,16 @@ interface defaultOptions {
     hashMethod: string;
 }
 
-interface hashObject {
-    hash: string;
-    salt: string;
-    keyLength: number;
-    hashMethod: string;
-    iterations: number;
-}
-
-type HashCallback = (err: Error, hash: hashObject) => void;
+type HashCallback = (err: Error, hash: string) => void;
 type VerifyCallback = (err: Error, isValid: boolean) => void;
 
 
 declare function credential(defaultOptions?: defaultOptions): {
     hash(password: string, callback: HashCallback): void;
-    hash(password: string): Promise<hashObject>;
+    hash(password: string): Promise<string>;
     // iterations(work: number, base): number;
-    verify(hash: hashObject | string, password: string, callback: VerifyCallback): void;
-    verify(hash: hashObject | string, password: string): Promise<boolean>;
+    verify(hash: string, password: string, callback: VerifyCallback): void;
+    verify(hash: string, password: string): Promise<boolean>;
     expired(hash: string, days: number): boolean;
 }
 

From a1d771d49cd6bf227593e24341ae4b218841ceba Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Wed, 13 Mar 2019 18:21:34 +0100
Subject: [PATCH 617/924] Update Option.d.ts (#33760)

---
 types/react-select/lib/components/Option.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-select/lib/components/Option.d.ts b/types/react-select/lib/components/Option.d.ts
index d7d20ec325..c770d91afa 100644
--- a/types/react-select/lib/components/Option.d.ts
+++ b/types/react-select/lib/components/Option.d.ts
@@ -15,6 +15,7 @@ interface InnerProps {
   id: string;
   key: string;
   onClick: MouseEventHandler<HTMLDivElement>;
+  onMouseMove: MouseEventHandler<HTMLDivElement>;
   onMouseOver: MouseEventHandler<HTMLDivElement>;
   tabIndex: number;
 }

From 4a70f924b0e203b2886a2ce9cfe0b1c80a00f186 Mon Sep 17 00:00:00 2001
From: Roey Berman <roey.berman@gmail.com>
Date: Wed, 13 Mar 2019 19:22:16 +0200
Subject: [PATCH 618/924] Support recursive matchers in sinon (#33838)

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

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index d05495078c..e07a69eb74 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -10,6 +10,7 @@
 //                 John Wood <https://github.com/johnjesse>
 //                 Alec Flett <https://github.com/alecf>
 //                 Simon Schick <https://github.com/SimonSchick>
+//                 Roey Berman <https://github.com/bergundy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/sinon/ts3.1/index.d.ts b/types/sinon/ts3.1/index.d.ts
index 80ec4ee483..444ed86f22 100644
--- a/types/sinon/ts3.1/index.d.ts
+++ b/types/sinon/ts3.1/index.d.ts
@@ -6,7 +6,7 @@ interface Document {} // tslint:disable-line no-empty-interface
 
 declare namespace Sinon {
     type MatchArguments<T> = {
-        [K in keyof T]: SinonMatcher | T[K];
+        [K in keyof T]: SinonMatcher | MatchArguments<T[K]> | T[K];
     };
 
     interface SinonSpyCallApi<TArgs extends any[] = any[], TReturnValue = any> {
diff --git a/types/sinon/ts3.1/sinon-tests.ts b/types/sinon/ts3.1/sinon-tests.ts
index 8e74cf30cf..6251692c2d 100644
--- a/types/sinon/ts3.1/sinon-tests.ts
+++ b/types/sinon/ts3.1/sinon-tests.ts
@@ -478,6 +478,7 @@ function testStub() {
         foo(arg: string): number { return 1; }
         promiseFunc() { return Promise.resolve('foo'); }
         promiseLikeFunc() { return Promise.resolve('foo') as PromiseLike<string>; }
+        fooDeep(arg: { s: string }): void { return undefined; }
     };
     const instance = new obj();
 
@@ -557,6 +558,9 @@ function testStub() {
     stub2.withArgs('a').returns(1);
     stub2.withArgs('a').returns('a'); // $ExpectError
 
+    const stub3 = sinon.stub(instance, 'fooDeep').named('namedStubDeep');
+    stub3.calledWith({ s: sinon.match.string });
+
     const pStub = sinon.stub(instance, 'promiseFunc');
     pStub.resolves();
     pStub.resolves('foo');

From 9ac36350fbeb53b91d8e402502b5d7ee91e4ba2f Mon Sep 17 00:00:00 2001
From: Mehdi Lahlou <mlahlou@protonmail.ch>
Date: Wed, 13 Mar 2019 18:22:52 +0100
Subject: [PATCH 619/924] [react-jsonschema-form] fix missing `label` property
 (#33808)

* fix(types/react-jsonschema-form): add missing `React.ReactElement` type argument

* chore(types/react-jsonschema-form): add myself as contributor

* fix(types/react-jsonschema-form): add missing `label` property on `WidgetProps`

* chore: update major / minor version number to 1.3

* Revert "fix(types/react-jsonschema-form): add missing `React.ReactElement` type argument"

This reverts commit 4c45ad1b3dfa8e7c5cd8b7e42cfa9310db928c44.
---
 types/react-jsonschema-form/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index 403356a89a..c43e04e589 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-jsonschema-form 1.0.1
+// Type definitions for react-jsonschema-form 1.3
 // Project: https://github.com/mozilla-services/react-jsonschema-form
 // Definitions by: Dan Fox <https://github.com/iamdanfox>
 //                 Ivan Jiang <https://github.com/iplus26>
@@ -6,6 +6,7 @@
 //                 Lucian Buzzo <https://github.com/LucianBuzzo>
 //                 Sylvain Thénault <https://github.com/sthenault>
 //                 Sebastian Busch <https://github.com/sbusch>
+//                 Mehdi Lahlou <https://github.com/medfreeman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -87,6 +88,7 @@ declare module "react-jsonschema-form" {
         formContext: any;
         onBlur: (id: string, value: string) => void;
         onFocus: (id: string, value: string) => void;
+        label: string;
     }
 
     export type Widget =

From f447708212e2ba190a65025321585427194c7104 Mon Sep 17 00:00:00 2001
From: Hugo Capocci <h.capocci@gmail.com>
Date: Wed, 13 Mar 2019 18:23:22 +0100
Subject: [PATCH 620/924] Fix options.width definition in
 bootstrap-growl-ifightcrime (#33806)

* Fix options.width definition in bootstrap-growl-ifightcrime

* take review into account: keep width attribute as optional
---
 .../bootstrap-growl-ifightcrime-tests.ts            | 13 ++++++++++++-
 types/bootstrap-growl-ifightcrime/index.d.ts        |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/types/bootstrap-growl-ifightcrime/bootstrap-growl-ifightcrime-tests.ts b/types/bootstrap-growl-ifightcrime/bootstrap-growl-ifightcrime-tests.ts
index 78f92fcf71..a6b023d121 100644
--- a/types/bootstrap-growl-ifightcrime/bootstrap-growl-ifightcrime-tests.ts
+++ b/types/bootstrap-growl-ifightcrime/bootstrap-growl-ifightcrime-tests.ts
@@ -14,7 +14,6 @@ let options: BootstrapGrowlIfightcrime.Options = {
     type: 'info',
     offset: offsetOptions,
     align: 'right',
-    width: 250,
     delay: 4000,
     allow_dismiss: true,
     stackup_spacing: 10
@@ -22,4 +21,16 @@ let options: BootstrapGrowlIfightcrime.Options = {
 
 $(document).ready(() => {
     $.bootstrapGrowl('Alert with options', options);
+
+    const optionsWidthAuto: BootstrapGrowlIfightcrime.Options  = {
+        ...options,
+        width: 'auto'
+    };
+    $.bootstrapGrowl('Alert with options, width=auto', optionsWidthAuto);
+
+    const optionsWidthAsNumber = {
+        ...options,
+        width: 120
+    };
+    $.bootstrapGrowl('Alert with options, width=120', optionsWidthAsNumber);
 });
diff --git a/types/bootstrap-growl-ifightcrime/index.d.ts b/types/bootstrap-growl-ifightcrime/index.d.ts
index 45755682ea..2d37135be3 100644
--- a/types/bootstrap-growl-ifightcrime/index.d.ts
+++ b/types/bootstrap-growl-ifightcrime/index.d.ts
@@ -47,9 +47,9 @@ declare namespace BootstrapGrowlIfightcrime {
          align?: AlignType;
 
         /**
-         * Integer
+         * Integer or 'auto'
          */
-         width?: number;
+         width?: number | 'auto';
 
         /**
          * Time while the message will be displayed. It's not equivalent to the *demo* timeOut!

From ec30451574f66caa9fa5d82aedf11ab1e5c09a0b Mon Sep 17 00:00:00 2001
From: Esteban Ibarra <eibarra1992@hotmail.com>
Date: Wed, 13 Mar 2019 12:24:23 -0500
Subject: [PATCH 621/924] Add createContainer function for victory (#33786)

* Add function createContainer for victory

* Fix tests

* Update types/victory/index.d.ts

Change FunctionComponent to ComponentType

Co-Authored-By: ibarrae <eibarra1992@hotmail.com>
---
 types/victory/index.d.ts        | 22 ++++++++++++++++++++++
 types/victory/tslint.json       |  3 ++-
 types/victory/victory-tests.tsx | 19 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 4fc95db8f1..29d0dd068a 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -5,6 +5,8 @@
 //                 Krzysztof Cebula <https://github.com/Havret>
 //                 Vitaliy Polyanskiy <https://github.com/allreadyExisted>
 //                 James Lismore <https://github.com/jlismore>
+//                 Stack Builders <https://github.com/stackbuilders>
+//                 Esteban Ibarra <https://github.com/ibarrae>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -2424,4 +2426,24 @@ declare module "victory" {
    * Data changes are animated with VictoryAnimation.
    */
   export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+
+  export type ContainerType =
+    | "brush"
+    | "cursor"
+    | "selection"
+    | "voronoi"
+    | "zoom";
+
+  /**
+   * createContainer makes a container component with multiple behaviors.
+   * It allows you to effectively combine any two of the following containers:
+   * VictoryBrushContainer, VictoryCursorContainer, VictorySelectionContainer,
+   * VictoryVoronoiContainer, or VictoryZoomContainer.
+   * @param c1 : "brush" | "cursor" | "selection" | "voronoi" | "zoom"
+   * @param c2 : "brush" | "cursor" | "selection" | "voronoi" | "zoom"
+   */
+  export function createContainer<V, W>(
+    c1: ContainerType,
+    c2: ContainerType
+  ): React.ComponentType<V & W>;
 }
diff --git a/types/victory/tslint.json b/types/victory/tslint.json
index 2fccde6e9b..ec47eebc69 100644
--- a/types/victory/tslint.json
+++ b/types/victory/tslint.json
@@ -9,6 +9,7 @@
         "no-declare-current-package": false,
         "no-empty-interface": false,
         "no-single-declare-module": false,
-        "strict-export-declare-modifiers": false
+        "strict-export-declare-modifiers": false,
+        "no-unnecessary-generics": false
     }
 }
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 32c9b3160d..ac60806cee 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -14,7 +14,10 @@ import {
     VictoryTheme,
     VictoryLegend,
     VictoryBoxPlot,
-    VictoryGroup
+    VictoryGroup,
+    createContainer,
+    VictoryZoomContainerProps,
+    VictoryBrushContainerProps
 } from "victory";
 
 // VictoryAnimation test
@@ -804,3 +807,17 @@ test = (
         }]}
     />
 );
+
+// createContainer test
+
+const VictoryZoomBrushContainer = createContainer<
+    VictoryZoomContainerProps,
+    VictoryBrushContainerProps
+>("zoom", "brush");
+
+test = (
+    <VictoryZoomBrushContainer
+        brushDomain={[0, 500]}
+        zoomDomain={[0, 500]}
+    />
+);

From 46dcd11868e935fb2a8bbd25478df834c0774ac8 Mon Sep 17 00:00:00 2001
From: Adam Duren <adamduren@gmail.com>
Date: Wed, 13 Mar 2019 10:26:16 -0700
Subject: [PATCH 622/924] Add automatic indicator to IPayout (#33293)

https://stripe.com/docs/api/payouts/object#payout_object-automatic
---
 types/stripe/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 33f253016d..0c35712f71 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -16,6 +16,7 @@
 //                 Simon Schick <https://github.com/SimonSchick>
 //                 Slava Yultyyev <https://github.com/yultyyev>
 //                 Corey Psoinos <https://github.com/cpsoinos>
+//                 Adam Duren <https://github.com/adamduren>
 //                 Saransh Kataria <https://github.com/saranshkataria>
 //                 Jonas Keisel <https://github.com/0xJoKe>
 //                 Andrew Delianides <https://github.com/delianides>
@@ -2852,6 +2853,11 @@ declare namespace Stripe {
              */
             arrival_date: number;
 
+            /**
+             * Returns true if the payout was created by an automated payout schedule, and false if it was requested manually.
+             */
+            automatic: boolean;
+
             /**
              * Balance transaction that describes the impact of this transfer on your account balance. [Expandable]
              */

From 5ab3d6837720d1b5238ef3e7cabe167771dc962c Mon Sep 17 00:00:00 2001
From: Antoine Hanriat <ahanriat@gmail.com>
Date: Wed, 13 Mar 2019 18:27:27 +0100
Subject: [PATCH 623/924] Add rox-react-native types definition (#33843)

---
 types/rox-react-native/index.d.ts             | 229 ++++++++++++++++++
 .../rox-react-native-tests.ts                 |  33 +++
 types/rox-react-native/tsconfig.json          |  24 ++
 types/rox-react-native/tslint.json            |   6 +
 4 files changed, 292 insertions(+)
 create mode 100644 types/rox-react-native/index.d.ts
 create mode 100644 types/rox-react-native/rox-react-native-tests.ts
 create mode 100644 types/rox-react-native/tsconfig.json
 create mode 100644 types/rox-react-native/tslint.json

diff --git a/types/rox-react-native/index.d.ts b/types/rox-react-native/index.d.ts
new file mode 100644
index 0000000000..d44d7c5c00
--- /dev/null
+++ b/types/rox-react-native/index.d.ts
@@ -0,0 +1,229 @@
+// Type definitions for rox-react-native 4.5
+// Project: https://rollout.io
+// Definitions by: ahanriat <https://github.com/ahanriat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+/**
+ * DISCLAIMER:
+ *
+ * Those type definition are based on the Javascript browser documentation
+ * as well as using and reversing the React-Native SDK
+ *
+ * Important note: Dedicated React-Native documentation as well as open source
+ * SDK are supposed to come.
+ */
+
+export {};
+
+export interface RoxContainer {
+    [key: string]: Flag | Configuration | Variant;
+}
+
+/**
+ * The register function should be called before the call to Rox.setup()
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section-register
+ */
+export function register(namespace: string, roxContainer: RoxContainer): void;
+
+/**
+ * Initiate connection with Rox servers for the application identified by the application key.
+ * The registered containers will be synced and Rox entities will get the appropriate values.
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section-setup
+ */
+export function setup(
+    apiKey: string,
+    options?: RoxSetupOptions
+): Promise<unknown>;
+
+export interface RoxSetupOptions {
+    version?: string;
+    // https://support.rollout.io/docs/javascript-browser-api#section-configurationfetchedhandler
+    configurationFetchedHandler?(fetcherResult: RoxFetcherResult): void;
+    debugLevel?: 'verbose';
+    // https://support.rollout.io/docs/javascript-browser-api#section-using-the-impressionhandler-option
+    impressionHandler?(
+        reporting: RoxReporting,
+        experiment: RoxExperiment,
+        context: unknown
+    ): void;
+    platform?: string;
+    freeze?: 'untilLaunch' | 'none';
+}
+
+export interface RoxFetcherResult {
+    fetcherStatus:
+        | 'APPLIED_FROM_EMBEDDED'
+        | 'APPLIED_FROM_CACHE'
+        | 'APPLIED_FROM_NETWORK'
+        | 'ERROR_FETCH_FAILED';
+    creationDate: Date;
+    hasChanges: boolean;
+    errorDetails?: string;
+}
+
+export interface RoxReporting {
+    name: string;
+    value: string;
+}
+
+export interface RoxExperiment {
+    identifier: string; //  experiment id
+    name: string;
+    isArchived: boolean;
+    labels: string[]; // experiment's labels. assigned from dashboard
+}
+
+/**
+ * Note that you might have to call unfreeze after setting custom properties such as email after login
+ * https://support.rollout.io/docs/custom-properties
+ */
+export function setCustomNumberProperty(
+    name: string,
+    value: number | (() => number)
+): void;
+export function setCustomStringProperty(
+    name: string,
+    value: string | (() => string)
+): void;
+export function setCustomBooleanProperty(
+    name: string,
+    value: boolean | (() => boolean)
+): void;
+
+/**
+ * Unfreeze the state of all flags in code
+ * Calling this function will unfreeze all flags, and using a flag will return it’s most updated value
+ *
+ * https://support.rollout.io/docs/flags-update-flow#section-flag-unfreeze
+ * https://support.rollout.io/docs/javascript-browser-api#section-unfreeze
+ */
+export function unfreeze(namespace?: string): void;
+
+/**
+ * Pulls the latest configuration and flag values down from the Rollout servers
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section-fetch
+ */
+export function fetch(): Promise<unknown>;
+
+/**
+ * Default is untilForeground
+ *
+ * https://support.rollout.io/docs/flags-update-flow#section-flag-freeze-level
+ */
+export type RoxFlagFreezeLevel = 'none' | 'untilForeground' | 'untilLaunch';
+export interface RoxFlagOptions {
+    freeze?: RoxFlagFreezeLevel;
+}
+
+/**
+ * Creates a new Flag
+ * https://support.rollout.io/docs/javascript-browser-api#section--rox-flag-
+ */
+export class Flag {
+    constructor(defaultValue: boolean, options?: RoxFlagOptions);
+
+    // The name of the Flag
+    name: string;
+
+    // Returns true when the flag is enabled
+    isEnabled(): boolean;
+
+    getNameDetails(): RoxNameDetails;
+
+    // Unlock the Flag value from changes from the last time it was freezed
+    unfreeze(): void;
+}
+
+/**
+ * Used to create and manage Rollout feature flags that determine different predefined values
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section--rox-variant-
+ */
+export class Variant<T extends string = string> {
+    constructor(defaultValue: T, options: T[], name?: string);
+
+    // The name of the Flag
+    name: string;
+
+    // Returns the current value of the Variant, accounting for value overrides
+    getValue(): T;
+
+    getNameDetails(): RoxNameDetails;
+
+    // Unlock the Flag value from changes from the last time it was freezed
+    unfreeze(): void;
+}
+
+interface RoxNameDetails {
+    name: string;
+    namespace: string;
+}
+
+/**
+ * manages a remote configuration setting with a value of type string, boolean, or number.
+ * The constructor sets the default value for the remote configuration setting
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section--rox-configuration-
+ */
+export class Configuration<T extends string | boolean | number = string> {
+    constructor(defaultValue: T);
+
+    // The name of the Configuration
+    name: string;
+
+    // Returns the current value of the Configuration, accounting for value overrides
+    getValue(): T;
+
+    // Unlock the Configuration value from changes from the last time it was freezed
+    unfreeze(): void;
+}
+
+/**
+ * Override: Should only be used for development purposes (QA - Feature dev - e2e)
+ *
+ * When you override an existing flag value using the Rox.overrides.setOverride method,
+ * the SDK will disregard existing configuration coming from the dashboard and will
+ * serialize the override on disk this value will be loaded and override the flag
+ * right after you call Rox.setup. To clear the override from the cache you need to
+ * call the Rox.overrides.clearOverride method
+ *
+ * https://support.rollout.io/docs/javascript-browser-api#section--rox-overrides-
+ */
+export interface RoxOverrides {
+    /**
+     * Sets an override value on a specific flag, this function accepts two parameters flag name (
+     * full flag name including namespace) and desired value (from type String).
+     * This function also saves the override value on the local device disk,
+     * so it is "remembered" for the next the SDK is loaded to production.
+     *
+     * https://support.rollout.io/docs/javascript-browser-api#section--rox-overrides-setoverride-
+     *
+     * Note that for boolean flag we still give the value as a string.
+     */
+    setOverride(
+        nameSpacedFlagName: string,
+        value: string | 'false' | 'true'
+    ): void;
+
+    /**
+     * Clears the override value from the flag (and the disk).
+     *
+     * https://support.rollout.io/docs/javascript-browser-api#section--rox-overrides-clearoverride-
+     */
+    clearOverride(nameSpacedFlagName: string): void;
+
+    getOriginalValue(nameSpacedFlagName: string): string;
+
+    /**
+     * full flag name including namespace
+     *
+     * https://support.rollout.io/docs/javascript-browser-api#section--rox-overrides-hasoverride-
+     */
+    hasOverride(nameSpacedFlagName: string): boolean;
+}
+
+export const overrides: RoxOverrides;
diff --git a/types/rox-react-native/rox-react-native-tests.ts b/types/rox-react-native/rox-react-native-tests.ts
new file mode 100644
index 0000000000..03dd29e362
--- /dev/null
+++ b/types/rox-react-native/rox-react-native-tests.ts
@@ -0,0 +1,33 @@
+import * as Rox from 'rox-react-native';
+
+const flags = {
+    superFlag: new Rox.Flag(false)
+};
+
+const variants = {
+    superVariant: new Rox.Variant('value1', ['value1', 'value2'])
+};
+
+const configurations = {
+    superConfiguration: new Rox.Configuration('☀️')
+};
+
+// The register function should be called before the call to Rox.setup()
+Rox.register('default', { ...configurations, ...variants, ...flags });
+Rox.setup('ROLLOUT_IO_KEY', {
+    impressionHandler
+}).then(linkTargetGroupAttributes);
+
+function linkTargetGroupAttributes() {
+    Rox.setCustomStringProperty('id', 'someId');
+    Rox.setCustomBooleanProperty('thisIsATest', true);
+    Rox.setCustomNumberProperty('aNumberProperty', 17);
+}
+
+function impressionHandler(
+    reporting: Rox.RoxReporting,
+    experiment?: Rox.RoxExperiment
+) {
+    // If there is no experiment it means that the user has not been enrolled
+    // or that the reporting is not used yet
+}
diff --git a/types/rox-react-native/tsconfig.json b/types/rox-react-native/tsconfig.json
new file mode 100644
index 0000000000..22b82ef058
--- /dev/null
+++ b/types/rox-react-native/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "rox-react-native-tests.ts"
+    ]
+}
diff --git a/types/rox-react-native/tslint.json b/types/rox-react-native/tslint.json
new file mode 100644
index 0000000000..82403bc9ec
--- /dev/null
+++ b/types/rox-react-native/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "file-name-casing": [true, "kebab-case"]
+    }
+}

From 85883977efc2edf23548bada762bd21bd75b2f13 Mon Sep 17 00:00:00 2001
From: Sam Palmer <github@sampalmer.dev>
Date: Wed, 13 Mar 2019 17:27:46 +0000
Subject: [PATCH 624/924] Add package for ink-testing-library (#33842)

---
 types/ink-testing-library/index.d.ts          | 18 +++++++++++++
 .../ink-testing-library-tests.tsx             | 24 ++++++++++++++++++
 types/ink-testing-library/tsconfig.json       | 25 +++++++++++++++++++
 types/ink-testing-library/tslint.json         |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/ink-testing-library/index.d.ts
 create mode 100644 types/ink-testing-library/ink-testing-library-tests.tsx
 create mode 100644 types/ink-testing-library/tsconfig.json
 create mode 100644 types/ink-testing-library/tslint.json

diff --git a/types/ink-testing-library/index.d.ts b/types/ink-testing-library/index.d.ts
new file mode 100644
index 0000000000..bf73d64b3a
--- /dev/null
+++ b/types/ink-testing-library/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for ink-testing-library 1.0
+// Project: https://github.com/vadimdemedes/ink-testing-library#readme
+// Definitions by: Sam Palmer <https://github.com/MancunianSam>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import { Component, InkElement } from "ink";
+export interface RenderResponse {
+    rerender: (tree: InkElement) => void;
+    unmount: () => void;
+    stdin: {
+        write: (data: any) => boolean;
+    };
+    frames: ReadonlyArray<string>;
+    lastFrame: () => string;
+}
+export function cleanup(): void;
+export function render(tree: InkElement): RenderResponse;
diff --git a/types/ink-testing-library/ink-testing-library-tests.tsx b/types/ink-testing-library/ink-testing-library-tests.tsx
new file mode 100644
index 0000000000..7cf783a344
--- /dev/null
+++ b/types/ink-testing-library/ink-testing-library-tests.tsx
@@ -0,0 +1,24 @@
+/** @jsx h */
+import { render, RenderResponse, cleanup } from "ink-testing-library";
+import { Component, h } from "ink";
+
+const renderResponse = render(<Component<{}, {}, {}> />); // $ExpectType RenderResponse
+
+renderResponse.frames; // $ExpectType ReadonlyArray<string>
+
+const rerender = renderResponse.rerender; // $ExpectType (tree: InkElement) => void
+rerender(<Component<{}, {}, {}> />); // $ExpectType void
+
+const unmount = renderResponse.unmount; // $ExpectType () => void
+unmount(); // $ExpectType void
+
+const stdin = renderResponse.stdin; // $ExpectType { write: (data: any) => boolean; }
+stdin.write(""); // $ExpectType boolean
+stdin.write([]); // $ExpectType boolean
+stdin.write({}); // $ExpectType boolean
+
+const lastFrame = renderResponse.lastFrame; // $ExpectType () => string
+lastFrame(); // $ExpectType string
+
+cleanup; // $ExpectType () => void
+cleanup(); // $ExpectType void
diff --git a/types/ink-testing-library/tsconfig.json b/types/ink-testing-library/tsconfig.json
new file mode 100644
index 0000000000..fed5182de7
--- /dev/null
+++ b/types/ink-testing-library/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "allowSyntheticDefaultImports": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts", 
+        "ink-testing-library-tests.tsx"
+    ]
+}
diff --git a/types/ink-testing-library/tslint.json b/types/ink-testing-library/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ink-testing-library/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 658daed931e3808575f7eb4d18abc75121041ce3 Mon Sep 17 00:00:00 2001
From: Lukas Tetzlaff <ltetzlaff@users.noreply.github.com>
Date: Wed, 13 Mar 2019 18:29:58 +0100
Subject: [PATCH 625/924] preact-i18n (#33829)

* Add types for `preact-i18n`

* Add test for `preact-i18n`

* rename `test` to `tests`

* bump ts version requirement
---
 types/preact-i18n/index.d.ts            | 36 +++++++++++++++++++++++++
 types/preact-i18n/package.json          |  6 +++++
 types/preact-i18n/preact-i18n-tests.tsx | 19 +++++++++++++
 types/preact-i18n/tsconfig.json         | 26 ++++++++++++++++++
 types/preact-i18n/tslint.json           |  3 +++
 5 files changed, 90 insertions(+)
 create mode 100644 types/preact-i18n/index.d.ts
 create mode 100644 types/preact-i18n/package.json
 create mode 100644 types/preact-i18n/preact-i18n-tests.tsx
 create mode 100644 types/preact-i18n/tsconfig.json
 create mode 100644 types/preact-i18n/tslint.json

diff --git a/types/preact-i18n/index.d.ts b/types/preact-i18n/index.d.ts
new file mode 100644
index 0000000000..a4bbb38c4c
--- /dev/null
+++ b/types/preact-i18n/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for preact-i18n 1.2
+// Project: https://github.com/synacor/preact-i18n
+// Definitions by: Lukas Tetzlaff <https://github.com/ltetzlaff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import { h, Component, VNode, ComponentChild, ComponentChildren } from "preact";
+
+export class TextComponent extends Component<{
+    id: string
+    fields?: {}
+    plural?: number
+}> {
+    render(): TextComponent;
+}
+
+export class IntlProvider extends Component<{
+    scope?: any
+    mark?: boolean
+    definition?: {}
+}> {
+    render(): IntlProvider;
+}
+export class Text extends TextComponent {}
+export class MarkupText extends TextComponent {}
+export class Localizer extends Component<{ children: ComponentChildren }> {
+    render(): Localizer;
+}
+
+// tslint:disable-next-line:no-unnecessary-generics
+export function withText<Props, Context = any>(mapping: {}): (Child: ComponentChild) => new (props?: Props, context?: Context) => any;
+
+export default function intl(
+    Child: Component,
+    options?: { scope?: any; definition?: {} }
+): VNode;
diff --git a/types/preact-i18n/package.json b/types/preact-i18n/package.json
new file mode 100644
index 0000000000..b0137e3b05
--- /dev/null
+++ b/types/preact-i18n/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "preact": "^8.4.2"
+    }
+}
diff --git a/types/preact-i18n/preact-i18n-tests.tsx b/types/preact-i18n/preact-i18n-tests.tsx
new file mode 100644
index 0000000000..a374a15286
--- /dev/null
+++ b/types/preact-i18n/preact-i18n-tests.tsx
@@ -0,0 +1,19 @@
+import { IntlProvider, Text, withText } from "preact-i18n";
+import { h, render, Component } from "preact";
+
+interface P {
+    foo: string;
+}
+
+@withText<P>({ exampleText2: "someText2" })
+class Example extends Component<P> {
+    render({ }: P) {
+        return <IntlProvider definition={{ exampleText1: "someText1"}}>
+            <p>
+                <Text id="exampleText1">fallbackText</Text>
+            </p>
+        </IntlProvider>;
+    }
+}
+
+render(<Example foo="bar" />, document);
diff --git a/types/preact-i18n/tsconfig.json b/types/preact-i18n/tsconfig.json
new file mode 100644
index 0000000000..45cea53d00
--- /dev/null
+++ b/types/preact-i18n/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "jsx": "preserve",
+        "experimentalDecorators": true,
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "preact-i18n-tests.tsx"
+    ]
+}
diff --git a/types/preact-i18n/tslint.json b/types/preact-i18n/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/preact-i18n/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From f99739db0bee21a5cb665ebd8d811c9c1ec3dc40 Mon Sep 17 00:00:00 2001
From: 0815Strohhut <44547548+0815Strohhut@users.noreply.github.com>
Date: Wed, 13 Mar 2019 18:30:47 +0100
Subject: [PATCH 626/924] Add styles to ChromeColorPicker (#33711)

ChromeColorPicker allows to override styles by providing a "styles" parameter which consists of a bunch of CSS definitions applied to different parts of the component
---
 types/react-color/index.d.ts                  |  8 +++--
 .../lib/components/chrome/Chrome.d.ts         | 31 ++++++++++++++++++-
 types/react-color/react-color-tests.tsx       |  2 +-
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/types/react-color/index.d.ts b/types/react-color/index.d.ts
index 25664870c8..9935814feb 100644
--- a/types/react-color/index.d.ts
+++ b/types/react-color/index.d.ts
@@ -1,6 +1,10 @@
-// Type definitions for react-color 2.14
+// Type definitions for react-color 2.17
 // Project: https://github.com/casesandberg/react-color/, http://casesandberg.github.io/react-color
-// Definitions by: Karol Janyst <https://github.com/LKay>, Marks Polakovs <https://github.com/markspolakovs>, Matthieu Montaudouin <https://github.com/mntdn>, Nokogiri <https://github.com/nkgrnkgr>
+// Definitions by:  Karol Janyst <https://github.com/LKay>,
+//                  Marks Polakovs <https://github.com/markspolakovs>,
+//                  Matthieu Montaudouin <https://github.com/mntdn>,
+//                  Nokogiri <https://github.com/nkgrnkgr>,
+//                  0815Strohhut <https://github.com/0815Strohhut>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
diff --git a/types/react-color/lib/components/chrome/Chrome.d.ts b/types/react-color/lib/components/chrome/Chrome.d.ts
index a078cb231e..3c8f4139a5 100644
--- a/types/react-color/lib/components/chrome/Chrome.d.ts
+++ b/types/react-color/lib/components/chrome/Chrome.d.ts
@@ -1,8 +1,37 @@
-import { Component } from "react";
+import { Component, CSSProperties } from "react";
 import { ColorPickerProps } from "../../..";
 
+export interface ChromePickerDefaultStyles {
+    picker?: CSSProperties;
+    saturation?: CSSProperties;
+    Saturation?: CSSProperties;
+    body?: CSSProperties;
+    controls?: CSSProperties;
+    color?: CSSProperties;
+    swatch?: CSSProperties;
+    active?: CSSProperties;
+    toggles?: CSSProperties;
+    hue?: CSSProperties;
+    Hue?: CSSProperties;
+    alpha?: CSSProperties;
+    Alpha?: CSSProperties;
+}
+
+export interface ChromePickerDisableAlphaStyles {
+    color?: CSSProperties;
+    alpha?: CSSProperties;
+    hue?: CSSProperties;
+    swatch?: CSSProperties;
+}
+
+export interface ChromePickerStyles {
+    default?: ChromePickerDefaultStyles;
+    disableAlpha?: ChromePickerDisableAlphaStyles;
+}
+
 export interface ChromePickerProps extends ColorPickerProps<ChromePicker> {
     disableAlpha?: boolean;
+    styles?: ChromePickerStyles;
 }
 
 export default class ChromePicker extends Component<ChromePickerProps> {}
diff --git a/types/react-color/react-color-tests.tsx b/types/react-color/react-color-tests.tsx
index 71ed800375..631fb34839 100644
--- a/types/react-color/react-color-tests.tsx
+++ b/types/react-color/react-color-tests.tsx
@@ -35,7 +35,7 @@ const colors = ["#000", "#333"];
 
 render(<AlphaPicker height="100px" width="100px" />, document.getElementById("main"));
 render(<BlockPicker colors={ colors } width="100px" />, document.getElementById("main"));
-render(<ChromePicker disableAlpha />, document.getElementById("main"));
+render(<ChromePicker disableAlpha styles={{ default: { picker: { width: 200 }}}} />, document.getElementById("main"));
 render(<CirclePicker colors={ colors } width="100px" />, document.getElementById("main"));
 render(<CompactPicker colors={ colors } />, document.getElementById("main"));
 render(<GithubPicker colors={ colors } width="100px" />, document.getElementById("main"));

From 18701d11dba59976c9ef0e7db32f162a8a2a5f5c Mon Sep 17 00:00:00 2001
From: Erik Rothoff Andersson <erik.rothoff@gmail.com>
Date: Wed, 13 Mar 2019 18:31:30 +0100
Subject: [PATCH 627/924] ember-data: In DS.PromiseObject forward the passed in
 type to sub-objects so .content property gets correct type (#33844)

* In DS.PromiseObject forward the passed in type to sub-objects so .content property gets correct type

* Update types/ember-data/test/promises.ts

Co-Authored-By: erkie <erik.rothoff@gmail.com>
---
 types/ember-data/index.d.ts       |  4 ++--
 types/ember-data/test/promises.ts | 20 ++++++++++++++++++++
 types/ember-data/tsconfig.json    |  3 ++-
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 types/ember-data/test/promises.ts

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 6cb514556c..f5ff0c5d57 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -902,8 +902,8 @@ export namespace DS {
      * it easy to create data bindings with the `PromiseObject` that will
      * be updated when the promise resolves.
      */
-    interface PromiseObject<T>
-        extends ObjectProxy,
+    interface PromiseObject<T extends object>
+        extends ObjectProxy<T>,
             PromiseProxyMixin<T & ObjectProxy> {}
     class PromiseObject<T> {}
     /**
diff --git a/types/ember-data/test/promises.ts b/types/ember-data/test/promises.ts
new file mode 100644
index 0000000000..976624ab19
--- /dev/null
+++ b/types/ember-data/test/promises.ts
@@ -0,0 +1,20 @@
+import DS from 'ember-data';
+import { assertType } from "./lib/assert";
+
+declare const store: DS.Store;
+
+class Person extends DS.Model {
+    firstName = DS.attr();
+}
+
+declare module 'ember-data/types/registries/model' {
+    export default interface ModelRegistry {
+        person: Person;
+    }
+}
+
+const promiseFind = store.findRecord("person", 1);
+
+promiseFind.content; // $ExpectType Person | undefined
+
+promiseFind.get("firstName");
diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index aadbbe7f5f..f64d309abe 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -83,6 +83,7 @@
         "test/belongs-to.ts",
         "test/record-reference.ts",
         "test/injections.ts",
-        "test/error.ts"
+        "test/error.ts",
+        "test/promises.ts"
     ]
 }

From dfd2efad8045771e4692c89e43a81203575bde2b Mon Sep 17 00:00:00 2001
From: Timur Manyanov <gtibalt@gmail.com>
Date: Wed, 13 Mar 2019 18:31:56 +0100
Subject: [PATCH 628/924] Add newly documented props to makeup-expander defs
 (#33847)

* Fix callback arguments type

* Add @types/marko definitions

* Add app-module-path definitions

* Add newly documented props to makeup-expander defs
---
 types/makeup-expander/index.d.ts               | 4 +++-
 types/makeup-expander/makeup-expander-tests.ts | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/makeup-expander/index.d.ts b/types/makeup-expander/index.d.ts
index 90bd660581..868aeb60ac 100644
--- a/types/makeup-expander/index.d.ts
+++ b/types/makeup-expander/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for makeup-expander 0.4
+// Type definitions for makeup-expander 0.6
 // Project: https://github.com/makeup-js/makeup-expander
 // Definitions by: Timur Manyanov <https://github.com/darkwebdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -16,6 +16,8 @@ declare namespace Expander {
         expandOnHover?: boolean;
         focusManagement?: string | null;
         hostSelector?: string;
+        expandedClass?: string;
+        simulateSpacebarClick?: boolean;
     }
 }
 
diff --git a/types/makeup-expander/makeup-expander-tests.ts b/types/makeup-expander/makeup-expander-tests.ts
index f35d7cd3bd..e0e280f15a 100644
--- a/types/makeup-expander/makeup-expander-tests.ts
+++ b/types/makeup-expander/makeup-expander-tests.ts
@@ -3,7 +3,8 @@ import Expander = require('makeup-expander');
 const widgetEl: HTMLElement | null = document.querySelector('.expander');
 
 const options: Expander.Options = {
-    expandOnClick: true
+    expandOnClick: true,
+    expandedClass: 'widget--expanded'
 };
 
 if (widgetEl) {

From 4108ddb08ef6a33760f4d2ebafdd38012afdc23b Mon Sep 17 00:00:00 2001
From: Eugene Wang <eugenewang@outlook.com>
Date: Wed, 13 Mar 2019 15:02:01 -0400
Subject: [PATCH 629/924] correction of credits or comments

This type definition has totally nothing related to @caseycesari 's geojson parser library. The previous PR is misleading, at least on this type definition.
---
 types/geojson/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index 90beca01c1..db8074e242 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for geojson 7946.0
-// Project: https://geojson.org/, https://github.com/caseycesari/geojson.js
+// Project: https://geojson.org/
 // Definitions by: Jacob Bruun <https://github.com/cobster>
 //                 Arne Schubert <https://github.com/atd-schubert>
 //                 Jeff Jacobson <https://github.com/JeffJacobson>

From 7ff66525e2649afb677a14ad8bfbfefebfb72066 Mon Sep 17 00:00:00 2001
From: Johan Davidsson <johan.davidsson@trewit.se>
Date: Wed, 13 Mar 2019 20:50:05 +0100
Subject: [PATCH 630/924] Adding types for module domhandler

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

diff --git a/types/domhandler/domhandler-tests.ts b/types/domhandler/domhandler-tests.ts
new file mode 100644
index 0000000000..f12fe33c88
--- /dev/null
+++ b/types/domhandler/domhandler-tests.ts
@@ -0,0 +1,12 @@
+import * as htmlparser from "htmlparser2";
+
+const rawHtml = "Xyz <script language= javascript>var foo = '<<bar>>';< /  script><!--<!-- Waah! -- -->";
+const handler = new htmlparser.DomHandler((error: Error, dom: htmlparser.DomElement[]) => {
+    if (error)
+    	console.error('There has been an error...');
+    else
+        console.log(dom);
+});
+const parser = new htmlparser.Parser(handler);
+parser.write(rawHtml);
+parser.end();
diff --git a/types/domhandler/index.d.ts b/types/domhandler/index.d.ts
new file mode 100644
index 0000000000..a65ba717b3
--- /dev/null
+++ b/types/domhandler/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for domhandler 2.4.2
+// Project: https://github.com/fb55/DomHandler#readme
+// Definitions by: Johan Davidsson <https://github.com/johandavidson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface DomHandlerOptions {
+    /***
+     * Indicates whether the whitespace in text nodes should be normalized
+     * (= all whitespace should be replaced with single spaces). The default value is "false".
+     */
+    normalizeWhitespace: boolean;
+
+    /***
+     * Adds DOM level 1 properties to all elements.
+     */
+    withDomLvl1: boolean;
+
+    /***
+     * Indicates whether a startIndex property will be added to nodes.
+     * When the parser is used in a non-streaming fashion, startIndex is an integer
+     * indicating the position of the start of the node in the document.
+     * The default value is "false".
+     */
+    withStartIndices: boolean;
+
+    /***
+     * Indicates whether a endIndex property will be added to nodes.
+     * When the parser is used in a non-streaming fashion, endIndex is an integer
+     * indicating the position of the end of the node in the document.
+     * The default value is "false".
+     */
+    withEndIndices: boolean;
+}
+
+export interface DomElement {
+    attribs?: {[s: string]: string};
+    children?: DomElement[];
+    data?: any;
+    name?: string;
+    next?: DomElement;
+    parent?: DomElement;
+    prev?: DomElement;
+    type?: string;
+}
+
+export interface Element extends DomElement {
+    name: string;
+}
+
+export interface Node extends DomElement {
+    firstChild(): DomElement;
+    lastChild(): DomElement;
+    nodeType(): number;
+}
+
+export class DomHandler {
+    constructor(callback: (error: any, dom: DomElement[]) => any);
+    constructor(callback: (error: any, dom: DomElement[]) => any, options: DomHandlerOptions);
+
+    onparserinit(parser: any): void;
+
+    /***
+     * Resets the handler back to starting state
+     */
+    onreset(): void;
+
+    /***
+     * Signals the handler that parsing is done
+     */
+    onend(): void;
+    onerror(error: Error): void;
+    onclosetag(): void;
+    onopentag(name: string, attribs: {[s: string]: string}): void;
+    ontext(data: string): void;
+    oncomment(data: string): void;
+    oncdatastart(): void;
+    oncommentend(): void;
+    onprocessinginstruction(name: string, data: string): void;
+}
diff --git a/types/domhandler/tsconfig.json b/types/domhandler/tsconfig.json
new file mode 100644
index 0000000000..4cd85394a0
--- /dev/null
+++ b/types/domhandler/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
+    },
+    "files": [
+        "index.d.ts",
+        "domhandler-tests.ts"
+    ]
+}
diff --git a/types/domhandler/tslint.json b/types/domhandler/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/domhandler/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a827896a2a6f0370222351b66a74024f8592e94c Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Wed, 13 Mar 2019 12:53:34 -0700
Subject: [PATCH 631/924] VS Code 1.15

---
 types/vscode/index.d.ts | 3143 +++------------------------------------
 1 file changed, 189 insertions(+), 2954 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 2af36e84b7..018ca50471 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.14
+// Type definitions for Visual Studio Code 1.15
 // Project: https://github.com/microsoft/vscode-extension-vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.14 Extension API
+ * Type Definition for Visual Studio Code 1.15 Extension API
  */
 
 declare module 'vscode' {
@@ -98,13 +98,9 @@ declare module 'vscode' {
 	export interface TextDocument {
 
 		/**
-		 * The associated uri for this document.
-		 *
-		 * *Note* that most documents use the `file`-scheme, which means they are files on disk. However, **not** all documents are
-		 * saved on disk and therefore the `scheme` must be checked before trying to access the underlying file or siblings on disk.
-		 *
-		 * @see [FileSystemProvider](#FileSystemProvider)
-		 * @see [TextDocumentContentProvider](#TextDocumentContentProvider)
+		 * The associated URI for this document. Most documents have the __file__-scheme, indicating that they
+		 * represent files on disk. However, some documents may have other schemes indicating that they are not
+		 * available on disk.
 		 */
 		readonly uri: Uri;
 
@@ -115,9 +111,7 @@ declare module 'vscode' {
 		readonly fileName: string;
 
 		/**
-		 * Is this document representing an untitled file which has never been saved yet. *Note* that
-		 * this does not mean the document will be saved to disk, use [`uri.scheme`](#Uri.scheme)
-		 * to figure out where a document will be [saved](#FileSystemProvider), e.g. `file`, `ftp` etc.
+		 * Is this document representing an untitled file.
 		 */
 		readonly isUntitled: boolean;
 
@@ -215,7 +209,7 @@ declare module 'vscode' {
 
 		/**
 		 * Get a word-range at the given position. By default words are defined by
-		 * common separators, like space, -, _, etc. In addition, per language custom
+		 * common separators, like space, -, _, etc. In addition, per languge custom
 		 * [word definitions](#LanguageConfiguration.wordPattern) can be defined. It
 		 * is also possible to provide a custom regular expression.
 		 *
@@ -277,7 +271,7 @@ declare module 'vscode' {
 		constructor(line: number, character: number);
 
 		/**
-		 * Check if this position is before `other`.
+		 * Check if `other` is before this position.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a smaller line
@@ -286,7 +280,7 @@ declare module 'vscode' {
 		isBefore(other: Position): boolean;
 
 		/**
-		 * Check if this position is before or equal to `other`.
+		 * Check if `other` is before or equal to this position.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a smaller line
@@ -295,7 +289,7 @@ declare module 'vscode' {
 		isBeforeOrEqual(other: Position): boolean;
 
 		/**
-		 * Check if this position is after `other`.
+		 * Check if `other` is after this position.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a greater line
@@ -304,7 +298,7 @@ declare module 'vscode' {
 		isAfter(other: Position): boolean;
 
 		/**
-		 * Check if this position is after or equal to `other`.
+		 * Check if `other` is after or equal to this position.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a greater line
@@ -313,7 +307,7 @@ declare module 'vscode' {
 		isAfterOrEqual(other: Position): boolean;
 
 		/**
-		 * Check if this position is equal to `other`.
+		 * Check if `other` equals this position.
 		 *
 		 * @param other A position.
 		 * @return `true` if the line and character of the given position are equal to
@@ -493,7 +487,7 @@ declare module 'vscode' {
 		active: Position;
 
 		/**
-		 * Create a selection from two positions.
+		 * Create a selection from two postions.
 		 *
 		 * @param anchor A position.
 		 * @param active A position.
@@ -553,20 +547,6 @@ declare module 'vscode' {
 		kind?: TextEditorSelectionChangeKind;
 	}
 
-	/**
-	 * Represents an event describing the change in a [text editor's visible ranges](#TextEditor.visibleRanges).
-	 */
-	export interface TextEditorVisibleRangesChangeEvent {
-		/**
-		 * The [text editor](#TextEditor) for which the visible ranges have changed.
-		 */
-		textEditor: TextEditor;
-		/**
-		 * The new value for the [text editor's visible ranges](#TextEditor.visibleRanges).
-		 */
-		visibleRanges: Range[];
-	}
-
 	/**
 	 * Represents an event describing the change in a [text editor's options](#TextEditor.options).
 	 */
@@ -586,7 +566,7 @@ declare module 'vscode' {
 	 */
 	export interface TextEditorViewColumnChangeEvent {
 		/**
-		 * The [text editor](#TextEditor) for which the view column has changed.
+		 * The [text editor](#TextEditor) for which the options have changed.
 		 */
 		textEditor: TextEditor;
 		/**
@@ -762,10 +742,8 @@ declare module 'vscode' {
 	export interface TextDocumentShowOptions {
 		/**
 		 * An optional view column in which the [editor](#TextEditor) should be shown.
-		 * The default is the [active](#ViewColumn.Active), other values are adjusted to
-		 * be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
-		 * not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside) to open the
-		 * editor to the side of the currently active one.
+		 * The default is the [one](#ViewColumn.One), other values are adjusted to
+		 * be __Min(column, columnCount + 1)__.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -799,31 +777,13 @@ declare module 'vscode' {
 		constructor(id: string);
 	}
 
-	/**
-	 * A reference to a named icon. Currently only [File](#ThemeIcon.File) and [Folder](#ThemeIcon.Folder) are supported.
-	 * Using a theme icon is preferred over a custom icon as it gives theme authors the possibility to change the icons.
-	 */
-	export class ThemeIcon {
-		/**
-		 * Reference to a icon representing a file. The icon is taken from the current file icon theme or a placeholder icon.
-		 */
-		static readonly File: ThemeIcon;
-
-		/**
-		 * Reference to a icon representing a folder. The icon is taken from the current file icon theme or a placeholder icon.
-		 */
-		static readonly Folder: ThemeIcon;
-
-		private constructor(id: string);
-	}
-
 	/**
 	 * Represents theme specific rendering styles for a [text editor decoration](#TextEditorDecorationType).
 	 */
 	export interface ThemableDecorationRenderOptions {
 		/**
 		 * Background color of the decoration. Use rgba() and define transparent background colors to play well with other decorations.
-		 * Alternatively a color from the color registry can be [referenced](#ThemeColor).
+		 * Alternativly a color from the color registry an be [referenced](#ColorIdentifier).
 		 */
 		backgroundColor?: string | ThemeColor;
 
@@ -885,16 +845,6 @@ declare module 'vscode' {
 		 */
 		borderWidth?: string;
 
-		/**
-		 * CSS styling property that will be applied to text enclosed by a decoration.
-		 */
-		fontStyle?: string;
-
-		/**
-		 * CSS styling property that will be applied to text enclosed by a decoration.
-		 */
-		fontWeight?: string;
-
 		/**
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
@@ -910,11 +860,6 @@ declare module 'vscode' {
 		 */
 		color?: string | ThemeColor;
 
-		/**
-		 * CSS styling property that will be applied to text enclosed by a decoration.
-		 */
-		opacity?: string;
-
 		/**
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
@@ -966,14 +911,6 @@ declare module 'vscode' {
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
 		borderColor?: string | ThemeColor;
-		/**
-		 * CSS styling property that will be applied to the decoration attachment.
-		 */
-		fontStyle?: string;
-		/**
-		 * CSS styling property that will be applied to the decoration attachment.
-		 */
-		fontWeight?: string;
 		/**
 		 * CSS styling property that will be applied to the decoration attachment.
 		 */
@@ -1049,7 +986,7 @@ declare module 'vscode' {
 
 		/**
 		 * Render options applied to the current decoration. For performance reasons, keep the
-		 * number of decoration specific options small, and use decoration types wherever possible.
+		 * number of decoration specific options small, and use decoration types whereever possible.
 		 */
 		renderOptions?: DecorationInstanceRenderOptions;
 	}
@@ -1086,7 +1023,7 @@ declare module 'vscode' {
 		/**
 		 * The document associated with this text editor. The document will be the same for the entire lifetime of this text editor.
 		 */
-		readonly document: TextDocument;
+		document: TextDocument;
 
 		/**
 		 * The primary selection on this text editor. Shorthand for `TextEditor.selections[0]`.
@@ -1098,12 +1035,6 @@ declare module 'vscode' {
 		 */
 		selections: Selection[];
 
-		/**
-		 * The current visible ranges in the editor (vertically).
-		 * This accounts only for vertical scrolling, and not for horizontal scrolling.
-		 */
-		readonly visibleRanges: Range[];
-
 		/**
 		 * Text editor options.
 		 */
@@ -1111,8 +1042,7 @@ declare module 'vscode' {
 
 		/**
 		 * The column in which this editor shows. Will be `undefined` in case this
-		 * isn't one of the main editors, e.g an embedded editor, or when the editor
-		 * column is larger than three.
+		 * isn't one of the three main editors, e.g an embedded editor.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -1131,7 +1061,7 @@ declare module 'vscode' {
 
 		/**
 		 * Insert a [snippet](#SnippetString) and put the editor into snippet mode. "Snippet mode"
-		 * means the editor adds placeholders and additional cursors so that the user can complete
+		 * means the editor adds placeholders and additionals cursors so that the user can complete
 		 * or accept the snippet.
 		 *
 		 * @param snippet The snippet to insert in this edit.
@@ -1164,10 +1094,10 @@ declare module 'vscode' {
 		/**
 		 * ~~Show the text editor.~~
 		 *
-		 * @deprecated Use [window.showTextDocument](#window.showTextDocument) instead.
+		 * @deprecated Use [window.showTextDocument](#window.showTextDocument)
 		 *
 		 * @param column The [column](#ViewColumn) in which to show this editor.
-		 * This method shows unexpected behavior and will be removed in the next major update.
+		 * instead. This method shows unexpected behavior and will be removed in the next major update.
 		 */
 		show(column?: ViewColumn): void;
 
@@ -1241,35 +1171,9 @@ declare module 'vscode' {
 	 */
 	export class Uri {
 
-		/**
-		 * Create an URI from a string, e.g. `http://www.msft.com/some/path`,
-		 * `file:///usr/home`, or `scheme:with/path`.
-		 *
-		 * @see [Uri.toString](#Uri.toString)
-		 * @param value The string value of an Uri.
-		 * @return A new Uri instance.
-		 */
-		static parse(value: string): Uri;
-
 		/**
 		 * Create an URI from a file system path. The [scheme](#Uri.scheme)
 		 * will be `file`.
-		 *
-		 * The *difference* between `Uri#parse` and `Uri#file` is that the latter treats the argument
-		 * as path, not as stringified-uri. E.g. `Uri.file(path)` is *not* the same as
-		 * `Uri.parse('file://' + path)` because the path might contain characters that are
-		 * interpreted (# and ?). See the following sample:
-		 * ```ts
-		const good = URI.file('/coding/c#/project1');
-		good.scheme === 'file';
-		good.path === '/coding/c#/project1';
-		good.fragment === '';
-
-		const bad = URI.parse('file://' + '/coding/c#/project1');
-		bad.scheme === 'file';
-		bad.path === '/coding/c'; // path is now broken
-		bad.fragment === '/project1';
-		```
 		 *
 		 * @param path A file system or UNC path.
 		 * @return A new Uri instance.
@@ -1277,9 +1181,13 @@ declare module 'vscode' {
 		static file(path: string): Uri;
 
 		/**
-		 * Use the `file` and `parse` factory functions to create new `Uri` objects.
+		 * Create an URI from a string. Will throw if the given value is not
+		 * valid.
+		 *
+		 * @param value The string value of an Uri.
+		 * @return A new Uri instance.
 		 */
-		private constructor(scheme: string, authority: string, path: string, query: string, fragment: string);
+		static parse(value: string): Uri;
 
 		/**
 		 * Scheme is the `http` part of `http://www.msft.com/some/path?query#fragment`.
@@ -1312,21 +1220,8 @@ declare module 'vscode' {
 		 * The string representing the corresponding file system path of this Uri.
 		 *
 		 * Will handle UNC paths and normalize windows drive letters to lower-case. Also
-		 * uses the platform specific path separator.
-		 *
-		 * * Will *not* validate the path for invalid characters and semantics.
-		 * * Will *not* look at the scheme of this Uri.
-		 * * The resulting string shall *not* be used for display purposes but
-		 * for disk operations, like `readFile` et al.
-		 *
-		 * The *difference* to the [`path`](#Uri.path)-property is the use of the platform specific
-		 * path separator and the handling of UNC paths. The sample below outlines the difference:
-		 * ```ts
-		const u = URI.parse('file://server/c$/folder/file.txt')
-		u.authority === 'server'
-		u.path === '/shares/c$/file.txt'
-		u.fsPath === '\\server\c$\folder\file.txt'
-		```
+		 * uses the platform specific path separator. Will *not* validate the path for
+		 * invalid characters and semantics. Will *not* look at the scheme of this Uri.
 		 */
 		readonly fsPath: string;
 
@@ -1348,13 +1243,11 @@ declare module 'vscode' {
 
 		/**
 		 * Returns a string representation of this Uri. The representation and normalization
-		 * of a URI depends on the scheme.
-		 *
-		 * * The resulting string can be safely used with [Uri.parse](#Uri.parse).
-		 * * The resulting string shall *not* be used for display purposes.
+		 * of a URI depends on the scheme. The resulting string can be safely used with
+		 * [Uri.parse](#Uri.parse).
 		 *
 		 * @param skipEncoding Do not percentage-encode the result, defaults to `false`. Note that
-		 *	the `#` and `?` characters occurring in the path will always be encoded.
+		 *	the `#` and `?` characters occuring in the path will always be encoded.
 		 * @returns A string representation of this Uri.
 		 */
 		toString(skipEncoding?: boolean): string;
@@ -1404,7 +1297,7 @@ declare module 'vscode' {
 		cancel(): void;
 
 		/**
-		 * Dispose object and free resources.
+		 * Dispose object and free resources. Will call [cancel](#CancellationTokenSource.cancel).
 		 */
 		dispose(): void;
 	}
@@ -1577,20 +1470,12 @@ declare module 'vscode' {
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
-		description?: string;
+		description: string;
 
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
 		detail?: string;
-
-		/**
-		 * Optional flag indicating if this item is picked initially.
-		 * (Only honored when the picker allows multiple selections.)
-		 *
-		 * @see [QuickPickOptions.canPickMany](#QuickPickOptions.canPickMany)
-		 */
-		picked?: boolean;
 	}
 
 	/**
@@ -1617,107 +1502,12 @@ declare module 'vscode' {
 		 */
 		ignoreFocusOut?: boolean;
 
-		/**
-		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
-		 */
-		canPickMany?: boolean;
-
 		/**
 		 * An optional function that is invoked whenever an item is selected.
 		 */
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
-	/**
-	 * Options to configure the behaviour of the [workspace folder](#WorkspaceFolder) pick UI.
-	 */
-	export interface WorkspaceFolderPickOptions {
-
-		/**
-		 * An optional string to show as place holder in the input box to guide the user what to pick on.
-		 */
-		placeHolder?: string;
-
-		/**
-		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
-		 */
-		ignoreFocusOut?: boolean;
-	}
-
-	/**
-	 * Options to configure the behaviour of a file open dialog.
-	 *
-	 * * Note 1: A dialog can select files, folders, or both. This is not true for Windows
-	 * which enforces to open either files or folder, but *not both*.
-	 * * Note 2: Explicitly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
-	 * and the editor then silently adjusts the options to select files.
-	 */
-	export interface OpenDialogOptions {
-		/**
-		 * The resource the dialog shows when opened.
-		 */
-		defaultUri?: Uri;
-
-		/**
-		 * A human-readable string for the open button.
-		 */
-		openLabel?: string;
-
-		/**
-		 * Allow to select files, defaults to `true`.
-		 */
-		canSelectFiles?: boolean;
-
-		/**
-		 * Allow to select folders, defaults to `false`.
-		 */
-		canSelectFolders?: boolean;
-
-		/**
-		 * Allow to select many files or folders.
-		 */
-		canSelectMany?: boolean;
-
-		/**
-		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
-		 * like "TypeScript", and an array of extensions, e.g.
-		 * ```ts
-		 * {
-		 * 	'Images': ['png', 'jpg']
-		 * 	'TypeScript': ['ts', 'tsx']
-		 * }
-		 * ```
-		 */
-		filters?: { [name: string]: string[] };
-	}
-
-	/**
-	 * Options to configure the behaviour of a file save dialog.
-	 */
-	export interface SaveDialogOptions {
-		/**
-		 * The resource the dialog shows when opened.
-		 */
-		defaultUri?: Uri;
-
-		/**
-		 * A human-readable string for the save button.
-		 */
-		saveLabel?: string;
-
-		/**
-		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
-		 * like "TypeScript", and an array of extensions, e.g.
-		 * ```ts
-		 * {
-		 * 	'Images': ['png', 'jpg']
-		 * 	'TypeScript': ['ts', 'tsx']
-		 * }
-		 * ```
-		 */
-		filters?: { [name: string]: string[] };
-	}
-
 	/**
 	 * Represents an action that is shown with an information, warning, or
 	 * error message.
@@ -1734,11 +1524,8 @@ declare module 'vscode' {
 		title: string;
 
 		/**
-		 * A hint for modal dialogs that the item should be triggered
-		 * when the user cancels the dialog (e.g. by pressing the ESC
-		 * key).
-		 *
-		 * Note: this option is ignored for non-modal messages.
+		 * Indicates that this item replaces the default
+		 * 'Close' action.
 		 */
 		isCloseAffordance?: boolean;
 	}
@@ -1804,62 +1591,16 @@ declare module 'vscode' {
 		 * @return A human readable string which is presented as diagnostic message.
 		 * Return `undefined`, `null`, or the empty string when 'value' is valid.
 		 */
-		validateInput?(value: string): string | undefined | null | Thenable<string | undefined | null>;
+		validateInput?(value: string): string | undefined | null;
 	}
 
-	/**
-	 * A relative pattern is a helper to construct glob patterns that are matched
-	 * relatively to a base path. The base path can either be an absolute file path
-	 * or a [workspace folder](#WorkspaceFolder).
-	 */
-	export class RelativePattern {
-
-		/**
-		 * A base file path to which this pattern will be matched against relatively.
-		 */
-		base: string;
-
-		/**
-		 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
-		 * relative to the base path.
-		 *
-		 * Example: Given a base of `/home/work/folder` and a file path of `/home/work/folder/index.js`,
-		 * the file glob pattern will match on `index.js`.
-		 */
-		pattern: string;
-
-		/**
-		 * Creates a new relative pattern object with a base path and pattern to match. This pattern
-		 * will be matched on file paths relative to the base path.
-		 *
-		 * @param base A base file path to which this pattern will be matched against relatively.
-		 * @param pattern A file glob pattern like `*.{ts,js}` that will be matched on file paths
-		 * relative to the base path.
-		 */
-		constructor(base: WorkspaceFolder | string, pattern: string)
-	}
-
-	/**
-	 * A file glob pattern to match file paths against. This can either be a glob pattern string
-	 * (like `**​/*.{ts,js}` or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
-	 *
-	 * Glob patterns can have the following syntax:
-	 * * `*` to match one or more characters in a path segment
-	 * * `?` to match on one character in a path segment
-	 * * `**` to match any number of path segments, including none
-	 * * `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
-	 * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
-	 * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
-	 */
-	export type GlobPattern = string | RelativePattern;
-
 	/**
 	 * A document filter denotes a document by different properties like
 	 * the [language](#TextDocument.languageId), the [scheme](#Uri.scheme) of
 	 * its resource, or a glob-pattern that is applied to the [path](#TextDocument.fileName).
 	 *
 	 * @sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
-	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', scheme: 'untitled', pattern: '**​/package.json' }`
+	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**∕package.json' }`
 	 */
 	export interface DocumentFilter {
 
@@ -1874,24 +1615,20 @@ declare module 'vscode' {
 		scheme?: string;
 
 		/**
-		 * A [glob pattern](#GlobPattern) that is matched on the absolute path of the document. Use a [relative pattern](#RelativePattern)
-		 * to filter documents to a [workspace folder](#WorkspaceFolder).
+		 * A glob pattern, like `*.{ts,js}`.
 		 */
-		pattern?: GlobPattern;
+		pattern?: string;
 	}
 
 	/**
 	 * A language selector is the combination of one or many language identifiers
 	 * and [language filters](#DocumentFilter).
 	 *
-	 * *Note* that a document selector that is just a language identifier selects *all*
-	 * documents, even those that are not saved on disk. Only use such selectors when
-	 * a feature works without further context, e.g without the need to resolve related
-	 * 'files'.
-	 *
-	 * @sample `let sel:DocumentSelector = { scheme: 'file', language: 'typescript' }`;
+	 * @sample `let sel:DocumentSelector = 'typescript'`;
+	 * @sample `let sel:DocumentSelector = ['typescript', { language: 'json', pattern: '**∕tsconfig.json' }]`;
 	 */
-	export type DocumentSelector = DocumentFilter | string | Array<DocumentFilter | string>;
+	export type DocumentSelector = string | DocumentFilter | (string | DocumentFilter)[];
+
 
 	/**
 	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
@@ -1899,7 +1636,7 @@ declare module 'vscode' {
 	 * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
 	 * thenable.
 	 *
-	 * The snippets below are all valid implementations of the [`HoverProvider`](#HoverProvider):
+	 * The snippets below are all valid implementions of the [`HoverProvider`](#HoverProvider):
 	 *
 	 * ```ts
 	 * let a: HoverProvider = {
@@ -1925,173 +1662,16 @@ declare module 'vscode' {
 	 */
 	export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
 
-	/**
-	 * Kind of a code action.
-	 *
-	 * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
-	 *
-	 * Code action kinds are used by VS Code for UI elements such as the refactoring context menu. Users
-	 * can also trigger code actions with a specific kind with the `editor.action.codeAction` command.
-	 */
-	export class CodeActionKind {
-		/**
-		 * Empty kind.
-		 */
-		static readonly Empty: CodeActionKind;
-
-		/**
-		 * Base kind for quickfix actions: `quickfix`.
-		 *
-		 * Quick fix actions address a problem in the code and are shown in the normal code action context menu.
-		 */
-		static readonly QuickFix: CodeActionKind;
-
-		/**
-		 * Base kind for refactoring actions: `refactor`
-		 *
-		 * Refactoring actions are shown in the refactoring context menu.
-		 */
-		static readonly Refactor: CodeActionKind;
-
-		/**
-		 * Base kind for refactoring extraction actions: `refactor.extract`
-		 *
-		 * Example extract actions:
-		 *
-		 * - Extract method
-		 * - Extract function
-		 * - Extract variable
-		 * - Extract interface from class
-		 * - ...
-		 */
-		static readonly RefactorExtract: CodeActionKind;
-
-		/**
-		 * Base kind for refactoring inline actions: `refactor.inline`
-		 *
-		 * Example inline actions:
-		 *
-		 * - Inline function
-		 * - Inline variable
-		 * - Inline constant
-		 * - ...
-		 */
-		static readonly RefactorInline: CodeActionKind;
-
-		/**
-		 * Base kind for refactoring rewrite actions: `refactor.rewrite`
-		 *
-		 * Example rewrite actions:
-		 *
-		 * - Convert JavaScript function to class
-		 * - Add or remove parameter
-		 * - Encapsulate field
-		 * - Make method static
-		 * - Move method to base class
-		 * - ...
-		 */
-		static readonly RefactorRewrite: CodeActionKind;
-
-		/**
-		 * Base kind for source actions: `source`
-		 *
-		 * Source code actions apply to the entire file and can be run on save
-		 * using `editor.codeActionsOnSave`. They also are shown in `source` context menu.
-		 */
-		static readonly Source: CodeActionKind;
-
-		/**
-		 * Base kind for an organize imports source action: `source.organizeImports`.
-		 */
-		static readonly SourceOrganizeImports: CodeActionKind;
-
-		private constructor(value: string);
-
-		/**
-		 * String value of the kind, e.g. `"refactor.extract.function"`.
-		 */
-		readonly value?: string;
-
-		/**
-		 * Create a new kind by appending a more specific selector to the current kind.
-		 *
-		 * Does not modify the current kind.
-		 */
-		append(parts: string): CodeActionKind;
-
-		/**
-		 * Does this kind contain `other`?
-		 *
-		 * The kind `"refactor"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`, but not `"unicorn.refactor.extract"` or `"refactory.extract"`
-		 *
-		 * @param other Kind to check.
-		 */
-		contains(other: CodeActionKind): boolean;
-	}
-
 	/**
 	 * Contains additional diagnostic information about the context in which
 	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
 	 */
 	export interface CodeActionContext {
+
 		/**
 		 * An array of diagnostics.
 		 */
 		readonly diagnostics: Diagnostic[];
-
-		/**
-		 * Requested kind of actions to return.
-		 *
-		 * Actions not of this kind are filtered out before being shown by the lightbulb.
-		 */
-		readonly only?: CodeActionKind;
-	}
-
-	/**
-	 * A code action represents a change that can be performed in code, e.g. to fix a problem or
-	 * to refactor code.
-	 *
-	 * A CodeAction must set either [`edit`](CodeAction#edit) and/or a [`command`](CodeAction#command). If both are supplied, the `edit` is applied first, then the command is executed.
-	 */
-	export class CodeAction {
-
-		/**
-		 * A short, human-readable, title for this code action.
-		 */
-		title: string;
-
-		/**
-		 * A [workspace edit](#WorkspaceEdit) this code action performs.
-		 */
-		edit?: WorkspaceEdit;
-
-		/**
-		 * [Diagnostics](#Diagnostic) that this code action resolves.
-		 */
-		diagnostics?: Diagnostic[];
-
-		/**
-		 * A [command](#Command) this code action executes.
-		 */
-		command?: Command;
-
-		/**
-		 * [Kind](#CodeActionKind) of the code action.
-		 *
-		 * Used to filter code actions.
-		 */
-		kind?: CodeActionKind;
-
-		/**
-		 * Creates a new code action.
-		 *
-		 * A code action must have at least a [title](#CodeAction.title) and [edits](#CodeAction.edit)
-		 * and/or a [command](#CodeAction.command).
-		 *
-		 * @param title The title of the code action.
-		 * @param kind The kind of the code action.
-		 */
-		constructor(title: string, kind?: CodeActionKind);
 	}
 
 	/**
@@ -2101,31 +1681,18 @@ declare module 'vscode' {
 	 * A code action can be any command that is [known](#commands.getCommands) to the system.
 	 */
 	export interface CodeActionProvider {
+
 		/**
 		 * Provide commands for the given document and range.
 		 *
 		 * @param document The document in which the command was invoked.
-		 * @param range The selector or range for which the command was invoked. This will always be a selection if
-		 * there is a currently active editor.
+		 * @param range The range for which the command was invoked.
 		 * @param context Context carrying additional information.
 		 * @param token A cancellation token.
-		 * @return An array of commands, quick fixes, or refactorings or a thenable of such. The lack of a result can be
+		 * @return An array of commands or a thenable of such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
-	}
-
-	/**
-	 * Metadata about the type of code actions that a [CodeActionProvider](#CodeActionProvider) providers
-	 */
-	export interface CodeActionProviderMetadata {
-		/**
-		 * [CodeActionKinds](#CodeActionKind) that this provider may return.
-		 *
-		 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the provider
-		 * may list our every specific kind they provide, such as `CodeActionKind.Refactor.Extract.append('function`)`
-		 */
-		readonly providedCodeActionKinds?: ReadonlyArray<CodeActionKind>;
+		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<Command[]>;
 	}
 
 	/**
@@ -2198,41 +1765,6 @@ declare module 'vscode' {
 		resolveCodeLens?(codeLens: CodeLens, token: CancellationToken): ProviderResult<CodeLens>;
 	}
 
-	/**
-	 * Information about where a symbol is defined.
-	 *
-	 * Provides additional metadata over normal [location](#Location) definitions, including the range of
-	 * the defining symbol
-	 */
-	export interface DefinitionLink {
-		/**
-		 * Span of the symbol being defined in the source file.
-		 *
-		 * Used as the underlined span for mouse definition hover. Defaults to the word range at
-		 * the definition position.
-		 */
-		originSelectionRange?: Range;
-
-		/**
-		 * The resource identifier of the definition.
-		 */
-		targetUri: Uri;
-
-		/**
-		 * The full range of the definition.
-		 *
-		 * For a class definition for example, this would be the entire body of the class definition.
-		 */
-		targetRange: Range;
-
-		/**
-		 * The span of the symbol definition.
-		 *
-		 * For a class definition, this would be the class name itself in the class definition.
-		 */
-		targetSelectionRange?: Range;
-	}
-
 	/**
 	 * The definition of a symbol represented as one or many [locations](#Location).
 	 * For most programming languages there is only one location at which a symbol is
@@ -2256,11 +1788,11 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+		provideDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
 	}
 
 	/**
-	 * The implementation provider interface defines the contract between extensions and
+	 * The implemenetation provider interface defines the contract between extensions and
 	 * the go to implementation feature.
 	 */
 	export interface ImplementationProvider {
@@ -2274,7 +1806,7 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+		provideImplementation(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
 	}
 
 	/**
@@ -2292,61 +1824,15 @@ declare module 'vscode' {
 		 * @return A definition or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined` or `null`.
 		 */
-		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition | DefinitionLink[]>;
+		provideTypeDefinition(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Definition>;
 	}
 
 	/**
-	 * The MarkdownString represents human readable text that supports formatting via the
-	 * markdown syntax. Standard markdown is supported, also tables, but no embedded html.
-	 */
-	export class MarkdownString {
-
-		/**
-		 * The markdown string.
-		 */
-		value: string;
-
-		/**
-		 * Indicates that this markdown string is from a trusted source. Only *trusted*
-		 * markdown supports links that execute commands, e.g. `[Run it](command:myCommandId)`.
-		 */
-		isTrusted?: boolean;
-
-		/**
-		 * Creates a new markdown string with the given value.
-		 *
-		 * @param value Optional, initial value.
-		 */
-		constructor(value?: string);
-
-		/**
-		 * Appends and escapes the given string to this markdown string.
-		 * @param value Plain text.
-		 */
-		appendText(value: string): MarkdownString;
-
-		/**
-		 * Appends the given string 'as is' to this markdown string.
-		 * @param value Markdown string.
-		 */
-		appendMarkdown(value: string): MarkdownString;
-
-		/**
-		 * Appends the given string as codeblock using the provided language.
-		 * @param value A code snippet.
-		 * @param language An optional [language identifier](#languages.getLanguages).
-		 */
-		appendCodeblock(value: string, language?: string): MarkdownString;
-	}
-
-	/**
-	 * ~~MarkedString can be used to render human readable text. It is either a markdown string
+	 * MarkedString can be used to render human readable text. It is either a markdown string
 	 * or a code-block that provides a language and a code snippet. Note that
-	 * markdown strings will be sanitized - that means html will be escaped.~~
-	 *
-	 * @deprecated This type is deprecated, please use [`MarkdownString`](#MarkdownString) instead.
+	 * markdown strings will be sanitized - that means html will be escaped.
 	 */
-	export type MarkedString = MarkdownString | string | { language: string; value: string };
+	export type MarkedString = string | { language: string; value: string };
 
 	/**
 	 * A hover represents additional information for a symbol or word. Hovers are
@@ -2525,7 +2011,7 @@ declare module 'vscode' {
 		 * @param name The name of the symbol.
 		 * @param kind The kind of the symbol.
 		 * @param containerName The name of the symbol containing the symbol.
-		 * @param location The location of the symbol.
+		 * @param location The the location of the symbol.
 		 */
 		constructor(name: string, kind: SymbolKind, containerName: string, location: Location);
 
@@ -2543,56 +2029,6 @@ declare module 'vscode' {
 		constructor(name: string, kind: SymbolKind, range: Range, uri?: Uri, containerName?: string);
 	}
 
-	/**
-	 * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document
-	 * symbols can be hierarchical and they have two ranges: one that encloses its definition and one that points to
-	 * its most interesting range, e.g. the range of an identifier.
-	 */
-	export class DocumentSymbol {
-
-		/**
-		 * The name of this symbol.
-		 */
-		name: string;
-
-		/**
-		 * More detail for this symbol, e.g the signature of a function.
-		 */
-		detail: string;
-
-		/**
-		 * The kind of this symbol.
-		 */
-		kind: SymbolKind;
-
-		/**
-		 * The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g comments and code.
-		 */
-		range: Range;
-
-		/**
-		 * The range that should be selected and reveal when this symbol is being picked, e.g the name of a function.
-		 * Must be contained by the [`range`](#DocumentSymbol.range).
-		 */
-		selectionRange: Range;
-
-		/**
-		 * Children of this symbol, e.g. properties of a class.
-		 */
-		children: DocumentSymbol[];
-
-		/**
-		 * Creates a new document symbol.
-		 *
-		 * @param name The name of the symbol.
-		 * @param detail Details for the symbol.
-		 * @param kind The kind of the symbol.
-		 * @param range The full range of the symbol.
-		 * @param selectionRange The range that should be reveal.
-		 */
-		constructor(name: string, detail: string, kind: SymbolKind, range: Range, selectionRange: Range);
-	}
-
 	/**
 	 * The document symbol provider interface defines the contract between extensions and
 	 * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-symbol)-feature.
@@ -2607,7 +2043,7 @@ declare module 'vscode' {
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | DocumentSymbol[]>;
+		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[]>;
 	}
 
 	/**
@@ -2617,16 +2053,10 @@ declare module 'vscode' {
 	export interface WorkspaceSymbolProvider {
 
 		/**
-		 * Project-wide search for a symbol matching the given query string.
-		 *
-		 * The `query`-parameter should be interpreted in a *relaxed way* as the editor will apply its own highlighting
-		 * and scoring on the results. A good rule of thumb is to match case-insensitive and to simply check that the
-		 * characters of *query* appear in their order in a candidate symbol. Don't use prefix, substring, or similar
-		 * strict matching.
-		 *
-		 * To improve performance implementors can implement `resolveWorkspaceSymbol` and then provide symbols with partial
-		 * [location](#SymbolInformation.location)-objects, without a `range` defined. The editor will then call
-		 * `resolveWorkspaceSymbol` for selected symbols only, e.g. when opening a workspace symbol.
+		 * Project-wide search for a symbol matching the given query string. It is up to the provider
+		 * how to search given the query string, like substring, indexOf etc. To improve performance implementors can
+		 * skip the [location](#SymbolInformation.location) of symbols and implement `resolveWorkspaceSymbol` to do that
+		 * later.
 		 *
 		 * @param query A non-empty query string.
 		 * @param token A cancellation token.
@@ -2749,15 +2179,12 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A workspace edit is a collection of textual and files changes for
-	 * multiple resources and documents.
-	 *
-	 * Use the [applyEdit](#workspace.applyEdit)-function to apply a workspace edit.
+	 * A workspace edit represents textual changes for many documents.
 	 */
 	export class WorkspaceEdit {
 
 		/**
-		 * The number of affected resources of textual or resource changes.
+		 * The number of affected resources.
 		 */
 		readonly size: number;
 
@@ -2788,8 +2215,7 @@ declare module 'vscode' {
 		delete(uri: Uri, range: Range): void;
 
 		/**
-		 * Check if a text edit for a resource exists.
-		 *
+		 * Check if this edit affects the given resource.
 		 * @param uri A resource identifier.
 		 * @return `true` if the given resource will be touched by this edit.
 		 */
@@ -2811,37 +2237,10 @@ declare module 'vscode' {
 		 */
 		get(uri: Uri): TextEdit[];
 
-		/**
-		 * Create a regular file.
-		 *
-		 * @param uri Uri of the new file..
-		 * @param options Defines if an existing file should be overwritten or be
-		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
-		 */
-		createFile(uri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
-
-		/**
-		 * Delete a file or folder.
-		 *
-		 * @param uri The uri of the file that is to be deleted.
-		 */
-		deleteFile(uri: Uri, options?: { recursive?: boolean, ignoreIfNotExists?: boolean }): void;
-
-		/**
-		 * Rename a file or folder.
-		 *
-		 * @param oldUri The existing file.
-		 * @param newUri The new location.
-		 * @param options Defines if existing files should be overwritten or be
-		 * ignored. When overwrite and ignoreIfExists are both set overwrite wins.
-		 */
-		renameFile(oldUri: Uri, newUri: Uri, options?: { overwrite?: boolean, ignoreIfExists?: boolean }): void;
-
-
 		/**
 		 * Get all text edits grouped by resource.
 		 *
-		 * @return A shallow copy of `[Uri, TextEdit[]]`-tuples.
+		 * @return An array of `[Uri, TextEdit[]]`-tuples.
 		 */
 		entries(): [Uri, TextEdit[]][];
 	}
@@ -2878,7 +2277,7 @@ declare module 'vscode' {
 		 * Builder-function that appends a tabstop (`$1`, `$2` etc) to
 		 * the [`value`](#SnippetString.value) of this snippet string.
 		 *
-		 * @param number The number of this tabstop, defaults to an auto-increment
+		 * @param number The number of this tabstop, defaults to an auto-incremet
 		 * value starting at 1.
 		 * @return This snippet string.
 		 */
@@ -2890,7 +2289,7 @@ declare module 'vscode' {
 		 *
 		 * @param value The value of this placeholder - either a string or a function
 		 * with which a nested snippet can be created.
-		 * @param number The number of this tabstop, defaults to an auto-increment
+		 * @param number The number of this tabstop, defaults to an auto-incremet
 		 * value starting at 1.
 		 * @return This snippet string.
 		 */
@@ -2926,18 +2325,6 @@ declare module 'vscode' {
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit>;
-
-		/**
-		 * Optional function for resolving and validating a position *before* running rename. The result can
-		 * be a range or a range and a placeholder text. The placeholder text should be the identifier of the symbol
-		 * which is being renamed - when omitted the text in the returned range is used.
-		 *
-		 * @param document The document in which rename will be invoked.
-		 * @param position The position at which rename will be invoked.
-		 * @param token A cancellation token.
-		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
-		 */
-		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
 	}
 
 	/**
@@ -3033,8 +2420,8 @@ declare module 'vscode' {
 	export class ParameterInformation {
 
 		/**
-		 * The label of this signature. *Note*: Must be a substring of its
-		 * containing signature information's [label](#SignatureInformation.label).
+		 * The label of this signature. Will be shown in
+		 * the UI.
 		 */
 		label: string;
 
@@ -3042,7 +2429,7 @@ declare module 'vscode' {
 		 * The human-readable doc-comment of this signature. Will be shown
 		 * in the UI but can be omitted.
 		 */
-		documentation?: string | MarkdownString;
+		documentation?: string;
 
 		/**
 		 * Creates a new parameter information object.
@@ -3050,7 +2437,7 @@ declare module 'vscode' {
 		 * @param label A label string.
 		 * @param documentation A doc string.
 		 */
-		constructor(label: string, documentation?: string | MarkdownString);
+		constructor(label: string, documentation?: string);
 	}
 
 	/**
@@ -3070,7 +2457,7 @@ declare module 'vscode' {
 		 * The human-readable doc-comment of this signature. Will be shown
 		 * in the UI but can be omitted.
 		 */
-		documentation?: string | MarkdownString;
+		documentation?: string;
 
 		/**
 		 * The parameters of this signature.
@@ -3083,7 +2470,7 @@ declare module 'vscode' {
 		 * @param label A label string.
 		 * @param documentation A doc string.
 		 */
-		constructor(label: string, documentation?: string | MarkdownString);
+		constructor(label: string, documentation?: string);
 	}
 
 	/**
@@ -3161,7 +2548,7 @@ declare module 'vscode' {
 	/**
 	 * A completion item represents a text snippet that is proposed to complete text that is being typed.
 	 *
-	 * It is sufficient to create a completion item from just a [label](#CompletionItem.label). In that
+	 * It is suffient to create a completion item from just a [label](#CompletionItem.label). In that
 	 * case the completion item will replace the [word](#TextDocument.getWordRangeAtPosition)
 	 * until the cursor with the given label or [insertText](#CompletionItem.insertText). Otherwise the
 	 * the given [edit](#CompletionItem.textEdit) is used.
@@ -3197,7 +2584,7 @@ declare module 'vscode' {
 		/**
 		 * A human-readable string that represents a doc-comment.
 		 */
-		documentation?: string | MarkdownString;
+		documentation?: string;
 
 		/**
 		 * A string that should be used when comparing this item
@@ -3213,13 +2600,6 @@ declare module 'vscode' {
 		 */
 		filterText?: string;
 
-		/**
-		 * Select this item when showing. *Note* that only one completion item can be selected and
-		 * that the editor decides which item that is. The rule is that the *first* item of those
-		 * that match best is selected.
-		 */
-		preselect?: boolean;
-
 		/**
 		 * A string or snippet that should be inserted in a document when selecting
 		 * this completion. When `falsy` the [label](#CompletionItem.label)
@@ -3290,7 +2670,7 @@ declare module 'vscode' {
 	export class CompletionList {
 
 		/**
-		 * This list is not complete. Further typing should result in recomputing
+		 * This list it not complete. Further typing should result in recomputing
 		 * this list.
 		 */
 		isIncomplete?: boolean;
@@ -3309,53 +2689,16 @@ declare module 'vscode' {
 		constructor(items?: CompletionItem[], isIncomplete?: boolean);
 	}
 
-	/**
-	 * How a [completion provider](#CompletionItemProvider) was triggered
-	 */
-	export enum CompletionTriggerKind {
-		/**
-		 * Completion was triggered normally.
-		 */
-		Invoke = 0,
-		/**
-		 * Completion was triggered by a trigger character.
-		 */
-		TriggerCharacter = 1,
-		/**
-		 * Completion was re-triggered as current completion list is incomplete
-		 */
-		TriggerForIncompleteCompletions = 2
-	}
-
-	/**
-	 * Contains additional information about the context in which
-	 * [completion provider](#CompletionItemProvider.provideCompletionItems) is triggered.
-	 */
-	export interface CompletionContext {
-		/**
-		 * How the completion was triggered.
-		 */
-		readonly triggerKind: CompletionTriggerKind;
-
-		/**
-		 * Character that triggered the completion item provider.
-		 *
-		 * `undefined` if provider was not triggered by a character.
-		 *
-		 * The trigger character is already in the document when the completion provider is triggered.
-		 */
-		readonly triggerCharacter?: string;
-	}
-
 	/**
 	 * The completion item provider interface defines the contract between extensions and
 	 * [IntelliSense](https://code.visualstudio.com/docs/editor/intellisense).
 	 *
-	 * Providers can delay the computation of the [`detail`](#CompletionItem.detail)
-	 * and [`documentation`](#CompletionItem.documentation) properties by implementing the
-	 * [`resolveCompletionItem`](#CompletionItemProvider.resolveCompletionItem)-function. However, properties that
-	 * are needed for the initial sorting and filtering, like `sortText`, `filterText`, `insertText`, and `range`, must
-	 * not be changed during resolve.
+	 * When computing *complete* completion items is expensive, providers can optionally implement
+	 * the `resolveCompletionItem`-function. In that case it is enough to return completion
+	 * items with a [label](#CompletionItem.label) from the
+	 * [provideCompletionItems](#CompletionItemProvider.provideCompletionItems)-function. Subsequently,
+	 * when a completion item is shown in the UI and gains focus this provider is asked to resolve
+	 * the item, like adding [doc-comment](#CompletionItem.documentation) or [details](#CompletionItem.detail).
 	 *
 	 * Providers are asked for completions either explicitly by a user gesture or -depending on the configuration-
 	 * implicitly when typing words or trigger characters.
@@ -3368,12 +2711,10 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
-		 * @param context How the completion was triggered.
-		 *
 		 * @return An array of completions, a [completion list](#CompletionList), or a thenable that resolves to either.
 		 * The lack of a result can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext): ProviderResult<CompletionItem[] | CompletionList>;
+		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<CompletionItem[] | CompletionList>;
 
 		/**
 		 * Given a completion item fill in more data, like [doc-comment](#CompletionItem.documentation)
@@ -3434,7 +2775,7 @@ declare module 'vscode' {
 
 		/**
 		 * Given a link fill in its [target](#DocumentLink.target). This method is called when an incomplete
-		 * link is selected in the UI. Providers can implement this method and return incomplete links
+		 * link is selected in the UI. Providers can implement this method and return incomple links
 		 * (without target) from the [`provideDocumentLinks`](#DocumentLinkProvider.provideDocumentLinks) method which
 		 * often helps to improve performance.
 		 *
@@ -3444,212 +2785,6 @@ declare module 'vscode' {
 		resolveDocumentLink?(link: DocumentLink, token: CancellationToken): ProviderResult<DocumentLink>;
 	}
 
-	/**
-	 * Represents a color in RGBA space.
-	 */
-	export class Color {
-
-		/**
-		 * The red component of this color in the range [0-1].
-		 */
-		readonly red: number;
-
-		/**
-		 * The green component of this color in the range [0-1].
-		 */
-		readonly green: number;
-
-		/**
-		 * The blue component of this color in the range [0-1].
-		 */
-		readonly blue: number;
-
-		/**
-		 * The alpha component of this color in the range [0-1].
-		 */
-		readonly alpha: number;
-
-		/**
-		 * Creates a new color instance.
-		 *
-		 * @param red The red component.
-		 * @param green The green component.
-		 * @param blue The blue component.
-		 * @param alpha The alpha component.
-		 */
-		constructor(red: number, green: number, blue: number, alpha: number);
-	}
-
-	/**
-	 * Represents a color range from a document.
-	 */
-	export class ColorInformation {
-
-		/**
-		 * The range in the document where this color appears.
-		 */
-		range: Range;
-
-		/**
-		 * The actual color value for this color range.
-		 */
-		color: Color;
-
-		/**
-		 * Creates a new color range.
-		 *
-		 * @param range The range the color appears in. Must not be empty.
-		 * @param color The value of the color.
-		 * @param format The format in which this color is currently formatted.
-		 */
-		constructor(range: Range, color: Color);
-	}
-
-	/**
-	 * A color presentation object describes how a [`color`](#Color) should be represented as text and what
-	 * edits are required to refer to it from source code.
-	 *
-	 * For some languages one color can have multiple presentations, e.g. css can represent the color red with
-	 * the constant `Red`, the hex-value `#ff0000`, or in rgba and hsla forms. In csharp other representations
-	 * apply, e.g `System.Drawing.Color.Red`.
-	 */
-	export class ColorPresentation {
-
-		/**
-		 * The label of this color presentation. It will be shown on the color
-		 * picker header. By default this is also the text that is inserted when selecting
-		 * this color presentation.
-		 */
-		label: string;
-
-		/**
-		 * An [edit](#TextEdit) which is applied to a document when selecting
-		 * this presentation for the color.  When `falsy` the [label](#ColorPresentation.label)
-		 * is used.
-		 */
-		textEdit?: TextEdit;
-
-		/**
-		 * An optional array of additional [text edits](#TextEdit) that are applied when
-		 * selecting this color presentation. Edits must not overlap with the main [edit](#ColorPresentation.textEdit) nor with themselves.
-		 */
-		additionalTextEdits?: TextEdit[];
-
-		/**
-		 * Creates a new color presentation.
-		 *
-		 * @param label The label of this color presentation.
-		 */
-		constructor(label: string);
-	}
-
-	/**
-	 * The document color provider defines the contract between extensions and feature of
-	 * picking and modifying colors in the editor.
-	 */
-	export interface DocumentColorProvider {
-
-		/**
-		 * Provide colors for the given document.
-		 *
-		 * @param document The document in which the command was invoked.
-		 * @param token A cancellation token.
-		 * @return An array of [color information](#ColorInformation) or a thenable that resolves to such. The lack of a result
-		 * can be signaled by returning `undefined`, `null`, or an empty array.
-		 */
-		provideDocumentColors(document: TextDocument, token: CancellationToken): ProviderResult<ColorInformation[]>;
-
-		/**
-		 * Provide [representations](#ColorPresentation) for a color.
-		 *
-		 * @param color The color to show and insert.
-		 * @param context A context object with additional information
-		 * @param token A cancellation token.
-		 * @return An array of color presentations or a thenable that resolves to such. The lack of a result
-		 * can be signaled by returning `undefined`, `null`, or an empty array.
-		 */
-		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
-	}
-
-	/**
-	 * A line based folding range. To be valid, start and end line must a zero or larger and smaller than the number of lines in the document.
-	 * Invalid ranges will be ignored.
-	 */
-	export class FoldingRange {
-
-		/**
-		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
-		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
-		 */
-		start: number;
-
-		/**
-		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
-		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
-		 */
-		end: number;
-
-		/**
-		 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
-		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
-		 * like 'Fold all comments'. See
-		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
-		 * If not set, the range is originated from a syntax element.
-		 */
-		kind?: FoldingRangeKind;
-
-		/**
-		 * Creates a new folding range.
-		 *
-		 * @param start The start line of the folded range.
-		 * @param end The end line of the folded range.
-		 * @param kind The kind of the folding range.
-		 */
-		constructor(start: number, end: number, kind?: FoldingRangeKind);
-	}
-
-	/**
-	 * An enumeration of specific folding range kinds. The kind is an optional field of a [FoldingRange](#FoldingRange)
-	 * and is used to distinguish specific folding ranges such as ranges originated from comments. The kind is used by commands like
-	 * `Fold all comments` or `Fold all regions`.
-	 * If the kind is not set on the range, the range originated from a syntax element other than comments, imports or region markers.
-	 */
-	export enum FoldingRangeKind {
-		/**
-		 * Kind for folding range representing a comment.
-		 */
-		Comment = 1,
-		/**
-		 * Kind for folding range representing a import.
-		 */
-		Imports = 2,
-		/**
-		 * Kind for folding range representing regions originating from folding markers like `#region` and `#endregion`.
-		 */
-		Region = 3
-	}
-
-	/**
-	 * Folding context (for future use)
-	 */
-	export interface FoldingContext {
-	}
-
-	/**
-	 * The folding range provider interface defines the contract between extensions and
-	 * [Folding](https://code.visualstudio.com/docs/editor/codebasics#_folding) in the editor.
-	 */
-	export interface FoldingRangeProvider {
-		/**
-		 * Returns a list of folding ranges or null and undefined if the provider
-		 * does not want to participate or was cancelled.
-		 * @param document The document in which the command was invoked.
-		 * @param context Additional context information (for future use)
-		 * @param token A cancellation token.
-		 */
-		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
-	}
-
 	/**
 	 * A tuple of two characters, like a pair of
 	 * opening and closing brackets.
@@ -3677,7 +2812,7 @@ declare module 'vscode' {
 	 */
 	export interface IndentationRule {
 		/**
-		 * If a line matches this pattern, then all the lines after it should be unindented once (until another rule matches).
+		 * If a line matches this pattern, then all the lines after it should be unindendented once (until another rule matches).
 		 */
 		decreaseIndentPattern: RegExp;
 		/**
@@ -3908,7 +3043,7 @@ declare module 'vscode' {
 		 * The *effective* value (returned by [`get`](#WorkspaceConfiguration.get))
 		 * is computed like this: `defaultValue` overwritten by `globalValue`,
 		 * `globalValue` overwritten by `workspaceValue`. `workspaceValue` overwritten by `workspaceFolderValue`.
-		 * Refer to [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings)
+		 * Refer to [Settings Inheritence](https://code.visualstudio.com/docs/getstarted/settings)
 		 * for more information.
 		 *
 		 * *Note:* The configuration name must denote a leaf in the configuration tree
@@ -3933,7 +3068,7 @@ declare module 'vscode' {
 		 * has no observable effect in that workspace, but in others. Setting a workspace value
 		 * in the presence of a more specific folder value has no observable effect for the resources
 		 * under respective [folder](#workspace.workspaceFolders), but in others. Refer to
-		 * [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings) for more information.
+		 * [Settings Inheritence](https://code.visualstudio.com/docs/getstarted/settings) for more information.
 		 *
 		 * *Note 2:* To remove a configuration value use `undefined`, like so: `config.update('somekey', undefined)`
 		 *
@@ -3947,11 +3082,8 @@ declare module 'vscode' {
 		 * @param section Configuration name, supports _dotted_ names.
 		 * @param value The new value.
 		 * @param configurationTarget The [configuration target](#ConfigurationTarget) or a boolean value.
-		 *	- If `true` configuration target is `ConfigurationTarget.Global`.
-		 *	- If `false` configuration target is `ConfigurationTarget.Workspace`.
-		 *	- If `undefined` or `null` configuration target is
-		 *	`ConfigurationTarget.WorkspaceFolder` when configuration is resource specific
-		 *	`ConfigurationTarget.Workspace` otherwise.
+		 *	If `undefined` or `null` or `false` configuration target is `ConfigurationTarget.Workspace`.
+		 *	If `true` configuration target is `ConfigurationTarget.Global`.
 		 */
 		update(section: string, value: any, configurationTarget?: ConfigurationTarget | boolean): Thenable<void>;
 
@@ -3973,7 +3105,7 @@ declare module 'vscode' {
 		uri: Uri;
 
 		/**
-		 * The document range of this location.
+		 * The document range of this locations.
 		 */
 		range: Range;
 
@@ -3986,17 +3118,6 @@ declare module 'vscode' {
 		constructor(uri: Uri, rangeOrPosition: Range | Position);
 	}
 
-	/**
-	 * The event that is fired when diagnostics change.
-	 */
-	export interface DiagnosticChangeEvent {
-
-		/**
-		 * An array of resources for which diagnostics have changed.
-		 */
-		readonly uris: Uri[];
-	}
-
 	/**
 	 * Represents the severity of diagnostics.
 	 */
@@ -4024,49 +3145,6 @@ declare module 'vscode' {
 		Hint = 3
 	}
 
-	/**
-	 * Represents a related message and source code location for a diagnostic. This should be
-	 * used to point to code locations that cause or related to a diagnostics, e.g when duplicating
-	 * a symbol in a scope.
-	 */
-	export class DiagnosticRelatedInformation {
-
-		/**
-		 * The location of this related diagnostic information.
-		 */
-		location: Location;
-
-		/**
-		 * The message of this related diagnostic information.
-		 */
-		message: string;
-
-		/**
-		 * Creates a new related diagnostic information object.
-		 *
-		 * @param location The location.
-		 * @param message The message.
-		 */
-		constructor(location: Location, message: string);
-	}
-
-	/**
-	 * Additional metadata about the type of a diagnostic.
-	 */
-	export enum DiagnosticTag {
-		/**
-		 * Unused or unnecessary code.
-		 *
-		 * Diagnostics with this tag are rendered faded out. The amount of fading
-		 * is controlled by the `"editorUnnecessaryCode.opacity"` theme color. For
-		 * example, `"editorUnnecessaryCode.opacity": "#000000c0"` will render the
-		 * code with 75% opacity. For high contrast themes, use the
-		 * `"editorUnnecessaryCode.border"` theme color to underline unnecessary code
-		 * instead of fading it out.
-		 */
-		Unnecessary = 1,
-	}
-
 	/**
 	 * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
 	 * are only valid in the scope of a file.
@@ -4083,33 +3161,23 @@ declare module 'vscode' {
 		 */
 		message: string;
 
+		/**
+		 * A human-readable string describing the source of this
+		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 */
+		source: string;
+
 		/**
 		 * The severity, default is [error](#DiagnosticSeverity.Error).
 		 */
 		severity: DiagnosticSeverity;
 
 		/**
-		 * A human-readable string describing the source of this
-		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 * A code or identifier for this diagnostics. Will not be surfaced
+		 * to the user, but should be used for later processing, e.g. when
+		 * providing [code actions](#CodeActionContext).
 		 */
-		source?: string;
-
-		/**
-		 * A code or identifier for this diagnostic.
-		 * Should be used for later processing, e.g. when providing [code actions](#CodeActionContext).
-		 */
-		code?: string | number;
-
-		/**
-		 * An array of related diagnostic information, e.g. when symbol-names within
-		 * a scope collide all definitions can be marked via this property.
-		 */
-		relatedInformation?: DiagnosticRelatedInformation[];
-
-		/**
-		 * Additional metadata about the diagnostic.
-		 */
-		tags?: DiagnosticTag[];
+		code: string | number;
 
 		/**
 		 * Creates a new diagnostic object.
@@ -4207,59 +3275,13 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Denotes a location of an editor in the window. Editors can be arranged in a grid
-	 * and each column represents one editor location in that grid by counting the editors
-	 * in order of their appearance.
+	 * Denotes a column in the editor window. Columns are
+	 * used to show editors side by side.
 	 */
 	export enum ViewColumn {
-		/**
-		 * A *symbolic* editor column representing the currently active column. This value
-		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
-		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Active`.
-		 */
-		Active = -1,
-		/**
-		 * A *symbolic* editor column representing the column to the side of the active one. This value
-		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
-		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Beside`.
-		 */
-		Beside = -2,
-		/**
-		 * The first editor column.
-		 */
 		One = 1,
-		/**
-		 * The second editor column.
-		 */
 		Two = 2,
-		/**
-		 * The third editor column.
-		 */
-		Three = 3,
-		/**
-		 * The fourth editor column.
-		 */
-		Four = 4,
-		/**
-		 * The fifth editor column.
-		 */
-		Five = 5,
-		/**
-		 * The sixth editor column.
-		 */
-		Six = 6,
-		/**
-		 * The seventh editor column.
-		 */
-		Seven = 7,
-		/**
-		 * The eighth editor column.
-		 */
-		Eight = 8,
-		/**
-		 * The ninth editor column.
-		 */
-		Nine = 9
+		Three = 3
 	}
 
 	/**
@@ -4359,7 +3381,7 @@ declare module 'vscode' {
 		/**
 		 * The text to show for the entry. You can embed icons in the text by leveraging the syntax:
 		 *
-		 * `My text $(icon-name) contains icons like $(icon-name) this one.`
+		 * `My text $(icon-name) contains icons like $(icon'name) this one.`
 		 *
 		 * Where the icon-name is taken from the [octicon](https://octicons.github.com) icon set, e.g.
 		 * `light-bulb`, `thumbsup`, `zap` etc.
@@ -4406,8 +3428,7 @@ declare module 'vscode' {
 
 		/**
 		 * Report a progress update.
-		 * @param value A progress item, like a message and/or an
-		 * report on how much work finished
+		 * @param value A progress item, like a message or an updated percentage value
 		 */
 		report(value: T): void;
 	}
@@ -4546,13 +3567,6 @@ declare module 'vscode' {
 		 * [`globalState`](#ExtensionContext.globalState) to store key value data.
 		 */
 		storagePath: string | undefined;
-
-		/**
-		 * An absolute file path of a directory in which the extension can create log files.
-		 * The directory might not exist on disk and creation is up to the extension. However,
-		 * the parent directory is guaranteed to be existent.
-		 */
-		logPath: string;
 	}
 
 	/**
@@ -4658,11 +3672,6 @@ declare module 'vscode' {
 		 * every task execution (new). Defaults to `TaskInstanceKind.Shared`
 		 */
 		panel?: TaskPanelKind;
-
-		/**
-		 * Controls whether to show the "Terminal will be reused by tasks, press any key to close it" message.
-		 */
-		showReuseMessage?: boolean;
 	}
 
 	/**
@@ -4674,22 +3683,22 @@ declare module 'vscode' {
 		/**
 		 * The clean task group;
 		 */
-		static Clean: TaskGroup;
+		public static Clean: TaskGroup;
 
 		/**
 		 * The build task group;
 		 */
-		static Build: TaskGroup;
+		public static Build: TaskGroup;
 
 		/**
 		 * The rebuild all task group;
 		 */
-		static Rebuild: TaskGroup;
+		public static Rebuild: TaskGroup;
 
 		/**
 		 * The test all task group;
 		 */
-		static Test: TaskGroup;
+		public static Test: TaskGroup;
 
 		private constructor(id: string, label: string);
 	}
@@ -4701,7 +3710,7 @@ declare module 'vscode' {
 	 */
 	export interface TaskDefinition {
 		/**
-		 * The task definition describing the task provided by an extension.
+		 * The task definition descibing the task provided by an extension.
 		 * Usually a task provider defines more properties to identify
 		 * a task. They need to be defined in the package.json of the
 		 * extension under the 'taskDefinitions' extension point. The npm
@@ -4711,9 +3720,6 @@ declare module 'vscode' {
 		 *     script: string;
 		 * }
 		 * ```
-		 *
-		 * Note that type identifier starting with a '$' are reserved for internal
-		 * usages and shouldn't be used by extensions.
 		 */
 		readonly type: string;
 
@@ -4781,38 +3787,6 @@ declare module 'vscode' {
 		options?: ProcessExecutionOptions;
 	}
 
-	/**
-	 * The shell quoting options.
-	 */
-	export interface ShellQuotingOptions {
-
-		/**
-		 * The character used to do character escaping. If a string is provided only spaces
-		 * are escaped. If a `{ escapeChar, charsToEscape }` literal is provide all characters
-		 * in `charsToEscape` are escaped using the `escapeChar`.
-		 */
-		escape?: string | {
-			/**
-			 * The escape character.
-			 */
-			escapeChar: string;
-			/**
-			 * The characters to escape.
-			 */
-			charsToEscape: string;
-		};
-
-		/**
-		 * The character used for strong quoting. The string's length must be 1.
-		 */
-		strong?: string;
-
-		/**
-		 * The character used for weak quoting. The string's length must be 1.
-		 */
-		weak?: string;
-	}
-
 	/**
 	 * Options for a shell execution
 	 */
@@ -4823,18 +3797,10 @@ declare module 'vscode' {
 		executable?: string;
 
 		/**
-		 * The arguments to be passed to the shell executable used to run the task. Most shells
-		 * require special arguments to execute a command. For  example `bash` requires the `-c`
-		 * argument to execute a command, `PowerShell` requires `-Command` and `cmd` requires both
-		 * `/d` and `/c`.
+		 * The arguments to be passed to the shell executable used to run the task.
 		 */
 		shellArgs?: string[];
 
-		/**
-		 * The shell quotes supported by this shell.
-		 */
-		shellQuoting?: ShellQuotingOptions;
-
 		/**
 		 * The current working directory of the executed shell.
 		 * If omitted the tools current workspace root is used.
@@ -4849,55 +3815,10 @@ declare module 'vscode' {
 		env?: { [key: string]: string };
 	}
 
-	/**
-	 * Defines how an argument should be quoted if it contains
-	 * spaces or unsupported characters.
-	 */
-	export enum ShellQuoting {
-
-		/**
-		 * Character escaping should be used. This for example
-		 * uses \ on bash and ` on PowerShell.
-		 */
-		Escape = 1,
-
-		/**
-		 * Strong string quoting should be used. This for example
-		 * uses " for Windows cmd and ' for bash and PowerShell.
-		 * Strong quoting treats arguments as literal strings.
-		 * Under PowerShell echo 'The value is $(2 * 3)' will
-		 * print `The value is $(2 * 3)`
-		 */
-		Strong = 2,
-
-		/**
-		 * Weak string quoting should be used. This for example
-		 * uses " for Windows cmd, bash and PowerShell. Weak quoting
-		 * still performs some kind of evaluation inside the quoted
-		 * string.  Under PowerShell echo "The value is $(2 * 3)"
-		 * will print `The value is 6`
-		 */
-		Weak = 3
-	}
-
-	/**
-	 * A string that will be quoted depending on the used shell.
-	 */
-	export interface ShellQuotedString {
-		/**
-		 * The actual string value.
-		 */
-		value: string;
-
-		/**
-		 * The quoting style to use.
-		 */
-		quoting: ShellQuoting;
-	}
 
 	export class ShellExecution {
 		/**
-		 * Creates a shell execution with a full command line.
+		 * Creates a process execution.
 		 *
 		 * @param commandLine The command line to execute.
 		 * @param options Optional options for the started the shell.
@@ -4905,32 +3826,10 @@ declare module 'vscode' {
 		constructor(commandLine: string, options?: ShellExecutionOptions);
 
 		/**
-		 * Creates a shell execution with a command and arguments. For the real execution VS Code will
-		 * construct a command line from the command and the arguments. This is subject to interpretation
-		 * especially when it comes to quoting. If full control over the command line is needed please
-		 * use the constructor that creates a `ShellExecution` with the full command line.
-		 *
-		 * @param command The command to execute.
-		 * @param args The command arguments.
-		 * @param options Optional options for the started the shell.
-		 */
-		constructor(command: string | ShellQuotedString, args: (string | ShellQuotedString)[], options?: ShellExecutionOptions);
-
-		/**
-		 * The shell command line. Is `undefined` if created with a command and arguments.
+		 * The shell command line
 		 */
 		commandLine: string;
 
-		/**
-		 * The shell command. Is `undefined` if created with a full command line.
-		 */
-		command: string | ShellQuotedString;
-
-		/**
-		 * The shell args. Is `undefined` if created with a full command line.
-		 */
-		args: (string | ShellQuotedString)[];
-
 		/**
 		 * The shell options used when the command line is executed in a shell.
 		 * Defaults to undefined.
@@ -4938,32 +3837,15 @@ declare module 'vscode' {
 		options?: ShellExecutionOptions;
 	}
 
-	/**
-	 * The scope of a task.
-	 */
-	export enum TaskScope {
-		/**
-		 * The task is a global task
-		 */
-		Global = 1,
-
-		/**
-		 * The task is a workspace task
-		 */
-		Workspace = 2
-	}
-
 	/**
 	 * A task to execute
 	 */
 	export class Task {
 
 		/**
-		 * ~~Creates a new task.~~
+		 * Creates a new task.
 		 *
-		 * @deprecated Use the new constructors that allow specifying a target for the task.
-		 *
-		 * @param definition The task definition as defined in the taskDefinitions extension point.
+		 * @param definition The task definition as defined in the taskDefintions extension point.
 		 * @param name The task's name. Is presented in the user interface.
 		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
 		 * @param execution The process or shell execution.
@@ -4973,30 +3855,11 @@ declare module 'vscode' {
 		 */
 		constructor(taskDefinition: TaskDefinition, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
 
-		/**
-		 * Creates a new task.
-		 *
-		 * @param definition The task definition as defined in the taskDefinitions extension point.
-		 * @param target Specifies the task's target. It is either a global or a workspace task or a task for a specific workspace folder.
-		 * @param name The task's name. Is presented in the user interface.
-		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
-		 * @param execution The process or shell execution.
-		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
-		 *  or '$eslint'. Problem matchers can be contributed by an extension using
-		 *  the `problemMatchers` extension point.
-		 */
-		constructor(taskDefinition: TaskDefinition, target: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
-
 		/**
 		 * The task's definition.
 		 */
 		definition: TaskDefinition;
 
-		/**
-		 * The task's scope.
-		 */
-		scope?: TaskScope.Global | TaskScope.Workspace | WorkspaceFolder;
-
 		/**
 		 * The task's name
 		 */
@@ -5040,7 +3903,7 @@ declare module 'vscode' {
 
 	/**
 	 * A task provider allows to add tasks to the task service.
-	 * A task provider is registered via #tasks.registerTaskProvider.
+	 * A task provider is registerd via #workspace.registerTaskProvider.
 	 */
 	export interface TaskProvider {
 		/**
@@ -5052,12 +3915,9 @@ declare module 'vscode' {
 
 		/**
 		 * Resolves a task that has no [`execution`](#Task.execution) set. Tasks are
-		 * often created from information found in the `tasks.json`-file. Such tasks miss
+		 * often created from information found in the `task.json`-file. Such tasks miss
 		 * the information on how to execute them and a task provider must fill in
-		 * the missing information in the `resolveTask`-method. This method will not be
-		 * called for tasks returned from the above `provideTasks` method since those
-		 * tasks are always fully resolved. A valid default implementation for the
-		 * `resolveTask` method is to return `undefined`.
+		 * the missing information in the `resolveTask`-method.
 		 *
 		 * @param task The task to resolve.
 		 * @param token A cancellation token.
@@ -5066,648 +3926,6 @@ declare module 'vscode' {
 		resolveTask(task: Task, token?: CancellationToken): ProviderResult<Task>;
 	}
 
-	/**
-	 * An object representing an executed Task. It can be used
-	 * to terminate a task.
-	 *
-	 * This interface is not intended to be implemented.
-	 */
-	export interface TaskExecution {
-		/**
-		 * The task that got started.
-		 */
-		task: Task;
-
-		/**
-		 * Terminates the task execution.
-		 */
-		terminate(): void;
-	}
-
-	/**
-	 * An event signaling the start of a task execution.
-	 *
-	 * This interface is not intended to be implemented.
-	 */
-	interface TaskStartEvent {
-		/**
-		 * The task item representing the task that got started.
-		 */
-		execution: TaskExecution;
-	}
-
-	/**
-	 * An event signaling the end of an executed task.
-	 *
-	 * This interface is not intended to be implemented.
-	 */
-	interface TaskEndEvent {
-		/**
-		 * The task item representing the task that finished.
-		 */
-		execution: TaskExecution;
-	}
-
-	/**
-	 * An event signaling the start of a process execution
-	 * triggered through a task
-	 */
-	export interface TaskProcessStartEvent {
-
-		/**
-		 * The task execution for which the process got started.
-		 */
-		execution: TaskExecution;
-
-		/**
-		 * The underlying process id.
-		 */
-		processId: number;
-	}
-
-	/**
-	 * An event signaling the end of a process execution
-	 * triggered through a task
-	 */
-	export interface TaskProcessEndEvent {
-
-		/**
-		 * The task execution for which the process got started.
-		 */
-		execution: TaskExecution;
-
-		/**
-		 * The process's exit code.
-		 */
-		exitCode: number;
-	}
-
-	export interface TaskFilter {
-		/**
-		 * The task version as used in the tasks.json file.
-		 * The string support the package.json semver notation.
-		 */
-		version?: string;
-
-		/**
-		 * The task type to return;
-		 */
-		type?: string;
-	}
-
-	/**
-	 * Namespace for tasks functionality.
-	 */
-	export namespace tasks {
-
-		/**
-		 * Register a task provider.
-		 *
-		 * @param type The task kind type this provider is registered for.
-		 * @param provider A task provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
-
-		/**
-		 * Fetches all tasks available in the systems. This includes tasks
-		 * from `tasks.json` files as well as tasks from task providers
-		 * contributed through extensions.
-		 *
-		 * @param filter a filter to filter the return tasks.
-		 */
-		export function fetchTasks(filter?: TaskFilter): Thenable<Task[]>;
-
-		/**
-		 * Executes a task that is managed by VS Code. The returned
-		 * task execution can be used to terminate the task.
-		 *
-		 * @param task the task to execute
-		 */
-		export function executeTask(task: Task): Thenable<TaskExecution>;
-
-		/**
-		 * The currently active task executions or an empty array.
-		 *
-		 * @readonly
-		 */
-		export let taskExecutions: ReadonlyArray<TaskExecution>;
-
-		/**
-		 * Fires when a task starts.
-		 */
-		export const onDidStartTask: Event<TaskStartEvent>;
-
-		/**
-		 * Fires when a task ends.
-		 */
-		export const onDidEndTask: Event<TaskEndEvent>;
-
-		/**
-		 * Fires when the underlying process has been started.
-		 * This event will not fire for tasks that don't
-		 * execute an underlying process.
-		 */
-		export const onDidStartTaskProcess: Event<TaskProcessStartEvent>;
-
-		/**
-		 * Fires when the underlying process has ended.
-		 * This event will not fire for tasks that don't
-		 * execute an underlying process.
-		 */
-		export const onDidEndTaskProcess: Event<TaskProcessEndEvent>;
-	}
-
-	/**
-	 * Enumeration of file types. The types `File` and `Directory` can also be
-	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
-	 * `FileType.Directory | FileType.SymbolicLink`.
-	 */
-	export enum FileType {
-		/**
-		 * The file type is unknown.
-		 */
-		Unknown = 0,
-		/**
-		 * A regular file.
-		 */
-		File = 1,
-		/**
-		 * A directory.
-		 */
-		Directory = 2,
-		/**
-		 * A symbolic link to a file.
-		 */
-		SymbolicLink = 64
-	}
-
-	/**
-	 * The `FileStat`-type represents metadata about a file
-	 */
-	export interface FileStat {
-		/**
-		 * The type of the file, e.g. is a regular file, a directory, or symbolic link
-		 * to a file.
-		 */
-		type: FileType;
-		/**
-		 * The creation timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
-		 */
-		ctime: number;
-		/**
-		 * The modification timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
-		 */
-		mtime: number;
-		/**
-		 * The size in bytes.
-		 */
-		size: number;
-	}
-
-	/**
-	 * A type that filesystem providers should use to signal errors.
-	 *
-	 * This class has factory methods for common error-cases, like `EntryNotFound` when
-	 * a file or folder doesn't exist, use them like so: `throw vscode.FileSystemError.EntryNotFound(someUri);`
-	 */
-	export class FileSystemError extends Error {
-
-		/**
-		 * Create an error to signal that a file or folder wasn't found.
-		 * @param messageOrUri Message or uri.
-		 */
-		static FileNotFound(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Create an error to signal that a file or folder already exists, e.g. when
-		 * creating but not overwriting a file.
-		 * @param messageOrUri Message or uri.
-		 */
-		static FileExists(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Create an error to signal that a file is not a folder.
-		 * @param messageOrUri Message or uri.
-		 */
-		static FileNotADirectory(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Create an error to signal that a file is a folder.
-		 * @param messageOrUri Message or uri.
-		 */
-		static FileIsADirectory(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Create an error to signal that an operation lacks required permissions.
-		 * @param messageOrUri Message or uri.
-		 */
-		static NoPermissions(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Create an error to signal that the file system is unavailable or too busy to
-		 * complete a request.
-		 * @param messageOrUri Message or uri.
-		 */
-		static Unavailable(messageOrUri?: string | Uri): FileSystemError;
-
-		/**
-		 * Creates a new filesystem error.
-		 *
-		 * @param messageOrUri Message or uri.
-		 */
-		constructor(messageOrUri?: string | Uri);
-	}
-
-	/**
-	 * Enumeration of file change types.
-	 */
-	export enum FileChangeType {
-
-		/**
-		 * The contents or metadata of a file have changed.
-		 */
-		Changed = 1,
-
-		/**
-		 * A file has been created.
-		 */
-		Created = 2,
-
-		/**
-		 * A file has been deleted.
-		 */
-		Deleted = 3,
-	}
-
-	/**
-	 * The event filesystem providers must use to signal a file change.
-	 */
-	export interface FileChangeEvent {
-
-		/**
-		 * The type of change.
-		 */
-		type: FileChangeType;
-
-		/**
-		 * The uri of the file that has changed.
-		 */
-		uri: Uri;
-	}
-
-	/**
-	 * The filesystem provider defines what the editor needs to read, write, discover,
-	 * and to manage files and folders. It allows extensions to serve files from remote places,
-	 * like ftp-servers, and to seamlessly integrate those into the editor.
-	 *
-	 * * *Note 1:* The filesystem provider API works with [uris](#Uri) and assumes hierarchical
-	 * paths, e.g. `foo:/my/path` is a child of `foo:/my/` and a parent of `foo:/my/path/deeper`.
-	 * * *Note 2:* There is an activation event `onFileSystem:<scheme>` that fires when a file
-	 * or folder is being accessed.
-	 * * *Note 3:* The word 'file' is often used to denote all [kinds](#FileType) of files, e.g.
-	 * folders, symbolic links, and regular files.
-	 */
-	export interface FileSystemProvider {
-
-		/**
-		 * An event to signal that a resource has been created, changed, or deleted. This
-		 * event should fire for resources that are being [watched](#FileSystemProvider.watch)
-		 * by clients of this provider.
-		 */
-		readonly onDidChangeFile: Event<FileChangeEvent[]>;
-
-		/**
-		 * Subscribe to events in the file or folder denoted by `uri`.
-		 *
-		 * The editor will call this function for files and folders. In the latter case, the
-		 * options differ from defaults, e.g. what files/folders to exclude from watching
-		 * and if subfolders, sub-subfolder, etc. should be watched (`recursive`).
-		 *
-		 * @param uri The uri of the file to be watched.
-		 * @param options Configures the watch.
-		 * @returns A disposable that tells the provider to stop watching the `uri`.
-		 */
-		watch(uri: Uri, options: { recursive: boolean; excludes: string[] }): Disposable;
-
-		/**
-		 * Retrieve metadata about a file.
-		 *
-		 * Note that the metadata for symbolic links should be the metadata of the file they refer to.
-		 * Still, the [SymbolicLink](#FileType.SymbolicLink)-type must be used in addition to the actual type, e.g.
-		 * `FileType.SymbolicLink | FileType.Directory`.
-		 *
-		 * @param uri The uri of the file to retrieve metadata about.
-		 * @return The file metadata about the file.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
-		 */
-		stat(uri: Uri): FileStat | Thenable<FileStat>;
-
-		/**
-		 * Retrieve all entries of a [directory](#FileType.Directory).
-		 *
-		 * @param uri The uri of the folder.
-		 * @return An array of name/type-tuples or a thenable that resolves to such.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
-		 */
-		readDirectory(uri: Uri): [string, FileType][] | Thenable<[string, FileType][]>;
-
-		/**
-		 * Create a new directory (Note, that new files are created via `write`-calls).
-		 *
-		 * @param uri The uri of the new folder.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist, e.g. no mkdirp-logic required.
-		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists.
-		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
-		 */
-		createDirectory(uri: Uri): void | Thenable<void>;
-
-		/**
-		 * Read the entire contents of a file.
-		 *
-		 * @param uri The uri of the file.
-		 * @return An array of bytes or a thenable that resolves to such.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
-		 */
-		readFile(uri: Uri): Uint8Array | Thenable<Uint8Array>;
-
-		/**
-		 * Write data to a file, replacing its entire contents.
-		 *
-		 * @param uri The uri of the file.
-		 * @param content The new content of the file.
-		 * @param options Defines if missing files should or must be created.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist and `create` is not set.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist and `create` is set, e.g. no mkdirp-logic required.
-		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists, `create` is set but `overwrite` is not set.
-		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
-		 */
-		writeFile(uri: Uri, content: Uint8Array, options: { create: boolean, overwrite: boolean }): void | Thenable<void>;
-
-		/**
-		 * Delete a file.
-		 *
-		 * @param uri The resource that is to be deleted.
-		 * @param options Defines if deletion of folders is recursive.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
-		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
-		 */
-		delete(uri: Uri, options: { recursive: boolean }): void | Thenable<void>;
-
-		/**
-		 * Rename a file or folder.
-		 *
-		 * @param oldUri The existing file.
-		 * @param newUri The new location.
-		 * @param options Defines if existing files should be overwritten.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `oldUri` doesn't exist.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `newUri` doesn't exist, e.g. no mkdirp-logic required.
-		 * @throws [`FileExists`](#FileSystemError.FileExists) when `newUri` exists and when the `overwrite` option is not `true`.
-		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
-		 */
-		rename(oldUri: Uri, newUri: Uri, options: { overwrite: boolean }): void | Thenable<void>;
-
-		/**
-		 * Copy files or folders. Implementing this function is optional but it will speedup
-		 * the copy operation.
-		 *
-		 * @param source The existing file.
-		 * @param destination The destination location.
-		 * @param options Defines if existing files should be overwriten.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `source` doesn't exist.
-		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `destination` doesn't exist, e.g. no mkdirp-logic required.
-		 * @throws [`FileExists`](#FileSystemError.FileExists) when `destination` exists and when the `overwrite` option is not `true`.
-		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
-		 */
-		copy?(source: Uri, destination: Uri, options: { overwrite: boolean }): void | Thenable<void>;
-	}
-
-	/**
-	 * Content settings for a webview.
-	 */
-	export interface WebviewOptions {
-		/**
-		 * Controls whether scripts are enabled in the webview content or not.
-		 *
-		 * Defaults to false (scripts-disabled).
-		 */
-		readonly enableScripts?: boolean;
-
-		/**
-		 * Controls whether command uris are enabled in webview content or not.
-		 *
-		 * Defaults to false.
-		 */
-		readonly enableCommandUris?: boolean;
-
-		/**
-		 * Root paths from which the webview can load local (filesystem) resources using the `vscode-resource:` scheme.
-		 *
-		 * Default to the root folders of the current workspace plus the extension's install directory.
-		 *
-		 * Pass in an empty array to disallow access to any local resources.
-		 */
-		readonly localResourceRoots?: ReadonlyArray<Uri>;
-	}
-
-	/**
-	 * A webview displays html content, like an iframe.
-	 */
-	export interface Webview {
-		/**
-		 * Content settings for the webview.
-		 */
-		options: WebviewOptions;
-
-		/**
-		 * Contents of the webview.
-		 *
-		 * Should be a complete html document.
-		 */
-		html: string;
-
-		/**
-		 * Fired when the webview content posts a message.
-		 */
-		readonly onDidReceiveMessage: Event<any>;
-
-		/**
-		 * Post a message to the webview content.
-		 *
-		 * Messages are only delivered if the webview is visible.
-		 *
-		 * @param message Body of the message.
-		 */
-		postMessage(message: any): Thenable<boolean>;
-	}
-
-	/**
-	 * Content settings for a webview panel.
-	 */
-	export interface WebviewPanelOptions {
-		/**
-		 * Controls if the find widget is enabled in the panel.
-		 *
-		 * Defaults to false.
-		 */
-		readonly enableFindWidget?: boolean;
-
-		/**
-		 * Controls if the webview panel's content (iframe) is kept around even when the panel
-		 * is no longer visible.
-		 *
-		 * Normally the webview panel's html context is created when the panel becomes visible
-		 * and destroyed when it is is hidden. Extensions that have complex state
-		 * or UI can set the `retainContextWhenHidden` to make VS Code keep the webview
-		 * context around, even when the webview moves to a background tab. When a webview using
-		 * `retainContextWhenHidden` becomes hidden, its scripts and other dynamic content are suspended.
-		 * When the panel becomes visible again, the context is automatically restored
-		 * in the exact same state it was in originally. You cannot send messages to a
-		 * hidden webview, even with `retainContextWhenHidden` enabled.
-		 *
-		 * `retainContextWhenHidden` has a high memory overhead and should only be used if
-		 * your panel's context cannot be quickly saved and restored.
-		 */
-		readonly retainContextWhenHidden?: boolean;
-	}
-
-	/**
-	 * A panel that contains a webview.
-	 */
-	interface WebviewPanel {
-		/**
-		 * Identifies the type of the webview panel, such as `'markdown.preview'`.
-		 */
-		readonly viewType: string;
-
-		/**
-		 * Title of the panel shown in UI.
-		 */
-		title: string;
-
-		/**
-		 * Icon for the panel shown in UI.
-		 */
-		iconPath?: Uri | { light: Uri; dark: Uri };
-
-		/**
-		 * Webview belonging to the panel.
-		 */
-		readonly webview: Webview;
-
-		/**
-		 * Content settings for the webview panel.
-		 */
-		readonly options: WebviewPanelOptions;
-
-		/**
-		 * Editor position of the panel. This property is only set if the webview is in
-		 * one of the editor view columns.
-		 */
-		readonly viewColumn?: ViewColumn;
-
-		/**
-		 * Whether the panel is active (focused by the user).
-		 */
-		readonly active: boolean;
-
-		/**
-		 * Whether the panel is visible.
-		 */
-		readonly visible: boolean;
-
-		/**
-		 * Fired when the panel's view state changes.
-		 */
-		readonly onDidChangeViewState: Event<WebviewPanelOnDidChangeViewStateEvent>;
-
-		/**
-		 * Fired when the panel is disposed.
-		 *
-		 * This may be because the user closed the panel or because `.dispose()` was
-		 * called on it.
-		 *
-		 * Trying to use the panel after it has been disposed throws an exception.
-		 */
-		readonly onDidDispose: Event<void>;
-
-		/**
-		 * Show the webview panel in a given column.
-		 *
-		 * A webview panel may only show in a single column at a time. If it is already showing, this
-		 * method moves it to a new column.
-		 *
-		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
-		 * @param preserveFocus When `true`, the webview will not take focus.
-		 */
-		reveal(viewColumn?: ViewColumn, preserveFocus?: boolean): void;
-
-		/**
-		 * Dispose of the webview panel.
-		 *
-		 * This closes the panel if it showing and disposes of the resources owned by the webview.
-		 * Webview panels are also disposed when the user closes the webview panel. Both cases
-		 * fire the `onDispose` event.
-		 */
-		dispose(): any;
-	}
-
-	/**
-	 * Event fired when a webview panel's view state changes.
-	 */
-	export interface WebviewPanelOnDidChangeViewStateEvent {
-		/**
-		 * Webview panel whose view state changed.
-		 */
-		readonly webviewPanel: WebviewPanel;
-	}
-
-	/**
-	 * Restore webview panels that have been persisted when vscode shuts down.
-	 *
-	 * There are two types of webview persistence:
-	 *
-	 * - Persistence within a session.
-	 * - Persistence across sessions (across restarts of VS Code).
-	 *
-	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
-	 *
-	 * Persistence within a session allows a webview to save its state when it becomes hidden
-	 * and restore its content from this state when it becomes visible again. It is powered entirely
-	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
-	 * any json serializable object. To restore the state again, call `getState()`
-	 *
-	 * ```js
-	 * // Within the webview
-	 * const vscode = acquireVsCodeApi();
-	 *
-	 * // Get existing state
-	 * const oldState = vscode.getState() || { value: 0 };
-	 *
-	 * // Update state
-	 * setState({ value: oldState.value + 1 })
-	 * ```
-	 *
-	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown,
-	 * VS Code will save off the state from `setState` of all webviews that have a serializer. When the
-	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
-	 * The extension can then restore the old `WebviewPanel` from this state.
-	 */
-	interface WebviewPanelSerializer {
-		/**
-		 * Restore a webview panel from its seriailzed `state`.
-		 *
-		 * Called when a serialized webview first becomes visible.
-		 *
-		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel. The
-		 * serializer must restore the webview's `.html` and hook up all webview events.
-		 * @param state Persisted state from the webview content.
-		 *
-		 * @return Thanble indicating that the webview has been fully restored.
-		 */
-		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
-	}
-
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -5720,13 +3938,6 @@ declare module 'vscode' {
 		 */
 		export let appName: string;
 
-		/**
-		 * The application root folder from which the editor is running.
-		 *
-		 * @readonly
-		 */
-		export let appRoot: string;
-
 		/**
 		 * Represents the preferred user-language, like `de-CH`, `fr`, or `en-US`.
 		 *
@@ -5821,10 +4032,10 @@ declare module 'vscode' {
 		/**
 		 * Executes the command denoted by the given command identifier.
 		 *
-		 * * *Note 1:* When executing an editor command not all types are allowed to
+		 * When executing an editor command not all types are allowed to
 		 * be passed as arguments. Allowed are the primitive types `string`, `boolean`,
-		 * `number`, `undefined`, and `null`, as well as [`Position`](#Position), [`Range`](#Range), [`Uri`](#Uri) and [`Location`](#Location).
-		 * * *Note 2:* There are no restrictions when executing commands that have been contributed
+		 * `number`, `undefined`, and `null`, as well as classes defined in this API.
+		 * There are no restrictions when executing commands that have been contributed
 		 * by extensions.
 		 *
 		 * @param command Identifier of the command to execute.
@@ -5844,32 +4055,6 @@ declare module 'vscode' {
 		export function getCommands(filterInternal?: boolean): Thenable<string[]>;
 	}
 
-	/**
-	 * Represents the state of a window.
-	 */
-	export interface WindowState {
-
-		/**
-		 * Whether the current window is focused.
-		 */
-		readonly focused: boolean;
-	}
-
-	/**
-	 * A uri handler is responsible for handling system-wide [uris](#Uri).
-	 *
-	 * @see [window.registerUriHandler](#window.registerUriHandler).
-	 */
-	export interface UriHandler {
-
-		/**
-		 * Handle the provided system-wide [uri](#Uri).
-		 *
-		 * @see [window.registerUriHandler](#window.registerUriHandler).
-		 */
-		handleUri(uri: Uri): ProviderResult<void>;
-	}
-
 	/**
 	 * Namespace for dealing with the current window of the editor. That is visible
 	 * and active editors, as well as, UI elements to show messages, selections, and
@@ -5894,7 +4079,7 @@ declare module 'vscode' {
 		 * has changed. *Note* that the event also fires when the active editor changes
 		 * to `undefined`.
 		 */
-		export const onDidChangeActiveTextEditor: Event<TextEditor | undefined>;
+		export const onDidChangeActiveTextEditor: Event<TextEditor>;
 
 		/**
 		 * An [event](#Event) which fires when the array of [visible editors](#window.visibleTextEditors)
@@ -5907,11 +4092,6 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
 
-		/**
-		 * An [event](#Event) which fires when the visible ranges of an editor has changed.
-		 */
-		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
-
 		/**
 		 * An [event](#Event) which fires when the options of an editor have changed.
 		 */
@@ -5922,43 +4102,18 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorViewColumn: Event<TextEditorViewColumnChangeEvent>;
 
-		/**
-		 * The currently opened terminals or an empty array.
-		 */
-		export const terminals: ReadonlyArray<Terminal>;
-
-		/**
-		 * An [event](#Event) which fires when a terminal has been created, either through the
-		 * [createTerminal](#window.createTerminal) API or commands.
-		 */
-		export const onDidOpenTerminal: Event<Terminal>;
-
 		/**
 		 * An [event](#Event) which fires when a terminal is disposed.
 		 */
 		export const onDidCloseTerminal: Event<Terminal>;
 
-		/**
-		 * Represents the current window's state.
-		 *
-		 * @readonly
-		 */
-		export let state: WindowState;
-
-		/**
-		 * An [event](#Event) which fires when the focus state of the current window
-		 * changes. The value of the event represents whether the window is focused.
-		 */
-		export const onDidChangeWindowState: Event<WindowState>;
-
 		/**
 		 * Show the given document in a text editor. A [column](#ViewColumn) can be provided
 		 * to control where the editor is being shown. Might change the [active editor](#window.activeTextEditor).
 		 *
 		 * @param document A text document to be shown.
-		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [active](#ViewColumn.Active), other values
-		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside)
-		 * to open the editor to the side of the currently active one.
+		 * @param column A view column in which the editor should be shown. The default is the [one](#ViewColumn.One), other values
+		 * are adjusted to be __Min(column, columnCount + 1)__.
 		 * @param preserveFocus When `true` the editor will not take focus.
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
@@ -5969,7 +4124,7 @@ declare module 'vscode' {
 		 * to control options of the editor is being shown. Might change the [active editor](#window.activeTextEditor).
 		 *
 		 * @param document A text document to be shown.
-		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @param options [Editor options](#ShowTextDocumentOptions) to configure the behavior of showing the [editor](#TextEditor).
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
 		export function showTextDocument(document: TextDocument, options?: TextDocumentShowOptions): Thenable<TextEditor>;
@@ -5980,7 +4135,7 @@ declare module 'vscode' {
 		 * @see [openTextDocument](#openTextDocument)
 		 *
 		 * @param uri A resource identifier.
-		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @param options [Editor options](#ShowTextDocumentOptions) to configure the behavior of showing the [editor](#TextEditor).
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
 		export function showTextDocument(uri: Uri, options?: TextDocumentShowOptions): Thenable<TextEditor>;
@@ -6129,16 +4284,6 @@ declare module 'vscode' {
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
-		/**
-		 * Shows a selection list allowing multiple selections.
-		 *
-		 * @param items An array of strings, or a promise that resolves to an array of strings.
-		 * @param options Configures the behavior of the selection list.
-		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected items or `undefined`.
-		 */
-		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
-
 		/**
 		 * Shows a selection list.
 		 *
@@ -6149,16 +4294,6 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
-		/**
-		 * Shows a selection list allowing multiple selections.
-		 *
-		 * @param items An array of items, or a promise that resolves to an array of items.
-		 * @param options Configures the behavior of the selection list.
-		 * @param token A token that can be used to signal cancellation.
-		 * @return A promise that resolves to the selected items or `undefined`.
-		 */
-		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
-
 		/**
 		 * Shows a selection list.
 		 *
@@ -6169,33 +4304,6 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
-		/**
-		 * Shows a selection list of [workspace folders](#workspace.workspaceFolders) to pick from.
-		 * Returns `undefined` if no folder is open.
-		 *
-		 * @param options Configures the behavior of the workspace folder list.
-		 * @return A promise that resolves to the workspace folder or `undefined`.
-		 */
-		export function showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions): Thenable<WorkspaceFolder | undefined>;
-
-		/**
-		 * Shows a file open dialog to the user which allows to select a file
-		 * for opening-purposes.
-		 *
-		 * @param options Options that control the dialog.
-		 * @returns A promise that resolves to the selected resources or `undefined`.
-		 */
-		export function showOpenDialog(options: OpenDialogOptions): Thenable<Uri[] | undefined>;
-
-		/**
-		 * Shows a file save dialog to the user which allows to select a file
-		 * for saving-purposes.
-		 *
-		 * @param options Options that control the dialog.
-		 * @returns A promise that resolves to the selected resource or `undefined`.
-		 */
-		export function showSaveDialog(options: SaveDialogOptions): Thenable<Uri | undefined>;
-
 		/**
 		 * Opens an input box to ask the user for input.
 		 *
@@ -6210,47 +4318,12 @@ declare module 'vscode' {
 		export function showInputBox(options?: InputBoxOptions, token?: CancellationToken): Thenable<string | undefined>;
 
 		/**
-		 * Creates a [QuickPick](#QuickPick) to let the user pick an item from a list
-		 * of items of type T.
-		 *
-		 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
-		 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
-		 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
-		 *
-		 * @return A new [QuickPick](#QuickPick).
-		 */
-		export function createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
-
-		/**
-		 * Creates a [InputBox](#InputBox) to let the user enter some text input.
-		 *
-		 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
-		 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
-		 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
-		 *
-		 * @return A new [InputBox](#InputBox).
-		 */
-		export function createInputBox(): InputBox;
-
-		/**
-		 * Creates a new [output channel](#OutputChannel) with the given name.
+		 * Create a new [output channel](#OutputChannel) with the given name.
 		 *
 		 * @param name Human-readable string which will be used to represent the channel in the UI.
 		 */
 		export function createOutputChannel(name: string): OutputChannel;
 
-		/**
-		 * Create and show a new webview panel.
-		 *
-		 * @param viewType Identifies the type of the webview panel.
-		 * @param title Title of the panel.
-		 * @param showOptions Where to show the webview in the editor. If preserveFocus is set, the new webview will not take focus.
-		 * @param options Settings for the new panel.
-		 *
-		 * @return New webview panel.
-		 */
-		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { viewColumn: ViewColumn, preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
-
 		/**
 		 * Set a message to the status bar. This is a short hand for the more powerful
 		 * status bar [items](#window.createStatusBarItem).
@@ -6291,7 +4364,7 @@ declare module 'vscode' {
 		 *
 		 * @param task A callback returning a promise. Progress increments can be reported with
 		 * the provided [progress](#Progress)-object.
-		 * @return The thenable the task did return.
+		 * @return The thenable the task did rseturn.
 		 */
 		export function withScmProgress<R>(task: (progress: Progress<number>) => Thenable<R>): Thenable<R>;
 
@@ -6302,19 +4375,9 @@ declare module 'vscode' {
 		 *
 		 * @param task A callback returning a promise. Progress state can be reported with
 		 * the provided [progress](#Progress)-object.
-		 *
-		 * To report discrete progress, use `increment` to indicate how much work has been completed. Each call with
-		 * a `increment` value will be summed up and reflected as overall progress until 100% is reached (a value of
-		 * e.g. `10` accounts for `10%` of work done).
-		 * Note that currently only `ProgressLocation.Notification` is capable of showing discrete progress.
-		 *
-		 * To monitor if the operation has been cancelled by the user, use the provided [`CancellationToken`](#CancellationToken).
-		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
-		 * long running operation.
-		 *
 		 * @return The thenable the task-callback returned.
 		 */
-		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; }>) => Thenable<R>): Thenable<R>;
 
 		/**
 		 * Creates a status bar [item](#StatusBarItem).
@@ -6347,142 +4410,10 @@ declare module 'vscode' {
 
 		/**
 		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
-		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
-		 *
-		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
-		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.
 		 * @param treeDataProvider A [TreeDataProvider](#TreeDataProvider) that provides tree data for the view
 		 */
 		export function registerTreeDataProvider<T>(viewId: string, treeDataProvider: TreeDataProvider<T>): Disposable;
-
-		/**
-		 * Create a [TreeView](#TreeView) for the view contributed using the extension point `views`.
-		 * @param viewId Id of the view contributed using the extension point `views`.
-		 * @param options Options object to provide [TreeDataProvider](#TreeDataProvider) for the view.
-		 * @returns a [TreeView](#TreeView).
-		 */
-		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
-
-		/**
-		 * Registers a [uri handler](#UriHandler) capable of handling system-wide [uris](#Uri).
-		 * In case there are multiple windows open, the topmost window will handle the uri.
-		 * A uri handler is scoped to the extension it is contributed from; it will only
-		 * be able to handle uris which are directed to the extension itself. A uri must respect
-		 * the following rules:
-		 *
-		 * - The uri-scheme must be the product name;
-		 * - The uri-authority must be the extension id (eg. `my.extension`);
-		 * - The uri-path, -query and -fragment parts are arbitrary.
-		 *
-		 * For example, if the `my.extension` extension registers a uri handler, it will only
-		 * be allowed to handle uris with the prefix `product-name://my.extension`.
-		 *
-		 * An extension can only register a single uri handler in its entire activation lifetime.
-		 *
-		 * * *Note:* There is an activation event `onUri` that fires when a uri directed for
-		 * the current extension is about to be handled.
-		 *
-		 * @param handler The uri handler to register for this extension.
-		 */
-		export function registerUriHandler(handler: UriHandler): Disposable;
-
-		/**
-		 * Registers a webview panel serializer.
-		 *
-		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation event and
-		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
-		 *
-		 * Only a single serializer may be registered at a time for a given `viewType`.
-		 *
-		 * @param viewType Type of the webview panel that can be serialized.
-		 * @param serializer Webview serializer.
-		 */
-		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
-	}
-
-	/**
-	 * The event that is fired when an element in the [TreeView](#TreeView) is expanded or collapsed
-	 */
-	export interface TreeViewExpansionEvent<T> {
-
-		/**
-		 * Element that is expanded or collapsed.
-		 */
-		readonly element: T;
-
-	}
-
-	/**
-	 * The event that is fired when there is a change in [tree view's selection](#TreeView.selection)
-	 */
-	export interface TreeViewSelectionChangeEvent<T> {
-
-		/**
-		 * Selected elements.
-		 */
-		readonly selection: T[];
-
-	}
-
-	/**
-	 * The event that is fired when there is a change in [tree view's visibility](#TreeView.visible)
-	 */
-	export interface TreeViewVisibilityChangeEvent {
-
-		/**
-		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
-		 */
-		readonly visible: boolean;
-
-	}
-
-	/**
-	 * Represents a Tree view
-	 */
-	export interface TreeView<T> extends Disposable {
-
-		/**
-		 * Event that is fired when an element is expanded
-		 */
-		readonly onDidExpandElement: Event<TreeViewExpansionEvent<T>>;
-
-		/**
-		 * Event that is fired when an element is collapsed
-		 */
-		readonly onDidCollapseElement: Event<TreeViewExpansionEvent<T>>;
-
-		/**
-		 * Currently selected elements.
-		 */
-		readonly selection: T[];
-
-		/**
-		 * Event that is fired when the [selection](#TreeView.selection) has changed
-		 */
-		readonly onDidChangeSelection: Event<TreeViewSelectionChangeEvent<T>>;
-
-		/**
-		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
-		 */
-		readonly visible: boolean;
-
-		/**
-		 * Event that is fired when [visibility](TreeView.visible) has changed
-		 */
-		readonly onDidChangeVisibility: Event<TreeViewVisibilityChangeEvent>;
-
-		/**
-		 * Reveals the given element in the tree view.
-		 * If the tree view is not visible then the tree view is shown and element is revealed.
-		 *
-		 * By default revealed element is selected and not focused.
-		 * In order to not to select, set the option `select` to `false`.
-		 * In order to focus, set the option `focus` to `true`.
-		 *
-		 * **NOTE:** [TreeDataProvider](#TreeDataProvider) is required to implement [getParent](#TreeDataProvider.getParent) method to access this API.
-		 */
-		reveal(element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void>;
 	}
 
 	/**
@@ -6491,7 +4422,6 @@ declare module 'vscode' {
 	export interface TreeDataProvider<T> {
 		/**
 		 * An optional event to signal that an element or root has changed.
-		 * This will trigger the view to update the changed element/root and its children recursively (if shown).
 		 * To signal that root has changed, do not pass any argument or pass `undefined` or `null`.
 		 */
 		onDidChangeTreeData?: Event<T | undefined | null>;
@@ -6511,54 +4441,21 @@ declare module 'vscode' {
 		 * @return Children of `element` or root if no element is passed.
 		 */
 		getChildren(element?: T): ProviderResult<T[]>;
-
-		/**
-		 * Optional method to return the parent of `element`.
-		 * Return `null` or `undefined` if `element` is a child of root.
-		 *
-		 * **NOTE:** This method should be implemented in order to access [reveal](#TreeView.reveal) API.
-		 *
-		 * @param element The element for which the parent has to be returned.
-		 * @return Parent of `element`.
-		 */
-		getParent?(element: T): ProviderResult<T>;
 	}
 
 	export class TreeItem {
 		/**
-		 * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri).
+		 * A human-readable string describing this item
 		 */
-		label?: string;
+		label: string;
 
 		/**
-		 * Optional id for the tree item that has to be unique across tree. The id is used to preserve the selection and expansion state of the tree item.
-		 *
-		 * If not provided, an id is generated using the tree item's label. **Note** that when labels change, ids will change and that selection and expansion state cannot be kept stable anymore.
+		 * The icon path for the tree item
 		 */
-		id?: string;
+		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri };
 
 		/**
-		 * The icon path or [ThemeIcon](#ThemeIcon) for the tree item.
-		 * When `falsy`, [Folder Theme Icon](#ThemeIcon.Folder) is assigned, if item is collapsible otherwise [File Theme Icon](#ThemeIcon.File).
-		 * When a [ThemeIcon](#ThemeIcon) is specified, icon is derived from the current file icon theme for the specified theme icon using [resourceUri](#TreeItem.resourceUri) (if provided).
-		 */
-		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
-
-		/**
-		 * The [uri](#Uri) of the resource representing this item.
-		 *
-		 * Will be used to derive the [label](#TreeItem.label), when it is not provided.
-		 * Will be used to derive the icon from current icon theme, when [iconPath](#TreeItem.iconPath) has [ThemeIcon](#ThemeIcon) value.
-		 */
-		resourceUri?: Uri;
-
-		/**
-		 * The tooltip text when you hover over this item.
-		 */
-		tooltip?: string | undefined;
-
-		/**
-		 * The [command](#Command) that should be executed when the tree item is selected.
+		 * The [command](#Command) which should be run when the tree item is selected.
 		 */
 		command?: Command;
 
@@ -6592,12 +4489,6 @@ declare module 'vscode' {
 		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
 		 */
 		constructor(label: string, collapsibleState?: TreeItemCollapsibleState);
-
-		/**
-		 * @param resourceUri The [uri](#Uri) of the resource representing this item.
-		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
-		 */
-		constructor(resourceUri: Uri, collapsibleState?: TreeItemCollapsibleState);
 	}
 
 	/**
@@ -6636,16 +4527,6 @@ declare module 'vscode' {
 		 * Args for the custom shell executable, this does not work on Windows (see #8429)
 		 */
 		shellArgs?: string[];
-
-		/**
-		 * A path for the current working directory to be used for the terminal.
-		 */
-		cwd?: string;
-
-		/**
-		 * Object with environment variables that will be added to the VS Code process.
-		 */
-		env?: { [key: string]: string | null };
 	}
 
 	/**
@@ -6656,19 +4537,14 @@ declare module 'vscode' {
 
 		/**
 		 * Show progress for the source control viewlet, as overlay for the icon and as progress bar
-		 * inside the viewlet (when visible). Neither supports cancellation nor discrete progress.
+		 * inside the viewlet (when visible).
 		 */
 		SourceControl = 1,
 
 		/**
-		 * Show progress in the status bar of the editor. Neither supports cancellation nor discrete progress.
+		 * Show progress in the status bar of the editor.
 		 */
-		Window = 10,
-
-		/**
-		 * Show progress as notification with an optional cancel button. Supports to show infinite and discrete progress.
-		 */
-		Notification = 15
+		Window = 10
 	}
 
 	/**
@@ -6686,277 +4562,6 @@ declare module 'vscode' {
 		 * operation.
 		 */
 		title?: string;
-
-		/**
-		 * Controls if a cancel button should show to allow the user to
-		 * cancel the long running operation.  Note that currently only
-		 * `ProgressLocation.Notification` is supporting to show a cancel
-		 * button.
-		 */
-		cancellable?: boolean;
-	}
-
-	/**
-	 * A light-weight user input UI that is intially not visible. After
-	 * configuring it through its properties the extension can make it
-	 * visible by calling [QuickInput.show](#QuickInput.show).
-	 *
-	 * There are several reasons why this UI might have to be hidden and
-	 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
-	 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
-	 * the user pressing Esc, some other input UI opening, etc.)
-	 *
-	 * A user pressing Enter or some other gesture implying acceptance
-	 * of the current state does not automatically hide this UI component.
-	 * It is up to the extension to decide whether to accept the user's input
-	 * and if the UI should indeed be hidden through a call to [QuickInput.hide](#QuickInput.hide).
-	 *
-	 * When the extension no longer needs this input UI, it should
-	 * [QuickInput.dispose](#QuickInput.dispose) it to allow for freeing up
-	 * any resources associated with it.
-	 *
-	 * See [QuickPick](#QuickPick) and [InputBox](#InputBox) for concrete UIs.
-	 */
-	export interface QuickInput {
-
-		/**
-		 * An optional title.
-		 */
-		title: string | undefined;
-
-		/**
-		 * An optional current step count.
-		 */
-		step: number | undefined;
-
-		/**
-		 * An optional total step count.
-		 */
-		totalSteps: number | undefined;
-
-		/**
-		 * If the UI should allow for user input. Defaults to true.
-		 *
-		 * Change this to false, e.g., while validating user input or
-		 * loading data for the next step in user input.
-		 */
-		enabled: boolean;
-
-		/**
-		 * If the UI should show a progress indicator. Defaults to false.
-		 *
-		 * Change this to true, e.g., while loading more data or validating
-		 * user input.
-		 */
-		busy: boolean;
-
-		/**
-		 * If the UI should stay open even when loosing UI focus. Defaults to false.
-		 */
-		ignoreFocusOut: boolean;
-
-		/**
-		 * Makes the input UI visible in its current configuration. Any other input
-		 * UI will first fire an [QuickInput.onDidHide](#QuickInput.onDidHide) event.
-		 */
-		show(): void;
-
-		/**
-		 * Hides this input UI. This will also fire an [QuickInput.onDidHide](#QuickInput.onDidHide)
-		 * event.
-		 */
-		hide(): void;
-
-		/**
-		 * An event signaling when this input UI is hidden.
-		 *
-		 * There are several reasons why this UI might have to be hidden and
-		 * the extension will be notified through [QuickInput.onDidHide](#QuickInput.onDidHide).
-		 * (Examples include: an explict call to [QuickInput.hide](#QuickInput.hide),
-		 * the user pressing Esc, some other input UI opening, etc.)
-		 */
-		onDidHide: Event<void>;
-
-		/**
-		 * Dispose of this input UI and any associated resources. If it is still
-		 * visible, it is first hidden. After this call the input UI is no longer
-		 * functional and no additional methods or properties on it should be
-		 * accessed. Instead a new input UI should be created.
-		 */
-		dispose(): void;
-	}
-
-	/**
-	 * A concrete [QuickInput](#QuickInput) to let the user pick an item from a
-	 * list of items of type T. The items can be filtered through a filter text field and
-	 * there is an option [canSelectMany](#QuickPick.canSelectMany) to allow for
-	 * selecting multiple items.
-	 *
-	 * Note that in many cases the more convenient [window.showQuickPick](#window.showQuickPick)
-	 * is easier to use. [window.createQuickPick](#window.createQuickPick) should be used
-	 * when [window.showQuickPick](#window.showQuickPick) does not offer the required flexibility.
-	 */
-	export interface QuickPick<T extends QuickPickItem> extends QuickInput {
-
-		/**
-		 * Current value of the filter text.
-		 */
-		value: string;
-
-		/**
-		 * Optional placeholder in the filter text.
-		 */
-		placeholder: string | undefined;
-
-		/**
-		 * An event signaling when the value of the filter text has changed.
-		 */
-		readonly onDidChangeValue: Event<string>;
-
-		/**
-		 * An event signaling when the user indicated acceptance of the selected item(s).
-		 */
-		readonly onDidAccept: Event<void>;
-
-		/**
-		 * Buttons for actions in the UI.
-		 */
-		buttons: ReadonlyArray<QuickInputButton>;
-
-		/**
-		 * An event signaling when a button was triggered.
-		 */
-		readonly onDidTriggerButton: Event<QuickInputButton>;
-
-		/**
-		 * Items to pick from.
-		 */
-		items: ReadonlyArray<T>;
-
-		/**
-		 * If multiple items can be selected at the same time. Defaults to false.
-		 */
-		canSelectMany: boolean;
-
-		/**
-		 * If the filter text should also be matched against the description of the items. Defaults to false.
-		 */
-		matchOnDescription: boolean;
-
-		/**
-		 * If the filter text should also be matched against the detail of the items. Defaults to false.
-		 */
-		matchOnDetail: boolean;
-
-		/**
-		 * Active items. This can be read and updated by the extension.
-		 */
-		activeItems: ReadonlyArray<T>;
-
-		/**
-		 * An event signaling when the active items have changed.
-		 */
-		readonly onDidChangeActive: Event<T[]>;
-
-		/**
-		 * Selected items. This can be read and updated by the extension.
-		 */
-		selectedItems: ReadonlyArray<T>;
-
-		/**
-		 * An event signaling when the selected items have changed.
-		 */
-		readonly onDidChangeSelection: Event<T[]>;
-	}
-
-	/**
-	 * A concrete [QuickInput](#QuickInput) to let the user input a text value.
-	 *
-	 * Note that in many cases the more convenient [window.showInputBox](#window.showInputBox)
-	 * is easier to use. [window.createInputBox](#window.createInputBox) should be used
-	 * when [window.showInputBox](#window.showInputBox) does not offer the required flexibility.
-	 */
-	export interface InputBox extends QuickInput {
-
-		/**
-		 * Current input value.
-		 */
-		value: string;
-
-		/**
-		 * Optional placeholder in the filter text.
-		 */
-		placeholder: string | undefined;
-
-		/**
-		 * If the input value should be hidden. Defaults to false.
-		 */
-		password: boolean;
-
-		/**
-		 * An event signaling when the value has changed.
-		 */
-		readonly onDidChangeValue: Event<string>;
-
-		/**
-		 * An event signaling when the user indicated acceptance of the input value.
-		 */
-		readonly onDidAccept: Event<void>;
-
-		/**
-		 * Buttons for actions in the UI.
-		 */
-		buttons: ReadonlyArray<QuickInputButton>;
-
-		/**
-		 * An event signaling when a button was triggered.
-		 */
-		readonly onDidTriggerButton: Event<QuickInputButton>;
-
-		/**
-		 * An optional prompt text providing some ask or explanation to the user.
-		 */
-		prompt: string | undefined;
-
-		/**
-		 * An optional validation message indicating a problem with the current input value.
-		 */
-		validationMessage: string | undefined;
-	}
-
-	/**
-	 * Button for an action in a [QuickPick](#QuickPick) or [InputBox](#InputBox).
-	 */
-	export interface QuickInputButton {
-
-		/**
-		 * Icon for the button.
-		 */
-		readonly iconPath: Uri | { light: Uri; dark: Uri } | ThemeIcon;
-
-		/**
-		 * An optional tooltip.
-		 */
-		readonly tooltip?: string | undefined;
-	}
-
-	/**
-	 * Predefined buttons for [QuickPick](#QuickPick) and [InputBox](#InputBox).
-	 */
-	export class QuickInputButtons {
-
-		/**
-		 * A back button for [QuickPick](#QuickPick) and [InputBox](#InputBox).
-		 *
-		 * When a navigation 'back' button is needed this one should be used for consistency.
-		 * It comes with a predefined icon, tooltip and location.
-		 */
-		static readonly Back: QuickInputButton;
-
-		/**
-		 * @hidden
-		 */
-		private constructor();
 	}
 
 	/**
@@ -6967,10 +4572,6 @@ declare module 'vscode' {
 		 * The range that got replaced.
 		 */
 		range: Range;
-		/**
-		 * The offset of the range that got replaced.
-		 */
-		rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
@@ -7087,21 +4688,18 @@ declare module 'vscode' {
 
 	/**
 	 * A workspace folder is one of potentially many roots opened by the editor. All workspace folders
-	 * are equal which means there is no notion of an active or master workspace folder.
+	 * are equal which means there is notion of an active or master workspace folder.
 	 */
 	export interface WorkspaceFolder {
 
 		/**
-		 * The associated uri for this workspace folder.
-		 *
-		 * *Note:* The [Uri](#Uri)-type was intentionally chosen such that future releases of the editor can support
-		 * workspace folders that are not stored on the local disk, e.g. `ftp://server/workspaces/foo`.
+		 * The associated URI for this workspace folder.
 		 */
 		readonly uri: Uri;
 
 		/**
 		 * The name of this workspace folder. Defaults to
-		 * the basename of its [uri-path](#Uri.path)
+		 * the basename its [uri-path](#Uri.path)
 		 */
 		readonly name: string;
 
@@ -7140,23 +4738,14 @@ declare module 'vscode' {
 		 */
 		export let workspaceFolders: WorkspaceFolder[] | undefined;
 
-		/**
-		 * The name of the workspace. `undefined` when no folder
-		 * has been opened.
-		 *
-		 * @readonly
-		 */
-		export let name: string | undefined;
-
 		/**
 		 * An event that is emitted when a workspace folder is added or removed.
 		 */
 		export const onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
 
 		/**
-		 * Returns the [workspace folder](#WorkspaceFolder) that contains a given uri.
-		 * * returns `undefined` when the given uri doesn't match any workspace folder
-		 * * returns the *input* when the given uri is a workspace folder itself
+		 * Returns a [workspace folder](#WorkspaceFolder) for the provided resource. When the resource
+		 * is a workspace folder itself, its parent workspace folder or `undefined` is returned.
 		 *
 		 * @param uri An uri.
 		 * @return A workspace folder or `undefined`
@@ -7177,82 +4766,33 @@ declare module 'vscode' {
 		 */
 		export function asRelativePath(pathOrUri: string | Uri, includeWorkspaceFolder?: boolean): string;
 
-		/**
-		 * This method replaces `deleteCount` [workspace folders](#workspace.workspaceFolders) starting at index `start`
-		 * by an optional set of `workspaceFoldersToAdd` on the `vscode.workspace.workspaceFolders` array. This "splice"
-		 * behavior can be used to add, remove and change workspace folders in a single operation.
-		 *
-		 * If the first workspace folder is added, removed or changed, the currently executing extensions (including the
-		 * one that called this method) will be terminated and restarted so that the (deprecated) `rootPath` property is
-		 * updated to point to the first workspace folder.
-		 *
-		 * Use the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) event to get notified when the
-		 * workspace folders have been updated.
-		 *
-		 * **Example:** adding a new workspace folder at the end of workspace folders
-		 * ```typescript
-		 * workspace.updateWorkspaceFolders(workspace.workspaceFolders ? workspace.workspaceFolders.length : 0, null, { uri: ...});
-		 * ```
-		 *
-		 * **Example:** removing the first workspace folder
-		 * ```typescript
-		 * workspace.updateWorkspaceFolders(0, 1);
-		 * ```
-		 *
-		 * **Example:** replacing an existing workspace folder with a new one
-		 * ```typescript
-		 * workspace.updateWorkspaceFolders(0, 1, { uri: ...});
-		 * ```
-		 *
-		 * It is valid to remove an existing workspace folder and add it again with a different name
-		 * to rename that folder.
-		 *
-		 * **Note:** it is not valid to call [updateWorkspaceFolders()](#updateWorkspaceFolders) multiple times
-		 * without waiting for the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) to fire.
-		 *
-		 * @param start the zero-based location in the list of currently opened [workspace folders](#WorkspaceFolder)
-		 * from which to start deleting workspace folders.
-		 * @param deleteCount the optional number of workspace folders to remove.
-		 * @param workspaceFoldersToAdd the optional variable set of workspace folders to add in place of the deleted ones.
-		 * Each workspace is identified with a mandatory URI and an optional name.
-		 * @return true if the operation was successfully started and false otherwise if arguments were used that would result
-		 * in invalid workspace folder state (e.g. 2 folders with the same URI).
-		 */
-		export function updateWorkspaceFolders(start: number, deleteCount: number | undefined | null, ...workspaceFoldersToAdd: { uri: Uri, name?: string }[]): boolean;
-
 		/**
 		 * Creates a file system watcher.
 		 *
-		 * A glob pattern that filters the file events on their absolute path must be provided. Optionally,
-		 * flags to ignore certain kinds of events can be provided. To stop listening to events the watcher must be disposed.
+		 * A glob pattern that filters the file events must be provided. Optionally, flags to ignore certain
+		 * kinds of events can be provided. To stop listening to events the watcher must be disposed.
 		 *
 		 * *Note* that only files within the current [workspace folders](#workspace.workspaceFolders) can be watched.
 		 *
-		 * @param globPattern A [glob pattern](#GlobPattern) that is applied to the absolute paths of created, changed,
-		 * and deleted files. Use a [relative pattern](#RelativePattern) to limit events to a certain [workspace folder](#WorkspaceFolder).
+		 * @param globPattern A glob pattern that is applied to the names of created, changed, and deleted files.
 		 * @param ignoreCreateEvents Ignore when files have been created.
 		 * @param ignoreChangeEvents Ignore when files have been changed.
 		 * @param ignoreDeleteEvents Ignore when files have been deleted.
 		 * @return A new file system watcher instance.
 		 */
-		export function createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
+		export function createFileSystemWatcher(globPattern: string, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
 
 		/**
-		 * Find files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
+		 * Find files in the workspace.
 		 *
-		 * @sample `findFiles('**​/*.js', '**​/node_modules/**', 10)`
-		 * @param include A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
-		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
-		 * @param exclude  A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
-		 * apply, when `null` no excludes will apply.
+		 * @sample `findFiles('**∕*.js', '**∕node_modules∕**', 10)`
+		 * @param include A glob pattern that defines the files to search for.
+		 * @param exclude A glob pattern that defines files and folders to exclude.
 		 * @param maxResults An upper-bound for the result.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
-		 * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
-		 * [workspace folders](#workspace.workspaceFolders) are opened.
+		 * @return A thenable that resolves to an array of resource identifiers.
 		 */
-		export function findFiles(include: GlobPattern, exclude?: GlobPattern | null, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
+		export function findFiles(include: string, exclude?: string, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
 
 		/**
 		 * Save all dirty files.
@@ -7263,17 +4803,12 @@ declare module 'vscode' {
 		export function saveAll(includeUntitled?: boolean): Thenable<boolean>;
 
 		/**
-		 * Make changes to one or many resources or create, delete, and rename resources as defined by the given
+		 * Make changes to one or many resources as defined by the given
 		 * [workspace edit](#WorkspaceEdit).
 		 *
-		 * All changes of a workspace edit are applied in the same order in which they have been added. If
-		 * multiple textual inserts are made at the same position, these strings appear in the resulting text
-		 * in the order the 'inserts' were made. Invalid sequences like 'delete file a' -> 'insert text in file a'
-		 * cause failure of the operation.
-		 *
-		 * When applying a workspace edit that consists only of text edits an 'all-or-nothing'-strategy is used.
-		 * A workspace edit with resource creations or deletions aborts the operation, e.g. consective edits will
-		 * not be attempted, when a single edit fails.
+		 * When applying a workspace edit, the editor implements an 'all-or-nothing'-strategy,
+		 * that means failure to load one document or make changes to one document will cause
+		 * the edit to be rejected.
 		 *
 		 * @param edit A workspace edit.
 		 * @return A thenable that resolves when the edit could be applied.
@@ -7337,33 +4872,19 @@ declare module 'vscode' {
 		export function registerTextDocumentContentProvider(scheme: string, provider: TextDocumentContentProvider): Disposable;
 
 		/**
-		 * An event that is emitted when a [text document](#TextDocument) is opened or when the language id
-		 * of a text document [has been changed](#languages.setTextDocumentLanguage).
-		 *
-		 * To add an event listener when a visible text document is opened, use the [TextEditor](#TextEditor) events in the
-		 * [window](#window) namespace. Note that:
-		 *
-		 * - The event is emitted before the [document](#TextDocument) is updated in the
-		 * [active text editor](#window.activeTextEditor)
-		 * - When a [text document](#TextDocument) is already open (e.g.: open in another [visible text editor](#window.visibleTextEditors)) this event is not emitted
-		 *
+		 * An event that is emitted when a [text document](#TextDocument) is opened.
 		 */
 		export const onDidOpenTextDocument: Event<TextDocument>;
 
 		/**
-		 * An event that is emitted when a [text document](#TextDocument) is disposed or when the language id
-		 * of a text document [has been changed](#languages.setTextDocumentLanguage).
-		 *
-		 * To add an event listener when a visible text document is closed, use the [TextEditor](#TextEditor) events in the
-		 * [window](#window) namespace. Note that this event is not emitted when a [TextEditor](#TextEditor) is closed
-		 * but the document remains open in another [visible text editor](#window.visibleTextEditors).
+		 * An event that is emitted when a [text document](#TextDocument) is disposed.
 		 */
 		export const onDidCloseTextDocument: Event<TextDocument>;
 
 		/**
 		 * An event that is emitted when a [text document](#TextDocument) is changed. This usually happens
 		 * when the [contents](#TextDocument.getText) changes but also when other things like the
-		 * [dirty](#TextDocument.isDirty)-state changes.
+		 * [dirty](TextDocument#isDirty)-state changes.
 		 */
 		export const onDidChangeTextDocument: Event<TextDocumentChangeEvent>;
 
@@ -7400,51 +4921,21 @@ declare module 'vscode' {
 		 * @param resource A resource for which the configuration is asked for
 		 * @return The full configuration or a subset.
 		 */
-		export function getConfiguration(section?: string, resource?: Uri | null): WorkspaceConfiguration;
+		export function getConfiguration(section?: string, resource?: Uri): WorkspaceConfiguration;
 
 		/**
 		 * An event that is emitted when the [configuration](#WorkspaceConfiguration) changed.
 		 */
-		export const onDidChangeConfiguration: Event<ConfigurationChangeEvent>;
+		export const onDidChangeConfiguration: Event<void>;
 
 		/**
-		 * ~~Register a task provider.~~
-		 *
-		 * @deprecated Use the corresponding function on the `tasks` namespace instead
+		 * Register a task provider.
 		 *
 		 * @param type The task kind type this provider is registered for.
 		 * @param provider A task provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
-
-		/**
-		 * Register a filesystem provider for a given scheme, e.g. `ftp`.
-		 *
-		 * There can only be one provider per scheme and an error is being thrown when a scheme
-		 * has been claimed by another provider or when it is reserved.
-		 *
-		 * @param scheme The uri-[scheme](#Uri.scheme) the provider registers for.
-		 * @param provider The filesystem provider.
-		 * @param options Immutable metadata about the provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean }): Disposable;
-	}
-
-	/**
-	 * An event describing the change in Configuration
-	 */
-	export interface ConfigurationChangeEvent {
-
-		/**
-		 * Returns `true` if the given section for the given resource (if provided) is affected.
-		 *
-		 * @param section Configuration name, supports _dotted_ names.
-		 * @param resource A resource Uri.
-		 * @return `true` if the given section for the given resource (if provided) is affected.
-		 */
-		affectsConfiguration(section: string, resource?: Uri): boolean;
 	}
 
 	/**
@@ -7483,19 +4974,6 @@ declare module 'vscode' {
 		 */
 		export function getLanguages(): Thenable<string[]>;
 
-		/**
-		 * Set (and change) the [language](#TextDocument.languageId) that is associated
-		 * with the given document.
-		 *
-		 * *Note* that calling this function will trigger the [`onDidCloseTextDocument`](#workspace.onDidCloseTextDocument) event
-		 * followed by the [`onDidOpenTextDocument`](#workspace.onDidOpenTextDocument) event.
-		 *
-		 * @param document The document which language is to be changed
-		 * @param languageId The new language identifier.
-		 * @returns A thenable that resolves with the updated document.
-		 */
-		export function setTextDocumentLanguage(document: TextDocument, languageId: string): Thenable<TextDocument>;
-
 		/**
 		 * Compute the match between a document [selector](#DocumentSelector) and a document. Values
 		 * greater than zero mean the selector matches the document.
@@ -7507,7 +4985,7 @@ declare module 'vscode' {
 		 *  1. When the `DocumentFilter` is empty (`{}`) the result is `0`
 		 *  2. When `scheme`, `language`, or `pattern` are defined but one doesn’t match, the result is `0`
 		 *  3. Matching against `*` gives a score of `5`, matching via equality or via a glob-pattern gives a score of `10`
-		 *  4. The result is the maximum value of each match
+		 *  4. The result is the maximun value of each match
 		 *
 		 * Samples:
 		 * ```js
@@ -7535,29 +5013,6 @@ declare module 'vscode' {
 		 */
 		export function match(selector: DocumentSelector, document: TextDocument): number;
 
-		/**
-		 * An [event](#Event) which fires when the global set of diagnostics changes. This is
-		 * newly added and removed diagnostics.
-		 */
-		export const onDidChangeDiagnostics: Event<DiagnosticChangeEvent>;
-
-		/**
-		 * Get all diagnostics for a given resource. *Note* that this includes diagnostics from
-		 * all extensions but *not yet* from the task framework.
-		 *
-		 * @param resource A resource
-		 * @returns An array of [diagnostics](#Diagnostic) objects or an empty array.
-		 */
-		export function getDiagnostics(resource: Uri): Diagnostic[];
-
-		/**
-		 * Get all diagnostics. *Note* that this includes diagnostics from
-		 * all extensions but *not yet* from the task framework.
-		 *
-		 * @returns An array of uri-diagnostics tuples or an empty array.
-		 */
-		export function getDiagnostics(): [Uri, Diagnostic[]][];
-
 		/**
 		 * Create a diagnostics collection.
 		 *
@@ -7591,10 +5046,9 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A code action provider.
-		 * @param metadata Metadata about the kind of code actions the provider providers.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider, metadata?: CodeActionProviderMetadata): Disposable;
+		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider): Disposable;
 
 		/**
 		 * Register a code lens provider.
@@ -7797,36 +5251,6 @@ declare module 'vscode' {
 		 */
 		export function registerDocumentLinkProvider(selector: DocumentSelector, provider: DocumentLinkProvider): Disposable;
 
-		/**
-		 * Register a color provider.
-		 *
-		 * Multiple providers can be registered for a language. In that case providers are asked in
-		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
-		 * not cause a failure of the whole operation.
-		 *
-		 * @param selector A selector that defines the documents this provider is applicable to.
-		 * @param provider A color provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
-
-		/**
-		 * Register a folding range provider.
-		 *
-		 * Multiple providers can be registered for a language. In that case providers are asked in
-		 * parallel and the results are merged.
-		 * If multiple folding ranges start at the same position, only the range of the first registered provider is used.
-		 * If a folding range overlaps with an other range that has a smaller position, it is also ignored.
-		 *
-		 * A failing provider (rejected promise or exception) will
-		 * not cause a failure of the whole operation.
-		 *
-		 * @param selector A selector that defines the documents this provider is applicable to.
-		 * @param provider A folding range provider.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider): Disposable;
-
 		/**
 		 * Set a [language configuration](#LanguageConfiguration) for a language.
 		 *
@@ -7846,11 +5270,6 @@ declare module 'vscode' {
 		 * Setter and getter for the contents of the input box.
 		 */
 		value: string;
-
-		/**
-		 * A string to show as place holder in the input box to guide the user.
-		 */
-		placeholder: string;
 	}
 
 	interface QuickDiffProvider {
@@ -7896,12 +5315,6 @@ declare module 'vscode' {
 		 */
 		readonly faded?: boolean;
 
-		/**
-		 * The title for a specific
-		 * [source control resource state](#SourceControlResourceState).
-		 */
-		readonly tooltip?: string;
-
 		/**
 		 * The light theme decorations.
 		 */
@@ -7987,16 +5400,6 @@ declare module 'vscode' {
 		 */
 		readonly label: string;
 
-		/**
-		 * The (optional) Uri of the root of this source control.
-		 */
-		readonly rootUri: Uri | undefined;
-
-		/**
-		 * The [input box](#SourceControlInputBox) for this source control.
-		 */
-		readonly inputBox: SourceControlInputBox;
-
 		/**
 		 * The UI-visible count of [resource states](#SourceControlResourceState) of
 		 * this source control.
@@ -8048,22 +5451,18 @@ declare module 'vscode' {
 	export namespace scm {
 
 		/**
-		 * ~~The [input box](#SourceControlInputBox) for the last source control
-		 * created by the extension.~~
-		 *
-		 * @deprecated Use SourceControl.inputBox instead
+		 * The [input box](#SourceControlInputBox) in the Source Control viewlet.
 		 */
 		export const inputBox: SourceControlInputBox;
 
 		/**
 		 * Creates a new [source control](#SourceControl) instance.
 		 *
-		 * @param id An `id` for the source control. Something short, eg: `git`.
+		 * @param id A unique `id` for the source control. Something short, eg: `git`.
 		 * @param label A human-readable string for the source control. Eg: `Git`.
-		 * @param rootUri An optional Uri of the root of the source control. Eg: `Uri.parse(workspaceRoot)`.
 		 * @return An instance of [source control](#SourceControl).
 		 */
-		export function createSourceControl(id: string, label: string, rootUri?: Uri): SourceControl;
+		export function createSourceControl(id: string, label: string): SourceControl;
 	}
 
 	/**
@@ -8071,14 +5470,14 @@ declare module 'vscode' {
 	 */
 	export interface DebugConfiguration {
 		/**
-		 * The type of the debug session.
+		 * The type for the debug session.
 		 */
 		type: string;
 
 		/**
-		 * The name of the debug session.
+		 * An optional name for the debug session.
 		 */
-		name: string;
+		name?: string;
 
 		/**
 		 * The request type of the debug session.
@@ -8138,135 +5537,22 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A debug configuration provider allows to add the initial debug configurations to a newly created launch.json
-	 * and to resolve a launch configuration before it is used to start a new debug session.
-	 * A debug configuration provider is registered via #debug.registerDebugConfigurationProvider.
-	 */
-	export interface DebugConfigurationProvider {
-		/**
-		 * Provides initial [debug configuration](#DebugConfiguration). If more than one debug configuration provider is
-		 * registered for the same type, debug configurations are concatenated in arbitrary order.
-		 *
-		 * @param folder The workspace folder for which the configurations are used or undefined for a folderless setup.
-		 * @param token A cancellation token.
-		 * @return An array of [debug configurations](#DebugConfiguration).
-		 */
-		provideDebugConfigurations?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]>;
-
-		/**
-		 * Resolves a [debug configuration](#DebugConfiguration) by filling in missing values or by adding/changing/removing attributes.
-		 * If more than one debug configuration provider is registered for the same type, the resolveDebugConfiguration calls are chained
-		 * in arbitrary order and the initial debug configuration is piped through the chain.
-		 * Returning the value 'undefined' prevents the debug session from starting.
-		 * Returning the value 'null' prevents the debug session from starting and opens the underlying debug configuration instead.
-		 *
-		 * @param folder The workspace folder from which the configuration originates from or undefined for a folderless setup.
-		 * @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
-		 * @param token A cancellation token.
-		 * @return The resolved debug configuration or undefined or null.
-		 */
-		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
-	}
-
-	/**
-	 * Represents the debug console.
-	 */
-	export interface DebugConsole {
-		/**
-		 * Append the given value to the debug console.
-		 *
-		 * @param value A string, falsy values will not be printed.
-		 */
-		append(value: string): void;
-
-		/**
-		 * Append the given value and a line feed character
-		 * to the debug console.
-		 *
-		 * @param value A string, falsy values will be printed.
-		 */
-		appendLine(value: string): void;
-	}
-
-	/**
-	 * An event describing the changes to the set of [breakpoints](#Breakpoint).
-	 */
-	export interface BreakpointsChangeEvent {
-		/**
-		 * Added breakpoints.
-		 */
-		readonly added: Breakpoint[];
-
-		/**
-		 * Removed breakpoints.
-		 */
-		readonly removed: Breakpoint[];
-
-		/**
-		 * Changed breakpoints.
-		 */
-		readonly changed: Breakpoint[];
-	}
-
-	/**
-	 * The base class of all breakpoint types.
-	 */
-	export class Breakpoint {
-		/**
-		 * Is breakpoint enabled.
-		 */
-		readonly enabled: boolean;
-		/**
-		 * An optional expression for conditional breakpoints.
-		 */
-		readonly condition?: string;
-		/**
-		 * An optional expression that controls how many hits of the breakpoint are ignored.
-		 */
-		readonly hitCondition?: string;
-		/**
-		 * An optional message that gets logged when this breakpoint is hit. Embedded expressions within {} are interpolated by the debug adapter.
-		 */
-		readonly logMessage?: string;
-
-		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
-	}
-
-	/**
-	 * A breakpoint specified by a source location.
-	 */
-	export class SourceBreakpoint extends Breakpoint {
-		/**
-		 * The source and line position of this breakpoint.
-		 */
-		readonly location: Location;
-
-		/**
-		 * Create a new breakpoint for a source location.
-		 */
-		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
-	}
-
-	/**
-	 * A breakpoint specified by a function name.
-	 */
-	export class FunctionBreakpoint extends Breakpoint {
-		/**
-		 * The name of the function to which this breakpoint is attached.
-		 */
-		readonly functionName: string;
-
-		/**
-		 * Create a new function breakpoint.
-		 */
-		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
-	}
-
-	/**
-	 * Namespace for debug functionality.
+	 * Namespace for dealing with debug sessions.
 	 */
 	export namespace debug {
 
+		/**
+		 * Start debugging by using either a named launch or named compound configuration,
+		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
+		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
+		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
+		 * Folder specific variables used in the configuration (e.g. '${workspaceRoot}') are resolved against the given folder.
+		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
+		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
+		 * @return A thenable that resolves when debugging could be successfully started.
+		 */
+		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+
 		/**
 		 * The currently active [debug session](#DebugSession) or `undefined`. The active debug session is the one
 		 * represented by the debug action floating window or the one currently shown in the drop down menu of the debug action floating window.
@@ -8274,17 +5560,6 @@ declare module 'vscode' {
 		 */
 		export let activeDebugSession: DebugSession | undefined;
 
-		/**
-		 * The currently active [debug console](#DebugConsole).
-		 */
-		export let activeDebugConsole: DebugConsole;
-
-		/**
-		 * List of breakpoints.
-		 */
-		export let breakpoints: Breakpoint[];
-
-
 		/**
 		 * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
 		 * has changed. *Note* that the event also fires when the active debug session changes
@@ -8306,51 +5581,11 @@ declare module 'vscode' {
 		 * An [event](#Event) which fires when a [debug session](#DebugSession) has terminated.
 		 */
 		export const onDidTerminateDebugSession: Event<DebugSession>;
-
-		/**
-		 * An [event](#Event) that is emitted when the set of breakpoints is added, removed, or changed.
-		 */
-		export const onDidChangeBreakpoints: Event<BreakpointsChangeEvent>;
-
-
-		/**
-		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specific debug type.
-		 * More than one provider can be registered for the same type.
-		 *
-		 * @param type The debug type for which the provider is registered.
-		 * @param provider The [debug configuration provider](#DebugConfigurationProvider) to register.
-		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
-		 */
-		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider): Disposable;
-
-		/**
-		 * Start debugging by using either a named launch or named compound configuration,
-		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
-		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
-		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
-		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
-		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
-		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
-		 * @return A thenable that resolves when debugging could be successfully started.
-		 */
-		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
-
-		/**
-		 * Add breakpoints.
-		 * @param breakpoints The breakpoints to add.
-		*/
-		export function addBreakpoints(breakpoints: Breakpoint[]): void;
-
-		/**
-		 * Remove breakpoints.
-		 * @param breakpoints The breakpoints to remove.
-		 */
-		export function removeBreakpoints(breakpoints: Breakpoint[]): void;
 	}
 
 	/**
 	 * Namespace for dealing with installed extensions. Extensions are represented
-	 * by an [extension](#Extension)-interface which enables reflection on them.
+	 * by an [extension](#Extension)-interface which allows to reflect on them.
 	 *
 	 * Extension writers can provide APIs to other extensions by returning their API public
 	 * surface from the `activate`-call.
@@ -8407,7 +5642,7 @@ declare module 'vscode' {
 
 /**
  * Thenable is a common denominator between ES6 promises, Q, jquery.Deferred, WinJS.Promise,
- * and others. This API makes no assumption about what promise library is being used which
+ * and others. This API makes no assumption about what promise libary is being used which
  * enables reusing existing code without migrating to a specific promise implementation. Still,
  * we recommend the use of native promises which are available in this editor.
  */

From 12c8bf1bff18e4a3f2163af1aa74823a02932350 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Wed, 13 Mar 2019 12:56:41 -0700
Subject: [PATCH 632/924] Drop tree API since it changed a lot

---
 types/vscode/vscode-tests.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/types/vscode/vscode-tests.ts b/types/vscode/vscode-tests.ts
index b5030ab1f8..4bab9ab12a 100644
--- a/types/vscode/vscode-tests.ts
+++ b/types/vscode/vscode-tests.ts
@@ -9,16 +9,3 @@ vscode.languages.registerCompletionItemProvider('markdown', {
 		return [];
 	}
 });
-
-const nodeDependenciesProvider: vscode.TreeDataProvider<string> = {
-	getChildren() {
-		return [];
-	},
-	getTreeItem(el: string) {
-		return {
-			id: el
-		};
-	}
-};
-
-vscode.window.registerTreeDataProvider('nodeDependencies', nodeDependenciesProvider);

From e9a0ac99d9f2fdc578c5c30e66ee10efa8afdcea Mon Sep 17 00:00:00 2001
From: Chang Wang <garnwraly@gmail.com>
Date: Wed, 13 Mar 2019 17:14:52 -0400
Subject: [PATCH 633/924] Add TCreationAttributes type param A model might have
 attributes that aren't required during creation, but is guaranteed to exist
 on any instance. An example is an auto-incrementing `id` field. This field
 shouldn't be required as part of a `create` call, but any instance returning
 such a model should have it.

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 9aba040234..6001d4fc22 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3733,7 +3733,7 @@ declare namespace sequelize {
      * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
      * already created models can be loaded using `sequelize.import`
      */
-    interface Model<TInstance, TAttributes> extends Hooks<TInstance>, Associations {
+    interface Model<TInstance, TAttributes, TCreationAttributes = TAttributes> extends Hooks<TInstance>, Associations {
 
         /**
          * The Instance class
@@ -4025,7 +4025,7 @@ declare namespace sequelize {
         /**
          * Builds a new model instance and calls save on it.
          */
-        create(values?: TAttributes, options?: CreateOptions): Promise<TInstance>;
+        create(values?: TCreationAttributes, options?: CreateOptions): Promise<TInstance>;
 
         /**
          * Find a row that matches the query, or build (but don't save) the row if none is found.
@@ -6050,8 +6050,8 @@ declare namespace sequelize {
          * @param options    These options are merged with the default define options provided to the Sequelize
          *                   constructor
          */
-        define<TInstance, TAttributes>(modelName: string, attributes: DefineModelAttributes<TAttributes>,
-            options?: DefineOptions<TInstance>): Model<TInstance, TAttributes>;
+        define<TInstance, TAttributes, TCreationAttributes = TAttributes>(modelName: string, attributes: DefineModelAttributes<TCreationAttributes>,
+            options?: DefineOptions<TInstance>): Model<TInstance, TAttributes, TCreationAttributes>;
 
         /**
          * Fetch a Model which is already defined

From 8df6b982f305d8bd5b877b02ccd74c6ebde004ff Mon Sep 17 00:00:00 2001
From: Chang Wang <garnwraly@gmail.com>
Date: Wed, 13 Mar 2019 17:16:53 -0400
Subject: [PATCH 634/924] Extend test to ensure TCreationAttributes works

---
 types/sequelize/sequelize-tests.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 3a13906f06..233de49f07 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -41,19 +41,26 @@ s.transaction().then( ( a ) => t = a );
 // ~~~~~~~~~~
 //
 
-interface GUserAttributes {
-    id? : number;
+interface GUserCreationAttributes {
+    id? : number
     username? : string;
     email: string;
 }
 
-interface GUserInstance extends Sequelize.Instance<GUserAttributes> {}
-const GUser = s.define<GUserInstance, GUserAttributes>('user', {
+interface GUserAttributes {
+    id : number;
+    username? : string;
+    email: string;
+}
+
+interface GUserInstance extends Sequelize.Instance<GUserAttributes>, GUserAttributes {}
+const GUser = s.define<GUserInstance, GUserAttributes, GUserCreationAttributes>('user', {
     id: Sequelize.INTEGER,
     username: Sequelize.STRING,
     email: Sequelize.STRING
 });
 GUser.create({ id : 1, username : 'one', email: 'one@lol.com' }).then((guser) => guser.save());
+GUser.create({ email: 'two@lol.com' }).then((guser) => guser.save())
 
 var schema : Sequelize.DefineAttributes = {
     key : { type : Sequelize.STRING, primaryKey : true },

From c00200d2ada70e2fbfd146df998f5aeef4972c81 Mon Sep 17 00:00:00 2001
From: onejsninja <bayoopesanya@gmail.com>
Date: Wed, 13 Mar 2019 22:48:01 +0100
Subject: [PATCH 635/924] Add types to allow string array argument for hmset
 (#33835)

* add missing type

* update test

* add name to Definitions By

* add missing types and update test

* regularize formatting

* remove string[]

* remove duplicate typing

* organized formatting

* Merge branch 'master' of https://github.com/OpesanyaAdebayo/DefinitelyTyped

* remove duplicate typing

* add types and tests for typescript 3.0 upwards

* resolve version conflicts

* resolve version conflict

* resolve formatting

* remove new types from older version

* remove header from submodule
---
 types/redis/index.d.ts           |    1 +
 types/redis/package.json         |   11 +
 types/redis/redis-tests.ts       |   10 +-
 types/redis/ts3.1/index.d.ts     | 1235 ++++++++++++++++++++++++++++++
 types/redis/ts3.1/redis-tests.ts |  142 ++++
 types/redis/ts3.1/tsconfig.json  |   23 +
 types/redis/ts3.1/tslint.json    |    1 +
 7 files changed, 1419 insertions(+), 4 deletions(-)
 create mode 100644 types/redis/package.json
 create mode 100644 types/redis/ts3.1/index.d.ts
 create mode 100644 types/redis/ts3.1/redis-tests.ts
 create mode 100644 types/redis/ts3.1/tsconfig.json
 create mode 100644 types/redis/ts3.1/tslint.json

diff --git a/types/redis/index.d.ts b/types/redis/index.d.ts
index eae16b7ff1..3548be95b9 100644
--- a/types/redis/index.d.ts
+++ b/types/redis/index.d.ts
@@ -10,6 +10,7 @@
 //                 Pirasis Leelatanon <https://github.com/1pete>
 //                 Stanislav Dzhus <https://github.com/blablapolicja>
 //                 Jake Ferrante <https://github.com/ferrantejake>
+//                 Adebayo Opesanya <https://github.com/OpesanyaAdebayo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Imported from: https://github.com/types/npm-redis
diff --git a/types/redis/package.json b/types/redis/package.json
new file mode 100644
index 0000000000..c1f0c68752
--- /dev/null
+++ b/types/redis/package.json
@@ -0,0 +1,11 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": {
+            "*": [
+                "ts3.1/*"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/types/redis/redis-tests.ts b/types/redis/redis-tests.ts
index fb5a97987d..16e690ca46 100644
--- a/types/redis/redis-tests.ts
+++ b/types/redis/redis-tests.ts
@@ -20,8 +20,8 @@ redis.print(err, value);
 // ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
 
 const options: redis.ClientOpts = {
-    host: "localhost",
-    port: 6379,
+  host: 'localhost',
+  port: 6379,
 };
 let client: redis.RedisClient = redis.createClient(num, str, options);
 
@@ -90,6 +90,8 @@ client.incr(str, resCallback);
 client.hgetall(str, resCallback);
 client.hmset(str, value, okCallback);
 client.hmset(str, str, str, str, str, okCallback);
+client.hmset(str, [str, str, str, str]);
+client.hmset(str, [str, value, str, value], okCallback);
 
 // Publish / Subscribe
 client.publish(str, value);
@@ -115,8 +117,8 @@ client.duplicate();
 
 // Pipeline
 client.cork();
-client.set("abc", "fff", strCallback);
-client.get("abc", resCallback);
+client.set('abc', 'fff', strCallback);
+client.get('abc', resCallback);
 client.uncork();
 
 // Add command
diff --git a/types/redis/ts3.1/index.d.ts b/types/redis/ts3.1/index.d.ts
new file mode 100644
index 0000000000..d69332f3de
--- /dev/null
+++ b/types/redis/ts3.1/index.d.ts
@@ -0,0 +1,1235 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import { Duplex } from 'stream';
+
+export interface RetryStrategyOptions {
+    error: NodeJS.ErrnoException;
+    total_retry_time: number;
+    times_connected: number;
+    attempt: number;
+}
+
+export type RetryStrategy = (options: RetryStrategyOptions) => number | Error;
+
+export interface ClientOpts {
+    host?: string;
+    port?: number;
+    path?: string;
+    url?: string;
+    parser?: string;
+    string_numbers?: boolean;
+    return_buffers?: boolean;
+    detect_buffers?: boolean;
+    socket_keepalive?: boolean;
+    no_ready_check?: boolean;
+    enable_offline_queue?: boolean;
+    retry_max_delay?: number;
+    connect_timeout?: number;
+    max_attempts?: number;
+    retry_unfulfilled_commands?: boolean;
+    auth_pass?: string;
+    password?: string;
+    db?: string | number;
+    family?: string;
+    rename_commands?: { [command: string]: string } | null;
+    tls?: any;
+    prefix?: string;
+    retry_strategy?: RetryStrategy;
+}
+
+export type Callback<T> = (err: Error | null, reply: T) => void;
+
+export interface ServerInfo {
+    redis_version: string;
+    versions: number[];
+}
+
+export interface OverloadedCommand<T, U, R> {
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T | T[], cb?: Callback<U>): R;
+    (arg1: T | T[], cb?: Callback<U>): R;
+    (...args: Array<T | Callback<U>>): R;
+}
+
+export interface OverloadedKeyCommand<T, U, R> {
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
+    (key: string, arg1: T | T[], cb?: Callback<U>): R;
+    (key: string, ...args: Array<T | Callback<U>>): R;
+    (...args: Array<string | T | Callback<U>>): R;
+}
+
+export interface OverloadedListCommand<T, U, R> {
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (arg1: T, arg2: T, cb?: Callback<U>): R;
+    (arg1: T | T[], cb?: Callback<U>): R;
+    (...args: Array<T | Callback<U>>): R;
+}
+
+export interface OverloadedSetCommand<T, U, R> {
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, arg6: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, arg5: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, arg4: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, arg3: T, cb?: Callback<U>): R;
+    (key: string, arg1: T, arg2: T, cb?: Callback<U>): R;
+    (key: string, arg1: T | { [key: string]: T } | T[], cb?: Callback<U>): R;
+    (key: string, ...args: Array<T | Callback<U>>): R;
+    (args: [string, ...T[]], cb?: Callback<U>): R;
+}
+
+export interface OverloadedLastCommand<T1, T2, U, R> {
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T1, arg6: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T1, arg5: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T1, arg4: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T1, arg3: T2, cb?: Callback<U>): R;
+    (arg1: T1, arg2: T2 | Array<T1 | T2>, cb?: Callback<U>): R;
+    (args: Array<T1 | T2>, cb?: Callback<U>): R;
+    (...args: Array<T1 | T2 | Callback<U>>): R;
+}
+
+export interface Commands<R> {
+    /**
+     * Listen for all requests received by the server in real time.
+     */
+    monitor(cb?: Callback<undefined>): R;
+    MONITOR(cb?: Callback<undefined>): R;
+
+    /**
+     * Get information and statistics about the server.
+     */
+    info(cb?: Callback<ServerInfo>): R;
+    info(section?: string | string[], cb?: Callback<ServerInfo>): R;
+    INFO(cb?: Callback<ServerInfo>): R;
+    INFO(section?: string | string[], cb?: Callback<ServerInfo>): R;
+
+    /**
+     * Ping the server.
+     */
+    ping(callback?: Callback<string>): R;
+    ping(message: string, callback?: Callback<string>): R;
+    PING(callback?: Callback<string>): R;
+    PING(message: string, callback?: Callback<string>): R;
+
+    /**
+     * Post a message to a channel.
+     */
+    publish(channel: string, value: string, cb?: Callback<number>): R;
+    PUBLISH(channel: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Authenticate to the server.
+     */
+    auth(password: string, callback?: Callback<string>): R;
+    AUTH(password: string, callback?: Callback<string>): R;
+
+    /**
+     * KILL - Kill the connection of a client.
+     * LIST - Get the list of client connections.
+     * GETNAME - Get the current connection name.
+     * PAUSE - Stop processing commands from clients for some time.
+     * REPLY - Instruct the server whether to reply to commands.
+     * SETNAME - Set the current connection name.
+     */
+    client: OverloadedCommand<string, any, R>;
+    CLIENT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Set multiple hash fields to multiple values.
+     */
+    hmset: OverloadedSetCommand<string | number, 'OK', R>;
+    HMSET: OverloadedSetCommand<string | number, 'OK', R>;
+
+    /**
+     * Listen for messages published to the given channels.
+     */
+    subscribe: OverloadedListCommand<string, string, R>;
+    SUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Stop listening for messages posted to the given channels.
+     */
+    unsubscribe: OverloadedListCommand<string, string, R>;
+    UNSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Listen for messages published to channels matching the given patterns.
+     */
+    psubscribe: OverloadedListCommand<string, string, R>;
+    PSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Stop listening for messages posted to channels matching the given patterns.
+     */
+    punsubscribe: OverloadedListCommand<string, string, R>;
+    PUNSUBSCRIBE: OverloadedListCommand<string, string, R>;
+
+    /**
+     * Append a value to a key.
+     */
+    append(key: string, value: string, cb?: Callback<number>): R;
+    APPEND(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Asynchronously rewrite the append-only file.
+     */
+    bgrewriteaof(cb?: Callback<'OK'>): R;
+    BGREWRITEAOF(cb?: Callback<'OK'>): R;
+
+    /**
+     * Asynchronously save the dataset to disk.
+     */
+    bgsave(cb?: Callback<string>): R;
+    BGSAVE(cb?: Callback<string>): R;
+
+    /**
+     * Count set bits in a string.
+     */
+    bitcount(key: string, cb?: Callback<number>): R;
+    bitcount(key: string, start: number, end: number, cb?: Callback<number>): R;
+    BITCOUNT(key: string, cb?: Callback<number>): R;
+    BITCOUNT(key: string, start: number, end: number, cb?: Callback<number>): R;
+
+    /**
+     * Perform arbitrary bitfield integer operations on strings.
+     */
+    bitfield: OverloadedKeyCommand<string | number, [number, number], R>;
+    BITFIELD: OverloadedKeyCommand<string | number, [number, number], R>;
+
+    /**
+     * Perform bitwise operations between strings.
+     */
+    bitop(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
+    bitop(operation: string, destkey: string, ...args: Array<string | Callback<number>>): R;
+    BITOP(operation: string, destkey: string, key1: string, key2: string, key3: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, key1: string, key2: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, key: string, cb?: Callback<number>): R;
+    BITOP(operation: string, destkey: string, ...args: Array<string | Callback<number>>): R;
+
+    /**
+     * Find first bit set or clear in a string.
+     */
+    bitpos(key: string, bit: number, start: number, end: number, cb?: Callback<number>): R;
+    bitpos(key: string, bit: number, start: number, cb?: Callback<number>): R;
+    bitpos(key: string, bit: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, start: number, end: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, start: number, cb?: Callback<number>): R;
+    BITPOS(key: string, bit: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove and get the first element in a list, or block until one is available.
+     */
+    blpop: OverloadedLastCommand<string, number, [string, string], R>;
+    BLPOP: OverloadedLastCommand<string, number, [string, string], R>;
+
+    /**
+     * Remove and get the last element in a list, or block until one is available.
+     */
+    brpop: OverloadedLastCommand<string, number, [string, string], R>;
+    BRPOP: OverloadedLastCommand<string, number, [string, string], R>;
+
+    /**
+     * Pop a value from a list, push it to another list and return it; or block until one is available.
+     */
+    brpoplpush(source: string, destination: string, timeout: number, cb?: Callback<string | null>): R;
+    BRPOPLPUSH(source: string, destination: string, timeout: number, cb?: Callback<string | null>): R;
+
+    /**
+     * ADDSLOTS - Assign new hash slots to receiving node.
+     * COUNT-FAILURE-REPORTS - Return the number of failure reports active for a given node.
+     * COUNTKEYSINSLOT - Return the number of local keys in the specified hash slot.
+     * DELSLOTS - Set hash slots as unbound in receiving node.
+     * FAILOVER - Forces a slave to perform a manual failover of its master.
+     * FORGET - Remove a node from the nodes table.
+     * GETKEYSINSLOT - Return local key names in the specified hash slot.
+     * INFO - Provides info about Redis Cluster node state.
+     * KEYSLOT - Returns the hash slot of the specified key.
+     * MEET - Force a node cluster to handshake with another node.
+     * NODES - Get cluster config for the node.
+     * REPLICATE - Reconfigure a node as a slave of the specified master node.
+     * RESET - Reset a Redis Cluster node.
+     * SAVECONFIG - Forces the node to save cluster state on disk.
+     * SET-CONFIG-EPOCH - Set the configuration epoch in a new node.
+     * SETSLOT - Bind a hash slot to a specified node.
+     * SLAVES - List slave nodes of the specified master node.
+     * SLOTS - Get array of Cluster slot to node mappings.
+     */
+    cluster: OverloadedCommand<string, any, this>;
+    CLUSTER: OverloadedCommand<string, any, this>;
+
+    /**
+     * Get array of Redis command details.
+     *
+     * COUNT - Get total number of Redis commands.
+     * GETKEYS - Extract keys given a full Redis command.
+     * INFO - Get array of specific REdis command details.
+     */
+    command(cb?: Callback<Array<[string, number, string[], number, number, number]>>): R;
+    COMMAND(cb?: Callback<Array<[string, number, string[], number, number, number]>>): R;
+
+    /**
+     * Get array of Redis command details.
+     *
+     * COUNT - Get array of Redis command details.
+     * GETKEYS - Extract keys given a full Redis command.
+     * INFO - Get array of specific Redis command details.
+     * GET - Get the value of a configuration parameter.
+     * REWRITE - Rewrite the configuration file with the in memory configuration.
+     * SET - Set a configuration parameter to the given value.
+     * RESETSTAT - Reset the stats returned by INFO.
+     */
+    config: OverloadedCommand<string, boolean, R>;
+    CONFIG: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Return the number of keys in the selected database.
+     */
+    dbsize(cb?: Callback<number>): R;
+    DBSIZE(cb?: Callback<number>): R;
+
+    /**
+     * OBJECT - Get debugging information about a key.
+     * SEGFAULT - Make the server crash.
+     */
+    debug: OverloadedCommand<string, boolean, R>;
+    DEBUG: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Decrement the integer value of a key by one.
+     */
+    decr(key: string, cb?: Callback<number>): R;
+    DECR(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Decrement the integer value of a key by the given number.
+     */
+    decrby(key: string, decrement: number, cb?: Callback<number>): R;
+    DECRBY(key: string, decrement: number, cb?: Callback<number>): R;
+
+    /**
+     * Delete a key.
+     */
+    del: OverloadedCommand<string, number, R>;
+    DEL: OverloadedCommand<string, number, R>;
+
+    /**
+     * Discard all commands issued after MULTI.
+     */
+    discard(cb?: Callback<'OK'>): R;
+    DISCARD(cb?: Callback<'OK'>): R;
+
+    /**
+     * Return a serialized version of the value stored at the specified key.
+     */
+    dump(key: string, cb?: Callback<string>): R;
+    DUMP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Echo the given string.
+     */
+    echo<T extends string>(message: T, cb?: Callback<T>): R;
+    ECHO<T extends string>(message: T, cb?: Callback<T>): R;
+
+    /**
+     * Execute a Lua script server side.
+     */
+    eval: OverloadedCommand<string | number, any, R>;
+    EVAL: OverloadedCommand<string | number, any, R>;
+
+    /**
+     * Execute a Lue script server side.
+     */
+    evalsha: OverloadedCommand<string | number, any, R>;
+    EVALSHA: OverloadedCommand<string | number, any, R>;
+
+    /**
+     * Determine if a key exists.
+     */
+    exists: OverloadedCommand<string, number, R>;
+    EXISTS: OverloadedCommand<string, number, R>;
+
+    /**
+     * Set a key's time to live in seconds.
+     */
+    expire(key: string, seconds: number, cb?: Callback<number>): R;
+    EXPIRE(key: string, seconds: number, cb?: Callback<number>): R;
+
+    /**
+     * Set the expiration for a key as a UNIX timestamp.
+     */
+    expireat(key: string, timestamp: number, cb?: Callback<number>): R;
+    EXPIREAT(key: string, timestamp: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove all keys from all databases.
+     */
+    flushall(cb?: Callback<string>): R;
+    FLUSHALL(cb?: Callback<string>): R;
+
+    /**
+     * Remove all keys from the current database.
+     */
+    flushdb(cb?: Callback<'OK'>): R;
+    FLUSHDB(cb?: Callback<'OK'>): R;
+
+    /**
+     * Add one or more geospatial items in the geospatial index represented using a sorted set.
+     */
+    geoadd: OverloadedKeyCommand<string | number, number, R>;
+    GEOADD: OverloadedKeyCommand<string | number, number, R>;
+
+    /**
+     * Returns members of a geospatial index as standard geohash strings.
+     */
+    geohash: OverloadedKeyCommand<string, string, R>;
+    GEOHASH: OverloadedKeyCommand<string, string, R>;
+
+    /**
+     * Returns longitude and latitude of members of a geospatial index.
+     */
+    geopos: OverloadedKeyCommand<string, Array<[number, number]>, R>;
+    GEOPOS: OverloadedKeyCommand<string, Array<[number, number]>, R>;
+
+    /**
+     * Returns the distance between two members of a geospatial index.
+     */
+    geodist: OverloadedKeyCommand<string, string, R>;
+    GEODIST: OverloadedKeyCommand<string, string, R>;
+
+    /**
+     * Query a sorted set representing a geospatial index to fetch members matching a given maximum distance from a point.
+     */
+    georadius: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+    GEORADIUS: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+
+    /**
+     * Query a sorted set representing a geospatial index to fetch members matching a given maximum distance from a member.
+     */
+    georadiusbymember: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+    GEORADIUSBYMEMBER: OverloadedKeyCommand<string | number, Array<string | [string, string | [string, string]]>, R>;
+
+    /**
+     * Get the value of a key.
+     */
+    get(key: string, cb?: Callback<string>): R;
+    GET(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Returns the bit value at offset in the string value stored at key.
+     */
+    getbit(key: string, offset: number, cb?: Callback<number>): R;
+    GETBIT(key: string, offset: number, cb?: Callback<number>): R;
+
+    /**
+     * Get a substring of the string stored at a key.
+     */
+    getrange(key: string, start: number, end: number, cb?: Callback<string>): R;
+    GETRANGE(key: string, start: number, end: number, cb?: Callback<string>): R;
+
+    /**
+     * Set the string value of a key and return its old value.
+     */
+    getset(key: string, value: string, cb?: Callback<string>): R;
+    GETSET(key: string, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Delete on or more hash fields.
+     */
+    hdel: OverloadedKeyCommand<string, number, R>;
+    HDEL: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Determine if a hash field exists.
+     */
+    hexists(key: string, field: string, cb?: Callback<number>): R;
+    HEXISTS(key: string, field: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the value of a hash field.
+     */
+    hget(key: string, field: string, cb?: Callback<string>): R;
+    HGET(key: string, field: string, cb?: Callback<string>): R;
+
+    /**
+     * Get all fields and values in a hash.
+     */
+    hgetall(key: string, cb?: Callback<{ [key: string]: string }>): R;
+    HGETALL(key: string, cb?: Callback<{ [key: string]: string }>): R;
+
+    /**
+     * Increment the integer value of a hash field by the given number.
+     */
+    hincrby(key: string, field: string, increment: number, cb?: Callback<number>): R;
+    HINCRBY(key: string, field: string, increment: number, cb?: Callback<number>): R;
+
+    /**
+     * Increment the float value of a hash field by the given amount.
+     */
+    hincrbyfloat(key: string, field: string, increment: number, cb?: Callback<string>): R;
+    HINCRBYFLOAT(key: string, field: string, increment: number, cb?: Callback<string>): R;
+
+    /**
+     * Get all the fields of a hash.
+     */
+    hkeys(key: string, cb?: Callback<string[]>): R;
+    HKEYS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Get the number of fields in a hash.
+     */
+    hlen(key: string, cb?: Callback<number>): R;
+    HLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the values of all the given hash fields.
+     */
+    hmget: OverloadedKeyCommand<string, string[], R>;
+    HMGET: OverloadedKeyCommand<string, string[], R>;
+
+    /**
+     * Set the string value of a hash field.
+     */
+    hset(key: string, field: string, value: string, cb?: Callback<number>): R;
+    HSET(key: string, field: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value of a hash field, only if the field does not exist.
+     */
+    hsetnx(key: string, field: string, value: string, cb?: Callback<number>): R;
+    HSETNX(key: string, field: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Get the length of the value of a hash field.
+     */
+    hstrlen(key: string, field: string, cb?: Callback<number>): R;
+    HSTRLEN(key: string, field: string, cb?: Callback<number>): R;
+
+    /**
+     * Get all the values of a hash.
+     */
+    hvals(key: string, cb?: Callback<string[]>): R;
+    HVALS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Increment the integer value of a key by one.
+     */
+    incr(key: string, cb?: Callback<number>): R;
+    INCR(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Increment the integer value of a key by the given amount.
+     */
+    incrby(key: string, increment: number, cb?: Callback<number>): R;
+    INCRBY(key: string, increment: number, cb?: Callback<number>): R;
+
+    /**
+     * Increment the float value of a key by the given amount.
+     */
+    incrbyfloat(key: string, increment: number, cb?: Callback<string>): R;
+    INCRBYFLOAT(key: string, increment: number, cb?: Callback<string>): R;
+
+    /**
+     * Find all keys matching the given pattern.
+     */
+    keys(pattern: string, cb?: Callback<string[]>): R;
+    KEYS(pattern: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Get the UNIX time stamp of the last successful save to disk.
+     */
+    lastsave(cb?: Callback<number>): R;
+    LASTSAVE(cb?: Callback<number>): R;
+
+    /**
+     * Get an element from a list by its index.
+     */
+    lindex(key: string, index: number, cb?: Callback<string>): R;
+    LINDEX(key: string, index: number, cb?: Callback<string>): R;
+
+    /**
+     * Insert an element before or after another element in a list.
+     */
+    linsert(key: string, dir: 'BEFORE' | 'AFTER', pivot: string, value: string, cb?: Callback<string>): R;
+    LINSERT(key: string, dir: 'BEFORE' | 'AFTER', pivot: string, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Get the length of a list.
+     */
+    llen(key: string, cb?: Callback<number>): R;
+    LLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove and get the first element in a list.
+     */
+    lpop(key: string, cb?: Callback<string>): R;
+    LPOP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Prepend one or multiple values to a list.
+     */
+    lpush: OverloadedKeyCommand<string, number, R>;
+    LPUSH: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Prepend a value to a list, only if the list exists.
+     */
+    lpushx(key: string, value: string, cb?: Callback<number>): R;
+    LPUSHX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Get a range of elements from a list.
+     */
+    lrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    LRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Remove elements from a list.
+     */
+    lrem(key: string, count: number, value: string, cb?: Callback<number>): R;
+    LREM(key: string, count: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value of an element in a list by its index.
+     */
+    lset(key: string, index: number, value: string, cb?: Callback<'OK'>): R;
+    LSET(key: string, index: number, value: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Trim a list to the specified range.
+     */
+    ltrim(key: string, start: number, stop: number, cb?: Callback<'OK'>): R;
+    LTRIM(key: string, start: number, stop: number, cb?: Callback<'OK'>): R;
+
+    /**
+     * Get the values of all given keys.
+     */
+    mget: OverloadedCommand<string, string[], R>;
+    MGET: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Atomically tranfer a key from a Redis instance to another one.
+     */
+    migrate: OverloadedCommand<string, boolean, R>;
+    MIGRATE: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Move a key to another database.
+     */
+    move(key: string, db: string | number): R;
+    MOVE(key: string, db: string | number): R;
+
+    /**
+     * Set multiple keys to multiple values.
+     */
+    mset: OverloadedCommand<string, boolean, R>;
+    MSET: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Set multiple keys to multiple values, only if none of the keys exist.
+     */
+    msetnx: OverloadedCommand<string, boolean, R>;
+    MSETNX: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Inspect the internals of Redis objects.
+     */
+    object: OverloadedCommand<string, any, R>;
+    OBJECT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Remove the expiration from a key.
+     */
+    persist(key: string, cb?: Callback<number>): R;
+    PERSIST(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove a key's time to live in milliseconds.
+     */
+    pexpire(key: string, milliseconds: number, cb?: Callback<number>): R;
+    PEXPIRE(key: string, milliseconds: number, cb?: Callback<number>): R;
+
+    /**
+     * Set the expiration for a key as a UNIX timestamp specified in milliseconds.
+     */
+    pexpireat(key: string, millisecondsTimestamp: number, cb?: Callback<number>): R;
+    PEXPIREAT(key: string, millisecondsTimestamp: number, cb?: Callback<number>): R;
+
+    /**
+     * Adds the specified elements to the specified HyperLogLog.
+     */
+    pfadd: OverloadedKeyCommand<string, number, R>;
+    PFADD: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Return the approximated cardinality of the set(s) observed by the HyperLogLog at key(s).
+     */
+    pfcount: OverloadedCommand<string, number, R>;
+    PFCOUNT: OverloadedCommand<string, number, R>;
+
+    /**
+     * Merge N different HyperLogLogs into a single one.
+     */
+    pfmerge: OverloadedCommand<string, boolean, R>;
+    PFMERGE: OverloadedCommand<string, boolean, R>;
+
+    /**
+     * Set the value and expiration in milliseconds of a key.
+     */
+    psetex(key: string, milliseconds: number, value: string, cb?: Callback<'OK'>): R;
+    PSETEX(key: string, milliseconds: number, value: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Inspect the state of the Pub/Sub subsytem.
+     */
+    pubsub: OverloadedCommand<string, number, R>;
+    PUBSUB: OverloadedCommand<string, number, R>;
+
+    /**
+     * Get the time to live for a key in milliseconds.
+     */
+    pttl(key: string, cb?: Callback<number>): R;
+    PTTL(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Close the connection.
+     */
+    quit(cb?: Callback<'OK'>): R;
+    QUIT(cb?: Callback<'OK'>): R;
+
+    /**
+     * Return a random key from the keyspace.
+     */
+    randomkey(cb?: Callback<string>): R;
+    RANDOMKEY(cb?: Callback<string>): R;
+
+    /**
+     * Enables read queries for a connection to a cluster slave node.
+     */
+    readonly(cb?: Callback<string>): R;
+    READONLY(cb?: Callback<string>): R;
+
+    /**
+     * Disables read queries for a connection to cluster slave node.
+     */
+    readwrite(cb?: Callback<string>): R;
+    READWRITE(cb?: Callback<string>): R;
+
+    /**
+     * Rename a key.
+     */
+    rename(key: string, newkey: string, cb?: Callback<'OK'>): R;
+    RENAME(key: string, newkey: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Rename a key, only if the new key does not exist.
+     */
+    renamenx(key: string, newkey: string, cb?: Callback<number>): R;
+    RENAMENX(key: string, newkey: string, cb?: Callback<number>): R;
+
+    /**
+     * Create a key using the provided serialized value, previously obtained using DUMP.
+     */
+    restore(key: string, ttl: number, serializedValue: string, cb?: Callback<'OK'>): R;
+    RESTORE(key: string, ttl: number, serializedValue: string, cb?: Callback<'OK'>): R;
+
+    /**
+     * Return the role of the instance in the context of replication.
+     */
+    role(cb?: Callback<[string, number, Array<[string, string, string]>]>): R;
+    ROLE(cb?: Callback<[string, number, Array<[string, string, string]>]>): R;
+
+    /**
+     * Remove and get the last element in a list.
+     */
+    rpop(key: string, cb?: Callback<string>): R;
+    RPOP(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Remove the last element in a list, prepend it to another list and return it.
+     */
+    rpoplpush(source: string, destination: string, cb?: Callback<string>): R;
+    RPOPLPUSH(source: string, destination: string, cb?: Callback<string>): R;
+
+    /**
+     * Append one or multiple values to a list.
+     */
+    rpush: OverloadedKeyCommand<string, number, R>;
+    RPUSH: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Append a value to a list, only if the list exists.
+     */
+    rpushx(key: string, value: string, cb?: Callback<number>): R;
+    RPUSHX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Append one or multiple members to a set.
+     */
+    sadd: OverloadedKeyCommand<string, number, R>;
+    SADD: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Synchronously save the dataset to disk.
+     */
+    save(cb?: Callback<string>): R;
+    SAVE(cb?: Callback<string>): R;
+
+    /**
+     * Get the number of members in a set.
+     */
+    scard(key: string, cb?: Callback<number>): R;
+    SCARD(key: string, cb?: Callback<number>): R;
+
+    /**
+     * DEBUG - Set the debug mode for executed scripts.
+     * EXISTS - Check existence of scripts in the script cache.
+     * FLUSH - Remove all scripts from the script cache.
+     * KILL - Kill the script currently in execution.
+     * LOAD - Load the specified Lua script into the script cache.
+     */
+    script: OverloadedCommand<string, any, R>;
+    SCRIPT: OverloadedCommand<string, any, R>;
+
+    /**
+     * Subtract multiple sets.
+     */
+    sdiff: OverloadedCommand<string, string[], R>;
+    SDIFF: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Subtract multiple sets and store the resulting set in a key.
+     */
+    sdiffstore: OverloadedKeyCommand<string, number, R>;
+    SDIFFSTORE: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Change the selected database for the current connection.
+     */
+    select(index: number | string, cb?: Callback<string>): R;
+    SELECT(index: number | string, cb?: Callback<string>): R;
+
+    /**
+     * Set the string value of a key.
+     */
+    set(key: string, value: string, cb?: Callback<'OK'>): R;
+    set(key: string, value: string, flag: string, cb?: Callback<'OK'>): R;
+    set(key: string, value: string, mode: string, duration: number, cb?: Callback<'OK' | undefined>): R;
+    set(key: string, value: string, mode: string, duration: number, flag: string, cb?: Callback<'OK' | undefined>): R;
+    SET(key: string, value: string, cb?: Callback<'OK'>): R;
+    SET(key: string, value: string, flag: string, cb?: Callback<'OK'>): R;
+    SET(key: string, value: string, mode: string, duration: number, cb?: Callback<'OK' | undefined>): R;
+    SET(key: string, value: string, mode: string, duration: number, flag: string, cb?: Callback<'OK' | undefined>): R;
+
+    /**
+     * Sets or clears the bit at offset in the string value stored at key.
+     */
+    setbit(key: string, offset: number, value: string, cb?: Callback<number>): R;
+    SETBIT(key: string, offset: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Set the value and expiration of a key.
+     */
+    setex(key: string, seconds: number, value: string, cb?: Callback<string>): R;
+    SETEX(key: string, seconds: number, value: string, cb?: Callback<string>): R;
+
+    /**
+     * Set the value of a key, only if the key does not exist.
+     */
+    setnx(key: string, value: string, cb?: Callback<number>): R;
+    SETNX(key: string, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Overwrite part of a string at key starting at the specified offset.
+     */
+    setrange(key: string, offset: number, value: string, cb?: Callback<number>): R;
+    SETRANGE(key: string, offset: number, value: string, cb?: Callback<number>): R;
+
+    /**
+     * Synchronously save the dataset to disk and then shut down the server.
+     */
+    shutdown: OverloadedCommand<string, string, R>;
+    SHUTDOWN: OverloadedCommand<string, string, R>;
+
+    /**
+     * Intersect multiple sets.
+     */
+    sinter: OverloadedKeyCommand<string, string[], R>;
+    SINTER: OverloadedKeyCommand<string, string[], R>;
+
+    /**
+     * Intersect multiple sets and store the resulting set in a key.
+     */
+    sinterstore: OverloadedCommand<string, number, R>;
+    SINTERSTORE: OverloadedCommand<string, number, R>;
+
+    /**
+     * Determine if a given value is a member of a set.
+     */
+    sismember(key: string, member: string, cb?: Callback<number>): R;
+    SISMEMBER(key: string, member: string, cb?: Callback<number>): R;
+
+    /**
+     * Make the server a slave of another instance, or promote it as master.
+     */
+    slaveof(host: string, port: string | number, cb?: Callback<string>): R;
+    SLAVEOF(host: string, port: string | number, cb?: Callback<string>): R;
+
+    /**
+     * Manages the Redis slow queries log.
+     */
+    slowlog: OverloadedCommand<string, Array<[number, number, number, string[]]>, R>;
+    SLOWLOG: OverloadedCommand<string, Array<[number, number, number, string[]]>, R>;
+
+    /**
+     * Get all the members in a set.
+     */
+    smembers(key: string, cb?: Callback<string[]>): R;
+    SMEMBERS(key: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Move a member from one set to another.
+     */
+    smove(source: string, destination: string, member: string, cb?: Callback<number>): R;
+    SMOVE(source: string, destination: string, member: string, cb?: Callback<number>): R;
+
+    /**
+     * Sort the elements in a list, set or sorted set.
+     */
+    sort: OverloadedCommand<string, string[], R>;
+    SORT: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Remove and return one or multiple random members from a set.
+     */
+    spop(key: string, cb?: Callback<string>): R;
+    spop(key: string, count: number, cb?: Callback<string[]>): R;
+    SPOP(key: string, cb?: Callback<string>): R;
+    SPOP(key: string, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Get one or multiple random members from a set.
+     */
+    srandmember(key: string, cb?: Callback<string>): R;
+    srandmember(key: string, count: number, cb?: Callback<string[]>): R;
+    SRANDMEMBER(key: string, cb?: Callback<string>): R;
+    SRANDMEMBER(key: string, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Remove one or more members from a set.
+     */
+    srem: OverloadedKeyCommand<string, number, R>;
+    SREM: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Get the length of the value stored in a key.
+     */
+    strlen(key: string, cb?: Callback<number>): R;
+    STRLEN(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Add multiple sets.
+     */
+    sunion: OverloadedCommand<string, string[], R>;
+    SUNION: OverloadedCommand<string, string[], R>;
+
+    /**
+     * Add multiple sets and store the resulting set in a key.
+     */
+    sunionstore: OverloadedCommand<string, number, R>;
+    SUNIONSTORE: OverloadedCommand<string, number, R>;
+
+    /**
+     * Internal command used for replication.
+     */
+    sync(cb?: Callback<undefined>): R;
+    SYNC(cb?: Callback<undefined>): R;
+
+    /**
+     * Return the current server time.
+     */
+    time(cb?: Callback<[string, string]>): R;
+    TIME(cb?: Callback<[string, string]>): R;
+
+    /**
+     * Get the time to live for a key.
+     */
+    ttl(key: string, cb?: Callback<number>): R;
+    TTL(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Determine the type stored at key.
+     */
+    type(key: string, cb?: Callback<string>): R;
+    TYPE(key: string, cb?: Callback<string>): R;
+
+    /**
+     * Forget about all watched keys.
+     */
+    unwatch(cb?: Callback<'OK'>): R;
+    UNWATCH(cb?: Callback<'OK'>): R;
+
+    /**
+     * Wait for the synchronous replication of all the write commands sent in the context of the current connection.
+     */
+    wait(numslaves: number, timeout: number, cb?: Callback<number>): R;
+    WAIT(numslaves: number, timeout: number, cb?: Callback<number>): R;
+
+    /**
+     * Watch the given keys to determine execution of the MULTI/EXEC block.
+     */
+    watch: OverloadedCommand<string, 'OK', R>;
+    WATCH: OverloadedCommand<string, 'OK', R>;
+
+    /**
+     * Add one or more members to a sorted set, or update its score if it already exists.
+     */
+    zadd: OverloadedKeyCommand<string | number, number, R>;
+    ZADD: OverloadedKeyCommand<string | number, number, R>;
+
+    /**
+     * Get the number of members in a sorted set.
+     */
+    zcard(key: string, cb?: Callback<number>): R;
+    ZCARD(key: string, cb?: Callback<number>): R;
+
+    /**
+     * Count the members in a sorted set with scores between the given values.
+     */
+    zcount(key: string, min: number | string, max: number | string, cb?: Callback<number>): R;
+    ZCOUNT(key: string, min: number | string, max: number | string, cb?: Callback<number>): R;
+
+    /**
+     * Increment the score of a member in a sorted set.
+     */
+    zincrby(key: string, increment: number, member: string, cb?: Callback<string>): R;
+    ZINCRBY(key: string, increment: number, member: string, cb?: Callback<string>): R;
+
+    /**
+     * Intersect multiple sorted sets and store the resulting sorted set in a new key.
+     */
+    zinterstore: OverloadedCommand<string | number, number, R>;
+    ZINTERSTORE: OverloadedCommand<string | number, number, R>;
+
+    /**
+     * Count the number of members in a sorted set between a given lexicographic range.
+     */
+    zlexcount(key: string, min: string, max: string, cb?: Callback<number>): R;
+    ZLEXCOUNT(key: string, min: string, max: string, cb?: Callback<number>): R;
+
+    /**
+     * Return a range of members in a sorted set, by index.
+     */
+    zrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    zrange(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+    ZRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    ZRANGE(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range.
+     */
+    zrangebylex(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    zrangebylex(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    ZRANGEBYLEX(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by lexicographical range, ordered from higher to lower strings.
+     */
+    zrevrangebylex(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    zrevrangebylex(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYLEX(key: string, min: string, max: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by score.
+     */
+    zrangebyscore(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    zrangebyscore(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Determine the index of a member in a sorted set.
+     */
+    zrank(key: string, member: string, cb?: Callback<number | undefined>): R;
+    ZRANK(key: string, member: string, cb?: Callback<number | undefined>): R;
+
+    /**
+     * Remove one or more members from a sorted set.
+     */
+    zrem: OverloadedKeyCommand<string, number, R>;
+    ZREM: OverloadedKeyCommand<string, number, R>;
+
+    /**
+     * Remove all members in a sorted set between the given lexicographical range.
+     */
+    zremrangebylex(key: string, min: string, max: string, cb?: Callback<number>): R;
+    ZREMRANGEBYLEX(key: string, min: string, max: string, cb?: Callback<number>): R;
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     */
+    zremrangebyrank(key: string, start: number, stop: number, cb?: Callback<number>): R;
+    ZREMRANGEBYRANK(key: string, start: number, stop: number, cb?: Callback<number>): R;
+
+    /**
+     * Remove all members in a sorted set within the given indexes.
+     */
+    zremrangebyscore(key: string, min: string | number, max: string | number, cb?: Callback<number>): R;
+    ZREMRANGEBYSCORE(key: string, min: string | number, max: string | number, cb?: Callback<number>): R;
+
+    /**
+     * Return a range of members in a sorted set, by index, with scores ordered from high to low.
+     */
+    zrevrange(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    zrevrange(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+    ZREVRANGE(key: string, start: number, stop: number, cb?: Callback<string[]>): R;
+    ZREVRANGE(key: string, start: number, stop: number, withscores: string, cb?: Callback<string[]>): R;
+
+    /**
+     * Return a range of members in a sorted set, by score, with scores ordered from high to low.
+     */
+    zrevrangebyscore(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    zrevrangebyscore(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+    ZREVRANGEBYSCORE(key: string, min: number | string, max: number | string, withscores: string, limit: string, offset: number, count: number, cb?: Callback<string[]>): R;
+
+    /**
+     * Determine the index of a member in a sorted set, with scores ordered from high to low.
+     */
+    zrevrank(key: string, member: string, cb?: Callback<number | undefined>): R;
+    ZREVRANK(key: string, member: string, cb?: Callback<number | undefined>): R;
+
+    /**
+     * Get the score associated with the given member in a sorted set.
+     */
+    zscore(key: string, member: string, cb?: Callback<string>): R;
+    ZSCORE(key: string, member: string, cb?: Callback<string>): R;
+
+    /**
+     * Add multiple sorted sets and store the resulting sorted set in a new key.
+     */
+    zunionstore: OverloadedCommand<string | number, number, R>;
+    ZUNIONSTORE: OverloadedCommand<string | number, number, R>;
+
+    /**
+     * Incrementally iterate the keys space.
+     */
+    scan: OverloadedCommand<string, [string, string[]], R>;
+    SCAN: OverloadedCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate Set elements.
+     */
+    sscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    SSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate hash fields and associated values.
+     */
+    hscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    HSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+
+    /**
+     * Incrementally iterate sorted sets elements and associated scores.
+     */
+    zscan: OverloadedKeyCommand<string, [string, string[]], R>;
+    ZSCAN: OverloadedKeyCommand<string, [string, string[]], R>;
+}
+
+export const RedisClient: new (options: ClientOpts) => RedisClient;
+
+export interface RedisClient extends Commands<boolean>, EventEmitter {
+    connected: boolean;
+    command_queue_length: number;
+    offline_queue_length: number;
+    retry_delay: number;
+    retry_backoff: number;
+    command_queue: any[];
+    offline_queue: any[];
+    connection_id: number;
+    server_info: ServerInfo;
+    stream: Duplex;
+
+    on(event: 'message' | 'message_buffer', listener: (channel: string, message: string) => void): this;
+    on(event: 'pmessage' | 'pmessage_buffer', listener: (pattern: string, channel: string, message: string) => void): this;
+    on(event: 'subscribe' | 'unsubscribe', listener: (channel: string, count: number) => void): this;
+    on(event: 'psubscribe' | 'punsubscribe', listener: (pattern: string, count: number) => void): this;
+    on(event: string, listener: (...args: any[]) => void): this;
+
+    /**
+     * Client methods.
+     */
+
+    end(flush?: boolean): void;
+    unref(): void;
+
+    cork(): void;
+    uncork(): void;
+
+    duplicate(options?: ClientOpts, cb?: Callback<RedisClient>): RedisClient;
+
+    sendCommand(command: string, cb?: Callback<any>): boolean;
+    sendCommand(command: string, args?: any[], cb?: Callback<any>): boolean;
+    send_command(command: string, cb?: Callback<any>): boolean;
+    send_command(command: string, args?: any[], cb?: Callback<any>): boolean;
+
+    addCommand(command: string): void;
+    add_command(command: string): void;
+
+    /**
+     * Mark the start of a transaction block.
+     */
+    multi(args?: Array<Array<string | number | Callback<any>>>): Multi;
+    MULTI(args?: Array<Array<string | number | Callback<any>>>): Multi;
+
+    batch(args?: Array<Array<string | number | Callback<any>>>): Multi;
+    BATCH(args?: Array<Array<string | number | Callback<any>>>): Multi;
+}
+
+export const Multi: new () => Multi;
+
+export interface Multi extends Commands<Multi> {
+    exec(cb?: Callback<any[]>): boolean;
+    EXEC(cb?: Callback<any[]>): boolean;
+
+    exec_atomic(cb?: Callback<any[]>): boolean;
+    EXEC_ATOMIC(cb?: Callback<any[]>): boolean;
+}
+
+export let debug_mode: boolean;
+
+export function createClient(port: number, host?: string, options?: ClientOpts): RedisClient;
+export function createClient(unix_socket: string, options?: ClientOpts): RedisClient;
+export function createClient(redis_url: string, options?: ClientOpts): RedisClient;
+export function createClient(options?: ClientOpts): RedisClient;
+
+export function print(err: Error | null, reply: any): void;
+
+export class RedisError extends Error { }
+export class ReplyError extends RedisError { }
+export class AbortError extends RedisError { }
+export class ParserError extends RedisError {
+    offset: number;
+    buffer: Buffer;
+}
+export class AggregateError extends AbortError { }
diff --git a/types/redis/ts3.1/redis-tests.ts b/types/redis/ts3.1/redis-tests.ts
new file mode 100644
index 0000000000..e2a0a37acf
--- /dev/null
+++ b/types/redis/ts3.1/redis-tests.ts
@@ -0,0 +1,142 @@
+import redis = require('redis');
+
+const value: any = 'any value';
+const commandArr: any[][] = [];
+const num = 0;
+const str = 'any string';
+const err: Error = new Error();
+const args: any[] = [];
+const resCallback: (err: Error | null, res: any) => void = () => {};
+const numCallback: (err: Error | null, res: number) => void = () => {};
+const strCallback: (err: Error | null, res: string) => void = () => {};
+const okCallback: (err: Error | null, res: 'OK') => void = () => {};
+const messageHandler: (channel: string, message: any) => void = () => {};
+
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+
+const debug_mode: boolean = redis.debug_mode;
+redis.print(err, value);
+
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+
+const options: redis.ClientOpts = {
+  host: 'localhost',
+  port: 6379,
+};
+let client: redis.RedisClient = redis.createClient(num, str, options);
+
+// Test the `retry_strategy` property
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+function retryStrategyNumber(options: redis.RetryStrategyOptions): number {
+  // Ensure that the properties of RetryStrategyOptions are resilient to breaking change.
+  // If the properties of the interface changes, the variables below will also need to be adapted.
+  const error: Error = options.error;
+  const total_retry_time: number = options.total_retry_time;
+  const times_connected: number = options.times_connected;
+  const attempt: number = options.attempt;
+  return 5000;
+}
+function retryStrategyError(options: redis.RetryStrategyOptions): Error {
+  return new Error('Foo');
+}
+client = redis.createClient({
+  retry_strategy: retryStrategyNumber
+});
+client = redis.createClient({
+  retry_strategy: retryStrategyError
+});
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+
+const connected: boolean = client.connected;
+const retry_delay: number = client.retry_delay;
+const retry_backoff: number = client.retry_backoff;
+const command_queue: any[] = client.command_queue;
+const offline_queue: any[] = client.offline_queue;
+const info: redis.ServerInfo = client.server_info;
+
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+
+client.end(true);
+
+// Connection (http://redis.io/commands#connection)
+client.auth(str, resCallback);
+client.ping(strCallback);
+client.unref();
+
+// Strings (http://redis.io/commands#strings)
+client.append(str, str, numCallback);
+client.bitcount(str, numCallback);
+client.bitcount(str, num, num, numCallback);
+client.set(str, str, okCallback);
+client.get(str, strCallback);
+client.exists(str, numCallback);
+
+// Event handlers
+client.on(str, messageHandler);
+client.once(str, messageHandler);
+
+// ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----
+
+// some of the bulk methods
+client.get('test');
+client.get('test', resCallback);
+client.set('test', 'test');
+client.set('test', 'test', okCallback);
+client.mset(args, resCallback);
+
+client.incr(str, resCallback);
+
+// Friendlier hash commands
+client.hgetall(str, resCallback);
+client.hmset(str, value, okCallback);
+client.hmset(str, str, str, str, str, okCallback);
+client.hmset([str, str, str, str, str], okCallback);
+client.hmset([str, str, str, str, str]);
+client.hmset(str, [str, str, str, str]);
+client.hmset(str, [str, value, str, value], okCallback);
+
+// Publish / Subscribe
+client.publish(str, value);
+client.subscribe(str);
+
+// Multi
+client.multi()
+  .scard(str)
+  .smembers(str)
+  .keys('*', resCallback)
+  .dbsize()
+  .exec(resCallback);
+
+client.multi([['get', 'test']]).exec();
+
+// Monitor mode
+client.monitor(resCallback);
+
+// Send command
+client.send_command(str, args, resCallback);
+// Duplicate
+client.duplicate();
+
+// Pipeline
+client.cork();
+client.set('abc', 'fff', strCallback);
+client.get('abc', resCallback);
+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);
+
+// increase-by-float reply a string
+client.incrbyfloat('a', 1.5, (error, value) => value.startsWith('1'));
+client.INCRBYFLOAT('a', 1.5, (error, value) => value.startsWith('1'));
+client.hincrbyfloat('a', 'b', 1.5, (error, value) => value.startsWith('1'));
+client.HINCRBYFLOAT('a', 'b', 1.5, (error, value) => value.startsWith('1'));
+client.zincrby('a', 1, 'b', strCallback);
+client.ZINCRBY('a', 1, 'b', strCallback);
+
+client.flushdb(okCallback);
diff --git a/types/redis/ts3.1/tsconfig.json b/types/redis/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..eb55ed1d6f
--- /dev/null
+++ b/types/redis/ts3.1/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",
+        "redis-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/redis/ts3.1/tslint.json b/types/redis/ts3.1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redis/ts3.1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 70fbf57f7b6b776bc1c55bf16caeeca2e9de16fe Mon Sep 17 00:00:00 2001
From: echojoshchen <48116767+echojoshchen@users.noreply.github.com>
Date: Wed, 13 Mar 2019 17:48:19 -0400
Subject: [PATCH 636/924] Add type defintion for Profile and fix
 multiSamlStrategy types. (#33851)

* Add missing types and fix typings for multiSamlStrategy

* Update SamlConfig required fields
---
 types/passport-saml/index.d.ts             | 25 ++++++++++++++++++----
 types/passport-saml/multiSamlStrategy.d.ts | 14 ++++++++----
 types/passport-saml/passport-saml-tests.ts | 10 +++++----
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index 24f0effa71..e4846cb19d 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -20,9 +20,9 @@ export interface CacheProvider {
     remove(key: string, callback: (err: Error | null, key: string) => void | null): void;
 }
 
-export type VerifiedCallback =	(err: Error | null, user: object, info: object) => void;
+export type VerifiedCallback = (err: Error | null, user?: object, info?: object) => void;
 
-export type VerifyWithRequest = (req: express.Request, profile: object, done: VerifiedCallback) => void;
+export type VerifyWithRequest = (req: express.Request, profile: Profile, done: VerifiedCallback) => void;
 
 export type VerifyWithoutRequest = (profile: object, done: VerifiedCallback) => void;
 
@@ -41,8 +41,8 @@ export interface SamlConfig {
     path?: string;
     protocol?: string;
     host?: string;
-    entryPoint: string;
-    issuer: string;
+    entryPoint?: string;
+    issuer?: string;
     privateCert?: string;
     cert?: string | string[] | CertCallback;
     decryptionPvk?: string;
@@ -82,3 +82,20 @@ export interface AuthenticateOptions extends passport.AuthenticateOptions {
 export interface AuthorizeOptions extends AuthenticateOptions {
     samlFallback?: string;
 }
+
+export type Profile = {
+	issuer?: string;
+	sessionIndex?: string;
+	nameID?: string;
+	nameIDFormat?: string;
+	nameQualifier?: string;
+	spNameQualifier?: string;
+	ID?: string;
+	mail?: string;  // InCommon Attribute urn:oid:0.9.2342.19200300.100.1.3
+	email?: string;  // `mail` if not present in the assertion
+	getAssertionXml(): string;  // get the raw assertion XML
+	getAssertion(): object;  // get the assertion XML parsed as a JavaScript object
+	getSamlResponseXml(): string; // get the raw SAML response XML
+} & {
+	[attributeName: string]: string;  // arbitrary `AttributeValue`s
+};
diff --git a/types/passport-saml/multiSamlStrategy.d.ts b/types/passport-saml/multiSamlStrategy.d.ts
index 405c7264dc..c9d8568aad 100644
--- a/types/passport-saml/multiSamlStrategy.d.ts
+++ b/types/passport-saml/multiSamlStrategy.d.ts
@@ -1,10 +1,16 @@
 import express = require('express');
 import { Strategy, SamlConfig, VerifyWithRequest, VerifyWithoutRequest } from './index';
 
-export interface MultiSamlConfig extends SamlConfig {
-    getSamlOptions(req: express.Request, callback: (err: Error | null, samlOptions: SamlConfig) => void): void;
+declare namespace MultiSamlStrategy {
+    type SamlOptionsCallback = (err: Error | null, samlOptions?: SamlConfig) => void;
+
+    interface MultiSamlConfig extends SamlConfig {
+        getSamlOptions(req: express.Request, callback: SamlOptionsCallback): void;
+    }
 }
 
-export class MultiSamlStrategy extends Strategy {
-    constructor(config: MultiSamlConfig, verify: VerifyWithRequest | VerifyWithoutRequest);
+declare class MultiSamlStrategy extends Strategy {
+    constructor(config: MultiSamlStrategy.MultiSamlConfig, verify: VerifyWithRequest | VerifyWithoutRequest);
 }
+
+export = MultiSamlStrategy;
diff --git a/types/passport-saml/passport-saml-tests.ts b/types/passport-saml/passport-saml-tests.ts
index b22421fe81..04901e52a1 100644
--- a/types/passport-saml/passport-saml-tests.ts
+++ b/types/passport-saml/passport-saml-tests.ts
@@ -35,24 +35,26 @@ passport.authenticate('samlCustomName', {failureRedirect: '/', failureFlash: tru
 
 const metadata = samlStrategy.generateServiceProviderMetadata("decryptionCert");
 
-const multiSamlStrategy = new MultiSamlStrategy.MultiSamlStrategy(
+const multiSamlStrategy = new MultiSamlStrategy(
 	{
 		name: 'samlCustomName',
 		path: '/login/callback',
 		entryPoint: 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
 		issuer: 'passport-saml',
-        getSamlOptions(req: express.Request, callback: (err: Error | null, samlOptions: SamlStrategy.SamlConfig) => void) {
+        getSamlOptions(req: express.Request, callback: MultiSamlStrategy.SamlOptionsCallback) {
             callback(null, {
                 name: 'samlCustomName',
                 path: '/login/callback2',
                 entryPoint: 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
                 issuer: 'passport-saml',
-            });
+			});
+			callback(new Error("SAML Options Error"));
         }
 	},
-	(profile: {}, done: (err: Error | null, user: {}, info?: {}) => void) => {
+	(profile: {}, done: (err: Error | null, user?: {}, info?: {}) => void) => {
 		const user = {};
 		done(null, user);
+		done(new Error("Verify Request Error"));
 	}
 );
 

From 569a9c76fdf4fd8aed280bebaa6da0e64f93e892 Mon Sep 17 00:00:00 2001
From: Ankith Konda <ankith.konda@gmail.com>
Date: Thu, 14 Mar 2019 07:48:40 +1000
Subject: [PATCH 637/924] mui-datatables - Add missing types for arguments of
 customToolbarSelect (#33836)

* Add types for custom selected toolbar args

* Fix lint errors

* remove whitespaces
---
 types/mui-datatables/index.d.ts               | 10 +++++++++-
 types/mui-datatables/mui-datatables-tests.tsx | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/mui-datatables/index.d.ts b/types/mui-datatables/index.d.ts
index 1bdf9fc07f..1be1289ac6 100644
--- a/types/mui-datatables/index.d.ts
+++ b/types/mui-datatables/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for mui-datatables 2.0
 // Project: https://github.com/gregnb/mui-datatables
 // Definitions by: Jeroen "Favna" Claassens <https://github.com/favna>
+//                 Ankith Konda <https://github.com/ankithkonda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -122,7 +123,14 @@ export interface MUIDataTableOptions {
     expandableRows?: boolean;
     renderExpandableRow?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => React.ReactNode;
     customToolbar?: () => React.ReactNode;
-    customToolbarSelect?: () => React.ReactNode;
+    customToolbarSelect?: (
+        selectedRows: {
+            data: Array<{ index: number; dataIndex: number }>;
+            lookup: { [key: number]: boolean };
+        },
+        displayData: Array<{ data: any[]; dataIndex: number }>,
+        setSelectedRows: (rows: number[]) => void
+    ) => React.ReactNode;
     customFooter?: () => React.ReactNode;
     customSort?: (data: any[], colIndex: number, order: string) => any[];
     elevation?: number;
diff --git a/types/mui-datatables/mui-datatables-tests.tsx b/types/mui-datatables/mui-datatables-tests.tsx
index c6a477ea08..7fd89a488b 100644
--- a/types/mui-datatables/mui-datatables-tests.tsx
+++ b/types/mui-datatables/mui-datatables-tests.tsx
@@ -25,6 +25,21 @@ class MuiCustomTable extends React.Component<Props> {
             separator: ','
         },
         sortFilterList: false,
+        customToolbarSelect: (selectedRows, displayData, setSelectedRows) => {
+            return (
+                <span>
+                    Custom Selected Toolbar:{' '}
+                    {`${selectedRows.data.length} - ${JSON.stringify(displayData[0])}`}
+                    <button
+                        onClick={() => {
+                            setSelectedRows([]);
+                        }}
+                    >
+                        Set Selected Row to none
+                    </button>
+                </span>
+            );
+        },
         textLabels: {
             body: {
                 noMatch: 'Sorry, no matching records found',

From da393aeca04cdb1cdb22ffe68b1f706715925e3d Mon Sep 17 00:00:00 2001
From: Johan Davidsson <johan.davidsson@trewit.se>
Date: Wed, 13 Mar 2019 23:00:29 +0100
Subject: [PATCH 638/924] Updated tests

---
 types/domhandler/domhandler-tests.ts | 14 ++++++++------
 types/domhandler/index.d.ts          | 19 +++++++++----------
 types/domhandler/tsconfig.json       |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/types/domhandler/domhandler-tests.ts b/types/domhandler/domhandler-tests.ts
index f12fe33c88..eea6441ad7 100644
--- a/types/domhandler/domhandler-tests.ts
+++ b/types/domhandler/domhandler-tests.ts
@@ -1,12 +1,14 @@
-import * as htmlparser from "htmlparser2";
+import { DomHandler, DomHandlerOptions, Node } from "domhandler";
 
-const rawHtml = "Xyz <script language= javascript>var foo = '<<bar>>';< /  script><!--<!-- Waah! -- -->";
-const handler = new htmlparser.DomHandler((error: Error, dom: htmlparser.DomElement[]) => {
+const handler = new DomHandler((error: Error, dom: any) => {
     if (error)
     	console.error('There has been an error...');
     else
         console.log(dom);
 });
-const parser = new htmlparser.Parser(handler);
-parser.write(rawHtml);
-parser.end();
+handler.ontext = (data: string) => { console.log(data); };
+handler.onreset = () => { console.log('We have a reset.'); };
+handler.onerror = (error: Error) => { console.error(Error); };
+handler.onopentag = (name: string, attribs) => { console.log(name, attribs); };
+
+const dho: DomHandlerOptions = { normalizeWhitespace: true, withDomLvl1: true, withEndIndices: true, withStartIndices: true };
diff --git a/types/domhandler/index.d.ts b/types/domhandler/index.d.ts
index a65ba717b3..9d33055bbd 100644
--- a/types/domhandler/index.d.ts
+++ b/types/domhandler/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for domhandler 2.4.2
+// Type definitions for domhandler 2.4
 // Project: https://github.com/fb55/DomHandler#readme
 // Definitions by: Johan Davidsson <https://github.com/johandavidson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,12 +9,12 @@ export interface DomHandlerOptions {
      * Indicates whether the whitespace in text nodes should be normalized
      * (= all whitespace should be replaced with single spaces). The default value is "false".
      */
-    normalizeWhitespace: boolean;
+    normalizeWhitespace?: boolean;
 
     /***
      * Adds DOM level 1 properties to all elements.
      */
-    withDomLvl1: boolean;
+    withDomLvl1?: boolean;
 
     /***
      * Indicates whether a startIndex property will be added to nodes.
@@ -22,7 +22,7 @@ export interface DomHandlerOptions {
      * indicating the position of the start of the node in the document.
      * The default value is "false".
      */
-    withStartIndices: boolean;
+    withStartIndices?: boolean;
 
     /***
      * Indicates whether a endIndex property will be added to nodes.
@@ -30,7 +30,7 @@ export interface DomHandlerOptions {
      * indicating the position of the end of the node in the document.
      * The default value is "false".
      */
-    withEndIndices: boolean;
+    withEndIndices?: boolean;
 }
 
 export interface DomElement {
@@ -49,14 +49,13 @@ export interface Element extends DomElement {
 }
 
 export interface Node extends DomElement {
-    firstChild(): DomElement;
-    lastChild(): DomElement;
-    nodeType(): number;
+    readonly firstChild: DomElement;
+    readonly lastChild: DomElement;
+    readonly nodeType: number;
 }
 
 export class DomHandler {
-    constructor(callback: (error: any, dom: DomElement[]) => any);
-    constructor(callback: (error: any, dom: DomElement[]) => any, options: DomHandlerOptions);
+    constructor(callback: (error: any, dom: DomElement[]) => any, options?: DomHandlerOptions);
 
     onparserinit(parser: any): void;
 
diff --git a/types/domhandler/tsconfig.json b/types/domhandler/tsconfig.json
index 4cd85394a0..62a39735a8 100644
--- a/types/domhandler/tsconfig.json
+++ b/types/domhandler/tsconfig.json
@@ -2,8 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
-
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From 67835aa01a13cd108bcdd0e7c8dd137394832f55 Mon Sep 17 00:00:00 2001
From: Fabio Berta <fnberta@gmail.com>
Date: Wed, 13 Mar 2019 23:23:25 +0100
Subject: [PATCH 639/924] update for version 6.1 (#33855)

---
 types/viewport-mercator-project/index.d.ts    | 44 ++++++++++---------
 .../viewport-mercator-project-tests.ts        | 17 +++----
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/types/viewport-mercator-project/index.d.ts b/types/viewport-mercator-project/index.d.ts
index 15b9fc373a..c30b183c9e 100644
--- a/types/viewport-mercator-project/index.d.ts
+++ b/types/viewport-mercator-project/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for viewport-mercator-project 5.2
+// Type definitions for viewport-mercator-project 6.1
 // Project: https://github.com/uber-common/viewport-mercator-project#readme
 // Definitions by: Fabio Berta <https://github.com/fnberta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.7
+
+import { mat4 } from 'gl-matrix';
 
 export interface ProjectOptions {
     topLeft?: boolean;
@@ -18,13 +20,11 @@ export type CoordinatesZ = [number, number, number];
 
 export type ViewMatrix = number[];
 
-export type ProjectionMatrix = number[];
-
 export interface ViewportOptions {
     width?: number;
     height?: number;
     viewMatrix?: ViewMatrix;
-    projectionMatrix?: ProjectionMatrix;
+    projectionMatrix?: ViewMatrix;
 }
 
 export class Viewport {
@@ -32,7 +32,7 @@ export class Viewport {
     height: number;
     scale: number;
     viewMatrix: ViewMatrix;
-    projectionMatrix: ProjectionMatrix;
+    projectionMatrix: ViewMatrix;
 
     constructor(opts?: ViewportOptions);
 
@@ -56,12 +56,10 @@ export interface WebMercatorViewportOptions {
     pitch?: number;
     bearing?: number;
     altitude?: number;
+    nearZMultiplier?: number;
     farZMultiplier?: number;
 }
 
-// Type comes from https://github.com/uber-web/math.gl
-export class Vector3 extends Array {}
-
 export class WebMercatorViewport extends Viewport {
     latitude: number;
     longitude: number;
@@ -69,7 +67,7 @@ export class WebMercatorViewport extends Viewport {
     pitch: number;
     bearing: number;
     altitude: number;
-    center: Vector3;
+    center: CoordinatesZ;
 
     constructor(opts?: WebMercatorViewportOptions);
 
@@ -89,35 +87,38 @@ export interface FittedBounds {
 
 export function fitBounds(options: { width: number; height: number; bounds: Bounds; padding?: Padding; offset?: Coordinates }): FittedBounds;
 
-export interface BaseViewportProps {
-    width: number;
-    height: number;
+export interface TransitionViewport {
     longitude: number;
     latitude: number;
     zoom: number;
 }
 
-export interface ViewportProps extends BaseViewportProps {
+export interface FlyToViewportProps extends TransitionViewport {
+    width: number;
+    height: number;
+}
+
+export interface ViewportProps extends FlyToViewportProps {
     pitch?: number;
     bearing?: number;
 }
 
-export interface NormalizedViewportProps extends BaseViewportProps {
+export interface NormalizedViewportProps extends FlyToViewportProps {
     pitch: number;
     bearing: number;
 }
 
 export function normalizeViewportProps(props: ViewportProps): NormalizedViewportProps;
 
-export function flyToViewport(startProps: BaseViewportProps, endProps: BaseViewportProps, t: number): BaseViewportProps;
+export function flyToViewport(startProps: FlyToViewportProps, endProps: FlyToViewportProps, t: number): TransitionViewport;
 
 export function lngLatToWorld(lngLat: Coordinates, scale: number): Coordinates;
 
 export function worldToLngLat(point: Coordinates, scale: number): Coordinates;
 
-export function worldToPixels(coordinates: Coordinates | CoordinatesZ, pixelProjectionMatrix: ProjectionMatrix): CoordinatesZ;
+export function worldToPixels(coordinates: Coordinates | CoordinatesZ, pixelProjectionMatrix: mat4): CoordinatesZ;
 
-export function pixelsToWorld(pixels: Coordinates | CoordinatesZ, pixelUnprojectionMatrix: ProjectionMatrix, targetZ?: number): CoordinatesZ;
+export function pixelsToWorld(pixels: Coordinates | CoordinatesZ, pixelUnprojectionMatrix: mat4, targetZ?: number): CoordinatesZ;
 
 export function getMeterZoom(input: { latitude: number }): number;
 
@@ -147,10 +148,10 @@ export interface BaseHighPrecisionDistanceScalesInput extends BaseDistanceScales
 export type HighPrecisionDistanceScalesInput = BaseHighPrecisionDistanceScalesInput & { zoom: number } | BaseHighPrecisionDistanceScalesInput & { scale: number };
 
 export function getDistanceScales(input: DistanceScalesInput): DistanceScales;
-
 export function getDistanceScales(input: HighPrecisionDistanceScalesInput): HighPrecisionDistanceScales;
 
-export function getWorldPosition(input: { longitude: number; latitude: number; zoom: number; scale: number; meterOffset?: number; distanceScales?: DistanceScales }): Vector3;
+export function addMetersToLngLat(lngLat: Coordinates, xy: Coordinates): Coordinates;
+export function addMetersToLngLat(lngLatZ: CoordinatesZ, xyz: CoordinatesZ): CoordinatesZ;
 
 export function getViewMatrix(input: { height: number; pitch: number; bearing: number; altitude: number; center?: CoordinatesZ; flipY?: boolean }): ViewMatrix;
 
@@ -159,6 +160,7 @@ export interface ProjectionParametersInput {
     height: number;
     pitch?: number;
     altitude?: number;
+    nearZMultiplier?: number;
     farZMultiplier?: number;
 }
 
@@ -172,4 +174,4 @@ export interface ProjectionParameters {
 
 export function getProjectionParameters(input: ProjectionParametersInput): ProjectionParameters;
 
-export function getProjectionMatrix(input: ProjectionParametersInput): ProjectionMatrix;
+export function getProjectionMatrix(input: ProjectionParametersInput): mat4;
diff --git a/types/viewport-mercator-project/viewport-mercator-project-tests.ts b/types/viewport-mercator-project/viewport-mercator-project-tests.ts
index 26fc54d466..abc3f90c89 100644
--- a/types/viewport-mercator-project/viewport-mercator-project-tests.ts
+++ b/types/viewport-mercator-project/viewport-mercator-project-tests.ts
@@ -1,7 +1,7 @@
 import WebMercatorViewport, {
+    addMetersToLngLat,
     DistanceScalesInput,
     getDistanceScales,
-    getWorldPosition,
 } from 'viewport-mercator-project';
 
 const mercator = new WebMercatorViewport();
@@ -21,8 +21,8 @@ const mercatorWithOptions = new WebMercatorViewport({
     latitude: 400,
 });
 
-const xy2 = mercatorWithOptions.projectFlat([10, 100], 20);
-const lngLat2 = mercatorWithOptions.unprojectFlat([10, 100], 20);
+const xyFlat = mercatorWithOptions.projectFlat([10, 100], 20);
+const lngLatFlat = mercatorWithOptions.unprojectFlat([10, 100], 20);
 
 const equal = mercator.equals(mercatorWithOptions);
 
@@ -36,7 +36,7 @@ const fittedMercator = mercatorWithOptions.fitBounds([[10, 20], [30, 40]], {
     offset: [10, 20],
 });
 
-const equal2 = fittedMercator.equals(mercatorWithOptions);
+const equalFitted = fittedMercator.equals(mercatorWithOptions);
 
 const distanceScalesInputZoom = {
     longitude: 1,
@@ -64,11 +64,6 @@ const { pixelsPerMeter2 } = getDistanceScales({
     highPrecision: true,
 });
 
-const worldPos = getWorldPosition({
-    longitude: 1,
-    latitude: 2,
-    zoom: 10,
-    scale: 1,
-});
+const [a, b] = addMetersToLngLat([1, 2], [3, 4]);
 
-const length = worldPos.length;
+const [c, d, e] = addMetersToLngLat([1, 2, 3], [4, 5, 6]);

From 813999bd2b6b2c75dec22b5bba0b52c853af787c Mon Sep 17 00:00:00 2001
From: Johan Davidsson <johan.davidsson@trewit.se>
Date: Thu, 14 Mar 2019 00:53:11 +0100
Subject: [PATCH 640/924] Add type definition for domelementtype (#33854)

* Added new types for domelementtype

* Updating PULL_REQUEST_TEMPLATE.md

* Revert changes to .github/PULL_REQUEST_TEMPLATE.md
---
 types/domelementtype/domelementtype-tests.ts | 12 ++++++
 types/domelementtype/index.d.ts              | 45 ++++++++++++++++++++
 types/domelementtype/tsconfig.json           | 24 +++++++++++
 types/domelementtype/tslint.json             |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 types/domelementtype/domelementtype-tests.ts
 create mode 100644 types/domelementtype/index.d.ts
 create mode 100644 types/domelementtype/tsconfig.json
 create mode 100644 types/domelementtype/tslint.json

diff --git a/types/domelementtype/domelementtype-tests.ts b/types/domelementtype/domelementtype-tests.ts
new file mode 100644
index 0000000000..4559635599
--- /dev/null
+++ b/types/domelementtype/domelementtype-tests.ts
@@ -0,0 +1,12 @@
+import { DomElementType } from "domelementtype";
+
+console.log(DomElementType.Text === 'text');
+console.log(DomElementType.Directive === 'directive');
+console.log(DomElementType.Comment === 'comment');
+console.log(DomElementType.Script === 'script');
+console.log(DomElementType.Style === 'style');
+console.log(DomElementType.Tag === 'tag');
+console.log(DomElementType.CDATA === 'cdata');
+console.log(DomElementType.Doctype === 'doctype');
+console.log(DomElementType.isTag({ type: DomElementType.Tag }));
+console.log(DomElementType.isTag({ type: DomElementType.Doctype }));
diff --git a/types/domelementtype/index.d.ts b/types/domelementtype/index.d.ts
new file mode 100644
index 0000000000..918563c8a2
--- /dev/null
+++ b/types/domelementtype/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for domelementtype 1.3
+// Project: https://github.com/fb55/domelementtype#readme
+// Definitions by: Johan Davidsson <https://github.com/johandavidson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export namespace DomElementType {
+    /***
+     * Text
+     */
+    const Text = "text";
+    /***
+     * <? ... ?>
+     */
+    const Directive = "directive";
+    /***
+     * <!-- ... -->
+     */
+    const Comment = "comment";
+    /***
+     * <script> tags
+     */
+    const Script = "script";
+    /***
+     * <style> tags
+     */
+    const Style = "style";
+    /***
+     * Any tag
+     */
+    const Tag = "tag";
+    /***
+     * <![CDATA[ ... ]]>
+     */
+    const CDATA = "cdata";
+    /***
+     * <!DOCTYPE ... >
+     */
+    const Doctype = "doctype";
+
+    /***
+     * Checks whether element object is a tag
+     */
+    function isTag(elem: { type: string}): boolean;
+}
diff --git a/types/domelementtype/tsconfig.json b/types/domelementtype/tsconfig.json
new file mode 100644
index 0000000000..3d6cf9a643
--- /dev/null
+++ b/types/domelementtype/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",
+        "domelementtype-tests.ts"
+    ]
+}
diff --git a/types/domelementtype/tslint.json b/types/domelementtype/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/domelementtype/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 18be7de7bd4050dbdf8c77f5f0baee5b8347e8dc Mon Sep 17 00:00:00 2001
From: Moshe Kolodny <kolodny@github.com>
Date: Wed, 13 Mar 2019 17:49:37 -0400
Subject: [PATCH 641/924] Add stronger typings to jasmine spys

---
 types/jasmine-ajax/jasmine-ajax-tests.ts |    2 +-
 types/jasmine/package.json               |   11 +
 types/jasmine/ts3.1/index.d.ts           |  857 ++++++++++++++
 types/jasmine/ts3.1/jasmine-tests.ts     | 1358 ++++++++++++++++++++++
 types/jasmine/ts3.1/tsconfig.json        |   22 +
 types/jasmine/ts3.1/tslint.json          |   13 +
 6 files changed, 2262 insertions(+), 1 deletion(-)
 create mode 100644 types/jasmine/package.json
 create mode 100644 types/jasmine/ts3.1/index.d.ts
 create mode 100644 types/jasmine/ts3.1/jasmine-tests.ts
 create mode 100644 types/jasmine/ts3.1/tsconfig.json
 create mode 100644 types/jasmine/ts3.1/tslint.json

diff --git a/types/jasmine-ajax/jasmine-ajax-tests.ts b/types/jasmine-ajax/jasmine-ajax-tests.ts
index cf1db49f28..325a66d14f 100644
--- a/types/jasmine-ajax/jasmine-ajax-tests.ts
+++ b/types/jasmine-ajax/jasmine-ajax-tests.ts
@@ -462,7 +462,7 @@ describe('FakeRequest', () => {
 
 	it('ticks the jasmine clock on timeout', () => {
 		const clock = { tick: jasmine.createSpy('tick') };
-		spyOn(jasmine, 'clock').and.returnValue(clock);
+		spyOn(jasmine, 'clock').and.returnValue(clock as any);
 
 		const request = new this.FakeRequest();
 		request.open();
diff --git a/types/jasmine/package.json b/types/jasmine/package.json
new file mode 100644
index 0000000000..f2591ceb88
--- /dev/null
+++ b/types/jasmine/package.json
@@ -0,0 +1,11 @@
+{
+    "private": true,
+    "types": "index",
+    "typesVersions": {
+        ">=3.1.0-0": {
+            "*": [
+                "ts3.1/*"
+            ]
+        }
+    }
+}
diff --git a/types/jasmine/ts3.1/index.d.ts b/types/jasmine/ts3.1/index.d.ts
new file mode 100644
index 0000000000..c5c39b342c
--- /dev/null
+++ b/types/jasmine/ts3.1/index.d.ts
@@ -0,0 +1,857 @@
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+//                 Theodore Brown <https://github.com/theodorejb>
+//                 David Pärsson <https://github.com/davidparsson>
+//                 Gabe Moothart <https://github.com/gmoothart>
+//                 Lukas Zech <https://github.com/lukas-zech-software>
+//                 Boris Breuer <https://github.com/Engineer2B>
+//                 Chris Yungmann <https://github.com/cyungmann>
+//                 Giles Roadnight <https://github.com/Roaders>
+//                 Yaroslav Admin <https://github.com/devoto13>
+//                 Domas Trijonis <https://github.com/fdim>
+//                 Peter Safranek <https://github.com/pe8ter>
+//                 Moshe Kolodny <https://github.com/kolodny>
+// For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
+
+type ImplementationCallback = (() => Promise<any>) | ((done: DoneFn) => void);
+type InferableFunction = (...args: any[]) => any;
+
+/**
+ * Create a group of specs (often called a suite).
+ * @param description Textual description of the group
+ * @param specDefinitions Function for Jasmine to invoke that will define inner suites a specs
+ */
+declare function describe(description: string, specDefinitions: () => void): void;
+
+/**
+ * A focused `describe`. If suites or specs are focused, only those that are focused will be executed.
+ * @param description Textual description of the group
+ * @param specDefinitions Function for Jasmine to invoke that will define inner suites a specs
+ */
+declare function fdescribe(description: string, specDefinitions: () => void): void;
+
+/**
+ * A temporarily disabled `describe`. Specs within an xdescribe will be marked pending and not executed.
+ * @param description Textual description of the group
+ * @param specDefinitions Function for Jasmine to invoke that will define inner suites a specs
+ */
+declare function xdescribe(description: string, specDefinitions: () => void): void;
+
+/**
+ * Define a single spec. A spec should contain one or more expectations that test the state of the code.
+ * A spec whose expectations all succeed will be passing and a spec with any failures will fail.
+ * @param expectation Textual description of what this spec is checking
+ * @param assertion Function that contains the code of your test. If not provided the test will be pending.
+ * @param timeout Custom timeout for an async spec.
+ */
+declare function it(expectation: string, assertion?: ImplementationCallback, timeout?: number): void;
+
+/**
+ * A focused `it`. If suites or specs are focused, only those that are focused will be executed.
+ * @param expectation Textual description of what this spec is checking
+ * @param assertion Function that contains the code of your test. If not provided the test will be pending.
+ * @param timeout Custom timeout for an async spec.
+ */
+declare function fit(expectation: string, assertion?: ImplementationCallback, timeout?: number): void;
+
+/**
+ * A temporarily disabled `it`. The spec will report as pending and will not be executed.
+ * @param expectation Textual description of what this spec is checking
+ * @param assertion Function that contains the code of your test. If not provided the test will be pending.
+ * @param timeout Custom timeout for an async spec.
+ */
+declare function xit(expectation: string, assertion?: ImplementationCallback, timeout?: number): void;
+
+/**
+ * Mark a spec as pending, expectation results will be ignored.
+ * If you call the function pending anywhere in the spec body, no matter the expectations, the spec will be marked pending.
+ * @param reason Reason the spec is pending.
+ */
+declare function pending(reason?: string): void;
+
+/**
+ * Run some shared setup before each of the specs in the describe in which it is called.
+ * @param action Function that contains the code to setup your specs.
+ * @param timeout Custom timeout for an async beforeEach.
+ */
+declare function beforeEach(action: ImplementationCallback, timeout?: number): void;
+
+/**
+ * Run some shared teardown after each of the specs in the describe in which it is called.
+ * @param action Function that contains the code to teardown your specs.
+ * @param timeout Custom timeout for an async afterEach.
+ */
+declare function afterEach(action: ImplementationCallback, timeout?: number): void;
+
+/**
+ * Run some shared setup once before all of the specs in the describe are run.
+ * Note: Be careful, sharing the setup from a beforeAll makes it easy to accidentally leak state between your specs so that they erroneously pass or fail.
+ * @param action Function that contains the code to setup your specs.
+ * @param timeout Custom timeout for an async beforeAll.
+ */
+declare function beforeAll(action: ImplementationCallback, timeout?: number): void;
+
+/**
+ * Run some shared teardown once before all of the specs in the describe are run.
+ * Note: Be careful, sharing the teardown from a afterAll makes it easy to accidentally leak state between your specs so that they erroneously pass or fail.
+ * @param action Function that contains the code to teardown your specs.
+ * @param timeout Custom timeout for an async afterAll
+ */
+declare function afterAll(action: ImplementationCallback, timeout?: number): void;
+
+/**
+ * Create an expectation for a spec.
+ * @checkReturnValue see https://tsetse.info/check-return-value
+ * @param spy
+ */
+declare function expect(spy: Function): jasmine.Matchers<any>;
+
+/**
+ * Create an expectation for a spec.
+ * @checkReturnValue see https://tsetse.info/check-return-value
+ * @param actual
+ */
+declare function expect<T>(actual: ArrayLike<T>): jasmine.ArrayLikeMatchers<T>;
+
+/**
+ * Create an expectation for a spec.
+ * @checkReturnValue see https://tsetse.info/check-return-value
+ * @param actual Actual computed value to test expectations against.
+ */
+declare function expect<T>(actual: T): jasmine.Matchers<T>;
+
+/**
+ * Create an expectation for a spec.
+ */
+declare function expect(): jasmine.NothingMatcher;
+
+/**
+ * Create an asynchronous expectation for a spec. Note that the matchers
+ * that are provided by an asynchronous expectation all return promises
+ * which must be either returned from the spec or waited for using `await`
+ * in order for Jasmine to associate them with the correct spec.
+ * @checkReturnValue see https://tsetse.info/check-return-value
+ * @param actual - Actual computed value to test expectations against.
+ */
+declare function expectAsync<T, U>(actual: Promise<T>): jasmine.AsyncMatchers<T, U>;
+
+/**
+ * Explicitly mark a spec as failed.
+ * @param e Reason for the failure
+ */
+declare function fail(e?: any): void;
+
+/**
+ * Action method that should be called when the async work is complete.
+ */
+interface DoneFn extends Function {
+    (): void;
+
+    /** fails the spec and indicates that it has completed. If the message is an Error, Error.message is used */
+    fail: (message?: Error | string) => void;
+}
+
+type Methods<T> = {
+    [K in {
+        [K in keyof T]: T[K] extends Function ? K : never
+    }[keyof T]]: T[K]
+};
+
+/**
+ * Install a spy onto an existing object.
+ * @param object The object upon which to install the `Spy`.
+ * @param method The name of the method to replace with a `Spy`.
+ */
+declare function spyOn<T, K extends keyof T = keyof T>(
+    object: T, method: T[K] extends InferableFunction ? K : never,
+): jasmine.Spy<T[K] extends InferableFunction ? T[K] : never>;
+
+/**
+ * Install a spy on a property installed with `Object.defineProperty` onto an existing object.
+ * @param object The object upon which to install the `Spy`.
+ * @param property The name of the property to replace with a `Spy`.
+ * @param accessType The access type (get|set) of the property to `Spy` on.
+ */
+declare function spyOnProperty<T>(object: T, property: keyof T, accessType?: 'get' | 'set'): jasmine.Spy;
+
+/**
+ * Installs spies on all writable and configurable properties of an object.
+ * @param object The object upon which to install the `Spy`s.
+ */
+declare function spyOnAllFunctions(object: object): jasmine.Spy;
+
+declare function runs(asyncMethod: Function): void;
+declare function waitsFor(latchMethod: () => boolean, failureMessage?: string, timeout?: number): void;
+declare function waits(timeout?: number): void;
+
+declare namespace jasmine {
+    type Expected<T> = T | ObjectContaining<T> | Any | Spy;
+    type SpyObjMethodNames<T = undefined> =
+        T extends undefined ?
+            (ReadonlyArray<string> | {[methodName: string]: any}) :
+            (ReadonlyArray<keyof T> | {[P in keyof T]?: ReturnType<T[P] extends InferableFunction ? T[P] : any>});
+
+    function clock(): Clock;
+
+    var matchersUtil: MatchersUtil;
+
+    function any(aclass: any): Any;
+
+    function anything(): Any;
+
+    function arrayContaining<T>(sample: ArrayLike<T>): ArrayContaining<T>;
+    function arrayWithExactContents<T>(sample: ArrayLike<T>): ArrayContaining<T>;
+    function objectContaining<T>(sample: Partial<T>): ObjectContaining<T>;
+    function createSpy<Fun extends InferableFunction>(name?: string, originalFn?: Fun): Spy<Fun>;
+
+    function createSpyObj(baseName: string, methodNames: SpyObjMethodNames): any;
+    function createSpyObj<T>(baseName: string, methodNames: SpyObjMethodNames<T>): SpyObj<T>;
+
+    function createSpyObj(methodNames: SpyObjMethodNames): any;
+    function createSpyObj<T>(methodNames: SpyObjMethodNames): SpyObj<T>;
+
+    function pp(value: any): string;
+
+    function getEnv(): Env;
+
+    function addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+
+    function addMatchers(matchers: CustomMatcherFactories): void;
+
+    function stringMatching(str: string | RegExp): Any;
+
+    function formatErrorMsg(domain: string, usage: string): (msg: string) => string;
+
+    interface Any {
+        (...params: any[]): any; // jasmine.Any can also be a function
+        new (expectedClass: any): any;
+
+        jasmineMatches(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    // taken from TypeScript lib.core.es6.d.ts, applicable to CustomMatchers.contains()
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+
+    interface ArrayContaining<T> {
+        new (sample: ArrayLike<T>): ArrayLike<T>;
+
+        asymmetricMatch(other: any): boolean;
+        jasmineToString(): string;
+    }
+
+    interface ObjectContaining<T> {
+        new (sample: Partial<T>): Partial<T>;
+
+        jasmineMatches(other: any, mismatchKeys: any[], mismatchValues: any[]): boolean;
+        jasmineToString(): string;
+    }
+
+    interface Block {
+        new (env: Env, func: SpecFunction, spec: Spec): any;
+
+        execute(onComplete: () => void): void;
+    }
+
+    interface WaitsBlock extends Block {
+        new (env: Env, timeout: number, spec: Spec): any;
+    }
+
+    interface WaitsForBlock extends Block {
+        new (env: Env, timeout: number, latchFunction: SpecFunction, message: string, spec: Spec): any;
+    }
+
+    interface Clock {
+        install(): void;
+        uninstall(): void;
+        /** Calls to any registered callback are triggered when the clock is ticked forward via the jasmine.clock().tick function, which takes a number of milliseconds. */
+        tick(ms: number): void;
+        mockDate(date?: Date): void;
+        withMock(func: () => void): void;
+    }
+
+    type CustomEqualityTester = (first: any, second: any) => boolean | void;
+
+    interface CustomMatcher {
+        compare<T>(actual: T, expected: T, ...args: any[]): CustomMatcherResult;
+        compare(actual: any, ...expected: any[]): CustomMatcherResult;
+        negativeCompare?<T>(actual: T, expected: T, ...args: any[]): CustomMatcherResult;
+        negativeCompare?(actual: any, ...expected: any[]): CustomMatcherResult;
+    }
+
+    type CustomMatcherFactory = (util: MatchersUtil, customEqualityTesters: CustomEqualityTester[]) => CustomMatcher;
+
+    interface CustomMatcherFactories {
+        [index: string]: CustomMatcherFactory;
+    }
+
+    interface CustomMatcherResult {
+        pass: boolean;
+        message?: string;
+    }
+
+    interface MatchersUtil {
+        equals(a: any, b: any, customTesters?: CustomEqualityTester[]): boolean;
+        contains<T>(haystack: ArrayLike<T> | string, needle: any, customTesters?: CustomEqualityTester[]): boolean;
+        buildFailureMessage(matcherName: string, isNot: boolean, actual: any, ...expected: any[]): string;
+    }
+
+    interface Env {
+        currentSpec: Spec;
+
+        matchersClass: Matchers<any>;
+
+        version(): any;
+        versionString(): string;
+        nextSpecId(): number;
+        addReporter(reporter: Reporter | CustomReporter): void;
+        execute(): void;
+        describe(description: string, specDefinitions: () => void): Suite;
+        // ddescribe(description: string, specDefinitions: () => void): Suite; Not a part of jasmine. Angular team adds these
+        beforeEach(beforeEachFunction: ImplementationCallback, timeout?: number): void;
+        beforeAll(beforeAllFunction: ImplementationCallback, timeout?: number): void;
+        currentRunner(): Runner;
+        afterEach(afterEachFunction: ImplementationCallback, timeout?: number): void;
+        afterAll(afterAllFunction: ImplementationCallback, timeout?: number): void;
+        xdescribe(desc: string, specDefinitions: () => void): XSuite;
+        it(description: string, func: () => void): Spec;
+        // iit(description: string, func: () => void): Spec; Not a part of jasmine. Angular team adds these
+        xit(desc: string, func: () => void): XSpec;
+        compareRegExps_(a: RegExp, b: RegExp, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        compareObjects_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        equals_(a: any, b: any, mismatchKeys: string[], mismatchValues: string[]): boolean;
+        contains_(haystack: any, needle: any): boolean;
+        addCustomEqualityTester(equalityTester: CustomEqualityTester): void;
+        addMatchers(matchers: CustomMatcherFactories): void;
+        specFilter(spec: Spec): boolean;
+        throwOnExpectationFailure(value: boolean): void;
+        seed(seed: string | number): string | number;
+        provideFallbackReporter(reporter: Reporter): void;
+        throwingExpectationFailures(): boolean;
+        allowRespy(allow: boolean): void;
+        randomTests(): boolean;
+        randomizeTests(b: boolean): void;
+        clearReporters(): void;
+    }
+
+    interface FakeTimer {
+        new (): any;
+
+        reset(): void;
+        tick(millis: number): void;
+        runFunctionsWithinRange(oldMillis: number, nowMillis: number): void;
+        scheduleFunction(timeoutKey: any, funcToCall: () => void, millis: number, recurring: boolean): void;
+    }
+
+    interface HtmlReporter {
+        new (): any;
+    }
+
+    interface HtmlSpecFilter {
+        new (): any;
+    }
+
+    interface Result {
+        type: string;
+    }
+
+    interface NestedResults extends Result {
+        description: string;
+
+        totalCount: number;
+        passedCount: number;
+        failedCount: number;
+
+        skipped: boolean;
+
+        rollupCounts(result: NestedResults): void;
+        log(values: any): void;
+        getItems(): Result[];
+        addResult(result: Result): void;
+        passed(): boolean;
+    }
+
+    interface MessageResult extends Result {
+        values: any;
+        trace: Trace;
+    }
+
+    interface ExpectationResult extends Result {
+        matcherName: string;
+        passed(): boolean;
+        expected: any;
+        actual: any;
+        message: string;
+        trace: Trace;
+    }
+
+    interface Order {
+        new (options: { random: boolean, seed: string }): any;
+        random: boolean;
+        seed: string;
+        sort<T>(items: T[]): T[];
+    }
+
+    namespace errors {
+        class ExpectationFailed extends Error {
+            constructor();
+
+            stack: any;
+        }
+    }
+
+    interface TreeProcessor {
+        new (attrs: any): any;
+        execute: (done: Function) => void;
+        processTree(): any;
+    }
+
+    interface Trace {
+        name: string;
+        message: string;
+        stack: any;
+    }
+
+    interface PrettyPrinter {
+        new (): any;
+
+        format(value: any): void;
+        iterateObject(obj: any, fn: (property: string, isGetter: boolean) => void): void;
+        emitScalar(value: any): void;
+        emitString(value: string): void;
+        emitArray(array: any[]): void;
+        emitObject(obj: any): void;
+        append(value: any): void;
+    }
+
+    interface StringPrettyPrinter extends PrettyPrinter {
+    }
+
+    interface Queue {
+        new (env: any): any;
+
+        env: Env;
+        ensured: boolean[];
+        blocks: Block[];
+        running: boolean;
+        index: number;
+        offset: number;
+        abort: boolean;
+
+        addBefore(block: Block, ensure?: boolean): void;
+        add(block: any, ensure?: boolean): void;
+        insertNext(block: any, ensure?: boolean): void;
+        start(onComplete?: () => void): void;
+        isRunning(): boolean;
+        next_(): void;
+        results(): NestedResults;
+    }
+
+    interface Matchers<T> {
+        new (env: Env, actual: T, spec: Env, isNot?: boolean): any;
+
+        env: Env;
+        actual: T;
+        spec: Env;
+        isNot?: boolean;
+        message(): any;
+
+        /**
+         *
+         * @param expected the actual value to be === to the expected value.
+         * @param expectationFailOutput
+         */
+        toBe(expected: Expected<T>, expectationFailOutput?: any): boolean;
+
+        /**
+         *
+         * @param expected the actual value to be equal to the expected, using deep equality comparison.
+         * @param expectationFailOutput
+         */
+        toEqual(expected: Expected<T>, expectationFailOutput?: any): boolean;
+        toMatch(expected: string | RegExp, expectationFailOutput?: any): boolean;
+        toBeDefined(expectationFailOutput?: any): boolean;
+        toBeUndefined(expectationFailOutput?: any): boolean;
+        toBeNull(expectationFailOutput?: any): boolean;
+        toBeNaN(): boolean;
+        toBeTruthy(expectationFailOutput?: any): boolean;
+        toBeFalsy(expectationFailOutput?: any): boolean;
+        toHaveBeenCalled(): boolean;
+        toHaveBeenCalledBefore(expected: Spy): boolean;
+        toHaveBeenCalledWith(...params: any[]): boolean;
+        toHaveBeenCalledTimes(expected: number): boolean;
+        toContain(expected: any, expectationFailOutput?: any): boolean;
+        toBeLessThan(expected: number, expectationFailOutput?: any): boolean;
+        toBeLessThanOrEqual(expected: number, expectationFailOutput?: any): boolean;
+        toBeGreaterThan(expected: number, expectationFailOutput?: any): boolean;
+        toBeGreaterThanOrEqual(expected: number, expectationFailOutput?: any): boolean;
+        toBeCloseTo(expected: number, precision?: any, expectationFailOutput?: any): boolean;
+        toThrow(expected?: any): boolean;
+        toThrowError(message?: string | RegExp): boolean;
+        toThrowError(expected?: new (...args: any[]) => Error, message?: string | RegExp): boolean;
+        toThrowMatching(predicate: (thrown: any) => boolean): boolean;
+        toBeNegativeInfinity(expectationFailOutput?: any): boolean;
+        toBePositiveInfinity(expectationFailOutput?: any): boolean;
+        toHaveClass(expected: any, expectationFailOutput?: any): boolean;
+
+        /**
+         * Add some context for an expect.
+         * @param message - Additional context to show when the matcher fails
+         */
+        withContext(message: string): Matchers<T>;
+
+        not: Matchers<T>;
+
+        Any: Any;
+    }
+
+    interface ArrayLikeMatchers<T> extends Matchers<ArrayLike<T>> {
+        toBe(expected: Expected<ArrayLike<T>> | ArrayContaining<T>, expectationFailOutput?: any): boolean;
+        toEqual(expected: Expected<ArrayLike<T>> | ArrayContaining<T>, expectationFailOutput?: any): boolean;
+        toContain(expected: Expected<T>, expectationFailOutput?: any): boolean;
+        not: ArrayLikeMatchers<T>;
+    }
+
+    interface NothingMatcher {
+        nothing(): void;
+    }
+
+    interface AsyncMatchers<T, U> {
+        /**
+         * Expect a promise to be resolved.
+         * @param expectationFailOutput
+         */
+        toBeResolved(expectationFailOutput?: any): Promise<void>;
+
+        /**
+         * Expect a promise to be rejected.
+         * @param expectationFailOutput
+         */
+        toBeRejected(expectationFailOutput?: any): Promise<void>;
+
+        /**
+         * Expect a promise to be resolved to a value equal to the expected, using deep equality comparison.
+         * @param expected - Value that the promise is expected to resolve to.
+         */
+        toBeResolvedTo(expected: Expected<T>): Promise<void>;
+
+        /**
+         * Expect a promise to be rejected with a value equal to the expected, using deep equality comparison.
+         * @param expected - Value that the promise is expected to be rejected with.
+         */
+        toBeRejectedWith(expected: Expected<U>): Promise<void>;
+
+        /**
+         * Add some context for an expect.
+         * @param message - Additional context to show when the matcher fails.
+         */
+        withContext(message: string): AsyncMatchers<T, U>;
+
+        /**
+         * Invert the matcher following this expect.
+         */
+        not: AsyncMatchers<T, U>;
+    }
+
+    interface Reporter {
+        reportRunnerStarting(runner: Runner): void;
+        reportRunnerResults(runner: Runner): void;
+        reportSuiteResults(suite: Suite): void;
+        reportSpecStarting(spec: Spec): void;
+        reportSpecResults(spec: Spec): void;
+        log(str: string): void;
+    }
+
+    interface MultiReporter extends Reporter {
+        addReporter(reporter: Reporter): void;
+    }
+
+    interface SuiteInfo {
+        totalSpecsDefined: number;
+    }
+
+    interface CustomReportExpectation {
+        matcherName: string;
+        message: string;
+        passed: boolean;
+        stack: string;
+    }
+
+    interface FailedExpectation extends CustomReportExpectation {
+        actual: string;
+        expected: string;
+    }
+
+    interface PassedExpectation extends CustomReportExpectation {
+    }
+
+    interface CustomReporterResult {
+        description: string;
+        failedExpectations?: FailedExpectation[];
+        fullName: string;
+        id: string;
+        passedExpectations?: PassedExpectation[];
+        pendingReason?: string;
+        status?: string;
+    }
+
+    interface RunDetails {
+        failedExpectations: ExpectationResult[];
+        order: Order;
+    }
+
+    interface CustomReporter {
+        jasmineStarted?(suiteInfo: SuiteInfo): void;
+        suiteStarted?(result: CustomReporterResult): void;
+        specStarted?(result: CustomReporterResult): void;
+        specDone?(result: CustomReporterResult): void;
+        suiteDone?(result: CustomReporterResult): void;
+        jasmineDone?(runDetails: RunDetails): void;
+    }
+
+    interface Runner {
+        new (env: Env): any;
+
+        execute(): void;
+        beforeEach(beforeEachFunction: SpecFunction): void;
+        afterEach(afterEachFunction: SpecFunction): void;
+        beforeAll(beforeAllFunction: SpecFunction): void;
+        afterAll(afterAllFunction: SpecFunction): void;
+        finishCallback(): void;
+        addSuite(suite: Suite): void;
+        add(block: Block): void;
+        specs(): Spec[];
+        suites(): Suite[];
+        topLevelSuites(): Suite[];
+        results(): NestedResults;
+    }
+
+    type SpecFunction = (spec?: Spec) => void;
+
+    interface SuiteOrSpec {
+        id: number;
+        env: Env;
+        description: string;
+        queue: Queue;
+    }
+
+    interface Spec extends SuiteOrSpec {
+        new (env: Env, suite: Suite, description: string): any;
+
+        suite: Suite;
+
+        afterCallbacks: SpecFunction[];
+        spies_: Spy[];
+
+        results_: NestedResults;
+        matchersClass: Matchers<any>;
+
+        getFullName(): string;
+        results(): NestedResults;
+        log(arguments: any): any;
+        runs(func: SpecFunction): Spec;
+        addToQueue(block: Block): void;
+        addMatcherResult(result: Result): void;
+        getResult(): any;
+        expect(actual: any): any;
+        waits(timeout: number): Spec;
+        waitsFor(latchFunction: SpecFunction, timeoutMessage?: string, timeout?: number): Spec;
+        fail(e?: any): void;
+        getMatchersClass_(): Matchers<any>;
+        addMatchers(matchersPrototype: CustomMatcherFactories): void;
+        finishCallback(): void;
+        finish(onComplete?: () => void): void;
+        after(doAfter: SpecFunction): void;
+        execute(onComplete?: () => void, enabled?: boolean): any;
+        addBeforesAndAftersToQueue(): void;
+        explodes(): void;
+        spyOn(obj: any, methodName: string, ignoreMethodDoesntExist: boolean): Spy;
+        spyOnProperty(object: any, property: string, accessType?: 'get' | 'set'): Spy;
+        spyOnAllFunctions(object: any): Spy;
+
+        removeAllSpies(): void;
+        throwOnExpectationFailure: boolean;
+    }
+
+    interface XSpec {
+        id: number;
+        runs(): void;
+    }
+
+    interface Suite extends SuiteOrSpec {
+        new (env: Env, description: string, specDefinitions: () => void, parentSuite: Suite): any;
+
+        parentSuite: Suite;
+
+        getFullName(): string;
+        finish(onComplete?: () => void): void;
+        beforeEach(beforeEachFunction: SpecFunction): void;
+        afterEach(afterEachFunction: SpecFunction): void;
+        beforeAll(beforeAllFunction: SpecFunction): void;
+        afterAll(afterAllFunction: SpecFunction): void;
+        results(): NestedResults;
+        add(suiteOrSpec: SuiteOrSpec): void;
+        specs(): Spec[];
+        suites(): Suite[];
+        children(): any[];
+        execute(onComplete?: () => void): void;
+    }
+
+    interface XSuite {
+        execute(): void;
+    }
+
+    interface Spy<Fn extends InferableFunction = InferableFunction> {
+        (...params: any[]): any;
+
+        and: SpyAnd<Fn>;
+        calls: Calls<Fn>;
+        withArgs(...args: any[]): Spy<Fn>;
+    }
+
+    type SpyObj<T> = T & {
+        [k in keyof T]: T[k] extends InferableFunction ? T[k] & Spy<T[k]> : T[k];
+    };
+
+    interface SpyAnd<Fun extends InferableFunction> {
+        identity: string;
+
+        /** By chaining the spy with and.callThrough, the spy will still track all calls to it but in addition it will delegate to the actual implementation. */
+        callThrough(): Spy<Fun>;
+        /** By chaining the spy with and.returnValue, all calls to the function will return a specific value. */
+        returnValue(val: ReturnType<Fun>): Spy<Fun>;
+        /** By chaining the spy with and.returnValues, all calls to the function will return specific values in order until it reaches the end of the return values list. */
+        returnValues(...values: Array<ReturnType<Fun>>): Spy<Fun>;
+        /** By chaining the spy with and.callFake, all calls to the spy will delegate to the supplied function. */
+        callFake(fn: Fun): Spy<Fun>;
+        /** By chaining the spy with and.throwError, all calls to the spy will throw the specified value. */
+        throwError(msg: string): Spy;
+        /** When a calling strategy is used for a spy, the original stubbing behavior can be returned at any time with and.stub. */
+        stub(): Spy;
+    }
+
+    interface Calls<Fun extends InferableFunction> {
+        /** By chaining the spy with calls.any(), will return false if the spy has not been called at all, and then true once at least one call happens. */
+        any(): boolean;
+        /** By chaining the spy with calls.count(), will return the number of times the spy was called */
+        count(): number;
+        /** By chaining the spy with calls.argsFor(), will return the arguments passed to call number index */
+        argsFor(index: number): Parameters<Fun>;
+        /** By chaining the spy with calls.allArgs(), will return the arguments to all calls */
+        allArgs(): Array<Parameters<Fun>>;
+        /** By chaining the spy with calls.all(), will return the context (the this) and arguments passed all calls */
+        all(): Array<CallInfo<Fun>>;
+        /** By chaining the spy with calls.mostRecent(), will return the context (the this) and arguments for the most recent call */
+        mostRecent(): CallInfo<Fun>;
+        /** By chaining the spy with calls.first(), will return the context (the this) and arguments for the first call */
+        first(): CallInfo<Fun>;
+        /** By chaining the spy with calls.reset(), will clears all tracking for a spy */
+        reset(): void;
+    }
+
+    interface CallInfo<Fun extends InferableFunction> {
+        /** The context (the this) for the call */
+        object: any;
+        /** All arguments passed to the call */
+        args: Parameters<Fun>;
+        /** The return value of the call */
+        returnValue: ReturnType<Fun>;
+    }
+
+    interface Util {
+        inherit(childClass: Function, parentClass: Function): any;
+        formatException(e: any): any;
+        htmlEscape(str: string): string;
+        argsToArray(args: any): any;
+        extend(destination: any, source: any): any;
+    }
+
+    interface JsApiReporter extends Reporter {
+        started: boolean;
+        finished: boolean;
+        result: any;
+        messages: any;
+        runDetails: RunDetails;
+
+        new (): any;
+
+        suites(): Suite[];
+        summarize_(suiteOrSpec: SuiteOrSpec): any;
+        results(): any;
+        resultsForSpec(specId: any): any;
+        log(str: any): any;
+        resultsForSpecs(specIds: any): any;
+        summarizeResult_(result: any): any;
+    }
+
+    interface Jasmine {
+        Spec: Spec;
+        clock: Clock;
+        util: Util;
+    }
+
+    var HtmlReporter: HtmlReporter;
+    var HtmlSpecFilter: HtmlSpecFilter;
+
+    /**
+     * Default number of milliseconds Jasmine will wait for an asynchronous spec to complete.
+     */
+    var DEFAULT_TIMEOUT_INTERVAL: number;
+
+    /**
+     * Maximum number of array elements to display when pretty printing objects.
+     * This will also limit the number of keys and values displayed for an object.
+     * Elements past this number will be ellipised.
+     */
+    var MAX_PRETTY_PRINT_ARRAY_LENGTH: number;
+
+    /**
+     * Maximum number of charasters to display when pretty printing objects.
+     * Characters past this number will be ellipised.
+     */
+    var MAX_PRETTY_PRINT_CHARS: number;
+
+    /**
+     * Maximum object depth the pretty printer will print to.
+     * Set this to a lower value to speed up pretty printing if you have large objects.
+     */
+    var MAX_PRETTY_PRINT_DEPTH: number;
+}
+
+declare module "jasmine" {
+    class jasmine {
+        constructor(options: any);
+        jasmine: jasmine.Jasmine;
+        addMatchers(matchers: jasmine.CustomMatcherFactories): void;
+        addReporter(reporter: jasmine.Reporter): void;
+        addSpecFile(filePath: string): void;
+        addSpecFiles(files: string[]): void;
+        configureDefaultReporter(options: any, ...args: any[]): void;
+        execute(files?: string[], filterString?: string): any;
+        exitCodeCompletion(passed: any): void;
+        loadConfig(config: any): void;
+        loadConfigFile(configFilePath: any): void;
+        loadHelpers(): void;
+        loadSpecs(): void;
+        onComplete(onCompleteCallback: (passed: boolean) => void): void;
+        provideFallbackReporter(reporter: jasmine.Reporter): void;
+        randomizeTests(value?: any): boolean;
+        seed(value: any): void;
+        showColors(value: any): void;
+        stopSpecOnExpectationFailure(value: any): void;
+        static ConsoleReporter(): any;
+        env: jasmine.Env;
+        reportersCount: number;
+        completionReporter: jasmine.CustomReporter;
+        reporter: jasmine.CustomReporter;
+        coreVersion(): string;
+        showingColors: boolean;
+        projectBaseDir: string;
+        printDeprecation(): void;
+        specFiles: string[];
+        helperFiles: string[];
+    }
+    export = jasmine;
+}
diff --git a/types/jasmine/ts3.1/jasmine-tests.ts b/types/jasmine/ts3.1/jasmine-tests.ts
new file mode 100644
index 0000000000..92c2a87494
--- /dev/null
+++ b/types/jasmine/ts3.1/jasmine-tests.ts
@@ -0,0 +1,1358 @@
+// tests based on http://jasmine.github.io/2.2/introduction.html
+
+describe("A suite", () => {
+    it("contains spec with an expectation", () => {
+        expect(true).toBe(true);
+    });
+});
+
+describe("A suite is just a function", () => {
+    var a: boolean;
+
+    it("and so is a spec", () => {
+        a = true;
+        expect(a).toBe(true);
+    });
+});
+
+describe("The 'toBe' matcher compares with ===", () => {
+    it("and has a positive case", () => {
+        expect(true).toBe(true);
+    });
+
+    it("and can have a negative case", () => {
+        expect(false).not.toBe(true);
+    });
+});
+
+describe("Included matchers:", () => {
+    it("The 'toBe' matcher compares with ===", () => {
+        const a = 12;
+        const b = a;
+
+        expect(a).toBe(b);
+        expect(a).not.toBe(24);
+    });
+
+    describe("The 'toEqual' matcher", () => {
+        it("works for simple literals and variables", () => {
+            const a = 12;
+            expect(a).toEqual(12);
+        });
+
+        it("should work for objects", () => {
+            const foo = {
+                a: 12,
+                b: 34
+            };
+            const bar = {
+                a: 12,
+                b: 34
+            };
+            expect(foo).toEqual(bar);
+        });
+
+        it("should work for optional values", () => {
+            const opt: string | undefined = Math.random() > .5  ? "s" : undefined;
+            expect(opt).toEqual(undefined);
+        });
+    });
+
+    it("The 'toMatch' matcher is for regular expressions", () => {
+        const message = "foo bar baz";
+
+        expect(message).toMatch(/bar/);
+        expect(message).toMatch("bar");
+        expect(message).not.toMatch(/quux/);
+    });
+
+    it("The 'toBeDefined' matcher compares against `undefined`", () => {
+        const a = {
+            foo: "foo"
+        };
+
+        expect(a.foo).toBeDefined();
+        expect((a as any).bar).not.toBeDefined();
+    });
+
+    it("The `toBeUndefined` matcher compares against `undefined`", () => {
+        const a = {
+            foo: "foo"
+        };
+
+        expect(a.foo).not.toBeUndefined();
+        expect((a as any).bar).toBeUndefined();
+    });
+
+    it("The 'toBeNull' matcher compares against null", () => {
+        const a: string | null = Math.random() > 0.5 ? "s" : null;
+        const foo = "foo";
+
+        expect(null).toBeNull();
+        expect(a).toBeNull();
+        expect(foo).not.toBeNull();
+    });
+
+    it("The 'toBeTruthy' matcher is for boolean casting testing", () => {
+        const a: string | undefined = Math.random() > 0.5 ? "s" : undefined;
+        const foo = "foo";
+
+        expect(foo).toBeTruthy();
+        expect(a).not.toBeTruthy();
+    });
+
+    it("The 'toBeFalsy' matcher is for boolean casting testing", () => {
+        const a: string | undefined = Math.random() > 0.5 ? "s" : undefined;
+        const foo = "foo";
+
+        expect(a).toBeFalsy();
+        expect(foo).not.toBeFalsy();
+    });
+
+    it("The 'toContain' matcher is for finding an item in an Array", () => {
+        const a = ["foo", "bar", "baz"];
+
+        expect(a).toContain('foo');
+        expect(a).not.toContain("quux");
+    });
+
+    it("The 'toContain' matcher is also for finding an object containing distinct properties in an Array", () => {
+        const a = [{ a: "foo" }, { a: "bar" }, { b: "baz" }];
+
+        expect(a).toContain(jasmine.objectContaining({ a: "foo" }));
+        expect(a).not.toContain({ a: "quux" });
+    });
+
+    it("The 'toBeLessThan' matcher is for mathematical comparisons", () => {
+        const pi = 3.1415926;
+        const e = 2.78;
+
+        expect(e).toBeLessThan(pi);
+        expect(pi).not.toBeLessThan(e);
+    });
+
+    it("The 'toBeGreaterThan' is for mathematical comparisons", () => {
+        const pi = 3.1415926;
+        const e = 2.78;
+
+        expect(pi).toBeGreaterThan(e);
+        expect(e).not.toBeGreaterThan(pi);
+    });
+
+    it("The 'toBeCloseTo' matcher is for precision math comparison", () => {
+        const pi = 3.1415926;
+        const e = 2.78;
+
+        expect(pi).not.toBeCloseTo(e, 2);
+        expect(pi).toBeCloseTo(e, 0);
+    });
+
+    it("The 'toThrow' matcher is for testing if a function throws an exception", () => {
+        const foo = () => {
+            return 1 + 2;
+        };
+        const bar = () => {
+            throw new Error("message");
+        };
+
+        expect(foo).not.toThrow();
+        expect(foo).toThrow();
+
+        expect(bar).not.toThrow();
+        expect(bar).toThrow();
+    });
+
+    it("The 'toThrowError' matcher is for testing a specific thrown exception", () => {
+        const foo = () => {
+            throw new TypeError("foo bar baz");
+        };
+
+        expect(foo).toThrowError("foo bar baz");
+        expect(foo).toThrowError(/bar/);
+        expect(foo).toThrowError(TypeError);
+        expect(foo).toThrowError(TypeError, "foo bar baz");
+    });
+
+    it("async matchers", async () => {
+        const badness = new Error("badness");
+        await expectAsync(Promise.resolve()).toBeResolved();
+        await expectAsync(Promise.resolve()).toBeResolved("good job");
+        await expectAsync(Promise.resolve(true)).toBeResolvedTo(true);
+        await expectAsync(Promise.reject(badness)).toBeRejected();
+        await expectAsync(Promise.reject(badness)).toBeRejected("bad mojo");
+        await expectAsync(Promise.reject(badness)).toBeRejectedWith(badness);
+        await expectAsync(Promise.resolve()).withContext("additional info").toBeResolved();
+    });
+
+    it("async matchers - not", async () => {
+        const badness = new Error("badness");
+        const malady = new Error("malady");
+        await expectAsync(Promise.reject(badness)).not.toBeResolved();
+        await expectAsync(Promise.resolve(true)).not.toBeResolvedTo(false);
+        await expectAsync(Promise.resolve()).not.toBeRejected();
+        await expectAsync(Promise.reject(badness)).not.toBeRejectedWith(malady);
+        await expectAsync(Promise.reject(badness)).not.withContext("additional info").toBeResolved();
+        await expectAsync(Promise.reject(badness)).withContext("additional info").not.toBeResolved();
+    });
+});
+
+describe("toThrowMatching", () => {
+    expect(() => {
+        ({} as any).doSomething();
+    }).toThrowMatching(error => error !== undefined);
+});
+
+describe("toBeNegativeInfinity", () => {
+    expect("").toBeNegativeInfinity();
+});
+
+describe("toBePositiveInfinity", () => {
+    expect("").toBePositiveInfinity();
+});
+
+describe("toHaveClass", () => {
+    expect("").toHaveClass(Array);
+});
+
+describe("A spec", () => {
+    it("is just a function, so it can contain any code", () => {
+        var foo = 0;
+        foo += 1;
+
+        expect(foo).toEqual(1);
+    });
+
+    it("can have more than one expectation", () => {
+        var foo = 0;
+        foo += 1;
+
+        expect(foo).toEqual(1);
+        expect(true).toEqual(true);
+    });
+});
+
+describe("A spec (with setup and tear-down)", () => {
+    var foo: number;
+
+    beforeEach(() => {
+        foo = 0;
+        foo += 1;
+    });
+
+    afterEach(() => {
+        foo = 0;
+    });
+
+    it("is just a function, so it can contain any code", () => {
+        expect(foo).toEqual(1);
+    });
+
+    it("can have more than one expectation", () => {
+        expect(foo).toEqual(1);
+        expect(true).toEqual(true);
+    });
+});
+
+describe("A spec", () => {
+    var foo: number;
+
+    beforeEach(() => {
+        foo = 0;
+        foo += 1;
+    });
+
+    afterEach(() => {
+        foo = 0;
+    });
+
+    it("is just a function, so it can contain any code", () => {
+        expect(foo).toEqual(1);
+    });
+
+    it("can have more than one expectation", () => {
+        expect(foo).toEqual(1);
+        expect(true).toEqual(true);
+    });
+
+    describe("nested inside a second describe", () => {
+        var bar: number;
+
+        beforeEach(() => {
+            bar = 1;
+        });
+
+        it("can reference both scopes as needed", () => {
+            expect(foo).toEqual(bar);
+        });
+    });
+});
+
+describe("withContext", () => {
+    it("can be used after an expectation", () => {
+        expect(1).withContext('context message').toBe(1);
+    });
+});
+
+xdescribe("A spec", () => {
+    var foo: number;
+
+    beforeEach(() => {
+        foo = 0;
+        foo += 1;
+    });
+
+    it("is just a function, so it can contain any code", () => {
+        expect(foo).toEqual(1);
+    });
+});
+
+describe("Pending specs", () => {
+    xit("can be declared 'xit'", () => {
+        expect(true).toBe(false);
+    });
+
+    it("can be declared with 'it' but without a function");
+
+    it("can be declared by calling 'pending' in the spec body", () => {
+        expect(true).toBe(false);
+        pending(); // without reason
+        pending('this is why it is pending');
+    });
+});
+
+describe("A spy", () => {
+    var foo: any, bar: any, baz: any = null;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            setBaz: (value: any) => {
+                baz = value;
+            }
+        };
+
+        spyOn(foo, 'setBar');
+        spyOn(foo, 'setBaz');
+
+        foo.setBar(123);
+        foo.setBar(456, 'another param');
+        foo.setBaz(789);
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.setBar).toHaveBeenCalled();
+    });
+
+    it("tracks all the arguments of its calls", () => {
+        expect(foo.setBar).toHaveBeenCalledWith(123);
+        expect(foo.setBar).toHaveBeenCalledWith(456, 'another param');
+    });
+
+    it("tracks the order in which spies were called", () => {
+        expect(foo.setBar).toHaveBeenCalledBefore(foo.setBaz);
+    });
+
+    it("stops all execution on a function", () => {
+        expect(bar).toBeNull();
+    });
+
+    it("tracks if it was called at all", function() {
+        foo.setBar();
+
+        expect(foo.setBar.calls.any()).toEqual(true);
+    });
+});
+
+describe("A spy, when configured to call through", () => {
+    var foo: any, bar: any, fetchedBar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, 'getBar').and.callThrough();
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar();
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(123);
+    });
+});
+
+describe("A spy, when configured to fake a return value", () => {
+    var foo: any, bar: any, fetchedBar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, "getBar").and.returnValue(745);
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar();
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(745);
+    });
+});
+
+describe("A spy, when configured to fake a series of return values", () => {
+    var foo: any, bar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, "getBar").and.returnValues("fetched first", "fetched second");
+
+        foo.setBar(123);
+    });
+
+    it("tracks that the spy was called", () => {
+        foo.getBar(123);
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not affect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called multiple times returns the requested values in order", () => {
+        expect(foo.getBar()).toEqual("fetched first");
+        expect(foo.getBar()).toEqual("fetched second");
+        expect(foo.getBar()).toBeUndefined();
+    });
+});
+
+describe("A spy, when configured with an alternate implementation", () => {
+    var foo: any, bar: any, fetchedBar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, "getBar").and.callFake(() => {
+            return 1001;
+        });
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar();
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(1001);
+    });
+});
+
+describe("A spy, when configured with alternate implementations for specified arguments", () => {
+    var foo: any, bar: any, fetchedBar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, "getBar")
+            .withArgs(1, "2")
+            .and.callFake(() => 1002);
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar(1, "2");
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(1002);
+    });
+});
+
+describe("A spy, when configured to throw a value", () => {
+    var foo: any, bar: any;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            }
+        };
+
+        spyOn(foo, "setBar").and.throwError("quux");
+    });
+
+    it("throws the value", () => {
+        expect(() => {
+            foo.setBar(123);
+        }).toThrowError("quux");
+    });
+});
+
+describe("A spy, when configured with multiple actions", () => {
+    var foo: any, bar: any, fetchedBar: any;
+    var fakeCalled = false;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            },
+            getBar: () => {
+                return bar;
+            }
+        };
+
+        spyOn(foo, 'getBar').and.callThrough().and.callFake(() => {
+            fakeCalled = true;
+        });
+
+        foo.setBar(123);
+        fetchedBar = foo.getBar();
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(foo.getBar).toHaveBeenCalled();
+    });
+
+    it("should not effect other functions", () => {
+        expect(bar).toEqual(123);
+    });
+
+    it("when called returns the requested value", () => {
+        expect(fetchedBar).toEqual(123);
+    });
+
+    it("should have called the fake implementation", () => {
+        expect(fakeCalled).toEqual(true);
+    });
+});
+
+describe("A spy", () => {
+    var foo: any, bar: any = null;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            }
+        };
+
+        spyOn(foo, 'setBar').and.callThrough();
+    });
+
+    it("can call through and then stub in the same spec", () => {
+        foo.setBar(123);
+        expect(bar).toEqual(123);
+
+        foo.setBar.and.stub();
+        bar = null;
+
+        foo.setBar(123);
+        expect(bar).toBe(null);
+    });
+});
+
+describe("A spy", () => {
+    var foo: any, bar: any = null;
+
+    beforeEach(() => {
+        foo = {
+            setBar: (value: any) => {
+                bar = value;
+            }
+        };
+
+        spyOn(foo, 'setBar');
+    });
+
+    it("tracks if it was called at all", () => {
+        expect(foo.setBar.calls.any()).toEqual(false);
+
+        foo.setBar();
+
+        expect(foo.setBar.calls.any()).toEqual(true);
+    });
+
+    it("tracks the number of times it was called", () => {
+        expect(foo.setBar.calls.count()).toEqual(0);
+
+        foo.setBar();
+        foo.setBar();
+
+        expect(foo.setBar.calls.count()).toEqual(2);
+    });
+
+    it("tracks the arguments of each call", () => {
+        foo.setBar(123);
+        foo.setBar(456, "baz");
+
+        expect(foo.setBar.calls.argsFor(0)).toEqual([123]);
+        expect(foo.setBar.calls.argsFor(1)).toEqual([456, "baz"]);
+    });
+
+    it("tracks the arguments of all calls", () => {
+        foo.setBar(123);
+        foo.setBar(456, "baz");
+
+        expect(foo.setBar.calls.allArgs()).toEqual([[123], [456, "baz"]]);
+    });
+
+    it("can provide the context and arguments to all calls", () => {
+        foo.setBar(123);
+
+        expect(foo.setBar.calls.all()).toEqual([{ object: foo, args: [123], returnValue: undefined }]);
+    });
+
+    it("has a shortcut to the most recent call", () => {
+        foo.setBar(123);
+        foo.setBar(456, "baz");
+
+        expect(foo.setBar.calls.mostRecent()).toEqual({ object: foo, args: [456, "baz"], returnValue: undefined });
+    });
+
+    it("has a shortcut to the first call", () => {
+        foo.setBar(123);
+        foo.setBar(456, "baz");
+
+        expect(foo.setBar.calls.first()).toEqual({ object: foo, args: [123], returnValue: undefined });
+    });
+
+    it("can be reset", () => {
+        foo.setBar(123);
+        foo.setBar(456, "baz");
+
+        expect(foo.setBar.calls.any()).toBe(true);
+
+        foo.setBar.calls.reset();
+
+        expect(foo.setBar.calls.any()).toBe(false);
+    });
+});
+
+describe("A spy, when created manually", () => {
+    var whatAmI: any;
+
+    beforeEach(() => {
+        whatAmI = jasmine.createSpy('whatAmI');
+
+        whatAmI("I", "am", "a", "spy");
+    });
+
+    it("is named, which helps in error reporting", () => {
+        expect(whatAmI.and.identity()).toEqual('whatAmI');
+    });
+
+    it("tracks that the spy was called", () => {
+        expect(whatAmI).toHaveBeenCalled();
+    });
+
+    it("tracks its number of calls", () => {
+        expect(whatAmI.calls.count()).toEqual(1);
+    });
+
+    it("tracks all the arguments of its calls", () => {
+        expect(whatAmI).toHaveBeenCalledWith("I", "am", "a", "spy");
+    });
+
+    it("allows access to the most recent call", () => {
+        expect(whatAmI.calls.mostRecent().args[0]).toEqual("I");
+    });
+});
+
+describe("Multiple spies, when created manually", () => {
+    class Tape {
+        private rewindTo: number;
+        play(): void { }
+        pause(): void { }
+        rewind(pos: number): void {
+            this.rewindTo = pos;
+        }
+        stop(): void { }
+        readonly isPlaying: boolean; // spy obj makes this writable
+    }
+
+    var tape: Tape;
+    var tapeSpy: jasmine.SpyObj<Tape>;
+    var el: jasmine.SpyObj<Element>;
+
+    beforeEach(() => {
+        tapeSpy = jasmine.createSpyObj<Tape>('tape', ['play', 'pause', 'stop', 'rewind']);
+        tape = tapeSpy;
+        (tape as { isPlaying: boolean }).isPlaying = false;
+        el = jasmine.createSpyObj<Element>('Element', ['hasAttribute']);
+
+        el.hasAttribute.and.returnValue(false);
+        el.hasAttribute("href");
+
+        tape.play();
+        tape.pause();
+        tape.rewind(0);
+
+        tapeSpy.play.and.callThrough();
+        tapeSpy.pause.and.callThrough();
+        tapeSpy.rewind.and.callThrough();
+    });
+
+    it("creates spies for each requested function", () => {
+        expect(tape.play).toBeDefined();
+        expect(tape.pause).toBeDefined();
+        expect(tape.stop).toBeDefined();
+        expect(tape.rewind).toBeDefined();
+    });
+
+    it("tracks that the spies were called", () => {
+        expect(tape.play).toHaveBeenCalled();
+        expect(tape.pause).toHaveBeenCalled();
+        expect(tape.rewind).toHaveBeenCalled();
+        expect(tape.stop).not.toHaveBeenCalled();
+    });
+
+    it("tracks all the arguments of its calls", () => {
+        expect(tape.rewind).toHaveBeenCalledWith(0);
+    });
+
+    it("read isPlaying property", () => {
+        expect(tape.isPlaying).toBe(false);
+    });
+});
+
+describe("multiple spies, when created with spyOnAllFunctions", () => {
+    it("spies on all functions", () => {
+        const obj = {
+            x: (a: number) => a,
+            y: (a: number) => a,
+        };
+
+        spyOnAllFunctions(obj);
+
+        obj.x(0);
+        obj.y(1);
+
+        expect(obj.x).toHaveBeenCalled();
+        expect(obj.y).toHaveBeenCalledWith(1);
+    });
+});
+
+describe("jasmine.nothing", () => {
+    it("matches any value", () => {
+        expect().nothing();
+    });
+});
+
+describe("jasmine.any", () => {
+    it("matches any value", () => {
+        expect({}).toEqual(jasmine.any(Object));
+        expect(12).toEqual(jasmine.any(Number));
+    });
+
+    it("matches any function", () => {
+        interface Test {
+            fn1(): void;
+            fn2(param1: number): number;
+        }
+
+        const a: Test = {
+            fn1: () => { },
+            fn2: (param1: number) => param1,
+        };
+
+        const expected: Test = {
+            fn1: jasmine.any(Function),
+            fn2: jasmine.any(Function),
+        };
+
+        expect(a).toEqual(expected);
+    });
+
+    describe("when used with a spy", () => {
+        it("is useful for comparing arguments", () => {
+            const foo = jasmine.createSpy('foo');
+            foo(12, () => {
+                return true;
+            });
+
+            expect(foo).toHaveBeenCalledWith(jasmine.any(Number), jasmine.any(Function));
+        });
+    });
+});
+
+describe("jasmine.objectContaining", () => {
+    interface fooType {
+        a: number;
+        b: number;
+        bar: string;
+    }
+    var foo: fooType;
+
+    beforeEach(() => {
+        foo = {
+            a: 1,
+            b: 2,
+            bar: "baz"
+        };
+    });
+
+    it("matches objects with the expect key/value pairs", () => {
+        // not explictly providing the type on objectContaining only guards against
+        // missmatching types on know properties
+        expect(foo).not.toEqual(jasmine.objectContaining({
+            a: 37,
+            foo: 2, // <-- this does not cause an error as the compiler cannot infer the type completely
+            // b: '123', <-- this would cause an error as `b` defined as number in fooType
+        }));
+
+        // explictly providing the type on objectContaining makes the guard more precise
+        // as misspelled properties are detected as well
+        expect(foo).not.toEqual(jasmine.objectContaining<fooType>({
+            bar: '',
+            // foo: 1, <-- this would cause an error as `foo` is not defined in fooType
+        }));
+    });
+
+    describe("when used with a spy", () => {
+        it("is useful for comparing arguments", () => {
+            const callback = jasmine.createSpy('callback');
+
+            callback({
+                bar: "baz"
+            });
+
+            expect(callback).toHaveBeenCalledWith(jasmine.objectContaining({
+                bar: "baz"
+            }));
+            expect(callback).not.toHaveBeenCalledWith(jasmine.objectContaining({
+                c: 37
+            }));
+        });
+    });
+});
+
+describe("jasmine.arrayContaining", () => {
+    var foo: number[];
+
+    beforeEach(() => {
+        foo = [1, 2, 3, 4];
+    });
+
+    it("matches arrays with some of the values", () => {
+        expect(foo).toEqual(jasmine.arrayContaining([3, 1]));
+        expect(foo).not.toEqual(jasmine.arrayContaining([6]));
+
+        expect(foo).toBe(jasmine.arrayContaining([3, 1]));
+        expect(foo).not.toBe(jasmine.arrayContaining([6]));
+    });
+
+    describe("when used with a spy", () => {
+        it("is useful when comparing arguments", () => {
+            const callback = jasmine.createSpy('callback');
+
+            callback([1, 2, 3, 4]);
+
+            expect(callback).toHaveBeenCalledWith(jasmine.arrayContaining([4, 2, 3]));
+            expect(callback).not.toHaveBeenCalledWith(jasmine.arrayContaining([5, 2]));
+        });
+    });
+});
+
+describe("jasmine.arrayWithExactContents", () => {
+    var foo: number[];
+
+    beforeEach(() => {
+        foo = [1, 2, 3, 4];
+    });
+
+    it("matches arrays with exactly the same values", () => {
+        expect(foo).toEqual(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+        expect(foo).not.toEqual(jasmine.arrayWithExactContents([6]));
+
+        expect(foo).toBe(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+        expect(foo).not.toBe(jasmine.arrayWithExactContents([6]));
+    });
+
+    describe("when used with a spy", () => {
+        it("is useful when comparing arguments", () => {
+            const callback = jasmine.createSpy('callback');
+
+            callback([1, 2, 3, 4]);
+
+            expect(callback).toHaveBeenCalledWith(jasmine.arrayWithExactContents([1, 2, 3, 4]));
+            expect(callback).not.toHaveBeenCalledWith(jasmine.arrayWithExactContents([5, 2]));
+        });
+    });
+});
+
+describe("Manually ticking the Jasmine Clock", () => {
+    var timerCallback: any;
+
+    beforeEach(() => {
+        timerCallback = jasmine.createSpy("timerCallback");
+        jasmine.clock().install();
+    });
+
+    afterEach(() => {
+        jasmine.clock().uninstall();
+    });
+
+    it("causes a timeout to be called synchronously", () => {
+        setTimeout(() => {
+            timerCallback();
+        }, 100);
+
+        expect(timerCallback).not.toHaveBeenCalled();
+
+        jasmine.clock().tick(101);
+
+        expect(timerCallback).toHaveBeenCalled();
+    });
+
+    it("causes an interval to be called synchronously", () => {
+        setInterval(() => {
+            timerCallback();
+        }, 100);
+
+        expect(timerCallback).not.toHaveBeenCalled();
+
+        jasmine.clock().tick(101);
+        expect(timerCallback.calls.count()).toEqual(1);
+
+        jasmine.clock().tick(50);
+        expect(timerCallback.calls.count()).toEqual(1);
+
+        jasmine.clock().tick(50);
+        expect(timerCallback.calls.count()).toEqual(2);
+    });
+
+    describe("Mocking the Date object", () => {
+        it("mocks the Date object and sets it to a given time", () => {
+            const baseTime = new Date(2013, 9, 23);
+
+            jasmine.clock().mockDate(baseTime);
+
+            jasmine.clock().tick(50);
+            expect(new Date().getTime()).toEqual(baseTime.getTime() + 50);
+        });
+    });
+});
+
+describe("Asynchronous specs", () => {
+    var value: number;
+    beforeEach((done: DoneFn) => {
+        setTimeout(() => {
+            value = 0;
+            done();
+        }, 1);
+    });
+
+    it("should support async execution of test preparation and expectations", (done: DoneFn) => {
+        value += 1;
+        expect(value).toBeGreaterThan(0);
+        done();
+    });
+
+    describe("long asynchronous specs", () => {
+        beforeEach((done: DoneFn) => {
+            done();
+        }, 1000);
+
+        it("takes a long time", (done: DoneFn) => {
+            setTimeout(() => {
+                done();
+            }, 9000);
+        }, 10000);
+
+        afterEach((done: DoneFn) => {
+            done();
+        }, 1000);
+    });
+});
+
+describe("Fail", () => {
+    it("should fail test when called without arguments", () => {
+        fail();
+    });
+
+    it("should fail test when called with a fail message", () => {
+        fail("The test failed");
+    });
+
+    it("should fail test when called an error", () => {
+        fail(new Error("The test failed with this error"));
+    });
+});
+
+// test based on http://jasmine.github.io/2.2/custom_equality.html
+describe("custom equality", () => {
+    const myCustomEquality: jasmine.CustomEqualityTester = function(first: any, second: any): boolean | void {
+        if (typeof first === "string" && typeof second === "string") {
+            return first[0] === second[1];
+        }
+    };
+
+    beforeEach(() => {
+        jasmine.addCustomEqualityTester(myCustomEquality);
+    });
+
+    it("should be custom equal", () => {
+        expect("abc").toEqual("aaa");
+    });
+
+    it("should be custom not equal", () => {
+        expect("abc").not.toEqual("abc");
+    });
+});
+
+// test based on http://jasmine.github.io/2.2/custom_matcher.html
+var customMatchers: jasmine.CustomMatcherFactories = {
+    toBeGoofy: (util: jasmine.MatchersUtil, customEqualityTesters: jasmine.CustomEqualityTester[]) => {
+        return {
+            compare: (actual: any, expected: any): jasmine.CustomMatcherResult => {
+                if (expected === undefined) {
+                    expected = '';
+                }
+                const result: jasmine.CustomMatcherResult = { pass: false };
+
+                result.pass = util.equals(actual.hyuk, "gawrsh" + expected, customEqualityTesters);
+
+                result.message = result.pass ?
+                    `Expected ${actual} not to be quite so goofy` :
+                    `Expected ${actual} to be goofy, but it was not very goofy`;
+
+                return result;
+            }
+        };
+    },
+    toBeWithinRange: (util: jasmine.MatchersUtil, customEqualityTesters: jasmine.CustomEqualityTester[]) => {
+        return {
+            compare: (actual: any, floor: number, ceiling: number): jasmine.CustomMatcherResult => {
+                const pass = actual >= floor && actual <= ceiling;
+                const message = `expected ${actual} to be within range ${floor}-${ceiling}`;
+                return { message, pass };
+            },
+
+            negativeCompare: (actual: any, floor: number, ceiling: number): jasmine.CustomMatcherResult => {
+                const pass = actual < floor && actual > ceiling;
+                const message = `expected ${actual} not to be within range ${floor}-${ceiling}`;
+                return { message, pass };
+            }
+        };
+    }
+};
+// add the custom matchers to interface jasmine.Matchers via TypeScript declaration merging
+// if your test files import or export anything, you'll want to use:
+// declare global {
+//     namespace jasmine {
+//         interface Matchers {
+//             ...
+//         }
+//     }
+// }
+declare namespace jasmine {
+    interface Matchers<T> {
+        toBeGoofy(expected?: Expected<T>): boolean;
+        toBeWithinRange(expected?: Expected<T>, floor?: number, ceiling?: number): boolean;
+    }
+}
+
+describe("Custom matcher: 'toBeGoofy'", () => {
+    beforeEach(() => {
+        jasmine.addMatchers(customMatchers);
+    });
+
+    it("is available on an expectation", () => {
+        expect({
+            hyuk: 'gawrsh'
+        }).toBeGoofy();
+    });
+
+    it("can take an 'expected' parameter", () => {
+        expect({
+            hyuk: 'gawrsh is fun'
+        }).toBeGoofy({ hyuk: ' is fun' });
+    });
+
+    it("can take many 'expected' parameters", () => {
+        expect(2).toBeWithinRange(1, 3);
+    });
+
+    it("can use the custom negativeCompare method", () => {
+        const matcher = customMatchers["toBeWithinRange"](jasmine.matchersUtil, []);
+        const result = matcher.negativeCompare!(1, 2, 3);
+
+        expect(result.pass).toBe(false);
+        expect(result.message).toBe("expected 1 not to be within range 2-3");
+    });
+
+    it("can be negated", () => {
+        expect({
+            hyuk: 'this is fun'
+        }).not.toBeGoofy();
+    });
+
+    it("has a proper message on failure", () => {
+        const actual = { hyuk: 'this is fun' };
+
+        const matcher = customMatchers["toBeGoofy"](jasmine.matchersUtil, []);
+        const result = matcher.compare(actual, null);
+
+        expect(result.pass).toBe(false);
+        expect(result.message).toBe(`Expected ${actual} to be goofy, but it was not very goofy`);
+    });
+});
+
+describe('better typed spys', () => {
+    describe('a typed spy', () => {
+        const spy = jasmine.createSpy('spy', (num: number, str: string) => {
+            return `${num} and ${str}`;
+        });
+        it('has a typed returnValue', () => {
+            // $ExpectType (val: string) => Spy<(num: number, str: string) => string>
+            spy.and.returnValue;
+        });
+        it('has a typed calls property', () => {
+            spy.calls.first().args; // $ExpectType [number, string]
+            spy.calls.first().returnValue; // $ExpectType string
+        });
+        it('has a typed callFake', () => {
+            // $ExpectType (fn: (num: number, str: string) => string) => Spy<(num: number, str: string) => string>
+            spy.and.callFake;
+        });
+    });
+    describe('spyOn', () => {
+        it('only works on methods', () => {
+            const foo = {
+                method() {
+                    return 'baz';
+                },
+                value: 'value',
+            };
+            const spy = spyOn(foo, 'method');
+            const spy2 = spyOn(foo, 'value'); // $ExpectError
+
+             // $ExpectType string
+            spy.calls.first().returnValue;
+        });
+        it('can allows overriding the generic', () => {
+            class Base {
+                service() {}
+            }
+            class Super extends Base {
+                service2() {}
+            }
+            spyOn<Base>(new Super(), 'service');
+            spyOn<Base>(new Super(), 'service2'); // $ExpectError
+        });
+    });
+    describe('createSpyObj', () => {
+        it('returns the correct spy types', () => {
+            const foo = {
+                method() {
+                    return 'baz';
+                },
+                value: 'value',
+            };
+            const spyObj = jasmine.createSpyObj<typeof foo>('foo', ['method']);
+
+            // $ExpectType (val: string) => Spy<() => string>
+            spyObj.method.and.returnValue;
+        });
+    });
+});
+
+// test based on http://jasmine.github.io/2.5/custom_reporter.html
+var myReporter: jasmine.CustomReporter = {
+    jasmineStarted: (suiteInfo: jasmine.SuiteInfo) => {
+        console.log("Running suite with " + suiteInfo.totalSpecsDefined);
+    },
+
+    suiteStarted: (result: jasmine.CustomReporterResult) => {
+        console.log(`Suite started: ${result.description} whose full description is: ${result.fullName}`);
+    },
+
+    specStarted: (result: jasmine.CustomReporterResult) => {
+        console.log(`Spec started: ${result.description} whose full description is: ${result.fullName}`);
+    },
+
+    specDone: (result: jasmine.CustomReporterResult) => {
+        console.log(`Spec: ${result.description} was ${result.status}`);
+        // tslint:disable-next-line:prefer-for-of
+        for (var i = 0; result.failedExpectations && i < result.failedExpectations.length; i += 1) {
+            console.log("Failure: " + result.failedExpectations[i].message);
+            console.log("Actual: " + result.failedExpectations[i].actual);
+            console.log("Expected: " + result.failedExpectations[i].expected);
+            console.log(result.failedExpectations[i].stack);
+        }
+        console.log(result.passedExpectations && result.passedExpectations.length);
+    },
+
+    suiteDone: (result: jasmine.CustomReporterResult) => {
+        console.log(`Suite: ${result.description} was ${result.status}`);
+        // tslint:disable-next-line:prefer-for-of
+        for (var i = 0; result.failedExpectations && i < result.failedExpectations.length; i += 1) {
+            console.log('AfterAll ' + result.failedExpectations[i].message);
+            console.log(result.failedExpectations[i].stack);
+        }
+    },
+
+    jasmineDone: (runDetails: jasmine.RunDetails) => {
+        console.log('Finished suite');
+        console.log('Random:', runDetails.order.random);
+    }
+};
+
+jasmine.getEnv().addReporter(myReporter);
+
+describe("Randomize Tests", () => {
+    it("should allow randomization of the order of tests", () => {
+        expect(() => {
+            const env = jasmine.getEnv();
+            env.randomizeTests(true);
+        }).not.toThrow();
+    });
+
+    it("should allow a seed to be passed in for randomization", () => {
+        expect(() => {
+            const env = jasmine.getEnv();
+            env.randomizeTests(true);
+            return env.seed(1234);
+        }).not.toThrow();
+    });
+});
+
+// Dest spces copied from jasmine project (https://github.com/jasmine/jasmine/blob/master/spec/core/SpecSpec.js)
+describe("createSpyObj", function() {
+    it("should create an object with spy methods and corresponding return values when you call jasmine.createSpyObj() with an object", function() {
+        const spyObj = jasmine.createSpyObj('BaseName', {method1: 42, method2: 'special sauce'});
+
+        expect(spyObj.method1()).toEqual(42);
+        expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
+
+        expect(spyObj.method2()).toEqual('special sauce');
+        expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
+    });
+
+    it("should create an object with a bunch of spy methods when you call jasmine.createSpyObj()", function() {
+        const spyObj = jasmine.createSpyObj('BaseName', ['method1', 'method2']);
+
+        expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function) });
+        expect(spyObj.method1.and.identity()).toEqual('BaseName.method1');
+        expect(spyObj.method2.and.identity()).toEqual('BaseName.method2');
+    });
+
+    it("should allow you to omit the baseName and takes only an object", function() {
+        const spyObj = jasmine.createSpyObj({method1: 42, method2: 'special sauce'});
+
+        expect(spyObj.method1()).toEqual(42);
+        expect(spyObj.method1.and.identity()).toEqual('unknown.method1');
+
+        expect(spyObj.method2()).toEqual('special sauce');
+        expect(spyObj.method2.and.identity()).toEqual('unknown.method2');
+    });
+
+    it("should allow you to omit the baseName and takes only a list of methods", function() {
+        const spyObj = jasmine.createSpyObj(['method1', 'method2']);
+
+        expect(spyObj).toEqual({ method1: jasmine.any(Function), method2: jasmine.any(Function) });
+        expect(spyObj.method1.and.identity()).toEqual('unknown.method1');
+        expect(spyObj.method2.and.identity()).toEqual('unknown.method2');
+    });
+
+    it("should throw if you pass an empty array argument", function() {
+        expect(function() {
+            jasmine.createSpyObj('BaseName', []);
+        }).toThrow("createSpyObj requires a non-empty array or object of method names to create spies for");
+    });
+
+    it("should throw if you pass an empty object argument", function() {
+        expect(function() {
+            jasmine.createSpyObj('BaseName', {});
+        }).toThrow("createSpyObj requires a non-empty array or object of method names to create spies for");
+    });
+});
+
+(() => {
+    // from boot.js
+    const env = jasmine.getEnv();
+
+    const htmlReporter = new jasmine.HtmlReporter();
+    env.addReporter(htmlReporter);
+
+    const specFilter = new jasmine.HtmlSpecFilter();
+    env.specFilter = (spec) => {
+        return specFilter.matches(spec.getFullName());
+    };
+
+    const currentWindowOnload = window.onload;
+    window.onload = () => {
+        if (currentWindowOnload) {
+            (currentWindowOnload as any)(null);
+        }
+        htmlReporter.initialize();
+        env.execute();
+    };
+})();
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
+jasmine.MAX_PRETTY_PRINT_DEPTH = 40;
diff --git a/types/jasmine/ts3.1/tsconfig.json b/types/jasmine/ts3.1/tsconfig.json
new file mode 100644
index 0000000000..d48a4a559a
--- /dev/null
+++ b/types/jasmine/ts3.1/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "files": [
+        "index.d.ts",
+        "jasmine-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/jasmine/ts3.1/tslint.json b/types/jasmine/ts3.1/tslint.json
new file mode 100644
index 0000000000..c540ba0129
--- /dev/null
+++ b/types/jasmine/ts3.1/tslint.json
@@ -0,0 +1,13 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false,
+        "no-declare-current-package": false,
+        "no-empty-interface": false,
+        "no-single-declare-module": false,
+        "no-unnecessary-generics": false,
+        "no-var-keyword": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false
+    }
+}

From 5befd67eabb90ec9bd3308ca4319aae6d3c6ac08 Mon Sep 17 00:00:00 2001
From: Moshe Kolodny <kolodny@github.com>
Date: Wed, 13 Mar 2019 21:57:19 -0400
Subject: [PATCH 642/924] Fix the build with a hack

---
 types/saywhen/saywhen-tests.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/saywhen/saywhen-tests.ts b/types/saywhen/saywhen-tests.ts
index a253308156..3eb72825fe 100644
--- a/types/saywhen/saywhen-tests.ts
+++ b/types/saywhen/saywhen-tests.ts
@@ -1,7 +1,17 @@
 import when = require('saywhen');
 
-when(jasmine.createSpy('test')); // $ExpectType CallHandler<Spy>
-when(jasmine.createSpy('test')).isCalled; // $ExpectType Proxy<Spy>
+// This interface is needed to get around the fact that the new jasmine
+// `createSpy` method takes a generic type while the old typings don't.
+// That means that in Typescript 3.0 the spy will be `Spy` and in 3.1 it
+// will be `Spy<InferableFunction>`. This interface matches both and is
+// what dtslint will expect the type to be.
+interface JasmineSpy extends jasmine.Spy {
+    (...params: any[]): any;
+}
+const spy: JasmineSpy = jasmine.createSpy('test');
+
+when(spy); // $ExpectType CallHandler<JasmineSpy>
+when(spy).isCalled; // $ExpectType Proxy<JasmineSpy>
 
 when.captor();	// $ExpectType MatcherProxy<{}>
 when.captor(jasmine.any(Number));	// $ExpectType MatcherProxy<Any>

From d470a7a43e67f0b97796c25be7286ba6436331a9 Mon Sep 17 00:00:00 2001
From: melchiorV <kmno4k2mno4@gmail.com>
Date: Thu, 14 Mar 2019 15:59:17 +0800
Subject: [PATCH 643/924] Mod the types about input in react

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

diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 512fb5a0a7..ecbf37f6aa 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2879,7 +2879,7 @@ declare namespace React {
         alt?: string;
         autoComplete?: string;
         autoFocus?: boolean;
-        capture?: boolean; // https://www.w3.org/TR/html-media-capture/#the-capture-attribute
+        capture?: boolean | string; // https://www.w3.org/TR/html-media-capture/#the-capture-attribute
         checked?: boolean;
         crossOrigin?: string;
         disabled?: boolean;

From 05effa563b24ad52f43266f989fbcc45e5675de4 Mon Sep 17 00:00:00 2001
From: melchiorV <kmno4k2mno4@gmail.com>
Date: Thu, 14 Mar 2019 16:26:08 +0800
Subject: [PATCH 644/924] Mod the types about AllHTMLAttributes in react

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

diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index ecbf37f6aa..d4f6300588 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2648,7 +2648,7 @@ declare namespace React {
         autoComplete?: string;
         autoFocus?: boolean;
         autoPlay?: boolean;
-        capture?: boolean;
+        capture?: boolean | string;
         cellPadding?: number | string;
         cellSpacing?: number | string;
         charSet?: string;

From 714e7b70bd50ba590158321255484ef87eee5943 Mon Sep 17 00:00:00 2001
From: Sebastian Markgraf <sebastian-markgraf@t-online.de>
Date: Wed, 13 Mar 2019 10:27:27 +0100
Subject: [PATCH 645/924] [victory] Add missing object possibility to gutter.

---
 types/victory/index.d.ts        |  2 +-
 types/victory/victory-tests.tsx | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 29d0dd068a..e6ed4b9003 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -2003,7 +2003,7 @@ declare module "victory" {
      * gutters are between columns. When orientation is vertical, gutters
      * are the space between rows.
      */
-    gutter?: number;
+    gutter?: number | {left: number, right: number};
     /**
      * The itemsPerRow prop determines how many items to render in each row
      * of a horizontal legend, or in each column of a vertical legend. This
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index ac60806cee..8a7cd0c14b 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -821,3 +821,16 @@ test = (
         zoomDomain={[0, 500]}
     />
 );
+
+// Gutter test
+test = (
+    <VictoryLegend
+        x={125}
+        y={50}
+        orientation="horizontal"
+        gutter={{left: 10, right: 10}}
+        data={[
+            { name: "One" }, { name: "Two" }, { name: "Three" }
+            ]}
+    />
+);

From 5b1d81b8504eccf726e044a869a8bcf54023357c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Baumeyer?= <baumeyerkevin@gmail.com>
Date: Thu, 14 Mar 2019 10:41:11 +0100
Subject: [PATCH 646/924] Update cron types & bump version

---
 types/cron/cron-tests.ts | 18 ++++++++++++++----
 types/cron/index.d.ts    | 32 +++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/types/cron/cron-tests.ts b/types/cron/cron-tests.ts
index d146fe6a61..f152498eca 100644
--- a/types/cron/cron-tests.ts
+++ b/types/cron/cron-tests.ts
@@ -46,6 +46,12 @@ var job = new CronJob(moment(), () => {
   timeZone /* Time zone of this job. */
 );
 
+// Another example with system commands
+var job = new CronJob('00 30 11 * * 1-5', 'ls', { command: 'ls', args: ['./'] },
+  true, /* Start the job right now */
+  timeZone /* Time zone of this job. */
+);
+
 // For good measure
 var job = new CronJob({
   cronTime: '00 30 11 * * 1-5',
@@ -59,10 +65,14 @@ var job = new CronJob({
   start: false,
   timeZone: 'America/Los_Angeles'
 });
-console.log(job.lastDate());
-console.log(job.nextDates());// Should be a Moment object
-console.log(job.nextDates(1));// Should be an array of Moment object
-console.log(job.running);
+const ld = job.lastDate(); // $ExpectType Date
+console.log(ld);
+const nd = job.nextDates(); // $ExpectType Moment
+console.log(nd);
+const nds = job.nextDates(1); // $ExpectType Moment | Moment[]
+console.log(nds);// Should be a Moment array
+const ru = job.running // $ExpectType boolean
+console.log(ru);
 job.setTime(new CronTime('00 30 11 * * 1-2'));
 job.start();
 job.stop();
diff --git a/types/cron/index.d.ts b/types/cron/index.d.ts
index b508c0d1fd..de4398333c 100644
--- a/types/cron/index.d.ts
+++ b/types/cron/index.d.ts
@@ -1,10 +1,15 @@
-// Type definitions for cron 1.6
+// Type definitions for cron 1.7
 // Project: https://www.npmjs.com/package/cron
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 Lundarl Gholoi <https://github.com/winup>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 import { Moment } from 'moment';
+import { SpawnOptions } from "child_process";
+
+export declare type CronCommand = (() => void) | string | { command: string, args?: ReadonlyArray<string>, options?: SpawnOptions};
 
 export declare class CronTime {
     /**
@@ -17,10 +22,14 @@ export declare class CronTime {
 
     /**
      * Tells you when ```CronTime``` will be run.
-     * @param i Indicate which turn of run after now. If not given return next run time.
      */
     public sendAt(): Moment;
-    public sendAt(i?: number): Moment[];
+    /**
+     * Tells you when ```CronTime``` will be run.
+     * @param i Indicate which turn of run after now. If not given return next run time.
+     * @returns A `Moment` when the source passed in the constructor is a `Date` or a `Moment` and an array of `Moment` when the source is a string
+     */
+    public sendAt(i?: number): Moment | Moment[];
     /**
      * Get the number of milliseconds in the future at which to fire our callbacks.
      */
@@ -35,11 +44,11 @@ export declare interface CronJobParameters {
     /**
      * The function to fire at the specified time. If an ```onComplete``` callback was provided, ```onTick``` will receive it as an argument. ```onTick``` may call ```onComplete``` when it has finished its work.
      */
-    onTick: () => void;
+    onTick: CronCommand;
     /**
      * A function that will fire when the job is stopped with ```job.stop()```, and may also be called by ```onTick``` at the end of each run.
      */
-    onComplete?: () => void;
+    onComplete?: CronCommand;
     /**
      * Specifies whether to start the job just before exiting the constructor. By default this is set to false. If left at default you will need to call ```job.start()``` in order to start the job (assuming ```job``` is the variable you set the cronjob to). This does not immediately fire your ```onTick``` function, it just gives you more control over the behavior of your jobs.
      */
@@ -88,7 +97,7 @@ export declare class CronJob {
      * @param utcOffset This allows you to specify the offset of your timezone rather than using the ```timeZone``` param. Probably don't use both ```timeZone``` and ```utcOffset``` together or weird things may happen.
      * @param unrefTimeout If you have code that keeps the event loop running and want to stop the node process when that finishes regardless of the state of your cronjob, you can do so making use of this parameter. This is off by default and cron will run as if it needs to control the event loop. For more information take a look at [timers#timers_timeout_unref](https://nodejs.org/api/timers.html#timers_timeout_unref) from the NodeJS docs.
      */
-    constructor(cronTime: string | Date | Moment, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean);
+    constructor(cronTime: string | Date | Moment, onTick: CronCommand, onComplete?: CronCommand, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean);
     /**
      * Create a new ```CronJob```.
      * @param options Job parameters.
@@ -114,10 +123,15 @@ export declare class CronJob {
     public lastDate(): Date;
     /**
      * Tells you when a ```CronTime``` will be run.
-     * @param i Indicate which turn of run after now. If not given return next run time.
      */
+    public nextDate(): Moment;
     public nextDates(): Moment;
-    public nextDates(i?: number): Moment[];
+    /**
+     * Tells you when a ```CronTime``` will be run.
+     * @param i Indicate which turn of run after now. If not given return next run time.
+     * @returns A `Moment` when the cronTime passed in the constructor is a `Date` or a `Moment` and an array of `Moment` when the cronTime is a string
+     */
+    public nextDates(i?: number): Moment | Moment[];
     /**
      * Add another ```onTick``` function.
      * @param callback Target function.
@@ -126,7 +140,7 @@ export declare class CronJob {
 }
 
 export declare var job:
-    ((cronTime: string | Date | Moment, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean) => CronJob)
+    ((cronTime: string | Date | Moment, onTick: () => void, onComplete?: CronCommand, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean, utcOffset?: string | number, unrefTimeout?: boolean) => CronJob)
     | ((options: CronJobParameters) => CronJob);
 export declare var time: (source: string | Date | Moment, zone?: string) => CronTime;
 export declare var sendAt: (cronTime: string | Date | Moment) => Moment;

From 4e8c93e46f12a82e81e7386e191ff6f60fce62c2 Mon Sep 17 00:00:00 2001
From: Simon Kostede <simon.kostede@de.neusoft.com>
Date: Thu, 14 Mar 2019 16:28:29 +0100
Subject: [PATCH 647/924] fix: wrong type definition for "fileds" in
 placeDetails

fields and response parameters only match partly
see: https://developers.google.com/places/web-service/details#fields
---
 types/google__maps/index.d.ts | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/types/google__maps/index.d.ts b/types/google__maps/index.d.ts
index f1df5d8f38..2745cafe62 100644
--- a/types/google__maps/index.d.ts
+++ b/types/google__maps/index.d.ts
@@ -2404,9 +2404,36 @@ export interface PlaceDetailsRequest {
      * parameter from a request, ALL possible fields will be returned, and you will be billed accordingly.
      * This applies only to Place Details requests.
      */
-    fields?: Array<keyof PlaceDetailsResult>;
+    fields?: PlaceDetailsRequestField[];
 }
 
+export type PlaceDetailsRequestField = (
+    "address_component" |
+    "adr_address" |
+    "alt_id" |
+    "formatted_address" |
+    "geometry" |
+    "icon" |
+    "id" |
+    "name" |
+    "permanently_closed" |
+    "photo" |
+    "place_id" |
+    "plus_code" |
+    "scope" |
+    "type" |
+    "url" |
+    "user_ratings_total" |
+    "utc_offset" |
+    "vicinity" |
+    "formatted_phone_number" |
+    "international_phone_number" |
+    "opening_hours" |
+    "website" |
+    "price_level" |
+    "rating" |
+    "review");
+
 export interface PlaceDetailsResponse {
     /** contains metadata on the request. */
     status: PlaceDetailsResponseStatus;

From 1c7369ccabfd3b6f76e2f74344efd56eb88e766f Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Thu, 14 Mar 2019 08:41:32 -0700
Subject: [PATCH 648/924] VS Code 1.16 Extension API

---
 types/vscode/index.d.ts | 127 +++++++++++++++++++++++++++++++++-------
 1 file changed, 107 insertions(+), 20 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 018ca50471..4f81092898 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.15
+// Type definitions for Visual Studio Code 1.16
 // Project: https://github.com/microsoft/vscode-extension-vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.15 Extension API
+ * Type Definition for Visual Studio Code 1.16 Extension API
  */
 
 declare module 'vscode' {
@@ -1828,11 +1828,50 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * MarkedString can be used to render human readable text. It is either a markdown string
-	 * or a code-block that provides a language and a code snippet. Note that
-	 * markdown strings will be sanitized - that means html will be escaped.
+	 * The MarkdownString represents human readable text that supports formatting via the
+	 * markdown syntax. Standard markdown is supported, also tables, but no embedded html.
 	 */
-	export type MarkedString = string | { language: string; value: string };
+	export class MarkdownString {
+
+		/**
+		 * The markdown string.
+		 */
+		value: string;
+
+		/**
+		 * Indicates that this markdown string is from a trusted source. Only *trusted*
+		 * markdown supports links that execute commands, e.g. `[Run it](command:myCommandId)`.
+		 */
+		isTrusted?: boolean;
+
+		/**
+		 * Creates a new markdown string with the given value.
+		 *
+		 * @param value Optional, initial value.
+		 */
+		constructor(value?: string);
+
+		/**
+		 * Appends and escapes the given string to this markdown string.
+		 * @param value Plain text.
+		 */
+		appendText(value: string): MarkdownString;
+
+		/**
+		 * Appends the given string 'as is' to this markdown string.
+		 * @param value Markdown string.
+		 */
+		appendMarkdown(value: string): MarkdownString;
+	}
+
+	/**
+	 * ~~MarkedString can be used to render human readable text. It is either a markdown string
+	 * or a code-block that provides a language and a code snippet. Note that
+	 * markdown strings will be sanitized - that means html will be escaped.~~
+	 *
+	 * @deprecated This type is deprecated, please use [`MarkdownString`](#MarkdownString) instead.
+	 */
+	export type MarkedString = MarkdownString | string | { language: string; value: string };
 
 	/**
 	 * A hover represents additional information for a symbol or word. Hovers are
@@ -3082,8 +3121,11 @@ declare module 'vscode' {
 		 * @param section Configuration name, supports _dotted_ names.
 		 * @param value The new value.
 		 * @param configurationTarget The [configuration target](#ConfigurationTarget) or a boolean value.
-		 *	If `undefined` or `null` or `false` configuration target is `ConfigurationTarget.Workspace`.
-		 *	If `true` configuration target is `ConfigurationTarget.Global`.
+		 *	- If `true` configuration target is `ConfigurationTarget.Global`.
+		 *	- If `false` configuration target is `ConfigurationTarget.Workspace`.
+		 *	- If `undefined` or `null` configuration target is
+		 *	`ConfigurationTarget.WorkspaceFolder` when configuration is resource specific
+		 *	`ConfigurationTarget.Workspace` otherwise.
 		 */
 		update(section: string, value: any, configurationTarget?: ConfigurationTarget | boolean): Thenable<void>;
 
@@ -3710,7 +3752,7 @@ declare module 'vscode' {
 	 */
 	export interface TaskDefinition {
 		/**
-		 * The task definition descibing the task provided by an extension.
+		 * The task definition describing the task provided by an extension.
 		 * Usually a task provider defines more properties to identify
 		 * a task. They need to be defined in the package.json of the
 		 * extension under the 'taskDefinitions' extension point. The npm
@@ -3845,7 +3887,7 @@ declare module 'vscode' {
 		/**
 		 * Creates a new task.
 		 *
-		 * @param definition The task definition as defined in the taskDefintions extension point.
+		 * @param definition The task definition as defined in the taskDefinitions extension point.
 		 * @param name The task's name. Is presented in the user interface.
 		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
 		 * @param execution The process or shell execution.
@@ -3903,7 +3945,7 @@ declare module 'vscode' {
 
 	/**
 	 * A task provider allows to add tasks to the task service.
-	 * A task provider is registerd via #workspace.registerTaskProvider.
+	 * A task provider is registered via #workspace.registerTaskProvider.
 	 */
 	export interface TaskProvider {
 		/**
@@ -3938,6 +3980,13 @@ declare module 'vscode' {
 		 */
 		export let appName: string;
 
+		/**
+		 * The application root folder from which the editor is running.
+		 *
+		 * @readonly
+		 */
+		export let appRoot: string;
+
 		/**
 		 * Represents the preferred user-language, like `de-CH`, `fr`, or `en-US`.
 		 *
@@ -4032,10 +4081,10 @@ declare module 'vscode' {
 		/**
 		 * Executes the command denoted by the given command identifier.
 		 *
-		 * When executing an editor command not all types are allowed to
+		 * * *Note 1:* When executing an editor command not all types are allowed to
 		 * be passed as arguments. Allowed are the primitive types `string`, `boolean`,
-		 * `number`, `undefined`, and `null`, as well as classes defined in this API.
-		 * There are no restrictions when executing commands that have been contributed
+		 * `number`, `undefined`, and `null`, as well as [`Position`](#Position), [`Range`](#Range), [`Uri`](#Uri) and [`Location`](#Location).
+		 * * *Note 2:* There are no restrictions when executing commands that have been contributed
 		 * by extensions.
 		 *
 		 * @param command Identifier of the command to execute.
@@ -4055,6 +4104,17 @@ declare module 'vscode' {
 		export function getCommands(filterInternal?: boolean): Thenable<string[]>;
 	}
 
+	/**
+	 * Represents the state of a window.
+	 */
+	export interface WindowState {
+
+		/**
+		 * Whether the current window is focused.
+		 */
+		readonly focused: boolean;
+	}
+
 	/**
 	 * Namespace for dealing with the current window of the editor. That is visible
 	 * and active editors, as well as, UI elements to show messages, selections, and
@@ -4107,6 +4167,19 @@ declare module 'vscode' {
 		 */
 		export const onDidCloseTerminal: Event<Terminal>;
 
+		/**
+		 * Represents the current window's state.
+		 *
+		 * @readonly
+		 */
+		export let state: WindowState;
+
+		/**
+		 * An [event](#Event) which fires when the focus state of the current window
+		 * changes. The value of the event represents whether the window is focused.
+		 */
+		export const onDidChangeWindowState: Event<WindowState>;
+
 		/**
 		 * Show the given document in a text editor. A [column](#ViewColumn) can be provided
 		 * to control where the editor is being shown. Might change the [active editor](#window.activeTextEditor).
@@ -4688,7 +4761,7 @@ declare module 'vscode' {
 
 	/**
 	 * A workspace folder is one of potentially many roots opened by the editor. All workspace folders
-	 * are equal which means there is notion of an active or master workspace folder.
+	 * are equal which means there is no notion of an active or master workspace folder.
 	 */
 	export interface WorkspaceFolder {
 
@@ -5315,6 +5388,12 @@ declare module 'vscode' {
 		 */
 		readonly faded?: boolean;
 
+		/**
+		 * The title for a specific
+		 * [source control resource state](#SourceControlResourceState).
+		 */
+		readonly tooltip?: string;
+
 		/**
 		 * The light theme decorations.
 		 */
@@ -5400,6 +5479,11 @@ declare module 'vscode' {
 		 */
 		readonly label: string;
 
+		/**
+		 * The [input box](#SourceControlInputBox) for this source control.
+		 */
+		readonly inputBox: SourceControlInputBox;
+
 		/**
 		 * The UI-visible count of [resource states](#SourceControlResourceState) of
 		 * this source control.
@@ -5451,14 +5535,17 @@ declare module 'vscode' {
 	export namespace scm {
 
 		/**
-		 * The [input box](#SourceControlInputBox) in the Source Control viewlet.
+		 * ~~The [input box](#SourceControlInputBox) for the last source control
+		 * created by the extension.~~
+		 *
+		 * @deprecated Use [SourceControl.inputBox](#SourceControl.inputBox) instead
 		 */
 		export const inputBox: SourceControlInputBox;
 
 		/**
 		 * Creates a new [source control](#SourceControl) instance.
 		 *
-		 * @param id A unique `id` for the source control. Something short, eg: `git`.
+		 * @param id An `id` for the source control. Something short, eg: `git`.
 		 * @param label A human-readable string for the source control. Eg: `Git`.
 		 * @return An instance of [source control](#SourceControl).
 		 */
@@ -5470,14 +5557,14 @@ declare module 'vscode' {
 	 */
 	export interface DebugConfiguration {
 		/**
-		 * The type for the debug session.
+		 * The type of the debug session.
 		 */
 		type: string;
 
 		/**
-		 * An optional name for the debug session.
+		 * The name of the debug session.
 		 */
-		name?: string;
+		name: string;
 
 		/**
 		 * The request type of the debug session.

From e44b05368cac0e42097d8386155658c7fb0c8c65 Mon Sep 17 00:00:00 2001
From: Bruce Kellerman <bruce.kellerman@gatherhere.com>
Date: Thu, 14 Mar 2019 12:20:45 -0400
Subject: [PATCH 649/924] added routing parameter to mget that was missing

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

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 0d12a931ed..bba1839260 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -235,6 +235,15 @@ client.mget({
   // ...
 });
 
+client.mget({
+  routing: "myroute",
+  body: {
+    ids: [1, 2, 3]
+  }
+}, (error, response) => {
+  // ...
+});
+
 client.search({
   index: 'myindex',
   q: 'title:test'
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 1c986b3001..c2e13b2108 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -452,6 +452,7 @@ export interface MGetParams extends GenericParams {
     preference?: string;
     realtime?: boolean;
     refresh?: boolean;
+    routing?: string;
     _source?: NameList;
     _sourceExclude?: NameList;
     _sourceInclude?: NameList;

From c2b879aaf6c2dd19c237cfca3a31de9b492a5e2c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 14 Mar 2019 10:34:54 -0700
Subject: [PATCH 650/924] Fix 2 previously-missed lints

---
 types/redux-shortcuts/index.d.ts   |  2 +-
 types/space-pen/space-pen-tests.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/redux-shortcuts/index.d.ts b/types/redux-shortcuts/index.d.ts
index 6b3ab667fb..7b1752e486 100644
--- a/types/redux-shortcuts/index.d.ts
+++ b/types/redux-shortcuts/index.d.ts
@@ -7,7 +7,7 @@
 import { ActionCreator, Action, Dispatch } from "redux";
 import Mousetrap = require('mousetrap');
 
-export {Mousetrap};
+export { Mousetrap };
 export const mousetrap: MousetrapInstance;
 
 export function bindShortcut(
diff --git a/types/space-pen/space-pen-tests.ts b/types/space-pen/space-pen-tests.ts
index 4beebddae1..d6e087b8b8 100644
--- a/types/space-pen/space-pen-tests.ts
+++ b/types/space-pen/space-pen-tests.ts
@@ -5,12 +5,12 @@ import View = SpacePen.View;
 
 class Spacecraft extends View {
 	static content() {
-		this.div(()=> {
-			this.h1("Spacecraft");
-			this.ol(()=> {
-				this.li("Apollo");
-				this.li("Soyuz");
-				this.li("Space Shuttle");
+		Spacecraft.div(()=> {
+			Spacecraft.h1("Spacecraft");
+			Spacecraft.ol(()=> {
+				Spacecraft.li("Apollo");
+				Spacecraft.li("Soyuz");
+				Spacecraft.li("Space Shuttle");
 			});
 		});
 	}

From 531c228b22c0d330473e34198172b280732fddb5 Mon Sep 17 00:00:00 2001
From: bmkrol823 <bmkrol823@users.noreply.github.com>
Date: Thu, 14 Mar 2019 14:28:54 -0400
Subject: [PATCH 651/924] Fabric: Additional methods defined/updated (#33875)

* Added some more definitions for use.

* Updated type for vptCoords so they are correct and also added a few more type defs
---
 types/fabric/fabric-impl.d.ts | 61 +++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 8e973de1ab..4e7fec0258 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -865,7 +865,7 @@ interface IShadowOptions {
 	/**
 	 * Whether the shadow should affect stroke operations
 	 */
-	affectStrike?: boolean;
+	affectStroke?: boolean;
 	/**
 	 * Indicates whether toObject should include default values
 	 */
@@ -1038,7 +1038,7 @@ interface IStaticCanvasOptions {
 	 * The coordinates get updated with @method calcViewportBoundaries.
 	 * @memberOf fabric.StaticCanvas.prototype
 	 */
-	vptCoords?: {tl: number, tr: number, bl: number, br: number}
+	vptCoords?: {tl: {x: number, y: number}, tr: {x: number, y: number}, bl: {x: number, y: number}, br: {x: number, y: number}}
 	/**
 	 * Based on vptCoords and object.aCoords, skip rendering of objects that
 	 * are not included in current viewport.
@@ -3529,6 +3529,40 @@ export class Object {
 	 * @return {fabric.Point}
 	 */
 	translateToGivenOrigin(pointL: Point, fromOriginX: string, fromOriginY: string, toOriginX: string, toOriginY: string): Point;
+	/*
+     * Calculate object dimensions from its properties
+     * @private
+     * @return {Object} .x width dimension
+     * @return {Object} .y height dimension
+     */
+	_getNonTransformedDimensions(): {x: number, y: number};
+	/**
+	 *
+	 * @param ctx
+	 * @private
+	 */
+	_renderStroke(ctx: CanvasRenderingContext2D): void;
+	/**
+	 * @private
+	 * @param {CanvasRenderingContext2D} ctx Context to render on
+	 */
+	_removeShadow(ctx: CanvasRenderingContext2D): void;
+	/**
+	 * @private
+	 * Sets line dash
+	 * @param {CanvasRenderingContext2D} ctx Context to set the dash line on
+	 * @param {Array} dashArray array representing dashes
+	 * @param {Function} alternative function to call if browser does not support lineDash
+	 */
+	_setLineDash(ctx: CanvasRenderingContext2D, dashArray: number[], alternative: Function): void;
+	/**
+	 * @private
+	 * @param {CanvasRenderingContext2D} ctx Context to render on
+	 * @param {Object} filler fabric.Pattern or fabric.Gradient
+	 * @return {Object} offset.offsetX offset for text rendering
+	 * @return {Object} offset.offsetY offset for text rendering
+	 */
+	_applyPatternGradientTransform(ctx: CanvasRenderingContext2D, filler: string | Pattern | Gradient): void;
 }
 
 interface IPathOptions extends IObjectOptions {
@@ -3940,6 +3974,20 @@ export class Text extends Object {
 	 * @return {Boolean}
 	 */
 	styleHas(property: string, lineIndex?: number): boolean;
+	/**
+	 * Measure a single line given its index. Used to calculate the initial
+	 * text bounding box. The values are calculated and stored in __lineWidths cache.
+	 * @private
+	 * @param {Number} lineIndex line number
+	 * @return {Number} Line width
+	 */
+	getLineWidth(lineIndex: number): number;
+	/**
+	 * @private
+	 * @param {Number} lineIndex index text line
+	 * @return {Number} Line left offset
+	 */
+	_getLineLeftOffset(lineIndex: number): number
 }
 interface ITextOptions extends TextOptions {
 	/**
@@ -4372,6 +4420,15 @@ export class IText extends Text {
 	 * @param {Event} e Event object
 	 */
 	setCursorByClick(e: Event): void;
+	/**
+	 * @private
+	 */
+	_getNewSelectionStartFromOffset(mouseOffset: {x: number, y: number}, prevWidth: number, width: number, index: number, jlen: number): number;
+	/**
+	 * @private
+	 * @param {CanvasRenderingContext2D} ctx Context to render on
+	 */
+	_render(ctx: CanvasRenderingContext2D): void;
 }
 interface ITextboxOptions extends ITextOptions {
 	/**

From 8f1a38f0fe933f03036d2c9d4eabe4d000c75332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BE=A1=E8=BE=99?= <zwl.sjtu@gmail.com>
Date: Fri, 15 Mar 2019 02:29:18 +0800
Subject: [PATCH 652/924] add option for media query
 apache/incubator-echarts#9612 (#33865)

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

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 873060c5f4..1332f0114a 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -188,7 +188,7 @@ declare namespace echarts {
          *     immediately
          */
         setOption(
-            option: EChartOption,
+            option: EChartOption | EChartsResponsiveOption,
             notMerge?: boolean,
             lazyUpdate?: boolean
         ) : void
@@ -918,6 +918,26 @@ declare namespace echarts {
         useUTC?: boolean,
     }
 
+    type EChartsMediaOption = {
+        query: {
+            width?: number,
+            height?: number,
+            aspectRatio?: number,
+            minWidth?: number,
+            minHeight?: number,
+            minAspectRatio?: number,
+            maxWidth?: number,
+            maxHeight?: number,
+            maxAspectRatio?: number
+        },
+        option: EChartOption
+    }
+
+    interface EChartsResponsiveOption {
+        baseOption?: EChartOption,
+        media?: EChartsMediaOption[]
+    }
+
     interface EChartsOptionConfig {
         notMerge?: boolean,
         lazyUpdate?: boolean,

From 9febaaf805b768e5c6c6241a8b5a8277f30d8108 Mon Sep 17 00:00:00 2001
From: Jojoshua <Jojoshua@gmail.com>
Date: Thu, 14 Mar 2019 14:29:36 -0400
Subject: [PATCH 653/924] Tabulator tables 4.2 fixes (#33862)

* Fix field required. Replace tick with tickCross

* searchFunc should be optional
---
 types/tabulator-tables/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/tabulator-tables/index.d.ts b/types/tabulator-tables/index.d.ts
index ba03cbabae..749ce30f32 100644
--- a/types/tabulator-tables/index.d.ts
+++ b/types/tabulator-tables/index.d.ts
@@ -1107,7 +1107,7 @@ You can pass an optional additional property with sorter, sorterParams that shou
     interface AutoCompleteParams {
         values: true | string[] | JSONRecord;
         listItemFormatter?: (value: string, text: string) => string;
-        searchFunc: (term: string, values: string[]) => string[];
+        searchFunc?: (term: string, values: string[]) => string[];
         allowEmpty?: boolean;
         freetext?: boolean;
         showListOnEmpty?: boolean;

From b22395c9ea40077f3456b80f52d4c8744ce763b6 Mon Sep 17 00:00:00 2001
From: Colin Doig <colindoig@gmail.com>
Date: Fri, 15 Mar 2019 07:29:59 +1300
Subject: [PATCH 654/924] add ImageMapType properties. (#33863)

ImageMapTypeOptions.tileSize is required
add StyledMapType properties
---
 types/googlemaps/googlemaps-tests.ts | 33 ++++++++++++++++++++++++++++
 types/googlemaps/index.d.ts          | 16 +++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/types/googlemaps/googlemaps-tests.ts b/types/googlemaps/googlemaps-tests.ts
index a62a0e23b1..9a123caa6f 100644
--- a/types/googlemaps/googlemaps-tests.ts
+++ b/types/googlemaps/googlemaps-tests.ts
@@ -455,3 +455,36 @@ service.findPlaceFromPhoneNumber({
 const autocomplete = new google.maps.places.Autocomplete(document.createElement('input'));
 const placeResult = autocomplete.getPlace();
 placeResult.name; // $ExpectType string
+
+/***** google.maps.ImageMapType *****/
+const imageMapType = new google.maps.ImageMapType({
+    alt: 'alt',
+    getTileUrl: (tileCoord: google.maps.Point, zoom: number) => 'string',
+    maxZoom: 20,
+    minZoom: 10,
+    name: 'name',
+    opacity: 0.5,
+    tileSize: new google.maps.Size(256, 256),
+});
+imageMapType.alt; // $ExpectType string
+imageMapType.maxZoom; // $ExpectType number
+imageMapType.minZoom; // $ExpectType number
+imageMapType.name; // $ExpectType string
+imageMapType.projection; // $ExpectType Projection
+imageMapType.radius; // $ExpectType number
+imageMapType.tileSize; // $ExpectType Size
+
+/***** google.maps.StyledMapType *****/
+const styledMapType = new google.maps.StyledMapType([], {
+    alt: 'alt',
+    maxZoom: 20,
+    minZoom: 10,
+    name: 'name',
+});
+styledMapType.alt; // $ExpectType string
+styledMapType.maxZoom; // $ExpectType number
+styledMapType.minZoom; // $ExpectType number
+styledMapType.name; // $ExpectType string
+styledMapType.projection; // $ExpectType Projection
+styledMapType.radius; // $ExpectType number
+styledMapType.tileSize; // $ExpectType Size
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 000917313b..b51ae7bfa6 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -1813,6 +1813,13 @@ declare namespace google.maps {
     getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
     releaseTile(tile: Element): void;
     setOpacity(opacity: number): void;
+    alt: string;
+    maxZoom: number;
+    minZoom: number;
+    name: string;
+    projection: Projection;
+    radius: number;
+    tileSize: Size;
   }
 
   export interface ImageMapTypeOptions {
@@ -1822,13 +1829,20 @@ declare namespace google.maps {
     minZoom?: number;
     name?: string;
     opacity?: number;
-    tileSize?: Size;
+    tileSize: Size;
   }
 
   export class StyledMapType extends MVCObject implements MapType {
     constructor(styles: MapTypeStyle[], options?: StyledMapTypeOptions);
     getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
     releaseTile(tile: Element): void;
+    alt: string;
+    maxZoom: number;
+    minZoom: number;
+    name: string;
+    projection: Projection;
+    radius: number;
+    tileSize: Size;
   }
 
   export interface StyledMapTypeOptions {

From a77a4e12d9f06a95464a5044c11a6e2022b99693 Mon Sep 17 00:00:00 2001
From: Amiram Korach <amiramk@gmail.com>
Date: Thu, 14 Mar 2019 20:30:22 +0200
Subject: [PATCH 655/924] Add methods for ContentPanelView according to docs
 (#33857)

https://www.inboxsdk.com/docs/#ContentPanelView
---
 types/inboxsdk/inboxsdk-tests.ts | 2 ++
 types/inboxsdk/index.d.ts        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/types/inboxsdk/inboxsdk-tests.ts b/types/inboxsdk/inboxsdk-tests.ts
index 19329b9d63..51f6e506a1 100644
--- a/types/inboxsdk/inboxsdk-tests.ts
+++ b/types/inboxsdk/inboxsdk-tests.ts
@@ -377,6 +377,8 @@ InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
       iconUrl: 'http://url.com',
     });
 
+    const isActive: boolean = contentPanel.isActive();
+    contentPanel.open();
     contentPanel.remove();
     const destroyed: boolean = contentPanel.destroyed;
     contentPanel.on('destroy', () => console.log());
diff --git a/types/inboxsdk/index.d.ts b/types/inboxsdk/index.d.ts
index f6adb9f229..2e71e8f8cf 100644
--- a/types/inboxsdk/index.d.ts
+++ b/types/inboxsdk/index.d.ts
@@ -451,6 +451,10 @@ declare namespace InboxSDK {
     type MessageViewViewStates = 'HIDDEN' | 'COLLAPSED' | 'EXPANDED';
 
     interface ContentPanelView {
+      isActive(): boolean;
+
+      open(): void;
+
       remove(): void;
 
       on(name: 'destroy' | 'activate' | 'deactivate', cb: () => void): void;

From 3b1a841ff759ce4d55e30aec102ba006625988fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eerban=20Ghi=C5=A3=C4=83?= <serbanghita@gmail.com>
Date: Thu, 14 Mar 2019 20:30:53 +0200
Subject: [PATCH 656/924] [puppeteer] Added SecurityDetails object and
 response.securityDetails() method (#33840)

* Added SecurityDetails object and response.securityDetails() method

* Added descriptions like in the docs.
---
 types/puppeteer/index.d.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index e043587e16..6d18282804 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -4,6 +4,7 @@
 //                 Christopher Deutsch <https://github.com/cdeutsch>
 //                 Konstantin Simon Maria Möllers <https://github.com/ksm2>
 //                 Simon Schick <https://github.com/SimonSchick>
+//                 Serban Ghita <https://github.com/SerbanGhita>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1073,6 +1074,19 @@ export interface RemoteInfo {
     port: number;
 }
 
+export interface SecurityDetails {
+    /** A string with the name of issuer of the certificate. (e.g. "Let's Encrypt Authority X3"). */
+    issuer(): string;
+    /** String with the security protocol (e.g. TLS 1.2). */
+    protocol(): string;
+    /** Name of the subject to which the certificate was issued to (e.g. "www.example.com"). */
+    subjectName(): string;
+    /** Timestamp stating the start of validity of the certificate. */
+    validFrom(): number;
+    /** Timestamp stating the end of validity of the certificate. */
+    validTo(): number;
+}
+
 /** Response class represents responses which are received by page. */
 export interface Response {
   /** Promise which resolves to a buffer with response body. */
@@ -1094,6 +1108,8 @@ export interface Response {
   ok(): boolean;
   /** Returns remote connection info */
   remoteAddress(): RemoteInfo;
+  /** Returns an object with security details associated with the response. */
+  securityDetails(): SecurityDetails | null;
   /** A matching Request object. */
   request(): Request;
   /** Contains the status code of the response (e.g., 200 for a success). */

From c35336fc947110a2f80706a3af2e5c0b00a7b1fe Mon Sep 17 00:00:00 2001
From: Mateo Mejia <mateo-io@users.noreply.github.com>
Date: Thu, 14 Mar 2019 13:31:14 -0500
Subject: [PATCH 657/924] [add] clickable prop to react-tooltip (#33852)

react-tooltip version 3.10.0 supports adding an optional `clickable: boolean` prop.
---
 types/react-tooltip/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index aba9cdf734..6818d36a5e 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -107,6 +107,7 @@ declare namespace ReactTooltip {
         class?: string;
         watchWindow?: boolean;
         sanitizeHtmlOptions?: SanitizeHtmlOptions;
+        clickable?: boolean;
     }
 }
 

From f324a9eca7ad4f9039bab45083121ec1369775c6 Mon Sep 17 00:00:00 2001
From: "Jeroen Claassens (Favna)" <jeroen.claassens@live.nl>
Date: Thu, 14 Mar 2019 19:31:38 +0100
Subject: [PATCH 658/924] mui-datatables: Extra types for subcomponents +
 Updated for lib updates (#33656)

* Typings for subcomponents

* Added args for functions and updated test

Signed-off-by: Jeroen Claassens <support@favna.xyz>

* Add custom search

Signed-off-by: Jeroen Claassens <jeroen.claassens@rws.nl>

* Export Table Column Options

This is to further support providing data as an object as you will need to define the column options properly in that situation.

* Properly export submodules

* Resolve arguments in customFooter

Requested in comment by @cwbuecheler

* Fix linting
---
 types/mui-datatables/index.d.ts               | 204 +++++++++++++++++-
 types/mui-datatables/mui-datatables-tests.tsx |  22 +-
 2 files changed, 204 insertions(+), 22 deletions(-)

diff --git a/types/mui-datatables/index.d.ts b/types/mui-datatables/index.d.ts
index 1be1289ac6..c177e7b50d 100644
--- a/types/mui-datatables/index.d.ts
+++ b/types/mui-datatables/index.d.ts
@@ -3,13 +3,13 @@
 // Definitions by: Jeroen "Favna" Claassens <https://github.com/favna>
 //                 Ankith Konda <https://github.com/ankithkonda>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.1
 
 import * as React from 'react';
 
 interface MUIDataTableData {
     index: number;
-    data: any[];
+    data: Array<object|number[]|string[]>;
 }
 
 interface MUIDataTableStateRows {
@@ -43,12 +43,6 @@ interface MUIDataTableCustomHeadRenderer extends MUIDataTableColumn {
     index: number;
 }
 
-interface MUIDataTableColumn {
-    name: string;
-    label?: string;
-    options?: MUIDataTableColumnOptions;
-}
-
 interface MUIDataTableTextLabelsBody {
     noMatch: string;
     toolTip: string;
@@ -86,6 +80,12 @@ interface MUIDataTableTextLabelsSelectedRows {
     deleteAria: string;
 }
 
+export interface MUIDataTableColumn {
+    name: string;
+    label?: string;
+    options?: MUIDataTableColumnOptions;
+}
+
 export interface MUIDataTableTextLabels {
     body: MUIDataTableTextLabelsBody;
     pagination: MUIDataTableTextLabelsPagination;
@@ -101,6 +101,7 @@ export interface MUIDataTableColumnOptions {
     filterList?: string[];
     filterOptions?: string[];
     sort?: boolean;
+    searchable?: boolean;
     sortDirection?: 'asc' | 'desc';
     download?: boolean;
     hint?: string;
@@ -123,6 +124,7 @@ export interface MUIDataTableOptions {
     expandableRows?: boolean;
     renderExpandableRow?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => React.ReactNode;
     customToolbar?: () => React.ReactNode;
+    customFooter?: (rowCount: number, page: number, rowsPerPage: number, changeRowsPerPage: () => any, changePage: number) => React.ReactNode;
     customToolbarSelect?: (
         selectedRows: {
             data: Array<{ index: number; dataIndex: number }>;
@@ -131,8 +133,8 @@ export interface MUIDataTableOptions {
         displayData: Array<{ data: any[]; dataIndex: number }>,
         setSelectedRows: (rows: number[]) => void
     ) => React.ReactNode;
-    customFooter?: () => React.ReactNode;
     customSort?: (data: any[], colIndex: number, order: string) => any[];
+    customSearch?: (searchQuery: string, currentRow: any[], columns: any[]) => boolean;
     elevation?: number;
     caseSensitive?: boolean;
     responsive?: 'stacked' | 'scroll';
@@ -173,10 +175,192 @@ export interface MuiDatatablesTableState {
 export interface MUIDataTableProps {
     title: string;
     columns: MUIDataTableColumnDef[];
-    data: any[];
+    data: Array<object|number[]|string[]>;
     options?: MUIDataTableOptions;
 }
 
+export interface MUIDataTablePopover {
+    action?: (...args: any) => any;
+    elevation?: number;
+    option?: boolean;
+    onClose?: (...args: any) => any;
+    onExited?: (...args: any) => any;
+    anchorEl?: React.ReactNode;
+    ref?: any;
+    anchorOrigin?: any;
+    transformOrigin?: any;
+}
+
+export interface MUIDataTableBody {
+    data: Array<object|number[]|string[]>;
+    count: number;
+    columns: MUIDataTableColumnDef[];
+    options: object;
+    filterList?: string[][];
+    onRowClick?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => void;
+    selectedRows?: object;
+    selectRowUpdate?: (...args: any) => any;
+    searchText?: string;
+    toggleExpandRow?: (...args: any) => any;
+    classes: object;
+}
+
+export interface MUIDataTableBodyCell {
+    classes?: object;
+    colIndex?: number;
+    columnHeader?: any;
+    options?: object;
+    dataIndex?: number;
+    rowIndex?: number;
+    className?: string;
+    children?: any;
+    otherProps?: any;
+}
+
+export interface MUIDataTableBodyRow {
+    options: object;
+    onClick?: (...args: any) => any;
+    rowSelected?: boolean;
+    classes?: object;
+    className?: string;
+}
+
+export interface MUIDataTableFilter {
+    filterData: any[];
+    filterList?: string[][];
+    options: object;
+    onFilterUpdate?: (...args: any) => any;
+    onFilterRest?: (...args: any) => any;
+    classes?: object;
+}
+
+export interface MUIDataTableFilterList {
+    filterList: string[][];
+    onFilterUpdate?: (...args: any) => any;
+    classes?: object;
+}
+
+export interface MUIDataTableFooter {
+    options?: object;
+    rowCount?: number;
+    page?: number;
+    rowsPerPage?: number;
+    changeRowsPerPage?: (...args: any) => any;
+    changePage?: any;
+}
+
+export interface MUIDataTableHead {
+    classes?: object;
+    columns?: MUIDataTableColumnDef[];
+    count?: number;
+    options?: object;
+    data?: any[];
+    page?: any;
+    setCellRef?: any;
+    selectedRows?: any;
+}
+
+export interface MUIDataTableHeadCell {
+    classes?: object;
+    options: object;
+    sortDirection?: 'asc' | 'desc';
+    toggleSort: (...args: any) => any;
+    sort: boolean;
+    hint: string;
+    children?: any;
+}
+
+export interface MUIDataTableHeadRow {
+    classes?: object;
+}
+
+export interface MUIDataTablePagination {
+    count: number;
+    options: object;
+    page: number;
+    rowsPerPage: number;
+    changeRowsPerPage: (...args: any) => any;
+}
+
+export interface MUIDataTableResize {
+    classes?: object;
+    options?: object;
+    rowSelected?: boolean;
+    setResizeable?: (...args: any) => any;
+    updateDividers?: (...args: any) => any;
+}
+
+export interface MUIDataTableSearch {
+    classes?: object;
+    options?: object;
+    onHide?: (...args: any) => any;
+    onSearch?: (...args: any) => any;
+}
+
+export interface MUIDataTableSelectCell {
+    checked: boolean;
+    fixedHeader: boolean;
+    isHeaderCell?: boolean;
+    expandableOn?: boolean;
+    selectableOn?: boolean;
+    isRowExpanded?: boolean;
+    isRowSelectable?: boolean;
+    onChange?: (...args: any) => any;
+    onExpand?: (...args: any) => any;
+    classes?: object;
+    otherProps?: any;
+}
+
+export interface MUIDataTableToolbar {
+    data?: any[];
+    classes?: object;
+    columns: MUIDataTableColumnDef[];
+    options?: object;
+    setTableActions?: (...args: any) => any;
+    searchTextUpdate?: (...args: any) => any;
+    filterData?: any;
+    filterList?: string[][];
+    filterUpdate?: any;
+    resetFilters?: any;
+    toggleViewColumn?: any;
+    title?: any;
+    tableRef?: (...args: any) => any;
+}
+
+export interface MUIDataTableToolbarSelect {
+    options: object;
+    rowSelected?: boolean;
+    displayData?: any;
+    onRowsDelete?: (...args: any) => any;
+    selectRowUpdate?: (...args: any) => any;
+    classes?: object;
+}
+
+export interface MUIDataTableViewCol {
+    columns: any[];
+    object: object;
+    onColumnUpdate: (...args: any) => any;
+    classes?: object;
+}
+
 declare const MUIDataTable: React.ComponentType<MUIDataTableProps>;
 
+export const Popover: React.Component<MUIDataTablePopover>;
+export const TableBodyCell: React.Component<MUIDataTableBodyCell>;
+export const TableBody: React.Component<MUIDataTableBody>;
+export const TableBodyRow: React.Component<MUIDataTableBodyRow>;
+export const TableFilter: React.Component<MUIDataTableFilter>;
+export const TableFilterList: React.Component<MUIDataTableFilterList>;
+export const TableFooter: React.Component<MUIDataTableFooter>;
+export const TableHeadCell: React.Component<MUIDataTableHeadCell>;
+export const TableHead: React.Component<MUIDataTableHead>;
+export const TableHeadRow: React.Component<MUIDataTableHeadRow>;
+export const TablePagination: React.Component<MUIDataTablePagination>;
+export const TableResize: React.Component<MUIDataTableResize>;
+export const TableSearch: React.Component<MUIDataTableSearch>;
+export const TableSelectCell: React.Component<MUIDataTableSelectCell>;
+export const TableToolbar: React.Component<MUIDataTableToolbar>;
+export const TableToolbarSelect: React.Component<MUIDataTableToolbarSelect>;
+export const TableViewCol: React.Component<MUIDataTableViewCol>;
+
 export default MUIDataTable;
diff --git a/types/mui-datatables/mui-datatables-tests.tsx b/types/mui-datatables/mui-datatables-tests.tsx
index 7fd89a488b..a92988386e 100644
--- a/types/mui-datatables/mui-datatables-tests.tsx
+++ b/types/mui-datatables/mui-datatables-tests.tsx
@@ -7,14 +7,14 @@ interface Props extends MUIDataTableOptions {
     textLabels?: MUIDataTableTextLabels;
 }
 
-class MuiCustomTable extends React.Component<Props> {
-    private readonly data: string[][] = this.props.data.map((asset: any) => Object.values(asset));
-    private readonly columns = this.props.data
-                                .map((entry: any) => Object.keys(entry))
-                                .flat()
-                                .map((title: string) => title.toUpperCase())
-                                .filter((element: string, index: number, array: string[]) => array.indexOf(element) === index);
-    private readonly TableOptions: MUIDataTableOptions = {
+const MuiCustomTable: React.FC<Props> = (props) => {
+    const data: string[][] = props.data.map((asset: any) => Object.values(asset));
+    const columns = props.data
+                        .map((entry: any) => Object.keys(entry))
+                        .flat()
+                        .map((title: string) => title.toUpperCase())
+                        .filter((element: string, index: number, array: string[]) => array.indexOf(element) === index);
+    const TableOptions: MUIDataTableOptions = {
         filterType: 'checkbox',
         responsive: 'scroll',
         selectableRows: false,
@@ -75,10 +75,8 @@ class MuiCustomTable extends React.Component<Props> {
         }
     };
 
-    render() {
-        return (<MUIDataTable title={this.props.title} data={this.data} columns={this.columns} options={this.TableOptions}/>);
-    }
-}
+    return (<MUIDataTable title={props.title} data={data} columns={columns} options={TableOptions}/>);
+};
 
 const TableFruits = [
     {id: 1, name: "Apple", amount: 1},

From ad15fb42c502ab407112cb9c3c6aa87aaa6165d9 Mon Sep 17 00:00:00 2001
From: SardineFish <Sardine@live.cn>
Date: Fri, 15 Mar 2019 02:32:34 +0800
Subject: [PATCH 659/924] [openpgp] Update declarations in openpgp package
 (#33833)

* Update declarations in openpgp/util & some incorrect declarations following the latest jsdoc.

* Update tests of openpgp/util & fix declarations.
---
 types/openpgp/index.d.ts             | 278 ++++++++++++++++++++++-----
 types/openpgp/openpgp-tests.ts       |  21 +-
 types/openpgp/ts3.2/index.d.ts       | 278 ++++++++++++++++++++++-----
 types/openpgp/ts3.2/openpgp-tests.ts |  21 +-
 4 files changed, 484 insertions(+), 114 deletions(-)

diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 628663a9ec..636d83faff 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -5,6 +5,7 @@
 //                 Daniel Montesinos <https://github.com/damonpam>
 //                 Carlos Villavicencio <https://github.com/po5i>
 //                 Eric Camellini <https://github.com/ecamellini>
+//                 SardineFIsh <https://github.com/SardineFish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -761,7 +762,7 @@ export namespace packet {
 
         getBitSize(): number;
         getFingerprint(): string;
-        getKeyId(): string;
+        getKeyId(): Keyid;
         read(input: string): any;
         write(): any;
     }
@@ -785,77 +786,264 @@ export namespace packet {
 }
 
 export namespace util {
-    /** Convert an array of integers(0.255) to a string
-        @param bin An array of (binary) integers to convert
+    /**
+     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+     * Also, convert ReadableStreams to MessagePorts
+     * @param obj the options object to be passed to the web worker
+     * @returns an array of binary data to be passed
      */
-    function bin2str(bin: Array<number>): string;
+    function getTransferables(obj: Object): ArrayBuffer[];
 
-    /** Calculates a 16bit sum of a string by adding each character codes modulus 65535
-        @param text string to create a sum of
+    /**
+     * Convert MessagePorts back to ReadableStreams
+     * @param obj
+     * @returns
      */
-    function calc_checksum(text: string): number;
+    function restoreStreams(obj: Object): Object;
 
-    /** Convert a string of utf8 bytes to a native javascript string
-        @param utf8 A valid squence of utf8 bytes
+    /**
+     * Create hex string from a binary
+     * @param str String to convert
+     * @returns String containing the hexadecimal values
      */
-    function decode_utf8(utf8: string): string
+    function str_to_hex(str: String): String;
 
-    /** Convert a native javascript string to a string of utf8 bytes
-        param str The string to convert
+    /**
+     * Create binary string from a hex encoded string
+     * @param str Hex string to convert
+     * @returns
      */
-    function encode_utf8(str: string): string
+    function hex_to_str(str: String): String;
 
-    /** Return the algorithm type as string
+    /**
+     * Convert a Uint8Array to an MPI-formatted Uint8Array.
+     * Note: the output is **not** an MPI object.
+     * @see
+     * @see
+     * @param bin An array of 8-bit integers to convert
+     * @returns MPI-formatted Uint8Array
      */
-    function get_hashAlgorithmString(): string
+    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
 
-    /** Get native Web Cryptography api. The default configuration is to use the api when available. But it can also be deactivated with config.useWebCrypto
+    /**
+     * Convert a Base-64 encoded string an array of 8-bit integer
+     * Note: accepts both Radix-64 and URL-safe strings
+     * @param base64 Base-64 encoded string to convert
+     * @returns An array of 8-bit integers
      */
-    function getWebCrypto(): Object
+    function b64_to_Uint8Array(base64: String): Uint8Array;
 
-    /** Create binary string from a hex encoded string
-        @param str Hex string to convert
+    /**
+     * Convert an array of 8-bit integer to a Base-64 encoded string
+     * @param bytes An array of 8-bit integers to convert
+     * @param url If true, output is URL-safe
+     * @returns Base-64 encoded string
      */
-    function hex2bin(str: string): string;
+    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): String;
 
-    /** Creating a hex string from an binary array of integers (0..255)
-        @param str Array of bytes to convert
+    /**
+     * Convert a hex string to an array of 8-bit integers
+     * @param hex A hex string to convert
+     * @returns An array of 8-bit integers
      */
-    function hexidump(str: string): string;
+    function hex_to_Uint8Array(hex: String): Uint8Array;
 
-    /** Create hexstring from a binary
-        @param str string to convert
+    /**
+     * Convert an array of 8-bit integers to a hex string
+     * @param bytes Array of 8-bit integers to convert
+     * @returns Hexadecimal representation of the array
      */
-    function hexstrdump(str: string): string;
+    function Uint8Array_to_hex(bytes: Uint8Array): String;
 
-    /** Helper function to print a debug message. Debug messages are only printed if
-        @param str string of the debug message
+    /**
+     * Convert a string to an array of 8-bit integers
+     * @param str String to convert
+     * @returns An array of 8-bit integers
      */
-    function print_debug(str: string): void;
+    function str_to_Uint8Array(str: String): Uint8Array;
 
-    /** Helper function to print a debug message. Debug messages are only printed if
-        @param str string of the debug message
+    /**
+     * Convert an array of 8-bit integers to a string
+     * @param bytes An array of 8-bit integers to convert
+     * @returns String representation of the array
      */
-    function print_debug_hexstr_dump(str: string): void;
+    function Uint8Array_to_str(bytes: Uint8Array): String;
 
-    /** Shifting a string to n bits right
-        @param value The string to shift
-        @param bitcount Amount of bits to shift (MUST be smaller than 9)
+    /**
+     * Convert a native javascript string to a Uint8Array of utf8 bytes
+     * @param str The string to convert
+     * @returns A valid squence of utf8 bytes
      */
-    function shiftRight(value: string, bitcount: number): string;
+    function encode_utf8(str: String | ReadableStream): Uint8Array | ReadableStream;
 
-    /** Convert a string to an array of integers(0.255)
-        @param str string to convert
+    /**
+     * Convert a Uint8Array of utf8 bytes to a native javascript string
+     * @param utf8 A valid squence of utf8 bytes
+     * @returns A native javascript string
      */
-    function str2bin(str: string): Array<number>;
+    function decode_utf8(utf8: Uint8Array | ReadableStream): String | ReadableStream;
 
-    /** Convert a string to a Uint8Array
-        @param str string to convert
+    /**
+     * Concat a list of Uint8Arrays, Strings or Streams
+     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+     * @param Array of Uint8Arrays/Strings/Streams to concatenate
+     * @returns Concatenated array
      */
-    function str2Uint8Array(str: string): Uint8Array;
+    var concat: any;
 
-    /** Convert a Uint8Array to a string. This currently functions the same as bin2str.
-        @param bin An array of (binary) integers to convert
+    /**
+     * Concat Uint8Arrays
+     * @param Array of Uint8Arrays to concatenate
+     * @returns Concatenated array
      */
-    function Uint8Array2str(bin: Uint8Array): string;
+    var concatUint8Array: any;
+
+    /**
+     * Check Uint8Array equality
+     * @param first array
+     * @param second array
+     * @returns equality
+     */
+    function equalsUint8Array(first: Uint8Array, second: Uint8Array): Boolean;
+
+    /**
+     * Calculates a 16bit sum of a Uint8Array by adding each character
+     * codes modulus 65535
+     * @param Uint8Array to create a sum of
+     * @returns 2 bytes containing the sum of all charcodes % 65535
+     */
+    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug(str: String): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexarray_dump(str: String): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexstr_dump(str: String): void;
+
+    /**
+     * Helper function to print a debug error. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_error(str: String): void;
+
+    /**
+     * Read a stream to the end and print it to the console when it's closed.
+     * @param str String of the debug message
+     * @param input Stream to print
+     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+     */
+    function print_entire_stream(str: String, input: ReadableStream | Uint8Array | String, concat: Function): void;
+
+    /**
+     * If S[1] == 0, then double(S) == (S[2..128] || 0);
+     * otherwise, double(S) == (S[2..128] || 0) xor
+     * (zeros(120) || 10000111).
+     * Both OCB and EAX (through CMAC) require this function to be constant-time.
+     * @param data
+     */
+    /* Illegal function name 'double' can't be used here
+    export function double(data: Uint8Array): void;
+    */
+
+    /**
+     * Shift a Uint8Array to the right by n bits
+     * @param array The array to shift
+     * @param bits Amount of bits to shift (MUST be smaller
+     *        than 8)
+     * @returns Resulting array.
+     */
+    function shiftRight(array: Uint8Array, bits: number): String;
+
+    /**
+     * Get native Web Cryptography api, only the current version of the spec.
+     * The default configuration is to use the api when available. But it can
+     * be deactivated with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCrypto(): Object;
+
+    /**
+     * Get native Web Cryptography api for all browsers, including legacy
+     * implementations of the spec e.g IE11 and Safari 8/9. The default
+     * configuration is to use the api when available. But it can be deactivated
+     * with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCryptoAll(): Object;
+
+    /**
+     * Detect Node.js runtime.
+     */
+    function detectNode(): void;
+
+    /**
+     * Get native Node.js module
+     * @param The module to require
+     * @returns The required module or 'undefined'
+     */
+    function nodeRequire(The: String): Object;
+
+    /**
+     * Get native Node.js crypto api. The default configuration is to use
+     * the api when available. But it can also be deactivated with config.use_native
+     * @returns The crypto module or 'undefined'
+     */
+    function getNodeCrypto(): Object;
+
+    /**
+     * Get native Node.js Buffer constructor. This should be used since
+     * Buffer is not available under browserify.
+     * @returns The Buffer constructor or 'undefined'
+     */
+    function getNodeBuffer(): Function;
+
+    /**
+     * Format user id for internal use.
+     */
+    function formatUserId(): void;
+
+    /**
+     * Parse user id.
+     */
+    function parseUserId(): void;
+
+    /**
+     * Normalize line endings to \r\n
+     */
+    function canonicalizeEOL(): void;
+
+    /**
+     * Convert line endings from canonicalized \r\n to native \n
+     */
+    function nativeEOL(): void;
+
+    /**
+     * Remove trailing spaces and tabs from each line
+     */
+    function removeTrailingSpaces(): void;
+
+    /**
+     * Encode input buffer using Z-Base32 encoding.
+     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+     * @param data The binary data to encode
+     * @returns Binary data encoded using Z-Base32
+     */
+    function encodeZBase32(data: Uint8Array): String;
 }
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 100941074a..b4ff8d9487 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -179,7 +179,7 @@ openpgp.crypto.hash.getHashByteLength(openpgp.enums.hash.md5);
 
 openpgp.crypto.random.getRandomBigInteger(0);
 openpgp.crypto.random.getRandomBytes(0);
-openpgp.crypto.random.getRandomValues(openpgp.util.str2Uint8Array(""));
+openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
 openpgp.crypto.random.getSecureRandom(0, 1);
 
 openpgp.crypto.signature.sign(openpgp.enums.hash.md5, openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
@@ -195,18 +195,15 @@ openpgp.message.readArmored("");
 openpgp.packet.fromStructuredClone({});
 openpgp.packet.newPacketFromTag("");
 
-openpgp.util.bin2str([0, 1]);
-openpgp.util.calc_checksum("");
-openpgp.util.decode_utf8("");
+openpgp.util.Uint8Array_to_str(new Uint8Array([1, 0]));
+openpgp.util.decode_utf8(new Uint8Array([1, 0]));
 openpgp.util.encode_utf8("");
-openpgp.util.get_hashAlgorithmString();
 openpgp.util.getWebCrypto();
-openpgp.util.hex2bin("");
-openpgp.util.hexidump("");
-openpgp.util.hexstrdump("");
+openpgp.util.hex_to_Uint8Array("");
+openpgp.util.print_debug_hexarray_dump("");
+openpgp.util.print_debug_hexstr_dump("");
 openpgp.util.print_debug("");
 openpgp.util.print_debug_hexstr_dump("");
-openpgp.util.shiftRight("", 1);
-openpgp.util.str2bin("");
-openpgp.util.str2Uint8Array("");
-openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
+openpgp.util.shiftRight(new Uint8Array([1, 0]), 1);
+openpgp.util.str_to_Uint8Array("");
+openpgp.util.Uint8Array_to_str(openpgp.util.str_to_Uint8Array(""));
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index e7f8cdd714..13b2d1646d 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -5,6 +5,7 @@
 //                 Daniel Montesinos <https://github.com/damonpam>
 //                 Carlos Villavicencio <https://github.com/po5i>
 //                 Eric Camellini <https://github.com/ecamellini>
+//                 SardineFIsh <https://github.com/SardineFish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace openpgp;
@@ -760,7 +761,7 @@ export namespace packet {
 
         getBitSize(): number;
         getFingerprint(): string;
-        getKeyId(): string;
+        getKeyId(): Keyid;
         read(input: string): any;
         write(): any;
     }
@@ -784,77 +785,264 @@ export namespace packet {
 }
 
 export namespace util {
-    /** Convert an array of integers(0.255) to a string
-        @param bin An array of (binary) integers to convert
+    /**
+     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+     * Also, convert ReadableStreams to MessagePorts
+     * @param obj the options object to be passed to the web worker
+     * @returns an array of binary data to be passed
      */
-    function bin2str(bin: Array<number>): string;
+    function getTransferables(obj: Object): ArrayBuffer[];
 
-    /** Calculates a 16bit sum of a string by adding each character codes modulus 65535
-        @param text string to create a sum of
+    /**
+     * Convert MessagePorts back to ReadableStreams
+     * @param obj
+     * @returns
      */
-    function calc_checksum(text: string): number;
+    function restoreStreams(obj: Object): Object;
 
-    /** Convert a string of utf8 bytes to a native javascript string
-        @param utf8 A valid squence of utf8 bytes
+    /**
+     * Create hex string from a binary
+     * @param str String to convert
+     * @returns String containing the hexadecimal values
      */
-    function decode_utf8(utf8: string): string
+    function str_to_hex(str: String): String;
 
-    /** Convert a native javascript string to a string of utf8 bytes
-        param str The string to convert
+    /**
+     * Create binary string from a hex encoded string
+     * @param str Hex string to convert
+     * @returns
      */
-    function encode_utf8(str: string): string
+    function hex_to_str(str: String): String;
 
-    /** Return the algorithm type as string
+    /**
+     * Convert a Uint8Array to an MPI-formatted Uint8Array.
+     * Note: the output is **not** an MPI object.
+     * @see
+     * @see
+     * @param bin An array of 8-bit integers to convert
+     * @returns MPI-formatted Uint8Array
      */
-    function get_hashAlgorithmString(): string
+    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
 
-    /** Get native Web Cryptography api. The default configuration is to use the api when available. But it can also be deactivated with config.useWebCrypto
+    /**
+     * Convert a Base-64 encoded string an array of 8-bit integer
+     * Note: accepts both Radix-64 and URL-safe strings
+     * @param base64 Base-64 encoded string to convert
+     * @returns An array of 8-bit integers
      */
-    function getWebCrypto(): Object
+    function b64_to_Uint8Array(base64: String): Uint8Array;
 
-    /** Create binary string from a hex encoded string
-        @param str Hex string to convert
+    /**
+     * Convert an array of 8-bit integer to a Base-64 encoded string
+     * @param bytes An array of 8-bit integers to convert
+     * @param url If true, output is URL-safe
+     * @returns Base-64 encoded string
      */
-    function hex2bin(str: string): string;
+    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): String;
 
-    /** Creating a hex string from an binary array of integers (0..255)
-        @param str Array of bytes to convert
+    /**
+     * Convert a hex string to an array of 8-bit integers
+     * @param hex A hex string to convert
+     * @returns An array of 8-bit integers
      */
-    function hexidump(str: string): string;
+    function hex_to_Uint8Array(hex: String): Uint8Array;
 
-    /** Create hexstring from a binary
-        @param str string to convert
+    /**
+     * Convert an array of 8-bit integers to a hex string
+     * @param bytes Array of 8-bit integers to convert
+     * @returns Hexadecimal representation of the array
      */
-    function hexstrdump(str: string): string;
+    function Uint8Array_to_hex(bytes: Uint8Array): String;
 
-    /** Helper function to print a debug message. Debug messages are only printed if
-        @param str string of the debug message
+    /**
+     * Convert a string to an array of 8-bit integers
+     * @param str String to convert
+     * @returns An array of 8-bit integers
      */
-    function print_debug(str: string): void;
+    function str_to_Uint8Array(str: String): Uint8Array;
 
-    /** Helper function to print a debug message. Debug messages are only printed if
-        @param str string of the debug message
+    /**
+     * Convert an array of 8-bit integers to a string
+     * @param bytes An array of 8-bit integers to convert
+     * @returns String representation of the array
      */
-    function print_debug_hexstr_dump(str: string): void;
+    function Uint8Array_to_str(bytes: Uint8Array): String;
 
-    /** Shifting a string to n bits right
-        @param value The string to shift
-        @param bitcount Amount of bits to shift (MUST be smaller than 9)
+    /**
+     * Convert a native javascript string to a Uint8Array of utf8 bytes
+     * @param str The string to convert
+     * @returns A valid squence of utf8 bytes
      */
-    function shiftRight(value: string, bitcount: number): string;
+    function encode_utf8(str: String | ReadableStream): Uint8Array | ReadableStream;
 
-    /** Convert a string to an array of integers(0.255)
-        @param str string to convert
+    /**
+     * Convert a Uint8Array of utf8 bytes to a native javascript string
+     * @param utf8 A valid squence of utf8 bytes
+     * @returns A native javascript string
      */
-    function str2bin(str: string): Array<number>;
+    function decode_utf8(utf8: Uint8Array | ReadableStream): String | ReadableStream;
 
-    /** Convert a string to a Uint8Array
-        @param str string to convert
+    /**
+     * Concat a list of Uint8Arrays, Strings or Streams
+     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+     * @param Array of Uint8Arrays/Strings/Streams to concatenate
+     * @returns Concatenated array
      */
-    function str2Uint8Array(str: string): Uint8Array;
+    var concat: any;
 
-    /** Convert a Uint8Array to a string. This currently functions the same as bin2str.
-        @param bin An array of (binary) integers to convert
+    /**
+     * Concat Uint8Arrays
+     * @param Array of Uint8Arrays to concatenate
+     * @returns Concatenated array
      */
-    function Uint8Array2str(bin: Uint8Array): string;
+    var concatUint8Array: any;
+
+    /**
+     * Check Uint8Array equality
+     * @param first array
+     * @param second array
+     * @returns equality
+     */
+    function equalsUint8Array(first: Uint8Array, second: Uint8Array): Boolean;
+
+    /**
+     * Calculates a 16bit sum of a Uint8Array by adding each character
+     * codes modulus 65535
+     * @param Uint8Array to create a sum of
+     * @returns 2 bytes containing the sum of all charcodes % 65535
+     */
+    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug(str: String): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexarray_dump(str: String): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexstr_dump(str: String): void;
+
+    /**
+     * Helper function to print a debug error. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_error(str: String): void;
+
+    /**
+     * Read a stream to the end and print it to the console when it's closed.
+     * @param str String of the debug message
+     * @param input Stream to print
+     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+     */
+    function print_entire_stream(str: String, input: ReadableStream | Uint8Array | String, concat: Function): void;
+
+    /**
+     * If S[1] == 0, then double(S) == (S[2..128] || 0);
+     * otherwise, double(S) == (S[2..128] || 0) xor
+     * (zeros(120) || 10000111).
+     * Both OCB and EAX (through CMAC) require this function to be constant-time.
+     * @param data
+     */
+    /* Illegal function name 'double' can't be used here
+    export function double(data: Uint8Array): void;
+    */
+
+    /**
+     * Shift a Uint8Array to the right by n bits
+     * @param array The array to shift
+     * @param bits Amount of bits to shift (MUST be smaller
+     *        than 8)
+     * @returns Resulting array.
+     */
+    function shiftRight(array: Uint8Array, bits: number): String;
+
+    /**
+     * Get native Web Cryptography api, only the current version of the spec.
+     * The default configuration is to use the api when available. But it can
+     * be deactivated with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCrypto(): Object;
+
+    /**
+     * Get native Web Cryptography api for all browsers, including legacy
+     * implementations of the spec e.g IE11 and Safari 8/9. The default
+     * configuration is to use the api when available. But it can be deactivated
+     * with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCryptoAll(): Object;
+
+    /**
+     * Detect Node.js runtime.
+     */
+    function detectNode(): void;
+
+    /**
+     * Get native Node.js module
+     * @param The module to require
+     * @returns The required module or 'undefined'
+     */
+    function nodeRequire(The: String): Object;
+
+    /**
+     * Get native Node.js crypto api. The default configuration is to use
+     * the api when available. But it can also be deactivated with config.use_native
+     * @returns The crypto module or 'undefined'
+     */
+    function getNodeCrypto(): Object;
+
+    /**
+     * Get native Node.js Buffer constructor. This should be used since
+     * Buffer is not available under browserify.
+     * @returns The Buffer constructor or 'undefined'
+     */
+    function getNodeBuffer(): Function;
+
+    /**
+     * Format user id for internal use.
+     */
+    function formatUserId(): void;
+
+    /**
+     * Parse user id.
+     */
+    function parseUserId(): void;
+
+    /**
+     * Normalize line endings to \r\n
+     */
+    function canonicalizeEOL(): void;
+
+    /**
+     * Convert line endings from canonicalized \r\n to native \n
+     */
+    function nativeEOL(): void;
+
+    /**
+     * Remove trailing spaces and tabs from each line
+     */
+    function removeTrailingSpaces(): void;
+
+    /**
+     * Encode input buffer using Z-Base32 encoding.
+     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+     * @param data The binary data to encode
+     * @returns Binary data encoded using Z-Base32
+     */
+    function encodeZBase32(data: Uint8Array): String;
 }
diff --git a/types/openpgp/ts3.2/openpgp-tests.ts b/types/openpgp/ts3.2/openpgp-tests.ts
index 7dffc0109b..9c19f87339 100644
--- a/types/openpgp/ts3.2/openpgp-tests.ts
+++ b/types/openpgp/ts3.2/openpgp-tests.ts
@@ -161,7 +161,7 @@ openpgp.crypto.hash.getHashByteLength(openpgp.enums.hash.md5);
 
 openpgp.crypto.random.getRandomBigInteger(0);
 openpgp.crypto.random.getRandomBytes(0);
-openpgp.crypto.random.getRandomValues(openpgp.util.str2Uint8Array(""));
+openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
 openpgp.crypto.random.getSecureRandom(0, 1);
 
 openpgp.crypto.signature.sign(openpgp.enums.hash.md5, openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
@@ -177,18 +177,15 @@ openpgp.message.readArmored("");
 openpgp.packet.fromStructuredClone({});
 openpgp.packet.newPacketFromTag("");
 
-openpgp.util.bin2str([0, 1]);
-openpgp.util.calc_checksum("");
-openpgp.util.decode_utf8("");
+openpgp.util.Uint8Array_to_str(new Uint8Array([1, 0]));
+openpgp.util.decode_utf8(new Uint8Array([1, 0]));
 openpgp.util.encode_utf8("");
-openpgp.util.get_hashAlgorithmString();
 openpgp.util.getWebCrypto();
-openpgp.util.hex2bin("");
-openpgp.util.hexidump("");
-openpgp.util.hexstrdump("");
+openpgp.util.hex_to_Uint8Array("");
+openpgp.util.print_debug_hexarray_dump("");
+openpgp.util.print_debug_hexstr_dump("");
 openpgp.util.print_debug("");
 openpgp.util.print_debug_hexstr_dump("");
-openpgp.util.shiftRight("", 1);
-openpgp.util.str2bin("");
-openpgp.util.str2Uint8Array("");
-openpgp.util.Uint8Array2str(openpgp.util.str2Uint8Array(""));
+openpgp.util.shiftRight(new Uint8Array([1, 0]), 1);
+openpgp.util.str_to_Uint8Array("");
+openpgp.util.Uint8Array_to_str(openpgp.util.str_to_Uint8Array(""));

From 568243ce7091ea67402c4509f3e1718215422f28 Mon Sep 17 00:00:00 2001
From: Julian Hundeloh <jaulz@users.noreply.github.com>
Date: Thu, 14 Mar 2019 19:33:06 +0100
Subject: [PATCH 660/924] [expo] fix: adjust WebBrowser types (#33869)

* fix: adjust WebBrowser types

See official types here: https://github.com/expo/expo/blob/master/packages/expo-web-browser/src/WebBrowser.ts
Or here in the docs: https://docs.expo.io/versions/v32.0.0/sdk/webbrowser/ (e.g., not "dimissed" but "dimiss" instead)

* fix: add tests

* fix: update test

* fix: change type to interface
---
 types/expo/expo-tests.tsx | 19 ++++++++++++++++++-
 types/expo/index.d.ts     | 18 +++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index c113b22576..a2aacb485e 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -51,7 +51,8 @@ import {
     SecureStore,
     SplashScreen,
     Svg,
-    Updates
+    Updates,
+    WebBrowser
 } from 'expo';
 
 const reverseGeocode: Promise<Location.GeocodeData[]> = Location.reverseGeocodeAsync({
@@ -1301,3 +1302,19 @@ async () => {
 SplashScreen.hide();
 SplashScreen.preventAutoHide();
 // #endregion
+
+// #region WebBrowser
+async () => {
+    const result1 = await WebBrowser.openBrowserAsync('https://google.com');
+    result1.type;
+
+    const result2 = await WebBrowser.openAuthSessionAsync('https://google.com', 'https://example.com');
+    if (result2.type === 'success') {
+        result2.url;
+    } else {
+        result2.type;
+    }
+
+    WebBrowser.dismissBrowser();
+};
+// #endregion
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 4ca39cd202..88e6ae9fd6 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -18,6 +18,7 @@
 //                 Satyajit Sahoo <https://github.com/satya164>
 //                 Vinit Sood <https://github.com/vinitsood>
 //                 Mattias Sämskar <https://github.com/mattiassamskar>
+//                 Julian Hundeloh <https://github.com/jaulz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -2865,9 +2866,20 @@ export class Video extends Component<VideoProps, VideoState> {
  * 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' }>;
+    interface BrowserResult {
+        type: 'cancel' | 'dismiss';
+    }
+
+    interface RedirectResult {
+        type: 'success';
+        url: string;
+    }
+
+    type AuthSessionResult = RedirectResult | BrowserResult;
+
+    function openBrowserAsync(url: string): Promise<BrowserResult>;
+    function openAuthSessionAsync(url: string, redirectUrl?: string): Promise<RedirectResult | BrowserResult>;
+    function dismissBrowser(): void;
 }
 
 // #region Calendar

From 382d630ccee8bf5f4c306ab3193cea8816dcd5a1 Mon Sep 17 00:00:00 2001
From: Mehdi Lahlou <mlahlou@protonmail.ch>
Date: Thu, 14 Mar 2019 19:33:42 +0100
Subject: [PATCH 661/924] fix(react-jsonschema-form): add missing types to
 `onFocus` and `onBlur` arguments of `WidgetProps` (#33871)

Add corresponding tests
---
 types/react-jsonschema-form/index.d.ts        |  4 ++--
 .../react-jsonschema-form-tests.tsx           | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index c43e04e589..fc4da16e0b 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -86,8 +86,8 @@ declare module "react-jsonschema-form" {
         onChange: (value: any) => void;
         options: object;
         formContext: any;
-        onBlur: (id: string, value: string) => void;
-        onFocus: (id: string, value: string) => void;
+        onBlur: (id: string, value: boolean | number | string | null) => void;
+        onFocus: (id: string, value: boolean | number | string | null) => void;
         label: string;
     }
 
diff --git a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
index 90116127fd..419b21cce5 100644
--- a/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
+++ b/types/react-jsonschema-form/react-jsonschema-form-tests.tsx
@@ -109,8 +109,26 @@ export class Example extends React.Component<any, IExampleState> {
     }
 }
 
-export const CustomWidget: React.SFC<WidgetProps> = (props) =>
+export const BooleanCustomWidget: React.SFC<WidgetProps> = (props) =>
+    <input
+        onFocus={()=> props.onFocus('id', true)}
+        onBlur={()=> props.onFocus('id', true)}
+    />
+
+export const NumberCustomWidget: React.SFC<WidgetProps> = (props) =>
+    <input
+        onFocus={()=> props.onFocus('id', 0)}
+        onBlur={()=> props.onFocus('id', 0)}
+    />
+
+export const StringCustomWidget: React.SFC<WidgetProps> = (props) =>
     <input
         onFocus={()=> props.onFocus('id', 'value')}
         onBlur={()=> props.onFocus('id', 'value')}
     />
+
+export const NullCustomWidget: React.SFC<WidgetProps> = (props) =>
+    <input
+        onFocus={()=> props.onFocus('id', null)}
+        onBlur={()=> props.onFocus('id', null)}
+    />

From bb6743473ee054c2c9dcf59800c82f6c68d973dd Mon Sep 17 00:00:00 2001
From: Jannik Keye <jannik.keye@gmail.com>
Date: Thu, 14 Mar 2019 19:34:10 +0100
Subject: [PATCH 662/924] fix: add missing linkTarget property to options
 interface (#33868)

---
 types/remarkable/lib/index.d.ts      | 5 +++++
 types/remarkable/remarkable-tests.ts | 1 +
 2 files changed, 6 insertions(+)

diff --git a/types/remarkable/lib/index.d.ts b/types/remarkable/lib/index.d.ts
index 48e3aa6772..c2c9b13511 100644
--- a/types/remarkable/lib/index.d.ts
+++ b/types/remarkable/lib/index.d.ts
@@ -104,6 +104,11 @@ declare namespace Remarkable {
          */
         linkify?: boolean;
 
+        /**
+         * Set target to open link in
+         */
+        linkTarget?: string;
+
         /**
          * Enable some language-neutral replacement + quotes beautification.
          */
diff --git a/types/remarkable/remarkable-tests.ts b/types/remarkable/remarkable-tests.ts
index 9c12632e69..c908af5f2a 100644
--- a/types/remarkable/remarkable-tests.ts
+++ b/types/remarkable/remarkable-tests.ts
@@ -19,6 +19,7 @@ export class RemarkableTest {
             breaks: false,
             langPrefix: "language-",
             linkify: false,
+            linkTarget: "_blank",
             typographer: false,
             quotes: "“”‘’",
             highlight(/*str, lang*/) { return ""; },

From 80591fb56d4c207899330bc19efb08c7b6941a50 Mon Sep 17 00:00:00 2001
From: Shikanime Deva <22115108+Shikanime@users.noreply.github.com>
Date: Thu, 14 Mar 2019 11:34:51 -0700
Subject: [PATCH 663/924] [sketchapp] Separate SketchMSPath from SketchMSLayer
 (#33874)

* Add nullable points and isClose

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

diff --git a/types/sketchapp/index.d.ts b/types/sketchapp/index.d.ts
index 79a9226508..375e7d4ef5 100644
--- a/types/sketchapp/index.d.ts
+++ b/types/sketchapp/index.d.ts
@@ -110,8 +110,11 @@ interface SketchMSImageDataReference {
 type SketchMSPointString = string;
 interface SketchMSPath {
   _class: 'path' | 'shapePath' | 'rectangle' | 'oval' | 'triangle';
-  isClosed?: boolean;
+  isClosed: boolean;
+  frame: SketchMSRect;
   points: SketchMSCurvePoint[];
+  style: SketchMSStyle;
+  layers: SketchMSPath[];
 }
 interface SketchMSCurvePoint {
   _class: 'curvePoint';
@@ -381,8 +384,6 @@ interface SketchMSSymbolMaster {
   attributedString: SketchMSAttributedString;
   name: string;
   layers: SketchMSLayer[];
-  points: SketchMSPath;
-  isClosed?: boolean;
   isVisible: boolean;
   nameIsFixed: boolean;
   grid: SketchMSSimpleGrid;

From aaa053673734bd402bc6502c97f96b1d0ce4f320 Mon Sep 17 00:00:00 2001
From: Ray Booysen <raybooysen@gmail.com>
Date: Fri, 15 Mar 2019 02:36:12 +0800
Subject: [PATCH 664/924] Update title (#33864)

Incorrect type definition in the comments.
---
 types/bunyan-seq/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/bunyan-seq/index.d.ts b/types/bunyan-seq/index.d.ts
index 6d2a29fb1c..c70b7bdacb 100644
--- a/types/bunyan-seq/index.d.ts
+++ b/types/bunyan-seq/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bunyan-blackhole 0.2
+// Type definitions for bunyan-seq 0.2
 // Project: https://github.com/datalust/bunyan-seq, https://github.com/continuousit/bunyan-seq
 // Definitions by: Ray Booysen <https://github.com/raybooysen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 1c11579652a0ca1cbe803e9416fdaee2f508910e Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Thu, 14 Mar 2019 20:33:57 +0100
Subject: [PATCH 665/924] Remove clean-webpack-plugin, v2.0.0 is written in
 TypeScript \o/ (#33877)

---
 notNeededPackages.json                        |  6 +++
 .../clean-webpack-plugin-tests.ts             | 17 -------
 types/clean-webpack-plugin/index.d.ts         | 48 -------------------
 types/clean-webpack-plugin/tsconfig.json      | 23 ---------
 types/clean-webpack-plugin/tslint.json        |  1 -
 5 files changed, 6 insertions(+), 89 deletions(-)
 delete mode 100644 types/clean-webpack-plugin/clean-webpack-plugin-tests.ts
 delete mode 100644 types/clean-webpack-plugin/index.d.ts
 delete mode 100644 types/clean-webpack-plugin/tsconfig.json
 delete mode 100644 types/clean-webpack-plugin/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 5f998b0b6c..812d1f9f1b 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -270,6 +270,12 @@
             "sourceRepoURL": "https://github.com/saltyrtc/chunked-dc-js",
             "asOfVersion": "0.2.2"
         },
+        {
+            "libraryName": "clean-webpack-plugin",
+            "typingsPackageName": "clean-webpack-plugin",
+            "sourceRepoURL": "https://github.com/johnagan/clean-webpack-plugin",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "colors.js (colors)",
             "typingsPackageName": "colors",
diff --git a/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts b/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts
deleted file mode 100644
index 6d60f36d51..0000000000
--- a/types/clean-webpack-plugin/clean-webpack-plugin-tests.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import CleanWebpackPlugin = require('clean-webpack-plugin');
-
-const paths = [
-	'path',
-	'glob/**/*.js',
-];
-
-new CleanWebpackPlugin(paths);
-new CleanWebpackPlugin(paths, 'root-directory');
-new CleanWebpackPlugin(paths, {});
-new CleanWebpackPlugin(paths, {
-	root: 'root-directory',
-	verbose: true,
-	dry: true,
-	watch: true,
-	exclude: ['a, b'],
-});
diff --git a/types/clean-webpack-plugin/index.d.ts b/types/clean-webpack-plugin/index.d.ts
deleted file mode 100644
index 7c23e51df5..0000000000
--- a/types/clean-webpack-plugin/index.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// Type definitions for clean-webpack-plugin 0.1
-// Project: https://github.com/johnagan/clean-webpack-plugin
-// Definitions by: Jed Fox <https://github.com/j-f1>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { Plugin } from 'webpack';
-
-export = CleanWebpackPlugin;
-
-declare class CleanWebpackPlugin extends Plugin {
-    /**
-     * @param paths A glob or array of globs to delete
-     */
-    constructor(paths: string | ReadonlyArray<string>, options?: string | CleanWebpackPlugin.Options);
-}
-
-declare namespace CleanWebpackPlugin {
-    interface Options {
-        /**
-         * Absolute path to your webpack root folder (paths appended to this)
-         * Default: root of your package
-         */
-        root?: string;
-        /**
-         * Write logs to the console.
-         */
-        verbose?: boolean;
-        /**
-         * Set to `true` to emulate deletion without actually removing any files.
-         */
-        dry?: boolean;
-        /**
-         * If true, remove files on recompile.
-         */
-        watch?: boolean;
-        /**
-         * Instead of removing whole path recursively,
-         * remove all path's content with exclusion of provided immediate children.
-         * Good for not removing shared files from build directories.
-         */
-        exclude?: ReadonlyArray<string>;
-        /**
-         * Allow the plugin to clean folders outside of the webpack root
-         */
-        allowExternal?: boolean;
-    }
-}
diff --git a/types/clean-webpack-plugin/tsconfig.json b/types/clean-webpack-plugin/tsconfig.json
deleted file mode 100644
index 8d0f70d644..0000000000
--- a/types/clean-webpack-plugin/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "clean-webpack-plugin-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/clean-webpack-plugin/tslint.json b/types/clean-webpack-plugin/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/clean-webpack-plugin/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From beddc9f5a90c2b3538070032b807ddf6ec64e447 Mon Sep 17 00:00:00 2001
From: Tony Wooster <twooster@gmail.com>
Date: Thu, 14 Mar 2019 20:35:18 +0100
Subject: [PATCH 666/924] Add types for centra and phin (#33887)

---
 types/centra/centra-tests.ts |  52 +++++++++++
 types/centra/index.d.ts      |  54 +++++++++++
 types/centra/tsconfig.json   |  23 +++++
 types/centra/tslint.json     |   1 +
 types/phin/index.d.ts        | 123 +++++++++++++++++++++++++
 types/phin/phin-tests.ts     | 172 +++++++++++++++++++++++++++++++++++
 types/phin/tsconfig.json     |  23 +++++
 types/phin/tslint.json       |   1 +
 8 files changed, 449 insertions(+)
 create mode 100644 types/centra/centra-tests.ts
 create mode 100644 types/centra/index.d.ts
 create mode 100644 types/centra/tsconfig.json
 create mode 100644 types/centra/tslint.json
 create mode 100644 types/phin/index.d.ts
 create mode 100644 types/phin/phin-tests.ts
 create mode 100644 types/phin/tsconfig.json
 create mode 100644 types/phin/tslint.json

diff --git a/types/centra/centra-tests.ts b/types/centra/centra-tests.ts
new file mode 100644
index 0000000000..908d94b41b
--- /dev/null
+++ b/types/centra/centra-tests.ts
@@ -0,0 +1,52 @@
+import centra = require('centra');
+import { URL } from 'url';
+
+function typeTests() {
+    // Test chaining
+    centra('http://google.com')
+        .query('param', 'value')
+        .path('mail')
+        .body({ a: 1, b: 2 })
+        .header({ a: 'b' })
+        .header('a', 'b')
+        .timeout(123)
+        .stream()
+        .compress()
+        .option('host', '123')
+        .option('port', 123)
+        .send().then(resp => {
+            resp.json().then((s: string) => s);
+            resp.text().then((s: string) => s);
+            resp.statusCode;
+            resp.coreRes;
+            resp.headers['asdf'];
+            resp.body.buffer.byteLength;
+        });
+
+    centra(new URL('google.com'))
+        .query('page', '2');
+}
+
+async function functionalTests() {
+    await centra('http://example.com').send().then(async r => {
+        if (r.statusCode !== 200) {
+            throw new Error('Bad status code');
+        }
+        r.text().then(t => t);
+    });
+
+    await centra(new URL('https://jsonplaceholder.typicode.com/todos'))
+        .query('userId', 1)
+        .timeout(1000)
+        .compress()
+        .send()
+        .then(r => {
+            r.json().then((todos: any[]) => {
+                if (!todos.every(t => t.userId === 1)) {
+                    throw new Error('Query params did not work');
+                }
+            });
+        });
+}
+
+functionalTests();
diff --git a/types/centra/index.d.ts b/types/centra/index.d.ts
new file mode 100644
index 0000000000..ae08d8ac2b
--- /dev/null
+++ b/types/centra/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for centra 2.2
+// Project: https://github.com/ethanent/centra
+// Definitions by: Tony Wooster <https://github.com/twooster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { RequestOptions, IncomingMessage } from 'http';
+import { URL } from 'url';
+
+interface CentraFactory {
+    (url: URL | string, method?: string): Centra.Request;
+}
+
+declare const Centra: CentraFactory;
+
+declare namespace Centra {
+    interface Response {
+        coreRes: IncomingMessage;
+        headers: IncomingMessage['headers'];
+        statusCode: IncomingMessage['statusCode'];
+        body: Buffer;
+
+        json(): Promise<any>;
+        text(): Promise<string>;
+    }
+
+    interface Request {
+        url: URL;
+        method: string;
+        data: string | Buffer | null;
+        sendDataAs: 'form' | 'json' | 'buffer' | null;
+        reqHeaders: { [k: string]: string };
+        streamEnabled: boolean;
+        compressionEnabled: boolean;
+        timeoutTime: number | null;
+        coreOptions: RequestOptions;
+
+        query(key: string, value: any): this;
+        query(params: { [k: string]: any }): this;
+        path(relativePath: string): this;
+        body(data: any, sendAs?: 'json' | 'buffer' | 'form'): this;
+        header(key: string, value: string): this;
+        header(headers: { [k: string]: string }): this;
+        timeout(timeMs: number): this;
+        option<T extends keyof RequestOptions>(key: T, value: RequestOptions[T]): this;
+        stream(): this;
+        compress(): this;
+        send(): Promise<Response>;
+    }
+}
+
+export = Centra;
diff --git a/types/centra/tsconfig.json b/types/centra/tsconfig.json
new file mode 100644
index 0000000000..6d690a3120
--- /dev/null
+++ b/types/centra/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",
+        "centra-tests.ts"
+    ]
+}
diff --git a/types/centra/tslint.json b/types/centra/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/centra/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/phin/index.d.ts b/types/phin/index.d.ts
new file mode 100644
index 0000000000..00130597e5
--- /dev/null
+++ b/types/phin/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for phin 3.3
+// Project: https://github.com/ethanent/phin
+// Definitions by: Tony Wooster <https://github.com/twooster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
+
+/// <reference types="node" />
+
+import { ClientRequestArgs, IncomingMessage } from 'http';
+import { URL } from 'url';
+import { Response as CentraResponse } from 'centra';
+
+type Options = Phin.Options;
+type BufferResponse = Phin.BufferResponse;
+type StreamResponse = Phin.StreamResponse;
+type JsonResponse = Phin.JsonResponse;
+type DefaultOpts = Phin.DefaultOpts;
+type BatchResponse = JsonResponse | BufferResponse;
+type AnyResponse = BatchResponse | StreamResponse;
+
+interface PhinFactory {
+    (optsOrUrl: (Options & { parse?: 'none', stream?: false }) | string): Promise<BufferResponse>;
+    (optsOrUrl: Options & { parse: 'json', stream?: false }): Promise<JsonResponse>;
+    (optsOrUrl: Options & { stream: true }): Promise<StreamResponse>;
+    (optsOrUrl: Options): Promise<AnyResponse>;
+
+    promisified(optsOrUrl: (Options & { parse?: 'none', stream?: false }) | string): Promise<BufferResponse>;
+    promisified(optsOrUrl: Options & { parse: 'json', stream?: false }): Promise<JsonResponse>;
+    promisified(optsOrUrl: Options & { stream: true }): Promise<StreamResponse>;
+    promisified(optsOrUrl: Options): Promise<AnyResponse>;
+
+    unpromisified(optsOrUrl: (Options & { parse?: 'none', stream?: false }) | string, cb: (err: unknown, resp: BufferResponse) => unknown): void;
+    unpromisified(optsOrUrl: Options & { parse: 'json', stream?: false }, cb: (err: unknown, resp: JsonResponse) => unknown): void;
+    unpromisified(optsOrUrl: Options & { stream: true }, cb: (err: unknown, resp: StreamResponse) => unknown): void;
+    unpromisified(optsOrUrl: Options, cb: (err: unknown, resp: AnyResponse) => unknown): void;
+
+    defaults(defaultOpts: DefaultOpts & { parse: 'json', stream?: false }):
+    {
+        (optsOrUrl: Options & { stream: true }): Promise<StreamResponse>
+        (optsOrUrl: Options & { parse: 'none', stream?: false }): Promise<BufferResponse>
+        (optsOrUrl: (Options & { parse?: 'json', stream?: false }) | string): Promise<JsonResponse>
+        (optsOrUrl: Options): Promise<AnyResponse>
+    };
+
+    defaults(defaultOpts: DefaultOpts & { parse?: 'none', stream?: false }):
+    {
+        (optsOrUrl: Options & { stream: true }): Promise<StreamResponse>
+        (optsOrUrl: Options & { parse: 'json', stream?: false }): Promise<JsonResponse>
+        (optsOrUrl: (Options & { parse?: 'none', stream?: false }) | string): Promise<BufferResponse>
+        (optsOrUrl: Options): Promise<AnyResponse>
+    };
+
+    defaults(defaultOpts: DefaultOpts & { parse: 'json', stream: true }):
+    {
+        (optsOrUrl: Options & { parse: 'none', stream: false }): Promise<BufferResponse>
+        (optsOrUrl: Options & { parse?: 'json', stream: false }): Promise<JsonResponse>
+        (optsOrUrl: (Options & { stream?: true }) | string): Promise<StreamResponse>
+        (optsOrUrl: Options | string): Promise<AnyResponse>
+    };
+
+    defaults(defaultOpts: DefaultOpts & { parse?: 'none', stream: true }):
+    {
+        (opts: Options & { parse: 'json', stream: false }): Promise<JsonResponse>
+        (opts: Options & { parse?: 'none', stream: false }): Promise<BufferResponse>
+        (opts: (Options & { stream?: true }) | string): Promise<StreamResponse>
+        (opts: Options): Promise<AnyResponse>
+    };
+
+    defaults(defaultOpts: DefaultOpts):
+    {
+        (optsOrUrl: Options & { stream: true }): Promise<StreamResponse>
+        (optsOrUrl: Options & { parse: 'json', stream: false }): Promise<JsonResponse>
+        (optsOrUrl: Options & { parse: 'none', stream: false }): Promise<BufferResponse>
+        (optsOrUrl: Options | string): Promise<AnyResponse>
+    };
+}
+
+declare const Phin: PhinFactory;
+
+declare namespace Phin {
+    interface DefaultOpts {
+        url?: string;
+        method?: string;
+        data?: any;
+        form?: { [k: string]: string };
+        headers?: { [k: string]: string };
+        core?: ClientRequestArgs;
+        parse?: 'none' | 'json';
+        followRedirects?: boolean;
+        compression?: boolean;
+        timeout?: number | null;
+        hostname?: string;
+        port?: number;
+        path?: string;
+        stream?: boolean;
+    }
+
+    interface Options extends DefaultOpts {
+        url: string;
+    }
+
+    interface BatchOptions extends Options {
+        stream: false;
+    }
+
+    interface StreamOptions extends Options {
+        stream: true;
+    }
+
+    interface StreamResponse extends IncomingMessage {
+        stream: StreamResponse;
+    }
+
+    interface BufferResponse extends IncomingMessage {
+        body: Buffer;
+    }
+
+    interface JsonResponse extends IncomingMessage {
+        body: any;
+    }
+}
+
+export = Phin;
diff --git a/types/phin/phin-tests.ts b/types/phin/phin-tests.ts
new file mode 100644
index 0000000000..9c42e2e128
--- /dev/null
+++ b/types/phin/phin-tests.ts
@@ -0,0 +1,172 @@
+import phin = require('phin');
+
+export function typeTests() {
+    function testParseNoneStreamFalse(o: { url: string, parse?: 'none', stream?: false } | string) {
+        phin(o); // $ExpectType Promise<BufferResponse>
+    }
+
+    function testParseJsonStreamFalse(o: { url: string, parse: 'json', stream?: false }) {
+        phin(o); // $ExpectType Promise<JsonResponse>
+    }
+
+    function testStreamTrue(o: { url: string, parse?: 'json' | 'none', stream: true }) {
+        phin(o); // $ExpectType Promise<StreamResponse>
+    }
+
+    function testCallbackParseNoneStreamFalse(o: { url: string, parse?: 'none', stream?: false } | string) {
+        phin.unpromisified(o, (_err, r) => {
+            r; // $ExpectType BufferResponse
+        });
+    }
+
+    function testCallbackParseJsonStreamFalse(o: { url: string, parse: 'json', stream?: false }) {
+        phin.unpromisified(o, (_err, r) => {
+            r; // $ExpectType JsonResponse
+        });
+    }
+
+    function testCallbackStreamTrue(o: { url: string, parse?: 'json' | 'none', stream: true }) {
+        phin.unpromisified(o, (_err, r) => {
+            r; // $ExpectType StreamResponse
+        });
+    }
+
+    function testCallbackAny(o: { url: string, parse?: 'json' | 'none', stream?: boolean }) {
+        phin.unpromisified(o, (_err, r) => {
+            r; // $ExpectType AnyResponse
+        });
+    }
+
+    function testDefaultsParseNoneStreamFalse(d: { parse?: 'none', stream?: false }) {
+        const p = phin.defaults(d);
+        return {
+            testSame(o: phin.Options & { parse?: 'none', stream?: false } | string) {
+                p(o); // $ExpectType Promise<BufferResponse>
+            },
+
+            testJson(o: phin.Options & { parse: 'json', stream?: false }) {
+                p(o); // $ExpectType Promise<JsonResponse>
+            },
+
+            testStream(o: phin.Options & { stream: true }) {
+                p(o); // $ExpectType Promise<StreamResponse>
+            },
+
+            testOthers(o: phin.Options) {
+                p(o); // $ExpectType Promise<AnyResponse>
+            }
+        };
+    }
+
+    function testDefaultsParseJsonStreamFalse(d: { parse: 'json', stream?: false }) {
+        const p = phin.defaults(d);
+        return {
+            testSame(o: phin.Options & { parse: 'none', stream?: false }) {
+                p(o); // $ExpectType Promise<BufferResponse>
+            },
+
+            testJson(o: phin.Options & { parse?: 'json', stream?: false } | string) {
+                p(o); // $ExpectType Promise<JsonResponse>
+            },
+
+            testStream(o: phin.Options & { stream: true }) {
+                p(o); // $ExpectType Promise<StreamResponse>
+            },
+
+            testOthers(o: phin.Options) {
+                p(o); // $ExpectType Promise<AnyResponse>
+            }
+        };
+    }
+
+    function testDefaultsParseJsonStreamTrue(d: { parse: 'json', stream: true }) {
+        const p = phin.defaults(d);
+        return {
+            testSame(o: phin.Options & { parse: 'none', stream: false }) {
+                p(o); // $ExpectType Promise<BufferResponse>
+            },
+
+            testJson(o: phin.Options & { parse?: 'json', stream: false }) {
+                p(o); // $ExpectType Promise<JsonResponse>
+            },
+
+            testStream(o: phin.Options & { stream?: true } | string) {
+                p(o); // $ExpectType Promise<StreamResponse>
+            },
+
+            testOthers(o: phin.Options) {
+                p(o); // $ExpectType Promise<AnyResponse>
+            }
+        };
+    }
+
+    function testDefaultsParseNoneStreamTrue(d: { parse?: 'none', stream: true }) {
+        const p = phin.defaults(d);
+        return {
+            testSame(o: phin.Options & { parse?: 'none', stream: false }) {
+                p(o); // $ExpectType Promise<BufferResponse>
+            },
+
+            testJson(o: phin.Options & { parse: 'json', stream: false }) {
+                p(o); // $ExpectType Promise<JsonResponse>
+            },
+
+            testStream(o: phin.Options & { stream?: true } | string) {
+                p(o); // $ExpectType Promise<StreamResponse>
+            },
+
+            testOthers(o: phin.Options) {
+                p(o); // $ExpectType Promise<AnyResponse>
+            }
+        };
+    }
+
+    function testDefaultsAny(d: { parse?: 'none' | 'json', stream?: boolean }) {
+        const p = phin.defaults(d);
+        return {
+            testSame(o: phin.Options & { parse: 'none', stream: false }) {
+                p(o); // $ExpectType Promise<BufferResponse>
+            },
+
+            testJson(o: phin.Options & { parse: 'json', stream: false }) {
+                p(o); // $ExpectType Promise<JsonResponse>
+            },
+
+            testStream(o: phin.Options & { stream: true }) {
+                p(o); // $ExpectType Promise<StreamResponse>
+            },
+
+            testOthers(o: phin.Options | string) {
+                p(o); // $ExpectType Promise<AnyResponse>
+            }
+        };
+    }
+}
+
+async function functionalTests() {
+    await phin('http://example.com').then(r => {
+        if (!Buffer.isBuffer(r.body)) { throw new Error('Not a buffer?'); }
+    });
+
+    await phin('http://placekitten.com/50/50').then(r => {
+        if (r.headers['content-type'] !== 'image/jpeg') {
+            throw new Error('expected a jpeg');
+        }
+    });
+
+    await phin({ url: 'https://jsonplaceholder.typicode.com/todos/1', parse: 'json' }).then(r => {
+        if (typeof r.body === 'string') {
+            throw new Error('Did not parse json');
+        }
+
+        if (typeof r.body.userId !== 'number') {
+            throw new Error('Did not get userId');
+        }
+    });
+
+    await phin({ url: 'https://jsonplaceholder.typicode.com/todos/1', stream: true }).then(r => {
+        r.on('end', () => {});
+    });
+}
+
+functionalTests();
diff --git a/types/phin/tsconfig.json b/types/phin/tsconfig.json
new file mode 100644
index 0000000000..3d4214514a
--- /dev/null
+++ b/types/phin/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",
+        "phin-tests.ts"
+    ]
+}
diff --git a/types/phin/tslint.json b/types/phin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/phin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b5e02f4863047cd2aa462194be0b202fd58bede7 Mon Sep 17 00:00:00 2001
From: Adam Dierkens <adierkens@users.noreply.github.com>
Date: Thu, 14 Mar 2019 12:35:50 -0700
Subject: [PATCH 667/924] Add types for carlo (#33861)

* Add carlo definitions

* Share expose function def

* Use puppeteer-core

* lint
---
 types/carlo/carlo-tests.ts |  32 +++
 types/carlo/index.d.ts     | 400 +++++++++++++++++++++++++++++++++++++
 types/carlo/tsconfig.json  |  25 +++
 types/carlo/tslint.json    |   1 +
 4 files changed, 458 insertions(+)
 create mode 100644 types/carlo/carlo-tests.ts
 create mode 100644 types/carlo/index.d.ts
 create mode 100644 types/carlo/tsconfig.json
 create mode 100644 types/carlo/tslint.json

diff --git a/types/carlo/carlo-tests.ts b/types/carlo/carlo-tests.ts
new file mode 100644
index 0000000000..d01636d969
--- /dev/null
+++ b/types/carlo/carlo-tests.ts
@@ -0,0 +1,32 @@
+import carlo = require('carlo');
+
+async function main() {
+    const app = await carlo.launch({
+        title: 'Test'
+    });
+
+    app.browserForTest();
+
+    const window = await app.createWindow({});
+    window.setBounds({
+        top: 10,
+        width: 30
+    });
+}
+
+(async () => {
+    // Launch the browser.
+    const app = await carlo.launch();
+
+    // Terminate Node.js process on app window closing.
+    app.on('exit', () => process.exit());
+
+    // Tell carlo where your web files are located.
+    app.serveFolder(__dirname);
+
+    // Expose 'env' function in the web environment.
+    await app.exposeFunction('env', _ => process.env);
+
+    // Navigate to the main page of your app.
+    await app.load('example.html');
+})();
diff --git a/types/carlo/index.d.ts b/types/carlo/index.d.ts
new file mode 100644
index 0000000000..7e7aea0fc3
--- /dev/null
+++ b/types/carlo/index.d.ts
@@ -0,0 +1,400 @@
+// Type definitions for carlo 0.9
+// Project: https://github.com/GoogleChromeLabs/carlo#readme
+// Definitions by: Adam Dierkens <https://github.com/adierkens>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import { Serializable, Browser, Page } from "puppeteer-core";
+
+export type Channel = string;
+
+/**
+ * Evaluates a function in the context of the page
+ * @param pageFunction  Function to be evaluated in the page context.
+ * @param args Arguments to pass to pageFunction.
+ *
+ * If the function passed to the Window.evaluate returns a Promise,
+ * then Window.evaluate would wait for the promise to resolve and return its value.
+ *
+ * If the function passed to the Window.evaluate returns a non-Serializable value,
+ * then Window.evaluate resolves to undefined.
+ */
+export type EvaluateFunction = (pageFunction: ((...args: any[]) => any) | string, ...args: Serializable[]) => Promise<Serializable>;
+
+export interface WindowOptions {
+    /**
+     * App window width in pixels.
+     */
+    width?: number;
+
+    /**
+     * App window height in pixels.
+     */
+    height?: number;
+
+    /**
+     * App window top offset in pixels.
+     */
+    top?: number;
+
+    /**
+     * App window left offset in pixels.
+     */
+    left?: number;
+
+    /**
+     * Background color using hex notation, defaults to '#ffffff'.
+     */
+    bgcolor?: string;
+}
+
+/**
+ * Set of configurable options to set on the app.
+ */
+export interface LaunchOptions extends WindowOptions {
+    /**
+     * Browser to be used, defaults to ['stable']
+     */
+    channel?: Channel[];
+
+    /**
+     * Application icon to be used in the system dock.
+     * Either buffer containing PNG or a path to the PNG file on the file system.
+     * This feature is only available in Chrome M72+.
+     * One can use 'canary' channel to see it in action before M72 hits stable.
+     */
+    icon?: Buffer | string;
+
+    /**
+     * Optional parameters to share between Carlo instances.
+     */
+    paramsForReuse?: any;
+
+    /**
+     * Application title
+     */
+    title?: string;
+
+    /**
+     *  Path to a User Data Directory. This folder is created upon the first app launch and contains user settings and Web storage data. Defaults to '.profile'.
+     */
+    userDataDir?: string;
+
+    /**
+     * Path to a Chromium or Chrome executable to run instead of the automatically located Chrome.
+     * If executablePath is a relative path, then it is resolved relative to current working directory.
+     * Carlo is only guaranteed to work with the latest Chrome stable version.
+     */
+    executablePath?: string;
+
+    /**
+     * Additional arguments to pass to the browser instance.
+     */
+    args?: string[];
+}
+
+export type AppEvent = 'exit' | 'window';
+export type WindowEvent = 'close';
+
+export interface Bounds {
+    /**
+     * Top offset in pixels.
+     */
+    top: number;
+
+    /**
+     * Left offset in pixels.
+     */
+    left: number;
+
+    /**
+     * Width in pixels.
+     */
+    width: number;
+
+    /**
+     * Height in pixels.
+     */
+    height: number;
+}
+
+export interface Window {
+    /**
+     * 'close' - Emitted when the window closes.
+     * @param name 'close'
+     */
+    on(name: AppEvent, callback: (...args: any[]) => void): void;
+
+    /**
+     * Returns window bounds
+     */
+    bounds(): Promise<Bounds>;
+
+    /**
+     * Brings this window to front.
+     */
+    bringToFront(): Promise<void>;
+
+    /**
+     * Closes this window.
+     */
+    close(): Promise<void>;
+
+    evaluate: EvaluateFunction;
+
+    /**
+     * @param name Name of the function on the window object.
+     * @param carloFunction Callback function which will be called in Carlo's context.
+     */
+    exposeFunction(name: string, carloFunction: (...args: any[]) => any): Promise<void>;
+
+    /**
+     * Turns the window into the full screen mode. Behavior is platform specific.
+     */
+    fullscreen(): Promise<void>;
+
+    /**
+     * Navigates the corresponding web page to the given uri,
+     * makes given params available in web page via carlo.loadParams()
+     * Resolves upon DOMContentLoaded event in the web page.
+     * @param uri Path to the resource relative to the folder passed into serveFolder()
+     * @param params Optional parameters to pass to the web application.
+     */
+    load(uri: string, params?: any): Promise<void>;
+
+    /**
+     * Maximizes the window. Behavior is platform-specific.
+     */
+    maximize(): Promise<void>;
+
+    /**
+     * Minimizes the window. Behavior is platform-specific.
+     */
+    minimize(): Promise<void>;
+
+    /**
+     * Returns Puppeteer page object for testing.
+     */
+    pageForTest(): Page;
+
+    /**
+     * Returns the options.paramsForReuse value passed into the carlo.launch.
+     */
+    paramsForReuse(): any;
+
+    /**
+     * Same as App.serveFolder(folder[, prefix]), but only applies to current window.
+     * @param folder Folder with web content to make available to Chrome.
+     * @param prefix Prefix of the URL path to serve from the given folder.
+     */
+    serveFolder(folder: string, prefix?: string): void;
+
+    /**
+     * Same as App.serveHandler(handler), but only applies to the current window requests.
+     * Only single window-level handler can be installed in window.
+     * @param handle Network handler callback accepting the HttpRequest parameter.
+     */
+    serveHandler(handle: (request: HttpRequest) => void): void;
+
+    /**
+     * Same as App.serveOrigin(base[, prefix]), but only applies to current window.
+     * @param base Base to serve web content from.
+     * @param prefix Prefix of the URL path to serve from the given folder.
+     */
+    serveOrigin(base: string, prefix?: string): Promise<void>;
+
+    /**
+     * Sets window bounds. Parameters top, left, width and height are all optional.
+     * Dimension or the offset is only applied when specified.
+     * @param bounds Window bounds
+     */
+    setBounds(bounds: {
+        /**
+         * Top offset in pixels.
+         */
+        top?: number;
+
+        /**
+         * Left offset in pixels.
+         */
+        left?: number;
+
+        /**
+         * Width in pixels.
+         */
+        width?: number;
+
+        /**
+         * Height in pixels.
+         */
+        height?: number;
+    }): Promise<void>;
+}
+
+export interface HttpRequest {
+    /**
+     * Aborts request.
+     * If request is a navigation request, navigation is aborted as well.
+     */
+    abort(): Promise<void>;
+
+    /**
+     * Proceeds with the default behavior for this request.
+     * Either serves it from the filesystem or defers to the browser.
+     */
+    continue(): Promise<void>;
+
+    /**
+     * Marks the request as failed.
+     * If request is a navigation request, navigation is still committed, but to a location that fails to be fetched.
+     */
+    fail(): Promise<void>;
+
+    /**
+     * Fulfills the network request with the given data. 'Content-Length' header is generated in case it is not listed in the headers.
+     */
+    fulfill(options: {
+        /**
+         * HTTP status code (200, 304, etc), defaults to 200.
+         */
+        status: number;
+
+        /**
+         * HTTP response headers.
+         */
+        headers: object;
+
+        /**
+         *  Response body.
+         */
+        body: Buffer;
+    }): Promise<void>;
+
+    /**
+     * Network request headers
+     */
+    headers(): object;
+
+    /**
+     * HTTP method of this network request (GET, POST, etc.)
+     */
+    method(): string;
+
+    /**
+     * Network request URL
+     */
+    url(): string;
+}
+
+export interface App {
+    /**
+     * 'exit' - Emitted when the last window closes.
+     * 'window' - Emitted when the new window opens.
+     * @param name 'exit' or 'window'
+     * @param callback
+     */
+    on(name: AppEvent, callback: (...args: any[]) => void): void;
+
+    /**
+     * Puppeteer browser object for testing.
+     */
+    browserForTest(): Browser;
+
+    createWindow(options?: WindowOptions): Promise<Window>;
+
+    evaluate: EvaluateFunction;
+
+    /**
+     * Closes the browser window
+     */
+    exit(): Promise<void>;
+
+    /**
+     * The method adds a function called name on the pages' window object.
+     * When called, the function executes carloFunction in Node.js and returns a Promise which resolves to the return value of carloFunction.
+     * @param name
+     * @param carloFunction
+     */
+    exposeFunction(name: string, carloFunction: (...args: any[]) => any): Promise<void>;
+
+    /**
+     * Shortcut to the main window's Window.load
+     * @param uri
+     * @param params
+     */
+    load(uri: string, ...params: any[]): Promise<void>;
+
+    /**
+     * Running app guarantees to have main window.
+     * If current main window closes, a next open window becomes the main one.
+     */
+    mainWindow(): Window;
+
+    /**
+     * Makes the content of the given folder available to the Chrome web app
+     * @param folder Folder with web content to make available to Chrome
+     * @param prefix Prefix of the URL path to serve from the given folder
+     */
+    serveFolder(folder: string, prefix?: string): void;
+
+    /**
+     * Handler function is called with every network request in this app.
+     * It can abort, continue or fulfill each request.
+     * Only single app-wide handler can be registered.
+     * @param handler Network handler callback accepting the HttpRequest parameter.
+     */
+    serveHandler(handler: (request: HttpRequest) => void): void;
+
+    /**
+     * Fetches Carlo content from the specified origin instead of reading it from the file system, eg http://localhost:8080.
+     * This mode can be used for the fast development mode available in web frameworks.
+     * @param base Base to serve web content from.
+     * @param prefix Prefix of the URL path to serve from the given folder.
+     */
+    serveOrigin(base: string, prefix?: string): void;
+
+    /**
+     * Specifies image to be used as an app icon in the system dock.
+     * This feature is only available in Chrome M72+. One can use 'canary' channel to see it in action before M72 hits stable.
+     * @param image Either buffer containing PNG or a path to the PNG file on the file system.
+     */
+    setIcon(image: Buffer | string): void;
+
+    /**
+     * Returns all currently opened windows.
+     * Running app guarantees to have at least one open window.
+     */
+    windows(): Window[];
+}
+
+/**
+ * Launches the browser
+ * @param options Set of configurable options to set on the app.
+ */
+export function launch(options?: LaunchOptions): Promise<App>;
+
+/**
+ * Enters headless test mode.
+ */
+export function enterTestMode(): void;
+
+/**
+ * Returns additional information about the file, otherwise not available to the web.
+ * Available in Chrome M73+
+ *
+ * @param file File to get additional information for
+ */
+export function fileInfo(file: any): Promise<{
+    /**
+     * absolute path to the given file
+     */
+    path: string;
+}>;
+
+/**
+ * This method is available in the Web world and returns parameters passed into the window.load().
+ * This is how Carlo passes initial set of <rpc> handles to Node objects into the web world.
+ */
+export function loadParams(): Promise<ReadonlyArray<any>>;
diff --git a/types/carlo/tsconfig.json b/types/carlo/tsconfig.json
new file mode 100644
index 0000000000..6bb4f11fe4
--- /dev/null
+++ b/types/carlo/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "target": "es2017",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "carlo-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/carlo/tslint.json b/types/carlo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/carlo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c3625fdd4853f60b881114190148ae43c0869a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jur=C4=A3is=20Rudaks?=
 <jurgisrudaks@users.noreply.github.com>
Date: Thu, 14 Mar 2019 21:41:30 +0200
Subject: [PATCH 668/924] Types for storybook__vue: Added addParameters type
 definition (#33732)

* Added addParameters type definition

* Version 5.0.1

* Removed patch version
---
 types/storybook__vue/index.d.ts              | 9 ++++++++-
 types/storybook__vue/storybook__vue-tests.ts | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/storybook__vue/index.d.ts b/types/storybook__vue/index.d.ts
index f91c9fa8e8..33c44a4925 100644
--- a/types/storybook__vue/index.d.ts
+++ b/types/storybook__vue/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for @storybook/vue 3.3
+// Type definitions for @storybook/vue 5.0
 // Project: https://github.com/storybooks/storybook, https://github.com/storybooks/storybook/tree/master/app/vue
 // Definitions by: Punit Gupta <https://github.com/pntgupta>
+//                 Jurgis Rudaks <https://github.com/jurgisrudaks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 // Created with the help of storybook__react types
@@ -11,12 +12,17 @@ import Vue, { ComponentOptions } from 'vue';
 
 // Story can be used as template or component
 export type StoryFunction = () => ComponentOptions<Vue> | string;
+
+export interface DecoratorParameters {
+    [key: string]: any;
+}
 export type StoryDecorator = (story: () => ComponentOptions<Vue>, context: { kind: string, story: string }) => ComponentOptions<Vue> | null;
 
 export interface Story {
     readonly kind: string;
     add(storyName: string, getStory: StoryFunction): this;
     addDecorator(decorator: StoryDecorator): this;
+    addParameters(parameters: DecoratorParameters): this;
 }
 
 export interface Addon {
@@ -33,6 +39,7 @@ export interface StoryObject {
 }
 
 export function addDecorator(decorator: StoryDecorator): void;
+export function addParameters(parameters: DecoratorParameters): void;
 export function configure(loaders: () => void, module: NodeModule): void;
 export function getStorybook(): StoryStore[];
 export function setAddon(addon: Addon): void;
diff --git a/types/storybook__vue/storybook__vue-tests.ts b/types/storybook__vue/storybook__vue-tests.ts
index 7c5c786ab7..b25e69e595 100644
--- a/types/storybook__vue/storybook__vue-tests.ts
+++ b/types/storybook__vue/storybook__vue-tests.ts
@@ -1,5 +1,5 @@
 import Vue, { ComponentOptions } from 'vue';
-import { addDecorator, configure, getStorybook, setAddon, storiesOf, StoryFunction, Story } from '@storybook/vue';
+import { addDecorator, configure, getStorybook, setAddon, storiesOf, StoryFunction, Story, addParameters, DecoratorParameters } from '@storybook/vue';
 
 interface CustomStory extends Story {
     addCentered(storyName: string, storyFn: StoryFunction): this;
@@ -22,8 +22,10 @@ const Decorator = (story: () => ComponentOptions<Vue>) => {
         }
     };
 };
+const parameters: DecoratorParameters = { parameter: 'foo' };
 
 addDecorator(Decorator);
+addParameters(parameters);
 configure(() => undefined, module);
 getStorybook().forEach(({ fileName, kind, stories }) => stories.forEach(({ name, render }) => render()));
 setAddon(addCenteredAddon);

From 3d3d37548bed9f4c4a0af5cbd4db7ad6d956603a Mon Sep 17 00:00:00 2001
From: Jonny Reeves <jonny@improbable.io>
Date: Thu, 14 Mar 2019 19:42:47 +0000
Subject: [PATCH 669/924] Add types for protoc-plugin (#33805)

* Add types for protoc-plugin

* Export simplePlugin as a namespace

* Remove unused file

* Use `require()` syntax in tests
---
 types/protoc-plugin/index.d.ts             | 27 ++++++++++++++++++++++
 types/protoc-plugin/protoc-plugin-tests.ts | 26 +++++++++++++++++++++
 types/protoc-plugin/tsconfig.json          | 23 ++++++++++++++++++
 types/protoc-plugin/tslint.json            |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/protoc-plugin/index.d.ts
 create mode 100644 types/protoc-plugin/protoc-plugin-tests.ts
 create mode 100644 types/protoc-plugin/tsconfig.json
 create mode 100644 types/protoc-plugin/tslint.json

diff --git a/types/protoc-plugin/index.d.ts b/types/protoc-plugin/index.d.ts
new file mode 100644
index 0000000000..c9d420c9e8
--- /dev/null
+++ b/types/protoc-plugin/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for protoc-plugin 0.0
+// Project: https://github.com/konsumer/node-protoc-plugin/
+// Definitions by: Jonny Reeves <https://github.com/jonnyreeves>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import {
+  CodeGeneratorRequest as pb_CodeGeneratorRequest,
+  CodeGeneratorResponse as pb_CodeGeneratorResponse
+} from "google-protobuf/google/protobuf/compiler/plugin_pb";
+import { FileDescriptorProto, SourceCodeInfo } from "google-protobuf/google/protobuf/descriptor_pb";
+import Location = SourceCodeInfo.Location;
+
+type OutputFiles = pb_CodeGeneratorResponse.File.AsObject[];
+type SimplePluginCallback = (filesToGenerate: ReadonlyArray<FileDescriptorProto.AsObject>) => (OutputFiles | Promise<OutputFiles>);
+
+declare function simplePlugin(cb: SimplePluginCallback): Promise<void>;
+declare namespace simplePlugin {
+	function CodeGeneratorRequest(stdin?: stream.Readable): Promise<pb_CodeGeneratorRequest>;
+	function CodeGeneratorResponse(stdout?: stream.Writable): (files: OutputFiles) => void;
+	function CodeGeneratorResponseError(stdout?: stream.Writable): (err: Error) => void;
+	function findCommentByPath(path: number[], locationList: Location.AsObject[]): string;
+}
+
+export = simplePlugin;
diff --git a/types/protoc-plugin/protoc-plugin-tests.ts b/types/protoc-plugin/protoc-plugin-tests.ts
new file mode 100644
index 0000000000..856a2c9dbd
--- /dev/null
+++ b/types/protoc-plugin/protoc-plugin-tests.ts
@@ -0,0 +1,26 @@
+import protocPlugin = require('protoc-plugin');
+import {
+  CodeGeneratorResponse as pb_CodeGeneratorResponse
+} from "google-protobuf/google/protobuf/compiler/plugin_pb";
+import FileObject = pb_CodeGeneratorResponse.File.AsObject;
+
+const {
+  CodeGeneratorRequest,
+  CodeGeneratorResponse,
+  CodeGeneratorResponseError
+} = protocPlugin;
+
+protocPlugin(filesToGenerate => {
+  const files: FileObject[] = [];
+  files.push({ name: "my_file.ts.d", content: "example" });
+  return files;
+});
+
+CodeGeneratorRequest()
+  .then(req => {
+    const files: FileObject[] = [];
+    files.push({ name: "my_file.ts.d", content: "example" });
+    return files;
+  })
+  .then(CodeGeneratorResponse())
+  .catch(CodeGeneratorResponseError());
diff --git a/types/protoc-plugin/tsconfig.json b/types/protoc-plugin/tsconfig.json
new file mode 100644
index 0000000000..741baad643
--- /dev/null
+++ b/types/protoc-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "protoc-plugin-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/protoc-plugin/tslint.json b/types/protoc-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/protoc-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e3037f9ba8cdf9a2b7dc97b119f8b46ab136089a Mon Sep 17 00:00:00 2001
From: Ifiok Jr <ifiokotung@gmail.com>
Date: Thu, 14 Mar 2019 20:06:11 +0000
Subject: [PATCH 670/924] [emoji-mart] export all types from top level import
 (#33598)

* fix: export all types from top level import

* fix: issues raised in PR

Also remove emoji-mart/dist-es/utils/emoji-index/index.d.ts since it doesn't exist in actual file structure
---
 types/emoji-mart/dist-es/index.d.ts           | 20 ++++++++++++-------
 .../dist-es/utils/emoji-index/index.d.ts      |  2 --
 types/emoji-mart/emoji-mart-tests.tsx         |  2 +-
 types/emoji-mart/tsconfig.json                |  3 +--
 4 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 types/emoji-mart/dist-es/utils/emoji-index/index.d.ts

diff --git a/types/emoji-mart/dist-es/index.d.ts b/types/emoji-mart/dist-es/index.d.ts
index bb0c79be3e..ca17399d5c 100644
--- a/types/emoji-mart/dist-es/index.d.ts
+++ b/types/emoji-mart/dist-es/index.d.ts
@@ -3,20 +3,26 @@ export { default as frequently } from './utils/frequently';
 export { Data } from './utils/data';
 
 export {
-    PickerProps,
+    BackgroundImageFn,
+    CategoryName,
+    CustomIcons,
     EmojiProps,
+    EmojiSet,
+    EmojiSheetSize,
     I18n,
     PartialI18n,
-    CategoryName
+    PickerProps,
 } from './utils/shared-props';
 
+export { default as emojiIndex } from './utils/emoji-index/emoji-index';
+
 export {
-    emojiIndex,
-    nimbleEmojiIndex,
-    EmojiData,
+    BaseEmoji,
     CustomEmoji,
-    EmojiSkin
-} from './utils/emoji-index';
+    EmojiData,
+    EmojiSkin,
+    default as NimbleEmojiIndex,
+} from './utils/emoji-index/nimble-emoji-index';
 
 export {
     Picker,
diff --git a/types/emoji-mart/dist-es/utils/emoji-index/index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index/index.d.ts
deleted file mode 100644
index 576a5d0cb7..0000000000
--- a/types/emoji-mart/dist-es/utils/emoji-index/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as emojiIndex } from './emoji-index';
-export { default as nimbleEmojiIndex, EmojiData, CustomEmoji, EmojiSkin } from './nimble-emoji-index';
diff --git a/types/emoji-mart/emoji-mart-tests.tsx b/types/emoji-mart/emoji-mart-tests.tsx
index 56b05453a9..a266d40f00 100644
--- a/types/emoji-mart/emoji-mart-tests.tsx
+++ b/types/emoji-mart/emoji-mart-tests.tsx
@@ -2,7 +2,7 @@
 
 import React = require('react');
 
-import { Picker, Emoji, EmojiProps, CustomEmoji } from 'emoji-mart';
+import { Picker, Emoji, EmojiProps, CustomEmoji, BaseEmoji, NimbleEmojiIndex } from 'emoji-mart';
 
 declare var console: { log(...args: any[]): void; };
 
diff --git a/types/emoji-mart/tsconfig.json b/types/emoji-mart/tsconfig.json
index d929a3cc01..381bfba639 100644
--- a/types/emoji-mart/tsconfig.json
+++ b/types/emoji-mart/tsconfig.json
@@ -27,7 +27,6 @@
         "dist-es/components/picker/nimble-picker.d.ts",
         "dist-es/utils/emoji-index/emoji-index.d.ts",
         "dist-es/utils/emoji-index/nimble-emoji-index.d.ts",
-        "dist-es/utils/emoji-index/index.d.ts",
         "dist-es/utils/data.d.ts",
         "dist-es/utils/frequently.d.ts",
         "dist-es/utils/shared-props.d.ts",
@@ -35,4 +34,4 @@
         "dist-es/index.d.ts",
         "emoji-mart-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 02db5ccb68be79df3f24cfc323bad5a609ff4d5f Mon Sep 17 00:00:00 2001
From: Johan Davidsson <johan.davidsson@trewit.se>
Date: Thu, 14 Mar 2019 21:06:51 +0100
Subject: [PATCH 671/924] Added typings for domutils (#33866)

* Added new types for domelementtype

* Adding types for module domutils

* Updating PULL_REQUEST_TEMPLATE.md

* Revert changes to .github/PULL_REQUEST_TEMPLATE.md

* Update test and documentation

* Removed namespace and fixed tests
---
 types/domutils/domutils-tests.ts |   9 +++
 types/domutils/index.d.ts        | 127 +++++++++++++++++++++++++++++++
 types/domutils/tsconfig.json     |  23 ++++++
 types/domutils/tslint.json       |   1 +
 4 files changed, 160 insertions(+)
 create mode 100644 types/domutils/domutils-tests.ts
 create mode 100644 types/domutils/index.d.ts
 create mode 100644 types/domutils/tsconfig.json
 create mode 100644 types/domutils/tslint.json

diff --git a/types/domutils/domutils-tests.ts b/types/domutils/domutils-tests.ts
new file mode 100644
index 0000000000..10a70dd255
--- /dev/null
+++ b/types/domutils/domutils-tests.ts
@@ -0,0 +1,9 @@
+import * as DomUtils from 'domutils';
+
+const elem = { name: 'elem' };
+const next = { name: 'next' };
+const child = { name: 'child' };
+
+DomUtils.append(elem, next);
+DomUtils.appendChild(elem, child);
+DomUtils.getName(elem);
diff --git a/types/domutils/index.d.ts b/types/domutils/index.d.ts
new file mode 100644
index 0000000000..14971086cb
--- /dev/null
+++ b/types/domutils/index.d.ts
@@ -0,0 +1,127 @@
+// Type definitions for domutils 1.7
+// Project: https://github.com/FB55/domutils#readme
+// Definitions by: Johan Davidsson <https://github.com/johandavidson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import { DomElement } from "domhandler";
+/***
+ * Append an element after another
+ *
+ * @argument elem The element to append to
+ * @argument next The element be added
+ */
+export function append(elem: DomElement, next: DomElement): void;
+/***
+ * Append a child to an element
+ *
+ * @argument elem The element to append to
+ * @argument child The element to be added as a child
+ */
+export function appendChild(elem: DomElement, child: DomElement): void;
+/***
+ * Compare the position of one node against another node in any other document.
+ * The return value is a bitmask with the following values:
+ *
+ * document order:
+ * > There is an ordering, document order, defined on all the nodes in the
+ * > document corresponding to the order in which the first character of the
+ * > XML representation of each node occurs in the XML representation of the
+ * > document after expansion of general entities. Thus, the document element
+ * > node will be the first node. Element nodes occur before their children.
+ * > Thus, document order orders element nodes in order of the occurrence of
+ * > their start-tag in the XML (after expansion of entities). The attribute
+ * > nodes of an element occur after the element and before its children. The
+ * > relative order of attribute nodes is implementation-dependent./
+ *
+ * Source:
+ * http://www.w3.org/TR/DOM-Level-3-Core/glossary.html#dt-document-order
+ * @argument nodaA The first node to use in the comparison
+ * @argument nodeB The second node to use in the comparison
+ *
+ * @return A bitmask describing the input nodes' relative position.
+ *
+ *        See http://dom.spec.whatwg.org/#dom-node-comparedocumentposition for
+ *        a description of these values.
+ */
+export function compareDocumentPosition(nodeA: DomElement, nodeB: DomElement): number;
+export function existsOne(test: any, elems: DomElement[]): boolean;
+export function filter(test: any, element: DomElement, recurse: boolean, limit: number): DomElement[];
+export function find(test: any, elems: DomElement[], recurse: boolean, limit: number): DomElement[];
+export function findAll(test: any, rootElems: DomElement[]): DomElement[];
+export function findOne(test: any, elems: DomElement[]): DomElement;
+export function findOneChild(test: any, elems: DomElement[]): DomElement;
+export function getAttributeValue(elem: DomElement, name: string): string;
+export function getChildren(elem: DomElement): DomElement[];
+/***
+ * Legacy
+ */
+export function getElementById(id: any, element: any, recurse?: any): any;
+/***
+ * Legacy
+ */
+export function getElements(options: any, element: any, recurse?: any, limit?: any): any;
+/***
+ * Legacy
+ */
+export function getElementsByTagName(name: any, element: any, recurse?: any, limit?: any): any;
+/***
+ * Legacy
+ */
+export function getElementsByTagType(type: any, element: any, recurse?: any, limit?: any): any;
+export function getInnerHTML(elem: DomElement, opts: any): string;
+/***
+ * Returns the name property of an element
+ *
+ * @argument elem The element to get the name for
+ */
+export function getName(elem: DomElement): string;
+/***
+ * Returns a string representing the array of DomElements
+ *
+ * @argument dom An array of DomElement that should be stringified
+ * @argument [opts] Optional options object
+ */
+export function getOuterHTML(dom: DomElement[], opts: { decodeEntities?: boolean, xmlMode?: boolean}): string;
+export function getParent(elem: DomElement): DomElement;
+export function getSiblings(elem: DomElement): DomElement[];
+export function getText(elem: DomElement): string;
+export function hasAttrib(elem: DomElement, name: string): boolean;
+export function isTag(elem: DomElement): boolean;
+/***
+ * Prepend an element before another
+ *
+ * @argument elem The element to append to
+ * @argument prev The element be added
+ */
+export function prepend(elem: DomElement, prev: DomElement): void;
+/***
+ * Remove an element from the dom
+ *
+ * @argument elem The element to be removed
+ */
+export function removeElement(elem: DomElement): void;
+/***
+ * Given an array of nodes, remove any member that is contained by another.
+ */
+export function removeSubsets(nodes: DomElement[]): DomElement[];
+/***
+ * Replace an element in the dom
+ *
+ * @argument elem The element to be replaced
+ * @argument replacement The element to be added
+ */
+export function replaceElement(elem: DomElement, replacement: DomElement): void;
+/***
+ * Legacy
+ */
+export function testElement(options: any, element: any): any;
+/***
+ * Sort an array of nodes based on their relative position in the document and
+ * remove any duplicate nodes. If the array contains nodes that do not belong
+ * to the same document, sort order is unspecified.
+ *
+ * @argument nodes Array of DOM nodes
+ * @returns collection of unique nodes, sorted in document order
+ */
+export function uniqueSort(nodes: DomElement[]): DomElement[];
diff --git a/types/domutils/tsconfig.json b/types/domutils/tsconfig.json
new file mode 100644
index 0000000000..891f9dd70e
--- /dev/null
+++ b/types/domutils/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",
+        "domutils-tests.ts"
+    ]
+}
diff --git a/types/domutils/tslint.json b/types/domutils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/domutils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 59a50f52c9f9973c3d2b61232ce66b72c466f1c5 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <derek.finlinson@journeyteam.com>
Date: Thu, 14 Mar 2019 14:49:53 -0600
Subject: [PATCH 672/924] Update createRecord response type

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

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index f7029be401..322af535d7 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -4762,7 +4762,7 @@ declare namespace Xrm {
          * @returns On success, returns a promise object containing the attributes specified earlier in the description of the successCallback parameter.
          * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/createrecord External Link: createRecord (Client API reference)}
          */
-        createRecord(entityLogicalName: string, record: any): Async.PromiseLike<string>;
+        createRecord(entityLogicalName: string, record: any): Async.PromiseLike<CreateResponse>;
 
         /**
          * Deletes an entity record.
@@ -4823,6 +4823,14 @@ declare namespace Xrm {
         updateRecord(entityLogicalName: string, id: string, data: any): Async.PromiseLike<any>;
     }
 
+    /**
+     * Interface for the WebAPI CreateRecord request response
+     */
+    interface CreateResponse {
+        entityType: string;
+        id: string;
+    }
+
     /**
      * Interface for the Promise error response arguments
      */

From b1ea8b036ea546d7056f04d8af40e799931cc1e2 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 14 Mar 2019 14:02:16 -0700
Subject: [PATCH 673/924] Update README

1. Update meaning of libraryName for deprecated packages.
2. Update spelling of Definitely Typed.
---
 README.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 746d9d9f3e..cb4fd7510b 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ You may need to add manual [references](http://www.typescriptlang.org/docs/handb
 
 ## How can I contribute?
 
-DefinitelyTyped only works because of contributions by users like you!
+Definitely Typed only works because of contributions by users like you!
 
 ### Test
 
@@ -89,7 +89,7 @@ then follow the instructions to [edit an existing package](#edit-an-existing-pac
 
 ### Make a pull request
 
-Once you've tested your package, you can share it on DefinitelyTyped.
+Once you've tested your package, you can share it on Definitely Typed.
 
 First, [fork](https://guides.github.com/activities/forking/) this repository, install [node](https://nodejs.org/), and run `npm install`.
 
@@ -117,7 +117,7 @@ If it doesn't, you can do so yourself in the comment associated with the PR.
 
 #### Create a new package
 
-If you are the library author and your package is written in TypeScript, [bundle the autogenerated declaration files](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) in your package instead of publishing to DefinitelyTyped.
+If you are the library author and your package is written in TypeScript, [bundle the autogenerated declaration files](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) in your package instead of publishing to Definitely Typed.
 
 If you are adding typings for an NPM package, create a directory with the same name.
 If the package you are adding typings for is not on NPM, make sure the name you choose for it does not conflict with the name of a package on NPM.
@@ -137,7 +137,7 @@ See all options at [dts-gen](https://github.com/Microsoft/dts-gen).
 
 You may edit the `tsconfig.json` to add new files, to add `"target": "es6"` (needed for async functions), to add to `"lib"`, or to add the `"jsx"` compiler option.
 
-DefinitelyTyped members routinely monitor for new PRs, though keep in mind that the number of other PRs may slow things down.
+Definitely Typed members routinely monitor for new PRs, though keep in mind that the number of other PRs may slow things down.
 
 For a good example package, see [base64-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/base64-js).
 
@@ -165,17 +165,17 @@ For a good example package, see [base64-js](https://github.com/DefinitelyTyped/D
 
 #### Removing a package
 
-When a package [bundles](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) its own types, types should be removed from DefinitelyTyped to avoid confusion.
+When a package [bundles](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) its own types, types should be removed from Definitely Typed to avoid confusion.
 
 You can remove it by running `npm run not-needed -- typingsPackageName asOfVersion sourceRepoURL [libraryName]`.
 - `typingsPackageName`: This is the name of the directory to delete.
 - `asOfVersion`: A stub will be published to `@types/foo` with this version. Should be higher than any currently published version.
 - `sourceRepoURL`: This should point to the repository that contains the typings.
-- `libraryName`: Descriptive name of the library, e.g. "Angular 2" instead of "angular2". (If ommitted, will be identical to "typingsPackageName".)
+- `libraryName`: Name of npm package that replaces the Definitely Typed types. Usually this is identical to "typingsPackageName" so you can omit it.
 
-Any other packages in DefinitelyTyped that referenced the deleted package should be updated to reference the bundled types. To do this, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
+Any other packages in Definitely Typed that referenced the deleted package should be updated to reference the bundled types. To do this, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
 
-If a package was never on DefinitelyTyped, it does not need to be added to `notNeededPackages.json`.
+If a package was never on Definitely Typed, it does not need to be added to `notNeededPackages.json`.
 
 
 #### Lint
@@ -225,11 +225,11 @@ The `master` branch is automatically published to the `@types` scope on NPM than
 
 #### I've submitted a pull request. How long until it is merged?
 
-It depends, but most pull requests will be merged within a week. PRs that have been approved by an author listed in the definition's header are usually merged more quickly; PRs for new definitions will take more time as they require more review from maintainers. Each PR is reviewed by a TypeScript or DefinitelyTyped team member before being merged, so please be patient as human factors may cause delays. Check the [PR Burndown Board](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen) to see progress as maintainers work through the open PRs.
+It depends, but most pull requests will be merged within a week. PRs that have been approved by an author listed in the definition's header are usually merged more quickly; PRs for new definitions will take more time as they require more review from maintainers. Each PR is reviewed by a TypeScript or Definitely Typed team member before being merged, so please be patient as human factors may cause delays. Check the [PR Burndown Board](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen) to see progress as maintainers work through the open PRs.
 
 #### My PR is merged; when will the `@types` NPM package be updated?
 
-NPM packages should update within a few minutes. If it's been more than an hour, mention the PR number on [the DefinitelyTyped Gitter channel](https://gitter.im/DefinitelyTyped/DefinitelyTyped) and the current maintainer will get the correct team member to investigate.
+NPM packages should update within a few minutes. If it's been more than an hour, mention the PR number on [the Definitely Typed Gitter channel](https://gitter.im/DefinitelyTyped/DefinitelyTyped) and the current maintainer will get the correct team member to investigate.
 
 #### I'm writing a definition that depends on another definition. Should I use `<reference types="" />` or an import?
 
@@ -325,13 +325,13 @@ You can look [here](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/mast
 This may belong in [TSJS-Lib-Generator](https://github.com/Microsoft/TSJS-lib-generator#readme). See the guidelines there.
 If the standard is still a draft, it belongs here.
 Use a name beginning with `dom-` and include a link to the standard as the "Project" link in the header.
-When it graduates draft mode, we may remove it from DefinitelyTyped and deprecate the associated `@types` package.
+When it graduates draft mode, we may remove it from Definitely Typed and deprecate the associated `@types` package.
 
-#### How do DefinitelyTyped package versions relate to versions of the corresponding library? 
+#### How do Definitely Typed package versions relate to versions of the corresponding library? 
 
 _NOTE: The discussion in this section assumes familiarity with [Semantic versioning](https://semver.org/)_
 
-Each DefinitelyTyped package is versioned when published to NPM. 
+Each Definitely Typed package is versioned when published to NPM. 
 The [types-publisher](https://github.com/Microsoft/types-publisher) (the tool that publishes `@types` packages to npm) will set the declaration package's version by using the `major.minor` version number listed in the first line of its `index.d.ts` file. 
 For example, here are the first few lines of [Node's type declarations](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/1253faabf5e0d2c5470db6ea87795d7f96fef7e2/types/node/index.d.ts) for version `10.12.x` at the time of writing:
 
@@ -339,24 +339,24 @@ For example, here are the first few lines of [Node's type declarations](https://
 // Type definitions for Node.js 10.12
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <https://github.com/Microsoft>
-//                 DefinitelyTyped <https://github.com/DefinitelyTyped>
+//                 Definitely Typed <https://github.com/DefinitelyTyped>
 //                 Alberto Schiabel <https://github.com/jkomyno>
 ```
 
 Because `10.12` is at the end the first line, the npm version of the `@types/node` package will also be `10.12.x`. 
 Note that the first-line comment in the `index.d.ts` file should only contain the `major.minor` version (e.g. `10.12`) and should not contain a patch version (e.g. `10.12.4`).
 This is because only the major and minor release numbers are aligned between library packages and type declaration packages. 
-The patch release number of the type declaration package (e.g. `.0` in `10.12.0`) is initialized to zero by DefinitelyTyped and is incremented each time a new `@types/node` package is published to NPM for the same major/minor version of the corresponding library.
+The patch release number of the type declaration package (e.g. `.0` in `10.12.0`) is initialized to zero by Definitely Typed and is incremented each time a new `@types/node` package is published to NPM for the same major/minor version of the corresponding library.
 
 Sometimes type declaration package versions and library package versions can get out of sync.
 Below are a few common reasons why, in order of how much they inconvenience users of a library.
 Only the last case is typically problematic.
 
 * As noted above, the patch version of the type declaration package is unrelated to the library patch version.
-  This allows DefinitelyTyped to safely update type declarations for the same major/minor version of a library. 
+  This allows Definitely Typed to safely update type declarations for the same major/minor version of a library. 
 * If updating a package for new functionality, don't forget to update the version number to line up with that version of the library.
   If users make sure versions correspond between JavaScript packages and their respective `@types` packages, then `npm update` should typically just work.
-* It's common for type declaration package updates to lag behind library updates because it's often library users, not maintainers, who update DefinitelyTyped when new library features are released.
+* It's common for type declaration package updates to lag behind library updates because it's often library users, not maintainers, who update Definitely Typed when new library features are released.
   So there may be a lag of days, weeks, or even months before a helpful community member sends a PR to update the type declaration package for a new library release.
   If you're impacted by this, you can be the change you want to see in the world and you can be that helpful community member!
 
@@ -366,7 +366,7 @@ Only the last case is typically problematic.
 
 [Semantic versioning](https://semver.org/) requires that versions with breaking changes must increment the major version number.  
 For example, a library that removes a publicly exported function after its `3.5.8` release must bump its version to `4.0.0` in its next release.  
-Furthermore, when the library's `4.0.0` release is out, its DefinitelyTyped type declaration package should also be updated to `4.0.0`, including any breaking changes to the library's API. 
+Furthermore, when the library's `4.0.0` release is out, its Definitely Typed type declaration package should also be updated to `4.0.0`, including any breaking changes to the library's API. 
 
 Many libraries have a large installed base of developers (including maintainers of other packages using that library as a dependency) who won't move right away to a new version that has breaking changes, because it might be months until a maintainer has time to rewrite code to adapt to the new version. 
 In the meantime, users of old library versions still may want to update type declarations for older versions. 
@@ -398,7 +398,7 @@ At the time of writing, the [history v2 `tsconfig.json`](https://github.com/Defi
 }
 ```
 
-If there are other packages in DefinitelyTyped that are incompatible with the new version, you will need to add path mappings to the old version. 
+If there are other packages in Definitely Typed that are incompatible with the new version, you will need to add path mappings to the old version. 
 You will also need to do this recursively for packages depending on packages depending on the old version.
 
 For example, `react-router` depends on `history@2`, so [react-router `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/v2/tsconfig.json) has a path mapping to `"history": [ "history/v2" ]`. 

From 20178e9c55f922235bf9297330cd6f19e318a7af Mon Sep 17 00:00:00 2001
From: "Matt R. Wilson" <mwilson@shutterstock.com>
Date: Thu, 14 Mar 2019 13:41:52 -0600
Subject: [PATCH 674/924] Remove @types/knex.

Self bundles types since 0.16.0
---
 notNeededPackages.json   |    6 +
 types/knex/index.d.ts    |  732 -----------------------
 types/knex/knex-tests.ts | 1223 --------------------------------------
 types/knex/tsconfig.json |   24 -
 types/knex/tslint.json   |    7 -
 5 files changed, 6 insertions(+), 1986 deletions(-)
 delete mode 100644 types/knex/index.d.ts
 delete mode 100644 types/knex/knex-tests.ts
 delete mode 100644 types/knex/tsconfig.json
 delete mode 100644 types/knex/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 812d1f9f1b..2030aa189f 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1032,6 +1032,12 @@
             "sourceRepoURL": "https://github.com/keycloak/keycloak",
             "asOfVersion": "3.4.1"
         },
+        {
+            "libraryName": "knex",
+            "typingsPackageName": "knex",
+            "sourceRepoURL": "https://github.com/tgriesser/knex",
+            "asOfVersion": "0.16.1"
+        },
         {
             "libraryName": "knockout-paging",
             "typingsPackageName": "knockout-paging",
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
deleted file mode 100644
index 7888559827..0000000000
--- a/types/knex/index.d.ts
+++ /dev/null
@@ -1,732 +0,0 @@
-// Type definitions for Knex.js 0.15
-// Project: https://github.com/tgriesser/knex, https://knexjs.org
-// Definitions by: Qubo <https://github.com/tkQubo>
-//                 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>
-//                 Joel Shepherd <https://github.com/joelshepherd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
-
-/// <reference types="node" />
-
-import events = require("events");
-import stream = require ("stream");
-import Bluebird = require("bluebird");
-
-type Callback = (...args: any[]) => void;
-type Client = (...args: any[]) => void;
-type Value = string | number | boolean | Date | string[] | number[] | Date[] | boolean[] | Buffer | Knex.Raw;
-interface ValueMap { [key: string]: Value | Knex.QueryBuilder; }
-type ColumnName = string | Knex.Raw | Knex.QueryBuilder | {[key: string]: string };
-type TableName = string | Knex.Raw | Knex.QueryBuilder;
-interface Identifier { [alias: string]: string; }
-
-interface Knex extends Knex.QueryInterface {
-    (tableName?: TableName | Identifier): Knex.QueryBuilder;
-    VERSION: string;
-    __knex__: string;
-
-    raw: Knex.RawBuilder;
-    transaction<T>(transactionScope: (trx: Knex.Transaction) => Promise<T> | Bluebird<T> | void): Bluebird<T>;
-    destroy(callback: (...args: any[]) => void): void;
-    destroy(): Bluebird<void>;
-    batchInsert(tableName: TableName, data: any[], chunkSize?: number): Knex.QueryBuilder;
-    schema: Knex.SchemaBuilder;
-    queryBuilder(): Knex.QueryBuilder;
-
-    client: any;
-    migrate: Knex.Migrator;
-    seed: any;
-    fn: Knex.FunctionHelper;
-    on(eventName: string, callback: (...args: any[]) => void): Knex.QueryBuilder;
-}
-
-declare function Knex(config: Knex.Config): Knex;
-
-declare namespace Knex {
-    //
-    // QueryInterface
-    //
-
-    interface QueryInterface {
-        select: Select;
-        as: As;
-        columns: Select;
-        column: Select;
-        from: Table;
-        into: Table;
-        table: Table;
-        distinct: Distinct;
-
-        // Joins
-        join: Join;
-        joinRaw: JoinRaw;
-        innerJoin: Join;
-        leftJoin: Join;
-        leftOuterJoin: Join;
-        rightJoin: Join;
-        rightOuterJoin: Join;
-        outerJoin: Join;
-        fullOuterJoin: Join;
-        crossJoin: Join;
-
-        // Withs
-        with: With;
-        withRaw: WithRaw;
-        withSchema: WithSchema;
-        withWrapped: WithWrapped;
-
-        // Wheres
-        where: Where;
-        andWhere: Where;
-        orWhere: Where;
-        whereNot: Where;
-        andWhereNot: Where;
-        orWhereNot: Where;
-        whereRaw: WhereRaw;
-        orWhereRaw: WhereRaw;
-        andWhereRaw: WhereRaw;
-        whereWrapped: WhereWrapped;
-        havingWrapped: WhereWrapped;
-        whereExists: WhereExists;
-        orWhereExists: WhereExists;
-        whereNotExists: WhereExists;
-        orWhereNotExists: WhereExists;
-        whereIn: WhereIn;
-        orWhereIn: WhereIn;
-        whereNotIn: WhereIn;
-        orWhereNotIn: WhereIn;
-        whereNull: WhereNull;
-        orWhereNull: WhereNull;
-        whereNotNull: WhereNull;
-        orWhereNotNull: WhereNull;
-        whereBetween: WhereBetween;
-        orWhereBetween: WhereBetween;
-        andWhereBetween: WhereBetween;
-        whereNotBetween: WhereBetween;
-        orWhereNotBetween: WhereBetween;
-        andWhereNotBetween: WhereBetween;
-
-        // Group by
-        groupBy: GroupBy;
-        groupByRaw: RawQueryBuilder;
-
-        // Order by
-        orderBy: OrderBy;
-        orderByRaw: RawQueryBuilder;
-
-        // Union
-        union: Union;
-        unionAll(callback: QueryCallback): QueryBuilder;
-
-        // Having
-        having: Having;
-        andHaving: Having;
-        havingRaw: RawQueryBuilder;
-        orHaving: Having;
-        orHavingRaw: RawQueryBuilder;
-        havingIn: HavingIn;
-
-        // Clear
-        clearOrder(): QueryBuilder;
-        clearSelect(): QueryBuilder;
-        clearWhere(): QueryBuilder;
-
-        // Paging
-        offset(offset: number): QueryBuilder;
-        limit(limit: number): QueryBuilder;
-
-        // Aggregation
-        count(...columnNames: string[]): QueryBuilder;
-        count(columnName: Record<string, string | string[] | Raw> | Raw): QueryBuilder;
-        countDistinct(columnName: string | Record<string, string | Raw> | Raw): QueryBuilder;
-        min(columnName: string, ...columnNames: string[]): QueryBuilder;
-        min(columnName: Record<string, string | string[] | Raw> | Raw): QueryBuilder;
-        max(columnName: string, ...columnNames: string[]): QueryBuilder;
-        max(columnName: Record<string, string | string[] | Raw> | Raw): QueryBuilder;
-        sum(columnName: string, ...columnNames: string[]): QueryBuilder;
-        sum(columnName: Record<string, string | string[] | Raw> | Raw): QueryBuilder;
-        sumDistinct(columnName: string | Record<string, string | Raw> | Raw): QueryBuilder;
-        avg(columnName: string, ...columnNames: string[]): QueryBuilder;
-        avg(columnName: Record<string, string | string[] | Raw> | Raw): QueryBuilder;
-        avgDistinct(columnName: string | Record<string, string | Raw> | Raw): QueryBuilder;
-        increment(columnName: string, amount?: number): QueryBuilder;
-        decrement(columnName: string, amount?: number): QueryBuilder;
-
-        // Others
-        first: Select;
-
-        pluck(column: string): QueryBuilder;
-
-        insert(data: any, returning?: string | string[]): QueryBuilder;
-        modify(callback: QueryCallbackWithArgs, ...args: any[]): QueryBuilder;
-        update(data: any, returning?: string | string[]): QueryBuilder;
-        update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
-        returning(column: string | string[]): QueryBuilder;
-
-        del(returning?: string | string[]): QueryBuilder;
-        delete(returning?: string | string[]): QueryBuilder;
-        truncate(): QueryBuilder;
-
-        clone(): QueryBuilder;
-    }
-
-    interface As {
-        (columnName: string): QueryBuilder;
-    }
-
-    interface Select extends ColumnNameQueryBuilder {
-        (aliases: { [alias: string]: string }): QueryBuilder;
-    }
-
-    interface Table {
-        // tslint:disable-next-line ban-types
-        (tableName: TableName | Identifier | Function | Raw): QueryBuilder;
-    }
-
-    // tslint:disable-next-line no-empty-interface
-    interface Distinct extends ColumnNameQueryBuilder {
-    }
-
-    interface JoinCallback {
-        (this: JoinClause, join: JoinClause): void;
-    }
-
-    interface Join {
-        (raw: Raw): QueryBuilder;
-        (tableName: TableName | QueryCallback, clause: JoinCallback): QueryBuilder;
-        (tableName: TableName | QueryCallback, columns: { [key: string]: string | number | Raw }): QueryBuilder;
-        (tableName: TableName | QueryCallback, raw: Raw): QueryBuilder;
-        (tableName: TableName | QueryCallback, column1: string, column2: string): QueryBuilder;
-        (tableName: TableName | QueryCallback, column1: string, raw: Raw): QueryBuilder;
-        (tableName: TableName | QueryCallback, column1: string, operator: string, column2: string): QueryBuilder;
-    }
-
-    interface JoinClause {
-        on(raw: Raw): JoinClause;
-        on(callback: JoinCallback): JoinClause;
-        on(columns: { [key: string]: string | Raw }): JoinClause;
-        on(column1: string, column2: string): JoinClause;
-        on(column1: string, raw: Raw): JoinClause;
-        on(column1: string, operator: string, column2: string | Raw): JoinClause;
-        andOn(raw: Raw): JoinClause;
-        andOn(callback: JoinCallback): JoinClause;
-        andOn(columns: { [key: string]: string | Raw }): JoinClause;
-        andOn(column1: string, column2: string): JoinClause;
-        andOn(column1: string, raw: Raw): JoinClause;
-        andOn(column1: string, operator: string, column2: string | Raw): JoinClause;
-        orOn(raw: Raw): JoinClause;
-        orOn(callback: JoinCallback): JoinClause;
-        orOn(columns: { [key: string]: string | Raw }): JoinClause;
-        orOn(column1: string, column2: string): JoinClause;
-        orOn(column1: string, raw: Raw): JoinClause;
-        orOn(column1: string, operator: string, column2: string | Raw): JoinClause;
-        onIn(column1: string, values: any[]): JoinClause;
-        andOnIn(column1: string, values: any[]): JoinClause;
-        orOnIn(column1: string, values: any[]): JoinClause;
-        onNotIn(column1: string, values: any[]): JoinClause;
-        andOnNotIn(column1: string, values: any[]): JoinClause;
-        orOnNotIn(column1: string, values: any[]): JoinClause;
-        onNull(column1: string): JoinClause;
-        andOnNull(column1: string): JoinClause;
-        orOnNull(column1: string): JoinClause;
-        onNotNull(column1: string): JoinClause;
-        andOnNotNull(column1: string): JoinClause;
-        orOnNotNull(column1: string): JoinClause;
-        onExists(callback: QueryCallback): JoinClause;
-        andOnExists(callback: QueryCallback): JoinClause;
-        orOnExists(callback: QueryCallback): JoinClause;
-        onNotExists(callback: QueryCallback): JoinClause;
-        andOnNotExists(callback: QueryCallback): JoinClause;
-        orOnNotExists(callback: QueryCallback): JoinClause;
-        onBetween(column1: string, range: [any, any]): JoinClause;
-        andOnBetween(column1: string, range: [any, any]): JoinClause;
-        orOnBetween(column1: string, range: [any, any]): JoinClause;
-        onNotBetween(column1: string, range: [any, any]): JoinClause;
-        andOnNotBetween(column1: string, range: [any, any]): JoinClause;
-        orOnNotBetween(column1: string, range: [any, any]): JoinClause;
-        using(column: string | string[] | Raw | { [key: string]: string | Raw }): JoinClause;
-        type(type: string): JoinClause;
-    }
-
-    interface JoinRaw {
-        (tableName: string, binding?: Value): QueryBuilder;
-    }
-
-    interface With extends WithRaw, WithWrapped {
-    }
-
-    interface WithRaw {
-        (alias: string, raw: Raw): QueryBuilder;
-        (alias: string, sql: string, bindings?: Value[] | object): QueryBuilder;
-    }
-
-    interface WithSchema {
-        (schema: string): QueryBuilder;
-    }
-
-    interface WithWrapped {
-        (alias: string, queryBuilder: QueryBuilder): QueryBuilder;
-        (alias: string, callback: (queryBuilder: QueryBuilder) => any): QueryBuilder;
-    }
-
-    interface Where extends WhereRaw, WhereWrapped, WhereNull {
-        (raw: Raw): QueryBuilder;
-        (callback: QueryCallback): QueryBuilder;
-        (object: object): QueryBuilder;
-        (columnName: string, value: Value | null): QueryBuilder;
-        (columnName: string, operator: string, value: Value | QueryBuilder | null): QueryBuilder;
-        (left: Raw, operator: string, right: Value | QueryBuilder | null): QueryBuilder;
-    }
-
-    interface WhereRaw extends RawQueryBuilder {
-        (condition: boolean): QueryBuilder;
-    }
-
-    interface WhereWrapped {
-        (callback: QueryCallback): QueryBuilder;
-    }
-
-    interface WhereNull {
-        (columnName: string): QueryBuilder;
-    }
-
-    interface WhereBetween {
-        (columnName: string, range: [Value, Value]): QueryBuilder;
-    }
-
-    interface WhereExists {
-        (callback: QueryCallback): QueryBuilder;
-        (query: QueryBuilder): QueryBuilder;
-    }
-
-    interface WhereNull {
-        (columnName: string): QueryBuilder;
-    }
-
-    interface WhereIn {
-        (columnName: string, values: Value[] | QueryBuilder | QueryCallback): QueryBuilder;
-        (columnNames: string[], values: Value[][] | QueryBuilder | QueryCallback): QueryBuilder;
-    }
-
-    interface GroupBy extends RawQueryBuilder, ColumnNameQueryBuilder {
-    }
-
-    interface OrderBy {
-        (columnName: string, direction?: string): QueryBuilder;
-    }
-
-    interface Union {
-        (callback: QueryCallback | QueryBuilder | Raw, wrap?: boolean): QueryBuilder;
-        (callbacks: Array<QueryCallback | QueryBuilder | Raw>, wrap?: boolean): QueryBuilder;
-        (...callbacks: Array<QueryCallback | QueryBuilder | Raw>): QueryBuilder;
-        // (...callbacks: QueryCallback[], wrap?: boolean): QueryInterface;
-    }
-
-    interface Having extends RawQueryBuilder, WhereWrapped {
-        (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
-    }
-
-    interface HavingIn {
-        (columnName: string, values: Value[]): QueryBuilder;
-    }
-
-    // commons
-
-    interface ColumnNameQueryBuilder {
-        (...columnNames: ColumnName[]): QueryBuilder;
-        (columnNames: ColumnName[]): QueryBuilder;
-    }
-
-    interface RawQueryBuilder {
-        (sql: string, ...bindings: Array<Value | QueryBuilder>): QueryBuilder;
-        (sql: string, bindings: Array<Value | QueryBuilder> | ValueMap): QueryBuilder;
-        (raw: Raw): QueryBuilder;
-    }
-
-    // Raw
-
-    interface Raw extends events.EventEmitter, ChainableInterface {
-        wrap(before: string, after: string): Raw;
-    }
-
-    interface RawBuilder {
-        (value: Value): Raw;
-        (sql: string, ...bindings: Array<Value | QueryBuilder>): Raw;
-        (sql: string, bindings: Array<Value | QueryBuilder> | ValueMap): Raw;
-    }
-
-    //
-    // QueryBuilder
-    //
-
-    type QueryCallback = (this: QueryBuilder, builder: QueryBuilder) => void;
-    type QueryCallbackWithArgs = (this: QueryBuilder, builder: QueryBuilder, ...args: any[]) => void;
-
-    interface QueryBuilder extends QueryInterface, ChainableInterface {
-        or: QueryBuilder;
-        and: QueryBuilder;
-
-        // TODO: Promise?
-        columnInfo(column?: string): Bluebird<ColumnInfo>;
-
-        forUpdate(): QueryBuilder;
-        forShare(): QueryBuilder;
-
-        toSQL(): Sql;
-
-        on(event: string, callback: (...args: any[]) => void): QueryBuilder;
-    }
-
-    interface Sql {
-        method: string;
-        options: any;
-        bindings: Value[];
-        sql: string;
-    }
-
-    //
-    // Chainable interface
-    //
-
-    interface ChainableInterface extends Bluebird<any> {
-        toQuery(): string;
-        options(options: { [key: string]: any }): this;
-        connection(connection: any): this;
-        debug(enabled: boolean): this;
-        transacting(trx: Transaction): this;
-        stream(handler: (readable: stream.PassThrough) => any): Bluebird<any>;
-        stream(options: { [key: string]: any }, handler: (readable: stream.PassThrough) => any): Bluebird<any>;
-        stream(options?: { [key: string]: any }): stream.PassThrough;
-        // tslint:disable-next-line no-unnecessary-generics
-        pipe<T extends NodeJS.WritableStream>(writable: T, options?: { [key: string]: any }): stream.PassThrough;
-    }
-
-    interface Transaction extends Knex {
-        savepoint(transactionScope: (trx: Transaction) => any): Bluebird<any>;
-        commit(value?: any): QueryBuilder;
-        rollback(error?: any): QueryBuilder;
-    }
-
-    //
-    // Schema builder
-    //
-
-    interface SchemaBuilder extends ChainableInterface {
-        createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
-        createTableIfNotExists(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
-        alterTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
-        renameTable(oldTableName: string, newTableName: string): Bluebird<void>;
-        dropTable(tableName: string): SchemaBuilder;
-        hasTable(tableName: string): Bluebird<boolean>;
-        hasColumn(tableName: string, columnName: string): Bluebird<boolean>;
-        table(tableName: string, callback: (tableBuilder: AlterTableBuilder) => any): Bluebird<void>;
-        dropTableIfExists(tableName: string): SchemaBuilder;
-        raw(statement: string): SchemaBuilder;
-        withSchema(schemaName: string): SchemaBuilder;
-    }
-
-    interface TableBuilder {
-        increments(columnName?: string): ColumnBuilder;
-        bigIncrements(columnName?: string): ColumnBuilder;
-        dropColumn(columnName: string): TableBuilder;
-        dropColumns(...columnNames: string[]): TableBuilder;
-        renameColumn(from: string, to: string): ColumnBuilder;
-        integer(columnName: string): ColumnBuilder;
-        bigInteger(columnName: string): ColumnBuilder;
-        text(columnName: string, textType?: string): ColumnBuilder;
-        string(columnName: string, length?: number): ColumnBuilder;
-        float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-        decimal(columnName: string, precision?: number | null, scale?: number): ColumnBuilder;
-        boolean(columnName: string): ColumnBuilder;
-        date(columnName: string): ColumnBuilder;
-        dateTime(columnName: string): ColumnBuilder;
-        time(columnName: string): ColumnBuilder;
-        timestamp(columnName: string, standard?: boolean): ColumnBuilder;
-        timestamps(useTimestampType?: boolean, makeDefaultNow?: boolean): ColumnBuilder;
-        binary(columnName: string, length?: number): ColumnBuilder;
-        enum(columnName: string, values: Value[], options?: EnumOptions): ColumnBuilder;
-        enu(columnName: string, values: Value[], options?: EnumOptions): ColumnBuilder;
-        json(columnName: string): ColumnBuilder;
-        jsonb(columnName: string): ColumnBuilder;
-        uuid(columnName: string): ColumnBuilder;
-        comment(val: string): TableBuilder;
-        specificType(columnName: string, type: string): ColumnBuilder;
-        primary(columnNames: string[]): TableBuilder;
-        index(columnNames: Array<string | Raw>, indexName?: string, indexType?: string): TableBuilder;
-        unique(columnNames: Array<string | Raw>, indexName?: string): TableBuilder;
-        foreign(column: string, foreignKeyName?: string): ForeignConstraintBuilder;
-        foreign(columns: string[], foreignKeyName?: string): MultikeyForeignConstraintBuilder;
-        dropForeign(columnNames: string[], foreignKeyName?: string): TableBuilder;
-        dropUnique(columnNames: Array<string | Raw>, indexName?: string): TableBuilder;
-        dropPrimary(constraintName?: string): TableBuilder;
-        dropIndex(columnNames: Array<string | Raw>, indexName?: string): TableBuilder;
-        dropTimestamps(): ColumnBuilder;
-    }
-
-    // tslint:disable-next-line no-empty-interface
-    interface CreateTableBuilder extends TableBuilder {
-    }
-
-    interface MySqlTableBuilder extends CreateTableBuilder {
-        engine(val: string): CreateTableBuilder;
-        charset(val: string): CreateTableBuilder;
-        collate(val: string): CreateTableBuilder;
-    }
-
-    // tslint:disable-next-line no-empty-interface
-    interface AlterTableBuilder extends TableBuilder {
-    }
-
-    // tslint:disable-next-line no-empty-interface
-    interface MySqlAlterTableBuilder extends AlterTableBuilder {
-    }
-
-    interface ColumnBuilder {
-        index(indexName?: string): ColumnBuilder;
-        primary(constraintName?: string): ColumnBuilder;
-        unique(indexName?: string): ColumnBuilder;
-        references(columnName: string): ReferencingColumnBuilder;
-        onDelete(command: string): ColumnBuilder;
-        onUpdate(command: string): ColumnBuilder;
-        defaultTo(value: Value): ColumnBuilder;
-        unsigned(): ColumnBuilder;
-        notNullable(): ColumnBuilder;
-        nullable(): ColumnBuilder;
-        comment(value: string): ColumnBuilder;
-        alter(): ColumnBuilder;
-    }
-
-    interface ForeignConstraintBuilder {
-        references(columnName: string): ReferencingColumnBuilder;
-    }
-
-    interface MultikeyForeignConstraintBuilder {
-        references(columnNames: string[]): ReferencingColumnBuilder;
-    }
-
-    interface PostgreSqlColumnBuilder extends ColumnBuilder {
-        index(indexName?: string, indexType?: string): ColumnBuilder;
-    }
-
-    interface ReferencingColumnBuilder extends ColumnBuilder {
-        inTable(tableName: string): ColumnBuilder;
-    }
-
-    // tslint:disable-next-line no-empty-interface
-    interface AlterColumnBuilder extends ColumnBuilder {
-    }
-
-    interface MySqlAlterColumnBuilder extends AlterColumnBuilder {
-        first(): AlterColumnBuilder;
-        after(columnName: string): AlterColumnBuilder;
-    }
-
-    interface EnumOptions {
-        useNative: boolean;
-        enumName: string;
-    }
-
-    //
-    // Configurations
-    //
-
-    interface ColumnInfo {
-        defaultValue: Value;
-        type: string;
-        maxLength: number;
-        nullable: boolean;
-    }
-
-    interface Config {
-        debug?: boolean;
-        client?: string | typeof Client;
-        dialect?: string;
-        version?: string;
-        connection?: string | ConnectionConfig | MariaSqlConnectionConfig |
-            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;
-        searchPath?: string | string[];
-        asyncStackTraces?: boolean;
-    }
-
-    interface ConnectionConfig {
-        host: string;
-        user: string;
-        password: string;
-        database: string;
-        domain?: string;
-        instanceName?: string;
-        debug?: boolean;
-        requestTimeout?: number;
-    }
-
-    interface MsSqlConnectionConfig {
-        user: string;
-        password: string;
-        server: string;
-        database: string;
-        options: MsSqlOptionsConfig;
-    }
-
-    // Config object for mariasql: https://github.com/mscdex/node-mariasql#client-methods
-    interface MariaSqlConnectionConfig {
-        user?: string;
-        password?: string;
-        host?: string;
-        port?: number;
-        unixSocket?: string;
-        protocol?: string;
-        db?: string;
-        keepQueries?: boolean;
-        multiStatements?: boolean;
-        connTimeout?: number;
-        pingInterval?: number;
-        secureAuth?: boolean;
-        compress?: boolean;
-        ssl?: boolean | MariaSslConfiguration;
-        local_infile?: boolean;
-        read_default_file?: string;
-        read_default_group?: string;
-        charset?: string;
-        streamHWM?: number;
-    }
-
-    interface MariaSslConfiguration {
-        key?: string;
-        cert?: string;
-        ca?: string;
-        capath?: string;
-        cipher?: string;
-        rejectUnauthorized?: boolean;
-    }
-
-    // Config object for mysql: https://github.com/mysqljs/mysql#connection-options
-    interface MySqlConnectionConfig {
-        host?: string;
-        port?: number;
-        localAddress?: string;
-        socketPath?: string;
-        user?: string;
-        password?: string;
-        database?: string;
-        charset?: string;
-        timezone?: string;
-        connectTimeout?: number;
-        stringifyObjects?: boolean;
-        insecureAuth?: boolean;
-        typeCast?: any;
-        queryFormat?: (query: string, values: any) => string;
-        supportBigNumbers?: boolean;
-        bigNumberStrings?: boolean;
-        dateStrings?: boolean;
-        debug?: boolean;
-        trace?: boolean;
-        multipleStatements?: boolean;
-        flags?: string;
-        ssl?: string | MariaSslConfiguration;
-    }
-
-    /** Used with SQLite3 adapter */
-    interface Sqlite3ConnectionConfig {
-        filename: string;
-        debug?: boolean;
-    }
-
-    interface MsSqlOptionsConfig {
-        encrypt?: boolean;
-        port?: number;
-        domain?: string;
-        connectionTimeout?: number;
-        requestTimeout?: number;
-        stream?: boolean;
-        parseJSON?: boolean;
-        pool?: PoolConfig;
-    }
-
-    interface SocketConnectionConfig {
-        socketPath: string;
-        user: string;
-        password: string;
-        database: string;
-        debug?: boolean;
-    }
-
-    interface PoolConfig {
-        name?: string;
-        create?: (...args: any[]) => void;
-        afterCreate?: (...args: any[]) => void;
-        destroy?: (...args: any[]) => void;
-        beforeDestroy?: (...args: any[]) => void;
-        min?: number;
-        max?: number;
-        refreshIdle?: boolean;
-        idleTimeoutMillis?: number;
-        reapIntervalMillis?: number;
-        returnToHead?: boolean;
-        priorityRange?: number;
-        validate?: (...args: any[]) => void;
-        log?: boolean;
-
-        // generic-pool v3 configs
-        maxWaitingClients?: number;
-        testOnBorrow?: boolean;
-        acquireTimeoutMillis?: number;
-        fifo?: boolean;
-        autostart?: boolean;
-        evictionRunIntervalMillis?: number;
-        numTestsPerRun?: number;
-        softIdleTimeoutMillis?: number;
-        Promise?: any;
-    }
-
-    interface MigratorConfig {
-        database?: string;
-        directory?: string;
-        extension?: string;
-        tableName?: string;
-        disableTransactions?: boolean;
-    }
-
-    interface SeedsConfig {
-        directory?: string;
-    }
-
-    interface Migrator {
-        make(name: string, config?: MigratorConfig): Bluebird<string>;
-        latest(config?: MigratorConfig): Bluebird<any>;
-        rollback(config?: MigratorConfig): Bluebird<any>;
-        status(config?: MigratorConfig): Bluebird<number>;
-        currentVersion(config?: MigratorConfig): Bluebird<string>;
-    }
-
-    interface FunctionHelper {
-        now(): Raw;
-    }
-
-    //
-    // Clients
-    //
-
-    class Client extends events.EventEmitter {
-      constructor(config: Config);
-      config: Config;
-      dialect: string;
-      driverName: string;
-      connectionSettings: object;
-
-      acquireRawConnection(): Promise<any>;
-      destroyRawConnection(connection: any): Promise<void>;
-      validateConnection(connection: any): Promise<boolean>;
-    }
-}
-
-export = Knex;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
deleted file mode 100644
index 1ff232e4a7..0000000000
--- a/types/knex/knex-tests.ts
+++ /dev/null
@@ -1,1223 +0,0 @@
-import Knex = require('knex');
-import { WriteStream } from 'fs';
-
-// Initializing the Library
-let knex = Knex({
-  client: 'sqlite3',
-  connection: {
-    filename: "./mydb.sqlite"
-  }
-});
-
-knex = Knex({
-  debug: true,
-  client: 'mysql',
-  connection: {
-    socketPath     : '/path/to/socket.sock',
-    user     : 'your_database_user',
-    password : 'your_database_password',
-    database : 'myapp_test'
-  }
-});
-
-knex = Knex({
-  debug: true,
-  client: 'pg',
-  version: '9.5',
-  connection: {
-    user    : 'your_database_user',
-    password: 'your_database_password',
-    server  : 'your_database_server',
-    options : {
-      database: 'myapp_test'
-    }
-  }
-});
-
-knex = Knex({
-  debug: true,
-  client: 'mssql',
-  connection: {
-    user    : 'your_database_user',
-    password: 'your_database_password',
-    server  : 'your_database_server',
-    options : {
-      database: 'myapp_test'
-    }
-  }
-});
-
-// Mariasql configuration
-knex = Knex({
-  debug: true,
-  client: 'mariasql',
-  connection: {
-    host     : '127.0.0.1',
-    user     : 'your_database_user',
-    password : 'your_database_password',
-    db       : 'myapp_test'
-  }
-});
-
-// Mysql configuration
-knex = Knex({
-  debug: true,
-  client: 'mysql',
-  connection: {
-    host     : '127.0.0.1',
-    user     : 'your_database_user',
-    password : 'your_database_password',
-    db       : 'myapp_test',
-    trace: false
-  }
-});
-
-// Pooling
-knex = Knex({
-    client: "mysql",
-    connection: {
-        host: "127.0.0.1",
-        user: "your_database_user",
-        password: "your_database_password",
-        database: "myapp_test"
-    },
-    pool: {
-        min: 0,
-        max: 7,
-        afterCreate: (connection: any, callback: (...args: any[]) => void) => callback(null, connection),
-        beforeDestroy: (connection: any, callback: (...args: any[]) => void) => callback(null, connection)
-    }
-});
-
-// acquireConnectionTimeout
-knex = Knex({
-  debug: true,
-  client: 'mysql',
-  connection: {
-    socketPath     : '/path/to/socket.sock',
-    user     : 'your_database_user',
-    password : 'your_database_password',
-    database : 'myapp_test'
-  },
-  acquireConnectionTimeout: 60000,
-});
-
-// Pure Query Builder without a connection
-knex = Knex({});
-
-// Pure Query Builder without a connection, using a specific flavour of SQL
-knex = Knex({
-  client: 'pg'
-});
-
-// searchPath
-knex = Knex({
-    client: 'pg',
-    searchPath: 'public',
-});
-knex = Knex({
-    client: 'pg',
-    searchPath: ['public', 'private'],
-});
-
-// postProcessResponse
-knex = Knex({
-  client: 'pg',
-  postProcessResponse(result, queryContext) {
-    return result;
-  }
-});
-
-// wrapIdentifier
-knex = Knex({
-  client: 'pg',
-  wrapIdentifier(value, origImpl, queryContext) {
-    return origImpl(value + 'foo');
-  }
-});
-
-// useNullAsDefault
-knex = Knex({
-  client: 'sqlite',
-  useNullAsDefault: true,
-});
-
-// Using custom client
-class TestClient extends Knex.Client {}
-
-knex = Knex({
-  client: TestClient,
-});
-
-knex('books').insert({title: 'Test'}).returning('*').toString();
-
-// Migrations
-knex = Knex({
-  client: 'mysql',
-  connection: {
-    host     : '127.0.0.1',
-    user     : 'your_database_user',
-    password : 'your_database_password',
-    database : 'myapp_test'
-  },
-  migrations: {
-    tableName: 'migrations'
-  },
-  seeds: {
-    directory: 'seeds'
-  }
-});
-
-// Knex Query Builder
-knex.select('title', 'author', 'year').from('books');
-knex.select({ name: 'title', writer: 'author' }).from(knex.raw('books'));
-knex.select().table('books');
-
-knex.avg('sum_column1').from(function() {
-  this.sum('column1 as sum_column1').from('t1').groupBy('column1').as('t1');
-}).as('ignored_alias');
-
-knex.column('title', 'author', 'year').select().from('books');
-knex.column(['title', 'author', 'year']).select().from('books');
-knex.column('title', { by: 'author' }, 'year').select().from('books');
-knex.column({ title: 'title', by: 'author', published: 'year' }).select().from('books');
-knex.select('*').from('users');
-
-knex('users').where({
-  first_name: 'Test',
-  last_name:  'User'
-}).select('id');
-
-knex('users').where('id', 1);
-
-knex('users').where(function() {
-  this.where('id', 1).orWhere('id', '>', 10);
-}).orWhere({name: 'Tester'});
-
-knex('users').where('votes', '>', 100);
-
-// Let null be used in a two or 3 parameter where filter
-knex('users').where('votes', null);
-knex('users').where('votes', 'is not', null);
-
-// Using Raw in where
-knex('users').where(knex.raw('votes + 1'), '>', 101);
-knex('users').where(knex.raw('votes + 1'), '>', knex.raw('100 + 1'));
-knex('users').where('votes', '>', knex.raw('100 + 1'));
-
-let subquery = knex('users').where('votes', '>', 100).andWhere('status', 'active').orWhere('name', 'John').select('id');
-knex('accounts').where('id', 'in', subquery);
-
-knex.select('name').from('users')
-  .whereIn('id', [1, 2, 3])
-  .orWhereIn('id', [4, 5, 6]);
-
-subquery = knex.select('id').from('accounts');
-knex.select('name').from('users')
-  .whereIn('account_id', subquery);
-
-knex('users')
-  .where('name', '=', 'John')
-  .orWhere(function() {
-    this.where('votes', '>', 100).andWhere('title', '<>', 'Admin');
-  });
-
-knex('users').whereNotIn('id', [1, 2, 3]);
-
-knex('users').where('name', 'like', '%Test%').orWhereNotIn('id', [1, 2, 3]);
-
-knex('users').whereNull('updated_at');
-
-knex('users').whereNotNull('created_at');
-
-knex('users').whereExists(function() {
-  this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-});
-
-knex('users').whereExists(knex.select('*').from('accounts').whereRaw('users.account_id = accounts.id'));
-
-knex('users').whereNotExists(function() {
-  this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-});
-
-knex('users').whereBetween('votes', [1, 100]);
-
-knex('users').whereNotBetween('votes', [1, 100]);
-
-knex('users').whereRaw('id = ?', [1]);
-knex('users').whereRaw('id = :id', { id: 1 });
-knex('users').whereRaw('id = :id', { id: knex('users').select('id').limit(1) });
-
-// Aggregate functions can use string/object parameters
-knex('users').count();
-knex('users').count('*');
-knex('users').count('id', 'votes');
-knex('users').count({count: '*'});
-knex('users').count({count: ['id', 'votes']});
-knex('users').count({count: knex.raw('*')});
-knex('users').count(knex.raw('id'));
-
-knex('users').countDistinct('votes');
-knex('users').countDistinct(knex.raw('votes'));
-knex('users').countDistinct({votes: 'votes'});
-knex('users').countDistinct({votes: knex.raw('votes')});
-
-knex('users').avg('id');
-knex('users').avg('id', 'votes');
-knex('users').avg({avg: 'id'});
-knex('users').avg({avg: ['id', 'votes']});
-knex('users').avg({ab: knex.raw('a + b')});
-knex('users').avg(knex.raw('votes'));
-
-knex('users').avgDistinct('votes');
-knex('users').avgDistinct(knex.raw('votes'));
-knex('users').avgDistinct({votes: 'votes'});
-knex('users').avgDistinct({votes: knex.raw('votes')});
-
-knex('users').max('id');
-knex('users').max('id', 'votes');
-knex('users').max({max: 'id'});
-knex('users').max({max: ['id', 'votes']});
-knex('users').max({ab: knex.raw('a + b')});
-knex('users').max(knex.raw('votes'));
-
-knex('users').min('id');
-knex('users').min('id', 'votes');
-knex('users').min({min: 'id'});
-knex('users').min({min: ['id', 'votes']});
-knex('users').min({ab: knex.raw('a + b')});
-knex('users').min(knex.raw('votes'));
-
-knex('users').sum('id');
-knex('users').sum('id', 'votes');
-knex('users').sum({sum: 'id'});
-knex('users').sum({sum: ['id', 'votes']});
-knex('users').sum({ab: knex.raw('a + b')});
-knex('users').sum(knex.raw('votes'));
-
-knex('users').sumDistinct('votes');
-knex('users').sumDistinct(knex.raw('votes'));
-knex('users').sumDistinct({votes: 'votes'});
-knex('users').sumDistinct({votes: knex.raw('votes')});
-
-// Join methods
-knex('users')
-  .join('contacts', 'users.id', '=', 'contacts.user_id')
-  .select('users.id', 'contacts.phone');
-
-knex('users')
-  .join('contacts', { 'users.id': 12355 })
-  .select('users.id', 'contacts.phone');
-
-knex('users')
-  .join('contacts', 'users.id', 'contacts.user_id')
-  .select('users.id', 'contacts.phone');
-
-knex('users')
-  .join(knex('contacts').select('user_id', 'phone').as('contacts'), 'users.id', 'contacts.user_id')
-  .select('users.id', 'contacts.phone');
-
-knex('users')
-  .join(knex('contacts').select('user_id', 'phone').as('contacts'), { 'users.id': 'contacts.user_id' })
-  .select('users.id', 'contacts.phone');
-
-knex.select('*').from('users').join(knex('accounts').select('id', 'owner_id').as('accounts'), function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').join('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').join('accounts', function(join: Knex.JoinClause) {
-  if (this !== join) {
-    throw new Error("join() callback call semantics wrong");
-  }
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('user').join('contacts', function() {
-  this.on('users.id', '=', knex.raw(7));
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNotIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnNotIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnNotIn('contacts.id', [7, 15, 23, 41]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNotNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnNotNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnNotNull('contacts.email');
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNotExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnNotExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnNotExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNotBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').andOnNotBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').orOnNotBetween('contacts.id', [5, 30]);
-});
-
-knex.select('*').from('users').join('contacts', function() {
-  this.on('users.id', '=', 'contacts.id').onNotExists(function() {
-    this.select('*').from('accounts').whereRaw('users.account_id = accounts.id');
-  });
-});
-
-knex.select('*').from('users').join('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').join('accounts', 'accounts.type', knex.raw('?', ['admin']));
-
-knex.raw('? ON CONFLICT DO NOTHING', [knex('account').insert([{}])]);
-knex.raw('select * from users where id = ? OR id = ?',
-  1,
-  knex('users').select('id').limit(1),
-);
-knex.raw('select * from users where id = :user_id', { user_id: 1 });
-knex.raw('select * from users where id = :user_id_query', {
-  user_id_query: knex('ids').select('id').limit(1)
-});
-
-knex.from('users').innerJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.table('users').innerJoin('accounts', 'users.id', '=', 'accounts.user_id');
-
-knex('users').innerJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex('users').innerJoin('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').leftJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').leftJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').leftJoin('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').leftJoin('accounts', (join) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id')
-  .andOn((join2) => {
-    join2.on('col1', 'col2').orOn('col3', 'col4');
-  });
-});
-
-knex.select('*').from('users').leftOuterJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').leftOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').rightJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').rightJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').rightJoin('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').rightOuterJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').rightOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').outerJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').outerJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').outerJoin('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').fullOuterJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('users').fullOuterJoin('accounts', function() {
-  this.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').fullOuterJoin('accounts', (join: Knex.JoinClause) => {
-  join.on('accounts.id', '=', 'users.account_id').orOn('accounts.owner_id', '=', 'users.id');
-});
-
-knex.select('*').from('users').crossJoin('accounts', 'users.id', 'accounts.user_id');
-
-knex.select('*').from('accounts').joinRaw('natural full join table1').where('id', 1);
-
-knex.select('*').from('accounts').join(knex.raw('natural full join table1')).where('id', 1);
-
-knex.select('*').from('accounts')
-  .join(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .leftJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .leftOuterJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .rightJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .rightOuterJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .innerJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .crossJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .fullOuterJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-knex.select('*').from('accounts')
-  .outerJoin(function() {
-    this.select('*').from('accounts').as('special_accounts');
-  }, 'special_accounts.a', '=', 'accounts.b');
-
-knex('customers')
-  .distinct('first_name', 'last_name')
-  .select();
-
-knex('users').groupBy('count');
-
-knex.select('year', knex.raw('SUM(profit)')).from('sales').groupByRaw('year WITH ROLLUP');
-
-knex('users').orderBy('name', 'desc');
-
-knex.select('*').from('table').orderByRaw('col NULLS LAST DESC');
-
-knex('books').insert({title: 'Slaughterhouse Five'});
-
-knex('coords').insert([{x: 20}, {y: 30},  {x: 10, y: 20}]);
-
-knex.insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], 'id').into('books');
-knex.insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], ['id', 'title']).into('books');
-
-knex('books')
-  .returning('id')
-  .insert({title: 'Slaughterhouse Five'});
-
-knex('books')
-  .returning('id')
-  .insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}]);
-
-knex.batchInsert('books', [{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], 200);
-knex.batchInsert('books', [{title: 'Catcher In The Rye'}, {title: 'Pride And Prejudice'}]);
-knex.queryBuilder().table('books');
-
-knex('books').where('published_date', '<', 2000).update({status: 'archived'});
-knex('books').where('published_date', '<', 2000).update({status: 'archived'}, 'id');
-knex('books').where('published_date', '<', 2000).update({status: 'archived'}, ['id', 'title']);
-
-knex('books').update('title', 'Slaughterhouse Five');
-knex('books').update('title', 'Slaughterhouse Five', 'id');
-knex('books').update('title', 'Slaughterhouse Five', ['id', 'title']);
-
-knex('accounts').where('activated', false).del();
-knex('accounts').where('activated', false).del('id');
-knex('accounts').where('activated', false).del(['id', 'title']);
-knex('accounts').where('activated', false).delete();
-knex('accounts').where('activated', false).delete('id');
-knex('accounts').where('activated', false).delete(['id', 'title']);
-
-knex.with('old_books', (qb) => {
-  qb.select('*').from('books').where('published_date', '<', 1970);
-}).select('*').from('old_books');
-
-knex.with('new_books', knex.raw('select * from books where published_date >= 2016'))
-  .select('*').from('new_books');
-
-knex.with('new_books', 'select * from books where published_date >= :year', { year: 2016 })
-  .select('*').from('new_books');
-
-knex.with('new_books', 'select * from books where published_date >= ?', [2016])
-  .select('*').from('new_books');
-
-knex.with('new_books', knex.select('*').from('books').where("published_date", ">=", 2016))
-  .select('*').from('new_books');
-
-knex.withRaw('recent_books', 'select * from books where published_date >= :year', { year: 2013 })
-  .select('*').from('recent_books');
-
-knex.withRaw('recent_books', knex.raw('select * from books where published_date >= ?', [2013]))
-  .select('*').from('recent_books');
-
-knex.withWrapped("antique_books", (qb) => {
-  qb.select('*').from('books').where('published_date', '<', 1899);
-}).select('*').from('antique_books');
-
-knex.withWrapped('new_books', knex.select('*').from('books').where("published_date", ">=", 2016))
-  .select('*').from('new_books');
-
-const someExternalMethod: (...args: any[]) => void = () => {};
-
-knex.transaction((trx) => {
-  knex('books').transacting(trx).insert({name: 'Old Books'})
-    .then((resp) => {
-      const id = resp[0];
-      someExternalMethod(id, trx);
-    })
-    .then(trx.commit)
-    .catch(trx.rollback);
-}).then(() => {
-  console.log('Transaction complete.');
-}).catch((err) => {
-  console.error(err);
-});
-
-knex.transaction((trx) => {
-  knex('tableName')
-    .transacting(trx)
-    .forUpdate()
-    .select('*');
-
-  knex('tableName')
-    .transacting(trx)
-    .forShare()
-    .select('*');
-});
-
-const transactionReturnValue = knex.transaction((trx) => {
-  return knex("table")
-    .insert({ foo: "bar" })
-    .returning(["id"])
-    .then((result) => {
-      return result[0].id as number;
-    });
-});
-
-// Tests that the transaction has kept the type of its return value by referencing a method of number
-transactionReturnValue.then(value => value.toExponential);
-
-knex('users').count('active');
-
-knex('users').min('age');
-
-knex('users').min('age as a');
-
-knex('users').max('age');
-
-knex('users').max('age as a');
-
-knex('users').sum('products');
-
-knex('users').sum('products as p');
-
-knex('users').avg('age');
-
-knex('users').avg('age as a');
-
-knex('accounts')
-  .where('userid', '=', 1)
-  .increment('balance', 10);
-
-knex('accounts').where('userid', '=', 1).decrement('balance', 5);
-
-knex('accounts').truncate();
-
-knex.table('users').first('id').then((ids) => {
-  console.log(ids);
-});
-
-knex.table('users').first('id', 'name').then((row) => {
-  console.log(row);
-});
-
-knex.table('users').first(knex.raw('round(sum(products)) as p')).then((row) => {
-  console.log(row);
-});
-
-knex.table('users').orderBy('name', 'desc').clearOrder().orderBy('id', 'asc').then((rows) => {
-  console.log(rows);
-});
-
-knex.table('users').select('*').clearSelect().select('id').then((rows) => {
-  console.log(rows);
-});
-
-knex('accounts').where('userid', '=', 1).clearWhere().select().then((rows) => {
-  console.log(rows);
-});
-
-// Using trx as a query builder:
-knex.transaction((trx) => {
-  const info: any = {};
-  const books: any[] = [
-    {title: 'Canterbury Tales'},
-    {title: 'Moby Dick'},
-    {title: 'Hamlet'}
-  ];
-
-  return trx
-    .insert({name: 'Old Books'}, 'id')
-    .into('catalogues')
-    .then((ids) => {
-      return Promise.all(books.map((book: any) => {
-        book.catalogue_id = ids[0];
-        // Some validation could take place here.
-        return trx.insert(info).into('books');
-      }));
-    });
-})
-.then((inserts) => {
-  console.log(inserts.length + ' new books saved.');
-})
-.catch((error) => {
-  // If we get here, that means that neither the 'Old Books' catalogues insert,
-  // nor any of the books inserts will have taken place.
-  console.error(error);
-});
-
-// Using trx as a transaction object:
-knex.transaction<{ length: number }>((trx) => {
-  trx.raw('');
-
-  trx.on('query-error', (error: Error) => {
-    console.error(error);
-  });
-
-  trx.savepoint((nestedTrx) => {
-    nestedTrx.rollback(new Error('something went terribly wrong'));
-  });
-
-  trx.transaction((nestedTrx) => {
-    nestedTrx.commit();
-  });
-
-  const info: any = {};
-  const books: any[] = [
-    {title: 'Canterbury Tales'},
-    {title: 'Moby Dick'},
-    {title: 'Hamlet'}
-  ];
-
-  knex.insert({name: 'Old Books'}, 'id')
-    .into('catalogues')
-    .transacting(trx)
-    .then((ids) => {
-      return Promise.all(books.map((book: any) => {
-        book.catalogue_id = ids[0];
-
-        // Some validation could take place here.
-
-        return knex.insert(info).into('books').transacting(trx);
-      }));
-    })
-    .then(trx.commit)
-    .catch(trx.rollback);
-})
-.then((inserts) => {
-  console.log(inserts.length + ' new books saved.');
-})
-.catch((error) => {
-  // If we get here, that means that neither the 'Old Books' catalogues insert,
-  // nor any of the books inserts will have taken place.
-  console.error(error);
-});
-
-// transacting handles undefined
-knex.insert({ name: 'Old Books'}).transacting(undefined);
-
-knex.schema.withSchema("public").hasTable("table"); // $ExpectType Bluebird<boolean>
-
-knex.schema.createTable('users', (table) => {
-  table.increments();
-  table.string('name');
-  table.enu('favorite_color', ['red', 'blue', 'green']);
-  table.timestamps();
-  table.timestamp('created_at').defaultTo(knex.fn.now());
-  table.timestamps(true, true);
-});
-
-knex.schema.alterTable('users', (table) => {
-  table.string('role').nullable();
-});
-
-knex.schema.renameTable('users', 'old_users');
-
-knex.schema.dropTable('users');
-
-knex.schema.hasTable('users').then((exists) => {
-  if (!exists) {
-    return knex.schema.createTable('users', (t) => {
-      t.increments('id').primary();
-      t.string('first_name', 100);
-      t.string('last_name', 100);
-      t.text('bio');
-    });
-  }
-});
-
-const tableName = '';
-const columnName = '';
-knex.schema.hasColumn(tableName, columnName);
-
-knex.schema.dropTableIfExists('users');
-
-knex.schema.table('users', (table) => {
-  table.dropColumn('name');
-  table.string('first_name');
-  table.string('last_name');
-});
-
-knex.schema.raw("SET sql_mode='TRADITIONAL'")
-.table('users', (table) => {
-    table.dropColumn('name');
-    table.string('first_name');
-    table.string('last_name');
-    table.dropUnique(["name1", "name2"], "index_name");
-    table.dropUnique(["name1", "name2"]);
-    table.dropPrimary();
-    table.dropPrimary("constraint_name");
-});
-
-knex('users')
-  .select(knex.raw('count(*) as user_count, status'))
-  .where(knex.raw(1))
-  .orWhere(knex.raw('status <> ?', [1]))
-  .groupBy('status');
-
-knex.raw('select * from users where id = ?', [1]).then((resp) => {
-    // ...
-  });
-
-(() => {
-  const subcolumn = knex.raw('select avg(salary) from employee where dept_no = e.dept_no')
-    .wrap('(', ') avg_sal_dept');
-
-  knex.select('e.lastname', 'e.salary', subcolumn)
-    .from('employee as e')
-    .whereRaw('dept_no = e.dept_no');
-})();
-
-(() => {
-  const subcolumn = knex.avg('salary')
-    .from('employee')
-    .whereRaw('dept_no = e.dept_no')
-    .as('avg_sal_dept');
-
-  knex.select('e.lastname', 'e.salary', subcolumn)
-    .from('employee as e')
-    .whereRaw('dept_no = e.dept_no');
-})();
-
-const x = 1;
-knex.select('name').from('users')
-  .where('id', '>', 20)
-  .andWhere('id', '<', 200)
-  .limit(10)
-  .offset(x)
-  .then((rows) => {
-    return rows.map((r: any) => r.name);
-  })
-  .then((names: any) => {
-    return knex.select('id').from('nicknames').whereIn('nickname', names);
-  })
-  .then((rows) => {
-    console.log(rows);
-  })
-  .catch((error) => {
-    console.error(error);
-  });
-
-knex.select('*').from('users').where({name: 'Tim'})
-  .then((rows) => {
-    return knex.insert({user_id: rows[0].id, name: 'Test'}, 'id').into('accounts');
-  }).then((id) => {
-    console.log('Inserted Account ' + id);
-  }).catch((error) => {
-    console.error(error);
-  });
-
-knex.insert({id: 1, name: 'Test'}, 'id').into('accounts')
-  .catch((error) => {
-    console.error(error);
-  }).then(() => {
-    return knex.select('*').from('accounts').where('id', 1);
-  }).then((rows) => {
-    console.log(rows[0]);
-  }).catch((error) => {
-    console.error(error);
-  });
-
-const query: any = () => {};
-query.then((x: any) => {
-    // doSideEffectsHere(x);
-    return x;
-});
-
-knex.select('name').from('users').limit(10).then((rows: any[]): string[] => {
-  return rows.map((row: any): string => {
-    return row.name;
-  });
-}).then((names: string[]) => {
-  console.log(names);
-}).catch((e: Error) => {
-  console.error(e);
-});
-
-knex.select('name').from('users').limit(10).then((rows: any[]) => {
-  return rows.reduce((memo: any, row: any) => {
-    memo.names.push(row.name);
-    memo.count++;
-    return memo;
-  }, {count: 0, names: []});
-}).then((obj: any) => {
-  console.log(obj);
-}).catch((e: Error) => {
-  console.error(e);
-});
-
-knex.select('name').from('users')
-  .limit(10)
-  .then(console.log.bind(console))
-  .catch(console.error.bind(console));
-
-const values: any[] = [];
-
-knex.insert(values).into('users')
-  .then(() => {
-    return {inserted: true};
-  });
-
-knex.select('name').from('users')
-  .where('id', '>', 20)
-  .andWhere('id', '<', 200)
-  .limit(10)
-  .offset(x);
-
-// Retrieve the stream:
-let stream = knex.select('*').from('users').stream();
-const writableStream: NodeJS.WritableStream = new WriteStream();
-stream.pipe(writableStream);
-
-// With options:
-stream = knex.select('*').from('users').stream({highWaterMark: 5});
-stream.pipe(writableStream);
-
-// Use as a promise:
-(() => {
-    knex
-        .select("*")
-        .from("users")
-        .where(knex.raw("id = ?", [1]))
-        .stream((stream: any) => {
-            stream.pipe(writableStream);
-        })
-        .then(() => {
-            // ...
-        })
-        .catch((e: Error) => {
-            console.error(e);
-        });
-})();
-
-stream = knex.select('*').from('users').pipe(writableStream);
-const app: any = () => {};
-
-knex.select('*')
-  .from('users')
-  .on('query', (data: any) => {
-    app.log(data);
-  })
-  .then(() => {
-    // ...
-  });
-
-knex.select('*').from('users').where(knex.raw('id = ?', [1])).toString();
-
-knex.select('*').from('users').where(knex.raw('id = ?', [1])).toSQL();
-
-//
-// Callback functions
-//
-knex('users')
-  .select('*')
-  .join('contacts', function(builder) {
-    this.on(function(builder: any) {
-      let self: Knex.JoinClause = this;
-      self = builder;
-    }).andOn(function(builder: any) {
-      let self: Knex.JoinClause = this;
-      self = builder;
-    }).orOn(function(builder: any) {
-      let self: Knex.JoinClause = this;
-      self = builder;
-    }).onExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    }).orOnExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    }).andOnExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    }).onNotExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    }).andOnNotExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    }).orOnNotExists(function(builder: any) {
-      let self: Knex.QueryBuilder = this;
-      self = builder;
-    });
-  }).where(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).orWhere(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).andWhere(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).whereIn('column', function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).orWhereIn('column', function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).whereNotIn('column', function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).orWhereNotIn('column', function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).whereWrapped(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).union(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).unionAll(function(builder) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }).modify(function(builder, aBool) {
-    let self: Knex.QueryBuilder = this;
-    self = builder;
-  }, true);
-
-//
-// Migrations
-//
-const name = "test";
-const config = {
-  directory: "./migrations",
-  extension: "js",
-  tableName: "knex_migrations",
-  disableTransactions: false
-};
-knex.migrate.make(name, config);
-knex.migrate.make(name);
-
-knex.migrate.latest(config);
-knex.migrate.latest();
-
-knex.migrate.rollback(config);
-knex.migrate.rollback();
-
-knex.migrate.currentVersion(config);
-knex.migrate.currentVersion();
-
-knex.seed.make(name, config);
-knex.seed.make(name);
-
-knex.seed.run(config);
-knex.seed.run();
-
-knex.schema
-  .dropTableIfExists('A')
-  .createTable('A', table => {
-    table.integer('C').unsigned().references('B.id').notNullable();
-    table.integer('D').primary('PK').notNullable();
-    table.string('E').unique('UX').nullable();
-    table.foreign('E', 'FK').references('F.id');
-    table.timestamp('T', false).notNullable();
-  });
-
-// creating table in MySQL with binary primary key with known field length
-knex.schema.createTable('testTable', (table) => {
-    table.binary('binaryKey', 16).primary(); // will make table with binaryKey type BINARY(16)
-});
-
-// allow creating decimal column that can store that can store numbers of any
-// precision and scale. (Only supported for Oracle, SQLite, Postgres)
-knex = Knex({
-    client: 'pg'
-});
-
-knex.schema
-    .dropTableIfExists('testTable')
-    .createTable('testTable', (table) => {
-        table.decimal('dec', null);
-    })
-    .dropTable('testTable');
-
-// allow specifying an alias for a table name
-knex.schema
-    .dropTableIfExists('foo')
-    .dropTableIfExists('bar')
-    .createTable('foo', (table) => {
-        table.uuid('id').primary();
-    })
-    .createTable('bar', (table) => {
-        table.uuid('id').primary();
-    });
-
-knex({
-    table1: 'foo',
-    table2: 'bar'
-})
-    .select({
-        table1Id: 'table1.id',
-        table2Id: 'table2.id'
-    });
-
-knex('characters')
-    .select()
-    .whereIn(['name', 'class'], [['Bar', 'Fighter'], ['Foo', 'Druid']]);
-
-knex('characters')
-    .select()
-    .whereIn('name', knex('characters').select('name'));
-knex('characters')
-    .select()
-    .whereIn(['name', 'class'], knex('characters').select('name', 'class'));
-
-knex('characters')
-    .select()
-    .whereIn('name', function() {
-        this.select('name').from('characters');
-    });
-knex('characters')
-    .select()
-    .whereIn(['name', 'class'], function() {
-        this.select('name', 'class').from('characters');
-    });
-
-knex('characters')
-    .select()
-    .where({ name: 'Bar', class: 'Fighter' })
-    .union(knex('characters').select().where({ name: 'Foo', class: 'Druid' }));
-knex('characters')
-    .select()
-    .where({ name: 'Bar', class: 'Fighter' })
-    .union([knex('characters').select().where({ name: 'Foo', class: 'Druid' })]);
-knex('characters')
-    .select()
-    .where({ name: 'Bar', class: 'Fighter' })
-    .union(
-        knex('characters').select().where({ name: 'Foo', class: 'Druid' }),
-        knex('characters').select().where({ name: 'Baz', class: 'Paladin' })
-    );
diff --git a/types/knex/tsconfig.json b/types/knex/tsconfig.json
deleted file mode 100644
index 8f0b7771d9..0000000000
--- a/types/knex/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "knex-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/knex/tslint.json b/types/knex/tslint.json
deleted file mode 100644
index 604d5950cf..0000000000
--- a/types/knex/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "unified-signatures": false,
-        "callable-types": false
-    }
-}

From c83a11c439b5607ad2a5d6f73bc691fbc4400494 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Thu, 14 Mar 2019 14:47:02 -0700
Subject: [PATCH 675/924] Detail on deprecated packages with dependents

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

diff --git a/README.md b/README.md
index cb4fd7510b..b50272dbf4 100644
--- a/README.md
+++ b/README.md
@@ -171,13 +171,26 @@ You can remove it by running `npm run not-needed -- typingsPackageName asOfVersi
 - `typingsPackageName`: This is the name of the directory to delete.
 - `asOfVersion`: A stub will be published to `@types/foo` with this version. Should be higher than any currently published version.
 - `sourceRepoURL`: This should point to the repository that contains the typings.
-- `libraryName`: Name of npm package that replaces the Definitely Typed types. Usually this is identical to "typingsPackageName" so you can omit it.
+- `libraryName`: Name of npm package that replaces the Definitely Typed types. Usually this is identical to "typingsPackageName", in which case you can omit it.
 
-Any other packages in Definitely Typed that referenced the deleted package should be updated to reference the bundled types. To do this, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
+Any other packages in Definitely Typed that referenced the deleted package should be updated to reference the bundled types.
+You can get this list by looking at the errors from `npm run test`.
+To fix the errors, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
+For example:
+
+```json
+{
+  "private": true,
+  "dependencies": {
+    "foo": "^2.6.0"
+  }
+}
+```
+
+When you add a `package.json` to dependents of `foo`, you will also need to open a PR to add `foo` [to dependenciesWhitelist.txt in types-publisher](https://github.com/Microsoft/types-publisher/blob/master/dependenciesWhitelist.txt).
 
 If a package was never on Definitely Typed, it does not need to be added to `notNeededPackages.json`.
 
-
 #### Lint
 
 All new packages must be linted. To lint a package, add a `tslint.json` to that package containing

From 68e69031cd0e28214e879a65548fa039f15decf9 Mon Sep 17 00:00:00 2001
From: "Matt R. Wilson" <mwilson@shutterstock.com>
Date: Thu, 14 Mar 2019 16:35:37 -0600
Subject: [PATCH 676/924] Add knex as dependency for needing packages.

Allows these types to still require knex now that it self bundles its types.
---
 types/bookshelf/package.json    | 6 ++++++
 types/knex-postgis/package.json | 6 ++++++
 types/mock-knex/package.json    | 6 ++++++
 types/schwifty/package.json     | 1 +
 4 files changed, 19 insertions(+)
 create mode 100644 types/bookshelf/package.json
 create mode 100644 types/knex-postgis/package.json
 create mode 100644 types/mock-knex/package.json

diff --git a/types/bookshelf/package.json b/types/bookshelf/package.json
new file mode 100644
index 0000000000..7bd76f13f8
--- /dev/null
+++ b/types/bookshelf/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "knex": "^0.16.1"
+    }
+}
diff --git a/types/knex-postgis/package.json b/types/knex-postgis/package.json
new file mode 100644
index 0000000000..7bd76f13f8
--- /dev/null
+++ b/types/knex-postgis/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "knex": "^0.16.1"
+    }
+}
diff --git a/types/mock-knex/package.json b/types/mock-knex/package.json
new file mode 100644
index 0000000000..7bd76f13f8
--- /dev/null
+++ b/types/mock-knex/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "knex": "^0.16.1"
+    }
+}
diff --git a/types/schwifty/package.json b/types/schwifty/package.json
index 01df4a95e3..4361a26f8b 100644
--- a/types/schwifty/package.json
+++ b/types/schwifty/package.json
@@ -1,6 +1,7 @@
 {
     "private": true,
     "dependencies": {
+        "knex": "^0.16.1",
         "objection": "^1.1.9"
     }
 }

From daa465cfb164f3b206d7a4d4f2fa4e8804256d89 Mon Sep 17 00:00:00 2001
From: Ryan Mehta <ryan.mehta@gmail.com>
Date: Thu, 14 Mar 2019 15:36:15 -0700
Subject: [PATCH 677/924] remove skip from express-jwt

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

diff --git a/types/express-jwt/index.d.ts b/types/express-jwt/index.d.ts
index d1029849cc..52d7d901ec 100644
--- a/types/express-jwt/index.d.ts
+++ b/types/express-jwt/index.d.ts
@@ -37,7 +37,6 @@ declare namespace jwt {
     export interface Options {
         secret: secretType | SecretCallback | SecretCallbackLong;
         userProperty?: string;
-        skip?: string[];
         credentialsRequired?: boolean;
         isRevoked?: IsRevokedCallback;
         requestProperty?: string;

From 201ee02d0082819c048c814af7932073868efa57 Mon Sep 17 00:00:00 2001
From: Aaron Beall <contact@abeall.com>
Date: Thu, 14 Mar 2019 21:58:30 -0400
Subject: [PATCH 678/924] Fix Metadata and updateOptions() definitions

---
 types/pendo-io-browser/index.d.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/types/pendo-io-browser/index.d.ts b/types/pendo-io-browser/index.d.ts
index dfc04e25d4..2b8e0082b7 100644
--- a/types/pendo-io-browser/index.d.ts
+++ b/types/pendo-io-browser/index.d.ts
@@ -10,15 +10,13 @@ declare namespace pendo {
         account?: Account;
     }
 
-    type Metadata = Record<string, string | number | undefined>;
-
-    interface Visitor extends Metadata {
-        id: string;
+    interface Metadata {
+        [key: string]: string | number | boolean | Date | string[] | number[];
     }
 
-    interface Account extends Metadata {
-        id?: string;
-    }
+    type Visitor = { id: string; } & Metadata;
+
+    type Account = { id?: string; } & Metadata;
 
     interface InitOptions extends Identity {
         apiKey?: string;
@@ -49,7 +47,7 @@ declare namespace pendo {
         identify(identity: Identity): void;
         isReady(): boolean;
         flushNow(): Promise<any>;
-        updateOptions(visitorMetadata: Metadata): void;
+        updateOptions(options: Identity): void;
         getVersion(): string;
         getVisitorId(): string;
         getAccountId(): string;
@@ -120,7 +118,7 @@ declare namespace pendo {
         attributes: {
             type: string;
             device: { desktop: boolean; mobile: boolean; type: "desktop" | "mobile" };
-            badge: any;
+            badge: any; // TODO
             priority: number;
             launcher: { keywords: string[] };
         };

From aae575867049a7d0fbcdc98dfbfc60932bc00ecc Mon Sep 17 00:00:00 2001
From: Aaron Beall <contact@abeall.com>
Date: Thu, 14 Mar 2019 22:04:04 -0400
Subject: [PATCH 679/924] Added test

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

diff --git a/types/pendo-io-browser/pendo-io-browser-tests.ts b/types/pendo-io-browser/pendo-io-browser-tests.ts
index 16db208cda..ebc4dc931f 100644
--- a/types/pendo-io-browser/pendo-io-browser-tests.ts
+++ b/types/pendo-io-browser/pendo-io-browser-tests.ts
@@ -31,6 +31,17 @@ pendo.identify({
     }
 });
 
+pendo.updateOptions({
+    visitor: {
+        id: 'foo'
+    },
+    account: {
+        id: 'bar',
+        TypeOfBusiness: 'brokers',
+        dollarPerStop: 'true'
+    }
+});
+
 pendo.debugging.getEventCache();
 
 pendo.events

From b237a5bae3c7502e911f21eda50d25d66b221cb8 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 15 Mar 2019 19:45:16 +0800
Subject: [PATCH 680/924] use strict tslint for uni-app

---
 types/uni-app/index.d.ts    | 6230 ++++++++++++++++++++++++++++++++++-
 types/uni-app/lib/page.d.ts |    6 +-
 types/uni-app/lib/uni.d.ts  | 6225 ----------------------------------
 types/uni-app/tsconfig.json |    1 -
 types/uni-app/tslint.json   |    7 +-
 5 files changed, 6229 insertions(+), 6240 deletions(-)
 delete mode 100644 types/uni-app/lib/uni.d.ts

diff --git a/types/uni-app/index.d.ts b/types/uni-app/index.d.ts
index 207a3447e4..960a3e8061 100644
--- a/types/uni-app/index.d.ts
+++ b/types/uni-app/index.d.ts
@@ -5,8 +5,6228 @@
 
 // TypeScript Version: 2.3
 
-import "./lib/app";
-import "./lib/common";
-import "./lib/page";
-import "./lib/uni";
-import "./lib/vue";
+/**
+ * Uni 实例变量
+ */
+declare const uni: Uni;
+
+declare class Uni {
+    /**
+     * 发起网络请求
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/request?id=request](http://uniapp.dcloud.io/api/request/request?id=request)
+     */
+    request(options: RequestOptions): RequestTask;
+    /**
+     * 上传文件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=uploadfile](http://uniapp.dcloud.io/api/request/network-file?id=uploadfile)
+     */
+    uploadFile(options: UploadFileOption): UploadTask;
+    /**
+     * 下载文件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
+     */
+    downloadFile(options: DownloadFileOption): DownloadTask;
+    /**
+     * 导入原生插件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
+     */
+    requireNativePlugin(moduleName: string): void;
+    /**
+     * upx 换算为 px
+     *
+     * 参考: [http://uniapp.dcloud.io/frame?id=upx2px](http://uniapp.dcloud.io/frame?id=upx2px)
+     */
+    upx2px(): number;
+    /**
+     * 创建一个 WebSocket 连接
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=connectsocket](http://uniapp.dcloud.io/api/request/websocket?id=connectsocket)
+     */
+    connectSocket(options: ConnectSocketOption): SocketTask;
+    /**
+     * 监听WebSocket连接打开事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen](http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen)
+     */
+    onSocketOpen(options: (result: OnSocketOpenCallbackResult) => void): void;
+    /**
+     * 监听WebSocket错误
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror](http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror)
+     */
+    onSocketError(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 通过 WebSocket 连接发送数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage)
+     */
+    sendSocketMessage(options: SendSocketMessageOptions): void;
+    /**
+     * 监听WebSocket接受到服务器的消息事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage)
+     */
+    onSocketMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
+    /**
+     * 关闭 WebSocket 连接
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=closesocket](http://uniapp.dcloud.io/api/request/websocket?id=closesocket)
+     */
+    closeSocket(options: CloseSocketOptions): void;
+    /**
+     * 监听WebSocket关闭
+     *
+     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose](http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose)
+     */
+    onSocketClose(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 从本地相册选择图片或使用相机拍照
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=chooseimage](http://uniapp.dcloud.io/api/media/image?id=chooseimage)
+     */
+    chooseImage(options: ChooseImageOptions): void;
+    /**
+     * 预览图片
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=previewimage](http://uniapp.dcloud.io/api/media/image?id=previewimage)
+     */
+    previewImage(options: PreviewImageOptions): void;
+    /**
+     * 预览图片
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=getimageinfo](http://uniapp.dcloud.io/api/media/image?id=getimageinfo)
+     */
+    getImageInfo(options: GetImageInfoOptions): void;
+    /**
+     * 保存图片到系统相册
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum](http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum)
+     */
+    saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
+    /**
+     * 录音管理
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager](http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager)
+     */
+    getRecorderManager(): RecorderManager;
+    /**
+     * 获取全局唯一的背景音频管理器 backgroundAudioManager
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager](http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager)
+     */
+    getBackgroundAudioManager(): BackgroundAudioManager;
+    /**
+     * 创建并返回 audio 上下文 audioContext 对象
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext](http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext)
+     */
+    createInnerAudioContext(): CreateInnerAudioContext;
+    /**
+     * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/video?id=choosevideo](http://uniapp.dcloud.io/api/media/video?id=choosevideo)
+     */
+    chooseVideo(options: ChooseVideoOptions): void;
+    /**
+     * 保存视频到系统相册
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum](http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum)
+     */
+    saveVideoToPhotosAlbum(options: SaveVideoToPhotosAlbumOptions): void;
+    /**
+     * 创建并返回 video 上下文 videoContext 对象
+     *
+     * 参考: [http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext](http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext)
+     */
+    createVideoContext(): VideoContext;
+    /**
+     * 保存文件到本地
+     *
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=savefile](http://uniapp.dcloud.io/api/file/file?id=savefile)
+     */
+    saveFile(options: SaveFileOptions): void;
+    /**
+     * 获取文件信息
+     */
+    getFileInfo(options: GetFileInfoOptions): void;
+    /**
+     * 获取本地已保存的文件列表
+     *
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist](http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist)
+     */
+    getSavedFileList(options: GetSavedFileListOptions): void;
+    /**
+     * 获取本地文件的文件信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo](http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo)
+     */
+    getSavedFileInfo(options: GetSavedFileInfoOptions): void;
+    /**
+     * 删除本地存储的文件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=removesavedfile](http://uniapp.dcloud.io/api/file/file?id=removesavedfile)
+     */
+    removeSavedFile(options: RemoveSavedFileOptions): void;
+    /**
+     * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
+     *
+     * 参考: [http://uniapp.dcloud.io/api/file/file?id=opendocument](http://uniapp.dcloud.io/api/file/file?id=opendocument)
+     */
+    openDocument(options: OpenDocumentOptions): void;
+    /**
+     * 将数据存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个异步接口
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstorage](http://uniapp.dcloud.io/api/storage/storage?id=setstorage)
+     */
+    setStorage(options: SetStorageOptions): void;
+    /**
+     * 将 data 存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个同步接口
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync)
+     */
+    setStorageSync(): void;
+    /**
+     * 从本地缓存中异步获取指定 key 对应的内容
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorage](http://uniapp.dcloud.io/api/storage/storage?id=getstorage)
+     */
+    getStorage(options: GetStorageOptions): void;
+    /**
+     * 从本地缓存中同步获取指定 key 对应的内容
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync)
+     */
+    getStorageSync(): void;
+    /**
+     * 异步获取当前storage的相关信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo)
+     */
+    getStorageInfo(options: GetStorageInfoOptions): void;
+    /**
+     * 同步获取当前storage的相关信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync)
+     */
+    getStorageInfoSync(): void;
+    /**
+     * 从本地缓存中异步移除指定 key
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestorage](http://uniapp.dcloud.io/api/storage/storage?id=removestorage)
+     */
+    removeStorage(options: RemoveStorageOptions): void;
+    /**
+     * 从本地缓存中同步移除指定 key
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync](http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync)
+     */
+    removeStorageSync(): void;
+    /**
+     * 清理本地数据缓存
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstorage](http://uniapp.dcloud.io/api/storage/storage?id=clearstorage)
+     */
+    clearStorage(): void;
+    /**
+     * 同步清理本地数据缓存
+     *
+     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync)
+     */
+    clearStorageSync(): void;
+    /**
+     * 获取当前的地理位置、速度
+     *
+     * 参考: [http://uniapp.dcloud.io/api/location/location?id=getlocation](http://uniapp.dcloud.io/api/location/location?id=getlocation)
+     */
+    getLocation(options: GetLocationOptions): void;
+    /**
+     * 打开地图选择位置。
+     *
+     * 参考: [http://uniapp.dcloud.io/api/location/location?id=chooselocation](http://uniapp.dcloud.io/api/location/location?id=chooselocation)
+     */
+    chooseLocation(options: ChooseLocationOptions): void;
+    /**
+     * 使用地图查看位置
+     *
+     * 参考: [http://uniapp.dcloud.io/api/location/open-location?id=openlocation](http://uniapp.dcloud.io/api/location/open-location?id=openlocation)
+     */
+    openLocation(options: OpenLocationOptions): void;
+    /**
+     * 创建并返回 map 上下文 mapContext 对象
+     *
+     * 参考: [http://uniapp.dcloud.io/api/location/map?id=createmapcontext](http://uniapp.dcloud.io/api/location/map?id=createmapcontext)
+     */
+    createMapContext(): MapContext;
+    /**
+     * 获取系统信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfo](http://uniapp.dcloud.io/api/system/info?id=getsysteminfo)
+     */
+    getSystemInfo(options: GetSystemInfoOptions): void;
+    /**
+     * 获取系统信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync](http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync)
+     */
+    getSystemInfoSync(): GetSystemInfoSuccess;
+    /**
+     * 判断uni-app的API，回调，参数，组件等是否在当前版本可用
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/info?id=caniuse](http://uniapp.dcloud.io/api/system/info?id=caniuse)
+     */
+    canIUse(options: string): boolean;
+    /**
+     * 获取网络类型
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/network?id=getnetworktype](http://uniapp.dcloud.io/api/system/network?id=getnetworktype)
+     */
+    getNetworkType(options: GetNetworkTypeOptions): void;
+    /**
+     * 监听网络状态变化
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange](http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange)
+     */
+    onNetworkStatusChange(callback: (result: OnNetworkStatusChangeSuccess) => void): void;
+    /**
+     * 监听加速度数据，频率：5次/秒，接口调用后会自动开始监听，可使用 uni.stopAccelerometer 停止监听
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange](http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange)
+     */
+    onAccelerometerChange(callback: (result: OnAccelerometerChangeSuccess) => void): void;
+    /**
+     * 开始监听加速度数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer)
+     */
+    startAccelerometer(options: StartAccelerometerOptions): void;
+    /**
+     * 停止监听加速度数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer)
+     */
+    stopAccelerometer(options: StopAccelerometerOptions): void;
+    /**
+     * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用uni.stopCompass停止监听
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=oncompasschange](http://uniapp.dcloud.io/api/system/compass?id=oncompasschange)
+     */
+    onCompassChange(callback: (result: OnCompassChangeSuccess) => void): void;
+    /**
+     * 开始监听罗盘数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=startcompass](http://uniapp.dcloud.io/api/system/compass?id=startcompass)
+     */
+    startCompass(options: StartCompassOptions): void;
+    /**
+     * 停止监听罗盘数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=stopcompass](http://uniapp.dcloud.io/api/system/compass?id=stopcompass)
+     */
+    stopCompass(options: StopCompassOptions): void;
+    /**
+     * 拨打电话
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/phone?id=makephonecall](http://uniapp.dcloud.io/api/system/phone?id=makephonecall)
+     */
+    makePhoneCall(options: MakePhoneCallOptions): void;
+    /**
+     * 调用扫码界面，扫码成功后返回对应的结果
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/barcode?id=scancode](http://uniapp.dcloud.io/api/system/barcode?id=scancode)
+     */
+    scanCode(options: ScanCodeOptions): void;
+    /**
+     * 设置系统剪贴板的内容
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata)
+     */
+    setClipboardData(options: SetClipboardDataOptions): void;
+    /**
+     * 获得系统剪贴板的内容
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata)
+     */
+    getClipboardData(options: GetClipboardDataOptions): void;
+    /**
+     * 隐藏软键盘
+     *
+     * 参考: [http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard](http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard)
+     */
+    hideKeyboard(): void;
+    /**
+     * 设置屏幕亮度
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness)
+     */
+    setScreenBrightness(options: SetScreenBrightnessOptions): void;
+    /**
+     * 获取屏幕亮度
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness)
+     */
+    getScreenBrightness(options: GetScreenBrightnessOptions): void;
+    /**
+     * 设置是否保持常亮状态
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon](http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon)
+     */
+    setKeepScreenOn(options: SetKeepScreenOnOptions): void;
+    /**
+     * 使手机发生较长时间的振动（400ms）
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong](http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong)
+     */
+    vibrateLong(options: VibrateLongOptions): void;
+    /**
+     * 使手机发生较短时间的振动（15ms）
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort](http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort)
+     */
+    vibrateShort(options: VibrateShortOptions): void;
+    /**
+     * 手机通讯录联系人和联系方式的增加
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/contact?id=addphonecontact](http://uniapp.dcloud.io/api/system/contact?id=addphonecontact)
+     */
+    addPhoneContact(options: AddPhoneContactOptions): void;
+    /**
+     * 获取已搜索到的iBeacon设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons](http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons)
+     */
+    getBeacons(options: GetBeaconsOptions): void;
+    /**
+     * 开始搜索附近的iBeacon设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery](http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery)
+     */
+    startBeaconDiscovery(options: StartBeaconDiscoveryOptions): void;
+    /**
+     * 停止搜索附近的iBeacon设备
+     *
+     * 参考: [http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery](http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery)
+     */
+    stopBeaconDiscovery(options: StopBeaconDiscoveryOptions): void;
+    /**
+     * 监听iBeacon设备更新
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate)
+     */
+    onBeaconUpdate(callback: (result: GetBeaconsRes) => void): void;
+    /**
+     * 监听iBeacon服务状态变化
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange)
+     */
+    onBeaconServiceChange(callback: (result: BeaconService) => void): void;
+    /**
+     * 关闭蓝牙模块
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter)
+     */
+    closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
+    /**
+     * 获取本机蓝牙适配器状态
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate)
+     */
+    getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
+    /**
+     * 获取已搜索到的蓝牙设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices)
+     */
+    getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
+    /**
+     * 根据uuid获取处于已连接的设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices)
+     */
+    getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
+    /**
+     * 监听蓝牙适配器状态变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange)
+     */
+    onBluetoothAdapterStateChange(callback: (result: OnBluetoothAdapterStateChangeResult) => void): void;
+    /**
+     * 监听搜索到新设备的事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound)
+     */
+    onBluetoothDeviceFound(callback: (result: OnBluetoothDeviceFoundResult) => void): void;
+    /**
+     * 初始化蓝牙模块
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter)
+     */
+    openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
+    /**
+     * 开始搜索附近的蓝牙设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery)
+     */
+    startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
+    /**
+     * 停止搜寻附近的蓝牙外围设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery)
+     */
+    stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
+    /**
+     * 断开与低功耗蓝牙设备的连接
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=closebleconnection](http://uniapp.dcloud.io/api/system/ble?id=closebleconnection)
+     */
+    closeBLEConnection(options: CloseBLEConnectionOptions): void;
+    /**
+     * 连接低功耗蓝牙设备
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=createbleconnection](http://uniapp.dcloud.io/api/system/ble?id=createbleconnection)
+     */
+    createBLEConnection(options: CreateBLEConnectionOptions): void;
+    /**
+     * 获取蓝牙设备指定服务中所有特征值
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics](http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics)
+     */
+    getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
+    /**
+     * 获取蓝牙设备的所有服务
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices](http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices)
+     */
+    getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
+    /**
+     * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange)
+     */
+    notifyBLECharacteristicValueChange(options: NotifyBLECharacteristicValueChangeOptions): void;
+    /**
+     * 监听低功耗蓝牙设备的特征值变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange)
+     */
+    onBLECharacteristicValueChange(callback: (result: OnBLECharacteristicValueChangeSuccess) => void): void;
+    /**
+     * 监听低功耗蓝牙设备连接状态变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange](http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange)
+     */
+    onBLEConnectionStateChange(callback: (result: OnBLEConnectionStateChangeSuccess) => void): void;
+    /**
+     * 读取低功耗蓝牙设备指定特征值的二进制数据值
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue)
+     */
+    readBLECharacteristicValue(options: ReadBLECharacteristicValueOptions): void;
+    /**
+     * 向低功耗蓝牙设备指定特征值写入二进制数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue)
+     */
+    writeBLECharacteristicValue(options: WriteBLECharacteristicValueOptions): void;
+    /**
+     * 显示消息提示框
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showtoast](http://uniapp.dcloud.io/api/ui/prompt?id=showtoast)
+     */
+    showToast(options: ShowToastOptions): void;
+    /**
+     * 显示 loading 提示框
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showloading](http://uniapp.dcloud.io/api/ui/prompt?id=showloading)
+     */
+    showLoading(options: ShowLoadingOptions): void;
+    /**
+     * 隐藏消息提示框
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast](http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast)
+     */
+    hideToast(): void;
+    /**
+     * 隐藏 loading 提示框
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hideloading](http://uniapp.dcloud.io/api/ui/prompt?id=hideloading)
+     */
+    hideLoading(): void;
+    /**
+     * 显示模态弹窗
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showmodal](http://uniapp.dcloud.io/api/ui/prompt?id=showmodal)
+     */
+    showModal(options: ShowModalOptions): void;
+    /**
+     * 显示操作菜单
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet](http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet)
+     */
+    showActionSheet(options: ShowActionSheetOptions): void;
+    /**
+     * 动态设置当前页面的标题
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle)
+     */
+    setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
+    /**
+     * 在当前页面显示导航条加载动画
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading)
+     */
+    showNavigationBarLoading(): void;
+    /**
+     * 隐藏导航条加载动画
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading)
+     */
+    hideNavigationBarLoading(): void;
+    /**
+     * 设置导航条颜色
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor)
+     */
+    setNavigationBarColor(options: SetNavigationbarColorOptions): void;
+    /**
+     * 动态设置 tabBar 某一项的内容
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem)
+     */
+    setTabBarItem(options: SetTabBarItemOptions): void;
+    /**
+     * 动态设置 tabBar 的整体样式
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle)
+     */
+    setTabBarStyle(options: SetTabBarStyleOptions): void;
+    /**
+     * 隐藏 tabBar
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar)
+     */
+    hideTabBar(options: HideTabBarOptions): void;
+    /**
+     * 显示 tabBar
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar)
+     */
+    showTabBar(options: ShowTabBarOptions): void;
+    /**
+     * 为 tabBar 某一项的右上角添加文本
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge)
+     */
+    setTabBarBadge(options: SetTabBarBadgeOptions): void;
+    /**
+     * 移除 tabBar 某一项右上角的文本
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge)
+     */
+    removeTabBarBadge(options: RemoveTabBarBadgeOptions): void;
+    /**
+     * 显示 tabBar 某一项的右上角的红点
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot)
+     */
+    showTabBarRedDot(options: ShowTabBarRedDotOptions): void;
+    /**
+     * 隐藏 tabBar 某一项的右上角的红点
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot)
+     */
+    hideTabBarRedDot(options: HideTabBarRedDotOptions): void;
+    /**
+     * 保留当前页面，跳转到应用内的某个页面
+     *
+     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateto](http://uniapp.dcloud.io/api/router?id=navigateto)
+     */
+    navigateTo(options: NavigateToOptions): void;
+    /**
+     * 关闭当前页面，跳转到应用内的某个页面
+     *
+     * 参考: [http://uniapp.dcloud.io/api/router?id=redirectto](http://uniapp.dcloud.io/api/router?id=redirectto)
+     */
+    redirectTo(options: RedirectToOptions): void;
+    /**
+     * 关闭所有页面，打开到应用内的某个页面
+     *
+     * 参考: [http://uniapp.dcloud.io/api/router?id=relaunch](http://uniapp.dcloud.io/api/router?id=relaunch)
+     */
+    reLaunch(options: ReLaunchOptions): void;
+    /**
+     * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
+     *
+     * 参考: [http://uniapp.dcloud.io/api/router?id=switchtab](http://uniapp.dcloud.io/api/router?id=switchtab)
+     */
+    switchTab(options: SwitchTabOptions): void;
+    /**
+     * 关闭当前页面，返回上一页面或多级页面
+     *
+     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateback](http://uniapp.dcloud.io/api/router?id=navigateback)
+     */
+    navigateBack(options: NavigateBackOptions): void;
+    /**
+     * 创建一个动画实例
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/animation?id=createanimation](http://uniapp.dcloud.io/api/ui/animation?id=createanimation)
+     */
+    createAnimation(options: CreateAnimationOptions): Animation;
+    /**
+     * 将页面滚动到目标位置
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto](http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto)
+     */
+    pageScrollTo(options: PageScrollToOptions): void;
+    /**
+     * 开始下拉刷新
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh)
+     */
+    startPullDownRefresh(options: StartPullDownRefreshOptions): void;
+    /**
+     * 停止当前页面下拉刷新
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh)
+     */
+    stopPullDownRefresh(): void;
+    /**
+     * 返回一个SelectorQuery对象实例
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery](http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery)
+     */
+    createSelectorQuery(): SelectorQuery;
+    /**
+     * 创建并返回一个 IntersectionObserver 对象实例
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver](http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver)
+     */
+    createIntersectionObserver(options: CreateIntersectionObserverOptions): IntersectionObserver;
+    /**
+     * 创建 canvas 绘图上下文
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext](http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext)
+     */
+    createCanvasContext(canvasId: string, componentInstance: any): CanvasContext;
+    /**
+     * 把当前画布指定区域的内容导出生成指定大小的图片
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath](http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath)
+     */
+    canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
+    /**
+     * 描述 canvas 区域隐含的像素数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata)
+     */
+    canvasGetImageData(options: CanvasGetImageDataOptions): void;
+    /**
+     * 将像素数据绘制到画布
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata)
+     */
+    canvasPutImageData(options: CanvasPutImageDataOptions): void;
+    /**
+     * 监听窗口尺寸变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=onwindowresize](http://uniapp.dcloud.io/api/ui/window?id=onwindowresize)
+     */
+    onWindowResize(callback: (result: WindowResizeResult) => void): void;
+    /**
+     * 取消监听窗口尺寸变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=offwindowresize](http://uniapp.dcloud.io/api/ui/window?id=offwindowresize)
+     */
+    offWindowResize(callback: () => void): void;
+    /**
+     * 获取服务供应商
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/provider?id=getprovider](http://uniapp.dcloud.io/api/plugins/provider?id=getprovider)
+     */
+    getProvider(options: GetProviderOptions): void;
+    /**
+     * 登录
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=login](http://uniapp.dcloud.io/api/plugins/login?id=login)
+     */
+    login(options: LoginOptions): void;
+    /**
+     * 获取用户信息
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo](http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo)
+     */
+    getUserInfo(options: GetUserInfoOptions): void;
+    /**
+     * 分享
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=share](http://uniapp.dcloud.io/api/plugins/share?id=share)
+     */
+    share(options: ShareOptions): void;
+    /**
+     * 开启推送
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=subscribepush](http://uniapp.dcloud.io/api/plugins/push?id=subscribepush)
+     */
+    subscribePush(options: SubscribePushOptions): void;
+    /**
+     * 关闭推送
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush](http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush)
+     */
+    unsubscribePush(options: UnscribePushOptions): void;
+    /**
+     * 监听透传数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=onpush](http://uniapp.dcloud.io/api/plugins/push?id=onpush)
+     */
+    onPush(options: OnPushOptions): void;
+    /**
+     * 移除监听透传数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=offpush](http://uniapp.dcloud.io/api/plugins/push?id=offpush)
+     */
+    offPush(options: OffPushOptions): void;
+    /**
+     * 支付
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment](http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment)
+     */
+    requestPayment(options: RequestPaymentOptions): void;
+    /**
+     * 提前向用户发起授权请求
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=authorize](http://uniapp.dcloud.io/api/other/authorize?id=authorize)
+     */
+    authorize(options: AuthorizeOptions): void;
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=opensetting](http://uniapp.dcloud.io/api/other/authorize?id=opensetting)
+     */
+    openSetting(options: OpenSettingOptions): void;
+    /**
+     * 获取用户的当前设置
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/setting?id=getsetting](http://uniapp.dcloud.io/api/other/setting?id=getsetting)
+     */
+    getSetting(options: GetSettingOptions): void;
+    /**
+     * 获取用户收货地址。调起用户编辑收货地址原生界面，并在编辑完成后返回用户选择的地址，需要用户授权 scope.address
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress](http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress)
+     */
+    chooseAddress(options: ChooseAddressOptions): void;
+    /**
+     * 选择用户的发票抬头，需要用户授权 scope.invoiceTitle
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle](http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle)
+     */
+    chooseInvoiceTitle(options: ChooseInvoiceTitleOptions): void;
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram)
+     */
+    navigateToMiniProgram(options: NavigateToMiniProgramOptions): void;
+    /**
+     * 跳转回上一个小程序，只有当另一个小程序跳转到当前小程序时才会能调用成功
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram)
+     */
+    navigateBackMiniProgram(options: NavigateBackMiniProgramOptions): void;
+    /**
+     * 返回全局唯一的版本更新管理器对象： updateManager，用于管理小程序更新
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/update?id=getupdatemanager](http://uniapp.dcloud.io/api/other/update?id=getupdatemanager)
+     */
+    getUpdateManager(): UpdateManager;
+    /**
+     * 设置是否打开调试开关。此开关对正式版也能生效
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug](http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug)
+     */
+    setEnableDebug(options: SetEnableDebugOptions): void;
+    /**
+     * 获取第三方平台自定义的数据字段
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig)
+     */
+    getExtConfig(options: GetExtConfigOptions): GetExtConfigRes;
+    /**
+     * uni.getExtConfig() 的同步版本
+     *
+     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync)
+     */
+    getExtConfigSync(): GetExtConfigSyncRes;
+    /**
+     * 隐藏分享按钮
+     *
+     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu](http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu)
+     */
+    hideShareMenu(options: HideShareMenuOptions): void;
+    /**
+     * 动态设置窗口的背景色
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor)
+     */
+    setBackgroundColor(options: SetBackgroundColorOptions): void;
+    /**
+     * 动态设置窗口的背景色
+     *
+     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle)
+     */
+    setBackgroundTextStyle(options: SetBackgroundTextStyleOptions): void;
+    /**
+     * 监听陀螺仪数据变化事件
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange](http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange)
+     */
+    onGyroscopeChange(callback: (result: OnGyroscopeChangeSuccess) => void): void;
+    /**
+     * 开始监听陀螺仪数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope)
+     */
+    startGyroscope(options: StartGyroscopeOptions): void;
+    /**
+     * 停止监听陀螺仪数据
+     *
+     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope)
+     */
+    stopGyroscope(options: StopGyroscopeOptions): void;
+}
+
+interface GeneralCallbackResult {
+    /**
+     * 错误信息
+     */
+    errMsg?: string;
+}
+
+interface RequestPaymentOptions {
+    /**
+     * 分享服务提供商，通过 uni.getProvider 获取
+     */
+    provider?: string;
+    /**
+     * 订单数据
+     */
+    orderInfo?: string;
+    /**
+     * 时间戳从1970年1月1日至今的秒数，即当前的时间，微信小程序独有
+     */
+    timeStamp?: string;
+    /**
+     * 随机字符串，长度为32个字符以下，微信小程序独有 。
+     */
+    nonceStr?: string;
+    /**
+     * 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=xx，微信小程序独有
+     */
+    package?: string;
+    /**
+     * 签名算法，暂支持 MD5 ，微信小程序独有
+     */
+    signType?: string;
+    /**
+     * 签名，具体签名方案参见小程序支付接口文档，微信小程序独有
+     */
+    paySign?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RequestOptions {
+    /**
+     * 资源url
+     */
+    url?: string;
+    /**
+     * 请求的参数
+     */
+    data?: string | object | ArrayBuffer;
+    /**
+     * 设置请求的 header，header 中不能设置 Referer。
+     */
+    header?: any;
+    /**
+     * 默认为 GET
+     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
+     */
+    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
+    /**
+     * 如果设为json，会尝试对返回的数据做一次 JSON.parse
+     */
+    dataType?: string;
+    /**
+     * 设置响应的数据类型。合法值：text、arraybuffer
+     */
+    responseType?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: RequestSuccessCallbackResult) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface RequestSuccessCallbackResult {
+    /**
+     * 开发者服务器返回的数据
+     */
+    data?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+    /**
+     * 开发者服务器返回的 HTTP Response Header
+     */
+    header?: any;
+}
+
+interface RequestTask {
+    /**
+     * 中断请求任务
+     */
+    abort(): void;
+}
+
+interface UploadFileOption {
+    /**
+     * 开发者服务器 url
+     */
+    url?: string;
+    /**
+     * 文件类型，image/video/audio，仅支付宝小程序，且必填。
+     * - image: 图像
+     * - video: 视频
+     * - audio: 音频
+     */
+    fileType?: 'image' | 'video' | 'audio';
+    /**
+     * 要上传文件资源的路径
+     */
+    filePath?: string;
+    /**
+     * 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
+     */
+    name?: string;
+    /**
+     * 需要上传的文件列表。使用 files 时，filePath 和 name 不生效。仅 5+App 支持
+     */
+    files?: UploadFileOptionFiles [];
+    /**
+     * HTTP 请求 Header, header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * HTTP 请求中其他额外的 form data
+     */
+    formData?: any;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: UploadFileSuccessCallbackResult) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface UploadFileOptionFiles {
+    /**
+     * multipart 提交时，表单的项目名，默认为 file，如果 name 不填或填的值相同，可能导致服务端读取文件时只能读取到一个文件。
+     */
+    name?: string;
+    /**
+     * 要上传文件资源的路径
+     */
+    uri?: string;
+}
+
+interface UploadTask {
+    /**
+     * 监听上传进度变化
+     */
+    onProgressUpdate(callback: (result: OnProgressUpdateResult) => void): void;
+    /**
+     * 中断上传任务
+     */
+    abort(): void;
+}
+
+interface OnProgressUpdateResult {
+    /**
+     * 上传进度百分比
+     */
+    progress?: number;
+    /**
+     * 已经上传的数据长度，单位 Bytes
+     */
+    totalBytesSent?: number;
+    /**
+     * 预期需要上传的数据总长度，单位 Bytes
+     */
+    totalBytesExpectedToSend?: number;
+}
+
+interface DownloadFileOption {
+    /**
+     * 下载资源的 url
+     */
+    url?: string;
+    /**
+     * HTTP 请求 Header，header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'}
+     */
+    success?: (result: DownloadSuccessData) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface DownloadTask {
+    /**
+     * 监听下载进度变化
+     */
+    onProgressUpdate(callback: (result: OnProgressDownloadResult) => void): void;
+    /**
+     * 中断下载任务
+     */
+    abort(): void;
+}
+
+interface OnProgressDownloadResult {
+    /**
+     * 下载进度百分比
+     */
+    progress?: number;
+    /**
+     * 已经下载的数据长度，单位 Bytes
+     */
+    totalBytesWritten?: number;
+    /**
+     * 预期需要下载的数据总长度，单位 Bytes
+     */
+    totalBytesExpectedToWrite?: number;
+}
+
+interface UploadFileSuccessCallbackResult {
+    /**
+     * 开发者服务器返回的数据
+     */
+    data?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+}
+
+interface DownloadSuccessData {
+    /**
+     * 临时文件路径，下载后的文件会存储到一个临时文件
+     */
+    tempFilePath?: string;
+    /**
+     * 开发者服务器返回的 HTTP 状态码
+     */
+    statusCode?: number;
+}
+
+interface ConnectSocketOption {
+    /**
+     * 开发者服务器接口地址，必须是 wss 协议，且域名必须是后台配置的合法域名
+     */
+    url?: string;
+    /**
+     * HTTP 请求 Header，header 中不能设置 Referer
+     */
+    header?: any;
+    /**
+     * 默认为 GET
+     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
+     */
+    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
+    /**
+     * 子协议数组
+     */
+    protocols?: string [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SendSocketMessageOptions {
+    /**
+     * 需要发送的内容
+     */
+    data?: string | ArrayBuffer;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface CloseSocketOptions {
+    /**
+     * 一个数字值表示关闭连接的状态号，表示连接被关闭的原因。如果这个参数没有被指定，默认的取值是1000 （表示正常连接关闭）
+     */
+    code?: number;
+    /**
+     * 一个可读的字符串，表示连接被关闭的原因。这个字符串必须是不长于123字节的UTF-8 文本（不是字符）
+     */
+    reason?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: (result: GeneralCallbackResult) => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: (result: GeneralCallbackResult) => void;
+}
+
+interface SocketTask {
+    /**
+     * 通过 WebSocket 连接发送数据
+     */
+    send(options: SendSocketMessageOptions): void;
+    /**
+     * 关闭 WebSocket 连接
+     */
+    close(options: CloseSocketOptions): void;
+    /**
+     * 监听 WebSocket 连接打开事件
+     */
+    onOpen(callback: (result: OnSocketOpenCallbackResult) => void): void;
+    /**
+     * 监听 WebSocket 连接关闭事件
+     */
+    onClose(callback: () => void): void;
+    /**
+     * 监听 WebSocket 错误
+     */
+    onError(callback: (result: GeneralCallbackResult) => void): void;
+    /**
+     * 监听WebSocket接受到服务器的消息事件
+     */
+    onMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
+}
+
+interface OnSocketMessageCallbackResult {
+    /**
+     * 服务器返回的消息
+     */
+    data?: string | ArrayBuffer;
+}
+
+interface OnSocketOpenCallbackResult {
+    /**
+     * 连接成功的 HTTP 响应 Header
+     */
+    header?: any;
+}
+
+interface ChooseImageOptions {
+    /**
+     * 最多可以选择的图片张数，默认9
+     */
+    count?: number;
+    /**
+     * original 原图，compressed 压缩图，默认二者都有
+     */
+    sizeType?: string | string [];
+    /**
+     * album 从相册选图，camera 使用相机，默认二者都有
+     */
+    sourceType?: string | string [];
+    /**
+     * 成功则返回图片的本地文件路径列表 tempFilePaths
+     */
+    success?: (result: ChooseImageSuccessCallbackResult) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseImageSuccessCallbackResult {
+    /**
+     * 图片的本地文件路径列表
+     */
+    tempFilePaths?: string | any [];
+    /**
+     * 图片的本地文件列表，每一项是一个 File 对象
+     */
+    tempFiles?: ChooseImageSuccessCallbackResultFile | ChooseImageSuccessCallbackResultFile [];
+}
+
+interface ChooseImageSuccessCallbackResultFile {
+    /**
+     * 本地文件路径
+     */
+    path?: string;
+    /**
+     * 本地文件大小，单位：B
+     */
+    size?: number;
+}
+
+interface PreviewImageOptions {
+    /**
+     * 当前显示图片的链接，不填则默认为 urls 的第一张
+     */
+    count?: string;
+    /**
+     * 需要预览的图片链接列表
+     */
+    urls?: string | any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetImageInfoOptions {
+    /**
+     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+     */
+    src?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetImageInfoSuccessData) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetImageInfoSuccessData {
+    /**
+     * 图片宽度，单位px
+     */
+    width?: number;
+    /**
+     * 图片高度，单位px
+     */
+    height?: number;
+    /**
+     * 返回图片的本地路径
+     */
+    path?: string;
+    /**
+     * 返回图片的方向
+     */
+    orientation?: string;
+    /**
+     * 返回图片的格式
+     */
+    type?: string;
+}
+
+interface SaveImageToPhotosAlbumOptions {
+    /**
+     * 图片文件路径，可以是临时文件路径也可以是永久文件路径，不支持网络图片路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartRecordOptions {
+    /**
+     * 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'}
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RecorderManager {
+    /**
+     * 开始录音
+     */
+    start(options: RecorderManagerStartOptions): void;
+    /**
+     * 暂停录音
+     */
+    pause(): void;
+    /**
+     * 暂停录音
+     */
+    resume(): void;
+    /**
+     * 停止录音
+     */
+    stop(): void;
+    /**
+     * 录音开始事件
+     */
+    onStart(options: () => void): void;
+    /**
+     * 录音暂停事件
+     */
+    onPause(options: () => void): void;
+    /**
+     * 录音停止事件，会回调文件地址
+     */
+    onStop(options: () => void): void;
+    /**
+     * 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件
+     */
+    onFrameRecorded(options: () => void): void;
+    /**
+     * 录音错误事件, 会回调错误信息
+     */
+    onError(options: () => void): void;
+}
+
+interface RecorderManagerStartOptions {
+    /**
+     * 指定录音的时长，单位 ms ，如果传入了合法的 duration ，在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
+     */
+    duration?: number;
+    /**
+     * 采样率，有效值 8000/16000/44100
+     */
+    sampleRate?: number;
+    /**
+     * 录音通道数，有效值 1/2
+     */
+    numberOfChannels?: number;
+    /**
+     * 编码码率，有效值见下表格
+     */
+    encodeBitRate?: number;
+    /**
+     * 音频格式，有效值 aac/mp3
+     */
+    format?: string;
+    /**
+     * 指定帧大小，单位 KB。传入 frameSize 后，每录制指定帧大小的内容后，会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
+     */
+    frameSize?: number;
+}
+
+interface PlayVoiceOptions {
+    /**
+     * 需要播放的语音文件的文件路径
+     */
+    filePath?: string;
+    /**
+     * original 原图，compressed 压缩图，默认二者都有
+     */
+    duration?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBackgroundAudioPlayerStateOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetBackgroundAudioPlayerStateSuccessData) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBackgroundAudioPlayerStateSuccessData {
+    /**
+     * 选定音频的长度（单位：s），只有在当前有音乐播放时返回
+     */
+    duration?: number;
+    /**
+     * 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回
+     */
+    currentPosition?: number;
+    /**
+     * 播放状态（2：没有音乐在播放，1：播放中，0：暂停中）
+     */
+    status?: number;
+    /**
+     * 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回
+     */
+    downloadPercent?: number;
+    /**
+     * 歌曲数据链接，只有在当前有音乐播放时返回
+     */
+    dataUrl?: string;
+}
+
+interface GetBackgroundAudioOptions {
+    /**
+     * 音乐链接，目前支持的格式有 m4a, aac, mp3, wav
+     */
+    dataUrl?: string;
+    /**
+     * 音乐标题
+     */
+    title?: string;
+    /**
+     * 封面url
+     */
+    coverImgUrl?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SeekBackgroundAudioOptions {
+    /**
+     * 音乐位置，单位：秒
+     */
+    position?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface BackgroundAudioManager {
+    /**
+     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
+     */
+    duration?: number;
+    /**
+     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
+     */
+    currentTime?: number;
+    /**
+     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
+     */
+    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;
+    /**
+     * 音频协议。默认值为 'http'，设置 'hls' 可以支持播放 HLS 协议的直播音频
+     */
+    protocol?: string;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+    /**
+     * 停止
+     */
+    stop(): 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;
+    /**
+     * 背景音频播放错误事件
+     */
+    onNext(callback: () => void): void;
+    /**
+     * 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发
+     */
+    onWaiting(callback: () => void): void;
+}
+
+interface CreateAudioContext {
+    /**
+     * 音频的地址
+     */
+    setSrc(): void;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+}
+
+interface CreateInnerAudioContext {
+    /**
+     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
+     */
+    duration?: number;
+    /**
+     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
+     */
+    currentTime?: number;
+    /**
+     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
+     */
+    paused?: boolean;
+    /**
+     * 音频的数据链接，用于直接播放。
+     */
+    src?: string;
+    /**
+     * 音频开始播放的位置（单位：s）
+     */
+    startTime?: number;
+    /**
+     * 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲
+     */
+    buffered?: number;
+    /**
+     * 是否自动开始播放，默认 false
+     */
+    autoplay?: boolean;
+    /**
+     * 是否循环播放，默认 false
+     */
+    loop?: boolean;
+    /**
+     * 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true
+     */
+    obeyMuteSwitch?: boolean;
+    /**
+     * 音量。范围 0~1。
+     */
+    volume?: number;
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 停止
+     */
+    stop(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): 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;
+    /**
+     * 取消监听 onCanplay 事件
+     */
+    offCanplay(callback: () => void): void;
+    /**
+     * 取消监听 onPlay 事件
+     */
+    offPlay(callback: () => void): void;
+    /**
+     * 取消监听 onPause 事件
+     */
+    offPause(callback: () => void): void;
+    /**
+     * 取消监听 onStop 事件
+     */
+    offStop(callback: () => void): void;
+    /**
+     * 取消监听 onEnded 事件
+     */
+    offEnded(callback: () => void): void;
+    /**
+     * 取消监听 onTimeUpdate 事件
+     */
+    offTimeUpdate(callback: () => void): void;
+    /**
+     * 取消监听 onWaiting 事件
+     */
+    offError(callback: () => void): void;
+    /**
+     * 取消监听 onWaiting 事件
+     */
+    offWaiting(callback: () => void): void;
+    /**
+     * 取消监听 onSeeking 事件
+     */
+    offSeeking(callback: () => void): void;
+    /**
+     * 取消监听 onSeeked 事件
+     */
+    offSeeked(callback: () => void): void;
+}
+
+interface ChooseVideoOptions {
+    /**
+     * album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera']
+     */
+    sourceType?: string | any [];
+    /**
+     * 是否压缩所选的视频源文件，默认值为true，需要压缩
+     */
+    compressed?: boolean;
+    /**
+     * 拍摄视频最长拍摄时间，单位秒。最长支持 60 秒
+     */
+    maxDuration?: number;
+    /**
+     * 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明
+     */
+    success?: (result: ChooseVideoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveVideoToPhotosAlbumOptions {
+    /**
+     * 视频文件路径，可以是临时文件路径也可以是永久文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseVideoSuccess {
+    /**
+     * 临时文件路径，下载后的文件会存储到一个临时文件
+     */
+    tempFilePath?: string;
+    /**
+     * 选定视频的时间长度
+     */
+    duration?: number;
+    /**
+     * 选定视频的数据量大小
+     */
+    size?: number;
+    /**
+     * 返回选定视频的长
+     */
+    height?: number;
+    /**
+     * 返回选定视频的宽
+     */
+    width?: number;
+}
+
+interface VideoContext {
+    /**
+     * 暂停
+     */
+    pause(): void;
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     */
+    seek(): void;
+    /**
+     * 发送弹幕，danmu 包含两个属性 text, color。
+     */
+    sendDanmu(): void;
+    /**
+     * 设置倍速播放，支持的倍率有 0.5/0.8/1.0/1.25/1.5
+     */
+    playbackRate(): void;
+    /**
+     * 进入全屏，可传入{direction}参数（1.7.0起支持），详见video组件文档
+     */
+    requestFullScreen(): void;
+    /**
+     * 退出全屏
+     */
+    exitFullScreen(): void;
+}
+
+interface CameraContext {
+    /**
+     * 拍照，可指定质量，成功则返回图片
+     */
+    takePhoto(options: CameraContextTakePhotoOptions): void;
+    /**
+     * 开始录像
+     */
+    startRecord(options: CameraContextStartRecordOptions): void;
+    /**
+     * 结束录像，成功则返回封面与视频
+     */
+    stopRecord(options: CameraContextStopRecordOptions): void;
+}
+
+interface CameraContextTakePhotoOptions {
+    /**
+     * 成像质量，值为high, normal, low，默认normal
+     */
+    quality?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CameraContextStartRecordOptions {
+    /**
+     * 超过30s或页面onHide时会结束录像，res = { tempThumbPath, tempVideoPath }
+     */
+    timeoutCallback?: () => void;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CameraContextStopRecordOptions {
+    /**
+     * 接口调用成功的回调函数 ，res = { tempThumbPath, tempVideoPath }
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveFileOptions {
+    /**
+     * 需要保存的文件的临时路径
+     */
+    tempFilePath?: string;
+    /**
+     * 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'}
+     */
+    success?: (result: SaveFileSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SaveFileSuccess {
+    /**
+     * 文件的保存路径
+     */
+    savedFilePath?: string;
+}
+
+interface GetFileInfoOptions {
+    /**
+     * 本地路径
+     */
+    filePath?: string;
+    /**
+     * 计算文件摘要的算法，默认值 md5，有效值：md5，sha1
+     */
+    digestAlgorithm?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetFileInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetFileInfoSuccess {
+    /**
+     * 文件大小，单位：B
+     */
+    size?: number;
+    /**
+     * 按照传入的 digestAlgorithm 计算得出的的文件摘要
+     */
+    digest?: string;
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+}
+
+interface GetSavedFileListOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSavedFileListSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSavedFileListSuccess {
+    /**
+     * 接口调用结果
+     */
+    errMsg?: number;
+    /**
+     * 文件列表
+     */
+    fileList?: string;
+}
+
+interface GetSavedFileInfoOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSavedFileInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSavedFileInfoSuccess {
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+    /**
+     * 文件大小，单位B
+     */
+    size?: number;
+    /**
+     * 文件保存时的时间戳，从1970/01/01 08:00:00 到该时刻的秒数
+     */
+    createTime?: number;
+}
+
+interface RemoveSavedFileOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OpenDocumentOptions {
+    /**
+     * 文件路径
+     */
+    filePath?: string;
+    /**
+     * 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx
+     */
+    fileType?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 需要存储的内容
+     */
+    data?: object | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageInfoOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetStorageInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetStorageInfoSuccess {
+    /**
+     * 当前storage中所有的key
+     */
+    keys?: string | any [];
+    /**
+     * 当前占用的空间大小, 单位kb
+     */
+    currentSize?: number;
+    /**
+     * 限制的空间大小，单位kb
+     */
+    limitSize?: number;
+}
+
+interface RemoveStorageOptions {
+    /**
+     * 本地缓存中的指定的 key
+     */
+    key?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetLocationOptions {
+    /**
+     * 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于uni.openLocation的坐标
+     */
+    type?: string;
+    /**
+     * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
+     */
+    altitude?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetLocationSuccess {
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+    /**
+     * 速度，浮点数，单位m/s
+     */
+    speed?: number;
+    /**
+     * 位置的精确度
+     */
+    accuracy?: string;
+    /**
+     * 高度，单位 m
+     */
+    altitude?: number;
+    /**
+     * 垂直精度，单位 m（Android 无法获取，返回 0）
+     */
+    verticalAccuracy?: number;
+    /**
+     * 水平精度，单位 m
+     */
+    horizontalAccuracy?: number;
+}
+
+interface ChooseLocationOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseLocationSuccess {
+    /**
+     * 位置名称
+     */
+    name?: string;
+    /**
+     * 详细地址
+     */
+    address?: string;
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+}
+
+interface OpenLocationOptions {
+    /**
+     * 纬度，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+    /**
+     * 缩放比例，范围5~18，默认为18
+     */
+    scale?: number;
+    /**
+     * 位置名称
+     */
+    name?: string;
+    /**
+     * 地址的详细说明
+     */
+    address?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContext {
+    /**
+     * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 uni.openLocation
+     */
+    getCenterLocation(options: MapContextGetCenterLocationOptions): void;
+    /**
+     * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
+     */
+    moveToLocation(): void;
+    /**
+     * 平移marker，带动画
+     */
+    translateMarker(options: MapContextTranslateMarkerOptions): void;
+    /**
+     * 缩放视野展示所有经纬度
+     */
+    includePoints(options: MapContextIncludePointsOptions): void;
+    /**
+     * 获取当前地图的视野范围
+     */
+    getRegion(options: MapContextGetRegionOptions): void;
+    /**
+     * 获取当前地图的缩放级别
+     */
+    getScale(options: MapContextGetScaleOptions): void;
+}
+
+interface MapContextGetCenterLocationOptions {
+    /**
+     * 接口调用成功的回调函数 ，res = { longitude: "经度", latitude: "纬度"}
+     */
+    success?: (result: MapContextGetLocationSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContextGetLocationSuccess {
+    /**
+     * 纬度，浮点数，范围为-90~90，负数表示南纬
+     */
+    latitude?: number;
+    /**
+     * 经度，范围为-180~180，负数表示西经
+     */
+    longitude?: number;
+}
+
+interface MapContextTranslateMarkerOptions {
+    /**
+     * 指定marker
+     */
+    markerId?: number;
+    /**
+     * 指定marker移动到的目标点
+     */
+    destination?: any;
+    /**
+     * 移动过程中是否自动旋转marker
+     */
+    autoRotate?: boolean;
+    /**
+     * marker的旋转角度
+     */
+    rotate?: number;
+    /**
+     * 动画持续时长，默认值1000ms，平移与旋转分别计算
+     */
+    duration?: number;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 动画结束回调函数
+     */
+    animationEnd?: () => void;
+}
+
+interface MapContextIncludePointsOptions {
+    /**
+     * 要显示在可视区域内的坐标点列表，[{latitude, longitude}]
+     */
+    points?: any [];
+    /**
+     * 坐标点形成的矩形边缘到地图边缘的距离，单位像素。格式为[上,右,下,左]，安卓上只能识别数组第一项，上下左右的padding一致。开发者工具暂不支持padding参数。
+     */
+    padding?: any [];
+}
+
+interface MapContextGetRegionOptions {
+    /**
+     * 接口调用成功的回调函数，res = {southwest, northeast}，西南角与东北角的经纬度
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MapContextGetScaleOptions {
+    /**
+     * 接口调用成功的回调函数，res = {scale}
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSystemInfoOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetSystemInfoSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSystemInfoSuccess {
+    /**
+     * 手机品牌
+     */
+    brand?: string;
+    /**
+     * 手机型号
+     */
+    model?: string;
+    /**
+     * 设备像素比
+     */
+    pixelRatio?: string;
+    /**
+     * 屏幕宽度
+     */
+    screenWidth?: number;
+    /**
+     * 屏幕高度
+     */
+    screenHeight?: number;
+    /**
+     * 可使用窗口宽度
+     */
+    windowWidth?: number;
+    /**
+     * 可使用窗口高度
+     */
+    windowHeight?: number;
+    /**
+     * 状态栏的高度
+     */
+    statusBarHeight?: number;
+    /**
+     * 程序设置的语言
+     */
+    language?: string;
+    /**
+     * 5+版本号
+     */
+    version?: number;
+    /**
+     * 操作系统版本
+     */
+    system?: string;
+    /**
+     * 客户端平台
+     */
+    platform?: string;
+    /**
+     * 用户字体大小设置
+     */
+    fontSizeSetting?: number;
+}
+
+interface GetNetworkTypeOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetNetworkTypeSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetNetworkTypeSuccess {
+    /**
+     * 网络类型
+     */
+    networkType?: string;
+}
+
+interface OnNetworkStatusChangeSuccess {
+    /**
+     * 当前是否有网络连接
+     */
+    isConnected?: number;
+    /**
+     * 网络类型
+     */
+    networkType?: string;
+}
+
+interface OnAccelerometerChangeSuccess {
+    /**
+     * X 轴
+     */
+    x?: number;
+    /**
+     * Y 轴
+     */
+    y?: number;
+    /**
+     * Z 轴
+     */
+    z?: number;
+}
+
+interface StartAccelerometerOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopAccelerometerOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnCompassChangeSuccess {
+    /**
+     * 面对的方向度数
+     */
+    direction?: number;
+}
+
+interface StartCompassOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopCompassOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MakePhoneCallOptions {
+    /**
+     * 需要拨打的电话号码
+     */
+    phoneNumber?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ScanCodeOptions {
+    /**
+     * 是否只能从相机扫码，不允许从相册选择图片
+     */
+    onlyFromCamera?: boolean;
+    /**
+     * 扫码类型，参数类型是数组，二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
+     */
+    scanType?: any [];
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: ScanCodeSuccessRes) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ScanCodeSuccessRes {
+    /**
+     * 所扫码的内容
+     */
+    result?: string;
+    /**
+     * 所扫码的类型
+     */
+    scanType?: string;
+    /**
+     * 所扫码的字符集
+     */
+    charSet?: string;
+    /**
+     * 当所扫的码为当前应用的合法二维码时，会返回此字段，内容为二维码携带的 path。
+     */
+    path?: string;
+}
+
+interface SetClipboardDataOptions {
+    /**
+     * 需要设置的内容
+     */
+    data?: string;
+    /**
+     * 成功返回的回调函数
+     */
+    success?: () => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetClipboardDataOptions {
+    /**
+     * 成功返回的回调函数
+     */
+    success?: (result: GetClipboardDataSuccessRes) => void;
+    /**
+     * 失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetClipboardDataSuccessRes {
+    /**
+     * 剪贴板的内容
+     */
+    data?: string;
+}
+
+interface OpenBluetoothAdapterOptions {
+    /**
+     * 成功则返回成功初始化信息
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CloseBluetoothAdapterOptions {
+    /**
+     * 成功则返回成功关闭模块信息
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothAdapterStateOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBluetoothAdapterStateSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothAdapterStateSuccess {
+    /**
+     * 是否正在搜索设备
+     */
+    discovering?: boolean;
+    /**
+     * 蓝牙适配器是否可用
+     */
+    available?: boolean;
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface OnBluetoothAdapterStateChangeResult {
+    /**
+     * 是否正在搜索设备
+     */
+    discovering?: boolean;
+    /**
+     * 蓝牙适配器是否可用
+     */
+    available?: boolean;
+}
+
+interface OnBluetoothDeviceFoundResult {
+    /**
+     * 设备列表信息
+     */
+    devices?: BluetoothDeviceInfo [];
+}
+
+interface StartBluetoothDevicesDiscoveryOptions {
+    /**
+     * 蓝牙设备主 service 的 uuid 列表
+     */
+    services?: any [];
+    /**
+     * 是否允许重复上报同一设备， 如果允许重复上报，则onDeviceFound 方法会多次上报同一设备，但是 RSSI 值会有不同
+     */
+    allowDuplicatesKey?: boolean;
+    /**
+     * 上报设备的间隔，默认为0，意思是找到新设备立即上报，否则根据传入的间隔上报
+     */
+    interval?: number;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBluetoothDevicesDiscoveryOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBluetoothDevicesDiscoverySuccess {
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBluetoothDevicesOptions {
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBluetoothDevicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBluetoothDevicesSuccess {
+    /**
+     * uuid 对应的的已连接设备列表
+     */
+    devices?: BluetoothDeviceInfo [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface BluetoothDeviceInfo {
+    /**
+     * 蓝牙设备名称，某些设备可能没有
+     */
+    name?: string;
+    /**
+     * 用于区分设备的 id
+     */
+    deviceId?: string;
+    /**
+     * 当前蓝牙设备的信号强度
+     */
+    RSSI?: number;
+    /**
+     * 当前蓝牙设备的广播数据段中的ManufacturerData数据段 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
+     */
+    advertisData?: any [];
+    /**
+     * 当前蓝牙设备的广播数据段中的ServiceUUIDs数据段
+     */
+    advertisServiceUUIDs?: any [];
+    /**
+     * 当前蓝牙设备的广播数据段中的LocalName数据段
+     */
+    localName?: string;
+    /**
+     * 当前蓝牙设备的广播数据段中的ServiceData数据段
+     */
+    serviceData?: any [];
+}
+
+interface GetConnectedBluetoothDevicesOptions {
+    /**
+     * 蓝牙设备主 service 的 uuid 列表
+     */
+    services?: any [];
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetConnectedBluetoothDevicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetConnectedBluetoothDevicesSuccess {
+    /**
+     * 搜索到的设备列表
+     */
+    devices?: GetConnectedBluetoothDevicesSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetConnectedBluetoothDevicesSuccessData {
+    /**
+     * 蓝牙设备名称，某些设备可能没有
+     */
+    name?: string;
+    /**
+     * 用于区分设备的 id
+     */
+    deviceId?: string;
+}
+
+interface CloseBLEConnectionOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+}
+
+interface CreateBLEConnectionOptions {
+    /**
+     * 蓝牙设备 id，参考 getDevices 接口
+     */
+    deviceId?: string;
+    /**
+     * 超时时间
+     */
+    timeout?: number;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnBLEConnectionStateChangeSuccess {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 连接目前的状态
+     */
+    connected?: boolean;
+}
+
+interface GetBLEDeviceServicesOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBLEDeviceServicesSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBLEDeviceServicesSuccess {
+    /**
+     * 设备服务列表
+     */
+    services?: GetBLEDeviceServicesSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBLEDeviceServicesSuccessData {
+    /**
+     * 蓝牙设备服务的 uuid
+     */
+    uuid?: string;
+    /**
+     * 该服务是否为主服务
+     */
+    isPrimary?: boolean;
+}
+
+interface GetBLEDeviceCharacteristicsOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙服务 uuid
+     */
+    serviceId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: GetBLEDeviceCharacteristicsSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBLEDeviceCharacteristicsSuccess {
+    /**
+     * 设备特征值列表
+     */
+    characteristics?: GetBLEDeviceCharacteristicsSuccessData [];
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface GetBLEDeviceCharacteristicsSuccessData {
+    /**
+     * 蓝牙设备服务的 uuid
+     */
+    uuid?: string;
+    /**
+     * 该特征值支持的操作类型
+     */
+    properties?: any;
+}
+
+interface ReadBLECharacteristicValueOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: ReadBLECharacteristicValueSuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ReadBLECharacteristicValueSuccess {
+    /**
+     * 错误码
+     */
+    errCode?: string;
+    /**
+     * 成功：ok，错误：详细信息
+     */
+    errMsg?: string;
+}
+
+interface WriteBLECharacteristicValueOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 蓝牙设备特征值对应的二进制值
+     */
+    value?: any [];
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NotifyBLECharacteristicValueChangeOptions {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * true: 启用 notify; false: 停用 notify
+     */
+    state?: boolean;
+    /**
+     * 成功则返回本机蓝牙适配器状态
+     */
+    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnBLECharacteristicValueChangeSuccess {
+    /**
+     * 蓝牙设备 id，参考 device 对象
+     */
+    deviceId?: string;
+    /**
+     * 蓝牙特征值对应服务的 uuid
+     */
+    serviceId?: string;
+    /**
+     * 蓝牙特征值的 uuid
+     */
+    characteristicId?: string;
+    /**
+     * 特征值最新的值 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
+     */
+    value?: any [];
+}
+
+interface StartBeaconDiscoveryOptions {
+    /**
+     * iBeacon设备广播的 uuids
+     */
+    uuids?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopBeaconDiscoveryOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBeaconsOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetBeaconsRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetBeaconsRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    beacons?: Beacon [];
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+}
+
+interface Beacon {
+    /**
+     * iBeacon 设备广播的 uuid
+     */
+    uuid?: string;
+    /**
+     * iBeacon 设备的主 id
+     */
+    major?: string;
+    /**
+     * iBeacon 设备的次 id
+     */
+    minor?: string;
+    /**
+     * 表示设备距离的枚举值
+     */
+    proximity?: number;
+    /**
+     * iBeacon 设备的距离
+     */
+    accuracy?: number;
+    /**
+     * 表示设备的信号强度
+     */
+    rssi?: number;
+}
+
+interface BeaconService {
+    /**
+     * 服务目前是否可用
+     */
+    available?: boolean;
+    /**
+     * 目前是否处于搜索状态
+     */
+    discovering?: boolean;
+}
+
+interface GetHCEStateOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartHCEOptions {
+    /**
+     * 需要注册到系统的 AID 列表，每个 AID 为 String 类型
+     */
+    aid_list?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopHCEOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HCEMessageRes {
+    /**
+     * 消息类型
+     */
+    messageType?: number;
+    /**
+     * 客户端接收到 NFC 设备的指令
+     */
+    data?: any [];
+    /**
+     * 此参数当且仅当 messageType=2 时有效
+     */
+    reason?: number;
+}
+
+interface SendHCEMessageOptions {
+    /**
+     * 二进制数据
+     */
+    data?: any [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ConnectWifiOptions {
+    /**
+     * Wi-Fi 设备ssid
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 设备bssid
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 设备密码
+     */
+    password?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWifiListOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface WiFi {
+    /**
+     * Wi-Fi 的SSID
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 的BSSID
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 是否安全
+     */
+    secure?: boolean;
+    /**
+     * Wi-Fi 信号强度
+     */
+    signalStrength?: number;
+}
+
+interface SetWifiListOptions {
+    /**
+     * Wi-Fi 的SSID
+     */
+    wifiList?: WiFiItem [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface WiFiItem {
+    /**
+     * Wi-Fi 的SSID
+     */
+    SSID?: string;
+    /**
+     * Wi-Fi 的BSSID
+     */
+    BSSID?: string;
+    /**
+     * Wi-Fi 设备密码
+     */
+    password?: string;
+}
+
+interface GetConnectedWifiOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetConnectedWifiRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetConnectedWifiRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    wifi?: WiFi;
+}
+
+interface ShowToastOptions {
+    /**
+     * 提示的内容
+     */
+    title?: string;
+    /**
+     * 图标
+     * - success: 显示成功图标
+     * - loading: 显示加载图标
+     * - none: 不显示图标
+     */
+    icon?: 'success' | 'loading' | 'none';
+    /**
+     * 自定义图标的本地路径，image 的优先级高于 icon
+     */
+    image?: string;
+    /**
+     * 提示的延迟时间，单位毫秒，默认：1500
+     */
+    duration?: number;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowLoadingOptions {
+    /**
+     * 提示的内容
+     */
+    title?: string;
+    /**
+     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     */
+    mask?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowModalOptions {
+    /**
+     * 提示的标题
+     */
+    title?: string;
+    /**
+     * 提示的内容
+     */
+    content?: string;
+    /**
+     * 是否显示取消按钮，默认为 true
+     */
+    showCancel?: boolean;
+    /**
+     * 取消按钮的文字，默认为"取消"
+     */
+    cancelText?: string;
+    /**
+     * 取消按钮的文字颜色，默认为"#000000"
+     */
+    cancelColor?: string;
+    /**
+     * 确定按钮的文字，默认为"确定"
+     */
+    confirmText?: string;
+    /**
+     * 确定按钮的文字颜色，默认为"#3CC51F"
+     */
+    confirmColor?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ShowModalRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowModalRes {
+    /**
+     * 为 true 时，表示用户点击了确定按钮
+     */
+    confirm?: boolean;
+    /**
+     * 为 true 时，表示用户点击了取消
+     */
+    cancel?: boolean;
+}
+
+interface ShowActionSheetOptions {
+    /**
+     * 按钮的文字数组
+     */
+    itemList?: any [];
+    /**
+     * 按钮的文字颜色，默认为"#000000"
+     */
+    itemColor?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ShowActionSheetRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowActionSheetRes {
+    /**
+     * 用户点击的按钮，从上到下的顺序，从0开始
+     */
+    tapIndex?: number;
+}
+
+interface SetNavigationBarTitleOptions {
+    /**
+     * 页面标题
+     */
+    title?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetNavigationbarColorOptions {
+    /**
+     * 前景颜色值，包括按钮、标题、状态栏的颜色
+     */
+    frontColor?: string;
+    /**
+     * 背景颜色值，有效值为十六进制颜色
+     */
+    backgroundColor?: string;
+    /**
+     * 动画效果
+     */
+    animation?: NavigationBarAnimation;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 显示的文本，不超过 3 个半角字符
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RemoveTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigationBarAnimation {
+    /**
+     * 动画变化时间，默认0，单位：毫秒
+     */
+    duration?: number;
+    /**
+     * 动画变化方式，默认 linear
+     * - linear: 动画从头到尾的速度是相同的
+     * - easeIn: 动画以低速开始
+     * - easeOut: 动画以低速结束
+     * - easeInOut: 动画以低速开始和结束
+     */
+    timingFunc?: 'linear' | 'easeIn' | 'easeOut' | 'easeInOut';
+}
+
+interface WindowResizeResult {
+    /**
+     * 变化后的窗口宽度，单位 px
+     */
+    windowWidth?: number;
+    /**
+     * 变化后的窗口高度，单位 px
+     */
+    windowHeight?: number;
+}
+
+interface SetTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 显示的文本
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RemoveTabBarBadgeOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarRedDotOptions {
+    /**
+     * tabBar的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarStyleOptions {
+    /**
+     * tab 上的文字默认颜色
+     */
+    color?: string;
+    /**
+     * tab 上的文字选中时的颜色
+     */
+    selectedColor?: string;
+    /**
+     * tab 的背景色
+     */
+    backgroundColor?: string;
+    /**
+     * tabbar上边框的颜色
+     */
+    borderStyle?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTabBarItemOptions {
+    /**
+     * tabBar 的哪一项，从左边算起，索引从0开始
+     */
+    index?: number;
+    /**
+     * tab 上按钮文字
+     */
+    text?: string;
+    /**
+     * 图片路径
+     */
+    iconPath?: string;
+    /**
+     * 选中时的图片路径
+     */
+    selectedIconPath?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowTabBarOptions {
+    /**
+     * 是否需要动画效果
+     */
+    animation?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideTabBarOptions {
+    /**
+     * 是否需要动画效果
+     */
+    animation?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetTopBarTextOptions {
+    /**
+     * 置顶栏文字内容
+     */
+    text?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigateToOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 窗口显示的动画类型
+     * - auto: 自动选择动画效果
+     * - none: 无动画效果
+     * - slide-in-right: 从右侧横向滑动效果
+     * - slide-in-left: 左侧横向滑动效果
+     * - slide-in-top: 从上侧竖向滑动效果
+     * - slide-in-bottom: 从下侧竖向滑动效果
+     * - fade-in: 从透明到不透明逐渐显示效果
+     * - zoom-out: 从小到大逐渐放大显示效果
+     * - zoom-fade-out: 从小到大逐渐放大并且从透明到不透明逐渐显示效果
+     * - pop-in: 从右侧平移入栈动画效果
+     */
+    animationType?: 'auto' | 'none' | 'slide-in-right' | 'slide-in-left' | 'slide-in-top' | 'slide-in-bottom' | 'fade-in' | 'zoom-out' | 'zoom-fade-out' | 'pop-in';
+    /**
+     * 窗口显示动画的持续时间，单位为 ms
+     */
+    animationDuration?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface RedirectToOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ReLaunchOptions {
+    /**
+     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SwitchTabOptions {
+    /**
+     * 需要跳转的 tabBar 页面的路径，路径后不能带参数
+     */
+    url?: string | string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CreateIntersectionObserverOptions {
+    /**
+     * 所有阈值
+     */
+    thresholds?: any [];
+    /**
+     * 初始的相交比例
+     */
+    initialRatio?: number;
+    /**
+     * 是否同时观测多个参照节点（而非一个）
+     */
+    selectAll?: boolean;
+}
+
+interface NavigateBackOptions {
+    /**
+     * 返回的页面数，如果 delta 大于现有页面数，则返回到首页
+     */
+    delta?: number;
+    /**
+     * 窗口关闭的动画类型
+     * - auto: 自动选择动画效果
+     * - none: 无动画效果
+     * - slide-out-right: 横向向右侧滑出屏幕动画
+     * - slide-out-left: 横向向左侧滑出屏幕动画
+     * - slide-out-top: 竖向向上侧滑出屏幕动画
+     * - slide-out-bottom: 竖向向下侧滑出屏幕动画
+     * - fade-out: 从不透明到透明逐渐隐藏动画
+     * - zoom-in: 从大逐渐缩小关闭动画
+     * - zoom-fade-in: 从大逐渐缩小并且从不透明到透明逐渐隐藏关闭动画
+     * - pop-out: 从右侧平移出栈动画效果
+     */
+    animationType?: 'auto' | 'none' | 'slide-out-right' | 'slide-out-left' | 'slide-out-top' | 'slide-out-bottom' | 'fade-out' | 'zoom-in' | 'zoom-fade-in' | 'pop-out';
+    /**
+     * 窗口关闭动画的持续时间，单位为 ms
+     */
+    animationDuration?: number;
+}
+
+interface CreateAnimationOptions {
+    /**
+     * 动画持续时间，单位ms
+     */
+    duration?: number;
+    /**
+     * 定义动画的效果
+     * - linear: 动画从头到尾的速度是相同的
+     * - ease: 动画以低速开始，然后加快，在结束前变慢
+     * - ease-in: 动画以低速开始
+     * - ease-in-out: 动画以低速开始和结束
+     * - ease-out: 动画以低速结束
+     * - step-start: 动画第一帧就跳至结束状态直到结束
+     * - step-end: 动画一直保持开始状态，最后一帧跳到结束状态
+     */
+    timingFunction?: 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
+    /**
+     * 动画延迟时间，单位 ms
+     */
+    delay?: number;
+    /**
+     * 设置transform-origin
+     */
+    transformOrigin?: string;
+}
+
+interface PageScrollToOptions {
+    /**
+     * 滚动到页面的目标位置
+     */
+    scrollTop?: number;
+    /**
+     * 滚动动画的时长
+     */
+    duration?: number;
+}
+
+interface StartPullDownRefreshOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SelectorQuery {
+    /**
+     * 将选择器的选取范围更改为自定义组件component内
+     */
+    in(component: any): void;
+    /**
+     * 在当前页面下选择第一个匹配选择器selector的节点
+     */
+    select(selector: string): NodesRef;
+    /**
+     * 在当前页面下选择匹配选择器selector的所有节点
+     */
+    selectAll(selector: string): NodesRef;
+    /**
+     * 选择显示区域
+     */
+    selectViewport(selector: string): NodesRef;
+    /**
+     * 执行所有的请求
+     */
+    exec(callback: () => void): void;
+}
+
+interface NodesRef {
+    /**
+     * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位
+     */
+    boundingClientRect(callback: (result: NodeRect) => void): void;
+    /**
+     * 添加节点的滚动位置查询请求，以像素为单位
+     */
+    scrollOffset(callback: (result: NodeRect) => void): SelectorQuery;
+    /**
+     * 获取节点的相关信息，需要获取的字段在fields中指定
+     */
+    fields(fields: NodeField, callback: (result: NodeRect) => void): SelectorQuery;
+}
+
+interface NodeRect {
+    /**
+     * 节点的ID
+     */
+    id?: string;
+    /**
+     * 节点的dataset
+     */
+    dataset?: any;
+    /**
+     * 节点的左边界坐标
+     */
+    left?: number;
+    /**
+     * 节点的右边界坐标
+     */
+    right?: number;
+    /**
+     * 节点的上边界坐标
+     */
+    top?: number;
+    /**
+     * 节点的下边界坐标
+     */
+    bottom?: number;
+    /**
+     * 节点的宽度
+     */
+    width?: number;
+    /**
+     * 节点的高度
+     */
+    height?: number;
+}
+
+interface NodeField {
+    /**
+     * 节点的dataset
+     */
+    dataset?: any;
+    /**
+     * 节点的宽度
+     */
+    width?: number;
+    /**
+     * 节点的高度
+     */
+    height?: number;
+    /**
+     * 节点的水平滚动位置
+     */
+    scrollLeft?: number;
+    /**
+     * 节点的竖直滚动位置
+     */
+    scrollTop?: number;
+    /**
+     * 节点 scroll-x 属性的当前值
+     */
+    scrollX?: number;
+    /**
+     * 节点 scroll-y 属性的当前值
+     */
+    scrollY?: number;
+}
+
+interface IntersectionObserver {
+    /**
+     * 使用选择器指定一个节点，作为参照区域之一
+     */
+    relativeTo(selector: string, margins: any []): void;
+    /**
+     * 指定页面显示区域作为参照区域之一
+     */
+    relativeToViewport(margins: any []): void;
+    /**
+     * 指定目标节点并开始监听相交状态变化情况
+     */
+    observe(targetSelector: string, callback: (result: ObserveResult) => void): void;
+    /**
+     * 停止监听
+     */
+    disconnect(): void;
+}
+
+interface ObserveResult {
+    /**
+     * 相交比例
+     */
+    intersectionRatio?: number;
+    /**
+     * 相交区域的边界
+     */
+    intersectionRect?: any;
+    /**
+     * 目标节点布局区域的边界
+     */
+    boundingClientRect?: ObserveNodeRect;
+    /**
+     * 参照区域的边界
+     */
+    relativeRect?: ObserveNodeRect;
+    /**
+     * 相交检测时的时间戳
+     */
+    time?: number;
+}
+
+interface ObserveNodeRect {
+    /**
+     * left
+     */
+    left?: number;
+    /**
+     * right
+     */
+    right?: number;
+    /**
+     * top
+     */
+    top?: number;
+    /**
+     * bottom
+     */
+    bottom?: number;
+}
+
+interface Animation {
+    /**
+     * 透明度
+     */
+    opacity(value: number): void;
+    /**
+     * 颜色值
+     */
+    backgroundColor(color: number): void;
+    /**
+     * 长度值
+     */
+    width(length: number): void;
+    /**
+     * 长度值
+     */
+    height(length: number): void;
+    /**
+     * 长度值
+     */
+    top(length: number): void;
+    /**
+     * 长度值
+     */
+    left(length: number): void;
+    /**
+     * 长度值
+     */
+    bottom(length: number): void;
+    /**
+     * 长度值
+     */
+    right(length: number): void;
+    /**
+     * 从原点顺时针旋转一个deg角度
+     */
+    rotate(deg: number): void;
+    /**
+     * 在X轴旋转一个deg角度
+     */
+    rotateX(deg: number): void;
+    /**
+     * 在Y轴旋转一个deg角度
+     */
+    rotateY(deg: number): void;
+    /**
+     * 在Z轴旋转一个deg角度
+     */
+    rotateZ(deg: number): void;
+    /**
+     * 同transform-function rotate3d
+     */
+    rotate3d(x: number, y: number, z: number, deg: number): void;
+    /**
+     * 缩放
+     */
+    scale(sx: number, sy: number): void;
+    /**
+     * 在X轴缩放sx倍数
+     */
+    scaleX(sx: number): void;
+    /**
+     * 在Y轴缩放sy倍数
+     */
+    scaleY(sy: number): void;
+    /**
+     * 在Z轴缩放sz倍数
+     */
+    scaleZ(sz: number): void;
+    /**
+     * 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数
+     */
+    scale3d(sx: number, sy: number, sz: number): void;
+    /**
+     * 偏移
+     */
+    translate(tx: number, ty: number): void;
+    /**
+     * 在X轴偏移tx
+     */
+    translateX(tx: number): void;
+    /**
+     * 在Y轴偏移ty
+     */
+    translateY(ty: number): void;
+    /**
+     * 在Z轴偏移tx
+     */
+    translateZ(tz: number): void;
+    /**
+     * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz
+     */
+    translate3d(tx: number, ty: number, tz: number): void;
+    /**
+     * 倾斜
+     */
+    skew(ax: number, ay: number): void;
+    /**
+     * Y轴坐标不变，X轴坐标延顺时针倾斜ax度
+     */
+    skewX(ax: number): void;
+    /**
+     * X轴坐标不变，Y轴坐标延顺时针倾斜ay度
+     */
+    skewY(ay: number): void;
+    /**
+     * 矩阵变形
+     */
+    matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): void;
+    /**
+     * 矩阵变形
+     */
+    matrix3d(): void;
+}
+
+interface CanvasContext {
+    /**
+     * 填充色
+     */
+    fillStyle?: string;
+    /**
+     * 边框颜色
+     */
+    strokeStyle?: string;
+    /**
+     * 阴影的模糊级别
+     */
+    shadowBlur?: number;
+    /**
+     * 阴影的颜色
+     */
+    shadowColor?: string;
+    /**
+     * 阴影相对于形状在水平方向的偏移
+     */
+    shadowOffsetX?: number;
+    /**
+     * 阴影相对于形状在竖直方向的偏移
+     */
+    shadowOffsetY?: number;
+    /**
+     * 线条的宽度
+     */
+    lineWidth?: number;
+    /**
+     * 线条的端点样式
+     * - butt:
+     * - round:
+     * - square:
+     */
+    lineCap?: 'butt' | 'round' | 'square';
+    /**
+     * 线条的结束交点样式
+     * - bevel:
+     * - round:
+     * - miter:
+     */
+    lineJoin?: 'bevel' | 'round' | 'miter';
+    /**
+     * 最大斜接长度
+     */
+    miterLimit?: number;
+    /**
+     * 透明度
+     */
+    globalAlpha?: number;
+    /**
+     * 设置要在绘制新形状时应用的合成操作的类型
+     */
+    globalCompositeOperation?: string;
+    /**
+     * 偏移量
+     */
+    lineDashOffset?: number;
+    /**
+     * 字体样式
+     */
+    font?: string;
+    /**
+     * 设置填充色
+     */
+    setFillStyle(color: string): void;
+    /**
+     * 设置边框颜色
+     */
+    setStrokeStyle(color: string): void;
+    /**
+     * 设置阴影样式
+     */
+    setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
+    /**
+     * 创建一个线性的渐变颜色
+     */
+    createLinearGradient(x0: number, y0: number, x1: number, y1: string): CanvasContext;
+    /**
+     * 创建一个圆形的渐变颜色
+     */
+    createCircularGradient(x: number, y: number, r: number): CanvasContext;
+    /**
+     * 创建一个颜色的渐变点
+     */
+    addColorStop(stop: number, color: string): void;
+    /**
+     * 设置线条的宽度
+     */
+    setLineWidth(lineWidth: number): void;
+    /**
+     * 设置线条的端点样式
+     */
+    setLineCap(lineCap: string): void;
+    /**
+     * 设置线条的交点样式
+     */
+    setLineJoin(lineJoin: string): void;
+    /**
+     * 设置线条的宽度
+     */
+    setLineDash(pattern: any [], offset: number): void;
+    /**
+     * 设置最大斜接长度
+     */
+    setMiterLimit(miterLimit: number): void;
+    /**
+     * 创建一个矩形
+     */
+    rect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 填充一个矩形
+     */
+    fillRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 画一个矩形(非填充)
+     */
+    strokeRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 清除画布上在该矩形区域内的内容
+     */
+    clearRect(x: number, y: number, width: number, height: number): void;
+    /**
+     * 对当前路径中的内容进行填充
+     */
+    fill(): void;
+    /**
+     * 画出当前路径的边框
+     */
+    stroke(): void;
+    /**
+     * 开始创建一个路径
+     */
+    beginPath(): void;
+    /**
+     * 关闭一个路径
+     */
+    closePath(): void;
+    /**
+     * 把路径移动到画布中的指定点，不创建线条
+     */
+    moveTo(x: number, y: number): void;
+    /**
+     * 增加一个新点，然后创建一条从上次指定点到目标点的线
+     */
+    lineTo(x: number, y: number): void;
+    /**
+     * 画一条弧线
+     */
+    arc(x: number, y: number, r: number, sAngle: number, eAngle: number, counterclockwise: boolean): void;
+    /**
+     * 创建三次方贝塞尔曲线路径
+     */
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    /**
+     * 创建二次贝塞尔曲线路径
+     */
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    /**
+     * 横纵坐标缩放
+     */
+    scale(scaleWidth: number, scaleHeight: number): void;
+    /**
+     * 顺时针旋转当前坐标轴
+     */
+    rotate(rotate: number): void;
+    /**
+     * 对当前坐标系的原点(0, 0)进行变换
+     */
+    translate(x: number, y: number): void;
+    /**
+     * 从原始画布中剪切任意形状和尺寸
+     */
+    clip(): void;
+    /**
+     * 设置字体的字号
+     */
+    setFontSize(fontSize: number): void;
+    /**
+     * 在画布上绘制被填充的文本
+     */
+    fillText(text: string, x: number, y: number, maxWidth: number): void;
+    /**
+     * 设置文字的对齐
+     */
+    setTextAlign(align: string): void;
+    /**
+     * 设置文字的水平对齐
+     */
+    setTextBaseline(textBaseline: string): void;
+    /**
+     * 绘制图像到画布
+     */
+    drawImage(imageResource: string, dx: number, dy: number, dWidth: number, dHeigt: number, sx: number, sy: number, sWidth: number, sHeight: number): void;
+    /**
+     * 设置全局画笔透明度
+     */
+    setGlobalAlpha(alpha: number): void;
+    /**
+     * 保存当前的绘图上下文
+     */
+    save(): void;
+    /**
+     * 恢复之前保存的绘图上下文
+     */
+    restore(): void;
+    /**
+     * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中
+     */
+    draw(reserve: boolean, callback: () => void): void;
+    /**
+     * 测量文本尺寸信息，目前仅返回文本宽度
+     */
+    measureText(text: string): CanvasTextMetrics;
+    /**
+     * 根据控制点和半径绘制圆弧路径
+     */
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    /**
+     * 给定的 (x, y) 位置绘制文本描边的方法
+     */
+    strokeText(text: string, x: number, y: number, maxWidth: number): void;
+    /**
+     * 对指定的图像创建模式的方法，可在指定的方向上重复元图像
+     */
+    createPattern(image: string, repetition: string): void;
+    /**
+     * 使用矩阵重新设置（覆盖）当前变换的方法
+     */
+    setTransform(scaleX: number, skewX: number, skewY: number, scaleY: number, translateX: number, translateY: number): void;
+}
+
+interface CanvasTextMetrics {
+    /**
+     * 文本的宽度
+     */
+    width?: number;
+}
+
+interface CanvasToTempFilePathOptions {
+    /**
+     * 画布x轴起点（默认0）
+     */
+    x?: number;
+    /**
+     * 画布y轴起点（默认0）
+     */
+    y?: number;
+    /**
+     * 画布宽度（默认为canvas宽度-x）
+     */
+    width?: number;
+    /**
+     * 画布高度（默认为canvas高度-y）
+     */
+    height?: number;
+    /**
+     * 输出图片宽度（默认为 width * 屏幕像素密度）
+     */
+    destWidth?: boolean;
+    /**
+     * 输出图片高度（默认为 height * 屏幕像素密度）
+     */
+    destHeight?: () => void;
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 目标文件的类型，默认为 'png'
+     */
+    fileType?: string;
+    /**
+     * 图片的质量，取值范围为 (0, 1]，不在范围内时当作1.0处理
+     */
+    quality?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CanvasToTempFilePathRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CanvasToTempFilePathRes {
+    /**
+     * 导出生成的图片路径
+     */
+    tempFilePath?: string;
+}
+
+interface CanvasGetImageDataOptions {
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 将要被提取的图像数据矩形区域的左上角 x 坐标
+     */
+    x?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的左上角 y 坐标
+     */
+    y?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的宽度
+     */
+    width?: number;
+    /**
+     * 将要被提取的图像数据矩形区域的高度
+     */
+    height?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CanvasGetImageDataRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CanvasGetImageDataRes {
+    /**
+     * 回调信息
+     */
+    errMsg?: string;
+    /**
+     * 图像数据矩形的宽度
+     */
+    width?: number;
+    /**
+     * 图像数据矩形的高度
+     */
+    height?: number;
+    /**
+     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
+     */
+    data?: any [];
+}
+
+interface CanvasPutImageDataOptions {
+    /**
+     * 画布标识，传入 <canvas/> 的 canvas-id
+     */
+    canvasId?: string;
+    /**
+     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
+     */
+    data?: any [];
+    /**
+     * 源图像数据在目标画布中的位置偏移量（x 轴方向的偏移量）
+     */
+    x?: number;
+    /**
+     * 源图像数据在目标画布中的位置偏移量（y 轴方向的偏移量）
+     */
+    y?: number;
+    /**
+     * 源图像数据矩形区域的宽度
+     */
+    width?: number;
+    /**
+     * 源图像数据矩形区域的高度
+     */
+    height?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetScreenBrightnessOptions {
+    /**
+     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮
+     */
+    value?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetScreenBrightnessOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetScreenBrightnessSuccessRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetScreenBrightnessSuccessRes {
+    /**
+     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮。
+     */
+    value?: number;
+}
+
+interface SetKeepScreenOnOptions {
+    /**
+     * 是否保持屏幕常亮
+     */
+    keepScreenOn?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface VibrateLongOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface VibrateShortOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AddPhoneContactOptions {
+    /**
+     * 头像本地文件路径
+     */
+    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;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetExtConfigOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetExtConfigRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetExtConfigRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 第三方平台自定义的数据
+     */
+    extConfig?: any;
+}
+
+interface GetExtConfigSyncRes {
+    /**
+     * 第三方平台自定义的数据
+     */
+    extConfig?: any;
+}
+
+interface GetProviderOptions {
+    /**
+     * 服务类型，可取值“oauth”、“share”、“payment”、“push”
+     * - oauth: 授权登录
+     * - share: 分享
+     * - payment: 支付
+     * - push: 推送
+     */
+    service?: 'oauth' | 'share' | 'payment' | 'push';
+    /**
+     * 接口调用成功的回调
+     */
+    success?: (result: GetProviderRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetProviderRes {
+    /**
+     * 服务类型
+     */
+    service?: string;
+    /**
+     * 得到的服务供应商
+     */
+    provider?: any [];
+}
+
+interface LoginOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
+     */
+    provider?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: LoginRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface LoginRes {
+    /**
+     * 描述信息
+     */
+    errMsg?: string;
+    /**
+     * 登录服务商提供的登录信息，服务商不同返回的结果不完全相同
+     */
+    authResult?: string;
+}
+
+interface CheckSessionOptions {
+    /**
+     * 接口调用成功的回调函数，session_key未过期
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数，session_key已过期
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AuthorizeOptions {
+    /**
+     * 需要获取权限的scope
+     */
+    scope?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetUserInfoOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 是否带上登录态信息，仅微信小程序生效。
+     */
+    withCredentials?: boolean;
+    /**
+     * 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。默认为en，仅微信小程序生效。
+     */
+    lang?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetUserInfoRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetUserInfoRes {
+    /**
+     * 用户信息对象，不包含 openid 等敏感信息
+     */
+    userInfo?: UserInfo;
+    /**
+     * 不包括敏感信息的原始数据字符串，用于计算签名。
+     */
+    rawData?: string;
+    /**
+     * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，仅微信小程序生效。
+     */
+    signature?: string;
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法，仅微信小程序生效。
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量，详细见加密数据解密算法，仅微信小程序生效。
+     */
+    iv?: string;
+    /**
+     * 描述信息
+     */
+    errMsg?: string;
+}
+
+interface UserInfo {
+    /**
+     * 用户昵称
+     */
+    nickname?: string;
+    /**
+     * 该服务商唯一用户标识
+     */
+    openid?: string;
+    /**
+     * 用户头像
+     */
+    avatarUrl?: string;
+}
+
+interface ShareOptions {
+    /**
+     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
+     */
+    provider?: string;
+    /**
+     * 分享类型。默认图文0，纯文字1，纯图片2，音乐3，视频4，小程序5。
+     * - 0: 图文
+     * - 1: 纯文字
+     * - 2: 纯图片
+     * - 3: 音乐
+     * - 4: 视频
+     * - 5: 小程序
+     */
+    type?: '0' | '1' | '2' | '3' | '4' | '5';
+    /**
+     * 标题
+     */
+    title?: string;
+    /**
+     * 场景。可取值“WXSceneSession”分享到聊天界面，“WXSenceTimeline”分享到朋友圈，“WXSceneFavorite”分享到微信收藏
+     */
+    scene?: string;
+    /**
+     * 摘要
+     */
+    summary?: string;
+    /**
+     * 跳转链接
+     */
+    href?: string;
+    /**
+     * 图片地址
+     */
+    imageUrl?: string;
+    /**
+     * 音视频地址
+     */
+    mediaUrl?: string;
+    /**
+     * 分享小程序
+     */
+    miniProgram?: MiniProgramShareOptions;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface MiniProgramShareOptions {
+    /**
+     * 微信小程序原始id
+     */
+    id?: string;
+    /**
+     * 点击链接进入的页面
+     */
+    path?: string;
+    /**
+     * 微信小程序版本类型，默认为0。
+     * - 0: 正式版
+     * - 1: 测试版
+     * - 2: 体验版
+     */
+    type?: '0' | '1' | '2';
+    /**
+     * 兼容低版本的网页链接
+     */
+    webUrl?: string;
+}
+
+interface SubscribePushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UnscribePushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnPushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接收到透传数据回调，回调参数（Object）：messageId（消息id）、data（消息内容）
+     */
+    callback?: () => void;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OffPushOptions {
+    /**
+     * 分享推送提供商，通过uni.getProvider获取
+     */
+    provider?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ShowShareMenuOptions {
+    /**
+     * 是否使用带 shareTicket 的转发
+     */
+    withShareTicket?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface HideShareMenuOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UpdateShareMenuOptions {
+    /**
+     * 是否使用带 shareTicket 的转发
+     */
+    withShareTicket?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetShareInfoOptions {
+    /**
+     * shareTicket
+     */
+    shareTicket?: string;
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetShareInfoRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetShareInfoRes {
+    /**
+     * 错误信息
+     */
+    errMsg?: string;
+    /**
+     * 包括敏感数据在内的完整转发信息的加密数据
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量
+     */
+    iv?: string;
+}
+
+interface ChooseAddressOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseAddressRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseAddressRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 收货人姓名
+     */
+    userName?: string;
+    /**
+     * 邮编
+     */
+    postalCode?: string;
+    /**
+     * 国标收货地址第一级地址
+     */
+    provinceName?: string;
+    /**
+     * 国标收货地址第二级地址
+     */
+    cityName?: string;
+    /**
+     * 国标收货地址第三级地址
+     */
+    countyName?: string;
+    /**
+     * 详细收货地址信息
+     */
+    detailInfo?: string;
+    /**
+     * 收货地址国家码
+     */
+    nationalCode?: string;
+    /**
+     * 收货人手机号码
+     */
+    telNumber?: string;
+}
+
+interface AddCardOptions {
+    /**
+     * 需要添加的卡券列表
+     */
+    cardList?: AddCardData [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: AddCardRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface AddCardData {
+    /**
+     * 卡券 id
+     */
+    cardId?: string;
+    /**
+     * 卡券的扩展参数
+     */
+    cardExt?: string;
+}
+
+interface AddCardRes {
+    /**
+     * 卡券 id
+     */
+    cardList?: CardData [];
+}
+
+interface CardData {
+    /**
+     * 加密 code，为用户领取到卡券的code加密后的字符串
+     */
+    code?: string;
+    /**
+     * 用户领取到卡券的id
+     */
+    cardId?: string;
+    /**
+     * 用户领取到卡券的扩展参数，与调用时传入的参数相同
+     */
+    cardExt?: string;
+    /**
+     * 是否成功
+     */
+    isSuccess?: boolean;
+}
+
+interface OpenCardOptions {
+    /**
+     * 需要打开的卡券列表
+     */
+    cardList?: OpenCardData [];
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OpenCardData {
+    /**
+     * 需要打开的卡券 Id
+     */
+    cardId?: string;
+    /**
+     * 由 addCard 的返回对象中的加密 code 通过解密后得到
+     */
+    code?: string;
+}
+
+interface OpenSettingOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetSettingOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWeRunDataOptions {
+    /**
+     * 超时时间，单位 ms
+     */
+    timeout?: number;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetWeRunDataRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface GetWeRunDataRes {
+    /**
+     * 调用结果
+     */
+    errMsg?: string;
+    /**
+     * 包括敏感数据在内的完整用户信息的加密数据
+     */
+    encryptedData?: string;
+    /**
+     * 加密算法的初始向量
+     */
+    iv?: string;
+}
+
+interface NavigateToMiniProgramOptions {
+    /**
+     * 要打开的uni-app appId
+     */
+    appId?: string;
+    /**
+     * 打开的页面路径，如果为空则打开首页
+     */
+    path?: string;
+    /**
+     * 需要传递给目标uni-app的数据
+     */
+    extraData?: any;
+    /**
+     * 要打开的uni-app版本
+     */
+    envVersion?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface NavigateBackMiniProgramOptions {
+    /**
+     * 需要返回给上一个uni-app的数据
+     */
+    extraData?: any;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseInvoiceTitleOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: ChooseInvoiceTitleRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface ChooseInvoiceTitleRes {
+    /**
+     * 抬头类型（0：单位，1：个人）
+     */
+    type?: string;
+    /**
+     * 抬头名称
+     */
+    title?: string;
+    /**
+     * 抬头税号
+     */
+    taxNumber?: string;
+    /**
+     * 单位地址
+     */
+    companyAddress?: string;
+    /**
+     * 手机号码
+     */
+    telephone?: string;
+    /**
+     * 银行名称
+     */
+    bankName?: string;
+    /**
+     * 银行账号
+     */
+    bankAccount?: string;
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface CheckIsSupportSoterAuthenticationOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: CheckIsSupportSoterAuthenticationRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface CheckIsSupportSoterAuthenticationRes {
+    /**
+     * 接口调用成功的回调函数
+     */
+    supportMode?: any [];
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface StartSoterAuthenticationOptions {
+    /**
+     * 请求使用的可接受的生物认证方式
+     */
+    requestAuthModes?: any [];
+    /**
+     * 挑战因子
+     */
+    challenge?: string;
+    /**
+     * 验证描述，即识别过程中显示在界面上的对话框提示内容
+     */
+    authContent?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: StartSoterAuthenticationRes) => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StartSoterAuthenticationRes {
+    /**
+     * 错误码
+     */
+    errCode?: number;
+    /**
+     * 生物认证方式
+     */
+    authMode?: string;
+    /**
+     * 在设备安全区域（TEE）内获得的本机安全信息以及本次认证信息
+     */
+    resultJSON?: string;
+    /**
+     * 接口调用结果
+     */
+    errMsg?: string;
+}
+
+interface CheckIsSoterEnrolledInDeviceOptions {
+    /**
+     * 认证方式
+     * - fingerPrint: 指纹识别
+     * - facial: 人脸识别（暂未支持）
+     * - speech: 声纹识别（暂未支持）
+     */
+    checkAuthMode?: 'fingerPrint' | 'facial' | 'speech';
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface UpdateManager {
+    /**
+     * 当向应用后台请求完新版本信息，会进行回调
+     */
+    onCheckForUpdate(callback: () => void): void;
+    /**
+     * 当新版本下载完成，会进行回调
+     */
+    onUpdateReady(callback: () => void): void;
+    /**
+     * 当新版本下载失败，会进行回调
+     */
+    onUpdateFailed(callback: () => void): void;
+    /**
+     * 当新版本下载完成，调用该方法会强制当前uni-app应用上新版本并重启
+     */
+    applyUpdate(): void;
+}
+
+interface Worker {
+    /**
+     * 向 Worker 线程发送的消息。
+     */
+    postMessage(message: any): void;
+    /**
+     * 监听 Worker 线程向当前线程发送的消息
+     */
+    onMessage(callback: () => void): void;
+    /**
+     * 结束当前 Worker 线程，仅限在主线程 Worker 实例上调用。
+     */
+    terminate(): void;
+}
+
+interface SetEnableDebugOptions {
+    /**
+     * 是否打开调试
+     */
+    enableDebug?: boolean;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetBackgroundColorOptions {
+    /**
+     * 窗口的背景色，必须为十六进制颜色值
+     */
+    backgroundColor?: string;
+    /**
+     * 顶部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
+     */
+    backgroundColorTop?: string;
+    /**
+     * 底部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
+     */
+    backgroundColorBottom?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface SetBackgroundTextStyleOptions {
+    /**
+     * 下拉背景字体、loading 图的样式，值为：dark、light
+     */
+    textStyle?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface OnGyroscopeChangeSuccess {
+    /**
+     * x 轴方向角速度
+     */
+    x?: number;
+    /**
+     * y 轴方向角速度
+     */
+    y?: number;
+    /**
+     * z 轴方向角速度
+     */
+    z?: number;
+}
+
+interface StartGyroscopeOptions {
+    /**
+     * 监听陀螺仪数据回调函数的执行频率：game（20ms/次）、ui（60ms/次）、normal （200ms/次）
+     */
+    interval?: string;
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
+
+interface StopGyroscopeOptions {
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: () => void;
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: () => void;
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: () => void;
+}
diff --git a/types/uni-app/lib/page.d.ts b/types/uni-app/lib/page.d.ts
index 26d622733b..6b2b22b083 100644
--- a/types/uni-app/lib/page.d.ts
+++ b/types/uni-app/lib/page.d.ts
@@ -142,11 +142,11 @@ declare namespace Page {
         ): void;
     }
 
-    type PageConstructor = <D extends AnyObject, T extends AnyObject & PageInstance>(
-            options: PageInstance<D, T> & T,
+    type PageConstructor = <T extends AnyObject & PageInstance>(
+            options: PageInstance<AnyObject, T> & T,
         ) => void;
 
-    type GetCurrentPages = <D extends AnyObject = {}, T extends AnyObject = {}>() => Array<PageInstance<D, T> & T>;
+    type GetCurrentPages = <T extends AnyObject = {}>() => Array<PageInstance<AnyObject, T> & T>;
 }
 
 declare const getCurrentPages: Page.GetCurrentPages;
diff --git a/types/uni-app/lib/uni.d.ts b/types/uni-app/lib/uni.d.ts
deleted file mode 100644
index ee3fed73d3..0000000000
--- a/types/uni-app/lib/uni.d.ts
+++ /dev/null
@@ -1,6225 +0,0 @@
-/**
- * Uni 实例变量
- */
-declare const uni: Uni;
-
-declare class Uni {
-    /**
-     * 发起网络请求
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/request?id=request](http://uniapp.dcloud.io/api/request/request?id=request)
-     */
-    request(options: RequestOptions): RequestTask;
-    /**
-     * 上传文件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=uploadfile](http://uniapp.dcloud.io/api/request/network-file?id=uploadfile)
-     */
-    uploadFile(options: UploadFileOption): UploadTask;
-    /**
-     * 下载文件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
-     */
-    downloadFile(options: DownloadFileOption): DownloadTask;
-    /**
-     * 导入原生插件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/network-file?id=downloadfile](http://uniapp.dcloud.io/api/request/network-file?id=downloadfile)
-     */
-    requireNativePlugin(moduleName: string): void;
-    /**
-     * upx 换算为 px
-     * 
-     * 参考: [http://uniapp.dcloud.io/frame?id=upx2px](http://uniapp.dcloud.io/frame?id=upx2px)
-     */
-    upx2px(): number;
-    /**
-     * 创建一个 WebSocket 连接
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=connectsocket](http://uniapp.dcloud.io/api/request/websocket?id=connectsocket)
-     */
-    connectSocket(options: ConnectSocketOption): SocketTask;
-    /**
-     * 监听WebSocket连接打开事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen](http://uniapp.dcloud.io/api/request/websocket?id=onsocketopen)
-     */
-    onSocketOpen(options: (result: OnSocketOpenCallbackResult) => void): void;
-    /**
-     * 监听WebSocket错误
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror](http://uniapp.dcloud.io/api/request/websocket?id=onsocketerror)
-     */
-    onSocketError(callback: (result: GeneralCallbackResult) => void): void;
-    /**
-     * 通过 WebSocket 连接发送数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=sendsocketmessage)
-     */
-    sendSocketMessage(options: SendSocketMessageOptions): void;
-    /**
-     * 监听WebSocket接受到服务器的消息事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage](http://uniapp.dcloud.io/api/request/websocket?id=onsocketmessage)
-     */
-    onSocketMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
-    /**
-     * 关闭 WebSocket 连接
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=closesocket](http://uniapp.dcloud.io/api/request/websocket?id=closesocket)
-     */
-    closeSocket(options: CloseSocketOptions): void;
-    /**
-     * 监听WebSocket关闭
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose](http://uniapp.dcloud.io/api/request/websocket?id=onsocketclose)
-     */
-    onSocketClose(callback: (result: GeneralCallbackResult) => void): void;
-    /**
-     * 从本地相册选择图片或使用相机拍照
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/image?id=chooseimage](http://uniapp.dcloud.io/api/media/image?id=chooseimage)
-     */
-    chooseImage(options: ChooseImageOptions): void;
-    /**
-     * 预览图片
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/image?id=previewimage](http://uniapp.dcloud.io/api/media/image?id=previewimage)
-     */
-    previewImage(options: PreviewImageOptions): void;
-    /**
-     * 预览图片
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/image?id=getimageinfo](http://uniapp.dcloud.io/api/media/image?id=getimageinfo)
-     */
-    getImageInfo(options: GetImageInfoOptions): void;
-    /**
-     * 保存图片到系统相册
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum](http://uniapp.dcloud.io/api/media/image?id=saveimagetophotosalbum)
-     */
-    saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
-    /**
-     * 录音管理
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager](http://uniapp.dcloud.io/api/media/record-manager?id=getrecordermanager)
-     */
-    getRecorderManager(): RecorderManager;
-    /**
-     * 获取全局唯一的背景音频管理器 backgroundAudioManager
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager](http://uniapp.dcloud.io/api/media/background-audio-manager?id=getbackgroundaudiomanager)
-     */
-    getBackgroundAudioManager(): BackgroundAudioManager;
-    /**
-     * 创建并返回 audio 上下文 audioContext 对象
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext](http://uniapp.dcloud.io/api/media/audio-context?id=createinneraudiocontext)
-     */
-    createInnerAudioContext(): CreateInnerAudioContext;
-    /**
-     * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/video?id=choosevideo](http://uniapp.dcloud.io/api/media/video?id=choosevideo)
-     */
-    chooseVideo(options: ChooseVideoOptions): void;
-    /**
-     * 保存视频到系统相册
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum](http://uniapp.dcloud.io/api/media/video?id=savevideotophotosalbum)
-     */
-    saveVideoToPhotosAlbum(options: SaveVideoToPhotosAlbumOptions): void;
-    /**
-     * 创建并返回 video 上下文 videoContext 对象
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext](http://uniapp.dcloud.io/api/media/video-context?id=createvideocontext)
-     */
-    createVideoContext(): VideoContext;
-    /**
-     * 保存文件到本地
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/file/file?id=savefile](http://uniapp.dcloud.io/api/file/file?id=savefile)
-     */
-    saveFile(options: SaveFileOptions): void;
-    /**
-     * 获取文件信息
-     */
-    getFileInfo(options: GetFileInfoOptions): void;
-    /**
-     * 获取本地已保存的文件列表
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist](http://uniapp.dcloud.io/api/file/file?id=getsavedfilelist)
-     */
-    getSavedFileList(options: GetSavedFileListOptions): void;
-    /**
-     * 获取本地文件的文件信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo](http://uniapp.dcloud.io/api/file/file?id=getsavedfileinfo)
-     */
-    getSavedFileInfo(options: GetSavedFileInfoOptions): void;
-    /**
-     * 删除本地存储的文件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/file/file?id=removesavedfile](http://uniapp.dcloud.io/api/file/file?id=removesavedfile)
-     */
-    removeSavedFile(options: RemoveSavedFileOptions): void;
-    /**
-     * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/file/file?id=opendocument](http://uniapp.dcloud.io/api/file/file?id=opendocument)
-     */
-    openDocument(options: OpenDocumentOptions): void;
-    /**
-     * 将数据存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个异步接口
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstorage](http://uniapp.dcloud.io/api/storage/storage?id=setstorage)
-     */
-    setStorage(options: SetStorageOptions): void;
-    /**
-     * 将 data 存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容，这是一个同步接口
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=setstoragesync)
-     */
-    setStorageSync(): void;
-    /**
-     * 从本地缓存中异步获取指定 key 对应的内容
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorage](http://uniapp.dcloud.io/api/storage/storage?id=getstorage)
-     */
-    getStorage(options: GetStorageOptions): void;
-    /**
-     * 从本地缓存中同步获取指定 key 对应的内容
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=getstoragesync)
-     */
-    getStorageSync(): void;
-    /**
-     * 异步获取当前storage的相关信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfo)
-     */
-    getStorageInfo(options: GetStorageInfoOptions): void;
-    /**
-     * 同步获取当前storage的相关信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync](http://uniapp.dcloud.io/api/storage/storage?id=getstorageinfosync)
-     */
-    getStorageInfoSync(): void;
-    /**
-     * 从本地缓存中异步移除指定 key
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestorage](http://uniapp.dcloud.io/api/storage/storage?id=removestorage)
-     */
-    removeStorage(options: RemoveStorageOptions): void;
-    /**
-     * 从本地缓存中同步移除指定 key
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync](http://uniapp.dcloud.io/api/storage/storage?id=removestoragesync)
-     */
-    removeStorageSync(): void;
-    /**
-     * 清理本地数据缓存
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstorage](http://uniapp.dcloud.io/api/storage/storage?id=clearstorage)
-     */
-    clearStorage(): void;
-    /**
-     * 同步清理本地数据缓存
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync](http://uniapp.dcloud.io/api/storage/storage?id=clearstoragesync)
-     */
-    clearStorageSync(): void;
-    /**
-     * 获取当前的地理位置、速度
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/location/location?id=getlocation](http://uniapp.dcloud.io/api/location/location?id=getlocation)
-     */
-    getLocation(options: GetLocationOptions): void;
-    /**
-     * 打开地图选择位置。
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/location/location?id=chooselocation](http://uniapp.dcloud.io/api/location/location?id=chooselocation)
-     */
-    chooseLocation(options: ChooseLocationOptions): void;
-    /**
-     * 使用地图查看位置
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/location/open-location?id=openlocation](http://uniapp.dcloud.io/api/location/open-location?id=openlocation)
-     */
-    openLocation(options: OpenLocationOptions): void;
-    /**
-     * 创建并返回 map 上下文 mapContext 对象
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/location/map?id=createmapcontext](http://uniapp.dcloud.io/api/location/map?id=createmapcontext)
-     */
-    createMapContext(): MapContext;
-    /**
-     * 获取系统信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfo](http://uniapp.dcloud.io/api/system/info?id=getsysteminfo)
-     */
-    getSystemInfo(options: GetSystemInfoOptions): void;
-    /**
-     * 获取系统信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync](http://uniapp.dcloud.io/api/system/info?id=getsysteminfosync)
-     */
-    getSystemInfoSync(): GetSystemInfoSuccess;
-    /**
-     * 判断uni-app的API，回调，参数，组件等是否在当前版本可用
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/info?id=caniuse](http://uniapp.dcloud.io/api/system/info?id=caniuse)
-     */
-    canIUse(options: string): boolean;
-    /**
-     * 获取网络类型
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/network?id=getnetworktype](http://uniapp.dcloud.io/api/system/network?id=getnetworktype)
-     */
-    getNetworkType(options: GetNetworkTypeOptions): void;
-    /**
-     * 监听网络状态变化
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange](http://uniapp.dcloud.io/api/system/network?id=onnetworkstatuschange)
-     */
-    onNetworkStatusChange(callback: (result: OnNetworkStatusChangeSuccess) => void): void;
-    /**
-     * 监听加速度数据，频率：5次/秒，接口调用后会自动开始监听，可使用 uni.stopAccelerometer 停止监听
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange](http://uniapp.dcloud.io/api/system/accelerometer?id=onaccelerometerchange)
-     */
-    onAccelerometerChange(callback: (result: OnAccelerometerChangeSuccess) => void): void;
-    /**
-     * 开始监听加速度数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=startaccelerometer)
-     */
-    startAccelerometer(options: StartAccelerometerOptions): void;
-    /**
-     * 停止监听加速度数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer](http://uniapp.dcloud.io/api/system/accelerometer?id=stopaccelerometer)
-     */
-    stopAccelerometer(options: StopAccelerometerOptions): void;
-    /**
-     * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用uni.stopCompass停止监听
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=oncompasschange](http://uniapp.dcloud.io/api/system/compass?id=oncompasschange)
-     */
-    onCompassChange(callback: (result: OnCompassChangeSuccess) => void): void;
-    /**
-     * 开始监听罗盘数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=startcompass](http://uniapp.dcloud.io/api/system/compass?id=startcompass)
-     */
-    startCompass(options: StartCompassOptions): void;
-    /**
-     * 停止监听罗盘数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/compass?id=stopcompass](http://uniapp.dcloud.io/api/system/compass?id=stopcompass)
-     */
-    stopCompass(options: StopCompassOptions): void;
-    /**
-     * 拨打电话
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/phone?id=makephonecall](http://uniapp.dcloud.io/api/system/phone?id=makephonecall)
-     */
-    makePhoneCall(options: MakePhoneCallOptions): void;
-    /**
-     * 调用扫码界面，扫码成功后返回对应的结果
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/barcode?id=scancode](http://uniapp.dcloud.io/api/system/barcode?id=scancode)
-     */
-    scanCode(options: ScanCodeOptions): void;
-    /**
-     * 设置系统剪贴板的内容
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=setclipboarddata)
-     */
-    setClipboardData(options: SetClipboardDataOptions): void;
-    /**
-     * 获得系统剪贴板的内容
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata](http://uniapp.dcloud.io/api/system/clipboard?id=getclipboarddata)
-     */
-    getClipboardData(options: GetClipboardDataOptions): void;
-    /**
-     * 隐藏软键盘
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard](http://uniapp.dcloud.io/api/keyboard?id=hidekeyboard)
-     */
-    hideKeyboard(): void;
-    /**
-     * 设置屏幕亮度
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=setscreenbrightness)
-     */
-    setScreenBrightness(options: SetScreenBrightnessOptions): void;
-    /**
-     * 获取屏幕亮度
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness](http://uniapp.dcloud.io/api/system/brightness?id=getscreenbrightness)
-     */
-    getScreenBrightness(options: GetScreenBrightnessOptions): void;
-    /**
-     * 设置是否保持常亮状态
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon](http://uniapp.dcloud.io/api/system/brightness?id=setkeepscreenon)
-     */
-    setKeepScreenOn(options: SetKeepScreenOnOptions): void;
-    /**
-     * 使手机发生较长时间的振动（400ms）
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong](http://uniapp.dcloud.io/api/system/vibrate?id=vibratelong)
-     */
-    vibrateLong(options: VibrateLongOptions): void;
-    /**
-     * 使手机发生较短时间的振动（15ms）
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort](http://uniapp.dcloud.io/api/system/vibrate?id=vibrateshort)
-     */
-    vibrateShort(options: VibrateShortOptions): void;
-    /**
-     * 手机通讯录联系人和联系方式的增加
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/contact?id=addphonecontact](http://uniapp.dcloud.io/api/system/contact?id=addphonecontact)
-     */
-    addPhoneContact(options: AddPhoneContactOptions): void;
-    /**
-     * 获取已搜索到的iBeacon设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons](http://uniapp.dcloud.io/api/system/ibeacon?id=getbeacons)
-     */
-    getBeacons(options: GetBeaconsOptions): void;
-    /**
-     * 开始搜索附近的iBeacon设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery](http://uniapp.dcloud.io/api/system/ibeacon?id=startbeacondiscovery)
-     */
-    startBeaconDiscovery(options: StartBeaconDiscoveryOptions): void;
-    /**
-     * 停止搜索附近的iBeacon设备
-     * 
-     * 参考: [http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery](http://uniapp.dcloud.io//api/system/ibeacon?id=stopbeacondiscovery)
-     */
-    stopBeaconDiscovery(options: StopBeaconDiscoveryOptions): void;
-    /**
-     * 监听iBeacon设备更新
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconupdate)
-     */
-    onBeaconUpdate(callback: (result: GetBeaconsRes) => void): void;
-    /**
-     * 监听iBeacon服务状态变化
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange](http://uniapp.dcloud.io/api/system/ibeacon?id=onbeaconservicechange)
-     */
-    onBeaconServiceChange(callback: (result: BeaconService) => void): void;
-    /**
-     * 关闭蓝牙模块
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=closebluetoothadapter)
-     */
-    closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
-    /**
-     * 获取本机蓝牙适配器状态
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothadapterstate)
-     */
-    getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
-    /**
-     * 获取已搜索到的蓝牙设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getbluetoothdevices)
-     */
-    getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
-    /**
-     * 根据uuid获取处于已连接的设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices](http://uniapp.dcloud.io/api/system/bluetooth?id=getconnectedbluetoothdevices)
-     */
-    getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
-    /**
-     * 监听蓝牙适配器状态变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothadapterstatechange)
-     */
-    onBluetoothAdapterStateChange(callback: (result: OnBluetoothAdapterStateChangeResult) => void): void;
-    /**
-     * 监听搜索到新设备的事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound](http://uniapp.dcloud.io/api/system/bluetooth?id=onbluetoothdevicefound)
-     */
-    onBluetoothDeviceFound(callback: (result: OnBluetoothDeviceFoundResult) => void): void;
-    /**
-     * 初始化蓝牙模块
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter](http://uniapp.dcloud.io/api/system/bluetooth?id=openbluetoothadapter)
-     */
-    openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
-    /**
-     * 开始搜索附近的蓝牙设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=startbluetoothdevicesdiscovery)
-     */
-    startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
-    /**
-     * 停止搜寻附近的蓝牙外围设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery](http://uniapp.dcloud.io/api/system/bluetooth?id=stopbluetoothdevicesdiscovery)
-     */
-    stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
-    /**
-     * 断开与低功耗蓝牙设备的连接
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=closebleconnection](http://uniapp.dcloud.io/api/system/ble?id=closebleconnection)
-     */
-    closeBLEConnection(options: CloseBLEConnectionOptions): void;
-    /**
-     * 连接低功耗蓝牙设备
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=createbleconnection](http://uniapp.dcloud.io/api/system/ble?id=createbleconnection)
-     */
-    createBLEConnection(options: CreateBLEConnectionOptions): void;
-    /**
-     * 获取蓝牙设备指定服务中所有特征值
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics](http://uniapp.dcloud.io/api/system/ble?id=getbledevicecharacteristics)
-     */
-    getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
-    /**
-     * 获取蓝牙设备的所有服务
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices](http://uniapp.dcloud.io/api/system/ble?id=getbledeviceservices)
-     */
-    getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
-    /**
-     * 启用低功耗蓝牙设备特征值变化时的notify功能，订阅特征值
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=notifyblecharacteristicvaluechange)
-     */
-    notifyBLECharacteristicValueChange(options: NotifyBLECharacteristicValueChangeOptions): void;
-    /**
-     * 监听低功耗蓝牙设备的特征值变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange](http://uniapp.dcloud.io/api/system/ble?id=onblecharacteristicvaluechange)
-     */
-    onBLECharacteristicValueChange(callback: (result: OnBLECharacteristicValueChangeSuccess) => void): void;
-    /**
-     * 监听低功耗蓝牙设备连接状态变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange](http://uniapp.dcloud.io/api/system/ble?id=onbleconnectionstatechange)
-     */
-    onBLEConnectionStateChange(callback: (result: OnBLEConnectionStateChangeSuccess) => void): void;
-    /**
-     * 读取低功耗蓝牙设备指定特征值的二进制数据值
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=readblecharacteristicvalue)
-     */
-    readBLECharacteristicValue(options: ReadBLECharacteristicValueOptions): void;
-    /**
-     * 向低功耗蓝牙设备指定特征值写入二进制数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue](http://uniapp.dcloud.io/api/system/ble?id=writeblecharacteristicvalue)
-     */
-    writeBLECharacteristicValue(options: WriteBLECharacteristicValueOptions): void;
-    /**
-     * 显示消息提示框
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showtoast](http://uniapp.dcloud.io/api/ui/prompt?id=showtoast)
-     */
-    showToast(options: ShowToastOptions): void;
-    /**
-     * 显示 loading 提示框
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showloading](http://uniapp.dcloud.io/api/ui/prompt?id=showloading)
-     */
-    showLoading(options: ShowLoadingOptions): void;
-    /**
-     * 隐藏消息提示框
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast](http://uniapp.dcloud.io/api/ui/prompt?id=hidetoast)
-     */
-    hideToast(): void;
-    /**
-     * 隐藏 loading 提示框
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=hideloading](http://uniapp.dcloud.io/api/ui/prompt?id=hideloading)
-     */
-    hideLoading(): void;
-    /**
-     * 显示模态弹窗
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showmodal](http://uniapp.dcloud.io/api/ui/prompt?id=showmodal)
-     */
-    showModal(options: ShowModalOptions): void;
-    /**
-     * 显示操作菜单
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet](http://uniapp.dcloud.io/api/ui/prompt?id=showactionsheet)
-     */
-    showActionSheet(options: ShowActionSheetOptions): void;
-    /**
-     * 动态设置当前页面的标题
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbartitle)
-     */
-    setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
-    /**
-     * 在当前页面显示导航条加载动画
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=shownavigationbarloading)
-     */
-    showNavigationBarLoading(): void;
-    /**
-     * 隐藏导航条加载动画
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading](http://uniapp.dcloud.io/api/ui/navigationbar?id=hidenavigationbarloading)
-     */
-    hideNavigationBarLoading(): void;
-    /**
-     * 设置导航条颜色
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor](http://uniapp.dcloud.io/api/ui/navigationbar?id=setnavigationbarcolor)
-     */
-    setNavigationBarColor(options: SetNavigationbarColorOptions): void;
-    /**
-     * 动态设置 tabBar 某一项的内容
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbaritem)
-     */
-    setTabBarItem(options: SetTabBarItemOptions): void;
-    /**
-     * 动态设置 tabBar 的整体样式
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarstyle)
-     */
-    setTabBarStyle(options: SetTabBarStyleOptions): void;
-    /**
-     * 隐藏 tabBar
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbar)
-     */
-    hideTabBar(options: HideTabBarOptions): void;
-    /**
-     * 显示 tabBar
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbar)
-     */
-    showTabBar(options: ShowTabBarOptions): void;
-    /**
-     * 为 tabBar 某一项的右上角添加文本
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=settabbarbadge)
-     */
-    setTabBarBadge(options: SetTabBarBadgeOptions): void;
-    /**
-     * 移除 tabBar 某一项右上角的文本
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge](http://uniapp.dcloud.io/api/ui/tabbar?id=removetabbarbadge)
-     */
-    removeTabBarBadge(options: RemoveTabBarBadgeOptions): void;
-    /**
-     * 显示 tabBar 某一项的右上角的红点
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=showtabbarreddot)
-     */
-    showTabBarRedDot(options: ShowTabBarRedDotOptions): void;
-    /**
-     * 隐藏 tabBar 某一项的右上角的红点
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot](http://uniapp.dcloud.io/api/ui/tabbar?id=hidetabbarreddot)
-     */
-    hideTabBarRedDot(options: HideTabBarRedDotOptions): void;
-    /**
-     * 保留当前页面，跳转到应用内的某个页面
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateto](http://uniapp.dcloud.io/api/router?id=navigateto)
-     */
-    navigateTo(options: NavigateToOptions): void;
-    /**
-     * 关闭当前页面，跳转到应用内的某个页面
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/router?id=redirectto](http://uniapp.dcloud.io/api/router?id=redirectto)
-     */
-    redirectTo(options: RedirectToOptions): void;
-    /**
-     * 关闭所有页面，打开到应用内的某个页面
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/router?id=relaunch](http://uniapp.dcloud.io/api/router?id=relaunch)
-     */
-    reLaunch(options: ReLaunchOptions): void;
-    /**
-     * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/router?id=switchtab](http://uniapp.dcloud.io/api/router?id=switchtab)
-     */
-    switchTab(options: SwitchTabOptions): void;
-    /**
-     * 关闭当前页面，返回上一页面或多级页面
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/router?id=navigateback](http://uniapp.dcloud.io/api/router?id=navigateback)
-     */
-    navigateBack(options: NavigateBackOptions): void;
-    /**
-     * 创建一个动画实例
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/animation?id=createanimation](http://uniapp.dcloud.io/api/ui/animation?id=createanimation)
-     */
-    createAnimation(options: CreateAnimationOptions): Animation;
-    /**
-     * 将页面滚动到目标位置
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto](http://uniapp.dcloud.io/api/ui/scroll?id=pagescrollto)
-     */
-    pageScrollTo(options: PageScrollToOptions): void;
-    /**
-     * 开始下拉刷新
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=startpulldownrefresh)
-     */
-    startPullDownRefresh(options: StartPullDownRefreshOptions): void;
-    /**
-     * 停止当前页面下拉刷新
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh](http://uniapp.dcloud.io/api/ui/pulldown?id=stoppulldownrefresh)
-     */
-    stopPullDownRefresh(): void;
-    /**
-     * 返回一个SelectorQuery对象实例
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery](http://uniapp.dcloud.io/api/ui/nodes-info?id=createselectorquery)
-     */
-    createSelectorQuery(): SelectorQuery;
-    /**
-     * 创建并返回一个 IntersectionObserver 对象实例
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver](http://uniapp.dcloud.io/api/ui/intersection-observer?id=createintersectionobserver)
-     */
-    createIntersectionObserver(options: CreateIntersectionObserverOptions): IntersectionObserver;
-    /**
-     * 创建 canvas 绘图上下文
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext](http://uniapp.dcloud.io/api/ui/canvas?id=createcanvascontext)
-     */
-    createCanvasContext(canvasId: string, componentInstance: any): CanvasContext;
-    /**
-     * 把当前画布指定区域的内容导出生成指定大小的图片
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath](http://uniapp.dcloud.io/api/ui/canvas?id=canvastotempfilepath)
-     */
-    canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
-    /**
-     * 描述 canvas 区域隐含的像素数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasgetimagedata)
-     */
-    canvasGetImageData(options: CanvasGetImageDataOptions): void;
-    /**
-     * 将像素数据绘制到画布
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata](http://uniapp.dcloud.io/api/ui/canvas?id=canvasputimagedata)
-     */
-    canvasPutImageData(options: CanvasPutImageDataOptions): void;
-    /**
-     * 监听窗口尺寸变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=onwindowresize](http://uniapp.dcloud.io/api/ui/window?id=onwindowresize)
-     */
-    onWindowResize(callback: (result: WindowResizeResult) => void): void;
-    /**
-     * 取消监听窗口尺寸变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/window?id=offwindowresize](http://uniapp.dcloud.io/api/ui/window?id=offwindowresize)
-     */
-    offWindowResize(callback: () => void): void;
-    /**
-     * 获取服务供应商
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/provider?id=getprovider](http://uniapp.dcloud.io/api/plugins/provider?id=getprovider)
-     */
-    getProvider(options: GetProviderOptions): void;
-    /**
-     * 登录
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=login](http://uniapp.dcloud.io/api/plugins/login?id=login)
-     */
-    login(options: LoginOptions): void;
-    /**
-     * 获取用户信息
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo](http://uniapp.dcloud.io/api/plugins/login?id=getuserinfo)
-     */
-    getUserInfo(options: GetUserInfoOptions): void;
-    /**
-     * 分享
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=share](http://uniapp.dcloud.io/api/plugins/share?id=share)
-     */
-    share(options: ShareOptions): void;
-    /**
-     * 开启推送
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=subscribepush](http://uniapp.dcloud.io/api/plugins/push?id=subscribepush)
-     */
-    subscribePush(options: SubscribePushOptions): void;
-    /**
-     * 关闭推送
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush](http://uniapp.dcloud.io/api/plugins/push?id=unsubscribepush)
-     */
-    unsubscribePush(options: UnscribePushOptions): void;
-    /**
-     * 监听透传数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=onpush](http://uniapp.dcloud.io/api/plugins/push?id=onpush)
-     */
-    onPush(options: OnPushOptions): void;
-    /**
-     * 移除监听透传数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/push?id=offpush](http://uniapp.dcloud.io/api/plugins/push?id=offpush)
-     */
-    offPush(options: OffPushOptions): void;
-    /**
-     * 支付
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment](http://uniapp.dcloud.io/api/plugins/payment?id=requestpayment)
-     */
-    requestPayment(options: RequestPaymentOptions): void;
-    /**
-     * 提前向用户发起授权请求
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=authorize](http://uniapp.dcloud.io/api/other/authorize?id=authorize)
-     */
-    authorize(options: AuthorizeOptions): void;
-    /**
-     * 调起客户端小程序设置界面，返回用户设置的操作结果
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/authorize?id=opensetting](http://uniapp.dcloud.io/api/other/authorize?id=opensetting)
-     */
-    openSetting(options: OpenSettingOptions): void;
-    /**
-     * 获取用户的当前设置
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/setting?id=getsetting](http://uniapp.dcloud.io/api/other/setting?id=getsetting)
-     */
-    getSetting(options: GetSettingOptions): void;
-    /**
-     * 获取用户收货地址。调起用户编辑收货地址原生界面，并在编辑完成后返回用户选择的地址，需要用户授权 scope.address
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress](http://uniapp.dcloud.io/api/other/choose-address?id=chooseaddress)
-     */
-    chooseAddress(options: ChooseAddressOptions): void;
-    /**
-     * 选择用户的发票抬头，需要用户授权 scope.invoiceTitle
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle](http://uniapp.dcloud.io/api/other/invoice-title?id=chooseinvoicetitle)
-     */
-    chooseInvoiceTitle(options: ChooseInvoiceTitleOptions): void;
-    /**
-     * 调起客户端小程序设置界面，返回用户设置的操作结果
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatetominiprogram)
-     */
-    navigateToMiniProgram(options: NavigateToMiniProgramOptions): void;
-    /**
-     * 跳转回上一个小程序，只有当另一个小程序跳转到当前小程序时才会能调用成功
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram](http://uniapp.dcloud.io/api/other/open-miniprogram?id=navigatebackminiprogram)
-     */
-    navigateBackMiniProgram(options: NavigateBackMiniProgramOptions): void;
-    /**
-     * 返回全局唯一的版本更新管理器对象： updateManager，用于管理小程序更新
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/update?id=getupdatemanager](http://uniapp.dcloud.io/api/other/update?id=getupdatemanager)
-     */
-    getUpdateManager(): UpdateManager;
-    /**
-     * 设置是否打开调试开关。此开关对正式版也能生效
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug](http://uniapp.dcloud.io/api/other/set-enable-debug?id=setenabledebug)
-     */
-    setEnableDebug(options: SetEnableDebugOptions): void;
-    /**
-     * 获取第三方平台自定义的数据字段
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfig)
-     */
-    getExtConfig(options: GetExtConfigOptions): GetExtConfigRes;
-    /**
-     * uni.getExtConfig() 的同步版本
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync](http://uniapp.dcloud.io/api/other/get-extconfig?id=getextconfigsync)
-     */
-    getExtConfigSync(): GetExtConfigSyncRes;
-    /**
-     * 隐藏分享按钮
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu](http://uniapp.dcloud.io/api/plugins/share?id=hidesharemenu)
-     */
-    hideShareMenu(options: HideShareMenuOptions): void;
-    /**
-     * 动态设置窗口的背景色
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundcolor)
-     */
-    setBackgroundColor(options: SetBackgroundColorOptions): void;
-    /**
-     * 动态设置窗口的背景色
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle](http://uniapp.dcloud.io/api/ui/bgcolor?id=setbackgroundtextstyle)
-     */
-    setBackgroundTextStyle(options: SetBackgroundTextStyleOptions): void;
-    /**
-     * 监听陀螺仪数据变化事件
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange](http://uniapp.dcloud.io/api/system/gyroscope?id=ongyroscopechange)
-     */
-    onGyroscopeChange(callback: (result: OnGyroscopeChangeSuccess) => void): void;
-    /**
-     * 开始监听陀螺仪数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=startgyroscope)
-     */
-    startGyroscope(options: StartGyroscopeOptions): void;
-    /**
-     * 停止监听陀螺仪数据
-     * 
-     * 参考: [http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope](http://uniapp.dcloud.io/api/system/gyroscope?id=stopgyroscope)
-     */
-    stopGyroscope(options: StopGyroscopeOptions): void;
-}
-
-interface GeneralCallbackResult {
-    /**
-     * 错误信息
-     */
-    errMsg?: string;
-}
-
-interface RequestPaymentOptions {
-    /**
-     * 分享服务提供商，通过 uni.getProvider 获取
-     */
-    provider?: string;
-    /**
-     * 订单数据
-     */
-    orderInfo?: string;
-    /**
-     * 时间戳从1970年1月1日至今的秒数，即当前的时间，微信小程序独有
-     */
-    timeStamp?: string;
-    /**
-     * 随机字符串，长度为32个字符以下，微信小程序独有 。
-     */
-    nonceStr?: string;
-    /**
-     * 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=xx，微信小程序独有
-     */
-    package?: string;
-    /**
-     * 签名算法，暂支持 MD5 ，微信小程序独有
-     */
-    signType?: string;
-    /**
-     * 签名，具体签名方案参见小程序支付接口文档，微信小程序独有
-     */
-    paySign?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface RequestOptions {
-    /**
-     * 资源url
-     */
-    url?: string;
-    /**
-     * 请求的参数
-     */
-    data?: string | object | ArrayBuffer;
-    /**
-     * 设置请求的 header，header 中不能设置 Referer。
-     */
-    header?: any;
-    /**
-     * 默认为 GET
-     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
-     */
-    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
-    /**
-     * 如果设为json，会尝试对返回的数据做一次 JSON.parse
-     */
-    dataType?: string;
-    /**
-     * 设置响应的数据类型。合法值：text、arraybuffer
-     */
-    responseType?: string;
-    /**
-     * 成功返回的回调函数
-     */
-    success?: (result: RequestSuccessCallbackResult) => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: (result: GeneralCallbackResult) => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: (result: GeneralCallbackResult) => void;
-}
-
-interface RequestSuccessCallbackResult {
-    /**
-     * 开发者服务器返回的数据
-     */
-    data?: string;
-    /**
-     * 开发者服务器返回的 HTTP 状态码
-     */
-    statusCode?: number;
-    /**
-     * 开发者服务器返回的 HTTP Response Header
-     */
-    header?: any;
-}
-
-interface RequestTask {
-    /**
-     * 中断请求任务
-     */
-    abort(): void;
-}
-
-interface UploadFileOption {
-    /**
-     * 开发者服务器 url
-     */
-    url?: string;
-    /**
-     * 文件类型，image/video/audio，仅支付宝小程序，且必填。
-     * - image: 图像
-     * - video: 视频
-     * - audio: 音频
-     */
-    fileType?: 'image' | 'video' | 'audio';
-    /**
-     * 要上传文件资源的路径
-     */
-    filePath?: string;
-    /**
-     * 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
-     */
-    name?: string;
-    /**
-     * 需要上传的文件列表。使用 files 时，filePath 和 name 不生效。仅 5+App 支持
-     */
-    files?: UploadFileOptionFiles [];
-    /**
-     * HTTP 请求 Header, header 中不能设置 Referer
-     */
-    header?: any;
-    /**
-     * HTTP 请求中其他额外的 form data
-     */
-    formData?: any;
-    /**
-     * 成功返回的回调函数
-     */
-    success?: (result: UploadFileSuccessCallbackResult) => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: (result: GeneralCallbackResult) => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: (result: GeneralCallbackResult) => void;
-}
-
-interface UploadFileOptionFiles {
-    /**
-     * multipart 提交时，表单的项目名，默认为 file，如果 name 不填或填的值相同，可能导致服务端读取文件时只能读取到一个文件。
-     */
-    name?: string;
-    /**
-     * 要上传文件资源的路径
-     */
-    uri?: string;
-}
-
-interface UploadTask {
-    /**
-     * 监听上传进度变化
-     */
-    onProgressUpdate(callback: (result: OnProgressUpdateResult) => void): void;
-    /**
-     * 中断上传任务
-     */
-    abort(): void;
-}
-
-interface OnProgressUpdateResult {
-    /**
-     * 上传进度百分比
-     */
-    progress?: number;
-    /**
-     * 已经上传的数据长度，单位 Bytes
-     */
-    totalBytesSent?: number;
-    /**
-     * 预期需要上传的数据总长度，单位 Bytes
-     */
-    totalBytesExpectedToSend?: number;
-}
-
-interface DownloadFileOption {
-    /**
-     * 下载资源的 url
-     */
-    url?: string;
-    /**
-     * HTTP 请求 Header，header 中不能设置 Referer
-     */
-    header?: any;
-    /**
-     * 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'}
-     */
-    success?: (result: DownloadSuccessData) => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface DownloadTask {
-    /**
-     * 监听下载进度变化
-     */
-    onProgressUpdate(callback: (result: OnProgressDownloadResult) => void): void;
-    /**
-     * 中断下载任务
-     */
-    abort(): void;
-}
-
-interface OnProgressDownloadResult {
-    /**
-     * 下载进度百分比
-     */
-    progress?: number;
-    /**
-     * 已经下载的数据长度，单位 Bytes
-     */
-    totalBytesWritten?: number;
-    /**
-     * 预期需要下载的数据总长度，单位 Bytes
-     */
-    totalBytesExpectedToWrite?: number;
-}
-
-interface UploadFileSuccessCallbackResult {
-    /**
-     * 开发者服务器返回的数据
-     */
-    data?: string;
-    /**
-     * 开发者服务器返回的 HTTP 状态码
-     */
-    statusCode?: number;
-}
-
-interface DownloadSuccessData {
-    /**
-     * 临时文件路径，下载后的文件会存储到一个临时文件
-     */
-    tempFilePath?: string;
-    /**
-     * 开发者服务器返回的 HTTP 状态码
-     */
-    statusCode?: number;
-}
-
-interface ConnectSocketOption {
-    /**
-     * 开发者服务器接口地址，必须是 wss 协议，且域名必须是后台配置的合法域名
-     */
-    url?: string;
-    /**
-     * HTTP 请求 Header，header 中不能设置 Referer
-     */
-    header?: any;
-    /**
-     * 默认为 GET
-     * 可以是：OPTIONS，GET，HEAD，POST，PUT，DELETE，TRACE，CONNECT
-     */
-    method?: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
-    /**
-     * 子协议数组
-     */
-    protocols?: string [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SendSocketMessageOptions {
-    /**
-     * 需要发送的内容
-     */
-    data?: string | ArrayBuffer;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GeneralCallbackResult) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: (result: GeneralCallbackResult) => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: (result: GeneralCallbackResult) => void;
-}
-
-interface CloseSocketOptions {
-    /**
-     * 一个数字值表示关闭连接的状态号，表示连接被关闭的原因。如果这个参数没有被指定，默认的取值是1000 （表示正常连接关闭）
-     */
-    code?: number;
-    /**
-     * 一个可读的字符串，表示连接被关闭的原因。这个字符串必须是不长于123字节的UTF-8 文本（不是字符）
-     */
-    reason?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GeneralCallbackResult) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: (result: GeneralCallbackResult) => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: (result: GeneralCallbackResult) => void;
-}
-
-interface SocketTask {
-    /**
-     * 通过 WebSocket 连接发送数据
-     */
-    send(options: SendSocketMessageOptions): void;
-    /**
-     * 关闭 WebSocket 连接
-     */
-    close(options: CloseSocketOptions): void;
-    /**
-     * 监听 WebSocket 连接打开事件
-     */
-    onOpen(callback: (result: OnSocketOpenCallbackResult) => void): void;
-    /**
-     * 监听 WebSocket 连接关闭事件
-     */
-    onClose(callback: () => void): void;
-    /**
-     * 监听 WebSocket 错误
-     */
-    onError(callback: (result: GeneralCallbackResult) => void): void;
-    /**
-     * 监听WebSocket接受到服务器的消息事件
-     */
-    onMessage(callback: (result: OnSocketMessageCallbackResult) => void): void;
-}
-
-interface OnSocketMessageCallbackResult {
-    /**
-     * 服务器返回的消息
-     */
-    data?: string | ArrayBuffer;
-}
-
-interface OnSocketOpenCallbackResult {
-    /**
-     * 连接成功的 HTTP 响应 Header
-     */
-    header?: any;
-}
-
-interface ChooseImageOptions {
-    /**
-     * 最多可以选择的图片张数，默认9
-     */
-    count?: number;
-    /**
-     * original 原图，compressed 压缩图，默认二者都有
-     */
-    sizeType?: string | string [];
-    /**
-     * album 从相册选图，camera 使用相机，默认二者都有
-     */
-    sourceType?: string | string [];
-    /**
-     * 成功则返回图片的本地文件路径列表 tempFilePaths
-     */
-    success?: (result: ChooseImageSuccessCallbackResult) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseImageSuccessCallbackResult {
-    /**
-     * 图片的本地文件路径列表
-     */
-    tempFilePaths?: string | any [];
-    /**
-     * 图片的本地文件列表，每一项是一个 File 对象
-     */
-    tempFiles?: ChooseImageSuccessCallbackResultFile | ChooseImageSuccessCallbackResultFile [];
-}
-
-interface ChooseImageSuccessCallbackResultFile {
-    /**
-     * 本地文件路径
-     */
-    path?: string;
-    /**
-     * 本地文件大小，单位：B
-     */
-    size?: number;
-}
-
-interface PreviewImageOptions {
-    /**
-     * 当前显示图片的链接，不填则默认为 urls 的第一张
-     */
-    count?: string;
-    /**
-     * 需要预览的图片链接列表
-     */
-    urls?: string | any [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetImageInfoOptions {
-    /**
-     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
-     */
-    src?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetImageInfoSuccessData) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetImageInfoSuccessData {
-    /**
-     * 图片宽度，单位px
-     */
-    width?: number;
-    /**
-     * 图片高度，单位px
-     */
-    height?: number;
-    /**
-     * 返回图片的本地路径
-     */
-    path?: string;
-    /**
-     * 返回图片的方向
-     */
-    orientation?: string;
-    /**
-     * 返回图片的格式
-     */
-    type?: string;
-}
-
-interface SaveImageToPhotosAlbumOptions {
-    /**
-     * 图片文件路径，可以是临时文件路径也可以是永久文件路径，不支持网络图片路径
-     */
-    filePath?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StartRecordOptions {
-    /**
-     * 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'}
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface RecorderManager {
-    /**
-     * 开始录音
-     */
-    start(options: RecorderManagerStartOptions): void;
-    /**
-     * 暂停录音
-     */
-    pause(): void;
-    /**
-     * 暂停录音
-     */
-    resume(): void;
-    /**
-     * 停止录音
-     */
-    stop(): void;
-    /**
-     * 录音开始事件
-     */
-    onStart(options: () => void): void;
-    /**
-     * 录音暂停事件
-     */
-    onPause(options: () => void): void;
-    /**
-     * 录音停止事件，会回调文件地址
-     */
-    onStop(options: () => void): void;
-    /**
-     * 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件
-     */
-    onFrameRecorded(options: () => void): void;
-    /**
-     * 录音错误事件, 会回调错误信息
-     */
-    onError(options: () => void): void;
-}
-
-interface RecorderManagerStartOptions {
-    /**
-     * 指定录音的时长，单位 ms ，如果传入了合法的 duration ，在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
-     */
-    duration?: number;
-    /**
-     * 采样率，有效值 8000/16000/44100
-     */
-    sampleRate?: number;
-    /**
-     * 录音通道数，有效值 1/2
-     */
-    numberOfChannels?: number;
-    /**
-     * 编码码率，有效值见下表格
-     */
-    encodeBitRate?: number;
-    /**
-     * 音频格式，有效值 aac/mp3
-     */
-    format?: string;
-    /**
-     * 指定帧大小，单位 KB。传入 frameSize 后，每录制指定帧大小的内容后，会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
-     */
-    frameSize?: number;
-}
-
-interface PlayVoiceOptions {
-    /**
-     * 需要播放的语音文件的文件路径
-     */
-    filePath?: string;
-    /**
-     * original 原图，compressed 压缩图，默认二者都有
-     */
-    duration?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBackgroundAudioPlayerStateOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetBackgroundAudioPlayerStateSuccessData) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBackgroundAudioPlayerStateSuccessData {
-    /**
-     * 选定音频的长度（单位：s），只有在当前有音乐播放时返回
-     */
-    duration?: number;
-    /**
-     * 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回
-     */
-    currentPosition?: number;
-    /**
-     * 播放状态（2：没有音乐在播放，1：播放中，0：暂停中）
-     */
-    status?: number;
-    /**
-     * 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回
-     */
-    downloadPercent?: number;
-    /**
-     * 歌曲数据链接，只有在当前有音乐播放时返回
-     */
-    dataUrl?: string;
-}
-
-interface GetBackgroundAudioOptions {
-    /**
-     * 音乐链接，目前支持的格式有 m4a, aac, mp3, wav
-     */
-    dataUrl?: string;
-    /**
-     * 音乐标题
-     */
-    title?: string;
-    /**
-     * 封面url
-     */
-    coverImgUrl?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SeekBackgroundAudioOptions {
-    /**
-     * 音乐位置，单位：秒
-     */
-    position?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface BackgroundAudioManager {
-    /**
-     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
-     */
-    duration?: number;
-    /**
-     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
-     */
-    currentTime?: number;
-    /**
-     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
-     */
-    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;
-    /**
-     * 音频协议。默认值为 'http'，设置 'hls' 可以支持播放 HLS 协议的直播音频
-     */
-    protocol?: string;
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(): void;
-    /**
-     * 停止
-     */
-    stop(): 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;
-    /**
-     * 背景音频播放错误事件
-     */
-    onNext(callback: () => void): void;
-    /**
-     * 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发
-     */
-    onWaiting(callback: () => void): void;
-}
-
-interface CreateAudioContext {
-    /**
-     * 音频的地址
-     */
-    setSrc(): void;
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(): void;
-}
-
-interface CreateInnerAudioContext {
-    /**
-     * 当前音频的长度（单位：s），只有在当前有合法的 src 时返回
-     */
-    duration?: number;
-    /**
-     * 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回
-     */
-    currentTime?: number;
-    /**
-     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
-     */
-    paused?: boolean;
-    /**
-     * 音频的数据链接，用于直接播放。
-     */
-    src?: string;
-    /**
-     * 音频开始播放的位置（单位：s）
-     */
-    startTime?: number;
-    /**
-     * 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲
-     */
-    buffered?: number;
-    /**
-     * 是否自动开始播放，默认 false
-     */
-    autoplay?: boolean;
-    /**
-     * 是否循环播放，默认 false
-     */
-    loop?: boolean;
-    /**
-     * 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true
-     */
-    obeyMuteSwitch?: boolean;
-    /**
-     * 音量。范围 0~1。
-     */
-    volume?: number;
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 停止
-     */
-    stop(): void;
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(): 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;
-    /**
-     * 取消监听 onCanplay 事件
-     */
-    offCanplay(callback: () => void): void;
-    /**
-     * 取消监听 onPlay 事件
-     */
-    offPlay(callback: () => void): void;
-    /**
-     * 取消监听 onPause 事件
-     */
-    offPause(callback: () => void): void;
-    /**
-     * 取消监听 onStop 事件
-     */
-    offStop(callback: () => void): void;
-    /**
-     * 取消监听 onEnded 事件
-     */
-    offEnded(callback: () => void): void;
-    /**
-     * 取消监听 onTimeUpdate 事件
-     */
-    offTimeUpdate(callback: () => void): void;
-    /**
-     * 取消监听 onWaiting 事件
-     */
-    offError(callback: () => void): void;
-    /**
-     * 取消监听 onWaiting 事件
-     */
-    offWaiting(callback: () => void): void;
-    /**
-     * 取消监听 onSeeking 事件
-     */
-    offSeeking(callback: () => void): void;
-    /**
-     * 取消监听 onSeeked 事件
-     */
-    offSeeked(callback: () => void): void;
-}
-
-interface ChooseVideoOptions {
-    /**
-     * album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera']
-     */
-    sourceType?: string | any [];
-    /**
-     * 是否压缩所选的视频源文件，默认值为true，需要压缩
-     */
-    compressed?: boolean;
-    /**
-     * 拍摄视频最长拍摄时间，单位秒。最长支持 60 秒
-     */
-    maxDuration?: number;
-    /**
-     * 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明
-     */
-    success?: (result: ChooseVideoSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SaveVideoToPhotosAlbumOptions {
-    /**
-     * 视频文件路径，可以是临时文件路径也可以是永久文件路径
-     */
-    filePath?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseVideoSuccess {
-    /**
-     * 临时文件路径，下载后的文件会存储到一个临时文件
-     */
-    tempFilePath?: string;
-    /**
-     * 选定视频的时间长度
-     */
-    duration?: number;
-    /**
-     * 选定视频的数据量大小
-     */
-    size?: number;
-    /**
-     * 返回选定视频的长
-     */
-    height?: number;
-    /**
-     * 返回选定视频的宽
-     */
-    width?: number;
-}
-
-interface VideoContext {
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(): void;
-    /**
-     * 发送弹幕，danmu 包含两个属性 text, color。
-     */
-    sendDanmu(): void;
-    /**
-     * 设置倍速播放，支持的倍率有 0.5/0.8/1.0/1.25/1.5
-     */
-    playbackRate(): void;
-    /**
-     * 进入全屏，可传入{direction}参数（1.7.0起支持），详见video组件文档
-     */
-    requestFullScreen(): void;
-    /**
-     * 退出全屏
-     */
-    exitFullScreen(): void;
-}
-
-interface CameraContext {
-    /**
-     * 拍照，可指定质量，成功则返回图片
-     */
-    takePhoto(options: CameraContextTakePhotoOptions): void;
-    /**
-     * 开始录像
-     */
-    startRecord(options: CameraContextStartRecordOptions): void;
-    /**
-     * 结束录像，成功则返回封面与视频
-     */
-    stopRecord(options: CameraContextStopRecordOptions): void;
-}
-
-interface CameraContextTakePhotoOptions {
-    /**
-     * 成像质量，值为high, normal, low，默认normal
-     */
-    quality?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CameraContextStartRecordOptions {
-    /**
-     * 超过30s或页面onHide时会结束录像，res = { tempThumbPath, tempVideoPath }
-     */
-    timeoutCallback?: () => void;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CameraContextStopRecordOptions {
-    /**
-     * 接口调用成功的回调函数 ，res = { tempThumbPath, tempVideoPath }
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SaveFileOptions {
-    /**
-     * 需要保存的文件的临时路径
-     */
-    tempFilePath?: string;
-    /**
-     * 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'}
-     */
-    success?: (result: SaveFileSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SaveFileSuccess {
-    /**
-     * 文件的保存路径
-     */
-    savedFilePath?: string;
-}
-
-interface GetFileInfoOptions {
-    /**
-     * 本地路径
-     */
-    filePath?: string;
-    /**
-     * 计算文件摘要的算法，默认值 md5，有效值：md5，sha1
-     */
-    digestAlgorithm?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetFileInfoSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetFileInfoSuccess {
-    /**
-     * 文件大小，单位：B
-     */
-    size?: number;
-    /**
-     * 按照传入的 digestAlgorithm 计算得出的的文件摘要
-     */
-    digest?: string;
-    /**
-     * 调用结果
-     */
-    errMsg?: string;
-}
-
-interface GetSavedFileListOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetSavedFileListSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetSavedFileListSuccess {
-    /**
-     * 接口调用结果
-     */
-    errMsg?: number;
-    /**
-     * 文件列表
-     */
-    fileList?: string;
-}
-
-interface GetSavedFileInfoOptions {
-    /**
-     * 文件路径
-     */
-    filePath?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetSavedFileInfoSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetSavedFileInfoSuccess {
-    /**
-     * 接口调用结果
-     */
-    errMsg?: string;
-    /**
-     * 文件大小，单位B
-     */
-    size?: number;
-    /**
-     * 文件保存时的时间戳，从1970/01/01 08:00:00 到该时刻的秒数
-     */
-    createTime?: number;
-}
-
-interface RemoveSavedFileOptions {
-    /**
-     * 文件路径
-     */
-    filePath?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OpenDocumentOptions {
-    /**
-     * 文件路径
-     */
-    filePath?: string;
-    /**
-     * 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx
-     */
-    fileType?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetStorageOptions {
-    /**
-     * 本地缓存中的指定的 key
-     */
-    key?: string;
-    /**
-     * 需要存储的内容
-     */
-    data?: object | string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetStorageOptions {
-    /**
-     * 本地缓存中的指定的 key
-     */
-    key?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetStorageInfoOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetStorageInfoSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetStorageInfoSuccess {
-    /**
-     * 当前storage中所有的key
-     */
-    keys?: string | any [];
-    /**
-     * 当前占用的空间大小, 单位kb
-     */
-    currentSize?: number;
-    /**
-     * 限制的空间大小，单位kb
-     */
-    limitSize?: number;
-}
-
-interface RemoveStorageOptions {
-    /**
-     * 本地缓存中的指定的 key
-     */
-    key?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetLocationOptions {
-    /**
-     * 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于uni.openLocation的坐标
-     */
-    type?: string;
-    /**
-     * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度
-     */
-    altitude?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetLocationSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetLocationSuccess {
-    /**
-     * 纬度，浮点数，范围为-90~90，负数表示南纬
-     */
-    latitude?: number;
-    /**
-     * 经度，范围为-180~180，负数表示西经
-     */
-    longitude?: number;
-    /**
-     * 速度，浮点数，单位m/s
-     */
-    speed?: number;
-    /**
-     * 位置的精确度
-     */
-    accuracy?: string;
-    /**
-     * 高度，单位 m
-     */
-    altitude?: number;
-    /**
-     * 垂直精度，单位 m（Android 无法获取，返回 0）
-     */
-    verticalAccuracy?: number;
-    /**
-     * 水平精度，单位 m
-     */
-    horizontalAccuracy?: number;
-}
-
-interface ChooseLocationOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: ChooseLocationSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseLocationSuccess {
-    /**
-     * 位置名称
-     */
-    name?: string;
-    /**
-     * 详细地址
-     */
-    address?: string;
-    /**
-     * 纬度，浮点数，范围为-90~90，负数表示南纬
-     */
-    latitude?: number;
-    /**
-     * 经度，范围为-180~180，负数表示西经
-     */
-    longitude?: number;
-}
-
-interface OpenLocationOptions {
-    /**
-     * 纬度，范围为-90~90，负数表示南纬
-     */
-    latitude?: number;
-    /**
-     * 经度，范围为-180~180，负数表示西经
-     */
-    longitude?: number;
-    /**
-     * 缩放比例，范围5~18，默认为18
-     */
-    scale?: number;
-    /**
-     * 位置名称
-     */
-    name?: string;
-    /**
-     * 地址的详细说明
-     */
-    address?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface MapContext {
-    /**
-     * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 uni.openLocation
-     */
-    getCenterLocation(options: MapContextGetCenterLocationOptions): void;
-    /**
-     * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
-     */
-    moveToLocation(): void;
-    /**
-     * 平移marker，带动画
-     */
-    translateMarker(options: MapContextTranslateMarkerOptions): void;
-    /**
-     * 缩放视野展示所有经纬度
-     */
-    includePoints(options: MapContextIncludePointsOptions): void;
-    /**
-     * 获取当前地图的视野范围
-     */
-    getRegion(options: MapContextGetRegionOptions): void;
-    /**
-     * 获取当前地图的缩放级别
-     */
-    getScale(options: MapContextGetScaleOptions): void;
-}
-
-interface MapContextGetCenterLocationOptions {
-    /**
-     * 接口调用成功的回调函数 ，res = { longitude: "经度", latitude: "纬度"}
-     */
-    success?: (result: MapContextGetLocationSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface MapContextGetLocationSuccess {
-    /**
-     * 纬度，浮点数，范围为-90~90，负数表示南纬
-     */
-    latitude?: number;
-    /**
-     * 经度，范围为-180~180，负数表示西经
-     */
-    longitude?: number;
-}
-
-interface MapContextTranslateMarkerOptions {
-    /**
-     * 指定marker
-     */
-    markerId?: number;
-    /**
-     * 指定marker移动到的目标点
-     */
-    destination?: any;
-    /**
-     * 移动过程中是否自动旋转marker
-     */
-    autoRotate?: boolean;
-    /**
-     * marker的旋转角度
-     */
-    rotate?: number;
-    /**
-     * 动画持续时长，默认值1000ms，平移与旋转分别计算
-     */
-    duration?: number;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 动画结束回调函数
-     */
-    animationEnd?: () => void;
-}
-
-interface MapContextIncludePointsOptions {
-    /**
-     * 要显示在可视区域内的坐标点列表，[{latitude, longitude}]
-     */
-    points?: any [];
-    /**
-     * 坐标点形成的矩形边缘到地图边缘的距离，单位像素。格式为[上,右,下,左]，安卓上只能识别数组第一项，上下左右的padding一致。开发者工具暂不支持padding参数。
-     */
-    padding?: any [];
-}
-
-interface MapContextGetRegionOptions {
-    /**
-     * 接口调用成功的回调函数，res = {southwest, northeast}，西南角与东北角的经纬度
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface MapContextGetScaleOptions {
-    /**
-     * 接口调用成功的回调函数，res = {scale}
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetSystemInfoOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetSystemInfoSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetSystemInfoSuccess {
-    /**
-     * 手机品牌
-     */
-    brand?: string;
-    /**
-     * 手机型号
-     */
-    model?: string;
-    /**
-     * 设备像素比
-     */
-    pixelRatio?: string;
-    /**
-     * 屏幕宽度
-     */
-    screenWidth?: number;
-    /**
-     * 屏幕高度
-     */
-    screenHeight?: number;
-    /**
-     * 可使用窗口宽度
-     */
-    windowWidth?: number;
-    /**
-     * 可使用窗口高度
-     */
-    windowHeight?: number;
-    /**
-     * 状态栏的高度
-     */
-    statusBarHeight?: number;
-    /**
-     * 程序设置的语言
-     */
-    language?: string;
-    /**
-     * 5+版本号
-     */
-    version?: number;
-    /**
-     * 操作系统版本
-     */
-    system?: string;
-    /**
-     * 客户端平台
-     */
-    platform?: string;
-    /**
-     * 用户字体大小设置
-     */
-    fontSizeSetting?: number;
-}
-
-interface GetNetworkTypeOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetNetworkTypeSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetNetworkTypeSuccess {
-    /**
-     * 网络类型
-     */
-    networkType?: string;
-}
-
-interface OnNetworkStatusChangeSuccess {
-    /**
-     * 当前是否有网络连接
-     */
-    isConnected?: number;
-    /**
-     * 网络类型
-     */
-    networkType?: string;
-}
-
-interface OnAccelerometerChangeSuccess {
-    /**
-     * X 轴
-     */
-    x?: number;
-    /**
-     * Y 轴
-     */
-    y?: number;
-    /**
-     * Z 轴
-     */
-    z?: number;
-}
-
-interface StartAccelerometerOptions {
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopAccelerometerOptions {
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OnCompassChangeSuccess {
-    /**
-     * 面对的方向度数
-     */
-    direction?: number;
-}
-
-interface StartCompassOptions {
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopCompassOptions {
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface MakePhoneCallOptions {
-    /**
-     * 需要拨打的电话号码
-     */
-    phoneNumber?: string;
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ScanCodeOptions {
-    /**
-     * 是否只能从相机扫码，不允许从相册选择图片
-     */
-    onlyFromCamera?: boolean;
-    /**
-     * 扫码类型，参数类型是数组，二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
-     */
-    scanType?: any [];
-    /**
-     * 成功返回的回调函数
-     */
-    success?: (result: ScanCodeSuccessRes) => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ScanCodeSuccessRes {
-    /**
-     * 所扫码的内容
-     */
-    result?: string;
-    /**
-     * 所扫码的类型
-     */
-    scanType?: string;
-    /**
-     * 所扫码的字符集
-     */
-    charSet?: string;
-    /**
-     * 当所扫的码为当前应用的合法二维码时，会返回此字段，内容为二维码携带的 path。
-     */
-    path?: string;
-}
-
-interface SetClipboardDataOptions {
-    /**
-     * 需要设置的内容
-     */
-    data?: string;
-    /**
-     * 成功返回的回调函数
-     */
-    success?: () => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetClipboardDataOptions {
-    /**
-     * 成功返回的回调函数
-     */
-    success?: (result: GetClipboardDataSuccessRes) => void;
-    /**
-     * 失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetClipboardDataSuccessRes {
-    /**
-     * 剪贴板的内容
-     */
-    data?: string;
-}
-
-interface OpenBluetoothAdapterOptions {
-    /**
-     * 成功则返回成功初始化信息
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CloseBluetoothAdapterOptions {
-    /**
-     * 成功则返回成功关闭模块信息
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBluetoothAdapterStateOptions {
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: GetBluetoothAdapterStateSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBluetoothAdapterStateSuccess {
-    /**
-     * 是否正在搜索设备
-     */
-    discovering?: boolean;
-    /**
-     * 蓝牙适配器是否可用
-     */
-    available?: boolean;
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface OnBluetoothAdapterStateChangeResult {
-    /**
-     * 是否正在搜索设备
-     */
-    discovering?: boolean;
-    /**
-     * 蓝牙适配器是否可用
-     */
-    available?: boolean;
-}
-
-interface OnBluetoothDeviceFoundResult {
-    /**
-     * 设备列表信息
-     */
-    devices?: BluetoothDeviceInfo [];
-}
-
-interface StartBluetoothDevicesDiscoveryOptions {
-    /**
-     * 蓝牙设备主 service 的 uuid 列表
-     */
-    services?: any [];
-    /**
-     * 是否允许重复上报同一设备， 如果允许重复上报，则onDeviceFound 方法会多次上报同一设备，但是 RSSI 值会有不同
-     */
-    allowDuplicatesKey?: boolean;
-    /**
-     * 上报设备的间隔，默认为0，意思是找到新设备立即上报，否则根据传入的间隔上报
-     */
-    interval?: number;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopBluetoothDevicesDiscoveryOptions {
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopBluetoothDevicesDiscoverySuccess {
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface GetBluetoothDevicesOptions {
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: GetBluetoothDevicesSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBluetoothDevicesSuccess {
-    /**
-     * uuid 对应的的已连接设备列表
-     */
-    devices?: BluetoothDeviceInfo [];
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface BluetoothDeviceInfo {
-    /**
-     * 蓝牙设备名称，某些设备可能没有
-     */
-    name?: string;
-    /**
-     * 用于区分设备的 id
-     */
-    deviceId?: string;
-    /**
-     * 当前蓝牙设备的信号强度
-     */
-    RSSI?: number;
-    /**
-     * 当前蓝牙设备的广播数据段中的ManufacturerData数据段 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
-     */
-    advertisData?: any [];
-    /**
-     * 当前蓝牙设备的广播数据段中的ServiceUUIDs数据段
-     */
-    advertisServiceUUIDs?: any [];
-    /**
-     * 当前蓝牙设备的广播数据段中的LocalName数据段
-     */
-    localName?: string;
-    /**
-     * 当前蓝牙设备的广播数据段中的ServiceData数据段
-     */
-    serviceData?: any [];
-}
-
-interface GetConnectedBluetoothDevicesOptions {
-    /**
-     * 蓝牙设备主 service 的 uuid 列表
-     */
-    services?: any [];
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: GetConnectedBluetoothDevicesSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetConnectedBluetoothDevicesSuccess {
-    /**
-     * 搜索到的设备列表
-     */
-    devices?: GetConnectedBluetoothDevicesSuccessData [];
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface GetConnectedBluetoothDevicesSuccessData {
-    /**
-     * 蓝牙设备名称，某些设备可能没有
-     */
-    name?: string;
-    /**
-     * 用于区分设备的 id
-     */
-    deviceId?: string;
-}
-
-interface CloseBLEConnectionOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-}
-
-interface CreateBLEConnectionOptions {
-    /**
-     * 蓝牙设备 id，参考 getDevices 接口
-     */
-    deviceId?: string;
-    /**
-     * 超时时间
-     */
-    timeout?: number;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OnBLEConnectionStateChangeSuccess {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 连接目前的状态
-     */
-    connected?: boolean;
-}
-
-interface GetBLEDeviceServicesOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: GetBLEDeviceServicesSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBLEDeviceServicesSuccess {
-    /**
-     * 设备服务列表
-     */
-    services?: GetBLEDeviceServicesSuccessData [];
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface GetBLEDeviceServicesSuccessData {
-    /**
-     * 蓝牙设备服务的 uuid
-     */
-    uuid?: string;
-    /**
-     * 该服务是否为主服务
-     */
-    isPrimary?: boolean;
-}
-
-interface GetBLEDeviceCharacteristicsOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 蓝牙服务 uuid
-     */
-    serviceId?: string;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: GetBLEDeviceCharacteristicsSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBLEDeviceCharacteristicsSuccess {
-    /**
-     * 设备特征值列表
-     */
-    characteristics?: GetBLEDeviceCharacteristicsSuccessData [];
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface GetBLEDeviceCharacteristicsSuccessData {
-    /**
-     * 蓝牙设备服务的 uuid
-     */
-    uuid?: string;
-    /**
-     * 该特征值支持的操作类型
-     */
-    properties?: any;
-}
-
-interface ReadBLECharacteristicValueOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 蓝牙特征值对应服务的 uuid
-     */
-    serviceId?: string;
-    /**
-     * 蓝牙特征值的 uuid
-     */
-    characteristicId?: string;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: ReadBLECharacteristicValueSuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ReadBLECharacteristicValueSuccess {
-    /**
-     * 错误码
-     */
-    errCode?: string;
-    /**
-     * 成功：ok，错误：详细信息
-     */
-    errMsg?: string;
-}
-
-interface WriteBLECharacteristicValueOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 蓝牙特征值对应服务的 uuid
-     */
-    serviceId?: string;
-    /**
-     * 蓝牙特征值的 uuid
-     */
-    characteristicId?: string;
-    /**
-     * 蓝牙设备特征值对应的二进制值
-     */
-    value?: any [];
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface NotifyBLECharacteristicValueChangeOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 蓝牙特征值对应服务的 uuid
-     */
-    serviceId?: string;
-    /**
-     * 蓝牙特征值的 uuid
-     */
-    characteristicId?: string;
-    /**
-     * true: 启用 notify; false: 停用 notify
-     */
-    state?: boolean;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success?: (result: StopBluetoothDevicesDiscoverySuccess) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OnBLECharacteristicValueChangeSuccess {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId?: string;
-    /**
-     * 蓝牙特征值对应服务的 uuid
-     */
-    serviceId?: string;
-    /**
-     * 蓝牙特征值的 uuid
-     */
-    characteristicId?: string;
-    /**
-     * 特征值最新的值 （注意：vConsole 无法打印出 ArrayBuffer 类型数据）
-     */
-    value?: any [];
-}
-
-interface StartBeaconDiscoveryOptions {
-    /**
-     * iBeacon设备广播的 uuids
-     */
-    uuids?: any [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopBeaconDiscoveryOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBeaconsOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetBeaconsRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetBeaconsRes {
-    /**
-     * 接口调用成功的回调函数
-     */
-    beacons?: Beacon [];
-    /**
-     * 调用结果
-     */
-    errMsg?: string;
-}
-
-interface Beacon {
-    /**
-     * iBeacon 设备广播的 uuid
-     */
-    uuid?: string;
-    /**
-     * iBeacon 设备的主 id
-     */
-    major?: string;
-    /**
-     * iBeacon 设备的次 id
-     */
-    minor?: string;
-    /**
-     * 表示设备距离的枚举值
-     */
-    proximity?: number;
-    /**
-     * iBeacon 设备的距离
-     */
-    accuracy?: number;
-    /**
-     * 表示设备的信号强度
-     */
-    rssi?: number;
-}
-
-interface BeaconService {
-    /**
-     * 服务目前是否可用
-     */
-    available?: boolean;
-    /**
-     * 目前是否处于搜索状态
-     */
-    discovering?: boolean;
-}
-
-interface GetHCEStateOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StartHCEOptions {
-    /**
-     * 需要注册到系统的 AID 列表，每个 AID 为 String 类型
-     */
-    aid_list?: any [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopHCEOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface HCEMessageRes {
-    /**
-     * 消息类型
-     */
-    messageType?: number;
-    /**
-     * 客户端接收到 NFC 设备的指令
-     */
-    data?: any [];
-    /**
-     * 此参数当且仅当 messageType=2 时有效
-     */
-    reason?: number;
-}
-
-interface SendHCEMessageOptions {
-    /**
-     * 二进制数据
-     */
-    data?: any [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StartWifiOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopWifiOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ConnectWifiOptions {
-    /**
-     * Wi-Fi 设备ssid
-     */
-    SSID?: string;
-    /**
-     * Wi-Fi 设备bssid
-     */
-    BSSID?: string;
-    /**
-     * Wi-Fi 设备密码
-     */
-    password?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetWifiListOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface WiFi {
-    /**
-     * Wi-Fi 的SSID
-     */
-    SSID?: string;
-    /**
-     * Wi-Fi 的BSSID
-     */
-    BSSID?: string;
-    /**
-     * Wi-Fi 是否安全
-     */
-    secure?: boolean;
-    /**
-     * Wi-Fi 信号强度
-     */
-    signalStrength?: number;
-}
-
-interface SetWifiListOptions {
-    /**
-     * Wi-Fi 的SSID
-     */
-    wifiList?: WiFiItem [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface WiFiItem {
-    /**
-     * Wi-Fi 的SSID
-     */
-    SSID?: string;
-    /**
-     * Wi-Fi 的BSSID
-     */
-    BSSID?: string;
-    /**
-     * Wi-Fi 设备密码
-     */
-    password?: string;
-}
-
-interface GetConnectedWifiOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetConnectedWifiRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetConnectedWifiRes {
-    /**
-     * 接口调用成功的回调函数
-     */
-    wifi?: WiFi;
-}
-
-interface ShowToastOptions {
-    /**
-     * 提示的内容
-     */
-    title?: string;
-    /**
-     * 图标
-     * - success: 显示成功图标
-     * - loading: 显示加载图标
-     * - none: 不显示图标
-     */
-    icon?: 'success' | 'loading' | 'none';
-    /**
-     * 自定义图标的本地路径，image 的优先级高于 icon
-     */
-    image?: string;
-    /**
-     * 提示的延迟时间，单位毫秒，默认：1500
-     */
-    duration?: number;
-    /**
-     * 是否显示透明蒙层，防止触摸穿透，默认：false
-     */
-    mask?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowLoadingOptions {
-    /**
-     * 提示的内容
-     */
-    title?: string;
-    /**
-     * 是否显示透明蒙层，防止触摸穿透，默认：false
-     */
-    mask?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowModalOptions {
-    /**
-     * 提示的标题
-     */
-    title?: string;
-    /**
-     * 提示的内容
-     */
-    content?: string;
-    /**
-     * 是否显示取消按钮，默认为 true
-     */
-    showCancel?: boolean;
-    /**
-     * 取消按钮的文字，默认为"取消"
-     */
-    cancelText?: string;
-    /**
-     * 取消按钮的文字颜色，默认为"#000000"
-     */
-    cancelColor?: string;
-    /**
-     * 确定按钮的文字，默认为"确定"
-     */
-    confirmText?: string;
-    /**
-     * 确定按钮的文字颜色，默认为"#3CC51F"
-     */
-    confirmColor?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: ShowModalRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowModalRes {
-    /**
-     * 为 true 时，表示用户点击了确定按钮
-     */
-    confirm?: boolean;
-    /**
-     * 为 true 时，表示用户点击了取消
-     */
-    cancel?: boolean;
-}
-
-interface ShowActionSheetOptions {
-    /**
-     * 按钮的文字数组
-     */
-    itemList?: any [];
-    /**
-     * 按钮的文字颜色，默认为"#000000"
-     */
-    itemColor?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: ShowActionSheetRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowActionSheetRes {
-    /**
-     * 用户点击的按钮，从上到下的顺序，从0开始
-     */
-    tapIndex?: number;
-}
-
-interface SetNavigationBarTitleOptions {
-    /**
-     * 页面标题
-     */
-    title?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetNavigationbarColorOptions {
-    /**
-     * 前景颜色值，包括按钮、标题、状态栏的颜色
-     */
-    frontColor?: string;
-    /**
-     * 背景颜色值，有效值为十六进制颜色
-     */
-    backgroundColor?: string;
-    /**
-     * 动画效果
-     */
-    animation?: NavigationBarAnimation;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetTabBarBadgeOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 显示的文本，不超过 3 个半角字符
-     */
-    text?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface RemoveTabBarBadgeOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowTabBarRedDotOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface HideTabBarRedDotOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface NavigationBarAnimation {
-    /**
-     * 动画变化时间，默认0，单位：毫秒
-     */
-    duration?: number;
-    /**
-     * 动画变化方式，默认 linear
-     * - linear: 动画从头到尾的速度是相同的
-     * - easeIn: 动画以低速开始
-     * - easeOut: 动画以低速结束
-     * - easeInOut: 动画以低速开始和结束
-     */
-    timingFunc?: 'linear' | 'easeIn' | 'easeOut' | 'easeInOut';
-}
-
-interface WindowResizeResult {
-    /**
-     * 变化后的窗口宽度，单位 px
-     */
-    windowWidth?: number;
-    /**
-     * 变化后的窗口高度，单位 px
-     */
-    windowHeight?: number;
-}
-
-interface SetTabBarBadgeOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 显示的文本
-     */
-    text?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface RemoveTabBarBadgeOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowTabBarRedDotOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface HideTabBarRedDotOptions {
-    /**
-     * tabBar的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetTabBarStyleOptions {
-    /**
-     * tab 上的文字默认颜色
-     */
-    color?: string;
-    /**
-     * tab 上的文字选中时的颜色
-     */
-    selectedColor?: string;
-    /**
-     * tab 的背景色
-     */
-    backgroundColor?: string;
-    /**
-     * tabbar上边框的颜色
-     */
-    borderStyle?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetTabBarItemOptions {
-    /**
-     * tabBar 的哪一项，从左边算起，索引从0开始
-     */
-    index?: number;
-    /**
-     * tab 上按钮文字
-     */
-    text?: string;
-    /**
-     * 图片路径
-     */
-    iconPath?: string;
-    /**
-     * 选中时的图片路径
-     */
-    selectedIconPath?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowTabBarOptions {
-    /**
-     * 是否需要动画效果
-     */
-    animation?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface HideTabBarOptions {
-    /**
-     * 是否需要动画效果
-     */
-    animation?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetTopBarTextOptions {
-    /**
-     * 置顶栏文字内容
-     */
-    text?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface NavigateToOptions {
-    /**
-     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
-     */
-    url?: string | string;
-    /**
-     * 窗口显示的动画类型
-     * - auto: 自动选择动画效果
-     * - none: 无动画效果
-     * - slide-in-right: 从右侧横向滑动效果
-     * - slide-in-left: 左侧横向滑动效果
-     * - slide-in-top: 从上侧竖向滑动效果
-     * - slide-in-bottom: 从下侧竖向滑动效果
-     * - fade-in: 从透明到不透明逐渐显示效果
-     * - zoom-out: 从小到大逐渐放大显示效果
-     * - zoom-fade-out: 从小到大逐渐放大并且从透明到不透明逐渐显示效果
-     * - pop-in: 从右侧平移入栈动画效果
-     */
-    animationType?: 'auto' | 'none' | 'slide-in-right' | 'slide-in-left' | 'slide-in-top' | 'slide-in-bottom' | 'fade-in' | 'zoom-out' | 'zoom-fade-out' | 'pop-in';
-    /**
-     * 窗口显示动画的持续时间，单位为 ms
-     */
-    animationDuration?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface RedirectToOptions {
-    /**
-     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
-     */
-    url?: string | string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ReLaunchOptions {
-    /**
-     * 需要跳转的应用内非 tabBar 的页面的路径 , 路径后可以带参数
-     */
-    url?: string | string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SwitchTabOptions {
-    /**
-     * 需要跳转的 tabBar 页面的路径，路径后不能带参数
-     */
-    url?: string | string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CreateIntersectionObserverOptions {
-    /**
-     * 所有阈值
-     */
-    thresholds?: any [];
-    /**
-     * 初始的相交比例
-     */
-    initialRatio?: number;
-    /**
-     * 是否同时观测多个参照节点（而非一个）
-     */
-    selectAll?: boolean;
-}
-
-interface NavigateBackOptions {
-    /**
-     * 返回的页面数，如果 delta 大于现有页面数，则返回到首页
-     */
-    delta?: number;
-    /**
-     * 窗口关闭的动画类型
-     * - auto: 自动选择动画效果
-     * - none: 无动画效果
-     * - slide-out-right: 横向向右侧滑出屏幕动画
-     * - slide-out-left: 横向向左侧滑出屏幕动画
-     * - slide-out-top: 竖向向上侧滑出屏幕动画
-     * - slide-out-bottom: 竖向向下侧滑出屏幕动画
-     * - fade-out: 从不透明到透明逐渐隐藏动画
-     * - zoom-in: 从大逐渐缩小关闭动画
-     * - zoom-fade-in: 从大逐渐缩小并且从不透明到透明逐渐隐藏关闭动画
-     * - pop-out: 从右侧平移出栈动画效果
-     */
-    animationType?: 'auto' | 'none' | 'slide-out-right' | 'slide-out-left' | 'slide-out-top' | 'slide-out-bottom' | 'fade-out' | 'zoom-in' | 'zoom-fade-in' | 'pop-out';
-    /**
-     * 窗口关闭动画的持续时间，单位为 ms
-     */
-    animationDuration?: number;
-}
-
-interface CreateAnimationOptions {
-    /**
-     * 动画持续时间，单位ms
-     */
-    duration?: number;
-    /**
-     * 定义动画的效果
-     * - linear: 动画从头到尾的速度是相同的
-     * - ease: 动画以低速开始，然后加快，在结束前变慢
-     * - ease-in: 动画以低速开始
-     * - ease-in-out: 动画以低速开始和结束
-     * - ease-out: 动画以低速结束
-     * - step-start: 动画第一帧就跳至结束状态直到结束
-     * - step-end: 动画一直保持开始状态，最后一帧跳到结束状态
-     */
-    timingFunction?: 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
-    /**
-     * 动画延迟时间，单位 ms
-     */
-    delay?: number;
-    /**
-     * 设置transform-origin
-     */
-    transformOrigin?: string;
-}
-
-interface PageScrollToOptions {
-    /**
-     * 滚动到页面的目标位置
-     */
-    scrollTop?: number;
-    /**
-     * 滚动动画的时长
-     */
-    duration?: number;
-}
-
-interface StartPullDownRefreshOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SelectorQuery {
-    /**
-     * 将选择器的选取范围更改为自定义组件component内
-     */
-    in(component: any): void;
-    /**
-     * 在当前页面下选择第一个匹配选择器selector的节点
-     */
-    select(selector: string): NodesRef;
-    /**
-     * 在当前页面下选择匹配选择器selector的所有节点
-     */
-    selectAll(selector: string): NodesRef;
-    /**
-     * 选择显示区域
-     */
-    selectViewport(selector: string): NodesRef;
-    /**
-     * 执行所有的请求
-     */
-    exec(callback: () => void): void;
-}
-
-interface NodesRef {
-    /**
-     * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位
-     */
-    boundingClientRect(callback: (result: NodeRect) => void): void;
-    /**
-     * 添加节点的滚动位置查询请求，以像素为单位
-     */
-    scrollOffset(callback: (result: NodeRect) => void): SelectorQuery;
-    /**
-     * 获取节点的相关信息，需要获取的字段在fields中指定
-     */
-    fields(fields: NodeField, callback: (result: NodeRect) => void): SelectorQuery;
-}
-
-interface NodeRect {
-    /**
-     * 节点的ID
-     */
-    id?: string;
-    /**
-     * 节点的dataset
-     */
-    dataset?: any;
-    /**
-     * 节点的左边界坐标
-     */
-    left?: number;
-    /**
-     * 节点的右边界坐标
-     */
-    right?: number;
-    /**
-     * 节点的上边界坐标
-     */
-    top?: number;
-    /**
-     * 节点的下边界坐标
-     */
-    bottom?: number;
-    /**
-     * 节点的宽度
-     */
-    width?: number;
-    /**
-     * 节点的高度
-     */
-    height?: number;
-}
-
-interface NodeField {
-    /**
-     * 节点的dataset
-     */
-    dataset?: any;
-    /**
-     * 节点的宽度
-     */
-    width?: number;
-    /**
-     * 节点的高度
-     */
-    height?: number;
-    /**
-     * 节点的水平滚动位置
-     */
-    scrollLeft?: number;
-    /**
-     * 节点的竖直滚动位置
-     */
-    scrollTop?: number;
-    /**
-     * 节点 scroll-x 属性的当前值
-     */
-    scrollX?: number;
-    /**
-     * 节点 scroll-y 属性的当前值
-     */
-    scrollY?: number;
-}
-
-interface IntersectionObserver {
-    /**
-     * 使用选择器指定一个节点，作为参照区域之一
-     */
-    relativeTo(selector: string, margins: any []): void;
-    /**
-     * 指定页面显示区域作为参照区域之一
-     */
-    relativeToViewport(margins: any []): void;
-    /**
-     * 指定目标节点并开始监听相交状态变化情况
-     */
-    observe(targetSelector: string, callback: (result: ObserveResult) => void): void;
-    /**
-     * 停止监听
-     */
-    disconnect(): void;
-}
-
-interface ObserveResult {
-    /**
-     * 相交比例
-     */
-    intersectionRatio?: number;
-    /**
-     * 相交区域的边界
-     */
-    intersectionRect?: any;
-    /**
-     * 目标节点布局区域的边界
-     */
-    boundingClientRect?: ObserveNodeRect;
-    /**
-     * 参照区域的边界
-     */
-    relativeRect?: ObserveNodeRect;
-    /**
-     * 相交检测时的时间戳
-     */
-    time?: number;
-}
-
-interface ObserveNodeRect {
-    /**
-     * left
-     */
-    left?: number;
-    /**
-     * right
-     */
-    right?: number;
-    /**
-     * top
-     */
-    top?: number;
-    /**
-     * bottom
-     */
-    bottom?: number;
-}
-
-interface Animation {
-    /**
-     * 透明度
-     */
-    opacity(value: number): void;
-    /**
-     * 颜色值
-     */
-    backgroundColor(color: number): void;
-    /**
-     * 长度值
-     */
-    width(length: number): void;
-    /**
-     * 长度值
-     */
-    height(length: number): void;
-    /**
-     * 长度值
-     */
-    top(length: number): void;
-    /**
-     * 长度值
-     */
-    left(length: number): void;
-    /**
-     * 长度值
-     */
-    bottom(length: number): void;
-    /**
-     * 长度值
-     */
-    right(length: number): void;
-    /**
-     * 从原点顺时针旋转一个deg角度
-     */
-    rotate(deg: number): void;
-    /**
-     * 在X轴旋转一个deg角度
-     */
-    rotateX(deg: number): void;
-    /**
-     * 在Y轴旋转一个deg角度
-     */
-    rotateY(deg: number): void;
-    /**
-     * 在Z轴旋转一个deg角度
-     */
-    rotateZ(deg: number): void;
-    /**
-     * 同transform-function rotate3d
-     */
-    rotate3d(x: number, y: number, z: number, deg: number): void;
-    /**
-     * 缩放
-     */
-    scale(sx: number, sy: number): void;
-    /**
-     * 在X轴缩放sx倍数
-     */
-    scaleX(sx: number): void;
-    /**
-     * 在Y轴缩放sy倍数
-     */
-    scaleY(sy: number): void;
-    /**
-     * 在Z轴缩放sz倍数
-     */
-    scaleZ(sz: number): void;
-    /**
-     * 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数
-     */
-    scale3d(sx: number, sy: number, sz: number): void;
-    /**
-     * 偏移
-     */
-    translate(tx: number, ty: number): void;
-    /**
-     * 在X轴偏移tx
-     */
-    translateX(tx: number): void;
-    /**
-     * 在Y轴偏移ty
-     */
-    translateY(ty: number): void;
-    /**
-     * 在Z轴偏移tx
-     */
-    translateZ(tz: number): void;
-    /**
-     * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz
-     */
-    translate3d(tx: number, ty: number, tz: number): void;
-    /**
-     * 倾斜
-     */
-    skew(ax: number, ay: number): void;
-    /**
-     * Y轴坐标不变，X轴坐标延顺时针倾斜ax度
-     */
-    skewX(ax: number): void;
-    /**
-     * X轴坐标不变，Y轴坐标延顺时针倾斜ay度
-     */
-    skewY(ay: number): void;
-    /**
-     * 矩阵变形
-     */
-    matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): void;
-    /**
-     * 矩阵变形
-     */
-    matrix3d(): void;
-}
-
-interface CanvasContext {
-    /**
-     * 填充色
-     */
-    fillStyle?: string;
-    /**
-     * 边框颜色
-     */
-    strokeStyle?: string;
-    /**
-     * 阴影的模糊级别
-     */
-    shadowBlur?: number;
-    /**
-     * 阴影的颜色
-     */
-    shadowColor?: string;
-    /**
-     * 阴影相对于形状在水平方向的偏移
-     */
-    shadowOffsetX?: number;
-    /**
-     * 阴影相对于形状在竖直方向的偏移
-     */
-    shadowOffsetY?: number;
-    /**
-     * 线条的宽度
-     */
-    lineWidth?: number;
-    /**
-     * 线条的端点样式
-     * - butt: 
-     * - round: 
-     * - square: 
-     */
-    lineCap?: 'butt' | 'round' | 'square';
-    /**
-     * 线条的结束交点样式
-     * - bevel: 
-     * - round: 
-     * - miter: 
-     */
-    lineJoin?: 'bevel' | 'round' | 'miter';
-    /**
-     * 最大斜接长度
-     */
-    miterLimit?: number;
-    /**
-     * 透明度
-     */
-    globalAlpha?: number;
-    /**
-     * 设置要在绘制新形状时应用的合成操作的类型
-     */
-    globalCompositeOperation?: string;
-    /**
-     * 偏移量
-     */
-    lineDashOffset?: number;
-    /**
-     * 字体样式
-     */
-    font?: string;
-    /**
-     * 设置填充色
-     */
-    setFillStyle(color: string): void;
-    /**
-     * 设置边框颜色
-     */
-    setStrokeStyle(color: string): void;
-    /**
-     * 设置阴影样式
-     */
-    setShadow(offsetX: number, offsetY: number, blur: number, color: string): void;
-    /**
-     * 创建一个线性的渐变颜色
-     */
-    createLinearGradient(x0: number, y0: number, x1: number, y1: string): CanvasContext;
-    /**
-     * 创建一个圆形的渐变颜色
-     */
-    createCircularGradient(x: number, y: number, r: number): CanvasContext;
-    /**
-     * 创建一个颜色的渐变点
-     */
-    addColorStop(stop: number, color: string): void;
-    /**
-     * 设置线条的宽度
-     */
-    setLineWidth(lineWidth: number): void;
-    /**
-     * 设置线条的端点样式
-     */
-    setLineCap(lineCap: string): void;
-    /**
-     * 设置线条的交点样式
-     */
-    setLineJoin(lineJoin: string): void;
-    /**
-     * 设置线条的宽度
-     */
-    setLineDash(pattern: any [], offset: number): void;
-    /**
-     * 设置最大斜接长度
-     */
-    setMiterLimit(miterLimit: number): void;
-    /**
-     * 创建一个矩形
-     */
-    rect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 填充一个矩形
-     */
-    fillRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 画一个矩形(非填充)
-     */
-    strokeRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 清除画布上在该矩形区域内的内容
-     */
-    clearRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 对当前路径中的内容进行填充
-     */
-    fill(): void;
-    /**
-     * 画出当前路径的边框
-     */
-    stroke(): void;
-    /**
-     * 开始创建一个路径
-     */
-    beginPath(): void;
-    /**
-     * 关闭一个路径
-     */
-    closePath(): void;
-    /**
-     * 把路径移动到画布中的指定点，不创建线条
-     */
-    moveTo(x: number, y: number): void;
-    /**
-     * 增加一个新点，然后创建一条从上次指定点到目标点的线
-     */
-    lineTo(x: number, y: number): void;
-    /**
-     * 画一条弧线
-     */
-    arc(x: number, y: number, r: number, sAngle: number, eAngle: number, counterclockwise: boolean): void;
-    /**
-     * 创建三次方贝塞尔曲线路径
-     */
-    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
-    /**
-     * 创建二次贝塞尔曲线路径
-     */
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    /**
-     * 横纵坐标缩放
-     */
-    scale(scaleWidth: number, scaleHeight: number): void;
-    /**
-     * 顺时针旋转当前坐标轴
-     */
-    rotate(rotate: number): void;
-    /**
-     * 对当前坐标系的原点(0, 0)进行变换
-     */
-    translate(x: number, y: number): void;
-    /**
-     * 从原始画布中剪切任意形状和尺寸
-     */
-    clip(): void;
-    /**
-     * 设置字体的字号
-     */
-    setFontSize(fontSize: number): void;
-    /**
-     * 在画布上绘制被填充的文本
-     */
-    fillText(text: string, x: number, y: number, maxWidth: number): void;
-    /**
-     * 设置文字的对齐
-     */
-    setTextAlign(align: string): void;
-    /**
-     * 设置文字的水平对齐
-     */
-    setTextBaseline(textBaseline: string): void;
-    /**
-     * 绘制图像到画布
-     */
-    drawImage(imageResource: string, dx: number, dy: number, dWidth: number, dHeigt: number, sx: number, sy: number, sWidth: number, sHeight: number): void;
-    /**
-     * 设置全局画笔透明度
-     */
-    setGlobalAlpha(alpha: number): void;
-    /**
-     * 保存当前的绘图上下文
-     */
-    save(): void;
-    /**
-     * 恢复之前保存的绘图上下文
-     */
-    restore(): void;
-    /**
-     * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中
-     */
-    draw(reserve: boolean, callback: () => void): void;
-    /**
-     * 测量文本尺寸信息，目前仅返回文本宽度
-     */
-    measureText(text: string): CanvasTextMetrics;
-    /**
-     * 根据控制点和半径绘制圆弧路径
-     */
-    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
-    /**
-     * 给定的 (x, y) 位置绘制文本描边的方法
-     */
-    strokeText(text: string, x: number, y: number, maxWidth: number): void;
-    /**
-     * 对指定的图像创建模式的方法，可在指定的方向上重复元图像
-     */
-    createPattern(image: string, repetition: string): void;
-    /**
-     * 使用矩阵重新设置（覆盖）当前变换的方法
-     */
-    setTransform(scaleX: number, skewX: number, skewY: number, scaleY: number, translateX: number, translateY: number): void;
-}
-
-interface CanvasTextMetrics {
-    /**
-     * 文本的宽度
-     */
-    width?: number;
-}
-
-interface CanvasToTempFilePathOptions {
-    /**
-     * 画布x轴起点（默认0）
-     */
-    x?: number;
-    /**
-     * 画布y轴起点（默认0）
-     */
-    y?: number;
-    /**
-     * 画布宽度（默认为canvas宽度-x）
-     */
-    width?: number;
-    /**
-     * 画布高度（默认为canvas高度-y）
-     */
-    height?: number;
-    /**
-     * 输出图片宽度（默认为 width * 屏幕像素密度）
-     */
-    destWidth?: boolean;
-    /**
-     * 输出图片高度（默认为 height * 屏幕像素密度）
-     */
-    destHeight?: () => void;
-    /**
-     * 画布标识，传入 <canvas/> 的 canvas-id
-     */
-    canvasId?: string;
-    /**
-     * 目标文件的类型，默认为 'png'
-     */
-    fileType?: string;
-    /**
-     * 图片的质量，取值范围为 (0, 1]，不在范围内时当作1.0处理
-     */
-    quality?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: CanvasToTempFilePathRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CanvasToTempFilePathRes {
-    /**
-     * 导出生成的图片路径
-     */
-    tempFilePath?: string;
-}
-
-interface CanvasGetImageDataOptions {
-    /**
-     * 画布标识，传入 <canvas/> 的 canvas-id
-     */
-    canvasId?: string;
-    /**
-     * 将要被提取的图像数据矩形区域的左上角 x 坐标
-     */
-    x?: number;
-    /**
-     * 将要被提取的图像数据矩形区域的左上角 y 坐标
-     */
-    y?: number;
-    /**
-     * 将要被提取的图像数据矩形区域的宽度
-     */
-    width?: number;
-    /**
-     * 将要被提取的图像数据矩形区域的高度
-     */
-    height?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: CanvasGetImageDataRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CanvasGetImageDataRes {
-    /**
-     * 回调信息
-     */
-    errMsg?: string;
-    /**
-     * 图像数据矩形的宽度
-     */
-    width?: number;
-    /**
-     * 图像数据矩形的高度
-     */
-    height?: number;
-    /**
-     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
-     */
-    data?: any [];
-}
-
-interface CanvasPutImageDataOptions {
-    /**
-     * 画布标识，传入 <canvas/> 的 canvas-id
-     */
-    canvasId?: string;
-    /**
-     * 图像像素点数据，一维数组，每四项表示一个像素点的rgba
-     */
-    data?: any [];
-    /**
-     * 源图像数据在目标画布中的位置偏移量（x 轴方向的偏移量）
-     */
-    x?: number;
-    /**
-     * 源图像数据在目标画布中的位置偏移量（y 轴方向的偏移量）
-     */
-    y?: number;
-    /**
-     * 源图像数据矩形区域的宽度
-     */
-    width?: number;
-    /**
-     * 源图像数据矩形区域的高度
-     */
-    height?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetScreenBrightnessOptions {
-    /**
-     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮
-     */
-    value?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetScreenBrightnessOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetScreenBrightnessSuccessRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetScreenBrightnessSuccessRes {
-    /**
-     * 屏幕亮度值，范围 0~1，0 最暗，1 最亮。
-     */
-    value?: number;
-}
-
-interface SetKeepScreenOnOptions {
-    /**
-     * 是否保持屏幕常亮
-     */
-    keepScreenOn?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface VibrateLongOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface VibrateShortOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface AddPhoneContactOptions {
-    /**
-     * 头像本地文件路径
-     */
-    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;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetExtConfigOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetExtConfigRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetExtConfigRes {
-    /**
-     * 调用结果
-     */
-    errMsg?: string;
-    /**
-     * 第三方平台自定义的数据
-     */
-    extConfig?: any;
-}
-
-interface GetExtConfigSyncRes {
-    /**
-     * 第三方平台自定义的数据
-     */
-    extConfig?: any;
-}
-
-interface GetProviderOptions {
-    /**
-     * 服务类型，可取值“oauth”、“share”、“payment”、“push”
-     * - oauth: 授权登录
-     * - share: 分享
-     * - payment: 支付
-     * - push: 推送
-     */
-    service?: 'oauth' | 'share' | 'payment' | 'push';
-    /**
-     * 接口调用成功的回调
-     */
-    success?: (result: GetProviderRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetProviderRes {
-    /**
-     * 服务类型
-     */
-    service?: string;
-    /**
-     * 得到的服务供应商
-     */
-    provider?: any [];
-}
-
-interface LoginOptions {
-    /**
-     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
-     */
-    provider?: string;
-    /**
-     * 超时时间，单位 ms
-     */
-    timeout?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: LoginRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface LoginRes {
-    /**
-     * 描述信息
-     */
-    errMsg?: string;
-    /**
-     * 登录服务商提供的登录信息，服务商不同返回的结果不完全相同
-     */
-    authResult?: string;
-}
-
-interface CheckSessionOptions {
-    /**
-     * 接口调用成功的回调函数，session_key未过期
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数，session_key已过期
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface AuthorizeOptions {
-    /**
-     * 需要获取权限的scope
-     */
-    scope?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetUserInfoOptions {
-    /**
-     * 分享服务提供商，通过uni.getProvider获取
-     */
-    provider?: string;
-    /**
-     * 是否带上登录态信息，仅微信小程序生效。
-     */
-    withCredentials?: boolean;
-    /**
-     * 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。默认为en，仅微信小程序生效。
-     */
-    lang?: string;
-    /**
-     * 超时时间，单位 ms
-     */
-    timeout?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetUserInfoRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetUserInfoRes {
-    /**
-     * 用户信息对象，不包含 openid 等敏感信息
-     */
-    userInfo?: UserInfo;
-    /**
-     * 不包括敏感信息的原始数据字符串，用于计算签名。
-     */
-    rawData?: string;
-    /**
-     * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，仅微信小程序生效。
-     */
-    signature?: string;
-    /**
-     * 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法，仅微信小程序生效。
-     */
-    encryptedData?: string;
-    /**
-     * 加密算法的初始向量，详细见加密数据解密算法，仅微信小程序生效。
-     */
-    iv?: string;
-    /**
-     * 描述信息
-     */
-    errMsg?: string;
-}
-
-interface UserInfo {
-    /**
-     * 用户昵称
-     */
-    nickname?: string;
-    /**
-     * 该服务商唯一用户标识
-     */
-    openid?: string;
-    /**
-     * 用户头像
-     */
-    avatarUrl?: string;
-}
-
-interface ShareOptions {
-    /**
-     * 分享服务提供商，通过uni.getProvider获取，如果不设置则弹出分享列表选择界面
-     */
-    provider?: string;
-    /**
-     * 分享类型。默认图文0，纯文字1，纯图片2，音乐3，视频4，小程序5。
-     * - 0: 图文
-     * - 1: 纯文字
-     * - 2: 纯图片
-     * - 3: 音乐
-     * - 4: 视频
-     * - 5: 小程序
-     */
-    type?: '0' | '1' | '2' | '3' | '4' | '5';
-    /**
-     * 标题
-     */
-    title?: string;
-    /**
-     * 场景。可取值“WXSceneSession”分享到聊天界面，“WXSenceTimeline”分享到朋友圈，“WXSceneFavorite”分享到微信收藏
-     */
-    scene?: string;
-    /**
-     * 摘要
-     */
-    summary?: string;
-    /**
-     * 跳转链接
-     */
-    href?: string;
-    /**
-     * 图片地址
-     */
-    imageUrl?: string;
-    /**
-     * 音视频地址
-     */
-    mediaUrl?: string;
-    /**
-     * 分享小程序
-     */
-    miniProgram?: MiniProgramShareOptions;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface MiniProgramShareOptions {
-    /**
-     * 微信小程序原始id
-     */
-    id?: string;
-    /**
-     * 点击链接进入的页面
-     */
-    path?: string;
-    /**
-     * 微信小程序版本类型，默认为0。
-     * - 0: 正式版
-     * - 1: 测试版
-     * - 2: 体验版
-     */
-    type?: '0' | '1' | '2';
-    /**
-     * 兼容低版本的网页链接
-     */
-    webUrl?: string;
-}
-
-interface SubscribePushOptions {
-    /**
-     * 分享推送提供商，通过uni.getProvider获取
-     */
-    provider?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface UnscribePushOptions {
-    /**
-     * 分享推送提供商，通过uni.getProvider获取
-     */
-    provider?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OnPushOptions {
-    /**
-     * 分享推送提供商，通过uni.getProvider获取
-     */
-    provider?: string;
-    /**
-     * 接收到透传数据回调，回调参数（Object）：messageId（消息id）、data（消息内容）
-     */
-    callback?: () => void;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OffPushOptions {
-    /**
-     * 分享推送提供商，通过uni.getProvider获取
-     */
-    provider?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ShowShareMenuOptions {
-    /**
-     * 是否使用带 shareTicket 的转发
-     */
-    withShareTicket?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface HideShareMenuOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface UpdateShareMenuOptions {
-    /**
-     * 是否使用带 shareTicket 的转发
-     */
-    withShareTicket?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetShareInfoOptions {
-    /**
-     * shareTicket
-     */
-    shareTicket?: string;
-    /**
-     * 超时时间，单位 ms
-     */
-    timeout?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetShareInfoRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetShareInfoRes {
-    /**
-     * 错误信息
-     */
-    errMsg?: string;
-    /**
-     * 包括敏感数据在内的完整转发信息的加密数据
-     */
-    encryptedData?: string;
-    /**
-     * 加密算法的初始向量
-     */
-    iv?: string;
-}
-
-interface ChooseAddressOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: ChooseAddressRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseAddressRes {
-    /**
-     * 调用结果
-     */
-    errMsg?: string;
-    /**
-     * 收货人姓名
-     */
-    userName?: string;
-    /**
-     * 邮编
-     */
-    postalCode?: string;
-    /**
-     * 国标收货地址第一级地址
-     */
-    provinceName?: string;
-    /**
-     * 国标收货地址第二级地址
-     */
-    cityName?: string;
-    /**
-     * 国标收货地址第三级地址
-     */
-    countyName?: string;
-    /**
-     * 详细收货地址信息
-     */
-    detailInfo?: string;
-    /**
-     * 收货地址国家码
-     */
-    nationalCode?: string;
-    /**
-     * 收货人手机号码
-     */
-    telNumber?: string;
-}
-
-interface AddCardOptions {
-    /**
-     * 需要添加的卡券列表
-     */
-    cardList?: AddCardData [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: AddCardRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface AddCardData {
-    /**
-     * 卡券 id
-     */
-    cardId?: string;
-    /**
-     * 卡券的扩展参数
-     */
-    cardExt?: string;
-}
-
-interface AddCardRes {
-    /**
-     * 卡券 id
-     */
-    cardList?: CardData [];
-}
-
-interface CardData {
-    /**
-     * 加密 code，为用户领取到卡券的code加密后的字符串
-     */
-    code?: string;
-    /**
-     * 用户领取到卡券的id
-     */
-    cardId?: string;
-    /**
-     * 用户领取到卡券的扩展参数，与调用时传入的参数相同
-     */
-    cardExt?: string;
-    /**
-     * 是否成功
-     */
-    isSuccess?: boolean;
-}
-
-interface OpenCardOptions {
-    /**
-     * 需要打开的卡券列表
-     */
-    cardList?: OpenCardData [];
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OpenCardData {
-    /**
-     * 需要打开的卡券 Id
-     */
-    cardId?: string;
-    /**
-     * 由 addCard 的返回对象中的加密 code 通过解密后得到
-     */
-    code?: string;
-}
-
-interface OpenSettingOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetSettingOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetWeRunDataOptions {
-    /**
-     * 超时时间，单位 ms
-     */
-    timeout?: number;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: GetWeRunDataRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface GetWeRunDataRes {
-    /**
-     * 调用结果
-     */
-    errMsg?: string;
-    /**
-     * 包括敏感数据在内的完整用户信息的加密数据
-     */
-    encryptedData?: string;
-    /**
-     * 加密算法的初始向量
-     */
-    iv?: string;
-}
-
-interface NavigateToMiniProgramOptions {
-    /**
-     * 要打开的uni-app appId
-     */
-    appId?: string;
-    /**
-     * 打开的页面路径，如果为空则打开首页
-     */
-    path?: string;
-    /**
-     * 需要传递给目标uni-app的数据
-     */
-    extraData?: any;
-    /**
-     * 要打开的uni-app版本
-     */
-    envVersion?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface NavigateBackMiniProgramOptions {
-    /**
-     * 需要返回给上一个uni-app的数据
-     */
-    extraData?: any;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseInvoiceTitleOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: ChooseInvoiceTitleRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface ChooseInvoiceTitleRes {
-    /**
-     * 抬头类型（0：单位，1：个人）
-     */
-    type?: string;
-    /**
-     * 抬头名称
-     */
-    title?: string;
-    /**
-     * 抬头税号
-     */
-    taxNumber?: string;
-    /**
-     * 单位地址
-     */
-    companyAddress?: string;
-    /**
-     * 手机号码
-     */
-    telephone?: string;
-    /**
-     * 银行名称
-     */
-    bankName?: string;
-    /**
-     * 银行账号
-     */
-    bankAccount?: string;
-    /**
-     * 接口调用结果
-     */
-    errMsg?: string;
-}
-
-interface CheckIsSupportSoterAuthenticationOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: CheckIsSupportSoterAuthenticationRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface CheckIsSupportSoterAuthenticationRes {
-    /**
-     * 接口调用成功的回调函数
-     */
-    supportMode?: any [];
-    /**
-     * 接口调用结果
-     */
-    errMsg?: string;
-}
-
-interface StartSoterAuthenticationOptions {
-    /**
-     * 请求使用的可接受的生物认证方式
-     */
-    requestAuthModes?: any [];
-    /**
-     * 挑战因子
-     */
-    challenge?: string;
-    /**
-     * 验证描述，即识别过程中显示在界面上的对话框提示内容
-     */
-    authContent?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: (result: StartSoterAuthenticationRes) => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StartSoterAuthenticationRes {
-    /**
-     * 错误码
-     */
-    errCode?: number;
-    /**
-     * 生物认证方式
-     */
-    authMode?: string;
-    /**
-     * 在设备安全区域（TEE）内获得的本机安全信息以及本次认证信息
-     */
-    resultJSON?: string;
-    /**
-     * 接口调用结果
-     */
-    errMsg?: string;
-}
-
-interface CheckIsSoterEnrolledInDeviceOptions {
-    /**
-     * 认证方式
-     * - fingerPrint: 指纹识别
-     * - facial: 人脸识别（暂未支持）
-     * - speech: 声纹识别（暂未支持）
-     */
-    checkAuthMode?: 'fingerPrint' | 'facial' | 'speech';
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface UpdateManager {
-    /**
-     * 当向应用后台请求完新版本信息，会进行回调
-     */
-    onCheckForUpdate(callback: () => void): void;
-    /**
-     * 当新版本下载完成，会进行回调
-     */
-    onUpdateReady(callback: () => void): void;
-    /**
-     * 当新版本下载失败，会进行回调
-     */
-    onUpdateFailed(callback: () => void): void;
-    /**
-     * 当新版本下载完成，调用该方法会强制当前uni-app应用上新版本并重启
-     */
-    applyUpdate(): void;
-}
-
-interface Worker {
-    /**
-     * 向 Worker 线程发送的消息。
-     */
-    postMessage(message: any): void;
-    /**
-     * 监听 Worker 线程向当前线程发送的消息
-     */
-    onMessage(callback: () => void): void;
-    /**
-     * 结束当前 Worker 线程，仅限在主线程 Worker 实例上调用。
-     */
-    terminate(): void;
-}
-
-interface SetEnableDebugOptions {
-    /**
-     * 是否打开调试
-     */
-    enableDebug?: boolean;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetBackgroundColorOptions {
-    /**
-     * 窗口的背景色，必须为十六进制颜色值
-     */
-    backgroundColor?: string;
-    /**
-     * 顶部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
-     */
-    backgroundColorTop?: string;
-    /**
-     * 底部窗口的背景色，必须为十六进制颜色值，仅 iOS 支持
-     */
-    backgroundColorBottom?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface SetBackgroundTextStyleOptions {
-    /**
-     * 下拉背景字体、loading 图的样式，值为：dark、light
-     */
-    textStyle?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface OnGyroscopeChangeSuccess {
-    /**
-     * x 轴方向角速度
-     */
-    x?: number;
-    /**
-     * y 轴方向角速度
-     */
-    y?: number;
-    /**
-     * z 轴方向角速度
-     */
-    z?: number;
-}
-
-interface StartGyroscopeOptions {
-    /**
-     * 监听陀螺仪数据回调函数的执行频率：game（20ms/次）、ui（60ms/次）、normal （200ms/次）
-     */
-    interval?: string;
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
-
-interface StopGyroscopeOptions {
-    /**
-     * 接口调用成功的回调函数
-     */
-    success?: () => void;
-    /**
-     * 接口调用失败的回调函数
-     */
-    fail?: () => void;
-    /**
-     * 接口调用结束的回调函数（调用成功、失败都会执行）
-     */
-    complete?: () => void;
-}
diff --git a/types/uni-app/tsconfig.json b/types/uni-app/tsconfig.json
index 25eccf7459..51707abb73 100644
--- a/types/uni-app/tsconfig.json
+++ b/types/uni-app/tsconfig.json
@@ -22,7 +22,6 @@
         "lib/app.d.ts",
         "lib/page.d.ts",
         "lib/common.d.ts",
-        "lib/uni.d.ts",
         "lib/vue.d.ts",
         "uni-app-tests.ts"
     ]
diff --git a/types/uni-app/tslint.json b/types/uni-app/tslint.json
index 0d531c5643..e60c15844f 100644
--- a/types/uni-app/tslint.json
+++ b/types/uni-app/tslint.json
@@ -1,8 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "max-line-length": false,
-        "no-trailing-whitespace": false,
-        "no-unnecessary-generics": false
-    }
+    "extends": "dtslint/dt.json"
 }
\ No newline at end of file

From cfb1d9966748fca729a6a692a1e68f8c0601c108 Mon Sep 17 00:00:00 2001
From: Florian Topf <florian.topf@gmail.com>
Date: Fri, 15 Mar 2019 14:58:59 +0100
Subject: [PATCH 681/924] Added additional property for type 'array'

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

diff --git a/types/revalidator/index.d.ts b/types/revalidator/index.d.ts
index dd249d2afc..ec172c2be2 100644
--- a/types/revalidator/index.d.ts
+++ b/types/revalidator/index.d.ts
@@ -88,6 +88,8 @@ declare module Revalidator {
         conform?: (value: any, data?: T) => boolean;
         /**Value is valid only if the dependent value is valid */
         dependencies?: string;
+        /**Property to describe items for type: 'array' */
+        items?: ISchema<T>|JSONSchema<T>
     }
 }
 
@@ -95,4 +97,4 @@ declare var revalidator: Revalidator.RevalidatorStatic;
 
 declare module "revalidator" {
     export = revalidator;
-}
\ No newline at end of file
+}

From 49311e0283a9859a79d2cdd70ed52163204a30a3 Mon Sep 17 00:00:00 2001
From: Jarrett Meyer <jarrettmeyer@gmail.com>
Date: Fri, 15 Mar 2019 10:36:26 -0400
Subject: [PATCH 682/924] Bump version in first line

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

diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index f5394a1b26..d4ba68d820 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3-sankey module 0.7
+// Type definitions for D3JS d3-sankey module 0.11.0
 // Project: https://github.com/d3/d3-sankey/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 193843ef52d8024eab5028635da07e59f68a444c Mon Sep 17 00:00:00 2001
From: jwooden <jwooden@underarmour.com>
Date: Fri, 15 Mar 2019 11:07:30 -0400
Subject: [PATCH 683/924] mssql: Add missing Request.pause and Request.resume
 types

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

diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts
index 085ab122c1..4c12f876c1 100644
--- a/types/mssql/index.d.ts
+++ b/types/mssql/index.d.ts
@@ -7,6 +7,7 @@
 //                 Jørgen Elgaard Larsen <https://github.com/elhaard>
 //                 Peter Keuter <https://github.com/pkeuter>
 //                 David Gasperoni <https://github.com/mcdado>
+//                 Jeff Wooden <https://github.com/woodenconsulting>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -281,6 +282,8 @@ export declare class Request extends events.EventEmitter {
     public bulk(table: Table): Promise<number>;
     public bulk(table: Table, callback: (err: Error, rowCount: any) => void): void;
     public cancel(): void;
+    public pause(): boolean;
+    public resume(): boolean;
 }
 
 export declare class RequestError implements Error {

From 8085f1a7bd8df949e3f411990a3cfccbd756f06e Mon Sep 17 00:00:00 2001
From: Saransh Kataria <saransh@wisdomgeek.com>
Date: Fri, 15 Mar 2019 10:24:25 -0700
Subject: [PATCH 684/924] added default_source to ISubscription in stripe
 (#33902)

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 0c35712f71..dd80286f5b 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -5126,6 +5126,13 @@ declare namespace Stripe {
              * invoice with payment instructions.
              */
             billing: SubscriptionBilling;
+
+            /**
+             * ID of the default payment source for the subscription.
+             * It must belong to the customer associated with the subscription and be in a chargeable state.
+             * If not set, defaults to the customer’s default source. [Expandable]
+             */
+            default_source: string;
         }
 
         interface ISubscriptionCustCreationOptions extends IDataOptionsWithMetadata {

From a3a8f8280681ff4c57f1fb260e4915cd1c4f3f2b Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Fri, 15 Mar 2019 13:25:37 -0400
Subject: [PATCH 685/924] [three] Update bones_browser and
 webgl_animation_skinning_morph tests (#33888)

* Update tests

* Remove unused interface
---
 types/three/test/docs/scenes/bones_browser.ts |  27 +-
 types/three/test/references.ts                |   1 +
 .../webgl/webgl_animation_skinning_morph.ts   | 333 +++++++++---------
 types/three/three-core.d.ts                   |   2 +-
 4 files changed, 180 insertions(+), 183 deletions(-)

diff --git a/types/three/test/docs/scenes/bones_browser.ts b/types/three/test/docs/scenes/bones_browser.ts
index c04a788cde..116af826d8 100644
--- a/types/three/test/docs/scenes/bones_browser.ts
+++ b/types/three/test/docs/scenes/bones_browser.ts
@@ -42,7 +42,7 @@
         initBones();
     }
     function createGeometry(sizing: any) {
-        var geometry = new THREE.CylinderGeometry(
+        var geometry = new THREE.CylinderBufferGeometry(
             5,                       // radiusTop
             5,                       // radiusBottom
             sizing.height,           // height
@@ -50,14 +50,29 @@
             sizing.segmentCount * 3, // heightSegments
             true                     // openEnded
         );
-        for (var i = 0; i < geometry.vertices.length; i++) {
-            var vertex = geometry.vertices[i];
+
+        var position = geometry.attributes.position as THREE.BufferAttribute;
+
+        var vertex = new THREE.Vector3();
+
+        var skinIndices = [];
+        var skinWeights = [];
+
+        for (var i = 0; i < position.count; i++) {
+            vertex.fromBufferAttribute(position, i);
+
             var y = (vertex.y + sizing.halfHeight);
+
             var skinIndex = Math.floor(y / sizing.segmentHeight);
             var skinWeight = (y % sizing.segmentHeight) / sizing.segmentHeight;
-            geometry.skinIndices.push(new THREE.Vector4(skinIndex, skinIndex + 1, 0, 0));
-            geometry.skinWeights.push(new THREE.Vector4(1 - skinWeight, skinWeight, 0, 0));
+
+            skinIndices.push(skinIndex, skinIndex + 1, 0, 0);
+            skinWeights.push(1 - skinWeight, skinWeight, 0, 0);
         }
+
+        geometry.addAttribute('skinIndex', new THREE.Uint16BufferAttribute(skinIndices, 4));
+        geometry.addAttribute('skinWeight', new THREE.Float32BufferAttribute(skinWeights, 4));
+
         return geometry;
     }
     function createBones(sizing: any) {
@@ -74,7 +89,7 @@
         }
         return bones;
     }
-    function createMesh(geometry: THREE.Geometry, bones: THREE.Bone[]) {
+    function createMesh(geometry: THREE.BufferGeometry, bones: THREE.Bone[]) {
         var material = new THREE.MeshPhongMaterial({
             skinning: true,
             color: 0x156289,
diff --git a/types/three/test/references.ts b/types/three/test/references.ts
index e2068d68a5..d966799943 100644
--- a/types/three/test/references.ts
+++ b/types/three/test/references.ts
@@ -2,3 +2,4 @@
 
 /// <reference types="stats.js" />
 /// <reference types="tween.js" />
+/// <reference types="dat.gui" />
diff --git a/types/three/test/webgl/webgl_animation_skinning_morph.ts b/types/three/test/webgl/webgl_animation_skinning_morph.ts
index 835d7a6ea5..e9129084ba 100644
--- a/types/three/test/webgl/webgl_animation_skinning_morph.ts
+++ b/types/three/test/webgl/webgl_animation_skinning_morph.ts
@@ -1,228 +1,209 @@
-// https://github.com/mrdoob/three.js/blob/master/examples/webgl_sprites.html
+// https://github.com/mrdoob/three.js/blob/master/examples/webgl_animation_skinning_morph.html
 
 () => {
     // ------- variable definitions that does not exist in the original code. These are for typescript.
+    interface WEBGL {
+        isWebGLAvailable(): boolean;
+
+        isWebGL2Available(): boolean;
+
+        getWebGLErrorMessage(): HTMLDivElement;
+
+        getWebGL2ErrorMessage(): HTMLDivElement;
+
+        getErrorMessage(version: 1 | 2): HTMLDivElement;
+    }
+
+    var WEBGL: WEBGL;
     // -------
 
-    var SCREEN_WIDTH = window.innerWidth;
-    var SCREEN_HEIGHT = window.innerHeight;
-    var FLOOR = -250;
-
-    var container: HTMLElement;
+    if (WEBGL.isWebGLAvailable() === false) {
+        document.body.appendChild(WEBGL.getWebGLErrorMessage());
+    }
+    var container: HTMLElement
     var stats: Stats;
+    var clock: THREE.Clock;
+    var gui: dat.GUI;
+    var mixer: THREE.AnimationMixer;
+    var actions: { [name: string]: THREE.AnimationAction };
+    var activeAction: THREE.AnimationAction;
+    var previousAction: THREE.AnimationAction;
+
     var camera: THREE.PerspectiveCamera;
     var scene: THREE.Scene;
     var renderer: THREE.WebGLRenderer;
-    var mesh: THREE.Mesh;
-    var helper: THREE.SkeletonHelper;
-    var mixer: THREE.AnimationMixer;
+    var model: THREE.Scene;
+    var face: THREE.Mesh;
 
-    var mouseX = 0, mouseY = 0;
+    type Emote = 'Jump' | 'Yes' | 'No' | 'Wave' | 'Punch' | 'ThumbsUp';
 
-    var windowHalfX = window.innerWidth / 2;
-    var windowHalfY = window.innerHeight / 2;
-
-    var clock = new THREE.Clock();
-
-    document.addEventListener( 'mousemove', onDocumentMouseMove, false );
+    var api: { [name in Emote]?: () => void; } & { state: string; } = {state: 'Walking'};
 
     init();
     animate();
 
     function init() {
+        container = document.createElement('div');
+        document.body.appendChild(container);
 
-        container = document.getElementById( 'container' );
-
-        camera = new THREE.PerspectiveCamera( 30, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 10000 );
-        camera.position.z = 2200;
+        camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 0.25, 100);
+        camera.position.set(-5, 3, 10);
+        camera.lookAt(new THREE.Vector3(0, 2, 0));
 
         scene = new THREE.Scene();
+        scene.background = new THREE.Color(0xe0e0e0);
+        scene.fog = new THREE.Fog(0xe0e0e0, 20, 100);
 
-        scene.fog = new THREE.Fog( 0xffffff, 2000, 10000 );
+        clock = new THREE.Clock();
 
-        scene.add( camera );
+        // lights
+        var light: THREE.Light = new THREE.HemisphereLight(0xffffff, 0x444444);
+        light.position.set(0, 20, 0);
+        scene.add(light);
 
-        // GROUND
+        light = new THREE.DirectionalLight(0xffffff);
+        light.position.set(0, 20, 10);
+        scene.add(light);
 
-        var geometry = new THREE.PlaneBufferGeometry( 16000, 16000 );
-        var material = new THREE.MeshPhongMaterial( { emissive: 0x888888 } );
+        // ground
+        var mesh = new THREE.Mesh(new THREE.PlaneBufferGeometry(2000, 2000), new THREE.MeshPhongMaterial({
+            color: 0x999999,
+            depthWrite: false
+        }));
+        mesh.rotation.x = -Math.PI / 2;
+        scene.add(mesh);
 
-        var ground = new THREE.Mesh( geometry, material );
-        ground.position.set( 0, FLOOR, 0 );
-        ground.rotation.x = -Math.PI/2;
-        scene.add( ground );
+        var grid = new THREE.GridHelper(200, 40, 0x000000, 0x000000);
+        (grid.material as THREE.LineBasicMaterial).opacity = 0.2;
+        (grid.material as THREE.LineBasicMaterial).transparent = true;
+        scene.add(grid);
 
-        ground.receiveShadow = true;
+        // model
+        var loader = new THREE.GLTFLoader();
+        loader.load('models/gltf/RobotExpressive/RobotExpressive.glb', function (gltf) {
+            model = gltf.scene;
+            scene.add(model);
 
+            createGUI(model, gltf.animations);
+        }, undefined, function (e) {
+            console.error(e);
+        });
 
-        // LIGHTS
-
-        scene.add( new THREE.HemisphereLight( 0x111111, 0x444444 ) );
-
-        var light = new THREE.DirectionalLight( 0xebf3ff, 1.5 );
-        light.position.set( 0, 140, 500 ).multiplyScalar( 1.1 );
-        scene.add( light );
-
-        light.castShadow = true;
-
-        light.shadowMapWidth = 1024;
-        light.shadowMapHeight = 1024;
-
-        var d = 390;
-
-        light.shadowCameraLeft = -d;
-        light.shadowCameraRight = d;
-        light.shadowCameraTop = d * 1.5;
-        light.shadowCameraBottom = -d;
-
-        light.shadowCameraFar = 3500;
-        //light.shadowCameraVisible = true;
-
-        // RENDERER
-
-        renderer = new THREE.WebGLRenderer( { antialias: true } );
-        renderer.setClearColor( scene.fog.color );
-        renderer.setPixelRatio( window.devicePixelRatio );
-        renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );
-        renderer.domElement.style.position = "relative";
-
-        container.appendChild( renderer.domElement );
-
-        renderer.gammaInput = true;
+        renderer = new THREE.WebGLRenderer({antialias: true});
+        renderer.setPixelRatio(window.devicePixelRatio);
+        renderer.setSize(window.innerWidth, window.innerHeight);
         renderer.gammaOutput = true;
+        renderer.gammaFactor = 2.2;
+        container.appendChild(renderer.domElement);
 
-        renderer.shadowMap.enabled = true;
-
-
-        // STATS
+        window.addEventListener('resize', onWindowResize, false);
 
+        // stats
         stats = new Stats();
-        container.appendChild( stats.dom );
+        container.appendChild(stats.dom);
+    }
 
-        //
+    function createGUI(model: THREE.Scene, animations: THREE.AnimationClip[]) {
+        var states = ['Idle', 'Walking', 'Running', 'Dance', 'Death', 'Sitting', 'Standing'];
+        var emotes: Emote[] = ['Jump', 'Yes', 'No', 'Wave', 'Punch', 'ThumbsUp'];
 
-        var loader = new THREE.JSONLoader();
-        loader.load( "models/skinned/knight.js", function ( geometry, materials ) {
+        gui = new dat.GUI();
 
-            createScene( geometry, materials as THREE.MeshPhongMaterial[], 0, FLOOR, -300, 60 )
+        mixer = new THREE.AnimationMixer(model);
 
-        } );
+        actions = {};
 
-        // GUI
+        for (var i = 0; i < animations.length; i++) {
+            var clip = animations[i];
+            var action = mixer.clipAction(clip);
+            actions[clip.name] = action;
 
-        initGUI();
+            if (emotes.indexOf(clip.name as Emote) >= 0 || states.indexOf(clip.name) >= 4) {
+                action.clampWhenFinished = true;
+                action.loop = THREE.LoopOnce;
+            }
+        }
 
-        //
+        // states
+        var statesFolder = gui.addFolder('States');
 
-        window.addEventListener( 'resize', onWindowResize, false );
+        var clipCtrl = statesFolder.add(api, 'state').options(states);
 
+        clipCtrl.onChange(function () {
+            fadeToAction(api.state, 0.5);
+        });
+
+        statesFolder.open();
+
+        // emotes
+        var emoteFolder = gui.addFolder('Emote');
+
+        function createEmoteCallback(name: Emote) {
+            api[name] = function () {
+                fadeToAction(name, 0.2);
+                mixer.addEventListener('finished', restoreState);
+            };
+
+            emoteFolder.add(api, name);
+        }
+
+        function restoreState() {
+            mixer.removeEventListener('finished', restoreState);
+
+            fadeToAction(api.state, 0.2);
+        }
+
+        for (var i = 0; i < emotes.length; i++) {
+            createEmoteCallback(emotes[i]);
+        }
+
+        emoteFolder.open();
+
+        // expressions
+        face = model.getObjectByName('Head_2') as THREE.Mesh;
+
+        var expressions = Object.keys(face.morphTargetDictionary);
+        var expressionFolder = gui.addFolder('Expressions');
+
+        for (var i = 0; i < expressions.length; i++) {
+            expressionFolder.add(face.morphTargetInfluences, i.toString(), 0, 1, 0.01).name(expressions[i]);
+        }
+
+        activeAction = actions['Walking'];
+        activeAction.play();
+
+        expressionFolder.open();
+    }
+
+    function fadeToAction(name: string, duration: number) {
+        previousAction = activeAction;
+        activeAction = actions[name];
+
+        if (previousAction !== activeAction) {
+            previousAction.fadeOut(duration);
+        }
+
+        activeAction
+            .reset()
+            .setEffectiveTimeScale(1)
+            .setEffectiveWeight(1)
+            .fadeIn(duration)
+            .play();
     }
 
     function onWindowResize() {
-
-        windowHalfX = window.innerWidth / 2;
-        windowHalfY = window.innerHeight / 2;
-
         camera.aspect = window.innerWidth / window.innerHeight;
         camera.updateProjectionMatrix();
 
-        renderer.setSize( window.innerWidth, window.innerHeight );
-
-    }
-
-    function createScene( geometry: THREE.Geometry, materials: THREE.MeshPhongMaterial[], x: number, y: number, z: number, s: number ) {
-
-        //ensureLoop( geometry.animation );
-
-        geometry.computeBoundingBox();
-        var bb = geometry.boundingBox;
-
-        var path = "textures/cube/Park2/";
-        var format = '.jpg';
-        var urls = [
-            path + 'posx' + format, path + 'negx' + format,
-            path + 'posy' + format, path + 'negy' + format,
-            path + 'posz' + format, path + 'negz' + format
-        ];
-
-        for ( var i = 0; i < materials.length; i ++ ) {
-
-            var m = materials[ i ];
-            m.skinning = true;
-            m.morphTargets = true;
-
-            m.specular.setHSL( 0, 0, 0.1 );
-
-            m.color.setHSL( 0.6, 0, 0.6 );
-
-            //m.map = map;
-            //m.envMap = envMap;
-            //m.bumpMap = bumpMap;
-            //m.bumpScale = 2;
-
-            //m.combine = THREE.MixOperation;
-            //m.reflectivity = 0.75;
-
-        }
-
-        mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial( materials ) );
-        mesh.position.set( x, y - bb.min.y * s, z );
-        mesh.scale.set( s, s, s );
-        scene.add( mesh );
-
-        mesh.castShadow = true;
-        mesh.receiveShadow = true;
-
-        helper = new THREE.SkeletonHelper( mesh );
-        //helper.material.linewidth = 3;
-        helper.visible = false;
-        scene.add( helper );
-
-
-        var clipMorpher = THREE.AnimationClip.CreateFromMorphTargetSequence( 'facialExpressions', (mesh.geometry as THREE.Geometry).morphTargets, 3, true );
-        var clipBones = geometry.animations[0];
-
-        mixer = new THREE.AnimationMixer( mesh );
-    }
-
-    function initGUI() {
-        mesh.visible = true;
-        helper.visible = true;
-    }
-
-    function onDocumentMouseMove( event: MouseEvent ) {
-
-        mouseX = ( event.clientX - windowHalfX );
-        mouseY = ( event.clientY - windowHalfY );
-
+        renderer.setSize(window.innerWidth, window.innerHeight);
     }
 
     //
-
     function animate() {
-
-        requestAnimationFrame( animate );
-
-        render();
+        var dt = clock.getDelta();
+        if (mixer) mixer.update(dt);
+        requestAnimationFrame(animate);
+        renderer.render(scene, camera);
         stats.update();
-
     }
-
-    function render() {
-
-        var delta = 0.75 * clock.getDelta();
-
-        camera.position.x += ( mouseX - camera.position.x ) * .05;
-        camera.position.y = THREE.Math.clamp( camera.position.y + ( - mouseY - camera.position.y ) * .05, 0, 1000 );
-
-        camera.lookAt( scene.position );
-
-        if( mixer ) {
-            mixer.update( delta );
-            helper.update();
-        }
-
-        renderer.render( scene, camera );
-
-    }
-}
\ No newline at end of file
+}
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 96c40c7496..f39d28b565 100755
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -224,7 +224,7 @@ type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint
 // Animation ////////////////////////////////////////////////////////////////////////////////////////
 
 export class AnimationAction {
-    loop: boolean;
+    loop: AnimationActionLoopStyles;
     time: number;
     timeScale: number;
     weight: number;

From 99793a9088ff5a5d785511356a4211b83e7bc819 Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Fri, 15 Mar 2019 18:26:51 +0100
Subject: [PATCH 686/924] fix #33825: more lax handling of promises (#33826)

---
 types/jasmine/index.d.ts       | 12 ++++++------
 types/jasmine/jasmine-tests.ts |  2 --
 types/jasmine/tslint.json      |  3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index 1bc099bcad..56a9f879be 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -15,7 +15,7 @@
 // TypeScript Version: 2.8
 // For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
 
-type ImplementationCallback = (() => Promise<any>) | ((done: DoneFn) => void);
+type ImplementationCallback = (() => PromiseLike<any>) | ((done: DoneFn) => void);
 
 /**
  * Create a group of specs (often called a suite).
@@ -134,7 +134,7 @@ declare function expect(): jasmine.NothingMatcher;
  * @checkReturnValue see https://tsetse.info/check-return-value
  * @param actual - Actual computed value to test expectations against.
  */
-declare function expectAsync<T, U>(actual: Promise<T>): jasmine.AsyncMatchers<T, U>;
+declare function expectAsync<T, U>(actual: PromiseLike<T>): jasmine.AsyncMatchers<T, U>;
 
 /**
  * Explicitly mark a spec as failed.
@@ -517,25 +517,25 @@ declare namespace jasmine {
          * Expect a promise to be resolved.
          * @param expectationFailOutput
          */
-        toBeResolved(expectationFailOutput?: any): Promise<void>;
+        toBeResolved(expectationFailOutput?: any): PromiseLike<void>;
 
         /**
          * Expect a promise to be rejected.
          * @param expectationFailOutput
          */
-        toBeRejected(expectationFailOutput?: any): Promise<void>;
+        toBeRejected(expectationFailOutput?: any): PromiseLike<void>;
 
         /**
          * Expect a promise to be resolved to a value equal to the expected, using deep equality comparison.
          * @param expected - Value that the promise is expected to resolve to.
          */
-        toBeResolvedTo(expected: Expected<T>): Promise<void>;
+        toBeResolvedTo(expected: Expected<T>): PromiseLike<void>;
 
         /**
          * Expect a promise to be rejected with a value equal to the expected, using deep equality comparison.
          * @param expected - Value that the promise is expected to be rejected with.
          */
-        toBeRejectedWith(expected: Expected<U>): Promise<void>;
+        toBeRejectedWith(expected: Expected<U>): PromiseLike<void>;
 
         /**
          * Add some context for an expect.
diff --git a/types/jasmine/jasmine-tests.ts b/types/jasmine/jasmine-tests.ts
index 66b98c4b0d..faa27b3894 100644
--- a/types/jasmine/jasmine-tests.ts
+++ b/types/jasmine/jasmine-tests.ts
@@ -176,10 +176,8 @@ describe("Included matchers:", () => {
     it("async matchers", async () => {
         const badness = new Error("badness");
         await expectAsync(Promise.resolve()).toBeResolved();
-        await expectAsync(Promise.resolve()).toBeResolved("good job");
         await expectAsync(Promise.resolve(true)).toBeResolvedTo(true);
         await expectAsync(Promise.reject(badness)).toBeRejected();
-        await expectAsync(Promise.reject(badness)).toBeRejected("bad mojo");
         await expectAsync(Promise.reject(badness)).toBeRejectedWith(badness);
         await expectAsync(Promise.resolve()).withContext("additional info").toBeResolved();
     });
diff --git a/types/jasmine/tslint.json b/types/jasmine/tslint.json
index c540ba0129..d2f3f5698c 100644
--- a/types/jasmine/tslint.json
+++ b/types/jasmine/tslint.json
@@ -8,6 +8,7 @@
         "no-unnecessary-generics": false,
         "no-var-keyword": false,
         "one-variable-per-declaration": false,
-        "only-arrow-functions": false
+        "only-arrow-functions": false,
+        "await-promise": [true, "PromiseLike"]
     }
 }

From b52215d454657419a2fbd67e2ab64a62ca8df032 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 15 Mar 2019 10:38:57 -0700
Subject: [PATCH 687/924] VS Code 1.17 Extension API

---
 types/vscode/index.d.ts | 354 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 319 insertions(+), 35 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 4f81092898..e01e612919 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.16
+// Type definitions for Visual Studio Code 1.17
 // Project: https://github.com/microsoft/vscode-extension-vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.16 Extension API
+ * Type Definition for Visual Studio Code 1.17 Extension API
  */
 
 declare module 'vscode' {
@@ -743,7 +743,8 @@ declare module 'vscode' {
 		/**
 		 * An optional view column in which the [editor](#TextEditor) should be shown.
 		 * The default is the [one](#ViewColumn.One), other values are adjusted to
-		 * be __Min(column, columnCount + 1)__.
+		 * be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
+		 * not adjusted.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -783,7 +784,7 @@ declare module 'vscode' {
 	export interface ThemableDecorationRenderOptions {
 		/**
 		 * Background color of the decoration. Use rgba() and define transparent background colors to play well with other decorations.
-		 * Alternativly a color from the color registry an be [referenced](#ColorIdentifier).
+		 * Alternatively a color from the color registry can be [referenced](#ThemeColor).
 		 */
 		backgroundColor?: string | ThemeColor;
 
@@ -1189,6 +1190,11 @@ declare module 'vscode' {
 		 */
 		static parse(value: string): Uri;
 
+		/**
+		 * Use the `file` and `parse` factory functions to create new `Uri` objects.
+		 */
+		private constructor(scheme: string, authority: string, path: string, query: string, fragment: string);
+
 		/**
 		 * Scheme is the `http` part of `http://www.msft.com/some/path?query#fragment`.
 		 * The part before the first colon.
@@ -1508,6 +1514,80 @@ declare module 'vscode' {
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
+	/**
+	 * Options to configure the behaviour of a file open dialog.
+	 *
+	 * * Note 1: A dialog can select files, folders, or both. This is not true for Windows
+	 * which enforces to open either files or folder, but *not both*.
+	 * * Note 2: Explictly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
+	 * and the editor then silently adjusts the options to select files.
+	 */
+	export interface OpenDialogOptions {
+		/**
+		 * The resource the dialog shows when opened.
+		 */
+		defaultUri?: Uri;
+
+		/**
+		 * A human-readable string for the open button.
+		 */
+		openLabel?: string;
+
+		/**
+		 * Allow to select files, defaults to `true`.
+		 */
+		canSelectFiles?: boolean;
+
+		/**
+		 * Allow to select folders, defaults to `false`.
+		 */
+		canSelectFolders?: boolean;
+
+		/**
+		 * Allow to select many files or folders.
+		 */
+		canSelectMany?: boolean;
+
+		/**
+		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
+		 * like "TypeScript", and an array of extensions, e.g.
+		 * ```ts
+		 * {
+		 * 	'Images': ['png', 'jpg']
+		 * 	'TypeScript': ['ts', 'tsx']
+		 * }
+		 * ```
+		 */
+		filters?: { [name: string]: string[] };
+	}
+
+	/**
+	 * Options to configure the behaviour of a file save dialog.
+	 */
+	export interface SaveDialogOptions {
+		/**
+		 * The resource the dialog shows when opened.
+		 */
+		defaultUri?: Uri;
+
+		/**
+		 * A human-readable string for the save button.
+		 */
+		saveLabel?: string;
+
+		/**
+		 * A set of file filters that are used by the dialog. Each entry is a human readable label,
+		 * like "TypeScript", and an array of extensions, e.g.
+		 * ```ts
+		 * {
+		 * 	'Images': ['png', 'jpg']
+		 * 	'TypeScript': ['ts', 'tsx']
+		 * }
+		 * ```
+		 */
+		filters?: { [name: string]: string[] };
+	}
+
 	/**
 	 * Represents an action that is shown with an information, warning, or
 	 * error message.
@@ -1594,6 +1674,44 @@ declare module 'vscode' {
 		validateInput?(value: string): string | undefined | null;
 	}
 
+	/**
+	 * A relative pattern is a helper to construct glob patterns that are matched
+	 * relatively to a base path. The base path can either be an absolute file path
+	 * or a [workspace folder](#WorkspaceFolder).
+	 */
+	class RelativePattern {
+
+		/**
+		 * A base file path to which this pattern will be matched against relatively.
+		 */
+		base: string;
+
+		/**
+		 * A file glob pattern like `*.{ts,js}` that will be matched on file paths
+		 * relative to the base path.
+		 *
+		 * Example: Given a base of `/home/work/folder` and a file path of `/home/work/folder/index.js`,
+		 * the file glob pattern will match on `index.js`.
+		 */
+		pattern: string;
+
+		/**
+		 * Creates a new relative pattern object with a base path and pattern to match. This pattern
+		 * will be matched on file paths relative to the base path.
+		 *
+		 * @param base A base file path to which this pattern will be matched against relatively.
+		 * @param pattern A file glob pattern like `*.{ts,js}` that will be matched on file paths
+		 * relative to the base path.
+		 */
+		constructor(base: WorkspaceFolder | string, pattern: string)
+	}
+
+	/**
+	 * A file glob pattern to match file paths against. This can either be a glob pattern string
+	 * (like `**∕*.{ts,js}` or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+	 */
+	export type GlobPattern = string | RelativePattern;
+
 	/**
 	 * A document filter denotes a document by different properties like
 	 * the [language](#TextDocument.languageId), the [scheme](#Uri.scheme) of
@@ -1615,9 +1733,10 @@ declare module 'vscode' {
 		scheme?: string;
 
 		/**
-		 * A glob pattern, like `*.{ts,js}`.
+		 * A [glob pattern](#GlobPattern) that is matched on the absolute path of the document. Use a [relative pattern](#RelativePattern)
+		 * to filter documents to a [workspace folder](#WorkspaceFolder).
 		 */
-		pattern?: string;
+		pattern?: GlobPattern;
 	}
 
 	/**
@@ -1629,7 +1748,6 @@ declare module 'vscode' {
 	 */
 	export type DocumentSelector = string | DocumentFilter | (string | DocumentFilter)[];
 
-
 	/**
 	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
 	 * may return. For once this is the actual result type `T`, like `Hover`, or a thenable that resolves
@@ -2097,6 +2215,11 @@ declare module 'vscode' {
 		 * skip the [location](#SymbolInformation.location) of symbols and implement `resolveWorkspaceSymbol` to do that
 		 * later.
 		 *
+		 * The `query`-parameter should be interpreted in a *relaxed way* as the editor will apply its own highlighting
+		 * and scoring on the results. A good rule of thumb is to match case-insensitive and to simply check that the
+		 * characters of *query* appear in their order in a candidate symbol. Don't use prefix, substring, or similar
+		 * strict matching.
+		 *
 		 * @param query A non-empty query string.
 		 * @param token A cancellation token.
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
@@ -2468,7 +2591,7 @@ declare module 'vscode' {
 		 * The human-readable doc-comment of this signature. Will be shown
 		 * in the UI but can be omitted.
 		 */
-		documentation?: string;
+		documentation?: string | MarkdownString;
 
 		/**
 		 * Creates a new parameter information object.
@@ -2476,7 +2599,7 @@ declare module 'vscode' {
 		 * @param label A label string.
 		 * @param documentation A doc string.
 		 */
-		constructor(label: string, documentation?: string);
+		constructor(label: string, documentation?: string | MarkdownString);
 	}
 
 	/**
@@ -2496,7 +2619,7 @@ declare module 'vscode' {
 		 * The human-readable doc-comment of this signature. Will be shown
 		 * in the UI but can be omitted.
 		 */
-		documentation?: string;
+		documentation?: string | MarkdownString;
 
 		/**
 		 * The parameters of this signature.
@@ -2509,7 +2632,7 @@ declare module 'vscode' {
 		 * @param label A label string.
 		 * @param documentation A doc string.
 		 */
-		constructor(label: string, documentation?: string);
+		constructor(label: string, documentation?: string | MarkdownString);
 	}
 
 	/**
@@ -2623,7 +2746,7 @@ declare module 'vscode' {
 		/**
 		 * A human-readable string that represents a doc-comment.
 		 */
-		documentation?: string;
+		documentation?: string | MarkdownString;
 
 		/**
 		 * A string that should be used when comparing this item
@@ -2728,6 +2851,40 @@ declare module 'vscode' {
 		constructor(items?: CompletionItem[], isIncomplete?: boolean);
 	}
 
+	/**
+	 * How a [completion provider](#CompletionItemProvider) was triggered
+	 */
+	export enum CompletionTriggerKind {
+		/**
+		 * Completion was triggered normally.
+		 */
+		Invoke = 0,
+		/**
+		 * Completion was triggered by a trigger character.
+		 */
+		TriggerCharacter = 1
+	}
+
+	/**
+	 * Contains additional information about the context in which
+	 * [completion provider](#CompletionItemProvider.provideCompletionItems) is triggered.
+	 */
+	export interface CompletionContext {
+		/**
+		 * How the completion was triggered.
+		 */
+		readonly triggerKind: CompletionTriggerKind;
+
+		/**
+		 * Character that triggered the completion item provider.
+		 *
+		 * `undefined` if provider was not triggered by a character.
+		 *
+		 * The trigger character is already in the document when the completion provider is triggered.
+		 */
+		readonly triggerCharacter?: string;
+	}
+
 	/**
 	 * The completion item provider interface defines the contract between extensions and
 	 * [IntelliSense](https://code.visualstudio.com/docs/editor/intellisense).
@@ -2750,10 +2907,12 @@ declare module 'vscode' {
 		 * @param document The document in which the command was invoked.
 		 * @param position The position at which the command was invoked.
 		 * @param token A cancellation token.
+		 * @param context How the completion was triggered.
+		 *
 		 * @return An array of completions, a [completion list](#CompletionList), or a thenable that resolves to either.
 		 * The lack of a result can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<CompletionItem[] | CompletionList>;
+		provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken, context: CompletionContext): ProviderResult<CompletionItem[] | CompletionList>;
 
 		/**
 		 * Given a completion item fill in more data, like [doc-comment](#CompletionItem.documentation)
@@ -3321,8 +3480,24 @@ declare module 'vscode' {
 	 * used to show editors side by side.
 	 */
 	export enum ViewColumn {
+		/**
+		 * A *symbolic* editor column representing the currently
+		 * active column. This value can be used when opening editors, but the
+		 * *resolved* [viewColumn](#TextEditor.viewColumn)-value of editors will always
+		 * be `One`, `Two`, `Three`, or `undefined` but never `Active`.
+		 */
+		Active = -1,
+		/**
+		 * The left most editor column.
+		 */
 		One = 1,
+		/**
+		 * The center editor column.
+		 */
 		Two = 2,
+		/**
+		 * The right most editor column.
+		 */
 		Three = 3
 	}
 
@@ -3879,13 +4054,30 @@ declare module 'vscode' {
 		options?: ShellExecutionOptions;
 	}
 
+	/**
+	 * The scope of a task.
+	 */
+	export enum TaskScope {
+		/**
+		 * The task is a global task
+		 */
+		Global = 1,
+
+		/**
+		 * The task is a workspace task
+		 */
+		Workspace = 2
+	}
+
 	/**
 	 * A task to execute
 	 */
 	export class Task {
 
 		/**
-		 * Creates a new task.
+		 * ~~Creates a new task.~~
+		 *
+		 * @deprecated Use the new constructors that allow specifying a target for the task.
 		 *
 		 * @param definition The task definition as defined in the taskDefinitions extension point.
 		 * @param name The task's name. Is presented in the user interface.
@@ -3897,11 +4089,30 @@ declare module 'vscode' {
 		 */
 		constructor(taskDefinition: TaskDefinition, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
 
+		/**
+		 * Creates a new task.
+		 *
+		 * @param definition The task definition as defined in the taskDefinitions extension point.
+		 * @param target Specifies the task's target. It is either a global or a workspace task or a task for a specific workspace folder.
+		 * @param name The task's name. Is presented in the user interface.
+		 * @param source The task's source (e.g. 'gulp', 'npm', ...). Is presented in the user interface.
+		 * @param execution The process or shell execution.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
+		 */
+		constructor(taskDefinition: TaskDefinition, target: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
+
 		/**
 		 * The task's definition.
 		 */
 		definition: TaskDefinition;
 
+		/**
+		 * The task's scope.
+		 */
+		scope?: TaskScope.Global | TaskScope.Workspace | WorkspaceFolder;
+
 		/**
 		 * The task's name
 		 */
@@ -4185,8 +4396,9 @@ declare module 'vscode' {
 		 * to control where the editor is being shown. Might change the [active editor](#window.activeTextEditor).
 		 *
 		 * @param document A text document to be shown.
-		 * @param column A view column in which the editor should be shown. The default is the [one](#ViewColumn.One), other values
-		 * are adjusted to be __Min(column, columnCount + 1)__.
+		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [one](#ViewColumn.One), other values
+		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
+		 * not adjusted.
 		 * @param preserveFocus When `true` the editor will not take focus.
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
@@ -4197,7 +4409,7 @@ declare module 'vscode' {
 		 * to control options of the editor is being shown. Might change the [active editor](#window.activeTextEditor).
 		 *
 		 * @param document A text document to be shown.
-		 * @param options [Editor options](#ShowTextDocumentOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
 		export function showTextDocument(document: TextDocument, options?: TextDocumentShowOptions): Thenable<TextEditor>;
@@ -4208,7 +4420,7 @@ declare module 'vscode' {
 		 * @see [openTextDocument](#openTextDocument)
 		 *
 		 * @param uri A resource identifier.
-		 * @param options [Editor options](#ShowTextDocumentOptions) to configure the behavior of showing the [editor](#TextEditor).
+		 * @param options [Editor options](#TextDocumentShowOptions) to configure the behavior of showing the [editor](#TextEditor).
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
 		export function showTextDocument(uri: Uri, options?: TextDocumentShowOptions): Thenable<TextEditor>;
@@ -4377,6 +4589,24 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
+		/**
+		 * Shows a file open dialog to the user which allows to select a file
+		 * for opening-purposes.
+		 *
+		 * @param options Options that control the dialog.
+		 * @returns A promise that resolves to the selected resources or `undefined`.
+		 */
+		export function showOpenDialog(options: OpenDialogOptions): Thenable<Uri[] | undefined>;
+
+		/**
+		 * Shows a file save dialog to the user which allows to select a file
+		 * for saving-purposes.
+		 *
+		 * @param options Options that control the dialog.
+		 * @returns A promise that resolves to the selected resource or `undefined`.
+		 */
+		export function showSaveDialog(options: SaveDialogOptions): Thenable<Uri | undefined>;
+
 		/**
 		 * Opens an input box to ask the user for input.
 		 *
@@ -4766,13 +4996,16 @@ declare module 'vscode' {
 	export interface WorkspaceFolder {
 
 		/**
-		 * The associated URI for this workspace folder.
+		 * The associated uri for this workspace folder.
+		 *
+		 * *Note:* The [Uri](#Uri)-type was intentionally chosen such that future releases of the editor can support
+		 * workspace folders that are not stored on the local disk, e.g. `ftp://server/workspaces/foo`.
 		 */
 		readonly uri: Uri;
 
 		/**
 		 * The name of this workspace folder. Defaults to
-		 * the basename its [uri-path](#Uri.path)
+		 * the basename of its [uri-path](#Uri.path)
 		 */
 		readonly name: string;
 
@@ -4817,8 +5050,9 @@ declare module 'vscode' {
 		export const onDidChangeWorkspaceFolders: Event<WorkspaceFoldersChangeEvent>;
 
 		/**
-		 * Returns a [workspace folder](#WorkspaceFolder) for the provided resource. When the resource
-		 * is a workspace folder itself, its parent workspace folder or `undefined` is returned.
+		 * Returns the [workspace folder](#WorkspaceFolder) that contains a given uri.
+		 * * returns `undefined` when the given uri doesn't match any workspace folder
+		 * * returns the *input* when the given uri is a workspace folder itself
 		 *
 		 * @param uri An uri.
 		 * @return A workspace folder or `undefined`
@@ -4842,30 +5076,35 @@ declare module 'vscode' {
 		/**
 		 * Creates a file system watcher.
 		 *
-		 * A glob pattern that filters the file events must be provided. Optionally, flags to ignore certain
-		 * kinds of events can be provided. To stop listening to events the watcher must be disposed.
+		 * A glob pattern that filters the file events on their absolute path must be provided. Optionally,
+		 * flags to ignore certain kinds of events can be provided. To stop listening to events the watcher must be disposed.
 		 *
 		 * *Note* that only files within the current [workspace folders](#workspace.workspaceFolders) can be watched.
 		 *
-		 * @param globPattern A glob pattern that is applied to the names of created, changed, and deleted files.
+		 * @param globPattern A [glob pattern](#GlobPattern) that is applied to the absolute paths of created, changed,
+		 * and deleted files. Use a [relative pattern](#RelativePattern) to limit events to a certain [workspace folder](#WorkspaceFolder).
 		 * @param ignoreCreateEvents Ignore when files have been created.
 		 * @param ignoreChangeEvents Ignore when files have been changed.
 		 * @param ignoreDeleteEvents Ignore when files have been deleted.
 		 * @return A new file system watcher instance.
 		 */
-		export function createFileSystemWatcher(globPattern: string, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
+		export function createFileSystemWatcher(globPattern: GlobPattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): FileSystemWatcher;
 
 		/**
-		 * Find files in the workspace.
+		 * Find files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
 		 *
 		 * @sample `findFiles('**∕*.js', '**∕node_modules∕**', 10)`
-		 * @param include A glob pattern that defines the files to search for.
-		 * @param exclude A glob pattern that defines files and folders to exclude.
+		 * @param include A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
+		 * will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
+		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
+		 * @param exclude  A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
+		 * will be matched against the file paths of resulting matches relative to their workspace.
 		 * @param maxResults An upper-bound for the result.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
-		 * @return A thenable that resolves to an array of resource identifiers.
+		 * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
+		 * [workspace folders](#workspace.workspaceFolders) are opened.
 		 */
-		export function findFiles(include: string, exclude?: string, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
+		export function findFiles(include: GlobPattern, exclude?: GlobPattern, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
 
 		/**
 		 * Save all dirty files.
@@ -4957,7 +5196,7 @@ declare module 'vscode' {
 		/**
 		 * An event that is emitted when a [text document](#TextDocument) is changed. This usually happens
 		 * when the [contents](#TextDocument.getText) changes but also when other things like the
-		 * [dirty](TextDocument#isDirty)-state changes.
+		 * [dirty](#TextDocument.isDirty)-state changes.
 		 */
 		export const onDidChangeTextDocument: Event<TextDocumentChangeEvent>;
 
@@ -5479,6 +5718,11 @@ declare module 'vscode' {
 		 */
 		readonly label: string;
 
+		/**
+		 * The (optional) Uri of the root of this source control.
+		 */
+		readonly rootUri: Uri | undefined;
+
 		/**
 		 * The [input box](#SourceControlInputBox) for this source control.
 		 */
@@ -5538,7 +5782,7 @@ declare module 'vscode' {
 		 * ~~The [input box](#SourceControlInputBox) for the last source control
 		 * created by the extension.~~
 		 *
-		 * @deprecated Use [SourceControl.inputBox](#SourceControl.inputBox) instead
+		 * @deprecated Use SourceControl.inputBox instead
 		 */
 		export const inputBox: SourceControlInputBox;
 
@@ -5547,9 +5791,10 @@ declare module 'vscode' {
 		 *
 		 * @param id An `id` for the source control. Something short, eg: `git`.
 		 * @param label A human-readable string for the source control. Eg: `Git`.
+		 * @param rootUri An optional Uri of the root of the source control. Eg: `Uri.parse(workspaceRoot)`.
 		 * @return An instance of [source control](#SourceControl).
 		 */
-		export function createSourceControl(id: string, label: string): SourceControl;
+		export function createSourceControl(id: string, label: string, rootUri?: Uri): SourceControl;
 	}
 
 	/**
@@ -5623,6 +5868,35 @@ declare module 'vscode' {
 		body?: any;
 	}
 
+	/**
+	 * A debug configuration provider allows to add the initial debug configurations to a newly created launch.json
+	 * and allows to resolve a launch configuration before it is used to start a new debug session.
+	 * A debug configuration provider is registered via #workspace.registerDebugConfigurationProvider.
+	 */
+	export interface DebugConfigurationProvider {
+		/**
+		 * Provides initial [debug configuration](#DebugConfiguration). If more than one debug configuration provider is
+		 * registered for the same type, debug configurations are concatenated in arbitrary order.
+		 *
+		 * @param folder The workspace folder for which the configurations are used or undefined for a folderless setup.
+		 * @param token A cancellation token.
+		 * @return An array of [debug configurations](#DebugConfiguration).
+		 */
+		provideDebugConfigurations?(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]>;
+
+		/**
+		 * Resolves a [debug configuration](#DebugConfiguration) by filling in missing values or by adding/changing/removing attributes.
+		 * If more than one debug configuration provider is registered for the same type, the resolveDebugConfiguration calls are chained
+		 * in arbitrary order and the initial debug configuration is piped through the chain.
+		 *
+		 * @param folder The workspace folder from which the configuration originates from or undefined for a folderless setup.
+		 * @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
+		 * @param token A cancellation token.
+		 * @return The resolved debug configuration.
+		 */
+		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
+	}
+
 	/**
 	 * Namespace for dealing with debug sessions.
 	 */
@@ -5633,7 +5907,7 @@ declare module 'vscode' {
 		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
 		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
 		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
-		 * Folder specific variables used in the configuration (e.g. '${workspaceRoot}') are resolved against the given folder.
+		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
 		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
 		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
 		 * @return A thenable that resolves when debugging could be successfully started.
@@ -5668,6 +5942,16 @@ declare module 'vscode' {
 		 * An [event](#Event) which fires when a [debug session](#DebugSession) has terminated.
 		 */
 		export const onDidTerminateDebugSession: Event<DebugSession>;
+
+		/**
+		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specifc debug type.
+		 * More than one provider can be registered for the same type.
+		 *
+		 * @param type The debug type for which the provider is registered.
+		 * @param provider The [debug configuration provider](#DebugConfigurationProvider) to register.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider): Disposable;
 	}
 
 	/**

From 46421c2ec857d6bf5127b36c35018d2ae71ba6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Acu=C3=B1a?= <reacuna@gmail.com>
Date: Fri, 15 Mar 2019 14:52:12 -0300
Subject: [PATCH 688/924] stripe: Use IListOptions on UsageRecordSummaries list
 (#33901)

The docs are not clear if the four parameters are options, but when
trying this out, the call works only if the subscription item id is
separate from the rest of the options (which are a IListOptions).

https://stripe.com/docs/api/usage_records/subscription_item_summary_list?lang=node
---
 types/stripe/index.d.ts      | 16 ++--------------
 types/stripe/stripe-tests.ts |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index dd80286f5b..afa4827f68 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -5794,18 +5794,6 @@ declare namespace Stripe {
             subscription_item: string;
             total_usage: number;
         }
-
-        interface IUsageRecordSummariesListOptions extends IListOptions {
-            /**
-             * Only summary items for the given subscription item.
-             */
-            subscription_item: string;
-            /**
-             * A limit on the number of objects to be returned. The limit can range between 1 and 100.
-             * @default 10
-             */
-            limit?: number;
-        }
     }
 
     // tslint:disable-next-line:no-unnecessary-class
@@ -5826,8 +5814,8 @@ declare namespace Stripe {
             /**
              * Creates a usage record for a specified subscription item and date, and fills it with a quantity.
              */
-            list(data: usageRecordSummaries.IUsageRecordSummariesListOptions, options: HeaderOptions, response?: IResponseFn<usageRecordSummaries.IUsageRecordSummaries>): Promise<usageRecordSummaries.IUsageRecordSummaries>;
-            list(data: usageRecordSummaries.IUsageRecordSummariesListOptions, response?: IResponseFn<usageRecordSummaries.IUsageRecordSummaries>): Promise<usageRecordSummaries.IUsageRecordSummaries>;
+            list(subscriptionItem: string, options: IListOptions, response?: IResponseFn<usageRecordSummaries.IUsageRecordSummaries>): Promise<usageRecordSummaries.IUsageRecordSummaries>;
+            list(subscriptionItem: string, response?: IResponseFn<usageRecordSummaries.IUsageRecordSummaries>): Promise<usageRecordSummaries.IUsageRecordSummaries>;
         }
 
         class Accounts extends StripeResource {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 3cfe1e9f5f..2b122caa1b 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -1381,8 +1381,8 @@ stripe.ephemeralKeys.create({ customer: "cus_5rfJKDJkuxzh5Q" }, { stripe_version
 stripe.usageRecords.create('sub_8QwCiwZ9tmMSpt', { action: 'set', quantity: 10000, timestamp: 1537006853 }).then((usageRecord: Stripe.usageRecords.IUsageRecord) => {});
 stripe.usageRecords.create('sub_8QwCiwZ9tmMSpt', { action: 'set', quantity: 10000, timestamp: 1537006853 }, (err, usageRecord: Stripe.usageRecords.IUsageRecord) => {});
 
-stripe.usageRecordSummaries.list({ subscription_item: 'si_C9gimdd2l9qvCU', limit: 10 }).then((usageRecordSummaries: Stripe.usageRecordSummaries.IUsageRecordSummaries) => {});
-stripe.usageRecordSummaries.list({ subscription_item: 'si_C9gimdd2l9qvCU', limit: 10 }, (err, usageRecordSummaries: Stripe.usageRecordSummaries.IUsageRecordSummaries) => {});
+stripe.usageRecordSummaries.list('si_C9gimdd2l9qvCU', { limit: 10 }).then((usageRecordSummaries: Stripe.usageRecordSummaries.IUsageRecordSummaries) => {});
+stripe.usageRecordSummaries.list('si_C9gimdd2l9qvCU', { limit: 10 }, (err, usageRecordSummaries: Stripe.usageRecordSummaries.IUsageRecordSummaries) => {});
 
 //#region Errors
 // ##################################################################################

From 3426c724886187726884efeb010e6cab059dea4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Acu=C3=B1a?= <reacuna@gmail.com>
Date: Fri, 15 Mar 2019 14:52:30 -0300
Subject: [PATCH 689/924] retrieveLines returns a promise of a IList (#33895)

According to the [Stripe documentation on invoice lines](https://stripe.com/docs/api/invoices/invoice_lines), the return value is a list, not a IInvoiceLineItem.
---
 types/stripe/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index afa4827f68..f86b4bb348 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -7140,10 +7140,10 @@ declare namespace Stripe {
              * @param id The id of the invoice containing the lines to be retrieved
              * @param data Filtering options
              */
-            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
-            retrieveLines(id: string, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<invoices.IInvoiceLineItem>;
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<IList<invoices.IInvoiceLineItem>>;
+            retrieveLines(id: string, data: invoices.IInvoiceLineItemRetrievalOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<IList<invoices.IInvoiceLineItem>>;
+            retrieveLines(id: string, options: HeaderOptions, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<IList<invoices.IInvoiceLineItem>>;
+            retrieveLines(id: string, response?: IResponseFn<IList<invoices.IInvoiceLineItem>>): Promise<IList<invoices.IInvoiceLineItem>>;
 
             /**
              * At any time, you can preview the upcoming invoice for a customer. This will show you all the charges that are pending,

From 187caaea1dc2fca6e7f78bb4bb54ce0eff1929d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Acu=C3=B1a?= <reacuna@gmail.com>
Date: Fri, 15 Mar 2019 14:52:40 -0300
Subject: [PATCH 690/924] stripe: Add type option to IProductListOptions
 (#33900)

* stripe: Add type option to IProductListOptions

https://stripe.com/docs/api/service_products/list?lang=node#list_service_products-type

* Add created property
---
 types/stripe/index.d.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index f86b4bb348..3a71b3d03a 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -3901,6 +3901,17 @@ declare namespace Stripe {
              * Only return products with the given url
              */
             url?: string;
+
+            /**
+             * Only return products of this type
+             */
+            type?: string;
+
+            /**
+             * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp,
+             * or it can be a dictionary with the following options:
+             */
+            created?: IDateFilter;
         }
 
         /**

From b85510d4c2055df9550e00bf78f0a7251dd64912 Mon Sep 17 00:00:00 2001
From: Daniel Luz <mernen@users.noreply.github.com>
Date: Fri, 15 Mar 2019 14:52:59 -0300
Subject: [PATCH 691/924] haversine: add {lat,lng} format (v1.1.1) (#33897)

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

diff --git a/types/haversine/haversine-tests.ts b/types/haversine/haversine-tests.ts
index 5c068ea4b3..de704573f1 100644
--- a/types/haversine/haversine-tests.ts
+++ b/types/haversine/haversine-tests.ts
@@ -33,6 +33,22 @@ const optionsShort: haversine.Options = {
 
 haversine(startShort, endShort, optionsShort);
 
+const startLatLng: haversine.CoordinateLatLng = {
+  lat: 11.4017529,
+  lng: 48.1548256,
+};
+
+const endLatLng: haversine.CoordinateLatLng = {
+  lat: 13.1445551,
+  lng: 52.5065133,
+};
+
+const optionsLatLng: haversine.Options = {
+  format: '{lat,lng}'
+};
+
+haversine(startLatLng, endLatLng, optionsLatLng);
+
 const startLatLon: haversine.LatLonTuple = [11.4017529, 48.1548256];
 
 const endLatLon: haversine.LatLonTuple = [13.1445551, 52.5065133];
diff --git a/types/haversine/index.d.ts b/types/haversine/index.d.ts
index 91123614b2..bd8e620457 100644
--- a/types/haversine/index.d.ts
+++ b/types/haversine/index.d.ts
@@ -14,6 +14,11 @@ declare namespace haversine {
         lat: number;
     }
 
+    interface CoordinateLatLng {
+        lat: number;
+        lng: number;
+    }
+
     type LatLonTuple = [number, number];
 
     interface GeoJSON {
@@ -22,7 +27,7 @@ declare namespace haversine {
         };
     }
 
-    type Coordinate = (CoordinateLongitudeLatitude | CoordinateLonLat | LatLonTuple | GeoJSON);
+    type Coordinate = (CoordinateLongitudeLatitude | CoordinateLonLat | CoordinateLatLng | LatLonTuple | GeoJSON);
 
     interface Options {
         /**
@@ -36,7 +41,7 @@ declare namespace haversine {
         /**
          * Format of coordinate arguments.
          */
-        format?: '[lat,lon]' | '[lon,lat]' | '{lon,lat}' | 'geojson';
+        format?: '[lat,lon]' | '[lon,lat]' | '{lon,lat}' | '{lat,lng}' | 'geojson';
     }
 }
 

From ea96cfcaf4b7707e159e94398d497b1c18e6b3aa Mon Sep 17 00:00:00 2001
From: Jose Garcia <garciajd90@gmail.com>
Date: Fri, 15 Mar 2019 10:53:11 -0700
Subject: [PATCH 692/924] Update gravatar to 1.8.0 (#33898)

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

diff --git a/types/gravatar/gravatar-tests.ts b/types/gravatar/gravatar-tests.ts
index f9a26bc561..9fa79a2d40 100644
--- a/types/gravatar/gravatar-tests.ts
+++ b/types/gravatar/gravatar-tests.ts
@@ -12,3 +12,5 @@ gravatar.url("email@example.com", { s: "200", r: "pg", default: "404" }, false);
 gravatar.url("email@example.com", { d: "404" }, false);
 gravatar.url("email@example.com", { forcedefault: "y" }, false);
 gravatar.url("email@example.com", { f: "y" });
+gravatar.url("email@example.com", { protocol: "https" });
+gravatar.url("email@example.com", { format: "xml" });
diff --git a/types/gravatar/index.d.ts b/types/gravatar/index.d.ts
index 5c2c113ab8..161ba459af 100644
--- a/types/gravatar/index.d.ts
+++ b/types/gravatar/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gravatar v1.4.0
+// Type definitions for gravatar v1.8.0
 // Project: https://github.com/emerleite/node-gravatar
 // Definitions by: Denis Sokolov <https://github.com/denis-sokolov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,6 +9,8 @@ declare namespace GravatarModule {
     default?: string
     f?: string
     forcedefault?: string
+    format?: string
+    protocol?: string
     r?: string
     rating?: string
     s?: string

From 0a90d3ca198db1b2157c260984d27a2da9b22661 Mon Sep 17 00:00:00 2001
From: Jarrett Meyer <meyer_jarrett@lilly.com>
Date: Fri, 15 Mar 2019 13:53:21 -0400
Subject: [PATCH 693/924] Fixes version in index.d.ts header

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

diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index d4ba68d820..3f10e2d1ae 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for D3JS d3-sankey module 0.11.0
+// Type definitions for D3JS d3-sankey module 0.11
 // Project: https://github.com/d3/d3-sankey/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 0.11.0
+// Last module patch version validated against: 0.11
 
 import { Link } from 'd3-shape';
 

From d504c7d2ad8142056f81459c9f2e1a4b249b7d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Acu=C3=B1a?= <reacuna@gmail.com>
Date: Fri, 15 Mar 2019 14:53:55 -0300
Subject: [PATCH 694/924] [@types/stripe] Update invoice list options (#33899)

* [@types/stripe] Update invoice list options

https://stripe.com/docs/api/invoices/list?lang=node

* Add billing and created properties
---
 types/stripe/index.d.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 3a71b3d03a..2a93740f3f 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -2284,12 +2284,32 @@ declare namespace Stripe {
         }
 
         interface IInvoiceListOptions extends IListOptions {
+            /**
+             * The billing mode of the invoice to retrieve. Either `charge_automatically` or `send_invoice`
+             */
+            billing?: "charge_automatically" | "send_invoice";
+
+            /**
+             * A filter on the list based on the object created field. The value can be a string with an integer Unix timestamp,
+             * or it can be a dictionary with the following options:
+             */
+            created?: IDateFilter;
+
             /**
              * The identifier of the customer whose invoices to return. If none is provided, all invoices will be returned.
              */
             customer?: string;
 
-            date?: IDateFilter;
+            /**
+             * A filter on the list based on the object due_date field. The value can be a string with an integer Unix timestamp,
+             * or it can be a dictionary with the following options:
+             */
+            due_date?: IDateFilter;
+
+            /**
+             * Only return invoices for the subscription specified by this subscription ID
+             */
+            subscription?: string;
         }
 
         interface IInvoiceLineItemRetrievalOptions extends IListOptions {

From 4ad9d20428487faf183f917ca6fe90cab06ac403 Mon Sep 17 00:00:00 2001
From: dwhitney <dustin.whitney@gmail.com>
Date: Fri, 15 Mar 2019 13:54:59 -0400
Subject: [PATCH 695/924]  removed 'children' SeriesLines.DataObject.  (#33876)

* removed 'children' SeriesLines.DataObject. It is not mentioned in the API documentation, and there was no comment with a link to the API docs like the other properties in the DataObject Interface.

* added dwhitney as a contributor
---
 types/echarts/index.d.ts                | 1 +
 types/echarts/options/series/lines.d.ts | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 1332f0114a..41b3fe801f 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -7,6 +7,7 @@
 //                 Roman <https://github.com/iRON5>
 //                 Bilal <https://github.com/bilalucar>
 //                 TMTron <https://github.com/tmtron>
+//                 dwhitney <https://github.com/dwhitney>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/echarts/options/series/lines.d.ts b/types/echarts/options/series/lines.d.ts
index 957acf0ac7..de22abf5fb 100644
--- a/types/echarts/options/series/lines.d.ts
+++ b/types/echarts/options/series/lines.d.ts
@@ -13253,8 +13253,6 @@ declare namespace echarts {
                  */
                 name?: string;
 
-                children: [DataObject];
-
                 /**
                  * An array includes two ore more than two coordinates.
                  * Each coordinate could be `[x, y]` in

From 8aef89a3d5ca7d4a9af9a5c082667b91bf0e7216 Mon Sep 17 00:00:00 2001
From: Avi Klaiman <aviklaiman@hotmail.com>
Date: Fri, 15 Mar 2019 19:55:19 +0200
Subject: [PATCH 696/924] Updated types for react-datepicker (#33890)

---
 types/react-datepicker/index.d.ts                 | 7 ++++++-
 types/react-datepicker/react-datepicker-tests.tsx | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index c957411347..522f1faaf9 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-datepicker 2.0
+// Type definitions for react-datepicker 2.2
 // Project: https://github.com/Hacker0x01/react-datepicker
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Andrey Balokha <https://github.com/andrewBalekha>,
@@ -10,6 +10,7 @@
 //                 Justin Grant <https://github.com/justingrant>
 //                 Jake Boone <https://github.com/jakeboone02>
 //                 Roman Nuritdinov <https://github.com/Ky6uk>
+//                 Avi Klaiman <https://github.com/aviklai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -127,6 +128,10 @@ export interface ReactDatePickerProps {
 	weekLabel?: string;
 	withPortal?: boolean;
 	yearDropdownItemNumber?: number;
+	timeInputLabel?: string;
+	inlineFocusSelectedMonth?: boolean;
+	onDayMouseEnter?: (date: Date) => void;
+	onMonthMouseLeave?: () => void;
 }
 
 declare class ReactDatePicker extends React.Component<ReactDatePickerProps> {
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 1188f53763..d7ea788bc7 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -116,6 +116,10 @@ const defaultLocale = getDefaultLocale();
 	weekLabel=""
 	withPortal
 	yearDropdownItemNumber={1}
+	timeInputLabel=""
+	inlineFocusSelectedMonth={false}
+	onDayMouseEnter={(date: Date) => {}}
+	onMonthMouseLeave={() => {}}
 >
 	<div />
 	<span />

From b39dfb354157d5f2d65431792dd97b264fca5263 Mon Sep 17 00:00:00 2001
From: Panagiotis Rikarnto Siavelis <siavelis@ceid.upatras.gr>
Date: Fri, 15 Mar 2019 19:55:44 +0200
Subject: [PATCH 697/924] react-big-calendar: add missing property
 `Messages.noEventsInRange`, update related test. (#33912)

---
 types/react-big-calendar/index.d.ts           |  2 ++
 .../react-big-calendar-tests.tsx              | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index 465c0a722c..0298b276e8 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -7,6 +7,7 @@
 //                 Paul Potsides <https://github.com/strongpauly>
 //                 janb87 <https://github.com/janb87>
 //                 Daniel Thorne <https://github.com/ldthorne>
+//                 Panagiotis Rikarnto Siavelis <https://github.com/siavelis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 import { Validator } from 'prop-types';
@@ -204,6 +205,7 @@ export interface Messages {
     today?: string;
     agenda?: string;
     showMore?: (count: number) => string;
+    noEventsInRange?: string;
 }
 
 export type Culture = string | string[];
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index bfcd9d3f0e..02652609b1 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -131,7 +131,24 @@ class CalendarResource {
                   agendaDateFormat: (date: Date, culture?: string, localizer?: object) => "some-format",
                   dayRangeHeaderFormat: (range: DateRange, culture?: string, localizer?: object) => "some-format"
               }}
-              messages={{}}
+              messages={{
+                date: 'Date',
+                time: 'Time',
+                event: 'Event',
+                allDay: 'All Day',
+                week: 'Week',
+                work_week: 'Work Week',
+                day: 'Day',
+                month: 'Month',
+                previous: 'Back',
+                next: 'Next',
+                yesterday: 'Yesterday',
+                tomorrow: 'Tomorrow',
+                today: 'Today',
+                agenda: 'Agenda',
+                noEventsInRange: 'There are no events in this range.',
+                showMore: total => `+${total} more`,
+              }}
               timeslots={24}
               defaultView={'month'}
               className={'my-calendar'}

From 8ec70ad7f632f06a60147873f8b6eceb3599935c Mon Sep 17 00:00:00 2001
From: Chris Guthrie <caguthrie@users.noreply.github.com>
Date: Fri, 15 Mar 2019 13:56:07 -0400
Subject: [PATCH 698/924] Adding isPureConfig optional property to
 react-highcharts (#33914)

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

diff --git a/types/react-highcharts/index.d.ts b/types/react-highcharts/index.d.ts
index 26a74e28a9..b8f47af4fb 100644
--- a/types/react-highcharts/index.d.ts
+++ b/types/react-highcharts/index.d.ts
@@ -20,6 +20,11 @@ interface ReactHighchartsProps {
      * @param after-render callback.
      */
     callback?(chart: Highcharts.ChartObject): void;
+
+    /**
+     * Chart will not rerender if the config is referentially equal to previous and this property is true
+     */
+    isPureConfig?: boolean;
 }
 
 /**
diff --git a/types/react-highcharts/react-highcharts-tests.tsx b/types/react-highcharts/react-highcharts-tests.tsx
index 7c0841e566..f3e31bd534 100644
--- a/types/react-highcharts/react-highcharts-tests.tsx
+++ b/types/react-highcharts/react-highcharts-tests.tsx
@@ -6,9 +6,12 @@ const config: Highcharts.Options = {};
 
 function callback(chart: Highcharts.ChartObject): void {}
 
+const isPureConfig = true;
+
 export const _ = () => (
     <>
         <ReactHighcharts config={config} />
         <ReactHighcharts config={config} callback={callback} />
+        <ReactHighcharts config={config} callback={callback} isPureConfig={isPureConfig} />
     </>
 );

From d6a5af917091d7145460e04c08039172e8ae9bf9 Mon Sep 17 00:00:00 2001
From: Chris Godsey <cgodsey@centeredgesoftware.com>
Date: Fri, 15 Mar 2019 13:56:39 -0400
Subject: [PATCH 699/924] added chai-moment typescript bindings (#33915)

* added chai-moment typescript bindings

* fixed linting stuff

* added one more newline at the end of a file
---
 types/chai-moment/chai-moment-tests.ts | 14 ++++++++++++++
 types/chai-moment/index.d.ts           | 25 +++++++++++++++++++++++++
 types/chai-moment/tsconfig.json        | 23 +++++++++++++++++++++++
 types/chai-moment/tslint.json          |  1 +
 4 files changed, 63 insertions(+)
 create mode 100644 types/chai-moment/chai-moment-tests.ts
 create mode 100644 types/chai-moment/index.d.ts
 create mode 100644 types/chai-moment/tsconfig.json
 create mode 100644 types/chai-moment/tslint.json

diff --git a/types/chai-moment/chai-moment-tests.ts b/types/chai-moment/chai-moment-tests.ts
new file mode 100644
index 0000000000..6354c4796b
--- /dev/null
+++ b/types/chai-moment/chai-moment-tests.ts
@@ -0,0 +1,14 @@
+import { assert, expect, use } from 'chai';
+import chaiMoment = require('chai-moment');
+
+use(chaiMoment);
+
+// bdd style
+expect('2019-03-14').to.be.afterMoment('2019-03-12', 'day');
+expect('2019-03-14').to.be.beforeMoment('2019-03-16');
+expect('2019-03-14').to.be.sameMoment('2019-03-14', 'day');
+
+// tdd style
+assert.afterMoment('2019-03-14', '2019-03-12');
+assert.beforeMoment('2019-03-14', '2019-03-18', 'day');
+assert.sameMoment('2019-03-14', '2019-03-14', 'day');
diff --git a/types/chai-moment/index.d.ts b/types/chai-moment/index.d.ts
new file mode 100644
index 0000000000..0b19b7573f
--- /dev/null
+++ b/types/chai-moment/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for chai-moment 0.1
+// Project: https://github.com/picardy/chai-moment
+// Definitions by: Chris Godsey <https://github.com/chrisgodsey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare global {
+	namespace Chai {
+		interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+            afterMoment(expected: string, granularity?: string): void;
+            beforeMoment(expected: string, granularity?: string): void;
+            sameMoment(expected: string, granularity?: string): void;
+		}
+
+		interface Assert {
+            afterMoment(val: any, exp: any, granularity?: any, msg?: any): void;
+            beforeMoment(val: any, exp: any, granularity?: any, msg?: any): void;
+            sameMoment(val: any, exp: any, granularity?: any, msg?: any): void;
+		}
+	}
+}
+
+declare function chaiMoment(chai: any, utils: any): void;
+export = chaiMoment;
diff --git a/types/chai-moment/tsconfig.json b/types/chai-moment/tsconfig.json
new file mode 100644
index 0000000000..571fe4f114
--- /dev/null
+++ b/types/chai-moment/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",
+        "chai-moment-tests.ts"
+    ]
+}
diff --git a/types/chai-moment/tslint.json b/types/chai-moment/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/chai-moment/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From ea24e64a67c8748d37c9969c3d49fceeb0b2f0c8 Mon Sep 17 00:00:00 2001
From: James Bellamy <james-ff@users.noreply.github.com>
Date: Fri, 15 Mar 2019 17:57:58 +0000
Subject: [PATCH 700/924] Adding type definitions for react-medium-image-zoom
 (#33911)

* Added type definitions for react-medium-image-zoom

* fixes for react-medium-image-zoom

* fixes for react-medium-image-zoom
---
 types/react-medium-image-zoom/index.d.ts      | 43 +++++++++++++++++++
 .../react-medium-image-zoom-tests.tsx         | 23 ++++++++++
 types/react-medium-image-zoom/tsconfig.json   | 25 +++++++++++
 types/react-medium-image-zoom/tslint.json     |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 types/react-medium-image-zoom/index.d.ts
 create mode 100644 types/react-medium-image-zoom/react-medium-image-zoom-tests.tsx
 create mode 100644 types/react-medium-image-zoom/tsconfig.json
 create mode 100644 types/react-medium-image-zoom/tslint.json

diff --git a/types/react-medium-image-zoom/index.d.ts b/types/react-medium-image-zoom/index.d.ts
new file mode 100644
index 0000000000..b3e9fcf14e
--- /dev/null
+++ b/types/react-medium-image-zoom/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for react-medium-image-zoom 3.0
+// Project: https://github.com/rpearce/react-medium-image-zoom#readme
+// Definitions by: James Bellamy <https://github.com/james-ff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import * as React from "react";
+
+export interface ImageZoom_Image {
+    src: string;
+    alt?: string;
+    className?: string;
+    style?: object;
+}
+
+export interface ImageZoom_ZoomImage {
+    src?: string;
+    alt?: string;
+    className?: string;
+    style?: object;
+}
+
+export interface ImageZoomDefaultStyles {
+    zoomContainer?: object;
+    overlay?: object;
+    image?: object;
+    zoomImage?: object;
+}
+
+export interface ImageZoomProps {
+    image: ImageZoom_Image;
+    zoomImage?: ImageZoom_ZoomImage;
+    zoomMargin?: number;
+    isZoomed?: boolean;
+    shouldHandleZoom?: () => boolean;
+    shouldReplaceImage?: boolean;
+    shouldRespectMaxDimension?: boolean;
+    defaultStyles?: ImageZoomDefaultStyles;
+    onZoom?: () => object;
+    onUnzoom?: () => object;
+}
+
+export default class ImageZoom extends React.Component<ImageZoomProps, any> {}
diff --git a/types/react-medium-image-zoom/react-medium-image-zoom-tests.tsx b/types/react-medium-image-zoom/react-medium-image-zoom-tests.tsx
new file mode 100644
index 0000000000..45d3ef1138
--- /dev/null
+++ b/types/react-medium-image-zoom/react-medium-image-zoom-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from "react";
+import ImageZoom from "react-medium-image-zoom";
+
+const component: React.FC = () => {
+    return (
+        <div>
+            <ImageZoom
+                image={{
+                    src: "https://raw.githubusercontent.com/rpearce/react-medium-image-zoom/master/docs/bridge.jpg",
+                    alt: "Golden Gate Bridge",
+                    className: "img"
+                }}
+                zoomImage={{
+                    src: "https://raw.githubusercontent.com/rpearce/react-medium-image-zoom/master/docs/bridge-big.jpg",
+                    alt: "Golden Gate Bridge",
+                    className: "img--zoomed"
+                }}
+            />
+        </div>
+    );
+};
+
+export default component;
diff --git a/types/react-medium-image-zoom/tsconfig.json b/types/react-medium-image-zoom/tsconfig.json
new file mode 100644
index 0000000000..4b1dd42ee0
--- /dev/null
+++ b/types/react-medium-image-zoom/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-medium-image-zoom-tests.tsx"
+    ]
+}
diff --git a/types/react-medium-image-zoom/tslint.json b/types/react-medium-image-zoom/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-medium-image-zoom/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 52c9a91c220400937b555ee71f77c9f238ed78ea Mon Sep 17 00:00:00 2001
From: Johan Davidsson <johan.davidsson@trewit.se>
Date: Fri, 15 Mar 2019 18:58:24 +0100
Subject: [PATCH 701/924] Fixing missing optional for domutils (#33907)

* Added new types for domelementtype

* Updating PULL_REQUEST_TEMPLATE.md

* Revert changes to .github/PULL_REQUEST_TEMPLATE.md

* Fixed missing optional
---
 types/domutils/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/domutils/index.d.ts b/types/domutils/index.d.ts
index 14971086cb..5300a68a8c 100644
--- a/types/domutils/index.d.ts
+++ b/types/domutils/index.d.ts
@@ -82,7 +82,7 @@ export function getName(elem: DomElement): string;
  * @argument dom An array of DomElement that should be stringified
  * @argument [opts] Optional options object
  */
-export function getOuterHTML(dom: DomElement[], opts: { decodeEntities?: boolean, xmlMode?: boolean}): string;
+export function getOuterHTML(dom: DomElement[], opts?: { decodeEntities?: boolean, xmlMode?: boolean}): string;
 export function getParent(elem: DomElement): DomElement;
 export function getSiblings(elem: DomElement): DomElement[];
 export function getText(elem: DomElement): string;

From e51e5044b8cf1bb317f5ca052cba4531d051a234 Mon Sep 17 00:00:00 2001
From: Evan Kim <evan.kim.390@gmail.com>
Date: Fri, 15 Mar 2019 10:58:55 -0700
Subject: [PATCH 702/924] Add type definitions for turbolinks 5.2 (#33906)

* Add type definition for turbolinks

* Fix style
---
 types/turbolinks/index.d.ts          | 22 ++++++++++++++++++++++
 types/turbolinks/tsconfig.json       | 23 +++++++++++++++++++++++
 types/turbolinks/tslint.json         |  3 +++
 types/turbolinks/turbolinks-tests.ts | 13 +++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 types/turbolinks/index.d.ts
 create mode 100644 types/turbolinks/tsconfig.json
 create mode 100644 types/turbolinks/tslint.json
 create mode 100644 types/turbolinks/turbolinks-tests.ts

diff --git a/types/turbolinks/index.d.ts b/types/turbolinks/index.d.ts
new file mode 100644
index 0000000000..e5e450a292
--- /dev/null
+++ b/types/turbolinks/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for turbolinks 5.2
+// Project: https://github.com/turbolinks/turbolinks
+// Definitions by: evankim390 <https://github.com/evankim390>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Turbolinks;
+export as namespace Turbolinks;
+
+declare const Turbolinks: Turbolinks.TurbolinksStatic;
+
+declare namespace Turbolinks {
+    interface Action {
+        action: "advance" | "replace";
+    }
+    interface TurbolinksStatic {
+        start(): void;
+        visit(location: string, options?: Action): void;
+        clearCache(): void;
+        setProgressBarDelay(delayInMilliseconds: number): void;
+        supported: boolean;
+    }
+}
diff --git a/types/turbolinks/tsconfig.json b/types/turbolinks/tsconfig.json
new file mode 100644
index 0000000000..d77954199b
--- /dev/null
+++ b/types/turbolinks/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",
+      "turbolinks-tests.ts"
+  ]
+}
diff --git a/types/turbolinks/tslint.json b/types/turbolinks/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/turbolinks/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/turbolinks/turbolinks-tests.ts b/types/turbolinks/turbolinks-tests.ts
new file mode 100644
index 0000000000..aa69ee4a62
--- /dev/null
+++ b/types/turbolinks/turbolinks-tests.ts
@@ -0,0 +1,13 @@
+import Turbolinks = require("turbolinks");
+
+Turbolinks.start();
+Turbolinks.visit("/new/path");
+Turbolinks.visit("/new/path", {
+  action: "replace",
+});
+Turbolinks.visit("/new/path", {
+  action: "advance",
+});
+Turbolinks.setProgressBarDelay(100);
+Turbolinks.clearCache();
+Turbolinks.supported;

From 33963c49d45aaa372614673df0bd4106ffaec3c0 Mon Sep 17 00:00:00 2001
From: michaeltnguyen <michaelt.nguyen@hcss.com>
Date: Fri, 15 Mar 2019 16:58:17 -0500
Subject: [PATCH 703/924] Fix onRowClick callback params

---
 types/react-virtualized/dist/es/Table.d.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index b66fac389b..d63d593b6e 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -183,11 +183,7 @@ export class Column extends Component<ColumnProps> {
 }
 
 export type RowMouseEventHandlerParams = {
-    rowData: {
-        columnData: object;
-        id: string;
-        index: number;
-    };
+    rowData: any
     index: number;
     event: React.MouseEvent<any>;
 };

From a23739dd3d700b890b5c6a6ca01b84bf3a14ae58 Mon Sep 17 00:00:00 2001
From: michaeltnguyen <michaelt.nguyen@hcss.com>
Date: Fri, 15 Mar 2019 17:10:32 -0500
Subject: [PATCH 704/924] Update react-virtualized version in index.d.ts

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

diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index c105c4db2f..1fd2fb0b4f 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-virtualized 9.18
+// Type definitions for react-virtualized 9.21
 // Project: https://github.com/bvaughn/react-virtualized
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 //                 John Gunther <https://github.com/guntherjh>

From 2255d9c32d78b9050537602b94e52da8a3d038fb Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Fri, 15 Mar 2019 22:20:39 +0000
Subject: [PATCH 705/924] Added react-native-canvas

---
 types/react-native-canvas/index.d.ts          | 19 +++++++++++++++++++
 .../react-native-canvas-tests.tsx             | 19 +++++++++++++++++++
 types/react-native-canvas/tsconfig.json       | 17 +++++++++++++++++
 types/react-native-canvas/tslint.json         |  1 +
 4 files changed, 56 insertions(+)
 create mode 100644 types/react-native-canvas/index.d.ts
 create mode 100644 types/react-native-canvas/react-native-canvas-tests.tsx
 create mode 100644 types/react-native-canvas/tsconfig.json
 create mode 100644 types/react-native-canvas/tslint.json

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
new file mode 100644
index 0000000000..3dae92869f
--- /dev/null
+++ b/types/react-native-canvas/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for react-native-canvas 0.1
+// Project: https://github.com/iddan/react-native-canvas#readme
+// Definitions by: hmajid2301 <https://github.com/hmajid2301>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+import { StyleProp, ViewStyle } from "react-native";
+
+export interface CanvasProps {
+    style: StyleProp<ViewStyle>;
+    baseUrl: string;
+    originWhitelist: string[];
+}
+
+export default class Canvas extends React.Component<CanvasProps> {}
+export class Image extends React.Component {}
+export class ImageData extends React.Component {}
+export class Path2D extends React.Component {}
diff --git a/types/react-native-canvas/react-native-canvas-tests.tsx b/types/react-native-canvas/react-native-canvas-tests.tsx
new file mode 100644
index 0000000000..1914b78d09
--- /dev/null
+++ b/types/react-native-canvas/react-native-canvas-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from "react";
+import { View } from "react-native";
+import Canvas, {
+    Image as CanvasImage,
+    Path2D,
+    ImageData
+} from "react-native-canvas";
+
+class CanvasTest extends React.Component {
+    render() {
+        return (
+            <View>
+                <Canvas ref={this.handleCanvas} />
+            </View>
+        );
+    }
+
+    handleCanvas = (canvas: Canvas) => {};
+}
diff --git a/types/react-native-canvas/tsconfig.json b/types/react-native-canvas/tsconfig.json
new file mode 100644
index 0000000000..ef85b41bd1
--- /dev/null
+++ b/types/react-native-canvas/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react-native"
+    },
+    "files": ["index.d.ts", "react-native-canvas-tests.tsx"]
+}
diff --git a/types/react-native-canvas/tslint.json b/types/react-native-canvas/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-canvas/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 81a99dfa3b1398316e6999e136f34ed13bdb7eb4 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Fri, 15 Mar 2019 23:21:50 +0100
Subject: [PATCH 706/924] Deprecate types for packages that provide their own
 types

---
 notNeededPackages.json                        | 258 ++++++++++++++++++
 .../aggregate-error/aggregate-error-tests.ts  |   9 -
 types/aggregate-error/index.d.ts              |  12 -
 types/aggregate-error/tsconfig.json           |  23 --
 types/aggregate-error/tslint.json             |   1 -
 .../decompress-response-tests.ts              |   6 -
 types/decompress-response/index.d.ts          |  11 -
 types/decompress-response/tsconfig.json       |  23 --
 types/decompress-response/tslint.json         |   1 -
 types/dom-loaded/dom-loaded-tests.ts          |   3 -
 types/dom-loaded/index.d.ts                   |   7 -
 types/dom-loaded/tsconfig.json                |  24 --
 types/dom-loaded/tslint.json                  |   1 -
 types/element-ready/element-ready-tests.ts    |   9 -
 types/element-ready/index.d.ts                |  10 -
 types/element-ready/tsconfig.json             |  24 --
 types/element-ready/tslint.json               |   1 -
 types/filenamify-url/filenamify-url-tests.ts  |   7 -
 types/filenamify-url/index.d.ts               |   7 -
 types/filenamify-url/tsconfig.json            |  23 --
 types/filenamify-url/tslint.json              |   1 -
 types/filenamify/filenamify-tests.ts          |  10 -
 types/filenamify/index.d.ts                   |  15 -
 types/filenamify/tsconfig.json                |  23 --
 types/filenamify/tslint.json                  |   3 -
 types/fkill/fkill-tests.ts                    |   5 -
 types/fkill/index.d.ts                        |  40 ---
 types/fkill/tsconfig.json                     |  23 --
 types/fkill/tslint.json                       |   1 -
 types/get-stream/get-stream-tests.ts          |  12 -
 types/get-stream/index.d.ts                   |  62 -----
 types/get-stream/tsconfig.json                |  23 --
 types/get-stream/tslint.json                  |   6 -
 types/has-yarn/has-yarn-tests.ts              |   4 -
 types/has-yarn/index.d.ts                     |   8 -
 types/has-yarn/tsconfig.json                  |  23 --
 types/has-yarn/tslint.json                    |   1 -
 types/hasha/hasha-tests.ts                    |  19 --
 types/hasha/index.d.ts                        |  38 ---
 types/hasha/tsconfig.json                     |  23 --
 types/hasha/tslint.json                       |   6 -
 types/into-stream/index.d.ts                  |  17 --
 types/into-stream/into-stream-tests.ts        |  27 --
 types/into-stream/tsconfig.json               |  23 --
 types/into-stream/tslint.json                 |   1 -
 types/is-scoped/index.d.ts                    |   8 -
 types/is-scoped/is-scoped-tests.ts            |   6 -
 types/is-scoped/tsconfig.json                 |  23 --
 types/is-scoped/tslint.json                   |   1 -
 types/latest-version/index.d.ts               |  14 -
 types/latest-version/latest-version-tests.ts  |   4 -
 types/latest-version/tsconfig.json            |  23 --
 types/latest-version/tslint.json              |   1 -
 types/leven/index.d.ts                        |   8 -
 types/leven/leven-tests.ts                    |   7 -
 types/leven/tsconfig.json                     |  23 --
 types/leven/tslint.json                       |   1 -
 types/mem/index.d.ts                          |  17 --
 types/mem/mem-tests.ts                        |  10 -
 types/mem/tsconfig.json                       |  23 --
 types/mem/tslint.json                         |   6 -
 types/npm-email/index.d.ts                    |  14 -
 types/npm-email/npm-email-tests.ts            |   3 -
 types/npm-email/tsconfig.json                 |  23 --
 types/npm-email/tslint.json                   |   1 -
 types/npm-keyword/index.d.ts                  |  44 ---
 types/npm-keyword/npm-keyword-tests.ts        |   7 -
 types/npm-keyword/tsconfig.json               |  23 --
 types/npm-keyword/tslint.json                 |   1 -
 types/npm-user/index.d.ts                     |  18 --
 types/npm-user/npm-user-tests.ts              |  11 -
 types/npm-user/tsconfig.json                  |  23 --
 types/npm-user/tslint.json                    |   1 -
 types/p-any/index.d.ts                        |  41 ---
 types/p-any/p-any-tests.ts                    |  24 --
 types/p-any/tsconfig.json                     |  23 --
 types/p-any/tslint.json                       |   1 -
 types/p-cancelable/index.d.ts                 |  70 -----
 types/p-cancelable/p-cancelable-tests.ts      |  88 ------
 types/p-cancelable/tsconfig.json              |  23 --
 types/p-cancelable/tslint.json                |   1 -
 types/p-catch-if/index.d.ts                   |  12 -
 types/p-catch-if/p-catch-if-tests.ts          |  39 ---
 types/p-catch-if/tsconfig.json                |  23 --
 types/p-catch-if/tslint.json                  |   1 -
 types/p-debounce/index.d.ts                   |  45 ---
 types/p-debounce/p-debounce-tests.ts          |  26 --
 types/p-debounce/tsconfig.json                |  23 --
 types/p-debounce/tslint.json                  |   1 -
 types/p-each-series/index.d.ts                |   8 -
 types/p-each-series/p-each-series-tests.ts    |  19 --
 types/p-each-series/tsconfig.json             |  23 --
 types/p-each-series/tslint.json               |   1 -
 types/p-every/index.d.ts                      |  16 --
 types/p-every/p-every-tests.ts                |  26 --
 types/p-every/tsconfig.json                   |  23 --
 types/p-every/tslint.json                     |   1 -
 types/p-locate/index.d.ts                     |  15 -
 types/p-locate/p-locate-tests.ts              |  14 -
 types/p-locate/tsconfig.json                  |  23 --
 types/p-locate/tslint.json                    |   1 -
 types/p-log/index.d.ts                        |  13 -
 types/p-log/p-log-tests.ts                    |  15 -
 types/p-log/tsconfig.json                     |  23 --
 types/p-log/tslint.json                       |   1 -
 types/p-map-series/index.d.ts                 |   9 -
 types/p-map-series/p-map-series-tests.ts      |  19 --
 types/p-map-series/tsconfig.json              |  23 --
 types/p-map-series/tslint.json                |   1 -
 types/p-memoize/index.d.ts                    |  56 ----
 types/p-memoize/p-memoize-tests.ts            |  13 -
 types/p-memoize/tsconfig.json                 |  16 --
 types/p-memoize/tslint.json                   |   1 -
 types/p-one/index.d.ts                        |  16 --
 types/p-one/p-one-tests.ts                    |  26 --
 types/p-one/tsconfig.json                     |  23 --
 types/p-one/tslint.json                       |   1 -
 types/p-progress/index.d.ts                   | 175 ------------
 types/p-progress/p-progress-tests.ts          |  31 ---
 types/p-progress/tsconfig.json                |  23 --
 types/p-progress/tslint.json                  |   1 -
 types/p-props/index.d.ts                      |  10 -
 types/p-props/p-props-tests.ts                |  21 --
 types/p-props/tsconfig.json                   |  23 --
 types/p-props/tslint.json                     |   6 -
 types/p-reduce/index.d.ts                     |  11 -
 types/p-reduce/p-reduce-tests.ts              |  27 --
 types/p-reduce/tsconfig.json                  |  23 --
 types/p-reduce/tslint.json                    |   1 -
 types/p-retry/index.d.ts                      |  28 --
 types/p-retry/p-retry-tests.ts                |  20 --
 types/p-retry/tsconfig.json                   |  23 --
 types/p-retry/tslint.json                     |   1 -
 types/p-series/index.d.ts                     |   9 -
 types/p-series/p-series-tests.ts              |  18 --
 types/p-series/tsconfig.json                  |  23 --
 types/p-series/tslint.json                    |   1 -
 types/p-tap/index.d.ts                        |  13 -
 types/p-tap/p-tap-tests.ts                    |  26 --
 types/p-tap/tsconfig.json                     |  23 --
 types/p-tap/tslint.json                       |   1 -
 types/p-timeout/index.d.ts                    |  16 --
 types/p-timeout/p-timeout-tests.ts            |  29 --
 types/p-timeout/tsconfig.json                 |  23 --
 types/p-timeout/tslint.json                   |   1 -
 types/package-json/index.d.ts                 |  77 ------
 types/package-json/package-json-tests.ts      |   6 -
 types/package-json/tsconfig.json              |  23 --
 types/package-json/tslint.json                |   1 -
 types/path-type/index.d.ts                    |  15 -
 types/path-type/path-type-tests.ts            |  15 -
 types/path-type/tsconfig.json                 |  23 --
 types/path-type/tslint.json                   |   1 -
 types/pkg-dir/index.d.ts                      |  12 -
 types/pkg-dir/pkg-dir-tests.ts                |  11 -
 types/pkg-dir/tsconfig.json                   |  23 --
 types/pkg-dir/tslint.json                     |   1 -
 types/pkg-versions/index.d.ts                 |   8 -
 types/pkg-versions/pkg-versions-tests.ts      |   3 -
 types/pkg-versions/tsconfig.json              |  23 --
 types/pkg-versions/tslint.json                |   1 -
 types/sindresorhus__df/index.d.ts             |  21 --
 .../sindresorhus__df-tests.ts                 |  37 ---
 types/sindresorhus__df/tsconfig.json          |  28 --
 types/sindresorhus__df/tslint.json            |   1 -
 types/unused-filename/index.d.ts              |  12 -
 types/unused-filename/tsconfig.json           |  23 --
 types/unused-filename/tslint.json             |   1 -
 .../unused-filename/unused-filename-tests.ts  |   5 -
 types/wallpaper/index.d.ts                    |  11 -
 types/wallpaper/tsconfig.json                 |  23 --
 types/wallpaper/tslint.json                   |   1 -
 types/wallpaper/wallpaper-tests.ts            |   8 -
 173 files changed, 258 insertions(+), 2848 deletions(-)
 delete mode 100644 types/aggregate-error/aggregate-error-tests.ts
 delete mode 100644 types/aggregate-error/index.d.ts
 delete mode 100644 types/aggregate-error/tsconfig.json
 delete mode 100644 types/aggregate-error/tslint.json
 delete mode 100644 types/decompress-response/decompress-response-tests.ts
 delete mode 100644 types/decompress-response/index.d.ts
 delete mode 100644 types/decompress-response/tsconfig.json
 delete mode 100644 types/decompress-response/tslint.json
 delete mode 100644 types/dom-loaded/dom-loaded-tests.ts
 delete mode 100644 types/dom-loaded/index.d.ts
 delete mode 100644 types/dom-loaded/tsconfig.json
 delete mode 100644 types/dom-loaded/tslint.json
 delete mode 100644 types/element-ready/element-ready-tests.ts
 delete mode 100644 types/element-ready/index.d.ts
 delete mode 100644 types/element-ready/tsconfig.json
 delete mode 100644 types/element-ready/tslint.json
 delete mode 100644 types/filenamify-url/filenamify-url-tests.ts
 delete mode 100644 types/filenamify-url/index.d.ts
 delete mode 100644 types/filenamify-url/tsconfig.json
 delete mode 100644 types/filenamify-url/tslint.json
 delete mode 100644 types/filenamify/filenamify-tests.ts
 delete mode 100644 types/filenamify/index.d.ts
 delete mode 100644 types/filenamify/tsconfig.json
 delete mode 100644 types/filenamify/tslint.json
 delete mode 100644 types/fkill/fkill-tests.ts
 delete mode 100644 types/fkill/index.d.ts
 delete mode 100644 types/fkill/tsconfig.json
 delete mode 100644 types/fkill/tslint.json
 delete mode 100644 types/get-stream/get-stream-tests.ts
 delete mode 100644 types/get-stream/index.d.ts
 delete mode 100644 types/get-stream/tsconfig.json
 delete mode 100644 types/get-stream/tslint.json
 delete mode 100644 types/has-yarn/has-yarn-tests.ts
 delete mode 100644 types/has-yarn/index.d.ts
 delete mode 100644 types/has-yarn/tsconfig.json
 delete mode 100644 types/has-yarn/tslint.json
 delete mode 100644 types/hasha/hasha-tests.ts
 delete mode 100644 types/hasha/index.d.ts
 delete mode 100644 types/hasha/tsconfig.json
 delete mode 100644 types/hasha/tslint.json
 delete mode 100644 types/into-stream/index.d.ts
 delete mode 100644 types/into-stream/into-stream-tests.ts
 delete mode 100644 types/into-stream/tsconfig.json
 delete mode 100644 types/into-stream/tslint.json
 delete mode 100644 types/is-scoped/index.d.ts
 delete mode 100644 types/is-scoped/is-scoped-tests.ts
 delete mode 100644 types/is-scoped/tsconfig.json
 delete mode 100644 types/is-scoped/tslint.json
 delete mode 100644 types/latest-version/index.d.ts
 delete mode 100644 types/latest-version/latest-version-tests.ts
 delete mode 100644 types/latest-version/tsconfig.json
 delete mode 100644 types/latest-version/tslint.json
 delete mode 100644 types/leven/index.d.ts
 delete mode 100644 types/leven/leven-tests.ts
 delete mode 100644 types/leven/tsconfig.json
 delete mode 100644 types/leven/tslint.json
 delete mode 100644 types/mem/index.d.ts
 delete mode 100644 types/mem/mem-tests.ts
 delete mode 100644 types/mem/tsconfig.json
 delete mode 100644 types/mem/tslint.json
 delete mode 100644 types/npm-email/index.d.ts
 delete mode 100644 types/npm-email/npm-email-tests.ts
 delete mode 100644 types/npm-email/tsconfig.json
 delete mode 100644 types/npm-email/tslint.json
 delete mode 100644 types/npm-keyword/index.d.ts
 delete mode 100644 types/npm-keyword/npm-keyword-tests.ts
 delete mode 100644 types/npm-keyword/tsconfig.json
 delete mode 100644 types/npm-keyword/tslint.json
 delete mode 100644 types/npm-user/index.d.ts
 delete mode 100644 types/npm-user/npm-user-tests.ts
 delete mode 100644 types/npm-user/tsconfig.json
 delete mode 100644 types/npm-user/tslint.json
 delete mode 100644 types/p-any/index.d.ts
 delete mode 100644 types/p-any/p-any-tests.ts
 delete mode 100644 types/p-any/tsconfig.json
 delete mode 100644 types/p-any/tslint.json
 delete mode 100644 types/p-cancelable/index.d.ts
 delete mode 100644 types/p-cancelable/p-cancelable-tests.ts
 delete mode 100644 types/p-cancelable/tsconfig.json
 delete mode 100644 types/p-cancelable/tslint.json
 delete mode 100644 types/p-catch-if/index.d.ts
 delete mode 100644 types/p-catch-if/p-catch-if-tests.ts
 delete mode 100644 types/p-catch-if/tsconfig.json
 delete mode 100644 types/p-catch-if/tslint.json
 delete mode 100644 types/p-debounce/index.d.ts
 delete mode 100644 types/p-debounce/p-debounce-tests.ts
 delete mode 100644 types/p-debounce/tsconfig.json
 delete mode 100644 types/p-debounce/tslint.json
 delete mode 100644 types/p-each-series/index.d.ts
 delete mode 100644 types/p-each-series/p-each-series-tests.ts
 delete mode 100644 types/p-each-series/tsconfig.json
 delete mode 100644 types/p-each-series/tslint.json
 delete mode 100644 types/p-every/index.d.ts
 delete mode 100644 types/p-every/p-every-tests.ts
 delete mode 100644 types/p-every/tsconfig.json
 delete mode 100644 types/p-every/tslint.json
 delete mode 100644 types/p-locate/index.d.ts
 delete mode 100644 types/p-locate/p-locate-tests.ts
 delete mode 100644 types/p-locate/tsconfig.json
 delete mode 100644 types/p-locate/tslint.json
 delete mode 100644 types/p-log/index.d.ts
 delete mode 100644 types/p-log/p-log-tests.ts
 delete mode 100644 types/p-log/tsconfig.json
 delete mode 100644 types/p-log/tslint.json
 delete mode 100644 types/p-map-series/index.d.ts
 delete mode 100644 types/p-map-series/p-map-series-tests.ts
 delete mode 100644 types/p-map-series/tsconfig.json
 delete mode 100644 types/p-map-series/tslint.json
 delete mode 100644 types/p-memoize/index.d.ts
 delete mode 100644 types/p-memoize/p-memoize-tests.ts
 delete mode 100644 types/p-memoize/tsconfig.json
 delete mode 100644 types/p-memoize/tslint.json
 delete mode 100644 types/p-one/index.d.ts
 delete mode 100644 types/p-one/p-one-tests.ts
 delete mode 100644 types/p-one/tsconfig.json
 delete mode 100644 types/p-one/tslint.json
 delete mode 100644 types/p-progress/index.d.ts
 delete mode 100644 types/p-progress/p-progress-tests.ts
 delete mode 100644 types/p-progress/tsconfig.json
 delete mode 100644 types/p-progress/tslint.json
 delete mode 100644 types/p-props/index.d.ts
 delete mode 100644 types/p-props/p-props-tests.ts
 delete mode 100644 types/p-props/tsconfig.json
 delete mode 100644 types/p-props/tslint.json
 delete mode 100644 types/p-reduce/index.d.ts
 delete mode 100644 types/p-reduce/p-reduce-tests.ts
 delete mode 100644 types/p-reduce/tsconfig.json
 delete mode 100644 types/p-reduce/tslint.json
 delete mode 100644 types/p-retry/index.d.ts
 delete mode 100644 types/p-retry/p-retry-tests.ts
 delete mode 100644 types/p-retry/tsconfig.json
 delete mode 100644 types/p-retry/tslint.json
 delete mode 100644 types/p-series/index.d.ts
 delete mode 100644 types/p-series/p-series-tests.ts
 delete mode 100644 types/p-series/tsconfig.json
 delete mode 100644 types/p-series/tslint.json
 delete mode 100644 types/p-tap/index.d.ts
 delete mode 100644 types/p-tap/p-tap-tests.ts
 delete mode 100644 types/p-tap/tsconfig.json
 delete mode 100644 types/p-tap/tslint.json
 delete mode 100644 types/p-timeout/index.d.ts
 delete mode 100644 types/p-timeout/p-timeout-tests.ts
 delete mode 100644 types/p-timeout/tsconfig.json
 delete mode 100644 types/p-timeout/tslint.json
 delete mode 100644 types/package-json/index.d.ts
 delete mode 100644 types/package-json/package-json-tests.ts
 delete mode 100644 types/package-json/tsconfig.json
 delete mode 100644 types/package-json/tslint.json
 delete mode 100644 types/path-type/index.d.ts
 delete mode 100644 types/path-type/path-type-tests.ts
 delete mode 100644 types/path-type/tsconfig.json
 delete mode 100644 types/path-type/tslint.json
 delete mode 100644 types/pkg-dir/index.d.ts
 delete mode 100644 types/pkg-dir/pkg-dir-tests.ts
 delete mode 100644 types/pkg-dir/tsconfig.json
 delete mode 100644 types/pkg-dir/tslint.json
 delete mode 100644 types/pkg-versions/index.d.ts
 delete mode 100644 types/pkg-versions/pkg-versions-tests.ts
 delete mode 100644 types/pkg-versions/tsconfig.json
 delete mode 100644 types/pkg-versions/tslint.json
 delete mode 100644 types/sindresorhus__df/index.d.ts
 delete mode 100644 types/sindresorhus__df/sindresorhus__df-tests.ts
 delete mode 100644 types/sindresorhus__df/tsconfig.json
 delete mode 100644 types/sindresorhus__df/tslint.json
 delete mode 100644 types/unused-filename/index.d.ts
 delete mode 100644 types/unused-filename/tsconfig.json
 delete mode 100644 types/unused-filename/tslint.json
 delete mode 100644 types/unused-filename/unused-filename-tests.ts
 delete mode 100644 types/wallpaper/index.d.ts
 delete mode 100644 types/wallpaper/tsconfig.json
 delete mode 100644 types/wallpaper/tslint.json
 delete mode 100644 types/wallpaper/wallpaper-tests.ts

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 812d1f9f1b..4cda1eb572 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -18,6 +18,12 @@
             "sourceRepoURL": "https://github.com/ceolter/ag-grid",
             "asOfVersion": "3.2.0"
         },
+        {
+            "libraryName": "aggregate-error",
+            "typingsPackageName": "aggregate-error",
+            "sourceRepoURL": "https://github.com/sindresorhus/aggregate-error",
+            "asOfVersion": "2.2.0"
+        },
         {
             "libraryName": "ajv",
             "typingsPackageName": "ajv",
@@ -468,6 +474,12 @@
             "sourceRepoURL": "https://github.com/MikeMcl/decimal.js",
             "asOfVersion": "7.4.0"
         },
+        {
+            "libraryName": "decompress-response",
+            "typingsPackageName": "decompress-response",
+            "sourceRepoURL": "https://github.com/sindresorhus/decompress-response",
+            "asOfVersion": "4.1.0"
+        },
         {
             "libraryName": "deepmerge",
             "typingsPackageName": "deepmerge",
@@ -510,6 +522,12 @@
             "sourceRepoURL": "https://github.com/joyent/docker-file-parser",
             "asOfVersion": "1.0.3"
         },
+        {
+            "libraryName": "dom-loaded",
+            "typingsPackageName": "dom-loaded",
+            "sourceRepoURL": "https://github.com/sindresorhus/dom-loaded",
+            "asOfVersion": "1.1.0"
+        },
         {
             "libraryName": "dot-case",
             "typingsPackageName": "dot-case",
@@ -564,6 +582,12 @@
             "sourceRepoURL": "https://github.com/loopline-systems/electron-builder",
             "asOfVersion": "2.8.0"
         },
+        {
+            "libraryName": "element-ready",
+            "typingsPackageName": "element-ready",
+            "sourceRepoURL": "https://github.com/sindresorhus/element-ready",
+            "asOfVersion": "3.1.0"
+        },
         {
             "libraryName": "email-addresses",
             "typingsPackageName": "email-addresses",
@@ -684,6 +708,18 @@
             "sourceRepoURL": "https://github.com/sindresorhus/file-type",
             "asOfVersion": "10.9.1"
         },
+        {
+            "libraryName": "filenamify",
+            "typingsPackageName": "filenamify",
+            "sourceRepoURL": "https://github.com/sindresorhus/filenamify",
+            "asOfVersion": "3.0.0"
+        },
+        {
+            "libraryName": "filenamify-url",
+            "typingsPackageName": "filenamify-url",
+            "sourceRepoURL": "https://github.com/sindresorhus/filenamify-url",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "FineUploader",
             "typingsPackageName": "fine-uploader",
@@ -696,6 +732,12 @@
             "sourceRepoURL": "https://www.firebase.com/docs/javascript/firebase",
             "asOfVersion": "3.2.1"
         },
+        {
+            "libraryName": "fkill",
+            "typingsPackageName": "fkill",
+            "sourceRepoURL": "https://github.com/sindresorhus/fkill",
+            "asOfVersion": "6.0.0"
+        },
         {
             "libraryName": "flatpickr",
             "typingsPackageName": "flatpickr",
@@ -744,6 +786,12 @@
             "sourceRepoURL": "https://github.com/manuelbieh/Geolib",
             "asOfVersion": "2.0.23"
         },
+        {
+            "libraryName": "get-stream",
+            "typingsPackageName": "get-stream",
+            "sourceRepoURL": "https://github.com/sindresorhus/get-stream",
+            "asOfVersion": "5.0.0"
+        },
         {
             "libraryName": "github",
             "typingsPackageName": "github",
@@ -810,6 +858,18 @@
             "sourceRepoURL": "https://handsontable.com/",
             "asOfVersion": "0.35.0"
         },
+        {
+            "libraryName": "has-yarn",
+            "typingsPackageName": "has-yarn",
+            "sourceRepoURL": "https://github.com/sindresorhus/has-yarn",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "hasha",
+            "typingsPackageName": "hasha",
+            "sourceRepoURL": "https://github.com/sindresorhus/hasha",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "hibp",
             "typingsPackageName": "hibp",
@@ -888,6 +948,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/internal-ip",
             "asOfVersion": "4.1.0"
         },
+        {
+            "libraryName": "into-stream",
+            "typingsPackageName": "into-stream",
+            "sourceRepoURL": "https://github.com/sindresorhus/into-stream",
+            "asOfVersion": "5.0.0"
+        },
         {
             "libraryName": "inversify",
             "typingsPackageName": "inversify",
@@ -948,6 +1014,12 @@
             "sourceRepoURL": "https://github.com/jonschlinkert/is-plain-object",
             "asOfVersion": "2.0.4"
         },
+        {
+            "libraryName": "is-scoped",
+            "typingsPackageName": "is-scoped",
+            "sourceRepoURL": "https://github.com/sindresorhus/is-scoped",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "is-svg",
             "typingsPackageName": "is-svg",
@@ -1056,6 +1128,12 @@
             "sourceRepoURL": "https://github.com/elitechance/lambda-phi",
             "asOfVersion": "1.0.1"
         },
+        {
+            "libraryName": "latest-version",
+            "typingsPackageName": "latest-version",
+            "sourceRepoURL": "https://github.com/sindresorhus/latest-version",
+            "asOfVersion": "5.0.0"
+        },
         {
             "libraryName": "ldclient-js",
             "typingsPackageName": "ldclient-js",
@@ -1068,6 +1146,12 @@
             "sourceRepoURL": "https://github.com/stevemao/left-pad",
             "asOfVersion": "1.2.0"
         },
+        {
+            "libraryName": "leven",
+            "typingsPackageName": "leven",
+            "sourceRepoURL": "https://github.com/sindresorhus/leven",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "Linq.JS",
             "typingsPackageName": "linq",
@@ -1158,6 +1242,12 @@
             "sourceRepoURL": "https://github.com/runk/node-maxmind",
             "asOfVersion": "2.0.5"
         },
+        {
+            "libraryName": "mem",
+            "typingsPackageName": "mem",
+            "sourceRepoURL": "https://github.com/sindresorhus/mem",
+            "asOfVersion": "4.2.0"
+        },
         {
             "libraryName": "mendixmodelsdk",
             "typingsPackageName": "mendixmodelsdk",
@@ -1260,6 +1350,18 @@
             "sourceRepoURL": "https://github.com/paularmstrong/normalizr",
             "asOfVersion": "2.0.18"
         },
+        {
+            "libraryName": "npm-email",
+            "typingsPackageName": "npm-email",
+            "sourceRepoURL": "https://github.com/sindresorhus/npm-email",
+            "asOfVersion": "3.1.0"
+        },
+        {
+            "libraryName": "npm-keyword",
+            "typingsPackageName": "npm-keyword",
+            "sourceRepoURL": "https://github.com/sindresorhus/npm-keyword",
+            "asOfVersion": "6.0.0"
+        },
         {
             "libraryName": "npm-name",
             "typingsPackageName": "npm-name",
@@ -1272,6 +1374,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/npm-run-path",
             "asOfVersion": "3.0.1"
         },
+        {
+            "libraryName": "npm-user",
+            "typingsPackageName": "npm-user",
+            "sourceRepoURL": "https://github.com/sindresorhus/npm-user",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "Nuka Carousel",
             "typingsPackageName": "nuka-carousel",
@@ -1302,48 +1410,162 @@
             "sourceRepoURL": "https://github.com/sindresorhus/ora",
             "asOfVersion": "3.2.0"
         },
+        {
+            "libraryName": "p-any",
+            "typingsPackageName": "p-any",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-any",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "p-cancelable",
+            "typingsPackageName": "p-cancelable",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-cancelable",
+            "asOfVersion": "1.1.0"
+        },
+        {
+            "libraryName": "p-catch-if",
+            "typingsPackageName": "p-catch-if",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-catch-if",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "p-debounce",
+            "typingsPackageName": "p-debounce",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-debounce",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "p-each-series",
+            "typingsPackageName": "p-each-series",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-each-series",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-event",
             "typingsPackageName": "p-event",
             "sourceRepoURL": "https://github.com/sindresorhus/p-event",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "p-every",
+            "typingsPackageName": "p-every",
+            "sourceRepoURL": "https://github.com/kevva/p-every",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-limit",
             "typingsPackageName": "p-limit",
             "sourceRepoURL": "https://github.com/sindresorhus/p-limit",
             "asOfVersion": "2.2.0"
         },
+        {
+            "libraryName": "p-locate",
+            "typingsPackageName": "p-locate",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-locate",
+            "asOfVersion": "4.0.0"
+        },
+        {
+            "libraryName": "p-log",
+            "typingsPackageName": "p-log",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-log",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-map",
             "typingsPackageName": "p-map",
             "sourceRepoURL": "https://github.com/sindresorhus/p-map",
             "asOfVersion": "2.0.0"
         },
+        {
+            "libraryName": "p-map-series",
+            "typingsPackageName": "p-map-series",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-map-series",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "p-memoize",
+            "typingsPackageName": "p-memoize",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-memoize",
+            "asOfVersion": "3.0.0"
+        },
+        {
+            "libraryName": "p-one",
+            "typingsPackageName": "p-one",
+            "sourceRepoURL": "https://github.com/kevva/p-one",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-pipe",
             "typingsPackageName": "p-pipe",
             "sourceRepoURL": "https://github.com/sindresorhus/p-pipe",
             "asOfVersion": "2.0.1"
         },
+        {
+            "libraryName": "p-progress",
+            "typingsPackageName": "p-progress",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-progress",
+            "asOfVersion": "0.3.0"
+        },
+        {
+            "libraryName": "p-props",
+            "typingsPackageName": "p-props",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-props",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-queue",
             "typingsPackageName": "p-queue",
             "sourceRepoURL": "https://github.com/sindresorhus/p-queue",
             "asOfVersion": "3.2.1"
         },
+        {
+            "libraryName": "p-reduce",
+            "typingsPackageName": "p-reduce",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-reduce",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "p-retry",
+            "typingsPackageName": "p-retry",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-retry",
+            "asOfVersion": "4.0.0"
+        },
+        {
+            "libraryName": "p-series",
+            "typingsPackageName": "p-series",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-series",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-some",
             "typingsPackageName": "p-some",
             "sourceRepoURL": "https://github.com/sindresorhus/p-some",
             "asOfVersion": "4.0.1"
         },
+        {
+            "libraryName": "p-tap",
+            "typingsPackageName": "p-tap",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-tap",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "p-throttle",
             "typingsPackageName": "p-throttle",
             "sourceRepoURL": "https://github.com/sindresorhus/p-throttle",
             "asOfVersion": "2.1.0"
         },
+        {
+            "libraryName": "p-timeout",
+            "typingsPackageName": "p-timeout",
+            "sourceRepoURL": "https://github.com/sindresorhus/p-timeout",
+            "asOfVersion": "3.0.0"
+        },
+        {
+            "libraryName": "package-json",
+            "typingsPackageName": "package-json",
+            "sourceRepoURL": "https://github.com/sindresorhus/package-json",
+            "asOfVersion": "6.1.0"
+        },
         {
             "libraryName": "param-case",
             "typingsPackageName": "param-case",
@@ -1380,6 +1602,12 @@
             "sourceRepoURL": "https://github.com/pillarjs/path-to-regexp",
             "asOfVersion": "1.7.0"
         },
+        {
+            "libraryName": "path-type",
+            "typingsPackageName": "path-type",
+            "sourceRepoURL": "https://github.com/sindresorhus/path-type",
+            "asOfVersion": "4.0.0"
+        },
         {
             "libraryName": "perfect-scrollbar",
             "typingsPackageName": "perfect-scrollbar",
@@ -1422,6 +1650,18 @@
             "sourceRepoURL": "https://github.com/sindresorhus/pkg-conf",
             "asOfVersion": "3.0.0"
         },
+        {
+            "libraryName": "pkg-dir",
+            "typingsPackageName": "pkg-dir",
+            "sourceRepoURL": "https://github.com/sindresorhus/pkg-dir",
+            "asOfVersion": "4.0.0"
+        },
+        {
+            "libraryName": "pkg-versions",
+            "typingsPackageName": "pkg-versions",
+            "sourceRepoURL": "https://github.com/sindresorhus/pkg-versions",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "plottable",
             "typingsPackageName": "plottable",
@@ -1800,6 +2040,12 @@
             "sourceRepoURL": "https://github.com/zeh/simplesignal",
             "asOfVersion": "1.0.0"
         },
+        {
+            "libraryName": "@sindresorhus/df",
+            "typingsPackageName": "sindresorhus__df",
+            "sourceRepoURL": "https://github.com/sindresorhus/df",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "@sindresorhus/slugify",
             "typingsPackageName": "sindresorhus__slugify",
@@ -2004,6 +2250,12 @@
             "sourceRepoURL": "https://github.com/kriasoft/universal-router",
             "asOfVersion": "8.0.0"
         },
+        {
+            "libraryName": "unused-filename",
+            "typingsPackageName": "unused-filename",
+            "sourceRepoURL": "https://github.com/sindresorhus/unused-filename",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "upper-case",
             "typingsPackageName": "upper-case",
@@ -2064,6 +2316,12 @@
             "sourceRepoURL": "https://github.com/sindresorhus/wait-for-localhost",
             "asOfVersion": "3.1.0"
         },
+        {
+            "libraryName": "wallpaper",
+            "typingsPackageName": "wallpaper",
+            "sourceRepoURL": "https://github.com/sindresorhus/wallpaper",
+            "asOfVersion": "4.3.0"
+        },
         {
             "libraryName": "webcola",
             "typingsPackageName": "webcola",
diff --git a/types/aggregate-error/aggregate-error-tests.ts b/types/aggregate-error/aggregate-error-tests.ts
deleted file mode 100644
index 69e544f9ee..0000000000
--- a/types/aggregate-error/aggregate-error-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import AggregateError = require('aggregate-error');
-
-const err = new AggregateError([new Error('foo'), 'bar']);
-
-for (const el of Array.from(err)) {
-    const err: Error = el;
-}
-
-throw err;
diff --git a/types/aggregate-error/index.d.ts b/types/aggregate-error/index.d.ts
deleted file mode 100644
index 8c8c4cd3b2..0000000000
--- a/types/aggregate-error/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for aggregate-error 1.0
-// Project: https://github.com/sindresorhus/aggregate-error#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = AggregateError;
-
-declare class AggregateError extends Error implements Iterable<Error> {
-    constructor(errors: Iterable<Error | string>);
-
-    [Symbol.iterator](): Iterator<Error>;
-}
diff --git a/types/aggregate-error/tsconfig.json b/types/aggregate-error/tsconfig.json
deleted file mode 100644
index f092ab1c3e..0000000000
--- a/types/aggregate-error/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "aggregate-error-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/aggregate-error/tslint.json b/types/aggregate-error/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/aggregate-error/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/decompress-response/decompress-response-tests.ts b/types/decompress-response/decompress-response-tests.ts
deleted file mode 100644
index f47665cbe0..0000000000
--- a/types/decompress-response/decompress-response-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 8e7ec88646..0000000000
--- a/types/decompress-response/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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
deleted file mode 100644
index c7a77a9fd1..0000000000
--- a/types/decompress-response/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "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
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/decompress-response/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/dom-loaded/dom-loaded-tests.ts b/types/dom-loaded/dom-loaded-tests.ts
deleted file mode 100644
index f8a3e5486d..0000000000
--- a/types/dom-loaded/dom-loaded-tests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import domLoaded = require("dom-loaded");
-
-domLoaded.then(() => console.log("DOM is loaded"));
diff --git a/types/dom-loaded/index.d.ts b/types/dom-loaded/index.d.ts
deleted file mode 100644
index 5d4d5154c4..0000000000
--- a/types/dom-loaded/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for dom-loaded 1.0
-// Project: https://github.com/sindresorhus/dom-loaded#readme
-// Definitions by: Lukas Tetzlaf <https://github.com/ltetzlaff>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare const domLoaded: Promise<void>;
-export = domLoaded;
diff --git a/types/dom-loaded/tsconfig.json b/types/dom-loaded/tsconfig.json
deleted file mode 100644
index 7d17914d86..0000000000
--- a/types/dom-loaded/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "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",
-        "dom-loaded-tests.ts"
-    ]
-}
diff --git a/types/dom-loaded/tslint.json b/types/dom-loaded/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/dom-loaded/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/element-ready/element-ready-tests.ts b/types/element-ready/element-ready-tests.ts
deleted file mode 100644
index e003947bc1..0000000000
--- a/types/element-ready/element-ready-tests.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import elementReady = require('element-ready');
-
-const p = elementReady('#unicorn');
-
-p.then(element => {
-    const el: HTMLElement = element;
-});
-
-p.cancel();
diff --git a/types/element-ready/index.d.ts b/types/element-ready/index.d.ts
deleted file mode 100644
index 03a750b59d..0000000000
--- a/types/element-ready/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for element-ready 2.1
-// Project: https://github.com/sindresorhus/element-ready#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import pCancelable = require('p-cancelable');
-
-export = elementReady;
-
-declare function elementReady(selector: string): pCancelable.PCancelable<HTMLElement>;
diff --git a/types/element-ready/tsconfig.json b/types/element-ready/tsconfig.json
deleted file mode 100644
index e5067c7ccf..0000000000
--- a/types/element-ready/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "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",
-        "element-ready-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/element-ready/tslint.json b/types/element-ready/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/element-ready/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/filenamify-url/filenamify-url-tests.ts b/types/filenamify-url/filenamify-url-tests.ts
deleted file mode 100644
index 2a575c9267..0000000000
--- a/types/filenamify-url/filenamify-url-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import filenamifyUrl = require("filenamify-url");
-
-filenamifyUrl("http://sindresorhus.com/foo?bar=baz");
-
-filenamifyUrl("http://sindresorhus.com/foo", { replacement: "🐴" });
-
-filenamifyUrl.path("https://sindresorhus.com");
diff --git a/types/filenamify-url/index.d.ts b/types/filenamify-url/index.d.ts
deleted file mode 100644
index 24dc581717..0000000000
--- a/types/filenamify-url/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Type definitions for filenamify-url 1.0
-// Project: https://github.com/sindresorhus/filenamify-url
-// Definitions by: Carlos Precioso <https://github.com/cprecioso>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as filenamifyUrl from "filenamify";
-export = filenamifyUrl;
diff --git a/types/filenamify-url/tsconfig.json b/types/filenamify-url/tsconfig.json
deleted file mode 100644
index dd7225304e..0000000000
--- a/types/filenamify-url/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "filenamify-url-tests.ts"
-    ]
-}
diff --git a/types/filenamify-url/tslint.json b/types/filenamify-url/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/filenamify-url/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/filenamify/filenamify-tests.ts b/types/filenamify/filenamify-tests.ts
deleted file mode 100644
index 54c92cdd87..0000000000
--- a/types/filenamify/filenamify-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import filenamify = require('filenamify');
-
-filenamify('<foo/bar>');
-// => 'foo!bar'
-
-filenamify('foo:"bar"', {replacement: '🐴'});
-// => 'foo🐴bar'
-
-filenamify.path('/some/!path');
-// => '/some/path'
diff --git a/types/filenamify/index.d.ts b/types/filenamify/index.d.ts
deleted file mode 100644
index 99eb7f89f7..0000000000
--- a/types/filenamify/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for filenamify 2.0
-// Project: https://github.com/sindresorhus/filenamify
-// Definitions by: Junyoung Choi <https://github.com/rokt33r>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function filenamify(input: string, options?: filenamify.Options): string;
-
-declare namespace filenamify {
-    interface Options {
-        replacement: string;
-    }
-    function path(input: string, options?: Options): string;
-}
-
-export = filenamify;
diff --git a/types/filenamify/tsconfig.json b/types/filenamify/tsconfig.json
deleted file mode 100644
index 0d41b23a0d..0000000000
--- a/types/filenamify/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "filenamify-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/filenamify/tslint.json b/types/filenamify/tslint.json
deleted file mode 100644
index f93cf8562a..0000000000
--- a/types/filenamify/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}
diff --git a/types/fkill/fkill-tests.ts b/types/fkill/fkill-tests.ts
deleted file mode 100644
index 6e2b380a16..0000000000
--- a/types/fkill/fkill-tests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import fkill = require('fkill');
-
-fkill(1337); // $ExpectType Promise<void>
-fkill('Safari'); // $ExpectType Promise<void>
-fkill([1337, 'Safari', ':8080']); // $ExpectType Promise<void>
diff --git a/types/fkill/index.d.ts b/types/fkill/index.d.ts
deleted file mode 100644
index 4b6663a10c..0000000000
--- a/types/fkill/index.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Type definitions for fkill 5.3
-// Project: https://github.com/sindresorhus/fkill#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = fkill;
-
-/**
- * Fabulously kill processes. Cross-platform.
- *
- * @param input One or more process IDs/names/ports to kill.
- * To kill a port, prefix it with a colon. For example: `:8080`.
- */
-declare function fkill(
-    input: number | string | Array<string | number>,
-    options?: fkill.Options
-): Promise<void>;
-
-declare namespace fkill {
-    interface Options {
-        /**
-         * Force kill the process.
-         * @default false
-         */
-        force?: boolean;
-
-        /**
-         * Kill all child processes along with the parent process. *(Windows only)*
-         * @default true
-         */
-        tree?: boolean;
-
-        /**
-         * Ignore capitalization when killing a process.
-         * Note that the case is always ignored on Windows.
-         * @default false
-         */
-        ignoreCase?: boolean;
-    }
-}
diff --git a/types/fkill/tsconfig.json b/types/fkill/tsconfig.json
deleted file mode 100644
index 2e36e29395..0000000000
--- a/types/fkill/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "fkill-tests.ts"
-    ]
-}
diff --git a/types/fkill/tslint.json b/types/fkill/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/fkill/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/get-stream/get-stream-tests.ts b/types/get-stream/get-stream-tests.ts
deleted file mode 100644
index 065c0a3c97..0000000000
--- a/types/get-stream/get-stream-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import getStream = require("get-stream");
-
-import * as fs from 'fs';
-
-getStream(fs.createReadStream('foo'))
-    .then(str => str.toLowerCase());
-
-getStream.array<string>(fs.createReadStream('foo'))
-    .then(values => values.join(', '));
-
-getStream.buffer(fs.createReadStream('foo'))
-    .then(buffer => buffer.byteLength);
diff --git a/types/get-stream/index.d.ts b/types/get-stream/index.d.ts
deleted file mode 100644
index 19c7c6067b..0000000000
--- a/types/get-stream/index.d.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// Type definitions for get-stream 3.0
-// Project: https://github.com/sindresorhus/get-stream#readme
-// Definitions by: Douglas Duteil <https://github.com/douglasduteil>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node" />
-
-import { Stream } from 'stream';
-
-interface Options {
-    /**
-     * Encoding of the incoming stream.
-     * @default 'utf8'
-     */
-    encoding?: BufferEncoding | 'buffer';
-    /**
-     * Maximum length of the returned string. If it exceeds this value before
-     * the stream ends, the promise will be rejected.
-     * @default Infinity
-     */
-    maxBuffer?: number;
-}
-
-/**
- * Get the stream as a string.
- * The methods returns a promise that resolves when the end event fires on the
- * stream, indicating that there is no more data to be read.
- * The stream is switched to flowing mode.
- */
-declare function getStream(stream: Stream, options?: Options): Promise<string>;
-declare namespace getStream {
-    /**
-     * Get the `stream` as an array of values.
-     *
-     * It honors both the `maxBuffer` and `encoding` options.
-     * The behavior changes slightly based on the encoding chosen:
-     *
-     * - When `encoding` is unset, it assumes an [object mode stream](https://nodesource.com/blog/understanding-object-streams/)
-     *   and collects values emitted from `stream` unmodified.
-     *   In this case `maxBuffer` refers to the number of items in the array
-     *   (not the sum of their sizes).
-     *
-     * - When `encoding` is set to `buffer`, it collects an array of buffers.
-     *   `maxBuffer` refers to the summed byte lengths of every buffer in the array.
-     *
-     * - When `encoding` is set to anything else, it collects an array of strings.
-     *   `maxBuffer` refers to the summed character lengths of every string in the array.
-     *
-     */
-    function array<T>(stream: Stream, options?: Options): Promise<T[]>;
-
-    /**
-     * Get the stream as a buffer.
-     *
-     * It honors the maxBuffer option as above, but it refers to byte length
-     * rather than string length.
-     */
-    function buffer(stream: Stream, options?: Options): Promise<Buffer>;
-}
-
-export = getStream;
diff --git a/types/get-stream/tsconfig.json b/types/get-stream/tsconfig.json
deleted file mode 100644
index 7d3b35d42d..0000000000
--- a/types/get-stream/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "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-stream-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/get-stream/tslint.json b/types/get-stream/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/get-stream/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/has-yarn/has-yarn-tests.ts b/types/has-yarn/has-yarn-tests.ts
deleted file mode 100644
index 925cfe3c43..0000000000
--- a/types/has-yarn/has-yarn-tests.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import hasYarn = require('has-yarn');
-
-// $ExpectType boolean
-hasYarn('foo');
diff --git a/types/has-yarn/index.d.ts b/types/has-yarn/index.d.ts
deleted file mode 100644
index 378f1ee811..0000000000
--- a/types/has-yarn/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for has-yarn 1.0
-// Project: https://github.com/sindresorhus/has-yarn#readme
-// Definitions by: BendingBender <https://github.com/BendgingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = hasYarn;
-
-declare function hasYarn(cwd?: string): boolean;
diff --git a/types/has-yarn/tsconfig.json b/types/has-yarn/tsconfig.json
deleted file mode 100644
index 824092017a..0000000000
--- a/types/has-yarn/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "has-yarn-tests.ts"
-    ]
-}
diff --git a/types/has-yarn/tslint.json b/types/has-yarn/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/has-yarn/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/hasha/hasha-tests.ts b/types/hasha/hasha-tests.ts
deleted file mode 100644
index d0054de81a..0000000000
--- a/types/hasha/hasha-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import hasha = require('hasha');
-
-let str: string | null;
-let buf: Buffer | null;
-
-str = hasha('unicorn');
-str = hasha('unicorn', {algorithm: 'md5'});
-str = hasha('unicorn', {algorithm: 'md5', encoding: 'latin1'});
-buf = hasha('unicorn', {algorithm: 'md5', encoding: 'buffer'});
-
-process.stdin.pipe(hasha.stream()).pipe(process.stdout);
-
-hasha.fromStream(process.stdin).then(hash => str = hash);
-hasha.fromStream(process.stdin, {encoding: 'hex'}).then(hash => str = hash);
-hasha.fromStream(process.stdin, {encoding: 'buffer'}).then(hash => buf = hash);
-
-hasha.fromFile('unicorn.png').then(hash => str = hash);
-hasha.fromFile('unicorn.png', {encoding: 'base64'}).then(hash => str = hash);
-hasha.fromFile('unicorn.png', {encoding: 'buffer'}).then(hash => buf = hash);
diff --git a/types/hasha/index.d.ts b/types/hasha/index.d.ts
deleted file mode 100644
index a158af88a3..0000000000
--- a/types/hasha/index.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Type definitions for hasha 3.0
-// Project: https://github.com/sindresorhus/hasha
-// Definitions by: BendingBender <https://github.com/BendgingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="node"/>
-import * as crypto from "crypto";
-
-export = hasha;
-
-declare function hasha(input: hasha.HashaInput): string;
-declare function hasha<E extends hasha.ToStringEncoding>(input: hasha.HashaInput, options: hasha.HashaOptions<E>): string;
-declare function hasha<E extends 'buffer'>(input: hasha.HashaInput, options: hasha.HashaOptions<E>): Buffer;
-
-declare namespace hasha {
-    type HashaInput = string | string[] | Buffer | Buffer[];
-    type ToStringEncoding = 'hex' | 'base64' | 'latin1' | 'binary' | undefined;
-    type HashaEncoding = ToStringEncoding | 'buffer';
-
-    interface HashaOptions<E extends HashaEncoding> {
-        encoding?: E;
-        algorithm?: string;
-    }
-
-    function stream(options?: HashaOptions<HashaEncoding>): crypto.Hash;
-
-    function fromStream(stream: NodeJS.ReadableStream): Promise<string | null>;
-    function fromStream<E extends ToStringEncoding>(stream: NodeJS.ReadableStream, options?: HashaOptions<E>): Promise<string | null>;
-    function fromStream<E extends 'buffer'>(stream: NodeJS.ReadableStream, options?: HashaOptions<E>): Promise<Buffer | null>;
-
-    function fromFile(filePath: string): Promise<string | null>;
-    function fromFile<E extends ToStringEncoding>(filePath: string, options: HashaOptions<E>): Promise<string | null>;
-    function fromFile<E extends 'buffer'>(filePath: string, options: HashaOptions<E>): Promise<Buffer | null>;
-
-    function fromFileSync(filePath: string): string;
-    function fromFileSync<E extends ToStringEncoding>(filePath: string, options: HashaOptions<E>): string;
-    function fromFileSync<E extends 'buffer'>(filePath: string, options: HashaOptions<E>): Buffer;
-}
diff --git a/types/hasha/tsconfig.json b/types/hasha/tsconfig.json
deleted file mode 100644
index fe359d64a5..0000000000
--- a/types/hasha/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "hasha-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/hasha/tslint.json b/types/hasha/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/hasha/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/into-stream/index.d.ts b/types/into-stream/index.d.ts
deleted file mode 100644
index f682ff10a7..0000000000
--- a/types/into-stream/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for into-stream 3.1
-// Project: https://github.com/sindresorhus/into-stream
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-
-export = intoStream;
-
-declare function intoStream(input: intoStream.Input | Promise<intoStream.Input>): NodeJS.ReadableStream;
-
-declare namespace intoStream {
-    function obj(input: object | Iterable<object> | Promise<object | Iterable<object>>): NodeJS.ReadableStream;
-
-    type Input = Buffer | string | Iterable<Buffer | string>;
-}
diff --git a/types/into-stream/into-stream-tests.ts b/types/into-stream/into-stream-tests.ts
deleted file mode 100644
index e1f3a9a7b0..0000000000
--- a/types/into-stream/into-stream-tests.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import intoStream = require('into-stream');
-
-function iterableFrom(arr: any[]) {
-    return {
-        *[Symbol.iterator]() {
-            let i = 0;
-            while (i < arr.length) {
-                yield arr[i++];
-            }
-        }
-    };
-}
-
-intoStream('unicorn').pipe(process.stdout);
-intoStream('unicorn'.split('')).pipe(process.stdout);
-intoStream(iterableFrom('unicorn'.split(''))).pipe(process.stdout);
-intoStream(new Buffer('unicorn')).pipe(process.stdout);
-intoStream(Promise.resolve('unicorn')).pipe(process.stdout);
-
-const f = {foo: true};
-const f2 = [{foo: true}, {bar: true}];
-intoStream.obj(f).pipe(process.stdout);
-intoStream.obj(f2).pipe(process.stdout);
-intoStream.obj(iterableFrom(f2)).pipe(process.stdout);
-intoStream.obj(Promise.resolve(f)).pipe(process.stdout);
-intoStream.obj(Promise.resolve(f2)).pipe(process.stdout);
-intoStream.obj(Promise.resolve(iterableFrom(f2))).pipe(process.stdout);
diff --git a/types/into-stream/tsconfig.json b/types/into-stream/tsconfig.json
deleted file mode 100644
index cc8a2cfa00..0000000000
--- a/types/into-stream/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "into-stream-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/into-stream/tslint.json b/types/into-stream/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/into-stream/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/is-scoped/index.d.ts b/types/is-scoped/index.d.ts
deleted file mode 100644
index 8c35dcdf9c..0000000000
--- a/types/is-scoped/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for is-scoped 1.0
-// Project: https://github.com/sindresorhus/is-scoped#readme
-// Definitions by: Leo Friedrichs <https://github.com/postcrafter>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = isScoped;
-
-declare function isScoped(input: string): boolean;
diff --git a/types/is-scoped/is-scoped-tests.ts b/types/is-scoped/is-scoped-tests.ts
deleted file mode 100644
index 9fb34bc3d2..0000000000
--- a/types/is-scoped/is-scoped-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import isScoped = require('is-scoped');
-
-const tests: boolean[] = [
-	isScoped('is-scoped'),
-	isScoped('@types/is-scoped'),
-];
diff --git a/types/is-scoped/tsconfig.json b/types/is-scoped/tsconfig.json
deleted file mode 100644
index 2b6374b9f0..0000000000
--- a/types/is-scoped/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "is-scoped-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/is-scoped/tslint.json b/types/is-scoped/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/is-scoped/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/latest-version/index.d.ts b/types/latest-version/index.d.ts
deleted file mode 100644
index 5127714c15..0000000000
--- a/types/latest-version/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for latest-version 4.0
-// Project: https://github.com/sindresorhus/latest-version#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = latestVersion;
-
-declare function latestVersion(name: string, options?: latestVersion.Options): Promise<string>;
-
-declare namespace latestVersion {
-    interface Options {
-        version?: string;
-    }
-}
diff --git a/types/latest-version/latest-version-tests.ts b/types/latest-version/latest-version-tests.ts
deleted file mode 100644
index 2cbd29b61f..0000000000
--- a/types/latest-version/latest-version-tests.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import latestVersion = require('latest-version');
-
-latestVersion('ava'); // $ExpectType Promise<string>
-latestVersion('npm', { version: 'latest-5' }); // $ExpectType Promise<string>
diff --git a/types/latest-version/tsconfig.json b/types/latest-version/tsconfig.json
deleted file mode 100644
index a62d14b69d..0000000000
--- a/types/latest-version/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "latest-version-tests.ts"
-    ]
-}
diff --git a/types/latest-version/tslint.json b/types/latest-version/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/latest-version/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/leven/index.d.ts b/types/leven/index.d.ts
deleted file mode 100644
index bd7e0ba4aa..0000000000
--- a/types/leven/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for leven 2.1
-// Project: https://github.com/sindresorhus/leven
-// Definitions by: Jan Alonzo <https://github.com/jmalonzo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function leven(a: string, b: string): number;
-
-export = leven;
diff --git a/types/leven/leven-tests.ts b/types/leven/leven-tests.ts
deleted file mode 100644
index 4ca0406529..0000000000
--- a/types/leven/leven-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import leven = require('leven');
-
-leven('baz', 'bar');
-// => "1"
-
-leven('foo', 'bar');
-// => "3"
diff --git a/types/leven/tsconfig.json b/types/leven/tsconfig.json
deleted file mode 100644
index 14d505d892..0000000000
--- a/types/leven/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "leven-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/leven/tslint.json b/types/leven/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/leven/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/mem/index.d.ts b/types/mem/index.d.ts
deleted file mode 100644
index 94ea5137ec..0000000000
--- a/types/mem/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Type definitions for mem 1.1
-// Project: https://github.com/sindresorhus/mem
-// Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-interface Options {
-	maxAge?: number;
-	cacheKey?(...args: any[]): string;
-	cache?: any;
-}
-
-declare const mem: {
-	<F extends (...args: any[]) => any>(fn: F, options?: Options): F;
-	clear<F extends (...args: any[]) => any>(fn: F): void;
-};
-
-export = mem;
diff --git a/types/mem/mem-tests.ts b/types/mem/mem-tests.ts
deleted file mode 100644
index b184cf263b..0000000000
--- a/types/mem/mem-tests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import mem = require('mem');
-
-let i = 0;
-const memoized = mem((arg: string) => ++i);
-const ret1: number = memoized('foo');
-
-// Clear the memoized data
-mem.clear(memoized);
-
-const ret2: Promise<string> = mem(() => Promise.resolve('foo'))();
diff --git a/types/mem/tsconfig.json b/types/mem/tsconfig.json
deleted file mode 100644
index 3545985694..0000000000
--- a/types/mem/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "mem-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/mem/tslint.json b/types/mem/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/mem/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/npm-email/index.d.ts b/types/npm-email/index.d.ts
deleted file mode 100644
index 055a68f8af..0000000000
--- a/types/npm-email/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for npm-email 3.0
-// Project: https://github.com/sindresorhus/npm-email#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = npmEmail;
-
-/**
- * Get the email of an npm user.
- *
- * @param username npm username to look up.
- * @returns A promise for the user's email address.
- */
-declare function npmEmail(username: string): Promise<string>;
diff --git a/types/npm-email/npm-email-tests.ts b/types/npm-email/npm-email-tests.ts
deleted file mode 100644
index b0640c73e3..0000000000
--- a/types/npm-email/npm-email-tests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import npmEmail = require('npm-email');
-
-npmEmail('sindresorhus'); // $ExpectType Promise<string>
diff --git a/types/npm-email/tsconfig.json b/types/npm-email/tsconfig.json
deleted file mode 100644
index 985ed0472a..0000000000
--- a/types/npm-email/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "npm-email-tests.ts"
-    ]
-}
diff --git a/types/npm-email/tslint.json b/types/npm-email/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/npm-email/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/npm-keyword/index.d.ts b/types/npm-keyword/index.d.ts
deleted file mode 100644
index 94c8af9f13..0000000000
--- a/types/npm-keyword/index.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Type definitions for npm-keyword 5.0
-// Project: https://github.com/sindresorhus/npm-keyword#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = npmKeyword;
-
-/**
- * Get a list of npm packages with a certain keyword.
- *
- * @param keyword One or more keywords. Only matches packages that have *all* the given keywords. Example: `['string', 'camelcase']`
- * @returns A promise for a list of packages having the specified keyword in their package.json `keyword` property.
- */
-declare function npmKeyword(
-    keyword: string | string[],
-    options?: npmKeyword.Options
-): Promise<npmKeyword.PackageDescriptor[]>;
-
-declare namespace npmKeyword {
-    /**
-     * @param keyword One or more keywords. Only matches packages that have *all* the given keywords. Example: `['string', 'camelcase']`
-     * @returns A promise for a list of package names. Use this if you don't need the description as it's faster.
-     */
-    function names(keyword: string | string[], options?: Options): Promise<string[]>;
-
-    /**
-     * @param keyword One or more keywords. Only matches packages that have *all* the given keywords. Example: `['string', 'camelcase']`
-     * @returns A promise for the count of packages.
-     */
-    function count(keyword: string | string[]): Promise<number>;
-
-    interface Options {
-        /**
-         * Limits the amount of results.
-         * @default 250
-         */
-        size?: number;
-    }
-
-    interface PackageDescriptor {
-        name: string;
-        description: string;
-    }
-}
diff --git a/types/npm-keyword/npm-keyword-tests.ts b/types/npm-keyword/npm-keyword-tests.ts
deleted file mode 100644
index 17418bdb04..0000000000
--- a/types/npm-keyword/npm-keyword-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import npmKeyword = require('npm-keyword');
-
-npmKeyword('gulpplugin'); // $ExpectType Promise<PackageDescriptor[]>
-npmKeyword('gulpplugin', { size: 10 }); // $ExpectType Promise<PackageDescriptor[]>
-npmKeyword.names('gulpplugin'); // $ExpectType Promise<string[]>
-npmKeyword.names('gulpplugin', { size: 10 }); // $ExpectType Promise<string[]>
-npmKeyword.count('gulpplugin'); // $ExpectType Promise<number>
diff --git a/types/npm-keyword/tsconfig.json b/types/npm-keyword/tsconfig.json
deleted file mode 100644
index b0c0fed33d..0000000000
--- a/types/npm-keyword/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "npm-keyword-tests.ts"
-    ]
-}
diff --git a/types/npm-keyword/tslint.json b/types/npm-keyword/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/npm-keyword/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/npm-user/index.d.ts b/types/npm-user/index.d.ts
deleted file mode 100644
index 2d03c12c0c..0000000000
--- a/types/npm-user/index.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Type definitions for npm-user 3.0
-// Project: https://github.com/sindresorhus/npm-user#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = npmUser;
-
-declare function npmUser(name: string): Promise<npmUser.UserData>;
-
-declare namespace npmUser {
-    interface UserData {
-        name: string | null;
-        avatar: string | null;
-        email: string | null;
-        github: string | null;
-        twitter: string | null;
-    }
-}
diff --git a/types/npm-user/npm-user-tests.ts b/types/npm-user/npm-user-tests.ts
deleted file mode 100644
index 1d63de27ef..0000000000
--- a/types/npm-user/npm-user-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import npmUser = require('npm-user');
-
-npmUser('sindresorhus').then(user => {
-    user; // $ExpectType UserData
-
-    user.name; // $ExpectType string | null
-    user.avatar; // $ExpectType string | null
-    user.email; // $ExpectType string | null
-    user.github; // $ExpectType string | null
-    user.twitter; // $ExpectType string | null
-});
diff --git a/types/npm-user/tsconfig.json b/types/npm-user/tsconfig.json
deleted file mode 100644
index 1e5c1d464f..0000000000
--- a/types/npm-user/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "npm-user-tests.ts"
-    ]
-}
diff --git a/types/npm-user/tslint.json b/types/npm-user/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/npm-user/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-any/index.d.ts b/types/p-any/index.d.ts
deleted file mode 100644
index 8b4df3504c..0000000000
--- a/types/p-any/index.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Type definitions for p-any 1.1
-// Project: https://github.com/sindresorhus/p-any#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import AggregateErrorModule = require('aggregate-error');
-
-export = pAny;
-
-declare function pAny<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
-    values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>, Value<T6>, Value<T7>, Value<T8>, Value<T9>, Value<T10>],
-    options?: pAny.Options<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>;
-declare function pAny<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
-    values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>, Value<T6>, Value<T7>, Value<T8>, Value<T9>],
-    options?: pAny.Options<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
-declare function pAny<T1, T2, T3, T4, T5, T6, T7, T8>(
-    values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>, Value<T6>, Value<T7>, Value<T8>],
-    options?: pAny.Options<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
-declare function pAny<T1, T2, T3, T4, T5, T6, T7>(
-    values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>, Value<T6>, Value<T7>],
-    options?: pAny.Options<T1 | T2 | T3 | T4 | T5 | T6 | T7>): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
-declare function pAny<T1, T2, T3, T4, T5, T6>(values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>, Value<T6>],
-                                              options?: pAny.Options<T1 | T2 | T3 | T4 | T5 | T6>): Promise<T1 | T2 | T3 | T4 | T5 | T6>;
-declare function pAny<T1, T2, T3, T4, T5>(values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>, Value<T5>],
-                                          options?: pAny.Options<T1 | T2 | T3 | T4 | T5>): Promise<T1 | T2 | T3 | T4 | T5>;
-declare function pAny<T1, T2, T3, T4>(values: [Value<T1>, Value<T2>, Value<T3>, Value<T4>],
-                                      options?: pAny.Options<T1 | T2 | T3 | T4>): Promise<T1 | T2 | T3 | T4>;
-declare function pAny<T1, T2, T3>(values: [Value<T1>, Value<T2>, Value<T3>], options?: pAny.Options<T1 | T2 | T3>): Promise<T1 | T2 | T3>;
-declare function pAny<T1, T2>(values: [Value<T1>, Value<T2>], options?: pAny.Options<T1 | T2>): Promise<T1 | T2>;
-declare function pAny<T>(values: Iterable<Value<T>> | Array<Value<T>>, options?: pAny.Options<T>): Promise<T>;
-
-type Value<T> = T | PromiseLike<T>;
-
-declare namespace pAny {
-    interface Options<T> {
-        filter?(value: T): boolean;
-    }
-
-    const AggregateError: typeof AggregateErrorModule;
-}
diff --git a/types/p-any/p-any-tests.ts b/types/p-any/p-any-tests.ts
deleted file mode 100644
index 9e5e6520b9..0000000000
--- a/types/p-any/p-any-tests.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import got = require('got');
-import pAny = require('p-any');
-
-pAny([
-    got.head('github.com').then(() => 'github'),
-    got.head('google.com').then(() => 'google'),
-    got.head('twitter.com').then(() => 'twitter'),
-]).then(first => {
-    const str: string = first;
-});
-
-pAny(new Set([
-    got.head('github.com').then(() => 'github'),
-    got.head('google.com').then(() => 'google'),
-    got.head('twitter.com').then(() => 'twitter'),
-]), {
-    filter(str: string) {
-        return true;
-    }
-}).then(first => {
-    const str: string = first;
-});
-
-throw new pAny.AggregateError([]);
diff --git a/types/p-any/tsconfig.json b/types/p-any/tsconfig.json
deleted file mode 100644
index 67d983361a..0000000000
--- a/types/p-any/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-any-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-any/tslint.json b/types/p-any/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-any/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-cancelable/index.d.ts b/types/p-cancelable/index.d.ts
deleted file mode 100644
index 8375149e32..0000000000
--- a/types/p-cancelable/index.d.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// Type definitions for p-cancelable 1.0
-// Project: https://github.com/sindresorhus/p-cancelable#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = PCancelable;
-
-declare const PCancelable: PCancelableConstructor;
-
-interface PCancelableConstructor extends PromiseConstructor {
-    readonly prototype: PCancelable.PCancelable<any>;
-    readonly CancelError: PCancelable.CancelErrorConstructor;
-
-    new <T>(
-        executor: (
-            resolve: (value?: T | PromiseLike<T>) => void,
-            reject: (reason?: any) => void,
-            onCancel: PCancelable.OnCancelFn
-        ) => void
-    ): PCancelable.PCancelable<T>;
-
-    fn<R>(
-        userFn: (onCancel: PCancelable.OnCancelFn) => PromiseLike<R>
-    ): () => PCancelable.PCancelable<R>;
-    fn<T1, R>(
-        userFn: (param1: T1, onCancel: PCancelable.OnCancelFn) => PromiseLike<R>
-    ): (param1: T1) => PCancelable.PCancelable<R>;
-    fn<T1, T2, R>(
-        userFn: (param1: T1, param2: T2, onCancel: PCancelable.OnCancelFn) => PromiseLike<R>
-    ): (param1: T1, param2: T2) => PCancelable.PCancelable<R>;
-    fn<T1, T2, T3, R>(
-        userFn: (
-            param1: T1,
-            param2: T2,
-            param3: T3,
-            onCancel: PCancelable.OnCancelFn
-        ) => PromiseLike<R>
-    ): (param1: T1, param2: T2, param3: T3) => PCancelable.PCancelable<R>;
-    fn<T1, T2, T3, T4, R>(
-        userFn: (
-            param1: T1,
-            param2: T2,
-            param3: T3,
-            param4: T4,
-            onCancel: PCancelable.OnCancelFn
-        ) => PromiseLike<R>
-    ): (param1: T1, param2: T2, param3: T3, param4: T4) => PCancelable.PCancelable<R>;
-    fn<R>(userFn: (...args: any[]) => PromiseLike<R>): (args: any[]) => PCancelable.PCancelable<R>;
-}
-
-declare namespace PCancelable {
-    interface PCancelable<T> extends Promise<T> {
-        readonly isCanceled: boolean;
-        cancel(reason?: string): void;
-    }
-
-    interface OnCancelFn {
-        (cancelHandler: () => void): void;
-        shouldReject: boolean;
-    }
-
-    interface CancelErrorConstructor extends ErrorConstructor {
-        new (reason?: string): CancelError;
-    }
-
-    interface CancelError extends Error {
-        readonly name: 'CancelError';
-        readonly isCanceled: boolean;
-    }
-}
diff --git a/types/p-cancelable/p-cancelable-tests.ts b/types/p-cancelable/p-cancelable-tests.ts
deleted file mode 100644
index 3e15c7d1f8..0000000000
--- a/types/p-cancelable/p-cancelable-tests.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/// <reference types="node" />
-
-import PCancelable = require('p-cancelable');
-import { EventEmitter } from 'events';
-
-const cancelablePromise: PCancelable.PCancelable<{}> = new PCancelable(
-    (resolve, reject, onCancel) => {
-        class Worker extends EventEmitter {
-            close() {}
-        }
-
-        const worker = new Worker();
-
-        onCancel.shouldReject = false;
-        onCancel(() => {
-            worker.close();
-        });
-
-        worker.on('finish', resolve);
-        worker.on('error', reject);
-    }
-);
-
-cancelablePromise
-    .then(value => {
-        console.log('Operation finished successfully:', value);
-    })
-    .catch(reason => {
-        if (cancelablePromise.isCanceled) {
-            // Handle the cancelation here
-            console.log('Operation was canceled');
-            return;
-        }
-
-        throw reason;
-    });
-
-setTimeout(() => {
-    cancelablePromise.cancel();
-    cancelablePromise.cancel('foo');
-}, 10000);
-
-const fn0 = PCancelable.fn(onCancel => {
-    // $ExpectType OnCancelFn
-    onCancel;
-
-    return Promise.resolve(10);
-});
-// $ExpectType () => PCancelable<number>
-fn0;
-
-const fn1 = PCancelable.fn((p1: string, onCancel: PCancelable.OnCancelFn) => {
-    return Promise.resolve(10);
-});
-// $ExpectType (param1: string) => PCancelable<number>
-fn1;
-
-const fn2 = PCancelable.fn((p1: string, p2: boolean, onCancel: PCancelable.OnCancelFn) => {
-    return Promise.resolve(10);
-});
-// $ExpectType (param1: string, param2: boolean) => PCancelable<number>
-fn2;
-
-const fn3 = PCancelable.fn(
-    (p1: string, p2: boolean, p3: number, onCancel: PCancelable.OnCancelFn) => {
-        return Promise.resolve(10);
-    }
-);
-// $ExpectType (param1: string, param2: boolean, param3: number) => PCancelable<number>
-fn3;
-
-const fn4 = PCancelable.fn(
-    (p1: string, p2: boolean, p3: number, p4: null, onCancel: PCancelable.OnCancelFn) => {
-        return Promise.resolve(10);
-    }
-);
-// $ExpectType (param1: string, param2: boolean, param3: number, param4: null) => PCancelable<number>
-fn4;
-
-const promise = fn0();
-let num: number;
-promise.then(innum => (num = innum));
-if (!promise.isCanceled) {
-    promise.cancel();
-}
-
-const err: PCancelable.CancelError = new PCancelable.CancelError();
-throw err;
diff --git a/types/p-cancelable/tsconfig.json b/types/p-cancelable/tsconfig.json
deleted file mode 100644
index 504511081d..0000000000
--- a/types/p-cancelable/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-cancelable-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-cancelable/tslint.json b/types/p-cancelable/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-cancelable/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-catch-if/index.d.ts b/types/p-catch-if/index.d.ts
deleted file mode 100644
index a832b88534..0000000000
--- a/types/p-catch-if/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for p-catch-if 1.0
-// Project: https://github.com/sindresorhus/p-catch-if#readme
-// Definitions by: Linus Unnebäck <https://github.com/LinusU>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace pCatchIf {
-    type Predicate = ErrorConstructor | ReadonlyArray<ErrorConstructor> | boolean | ((err: Error) => boolean | PromiseLike<boolean>);
-}
-
-declare function pCatchIf<T>(predicate: pCatchIf.Predicate, fn: (err: Error) => T): (err: Error) => T;
-
-export = pCatchIf;
diff --git a/types/p-catch-if/p-catch-if-tests.ts b/types/p-catch-if/p-catch-if-tests.ts
deleted file mode 100644
index f42679cce6..0000000000
--- a/types/p-catch-if/p-catch-if-tests.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import pCatchIf = require('p-catch-if');
-
-/**** Setup "fake" environemt ****/
-
-declare function getData(): Promise<{}>;
-declare function retry<T>(fn: () => T): T;
-declare function recordError(err: Error): undefined;
-declare function isProduction(): boolean;
-declare function sendError(err: Error): Promise<undefined>;
-declare function checkResults(): Promise<boolean>;
-
-declare const TimeoutError: ErrorConstructor;
-declare const NetworkError: ErrorConstructor;
-declare const UnicornError: ErrorConstructor;
-
-declare const console: { error(): undefined };
-
-/**** Use examples from the official library's readme.md ****/
-
-// error constructor
-getData().catch(pCatchIf(TimeoutError, () => retry(getData)));
-
-// multiple error constructors
-getData().catch(pCatchIf([NetworkError, TimeoutError], () => retry(getData)));
-
-// boolean
-getData().catch(pCatchIf(isProduction, recordError));
-
-// function
-const hasUnicornMessage = (err: Error) => err.message.includes('unicorn');
-getData().catch(pCatchIf(hasUnicornMessage, console.error));
-
-// promise-returning function
-const handler = (err: Error) => sendError(err).then(checkResults);
-getData().catch(pCatchIf(handler, console.error));
-
-// can also be nested
-const validateMessage = (err: Error) => err.message === 'Too many rainbows';
-getData().catch(pCatchIf(UnicornError, pCatchIf(validateMessage, console.error)));
diff --git a/types/p-catch-if/tsconfig.json b/types/p-catch-if/tsconfig.json
deleted file mode 100644
index bdabef2511..0000000000
--- a/types/p-catch-if/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictFunctionTypes": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-catch-if-tests.ts"
-    ]
-}
diff --git a/types/p-catch-if/tslint.json b/types/p-catch-if/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-catch-if/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-debounce/index.d.ts b/types/p-debounce/index.d.ts
deleted file mode 100644
index 4a18903762..0000000000
--- a/types/p-debounce/index.d.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// Type definitions for p-debounce 1.0
-// Project: https://github.com/sindresorhus/p-debounce#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pDebounce;
-
-declare function pDebounce<R>(fn: () => PromiseLike<R> | R, wait: number, options?: pDebounce.Options): (() => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1>(fn: (arg1: T1) => PromiseLike<R> | R, wait: number, options?: pDebounce.Options): ((arg1: T1) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2>(fn: (arg1: T1, arg2: T2) => PromiseLike<R> | R, wait: number, options?: pDebounce.Options): ((arg1: T1, arg2: T2) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3) => PromiseLike<R> | R,
-                                          wait: number,
-                                          options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => PromiseLike<R> | R,
-                                              wait: number,
-                                              options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => PromiseLike<R> | R,
-                                                  wait: number,
-                                                  options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5, T6>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => PromiseLike<R> | R,
-                                                      wait: number,
-                                                      options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5, T6, T7>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7) => PromiseLike<R> | R,
-    wait: number,
-    options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5, T6, T7, T8>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8) => PromiseLike<R> | R,
-    wait: number,
-    options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5, T6, T7, T8, T9>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9) => PromiseLike<R> | R,
-    wait: number,
-    options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
-    fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9, arg10: T10) => PromiseLike<R> | R,
-    wait: number,
-    options?: pDebounce.Options): ((arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, arg7: T7, arg8: T8, arg9: T9, arg10: T10) => Promise<R>) & { abort(): void; };
-declare function pDebounce<R>(fn: (...args: any[]) => PromiseLike<R> | R, wait: number, options?: pDebounce.Options): ((...args: any[]) => Promise<R>) & { abort(): void; };
-
-declare namespace pDebounce {
-    interface Options {
-        leading?: boolean;
-    }
-}
diff --git a/types/p-debounce/p-debounce-tests.ts b/types/p-debounce/p-debounce-tests.ts
deleted file mode 100644
index 5e7b7a49ac..0000000000
--- a/types/p-debounce/p-debounce-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import pDebounce = require('p-debounce');
-
-const expensiveCall = (input: number) => Promise.resolve(input);
-
-const debouncedFn = pDebounce(expensiveCall, 200);
-const debouncedFn2 = pDebounce(expensiveCall, 200, {leading: true});
-
-for (const i of [1, 2, 3]) {
-    debouncedFn(i).then(i => {
-        const num: number = i;
-    });
-}
-
-pDebounce(() => true, 2)();
-pDebounce((n: number, s: string) => true, 2)(1, 's');
-pDebounce((n: number, s: string, b: boolean) => true, 2)(1, 's', true);
-pDebounce((n: number, s: string, b: boolean, n2: number) => true, 2)(1, 's', true, 1);
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string) => true, 2)(1, 's', true, 1, 's');
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean) => true, 2)(1, 's', true, 1, 's', false);
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number) => true, 2)(1, 's', true, 1, 's', false, 1);
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number) => true, 2)(1, 's', true, 1, 's', false, 1, 2);
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number) => true, 2)(1, 's', true, 1, 's', false, 1, 2, 3);
-pDebounce((n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number) => true, 2)(1, 's', true, 1, 's', false, 1, 2, 3, 4);
-pDebounce(
-    (n: number, s: string, b: boolean, n2: number, s2: string, b2: boolean, n3: number, n4: number, n5: number, n6: number, s3: string) => true,
-    2)(1, 's', true, 1, 's', false, 1, 2, 3, 4, 'as');
diff --git a/types/p-debounce/tsconfig.json b/types/p-debounce/tsconfig.json
deleted file mode 100644
index 4de0f115d8..0000000000
--- a/types/p-debounce/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-debounce-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-debounce/tslint.json b/types/p-debounce/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-debounce/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-each-series/index.d.ts b/types/p-each-series/index.d.ts
deleted file mode 100644
index 7cf91112b8..0000000000
--- a/types/p-each-series/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for p-each-series 1.0
-// Project: https://github.com/sindresorhus/p-each-series#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pEachSeries;
-
-declare function pEachSeries<T>(input: Iterable<PromiseLike<T> | T>, iterator: (element: T, index: number) => any): Promise<T[]>;
diff --git a/types/p-each-series/p-each-series-tests.ts b/types/p-each-series/p-each-series-tests.ts
deleted file mode 100644
index 3766842e81..0000000000
--- a/types/p-each-series/p-each-series-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import pEachSeries = require('p-each-series');
-
-const keywords = [
-    Promise.resolve('foo'),
-    'rainbow',
-    'pony'
-];
-
-const keywordSet = new Set(keywords);
-
-pEachSeries(keywords, el => Promise.resolve(el)).then(result => {
-    result; // $ExpectType string[]
-    const str: string = result[0];
-});
-
-pEachSeries(keywordSet, (el, idx) => Promise.resolve(idx)).then(result => {
-    result; // $ExpectType string[]
-    const str: string = result[0];
-});
diff --git a/types/p-each-series/tsconfig.json b/types/p-each-series/tsconfig.json
deleted file mode 100644
index e8cd900d05..0000000000
--- a/types/p-each-series/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-each-series-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-each-series/tslint.json b/types/p-each-series/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-each-series/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-every/index.d.ts b/types/p-every/index.d.ts
deleted file mode 100644
index 57b41f0a4e..0000000000
--- a/types/p-every/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for p-every 1.0
-// Project: https://github.com/kevva/p-every#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pEvery;
-
-declare function pEvery<T>(input: Iterable<PromiseLike<T> | T>,
-                           testFn: (element: T, index: number) => boolean | Promise<boolean>,
-                           options?: pEvery.Options): Promise<boolean>;
-
-declare namespace pEvery {
-    interface Options {
-        concurrency?: number;
-    }
-}
diff --git a/types/p-every/p-every-tests.ts b/types/p-every/p-every-tests.ts
deleted file mode 100644
index df06fdf899..0000000000
--- a/types/p-every/p-every-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import pEvery = require('p-every');
-
-const places = [
-    Promise.resolve('Norway'),
-    'Bangkok, Thailand',
-    'Berlin, Germany',
-    'Tokyo, Japan'
-];
-
-pEvery(places, x => Promise.resolve(true)).then(result => {
-    const bool: boolean = result;
-});
-
-const places2 = [
-    Promise.resolve('Norway'),
-    'Bangkok, Thailand',
-    'Berlin, Germany',
-    5
-];
-
-pEvery<string | number>(places2, x => {
-    const strnum: string | number = x;
-    return Promise.resolve(true);
-}, {concurrency: 2}).then(result => {
-    const bool: boolean = result;
-});
diff --git a/types/p-every/tsconfig.json b/types/p-every/tsconfig.json
deleted file mode 100644
index 979927093f..0000000000
--- a/types/p-every/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-every-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-every/tslint.json b/types/p-every/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-every/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-locate/index.d.ts b/types/p-locate/index.d.ts
deleted file mode 100644
index 9ddc11197c..0000000000
--- a/types/p-locate/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for p-locate 2.0
-// Project: https://github.com/sindresorhus/p-locate#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pLocate;
-
-declare function pLocate<T>(input: Iterable<PromiseLike<T> | T>, tester: (element: T) => Promise<boolean> | boolean, options?: pLocate.Options): Promise<T | undefined>;
-
-declare namespace pLocate {
-    interface Options {
-        concurrency?: number;
-        preserveOrder?: boolean;
-    }
-}
diff --git a/types/p-locate/p-locate-tests.ts b/types/p-locate/p-locate-tests.ts
deleted file mode 100644
index acceb0376a..0000000000
--- a/types/p-locate/p-locate-tests.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import pLocate = require('p-locate');
-
-const files = [
-    'unicorn.png',
-    'rainbow.png',
-    'pony.png'
-];
-
-let str: string | undefined;
-pLocate(files, file => Promise.resolve(file === 'rainbow.png')).then(foundPath => {
-    str = foundPath;
-});
-
-pLocate(files, file => Promise.resolve(file === 'rainbow.png'), {concurrency: 2, preserveOrder: false});
diff --git a/types/p-locate/tsconfig.json b/types/p-locate/tsconfig.json
deleted file mode 100644
index 1f3e8a7711..0000000000
--- a/types/p-locate/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-locate-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-locate/tslint.json b/types/p-locate/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-locate/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-log/index.d.ts b/types/p-log/index.d.ts
deleted file mode 100644
index 66fe1ceace..0000000000
--- a/types/p-log/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for p-log 1.0
-// Project: https://github.com/sindresorhus/p-log#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pLog;
-
-declare const pLog: pLog;
-
-interface pLog {
-    (): <T>(value: T) => Promise<T>;
-    catch(): (value: any) => Promise<never>;
-}
diff --git a/types/p-log/p-log-tests.ts b/types/p-log/p-log-tests.ts
deleted file mode 100644
index 58e9aa17d7..0000000000
--- a/types/p-log/p-log-tests.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import pLog = require('p-log');
-
-Promise.resolve('unicorn')
-    .then(pLog())
-    .then(val => {
-        val; // $ExpectType string
-    });
-
-Promise.resolve()
-    .then(() => {
-        throw new Error('pony');
-    })
-    .catch(pLog.catch())
-    .catch(error => {
-    });
diff --git a/types/p-log/tsconfig.json b/types/p-log/tsconfig.json
deleted file mode 100644
index 891d94fce3..0000000000
--- a/types/p-log/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-log-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-log/tslint.json b/types/p-log/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-log/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-map-series/index.d.ts b/types/p-map-series/index.d.ts
deleted file mode 100644
index d7767278f5..0000000000
--- a/types/p-map-series/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for p-map-series 1.0
-// Project: https://github.com/sindresorhus/p-map-series#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = pMapSeries;
-
-declare function pMapSeries<T, U = T>(input: Iterable<PromiseLike<T> | T>, mapper: (element: T, index: number) => PromiseLike<U> | U): Promise<U[]>;
diff --git a/types/p-map-series/p-map-series-tests.ts b/types/p-map-series/p-map-series-tests.ts
deleted file mode 100644
index c9c2831b0f..0000000000
--- a/types/p-map-series/p-map-series-tests.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import pMapSeries = require('p-map-series');
-
-const keywords = [
-    Promise.resolve('foo'),
-    'rainbow',
-    'pony'
-];
-
-const keywordSet = new Set(keywords);
-
-pMapSeries(keywords, (keyword, idx) => Promise.resolve({keyword, idx})).then(result => {
-    result; // $ExpectType { keyword: string; idx: number; }[]
-    const res1: { keyword: string; idx: number; } = result[0];
-});
-
-pMapSeries(keywordSet, (keyword) => Promise.resolve({keyword})).then(result => {
-    result; // $ExpectType { keyword: string; }[]
-    const res1: { keyword: string; } = result[0];
-});
diff --git a/types/p-map-series/tsconfig.json b/types/p-map-series/tsconfig.json
deleted file mode 100644
index b06e222983..0000000000
--- a/types/p-map-series/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-map-series-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-map-series/tslint.json b/types/p-map-series/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-map-series/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-memoize/index.d.ts b/types/p-memoize/index.d.ts
deleted file mode 100644
index 0b997b4b19..0000000000
--- a/types/p-memoize/index.d.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-// Type definitions for p-memoize 1.0
-// Project: https://github.com/sindresorhus/p-memoize#readme
-// Definitions by: forabi <https://github.com/forabi>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-interface MemOptions {
-    /**
-     * Milliseconds until the cache expires.
-     * @default Infinity
-     */
-    maxAge?: number;
-
-    /**
-     * Determines the cache key for storing the result based on the
-     * function arguments. By default, if there's only one argument and
-     * it's a primitive, it's used directly as a key, otherwise it's all
-     * the function arguments JSON stringified as an array.
-     *
-     * You could for example change it to only cache on the first argument
-     * `x => JSON.stringify(x)`.
-     */
-    cacheKey?: (...args: any[]) => string;
-
-    /**
-     * Use a different cache storage.
-     * Must implement the following methods:
-     * `.has(key)`, `.get(key)`, `.set(key, value)`, `.delete(key)`, and optionally `.clear()`
-     * You could for example use a `WeakMap` instead or `quick-lru` for a LRU cache.
-     *
-     * @default new Map()
-     */
-    cache?: pMemoize.Cache;
-
-    /** Cache rejected promises. */
-    cachePromiseRejection?: boolean;
-}
-
-type PMemoize = <T extends (...args: any[]) => any>(
-    f: T,
-    memoizeOptions?: MemOptions
-) => T;
-
-declare const pMemoize: PMemoize;
-
-declare namespace pMemoize {
-    interface Cache<K = string, V = any> {
-        get(key: K): V;
-        set(key: K, value: V): void;
-        has(key: K): boolean;
-        delete(key: K): void;
-        clear?(): void;
-    }
-}
-
-export = pMemoize;
diff --git a/types/p-memoize/p-memoize-tests.ts b/types/p-memoize/p-memoize-tests.ts
deleted file mode 100644
index 8626482dab..0000000000
--- a/types/p-memoize/p-memoize-tests.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import pMemoize = require('p-memoize');
-import { Cache } from 'p-memoize';
-
-const a = pMemoize(async () => Promise.resolve('Hello world!'));
-
-const b = pMemoize(async () => Promise.resolve(1), {
-    maxAge: 1000,
-    cache: new Map()
-});
-
-a();
-
-b();
diff --git a/types/p-memoize/tsconfig.json b/types/p-memoize/tsconfig.json
deleted file mode 100644
index 0605de1be9..0000000000
--- a/types/p-memoize/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": ["es6"],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": ["../"],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes": true
-    },
-    "files": ["index.d.ts", "p-memoize-tests.ts"]
-}
diff --git a/types/p-memoize/tslint.json b/types/p-memoize/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-memoize/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-one/index.d.ts b/types/p-one/index.d.ts
deleted file mode 100644
index 14408b4cd7..0000000000
--- a/types/p-one/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for p-one 1.0
-// Project: https://github.com/kevva/p-one#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pOne;
-
-declare function pOne<T>(input: Iterable<PromiseLike<T> | T>,
-                         testFn: (element: T, index: number) => boolean | Promise<boolean>,
-                         options?: pOne.Options): Promise<boolean>;
-
-declare namespace pOne {
-    interface Options {
-        concurrency?: number;
-    }
-}
diff --git a/types/p-one/p-one-tests.ts b/types/p-one/p-one-tests.ts
deleted file mode 100644
index 99c2536dec..0000000000
--- a/types/p-one/p-one-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import pOne = require('p-one');
-
-const places = [
-    Promise.resolve('Norway'),
-    'Bangkok, Thailand',
-    'Berlin, Germany',
-    'Tokyo, Japan'
-];
-
-pOne(places, x => Promise.resolve(true)).then(result => {
-    const bool: boolean = result;
-});
-
-const places2 = [
-    Promise.resolve('Norway'),
-    'Bangkok, Thailand',
-    'Berlin, Germany',
-    5
-];
-
-pOne<string | number>(places2, x => {
-    const strnum: string | number = x;
-    return Promise.resolve(true);
-}, {concurrency: 2}).then(result => {
-    const bool: boolean = result;
-});
diff --git a/types/p-one/tsconfig.json b/types/p-one/tsconfig.json
deleted file mode 100644
index 27a6a05ac7..0000000000
--- a/types/p-one/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-one-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-one/tslint.json b/types/p-one/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-one/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-progress/index.d.ts b/types/p-progress/index.d.ts
deleted file mode 100644
index 8eb745683c..0000000000
--- a/types/p-progress/index.d.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-// Type definitions for p-progress 0.2
-// Project: https://github.com/sindresorhus/p-progress#readme
-// Definitions by: icopp <https://github.com/icopp>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-declare namespace pProgress {
-    interface Options {
-        /**
-         * Number of concurrently pending promises.
-         *
-         * To run the promises in series, set it to 1.
-         *
-         * When this option is set, the first argument must be an array of
-         * promise-returning functions.
-         *
-         * Minimum 1.
-         *
-         * @default {Infinity}
-         */
-        concurrency?: number;
-    }
-}
-
-type PromiseFactory<T> = () => Promise<T> | PromiseLike<T>;
-
-declare class PProgress<T> extends Promise<T> {
-    /**
-     * The current progress percentage of the promise as a number between 0 and
-     * 1.
-     */
-    progress: number;
-
-    /**
-     * Convenience method to run multiple promises and get a total progress of
-     * all of them. It counts normal promises with progress `0` when pending and
-     * progress `1` when resolved. For PProgress type promises, it listens to
-     * their onProgress() method for more fine grained progress reporting. You
-     * can mix and match normal promises and PProgress promises.
-     *
-     * @param promises Array of promises or promise-returning functions.
-     * @throws {TypeError}
-     */
-    static all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>,
-            PromiseFactory<T6>,
-            PromiseFactory<T7>,
-            PromiseFactory<T8>,
-            PromiseFactory<T9>,
-            PromiseFactory<T10>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
-    static all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>,
-            PromiseFactory<T6>,
-            PromiseFactory<T7>,
-            PromiseFactory<T8>,
-            PromiseFactory<T9>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
-    static all<T1, T2, T3, T4, T5, T6, T7, T8>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>,
-            PromiseFactory<T6>,
-            PromiseFactory<T7>,
-            PromiseFactory<T8>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8]>;
-    static all<T1, T2, T3, T4, T5, T6, T7>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>,
-            PromiseFactory<T6>,
-            PromiseFactory<T7>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5, T6, T7]>;
-    static all<T1, T2, T3, T4, T5, T6>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>,
-            PromiseFactory<T6>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5, T6]>;
-    static all<T1, T2, T3, T4, T5>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>,
-            PromiseFactory<T5>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4, T5]>;
-    static all<T1, T2, T3, T4>(
-        promises: [
-            PromiseFactory<T1>,
-            PromiseFactory<T2>,
-            PromiseFactory<T3>,
-            PromiseFactory<T4>
-        ],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3, T4]>;
-    static all<T1, T2, T3>(
-        promises: [PromiseFactory<T1>, PromiseFactory<T2>, PromiseFactory<T3>],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2, T3]>;
-    static all<T1, T2>(
-        promises: [PromiseFactory<T1>, PromiseFactory<T2>],
-        options?: pProgress.Options
-    ): PProgress<[T1, T2]>;
-    static all<T1>(
-        promises: [PromiseFactory<T1>],
-        options?: pProgress.Options
-    ): PProgress<[T1]>;
-    static all<TAll>(
-        promises: Array<PromiseFactory<TAll>>,
-        options?: pProgress.Options
-    ): PProgress<TAll>;
-
-    /**
-     * Same as the Promise constructor, but with an appended `progress`
-     * parameter in `executor`.
-     *
-     * @param progress
-     *  Call this with progress updates. It expects a number between 0 and 1.
-     *
-     *  Multiple calls with the same number will result in only one
-     *  `onProgress()` event.
-     *
-     *  Progress percentage `1` is reported for you when the promise resolves.
-     *  If you set it yourself, it will simply be ignored.
-     */
-    constructor(
-        executor: (
-            resolve: (value?: T | PromiseLike<T>) => void,
-            reject: (reason?: any) => void,
-            progress: (progress: number) => void
-        ) => void
-    );
-
-    /**
-     * Accepts a function that gets `instance.progress` as an argument and is
-     * called for every progress event.
-     *
-     * @throws {TypeError}
-     */
-    onProgress(cb: (progress: number) => void): void;
-}
-
-export = PProgress;
diff --git a/types/p-progress/p-progress-tests.ts b/types/p-progress/p-progress-tests.ts
deleted file mode 100644
index eb70dec355..0000000000
--- a/types/p-progress/p-progress-tests.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import PProgress = require("p-progress");
-
-new PProgress(async (resolve, reject, progress) => {
-    try {
-        await Promise.resolve("sindresorhus.com");
-        progress(0.5);
-
-        await Promise.resolve("ava.li");
-        progress(1);
-
-        resolve();
-    } catch (e) {
-        reject(e);
-    }
-}).onProgress(progress => {
-    progress;
-});
-
-PProgress.all(
-    [
-        () => Promise.resolve("sindresorhus.com"),
-        () => Promise.resolve("ava.li"),
-        () => Promise.resolve(),
-        () => Promise.resolve(1)
-    ],
-    { concurrency: 2 }
-).then(result => {
-    const str: string = result[0];
-    const str2: string = result[1];
-    const num: number = result[3];
-});
diff --git a/types/p-progress/tsconfig.json b/types/p-progress/tsconfig.json
deleted file mode 100644
index 1cd7ff1976..0000000000
--- a/types/p-progress/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "strictFunctionTypes": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-progress-tests.ts"
-    ]
-}
diff --git a/types/p-progress/tslint.json b/types/p-progress/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-progress/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-props/index.d.ts b/types/p-props/index.d.ts
deleted file mode 100644
index 3fa293ef69..0000000000
--- a/types/p-props/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for p-props 1.0
-// Project: https://github.com/sindresorhus/p-props#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = pProps;
-
-declare function pProps<V, M extends { [key: string]: PromiseLike<V> | V }>(input: M): Promise<Record<keyof M, V>>;
-declare function pProps<K, V>(input: Map<K, PromiseLike<V> | V>): Promise<Map<K, V>>;
diff --git a/types/p-props/p-props-tests.ts b/types/p-props/p-props-tests.ts
deleted file mode 100644
index 651d613193..0000000000
--- a/types/p-props/p-props-tests.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import pProps = require('p-props');
-import got = require('got');
-
-const fetch = (url: string): Promise<string> => got(url).then(res => res.body);
-
-const sites = {
-    ava: fetch('ava.li'),
-    todomvc: fetch('todomvc.com'),
-    github: fetch('github.com'),
-    foo: 'bar'
-};
-
-pProps<string, typeof sites>(sites).then(result => {
-    const str: string = result.github;
-});
-
-const map = new Map<number, string | Promise<string>>([[1, Promise.resolve('1')], [2, '2']]);
-
-pProps(map).then(result => {
-    const str: string | undefined = result.get(1);
-});
diff --git a/types/p-props/tsconfig.json b/types/p-props/tsconfig.json
deleted file mode 100644
index 8ef73ae141..0000000000
--- a/types/p-props/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-props-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-props/tslint.json b/types/p-props/tslint.json
deleted file mode 100644
index 71ee04c4e1..0000000000
--- a/types/p-props/tslint.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
-}
diff --git a/types/p-reduce/index.d.ts b/types/p-reduce/index.d.ts
deleted file mode 100644
index 6434eda06a..0000000000
--- a/types/p-reduce/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for p-reduce 1.0
-// Project: https://github.com/sindresorhus/p-reduce#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = pReduce;
-
-declare function pReduce<T, U = T>(input: Iterable<PromiseLike<T> | T>,
-                                   reducer: (previousValue: U, currentValue: T, index: number) => Promise<U> | U,
-                                   initialValue?: U): Promise<U>;
diff --git a/types/p-reduce/p-reduce-tests.ts b/types/p-reduce/p-reduce-tests.ts
deleted file mode 100644
index 113b6040fc..0000000000
--- a/types/p-reduce/p-reduce-tests.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import pReduce = require('p-reduce');
-
-const names = [
-    Promise.resolve('sindresorhus'),
-    'Addy Osmani',
-    'Pascal Hartig',
-    'Stephen Sawchuk'
-];
-
-pReduce(names, (total, name) => {
-    return Promise.resolve(total + 1);
-}, 0).then(count => {
-    const num: number = count;
-});
-
-const names2 = [
-    Promise.resolve('sindresorhus'),
-    'Addy Osmani',
-    'Pascal Hartig',
-    5
-];
-
-pReduce<string | number, string>(names2, (allNames, name) => {
-    return Promise.resolve(`${allNames},${name}`);
-}, '').then(allNames => {
-    const str: string = allNames;
-});
diff --git a/types/p-reduce/tsconfig.json b/types/p-reduce/tsconfig.json
deleted file mode 100644
index d06d04e5e7..0000000000
--- a/types/p-reduce/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-reduce-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-reduce/tslint.json b/types/p-reduce/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-reduce/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-retry/index.d.ts b/types/p-retry/index.d.ts
deleted file mode 100644
index b2c9100b68..0000000000
--- a/types/p-retry/index.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Type definitions for p-retry 3.0
-// Project: https://github.com/sindresorhus/p-retry#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { OperationOptions } from 'retry';
-
-export = pRetry;
-
-declare function pRetry<T>(input: (attemptCount: number) => PromiseLike<T> | T, options?: pRetry.Options): Promise<T>;
-
-declare namespace pRetry {
-    class AbortError extends Error {
-        readonly name: 'AbortError';
-        readonly originalError: Error;
-        constructor(message: string | Error);
-    }
-
-    interface FailedAttemptError extends Error {
-        attemptNumber: number;
-        retriesLeft: number;
-    }
-
-    interface Options extends OperationOptions {
-        onFailedAttempt?: (error: FailedAttemptError) => void;
-    }
-}
diff --git a/types/p-retry/p-retry-tests.ts b/types/p-retry/p-retry-tests.ts
deleted file mode 100644
index 19d3fbbfef..0000000000
--- a/types/p-retry/p-retry-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import pRetry = require('p-retry');
-import fetch from 'node-fetch';
-
-const run = () => fetch('https://sindresorhus.com/unicorn')
-    .then(response => {
-        // abort retrying if the resource doesn't exist
-        if (response.status === 404) {
-            throw new pRetry.AbortError(response.statusText);
-        }
-        return response.text();
-    });
-
-pRetry(run, {
-    retries: 5,
-    onFailedAttempt: error => {
-        console.log(`Attempt ${error.attemptNumber} failed. There are ${error.retriesLeft} attempts left.`);
-    }
-}).then(result => {
-    const str: string = result;
-});
diff --git a/types/p-retry/tsconfig.json b/types/p-retry/tsconfig.json
deleted file mode 100644
index 8bd6ddd6b5..0000000000
--- a/types/p-retry/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-retry-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-retry/tslint.json b/types/p-retry/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-retry/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-series/index.d.ts b/types/p-series/index.d.ts
deleted file mode 100644
index ecc7b19cd8..0000000000
--- a/types/p-series/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Type definitions for p-series 1.0
-// Project: https://github.com/sindresorhus/p-series#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = pSeries;
-
-declare function pSeries<T>(tasks: Iterable<() => Promise<T> | T>): Promise<T[]>;
diff --git a/types/p-series/p-series-tests.ts b/types/p-series/p-series-tests.ts
deleted file mode 100644
index 1b97ca3a48..0000000000
--- a/types/p-series/p-series-tests.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import pSeries = require('p-series');
-import got = require('got');
-
-pSeries<got.Response<string> | number | boolean>([
-    () => got('sindresorhus.com'),
-    () => Promise.resolve(1),
-    () => true
-]).then(result => {
-    result[0]; // $ExpectType number | boolean | Response<string>
-});
-
-pSeries<got.Response<string> | number | boolean>(new Set<(() => Promise<got.Response<string>>) | (() => Promise<number>) | (() => Promise<boolean>)>([
-    () => got('sindresorhus.com'),
-    () => Promise.resolve(1),
-    () => Promise.resolve(true)
-])).then(result => {
-    result[0]; // $ExpectType number | boolean | Response<string>
-});
diff --git a/types/p-series/tsconfig.json b/types/p-series/tsconfig.json
deleted file mode 100644
index 7ac0ed4d4c..0000000000
--- a/types/p-series/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-series-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-series/tslint.json b/types/p-series/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-series/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-tap/index.d.ts b/types/p-tap/index.d.ts
deleted file mode 100644
index 38996963fc..0000000000
--- a/types/p-tap/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Type definitions for p-tap 1.0
-// Project: https://github.com/sindresorhus/p-tap#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pTap;
-
-declare const pTap: pTap;
-
-interface pTap {
-    <T>(fn: (value: T) => any): (value: T) => Promise<T>;
-    catch(fn: (value: any) => any): (value: any) => Promise<never>;
-}
diff --git a/types/p-tap/p-tap-tests.ts b/types/p-tap/p-tap-tests.ts
deleted file mode 100644
index c0db33e3cc..0000000000
--- a/types/p-tap/p-tap-tests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import pTap = require('p-tap');
-
-Promise.resolve('unicorn')
-    .then(pTap<string>(val => {
-        const str: string = val;
-        return 1;
-    }))
-    .then(val => {
-        const str: string = val;
-    });
-
-Promise.resolve('unicorn')
-    .then(pTap<string>(val => {
-        const str: string = val;
-        return Promise.resolve(1);
-    }))
-    .then(val => {
-        const str: string = val;
-    });
-
-Promise.reject(new Error())
-    .catch(pTap.catch(val => {
-        const num: number = val;
-    }))
-    .then(() => 1)
-    .catch(() => {});
diff --git a/types/p-tap/tsconfig.json b/types/p-tap/tsconfig.json
deleted file mode 100644
index 1d4042647f..0000000000
--- a/types/p-tap/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-tap-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-tap/tslint.json b/types/p-tap/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-tap/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/p-timeout/index.d.ts b/types/p-timeout/index.d.ts
deleted file mode 100644
index 40e1dc6410..0000000000
--- a/types/p-timeout/index.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// Type definitions for p-timeout 1.2
-// Project: https://github.com/sindresorhus/p-timeout#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pTimeout;
-
-declare function pTimeout<T>(input: PromiseLike<T>, ms: number, message?: string | pTimeout.TimeoutError): Promise<T>;
-declare function pTimeout<T, R>(input: PromiseLike<T>, ms: number, fallback: () => R | Promise<R>): Promise<T | R>;
-
-declare namespace pTimeout {
-    class TimeoutError extends Error {
-        readonly name: 'TimeoutError';
-        constructor(message?: string);
-    }
-}
diff --git a/types/p-timeout/p-timeout-tests.ts b/types/p-timeout/p-timeout-tests.ts
deleted file mode 100644
index 455ed2204f..0000000000
--- a/types/p-timeout/p-timeout-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/// <reference types="node" />
-
-import pTimeout = require('p-timeout');
-
-const delayedPromise: () => Promise<string> = () => new Promise(resolve => setTimeout(() => resolve('foo'), 200));
-
-let str: string;
-let num: number;
-pTimeout(delayedPromise(), 50).then(() => 'foo');
-pTimeout(delayedPromise(), 50, () => {
-    return pTimeout(delayedPromise(), 300);
-});
-pTimeout(delayedPromise(), 50).then(res => str = res);
-pTimeout(delayedPromise(), 50, 'error').then(res => str = res);
-pTimeout(delayedPromise(), 50, new pTimeout.TimeoutError('error')).then(res => str = res);
-pTimeout(delayedPromise(), 50, () => Promise.resolve(10)).then(res => {
-    if (typeof res === 'string') {
-        str = res;
-    } else {
-        num = res;
-    }
-});
-pTimeout(delayedPromise(), 50, () => 10).then(res => {
-    if (typeof res === 'string') {
-        str = res;
-    } else {
-        num = res;
-    }
-});
diff --git a/types/p-timeout/tsconfig.json b/types/p-timeout/tsconfig.json
deleted file mode 100644
index d16042504a..0000000000
--- a/types/p-timeout/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "p-timeout-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/p-timeout/tslint.json b/types/p-timeout/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/p-timeout/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/package-json/index.d.ts b/types/package-json/index.d.ts
deleted file mode 100644
index 9089b19d0a..0000000000
--- a/types/package-json/index.d.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Type definitions for package-json 5.0
-// Project: https://github.com/sindresorhus/package-json#readme
-// Definitions by: Jinwoo Lee <https://github.com/jinwoo>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = packageJson;
-
-/**
- * Get metadata of a package from the npm registry.
- *
- * @param name Name of the package.
- */
-declare function packageJson(
-    name: string,
-    options?: packageJson.Options
-): Promise<packageJson.PackageJson>;
-
-declare namespace packageJson {
-    interface Options {
-        /**
-         * Package version such as `1.0.0` or a [dist tag](https://docs.npmjs.com/cli/dist-tag) such as `latest`.
-         *
-         * The version can also be in any format supported by the [semver](https://github.com/npm/node-semver) module.
-         * For example:
-         * - `1` - Get the latest `1.x.x`
-         * - `1.2` - Get the latest `1.2.x`
-         * - `^1.2.3` - Get the latest `1.x.x` but at least `1.2.3`
-         * - `~1.2.3` - Get the latest `1.2.x` but at least `1.2.3`
-         *
-         * @default 'latest'
-         */
-        version?: string;
-        /**
-         * By default, only an abbreviated metadata object is returned for performance reasons.
-         * [Read more.](https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md)
-         * @default false
-         */
-        fullMetadata?: boolean;
-        /**
-         * Return the [main entry](https://registry.npmjs.org/ava) containing all versions.
-         * @default false
-         */
-        allVersions?: boolean;
-    }
-
-    interface PackageJson {
-        [k: string]: any;
-        name?: string;
-        version?: string;
-        files?: string[];
-        bin?: { [k: string]: string };
-        man?: string[];
-        keywords?: string[];
-        author?: Person;
-        maintainers?: Person[];
-        contributors?: Person[];
-        bundleDependencies?: { [name: string]: string };
-        dependencies?: { [name: string]: string };
-        devDependencies?: { [name: string]: string };
-        optionalDependencies?: { [name: string]: string };
-        description?: string;
-        engines?: { [type: string]: string };
-        license?: string;
-        repository?: { type: string; url: string };
-        bugs?: { url: string; email?: string } | { url?: string; email: string };
-        homepage?: string;
-        scripts?: { [k: string]: string };
-        readme?: string;
-    }
-
-    interface Person {
-        name?: string;
-        email?: string;
-        url?: string;
-    }
-}
diff --git a/types/package-json/package-json-tests.ts b/types/package-json/package-json-tests.ts
deleted file mode 100644
index 7255351933..0000000000
--- a/types/package-json/package-json-tests.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import packageJson = require('package-json');
-
-packageJson('package-json'); // $ExpectType Promise<PackageJson>
-packageJson('package-json', { version: '1.2.3' }); // $ExpectType Promise<PackageJson>
-packageJson('package-json', { fullMetadata: true }); // $ExpectType Promise<PackageJson>
-packageJson('package-json', { allVersions: true }); // $ExpectType Promise<PackageJson>
diff --git a/types/package-json/tsconfig.json b/types/package-json/tsconfig.json
deleted file mode 100644
index 7bca217f58..0000000000
--- a/types/package-json/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictFunctionTypes": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "package-json-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/package-json/tslint.json b/types/package-json/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/package-json/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/path-type/index.d.ts b/types/path-type/index.d.ts
deleted file mode 100644
index d67856f85e..0000000000
--- a/types/path-type/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for path-type 3.0
-// Project: https://github.com/sindresorhus/path-type#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export const file: PathTypeFn;
-export const dir: PathTypeFn;
-export const symlink: PathTypeFn;
-
-export const fileSync: PathTypeSyncFn;
-export const dirSync: PathTypeSyncFn;
-export const symlinkSync: PathTypeSyncFn;
-
-export type PathTypeFn = (path: string) => Promise<boolean>;
-export type PathTypeSyncFn = (path: string) => boolean;
diff --git a/types/path-type/path-type-tests.ts b/types/path-type/path-type-tests.ts
deleted file mode 100644
index d070731523..0000000000
--- a/types/path-type/path-type-tests.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import pathType = require('path-type');
-
-// $ExpectType Promise<boolean>
-pathType.file('package.json');
-// $ExpectType Promise<boolean>
-pathType.dir('package.json');
-// $ExpectType Promise<boolean>
-pathType.symlink('package.json');
-
-// $ExpectType boolean
-pathType.fileSync('package.json');
-// $ExpectType boolean
-pathType.dirSync('package.json');
-// $ExpectType boolean
-pathType.symlinkSync('package.json');
diff --git a/types/path-type/tsconfig.json b/types/path-type/tsconfig.json
deleted file mode 100644
index f2c7533a5d..0000000000
--- a/types/path-type/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "path-type-tests.ts"
-    ]
-}
diff --git a/types/path-type/tslint.json b/types/path-type/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/path-type/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/pkg-dir/index.d.ts b/types/pkg-dir/index.d.ts
deleted file mode 100644
index 7d8b714f0b..0000000000
--- a/types/pkg-dir/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for pkg-dir 2.0
-// Project: https://github.com/sindresorhus/pkg-dir#readme
-// Definitions by: NK-WEB-Git <https://github.com/NK-WEB-Git>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pkgDir;
-
-declare function pkgDir(cwd?: string): Promise<string | null>;
-
-declare namespace pkgDir {
-    function sync(cwd?: string): string | null;
-}
diff --git a/types/pkg-dir/pkg-dir-tests.ts b/types/pkg-dir/pkg-dir-tests.ts
deleted file mode 100644
index 487310a6a2..0000000000
--- a/types/pkg-dir/pkg-dir-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import pkgDir = require('pkg-dir');
-
-pkgDir('/Users/project/pkg-dir').then(rootDir => {
-    rootDir; // $ExpectType string | null
-});
-
-pkgDir().then(rootDir => {
-    rootDir;
-});
-
-pkgDir.sync('/Users/project/pkg-dir'); // $ExpectType string | null
diff --git a/types/pkg-dir/tsconfig.json b/types/pkg-dir/tsconfig.json
deleted file mode 100644
index a5647ed0eb..0000000000
--- a/types/pkg-dir/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pkg-dir-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/pkg-dir/tslint.json b/types/pkg-dir/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/pkg-dir/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/pkg-versions/index.d.ts b/types/pkg-versions/index.d.ts
deleted file mode 100644
index a271a57485..0000000000
--- a/types/pkg-versions/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for pkg-versions 1.1
-// Project: https://github.com/sindresorhus/pkg-versions#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = pkgVersions;
-
-declare function pkgVersions(name: string): Promise<Set<string>>;
diff --git a/types/pkg-versions/pkg-versions-tests.ts b/types/pkg-versions/pkg-versions-tests.ts
deleted file mode 100644
index f0b963b998..0000000000
--- a/types/pkg-versions/pkg-versions-tests.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import pkgVersions = require('pkg-versions');
-
-pkgVersions('ava'); // $ExpectType Promise<Set<string>>
diff --git a/types/pkg-versions/tsconfig.json b/types/pkg-versions/tsconfig.json
deleted file mode 100644
index cc9bffbcd4..0000000000
--- a/types/pkg-versions/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "pkg-versions-tests.ts"
-    ]
-}
diff --git a/types/pkg-versions/tslint.json b/types/pkg-versions/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/pkg-versions/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/sindresorhus__df/index.d.ts b/types/sindresorhus__df/index.d.ts
deleted file mode 100644
index af7a6c8d20..0000000000
--- a/types/sindresorhus__df/index.d.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// Type definitions for sindresorhus__df 2.10
-// Project: https://github.com/sindresorhus/df
-// Definitions by: Matt Thompson <https://github.com/whatknight>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
-
-declare function df(): Promise<df.SpaceInfo[]>;
-declare namespace df {
-    function fs(filesystem: string): Promise<SpaceInfo>;
-    function file(file: string): Promise<SpaceInfo>;
-    interface SpaceInfo {
-        filesystem: string;
-        size: number;
-        used: number;
-        available: number;
-        capacity: number;
-        mountpoint: string;
-    }
-}
-
-export = df;
diff --git a/types/sindresorhus__df/sindresorhus__df-tests.ts b/types/sindresorhus__df/sindresorhus__df-tests.ts
deleted file mode 100644
index 970c8b8a1f..0000000000
--- a/types/sindresorhus__df/sindresorhus__df-tests.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import df = require('@sindresorhus/df');
-
-(async () => {
-    const disks  = await df();
-    disks.forEach((disk: df.SpaceInfo) => {
-        const {filesystem, size, used, available, capacity, mountpoint} = disk;
-        return {
-            filesystem, size, used, available, capacity, mountpoint
-        };
-    });
-	/*
-	[{
-		filesystem: '/dev/disk1',
-		size: 499046809600,
-		used: 443222245376,
-		available: 55562420224,
-		capacity: 0.89,
-		mountpoint: '/'
-	}, …]
-	*/
-
-	let {filesystem, size, used, available, capacity, mountpoint} = await df.fs('/dev/disk1');
-	/*
-	{
-		filesystem: '/dev/disk1',
-		…
-	}
-	*/
-
-	({filesystem, size, used, available, capacity, mountpoint} = await df.file('./simple.txt'));
-	/*
-	{
-		filesystem: '/dev/disk1',
-		…
-	}
-	*/
-})();
diff --git a/types/sindresorhus__df/tsconfig.json b/types/sindresorhus__df/tsconfig.json
deleted file mode 100644
index 9dcf70310e..0000000000
--- a/types/sindresorhus__df/tsconfig.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "strictFunctionTypes": true,
-        "forceConsistentCasingInFileNames": true,
-        "paths": {
-            "@sindresorhus/df": [
-                "sindresorhus__df"
-            ]
-        }
-    },
-    "files": [
-        "index.d.ts",
-        "sindresorhus__df-tests.ts"
-    ]
-}
diff --git a/types/sindresorhus__df/tslint.json b/types/sindresorhus__df/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/sindresorhus__df/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/unused-filename/index.d.ts b/types/unused-filename/index.d.ts
deleted file mode 100644
index 87d059683c..0000000000
--- a/types/unused-filename/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Type definitions for unused-filename 1.0
-// Project: https://github.com/sindresorhus/unused-filename#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export = unusedFilename;
-
-declare function unusedFilename(filepath: string): Promise<string>;
-
-declare namespace unusedFilename {
-    function sync(filepath: string): string;
-}
diff --git a/types/unused-filename/tsconfig.json b/types/unused-filename/tsconfig.json
deleted file mode 100644
index da9da24039..0000000000
--- a/types/unused-filename/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "unused-filename-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/unused-filename/tslint.json b/types/unused-filename/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/unused-filename/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/unused-filename/unused-filename-tests.ts b/types/unused-filename/unused-filename-tests.ts
deleted file mode 100644
index c7e1f4a9f3..0000000000
--- a/types/unused-filename/unused-filename-tests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import unusedFilename = require('unused-filename');
-
-unusedFilename('rainbow.txt').then(filename => {
-    filename; // $ExpectType string
-});
diff --git a/types/wallpaper/index.d.ts b/types/wallpaper/index.d.ts
deleted file mode 100644
index 21f2c8fb40..0000000000
--- a/types/wallpaper/index.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// Type definitions for wallpaper 2.5
-// Project: https://github.com/sindresorhus/wallpaper#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export function get(): Promise<string>;
-export function set(imagePath: string, options?: WallpaperOptions): Promise<void>;
-
-export interface WallpaperOptions {
-    scale?: 'fill' | 'fit' | 'stretch' | 'center';
-}
diff --git a/types/wallpaper/tsconfig.json b/types/wallpaper/tsconfig.json
deleted file mode 100644
index ace8bd1f01..0000000000
--- a/types/wallpaper/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "wallpaper-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/wallpaper/tslint.json b/types/wallpaper/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/wallpaper/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/wallpaper/wallpaper-tests.ts b/types/wallpaper/wallpaper-tests.ts
deleted file mode 100644
index 49fc5dfd1b..0000000000
--- a/types/wallpaper/wallpaper-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import wallpaper = require('wallpaper');
-
-wallpaper.set('unicorn.jpg').then(() => {});
-wallpaper.set('unicorn.jpg', {scale: 'fill'}).then(() => {});
-
-wallpaper.get().then(imagePath => {
-    const str: string = imagePath;
-});

From 2492054ca346f1086c6437e1c2ad5bcb6493309d Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Fri, 15 Mar 2019 23:01:30 +0000
Subject: [PATCH 707/924] Updated Definitions

---
 types/react-native-canvas/index.d.ts          | 92 ++++++++++++++++++-
 .../react-native-canvas-tests.tsx             | 27 +++++-
 2 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index 3dae92869f..d9aa845ef6 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -7,10 +7,96 @@
 import * as React from "react";
 import { StyleProp, ViewStyle } from "react-native";
 
+export interface IImageData {
+    data: number[];
+    height: number;
+    width: number;
+}
+
+export interface CanvasRenderingContext2D {
+    fillStyle: string;
+    font: string;
+    globalAlpha: number;
+    globalCompositionOperation: string;
+    linecap: string;
+    lineDashOffset: number;
+    lineJoin: string;
+    lineWidth: number;
+    miterLimit: number;
+    shadowBlur: number;
+    shadowColor: string;
+    shadowOffsetX: number;
+    shadowOffsetY: number;
+    strokeStyle: string;
+    textAlign: string;
+    arc: (
+        x: number,
+        y: number,
+        r: number,
+        sAngle: number,
+        eAngle: number,
+        counterClockwise?: number
+    ) => void;
+    arcTo: (x1: number, y1: number, x2: number, y2: number, r: number) => void;
+    beginPath: () => void;
+    bezierCurveTo: (
+        cp1x: number,
+        cp1y: number,
+        cp2x: number,
+        cp2y: number,
+        x: number,
+        y: number
+    ) => void;
+    clearRect: (x: number, y: number, width: number, height: number) => void;
+    clip: () => void;
+    closePath: () => void;
+    createImageData: (
+        width: number,
+        height: number,
+        imageData: IImageData
+    ) => void;
+    createLinearGradient;
+    createPattern;
+    createRadialGradient;
+    drawFocusIfNeeded;
+    drawImage;
+    drawWidgetAsOnScreen;
+    drawWindow;
+    fill;
+    fillRect: (x: number, y: number, width: number, height: number) => void;
+    fillText;
+    getImageData;
+    getLineDash;
+    isPointInPath;
+    isPointInStroke;
+    lineTo;
+    measureText;
+    moveTo;
+    putImageData;
+    quadraticCurveTo;
+    rect;
+    restore;
+    rotate;
+    save;
+    scale;
+    setLineDash;
+    setTransform;
+    stroke;
+    strokeRect;
+    strokeText;
+    transform;
+    translate;
+}
+
+export interface ICanvas {
+    getContext: (context: string) => CanvasRenderingContext2D;
+}
+
 export interface CanvasProps {
-    style: StyleProp<ViewStyle>;
-    baseUrl: string;
-    originWhitelist: string[];
+    baseUrl?: string;
+    originWhitelist?: string[];
+    ref: (canvas: ICanvas) => void;
+    style?: StyleProp<ViewStyle>;
 }
 
 export default class Canvas extends React.Component<CanvasProps> {}
diff --git a/types/react-native-canvas/react-native-canvas-tests.tsx b/types/react-native-canvas/react-native-canvas-tests.tsx
index 1914b78d09..4fce8beb97 100644
--- a/types/react-native-canvas/react-native-canvas-tests.tsx
+++ b/types/react-native-canvas/react-native-canvas-tests.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import { View } from "react-native";
 import Canvas, {
+    ICanvas,
     Image as CanvasImage,
     Path2D,
     ImageData
@@ -15,5 +16,29 @@ class CanvasTest extends React.Component {
         );
     }
 
-    handleCanvas = (canvas: Canvas) => {};
+    handleCanvas = (canvas: ICanvas) => {
+        canvas.width = 100;
+        canvas.height = 100;
+
+        const context = canvas.getContext("2d");
+        context.fillStyle = "purple";
+        context.fillRect(0, 0, 100, 100);
+
+        const ellipse = new Path2D(canvas);
+        ellipse.ellipse(50, 50, 25, 35, (45 * Math.PI) / 180, 0, 2 * Math.PI);
+        context.fillStyle = "purple";
+        context.fill(ellipse);
+
+        context.getImageData(0, 0, 100, 100).then((imageData: ImageData) => {
+            const data = Object.values(imageData.data);
+            const length = Object.keys(data).length;
+            for (let i = 0; i < length; i += 4) {
+                data[i] = 0;
+                data[i + 1] = 0;
+                data[i + 2] = 0;
+            }
+            const imgData = new ImageData(canvas, data, 100, 100);
+            context.putImageData(imgData, 0, 0);
+        });
+    };
 }

From 3a7dfab02f26033dfce809f93d380e86d4ed25a5 Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Fri, 15 Mar 2019 23:11:47 +0000
Subject: [PATCH 708/924] Updated definitions more

---
 types/react-native-canvas/index.d.ts | 29 ++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index d9aa845ef6..20128c6ea8 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -13,6 +13,10 @@ export interface IImageData {
     width: number;
 }
 
+//
+export interface IImage {
+}
+
 export interface CanvasRenderingContext2D {
     fillStyle: string;
     font: string;
@@ -50,21 +54,26 @@ export interface CanvasRenderingContext2D {
     clearRect: (x: number, y: number, width: number, height: number) => void;
     clip: () => void;
     closePath: () => void;
-    createImageData: (
+    createImageData: ( //
         width: number,
         height: number,
         imageData: IImageData
     ) => void;
-    createLinearGradient;
-    createPattern;
-    createRadialGradient;
-    drawFocusIfNeeded;
-    drawImage;
-    drawWidgetAsOnScreen;
-    drawWindow;
-    fill;
+    createLinearGradient: (
+        x0: number,
+        yo: number,
+        x1: number,
+        y1: number
+    ) => void;
+    createPattern: () => void;
+    createRadialGradient: (x0: number, y0: number, r0: number, x1: number, y1: number, r1: number);
+    drawFocusIfNeeded: (html: any) => void; //
+    drawImage: (image: IImage, sx?: number, sy?: number, sWidth?: number, sHeight?: number, dx: number, dy: number, dWidth?: number, dHeight?: number) => void; //
+    drawWidgetAsOnScreen: (window: any) => void; //
+    drawWindow: (window: any, x: number, y: number, w: number, h: number, bgColor: string, flags?: any) => void; //
+    fill: (fillRule?: any, Path2D: any) => void; //
     fillRect: (x: number, y: number, width: number, height: number) => void;
-    fillText;
+    fillText: (text: string, x:number, y: number, maxWidth?: number) => void;
     getImageData;
     getLineDash;
     isPointInPath;

From c78831ca896ce888c0cc924398d0a5e298a55d73 Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Fri, 15 Mar 2019 23:30:05 +0000
Subject: [PATCH 709/924] Added more definitions

---
 types/react-native-canvas/index.d.ts | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index 20128c6ea8..35cdc6e311 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -71,30 +71,30 @@ export interface CanvasRenderingContext2D {
     drawImage: (image: IImage, sx?: number, sy?: number, sWidth?: number, sHeight?: number, dx: number, dy: number, dWidth?: number, dHeight?: number) => void; //
     drawWidgetAsOnScreen: (window: any) => void; //
     drawWindow: (window: any, x: number, y: number, w: number, h: number, bgColor: string, flags?: any) => void; //
-    fill: (fillRule?: any, Path2D: any) => void; //
+    fill: (fillRule?: any, Path2D: Path2D) => void; //
     fillRect: (x: number, y: number, width: number, height: number) => void;
     fillText: (text: string, x:number, y: number, maxWidth?: number) => void;
-    getImageData;
-    getLineDash;
-    isPointInPath;
-    isPointInStroke;
-    lineTo;
-    measureText;
-    moveTo;
-    putImageData;
-    quadraticCurveTo;
-    rect;
-    restore;
-    rotate;
-    save;
-    scale;
-    setLineDash;
-    setTransform;
-    stroke;
-    strokeRect;
-    strokeText;
-    transform;
-    translate;
+    getImageData: (sx: number, sy: number, sw: number, sh: number) => IImageData;
+    getLineDash: () => number[];
+    isPointInPath: (x: number, y: number, fillRule: any, path: Path2D) => boolean;
+    isPointInStroke: (x: number, y: number, path: Path2D) => boolean;
+    lineTo: (x: number, y: number) => void;
+    measureText: (text: string) => any; //
+    moveTo: (x: number, y: number) => void;
+    putImageData: (imageData: IImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number) => void;
+    quadraticCurveTo: (cpx: number, cpy: number, x: number, y: number) => void;
+    rect: (x: number, y: number, width: number, height: number) => void;
+    restore: () => void;
+    rotate: (angle: number) => void;
+    save: () => void;
+    scale: (x: number, y: number) => void;
+    setLineDash: (segments: number[]) => void;
+    setTransform: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+    stroke: (path: Path2D) => void;
+    strokeRect: (x: number, y:number, width: number, height: number) => void;
+    strokeText: (text: string, x: number, y: number, maxWidth?: number) => void;
+    transform: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+    translate: (x: number, y: number) => void;
 }
 
 export interface ICanvas {

From d1fa05328f971ef375afbfe43d56bc40dfa559b4 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Sat, 16 Mar 2019 12:31:00 +0100
Subject: [PATCH 710/924] types/domurl: add missing default export, also fix
 bad tests

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

diff --git a/types/domurl/domurl-tests.ts b/types/domurl/domurl-tests.ts
index 2de93bcc20..e00aa7e1ba 100644
--- a/types/domurl/domurl-tests.ts
+++ b/types/domurl/domurl-tests.ts
@@ -1,13 +1,15 @@
-interface UModel extends QueryString {
+import Url = require("domurl");
+
+interface UModel {
     a: any;
     b: string;
 }
 
-interface U2Model extends QueryString {
+interface U2Model {
     a: any;
 }
 
-interface U3Model extends QueryString {
+interface U3Model {
     foo: string;
 }
 
diff --git a/types/domurl/index.d.ts b/types/domurl/index.d.ts
index d0b7896d61..9de60d45b1 100644
--- a/types/domurl/index.d.ts
+++ b/types/domurl/index.d.ts
@@ -3,14 +3,15 @@
 // Definitions by: Mikhus <ttps://github.com/Mikhus>
 // Definitions: https://github.com/Mikhus/DefinitelyTyped
 
-declare class QueryString {
-    constructor(qs?: string);
-    toString: () => string;
+// <reference types="node" />
+
+declare namespace domurl {
+    type QueryString<T> = T;
 }
 
 declare class Url<T> {
     constructor(url?: string);
-    query: T;
+    query: domurl.QueryString<T>;
     protocol: string;
     user: string;
     pass: string;
@@ -26,5 +27,7 @@ declare class Url<T> {
     paths: (paths?: [string]) => [string];
     isEmptyQuery: () => boolean;
     queryLength: () => number;
-    clearQuery: () => Url<T>;
+    clearQuery: () => Url<{}>;
 }
+
+export = Url;

From 57c5f829094860e6a25eb0363c70db7ebe1f2c1c Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Sat, 16 Mar 2019 23:30:48 +1100
Subject: [PATCH 711/924] webpack: Fix startTime and endTime in Stats

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index fe3dc638e1..d540a165c4 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1131,8 +1131,8 @@ declare namespace webpack {
     abstract class Stats {
         compilation: compilation.Compilation;
         hash?: string;
-        startTime?: Date;
-        endTime?: Date;
+        startTime?: number;
+        endTime?: number;
         /** Returns true if there were errors while compiling. */
         hasErrors(): boolean;
         /** Returns true if there were warnings while compiling. */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 487d28b8f6..6c8bd52ba7 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -895,3 +895,11 @@ profiling = new webpack.debug.ProfilingPlugin({ outputPath: './path.json' });
 configuration = {
     plugins: [profiling]
 };
+
+compiler.hooks.done.tap('foo', stats => {
+  if (stats.startTime === undefined || stats.endTime === undefined) {
+    throw new Error('Well, this is odd');
+  }
+
+  console.log(`Compiled in ${stats.endTime - stats.startTime}ms`);
+});

From b2863192f524179870cab75446e1ac247e0c5c75 Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Sat, 16 Mar 2019 13:01:40 +0000
Subject: [PATCH 712/924] Finished defining the styles

---
 types/react-native-canvas/index.d.ts          | 164 ++++++++++++++----
 .../react-native-canvas-tests.tsx             |  29 ++--
 types/react-native-canvas/tsconfig.json       |   2 +-
 3 files changed, 149 insertions(+), 46 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index 35cdc6e311..b534ac1d46 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -7,14 +7,18 @@
 import * as React from "react";
 import { StyleProp, ViewStyle } from "react-native";
 
-export interface IImageData {
-    data: number[];
-    height: number;
+export interface ICanvas {
     width: number;
+    height: number;
+    toDataURL: () => string;
+    getContext: (context: string) => CanvasRenderingContext2D;
 }
 
-//
-export interface IImage {
+export interface CanvasProps {
+    baseUrl?: string;
+    originWhitelist?: string[];
+    ref: (canvas: ICanvas) => void;
+    style?: StyleProp<ViewStyle>;
 }
 
 export interface CanvasRenderingContext2D {
@@ -54,10 +58,11 @@ export interface CanvasRenderingContext2D {
     clearRect: (x: number, y: number, width: number, height: number) => void;
     clip: () => void;
     closePath: () => void;
-    createImageData: ( //
+    createImageData: (
+        //
         width: number,
         height: number,
-        imageData: IImageData
+        imageData: ImageData
     ) => void;
     createLinearGradient: (
         x0: number,
@@ -66,22 +71,70 @@ export interface CanvasRenderingContext2D {
         y1: number
     ) => void;
     createPattern: () => void;
-    createRadialGradient: (x0: number, y0: number, r0: number, x1: number, y1: number, r1: number);
-    drawFocusIfNeeded: (html: any) => void; //
-    drawImage: (image: IImage, sx?: number, sy?: number, sWidth?: number, sHeight?: number, dx: number, dy: number, dWidth?: number, dHeight?: number) => void; //
-    drawWidgetAsOnScreen: (window: any) => void; //
-    drawWindow: (window: any, x: number, y: number, w: number, h: number, bgColor: string, flags?: any) => void; //
-    fill: (fillRule?: any, Path2D: Path2D) => void; //
+    createRadialGradient: (
+        x0: number,
+        y0: number,
+        r0: number,
+        x1: number,
+        y1: number,
+        r1: number
+    ) => void;
+    drawFocusIfNeeded: (html: HTMLElement) => void;
+    drawImage: (
+        image: Image,
+        dx: number,
+        dy: number,
+        sx?: number,
+        sy?: number,
+        sWidth?: number,
+        sHeight?: number,
+        dWidth?: number,
+        dHeight?: number
+    ) => void;
+    drawWidgetAsOnScreen: (window: any) => void;
+    drawWindow: (
+        window: any,
+        x: number,
+        y: number,
+        w: number,
+        h: number,
+        bgColor: string,
+        flags?: any
+    ) => void; //
+    fill: (Path2D: Path2D, fillRule?: any) => void;
     fillRect: (x: number, y: number, width: number, height: number) => void;
-    fillText: (text: string, x:number, y: number, maxWidth?: number) => void;
-    getImageData: (sx: number, sy: number, sw: number, sh: number) => IImageData;
+    fillText: (text: string, x: number, y: number, maxWidth?: number) => void;
+    ellipse: (
+        x: number,
+        y: number,
+        radiusX: number,
+        radiusY: number,
+        rotation: number,
+        startAngle: number,
+        endAngle: number,
+        anticlockwise?: boolean
+    ) => void;
+    getImageData: (sx: number, sy: number, sw: number, sh: number) => ImageData;
     getLineDash: () => number[];
-    isPointInPath: (x: number, y: number, fillRule: any, path: Path2D) => boolean;
+    isPointInPath: (
+        x: number,
+        y: number,
+        fillRule: any,
+        path: Path2D
+    ) => boolean;
     isPointInStroke: (x: number, y: number, path: Path2D) => boolean;
     lineTo: (x: number, y: number) => void;
-    measureText: (text: string) => any; //
+    measureText: (text: string) => any;
     moveTo: (x: number, y: number) => void;
-    putImageData: (imageData: IImageData, dx: number, dy: number, dirtyX?: number, dirtyY?: number, dirtyWidth?: number, dirtyHeight?: number) => void;
+    putImageData: (
+        imageData: ImageData,
+        dx: number,
+        dy: number,
+        dirtyX?: number,
+        dirtyY?: number,
+        dirtyWidth?: number,
+        dirtyHeight?: number
+    ) => void;
     quadraticCurveTo: (cpx: number, cpy: number, x: number, y: number) => void;
     rect: (x: number, y: number, width: number, height: number) => void;
     restore: () => void;
@@ -89,26 +142,67 @@ export interface CanvasRenderingContext2D {
     save: () => void;
     scale: (x: number, y: number) => void;
     setLineDash: (segments: number[]) => void;
-    setTransform: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+    setTransform: (
+        a: number,
+        b: number,
+        c: number,
+        d: number,
+        e: number,
+        f: number
+    ) => void;
     stroke: (path: Path2D) => void;
-    strokeRect: (x: number, y:number, width: number, height: number) => void;
+    strokeRect: (x: number, y: number, width: number, height: number) => void;
     strokeText: (text: string, x: number, y: number, maxWidth?: number) => void;
-    transform: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+    transform: (
+        a: number,
+        b: number,
+        c: number,
+        d: number,
+        e: number,
+        f: number
+    ) => void;
     translate: (x: number, y: number) => void;
 }
 
-export interface ICanvas {
-    getContext: (context: string) => CanvasRenderingContext2D;
-}
-
-export interface CanvasProps {
-    baseUrl?: string;
-    originWhitelist?: string[];
-    ref: (canvas: ICanvas) => void;
-    style?: StyleProp<ViewStyle>;
-}
-
 export default class Canvas extends React.Component<CanvasProps> {}
-export class Image extends React.Component {}
-export class ImageData extends React.Component {}
-export class Path2D extends React.Component {}
+
+export class Image {
+    constructor(canvas: ICanvas, height?: number, width?: number);
+    crossOrigin: string | undefined;
+    height: number | undefined;
+    width: number | undefined;
+    src: string | undefined;
+    addEventListener: (event: string, func: (...args: any) => any) => void;
+}
+
+export class ImageData {
+    constructor(canvas: ICanvas, data: number[], height: number, width: number);
+    readonly data: number[];
+    readonly height: number;
+    readonly width: number;
+}
+
+export class Path2D {
+    constructor(canvas: ICanvas, ...args: any);
+    addPath: (
+        path: Path2D,
+        transform?: {
+            a: number;
+            b: number;
+            c: number;
+            d: number;
+            e: number;
+            f: number;
+        }
+    ) => void;
+
+    closePath: CanvasRenderingContext2D["closePath"];
+    moveTo: CanvasRenderingContext2D["moveTo"];
+    lineTo: CanvasRenderingContext2D["lineTo"];
+    bezierCurveTo: CanvasRenderingContext2D["bezierCurveTo"];
+    quadraticCurveTo: CanvasRenderingContext2D["quadraticCurveTo"];
+    arc: CanvasRenderingContext2D["arc"];
+    arcTo: CanvasRenderingContext2D["arcTo"];
+    ellipse: CanvasRenderingContext2D["ellipse"];
+    rect: CanvasRenderingContext2D["rect"];
+}
diff --git a/types/react-native-canvas/react-native-canvas-tests.tsx b/types/react-native-canvas/react-native-canvas-tests.tsx
index 4fce8beb97..1adba4d4ff 100644
--- a/types/react-native-canvas/react-native-canvas-tests.tsx
+++ b/types/react-native-canvas/react-native-canvas-tests.tsx
@@ -29,16 +29,25 @@ class CanvasTest extends React.Component {
         context.fillStyle = "purple";
         context.fill(ellipse);
 
-        context.getImageData(0, 0, 100, 100).then((imageData: ImageData) => {
-            const data = Object.values(imageData.data);
-            const length = Object.keys(data).length;
-            for (let i = 0; i < length; i += 4) {
-                data[i] = 0;
-                data[i + 1] = 0;
-                data[i + 2] = 0;
-            }
-            const imgData = new ImageData(canvas, data, 100, 100);
-            context.putImageData(imgData, 0, 0);
+        const image = new CanvasImage(canvas);
+        canvas.width = 100;
+        canvas.height = 100;
+
+        image.src =
+            "https://upload.wikimedia.org/wikipedia/commons/6/63/Biho_Takashi._Bat_Before_the_Moon%2C_ca._1910.jpg";
+        image.addEventListener("load", () => {
+            context.drawImage(image, 0, 0, 100, 100);
         });
+
+        const imageData = context.getImageData(0, 0, 100, 100);
+        const data = Object.values(imageData.data);
+        const length = Object.keys(data).length;
+        for (let i = 0; i < length; i += 4) {
+            data[i] = 0;
+            data[i + 1] = 0;
+            data[i + 2] = 0;
+        }
+        const imgData = new ImageData(canvas, data, 100, 100);
+        context.putImageData(imgData, 0, 0);
     };
 }
diff --git a/types/react-native-canvas/tsconfig.json b/types/react-native-canvas/tsconfig.json
index ef85b41bd1..a86d644a9f 100644
--- a/types/react-native-canvas/tsconfig.json
+++ b/types/react-native-canvas/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": ["es6", "es2017"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,

From 21adc178a47eca990cf357b0c47d62b201c78cba Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Sat, 16 Mar 2019 13:10:55 +0000
Subject: [PATCH 713/924] Fixed small bugs

---
 types/react-native-canvas/index.d.ts          | 24 +++++++++----------
 .../react-native-canvas-tests.tsx             |  5 ++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index b534ac1d46..559b986ba8 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -2,22 +2,15 @@
 // Project: https://github.com/iddan/react-native-canvas#readme
 // Definitions by: hmajid2301 <https://github.com/hmajid2301>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 3.1
 
 import * as React from "react";
 import { StyleProp, ViewStyle } from "react-native";
 
-export interface ICanvas {
-    width: number;
-    height: number;
-    toDataURL: () => string;
-    getContext: (context: string) => CanvasRenderingContext2D;
-}
-
 export interface CanvasProps {
     baseUrl?: string;
     originWhitelist?: string[];
-    ref: (canvas: ICanvas) => void;
+    ref: (canvas: Canvas) => any;
     style?: StyleProp<ViewStyle>;
 }
 
@@ -164,10 +157,15 @@ export interface CanvasRenderingContext2D {
     translate: (x: number, y: number) => void;
 }
 
-export default class Canvas extends React.Component<CanvasProps> {}
+export default class Canvas extends React.Component<CanvasProps> {
+    width: number;
+    height: number;
+    toDataURL: () => string;
+    getContext: (context: string) => CanvasRenderingContext2D;
+}
 
 export class Image {
-    constructor(canvas: ICanvas, height?: number, width?: number);
+    constructor(canvas: Canvas, height?: number, width?: number);
     crossOrigin: string | undefined;
     height: number | undefined;
     width: number | undefined;
@@ -176,14 +174,14 @@ export class Image {
 }
 
 export class ImageData {
-    constructor(canvas: ICanvas, data: number[], height: number, width: number);
+    constructor(canvas: Canvas, data: number[], height: number, width: number);
     readonly data: number[];
     readonly height: number;
     readonly width: number;
 }
 
 export class Path2D {
-    constructor(canvas: ICanvas, ...args: any);
+    constructor(canvas: Canvas, ...args: any);
     addPath: (
         path: Path2D,
         transform?: {
diff --git a/types/react-native-canvas/react-native-canvas-tests.tsx b/types/react-native-canvas/react-native-canvas-tests.tsx
index 1adba4d4ff..4b5227231b 100644
--- a/types/react-native-canvas/react-native-canvas-tests.tsx
+++ b/types/react-native-canvas/react-native-canvas-tests.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 import { View } from "react-native";
 import Canvas, {
-    ICanvas,
     Image as CanvasImage,
     Path2D,
     ImageData
@@ -16,7 +15,7 @@ class CanvasTest extends React.Component {
         );
     }
 
-    handleCanvas = (canvas: ICanvas) => {
+    handleCanvas = (canvas: Canvas) => {
         canvas.width = 100;
         canvas.height = 100;
 
@@ -49,5 +48,5 @@ class CanvasTest extends React.Component {
         }
         const imgData = new ImageData(canvas, data, 100, 100);
         context.putImageData(imgData, 0, 0);
-    };
+    }
 }

From 81087d667ef43abc71756e1610a496f7094c7ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E8=83=9C=E5=BC=BA?= <guoshengqiang@live.com>
Date: Sat, 16 Mar 2019 21:27:51 +0800
Subject: [PATCH 714/924] use strictNullChecks for uni-app

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

diff --git a/types/uni-app/tsconfig.json b/types/uni-app/tsconfig.json
index 51707abb73..9074ebf730 100644
--- a/types/uni-app/tsconfig.json
+++ b/types/uni-app/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From 3f1d1f4d8e3c2858ba7d0bd969b2172076ec511a Mon Sep 17 00:00:00 2001
From: Carsten Klein <trancesilken@gmail.com>
Date: Fri, 8 Mar 2019 21:00:21 +0100
Subject: [PATCH 715/924] fix #33727: make ImplementationCallback more lax

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

diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index 56a9f879be..c1cfcdc913 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -15,7 +15,7 @@
 // TypeScript Version: 2.8
 // For ddescribe / iit use : https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/karma-jasmine/karma-jasmine.d.ts
 
-type ImplementationCallback = (() => PromiseLike<any>) | ((done: DoneFn) => void);
+type ImplementationCallback = (() => PromiseLike<any>) | (() => void) | ((done: DoneFn) => void);
 
 /**
  * Create a group of specs (often called a suite).

From bcf3b5e34a596bac56d053bbc0e198c094a9d888 Mon Sep 17 00:00:00 2001
From: Travis CI User <travis@example.org>
Date: Sat, 16 Mar 2019 16:31:49 +0000
Subject: [PATCH 716/924] Update CODEOWNERS

---
 .github/CODEOWNERS | 132 +++++++++++++++++++++++----------------------
 1 file changed, 69 insertions(+), 63 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 54d80df8e5..81913375f9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -276,7 +276,7 @@
 /types/await-timeout/                               @szhu
 /types/awesomplete/                                 @webbiesdk @bmdixon @tbekolay @chrislopresto
 /types/aws-iot-device-sdk/                          @niik @mlamp
-/types/aws-lambda/                                  @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev @ohookins @trevor-leach @jagregory @dalen @loikg @skyzenr @richardcornelissen
+/types/aws-lambda/                                  @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev @ohookins @trevor-leach @jagregory @dalen @loikg @skyzenr @richardcornelissen @redlickigrzegorz
 /types/aws-param-store/                             @jasonthomasgray
 /types/aws-serverless-express/                      @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                        @ajcrites
@@ -375,7 +375,7 @@
 /types/bindings/                                    @unindented
 /types/bintrees/                                    @CjS77
 /types/bip21/                                       @stefanhuber
-/types/bip32/                                       @me
+/types/bip32/                                       @eduhenke
 /types/bip38/                                       @micksatana
 /types/bip39/                                       @micksatana
 /types/bit-array/                                   @mudkipme
@@ -440,11 +440,10 @@
 /types/bootstrap3-dialog/                           @nakupanda @cnboland
 /types/bounce.js/                                   @cherrry
 /types/box2d/                                       @jbaldwin
-/types/boxen/                                       @BendingBender
 /types/bpmn-moddle/                                 @haydos89
 /types/brace-expansion/                             @BendingBender
 /types/braces/                                      @vemoo
-/types/braft-editor/                                @me
+/types/braft-editor/                                @petitspois
 /types/braintree-web/                               @chlela
 /types/breeze/                                      @borisyankov
 /types/bricks.js/                                   @kondi
@@ -459,7 +458,7 @@
 /types/browser-resolve/                             @marionebl
 /types/browser-sync/                                @joeskeen @aznnomness
 /types/browserify/                                  @AndrewGaspar @jvilk @leonard-thieu @LinusU
-/types/browserslist/                                @davecardwell
+/types/browserslist/                                @davecardwell @AndrewLeedham
 /types/browserslist-useragent/                      @nju33
 /types/bs58/                                        @chrootsu @BendingBender
 /types/bs58/v3/                                     @chrootsu
@@ -526,8 +525,9 @@
 /types/carbon__themes/                              @vpicone
 /types/carbon__type/                                @vpicone
 /types/card-validator/                              @ChanceM
+/types/carlo/                                       @adierkens
 /types/case-sensitive-paths-webpack-plugin/         @r3nya
-/types/caseless/                                    @downace @mastermatt
+/types/caseless/                                    @downace @mastermatt @forivall
 /types/cash/                                        @akvlko
 /types/casperjs/                                    @jedmao @urielch
 /types/cassandra-driver/                            @Svjard @pc-jedi @michal-b-kaminski
@@ -539,6 +539,7 @@
 /types/cavy/                                        @tyler-hoffman
 /types/cbor/                                        @pushplay
 /types/ccap/                                        @taoqf
+/types/centra/                                      @twooster
 /types/cesium/                                      @Zuzon @hnipps @szechyjs @golyalpha
 /types/cfn-response/                                @ivoisbelongtous
 /types/chai/                                        @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana @ErikSchierboom
@@ -551,10 +552,10 @@
 /types/chai-enzyme/                                 @asvetliakov
 /types/chai-fs/                                     @dimitardanailov
 /types/chai-fuzzy/                                  @Bartvds
-/types/chai-http/                                   @Nemo157 @G1itcher @CaselIT @bas-l
 /types/chai-jest-snapshot/                          @mattvperry
 /types/chai-jquery/                                 @kazimanzurrashid
 /types/chai-json-schema/                            @ulrichheiniger
+/types/chai-moment/                                 @chrisgodsey
 /types/chai-oequal/                                 @mizunashi-mana
 /types/chai-roughly/                                @swist
 /types/chai-spies/                                  @kuzn-ilya @harm-less @jounisuo
@@ -607,7 +608,6 @@
 /types/clean-css/v3/                                @tkrotoff
 /types/clean-regexp/                                @BendingBender
 /types/clean-stack/                                 @BendingBender
-/types/clean-webpack-plugin/                        @j-f1
 /types/clear-require/                               @dan-j
 /types/clearbladejs-client/                         @ClearBlade
 /types/clearbladejs-node/                           @ClearBlade
@@ -634,6 +634,7 @@
 /types/clmtrackr/                                   @hellochar
 /types/clndr/                                       @jasperjn
 /types/clockpicker/                                 @jfcere
+/types/clone-deep/                                  @tanfonto
 /types/cloneable-readable/                          @qlonik
 /types/cloner/                                      @matrumz
 /types/closure-compiler/                            @mprobst
@@ -704,7 +705,7 @@
 /types/condense-whitespace/                         @djcsdy
 /types/confidence/                                  @jppellerin
 /types/config/                                      @RWander @forrestbice @jndonald3 @albertovasquez
-/types/config-yaml/                                 @me
+/types/config-yaml/                                 @Arylo
 /types/configstore/                                 @ArcticLight
 /types/configurable/                                @jewbre
 /types/confit/                                      @ethanresnick
@@ -749,7 +750,6 @@
 /types/cookies/                                     @WangZishi @jkeylu @BendingBender
 /types/copy/                                        @ffflorian
 /types/copy-paste/                                  @SrTobi
-/types/copy-text-to-clipboard/                      @BendingBender
 /types/copy-webpack-plugin/                         @flying-sheep
 /types/copyfiles/                                   @ffflorian
 /types/cordova-ionic/                               @hendrikmaus
@@ -792,9 +792,7 @@
 /types/country-select-js/                           @humrochagf
 /types/countup.js/                                  @shermendev
 /types/coverup/                                     @bevalorous
-/types/cp-file/                                     @BendingBender
 /types/cpx/                                         @alan-agius4
-/types/cpy/                                         @mhegazy @BendingBender
 /types/cqrs-domain/                                 @blissi
 /types/cradle/                                      @panuhorsmalahti
 /types/crc/                                         @YuJianrong
@@ -831,6 +829,7 @@
 /types/css/                                         @ilich
 /types/css-font-loading-module/                     @slikts
 /types/css-modules/                                 @NeekSandhu
+/types/css-modules-loader-core/                     @skovy
 /types/css-to-style/                                @bengry
 /types/css-tree/                                    @erik-kallen
 /types/cssbeautify/                                 @rictic
@@ -946,7 +945,6 @@
 /types/debounce-fn/                                 @BendingBender
 /types/debounce-promise/                            @whtsky
 /types/debug/                                       @swook @galtalmor @zamb3zi @brasten @npenin
-/types/decamelize/                                  @samverschueren
 /types/decay/                                       @enaeseth
 /types/decode-entities/                             @waspothegreat
 /types/decode-uri-component/                        @BendingBender
@@ -1014,6 +1012,7 @@
 /types/diffie-hellman/                              @BendingBender
 /types/digibyte/                                    @lautarodragan @werewolfe
 /types/dinero.js/                                   @BendingBender
+/types/dingtalk-robot-sender/                       @bangbang93
 /types/dir-glob/                                    @BendingBender
 /types/dir-resolve/                                 @andy-ms
 /types/dirname-regex/                               @BendingBender
@@ -1043,9 +1042,12 @@
 /types/dom-mediacapture-record/                     @eliasmeire
 /types/dom-to-image/                                @JipSterk
 /types/dom4/                                        @adidahiya @giladgray
+/types/domelementtype/                              @johandavidson
+/types/domhandler/                                  @johandavidson
 /types/domo/                                        @Steve-Fenton
 /types/dompurify/                                   @bazuzi @FlowCrypt
 /types/domready/                                    @dotnetnerd
+/types/domutils/                                    @johandavidson
 /types/donna/                                       @vvakame
 /types/dookie/                                      @swanest
 /types/dot/                                         @ZombieHunter
@@ -1106,8 +1108,9 @@
 /types/easy-table/                                  @nikeee
 /types/easy-xapi/                                   @DeadAlready
 /types/easy-xapi-utils/                             @DeadAlready
+/types/easydate/                                    @satyarohith
 /types/ebongarde-root/                              @Ebongarde
-/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia @iRON5 @bilalucar
+/types/echarts/                                     @xieisabug @AntiMoron @liveangela @Ovilia @iRON5 @bilalucar @tmtron @dwhitney
 /types/ecma-proposal-math-extensions/               @ksm2
 /types/ecurve/                                      @mhegazy
 /types/ed25519/                                     @erikma
@@ -1280,9 +1283,9 @@
 /types/expired/                                     @BendingBender
 /types/expired-storage/                             @intolerance
 /types/expirymanager/                               @DanielRose
-/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164 @vinitsood
-/types/expo/v31/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164
-/types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
+/types/expo/                                        @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164 @vinitsood @mattiassamskar @jaulz
+/types/expo/v31/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @levansuper @ihmpavel @burtek @jkillian @satya164 @mattiassamskar
+/types/expo/v30/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo @mattiassamskar
 /types/expo/v27/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki @mo
 /types/expo/v26/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
 /types/expo/v25/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
@@ -1367,6 +1370,7 @@
 /types/factory-girl/                                @stackbuilders @sestrella @elcuy
 /types/faker/                                       @bensw @basp @Kuniwak @mattbishop
 /types/faker/v3/                                    @Kuniwak
+/types/falafel/                                     @delprzemo
 /types/falcor/                                      @Quramy
 /types/falcor-express/                              @Quramy
 /types/falcor-http-datasource/                      @Quramy
@@ -1425,7 +1429,6 @@
 /types/figures/                                     @BendingBender
 /types/file-exists/                                 @BendingBender
 /types/file-saver/                                  @cyrilschumacher @DaIgeb @chrismbarr
-/types/file-type/                                   @tcaesvk @BendingBender
 /types/file-url/                                    @coderslagoon
 /types/filenamify/                                  @rokt33r
 /types/filenamify-url/                              @cprecioso
@@ -1720,6 +1723,7 @@
 /types/get-node-dimensions/                         @vincekovacs
 /types/get-port/                                    @plantain-00 @BendingBender
 /types/get-range/                                   @BendingBender
+/types/get-res/                                     @satyarohith
 /types/get-stdin/                                   @DanielRosenwasser
 /types/get-stream/                                  @douglasduteil @BendingBender
 /types/get-urls/                                    @BendingBender
@@ -1837,7 +1841,8 @@
 /types/grasp/                                       @agnoster
 /types/gravatar/                                    @denis-sokolov
 /types/gravatar-url/                                @ivangabriele
-/types/greasemonkey/                                @kotas
+/types/greasemonkey/                                @kotas @nikolay-borzov
+/types/greasemonkey/v3/                             @kotas
 /types/grecaptcha/                                  @DethAriel @rafaeltavares
 /types/grecaptcha/v0/                               @brentj73
 /types/gregorian-calendar/                          @cwalv
@@ -1989,7 +1994,7 @@
 /types/hexo-fs/                                     @segayuu
 /types/hexo-log/                                    @segayuu
 /types/hexo-util/                                   @segayuu
-/types/highcharts/                                  @damianog @baltie @AlbertOzimek @hanssens
+/types/highcharts/                                  @damianog @baltie @AlbertOzimek @hanssens @jgresham
 /types/highcharts-ng/                               @scatcher
 /types/highland/                                    @Bartvds @hgwood @iwllyu @alvis @notbobthebuilder
 /types/highlight.js/                                @nikeee @sourrust @joshuakgoldberg
@@ -2048,7 +2053,6 @@
 /types/humane/                                      @jmvrbanac
 /types/humanize-ms/                                 @adamzerella
 /types/humanize-plus/                               @DenisCarriere
-/types/humanize-string/                             @ragnarok56
 /types/humanize-url/                                @BendingBender
 /types/humanparser/                                 @MichalPodeszwa
 /types/humps/                                       @nikeee
@@ -2086,7 +2090,6 @@
 /types/ignore-styles/                               @tai2
 /types/iltorb/                                      @Alorel @reconbot
 /types/image-size/                                  @elisee
-/types/image-type/                                  @ffflorian
 /types/imagemagick/                                 @soywiz
 /types/imagemagick-native/                          @horiuchi
 /types/imagemapster/                                @delphinus35
@@ -2120,6 +2123,7 @@
 /types/ink/                                         @cprecioso
 /types/ink-spinner/                                 @lukostry
 /types/ink-table/                                   @lukostry
+/types/ink-testing-library/                         @MancunianSam
 /types/ink-text-input/                              @lukostry
 /types/inline-css/                                  @philipisapain
 /types/inline-style-prefixer/                       @ahz @dpetrezselyova @franklixuefei
@@ -2214,7 +2218,6 @@
 /types/is-running/                                  @danwbyrne
 /types/is-scoped/                                   @postcrafter
 /types/is-stream/                                   @me
-/types/is-svg/                                      @BendingBender
 /types/is-text-path/                                @mhegazy
 /types/is-touch-device/                             @screendriver
 /types/is-trademarked/                              @BendingBender
@@ -2238,7 +2241,7 @@
 /types/issue-parser/                                @Leko
 /types/issue-regex/                                 @BendingBender
 /types/istanbul/                                    @tkrotoff
-/types/istanbul-lib-coverage/                       @jason0x43
+/types/istanbul-lib-coverage/                       @jason0x43 @loryman
 /types/istanbul-lib-hook/                           @jason0x43
 /types/istanbul-lib-instrument/                     @jason0x43
 /types/istanbul-lib-report/                         @jason0x43
@@ -2521,8 +2524,8 @@
 /types/jsrender/                                    @zakki
 /types/jsreport-core/                               @taoqf
 /types/jsreport-html-embedded-in-docx/              @taoqf
-/types/jsreport-html-to-xlsx/                       @me
-/types/jsreport-html-to-xlsx/v1/                    @me
+/types/jsreport-html-to-xlsx/                       @taoqf
+/types/jsreport-html-to-xlsx/v1/                    @taoqf
 /types/jsreport-jsrender/                           @taoqf
 /types/jsreport-phantom-pdf/                        @taoqf
 /types/jsreport-xlsx/                               @taoqf
@@ -2766,7 +2769,7 @@
 /types/lingui__macro/                               @huan086
 /types/lingui__react/                               @huan086
 /types/linkify-issues/                              @BendingBender
-/types/linkify-it/                                  @praxxis
+/types/linkify-it/                                  @praxxis @alexplumb
 /types/linkify-urls/                                @BendingBender
 /types/linkifyjs/                                   @szhu @ovidiubute
 /types/list-git-remotes/                            @BendingBender
@@ -3295,6 +3298,7 @@
 /types/mixto/                                       @vvakame
 /types/mjml/                                        @aahoughton @marpstar
 /types/mjml-react/                                  @henrinormak
+/types/mkcert/                                      @asachin96
 /types/mkdirp/                                      @Bartvds @mrmlnc
 /types/mkdirp-promise/                              @pluma
 /types/mkpath/                                      @optical
@@ -3333,13 +3337,13 @@
 /types/moment-strftime2/                            @dex4er
 /types/moment-timezone/                             @michelsalib @alanblins @asermax @borys-kupar
 /types/money-math/                                  @taoqf
-/types/mongo-sanitize/                              @CedricCazin
+/types/mongo-sanitize/                              @CedricCazin @penumbra1
 /types/mongodb/                                     @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi @various89 @angela-1 @lirbank @hector7 @floric @erikc5000 @Manc
 /types/mongodb/v2/                                  @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi
 /types/mongodb-memory-server/                       @dmitryrogozhny
 /types/mongodb-uri/                                 @mernxl
-/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier @frontendmonster @mingchen @penumbra1
-/types/mongoose/v4/                                 @simonxca @horiuchi @lukasz-zak
+/types/mongoose/                                    @horiuchi @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd @various89 @Fazendaaa @NormanPerrin @danmana @stablio @emmanuelgautier @frontendmonster @mingchen @penumbra1 @orblazer
+/types/mongoose/v4/                                 @simonxca @horiuchi @lukasz-zak @murbanowicz
 /types/mongoose-auto-increment/                     @AyaMorisawa
 /types/mongoose-deep-populate/                      @AyaMorisawa
 /types/mongoose-geojson-schema/                     @bondz
@@ -3377,7 +3381,7 @@
 /types/msportalfx-test/                             @julioct
 /types/mssql/                                       @jaminfarr @buzinas @mrrichar @elhaard @pkeuter @mcdado
 /types/mu2/                                         @jedigo
-/types/mui-datatables/                              @favna
+/types/mui-datatables/                              @favna @ankithkonda
 /types/muicss/                                      @samuelneff
 /types/multer/                                      @jt000 @DavidBR-SW @mxl @hyunseob
 /types/multer-gridfs-storage/                       @devconcept
@@ -3529,7 +3533,7 @@
 /types/node-localstorage/                           @intolerance
 /types/node-memwatch/                               @Kroisse
 /types/node-mysql-wrapper/                          @kataras
-/types/node-notifier/                               @tkQubo
+/types/node-notifier/                               @tkQubo @loryman
 /types/node-polyglot/                               @timjk @liamross
 /types/node-powershell/                             @rodrigoff
 /types/node-pushnotifications/                      @menushka
@@ -3591,12 +3595,10 @@
 /types/npm-keyword/                                 @BendingBender
 /types/npm-license-crawler/                         @ffflorian
 /types/npm-list-author-packages/                    @ffflorian
-/types/npm-name/                                    @BendingBender
 /types/npm-package-arg/                             @mgroenhoff @OiYouYeahYou
 /types/npm-packlist/                                @ajafff
 /types/npm-paths/                                   @BendingBender
 /types/npm-registry-package-info/                   @ffflorian
-/types/npm-run-path/                                @BendingBender
 /types/npm-user/                                    @BendingBender
 /types/npm-user-packages/                           @BendingBender
 /types/npmlog/                                      @DanielMSchmidt @littlepiggy03
@@ -3680,7 +3682,7 @@
 /types/openlayers/                                  @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96 @gberaudo
 /types/openlayers/v3/                               @osechet @matthiasdailey-ccri
 /types/openlayers/v2/                               @bolhovsky
-/types/openpgp/                                     @errietta @damonpam @po5i @ecamellini
+/types/openpgp/                                     @errietta @damonpam @po5i @ecamellini @SardineFish
 /types/openstack-wrapper/                           @sanjaymadane
 /types/opentok/                                     @westy92 @CatGuardian
 /types/opentype.js/                                 @danmarshall @edzis
@@ -3735,7 +3737,6 @@
 /types/p-retry/                                     @BendingBender
 /types/p-series/                                    @BendingBender
 /types/p-settle/                                    @natesilva
-/types/p-some/                                      @BendingBender
 /types/p-tap/                                       @BendingBender
 /types/p-time/                                      @BendingBender
 /types/p-timeout/                                   @BendingBender
@@ -3833,7 +3834,6 @@
 /types/path-exists/v1/                              @shiwano
 /types/path-is-absolute/                            @mhegazy
 /types/path-is-inside/                              @aomarks
-/types/path-key/                                    @BendingBender
 /types/path-regex/                                  @BendingBender
 /types/path-type/                                   @BendingBender
 /types/pathfinding/                                 @BNedry
@@ -3859,7 +3859,7 @@
 /types/pendo-io-browser/                            @aaronbeall
 /types/permit/                                      @jannikkeye
 /types/persona/                                     @Nycto
-/types/pet-finder-api/                              @me
+/types/pet-finder-api/                              @ncipollina
 /types/petit-dom/                                   @JamesMessinger
 /types/pg/                                          @pspeter3
 /types/pg/v6/                                       @pspeter3
@@ -3875,6 +3875,7 @@
 /types/phantom/                                     @horiuchi @llRandom
 /types/phantomcss/                                  @abauzac
 /types/phantomjs/                                   @jedhunsaker @keesey
+/types/phin/                                        @twooster
 /types/phoenix/                                     @mciastek @John-Goff @princemaple
 /types/phone/                                       @DxCx
 /types/phone-formatter/                             @westy92
@@ -3978,6 +3979,7 @@
 /types/power-assert/                                @vvakame
 /types/power-assert-formatter/                      @vvakame
 /types/powerbi-visuals-tools/                       @zBritva @Microsoft
+/types/preact-i18n/                                 @ltetzlaff
 /types/precise/                                     @codeanimal
 /types/precond/                                     @olsio
 /types/preloadjs/                                   @endel
@@ -4047,6 +4049,8 @@
 /types/prosemirror-test-builder/                    @ifiokjr
 /types/prosemirror-transform/                       @bradleyayers @davidka @timjb @patsimm
 /types/prosemirror-view/                            @bradleyayers @davidka @timjb @patsimm
+/types/protoc-plugin/                               @jonnyreeves
+/types/protocol-buffers-schema/                     @claasahl
 /types/proton-native/                               @khanhas @ltetzlaff
 /types/protractor-browser-logs/                     @rokadias
 /types/protractor-helpers/                          @johncant
@@ -4056,7 +4060,6 @@
 /types/proxy-lists/                                 @BehindTheMath
 /types/proxy-verifier/                              @BehindTheMath
 /types/proxyquire/                                  @jt000
-/types/ps-list/                                     @BendingBender
 /types/ps-tree/                                     @alessiopcc
 /types/pseudo-audio-param/                          @kirbysayshi
 /types/psl/                                         @BendingBender
@@ -4071,7 +4074,7 @@
 /types/pumpify/                                     @JustinBeckwith @aoberoi
 /types/punycode/                                    @yavanosta
 /types/pupa/                                        @nju33
-/types/puppeteer/                                   @marvinhagemeister @cdeutsch @ksm2 @SimonSchick
+/types/puppeteer/                                   @marvinhagemeister @cdeutsch @ksm2 @SimonSchick @SerbanGhita
 /types/puppeteer/v0/                                @marvinhagemeister @cdeutsch
 /types/puppeteer-core/                              @mtsmfm
 /types/pure-render-decorator/                       @seansfkelley
@@ -4095,8 +4098,6 @@
 /types/qs-middleware/                               @davecardwell
 /types/qtip2/                                       @Seltzer @leonard-thieu
 /types/querystringify/                              @ilich
-/types/quick-lru/                                   @BendingBender
-/types/quick-lru/v1/                                @BendingBender
 /types/quill/                                       @sumitkm @guillaume-ro-fr @43081j @AnielloFalcone @mhamri
 /types/quixote/                                     @greybax
 /types/qunit/                                       @waratuman @mike-north
@@ -4160,7 +4161,7 @@
 /types/rdflib/                                      @cenotelie
 /types/re-base/                                     @jordandrako
 /types/reach__router/                               @kingdaro
-/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Jessidhia @pshrmn @threepointone @saranshkataria
+/types/react/                                       @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei @Jessidhia @pshrmn @saranshkataria
 /types/react/v15/                                   @bbenezech @pzavolinsky @digiguru @ericanderson @tkrotoff @DovydasNavickas @onigoetz
 /types/react-adal/                                  @dkorolev1
 /types/react-albus/                                 @sseppola @conradreuter @kuirak
@@ -4175,10 +4176,10 @@
 /types/react-autocomplete/                          @lstanden
 /types/react-autosuggest/                           @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
 /types/react-avatar-editor/                         @diogocorrea @gabsprates @lsenta @davidspiess
-/types/react-beautiful-dnd/                         @varHarrie @bradleyayers @paustint @marknelissen @enricoboccadifuoco @lonyele
+/types/react-beautiful-dnd/                         @varHarrie @bradleyayers @paustint @marknelissen @enricoboccadifuoco @lonyele @lukyth
 /types/react-better-password/                       @mhuynh1
-/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87 @ldthorne
-/types/react-blessed/                               @me
+/types/react-big-calendar/                          @piotrwitek @paustint @pikpok @eps1lon @strongpauly @janb87 @ldthorne @siavelis
+/types/react-blessed/                               @guoshencheng
 /types/react-body-classname/                        @mhegazy
 /types/react-bootstrap/                             @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran @bes
 /types/react-bootstrap-date-picker/                 @LKay @ssi-hu-antal-bodnar
@@ -4201,7 +4202,7 @@
 /types/react-coinhive/                              @sktbcbbs
 /types/react-collapse/                              @Kimahriman
 /types/react-collapsible/                           @knegusen
-/types/react-color/                                 @LKay @markspolakovs @mntdn @nkgrnkgr
+/types/react-color/                                 @LKay @markspolakovs @mntdn @nkgrnkgr @0815Strohhut
 /types/react-confirm/                               @santiagodoldan @marknelissen
 /types/react-content-loader/                        @alaatm @samwalshnz
 /types/react-copy-to-clipboard/                     @mabels @BernabeFelix
@@ -4221,7 +4222,7 @@
 /types/react-data-grid/v1/                          @SupernaviX
 /types/react-datagrid/                              @stephenjelfs
 /types/react-date-range/                            @Junbong
-/types/react-datepicker/                            @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley @justingrant @jakeboone02
+/types/react-datepicker/                            @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley @justingrant @jakeboone02 @Ky6uk @aviklai
 /types/react-daterange-picker/                      @uncovertruth @MartynasZilinskas @donaldtf @vladflorescu94
 /types/react-dates/                                 @ArturAmpilogov @NathanNZ
 /types/react-daum-postcode/                         @Sa-ryong
@@ -4265,7 +4266,8 @@
 /types/react-google-login-component/                @koss-lebedev
 /types/react-google-maps-loader/                    @vasilysn
 /types/react-google-places-suggest/                 @vasilysn
-/types/react-google-recaptcha/                      @KoalaHuman @tomsturge
+/types/react-google-recaptcha/                      @KoalaHuman @tomsturge @MaxwellBo
+/types/react-google-recaptcha/v0/                   @KoalaHuman @tomsturge
 /types/react-gravatar/                              @invliD
 /types/react-grid-layout/                           @abirkholz @alitaheri @ZheyangSong @andrewhathaway @manav-m
 /types/react-hamburger-menu/                        @grzesie2k
@@ -4313,7 +4315,7 @@
 /types/react-json/                                  @spielc
 /types/react-json-pretty/                           @LKay
 /types/react-json-tree/                             @gnestor @zainafzal08
-/types/react-jsonschema-form/                       @iamdanfox @iplus26 @phbou72 @LucianBuzzo @sthenault @sbusch
+/types/react-jsonschema-form/                       @iamdanfox @iplus26 @phbou72 @LucianBuzzo @sthenault @sbusch @medfreeman
 /types/react-jss/                                   @eps1lon @jlaw90
 /types/react-kawaii/                                @ZhangYiJiang
 /types/react-lazyload/                              @m0a
@@ -4334,6 +4336,7 @@
 /types/react-mce/                                   @morphologue
 /types/react-mdl/                                   @bradzacher
 /types/react-measure/                               @asvetliakov @marcfallows
+/types/react-medium-image-zoom/                     @james-ff
 /types/react-mentions/                              @activescott @efedorenko
 /types/react-mixin/                                 @tkqubo
 /types/react-modal/                                 @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz @jpowell
@@ -4341,7 +4344,7 @@
 /types/react-motion-loop/                           @j-em
 /types/react-motion-slider/                         @asvetliakov
 /types/react-motion-ui-pack/                        @jsonunger
-/types/react-native/                                @alloy @huhuanming @iRoachie @skn0tt @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff @a-tarasyuk @mvdam @esemesek @mrnickel @souvik-ghosh @nossbigg
+/types/react-native/                                @alloy @huhuanming @iRoachie @skn0tt @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff @a-tarasyuk @mvdam @esemesek @mrnickel @souvik-ghosh @nossbigg @saranshkataria
 /types/react-native-android-taskdescription/        @christianchown
 /types/react-native-auth0/                          @ascariandrea @marknelissen
 /types/react-native-autocomplete-input/             @ifiokjr
@@ -4432,7 +4435,7 @@
 /types/react-notification-system-redux/             @LKay
 /types/react-notify-toast/                          @klaascuvelier
 /types/react-numeric-input/                         @heatherbooker @akx
-/types/react-onclickoutside/                        @LKay @surgeboris
+/types/react-onclickoutside/                        @LKay @surgeboris @NilSet
 /types/react-onclickoutside/v5/                     @LKay
 /types/react-onsenui/                               @salim7 @jemmyw @lirbank
 /types/react-outside-click-handler/                 @zubivan
@@ -4572,7 +4575,6 @@
 /types/reactstrap/                                  @alihammad @mfal @danilobjr @FaithForHumans @timc13 @patrickrgaffney @prabodht @georg94
 /types/reactstrap/v4/                               @alihammad @mfal @danilobjr @fabiopaiva
 /types/read/                                        @timjk
-/types/read-chunk/                                  @crispybee
 /types/read-package-tree/                           @mgroenhoff
 /types/read-pkg/                                    @jdxcode
 /types/read-pkg-up/                                 @dudeofawesome @jdxcode
@@ -4597,7 +4599,7 @@
 /types/recursive-readdir/                           @elisee @MicahZoltu
 /types/recursive-readdir/v1/                        @elisee
 /types/redent/                                      @BendingBender
-/types/redis/                                       @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j @barnski @1pete @blablapolicja @ferrantejake
+/types/redis/                                       @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j @barnski @1pete @blablapolicja @ferrantejake @OpesanyaAdebayo
 /types/redis-errors/                                @43081j
 /types/redis-mock/                                  @BendingBender
 /types/redis-rate-limiter/                          @westy92 @nodify-at
@@ -4700,6 +4702,7 @@
 /types/requirejs-domready/                          @lefb766
 /types/requires-port/                               @BendingBender
 /types/resemblejs/                                  @pimterry
+/types/reserved-words/                              @skovy
 /types/reservoir/                                   @danvk
 /types/resize-img/                                  @higuri
 /types/resize-observer-browser/                     @chivesrs
@@ -4755,6 +4758,7 @@
 /types/rn-fetch-blob/                               @pengcao1
 /types/roads/                                       @dancespiele
 /types/roads-server/                                @dancespiele
+/types/roarr/                                       @psaxton
 /types/rocksdb/                                     @MeirionHughes @danwbyrne
 /types/roll/                                        @icopp
 /types/rolling-rate-limiter/                        @l-jonas
@@ -4774,6 +4778,7 @@
 /types/round-to/                                    @seangenabe
 /types/route-parser/                                @ianks @bobbuehler
 /types/routie/                                      @Adilson
+/types/rox-react-native/                            @ahanriat
 /types/royalslider/                                 @csrakowski @sKopheK
 /types/rpio/                                        @DominikPalo @Pencl
 /types/rrc/                                         @DeividasBakanas
@@ -5004,12 +5009,11 @@
 /types/sindresorhus__df/                            @whatknight
 /types/sindresorhus__djb2a/                         @BendingBender
 /types/sindresorhus__fnv1a/                         @BendingBender
-/types/sindresorhus__slugify/                       @cprecioso
 /types/sindresorhus__string-hash/                   @BendingBender
 /types/sindresorhus__to-milliseconds/               @BendingBender
 /types/single-line-log/                             @ffflorian
 /types/single-spa-react/                            @Garrett-Smith-iq @chrisdopuch
-/types/sinon/                                       @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg @gjednaszewski @johnjesse @alecf @SimonSchick
+/types/sinon/                                       @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg @gjednaszewski @johnjesse @alecf @SimonSchick @bergundy
 /types/sinon-as-promised/                           @igrayson
 /types/sinon-chai/                                  @kazimanzurrashid @jedmao @elpdpt
 /types/sinon-chai/v2/                               @kazimanzurrashid @jedmao
@@ -5181,7 +5185,7 @@
 /types/storybook__channels/                         @bmatcuk
 /types/storybook__react/                            @joscha @wapgear @dandean
 /types/storybook__react-native/                     @joscha @wapgear @alechill @iRoachie @ceyhuno
-/types/storybook__vue/                              @pntgupta
+/types/storybook__vue/                              @pntgupta @jurgisrudaks
 /types/strange/                                     @wanganjun
 /types/stream-array/                                @Tyler-Murphy
 /types/stream-buffers/                              @Jason3S
@@ -5220,7 +5224,7 @@
 /types/strip-color/                                 @BendingBender
 /types/strip-indent/                                @BendingBender
 /types/strip-json-comments/                         @dmoonfire
-/types/stripe/                                      @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun @galtalmor @htunnicliff @squirly @tzarger @ifiokjr @SimonSchick @yultyyev @cpsoinos @saranshkataria @0xJoKe
+/types/stripe/                                      @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun @galtalmor @htunnicliff @squirly @tzarger @ifiokjr @SimonSchick @yultyyev @cpsoinos @adamduren @saranshkataria @0xJoKe @delianides
 /types/stripe-checkout/                             @cgwrench
 /types/stripe-v2/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                                   @ejsmith @amritk @adamcmiel @jleider @galuszkak @slangeder
@@ -5317,6 +5321,7 @@
 /types/tabulator/                                   @euginio
 /types/tabulator-tables/                            @jojoshua
 /types/tail/                                        @spacejack
+/types/tampermonkey/                                @silverwzw @nikolay-borzov
 /types/tapable/                                     @e-cloud @johnnyreilly
 /types/tapable/v0/                                  @e-cloud
 /types/tape/                                        @Bartvds @sodatea @DennisSchwartz @mikehenrty @rostrowski
@@ -5379,7 +5384,6 @@
 /types/tildify/                                     @BendingBender
 /types/tile-reduce/                                 @DenisCarriere
 /types/tilebelt/                                    @DenisCarriere
-/types/time-span/                                   @BendingBender @mdvorscak
 /types/timelinejs/                                  @rolandzwaga
 /types/timelinejs3/                                 @MikeMatusz
 /types/timer-machine/                               @dolanmiu
@@ -5432,7 +5436,6 @@
 /types/transducers-js/                              @colinkahn @dphilipson @NaridaL
 /types/transducers.js/                              @dphilipson
 /types/transliteration/                             @tony19
-/types/trash/                                       @matthew-matvei @hoishin @BendingBender
 /types/traverse/                                    @newclear
 /types/traverson/                                   @marcinporebski
 /types/travis-fold/                                 @andy-ms
@@ -5446,6 +5449,7 @@
 /types/trim-newlines/                               @djcsdy
 /types/triple-beam/                                 @danwbyrne
 /types/triplesec/                                   @threesquared
+/types/trouter/                                     @stahlstift
 /types/trunk8/                                      @niemyjski
 /types/trusted-types/                               @vrana
 /types/tryer/                                       @bengry
@@ -5453,6 +5457,7 @@
 /types/tspromise/                                   @soywiz
 /types/ttf2woff2/                                   @ThomasdenH
 /types/tunnel/                                      @BendingBender
+/types/turbolinks/                                  @evankim390
 /types/turndown/                                    @sergey-zhidkov
 /types/tus-js-client/                               @kevhiggins @Acconut
 /types/tv4/                                         @Bartvds @psnider
@@ -5598,10 +5603,11 @@
 /types/vfile/                                       @bizen241 @rokt33r
 /types/vfile-location/                              @ikatyang @rokt33r
 /types/vfile-message/                               @rokt33r
-/types/victory/                                     @asvetliakov @snerks @Havret @allreadyExisted @jlismore
+/types/victory/                                     @asvetliakov @snerks @Havret @allreadyExisted @jlismore @stackbuilders @ibarrae
 /types/video.js/                                    @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas @gjanblaszczyk @sroucheray @AkxeOne @meikidd
 /types/viewability-helper/                          @lironzluf
 /types/viewerjs/                                    @lrh3321
+/types/viewport-list/                               @satyarohith
 /types/viewport-mercator-project/                   @fnberta
 /types/viewporter/                                  @borisyankov
 /types/vimeo/                                       @DazWilkin
@@ -5629,8 +5635,9 @@
 /types/vortex-web-client/                           @Pro
 /types/voucher-code-generator/                      @JWebCoder
 /types/voximplant-websdk/                           @aylarov
+/types/vscode/                                      @Microsoft
 /types/vue-chartkick/                               @cnsmedia
-/types/vue-color/                                   @me
+/types/vue-color/                                   @mildful
 /types/vue-markdown/                                @neodon
 /types/vue-resource/                                @kaorun343
 /types/vue-scrollto/                                @vincekovacs
@@ -5843,7 +5850,6 @@
 /types/yui/                                         @giabao
 /types/yup/                                         @dhardtke @vtserman @MoretonBayRC @sseppola @YashdalfTheGray @vincentjames501 @robertbullen @sat0yu @dancrumb
 /types/z-schema/                                    @pgonzal
-/types/zapier-platform-core/                        @bradleyayers
 /types/zeit__next-typescript/                       @icopp
 /types/zen-observable/                              @aicest @JounQin @itomtom
 /types/zen-push/                                    @daprahamian

From 2d7e758a78e933f5045e4a6f1c6d89d3f3d7ced5 Mon Sep 17 00:00:00 2001
From: John Gozde <john@gozde.ca>
Date: Sat, 16 Mar 2019 11:41:54 -0600
Subject: [PATCH 717/924] react-window: update scrollToItem params, docs
 (1.7.0)

---
 types/react-window/index.d.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/types/react-window/index.d.ts b/types/react-window/index.d.ts
index 810661d387..eee0b6b8ae 100644
--- a/types/react-window/index.d.ts
+++ b/types/react-window/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/bvaughn/react-window/, http://react-window.now.sh
 // Definitions by: Martynas Kadiša <https://github.com/martynaskadisa>
 //                 Alex Guerra <https://github.com/heyimalex>
+//                 John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -395,17 +396,19 @@ export class FixedSizeGrid extends Component<FixedSizeGridProps> {
      * Scroll to the specified item.
      *
      * By default, the Grid will scroll as little as possible to ensure the item is visible.
-     * You can control the alignment of the item though by specifying a second alignment parameter. Acceptable values are:
+     * You can control the alignment of the item though by specifying an `align` property. Acceptable values are:
      *
      * - auto (default) - Scroll as little as possible to ensure the item is visible. (If the item is already visible, it won't scroll at all.)
      * - center - Center align the item within the grid.
      * - end - Align the item to the bottom, right hand side of the grid.
      * - start - Align the item to the top, left hand of the grid.
+     *
+     * If either `columnIndex` or `rowIndex` are omitted, `scrollLeft` or `scrollTop` will be unchanged (respectively).
      */
     scrollToItem(params: {
         align?: Align;
-        columnIndex: number;
-        rowIndex: number;
+        columnIndex?: number;
+        rowIndex?: number;
     }): void;
 }
 
@@ -418,17 +421,19 @@ export class VariableSizeGrid extends Component<VariableSizeGridProps> {
      * Scroll to the specified item.
      *
      * By default, the Grid will scroll as little as possible to ensure the item is visible.
-     * You can control the alignment of the item though by specifying a second alignment parameter. Acceptable values are:
+     * You can control the alignment of the item though by specifying an `align` property. Acceptable values are:
      *
      * - auto (default) - Scroll as little as possible to ensure the item is visible. (If the item is already visible, it won't scroll at all.)
      * - center - Center align the item within the grid.
      * - end - Align the item to the bottom, right hand side of the grid.
      * - start - Align the item to the top, left hand of the grid.
+     *
+     * If either `columnIndex` or `rowIndex` are omitted, `scrollLeft` or `scrollTop` will be unchanged (respectively).
      */
     scrollToItem(params: {
         align?: Align;
-        columnIndex: number;
-        rowIndex: number;
+        columnIndex?: number;
+        rowIndex?: number;
     }): void;
     /**
      * VariableSizeGrid caches offsets and measurements for each column index for performance purposes.

From ef4a13d0683882056f97a7d5761999bb6e51da04 Mon Sep 17 00:00:00 2001
From: John Gozde <john@gozde.ca>
Date: Sat, 16 Mar 2019 11:58:01 -0600
Subject: [PATCH 718/924] react-window: update tests for refs

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

diff --git a/types/react-window/react-window-tests.tsx b/types/react-window/react-window-tests.tsx
index febd9ae500..62549f3380 100644
--- a/types/react-window/react-window-tests.tsx
+++ b/types/react-window/react-window-tests.tsx
@@ -218,3 +218,67 @@ class RowWithShouldComponentUpdate extends React.Component<
         return <div style={style}>Row {index}</div>;
     }
 }
+
+const fixedRef = React.createRef<FixedSizeGrid>();
+const FixedSizeGridTestRefs: React.SFC = () => (
+    <FixedSizeGrid
+        columnCount={0}
+        columnWidth={0}
+        ref={fixedRef}
+        rowCount={0}
+        rowHeight={0}
+        height={0}
+        width={0}
+    >
+        {({ style, columnIndex, rowIndex }) => (
+            <div style={style}>
+                Test {rowIndex} {columnIndex}
+            </div>
+        )}
+    </FixedSizeGrid>
+);
+
+if (fixedRef.current) {
+    fixedRef.current.scrollTo({ scrollLeft: 0, scrollTop: 0});
+    fixedRef.current.scrollToItem({});
+    fixedRef.current.scrollToItem({ align: "auto" });
+    fixedRef.current.scrollToItem({ rowIndex: 0 });
+    fixedRef.current.scrollToItem({ columnIndex: 0 });
+    fixedRef.current.scrollToItem({ rowIndex: 0, columnIndex: 0 });
+    fixedRef.current.scrollToItem({ align: "start", rowIndex: 0, columnIndex: 0 });
+}
+
+const variableRef = React.createRef<VariableSizeGrid>();
+const VariableSizeGridTestRefs: React.SFC = () => (
+    <VariableSizeGrid
+        columnCount={0}
+        columnWidth={index => 0}
+        ref={variableRef}
+        rowCount={0}
+        rowHeight={index => 0}
+        height={0}
+        width={0}
+    >
+        {({ style, columnIndex, rowIndex }) => (
+            <div style={style}>
+                Test {rowIndex} {columnIndex}
+            </div>
+        )}
+    </VariableSizeGrid>
+);
+
+if (variableRef.current) {
+    variableRef.current.scrollTo({ scrollLeft: 0, scrollTop: 0});
+    variableRef.current.scrollToItem({});
+    variableRef.current.scrollToItem({ align: "auto" });
+    variableRef.current.scrollToItem({ rowIndex: 0 });
+    variableRef.current.scrollToItem({ columnIndex: 0 });
+    variableRef.current.scrollToItem({ rowIndex: 0, columnIndex: 0 });
+    variableRef.current.scrollToItem({ align: "start", rowIndex: 0, columnIndex: 0 });
+    variableRef.current.resetAfterColumnIndex(0);
+    variableRef.current.resetAfterColumnIndex(0, true);
+    variableRef.current.resetAfterRowIndex(0);
+    variableRef.current.resetAfterRowIndex(0, false);
+    variableRef.current.resetAfterIndices({ columnIndex: 0, rowIndex: 0 });
+    variableRef.current.resetAfterIndices({ columnIndex: 0, rowIndex: 0, shouldForceUpdate: true });
+}

From b24050cf4d77ea44d10f57b8d23c856d67971162 Mon Sep 17 00:00:00 2001
From: John Gozde <john@gozde.ca>
Date: Sat, 16 Mar 2019 12:10:03 -0600
Subject: [PATCH 719/924] react-window: bump version 1.7

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

diff --git a/types/react-window/index.d.ts b/types/react-window/index.d.ts
index eee0b6b8ae..2f4eda08df 100644
--- a/types/react-window/index.d.ts
+++ b/types/react-window/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-window 1.5
+// Type definitions for react-window 1.7
 // Project: https://github.com/bvaughn/react-window/, http://react-window.now.sh
 // Definitions by: Martynas Kadiša <https://github.com/martynaskadisa>
 //                 Alex Guerra <https://github.com/heyimalex>

From 19fee9984bf196930acbf96461d3c1234173bf3a Mon Sep 17 00:00:00 2001
From: David Edmondson <threehams@gmail.com>
Date: Sat, 16 Mar 2019 14:15:24 -0700
Subject: [PATCH 720/924] Add longhand padding/margin types.

---
 types/styled-system/index.d.ts              | 25 ++++++++++++++++++---
 types/styled-system/styled-system-tests.tsx | 22 ++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
index ec7686ab89..b91f9c1707 100644
--- a/types/styled-system/index.d.ts
+++ b/types/styled-system/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for styled-system 3.2
+// Type definitions for styled-system 4.0
 // Project: https://github.com/jxnblk/styled-system#readme
 // Definitions by: Marshall Bowers <https://github.com/maxdeviant>
 //                 Ben McCormick <https://github.com/phobon>
@@ -51,7 +51,7 @@ export type TLengthStyledSystem = string | 0 | number;
 export type ResponsiveValue<T> = T | Array<T | null> | { [key: string]: T };
 
 /**
- * Converts shorthand margin and padding props to margin and padding CSS declarations
+ * Converts shorthand or longhand margin and padding props to margin and padding CSS declarations
  *
  * - Numbers from 0-4 (or the length of theme.space) are converted to values on the spacing scale.
  * - Negative values can be used for negative margins.
@@ -59,32 +59,51 @@ export type ResponsiveValue<T> = T | Array<T | null> | { [key: string]: T };
  * - String values are passed as raw CSS values.
  * - Array values are converted into responsive values.
  */
-
 export interface SpaceProps<TLength = TLengthStyledSystem> {
     /** Margin on top, left, bottom and right */
     m?: ResponsiveValue<CSS.MarginProperty<TLength>>;
+    /** Margin on top, left, bottom and right */
+    margin?: ResponsiveValue<CSS.MarginProperty<TLength>>;
     /** Margin for the top */
     mt?: ResponsiveValue<CSS.MarginTopProperty<TLength>>;
+    /** Margin for the top */
+    marginTop?: ResponsiveValue<CSS.MarginTopProperty<TLength>>;
     /** Margin for the right */
     mr?: ResponsiveValue<CSS.MarginRightProperty<TLength>>;
+    /** Margin for the right */
+    marginRight?: ResponsiveValue<CSS.MarginRightProperty<TLength>>;
     /** Margin for the bottom */
     mb?: ResponsiveValue<CSS.MarginBottomProperty<TLength>>;
+    /** Margin for the bottom */
+    marginBottom?: ResponsiveValue<CSS.MarginBottomProperty<TLength>>;
     /** Margin for the left */
     ml?: ResponsiveValue<CSS.MarginLeftProperty<TLength>>;
+    /** Margin for the left */
+    marginLeft?: ResponsiveValue<CSS.MarginLeftProperty<TLength>>;
     /** Margin for the left and right */
     mx?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Margin for the top and bottom */
     my?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding on top, left, bottom and right */
     p?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
+    /** Padding on top, left, bottom and right */
+    padding?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding for the top */
     pt?: ResponsiveValue<CSS.PaddingTopProperty<TLength>>;
+    /** Padding for the top */
+    paddingTop?: ResponsiveValue<CSS.PaddingTopProperty<TLength>>;
     /** Padding for the right */
     pr?: ResponsiveValue<CSS.PaddingRightProperty<TLength>>;
+    /** Padding for the right */
+    paddingRight?: ResponsiveValue<CSS.PaddingRightProperty<TLength>>;
     /** Padding for the bottom */
     pb?: ResponsiveValue<CSS.PaddingBottomProperty<TLength>>;
+    /** Padding for the bottom */
+    paddingBottom?: ResponsiveValue<CSS.PaddingBottomProperty<TLength>>;
     /** Padding for the left */
     pl?: ResponsiveValue<CSS.PaddingLeftProperty<TLength>>;
+    /** Padding for the left */
+    paddingLeft?: ResponsiveValue<CSS.PaddingLeftProperty<TLength>>;
     /** Padding for the left and right */
     px?: ResponsiveValue<CSS.PaddingProperty<TLength>>;
     /** Padding for the top and bottom */
diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
index ae2f87b7ab..c99a15c8f2 100644
--- a/types/styled-system/styled-system-tests.tsx
+++ b/types/styled-system/styled-system-tests.tsx
@@ -328,8 +328,30 @@ const test = () => (
         <Box fontSize={{ sm: 2, md: 3, lg: 4 }} />
         // responsive margin
         <Box m={[1, 2, 3]} />
+        <Box ml={[1, 2, 3]} />
+        <Box mr={[1, 2, 3]} />
+        <Box mt={[1, 2, 3]} />
+        <Box mb={[1, 2, 3]} />
+        <Box mx={[1, 2, 3]} />
+        <Box my={[1, 2, 3]} />
+        <Box margin={[1, 2, 3]} />
+        <Box marginLeft={[1, 2, 3]} />
+        <Box marginRight={[1, 2, 3]} />
+        <Box marginTop={[1, 2, 3]} />
+        <Box marginBottom={[1, 2, 3]} />
         // responsive padding
         <Box p={[1, 2, 3]} />
+        <Box pl={[1, 2, 3]} />
+        <Box pr={[1, 2, 3]} />
+        <Box pt={[1, 2, 3]} />
+        <Box pb={[1, 2, 3]} />
+        <Box px={[1, 2, 3]} />
+        <Box py={[1, 2, 3]} />
+        <Box padding={[1, 2, 3]} />
+        <Box paddingLeft={[1, 2, 3]} />
+        <Box paddingRight={[1, 2, 3]} />
+        <Box paddingTop={[1, 2, 3]} />
+        <Box paddingBottom={[1, 2, 3]} />
         <Box p={{ sm: 1, md: 2, lg: 3 }} />
         // examples (margin prop) // sets margin value of `theme.space[2]`
         <Box m={2} />

From d130d42d81b8713807112a180c9b845e63f2e606 Mon Sep 17 00:00:00 2001
From: Jose Miguel Colella <josecolella@yahoo.com>
Date: Sat, 16 Mar 2019 21:48:38 -0400
Subject: [PATCH 721/924] feat(passport-saml): Make attributeName unknown

Making the attributeName a string value type restricts assigning attributes to the Profile object. Making the value unknown still allows for declaration of type by the user without having the restriction of only using string value
---
 types/passport-saml/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index e4846cb19d..874b84ed7f 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -3,8 +3,9 @@
 // Definitions by: Chris Barth <https://github.com/cjbarth>
 //                 Damian Assennato <https://github.com/dassennato>
 //                 Karol Samborski <https://github.com/ksamborski>
+//                 Jose Colella <https://github.com/josecolella>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 3.0
 
 import passport = require('passport');
 import express = require('express');
@@ -97,5 +98,5 @@ export type Profile = {
 	getAssertion(): object;  // get the assertion XML parsed as a JavaScript object
 	getSamlResponseXml(): string; // get the raw SAML response XML
 } & {
-	[attributeName: string]: string;  // arbitrary `AttributeValue`s
+	[attributeName: string]: unknown;  // arbitrary `AttributeValue`s
 };

From 0b19c17274c6ad06e597a4cd3ef07d3d257b5707 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Sun, 17 Mar 2019 00:33:37 -0400
Subject: [PATCH 722/924] Fix generics on `.command()` signature

The `.command(command, description, module)` signature should match the `.command(command, showInHelp, module)` signature, but the generic `U` was accidentally removed.
---
 types/yargs/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 0292ec3132..1f9dc22e3e 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -60,7 +60,7 @@ declare namespace yargs {
 
         command<U>(command: string | ReadonlyArray<string>, description: string, builder?: (args: Argv<T>) => Argv<U>, handler?: (args: Arguments<U>) => void): Argv<T>;
         command<O extends { [key: string]: Options }>(command: string | ReadonlyArray<string>, description: string, builder?: O, handler?: (args: Arguments<InferredOptionTypes<O>>) => void): Argv<T>;
-        command(command: string | ReadonlyArray<string>, description: string, module: CommandModule<T, any>): Argv<T>;
+        command<U>(command: string | ReadonlyArray<string>, description: string, module: CommandModule<T, U>): Argv<U>;
         command<U>(command: string | ReadonlyArray<string>, showInHelp: false, builder?: (args: Argv<T>) => Argv<U>, handler?: (args: Arguments<U>) => void): Argv<T>;
         command<O extends { [key: string]: Options }>(command: string | ReadonlyArray<string>, showInHelp: false, builder?: O, handler?: (args: Arguments<InferredOptionTypes<O>>) => void): Argv<T>;
         command<U>(command: string | ReadonlyArray<string>, showInHelp: false, module: CommandModule<T, U>): Argv<U>;

From 9bff39ea19ba9db8c09ffc3307bbec7048776202 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Sun, 17 Mar 2019 12:44:16 +0800
Subject: [PATCH 723/924] Added type definitions for amap-js-api-map3d

---
 .../amap-js-api-map3d-tests.ts                | 489 ++++++++++++++++++
 types/amap-js-api-map3d/geometry-3d.d.ts      |  28 +
 types/amap-js-api-map3d/index.d.ts            |  15 +
 types/amap-js-api-map3d/lights.d.ts           |  17 +
 types/amap-js-api-map3d/map3d.d.ts            |  15 +
 types/amap-js-api-map3d/object3d-group.d.ts   |   8 +
 types/amap-js-api-map3d/object3d-layer.d.ts   |  27 +
 types/amap-js-api-map3d/object3d.d.ts         |  92 ++++
 types/amap-js-api-map3d/tsconfig.json         |  31 ++
 types/amap-js-api-map3d/tslint.json           |   3 +
 types/amap-js-api-map3d/vector3.d.ts          |  16 +
 11 files changed, 741 insertions(+)
 create mode 100644 types/amap-js-api-map3d/amap-js-api-map3d-tests.ts
 create mode 100644 types/amap-js-api-map3d/geometry-3d.d.ts
 create mode 100644 types/amap-js-api-map3d/index.d.ts
 create mode 100644 types/amap-js-api-map3d/lights.d.ts
 create mode 100644 types/amap-js-api-map3d/map3d.d.ts
 create mode 100644 types/amap-js-api-map3d/object3d-group.d.ts
 create mode 100644 types/amap-js-api-map3d/object3d-layer.d.ts
 create mode 100644 types/amap-js-api-map3d/object3d.d.ts
 create mode 100644 types/amap-js-api-map3d/tsconfig.json
 create mode 100644 types/amap-js-api-map3d/tslint.json
 create mode 100644 types/amap-js-api-map3d/vector3.d.ts

diff --git a/types/amap-js-api-map3d/amap-js-api-map3d-tests.ts b/types/amap-js-api-map3d/amap-js-api-map3d-tests.ts
new file mode 100644
index 0000000000..ec89b74476
--- /dev/null
+++ b/types/amap-js-api-map3d/amap-js-api-map3d-tests.ts
@@ -0,0 +1,489 @@
+/**
+ * preset.ts
+ */
+
+declare const map: AMap.Map;
+declare const lnglat: AMap.LngLat;
+declare const size: AMap.Size;
+declare const lnglatTuple: [number, number];
+declare const pixel: AMap.Pixel;
+declare const layer: AMap.Layer;
+declare const ambientLight: AMap.Lights.AmbientLight;
+declare const directionLight: AMap.Lights.DirectionLight;
+declare const line: AMap.Object3D.Line;
+declare const mesh: AMap.Object3D.Mesh;
+declare const object3d: AMap.Object3D;
+declare const geometry: AMap.Geometry3D.Mesh;
+
+/**
+ * lights.ts
+ */
+
+// $ExpectType AmbientLight
+const testAmbientLight = new AMap.Lights.AmbientLight([0.1, 0, 0.1], 1);
+
+// $ExpectType void
+testAmbientLight.setColor([0.1, 1, 0.5]);
+
+// $ExpectType void
+testAmbientLight.setIntensity(1);
+
+// $ExpectType DirectionLight
+const testDirectionLight = new AMap.Lights.DirectionLight([1, 2, 3], [1, 2, 3], 1);
+
+// $ExpectType void
+testDirectionLight.setColor([1, 2, 3]);
+
+// $ExpectType void
+testDirectionLight.setIntensity(1);
+
+// $ExpectType void
+testDirectionLight.setDirection([1, 2, 3]);
+
+/**
+ * map3d.ts
+ */
+
+// $ExpectType Object3DResult | null
+map.getObject3DByContainerPos(pixel);
+
+// $ExpectType Object3DResult | null
+const containserPos = map.getObject3DByContainerPos(pixel, [layer], true);
+if (containserPos) {
+    // $ExpectType number
+    containserPos.index;
+    // $ExpectType Vector3
+    containserPos.point;
+    // $ExpectType number
+    containserPos.distance;
+    // $ExpectType Object3D
+    containserPos.object;
+} else {
+    // $ExpectType null
+    containserPos;
+}
+
+map.AmbientLight = ambientLight;
+map.AmbientLight = undefined;
+
+map.DirectionLight = directionLight;
+map.DirectionLight = undefined;
+
+/**
+ * object3d-group.ts
+ */
+
+// $ExpectType Object3DGroup<Object3D>
+const testObject3dGroup1 = new AMap.Object3DGroup();
+// $ExpectType Object3DGroup<Mesh>
+const testObject3dGroup2 = new AMap.Object3DGroup<AMap.Object3D.Mesh>();
+
+// $ExpectType Object3D[]
+testObject3dGroup1.children;
+// $ExpectType Mesh[]
+testObject3dGroup2.children;
+
+// $ExoectType void
+testObject3dGroup1.add(line);
+// $ExoectType void
+testObject3dGroup1.add(mesh);
+// $ExoectType void
+testObject3dGroup2.add(mesh);
+// $ExpectError
+testObject3dGroup2.add(line);
+
+// $ExoectType void
+testObject3dGroup1.remove(line);
+// $ExoectType void
+testObject3dGroup1.remove(mesh);
+// $ExoectType void
+testObject3dGroup2.remove(mesh);
+// $ExpectError
+testObject3dGroup2.remove(line);
+
+/**
+ * object3d-Layer.ts
+ */
+
+// $ExpectType Object3DLayer
+new AMap.Object3DLayer();
+// $ExpectType Object3DLayer
+new AMap.Object3DLayer({});
+// $ExpectType Object3DLayer
+const testObject3DLayer = new AMap.Object3DLayer({
+    map,
+    visible: true,
+    opacity: 0.1,
+    zIndex: 2,
+    zooms: [1, 2]
+});
+
+// $ExpectType void
+testObject3DLayer.setMap(null);
+// $ExpectType void
+testObject3DLayer.setMap(map);
+
+// $ExpectType Map | null | undefined
+testObject3DLayer.getMap();
+
+// $ExpectType void
+testObject3DLayer.hide();
+
+// $ExpectType void
+testObject3DLayer.show();
+
+// $ExpectType void
+testObject3DLayer.setOpacity(1);
+
+// $ExpectType number
+testObject3DLayer.getOpacity();
+
+// $ExpectType void
+testObject3DLayer.setzIndex(1);
+
+// $ExpectType number
+testObject3DLayer.getzIndex();
+
+// $ExpectType [number, number]
+testObject3DLayer.getZooms();
+
+// $ExpectType void
+testObject3DLayer.add(object3d);
+
+// $ExpectType void
+testObject3DLayer.remove(object3d);
+
+// $ExpectType void
+testObject3DLayer.clear();
+
+// $ExpectType void
+testObject3DLayer.reDraw();
+
+/**
+ * vector3.ts
+ */
+
+// $ExpectType Vector3
+const testVector = new AMap.Vector3([1, 2, 3]);
+// $ExpectType Vector3
+new AMap.Vector3(testVector);
+
+// $ExpectType [number, number, number]
+testVector.elements;
+
+// $ExpectType void
+testVector.set(1, 2, 3);
+
+// $ExpectType number
+testVector.dot();
+
+// $ExpectType Vector3
+testVector.clone();
+
+// $ExpectType Vector3
+testVector.add(testVector);
+// $ExpectType Vector3
+testVector.add([1, 2, 3]);
+
+// $ExpectType Vector3
+testVector.sub(testVector);
+// $ExpectType Vector3
+testVector.sub([1, 2, 3]);
+
+// $ExpectType Vector3
+testVector.addVectors(testVector, testVector);
+
+// $ExpectType Vector3
+testVector.subVectors(testVector, testVector);
+
+// $ExpectType Vector3
+testVector.crossVectors(testVector, testVector);
+
+// $ExpectType Vector3
+testVector.normalize();
+
+// $ExpectType number
+testVector.length();
+
+/**
+ * object3d/mesh.ts
+ */
+
+// $ExpectType Mesh
+const testMesh = new AMap.Object3D.Mesh();
+
+// $ExpectError
+testMesh.geometry = geometry;
+
+// $ExpectType number[]
+testMesh.geometry.vertices;
+// $ExpectError
+testMesh.geometry.vertices = [];
+testMesh.geometry.vertices.shift();
+
+// $ExpectType number[]
+testMesh.geometry.vertexColors;
+// $ExpectError
+testMesh.geometry.vertexColors = [];
+testMesh.geometry.vertexColors.shift();
+
+// $ExpectType number[]
+testMesh.geometry.vertexUVs;
+// $ExpectError
+testMesh.geometry.vertexUVs = [];
+testMesh.geometry.vertexUVs.shift();
+
+// $ExpectType number[]
+testMesh.geometry.faces;
+// $ExpectError
+testMesh.geometry.faces = [];
+testMesh.geometry.faces.shift();
+
+// $ExpectType number[]
+testMesh.geometry.textureIndices;
+// $ExpectError
+testMesh.geometry.textureIndices = [];
+testMesh.geometry.textureIndices.shift();
+
+// $ExpectType (string | HTMLCanvasElement)[]
+testMesh.textures;
+
+// $ExpectType boolean
+testMesh.needUpdate;
+
+// $ExpectType boolean
+testMesh.transparent;
+
+// $ExpectType boolean
+testMesh.DEPTH_TEST;
+
+// $ExpectType void
+testMesh.reDraw();
+
+/**
+ * object3d/meshAcceptLights.ts
+ */
+
+// $ExpectType MeshAcceptLights
+const testMeshAcceptLights = new AMap.Object3D.MeshAcceptLights();
+
+// $ExpectError
+testMeshAcceptLights.geometry = geometry;
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.vertices;
+// $ExpectError
+testMeshAcceptLights.geometry.vertices = [];
+testMeshAcceptLights.geometry.vertices.shift();
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.vertexColors;
+// $ExpectError
+testMeshAcceptLights.geometry.vertexColors = [];
+testMeshAcceptLights.geometry.vertexColors.shift();
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.vertexUVs;
+// $ExpectError
+testMeshAcceptLights.geometry.vertexUVs = [];
+testMeshAcceptLights.geometry.vertexUVs.shift();
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.faces;
+// $ExpectError
+testMeshAcceptLights.geometry.faces = [];
+testMeshAcceptLights.geometry.faces.shift();
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.textureIndices;
+// $ExpectError
+testMeshAcceptLights.geometry.textureIndices = [];
+testMeshAcceptLights.geometry.textureIndices.shift();
+
+// $ExpectType number[]
+testMeshAcceptLights.geometry.vertexNormals;
+// $ExpectError
+testMeshAcceptLights.geometry.vertexNormals = [];
+testMeshAcceptLights.geometry.vertexNormals.shift();
+
+// $ExpectType (string | HTMLCanvasElement)[]
+testMeshAcceptLights.textures;
+
+// $ExpectType boolean
+testMeshAcceptLights.needUpdate;
+
+// $ExpectType boolean
+testMeshAcceptLights.transparent;
+
+// $ExpectType boolean
+testMeshAcceptLights.DEPTH_TEST;
+
+// $ExpectType void
+testMeshAcceptLights.reDraw();
+
+/**
+ * object3d/meshLine.ts
+ */
+
+// $ExpectError
+new AMap.Object3D.MeshLine();
+// $ExpectError
+new AMap.Object3D.MeshLine({});
+// $ExpectType MeshLine
+const testMeshLine = new AMap.Object3D.MeshLine({
+    path: [lnglat],
+    width: 1,
+    height: 1,
+    color: 'red'
+});
+// $ExpectType MeshLine
+new AMap.Object3D.MeshLine({
+    path: [lnglat],
+    color: [0, 0, 1, 1]
+});
+// $ExpectType MeshLine
+new AMap.Object3D.MeshLine({
+    path: [[1, 2]]
+});
+// $ExpectType MeshLine
+new AMap.Object3D.MeshLine({
+    path: [lnglat],
+    unit: 'meter'
+});
+// $ExpectType MeshLine
+new AMap.Object3D.MeshLine({
+    path: [pixel],
+    unit: 'px'
+});
+// $ExpectError
+new AMap.Object3D.MeshLine({
+    path: [lnglat],
+    unit: 'px'
+});
+// $ExpectError
+new AMap.Object3D.MeshLine({
+    path: [pixel],
+    unit: 'meter'
+});
+
+// $ExpectType number[]
+testMeshLine.geometry.vertices;
+// $ExpectError
+testMeshLine.geometry.vertices = [];
+testMeshLine.geometry.vertices.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.vertexUVs;
+// $ExpectError
+testMeshLine.geometry.vertexUVs = [];
+testMeshLine.geometry.vertexUVs.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.vertexColors;
+// $ExpectError
+testMeshLine.geometry.vertexColors = [];
+testMeshLine.geometry.vertexColors.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.vertexColors;
+// $ExpectError
+testMeshLine.geometry.vertexColors = [];
+testMeshLine.geometry.vertexColors.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.vertexIndices;
+// $ExpectError
+testMeshLine.geometry.vertexIndices = [];
+testMeshLine.geometry.vertexIndices.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.directions;
+// $ExpectError
+testMeshLine.geometry.directions = [];
+testMeshLine.geometry.directions.shift();
+
+// $ExpectType number[]
+testMeshLine.geometry.textureIndices;
+// $ExpectError
+testMeshLine.geometry.textureIndices = [];
+testMeshLine.geometry.textureIndices.shift();
+
+// $ExpectType number
+testMeshLine.width;
+
+// $ExpectType void
+testMeshLine.setPath([lnglat]);
+// $ExpectType void
+testMeshLine.setPath([lnglatTuple]);
+// $ExpectType void
+testMeshLine.setPath([pixel]);
+
+// $ExpectType void
+testMeshLine.setWidth(10);
+
+// $ExpectType void
+testMeshLine.setHeight(10);
+
+// $ExpectType void
+testMeshLine.setColor('red');
+
+/**
+ * object3d/prism.ts
+ */
+
+// $ExpectError
+new AMap.Object3D.Prism();
+// $ExpectError
+new AMap.Object3D.Prism({});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: 'red',
+    height: 1,
+    color2: 'blue'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [pixel],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [[lnglat]],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [[pixel]],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [[lnglatTuple]],
+    color: 'red'
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: ['red']
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: [1, 1, 1, 1]
+});
+// $ExpectType Prism
+new AMap.Object3D.Prism({
+    path: [lnglat],
+    color: [[1, 1, 1, 1]]
+});
diff --git a/types/amap-js-api-map3d/geometry-3d.d.ts b/types/amap-js-api-map3d/geometry-3d.d.ts
new file mode 100644
index 0000000000..edb4fd2a85
--- /dev/null
+++ b/types/amap-js-api-map3d/geometry-3d.d.ts
@@ -0,0 +1,28 @@
+declare namespace AMap {
+    abstract class Geometry3D {
+        readonly vertices: number[];
+        readonly vertexUVs: number[];
+        readonly vertexColors: number[];
+    }
+
+    namespace Geometry3D {
+        class Mesh extends Geometry3D {
+            readonly type: 'mesh';
+            readonly faces: number[];
+            readonly textureIndices: number[];
+        }
+
+        class Line extends Geometry3D {
+            readonly type: 'line';
+            readonly segments: number[];
+            readonly textureIndices: number[];
+        }
+
+        class Points extends Geometry3D {
+            readonly type: 'points';
+            readonly pointSizes: number[];
+            readonly pointAreas: number[];
+            readonly textureIndices: number[];
+        }
+    }
+}
diff --git a/types/amap-js-api-map3d/index.d.ts b/types/amap-js-api-map3d/index.d.ts
new file mode 100644
index 0000000000..43be45eb13
--- /dev/null
+++ b/types/amap-js-api-map3d/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for non-npm package amap-js-api-map3d 1.4
+// Project: https://lbs.amap.com/api/javascript-api/reference/maps-3d
+// Definitions by: breeze9527 <https://github.com/breeze9527>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="amap-js-api" />
+
+/// <reference path="geometry-3d.d.ts" />
+/// <reference path="lights.d.ts" />
+/// <reference path="map3d.d.ts" />
+/// <reference path="object3d-group.d.ts" />
+/// <reference path="object3d-layer.d.ts" />
+/// <reference path="object3d.d.ts" />
+/// <reference path="vector3.d.ts" />
diff --git a/types/amap-js-api-map3d/lights.d.ts b/types/amap-js-api-map3d/lights.d.ts
new file mode 100644
index 0000000000..b637ee79ef
--- /dev/null
+++ b/types/amap-js-api-map3d/lights.d.ts
@@ -0,0 +1,17 @@
+declare namespace AMap {
+    namespace Lights {
+        class AmbientLight {
+            constructor(color: [number, number, number], intensity: number);
+            setColor(color: [number, number, number]): void;
+            setIntensity(intensity: number): void;
+        }
+
+        class DirectionLight {
+            constructor(direction: [number, number, number], color: [number, number, number], intensity: number);
+            update(): void;
+            setDirection(direction: [number, number, number]): void;
+            setColor(direction: [number, number, number]): void;
+            setIntensity(intensity: number): void;
+        }
+    }
+}
diff --git a/types/amap-js-api-map3d/map3d.d.ts b/types/amap-js-api-map3d/map3d.d.ts
new file mode 100644
index 0000000000..f2345f1a30
--- /dev/null
+++ b/types/amap-js-api-map3d/map3d.d.ts
@@ -0,0 +1,15 @@
+declare namespace AMap {
+    namespace Map {
+        interface Object3DResult {
+            index: number;
+            point: Vector3;
+            distance: number;
+            object: Object3D;
+        }
+    }
+    interface Map {
+        AmbientLight?: Lights.AmbientLight;
+        DirectionLight?: Lights.DirectionLight;
+        getObject3DByContainerPos(pixel: Pixel, layers?: Layer[], all?: boolean): Map.Object3DResult | null;
+    }
+}
diff --git a/types/amap-js-api-map3d/object3d-group.d.ts b/types/amap-js-api-map3d/object3d-group.d.ts
new file mode 100644
index 0000000000..4c1f4d90d3
--- /dev/null
+++ b/types/amap-js-api-map3d/object3d-group.d.ts
@@ -0,0 +1,8 @@
+declare namespace AMap {
+    class Object3DGroup<C extends Object3D = Object3D> extends Object3D {
+        constructor();
+        children: C[];
+        add(object3d: C): void;
+        remove(object3d: C): void;
+    }
+}
diff --git a/types/amap-js-api-map3d/object3d-layer.d.ts b/types/amap-js-api-map3d/object3d-layer.d.ts
new file mode 100644
index 0000000000..de29a0bfd9
--- /dev/null
+++ b/types/amap-js-api-map3d/object3d-layer.d.ts
@@ -0,0 +1,27 @@
+declare namespace AMap {
+    namespace Object3DLayer {
+        interface Options {
+            map?: Map;
+            visible?: boolean;
+            opacity?: number;
+            zIndex?: number;
+            zooms?: [number, number];
+        }
+    }
+
+    class Object3DLayer extends Layer {
+        constructor(options?: Object3DLayer.Options)
+        add(object3d: Object3D): void;
+        remove(object3d: Object3D): void;
+        clear(): void;
+        reDraw(): void;
+
+        // internal
+        setOption(options: {
+            position?: number;
+            scale?: number;
+            height?: number;
+            scene?: number;
+        }): void;
+    }
+}
diff --git a/types/amap-js-api-map3d/object3d.d.ts b/types/amap-js-api-map3d/object3d.d.ts
new file mode 100644
index 0000000000..32f63e2378
--- /dev/null
+++ b/types/amap-js-api-map3d/object3d.d.ts
@@ -0,0 +1,92 @@
+declare namespace AMap {
+    class Object3D {
+        readonly geometry: Geometry3D;
+        transparent: boolean;
+        DEPTH_TEST: boolean;
+        textures: Array<string | HTMLCanvasElement>;
+        needUpdate: boolean;
+        reDraw(): void;
+
+        // internal
+        reset(): void;
+    }
+
+    namespace Object3D {
+        class Mesh extends Object3D {
+            readonly geometry: Geometry3D.Mesh;
+        }
+
+        class MeshAcceptLights extends Mesh {
+            readonly geometry: Geometry3D.Mesh & { readonly vertexNormals: number[] };
+        }
+
+        namespace Prism {
+            interface Options {
+                path: LngLat[] | Pixel[] | Array<LngLat[] | Pixel[] | Array<[number, number]>>;
+                color: string | number[] | Array<string | number[]>;
+                height?: number;
+                color2?: string | number[] | Array<string | number[]>;
+            }
+        }
+        class Prism extends MeshAcceptLights {
+            constructor(options: Prism.Options);
+        }
+
+        // tslint:disable-next-line
+        class Wall extends Prism { }
+
+        class Line extends Object3D {
+            readonly geometry: Geometry3D.Line;
+        }
+
+        namespace ThinLine {
+            interface Options {
+                path: Array<[number, number]>;
+                color: string;
+                altitude?: number;
+                dashArray?: number[];
+            }
+        }
+        class ThinLine extends Line {
+            constructor(options: ThinLine.Options);
+        }
+
+        class Points extends Object3D {
+            readonly geometry: Geometry3D.Points;
+            borderColor: string;
+            borderWeight: number;
+        }
+
+        class RoundPoints extends Points {
+            merge: boolean;
+        }
+
+        namespace MeshLine {
+            type Options = {
+                width?: number;
+                height?: number | number[];
+                color?: string | number[];
+            } & ({
+                unit?: 'meter';
+                path: Array<[number, number]> | LngLat[];
+            } | {
+                unit: 'px';
+                path: Array<[number, number]> | Pixel[];
+            });
+        }
+        // inherit from WideLine
+        class MeshLine extends Object3D {
+            constructor(options: MeshLine.Options);
+            readonly geometry: Geometry3D & {
+                readonly vertexIndices: number[];
+                readonly directions: number[];
+                readonly textureIndices: number[];
+            };
+            width: number;
+            setPath(path: LngLat[] | Pixel[] | Array<[number, number]>): void;
+            setWidth(width: number): void;
+            setHeight(height: number | number[]): void;
+            setColor(color: string): void;
+        }
+    }
+}
diff --git a/types/amap-js-api-map3d/tsconfig.json b/types/amap-js-api-map3d/tsconfig.json
new file mode 100644
index 0000000000..e28735d963
--- /dev/null
+++ b/types/amap-js-api-map3d/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "geometry-3d.d.ts",
+        "index.d.ts",
+        "lights.d.ts",
+        "map3d.d.ts",
+        "object3d-group.d.ts",
+        "object3d-layer.d.ts",
+        "object3d.d.ts",
+        "vector3.d.ts",
+        "amap-js-api-map3d-tests.ts"
+    ]
+}
diff --git a/types/amap-js-api-map3d/tslint.json b/types/amap-js-api-map3d/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/amap-js-api-map3d/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/amap-js-api-map3d/vector3.d.ts b/types/amap-js-api-map3d/vector3.d.ts
new file mode 100644
index 0000000000..1cb02fe9b0
--- /dev/null
+++ b/types/amap-js-api-map3d/vector3.d.ts
@@ -0,0 +1,16 @@
+declare namespace AMap {
+    class Vector3 {
+        readonly elements: [number, number, number];
+        constructor(elements: [number, number, number] | Vector3);
+        set(x: number, y: number, z: number): void;
+        dot(): number;
+        clone(): Vector3;
+        add(elements: [number, number, number] | Vector3): this;
+        sub(elements: [number, number, number] | Vector3): this;
+        addVectors(a: Vector3, b: Vector3): this;
+        subVectors(a: Vector3, b: Vector3): this;
+        crossVectors(a: Vector3, b: Vector3): this;
+        normalize(): this;
+        length(): number;
+    }
+}

From 3e4f53613a60a832c590d4287d3e4260bf6bbb5a Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Sun, 17 Mar 2019 16:07:22 +1100
Subject: [PATCH 724/924] circular-dependency-plugin: Initial commit

---
 .../circular-dependency-plugin-tests.ts       | 29 ++++++++++++++++++
 types/circular-dependency-plugin/index.d.ts   | 30 +++++++++++++++++++
 .../circular-dependency-plugin/tsconfig.json  | 23 ++++++++++++++
 types/circular-dependency-plugin/tslint.json  |  1 +
 4 files changed, 83 insertions(+)
 create mode 100644 types/circular-dependency-plugin/circular-dependency-plugin-tests.ts
 create mode 100644 types/circular-dependency-plugin/index.d.ts
 create mode 100644 types/circular-dependency-plugin/tsconfig.json
 create mode 100644 types/circular-dependency-plugin/tslint.json

diff --git a/types/circular-dependency-plugin/circular-dependency-plugin-tests.ts b/types/circular-dependency-plugin/circular-dependency-plugin-tests.ts
new file mode 100644
index 0000000000..8c627651e7
--- /dev/null
+++ b/types/circular-dependency-plugin/circular-dependency-plugin-tests.ts
@@ -0,0 +1,29 @@
+import * as CircularDependencyPlugin from 'circular-dependency-plugin';
+import * as webpack from 'webpack';
+
+new CircularDependencyPlugin();
+new CircularDependencyPlugin({});
+
+const MAX_CYCLES = 5;
+let numCyclesDetected = 0;
+
+new CircularDependencyPlugin({
+  allowAsyncCycles: false,
+  cwd: process.cwd(),
+  exclude: /a\.js|node_modules/,
+  failOnError: true,
+  onDetected({ module: webpackModuleRecord, paths, compilation }) {
+    numCyclesDetected++;
+    compilation.warnings.push(new Error(paths.join(' -> ')));
+  },
+  onStart({ compilation }) {
+    numCyclesDetected = 0;
+  },
+  onEnd({ compilation }) {
+    if (numCyclesDetected > MAX_CYCLES) {
+      compilation.errors.push(new Error('Too many cycles'));
+    }
+  },
+});
+
+webpack({ plugins: [new CircularDependencyPlugin()] });
diff --git a/types/circular-dependency-plugin/index.d.ts b/types/circular-dependency-plugin/index.d.ts
new file mode 100644
index 0000000000..89c14b0ec0
--- /dev/null
+++ b/types/circular-dependency-plugin/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for circular-dependency-plugin 5.0
+// Project: https://github.com/aackerman/circular-dependency-plugin
+// Definitions by: Olegs Jeremejevs <https://github.com/jeremejevs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Plugin, Module, compilation } from 'webpack';
+
+export = CircularDependencyPlugin;
+
+declare class CircularDependencyPlugin extends Plugin {
+  constructor(options?: CircularDependencyPlugin.Options);
+  // Not exposing `isCyclic` because it isn't meant to be public, I believe
+}
+
+declare namespace CircularDependencyPlugin {
+  interface Options {
+    allowAsyncCycles?: boolean;
+    cwd?: string;
+    exclude?: RegExp;
+    failOnError?: boolean;
+    onDetected?: (x: {
+      module: Module;
+      paths: string[];
+      compilation: compilation.Compilation;
+    }) => void;
+    onEnd?: (x: { compilation: compilation.Compilation }) => void;
+    onStart?: (x: { compilation: compilation.Compilation }) => void;
+  }
+}
diff --git a/types/circular-dependency-plugin/tsconfig.json b/types/circular-dependency-plugin/tsconfig.json
new file mode 100644
index 0000000000..476eb673dd
--- /dev/null
+++ b/types/circular-dependency-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "circular-dependency-plugin-tests.ts"
+    ]
+}
diff --git a/types/circular-dependency-plugin/tslint.json b/types/circular-dependency-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/circular-dependency-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From cfde12269ccf42b9c1db2a04e260a4f8ed4ccf62 Mon Sep 17 00:00:00 2001
From: Richard Lea <chigix@zoho.com>
Date: Sun, 10 Mar 2019 01:01:16 +0900
Subject: [PATCH 725/924] fix(inquirer): update api definitions to 6.x

Signed-off-by: Richard Lea <chigix@zoho.com>
---
 types/inquirer/index.d.ts         | 147 +++++++++++++++++-------------
 types/inquirer/inquirer-tests.ts  | 111 +++++++++++-----------
 types/inquirer/package.json       |   6 ++
 types/yeoman-generator/index.d.ts |   1 +
 4 files changed, 143 insertions(+), 122 deletions(-)
 create mode 100644 types/inquirer/package.json

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 74aee08ed3..d61b2adde4 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Inquirer.js
+// Type definitions for Inquirer.js 6.x
 // Project: https://github.com/SBoudrias/Inquirer.js
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Parvez <https://github.com/ppathan>
@@ -9,27 +9,26 @@
 //                 Justin Rockwood <https://github.com/jrockwood>
 //                 Keith Kelly <https://github.com/kwkelly>
 //                 Junyoung Clare Jang <https://github.com/Ailrun>
+//                 Richard Lea <https://github.com/chigix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// TypeScript Version: 2.3
-/// <reference types="rx" />
+// TypeScript Version: 2.8
 
 import through = require('through');
+import { Observable } from 'rxjs';
+import * as readline from 'readline';
 
 declare namespace inquirer {
-    type Prompts = { [name: string]: PromptModule };
+    type Prompts = { [name: string]: prompts.Base };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
     type Questions<T = Answers> =
         | Question<T>
         | ReadonlyArray<Question<T>>
-        | Rx.Observable<Question<T>>;
-    interface OutputStreamOption {
-        output: NodeJS.WriteStream
-    }
-    interface InputStreamOption {
-        input: NodeJS.ReadStream
-    }
-    type StreamOptions = InputStreamOption | OutputStreamOption | (InputStreamOption & OutputStreamOption);
+        | Observable<Question<T>>;
+    type StreamOptions = {
+        input?: NodeJS.ReadStream,
+        output?: NodeJS.WriteStream,
+    };
 
     interface Inquirer {
         restoreDefaultPrompts(): void;
@@ -47,28 +46,25 @@ declare namespace inquirer {
         /**
          * Public CLI helper interface
          * @param questions Questions settings array
-         * @param cb Callback being passed the user answers
          * @return
          */
-        prompt<T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
-        prompt<T>(questions: Questions<T>): Promise<T>;
+        prompt: PromptModule;
         prompts: Prompts;
         Separator: objects.SeparatorStatic;
         ui: {
             BottomBar: ui.BottomBar;
-            Prompt: ui.Prompt;
+            Prompt: ui.PromptUI;
         };
     }
 
     interface PromptModule {
-        <T>(questions: Questions<T>): Promise<T>;
-        <T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
+        <T>(questions: Questions<T>): Promise<T> & { ui: ui.PromptUI };
         /**
          * Register a prompt type
          * @param name Prompt type name
          * @param prompt Prompt constructor
          */
-        registerPrompt(name: string, prompt: PromptModule): ui.Prompt;
+        registerPrompt(name: string, prompt: prompts.Base): PromptModule;
         /**
          * Register the defaults provider prompts
          */
@@ -111,9 +107,9 @@ declare namespace inquirer {
          * (to save in the answers hash). Values can also be a Separator.
          */
         choices?:
-            | ReadonlyArray<ChoiceType>
-            | ((answers: T) => ReadonlyArray<ChoiceType>)
-            | ((answers: T) => Promise<ReadonlyArray<ChoiceType>>);
+        | ReadonlyArray<ChoiceType>
+        | ((answers: T) => ReadonlyArray<ChoiceType>)
+        | ((answers: T) => Promise<ReadonlyArray<ChoiceType>>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
@@ -161,32 +157,88 @@ declare namespace inquirer {
         [key: string]: any;
     }
 
+    /**
+     * Corresponding to the answer object creation in:
+     * https://github.com/SBoudrias/Inquirer.js/blob/ff075f587ef78504f0eae4ee5ca0656432429026/packages/inquirer/lib/ui/prompt.js#L88
+     */
+    interface Answer {
+        name: string,
+        answer: any,
+    }
+
+    namespace prompts {
+        /**
+         * Base prompt implementation
+         * Should be extended by prompt types.
+         *
+         * @interface Base
+         */
+        interface Base {
+            new <T>(question: Question<T>, rl: readline.Interface, answers: Answers): Base;
+            /**
+             * Start the Inquiry session and manage output value filtering
+             *
+             * @returns {Promise<any>}
+             * @memberof Base
+             */
+            run(): Promise<any>;
+            /**
+             * Called when the UI closes. Override to do any specific cleanup necessary
+             */
+            close(): void;
+            /**
+             * Generate the prompt question string
+             */
+            getQuestion(): string;
+        }
+    }
+
     namespace ui {
+
         /**
          * Base interface class other can inherits from
          */
-        interface Prompt extends BaseUI<Prompts> {
-            new (promptModule: Prompts): Prompt;
+        interface BaseUI {
+            rl: readline.Interface;
+            new(opt: StreamOptions): BaseUI;
+            /**
+             * Handle the ^C exit
+             * @return {null}
+             */
+            onForceClose(): void;
+            /**
+             * Close the interface and cleanup listeners
+             */
+            close(): void;
+        }
+        /**
+         * Base interface class other can inherits from
+         */
+        interface PromptUI extends BaseUI {
+            process: Observable<Answer>;
+            new(prompts: Prompts, opt: StreamOptions): PromptUI;
+            run<T>(questions: Questions<T>): Promise<Answers>;
             /**
              * Once all prompt are over
              */
             onCompletion(): void;
-            processQuestion<T>(question: Question<T>): any;
-            fetchAnswer<T>(question: Question<T>): any;
-            setDefaultType<T>(question: Question<T>): any;
-            filterIfRunnable<T>(question: Question<T>): any;
+            processQuestion<T>(question: Question<T>): Observable<Question<T>>;
+            fetchAnswer<T>(question: Question<T>): Observable<Question<T>>;
+            setDefaultType<T>(question: Question<T>): Observable<Question<T>>;
+            filterIfRunnable<T>(question: Question<T>): Observable<Question<T>>;
         }
 
         /**
          * Sticky bottom bar user interface
          */
-        interface BottomBar extends BaseUI<BottomBarOption> {
-            new (opt?: BottomBarOption): BottomBar;
+        interface BottomBar extends BaseUI {
+            new(opt?: StreamOptions & { bottomBar?: string }): BottomBar;
             /**
              * Render the prompt to screen
              * @return self
              */
             render(): BottomBar;
+            clean(): BottomBar;
             /**
              * Update the bottom bar content and rerender
              * @param bottomBar Bottom bar content
@@ -194,10 +246,11 @@ declare namespace inquirer {
              */
             updateBottomBar(bottomBar: string): BottomBar;
             /**
-             * Rerender the prompt
+             * Write out log data
+             * @param {String} data - The log data to be output
              * @return self
              */
-            writeLog(data: any): BottomBar;
+            writeLog(data: string): BottomBar;
             /**
              * Make sure line end on a line feed
              * @param str Input string
@@ -212,36 +265,6 @@ declare namespace inquirer {
             log: through.ThroughStream;
         }
 
-        interface BottomBarOption {
-            bottomBar?: string;
-        }
-        /**
-         * Base interface class other can inherits from
-         */
-        interface BaseUI<TOpt> {
-            new (opt: TOpt): void;
-            /**
-             * Handle the ^C exit
-             * @return {null}
-             */
-            onForceClose(): void;
-            /**
-             * Close the interface and cleanup listeners
-             */
-            close(): void;
-            /**
-             * Handle and propagate keypress events
-             */
-            onKeypress(s: string, key: Key): void;
-        }
-
-        interface Key {
-            sequence: string;
-            name: string;
-            meta: boolean;
-            shift: boolean;
-            ctrl: boolean;
-        }
     }
 
     namespace objects {
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index 4c8ba9491f..95f8d442a6 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -3,11 +3,10 @@ import inquirer = require("inquirer");
 inquirer.prompt(
     [
         /* Pass your questions in here */
-    ],
-    function(answers: inquirer.Answers) {
-        // Use user feedback for... whatever!!
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    // Use user feedback for... whatever!!
+});
 
 //
 // examples/bottom-bar.js
@@ -87,11 +86,10 @@ inquirer.prompt<{ toppings: string }>(
                 return true;
             }
         }
-    ],
-    function(answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then(answers => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/expand.js
@@ -134,11 +132,10 @@ inquirer.prompt(
                 }
             ]
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/input.js
@@ -184,9 +181,9 @@ var questions = [
     }
 ];
 
-inquirer.prompt(questions, function(answers) {
-    console.log(JSON.stringify(answers, null, "  "));
-});
+inquirer.prompt(questions).then(
+    answers => console.log(JSON.stringify(answers, null, "  "))
+);
 
 //
 // examples/list.js
@@ -222,11 +219,10 @@ inquirer.prompt(
                 return val.toLowerCase();
             }
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/long-list.js
@@ -263,11 +259,10 @@ inquirer.prompt(
             paginated: true,
             choices: choices
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/nested-call.js
@@ -286,16 +281,15 @@ inquirer.prompt(
         name: "chocolate",
         message: "What's your favorite chocolate?",
         choices: ["Mars", "Oh Henry", "Hershey"]
-    },
-    function(answers: inquirer.Answers) {
-        inquirer.prompt({
-            type: "list",
-            name: "beverage",
-            message: "And your favorite beverage?",
-            choices: ["Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull"]
-        });
     }
-);
+).then((answers: inquirer.Answers) => {
+    inquirer.prompt({
+        type: "list",
+        name: "beverage",
+        message: "And your favorite beverage?",
+        choices: ["Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull"]
+    });
+});
 
 //
 // examples/password.js
@@ -315,11 +309,10 @@ inquirer.prompt(
             message: "Enter your git password",
             name: "password"
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/pizza.js
@@ -421,7 +414,7 @@ var questions2 = [
     }
 ];
 
-inquirer.prompt(questions, function(answers) {
+inquirer.prompt(questions).then(answers => {
     console.log("\nOrder receipt:");
     console.log(JSON.stringify(answers, null, "  "));
 });
@@ -460,11 +453,10 @@ inquirer.prompt(
                 return val.toLowerCase();
             }
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, "  "));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, "  "));
+});
 
 //
 // examples/recursive.js
@@ -495,9 +487,8 @@ var questions3 = [
 ];
 
 function ask() {
-    inquirer.prompt<{ tvShow: string; askAgain: boolean }>(questions3, function(
-        answers
-    ) {
+    inquirer.prompt<{ tvShow: string; askAgain: boolean }>(questions3)
+    .then((answers) => {
         output2.push(answers.tvShow);
         if (answers.askAgain) {
             ask();
@@ -560,7 +551,7 @@ function likesFood(aFood: string) {
     };
 }
 
-inquirer.prompt<Answers4>(questions, function(answers) {
+inquirer.prompt<Answers4>(questions).then(answers => {
     console.log(JSON.stringify(answers, null, "  "));
 });
 
@@ -579,11 +570,10 @@ inquirer.prompt(
             message: 'What do you want to do?',
             choices: immutableChoices
         }
-    ],
-    function(answers: inquirer.Answers) {
-        console.log(JSON.stringify(answers, null, '  '));
-    }
-);
+    ]
+).then((answers: inquirer.Answers) => {
+    console.log(JSON.stringify(answers, null, '  '));
+});
 
 //
 // Other tests not covered in the examples provided with inquirer
@@ -667,9 +657,10 @@ var questions = [
     }
 ];
 
-inquirer.createPromptModule({ output: process.stderr })(questions, function(answers) {
-    console.log(JSON.stringify(answers, null, "  "));
-});
+inquirer.createPromptModule({ output: process.stderr })(questions)
+    .then(answers => {
+            console.log(JSON.stringify(answers, null, "  "));
+        });
 
 // Work with JS inquirer but rejected by typing.
 inquirer.prompt([
diff --git a/types/inquirer/package.json b/types/inquirer/package.json
new file mode 100644
index 0000000000..021b40d754
--- /dev/null
+++ b/types/inquirer/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rxjs": ">=6.4.0"
+    }
+}
diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index fe39171825..0332eab033 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -7,6 +7,7 @@
 //                 Arthur Corenzan <https://github.com/haggen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
+/// <reference types="rx" />
 
 import { EventEmitter } from 'events';
 import * as inquirer from 'inquirer';

From 545ee9c7869a6be3481ab3d92ad097c1bbfaa606 Mon Sep 17 00:00:00 2001
From: AntoineDoubovetzky <antoined@bam.tech>
Date: Sun, 17 Mar 2019 12:03:35 +0100
Subject: [PATCH 726/924] create react-scrollable-anchor package

---
 types/react-scrollable-anchor/index.d.ts      | 26 ++++++++++
 .../react-scrollable-anchor-tests.tsx         | 47 +++++++++++++++++++
 types/react-scrollable-anchor/tsconfig.json   | 24 ++++++++++
 types/react-scrollable-anchor/tslint.json     |  1 +
 4 files changed, 98 insertions(+)
 create mode 100644 types/react-scrollable-anchor/index.d.ts
 create mode 100644 types/react-scrollable-anchor/react-scrollable-anchor-tests.tsx
 create mode 100644 types/react-scrollable-anchor/tsconfig.json
 create mode 100644 types/react-scrollable-anchor/tslint.json

diff --git a/types/react-scrollable-anchor/index.d.ts b/types/react-scrollable-anchor/index.d.ts
new file mode 100644
index 0000000000..9459918b15
--- /dev/null
+++ b/types/react-scrollable-anchor/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for react-scrollable-anchor 0.6
+// Project: https://github.com/gabergg/react-scrollable-anchor
+// Definitions by: Antoine DOUBOVETZKY <https://github.com/AntoineDoubovetzky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface ScrollableAnchorProps {
+  id: string;
+  children?: React.ReactNode;
+}
+
+declare const ScrollableAnchor: React.ComponentType<ScrollableAnchorProps>;
+
+export interface ConfigureAnchorsOptions {
+  offset?: number;
+  scrollDuration?: number;
+  keepLastAnchorHash?: boolean;
+}
+
+export default ScrollableAnchor;
+export function goToTop(): void;
+export function configureAnchors(options: ConfigureAnchorsOptions): void;
+export function goToAnchor(anchorId: string, saveHashUpdate?: boolean): void;
+export function removeHash(): void;
diff --git a/types/react-scrollable-anchor/react-scrollable-anchor-tests.tsx b/types/react-scrollable-anchor/react-scrollable-anchor-tests.tsx
new file mode 100644
index 0000000000..984a01f741
--- /dev/null
+++ b/types/react-scrollable-anchor/react-scrollable-anchor-tests.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import ScrollableAnchor, { goToAnchor, goToTop, removeHash, configureAnchors } from "react-scrollable-anchor";
+
+/*
+ * goToAnchor
+ */
+// $ExpectType void
+goToAnchor("one");
+// $ExpectError
+goToAnchor(1);
+
+/*
+ * goToTop
+ */
+// $ExpectType void
+goToTop();
+// $ExpectError
+goToTop(1);
+
+/*
+ * removeHash
+ */
+// $ExpectType void
+removeHash();
+// $ExpectError
+removeHash(1);
+
+/*
+ * configureAnchors
+ */
+// $ExpectType void
+configureAnchors({ offset: 500, scrollDuration: 1000, keepLastAnchorHash: true });
+// $ExpectError
+configureAnchors();
+// $ExpectError
+configureAnchors({ wrongKey: 1 });
+// $ExpectError
+configureAnchors({ offset: 'string' });
+// $ExpectError
+configureAnchors({ scrollDuration: 'string' });
+// $ExpectError
+configureAnchors({ keepLastAnchorHash: 3 });
+
+// $ExpectError
+<ScrollableAnchor><div>Test</div></ScrollableAnchor>;
+
+<ScrollableAnchor id="anchorId"><div>Test</div></ScrollableAnchor>;
diff --git a/types/react-scrollable-anchor/tsconfig.json b/types/react-scrollable-anchor/tsconfig.json
new file mode 100644
index 0000000000..198bad7412
--- /dev/null
+++ b/types/react-scrollable-anchor/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "strictFunctionTypes": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-scrollable-anchor-tests.tsx"
+    ]
+}
diff --git a/types/react-scrollable-anchor/tslint.json b/types/react-scrollable-anchor/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-scrollable-anchor/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 32225d8a5b6df4e20c0cea76df4c51209ce206b4 Mon Sep 17 00:00:00 2001
From: Chnapy <richardhaddad@hotmail.fr>
Date: Sun, 17 Mar 2019 13:10:17 +0100
Subject: [PATCH 727/924] fix export
 (https://github.com/DefinitelyTyped/DefinitelyTyped/pull/33748#pullrequestreview-212725106)

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

diff --git a/types/vara/index.d.ts b/types/vara/index.d.ts
index da9b7a873c..3ffe9c1590 100644
--- a/types/vara/index.d.ts
+++ b/types/vara/index.d.ts
@@ -12,7 +12,7 @@
  * however they will not override the options set above.
  * They will work as secondary options.
  */
-export interface TextProperties {
+interface TextProperties {
     /**
      * Size of the text
      */
@@ -47,7 +47,7 @@ export interface TextProperties {
     letterSpacing?: number;
 }
 
-export interface TextStep extends TextProperties {
+interface TextStep extends TextProperties {
     /**
      * Text to be shown
      */
@@ -79,7 +79,7 @@ export interface TextStep extends TextProperties {
     delay?: number;
 }
 
-export interface TextElements {
+interface TextElements {
     /**
      * Array of svg g elements, each representing a letter
      */
@@ -91,9 +91,11 @@ export interface TextElements {
     container: SVGGElement;
 }
 
-export default class Vara {
-    constructor(queryDom: string, fontJSONSource: string,
-        textStep: TextStep[], textGlobals?: TextProperties);
+declare class VaraType {
+    constructor(queryDom: string,
+        fontJSONSource: string,
+        textStep: TextStep[],
+        textGlobals?: TextProperties);
 
     /**
      * Is used to execute a function when the font is loaded and the elements are created.
@@ -153,3 +155,8 @@ export default class Vara {
 
     setPosition(element: SVGGElement, obj: { x?: number; y?: number }, relative?: { x: boolean; y: boolean; }): void;
 }
+
+declare const Vara: typeof VaraType;
+
+export = Vara;
+export as namespace Vara;
diff --git a/types/vara/vara-tests.ts b/types/vara/vara-tests.ts
index 4c76973292..b7f35dc341 100644
--- a/types/vara/vara-tests.ts
+++ b/types/vara/vara-tests.ts
@@ -1,4 +1,5 @@
-import Vara from 'vara';
+import Vara = require('vara');
+import * as Vara2 from 'vara';
 
 const vara = new Vara('#root', 'font.json', [
     {
@@ -35,8 +36,10 @@ const vara = new Vara('#root', 'font.json', [
     }
 );
 
+const vara2 = new Vara2('#root', 'font.json', []);
+
 // $ExpectType void
-vara.ready(() => {});
+vara.ready(() => { });
 
 // $ExpectType false | TextElements
 vara.get(0);
@@ -47,7 +50,7 @@ vara.draw(0);
 vara.draw(0, 1000);
 
 // $ExpectType void
-vara.animationEnd((id, group) => {});
+vara.animationEnd((id, group) => { });
 
 // $ExpectType void
 vara.playAll();

From f7b7ec584b8a0d4a861c562cba859e46944eaa2a Mon Sep 17 00:00:00 2001
From: Jeroen Claassens <support@fanva.xyz>
Date: Sun, 17 Mar 2019 13:44:23 +0100
Subject: [PATCH 728/924] Remove leven

---
 notNeededPackages.json     |  6 ++++++
 types/leven/index.d.ts     |  8 --------
 types/leven/leven-tests.ts |  7 -------
 types/leven/tsconfig.json  | 23 -----------------------
 types/leven/tslint.json    |  1 -
 5 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 types/leven/index.d.ts
 delete mode 100644 types/leven/leven-tests.ts
 delete mode 100644 types/leven/tsconfig.json
 delete mode 100644 types/leven/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 812d1f9f1b..2df1cad4ad 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1068,6 +1068,12 @@
             "sourceRepoURL": "https://github.com/stevemao/left-pad",
             "asOfVersion": "1.2.0"
         },
+        {
+            "libraryName": "leven",
+            "typingsPackageName": "leven",
+            "sourceRepoURL": "https://github.com/sindresorhus/leven",
+            "asOfVersion": "3.0.0"
+        },
         {
             "libraryName": "Linq.JS",
             "typingsPackageName": "linq",
diff --git a/types/leven/index.d.ts b/types/leven/index.d.ts
deleted file mode 100644
index bd7e0ba4aa..0000000000
--- a/types/leven/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Type definitions for leven 2.1
-// Project: https://github.com/sindresorhus/leven
-// Definitions by: Jan Alonzo <https://github.com/jmalonzo>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare function leven(a: string, b: string): number;
-
-export = leven;
diff --git a/types/leven/leven-tests.ts b/types/leven/leven-tests.ts
deleted file mode 100644
index 4ca0406529..0000000000
--- a/types/leven/leven-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import leven = require('leven');
-
-leven('baz', 'bar');
-// => "1"
-
-leven('foo', 'bar');
-// => "3"
diff --git a/types/leven/tsconfig.json b/types/leven/tsconfig.json
deleted file mode 100644
index 14d505d892..0000000000
--- a/types/leven/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "leven-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/leven/tslint.json b/types/leven/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/leven/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 7dd9133ef8d53e860b48ddfb11f1d1b7dcf554f1 Mon Sep 17 00:00:00 2001
From: bonan <bonan@g33k.se>
Date: Sun, 17 Mar 2019 14:33:57 +0100
Subject: [PATCH 729/924] Add definitions for Kamailio KEMI Framework

---
 types/kamailio-kemi/index.d.ts             | 1294 ++++++++++++++++++++
 types/kamailio-kemi/kamailio-kemi-tests.ts |   33 +
 types/kamailio-kemi/tsconfig.json          |   23 +
 types/kamailio-kemi/tslint.json            |    1 +
 4 files changed, 1351 insertions(+)
 create mode 100644 types/kamailio-kemi/index.d.ts
 create mode 100644 types/kamailio-kemi/kamailio-kemi-tests.ts
 create mode 100644 types/kamailio-kemi/tsconfig.json
 create mode 100644 types/kamailio-kemi/tslint.json

diff --git a/types/kamailio-kemi/index.d.ts b/types/kamailio-kemi/index.d.ts
new file mode 100644
index 0000000000..5203ba50f4
--- /dev/null
+++ b/types/kamailio-kemi/index.d.ts
@@ -0,0 +1,1294 @@
+// Type definitions for non-npm package kamailio-kemi 5.3
+// Project: https://github.com/kamailio/kamailio/
+// Definitions by: bonan <https://github.com/bonan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// Types and comments extracted from:
+// https://kamailio.org/docs/tutorials/5.3.x/kamailio-kemi-framework/
+
+export as namespace KSR;
+export {};
+
+// Allowed flags
+type Flag = 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31;
+
+// Write a log message to DEBUG level
+export function dbg(logStr: string): void;
+
+// Write a log message to ERROR level.
+export function err(logStr: string): void;
+
+// Write a log message to INFO level.
+export function info(logStr: string): void;
+
+// Set the internal flag to add rport parameter to local generated Via header.
+export function add_local_rport(): boolean;
+
+// Adds a tcp port alias for the current connection (if tcp). Useful if you want to send all the trafic to
+// port_alias through the same connection this request came from (it could help for firewall or nat traversal).
+// When the aliased connection is closed (e.g. it is idle for too much time), all the port aliases are removed.
+export function add_tcp_alias(port: number): void;
+
+// Adds the port from the message via as an alias to TCP connection. See add_tcp_alias(int port) for more details.
+export function add_tcp_alias_via(): number;
+
+// Set the flag for "rport" handling (send the reply based on source address instead of Via header).
+export function force_rport(): boolean;
+
+// Return true if the value of the parameter matches the method type of the SIP message.
+export function is_method(method: string): boolean;
+
+/*
+ * Return true if SIP method of the currently processed message is matching
+ * one of the corresponding characters given as parameter.
+ * Matching the method is done based on corresponding characters:
+ *
+ * I - INVITE
+ * A - ACK
+ * B - BYE
+ * C - CANCEL
+ * R - REGISTER
+ * M - MESSAGE
+ * O - OPTIONS
+ * S - SUBSCRIBE
+ * P - PUBLISH
+ * N - NOTIFY
+ * U - UPDATE
+ * K - KDMQ
+ * G - GET
+ * T - POST
+ * V - PUT
+ * D - DELETE
+ */
+export function is_method_in(method: string): boolean;
+
+// Helpers for common methods
+export function is_INVITE(): boolean;
+export function is_ACK(): boolean;
+export function is_BYE(): boolean;
+export function is_CANCEL(): boolean;
+export function is_REGISTER(): boolean;
+export function is_MESSAGE(): boolean;
+export function is_SUBSCRIBE(): boolean;
+export function is_PUBLISH(): boolean;
+export function is_NOTIFY(): boolean;
+export function is_OPTIONS(): boolean;
+export function is_INFO(): boolean;
+export function is_UPDATE(): boolean;
+export function is_PRACK(): boolean;
+
+// Return true of the URI address provided as parameter matches a local socket (IP) or local domain.
+export function is_myself(uri: string): boolean;
+
+// Return true if the URI in From header matches a local socket (IP) or local domain.
+export function is_myself_furi(): boolean;
+
+// Return true if the R-URI matches a local socket (IP) or local domain.
+export function is_myself_ruri(): boolean;
+
+// Return true if the URI in To header matches a local socket (IP) or local domain.
+export function is_myself_turi(): boolean;
+
+// Write a log message specifying the level value.
+export function log(level: "dbg"|"info"|"warn"|"crit"|"err", msg: string): void;
+
+// Set the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+export function setflag(flag: Flag): boolean;
+
+// Reset the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+export function resetflag(flag: Flag): boolean;
+
+// Return true if the message/transaction flag at the index provided by the parameter is set (the bit has value 1).
+export function isflagset(flag: Flag): boolean;
+
+// Set the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+export function setbflag(flag: Flag): boolean;
+
+// Reset the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+export function resetbflag(flag: Flag): boolean;
+
+// Return true if the branch flag at the index provided by the parameter is set (the bit has value 1).
+export function isbflagset(flag: Flag): boolean;
+
+// Set the flag at the index provided by the first parameter to the branch number specified by the second parameter.
+// The flag parameter has to be a number from 0 to 31.
+// The branch parameter should be between 0 and 12 (a matter of max_branches global parameter).
+export function setbiflag(flag: Flag, branch: number): boolean;
+
+// Reset a branch flag by position and branch index.
+export function resetbiflag(flag: Flag, branch: number): boolean;
+
+// Test if a branch flag is set by position and branch index.
+export function isbiflagset(flag: Flag, branch: number): boolean;
+
+// Set a script flag
+export function setsflag(flag: Flag): boolean;
+
+// Reset a script flag
+export function resetsflag(flag: Flag): boolean;
+
+// Test if a script flag is set
+export function issflagset(flag: Flag): boolean;
+
+// Set request URI
+export function seturi(uri: string): boolean;
+
+// Set request user
+export function setuser(usr: string): boolean;
+
+// Set request host
+export function sethost(host: string): boolean;
+
+// Set destination URI
+export function setdsturi(uri: string): boolean;
+
+// Reset the destination URI (aka: outbound proxy address, dst_uri, $du).
+export function resetdsturi(): boolean;
+
+// Test if destination URI is set.
+export function isdsturiset(): boolean;
+
+// Set the DROP flag, so at the end of KEMI script execution, the SIP request branch or the SIP response is not forwarded.
+export function set_drop(): void;
+export function set_advertised_address(addr: string): number;
+export function set_advertised_port(port: string): number;
+export function set_forward_close(): boolean;
+export function set_forward_no_connect(): boolean;
+export function set_reply_close(): boolean;
+export function set_reply_no_connect(): boolean;
+
+// Forward the SIP request in stateless mode to the address set in destination URI ($du), or,
+// if this is not set, to the address in request URI ($ru).
+export function forward(): number;
+
+// Forward the SIP request in stateless mode to the address provided in the SIP URI parameter.
+export function forward_uri(uri: string): number;
+
+// Special declaration of debugger and enum to avoid using reserved words
+declare namespace _debugger {
+    function dbg_pv_dump(): number;
+    function dbg_pv_dump_ex(mask: number, level: number): number;
+}
+
+declare namespace _enum {
+    function enum_i_query_suffix(vsuffix: string): number;
+    function enum_pv_query(ve164: string): number;
+    function enum_pv_query_suffix(ve164: string, vsuffix: string): number;
+    function enum_pv_query_suffix_service(ve164: string, vsuffix: string, vservice: string): number;
+    function enum_query(): number;
+    function enum_query_suffix(vsuffix: string): number;
+    function enum_query_suffix_service(vsuffix: string, vservice: string): number;
+    function i_enum_query(): number;
+    function i_enum_query_suffix_service(vsuffix: string, vservice: string): number;
+    function is_from_user_enum(): number;
+    function is_from_user_enum_suffix(vsuffix: string): number;
+    function is_from_user_enum_suffix_service(vsuffix: string, vservice: string): number;
+}
+
+// noinspection ReservedWordAsName
+export {
+    _debugger as debugger,
+    _enum as enum
+};
+
+export namespace pv {
+    // Return the value of pseudo-variable `pvname`.
+    // The returned value can be string or integer
+    function get(pvname: string): string|number|null;
+
+    // Same as get(), but returns empty string on null
+    function gete(pvname: string): string|number;
+
+    // Same as get(), but returns `vn` on null
+    function getvn(pvname: string, vn: number): string|number;
+
+    // Return the value of pseudo-variable pvname if it is different than $null or
+    // the parameter vs if the variable is having the $null value.
+    function getvs(pvname: string, vn: number): string|number;
+
+    // Return the value of pseudo-variable pvname if it is different than $null or the string <<null>> if the
+    // variable is having the $null value. This should be used instead of KSR.pv.get(...) in the scripting
+    // languages that throw and error when attempting to print a NULL (or NIL) value.
+    function getw(pvname: string): string|number;
+
+    // Set the value of pseudo-variable pvname to integer value provided by parameter val.
+    function seti(pvname: string, val: number): void;
+
+    // Set the value of pseudo-variable pvname to string value provided by parameter val.
+    function sets(pvname: string, val: string): void;
+
+    // Set the value of pseudo-variable pvname to $null.
+    function unset(pvname: string): void;
+
+    // Return true if pseudo-variable pvname is $null.
+    function is_null(pvname: string): boolean;
+}
+
+export namespace hdr {
+    // Append header to current SIP message (request or reply). It will be added after the last header.
+    function append(hdr: string): number;
+
+    // Append header to current SIP message (request or reply).
+    // It will be added after the first header matching the name hdrName.
+    function append_after(hdr: string, hdrName: string): number;
+
+    // Insert header to current SIP message (request or reply).
+    // It will be added before the first header.
+    function insert(hdr: string): number;
+
+    // Insert header to current SIP message (request or reply).
+    // It will be added before the header matching the name hdrName.
+    function insert_before(hdr: string, hdrName: string): number;
+
+    // Remove all the headers with the name hdrName.
+    function remove(hdrName: string): number;
+
+    // Return greater than 0 if a header with the name hdrName exists and less than 0 if there is no such header.
+    function is_present(hdrName: string): number;
+
+    // Add a header to the SIP response to be generated by Kamailio for the current SIP request.
+    function append_to_reply(hdr: string): number;
+}
+
+export namespace x {
+    // Execute a function (specified by fname) exported by a Kamailio module. Additional parameters must be string
+    // and they are passed to the Kamailio module function.
+    function modf(name: string, ...params: string[]): number;
+
+    // Equivalent of exit from native kamailio.cfg scripting language, stop the execution of the SIP routing script.
+    function exit(): void;
+
+    // Equivalent of drop from native kamailio.cfg scripting language, stop the execution of the SIP routing script
+    // and drop routing further the SIP request branch or response.
+    function drop(): void;
+}
+
+export namespace acc {
+    // Equivalent of native kamailio.cfg function: acc_db_request("comment", "dbtable").
+    function acc_db_request(comment: string, dbtable: string): number;
+    // Equivalent of native kamailio.cfg function: acc_log_request("comment").
+    function acc_log_request(comment: string): number;
+    // Equivalent of native kamailio.cfg function: acc_request("comment", "dbtable").
+    function acc_request(comment: string, dbtable: string): number;
+}
+
+export namespace acc_radius {
+    function request(comment: string): number;
+}
+
+export namespace alias_db {
+    function lookup(stable: string): number;
+    function lookup_ex(stable: string, sflags: string): number;
+}
+
+export namespace app_jsdt {
+    function dofile(script: string): number;
+    function dostring(script: string): number;
+    function run(func: string): number;
+    function run_p1(func: string, p1: string): number;
+    function run_p2(func: string, p1: string, p2: string): number;
+    function run_p3(func: string, p1: string, p2: string, p3: string): number;
+    function runstring(script: string): number;
+}
+
+export namespace app_lua {
+    function dofile(script: string): number;
+    function dostring(script: string): number;
+    function run(func: string): number;
+    function run_p1(func: string, p1: string): number;
+    function run_p2(func: string, p1: string, p2: string): number;
+    function run_p3(func: string, p1: string, p2: string, p3: string): number;
+    function runstring(script: string): number;
+}
+
+export namespace app_python {
+    function exec(method: string): number;
+    function exec_p1(method: string, p1: string): number;
+}
+
+export namespace app_python3 {
+    function exec(method: string): number;
+    function exec_p1(method: string, p1: string): number;
+}
+
+export namespace app_ruby {
+    function run(func: string): number;
+    function run_p1(func: string, p1: string): number;
+    function run_p2(func: string, p1: string, p2: string): number;
+    function run_p3(func: string, p1: string, p2: string, p3: string): number;
+}
+
+export namespace app_sqlang {
+    function dofile(script: string): number;
+    function dostring(script: string): number;
+    function run(func: string): number;
+    function run_p1(func: string, p1: string): number;
+    function run_p2(func: string, p1: string, p2: string): number;
+    function run_p3(func: string, p1: string, p2: string, p3: string): number;
+    function runstring(script: string): number;
+}
+
+export namespace async {
+    function route(rn: string, s: number): number;
+    function task_route(rn: string): number;
+}
+
+export namespace auth {
+    function auth_challenge(realm: string, flags: number): number;
+    function consume_credentials(): number;
+    function has_credentials(srealm: string): number;
+    function pv_auth_check(srealm: string, spasswd: string, vflags: number, vchecks: number): number;
+}
+
+export namespace auth_db {
+    function auth_check(srealm: string, stable: string, iflags: number): number;
+    function is_subscriber(suri: string, stable: string, iflags: number): number;
+}
+
+export namespace auth_ephemeral {
+    function autheph_authenticate(susername: string, spassword: string): number;
+    function autheph_check(srealm: string): number;
+    function autheph_proxy(srealm: string): number;
+    function autheph_www(srealm: string): number;
+    function autheph_www_method(srealm: string, smethod: string): number;
+}
+
+export namespace auth_radius {
+    function proxy_authorize(srealm: string): number;
+    function proxy_authorize_user(srealm: string, suser: string): number;
+    function www_authorize(srealm: string): number;
+    function www_authorize_user(srealm: string, suser: string): number;
+}
+
+export namespace auth_xkeys {
+    function auth_xkeys_add(shdr: string, skey: string, salg: string, sdata: string): number;
+    function auth_xkeys_check(shdr: string, skey: string, salg: string, sdata: string): number;
+}
+
+export namespace benchmark {
+    function bm_log_timer(tname: string): number;
+    function bm_start_timer(tname: string): number;
+}
+
+export namespace blst {
+    function blst_add(t: number): number;
+    function blst_add_default(): number;
+    function blst_add_retry_after(t_min: number, t_max: number): number;
+    function blst_clear_ignore(mask: number): number;
+    function blst_clear_ignore_all(): number;
+    function blst_del(): number;
+    function blst_is_blacklisted(): number;
+    function blst_rpl_clear_ignore(mask: number): number;
+    function blst_rpl_clear_ignore_all(): number;
+    function blst_rpl_set_ignore(mask: number): number;
+    function blst_rpl_set_ignore_all(): number;
+    function blst_set_ignore(mask: number): number;
+    function blst_set_ignore_all(): number;
+}
+
+export namespace call_control {
+    function call_control(): number;
+}
+
+export namespace cfgutils {
+    function abort(): number;
+    function core_hash(s1: string, s2: string, sz: number): number;
+    function lock(lkey: string): number;
+    function pkg_status(): number;
+    function pkg_summary(): number;
+    function rand_event(): number;
+    function rand_get_prob(): number;
+    function rand_reset_prob(): number;
+    function rand_set_prob(percent_par: number): number;
+    function shm_status(): number;
+    function shm_summary(): number;
+    function trylock(lkey: string): number;
+    function unlock(lkey: string): number;
+}
+
+export namespace cnxcc {
+    function get_channel_count(sclient: string, pvname: string): number;
+    function set_max_channels(sclient: string, max_chan: number): number;
+    function set_max_credit(sclient: string, scredit: string, scps: string, initp: number, finishp: number): number;
+    function set_max_time(sclient: string, max_secs: number): number;
+    function terminate_all(sclient: string): number;
+    function update_max_time(sclient: string, secs: number): number;
+}
+
+export namespace corex {
+    function append_branch(): number;
+    function append_branch_uri(uri: string): number;
+    function append_branch_uri_q(uri: string, q: string): number;
+    function has_ruri_user(): number;
+    function has_user_agent(): number;
+    function isxflagset(fval: number): number;
+    function resetxflag(fval: number): number;
+    function send_data(uri: string, data: string): number;
+    function sendx(uri: string, sock: string, data: string): number;
+    function set_recv_socket(ssock: string): number;
+    function set_send_socket(ssock: string): number;
+    function set_source_address(saddr: string): number;
+    function setxflag(fval: number): number;
+    function via_add_srvid(fval: number): number;
+    function via_add_xavp_params(fval: number): number;
+    function via_use_xavp_fields(fval: number): number;
+}
+
+export namespace counters {
+    function add(sname: string, v: number): number;
+    function inc(sname: string): number;
+    function reset(sname: string): number;
+}
+
+export namespace crypto {
+    function aes_decrypt(ins: string, keys: string, dpv: string): number;
+    function aes_encrypt(ins: string, keys: string, dpv: string): number;
+}
+
+export namespace dialog {
+    function dlg_bye(side: string): number;
+    function dlg_db_load_callid(callid: string): number;
+    function dlg_db_load_extra(): number;
+    function dlg_get(sc: string, sf: string, st: string): number;
+    function dlg_isflagset(val: number): number;
+    function dlg_manage(): number;
+    function dlg_resetflag(val: number): number;
+    function dlg_set_property(pval: string): number;
+    function dlg_set_timeout(to: number): number;
+    function dlg_set_timeout_id(to: number, he: number, hi: number): number;
+    function dlg_setflag(val: number): number;
+    function get_profile_size(sprofile: string, svalue: string, spv: string): number;
+    function get_profile_size_static(sprofile: string, spv: string): number;
+    function is_in_profile(sprofile: string, svalue: string): number;
+    function is_in_profile_static(sprofile: string): number;
+    function is_known_dlg(): number;
+    function set_dlg_profile(sprofile: string, svalue: string): number;
+    function set_dlg_profile_static(sprofile: string): number;
+    function unset_dlg_profile(sprofile: string, svalue: string): number;
+    function unset_dlg_profile_static(sprofile: string): number;
+}
+
+export namespace dialplan {
+    function dp_match(dpid: number, src: string): number;
+    function dp_replace(dpid: number, src: string, dst: string): number;
+}
+
+export namespace dispatcher {
+    function ds_is_from_list(group: number): number;
+    function ds_is_from_list_mode(vset: number, vmode: number): number;
+    function ds_is_from_list_uri(vset: number, vmode: number, vuri: string): number;
+    function ds_is_from_lists(): number;
+    function ds_list_exists(set: number): number;
+    function ds_load_unset(): number;
+    function ds_load_update(): number;
+    function ds_mark_dst(): number;
+    function ds_mark_dst_state(sval: string): number;
+    function ds_next_domain(): number;
+    function ds_next_dst(): number;
+    function ds_reload(): number;
+    function ds_select(set: number, alg: number): number;
+    function ds_select_domain(set: number, alg: number): number;
+    function ds_select_domain_limit(set: number, alg: number, limit: number): number;
+    function ds_select_dst(set: number, alg: number): number;
+    function ds_select_dst_limit(set: number, alg: number, limit: number): number;
+    function ds_select_limit(set: number, alg: number, limit: number): number;
+    function ds_select_routes(srules: string, smode: string): number;
+    function ds_select_routes_limit(srules: string, smode: string, rlimit: number): number;
+    function ds_set_domain(): number;
+    function ds_set_dst(): number;
+}
+
+export namespace diversion {
+    function add_diversion(reason: string): number;
+    function add_diversion_uri(reason: string, uri: string): number;
+}
+
+export namespace dmq {
+    function bcast_message(peer_str: string, body_str: string, ct_str: string): number;
+    function handle_message(): number;
+    function handle_message_rc(returnval: number): number;
+    function is_from_node(): number;
+    function send_message(peer_str: string, to_str: string, body_str: string, ct_str: string): number;
+    function t_replicate(): number;
+    function t_replicate_mode(mode: number): number;
+}
+
+export namespace domain {
+    function is_domain_local(sdomain: string): number;
+    function is_from_local(): number;
+    function is_uri_host_local(): number;
+    function lookup_domain(_sdomain: string): number;
+    function lookup_domain_prefix(_sdomain: string, _sprefix: string): number;
+}
+
+export namespace drouting {
+    function do_routing(grp_id: number): number;
+    function do_routing_furi(): number;
+    function goes_to_gw(): number;
+    function goes_to_gw_type(type: number): number;
+    function is_from_gw(): number;
+    function is_from_gw_type(type: number): number;
+    function is_from_gw_type_flags(type: number, flags: number): number;
+    function next_routing(): number;
+    function use_next_gw(): number;
+}
+
+export namespace evapi {
+    function async_relay(sdata: string): number;
+    function close(): number;
+    function relay(sdata: string): number;
+    function relay_multicast(sdata: string, stag: string): number;
+    function relay_unicast(sdata: string, stag: string): number;
+    function set_tag(stag: string): number;
+}
+
+export namespace exec {
+    function exec_avp(cmd: string): number;
+    function exec_dset(cmd: string): number;
+    function exec_msg(cmd: string): number;
+}
+
+export namespace geoip {
+    function match(tomatch: string, pvclass: string): number;
+}
+
+export namespace geoip2 {
+    function match(tomatch: string, pvclass: string): number;
+}
+
+export namespace group {
+    function is_user_in(uri: string, grp: string): number;
+}
+
+export namespace htable {
+    function sht_has_name(sname: string, sop: string, sval: string): number;
+    function sht_has_str_value(sname: string, sop: string, sval: string): number;
+    function sht_iterator_end(iname: string): number;
+    function sht_iterator_next(iname: string): number;
+    function sht_iterator_start(iname: string, hname: string): number;
+    function sht_lock(htname: string, skey: string): number;
+    function sht_reset(hname: string): number;
+    function sht_rm(hname: string, iname: string): number;
+    function sht_rm_name(sname: string, sop: string, sval: string): number;
+    function sht_rm_name_re(htname: string, rexp: string): number;
+    function sht_rm_value(sname: string, sop: string, sval: string): number;
+    function sht_rm_value_re(htname: string, rexp: string): number;
+    function sht_setex(htname: string, itname: string, itval: number): number;
+    function sht_seti(htname: string, itname: string, itval: number): number;
+    function sht_sets(htname: string, itname: string, itval: string): number;
+    function sht_setxi(htname: string, itname: string, itval: number, exval: number): number;
+    function sht_setxs(htname: string, itname: string, itval: string, exval: number): number;
+    function sht_unlock(htname: string, skey: string): number;
+}
+
+export namespace http_async_client {
+    function query(sdata: string, rn: string): number;
+}
+
+export namespace http_client {
+    function curl_connect(con: string, url: string, dpv: string): number;
+    function curl_connect_post(con: string, url: string, ctype: string, data: string, dpv: string): number;
+    function query(url: string, dpv: string): number;
+    function query_post(url: string, post: string, dpv: string): number;
+    function query_post_hdrs(url: string, post: string, hdrs: string, dpv: string): number;
+}
+
+export namespace imc {
+    function imc_manager(): number;
+}
+
+export namespace ipops {
+    function compare_ips(_sval1: string, _sval2: string): number;
+    function compare_pure_ips(_sval1: string, _sval2: string): number;
+    function detailed_ip_type(_sval: string, _dpv: string): number;
+    function detailed_ipv4_type(_sval: string, _dpv: string): number;
+    function detailed_ipv6_type(_sval: string, _dpv: string): number;
+    function dns_int_match_ip(vhn: string, vip: string): number;
+    function dns_query(naptrname: string, pvid: string): number;
+    function dns_sys_match_ip(vhn: string, vip: string): number;
+    function ip_is_in_subnet(_sval1: string, _sval2: string): number;
+    function ip_type(sval: string): number;
+    function is_in_subnet(_sval1: string, _sval2: string): number;
+    function is_ip(sval: string): number;
+    function is_ip4(sval: string): number;
+    function is_ip6(sval: string): number;
+    function is_ip6_reference(sval: string): number;
+    function is_ip_rfc1918(sval: string): number;
+    function is_pure_ip(sval: string): number;
+    function naptr_query(naptrname: string, pvid: string): number;
+    function srv_query(naptrname: string, pvid: string): number;
+}
+
+export namespace jansson {
+    function get(spath: string, sdoc: string, spv: string): number;
+}
+
+export namespace jsonrpcs {
+    function exec(scmd: string): number;
+}
+
+export namespace keepalive {
+    function is_alive(dest: string): number;
+}
+
+export namespace kex {
+    function resetdebug(): number;
+    function setdebug(lval: number): number;
+}
+
+export namespace lcr {
+    function defunct_gw(defunct_period: number): number;
+    function from_any_gw(): number;
+    function from_any_gw_addr(addr_str: string, transport: number): number;
+    function from_gw(lcr_id: number): number;
+    function from_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
+    function inactivate_gw(): number;
+    function load_gws(lcr_id: number): number;
+    function load_gws_furi(lcr_id: number, ruri_user: string, from_uri: string): number;
+    function load_gws_ruser(lcr_id: number, ruri_user: string): number;
+    function next_gw(): number;
+    function to_any_gw(): number;
+    function to_any_gw_addr(addr_str: string, transport: number): number;
+    function to_gw(lcr_id: number): number;
+    function to_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
+}
+
+export namespace log_custom {
+    function log_udp(txt: string): number;
+}
+
+export namespace log_systemd {
+    function sd_journal_print(slev: string, stxt: string): number;
+    function sd_journal_send_xvap(xname: string): number;
+}
+
+export namespace maxfwd {
+    function is_maxfwd_lt(limit: number): number;
+    function process_maxfwd(limit: number): number;
+}
+
+export namespace mediaproxy {
+    function end_media_session(): number;
+    function engage_media_proxy(): number;
+    function use_media_proxy(): number;
+}
+
+export namespace misc_radius {
+    function does_uri_exist(): number;
+    function does_uri_exist_uval(suri: string): number;
+    function does_uri_user_exist(): number;
+    function does_uri_user_exist_uval(user: string): number;
+    function is_user_in(user: string, group: string): number;
+    function load_callee_avps(user: string): number;
+    function load_caller_avps(user: string): number;
+}
+
+export namespace mqueue {
+    function mq_add(mq: string, key: string, val: string): number;
+    function mq_fetch(mq: string): number;
+    function mq_pv_free(mq: string): number;
+    function mq_size(mq: string): number;
+}
+
+export namespace msilo {
+    function mdump(): number;
+    function mdump_uri(owner_s: string): number;
+    function mstore(): number;
+    function mstore_uri(owner_s: string): number;
+}
+
+export namespace msrp {
+    function cmap_lookup(): number;
+    function cmap_save(): number;
+    function is_reply(): number;
+    function is_request(): number;
+    function relay(): number;
+    function relay_flags(rtflags: number): number;
+    function reply(rcode: string, rtext: string, rhdrs: string): number;
+    function reply_flags(rtflags: number): number;
+    function set_dst(rtaddr: string, rfsock: string): number;
+}
+
+export namespace mtree {
+    function mt_match(tname: string, tomatch: string, mval: number): number;
+}
+
+export namespace nat_traversal {
+    function client_nat_test(tests: number): number;
+    function fix_contact(): number;
+    function nat_keepalive(): number;
+}
+
+export namespace nathelper {
+    function add_contact_alias(): number;
+    function add_contact_alias_addr(ip_str: string, port_str: string, proto_str: string): number;
+    function add_rcv_param(upos: number): number;
+    function fix_nated_contact(): number;
+    function fix_nated_register(): number;
+    function fix_nated_sdp(level: number): number;
+    function fix_nated_sdp_ip(level: number, ip: string): number;
+    function handle_ruri_alias(): number;
+    function is_rfc1918(address: string): number;
+    function nat_uac_test(tests: number): number;
+    function set_contact_alias(): number;
+}
+
+export namespace ndb_mongodb {
+    function exec(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+    function exec_simple(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+    function find(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+    function find_one(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+    function free_reply(name: string): number;
+    function next_reply(name: string): number;
+}
+
+export namespace ndb_redis {
+    function redis_cmd(srv: string, rcmd: string, sres: string): number;
+    function redis_cmd_p1(srv: string, rcmd: string, p1: string, sres: string): number;
+    function redis_cmd_p2(srv: string, rcmd: string, p1: string, p2: string, sres: string): number;
+    function redis_cmd_p3(srv: string, rcmd: string, p1: string, p2: string, p3: string, sres: string): number;
+    function redis_free(name: string): number;
+}
+
+export namespace path {
+    function add_path(): number;
+    function add_path_received(): number;
+    function add_path_received_user(_user: string): number;
+    function add_path_received_user_params(_user: string, _params: string): number;
+    function add_path_user(_user: string): number;
+    function add_path_user_params(_user: string, _params: string): number;
+}
+
+export namespace pdt {
+    function pd_translate(sd: string, md: number): number;
+    function pprefix2domain(m: number, s: number): number;
+}
+
+export namespace permissions {
+    function allow_address(addr_group: number, ips: string, port: number): number;
+    function allow_address_group(_addr: string, _port: number): number;
+    function allow_source_address(addr_group: number): number;
+    function allow_source_address_group(): number;
+}
+
+export namespace phonenum {
+    function match(tomatch: string, pvclass: string): number;
+}
+
+export namespace pike {
+    function pike_check_req(): number;
+}
+
+export namespace pipelimit {
+    function pl_check(pipeid: string): number;
+    function pl_check_limit(pipeid: string, alg: string, limit: number): number;
+    function pl_drop(): number;
+    function pl_drop_range(rmin: number, rmax: number): number;
+    function pl_drop_retry(rafter: number): number;
+}
+
+export namespace prefix_route {
+    function prefix_route(ruser: string): number;
+    function prefix_route_uri(): number;
+}
+
+export namespace presence {
+    function handle_publish(): number;
+    function handle_publish_uri(sender_uri: string): number;
+    function handle_subscribe(): number;
+    function handle_subscribe_uri(wuri: string): number;
+    function pres_auth_status(watcher_uri: string, presentity_uri: string): number;
+    function pres_has_subscribers(pres_uri: string, wevent: string): number;
+    function pres_refresh_watchers(pres: string, event: string, type: number): number;
+    function pres_refresh_watchers_file(pres: string, event: string, type: number, file_uri: string, filename: string): number;
+    function pres_update_watchers(pres_uri: string, event: string): number;
+}
+
+export namespace presence_xml {
+    function pres_check_activities(pres_uri: string, activity: string): number;
+    function pres_check_basic(pres_uri: string, status: string): number;
+}
+
+export namespace pua {
+    function pua_set_publish(): number;
+    function pua_update_contact(): number;
+}
+
+export namespace pvx {
+    function evalx(dst: string, fmt: string): number;
+    function pv_var_to_xavp(varname: string, xname: string): number;
+    function pv_xavp_print(): number;
+    function pv_xavp_to_var(xname: string): number;
+    function sbranch_append(): number;
+    function sbranch_reset(): number;
+    function sbranch_set_ruri(): number;
+    function xavp_params_explode(sparams: string, sxname: string): number;
+    function xavp_params_implode(sxname: string, svname: string): number;
+}
+
+export namespace rabbitmq {
+    function publish(exchange: string, routingkey: string, contenttype: string, messagebody: string): number;
+    function publish_consume(exchange: string, routingkey: string, contenttype: string, messagebody: string, dpv: string): number;
+}
+
+export namespace regex {
+    function pcre_match(string: string, regex: string): number;
+    function pcre_match_group(string: string, num_pcre: number): number;
+}
+
+export namespace registrar {
+    function add_sock_hdr(hdr_name: string): number;
+    function lookup(table: string): number;
+    function lookup_branches(_dtable: string): number;
+    function lookup_to_dset(table: string, uri: string): number;
+    function lookup_uri(table: string, uri: string): number;
+    function reg_fetch_contacts(dtable: string, uri: string, profile: string): number;
+    function reg_free_contacts(profile: string): number;
+    function registered(table: string): number;
+    function registered_action(_dtable: string, _uri: string, _f: number, _aflags: number): number;
+    function registered_flags(_dtable: string, _uri: string, _f: number): number;
+    function registered_uri(_dtable: string, _uri: string): number;
+    function save(table: string, flags: number): number;
+    function save_uri(table: string, flags: number, uri: string): number;
+    function set_q_override(new_q: string): number;
+    function unregister(_dtable: string, _uri: string): number;
+    function unregister_ruid(_dtable: string, _uri: string, _ruid: string): number;
+}
+
+export namespace rls {
+    function handle_notify(): number;
+    function handle_subscribe(): number;
+    function handle_subscribe_uri(wuri: string): number;
+    function update_subs(uri: string, event: string): number;
+}
+
+export namespace rr {
+    function add_rr_param(sparam: string): number;
+    function check_route_param(sre: string): number;
+    function is_direction(dir: string): number;
+    function loose_route(): number;
+    function record_route(): number;
+    function record_route_params(params: string): number;
+    function remove_record_route(): number;
+}
+
+export namespace rtjson {
+    function init_routes(rdoc: string): number;
+    function next_route(): number;
+    function push_routes(): number;
+    function update_branch(): number;
+}
+
+export namespace rtpengine {
+    function rtpengine_answer(flags: string): number;
+    function rtpengine_answer0(): number;
+    function rtpengine_delete(flags: string): number;
+    function rtpengine_delete0(): number;
+    function rtpengine_manage(flags: string): number;
+    function rtpengine_manage0(): number;
+    function rtpengine_offer(flags: string): number;
+    function rtpengine_offer0(): number;
+    function set_rtpengine_set(r1: number): number;
+    // This function is the sibling function to set_rtpengine_set().
+    // The original module function is declared as set_rtpengine_set(setid[, setid2]).
+    // In KEMI set_rtpengine_set() takes only the first parameter and set_rtpengine_set2() allows for the second optional parameter to be passed.
+    // Please review the documentation for set_rtpengine_set() for more information.
+    function set_rtpengine_set2(r1: number, r2: number): number;
+    function start_recording(): number;
+    function stop_recording(): number;
+}
+
+export namespace rtpproxy {
+    function rtpproxy_answer(flags: string): number;
+    function rtpproxy_answer0(): number;
+    function rtpproxy_answer_ip(flags: string, mip: string): number;
+    function rtpproxy_destroy(flags: string): number;
+    function rtpproxy_destroy0(): number;
+    function rtpproxy_manage(flags: string): number;
+    function rtpproxy_manage0(): number;
+    function rtpproxy_manage_ip(flags: string, mip: string): number;
+    function rtpproxy_offer(flags: string): number;
+    function rtpproxy_offer0(): number;
+    function rtpproxy_offer_ip(flags: string, mip: string): number;
+    function rtpproxy_stop_stream2uac(): number;
+    function rtpproxy_stop_stream2uas(): number;
+    function rtpproxy_stream2uac(pname: string, count: number): number;
+    function rtpproxy_stream2uas(pname: string, count: number): number;
+    function set_rtpproxy_set(rset: number): number;
+    function start_recording(): number;
+}
+
+export namespace sanity {
+    function sanity_check(mflags: number, uflags: number): number;
+    function sanity_check_defaults(): number;
+    function sanity_reply(): number;
+}
+
+export namespace sca {
+    function call_info_update(update_mask: number, uri_to: string, uri_from: string): number;
+    function call_info_update_default(): number;
+    function call_info_update_mask(umask: number): number;
+    function call_info_update_turi(umask: number, sto: string): number;
+    function handle_subscribe(): number;
+}
+
+export namespace sdpops {
+    function keep_codecs_by_id(codecs: string, media: string): number;
+    function keep_codecs_by_name(codecs: string, media: string): number;
+    function remove_codecs_by_id(codecs: string, media: string): number;
+    function remove_codecs_by_name(codecs: string, media: string): number;
+    function remove_line_by_prefix(prefix: string, media: string): number;
+    function remove_media(media: string): number;
+    function sdp_content(): number;
+    function sdp_content_flags(flags: number): number;
+    function sdp_get(avp: string): number;
+    function sdp_get_line_startswith(aname: string, sline: string): number;
+    function sdp_print(llevel: number): number;
+    function sdp_transport(avp: string): number;
+    function sdp_with_active_media(media: string): number;
+    function sdp_with_ice(): number;
+    function sdp_with_media(media: string): number;
+}
+
+export namespace sipcapture {
+    function float2int(_val: string, _coof: string): number;
+    function report_capture(_table: string): number;
+    function report_capture_cid(_table: string, _cid: string): number;
+    function report_capture_data(_table: string, _cid: string, _data: string): number;
+    function sip_capture(): number;
+    function sip_capture_forward(puri: string): number;
+    function sip_capture_mode(_table: string, _cmdata: string): number;
+    function sip_capture_table(_table: string): number;
+}
+
+export namespace sipdump {
+    function send(stag: string): number;
+}
+
+export namespace sipjson {
+    function sj_serialize(smode: string, pvn: string): number;
+}
+
+export namespace siptrace {
+    function hlog(message: string): number;
+    function hlog_cid(correlationid: string, message: string): number;
+    function sip_trace(): number;
+    function sip_trace_dst(duri: string): number;
+    function sip_trace_dst_cid(duri: string, cid: string): number;
+}
+
+export namespace siputils {
+    function has_totag(): number;
+    function is_alphanum(tval: string): number;
+    function is_alphanumex(tval: string, eset: string): number;
+    function is_first_hop(): number;
+    function is_numeric(tval: string): number;
+    function is_reply(): number;
+    function is_request(): number;
+    function is_tel_number(tval: string): number;
+    function is_uri(suri: string): number;
+    function is_user(suser: string): number;
+    function uri_param(sparam: string): number;
+    function uri_param_value(sparam: string, svalue: string): number;
+}
+
+export namespace sl {
+    function send_reply(code: number, reason: string): number;
+    function sl_forward_reply(code: string, reason: string): number;
+    function sl_reply_error(): number;
+    function sl_send_reply(code: number, reason: string): number;
+}
+
+export namespace speeddial {
+    function lookup(stable: string): number;
+    function lookup_owner(stable: string, sowner: string): number;
+}
+
+export namespace sqlops {
+    function sql_is_null(sres: string, i: number, j: number): number;
+    function sql_num_columns(sres: string): number;
+    function sql_num_rows(sres: string): number;
+    function sql_query(scon: string, squery: string, sres: string): number;
+    function sql_query_async(scon: string, squery: string): number;
+    function sql_result_free(sres: string): number;
+    function sql_xquery(scon: string, squery: string, xavp: string): number;
+}
+
+export namespace ss7ops {
+    function isup_to_json(proto: number): number;
+}
+
+export namespace sst {
+    function sst_check_min(flag: number): number;
+}
+
+export namespace statistics {
+    function reset_stat(sname: string): number;
+    function update_stat(sname: string, sval: number): number;
+}
+
+export namespace statsc {
+    function statsc_reset(): number;
+}
+
+export namespace statsd {
+    function statsd_decr(key: string): number;
+    function statsd_gauge(key: string, val: string): number;
+    function statsd_incr(key: string): number;
+    function statsd_set(key: string, val: string): number;
+    function statsd_start(key: string): number;
+    function statsd_stop(key: string): number;
+}
+
+export namespace tcpops {
+    function tcp_conid_alive(i_conid: number): number;
+    function tcp_conid_state(i_conid: number): number;
+    function tcp_enable_closed_event(): number;
+    function tcp_enable_closed_event_cid(i_conid: number): number;
+    function tcp_keepalive_disable(): number;
+    function tcp_keepalive_disable_cid(i_con: number): number;
+    function tcp_keepalive_enable(i_idle: number, i_cnt: number, i_intvl: number): number;
+    function tcp_keepalive_enable_cid(i_con: number, i_idle: number, i_cnt: number, i_intvl: number): number;
+    function tcp_set_connection_lifetime(i_time: number): number;
+    function tcp_set_connection_lifetime_cid(i_conid: number, i_time: number): number;
+}
+
+export namespace textops {
+    function append_body_part(txt: string, ct: string): number;
+    function append_body_part_cd(txt: string, ct: string, cd: string): number;
+    function append_body_part_hex(txt: string, ct: string): number;
+    function append_body_part_hex_cd(htxt: string, ct: string, cd: string): number;
+    function cmp_istr(s1: string, s2: string): number;
+    function cmp_str(s1: string, s2: string): number;
+    function filter_body(content_type: string): number;
+    function get_body_part(ctype: string, pvname: string): number;
+    function get_body_part_raw(ctype: string, pvname: string): number;
+    function has_body(): number;
+    function has_body_type(ctype: string): number;
+    function in_list(subject: string, list: string, vsep: string): number;
+    function in_list_prefix(subject: string, list: string, vsep: string): number;
+    function is_audio_on_hold(): number;
+    function is_present_hf(hname: string): number;
+    function is_present_hf_re(ematch: string): number;
+    function is_privacy(privacy: string): number;
+    function remove_body_part(content_type: string): number;
+    function remove_hf_exp(ematch: string, eskip: string): number;
+    function remove_hf_re(ematch: string): number;
+    function replace(sre: string, sval: string): number;
+    function replace_all(sre: string, sval: string): number;
+    function replace_body(sre: string, sval: string): number;
+    function replace_body_all(sre: string, sval: string): number;
+    function replace_body_atonce(sre: string, sval: string): number;
+    function replace_body_str(mkey: string, rval: string, rmode: string): number;
+    function replace_hdrs(sre: string, sval: string): number;
+    function replace_hdrs_str(mkey: string, rval: string, rmode: string): number;
+    function replace_str(mkey: string, rval: string, rmode: string): number;
+    function search(sre: string): number;
+    function search_append(ematch: string, val: string): number;
+    function search_append_body(ematch: string, val: string): number;
+    function search_body(sre: string): number;
+    function search_hf(hname: string, sre: string, flags: string): number;
+    function set_body(nb: string, nc: string): number;
+    function set_body_multipart(nbody: string, ctype: string, boundary: string): number;
+    function set_body_multipart_boundary(boundary: string): number;
+    function set_body_multipart_content(nbody: string, ctype: string): number;
+    function set_body_multipart_mode(): number;
+    function set_reply_body(nb: string, nc: string): number;
+    function starts_with(s1: string, s2: string): number;
+    function subst(subst: string): number;
+    function subst_body(subst: string): number;
+    function subst_hf(hname: string, subst: string, flags: string): number;
+    function subst_uri(subst: string): number;
+    function subst_user(subst: string): number;
+}
+
+export namespace textopsx {
+    function append_hf_value(hexp: string, val: string): number;
+    function assign_hf_value(hexp: string, val: string): number;
+    function assign_hf_value2(hexp: string, val: string): number;
+    function change_reply_status(code: number, reason: string): number;
+    function exclude_hf_value(hexp: string, val: string): number;
+    function fnmatch(val: string, match: string): number;
+    function fnmatch_ex(val: string, match: string, flags: string): number;
+    function hf_value_exists(hexp: string, val: string): number;
+    function include_hf_value(hexp: string, val: string): number;
+    function insert_hf_value(hexp: string, val: string): number;
+    function keep_hf(): number;
+    function keep_hf_re(sre: string): number;
+    function msg_apply_changes(): number;
+    function msg_set_buffer(obuf: string): number;
+    function remove_body(): number;
+    function remove_hf_value(hexp: string): number;
+    function remove_hf_value2(hexp: string, val: string): number;
+}
+
+export namespace tls {
+    function is_peer_verified(): number;
+}
+
+export namespace tm {
+    function t_any_replied(): number;
+    function t_any_timeout(): number;
+    function t_branch_replied(): number;
+    function t_branch_timeout(): number;
+    function t_check_status(sexp: string): number;
+    function t_check_trans(): number;
+    function t_drop_replies(mode: string): number;
+    function t_drop_replies_all(): number;
+    function t_grep_status(code: number): number;
+    function t_is_canceled(): number;
+    function t_is_expired(): number;
+    function t_is_retr_async_reply(): number;
+    function t_is_set(target: string): number;
+    function t_load_contacts(): number;
+    function t_lookup_cancel(): number;
+    function t_lookup_cancel_flags(flags: number): number;
+    function t_lookup_request(): number;
+    function t_newtran(): number;
+    function t_next_contact_flow(): number;
+    function t_next_contacts(): number;
+    function t_on_branch(rname: string): number;
+    function t_on_branch_failure(rname: string): number;
+    function t_on_failure(rname: string): number;
+    function t_on_reply(rname: string): number;
+    function t_relay(): number;
+    function t_release(): number;
+    function t_replicate(suri: string): number;
+    function t_reply(code: number, reason: string): number;
+    function t_reset_fr(): number;
+    function t_reset_max_lifetime(): number;
+    function t_reset_retr(): number;
+    function t_retransmit_reply(): number;
+    function t_save_lumps(): number;
+    function t_send_reply(code: number, reason: string): number;
+    function t_set_auto_inv_100(state: number): number;
+    function t_set_disable_6xx(state: number): number;
+    function t_set_disable_failover(state: number): number;
+    function t_set_disable_internal_reply(state: number): number;
+    function t_set_fr(fr_inv: number, fr: number): number;
+    function t_set_fr_inv(fr_inv: number): number;
+    function t_set_max_lifetime(t1: number, t2: number): number;
+    function t_set_no_e2e_cancel_reason(state: number): number;
+    function t_set_retr(t1: number, t2: number): number;
+    function t_uac_send(method: string, ruri: string, nexthop: string, ssock: string, hdrs: string, body: string): number;
+    function t_use_uac_headers(): number;
+}
+
+export namespace tmrec {
+    function is_leap_year(y: number): number;
+    function is_leap_year_now(): number;
+    function match(rv: string): number;
+    function match_timestamp(rv: string, ti: number): number;
+    function time_period_match(period: string): number;
+    function time_period_match_timestamp(period: string, ti: number): number;
+}
+
+export namespace tmx {
+    function t_cancel_branches(mode: string): number;
+    function t_cancel_callid(callid_s: string, cseq_s: string, fl: number): number;
+    function t_cancel_callid_reason(callid_s: string, cseq_s: string, fl: number, rcode: number): number;
+    function t_continue(tindex: number, tlabel: number, cbname: string): number;
+    function t_flush_flags(): number;
+    function t_flush_xflags(): number;
+    function t_is_branch_route(): number;
+    function t_is_failure_route(): number;
+    function t_is_reply_route(): number;
+    function t_is_request_route(): number;
+    function t_precheck_trans(): number;
+    function t_reply_callid(callid_s: string, cseq_s: string, code: number, status_s: string): number;
+    function t_reuse_branch(): number;
+    function t_suspend(): number;
+}
+
+export namespace tsilo {
+    function ts_append(_table: string, _ruri: string): number;
+    function ts_append_to(tindex: number, tlabel: number, _table: string): number;
+    function ts_append_to_uri(tindex: number, tlabel: number, _table: string, _uri: string): number;
+    function ts_store(): number;
+    function ts_store_uri(puri: string): number;
+}
+
+export namespace uac {
+    function uac_auth(): number;
+    function uac_reg_disable(attr: string, val: string): number;
+    function uac_reg_enable(attr: string, val: string): number;
+    function uac_reg_lookup(userid: string, sdst: string): number;
+    function uac_reg_refresh(l_uuid: string): number;
+    function uac_reg_request_to(userid: string, imode: number): number;
+    function uac_reg_status(sruuid: string): number;
+    function uac_replace_from(pdsp: string, puri: string): number;
+    function uac_replace_from_uri(puri: string): number;
+    function uac_replace_to(pdsp: string, puri: string): number;
+    function uac_replace_to_uri(puri: string): number;
+    function uac_req_send(): number;
+    function uac_restore_from(): number;
+    function uac_restore_to(): number;
+}
+
+export namespace uac_redirect {
+    function get_redirects(max_c: number, max_b: number): number;
+    function get_redirects_acc(max_c: number, max_b: number, reason: string): number;
+    function get_redirects_all(): number;
+}
+
+export namespace uri_db {
+    function check_from(): number;
+    function check_to(): number;
+    function check_uri(suri: string): number;
+    function check_uri_realm(suri: string, susername: string, srealm: string): number;
+    function does_uri_exist(): number;
+}
+
+export namespace userblacklist {
+    function check_user_blacklist(suser: string, sdomain: string): number;
+    function check_user_blacklist_number(suser: string, sdomain: string, snumber: string): number;
+    function check_user_blacklist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
+    function check_user_whitelist(suser: string, sdomain: string): number;
+    function check_user_whitelist_number(suser: string, sdomain: string, snumber: string): number;
+    function check_user_whitelist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
+}
+
+export namespace utils {
+    function xcap_auth_status(watcher_uri: string, presentity_uri: string): number;
+}
+
+export namespace websocket {
+    function close(): number;
+    function close_conid(status: number, reason: string, con: number): number;
+    function close_reason(status: number, reason: string): number;
+    function handle_handshake(): number;
+}
+
+export namespace xcap_server {
+    function xcaps_del(uri: string, path: string): number;
+    function xcaps_get(uri: string, path: string): number;
+    function xcaps_put(uri: string, path: string, pbody: string): number;
+}
+
+export namespace xhttp {
+    function xhttp_reply(code: number, reason: string, ctype: string, body: string): number;
+}
+
+export namespace xhttp_pi {
+    function dispatch(): number;
+}
+
+export namespace xhttp_rpc {
+    function dispatch(): number;
+}
+
+export namespace xlog {
+    function xalert(lmsg: string): number;
+    function xcrit(lmsg: string): number;
+    function xdbg(lmsg: string): number;
+    function xerr(lmsg: string): number;
+    function xinfo(lmsg: string): number;
+    function xlog(slevel: string, lmsg: string): number;
+    function xnotice(lmsg: string): number;
+    function xwarn(lmsg: string): number;
+}
+
+export namespace xmlrpc {
+    function dispatch_rpc(): number;
+    function xmlrpc_reply(rcode: number, reason: string): number;
+}
diff --git a/types/kamailio-kemi/kamailio-kemi-tests.ts b/types/kamailio-kemi/kamailio-kemi-tests.ts
new file mode 100644
index 0000000000..7eebc2cf8f
--- /dev/null
+++ b/types/kamailio-kemi/kamailio-kemi-tests.ts
@@ -0,0 +1,33 @@
+import * as KSR from "kamailio-kemi";
+
+function ksr_request_route() {
+    if (KSR.maxfwd.process_maxfwd(16) < 0) {
+        KSR.sl.send_reply(483, "Too Many Hops");
+        return;
+    }
+    const reqURI = KSR.pv.get('$ru');
+    const reqMethod = KSR.pv.get('$rm');
+
+    if (KSR.isflagset(31)) {
+        KSR.hdr.append_to_reply("Retry-After: 60");
+        KSR.sl.send_reply(503, "Service Unavailable");
+        return;
+    }
+
+    if (KSR.is_OPTIONS()) {
+        KSR.sl.send_reply(200, "OK");
+        return;
+    }
+
+    KSR.dbg(`IN ksr_request_route(): ${reqMethod} ${reqURI}`);
+
+    KSR.pv.sets('$du', "sip:127.0.0.1:5080;transport=tcp");
+
+    KSR.tm.t_on_branch("ksr_branch_route");
+    KSR.tm.t_on_reply("ksr_onreply_route");
+    KSR.tm.t_on_failure("ksr_failure_route");
+
+    if (KSR.tm.t_relay() < 0) {
+        KSR.sl.send_reply(500, "Server error");
+    }
+}
diff --git a/types/kamailio-kemi/tsconfig.json b/types/kamailio-kemi/tsconfig.json
new file mode 100644
index 0000000000..f8fc5ffaa7
--- /dev/null
+++ b/types/kamailio-kemi/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "kamailio-kemi-tests.ts"
+    ]
+}
diff --git a/types/kamailio-kemi/tslint.json b/types/kamailio-kemi/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/kamailio-kemi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b2a02eb2c6c8ce9dd8b2935d10d42e107e1cac2a Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <kocal@live.fr>
Date: Sun, 17 Mar 2019 15:19:14 +0100
Subject: [PATCH 730/924] improve(slick-slider): add type for Slick instance
 itself

---
 types/slick-carousel/index.d.ts | 276 +++++++++++++++++++++++++++++++-
 1 file changed, 275 insertions(+), 1 deletion(-)

diff --git a/types/slick-carousel/index.d.ts b/types/slick-carousel/index.d.ts
index b92b1e9930..02ab392268 100644
--- a/types/slick-carousel/index.d.ts
+++ b/types/slick-carousel/index.d.ts
@@ -1,11 +1,124 @@
 // Type definitions for stick 1.6.0
 // Project: http://kenwheeler.github.io/slick/
 // Definitions by: John Gouigouix <https://github.com/orchestra-ts/DefinitelyTyped/>
+//                 Hugo Alliaume <https://github.com/Kocal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
 
+interface JQuerySlick extends JQuerySlickInitials {
+    defaults: JQuerySlickOptions;
+    options: JQuerySlickOptions;
+    originalSettings: JQuerySlickOptions;
+    initials: JQuerySlickInitials;
+
+    /**
+     * Default: null
+     */
+    activeBreakpoint: number | null;
+
+    /**
+     * Default: null
+     */
+    animType: 'OTransform' | 'MozTransform' | 'webkitTransform' | 'msTransform' | 'transform' | false | null;
+
+    /**
+     * Default: null
+     */
+    animProp: null;
+
+    /**
+     * Default: []
+     */
+    breakpoints: number[];
+
+    /**
+     * Default: {}
+     */
+    breakpointSettings: { [breakpoint: number]: JQuerySlickOptions };
+
+    /**
+     * Default: false
+     */
+    cssTransitions: boolean;
+
+    /**
+     * Default: false
+     */
+    focussed: boolean;
+
+    /**
+     * Default: false
+     */
+    interrupted: boolean;
+
+    /**
+     * Default: 'hidden'
+     */
+    hidden: 'mozHidden' | 'webkitHidden' | 'hidden';
+
+    /**
+     * Default: true
+     */
+    paused: boolean;
+
+    /**
+     * Default: null
+     */
+    positionProp: 'top' | 'left' | null;
+
+    /**
+     * Default: null
+     */
+    respondTo: 'window' | 'slider' | 'min' | null;
+
+    /**
+     * Default: 1
+     */
+    rowCount: number;
+
+    /**
+     * Default: true
+     */
+    shouldClick: boolean;
+
+    /**
+     * Default: $(element)
+     */
+    $slider: JQuery;
+
+    /**
+     * Default: null
+     */
+    $slidesCache: JQuery | null;
+
+    /**
+     * Default: null
+     */
+    transformType: '-o-transform' | '-moz-transform' | '-webkit-transform' | '-ms-transform' | 'transition' | null;
+
+    /**
+     * Default: null
+     */
+    transitionType: 'OTransition' | 'MozTransition' | 'webkitTransition' | 'msTransition' | 'transition' | null;
+
+    /**
+     * Default: 'visibilitychange'
+     */
+    visibilityChange: 'visibilitychange' | 'mozvisibilitychange' | 'webkitvisibilitychange';
+
+    /**
+     * Default: 0
+     */
+    windowWidth: number;
+
+    /**
+     * Default: null
+     */
+    windowTimer: number | null;
+}
+
 interface JQuerySlickOptions {
 
     /**
@@ -298,9 +411,170 @@ interface JQuerySlickOptions {
      * Default: 1000
      */
     zIndex?: number;
-    
+
 }
 
+interface JQuerySlickInitials {
+    /**
+     * When there is an animation running.
+     * Default: false
+     */
+    animating: boolean;
+
+    /**
+     * When they user is dragging a slide.
+     * Default: false
+     */
+    dragging: boolean;
+
+    /**
+     * Internal `setInterval` identifier.
+     * Default: null
+     */
+    autoPlayTimer: number|null;
+
+    /**
+     * The current direction (`0` for left and down, `1` for right and up).
+     * Default: 0
+     */
+    currentDirection: number;
+
+    /**
+     * Default: null
+     */
+    currentLeft: number|null;
+
+    /**
+     * The index of the current slide.
+     * Default: 0
+     */
+    currentSlide: number;
+
+    /**
+     * The direction (`0` for left and down, `1` for right and up).
+     * Default: null
+     */
+    direction: number;
+
+    /**
+     * jQuery instance that contains the "dots".
+     * Default: null
+     */
+    $dots: JQuery | null;
+
+    /**
+     * The list's width in pixels.
+     * Default: null
+     */
+    listWidth: number|null;
+
+    /**
+     * The list's height in pixels.
+     * Default: null
+     */
+    listHeight: number|null;
+
+    /**
+     * (actually it's not used in Slick, so I don't know what it is...)
+     * Default: 0
+     */
+    loadIndex: number;
+
+    /**
+     * jQuery instance that contains the "next arrow".
+     * Default: null
+     */
+    $nextArrow: JQuery | null;
+
+    /**
+     * jQuery instance that contains the "prev arrow".
+     * Default: null
+     */
+    $prevArrow: JQuery | null;
+
+    /**
+     * When they user is scrolling a slide.
+     * Default: false
+     */
+    scrolling: boolean;
+
+    /**
+     * The number of slides.
+     * Default: null
+     */
+    slideCount: number | null;
+
+    /**
+     * The slide's width in pixels.
+     * Default: null
+     */
+    slideWidth: Number | null;
+
+    /**
+     * jQuery instance that contains the "slide track".
+     * Default: null
+     */
+    $slideTrack: JQuery | null;
+
+    /**
+     * jQuery instance that contains the "slides".
+     * Default: null
+     */
+    $slides: JQuery | null;
+
+    /**
+     * When the slider is sliding.
+     * Default: false
+     */
+    sliding: boolean;
+
+    /**
+     * Slide offset in pixels.
+     * Default: 0
+     */
+    slideOffset: number;
+
+    /**
+     * Default: null
+     */
+    swipeLeft: number | null;
+
+    /**
+     * Default: false
+     */
+    swiping: boolean;
+
+    /**
+     * jQuery instance that contains the "list".
+     * Default: null
+     */
+    $list: null;
+
+    /**
+     * Object that contains properties relative to "touch" behavior.
+     */
+    touchObject: {
+        startX?: number;
+        startY?: number;
+        curX?: number;
+        curY?: number;
+        swipeLength?: number;
+        edgeHit?: boolean;
+        minSwipe?: number;
+        fingerCount?: number;
+        verticalSwiping?: boolean;
+    };
+
+    /**
+     * Default: false
+     */
+    transformsEnabled: boolean;
+
+    /**
+     * Default: false
+     */
+    unslicked: boolean;
+}
 
 interface JQuery {
 

From 0c85c7ee5d9832b6295d4e33e30aec07275468f9 Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <kocal@live.fr>
Date: Sun, 17 Mar 2019 15:21:46 +0100
Subject: [PATCH 731/924] improve(slick-slider): use the new type as return
 type for a method

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

diff --git a/types/slick-carousel/index.d.ts b/types/slick-carousel/index.d.ts
index 02ab392268..00b16ef69c 100644
--- a/types/slick-carousel/index.d.ts
+++ b/types/slick-carousel/index.d.ts
@@ -695,6 +695,6 @@ interface JQuery {
      * Get Slick Object
      * @param methodName The name of the method
      */
-    slick(methodName: "getSlick"): Object;
+    slick(methodName: "getSlick"): JQuerySlick;
 
 }

From a055ce78a5580204cf9279f9bee77358796233ba Mon Sep 17 00:00:00 2001
From: Richard Lea <chigix@zoho.com>
Date: Sun, 17 Mar 2019 21:04:36 +0900
Subject: [PATCH 732/924] fix(yeoman): rxjs dependency and typescript version

TypeScript 2.8 is required for the dependency of rxjs 6 +, where conditional
types are in usage, which is a main difference with the ancient rx library
and this change point would make this library break without upgrade to
typescript 2.8

Signed-off-by: Richard Lea <chigix@zoho.com>
---
 types/yeoman-generator/index.d.ts   | 7 ++++---
 types/yeoman-generator/package.json | 6 ++++++
 types/yeoman-test/index.d.ts        | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 types/yeoman-generator/package.json

diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index 0332eab033..7d461e7b78 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -5,12 +5,13 @@
 //                 Ika <https://github.com/ikatyang>
 //                 Joshua Cherry <https://github.com/tasadar2>
 //                 Arthur Corenzan <https://github.com/haggen>
+//                 Richard Lea <https://github.com/chigix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-/// <reference types="rx" />
+// TypeScript Version: 2.8
 
 import { EventEmitter } from 'events';
 import * as inquirer from 'inquirer';
+import { Observable } from 'rxjs';
 
 type Callback = (err: any) => void;
 
@@ -21,7 +22,7 @@ declare namespace Generator {
          */
         store?: boolean;
     }
-    type Questions = Question | Question[] | Rx.Observable<Question>;
+    type Questions = Question | Question[] | Observable<Question>;
     type Answers = inquirer.Answers;
 
     class Storage {
diff --git a/types/yeoman-generator/package.json b/types/yeoman-generator/package.json
new file mode 100644
index 0000000000..021b40d754
--- /dev/null
+++ b/types/yeoman-generator/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rxjs": ">=6.4.0"
+    }
+}
diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index acccfba1bb..3312f748ff 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yeoman/yeoman-test, http://yeoman.io/authoring/testing.html
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { EventEmitter } from 'events';
 import Generator = require('yeoman-generator');

From fcbefdf2dfaae06f98ce403afe0b07f81481280d Mon Sep 17 00:00:00 2001
From: bonan <bonan@g33k.se>
Date: Sun, 17 Mar 2019 17:23:27 +0100
Subject: [PATCH 733/924] kamailio-kemi: Declare global const instead of using
 namespace

---
 types/kamailio-kemi/index.d.ts             | 2573 ++++++++++----------
 types/kamailio-kemi/kamailio-kemi-tests.ts |    2 -
 2 files changed, 1289 insertions(+), 1286 deletions(-)

diff --git a/types/kamailio-kemi/index.d.ts b/types/kamailio-kemi/index.d.ts
index 5203ba50f4..8afd79d533 100644
--- a/types/kamailio-kemi/index.d.ts
+++ b/types/kamailio-kemi/index.d.ts
@@ -6,1289 +6,1294 @@
 // Types and comments extracted from:
 // https://kamailio.org/docs/tutorials/5.3.x/kamailio-kemi-framework/
 
-export as namespace KSR;
 export {};
-
-// Allowed flags
-type Flag = 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31;
-
-// Write a log message to DEBUG level
-export function dbg(logStr: string): void;
-
-// Write a log message to ERROR level.
-export function err(logStr: string): void;
-
-// Write a log message to INFO level.
-export function info(logStr: string): void;
-
-// Set the internal flag to add rport parameter to local generated Via header.
-export function add_local_rport(): boolean;
-
-// Adds a tcp port alias for the current connection (if tcp). Useful if you want to send all the trafic to
-// port_alias through the same connection this request came from (it could help for firewall or nat traversal).
-// When the aliased connection is closed (e.g. it is idle for too much time), all the port aliases are removed.
-export function add_tcp_alias(port: number): void;
-
-// Adds the port from the message via as an alias to TCP connection. See add_tcp_alias(int port) for more details.
-export function add_tcp_alias_via(): number;
-
-// Set the flag for "rport" handling (send the reply based on source address instead of Via header).
-export function force_rport(): boolean;
-
-// Return true if the value of the parameter matches the method type of the SIP message.
-export function is_method(method: string): boolean;
-
-/*
- * Return true if SIP method of the currently processed message is matching
- * one of the corresponding characters given as parameter.
- * Matching the method is done based on corresponding characters:
- *
- * I - INVITE
- * A - ACK
- * B - BYE
- * C - CANCEL
- * R - REGISTER
- * M - MESSAGE
- * O - OPTIONS
- * S - SUBSCRIBE
- * P - PUBLISH
- * N - NOTIFY
- * U - UPDATE
- * K - KDMQ
- * G - GET
- * T - POST
- * V - PUT
- * D - DELETE
- */
-export function is_method_in(method: string): boolean;
-
-// Helpers for common methods
-export function is_INVITE(): boolean;
-export function is_ACK(): boolean;
-export function is_BYE(): boolean;
-export function is_CANCEL(): boolean;
-export function is_REGISTER(): boolean;
-export function is_MESSAGE(): boolean;
-export function is_SUBSCRIBE(): boolean;
-export function is_PUBLISH(): boolean;
-export function is_NOTIFY(): boolean;
-export function is_OPTIONS(): boolean;
-export function is_INFO(): boolean;
-export function is_UPDATE(): boolean;
-export function is_PRACK(): boolean;
-
-// Return true of the URI address provided as parameter matches a local socket (IP) or local domain.
-export function is_myself(uri: string): boolean;
-
-// Return true if the URI in From header matches a local socket (IP) or local domain.
-export function is_myself_furi(): boolean;
-
-// Return true if the R-URI matches a local socket (IP) or local domain.
-export function is_myself_ruri(): boolean;
-
-// Return true if the URI in To header matches a local socket (IP) or local domain.
-export function is_myself_turi(): boolean;
-
-// Write a log message specifying the level value.
-export function log(level: "dbg"|"info"|"warn"|"crit"|"err", msg: string): void;
-
-// Set the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
-export function setflag(flag: Flag): boolean;
-
-// Reset the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
-export function resetflag(flag: Flag): boolean;
-
-// Return true if the message/transaction flag at the index provided by the parameter is set (the bit has value 1).
-export function isflagset(flag: Flag): boolean;
-
-// Set the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
-export function setbflag(flag: Flag): boolean;
-
-// Reset the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
-export function resetbflag(flag: Flag): boolean;
-
-// Return true if the branch flag at the index provided by the parameter is set (the bit has value 1).
-export function isbflagset(flag: Flag): boolean;
-
-// Set the flag at the index provided by the first parameter to the branch number specified by the second parameter.
-// The flag parameter has to be a number from 0 to 31.
-// The branch parameter should be between 0 and 12 (a matter of max_branches global parameter).
-export function setbiflag(flag: Flag, branch: number): boolean;
-
-// Reset a branch flag by position and branch index.
-export function resetbiflag(flag: Flag, branch: number): boolean;
-
-// Test if a branch flag is set by position and branch index.
-export function isbiflagset(flag: Flag, branch: number): boolean;
-
-// Set a script flag
-export function setsflag(flag: Flag): boolean;
-
-// Reset a script flag
-export function resetsflag(flag: Flag): boolean;
-
-// Test if a script flag is set
-export function issflagset(flag: Flag): boolean;
-
-// Set request URI
-export function seturi(uri: string): boolean;
-
-// Set request user
-export function setuser(usr: string): boolean;
-
-// Set request host
-export function sethost(host: string): boolean;
-
-// Set destination URI
-export function setdsturi(uri: string): boolean;
-
-// Reset the destination URI (aka: outbound proxy address, dst_uri, $du).
-export function resetdsturi(): boolean;
-
-// Test if destination URI is set.
-export function isdsturiset(): boolean;
-
-// Set the DROP flag, so at the end of KEMI script execution, the SIP request branch or the SIP response is not forwarded.
-export function set_drop(): void;
-export function set_advertised_address(addr: string): number;
-export function set_advertised_port(port: string): number;
-export function set_forward_close(): boolean;
-export function set_forward_no_connect(): boolean;
-export function set_reply_close(): boolean;
-export function set_reply_no_connect(): boolean;
-
-// Forward the SIP request in stateless mode to the address set in destination URI ($du), or,
-// if this is not set, to the address in request URI ($ru).
-export function forward(): number;
-
-// Forward the SIP request in stateless mode to the address provided in the SIP URI parameter.
-export function forward_uri(uri: string): number;
-
-// Special declaration of debugger and enum to avoid using reserved words
-declare namespace _debugger {
-    function dbg_pv_dump(): number;
-    function dbg_pv_dump_ex(mask: number, level: number): number;
-}
-
-declare namespace _enum {
-    function enum_i_query_suffix(vsuffix: string): number;
-    function enum_pv_query(ve164: string): number;
-    function enum_pv_query_suffix(ve164: string, vsuffix: string): number;
-    function enum_pv_query_suffix_service(ve164: string, vsuffix: string, vservice: string): number;
-    function enum_query(): number;
-    function enum_query_suffix(vsuffix: string): number;
-    function enum_query_suffix_service(vsuffix: string, vservice: string): number;
-    function i_enum_query(): number;
-    function i_enum_query_suffix_service(vsuffix: string, vservice: string): number;
-    function is_from_user_enum(): number;
-    function is_from_user_enum_suffix(vsuffix: string): number;
-    function is_from_user_enum_suffix_service(vsuffix: string, vservice: string): number;
-}
-
-// noinspection ReservedWordAsName
-export {
-    _debugger as debugger,
-    _enum as enum
-};
-
-export namespace pv {
-    // Return the value of pseudo-variable `pvname`.
-    // The returned value can be string or integer
-    function get(pvname: string): string|number|null;
-
-    // Same as get(), but returns empty string on null
-    function gete(pvname: string): string|number;
-
-    // Same as get(), but returns `vn` on null
-    function getvn(pvname: string, vn: number): string|number;
-
-    // Return the value of pseudo-variable pvname if it is different than $null or
-    // the parameter vs if the variable is having the $null value.
-    function getvs(pvname: string, vn: number): string|number;
-
-    // Return the value of pseudo-variable pvname if it is different than $null or the string <<null>> if the
-    // variable is having the $null value. This should be used instead of KSR.pv.get(...) in the scripting
-    // languages that throw and error when attempting to print a NULL (or NIL) value.
-    function getw(pvname: string): string|number;
-
-    // Set the value of pseudo-variable pvname to integer value provided by parameter val.
-    function seti(pvname: string, val: number): void;
-
-    // Set the value of pseudo-variable pvname to string value provided by parameter val.
-    function sets(pvname: string, val: string): void;
-
-    // Set the value of pseudo-variable pvname to $null.
-    function unset(pvname: string): void;
-
-    // Return true if pseudo-variable pvname is $null.
-    function is_null(pvname: string): boolean;
-}
-
-export namespace hdr {
-    // Append header to current SIP message (request or reply). It will be added after the last header.
-    function append(hdr: string): number;
-
-    // Append header to current SIP message (request or reply).
-    // It will be added after the first header matching the name hdrName.
-    function append_after(hdr: string, hdrName: string): number;
-
-    // Insert header to current SIP message (request or reply).
-    // It will be added before the first header.
-    function insert(hdr: string): number;
-
-    // Insert header to current SIP message (request or reply).
-    // It will be added before the header matching the name hdrName.
-    function insert_before(hdr: string, hdrName: string): number;
-
-    // Remove all the headers with the name hdrName.
-    function remove(hdrName: string): number;
-
-    // Return greater than 0 if a header with the name hdrName exists and less than 0 if there is no such header.
-    function is_present(hdrName: string): number;
-
-    // Add a header to the SIP response to be generated by Kamailio for the current SIP request.
-    function append_to_reply(hdr: string): number;
-}
-
-export namespace x {
-    // Execute a function (specified by fname) exported by a Kamailio module. Additional parameters must be string
-    // and they are passed to the Kamailio module function.
-    function modf(name: string, ...params: string[]): number;
-
-    // Equivalent of exit from native kamailio.cfg scripting language, stop the execution of the SIP routing script.
-    function exit(): void;
-
-    // Equivalent of drop from native kamailio.cfg scripting language, stop the execution of the SIP routing script
-    // and drop routing further the SIP request branch or response.
-    function drop(): void;
-}
-
-export namespace acc {
-    // Equivalent of native kamailio.cfg function: acc_db_request("comment", "dbtable").
-    function acc_db_request(comment: string, dbtable: string): number;
-    // Equivalent of native kamailio.cfg function: acc_log_request("comment").
-    function acc_log_request(comment: string): number;
-    // Equivalent of native kamailio.cfg function: acc_request("comment", "dbtable").
-    function acc_request(comment: string, dbtable: string): number;
-}
-
-export namespace acc_radius {
-    function request(comment: string): number;
-}
-
-export namespace alias_db {
-    function lookup(stable: string): number;
-    function lookup_ex(stable: string, sflags: string): number;
-}
-
-export namespace app_jsdt {
-    function dofile(script: string): number;
-    function dostring(script: string): number;
-    function run(func: string): number;
-    function run_p1(func: string, p1: string): number;
-    function run_p2(func: string, p1: string, p2: string): number;
-    function run_p3(func: string, p1: string, p2: string, p3: string): number;
-    function runstring(script: string): number;
-}
-
-export namespace app_lua {
-    function dofile(script: string): number;
-    function dostring(script: string): number;
-    function run(func: string): number;
-    function run_p1(func: string, p1: string): number;
-    function run_p2(func: string, p1: string, p2: string): number;
-    function run_p3(func: string, p1: string, p2: string, p3: string): number;
-    function runstring(script: string): number;
-}
-
-export namespace app_python {
-    function exec(method: string): number;
-    function exec_p1(method: string, p1: string): number;
-}
-
-export namespace app_python3 {
-    function exec(method: string): number;
-    function exec_p1(method: string, p1: string): number;
-}
-
-export namespace app_ruby {
-    function run(func: string): number;
-    function run_p1(func: string, p1: string): number;
-    function run_p2(func: string, p1: string, p2: string): number;
-    function run_p3(func: string, p1: string, p2: string, p3: string): number;
-}
-
-export namespace app_sqlang {
-    function dofile(script: string): number;
-    function dostring(script: string): number;
-    function run(func: string): number;
-    function run_p1(func: string, p1: string): number;
-    function run_p2(func: string, p1: string, p2: string): number;
-    function run_p3(func: string, p1: string, p2: string, p3: string): number;
-    function runstring(script: string): number;
-}
-
-export namespace async {
-    function route(rn: string, s: number): number;
-    function task_route(rn: string): number;
-}
-
-export namespace auth {
-    function auth_challenge(realm: string, flags: number): number;
-    function consume_credentials(): number;
-    function has_credentials(srealm: string): number;
-    function pv_auth_check(srealm: string, spasswd: string, vflags: number, vchecks: number): number;
-}
-
-export namespace auth_db {
-    function auth_check(srealm: string, stable: string, iflags: number): number;
-    function is_subscriber(suri: string, stable: string, iflags: number): number;
-}
-
-export namespace auth_ephemeral {
-    function autheph_authenticate(susername: string, spassword: string): number;
-    function autheph_check(srealm: string): number;
-    function autheph_proxy(srealm: string): number;
-    function autheph_www(srealm: string): number;
-    function autheph_www_method(srealm: string, smethod: string): number;
-}
-
-export namespace auth_radius {
-    function proxy_authorize(srealm: string): number;
-    function proxy_authorize_user(srealm: string, suser: string): number;
-    function www_authorize(srealm: string): number;
-    function www_authorize_user(srealm: string, suser: string): number;
-}
-
-export namespace auth_xkeys {
-    function auth_xkeys_add(shdr: string, skey: string, salg: string, sdata: string): number;
-    function auth_xkeys_check(shdr: string, skey: string, salg: string, sdata: string): number;
-}
-
-export namespace benchmark {
-    function bm_log_timer(tname: string): number;
-    function bm_start_timer(tname: string): number;
-}
-
-export namespace blst {
-    function blst_add(t: number): number;
-    function blst_add_default(): number;
-    function blst_add_retry_after(t_min: number, t_max: number): number;
-    function blst_clear_ignore(mask: number): number;
-    function blst_clear_ignore_all(): number;
-    function blst_del(): number;
-    function blst_is_blacklisted(): number;
-    function blst_rpl_clear_ignore(mask: number): number;
-    function blst_rpl_clear_ignore_all(): number;
-    function blst_rpl_set_ignore(mask: number): number;
-    function blst_rpl_set_ignore_all(): number;
-    function blst_set_ignore(mask: number): number;
-    function blst_set_ignore_all(): number;
-}
-
-export namespace call_control {
-    function call_control(): number;
-}
-
-export namespace cfgutils {
-    function abort(): number;
-    function core_hash(s1: string, s2: string, sz: number): number;
-    function lock(lkey: string): number;
-    function pkg_status(): number;
-    function pkg_summary(): number;
-    function rand_event(): number;
-    function rand_get_prob(): number;
-    function rand_reset_prob(): number;
-    function rand_set_prob(percent_par: number): number;
-    function shm_status(): number;
-    function shm_summary(): number;
-    function trylock(lkey: string): number;
-    function unlock(lkey: string): number;
-}
-
-export namespace cnxcc {
-    function get_channel_count(sclient: string, pvname: string): number;
-    function set_max_channels(sclient: string, max_chan: number): number;
-    function set_max_credit(sclient: string, scredit: string, scps: string, initp: number, finishp: number): number;
-    function set_max_time(sclient: string, max_secs: number): number;
-    function terminate_all(sclient: string): number;
-    function update_max_time(sclient: string, secs: number): number;
-}
-
-export namespace corex {
-    function append_branch(): number;
-    function append_branch_uri(uri: string): number;
-    function append_branch_uri_q(uri: string, q: string): number;
-    function has_ruri_user(): number;
-    function has_user_agent(): number;
-    function isxflagset(fval: number): number;
-    function resetxflag(fval: number): number;
-    function send_data(uri: string, data: string): number;
-    function sendx(uri: string, sock: string, data: string): number;
-    function set_recv_socket(ssock: string): number;
-    function set_send_socket(ssock: string): number;
-    function set_source_address(saddr: string): number;
-    function setxflag(fval: number): number;
-    function via_add_srvid(fval: number): number;
-    function via_add_xavp_params(fval: number): number;
-    function via_use_xavp_fields(fval: number): number;
-}
-
-export namespace counters {
-    function add(sname: string, v: number): number;
-    function inc(sname: string): number;
-    function reset(sname: string): number;
-}
-
-export namespace crypto {
-    function aes_decrypt(ins: string, keys: string, dpv: string): number;
-    function aes_encrypt(ins: string, keys: string, dpv: string): number;
-}
-
-export namespace dialog {
-    function dlg_bye(side: string): number;
-    function dlg_db_load_callid(callid: string): number;
-    function dlg_db_load_extra(): number;
-    function dlg_get(sc: string, sf: string, st: string): number;
-    function dlg_isflagset(val: number): number;
-    function dlg_manage(): number;
-    function dlg_resetflag(val: number): number;
-    function dlg_set_property(pval: string): number;
-    function dlg_set_timeout(to: number): number;
-    function dlg_set_timeout_id(to: number, he: number, hi: number): number;
-    function dlg_setflag(val: number): number;
-    function get_profile_size(sprofile: string, svalue: string, spv: string): number;
-    function get_profile_size_static(sprofile: string, spv: string): number;
-    function is_in_profile(sprofile: string, svalue: string): number;
-    function is_in_profile_static(sprofile: string): number;
-    function is_known_dlg(): number;
-    function set_dlg_profile(sprofile: string, svalue: string): number;
-    function set_dlg_profile_static(sprofile: string): number;
-    function unset_dlg_profile(sprofile: string, svalue: string): number;
-    function unset_dlg_profile_static(sprofile: string): number;
-}
-
-export namespace dialplan {
-    function dp_match(dpid: number, src: string): number;
-    function dp_replace(dpid: number, src: string, dst: string): number;
-}
-
-export namespace dispatcher {
-    function ds_is_from_list(group: number): number;
-    function ds_is_from_list_mode(vset: number, vmode: number): number;
-    function ds_is_from_list_uri(vset: number, vmode: number, vuri: string): number;
-    function ds_is_from_lists(): number;
-    function ds_list_exists(set: number): number;
-    function ds_load_unset(): number;
-    function ds_load_update(): number;
-    function ds_mark_dst(): number;
-    function ds_mark_dst_state(sval: string): number;
-    function ds_next_domain(): number;
-    function ds_next_dst(): number;
-    function ds_reload(): number;
-    function ds_select(set: number, alg: number): number;
-    function ds_select_domain(set: number, alg: number): number;
-    function ds_select_domain_limit(set: number, alg: number, limit: number): number;
-    function ds_select_dst(set: number, alg: number): number;
-    function ds_select_dst_limit(set: number, alg: number, limit: number): number;
-    function ds_select_limit(set: number, alg: number, limit: number): number;
-    function ds_select_routes(srules: string, smode: string): number;
-    function ds_select_routes_limit(srules: string, smode: string, rlimit: number): number;
-    function ds_set_domain(): number;
-    function ds_set_dst(): number;
-}
-
-export namespace diversion {
-    function add_diversion(reason: string): number;
-    function add_diversion_uri(reason: string, uri: string): number;
-}
-
-export namespace dmq {
-    function bcast_message(peer_str: string, body_str: string, ct_str: string): number;
-    function handle_message(): number;
-    function handle_message_rc(returnval: number): number;
-    function is_from_node(): number;
-    function send_message(peer_str: string, to_str: string, body_str: string, ct_str: string): number;
-    function t_replicate(): number;
-    function t_replicate_mode(mode: number): number;
-}
-
-export namespace domain {
-    function is_domain_local(sdomain: string): number;
-    function is_from_local(): number;
-    function is_uri_host_local(): number;
-    function lookup_domain(_sdomain: string): number;
-    function lookup_domain_prefix(_sdomain: string, _sprefix: string): number;
-}
-
-export namespace drouting {
-    function do_routing(grp_id: number): number;
-    function do_routing_furi(): number;
-    function goes_to_gw(): number;
-    function goes_to_gw_type(type: number): number;
-    function is_from_gw(): number;
-    function is_from_gw_type(type: number): number;
-    function is_from_gw_type_flags(type: number, flags: number): number;
-    function next_routing(): number;
-    function use_next_gw(): number;
-}
-
-export namespace evapi {
-    function async_relay(sdata: string): number;
-    function close(): number;
-    function relay(sdata: string): number;
-    function relay_multicast(sdata: string, stag: string): number;
-    function relay_unicast(sdata: string, stag: string): number;
-    function set_tag(stag: string): number;
-}
-
-export namespace exec {
-    function exec_avp(cmd: string): number;
-    function exec_dset(cmd: string): number;
-    function exec_msg(cmd: string): number;
-}
-
-export namespace geoip {
-    function match(tomatch: string, pvclass: string): number;
-}
-
-export namespace geoip2 {
-    function match(tomatch: string, pvclass: string): number;
-}
-
-export namespace group {
-    function is_user_in(uri: string, grp: string): number;
-}
-
-export namespace htable {
-    function sht_has_name(sname: string, sop: string, sval: string): number;
-    function sht_has_str_value(sname: string, sop: string, sval: string): number;
-    function sht_iterator_end(iname: string): number;
-    function sht_iterator_next(iname: string): number;
-    function sht_iterator_start(iname: string, hname: string): number;
-    function sht_lock(htname: string, skey: string): number;
-    function sht_reset(hname: string): number;
-    function sht_rm(hname: string, iname: string): number;
-    function sht_rm_name(sname: string, sop: string, sval: string): number;
-    function sht_rm_name_re(htname: string, rexp: string): number;
-    function sht_rm_value(sname: string, sop: string, sval: string): number;
-    function sht_rm_value_re(htname: string, rexp: string): number;
-    function sht_setex(htname: string, itname: string, itval: number): number;
-    function sht_seti(htname: string, itname: string, itval: number): number;
-    function sht_sets(htname: string, itname: string, itval: string): number;
-    function sht_setxi(htname: string, itname: string, itval: number, exval: number): number;
-    function sht_setxs(htname: string, itname: string, itval: string, exval: number): number;
-    function sht_unlock(htname: string, skey: string): number;
-}
-
-export namespace http_async_client {
-    function query(sdata: string, rn: string): number;
-}
-
-export namespace http_client {
-    function curl_connect(con: string, url: string, dpv: string): number;
-    function curl_connect_post(con: string, url: string, ctype: string, data: string, dpv: string): number;
-    function query(url: string, dpv: string): number;
-    function query_post(url: string, post: string, dpv: string): number;
-    function query_post_hdrs(url: string, post: string, hdrs: string, dpv: string): number;
-}
-
-export namespace imc {
-    function imc_manager(): number;
-}
-
-export namespace ipops {
-    function compare_ips(_sval1: string, _sval2: string): number;
-    function compare_pure_ips(_sval1: string, _sval2: string): number;
-    function detailed_ip_type(_sval: string, _dpv: string): number;
-    function detailed_ipv4_type(_sval: string, _dpv: string): number;
-    function detailed_ipv6_type(_sval: string, _dpv: string): number;
-    function dns_int_match_ip(vhn: string, vip: string): number;
-    function dns_query(naptrname: string, pvid: string): number;
-    function dns_sys_match_ip(vhn: string, vip: string): number;
-    function ip_is_in_subnet(_sval1: string, _sval2: string): number;
-    function ip_type(sval: string): number;
-    function is_in_subnet(_sval1: string, _sval2: string): number;
-    function is_ip(sval: string): number;
-    function is_ip4(sval: string): number;
-    function is_ip6(sval: string): number;
-    function is_ip6_reference(sval: string): number;
-    function is_ip_rfc1918(sval: string): number;
-    function is_pure_ip(sval: string): number;
-    function naptr_query(naptrname: string, pvid: string): number;
-    function srv_query(naptrname: string, pvid: string): number;
-}
-
-export namespace jansson {
-    function get(spath: string, sdoc: string, spv: string): number;
-}
-
-export namespace jsonrpcs {
-    function exec(scmd: string): number;
-}
-
-export namespace keepalive {
-    function is_alive(dest: string): number;
-}
-
-export namespace kex {
-    function resetdebug(): number;
-    function setdebug(lval: number): number;
-}
-
-export namespace lcr {
-    function defunct_gw(defunct_period: number): number;
-    function from_any_gw(): number;
-    function from_any_gw_addr(addr_str: string, transport: number): number;
-    function from_gw(lcr_id: number): number;
-    function from_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
-    function inactivate_gw(): number;
-    function load_gws(lcr_id: number): number;
-    function load_gws_furi(lcr_id: number, ruri_user: string, from_uri: string): number;
-    function load_gws_ruser(lcr_id: number, ruri_user: string): number;
-    function next_gw(): number;
-    function to_any_gw(): number;
-    function to_any_gw_addr(addr_str: string, transport: number): number;
-    function to_gw(lcr_id: number): number;
-    function to_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
-}
-
-export namespace log_custom {
-    function log_udp(txt: string): number;
-}
-
-export namespace log_systemd {
-    function sd_journal_print(slev: string, stxt: string): number;
-    function sd_journal_send_xvap(xname: string): number;
-}
-
-export namespace maxfwd {
-    function is_maxfwd_lt(limit: number): number;
-    function process_maxfwd(limit: number): number;
-}
-
-export namespace mediaproxy {
-    function end_media_session(): number;
-    function engage_media_proxy(): number;
-    function use_media_proxy(): number;
-}
-
-export namespace misc_radius {
-    function does_uri_exist(): number;
-    function does_uri_exist_uval(suri: string): number;
-    function does_uri_user_exist(): number;
-    function does_uri_user_exist_uval(user: string): number;
-    function is_user_in(user: string, group: string): number;
-    function load_callee_avps(user: string): number;
-    function load_caller_avps(user: string): number;
-}
-
-export namespace mqueue {
-    function mq_add(mq: string, key: string, val: string): number;
-    function mq_fetch(mq: string): number;
-    function mq_pv_free(mq: string): number;
-    function mq_size(mq: string): number;
-}
-
-export namespace msilo {
-    function mdump(): number;
-    function mdump_uri(owner_s: string): number;
-    function mstore(): number;
-    function mstore_uri(owner_s: string): number;
-}
-
-export namespace msrp {
-    function cmap_lookup(): number;
-    function cmap_save(): number;
-    function is_reply(): number;
-    function is_request(): number;
-    function relay(): number;
-    function relay_flags(rtflags: number): number;
-    function reply(rcode: string, rtext: string, rhdrs: string): number;
-    function reply_flags(rtflags: number): number;
-    function set_dst(rtaddr: string, rfsock: string): number;
-}
-
-export namespace mtree {
-    function mt_match(tname: string, tomatch: string, mval: number): number;
-}
-
-export namespace nat_traversal {
-    function client_nat_test(tests: number): number;
-    function fix_contact(): number;
-    function nat_keepalive(): number;
-}
-
-export namespace nathelper {
-    function add_contact_alias(): number;
-    function add_contact_alias_addr(ip_str: string, port_str: string, proto_str: string): number;
-    function add_rcv_param(upos: number): number;
-    function fix_nated_contact(): number;
-    function fix_nated_register(): number;
-    function fix_nated_sdp(level: number): number;
-    function fix_nated_sdp_ip(level: number, ip: string): number;
-    function handle_ruri_alias(): number;
-    function is_rfc1918(address: string): number;
-    function nat_uac_test(tests: number): number;
-    function set_contact_alias(): number;
-}
-
-export namespace ndb_mongodb {
-    function exec(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
-    function exec_simple(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
-    function find(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
-    function find_one(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
-    function free_reply(name: string): number;
-    function next_reply(name: string): number;
-}
-
-export namespace ndb_redis {
-    function redis_cmd(srv: string, rcmd: string, sres: string): number;
-    function redis_cmd_p1(srv: string, rcmd: string, p1: string, sres: string): number;
-    function redis_cmd_p2(srv: string, rcmd: string, p1: string, p2: string, sres: string): number;
-    function redis_cmd_p3(srv: string, rcmd: string, p1: string, p2: string, p3: string, sres: string): number;
-    function redis_free(name: string): number;
-}
-
-export namespace path {
-    function add_path(): number;
-    function add_path_received(): number;
-    function add_path_received_user(_user: string): number;
-    function add_path_received_user_params(_user: string, _params: string): number;
-    function add_path_user(_user: string): number;
-    function add_path_user_params(_user: string, _params: string): number;
-}
-
-export namespace pdt {
-    function pd_translate(sd: string, md: number): number;
-    function pprefix2domain(m: number, s: number): number;
-}
-
-export namespace permissions {
-    function allow_address(addr_group: number, ips: string, port: number): number;
-    function allow_address_group(_addr: string, _port: number): number;
-    function allow_source_address(addr_group: number): number;
-    function allow_source_address_group(): number;
-}
-
-export namespace phonenum {
-    function match(tomatch: string, pvclass: string): number;
-}
-
-export namespace pike {
-    function pike_check_req(): number;
-}
-
-export namespace pipelimit {
-    function pl_check(pipeid: string): number;
-    function pl_check_limit(pipeid: string, alg: string, limit: number): number;
-    function pl_drop(): number;
-    function pl_drop_range(rmin: number, rmax: number): number;
-    function pl_drop_retry(rafter: number): number;
-}
-
-export namespace prefix_route {
-    function prefix_route(ruser: string): number;
-    function prefix_route_uri(): number;
-}
-
-export namespace presence {
-    function handle_publish(): number;
-    function handle_publish_uri(sender_uri: string): number;
-    function handle_subscribe(): number;
-    function handle_subscribe_uri(wuri: string): number;
-    function pres_auth_status(watcher_uri: string, presentity_uri: string): number;
-    function pres_has_subscribers(pres_uri: string, wevent: string): number;
-    function pres_refresh_watchers(pres: string, event: string, type: number): number;
-    function pres_refresh_watchers_file(pres: string, event: string, type: number, file_uri: string, filename: string): number;
-    function pres_update_watchers(pres_uri: string, event: string): number;
-}
-
-export namespace presence_xml {
-    function pres_check_activities(pres_uri: string, activity: string): number;
-    function pres_check_basic(pres_uri: string, status: string): number;
-}
-
-export namespace pua {
-    function pua_set_publish(): number;
-    function pua_update_contact(): number;
-}
-
-export namespace pvx {
-    function evalx(dst: string, fmt: string): number;
-    function pv_var_to_xavp(varname: string, xname: string): number;
-    function pv_xavp_print(): number;
-    function pv_xavp_to_var(xname: string): number;
-    function sbranch_append(): number;
-    function sbranch_reset(): number;
-    function sbranch_set_ruri(): number;
-    function xavp_params_explode(sparams: string, sxname: string): number;
-    function xavp_params_implode(sxname: string, svname: string): number;
-}
-
-export namespace rabbitmq {
-    function publish(exchange: string, routingkey: string, contenttype: string, messagebody: string): number;
-    function publish_consume(exchange: string, routingkey: string, contenttype: string, messagebody: string, dpv: string): number;
-}
-
-export namespace regex {
-    function pcre_match(string: string, regex: string): number;
-    function pcre_match_group(string: string, num_pcre: number): number;
-}
-
-export namespace registrar {
-    function add_sock_hdr(hdr_name: string): number;
-    function lookup(table: string): number;
-    function lookup_branches(_dtable: string): number;
-    function lookup_to_dset(table: string, uri: string): number;
-    function lookup_uri(table: string, uri: string): number;
-    function reg_fetch_contacts(dtable: string, uri: string, profile: string): number;
-    function reg_free_contacts(profile: string): number;
-    function registered(table: string): number;
-    function registered_action(_dtable: string, _uri: string, _f: number, _aflags: number): number;
-    function registered_flags(_dtable: string, _uri: string, _f: number): number;
-    function registered_uri(_dtable: string, _uri: string): number;
-    function save(table: string, flags: number): number;
-    function save_uri(table: string, flags: number, uri: string): number;
-    function set_q_override(new_q: string): number;
-    function unregister(_dtable: string, _uri: string): number;
-    function unregister_ruid(_dtable: string, _uri: string, _ruid: string): number;
-}
-
-export namespace rls {
-    function handle_notify(): number;
-    function handle_subscribe(): number;
-    function handle_subscribe_uri(wuri: string): number;
-    function update_subs(uri: string, event: string): number;
-}
-
-export namespace rr {
-    function add_rr_param(sparam: string): number;
-    function check_route_param(sre: string): number;
-    function is_direction(dir: string): number;
-    function loose_route(): number;
-    function record_route(): number;
-    function record_route_params(params: string): number;
-    function remove_record_route(): number;
-}
-
-export namespace rtjson {
-    function init_routes(rdoc: string): number;
-    function next_route(): number;
-    function push_routes(): number;
-    function update_branch(): number;
-}
-
-export namespace rtpengine {
-    function rtpengine_answer(flags: string): number;
-    function rtpengine_answer0(): number;
-    function rtpengine_delete(flags: string): number;
-    function rtpengine_delete0(): number;
-    function rtpengine_manage(flags: string): number;
-    function rtpengine_manage0(): number;
-    function rtpengine_offer(flags: string): number;
-    function rtpengine_offer0(): number;
-    function set_rtpengine_set(r1: number): number;
-    // This function is the sibling function to set_rtpengine_set().
-    // The original module function is declared as set_rtpengine_set(setid[, setid2]).
-    // In KEMI set_rtpengine_set() takes only the first parameter and set_rtpengine_set2() allows for the second optional parameter to be passed.
-    // Please review the documentation for set_rtpengine_set() for more information.
-    function set_rtpengine_set2(r1: number, r2: number): number;
-    function start_recording(): number;
-    function stop_recording(): number;
-}
-
-export namespace rtpproxy {
-    function rtpproxy_answer(flags: string): number;
-    function rtpproxy_answer0(): number;
-    function rtpproxy_answer_ip(flags: string, mip: string): number;
-    function rtpproxy_destroy(flags: string): number;
-    function rtpproxy_destroy0(): number;
-    function rtpproxy_manage(flags: string): number;
-    function rtpproxy_manage0(): number;
-    function rtpproxy_manage_ip(flags: string, mip: string): number;
-    function rtpproxy_offer(flags: string): number;
-    function rtpproxy_offer0(): number;
-    function rtpproxy_offer_ip(flags: string, mip: string): number;
-    function rtpproxy_stop_stream2uac(): number;
-    function rtpproxy_stop_stream2uas(): number;
-    function rtpproxy_stream2uac(pname: string, count: number): number;
-    function rtpproxy_stream2uas(pname: string, count: number): number;
-    function set_rtpproxy_set(rset: number): number;
-    function start_recording(): number;
-}
-
-export namespace sanity {
-    function sanity_check(mflags: number, uflags: number): number;
-    function sanity_check_defaults(): number;
-    function sanity_reply(): number;
-}
-
-export namespace sca {
-    function call_info_update(update_mask: number, uri_to: string, uri_from: string): number;
-    function call_info_update_default(): number;
-    function call_info_update_mask(umask: number): number;
-    function call_info_update_turi(umask: number, sto: string): number;
-    function handle_subscribe(): number;
-}
-
-export namespace sdpops {
-    function keep_codecs_by_id(codecs: string, media: string): number;
-    function keep_codecs_by_name(codecs: string, media: string): number;
-    function remove_codecs_by_id(codecs: string, media: string): number;
-    function remove_codecs_by_name(codecs: string, media: string): number;
-    function remove_line_by_prefix(prefix: string, media: string): number;
-    function remove_media(media: string): number;
-    function sdp_content(): number;
-    function sdp_content_flags(flags: number): number;
-    function sdp_get(avp: string): number;
-    function sdp_get_line_startswith(aname: string, sline: string): number;
-    function sdp_print(llevel: number): number;
-    function sdp_transport(avp: string): number;
-    function sdp_with_active_media(media: string): number;
-    function sdp_with_ice(): number;
-    function sdp_with_media(media: string): number;
-}
-
-export namespace sipcapture {
-    function float2int(_val: string, _coof: string): number;
-    function report_capture(_table: string): number;
-    function report_capture_cid(_table: string, _cid: string): number;
-    function report_capture_data(_table: string, _cid: string, _data: string): number;
-    function sip_capture(): number;
-    function sip_capture_forward(puri: string): number;
-    function sip_capture_mode(_table: string, _cmdata: string): number;
-    function sip_capture_table(_table: string): number;
-}
-
-export namespace sipdump {
-    function send(stag: string): number;
-}
-
-export namespace sipjson {
-    function sj_serialize(smode: string, pvn: string): number;
-}
-
-export namespace siptrace {
-    function hlog(message: string): number;
-    function hlog_cid(correlationid: string, message: string): number;
-    function sip_trace(): number;
-    function sip_trace_dst(duri: string): number;
-    function sip_trace_dst_cid(duri: string, cid: string): number;
-}
-
-export namespace siputils {
-    function has_totag(): number;
-    function is_alphanum(tval: string): number;
-    function is_alphanumex(tval: string, eset: string): number;
-    function is_first_hop(): number;
-    function is_numeric(tval: string): number;
-    function is_reply(): number;
-    function is_request(): number;
-    function is_tel_number(tval: string): number;
-    function is_uri(suri: string): number;
-    function is_user(suser: string): number;
-    function uri_param(sparam: string): number;
-    function uri_param_value(sparam: string, svalue: string): number;
-}
-
-export namespace sl {
-    function send_reply(code: number, reason: string): number;
-    function sl_forward_reply(code: string, reason: string): number;
-    function sl_reply_error(): number;
-    function sl_send_reply(code: number, reason: string): number;
-}
-
-export namespace speeddial {
-    function lookup(stable: string): number;
-    function lookup_owner(stable: string, sowner: string): number;
-}
-
-export namespace sqlops {
-    function sql_is_null(sres: string, i: number, j: number): number;
-    function sql_num_columns(sres: string): number;
-    function sql_num_rows(sres: string): number;
-    function sql_query(scon: string, squery: string, sres: string): number;
-    function sql_query_async(scon: string, squery: string): number;
-    function sql_result_free(sres: string): number;
-    function sql_xquery(scon: string, squery: string, xavp: string): number;
-}
-
-export namespace ss7ops {
-    function isup_to_json(proto: number): number;
-}
-
-export namespace sst {
-    function sst_check_min(flag: number): number;
-}
-
-export namespace statistics {
-    function reset_stat(sname: string): number;
-    function update_stat(sname: string, sval: number): number;
-}
-
-export namespace statsc {
-    function statsc_reset(): number;
-}
-
-export namespace statsd {
-    function statsd_decr(key: string): number;
-    function statsd_gauge(key: string, val: string): number;
-    function statsd_incr(key: string): number;
-    function statsd_set(key: string, val: string): number;
-    function statsd_start(key: string): number;
-    function statsd_stop(key: string): number;
-}
-
-export namespace tcpops {
-    function tcp_conid_alive(i_conid: number): number;
-    function tcp_conid_state(i_conid: number): number;
-    function tcp_enable_closed_event(): number;
-    function tcp_enable_closed_event_cid(i_conid: number): number;
-    function tcp_keepalive_disable(): number;
-    function tcp_keepalive_disable_cid(i_con: number): number;
-    function tcp_keepalive_enable(i_idle: number, i_cnt: number, i_intvl: number): number;
-    function tcp_keepalive_enable_cid(i_con: number, i_idle: number, i_cnt: number, i_intvl: number): number;
-    function tcp_set_connection_lifetime(i_time: number): number;
-    function tcp_set_connection_lifetime_cid(i_conid: number, i_time: number): number;
-}
-
-export namespace textops {
-    function append_body_part(txt: string, ct: string): number;
-    function append_body_part_cd(txt: string, ct: string, cd: string): number;
-    function append_body_part_hex(txt: string, ct: string): number;
-    function append_body_part_hex_cd(htxt: string, ct: string, cd: string): number;
-    function cmp_istr(s1: string, s2: string): number;
-    function cmp_str(s1: string, s2: string): number;
-    function filter_body(content_type: string): number;
-    function get_body_part(ctype: string, pvname: string): number;
-    function get_body_part_raw(ctype: string, pvname: string): number;
-    function has_body(): number;
-    function has_body_type(ctype: string): number;
-    function in_list(subject: string, list: string, vsep: string): number;
-    function in_list_prefix(subject: string, list: string, vsep: string): number;
-    function is_audio_on_hold(): number;
-    function is_present_hf(hname: string): number;
-    function is_present_hf_re(ematch: string): number;
-    function is_privacy(privacy: string): number;
-    function remove_body_part(content_type: string): number;
-    function remove_hf_exp(ematch: string, eskip: string): number;
-    function remove_hf_re(ematch: string): number;
-    function replace(sre: string, sval: string): number;
-    function replace_all(sre: string, sval: string): number;
-    function replace_body(sre: string, sval: string): number;
-    function replace_body_all(sre: string, sval: string): number;
-    function replace_body_atonce(sre: string, sval: string): number;
-    function replace_body_str(mkey: string, rval: string, rmode: string): number;
-    function replace_hdrs(sre: string, sval: string): number;
-    function replace_hdrs_str(mkey: string, rval: string, rmode: string): number;
-    function replace_str(mkey: string, rval: string, rmode: string): number;
-    function search(sre: string): number;
-    function search_append(ematch: string, val: string): number;
-    function search_append_body(ematch: string, val: string): number;
-    function search_body(sre: string): number;
-    function search_hf(hname: string, sre: string, flags: string): number;
-    function set_body(nb: string, nc: string): number;
-    function set_body_multipart(nbody: string, ctype: string, boundary: string): number;
-    function set_body_multipart_boundary(boundary: string): number;
-    function set_body_multipart_content(nbody: string, ctype: string): number;
-    function set_body_multipart_mode(): number;
-    function set_reply_body(nb: string, nc: string): number;
-    function starts_with(s1: string, s2: string): number;
-    function subst(subst: string): number;
-    function subst_body(subst: string): number;
-    function subst_hf(hname: string, subst: string, flags: string): number;
-    function subst_uri(subst: string): number;
-    function subst_user(subst: string): number;
-}
-
-export namespace textopsx {
-    function append_hf_value(hexp: string, val: string): number;
-    function assign_hf_value(hexp: string, val: string): number;
-    function assign_hf_value2(hexp: string, val: string): number;
-    function change_reply_status(code: number, reason: string): number;
-    function exclude_hf_value(hexp: string, val: string): number;
-    function fnmatch(val: string, match: string): number;
-    function fnmatch_ex(val: string, match: string, flags: string): number;
-    function hf_value_exists(hexp: string, val: string): number;
-    function include_hf_value(hexp: string, val: string): number;
-    function insert_hf_value(hexp: string, val: string): number;
-    function keep_hf(): number;
-    function keep_hf_re(sre: string): number;
-    function msg_apply_changes(): number;
-    function msg_set_buffer(obuf: string): number;
-    function remove_body(): number;
-    function remove_hf_value(hexp: string): number;
-    function remove_hf_value2(hexp: string, val: string): number;
-}
-
-export namespace tls {
-    function is_peer_verified(): number;
-}
-
-export namespace tm {
-    function t_any_replied(): number;
-    function t_any_timeout(): number;
-    function t_branch_replied(): number;
-    function t_branch_timeout(): number;
-    function t_check_status(sexp: string): number;
-    function t_check_trans(): number;
-    function t_drop_replies(mode: string): number;
-    function t_drop_replies_all(): number;
-    function t_grep_status(code: number): number;
-    function t_is_canceled(): number;
-    function t_is_expired(): number;
-    function t_is_retr_async_reply(): number;
-    function t_is_set(target: string): number;
-    function t_load_contacts(): number;
-    function t_lookup_cancel(): number;
-    function t_lookup_cancel_flags(flags: number): number;
-    function t_lookup_request(): number;
-    function t_newtran(): number;
-    function t_next_contact_flow(): number;
-    function t_next_contacts(): number;
-    function t_on_branch(rname: string): number;
-    function t_on_branch_failure(rname: string): number;
-    function t_on_failure(rname: string): number;
-    function t_on_reply(rname: string): number;
-    function t_relay(): number;
-    function t_release(): number;
-    function t_replicate(suri: string): number;
-    function t_reply(code: number, reason: string): number;
-    function t_reset_fr(): number;
-    function t_reset_max_lifetime(): number;
-    function t_reset_retr(): number;
-    function t_retransmit_reply(): number;
-    function t_save_lumps(): number;
-    function t_send_reply(code: number, reason: string): number;
-    function t_set_auto_inv_100(state: number): number;
-    function t_set_disable_6xx(state: number): number;
-    function t_set_disable_failover(state: number): number;
-    function t_set_disable_internal_reply(state: number): number;
-    function t_set_fr(fr_inv: number, fr: number): number;
-    function t_set_fr_inv(fr_inv: number): number;
-    function t_set_max_lifetime(t1: number, t2: number): number;
-    function t_set_no_e2e_cancel_reason(state: number): number;
-    function t_set_retr(t1: number, t2: number): number;
-    function t_uac_send(method: string, ruri: string, nexthop: string, ssock: string, hdrs: string, body: string): number;
-    function t_use_uac_headers(): number;
-}
-
-export namespace tmrec {
-    function is_leap_year(y: number): number;
-    function is_leap_year_now(): number;
-    function match(rv: string): number;
-    function match_timestamp(rv: string, ti: number): number;
-    function time_period_match(period: string): number;
-    function time_period_match_timestamp(period: string, ti: number): number;
-}
-
-export namespace tmx {
-    function t_cancel_branches(mode: string): number;
-    function t_cancel_callid(callid_s: string, cseq_s: string, fl: number): number;
-    function t_cancel_callid_reason(callid_s: string, cseq_s: string, fl: number, rcode: number): number;
-    function t_continue(tindex: number, tlabel: number, cbname: string): number;
-    function t_flush_flags(): number;
-    function t_flush_xflags(): number;
-    function t_is_branch_route(): number;
-    function t_is_failure_route(): number;
-    function t_is_reply_route(): number;
-    function t_is_request_route(): number;
-    function t_precheck_trans(): number;
-    function t_reply_callid(callid_s: string, cseq_s: string, code: number, status_s: string): number;
-    function t_reuse_branch(): number;
-    function t_suspend(): number;
-}
-
-export namespace tsilo {
-    function ts_append(_table: string, _ruri: string): number;
-    function ts_append_to(tindex: number, tlabel: number, _table: string): number;
-    function ts_append_to_uri(tindex: number, tlabel: number, _table: string, _uri: string): number;
-    function ts_store(): number;
-    function ts_store_uri(puri: string): number;
-}
-
-export namespace uac {
-    function uac_auth(): number;
-    function uac_reg_disable(attr: string, val: string): number;
-    function uac_reg_enable(attr: string, val: string): number;
-    function uac_reg_lookup(userid: string, sdst: string): number;
-    function uac_reg_refresh(l_uuid: string): number;
-    function uac_reg_request_to(userid: string, imode: number): number;
-    function uac_reg_status(sruuid: string): number;
-    function uac_replace_from(pdsp: string, puri: string): number;
-    function uac_replace_from_uri(puri: string): number;
-    function uac_replace_to(pdsp: string, puri: string): number;
-    function uac_replace_to_uri(puri: string): number;
-    function uac_req_send(): number;
-    function uac_restore_from(): number;
-    function uac_restore_to(): number;
-}
-
-export namespace uac_redirect {
-    function get_redirects(max_c: number, max_b: number): number;
-    function get_redirects_acc(max_c: number, max_b: number, reason: string): number;
-    function get_redirects_all(): number;
-}
-
-export namespace uri_db {
-    function check_from(): number;
-    function check_to(): number;
-    function check_uri(suri: string): number;
-    function check_uri_realm(suri: string, susername: string, srealm: string): number;
-    function does_uri_exist(): number;
-}
-
-export namespace userblacklist {
-    function check_user_blacklist(suser: string, sdomain: string): number;
-    function check_user_blacklist_number(suser: string, sdomain: string, snumber: string): number;
-    function check_user_blacklist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
-    function check_user_whitelist(suser: string, sdomain: string): number;
-    function check_user_whitelist_number(suser: string, sdomain: string, snumber: string): number;
-    function check_user_whitelist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
-}
-
-export namespace utils {
-    function xcap_auth_status(watcher_uri: string, presentity_uri: string): number;
-}
-
-export namespace websocket {
-    function close(): number;
-    function close_conid(status: number, reason: string, con: number): number;
-    function close_reason(status: number, reason: string): number;
-    function handle_handshake(): number;
-}
-
-export namespace xcap_server {
-    function xcaps_del(uri: string, path: string): number;
-    function xcaps_get(uri: string, path: string): number;
-    function xcaps_put(uri: string, path: string, pbody: string): number;
-}
-
-export namespace xhttp {
-    function xhttp_reply(code: number, reason: string, ctype: string, body: string): number;
-}
-
-export namespace xhttp_pi {
-    function dispatch(): number;
-}
-
-export namespace xhttp_rpc {
-    function dispatch(): number;
-}
-
-export namespace xlog {
-    function xalert(lmsg: string): number;
-    function xcrit(lmsg: string): number;
-    function xdbg(lmsg: string): number;
-    function xerr(lmsg: string): number;
-    function xinfo(lmsg: string): number;
-    function xlog(slevel: string, lmsg: string): number;
-    function xnotice(lmsg: string): number;
-    function xwarn(lmsg: string): number;
-}
-
-export namespace xmlrpc {
-    function dispatch_rpc(): number;
-    function xmlrpc_reply(rcode: number, reason: string): number;
+declare global {
+    const KSR: typeof KamailioKemi;
+}
+
+declare namespace KamailioKemi {
+    // Allowed flags
+    type Flag = 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31;
+
+    // Write a log message to DEBUG level
+    export function dbg(logStr: string): void;
+
+    // Write a log message to ERROR level.
+    export function err(logStr: string): void;
+
+    // Write a log message to INFO level.
+    export function info(logStr: string): void;
+
+    // Set the internal flag to add rport parameter to local generated Via header.
+    export function add_local_rport(): boolean;
+
+    // Adds a tcp port alias for the current connection (if tcp). Useful if you want to send all the trafic to
+    // port_alias through the same connection this request came from (it could help for firewall or nat traversal).
+    // When the aliased connection is closed (e.g. it is idle for too much time), all the port aliases are removed.
+    export function add_tcp_alias(port: number): void;
+
+    // Adds the port from the message via as an alias to TCP connection. See add_tcp_alias(int port) for more details.
+    export function add_tcp_alias_via(): number;
+
+    // Set the flag for "rport" handling (send the reply based on source address instead of Via header).
+    export function force_rport(): boolean;
+
+    // Return true if the value of the parameter matches the method type of the SIP message.
+    export function is_method(method: string): boolean;
+
+    /*
+     * Return true if SIP method of the currently processed message is matching
+     * one of the corresponding characters given as parameter.
+     * Matching the method is done based on corresponding characters:
+     *
+     * I - INVITE
+     * A - ACK
+     * B - BYE
+     * C - CANCEL
+     * R - REGISTER
+     * M - MESSAGE
+     * O - OPTIONS
+     * S - SUBSCRIBE
+     * P - PUBLISH
+     * N - NOTIFY
+     * U - UPDATE
+     * K - KDMQ
+     * G - GET
+     * T - POST
+     * V - PUT
+     * D - DELETE
+     */
+    export function is_method_in(method: string): boolean;
+
+    // Helpers for common methods
+    export function is_INVITE(): boolean;
+    export function is_ACK(): boolean;
+    export function is_BYE(): boolean;
+    export function is_CANCEL(): boolean;
+    export function is_REGISTER(): boolean;
+    export function is_MESSAGE(): boolean;
+    export function is_SUBSCRIBE(): boolean;
+    export function is_PUBLISH(): boolean;
+    export function is_NOTIFY(): boolean;
+    export function is_OPTIONS(): boolean;
+    export function is_INFO(): boolean;
+    export function is_UPDATE(): boolean;
+    export function is_PRACK(): boolean;
+
+    // Return true of the URI address provided as parameter matches a local socket (IP) or local domain.
+    export function is_myself(uri: string): boolean;
+
+    // Return true if the URI in From header matches a local socket (IP) or local domain.
+    export function is_myself_furi(): boolean;
+
+    // Return true if the R-URI matches a local socket (IP) or local domain.
+    export function is_myself_ruri(): boolean;
+
+    // Return true if the URI in To header matches a local socket (IP) or local domain.
+    export function is_myself_turi(): boolean;
+
+    // Write a log message specifying the level value.
+    export function log(level: "dbg"|"info"|"warn"|"crit"|"err", msg: string): void;
+
+    // Set the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+    export function setflag(flag: Flag): boolean;
+
+    // Reset the SIP message/transaction flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+    export function resetflag(flag: Flag): boolean;
+
+    // Return true if the message/transaction flag at the index provided by the parameter is set (the bit has value 1).
+    export function isflagset(flag: Flag): boolean;
+
+    // Set the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+    export function setbflag(flag: Flag): boolean;
+
+    // Reset the branch flag at the index provided by the parameter. The flag parameter has to be a number from 0 to 31.
+    export function resetbflag(flag: Flag): boolean;
+
+    // Return true if the branch flag at the index provided by the parameter is set (the bit has value 1).
+    export function isbflagset(flag: Flag): boolean;
+
+    // Set the flag at the index provided by the first parameter to the branch number specified by the second parameter.
+    // The flag parameter has to be a number from 0 to 31.
+    // The branch parameter should be between 0 and 12 (a matter of max_branches global parameter).
+    export function setbiflag(flag: Flag, branch: number): boolean;
+
+    // Reset a branch flag by position and branch index.
+    export function resetbiflag(flag: Flag, branch: number): boolean;
+
+    // Test if a branch flag is set by position and branch index.
+    export function isbiflagset(flag: Flag, branch: number): boolean;
+
+    // Set a script flag
+    export function setsflag(flag: Flag): boolean;
+
+    // Reset a script flag
+    export function resetsflag(flag: Flag): boolean;
+
+    // Test if a script flag is set
+    export function issflagset(flag: Flag): boolean;
+
+    // Set request URI
+    export function seturi(uri: string): boolean;
+
+    // Set request user
+    export function setuser(usr: string): boolean;
+
+    // Set request host
+    export function sethost(host: string): boolean;
+
+    // Set destination URI
+    export function setdsturi(uri: string): boolean;
+
+    // Reset the destination URI (aka: outbound proxy address, dst_uri, $du).
+    export function resetdsturi(): boolean;
+
+    // Test if destination URI is set.
+    export function isdsturiset(): boolean;
+
+    // Set the DROP flag, so at the end of KEMI script execution, the SIP request branch or the SIP response is not forwarded.
+    export function set_drop(): void;
+    export function set_advertised_address(addr: string): number;
+    export function set_advertised_port(port: string): number;
+    export function set_forward_close(): boolean;
+    export function set_forward_no_connect(): boolean;
+    export function set_reply_close(): boolean;
+    export function set_reply_no_connect(): boolean;
+
+    // Forward the SIP request in stateless mode to the address set in destination URI ($du), or,
+    // if this is not set, to the address in request URI ($ru).
+    export function forward(): number;
+
+    // Forward the SIP request in stateless mode to the address provided in the SIP URI parameter.
+    export function forward_uri(uri: string): number;
+
+    // Special declaration of debugger and enum to avoid using reserved words
+    namespace _debugger {
+        function dbg_pv_dump(): number;
+        function dbg_pv_dump_ex(mask: number, level: number): number;
+    }
+
+    namespace _enum {
+        function enum_i_query_suffix(vsuffix: string): number;
+        function enum_pv_query(ve164: string): number;
+        function enum_pv_query_suffix(ve164: string, vsuffix: string): number;
+        function enum_pv_query_suffix_service(ve164: string, vsuffix: string, vservice: string): number;
+        function enum_query(): number;
+        function enum_query_suffix(vsuffix: string): number;
+        function enum_query_suffix_service(vsuffix: string, vservice: string): number;
+        function i_enum_query(): number;
+        function i_enum_query_suffix_service(vsuffix: string, vservice: string): number;
+        function is_from_user_enum(): number;
+        function is_from_user_enum_suffix(vsuffix: string): number;
+        function is_from_user_enum_suffix_service(vsuffix: string, vservice: string): number;
+    }
+
+    // noinspection ReservedWordAsName
+    // TypeScript Version: 2.2
+    export {
+        _debugger as debugger,
+        _enum as enum
+    };
+
+    export namespace pv {
+        // Return the value of pseudo-variable `pvname`.
+        // The returned value can be string or integer
+        function get(pvname: string): string|number|null;
+
+        // Same as get(), but returns empty string on null
+        function gete(pvname: string): string|number;
+
+        // Same as get(), but returns `vn` on null
+        function getvn(pvname: string, vn: number): string|number;
+
+        // Return the value of pseudo-variable pvname if it is different than $null or
+        // the parameter vs if the variable is having the $null value.
+        function getvs(pvname: string, vn: number): string|number;
+
+        // Return the value of pseudo-variable pvname if it is different than $null or the string <<null>> if the
+        // variable is having the $null value. This should be used instead of KSR.pv.get(...) in the scripting
+        // languages that throw and error when attempting to print a NULL (or NIL) value.
+        function getw(pvname: string): string|number;
+
+        // Set the value of pseudo-variable pvname to integer value provided by parameter val.
+        function seti(pvname: string, val: number): void;
+
+        // Set the value of pseudo-variable pvname to string value provided by parameter val.
+        function sets(pvname: string, val: string): void;
+
+        // Set the value of pseudo-variable pvname to $null.
+        function unset(pvname: string): void;
+
+        // Return true if pseudo-variable pvname is $null.
+        function is_null(pvname: string): boolean;
+    }
+
+    export namespace hdr {
+        // Append header to current SIP message (request or reply). It will be added after the last header.
+        function append(hdr: string): number;
+
+        // Append header to current SIP message (request or reply).
+        // It will be added after the first header matching the name hdrName.
+        function append_after(hdr: string, hdrName: string): number;
+
+        // Insert header to current SIP message (request or reply).
+        // It will be added before the first header.
+        function insert(hdr: string): number;
+
+        // Insert header to current SIP message (request or reply).
+        // It will be added before the header matching the name hdrName.
+        function insert_before(hdr: string, hdrName: string): number;
+
+        // Remove all the headers with the name hdrName.
+        function remove(hdrName: string): number;
+
+        // Return greater than 0 if a header with the name hdrName exists and less than 0 if there is no such header.
+        function is_present(hdrName: string): number;
+
+        // Add a header to the SIP response to be generated by Kamailio for the current SIP request.
+        function append_to_reply(hdr: string): number;
+    }
+
+    export namespace x {
+        // Execute a function (specified by fname) exported by a Kamailio module. Additional parameters must be string
+        // and they are passed to the Kamailio module function.
+        function modf(name: string, ...params: string[]): number;
+
+        // Equivalent of exit from native kamailio.cfg scripting language, stop the execution of the SIP routing script.
+        function exit(): void;
+
+        // Equivalent of drop from native kamailio.cfg scripting language, stop the execution of the SIP routing script
+        // and drop routing further the SIP request branch or response.
+        function drop(): void;
+    }
+
+    export namespace acc {
+        // Equivalent of native kamailio.cfg function: acc_db_request("comment", "dbtable").
+        function acc_db_request(comment: string, dbtable: string): number;
+        // Equivalent of native kamailio.cfg function: acc_log_request("comment").
+        function acc_log_request(comment: string): number;
+        // Equivalent of native kamailio.cfg function: acc_request("comment", "dbtable").
+        function acc_request(comment: string, dbtable: string): number;
+    }
+
+    export namespace acc_radius {
+        function request(comment: string): number;
+    }
+
+    export namespace alias_db {
+        function lookup(stable: string): number;
+        function lookup_ex(stable: string, sflags: string): number;
+    }
+
+    export namespace app_jsdt {
+        function dofile(script: string): number;
+        function dostring(script: string): number;
+        function run(func: string): number;
+        function run_p1(func: string, p1: string): number;
+        function run_p2(func: string, p1: string, p2: string): number;
+        function run_p3(func: string, p1: string, p2: string, p3: string): number;
+        function runstring(script: string): number;
+    }
+
+    export namespace app_lua {
+        function dofile(script: string): number;
+        function dostring(script: string): number;
+        function run(func: string): number;
+        function run_p1(func: string, p1: string): number;
+        function run_p2(func: string, p1: string, p2: string): number;
+        function run_p3(func: string, p1: string, p2: string, p3: string): number;
+        function runstring(script: string): number;
+    }
+
+    export namespace app_python {
+        function exec(method: string): number;
+        function exec_p1(method: string, p1: string): number;
+    }
+
+    export namespace app_python3 {
+        function exec(method: string): number;
+        function exec_p1(method: string, p1: string): number;
+    }
+
+    export namespace app_ruby {
+        function run(func: string): number;
+        function run_p1(func: string, p1: string): number;
+        function run_p2(func: string, p1: string, p2: string): number;
+        function run_p3(func: string, p1: string, p2: string, p3: string): number;
+    }
+
+    export namespace app_sqlang {
+        function dofile(script: string): number;
+        function dostring(script: string): number;
+        function run(func: string): number;
+        function run_p1(func: string, p1: string): number;
+        function run_p2(func: string, p1: string, p2: string): number;
+        function run_p3(func: string, p1: string, p2: string, p3: string): number;
+        function runstring(script: string): number;
+    }
+
+    export namespace async {
+        function route(rn: string, s: number): number;
+        function task_route(rn: string): number;
+    }
+
+    export namespace auth {
+        function auth_challenge(realm: string, flags: number): number;
+        function consume_credentials(): number;
+        function has_credentials(srealm: string): number;
+        function pv_auth_check(srealm: string, spasswd: string, vflags: number, vchecks: number): number;
+    }
+
+    export namespace auth_db {
+        function auth_check(srealm: string, stable: string, iflags: number): number;
+        function is_subscriber(suri: string, stable: string, iflags: number): number;
+    }
+
+    export namespace auth_ephemeral {
+        function autheph_authenticate(susername: string, spassword: string): number;
+        function autheph_check(srealm: string): number;
+        function autheph_proxy(srealm: string): number;
+        function autheph_www(srealm: string): number;
+        function autheph_www_method(srealm: string, smethod: string): number;
+    }
+
+    export namespace auth_radius {
+        function proxy_authorize(srealm: string): number;
+        function proxy_authorize_user(srealm: string, suser: string): number;
+        function www_authorize(srealm: string): number;
+        function www_authorize_user(srealm: string, suser: string): number;
+    }
+
+    export namespace auth_xkeys {
+        function auth_xkeys_add(shdr: string, skey: string, salg: string, sdata: string): number;
+        function auth_xkeys_check(shdr: string, skey: string, salg: string, sdata: string): number;
+    }
+
+    export namespace benchmark {
+        function bm_log_timer(tname: string): number;
+        function bm_start_timer(tname: string): number;
+    }
+
+    export namespace blst {
+        function blst_add(t: number): number;
+        function blst_add_default(): number;
+        function blst_add_retry_after(t_min: number, t_max: number): number;
+        function blst_clear_ignore(mask: number): number;
+        function blst_clear_ignore_all(): number;
+        function blst_del(): number;
+        function blst_is_blacklisted(): number;
+        function blst_rpl_clear_ignore(mask: number): number;
+        function blst_rpl_clear_ignore_all(): number;
+        function blst_rpl_set_ignore(mask: number): number;
+        function blst_rpl_set_ignore_all(): number;
+        function blst_set_ignore(mask: number): number;
+        function blst_set_ignore_all(): number;
+    }
+
+    export namespace call_control {
+        function call_control(): number;
+    }
+
+    export namespace cfgutils {
+        function abort(): number;
+        function core_hash(s1: string, s2: string, sz: number): number;
+        function lock(lkey: string): number;
+        function pkg_status(): number;
+        function pkg_summary(): number;
+        function rand_event(): number;
+        function rand_get_prob(): number;
+        function rand_reset_prob(): number;
+        function rand_set_prob(percent_par: number): number;
+        function shm_status(): number;
+        function shm_summary(): number;
+        function trylock(lkey: string): number;
+        function unlock(lkey: string): number;
+    }
+
+    export namespace cnxcc {
+        function get_channel_count(sclient: string, pvname: string): number;
+        function set_max_channels(sclient: string, max_chan: number): number;
+        function set_max_credit(sclient: string, scredit: string, scps: string, initp: number, finishp: number): number;
+        function set_max_time(sclient: string, max_secs: number): number;
+        function terminate_all(sclient: string): number;
+        function update_max_time(sclient: string, secs: number): number;
+    }
+
+    export namespace corex {
+        function append_branch(): number;
+        function append_branch_uri(uri: string): number;
+        function append_branch_uri_q(uri: string, q: string): number;
+        function has_ruri_user(): number;
+        function has_user_agent(): number;
+        function isxflagset(fval: number): number;
+        function resetxflag(fval: number): number;
+        function send_data(uri: string, data: string): number;
+        function sendx(uri: string, sock: string, data: string): number;
+        function set_recv_socket(ssock: string): number;
+        function set_send_socket(ssock: string): number;
+        function set_source_address(saddr: string): number;
+        function setxflag(fval: number): number;
+        function via_add_srvid(fval: number): number;
+        function via_add_xavp_params(fval: number): number;
+        function via_use_xavp_fields(fval: number): number;
+    }
+
+    export namespace counters {
+        function add(sname: string, v: number): number;
+        function inc(sname: string): number;
+        function reset(sname: string): number;
+    }
+
+    export namespace crypto {
+        function aes_decrypt(ins: string, keys: string, dpv: string): number;
+        function aes_encrypt(ins: string, keys: string, dpv: string): number;
+    }
+
+    export namespace dialog {
+        function dlg_bye(side: string): number;
+        function dlg_db_load_callid(callid: string): number;
+        function dlg_db_load_extra(): number;
+        function dlg_get(sc: string, sf: string, st: string): number;
+        function dlg_isflagset(val: number): number;
+        function dlg_manage(): number;
+        function dlg_resetflag(val: number): number;
+        function dlg_set_property(pval: string): number;
+        function dlg_set_timeout(to: number): number;
+        function dlg_set_timeout_id(to: number, he: number, hi: number): number;
+        function dlg_setflag(val: number): number;
+        function get_profile_size(sprofile: string, svalue: string, spv: string): number;
+        function get_profile_size_static(sprofile: string, spv: string): number;
+        function is_in_profile(sprofile: string, svalue: string): number;
+        function is_in_profile_static(sprofile: string): number;
+        function is_known_dlg(): number;
+        function set_dlg_profile(sprofile: string, svalue: string): number;
+        function set_dlg_profile_static(sprofile: string): number;
+        function unset_dlg_profile(sprofile: string, svalue: string): number;
+        function unset_dlg_profile_static(sprofile: string): number;
+    }
+
+    export namespace dialplan {
+        function dp_match(dpid: number, src: string): number;
+        function dp_replace(dpid: number, src: string, dst: string): number;
+    }
+
+    export namespace dispatcher {
+        function ds_is_from_list(group: number): number;
+        function ds_is_from_list_mode(vset: number, vmode: number): number;
+        function ds_is_from_list_uri(vset: number, vmode: number, vuri: string): number;
+        function ds_is_from_lists(): number;
+        function ds_list_exists(set: number): number;
+        function ds_load_unset(): number;
+        function ds_load_update(): number;
+        function ds_mark_dst(): number;
+        function ds_mark_dst_state(sval: string): number;
+        function ds_next_domain(): number;
+        function ds_next_dst(): number;
+        function ds_reload(): number;
+        function ds_select(set: number, alg: number): number;
+        function ds_select_domain(set: number, alg: number): number;
+        function ds_select_domain_limit(set: number, alg: number, limit: number): number;
+        function ds_select_dst(set: number, alg: number): number;
+        function ds_select_dst_limit(set: number, alg: number, limit: number): number;
+        function ds_select_limit(set: number, alg: number, limit: number): number;
+        function ds_select_routes(srules: string, smode: string): number;
+        function ds_select_routes_limit(srules: string, smode: string, rlimit: number): number;
+        function ds_set_domain(): number;
+        function ds_set_dst(): number;
+    }
+
+    export namespace diversion {
+        function add_diversion(reason: string): number;
+        function add_diversion_uri(reason: string, uri: string): number;
+    }
+
+    export namespace dmq {
+        function bcast_message(peer_str: string, body_str: string, ct_str: string): number;
+        function handle_message(): number;
+        function handle_message_rc(returnval: number): number;
+        function is_from_node(): number;
+        function send_message(peer_str: string, to_str: string, body_str: string, ct_str: string): number;
+        function t_replicate(): number;
+        function t_replicate_mode(mode: number): number;
+    }
+
+    export namespace domain {
+        function is_domain_local(sdomain: string): number;
+        function is_from_local(): number;
+        function is_uri_host_local(): number;
+        function lookup_domain(_sdomain: string): number;
+        function lookup_domain_prefix(_sdomain: string, _sprefix: string): number;
+    }
+
+    export namespace drouting {
+        function do_routing(grp_id: number): number;
+        function do_routing_furi(): number;
+        function goes_to_gw(): number;
+        function goes_to_gw_type(type: number): number;
+        function is_from_gw(): number;
+        function is_from_gw_type(type: number): number;
+        function is_from_gw_type_flags(type: number, flags: number): number;
+        function next_routing(): number;
+        function use_next_gw(): number;
+    }
+
+    export namespace evapi {
+        function async_relay(sdata: string): number;
+        function close(): number;
+        function relay(sdata: string): number;
+        function relay_multicast(sdata: string, stag: string): number;
+        function relay_unicast(sdata: string, stag: string): number;
+        function set_tag(stag: string): number;
+    }
+
+    export namespace exec {
+        function exec_avp(cmd: string): number;
+        function exec_dset(cmd: string): number;
+        function exec_msg(cmd: string): number;
+    }
+
+    export namespace geoip {
+        function match(tomatch: string, pvclass: string): number;
+    }
+
+    export namespace geoip2 {
+        function match(tomatch: string, pvclass: string): number;
+    }
+
+    export namespace group {
+        function is_user_in(uri: string, grp: string): number;
+    }
+
+    export namespace htable {
+        function sht_has_name(sname: string, sop: string, sval: string): number;
+        function sht_has_str_value(sname: string, sop: string, sval: string): number;
+        function sht_iterator_end(iname: string): number;
+        function sht_iterator_next(iname: string): number;
+        function sht_iterator_start(iname: string, hname: string): number;
+        function sht_lock(htname: string, skey: string): number;
+        function sht_reset(hname: string): number;
+        function sht_rm(hname: string, iname: string): number;
+        function sht_rm_name(sname: string, sop: string, sval: string): number;
+        function sht_rm_name_re(htname: string, rexp: string): number;
+        function sht_rm_value(sname: string, sop: string, sval: string): number;
+        function sht_rm_value_re(htname: string, rexp: string): number;
+        function sht_setex(htname: string, itname: string, itval: number): number;
+        function sht_seti(htname: string, itname: string, itval: number): number;
+        function sht_sets(htname: string, itname: string, itval: string): number;
+        function sht_setxi(htname: string, itname: string, itval: number, exval: number): number;
+        function sht_setxs(htname: string, itname: string, itval: string, exval: number): number;
+        function sht_unlock(htname: string, skey: string): number;
+    }
+
+    export namespace http_async_client {
+        function query(sdata: string, rn: string): number;
+    }
+
+    export namespace http_client {
+        function curl_connect(con: string, url: string, dpv: string): number;
+        function curl_connect_post(con: string, url: string, ctype: string, data: string, dpv: string): number;
+        function query(url: string, dpv: string): number;
+        function query_post(url: string, post: string, dpv: string): number;
+        function query_post_hdrs(url: string, post: string, hdrs: string, dpv: string): number;
+    }
+
+    export namespace imc {
+        function imc_manager(): number;
+    }
+
+    export namespace ipops {
+        function compare_ips(_sval1: string, _sval2: string): number;
+        function compare_pure_ips(_sval1: string, _sval2: string): number;
+        function detailed_ip_type(_sval: string, _dpv: string): number;
+        function detailed_ipv4_type(_sval: string, _dpv: string): number;
+        function detailed_ipv6_type(_sval: string, _dpv: string): number;
+        function dns_int_match_ip(vhn: string, vip: string): number;
+        function dns_query(naptrname: string, pvid: string): number;
+        function dns_sys_match_ip(vhn: string, vip: string): number;
+        function ip_is_in_subnet(_sval1: string, _sval2: string): number;
+        function ip_type(sval: string): number;
+        function is_in_subnet(_sval1: string, _sval2: string): number;
+        function is_ip(sval: string): number;
+        function is_ip4(sval: string): number;
+        function is_ip6(sval: string): number;
+        function is_ip6_reference(sval: string): number;
+        function is_ip_rfc1918(sval: string): number;
+        function is_pure_ip(sval: string): number;
+        function naptr_query(naptrname: string, pvid: string): number;
+        function srv_query(naptrname: string, pvid: string): number;
+    }
+
+    export namespace jansson {
+        function get(spath: string, sdoc: string, spv: string): number;
+    }
+
+    export namespace jsonrpcs {
+        function exec(scmd: string): number;
+    }
+
+    export namespace keepalive {
+        function is_alive(dest: string): number;
+    }
+
+    export namespace kex {
+        function resetdebug(): number;
+        function setdebug(lval: number): number;
+    }
+
+    export namespace lcr {
+        function defunct_gw(defunct_period: number): number;
+        function from_any_gw(): number;
+        function from_any_gw_addr(addr_str: string, transport: number): number;
+        function from_gw(lcr_id: number): number;
+        function from_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
+        function inactivate_gw(): number;
+        function load_gws(lcr_id: number): number;
+        function load_gws_furi(lcr_id: number, ruri_user: string, from_uri: string): number;
+        function load_gws_ruser(lcr_id: number, ruri_user: string): number;
+        function next_gw(): number;
+        function to_any_gw(): number;
+        function to_any_gw_addr(addr_str: string, transport: number): number;
+        function to_gw(lcr_id: number): number;
+        function to_gw_addr(lcr_id: number, addr_str: string, transport: number): number;
+    }
+
+    export namespace log_custom {
+        function log_udp(txt: string): number;
+    }
+
+    export namespace log_systemd {
+        function sd_journal_print(slev: string, stxt: string): number;
+        function sd_journal_send_xvap(xname: string): number;
+    }
+
+    export namespace maxfwd {
+        function is_maxfwd_lt(limit: number): number;
+        function process_maxfwd(limit: number): number;
+    }
+
+    export namespace mediaproxy {
+        function end_media_session(): number;
+        function engage_media_proxy(): number;
+        function use_media_proxy(): number;
+    }
+
+    export namespace misc_radius {
+        function does_uri_exist(): number;
+        function does_uri_exist_uval(suri: string): number;
+        function does_uri_user_exist(): number;
+        function does_uri_user_exist_uval(user: string): number;
+        function is_user_in(user: string, group: string): number;
+        function load_callee_avps(user: string): number;
+        function load_caller_avps(user: string): number;
+    }
+
+    export namespace mqueue {
+        function mq_add(mq: string, key: string, val: string): number;
+        function mq_fetch(mq: string): number;
+        function mq_pv_free(mq: string): number;
+        function mq_size(mq: string): number;
+    }
+
+    export namespace msilo {
+        function mdump(): number;
+        function mdump_uri(owner_s: string): number;
+        function mstore(): number;
+        function mstore_uri(owner_s: string): number;
+    }
+
+    export namespace msrp {
+        function cmap_lookup(): number;
+        function cmap_save(): number;
+        function is_reply(): number;
+        function is_request(): number;
+        function relay(): number;
+        function relay_flags(rtflags: number): number;
+        function reply(rcode: string, rtext: string, rhdrs: string): number;
+        function reply_flags(rtflags: number): number;
+        function set_dst(rtaddr: string, rfsock: string): number;
+    }
+
+    export namespace mtree {
+        function mt_match(tname: string, tomatch: string, mval: number): number;
+    }
+
+    export namespace nat_traversal {
+        function client_nat_test(tests: number): number;
+        function fix_contact(): number;
+        function nat_keepalive(): number;
+    }
+
+    export namespace nathelper {
+        function add_contact_alias(): number;
+        function add_contact_alias_addr(ip_str: string, port_str: string, proto_str: string): number;
+        function add_rcv_param(upos: number): number;
+        function fix_nated_contact(): number;
+        function fix_nated_register(): number;
+        function fix_nated_sdp(level: number): number;
+        function fix_nated_sdp_ip(level: number, ip: string): number;
+        function handle_ruri_alias(): number;
+        function is_rfc1918(address: string): number;
+        function nat_uac_test(tests: number): number;
+        function set_contact_alias(): number;
+    }
+
+    export namespace ndb_mongodb {
+        function exec(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+        function exec_simple(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+        function find(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+        function find_one(ssrv: string, sdname: string, scname: string, scmd: string, sres: string): number;
+        function free_reply(name: string): number;
+        function next_reply(name: string): number;
+    }
+
+    export namespace ndb_redis {
+        function redis_cmd(srv: string, rcmd: string, sres: string): number;
+        function redis_cmd_p1(srv: string, rcmd: string, p1: string, sres: string): number;
+        function redis_cmd_p2(srv: string, rcmd: string, p1: string, p2: string, sres: string): number;
+        function redis_cmd_p3(srv: string, rcmd: string, p1: string, p2: string, p3: string, sres: string): number;
+        function redis_free(name: string): number;
+    }
+
+    export namespace path {
+        function add_path(): number;
+        function add_path_received(): number;
+        function add_path_received_user(_user: string): number;
+        function add_path_received_user_params(_user: string, _params: string): number;
+        function add_path_user(_user: string): number;
+        function add_path_user_params(_user: string, _params: string): number;
+    }
+
+    export namespace pdt {
+        function pd_translate(sd: string, md: number): number;
+        function pprefix2domain(m: number, s: number): number;
+    }
+
+    export namespace permissions {
+        function allow_address(addr_group: number, ips: string, port: number): number;
+        function allow_address_group(_addr: string, _port: number): number;
+        function allow_source_address(addr_group: number): number;
+        function allow_source_address_group(): number;
+    }
+
+    export namespace phonenum {
+        function match(tomatch: string, pvclass: string): number;
+    }
+
+    export namespace pike {
+        function pike_check_req(): number;
+    }
+
+    export namespace pipelimit {
+        function pl_check(pipeid: string): number;
+        function pl_check_limit(pipeid: string, alg: string, limit: number): number;
+        function pl_drop(): number;
+        function pl_drop_range(rmin: number, rmax: number): number;
+        function pl_drop_retry(rafter: number): number;
+    }
+
+    export namespace prefix_route {
+        function prefix_route(ruser: string): number;
+        function prefix_route_uri(): number;
+    }
+
+    export namespace presence {
+        function handle_publish(): number;
+        function handle_publish_uri(sender_uri: string): number;
+        function handle_subscribe(): number;
+        function handle_subscribe_uri(wuri: string): number;
+        function pres_auth_status(watcher_uri: string, presentity_uri: string): number;
+        function pres_has_subscribers(pres_uri: string, wevent: string): number;
+        function pres_refresh_watchers(pres: string, event: string, type: number): number;
+        function pres_refresh_watchers_file(pres: string, event: string, type: number, file_uri: string, filename: string): number;
+        function pres_update_watchers(pres_uri: string, event: string): number;
+    }
+
+    export namespace presence_xml {
+        function pres_check_activities(pres_uri: string, activity: string): number;
+        function pres_check_basic(pres_uri: string, status: string): number;
+    }
+
+    export namespace pua {
+        function pua_set_publish(): number;
+        function pua_update_contact(): number;
+    }
+
+    export namespace pvx {
+        function evalx(dst: string, fmt: string): number;
+        function pv_var_to_xavp(varname: string, xname: string): number;
+        function pv_xavp_print(): number;
+        function pv_xavp_to_var(xname: string): number;
+        function sbranch_append(): number;
+        function sbranch_reset(): number;
+        function sbranch_set_ruri(): number;
+        function xavp_params_explode(sparams: string, sxname: string): number;
+        function xavp_params_implode(sxname: string, svname: string): number;
+    }
+
+    export namespace rabbitmq {
+        function publish(exchange: string, routingkey: string, contenttype: string, messagebody: string): number;
+        function publish_consume(exchange: string, routingkey: string, contenttype: string, messagebody: string, dpv: string): number;
+    }
+
+    export namespace regex {
+        function pcre_match(string: string, regex: string): number;
+        function pcre_match_group(string: string, num_pcre: number): number;
+    }
+
+    export namespace registrar {
+        function add_sock_hdr(hdr_name: string): number;
+        function lookup(table: string): number;
+        function lookup_branches(_dtable: string): number;
+        function lookup_to_dset(table: string, uri: string): number;
+        function lookup_uri(table: string, uri: string): number;
+        function reg_fetch_contacts(dtable: string, uri: string, profile: string): number;
+        function reg_free_contacts(profile: string): number;
+        function registered(table: string): number;
+        function registered_action(_dtable: string, _uri: string, _f: number, _aflags: number): number;
+        function registered_flags(_dtable: string, _uri: string, _f: number): number;
+        function registered_uri(_dtable: string, _uri: string): number;
+        function save(table: string, flags: number): number;
+        function save_uri(table: string, flags: number, uri: string): number;
+        function set_q_override(new_q: string): number;
+        function unregister(_dtable: string, _uri: string): number;
+        function unregister_ruid(_dtable: string, _uri: string, _ruid: string): number;
+    }
+
+    export namespace rls {
+        function handle_notify(): number;
+        function handle_subscribe(): number;
+        function handle_subscribe_uri(wuri: string): number;
+        function update_subs(uri: string, event: string): number;
+    }
+
+    export namespace rr {
+        function add_rr_param(sparam: string): number;
+        function check_route_param(sre: string): number;
+        function is_direction(dir: string): number;
+        function loose_route(): number;
+        function record_route(): number;
+        function record_route_params(params: string): number;
+        function remove_record_route(): number;
+    }
+
+    export namespace rtjson {
+        function init_routes(rdoc: string): number;
+        function next_route(): number;
+        function push_routes(): number;
+        function update_branch(): number;
+    }
+
+    export namespace rtpengine {
+        function rtpengine_answer(flags: string): number;
+        function rtpengine_answer0(): number;
+        function rtpengine_delete(flags: string): number;
+        function rtpengine_delete0(): number;
+        function rtpengine_manage(flags: string): number;
+        function rtpengine_manage0(): number;
+        function rtpengine_offer(flags: string): number;
+        function rtpengine_offer0(): number;
+        function set_rtpengine_set(r1: number): number;
+        // This function is the sibling function to set_rtpengine_set().
+        // The original module function is declared as set_rtpengine_set(setid[, setid2]).
+        // In KEMI set_rtpengine_set() takes only the first parameter and set_rtpengine_set2() allows for the second optional parameter to be passed.
+        // Please review the documentation for set_rtpengine_set() for more information.
+        function set_rtpengine_set2(r1: number, r2: number): number;
+        function start_recording(): number;
+        function stop_recording(): number;
+    }
+
+    export namespace rtpproxy {
+        function rtpproxy_answer(flags: string): number;
+        function rtpproxy_answer0(): number;
+        function rtpproxy_answer_ip(flags: string, mip: string): number;
+        function rtpproxy_destroy(flags: string): number;
+        function rtpproxy_destroy0(): number;
+        function rtpproxy_manage(flags: string): number;
+        function rtpproxy_manage0(): number;
+        function rtpproxy_manage_ip(flags: string, mip: string): number;
+        function rtpproxy_offer(flags: string): number;
+        function rtpproxy_offer0(): number;
+        function rtpproxy_offer_ip(flags: string, mip: string): number;
+        function rtpproxy_stop_stream2uac(): number;
+        function rtpproxy_stop_stream2uas(): number;
+        function rtpproxy_stream2uac(pname: string, count: number): number;
+        function rtpproxy_stream2uas(pname: string, count: number): number;
+        function set_rtpproxy_set(rset: number): number;
+        function start_recording(): number;
+    }
+
+    export namespace sanity {
+        function sanity_check(mflags: number, uflags: number): number;
+        function sanity_check_defaults(): number;
+        function sanity_reply(): number;
+    }
+
+    export namespace sca {
+        function call_info_update(update_mask: number, uri_to: string, uri_from: string): number;
+        function call_info_update_default(): number;
+        function call_info_update_mask(umask: number): number;
+        function call_info_update_turi(umask: number, sto: string): number;
+        function handle_subscribe(): number;
+    }
+
+    export namespace sdpops {
+        function keep_codecs_by_id(codecs: string, media: string): number;
+        function keep_codecs_by_name(codecs: string, media: string): number;
+        function remove_codecs_by_id(codecs: string, media: string): number;
+        function remove_codecs_by_name(codecs: string, media: string): number;
+        function remove_line_by_prefix(prefix: string, media: string): number;
+        function remove_media(media: string): number;
+        function sdp_content(): number;
+        function sdp_content_flags(flags: number): number;
+        function sdp_get(avp: string): number;
+        function sdp_get_line_startswith(aname: string, sline: string): number;
+        function sdp_print(llevel: number): number;
+        function sdp_transport(avp: string): number;
+        function sdp_with_active_media(media: string): number;
+        function sdp_with_ice(): number;
+        function sdp_with_media(media: string): number;
+    }
+
+    export namespace sipcapture {
+        function float2int(_val: string, _coof: string): number;
+        function report_capture(_table: string): number;
+        function report_capture_cid(_table: string, _cid: string): number;
+        function report_capture_data(_table: string, _cid: string, _data: string): number;
+        function sip_capture(): number;
+        function sip_capture_forward(puri: string): number;
+        function sip_capture_mode(_table: string, _cmdata: string): number;
+        function sip_capture_table(_table: string): number;
+    }
+
+    export namespace sipdump {
+        function send(stag: string): number;
+    }
+
+    export namespace sipjson {
+        function sj_serialize(smode: string, pvn: string): number;
+    }
+
+    export namespace siptrace {
+        function hlog(message: string): number;
+        function hlog_cid(correlationid: string, message: string): number;
+        function sip_trace(): number;
+        function sip_trace_dst(duri: string): number;
+        function sip_trace_dst_cid(duri: string, cid: string): number;
+    }
+
+    export namespace siputils {
+        function has_totag(): number;
+        function is_alphanum(tval: string): number;
+        function is_alphanumex(tval: string, eset: string): number;
+        function is_first_hop(): number;
+        function is_numeric(tval: string): number;
+        function is_reply(): number;
+        function is_request(): number;
+        function is_tel_number(tval: string): number;
+        function is_uri(suri: string): number;
+        function is_user(suser: string): number;
+        function uri_param(sparam: string): number;
+        function uri_param_value(sparam: string, svalue: string): number;
+    }
+
+    export namespace sl {
+        function send_reply(code: number, reason: string): number;
+        function sl_forward_reply(code: string, reason: string): number;
+        function sl_reply_error(): number;
+        function sl_send_reply(code: number, reason: string): number;
+    }
+
+    export namespace speeddial {
+        function lookup(stable: string): number;
+        function lookup_owner(stable: string, sowner: string): number;
+    }
+
+    export namespace sqlops {
+        function sql_is_null(sres: string, i: number, j: number): number;
+        function sql_num_columns(sres: string): number;
+        function sql_num_rows(sres: string): number;
+        function sql_query(scon: string, squery: string, sres: string): number;
+        function sql_query_async(scon: string, squery: string): number;
+        function sql_result_free(sres: string): number;
+        function sql_xquery(scon: string, squery: string, xavp: string): number;
+    }
+
+    export namespace ss7ops {
+        function isup_to_json(proto: number): number;
+    }
+
+    export namespace sst {
+        function sst_check_min(flag: number): number;
+    }
+
+    export namespace statistics {
+        function reset_stat(sname: string): number;
+        function update_stat(sname: string, sval: number): number;
+    }
+
+    export namespace statsc {
+        function statsc_reset(): number;
+    }
+
+    export namespace statsd {
+        function statsd_decr(key: string): number;
+        function statsd_gauge(key: string, val: string): number;
+        function statsd_incr(key: string): number;
+        function statsd_set(key: string, val: string): number;
+        function statsd_start(key: string): number;
+        function statsd_stop(key: string): number;
+    }
+
+    export namespace tcpops {
+        function tcp_conid_alive(i_conid: number): number;
+        function tcp_conid_state(i_conid: number): number;
+        function tcp_enable_closed_event(): number;
+        function tcp_enable_closed_event_cid(i_conid: number): number;
+        function tcp_keepalive_disable(): number;
+        function tcp_keepalive_disable_cid(i_con: number): number;
+        function tcp_keepalive_enable(i_idle: number, i_cnt: number, i_intvl: number): number;
+        function tcp_keepalive_enable_cid(i_con: number, i_idle: number, i_cnt: number, i_intvl: number): number;
+        function tcp_set_connection_lifetime(i_time: number): number;
+        function tcp_set_connection_lifetime_cid(i_conid: number, i_time: number): number;
+    }
+
+    export namespace textops {
+        function append_body_part(txt: string, ct: string): number;
+        function append_body_part_cd(txt: string, ct: string, cd: string): number;
+        function append_body_part_hex(txt: string, ct: string): number;
+        function append_body_part_hex_cd(htxt: string, ct: string, cd: string): number;
+        function cmp_istr(s1: string, s2: string): number;
+        function cmp_str(s1: string, s2: string): number;
+        function filter_body(content_type: string): number;
+        function get_body_part(ctype: string, pvname: string): number;
+        function get_body_part_raw(ctype: string, pvname: string): number;
+        function has_body(): number;
+        function has_body_type(ctype: string): number;
+        function in_list(subject: string, list: string, vsep: string): number;
+        function in_list_prefix(subject: string, list: string, vsep: string): number;
+        function is_audio_on_hold(): number;
+        function is_present_hf(hname: string): number;
+        function is_present_hf_re(ematch: string): number;
+        function is_privacy(privacy: string): number;
+        function remove_body_part(content_type: string): number;
+        function remove_hf_exp(ematch: string, eskip: string): number;
+        function remove_hf_re(ematch: string): number;
+        function replace(sre: string, sval: string): number;
+        function replace_all(sre: string, sval: string): number;
+        function replace_body(sre: string, sval: string): number;
+        function replace_body_all(sre: string, sval: string): number;
+        function replace_body_atonce(sre: string, sval: string): number;
+        function replace_body_str(mkey: string, rval: string, rmode: string): number;
+        function replace_hdrs(sre: string, sval: string): number;
+        function replace_hdrs_str(mkey: string, rval: string, rmode: string): number;
+        function replace_str(mkey: string, rval: string, rmode: string): number;
+        function search(sre: string): number;
+        function search_append(ematch: string, val: string): number;
+        function search_append_body(ematch: string, val: string): number;
+        function search_body(sre: string): number;
+        function search_hf(hname: string, sre: string, flags: string): number;
+        function set_body(nb: string, nc: string): number;
+        function set_body_multipart(nbody: string, ctype: string, boundary: string): number;
+        function set_body_multipart_boundary(boundary: string): number;
+        function set_body_multipart_content(nbody: string, ctype: string): number;
+        function set_body_multipart_mode(): number;
+        function set_reply_body(nb: string, nc: string): number;
+        function starts_with(s1: string, s2: string): number;
+        function subst(subst: string): number;
+        function subst_body(subst: string): number;
+        function subst_hf(hname: string, subst: string, flags: string): number;
+        function subst_uri(subst: string): number;
+        function subst_user(subst: string): number;
+    }
+
+    export namespace textopsx {
+        function append_hf_value(hexp: string, val: string): number;
+        function assign_hf_value(hexp: string, val: string): number;
+        function assign_hf_value2(hexp: string, val: string): number;
+        function change_reply_status(code: number, reason: string): number;
+        function exclude_hf_value(hexp: string, val: string): number;
+        function fnmatch(val: string, match: string): number;
+        function fnmatch_ex(val: string, match: string, flags: string): number;
+        function hf_value_exists(hexp: string, val: string): number;
+        function include_hf_value(hexp: string, val: string): number;
+        function insert_hf_value(hexp: string, val: string): number;
+        function keep_hf(): number;
+        function keep_hf_re(sre: string): number;
+        function msg_apply_changes(): number;
+        function msg_set_buffer(obuf: string): number;
+        function remove_body(): number;
+        function remove_hf_value(hexp: string): number;
+        function remove_hf_value2(hexp: string, val: string): number;
+    }
+
+    export namespace tls {
+        function is_peer_verified(): number;
+    }
+
+    export namespace tm {
+        function t_any_replied(): number;
+        function t_any_timeout(): number;
+        function t_branch_replied(): number;
+        function t_branch_timeout(): number;
+        function t_check_status(sexp: string): number;
+        function t_check_trans(): number;
+        function t_drop_replies(mode: string): number;
+        function t_drop_replies_all(): number;
+        function t_grep_status(code: number): number;
+        function t_is_canceled(): number;
+        function t_is_expired(): number;
+        function t_is_retr_async_reply(): number;
+        function t_is_set(target: string): number;
+        function t_load_contacts(): number;
+        function t_lookup_cancel(): number;
+        function t_lookup_cancel_flags(flags: number): number;
+        function t_lookup_request(): number;
+        function t_newtran(): number;
+        function t_next_contact_flow(): number;
+        function t_next_contacts(): number;
+        function t_on_branch(rname: string): number;
+        function t_on_branch_failure(rname: string): number;
+        function t_on_failure(rname: string): number;
+        function t_on_reply(rname: string): number;
+        function t_relay(): number;
+        function t_release(): number;
+        function t_replicate(suri: string): number;
+        function t_reply(code: number, reason: string): number;
+        function t_reset_fr(): number;
+        function t_reset_max_lifetime(): number;
+        function t_reset_retr(): number;
+        function t_retransmit_reply(): number;
+        function t_save_lumps(): number;
+        function t_send_reply(code: number, reason: string): number;
+        function t_set_auto_inv_100(state: number): number;
+        function t_set_disable_6xx(state: number): number;
+        function t_set_disable_failover(state: number): number;
+        function t_set_disable_internal_reply(state: number): number;
+        function t_set_fr(fr_inv: number, fr: number): number;
+        function t_set_fr_inv(fr_inv: number): number;
+        function t_set_max_lifetime(t1: number, t2: number): number;
+        function t_set_no_e2e_cancel_reason(state: number): number;
+        function t_set_retr(t1: number, t2: number): number;
+        function t_uac_send(method: string, ruri: string, nexthop: string, ssock: string, hdrs: string, body: string): number;
+        function t_use_uac_headers(): number;
+    }
+
+    export namespace tmrec {
+        function is_leap_year(y: number): number;
+        function is_leap_year_now(): number;
+        function match(rv: string): number;
+        function match_timestamp(rv: string, ti: number): number;
+        function time_period_match(period: string): number;
+        function time_period_match_timestamp(period: string, ti: number): number;
+    }
+
+    export namespace tmx {
+        function t_cancel_branches(mode: string): number;
+        function t_cancel_callid(callid_s: string, cseq_s: string, fl: number): number;
+        function t_cancel_callid_reason(callid_s: string, cseq_s: string, fl: number, rcode: number): number;
+        function t_continue(tindex: number, tlabel: number, cbname: string): number;
+        function t_flush_flags(): number;
+        function t_flush_xflags(): number;
+        function t_is_branch_route(): number;
+        function t_is_failure_route(): number;
+        function t_is_reply_route(): number;
+        function t_is_request_route(): number;
+        function t_precheck_trans(): number;
+        function t_reply_callid(callid_s: string, cseq_s: string, code: number, status_s: string): number;
+        function t_reuse_branch(): number;
+        function t_suspend(): number;
+    }
+
+    export namespace tsilo {
+        function ts_append(_table: string, _ruri: string): number;
+        function ts_append_to(tindex: number, tlabel: number, _table: string): number;
+        function ts_append_to_uri(tindex: number, tlabel: number, _table: string, _uri: string): number;
+        function ts_store(): number;
+        function ts_store_uri(puri: string): number;
+    }
+
+    export namespace uac {
+        function uac_auth(): number;
+        function uac_reg_disable(attr: string, val: string): number;
+        function uac_reg_enable(attr: string, val: string): number;
+        function uac_reg_lookup(userid: string, sdst: string): number;
+        function uac_reg_refresh(l_uuid: string): number;
+        function uac_reg_request_to(userid: string, imode: number): number;
+        function uac_reg_status(sruuid: string): number;
+        function uac_replace_from(pdsp: string, puri: string): number;
+        function uac_replace_from_uri(puri: string): number;
+        function uac_replace_to(pdsp: string, puri: string): number;
+        function uac_replace_to_uri(puri: string): number;
+        function uac_req_send(): number;
+        function uac_restore_from(): number;
+        function uac_restore_to(): number;
+    }
+
+    export namespace uac_redirect {
+        function get_redirects(max_c: number, max_b: number): number;
+        function get_redirects_acc(max_c: number, max_b: number, reason: string): number;
+        function get_redirects_all(): number;
+    }
+
+    export namespace uri_db {
+        function check_from(): number;
+        function check_to(): number;
+        function check_uri(suri: string): number;
+        function check_uri_realm(suri: string, susername: string, srealm: string): number;
+        function does_uri_exist(): number;
+    }
+
+    export namespace userblacklist {
+        function check_user_blacklist(suser: string, sdomain: string): number;
+        function check_user_blacklist_number(suser: string, sdomain: string, snumber: string): number;
+        function check_user_blacklist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
+        function check_user_whitelist(suser: string, sdomain: string): number;
+        function check_user_whitelist_number(suser: string, sdomain: string, snumber: string): number;
+        function check_user_whitelist_table(suser: string, sdomain: string, snumber: string, stable: string): number;
+    }
+
+    export namespace utils {
+        function xcap_auth_status(watcher_uri: string, presentity_uri: string): number;
+    }
+
+    export namespace websocket {
+        function close(): number;
+        function close_conid(status: number, reason: string, con: number): number;
+        function close_reason(status: number, reason: string): number;
+        function handle_handshake(): number;
+    }
+
+    export namespace xcap_server {
+        function xcaps_del(uri: string, path: string): number;
+        function xcaps_get(uri: string, path: string): number;
+        function xcaps_put(uri: string, path: string, pbody: string): number;
+    }
+
+    export namespace xhttp {
+        function xhttp_reply(code: number, reason: string, ctype: string, body: string): number;
+    }
+
+    export namespace xhttp_pi {
+        function dispatch(): number;
+    }
+
+    export namespace xhttp_rpc {
+        function dispatch(): number;
+    }
+
+    export namespace xlog {
+        function xalert(lmsg: string): number;
+        function xcrit(lmsg: string): number;
+        function xdbg(lmsg: string): number;
+        function xerr(lmsg: string): number;
+        function xinfo(lmsg: string): number;
+        function xlog(slevel: string, lmsg: string): number;
+        function xnotice(lmsg: string): number;
+        function xwarn(lmsg: string): number;
+    }
+
+    export namespace xmlrpc {
+        function dispatch_rpc(): number;
+        function xmlrpc_reply(rcode: number, reason: string): number;
+    }
 }
diff --git a/types/kamailio-kemi/kamailio-kemi-tests.ts b/types/kamailio-kemi/kamailio-kemi-tests.ts
index 7eebc2cf8f..fc4b7e16e3 100644
--- a/types/kamailio-kemi/kamailio-kemi-tests.ts
+++ b/types/kamailio-kemi/kamailio-kemi-tests.ts
@@ -1,5 +1,3 @@
-import * as KSR from "kamailio-kemi";
-
 function ksr_request_route() {
     if (KSR.maxfwd.process_maxfwd(16) < 0) {
         KSR.sl.send_reply(483, "Too Many Hops");

From 448b80df33285e2b90ff23f1aec9d7aa2284b574 Mon Sep 17 00:00:00 2001
From: Andrej Mihajlov <and.mikhaylov@gmail.com>
Date: Sun, 17 Mar 2019 17:35:32 +0100
Subject: [PATCH 734/924] Update index.d.ts

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

diff --git a/types/opentok/index.d.ts b/types/opentok/index.d.ts
index 85b9794316..58fdfaa7ba 100644
--- a/types/opentok/index.d.ts
+++ b/types/opentok/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/opentok/opentok-node
 // Definitions by: Seth Westphal <https://github.com/westy92>
 //                 Anthony Messerschmidt <https://github.com/CatGuardian>
+//                 Andrej Mihajlov <https://github.com/pronebird>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'opentok' {
@@ -81,13 +82,13 @@ declare module 'opentok' {
   class OpenTok {
     constructor(apiKey: string, apiSecret: string);
 
-    public createSession(options: OpenTok.SessionOptions, callback: (err: Error, session: OpenTok.Session) => void): void;
+    public createSession(options: OpenTok.SessionOptions, callback: (error: Error | null, session?: OpenTok.Session) => void): void;
     public generateToken(sessionId: string, options: OpenTok.TokenOptions): OpenTok.Token;
-    public startArchive(sessionId: string, options: OpenTok.ArchiveOptions, callback: (err: Error, archive: OpenTok.Archive) => void): void;
-    public stopArchive(archiveId: string, callback: (err: Error, archive: OpenTok.Archive) => void): void;
-    public getArchive(archiveId: string, callback: (err: Error, archive: OpenTok.Archive) => void): void;
-    public deleteArchive(archiveId: string, callback: (err: Error) => void): void;
-    public listArchives(options: OpenTok.ListArchivesOptions, callback: (err: Error, archives: OpenTok.Archive[], totalCount: number) => void): void;
+    public startArchive(sessionId: string, options: OpenTok.ArchiveOptions, callback: (error: Error | null, archive?: OpenTok.Archive) => void): void;
+    public stopArchive(archiveId: string, callback: (error: Error | null, archive?: OpenTok.Archive) => void): void;
+    public getArchive(archiveId: string, callback: (error: Error | null, archive?: OpenTok.Archive) => void): void;
+    public deleteArchive(archiveId: string, callback: (error: Error | null) => void): void;
+    public listArchives(options: OpenTok.ListArchivesOptions, callback: (error: Error | null, archives?: OpenTok.Archive[], totalCount?: number) => void): void;
   }
 
   export = OpenTok;

From 464e281d3df23a4c08b8fd120a3e881c15d09cca Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Sun, 17 Mar 2019 21:03:28 -0400
Subject: [PATCH 735/924] feat(react-native): Add `textAlignVertical` prop to
 TextInput

---
 types/react-native/index.d.ts     | 5 +++++
 types/react-native/test/index.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2316ee63c9..1c6d6437d9 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1143,6 +1143,11 @@ export interface TextInputAndroidProps {
      * The color of the textInput underline.
      */
     underlineColorAndroid?: string;
+
+    /**
+     * Vertically align text when `multiline` is set to true
+     */
+    textAlignVertical?: "auto" | "top" | "bottom" | "center";
 }
 
 export type KeyboardType = "default" | "email-address" | "numeric" | "phone-pad";
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 74f8b6a9b5..49e1bab1ac 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -648,7 +648,7 @@ class TextInputTest extends React.Component<{}, { username: string }> {
 
                 <TextInput multiline onContentSizeChange={this.handleOnContentSizeChange} />
 
-                <TextInput contextMenuHidden={true} />
+                <TextInput contextMenuHidden={true} textAlignVertical="top"/>
             </View>
         );
     }

From 391c85bbfe2036e514fadcd8b2db181bf5edf203 Mon Sep 17 00:00:00 2001
From: Adrien Antoine <adriantoine@gmail.com>
Date: Mon, 18 Mar 2019 14:04:19 +0000
Subject: [PATCH 736/924] Added type definitions for react-text-truncate

---
 types/react-text-truncate/index.d.ts          | 24 ++++++++++++++++++
 .../react-text-truncate-tests.tsx             | 18 +++++++++++++
 types/react-text-truncate/tsconfig.json       | 25 +++++++++++++++++++
 types/react-text-truncate/tslint.json         |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/react-text-truncate/index.d.ts
 create mode 100644 types/react-text-truncate/react-text-truncate-tests.tsx
 create mode 100644 types/react-text-truncate/tsconfig.json
 create mode 100644 types/react-text-truncate/tslint.json

diff --git a/types/react-text-truncate/index.d.ts b/types/react-text-truncate/index.d.ts
new file mode 100644
index 0000000000..d0eca2e4a4
--- /dev/null
+++ b/types/react-text-truncate/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for react-text-truncate 0.14
+// Project: https://github.com/ShinyChang/react-text-truncate
+// Definitions by: Adrien Antoine <https://github.com/adriantoine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+export interface TextTruncateProps {
+    containerClassName?: string;
+    element?: string;
+    line?: number | boolean;
+    onCalculated?: () => void;
+    onTruncated?: () => void;
+    onToggled?: (truncated: boolean) => void;
+    text?: string;
+    textElement?: React.ReactNode;
+    textTruncateChild?: React.ReactNode;
+    truncateText?: string;
+    maxCalculateTimes?: number;
+}
+
+declare class TextTruncate extends React.Component<TextTruncateProps> {}
+
+export default TextTruncate;
diff --git a/types/react-text-truncate/react-text-truncate-tests.tsx b/types/react-text-truncate/react-text-truncate-tests.tsx
new file mode 100644
index 0000000000..b5c77ee28f
--- /dev/null
+++ b/types/react-text-truncate/react-text-truncate-tests.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import TextTruncate from 'react-text-truncate';
+
+const TruncatedText = () => (
+    <TextTruncate
+        text="My Text"
+        line={2}
+        containerClassName="my-container"
+        element="span"
+        onCalculated={() => {}}
+        onTruncated={() => {}}
+        onToggled={(truncate: boolean) => {}}
+        textElement={<div />}
+        textTruncateChild={<div />}
+        truncateText="..."
+        maxCalculateTimes={5}
+    />
+);
diff --git a/types/react-text-truncate/tsconfig.json b/types/react-text-truncate/tsconfig.json
new file mode 100644
index 0000000000..9dd3530bc3
--- /dev/null
+++ b/types/react-text-truncate/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-text-truncate-tests.tsx"
+    ]
+}
diff --git a/types/react-text-truncate/tslint.json b/types/react-text-truncate/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-text-truncate/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9016d4d79178e211b2514d0d006eae2bb632a6f9 Mon Sep 17 00:00:00 2001
From: Adrien Antoine <adriantoine@gmail.com>
Date: Mon, 18 Mar 2019 14:08:35 +0000
Subject: [PATCH 737/924] Added typescript version

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

diff --git a/types/react-text-truncate/index.d.ts b/types/react-text-truncate/index.d.ts
index d0eca2e4a4..21b4c537a1 100644
--- a/types/react-text-truncate/index.d.ts
+++ b/types/react-text-truncate/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ShinyChang/react-text-truncate
 // Definitions by: Adrien Antoine <https://github.com/adriantoine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 

From 342c184c9ba2f25cf8786c21ee24f3fd3432c024 Mon Sep 17 00:00:00 2001
From: BradleyHill <brad.hill@comcast.net>
Date: Mon, 18 Mar 2019 10:40:40 -0500
Subject: [PATCH 738/924] Fabricjs - cleanup Object.onDeselect (#33975)

* Fabricjs - cleanup Object.onDeselect (IText & Group don't need as extend Object). It receives an object with 2 optional params.

* Fabricjs - cleanup Object.onDeselect (IText & Group don't need as extend Object). It receives an object with 2 optional params. Strongly typed `Object`.

* Fabricjs - cleanup Object.onDeselect (IText & Group don't need as extend Object). It receives an object with 2 optional params. Might as well update the return type. Stole doc from implementation.
---
 types/fabric/fabric-impl.d.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 4e7fec0258..5b2a7c13af 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -2144,12 +2144,6 @@ export class ActiveSelection {
 	 * active object. no events fired.
 	 */
 	toGroup(): Group;
-	/**
-	 * If returns true, deselection is cancelled.
-	 * @since 2.0.0
-	 * @return {Boolean} [cancel]
-	 */
-	onDeselect(): boolean;
 	/**
 	 * Returns {@link fabric.ActiveSelection} instance from an object representation
 	 * @memberOf fabric.ActiveSelection
@@ -3500,8 +3494,9 @@ export class Object {
 	/**
 	 * This callback function is called every time _discardActiveObject or _setActiveObject
 	 * try to to deselect this object. If the function returns true, the process is cancelled
+     * @return {Boolean} true to cancel selection
 	 */
-	onDeselect(): void;
+	onDeselect(options: { e?: Event, object?: Object }): boolean;
 	/**
 	 * This callback function is called every time _discardActiveObject or _setActiveObject
 	 * try to to select this object. If the function returns true, the process is cancelled
@@ -4137,7 +4132,6 @@ export class IText extends Text {
 	 * Initializes all the interactive behavior of IText
 	 */
 	initBehavior(): void;
-	onDeselect(): void;
 	/**
 	 * Initializes "added" event handler
 	 */

From 40315c6637d7fee319b891020387fb556e74287b Mon Sep 17 00:00:00 2001
From: Satya Rohith <gsatyarohith@gmail.com>
Date: Mon, 18 Mar 2019 21:11:06 +0530
Subject: [PATCH 739/924] fix: use Device interface instead of an object
 (#33973)

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

diff --git a/types/viewport-list/index.d.ts b/types/viewport-list/index.d.ts
index 2c27ebdb06..ce6b21150a 100644
--- a/types/viewport-list/index.d.ts
+++ b/types/viewport-list/index.d.ts
@@ -6,10 +6,18 @@
 
 export = viewportList;
 
+interface Device {
+    name: string;
+    platform: string;
+    os: string;
+    size: string;
+    release: string;
+}
+
 /**
  * Returns a list of devices and their veiwports
  *
  * @param items - An array of device names to fetch
  * @returns - An array of viewports
  */
-declare function viewportList(items?: string[]): object[];
+declare function viewportList(items?: string[]): Device[];
diff --git a/types/viewport-list/viewport-list-tests.ts b/types/viewport-list/viewport-list-tests.ts
index 973296b666..14a91d7fd8 100644
--- a/types/viewport-list/viewport-list-tests.ts
+++ b/types/viewport-list/viewport-list-tests.ts
@@ -1,3 +1,3 @@
 import viewportList = require('viewport-list');
 
-viewportList(); // $ExpectType object[]
+viewportList(); // $ExpectType Device[]

From cef82d6e7c1986d43a5fac69c377771fe684209a Mon Sep 17 00:00:00 2001
From: Satya Rohith <gsatyarohith@gmail.com>
Date: Mon, 18 Mar 2019 21:11:31 +0530
Subject: [PATCH 740/924] fix: use interface instead of object (#33972)

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

diff --git a/types/get-res/get-res-tests.ts b/types/get-res/get-res-tests.ts
index d767a6d054..ccb060b0d6 100644
--- a/types/get-res/get-res-tests.ts
+++ b/types/get-res/get-res-tests.ts
@@ -1,3 +1,3 @@
 import getRes = require('get-res');
 
-getRes(); // $ExpectType Promise<object[]>
+getRes(); // $ExpectType Promise<Resolution[]>
diff --git a/types/get-res/index.d.ts b/types/get-res/index.d.ts
index 36fb22d94c..223d451910 100644
--- a/types/get-res/index.d.ts
+++ b/types/get-res/index.d.ts
@@ -6,9 +6,14 @@
 
 export = getRes;
 
+interface Resolution {
+    item: string;
+    percent: string;
+}
+
 /**
  * Get ten most popular screen resolutions
  *
  * @returns An array with the details of ten most popular screen resolutions
  */
-declare function getRes(): Promise<object[]>;
+declare function getRes(): Promise<Resolution[]>;

From 6131c006d3625142bbaeec6e846b0b08b318681b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Dole=C5=BEel?= <dolezel.jan@gmail.com>
Date: Mon, 18 Mar 2019 16:41:56 +0100
Subject: [PATCH 741/924] Updating dependency (#33968)

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

diff --git a/types/react-sortable-tree/package.json b/types/react-sortable-tree/package.json
index 2e009d2f82..41eb88b180 100644
--- a/types/react-sortable-tree/package.json
+++ b/types/react-sortable-tree/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "react-dnd": "^5.0.0"
+    "react-dnd": "5 || 6 || 7"
   }
 }

From 3d3b075589ccc34bbfea00c92f013e0183349a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?=
 <18708370+Flarna@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:42:58 +0100
Subject: [PATCH 742/924] [node] fix static-this lint issues (#33965)

---
 types/node/test/util.ts      | 16 ++++++++--------
 types/node/v10/node-tests.ts | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/types/node/test/util.ts b/types/node/test/util.ts
index 3af024972e..14500161fd 100644
--- a/types/node/test/util.ts
+++ b/types/node/test/util.ts
@@ -89,14 +89,14 @@ import { readFile } from 'fs';
         }
 
         static test(): void {
-            const cfn = util.callbackify(this.fn);
-            const cfnE = util.callbackify(this.fnE);
-            const cfnT1 = util.callbackify(this.fnT1);
-            const cfnT1E = util.callbackify(this.fnT1E);
-            const cfnTResult = util.callbackify(this.fnTResult);
-            const cfnTResultE = util.callbackify(this.fnTResultE);
-            const cfnT1TResult = util.callbackify(this.fnT1TResult);
-            const cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+            const cfn = util.callbackify(callbackifyTest.fn);
+            const cfnE = util.callbackify(callbackifyTest.fnE);
+            const cfnT1 = util.callbackify(callbackifyTest.fnT1);
+            const cfnT1E = util.callbackify(callbackifyTest.fnT1E);
+            const cfnTResult = util.callbackify(callbackifyTest.fnTResult);
+            const cfnTResultE = util.callbackify(callbackifyTest.fnTResultE);
+            const cfnT1TResult = util.callbackify(callbackifyTest.fnT1TResult);
+            const cfnT1TResultE = util.callbackify(callbackifyTest.fnT1TResultE);
 
             cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
             cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
index 6ae1c52bde..789b87b600 100644
--- a/types/node/v10/node-tests.ts
+++ b/types/node/v10/node-tests.ts
@@ -882,14 +882,14 @@ function bufferTests() {
             }
 
             static test(): void {
-                const cfn = util.callbackify(this.fn);
-                const cfnE = util.callbackify(this.fnE);
-                const cfnT1 = util.callbackify(this.fnT1);
-                const cfnT1E = util.callbackify(this.fnT1E);
-                const cfnTResult = util.callbackify(this.fnTResult);
-                const cfnTResultE = util.callbackify(this.fnTResultE);
-                const cfnT1TResult = util.callbackify(this.fnT1TResult);
-                const cfnT1TResultE = util.callbackify(this.fnT1TResultE);
+                const cfn = util.callbackify(callbackifyTest.fn);
+                const cfnE = util.callbackify(callbackifyTest.fnE);
+                const cfnT1 = util.callbackify(callbackifyTest.fnT1);
+                const cfnT1E = util.callbackify(callbackifyTest.fnT1E);
+                const cfnTResult = util.callbackify(callbackifyTest.fnTResult);
+                const cfnTResultE = util.callbackify(callbackifyTest.fnTResultE);
+                const cfnT1TResult = util.callbackify(callbackifyTest.fnT1TResult);
+                const cfnT1TResultE = util.callbackify(callbackifyTest.fnT1TResultE);
 
                 cfn((err: NodeJS.ErrnoException, ...args: string[]) => assert(err === null && args.length === 1 && args[0] === undefined));
                 cfnE((err: NodeJS.ErrnoException, ...args: string[]) => assert(err.message === 'fail' && args.length === 0));

From 59c441bc457f89cc5001da97c8c7ee6e8b2967fe Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Mon, 18 Mar 2019 08:44:39 -0700
Subject: [PATCH 743/924] [ember] ember-octane decorator types (#33963)

* [@ember/object] types for @action and @computed decorators

* [@ember/service] add support for ember-octane @inject decorator

* [@ember/object] absolute import in tests

* [@ember/controller] controller @inject decorator for ember-octane

* [ember] lint fixes

* [@ember/object] decorators for computed property macros in ember-octane
---
 types/ember/index.d.ts                        |   2 +-
 types/ember/test/helper.ts                    |   8 +-
 .../ember__controller-tests.ts                |  11 -
 types/ember__controller/index.d.ts            |   4 +-
 types/ember__controller/test/main.ts          |  14 +
 types/ember__controller/test/octane.ts        |  26 ++
 types/ember__controller/tsconfig.json         |   4 +-
 types/ember__object/computed.d.ts             | 308 ++++++++++++++--
 types/ember__object/index.d.ts                | 349 +++++-------------
 types/ember__object/test/octane.ts            | 217 +++++++++++
 types/ember__object/tsconfig.json             |   2 +
 types/ember__service/ember__service-tests.ts  |  38 --
 types/ember__service/index.d.ts               |   7 +-
 types/ember__service/test/main.ts             |  44 +++
 types/ember__service/test/octane.ts           |  28 ++
 types/ember__service/tsconfig.json            |   4 +-
 16 files changed, 724 insertions(+), 342 deletions(-)
 delete mode 100644 types/ember__controller/ember__controller-tests.ts
 create mode 100644 types/ember__controller/test/main.ts
 create mode 100644 types/ember__controller/test/octane.ts
 create mode 100644 types/ember__object/test/octane.ts
 delete mode 100644 types/ember__service/ember__service-tests.ts
 create mode 100644 types/ember__service/test/main.ts
 create mode 100644 types/ember__service/test/octane.ts

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index d7aaa35b36..d048007d8f 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Ember.js 3.0
+// Type definitions for Ember.js 3.1
 // Project: http://emberjs.com/, https://github.com/emberjs/ember
 // Definitions by: Jed Mao <https://github.com/jedmao>
 //                 bttf <https://github.com/bttf>
diff --git a/types/ember/test/helper.ts b/types/ember/test/helper.ts
index 4743841e31..ec4806b18f 100755
--- a/types/ember/test/helper.ts
+++ b/types/ember/test/helper.ts
@@ -14,8 +14,14 @@ class SessionService extends Ember.Service {
     currentUser: User;
 }
 
+declare module '@ember/service' {
+    interface Registry {
+        session: SessionService;
+    }
+}
+
 const CurrentUserEmailHelper = Ember.Helper.extend({
-    session: Ember.inject.service() as Ember.ComputedProperty<SessionService>,
+    session: Ember.inject.service('session'),
     onNewUser: Ember.observer('session.currentUser', function(this: Ember.Helper) {
         this.recompute();
     }),
diff --git a/types/ember__controller/ember__controller-tests.ts b/types/ember__controller/ember__controller-tests.ts
deleted file mode 100644
index 02307f447c..0000000000
--- a/types/ember__controller/ember__controller-tests.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import Controller from '@ember/controller';
-
-Controller.extend ({
-  queryParams: ['category'],
-  category: null,
-  isExpanded: false,
-
-  toggleBody() {
-    this.toggleProperty('isExpanded');
-  }
-});
diff --git a/types/ember__controller/index.d.ts b/types/ember__controller/index.d.ts
index 77522a3b29..5071811a85 100644
--- a/types/ember__controller/index.d.ts
+++ b/types/ember__controller/index.d.ts
@@ -31,9 +31,11 @@ export interface ControllerMixin extends ActionHandler {
 export const ControllerMixin: Mixin<ControllerMixin>;
 // tslint:disable-next-line:no-empty-interface
 export default class Controller extends EmberObject.extend(ControllerMixin) {}
+export function inject(): ComputedProperty<Controller> & PropertyDecorator;
 export function inject<K extends keyof Registry>(
     name: K
-): ComputedProperty<Registry[K]>;
+): ComputedProperty<Registry[K]> & PropertyDecorator;
+export function inject(target: object, propertyKey: string | symbol): void;
 
 // A type registry for Ember `Controller`s. Meant to be declaration-merged
 // so string lookups resolve to the correct type.
diff --git a/types/ember__controller/test/main.ts b/types/ember__controller/test/main.ts
new file mode 100644
index 0000000000..88722b0909
--- /dev/null
+++ b/types/ember__controller/test/main.ts
@@ -0,0 +1,14 @@
+import Controller, { inject } from "@ember/controller";
+
+Controller.extend({
+    queryParams: ["category"],
+    category: null,
+    isExpanded: false,
+
+    first: inject(),
+    second: inject('second'),
+
+    toggleBody() {
+        this.toggleProperty("isExpanded");
+    }
+});
diff --git a/types/ember__controller/test/octane.ts b/types/ember__controller/test/octane.ts
new file mode 100644
index 0000000000..9d4c73bf8d
--- /dev/null
+++ b/types/ember__controller/test/octane.ts
@@ -0,0 +1,26 @@
+import Controller, { inject } from "@ember/controller";
+
+class FirstController extends Controller {
+    foo = "bar";
+    @inject second: InstanceType<typeof SecondController>;
+    @inject() otherSecond: InstanceType<typeof SecondController>;
+    @inject("second") moreSecond: InstanceType<typeof SecondController>;
+
+    first() {
+        return "";
+    }
+}
+const SecondController = Controller.extend({
+    foo: "bar",
+
+    second() {
+        return "";
+    }
+});
+
+declare module "@ember/controller" {
+    interface Registry {
+        first: FirstController;
+        second: InstanceType<typeof SecondController>;
+    }
+}
diff --git a/types/ember__controller/tsconfig.json b/types/ember__controller/tsconfig.json
index 865ec007ac..5ca97b037a 100644
--- a/types/ember__controller/tsconfig.json
+++ b/types/ember__controller/tsconfig.json
@@ -10,6 +10,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "experimentalDecorators": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -25,6 +26,7 @@
     },
     "files": [
         "index.d.ts",
-        "ember__controller-tests.ts"
+        "test/main.ts",
+        "test/octane.ts"
     ]
 }
diff --git a/types/ember__object/computed.d.ts b/types/ember__object/computed.d.ts
index e63ee86294..8053c5a82a 100644
--- a/types/ember__object/computed.d.ts
+++ b/types/ember__object/computed.d.ts
@@ -1,4 +1,4 @@
-import { computed } from '@ember/object';
+import { computed } from "@ember/object";
 
 /**
  * A computed property transforms an objects function into a property.
@@ -36,13 +36,70 @@ export default class ComputedProperty<Get, Set = Get> {
     meta(): {};
 }
 
-export const alias: typeof computed.alias;
-export const and: typeof computed.and;
-export const bool: typeof computed.bool;
-export const collect: typeof computed.collect;
-export const deprecatingAlias: typeof computed.deprecatingAlias;
-export const empty: typeof computed.empty;
-export const equal: typeof computed.equal;
+/**
+ * Creates a new property that is an alias for another property
+ * on an object. Calls to `get` or `set` this property behave as
+ * though they were called on the original property.
+ */
+export function alias(
+    dependentKey: string
+): ComputedProperty<any> & PropertyDecorator;
+/**
+ * A computed property that performs a logical `and` on the
+ * original values for the provided dependent properties.
+ */
+export function and(
+    ...dependentKeys: string[]
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that converts the provided dependent property
+ * into a boolean value.
+ */
+export function bool(
+    dependentKey: string
+): ComputedProperty<boolean> & PropertyDecorator;
+
+/**
+ * A computed property that returns the array of values
+ * for the provided dependent properties.
+ */
+export function collect(
+    ...dependentKeys: string[]
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * Creates a new property that is an alias for another property
+ * on an object. Calls to `get` or `set` this property behave as
+ * though they were called on the original property, but also
+ * print a deprecation warning.
+ */
+export function deprecatingAlias(
+    dependentKey: string,
+    options: { id: string; until: string }
+): ComputedProperty<any> & PropertyDecorator;
+/**
+ * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
+ */
+export function deprecatingAlias(
+    dependentKey: string,
+    options?: { id?: string; until?: string }
+): ComputedProperty<any> & PropertyDecorator;
+
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is null, an empty string, empty array, or empty function.
+ */
+export function empty(
+    dependentKey: string
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is equal to the given value.
+ */
+export function equal(
+    dependentKey: string,
+    value: any
+): ComputedProperty<boolean> & PropertyDecorator;
 /**
  * Expands `pattern`, invoking `callback` for each expansion.
  */
@@ -50,28 +107,213 @@ export function expandProperties(
     pattern: string,
     callback: (expanded: string) => void
 ): void;
-export const filter: typeof computed.filter;
-export const filterBy: typeof computed.filterBy;
-export const gt: typeof computed.gt;
-export const gte: typeof computed.gte;
-export const intersect: typeof computed.intersect;
-export const lt: typeof computed.lt;
-export const lte: typeof computed.lte;
-export const map: typeof computed.map;
-export const mapBy: typeof computed.mapBy;
-export const match: typeof computed.match;
-export const max: typeof computed.max;
-export const min: typeof computed.min;
-export const none: typeof computed.none;
-export const not: typeof computed.not;
-export const notEmpty: typeof computed.notEmpty;
-export const oneWay: typeof computed.oneWay;
-export const or: typeof computed.or;
-export const readOnly: typeof computed.readOnly;
-export const reads: typeof computed.reads;
-export const setDiff: typeof computed.setDiff;
-export const sort: typeof computed.sort;
-export const sum: typeof computed.sum;
-export const union: typeof computed.union;
-export const uniq: typeof computed.uniq;
-export const uniqBy: typeof computed.uniqBy;
+
+/**
+ * Filters the array by the callback.
+ */
+export function filter(
+    dependentKey: string,
+    callback: (value: any, index: number, array: any[]) => boolean
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * Filters the array by the property and value
+ */
+export function filterBy(
+    dependentKey: string,
+    propertyKey: string,
+    value?: any
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property that returns true if the provided dependent property
+ * is greater than the provided value.
+ */
+export function gt(
+    dependentKey: string,
+    value: number
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is greater than or equal to the provided value.
+ */
+export function gte(
+    dependentKey: string,
+    value: number
+): ComputedProperty<boolean> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the elements
+ * two or more dependent arrays have in common.
+ */
+export function intersect(
+    ...propertyKeys: string[]
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property that returns true if the provided dependent property
+ * is less than the provided value.
+ */
+export function lt(
+    dependentKey: string,
+    value: number
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is less than or equal to the provided value.
+ */
+export function lte(
+    dependentKey: string,
+    value: number
+): ComputedProperty<boolean> & PropertyDecorator;
+
+/**
+ * Returns an array mapped via the callback
+ */
+export function map<U>(
+    dependentKey: string,
+    callback: (value: any, index: number, array: any[]) => U
+): ComputedProperty<U[]> & PropertyDecorator;
+
+/**
+ * Returns an array mapped to the specified key.
+ */
+export function mapBy(
+    dependentKey: string,
+    propertyKey: string
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property which matches the original value for the
+ * dependent property against a given RegExp, returning `true`
+ * if the value matches the RegExp and `false` if it does not.
+ */
+export function match(
+    dependentKey: string,
+    regexp: RegExp
+): ComputedProperty<boolean> & PropertyDecorator;
+
+/**
+ * A computed property that calculates the maximum value in the
+ * dependent array. This will return `-Infinity` when the dependent
+ * array is empty.
+ */
+export function max(
+    dependentKey: string
+): ComputedProperty<number> & PropertyDecorator;
+
+/**
+ * A computed property that calculates the minimum value in the
+ * dependent array. This will return `Infinity` when the dependent
+ * array is empty.
+ */
+export function min(
+    dependentKey: string
+): ComputedProperty<number> & PropertyDecorator;
+
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is null or undefined. This avoids errors from JSLint complaining
+ * about use of ==, which can be technically confusing.
+ */
+export function none(
+    dependentKey: string
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that returns the inverse boolean value
+ * of the original value for the dependent property.
+ */
+export function not(
+    dependentKey: string
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is NOT null, an empty string, empty array, or empty function.
+ */
+export function notEmpty(
+    dependentKey: string
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+ * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+ * not mutate the upstream property, rather causes the current property to
+ * become the value set. This causes the downstream property to permanently
+ * diverge from the upstream property.
+ */
+export function oneWay(
+    dependentKey: string
+): ComputedProperty<any> & PropertyDecorator;
+/**
+ * A computed property which performs a logical `or` on the
+ * original values for the provided dependent properties.
+ */
+export function or(
+    ...dependentKeys: string[]
+): ComputedProperty<boolean> & PropertyDecorator;
+/**
+ * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+ * a readOnly one way binding. Very often when using `computed.oneWay` one does
+ * not also want changes to propagate back up, as they will replace the value.
+ */
+export function readOnly(
+    dependentKey: string
+): ComputedProperty<any> & PropertyDecorator;
+/**
+ * This is a more semantically meaningful alias of `computed.oneWay`,
+ * whose name is somewhat ambiguous as to which direction the data flows.
+ */
+export function reads(
+    dependentKey: string
+): ComputedProperty<any> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the
+ * properties from the first dependent array that are not in the second
+ * dependent array.
+ */
+export function setDiff(
+    setAProperty: string,
+    setBProperty: string
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the
+ * properties from the first dependent array sorted based on a property
+ * or sort function.
+ */
+export function sort(
+    itemsKey: string,
+    sortDefinition: string | ((itemA: any, itemB: any) => number)
+): ComputedProperty<any[]> & PropertyDecorator;
+/**
+ * A computed property that returns the sum of the values
+ * in the dependent array.
+ */
+export function sum(
+    dependentKey: string
+): ComputedProperty<number> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from one or more dependent arrays.
+ */
+export function uniq(
+    propertyKey: string
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from one or more dependent arrays.
+ */
+export function union(
+    ...propertyKeys: string[]
+): ComputedProperty<any[]> & PropertyDecorator;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from an array, with uniqueness determined by specific key.
+ */
+export function uniqBy(
+    dependentKey: string,
+    propertyKey: string
+): ComputedProperty<any[]> & PropertyDecorator;
diff --git a/types/ember__object/index.d.ts b/types/ember__object/index.d.ts
index f287a51a90..fb5a76efd2 100644
--- a/types/ember__object/index.d.ts
+++ b/types/ember__object/index.d.ts
@@ -1,19 +1,20 @@
-// Type definitions for non-npm package @ember/object 3.0
+// Type definitions for non-npm package @ember/object 3.1
 // Project: https://emberjs.com/api/ember/3.4/modules/@ember%2Fobject
 // Definitions by: Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import CoreObject from '@ember/object/core';
-import Observable from '@ember/object/observable';
+import CoreObject from "@ember/object/core";
+import Observable from "@ember/object/observable";
 import {
     ComputedPropertyCallback,
     UnwrapComputedPropertyGetter,
     UnwrapComputedPropertySetter,
     UnwrapComputedPropertyGetters,
-    UnwrapComputedPropertySetters
-} from '@ember/object/-private/types';
-import ComputedProperty from '@ember/object/computed';
+    UnwrapComputedPropertySetters,
+    ExtractPropertyNamesOfType
+} from "@ember/object/-private/types";
+import ComputedProperty, * as ComputedNamespace from "@ember/object/computed";
 
 /**
  * `Ember.Object` is the main base class for all Ember objects. It is a subclass
@@ -21,252 +22,96 @@ import ComputedProperty from '@ember/object/computed';
  * see the documentation for each of these.
  */
 export default class EmberObject extends CoreObject.extend(Observable) {}
+declare function computed(...deps: string[]): (target: object, propertyKey: string) => void;
+declare function computed<T>(
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    k2: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    k2: string,
+    k3: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    k2: string,
+    k3: string,
+    k4: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    k2: string,
+    k3: string,
+    k4: string,
+    k5: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed<T>(
+    k1: string,
+    k2: string,
+    k3: string,
+    k4: string,
+    k5: string,
+    k6: string,
+    cb: ComputedPropertyCallback<T>
+): ComputedProperty<T>;
+declare function computed(
+    k1: string,
+    k2: string,
+    k3: string,
+    k4: string,
+    k5: string,
+    k6: string,
+    k7: string,
+    ...rest: any[]
+): ComputedProperty<any>;
 
-export const computed: {
-    <T>(cb: ComputedPropertyCallback<T>): ComputedProperty<T>;
-    <T>(k1: string, cb: ComputedPropertyCallback<T>): ComputedProperty<T>;
-    <T>(
-        k1: string,
-        k2: string,
-        cb: ComputedPropertyCallback<T>
-    ): ComputedProperty<T>;
-    <T>(
-        k1: string,
-        k2: string,
-        k3: string,
-        cb: ComputedPropertyCallback<T>
-    ): ComputedProperty<T>;
-    <T>(
-        k1: string,
-        k2: string,
-        k3: string,
-        k4: string,
-        cb: ComputedPropertyCallback<T>
-    ): ComputedProperty<T>;
-    <T>(
-        k1: string,
-        k2: string,
-        k3: string,
-        k4: string,
-        k5: string,
-        cb: ComputedPropertyCallback<T>
-    ): ComputedProperty<T>;
-    <T>(
-        k1: string,
-        k2: string,
-        k3: string,
-        k4: string,
-        k5: string,
-        k6: string,
-        cb: ComputedPropertyCallback<T>
-    ): ComputedProperty<T>;
-    (
-        k1: string,
-        k2: string,
-        k3: string,
-        k4: string,
-        k5: string,
-        k6: string,
-        k7: string,
-        ...rest: any[]
-    ): ComputedProperty<any>;
+declare namespace computed {
+    const empty: typeof ComputedNamespace.empty;
+    const notEmpty: typeof ComputedNamespace.notEmpty;
+    const none: typeof ComputedNamespace.none;
+    const not: typeof ComputedNamespace.not;
+    const bool: typeof ComputedNamespace.bool;
+    const match: typeof ComputedNamespace.match;
+    const equal: typeof ComputedNamespace.equal;
+    const gt: typeof ComputedNamespace.gt;
+    const gte: typeof ComputedNamespace.gte;
+    const lt: typeof ComputedNamespace.lt;
+    const lte: typeof ComputedNamespace.lte;
+    const and: typeof ComputedNamespace.and;
+    const or: typeof ComputedNamespace.or;
+    const alias: typeof ComputedNamespace.alias;
+    const oneWay: typeof ComputedNamespace.oneWay;
+    const reads: typeof ComputedNamespace.reads;
+    const readOnly: typeof ComputedNamespace.readOnly;
+    const deprecatingAlias: typeof ComputedNamespace.deprecatingAlias;
+    const sum: typeof ComputedNamespace.sum;
+    const max: typeof ComputedNamespace.max;
+    const min: typeof ComputedNamespace.min;
+    const map: typeof ComputedNamespace.map;
+    const mapBy: typeof ComputedNamespace.mapBy;
+    const filter: typeof ComputedNamespace.filter;
+    const filterBy: typeof ComputedNamespace.filterBy;
+    const uniq: typeof ComputedNamespace.uniq;
+    const uniqBy: typeof ComputedNamespace.uniqBy;
+    const union: typeof ComputedNamespace.union;
+    const intersect: typeof ComputedNamespace.intersect;
+    const setDiff: typeof ComputedNamespace.setDiff;
+    const collect: typeof ComputedNamespace.collect;
+    const sort: typeof ComputedNamespace.sort;
+}
 
-    /**
-     * A computed property that returns true if the value of the dependent
-     * property is null, an empty string, empty array, or empty function.
-     */
-    empty(dependentKey: string): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the value of the dependent
-     * property is NOT null, an empty string, empty array, or empty function.
-     */
-    notEmpty(dependentKey: string): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the value of the dependent
-     * property is null or undefined. This avoids errors from JSLint complaining
-     * about use of ==, which can be technically confusing.
-     */
-    none(dependentKey: string): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns the inverse boolean value
-     * of the original value for the dependent property.
-     */
-    not(dependentKey: string): ComputedProperty<boolean>;
-    /**
-     * A computed property that converts the provided dependent property
-     * into a boolean value.
-     */
-    bool(dependentKey: string): ComputedProperty<boolean>;
-    /**
-     * A computed property which matches the original value for the
-     * dependent property against a given RegExp, returning `true`
-     * if the value matches the RegExp and `false` if it does not.
-     */
-    match(dependentKey: string, regexp: RegExp): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the provided dependent property
-     * is equal to the given value.
-     */
-    equal(dependentKey: string, value: any): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the provided dependent property
-     * is greater than the provided value.
-     */
-    gt(dependentKey: string, value: number): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the provided dependent property
-     * is greater than or equal to the provided value.
-     */
-    gte(dependentKey: string, value: number): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the provided dependent property
-     * is less than the provided value.
-     */
-    lt(dependentKey: string, value: number): ComputedProperty<boolean>;
-    /**
-     * A computed property that returns true if the provided dependent property
-     * is less than or equal to the provided value.
-     */
-    lte(dependentKey: string, value: number): ComputedProperty<boolean>;
-    /**
-     * A computed property that performs a logical `and` on the
-     * original values for the provided dependent properties.
-     */
-    and(...dependentKeys: string[]): ComputedProperty<boolean>;
-    /**
-     * A computed property which performs a logical `or` on the
-     * original values for the provided dependent properties.
-     */
-    or(...dependentKeys: string[]): ComputedProperty<boolean>;
-    /**
-     * Creates a new property that is an alias for another property
-     * on an object. Calls to `get` or `set` this property behave as
-     * though they were called on the original property.
-     */
-    alias(dependentKey: string): ComputedProperty<any>;
-    /**
-     * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
-     * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
-     * not mutate the upstream property, rather causes the current property to
-     * become the value set. This causes the downstream property to permanently
-     * diverge from the upstream property.
-     */
-    oneWay(dependentKey: string): ComputedProperty<any>;
-    /**
-     * This is a more semantically meaningful alias of `computed.oneWay`,
-     * whose name is somewhat ambiguous as to which direction the data flows.
-     */
-    reads(dependentKey: string): ComputedProperty<any>;
-    /**
-     * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
-     * a readOnly one way binding. Very often when using `computed.oneWay` one does
-     * not also want changes to propagate back up, as they will replace the value.
-     */
-    readOnly(dependentKey: string): ComputedProperty<any>;
-    /**
-     * Creates a new property that is an alias for another property
-     * on an object. Calls to `get` or `set` this property behave as
-     * though they were called on the original property, but also
-     * print a deprecation warning.
-     */
-    deprecatingAlias(
-        dependentKey: string,
-        options: { id: string; until: string }
-    ): ComputedProperty<any>;
-    /**
-     * @deprecated Missing deprecation options: https://emberjs.com/deprecations/v2.x/#toc_ember-debug-function-options
-     */
-    deprecatingAlias(
-        dependentKey: string,
-        options?: { id?: string; until?: string }
-    ): ComputedProperty<any>;
-    /**
-     * A computed property that returns the sum of the values
-     * in the dependent array.
-     */
-    sum(dependentKey: string): ComputedProperty<number>;
-    /**
-     * A computed property that calculates the maximum value in the
-     * dependent array. This will return `-Infinity` when the dependent
-     * array is empty.
-     */
-    max(dependentKey: string): ComputedProperty<number>;
-    /**
-     * A computed property that calculates the minimum value in the
-     * dependent array. This will return `Infinity` when the dependent
-     * array is empty.
-     */
-    min(dependentKey: string): ComputedProperty<number>;
-    /**
-     * Returns an array mapped via the callback
-     */
-    map<U>(
-        dependentKey: string,
-        callback: (value: any, index: number, array: any[]) => U
-    ): ComputedProperty<U[]>;
-    /**
-     * Returns an array mapped to the specified key.
-     */
-    mapBy(dependentKey: string, propertyKey: string): ComputedProperty<any[]>;
-    /**
-     * Filters the array by the callback.
-     */
-    filter(
-        dependentKey: string,
-        callback: (value: any, index: number, array: any[]) => boolean
-    ): ComputedProperty<any[]>;
-    /**
-     * Filters the array by the property and value
-     */
-    filterBy(
-        dependentKey: string,
-        propertyKey: string,
-        value?: any
-    ): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the unique
-     * elements from one or more dependent arrays.
-     */
-    uniq(propertyKey: string): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the unique
-     * elements from an array, with uniqueness determined by specific key.
-     */
-    uniqBy(dependentKey: string, propertyKey: string): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the unique
-     * elements from one or more dependent arrays.
-     */
-    union(...propertyKeys: string[]): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the elements
-     * two or more dependent arrays have in common.
-     */
-    intersect(...propertyKeys: string[]): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the
-     * properties from the first dependent array that are not in the second
-     * dependent array.
-     */
-    setDiff(
-        setAProperty: string,
-        setBProperty: string
-    ): ComputedProperty<any[]>;
-    /**
-     * A computed property that returns the array of values
-     * for the provided dependent properties.
-     */
-    collect(...dependentKeys: string[]): ComputedProperty<any[]>;
-    /**
-     * A computed property which returns a new array with all the
-     * properties from the first dependent array sorted based on a property
-     * or sort function.
-     */
-    sort(
-        itemsKey: string,
-        sortDefinition: string | ((itemA: any, itemB: any) => number)
-    ): ComputedProperty<any[]>;
-};
+export { computed };
 /**
  * Specify a method that observes property changes.
  */
@@ -387,7 +232,9 @@ export function defineProperty(
 
 export function notifyPropertyChange(obj: object, keyName: string): void;
 
-declare module '@ember/utils/-private/types' {
+export const action: MethodDecorator;
+
+declare module "@ember/utils/-private/types" {
     interface TypeLookup {
         class: typeof EmberObject;
         instance: EmberObject;
diff --git a/types/ember__object/test/octane.ts b/types/ember__object/test/octane.ts
new file mode 100644
index 0000000000..d475cab777
--- /dev/null
+++ b/types/ember__object/test/octane.ts
@@ -0,0 +1,217 @@
+import { action, computed, default as EmberObject } from "@ember/object";
+import {
+    alias,
+    and,
+    bool,
+    collect,
+    deprecatingAlias,
+    empty,
+    equal,
+    filter,
+    filterBy,
+    gt,
+    gte,
+    intersect,
+    lt,
+    lte,
+    map,
+    mapBy,
+    match,
+    max,
+    min,
+    none,
+    not,
+    notEmpty,
+    oneWay,
+    or,
+    readOnly,
+    reads,
+    setDiff,
+    sort,
+    sum,
+    union,
+    uniq,
+    uniqBy
+} from "@ember/object/computed";
+
+// Native class syntax
+class Foo extends EmberObject {
+    firstName: string;
+    lastName: string;
+
+    @action // $ExpectError
+    bar: string;
+
+    @computed("firstName", "lastName")
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+
+    @action
+    foo() {}
+}
+
+// Computed property macros
+
+class Bar extends EmberObject {
+    firstName: string;
+    last: string;
+
+    values: number[];
+
+    @alias aliasTest0: string; // $ExpectError
+    @alias() aliasTest1: string; // $ExpectError
+    @alias("firstName") aliasTest2: string;
+
+    @and andTest0: boolean; // $ExpectError
+    @and() andTest1: boolean;
+    @and("firstName") andTest2: boolean;
+    @and("firstName", "lastName") andTest3: boolean;
+
+    @bool boolTest0: boolean; // $ExpectError
+    @bool() boolTest1: boolean; // $ExpectError
+    @bool("firstName") boolTest2: boolean;
+
+    @collect collectTest0: any; // $ExpectError
+    @collect() collectTest1: any;
+    @collect("firstName") collectTest2: any;
+
+    @deprecatingAlias deprecatingAliasTest0: string; // $ExpectError
+    @deprecatingAlias() deprecatingAliasTest1: string; // $ExpectError
+    @deprecatingAlias("firstName") deprecatingAliasTest2: string;
+
+    @empty emptyTest0: boolean; // $ExpectError
+    @empty() emptyTest1: boolean; // $ExpectError
+    @empty("firstName") emptyTest2: boolean;
+
+    @equal equalTest0: boolean; // $ExpectError
+    @equal() equalTest1: boolean; // $ExpectError
+    @equal("firstName") equalTest2: boolean; // $ExpectError
+    @equal("firstName", "lastName") equalTest3: boolean;
+
+    @filter filterTest1: string[]; // $ExpectError
+    @filter() filterTest2: string[]; // $ExpectError
+    @filter("firstName") filterTest3: string[]; // $ExpectError
+    @filter("firstName", x => x) filterTest4: string[];
+
+    @filterBy filterByTest1: any[]; // $ExpectError
+    @filterBy() filterByTest2: any[]; // $ExpectError
+    @filterBy("firstName") filterByTest3: any[]; // $ExpectError
+    @filterBy("firstName", "id") filterByTest4: any[];
+
+    @gt gtTest1: boolean; // $ExpectError
+    @gt() gtTest2: boolean; // $ExpectError
+    @gt("firstName") gtTest3: boolean; // $ExpectError
+    @gt("firstName", 3) gtTest4: boolean;
+
+    @gte gteTest1: boolean; // $ExpectError
+    @gte() gteTest2: boolean; // $ExpectError
+    @gte("firstName") gteTest3: boolean; // $ExpectError
+    @gte("firstName", 3) gteTest4: boolean;
+
+    @intersect intersectTest1: any; // $ExpectError
+    @intersect() intersectTest2: any;
+    @intersect("firstName") intersectTest3: any;
+    @intersect("firstName", "lastName") intersectTest4: any;
+
+    @lt ltTest1: boolean; // $ExpectError
+    @lt() ltTest2: boolean; // $ExpectError
+    @lt("firstName") ltTest3: boolean; // $ExpectError
+    @lt("firstName", 3) ltTest4: boolean;
+
+    @lte lteTest1: boolean; // $ExpectError
+    @lte() lteTest2: boolean; // $ExpectError
+    @lte("firstName") lteTest3: boolean; // $ExpectError
+    @lte("firstName", 3) lteTest4: boolean;
+
+    @map mapTest1: string[]; // $ExpectError
+    @map() mapTest2: string[]; // $ExpectError
+    @map("firstName") mapTest3: string[]; // $ExpectError
+    @map("firstName", x => x) mapTest4: string[];
+
+    @mapBy mapByTest1: any[]; // $ExpectError
+    @mapBy() mapByTest2: any[]; // $ExpectError
+    @mapBy("firstName") mapByTest3: any[]; // $ExpectError
+    @mapBy("firstName", "id") mapByTest4: any[];
+
+    @match matchTest1: boolean; // $ExpectError
+    @match() matchTest2: boolean; // $ExpectError
+    @match("firstName") matchTest3: boolean; // $ExpectError
+    @match("firstName", "abc") matchTest4: boolean; // $ExpectError
+    @match("firstName", /\s+/) matchTest5: boolean;
+
+    @max maxTest1: number; // $ExpectError
+    @max() maxTest2: number; // $ExpectError
+    @max("values") maxTest3: number;
+    @max("values", "a") maxTest4: number; // $ExpectError
+
+    @min minTest1: number; // $ExpectError
+    @min() minTest2: number; // $ExpectError
+    @min("values") minTest3: number;
+    @min("values", "a") minTest4: number; // $ExpectError
+
+    @none noneTest1: number; // $ExpectError
+    @none() noneTest2: number; // $ExpectError
+    @none("values") noneTest3: number;
+    @none("values", "a") noneTest4: number; // $ExpectError
+
+    @not notTest1: number; // $ExpectError
+    @not() notTest2: number; // $ExpectError
+    @not("values") notTest3: number;
+    @not("values", "a") notTest4: number; // $ExpectError
+
+    @notEmpty notEmptyTest1: boolean; // $ExpectError
+    @notEmpty() notEmptyTest2: boolean; // $ExpectError
+    @notEmpty("firstName") notEmptyTest3: boolean;
+    @notEmpty("firstName", "a") notEmptyTest4: boolean; // $ExpectError
+
+    @oneWay oneWayTest1: boolean; // $ExpectError
+    @oneWay() oneWayTest2: boolean; // $ExpectError
+    @oneWay("firstName") oneWayTest3: boolean;
+    @oneWay("firstName", "b") oneWayTest4: boolean; // $ExpectError
+
+    @or orTest1: boolean; // $ExpectError
+    @or() orTest2: boolean;
+    @or("firstName") orTest3: boolean;
+    @or("firstName", "lastName") orTest4: boolean;
+
+    @readOnly readOnlyTest1: boolean; // $ExpectError
+    @readOnly() readOnlyTest2: boolean; // $ExpectError
+    @readOnly("firstName") readOnlyTest3: boolean;
+
+    @reads readsTest1: boolean; // $ExpectError
+    @reads() readsTest2: boolean; // $ExpectError
+    @reads("firstName") readsTest3: boolean;
+    @reads("firstName", "a") readsTest4: boolean; // $ExpectError
+
+    @setDiff setDiffTest1: number; // $ExpectError
+    @setDiff() setDiffTest2: number; // $ExpectError
+    @setDiff("values") setDiffTest3: number; // $ExpectError
+    @setDiff("values", "otherThing") setDiffTest4: number;
+    @setDiff("values", "otherThing", "a") setDiffTest5: number; // $ExpectError
+
+    @sort sortTest1: number; // $ExpectError
+    @sort() sortTest2: number; // $ExpectError
+    @sort("values") sortTest3: number; // $ExpectError
+    @sort("values", "id") sortTest4: number;
+    @sort("values", "id", "a") sortTest5: number; // $ExpectError
+    @sort("values", (a, b) => a - b) sortTest6: number;
+
+    @sum sumTest1: number; // $ExpectError
+    @sum() sumTest2: number; // $ExpectError
+    @sum("values") sumTest3: number;
+
+    @union unionTest1: any; // $ExpectError
+    @union() unionTest2: any;
+    @union("firstName") unionTest3: any;
+    @union("firstName", "lastName") unionTest4: any;
+
+    @uniq uniqTest1: number; // $ExpectError
+    @uniq() uniqTest2: number; // $ExpectError
+    @uniq("values") uniqTest3: number;
+
+    @uniqBy uniqByTest1: number; // $ExpectError
+    @uniqBy() uniqByTest2: number; // $ExpectError
+    @uniqBy("values") uniqByTest3: number; // $ExpectError
+    @uniqBy("values", "id") uniqByTest4: number;
+}
diff --git a/types/ember__object/tsconfig.json b/types/ember__object/tsconfig.json
index deeb128e7b..5f6af3fbda 100644
--- a/types/ember__object/tsconfig.json
+++ b/types/ember__object/tsconfig.json
@@ -11,6 +11,7 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
+        "experimentalDecorators": true,
         "typeRoots": [
             "../"
         ],
@@ -49,6 +50,7 @@
         "test/extend.ts",
         "test/object.ts",
         "test/observable.ts",
+        "test/octane.ts",
         "test/proxy.ts",
         "test/reopen.ts"
     ]
diff --git a/types/ember__service/ember__service-tests.ts b/types/ember__service/ember__service-tests.ts
deleted file mode 100644
index ee2e39823c..0000000000
--- a/types/ember__service/ember__service-tests.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import Service, { inject } from "@ember/service";
-import EmberObject from "@ember/object";
-
-class FirstSvc extends Service {
-    foo = 'bar';
-    first() { return ''; }
-}
-const SecondSvc = Service.extend({
-    foo: 'bar',
-    second() { return ''; }
-});
-
-class ThirdSvc extends Service.extend({
-    foo: 'bar',
-    third() { return ''; }
-}) { }
-
-declare module '@ember/service' {
-    interface Registry {
-        first: FirstSvc;
-        second: InstanceType<typeof SecondSvc>;
-        third: ThirdSvc;
-    }
-}
-
-const ServiceTriplet = EmberObject.extend({
-    sFirst: inject('first'),
-    sSecond: inject('second'),
-    sThird: inject('third'),
-    unknownService: inject()
-});
-
-const obj = ServiceTriplet.create();
-
-obj.get('sFirst'); // $ExpectType FirstSvc
-obj.get('sSecond').second(); // $ExpectType ""
-obj.get('sThird'); // $ExpectType ThirdSvc
-obj.get('unknownService'); // $ExpectType Service
diff --git a/types/ember__service/index.d.ts b/types/ember__service/index.d.ts
index 45918f4bbb..416d705940 100644
--- a/types/ember__service/index.d.ts
+++ b/types/ember__service/index.d.ts
@@ -12,10 +12,9 @@ export default class Service extends EmberObject {}
  * Creates a property that lazily looks up a service in the container. There
  * are no restrictions as to what objects a service can be injected into.
  */
-export function inject(): ComputedProperty<Service>;
-export function inject<K extends keyof Registry>(
-    name: K
-): ComputedProperty<Registry[K]>;
+export function inject(): PropertyDecorator & ComputedProperty<Service>; // @inject() foo, foo: inject()
+export function inject(target: object, propertyKey: string | symbol): void; // @inject foo
+export function inject<K extends keyof Registry>(name: K): PropertyDecorator & ComputedProperty<Registry[K]>; // @inject('store') foo      @inject() foo
 
 // A type registry for Ember `Service`s. Meant to be declaration-merged so
 // string lookups resolve to the correct type.
diff --git a/types/ember__service/test/main.ts b/types/ember__service/test/main.ts
new file mode 100644
index 0000000000..862f499b89
--- /dev/null
+++ b/types/ember__service/test/main.ts
@@ -0,0 +1,44 @@
+import Service, { inject } from "@ember/service";
+import EmberObject from "@ember/object";
+
+class FirstSvc extends Service {
+    foo = "bar";
+    first() {
+        return "";
+    }
+}
+const SecondSvc = Service.extend({
+    foo: "bar",
+    second() {
+        return "";
+    }
+});
+
+class ThirdSvc extends Service.extend({
+    foo: "bar",
+    third() {
+        return "";
+    }
+}) {}
+
+declare module "@ember/service" {
+    interface Registry {
+        first: FirstSvc;
+        second: InstanceType<typeof SecondSvc>;
+        third: ThirdSvc;
+    }
+}
+
+const ServiceTriplet = EmberObject.extend({
+    sFirst: inject("first"),
+    sSecond: inject("second"),
+    sThird: inject("third"),
+    unknownService: inject()
+});
+
+const obj = ServiceTriplet.create();
+
+obj.get("sFirst"); // $ExpectType FirstSvc
+obj.get("sSecond").second(); // $ExpectType ""
+obj.get("sThird"); // $ExpectType ThirdSvc
+obj.get("unknownService"); // $ExpectType Service
diff --git a/types/ember__service/test/octane.ts b/types/ember__service/test/octane.ts
new file mode 100644
index 0000000000..c6971e98e4
--- /dev/null
+++ b/types/ember__service/test/octane.ts
@@ -0,0 +1,28 @@
+import Service, { inject } from "@ember/service";
+import EmberObject from "@ember/object";
+
+class FirstSvc extends Service {
+    foo = "bar";
+    first() {
+        return "";
+    }
+}
+const SecondSvc = Service.extend({
+    foo: "bar",
+    second() {
+        return "";
+    }
+});
+
+declare module "@ember/service" {
+    interface Registry {
+        first: FirstSvc;
+        second: InstanceType<typeof SecondSvc>;
+    }
+}
+
+class Foo extends EmberObject {
+    @inject foo: FirstSvc;
+    @inject("first") baz: FirstSvc;
+    @inject() bar: FirstSvc;
+}
diff --git a/types/ember__service/tsconfig.json b/types/ember__service/tsconfig.json
index f1cfe16ca1..1df951cc8a 100644
--- a/types/ember__service/tsconfig.json
+++ b/types/ember__service/tsconfig.json
@@ -10,6 +10,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "experimentalDecorators": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -25,6 +26,7 @@
     },
     "files": [
         "index.d.ts",
-        "ember__service-tests.ts"
+        "test/main.ts",
+        "test/octane.ts"
     ]
 }

From 8bbc75ad8fc2cf41f77ca035ed60734b7da19b3a Mon Sep 17 00:00:00 2001
From: Silas Rech <silas.rech@protonmail.com>
Date: Mon, 18 Mar 2019 16:45:23 +0100
Subject: [PATCH 744/924] [hapi-auth-cookie] update to v10.0.0 (#33944)

---
 .../hapi-auth-cookie-tests.ts                 | 14 ++--
 types/hapi-auth-cookie/index.d.ts             | 65 ++-----------------
 2 files changed, 13 insertions(+), 66 deletions(-)

diff --git a/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts b/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
index 155bb928e3..4df23a6955 100644
--- a/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
+++ b/types/hapi-auth-cookie/hapi-auth-cookie-tests.ts
@@ -8,15 +8,17 @@ server.register({
 });
 
 const options: auth.Options = {
-    clearInvalid: true,
-    cookie:       'session',
-    domain:       '.typescript.org',
+    cookie: {
+        clearInvalid: true,
+        name:         'session',
+        domain:       '.typescript.org',
+        password:     'abcdef',
+        isSecure:     true,
+        ttl:          259200000,
+    },
     keepAlive:    true,
-    password:     'abcdef',
     redirectTo:   '/login',
-    isSecure:     true,
     appendNext:   false,
-    ttl:          259200000,
     validateFunc: async () => {
         return { valid: true };
     },
diff --git a/types/hapi-auth-cookie/index.d.ts b/types/hapi-auth-cookie/index.d.ts
index 8184ffd2fe..bcae2b3bdc 100644
--- a/types/hapi-auth-cookie/index.d.ts
+++ b/types/hapi-auth-cookie/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hapi-auth-cookie 9.1
+// Type definitions for hapi-auth-cookie 10.0
 // Project: https://github.com/hapijs/hapi-auth-cookie
 // Definitions by: Silas Rech <https://github.com/lenovouser>
 //                 Simon Schick <https://github.com/SimonSchick>
@@ -32,51 +32,18 @@ declare module 'hapi' {
 declare namespace hapiAuthCookie {
     interface ValidateResponse { valid: boolean; credentials?: AuthCredentials; }
     type ValidateFunction = (request?: Request, session?: object) => Promise<ValidateResponse>;
-    type RedirectToFunction = (request?: Request) => void;
+    type RedirectToFunction = (request?: Request) => string;
 
     /**
      * Options passed to 'hapi.auth.strategy' when this plugin is used
      */
     interface Options {
         /**
-         * The cookie name.
+         * Cookie options.
          *
-         * @default 'sid'
+         * @default { name: 'sid', clearInvalid: false, isSameSite: 'Strict', isSecure: true, isHttpOnly: true }
          */
-        cookie?: string;
-
-        /**
-         * Used for Iron cookie encoding.
-         * Should be at least 32 characters long.
-         */
-        password: string;
-
-        /**
-         * Sets the cookie expires time in milliseconds.
-         * Required when 'keepAlive' is true.
-         * Defaults to single browser session (ends when browser closes).
-         */
-        ttl?: number;
-
-        /**
-         * Sets the cookie Domain value.
-         * Defaults to none.
-         */
-        domain?: string;
-
-        /**
-         * Sets the cookie path value.
-         *
-         * @default '/'
-         */
-        path?: string;
-
-        /**
-         * Any authentication cookie that fails validation will be marked as expired in the response and cleared.
-         *
-         * @default false
-         */
-        clearInvalid?: boolean;
+        cookie?: ServerStateCookieOptions & { name: string };
 
         /**
          * Automatically sets the session cookie after validation to extend the current session for a new TTL duration.
@@ -85,28 +52,6 @@ declare namespace hapiAuthCookie {
          */
         keepAlive?: boolean;
 
-        /**
-         * If false omitted.
-         * Other options Strict or Lax.
-         *
-         * @default 'Strict'
-         */
-        isSameSite?: ServerStateCookieOptions['isSameSite'];
-
-        /**
-         * If false, the cookie is allowed to be transmitted over insecure connections which exposes it to attacks.
-         *
-         * @default true
-         */
-        isSecure?: boolean;
-
-        /**
-         * If false, the cookie will not include the 'HttpOnly' flag.
-         *
-         * @default true
-         */
-        isHttpOnly?: boolean;
-
         /**
          * Login URI or function that returns a URI to redirect unauthenticated requests to.
          * Note that it will only trigger when the authentication mode is 'required'.

From 72e4172ce087c7e43e0f3a3f066cc282b5ca2e6e Mon Sep 17 00:00:00 2001
From: Resi Respati <resir014@gmail.com>
Date: Mon, 18 Mar 2019 22:46:05 +0700
Subject: [PATCH 745/924] [next] add `Html` component to `_document` page
 (#33928)

---
 types/next/document.d.ts                | 1 +
 types/next/test/next-document-tests.tsx | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index f89e5d71e0..161f28625e 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -111,6 +111,7 @@ export type DocumentComponentType<P = {}, IP = P, C = NextDocumentContext> = Nex
     C
 >;
 
+export class Html extends React.Component<React.HTMLProps<HTMLHtmlElement>> {}
 export class Head extends React.Component<HeadProps> {}
 export class Main extends React.Component {}
 export class NextScript extends React.Component<NextScriptProps> {}
diff --git a/types/next/test/next-document-tests.tsx b/types/next/test/next-document-tests.tsx
index 7c50a03930..9fcb18869c 100644
--- a/types/next/test/next-document-tests.tsx
+++ b/types/next/test/next-document-tests.tsx
@@ -1,6 +1,7 @@
 import Document, {
     DocumentProps,
     Enhancer,
+    Html,
     Head,
     Main,
     NextScript,
@@ -21,7 +22,7 @@ class MyDocumentDefault extends Document {
 
     render() {
         return (
-            <html>
+            <Html>
                 <Head>
                     <style>{`body { margin: 0 } /* custom! */`}</style>
                 </Head>
@@ -29,7 +30,7 @@ class MyDocumentDefault extends Document {
                     <Main />
                     <NextScript />
                 </body>
-            </html>
+            </Html>
         );
     }
 }

From 44a2ba1736567b94fd076343a9441711c6c804b6 Mon Sep 17 00:00:00 2001
From: James Reggio <james.reggio@gmail.com>
Date: Mon, 18 Mar 2019 08:51:31 -0700
Subject: [PATCH 746/924] [react-redux] Fix #33690: improper import of
 hoist-non-react-statics (#33919)

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

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 3ef1005cd8..f97fd11b9d 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -43,7 +43,7 @@ import {
     Store
 } from 'redux';
 
-import { NonReactStatics } from 'hoist-non-react-statics';
+import hoistNonReactStatics = require('hoist-non-react-statics');
 
 // Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
@@ -100,7 +100,7 @@ export type GetProps<C> = C extends ComponentType<infer P> ? P : never;
 export type ConnectedComponentClass<
     C extends ComponentType<any>,
     P
-> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & NonReactStatics<C> & {
+> = ComponentClass<JSX.LibraryManagedAttributes<C, P>> & hoistNonReactStatics.NonReactStatics<C> & {
     WrappedComponent: C;
 };
 

From dd4e785e6aaaf9fb1a23c36363cafc6085574060 Mon Sep 17 00:00:00 2001
From: Jong Eun Lee <yomybaby@yomybaby.com>
Date: Mon, 18 Mar 2019 23:57:19 +0800
Subject: [PATCH 747/924] @types/parse : add "Parse.User.currentAsync()"
 (#33731)

* @types/parse : add Parse.User.currentAsync()
https://parseplatform.org/Parse-SDK-JS/api/2.2.1/Parse.User.html#.currentAsync

* @types/parse Parse.User.currentAsync can resturn null

* revert code styling.
---
 types/parse/index.d.ts     | 4 +++-
 types/parse/parse-tests.ts | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index b87a9f5f56..7dcefdbf3d 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for parse 2.1.0
+// Type definitions for parse 2.1.1
 // Project: https://parseplatform.org/
 // Definitions by:  Ullisen Media Group <http://ullisenmedia.com>
 //                  David Poetzsch-Heffter <https://github.com/dpoetzsch>
@@ -8,6 +8,7 @@
 //                  Otherwise SAS <https://github.com/owsas>
 //                  Andrew Goldis <https://github.com/agoldis>
 //                  Alexandre Hétu Rivard <https://github.com/AlexandreHetu>
+//                  Jong Eun Lee <https://github.com/yomybaby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -621,6 +622,7 @@ subscription.on('close', () => {});
     class User extends Object {
 
         static current(): User | undefined;
+        static currentAsync(): Promise<User | null>;
         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>;
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index cb80764cd4..1c430b1807 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -222,6 +222,15 @@ function test_user() {
     user.signUp(null, { useMasterKey: true });
 }
 
+async function test_user_currentAsync() {
+    const asyncUser = await Parse.User.currentAsync();
+    if (asyncUser) {
+        asyncUser.set('email', 'email@example.com');
+    } else if (asyncUser === null) {
+        Parse.User.logIn('email@example.com', 'my pass');
+    }
+}
+
 function test_user_acl_roles() {
 
     const user = new Parse.User();

From fb36d063d659b14980b2804ee1f5075d3bbabad8 Mon Sep 17 00:00:00 2001
From: Dan Minshew <ofenixculpa@gmail.com>
Date: Mon, 18 Mar 2019 10:57:51 -0500
Subject: [PATCH 748/924] [cytoscape] fix typo: bellmanFort -> bellmanFord
 (#33926)

---
 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 b4ca7de92f..aec7c9bf6c 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Cytoscape.js 3.3
+// Type definitions for Cytoscape.js 3.4
 // Project: http://js.cytoscape.org/
 // Definitions by:  Fabian Schmidt and Fred Eisele <https://github.com/phreed>
 //                  Shenghan Gao <https://github.com/wy193777>
@@ -3229,7 +3229,7 @@ declare namespace cytoscape {
          * This finds the shortest path from the starting node to all other nodes in the collection.
          * http://js.cytoscape.org/#eles.bellmanFord
          */
-        bellmanFort(options: SearchBellmanFordOptions): SearchBellmanFordResult;
+        bellmanFord(options: SearchBellmanFordOptions): SearchBellmanFordResult;
         /**
          * Perform Kruskal's algorithm on the elements in the collection,
          * returning the minimum spanning tree, assuming undirected edges.

From 5463b14a1266f5d4eb2f982be341a2b190b0f5b1 Mon Sep 17 00:00:00 2001
From: ClassicDarkChocolate
 <32133670+ClassicDarkChocolate@users.noreply.github.com>
Date: Tue, 19 Mar 2019 00:00:07 +0800
Subject: [PATCH 749/924] next: Add GetInitialProps type (#33925)

* next: Add GetInitialProps type

* next: Fix Error getInitialProps generic ordering
---
 types/next/error.d.ts |  4 ++--
 types/next/index.d.ts | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/types/next/error.d.ts b/types/next/error.d.ts
index 8ad2226f07..d22fa2b260 100644
--- a/types/next/error.d.ts
+++ b/types/next/error.d.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { NextContext } from ".";
+import { GetInitialProps, NextContext } from ".";
 
 /**
  * Initial props returned from base Error class.
@@ -10,5 +10,5 @@ export interface DefaultErrorIProps {
 }
 
 export default class Error<P = {}> extends React.Component<P & DefaultErrorIProps> {
-    static getInitialProps(context: NextContext): Promise<DefaultErrorIProps> | DefaultErrorIProps;
+    static getInitialProps: GetInitialProps<DefaultErrorIProps, NextContext>;
 }
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 0f491675ce..f12c7cf9d6 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -14,8 +14,8 @@
 
 import * as http from "http";
 import * as url from "url";
-import { Server as NextServer, ServerOptions as NextServerOptions, RenderOptions } from 'next-server';
-import { NextConfig as NextServerConfig } from 'next-server/next-config';
+import { Server as NextServer, ServerOptions as NextServerOptions, RenderOptions } from "next-server";
+import { NextConfig as NextServerConfig } from "next-server/next-config";
 import { Response as NodeResponse } from "node-fetch";
 import { SingletonRouter, DefaultQuery, UrlLike } from "./router";
 
@@ -131,8 +131,16 @@ declare namespace next {
      * @template C Context passed to getInitialProps.
      */
     interface NextStaticLifecycle<IP, C> {
-        getInitialProps?: (ctx: C) => Promise<IP> | IP;
+        getInitialProps?: GetInitialProps<IP, C>;
     }
+
+    /**
+     * Next.js getInitialProps type.
+     *
+     * @template IP Initial props returned from getInitialProps and passed to the component.
+     * @template C Context passed to getInitialProps.
+     */
+    type GetInitialProps<IP, C> = (ctx: C) => Promise<IP> | IP;
 }
 
 declare function next(options?: next.ServerOptions & { dev: true }): next.DevServer;

From 487a3f5ef03b0fafa747e1c9014cacd0ad7973de Mon Sep 17 00:00:00 2001
From: SergiiNozhka <sergey.nozhka@gmail.com>
Date: Mon, 18 Mar 2019 11:00:34 -0500
Subject: [PATCH 750/924] add Outputs to
 serverless.service.provider.compiledCloudFormationTemplate (#33886)

---
 types/serverless/classes/Service.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/serverless/classes/Service.d.ts b/types/serverless/classes/Service.d.ts
index 040a45f825..573663603b 100644
--- a/types/serverless/classes/Service.d.ts
+++ b/types/serverless/classes/Service.d.ts
@@ -12,6 +12,9 @@ declare class Service {
     provider: {
       compiledCloudFormationTemplate: {
         Resources: any[];
+        Outputs?: {
+          [key: string]: any;
+        };
       };
 
       name: string;

From cf3cfac7b014728a35033535e56609147dab674c Mon Sep 17 00:00:00 2001
From: Maxime Poulin <mpoulin@roux.ca>
Date: Mon, 18 Mar 2019 12:01:56 -0400
Subject: [PATCH 751/924] Add support for Redis Cluster in Bull (#33774)

* Add support for Redis Cluster in Bull

* Added test for Redis Cluster in Bull
---
 types/bull/bull-tests.tsx | 13 +++++++++++++
 types/bull/index.d.ts     |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index 13ae21f5a4..64f4eef698 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -70,6 +70,19 @@ videoQueue.add({video: 'http://example.com/video1.mov'});
 audioQueue.add({audio: 'http://example.com/audio1.mp3'});
 imageQueue.add({image: 'http://example.com/image1.tiff'});
 
+//////////////////////////////////////////////////////////////////////////////////
+//
+// Test Redis Cluster connexion
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+const clusterQueue = new Queue('queue on redis cluster', {
+    prefix: 'cluster-test',
+    createClient: (clusterUri: Redis.ClusterNode) => {
+        return new Redis.Cluster([{port: 6379, host: '127.0.0.1'}]);
+    }
+});
+
 //////////////////////////////////////////////////////////////////////////////////
 //
 // Re-using Redis Connections
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index cd2d1a9047..5297eadb19 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -49,9 +49,9 @@ declare namespace Bull {
 
     /**
      * When specified, the `Queue` will use this function to create new `ioredis` client connections.
-     * This is useful if you want to re-use connections.
+     * This is useful if you want to re-use connections or connect to a Redis cluster.
      */
-    createClient?(type: 'client' | 'subscriber' | 'bclient', redisOpts?: Redis.RedisOptions): Redis.Redis;
+    createClient?(type: 'client' | 'subscriber' | 'bclient', redisOpts?: Redis.RedisOptions): Redis.Redis | Redis.Cluster;
 
     /**
      * Prefix to use for all redis keys

From ff84887e0bbae6a9a028771b57b028c12b134a32 Mon Sep 17 00:00:00 2001
From: meisamBalanian <37935328+meisamBalanian@users.noreply.github.com>
Date: Mon, 18 Mar 2019 19:32:37 +0330
Subject: [PATCH 752/924] index.d.ts (#33681)

* index.d.ts

i need to use highchart  indicator on my project, i have to add 'linkedTo' manually on this file, could you possibly add this change to this file please?

* Update index.d.ts

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

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 2c4b14c797..b3900154cd 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -5965,6 +5965,10 @@ declare namespace Highcharts {
          * Define the visual z index of the series.
          */
         zIndex?: number;
+        /**
+         * When using any indicators, Define the indicators name like 'candlesticksss'.
+         */
+        linkedTo?: string;
     }
 
     interface SeriesOptions extends IndividualSeriesOptions, SeriesChart { }

From 0c776885f2b57e337ca5f331722fd52421dc0765 Mon Sep 17 00:00:00 2001
From: Sascha Zarhuber <saschazar21@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:03:16 +0100
Subject: [PATCH 753/924] node-forge: added types for HMAC and RSA (encryption,
 conversion to Asn1, etc...) (#33934)

* Add types for Document and Page in react-sketchapp

* Updated version number in react-sketchapp

* feat(HMAC): Added HMAC type defs

* feat(RSA): Added types for encryption/decryption RSA keys

* fix(HMAC): Fixed namespace definition
---
 types/node-forge/index.d.ts | 87 +++++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 13 deletions(-)

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index ad15411714..4a366deab7 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-forge 0.7.6
+// Type definitions for node-forge 0.8.1
 // Project: https://github.com/digitalbazaar/forge
 // Definitions by: Seth Westphal    <https://github.com/westy92>
 //                 Kay Schecker     <https://github.com/flynetworks>
@@ -10,6 +10,7 @@
 //                 timhwang21       <https://github.com/timhwang21>
 //                 supaiku0         <https://github.com/supaiku0>
 //                 Anders Kaseorg   <https://github.com/andersk>
+//                 Sascha Zarhuber  <https://github.com/saschazar21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -56,23 +57,19 @@ declare module "node-forge" {
         type PEM = string;
         type PublicKey = rsa.PublicKey | ed25519.Key;
         type PrivateKey = rsa.PrivateKey | ed25519.Key;
+        type EncryptionOptions = {
+            algorithm?: 'aes128' | 'aes192' | 'aes256' | '3des';
+            count?: number;
+            saltSize?: number;
+            prfAlgorithm?: 'sha1' | 'sha224' | 'sha256' | 'sha384' | 'sha512';
+            legacy?: boolean;
+        };
 
         interface KeyPair {
             publicKey: PublicKey;
             privateKey: PrivateKey;
         }
 
-        function pemToDer(pem: PEM): util.ByteStringBuffer;
-        function privateKeyToPem(key: PrivateKey, maxline?: number): PEM;
-        function privateKeyInfoToPem(key: Bytes, maxline?: number): PEM;
-        function publicKeyToPem(key: PublicKey, maxline?: number): PEM;
-        function publicKeyFromPem(pem: PEM): PublicKey;
-        function privateKeyFromPem(pem: PEM): PrivateKey;
-        function certificateToPem(cert: Certificate, maxline?: number): PEM;
-        function certificateFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
-        function createCaStore(certs?: ReadonlyArray<Certificate | pki.PEM>): CAStore;
-        function verifyCertificateChain(caStore: CAStore, chain: Certificate[], customVerifyCallback?: (verified: boolean | string, depth: number, chain: Certificate[]) => boolean): boolean;
-
         interface oids {
             [key: string]: string;
         }
@@ -270,9 +267,51 @@ declare module "node-forge" {
 
         function createCertificationRequest(): Certificate;
 
-        function publicKeyToAsn1(publicKey: PublicKey): any;
+        function certificateToPem(cert: Certificate, maxline?: number): PEM;
+
+        function certificateFromPem(pem: PEM, computeHash?: boolean, strict?: boolean): Certificate;
+
+        function createCaStore(certs?: ReadonlyArray<Certificate | pki.PEM>): CAStore;
+
+        function verifyCertificateChain(caStore: CAStore, chain: Certificate[], customVerifyCallback?: (verified: boolean | string, depth: number, chain: Certificate[]) => boolean): boolean;
+
+        function pemToDer(pem: PEM): util.ByteStringBuffer;
+
+        function privateKeyToPem(key: PrivateKey, maxline?: number): PEM;
+
+        function privateKeyInfoToPem(key: asn1.Asn1, maxline?: number): PEM;
+
+        function publicKeyToPem(key: PublicKey, maxline?: number): PEM;
+
+        function publicKeyFromPem(pem: PEM): PublicKey;
+
+        function privateKeyFromPem(pem: PEM): PrivateKey;
+
+        function decryptPrivateKeyInfo(obj: asn1.Asn1, password: string): asn1.Asn1;
+
+        function encryptPrivateKeyInfo(obj: asn1.Asn1, password: string, options?: EncryptionOptions): asn1.Asn1;
+
+        function encryptedPrivateKeyFromPem(pem: PEM): asn1.Asn1;
+
+        function encryptedPrivateKeyToPem(obj: asn1.Asn1): PEM;
+
+        function decryptRsaPrivateKey(pem: PEM, password: string): PrivateKey;
+
+        function encryptRsaPrivateKey(privateKey: PrivateKey, password: string, options?: EncryptionOptions): PEM;
+
+        function privateKeyFromAsn1(privateKey: asn1.Asn1): PrivateKey;
+
+        function privateKeyToAsn1(privateKey: PrivateKey): asn1.Asn1;
+
+        function publicKeyFromAsn1(publicKey: asn1.Asn1): PublicKey;
+
+        function publicKeyToAsn1(publicKey: PublicKey): asn1.Asn1;
 
         function publicKeyToRSAPublicKey(publicKey: PublicKey): any;
+
+        function setRsaPublicKey(n: jsbn.BigInteger, e: jsbn.BigInteger): PublicKey;
+
+        function wrapRsaPrivateKey(privateKey: asn1.Asn1): asn1.Asn1;
     }
 
     namespace random {
@@ -548,6 +587,7 @@ declare module "node-forge" {
     }
 
     namespace md {
+
         interface MessageDigest {
             update(msg: string, encoding?: Encoding): MessageDigest;
             digest(): util.ByteStringBuffer;
@@ -561,6 +601,10 @@ declare module "node-forge" {
             function create(): MessageDigest;
         }
 
+        namespace sha384 {
+            function create(): MessageDigest;
+        }
+
         namespace sha512 {
             function create(): MessageDigest;
         }
@@ -568,6 +612,23 @@ declare module "node-forge" {
         namespace md5 {
             function create(): MessageDigest;
         }
+
+        namespace hmac {
+        }
+    }
+
+    namespace hmac {
+
+      type Algorithm = "sha1" | "md5" | "sha256";
+
+      interface HMAC {
+          digest(): util.ByteBuffer;
+          getMact(): util.ByteBuffer;
+          start(md: Algorithm, key: string | util.ByteBuffer | null): void;
+          update(bytes: string | util.ByteBuffer | Buffer): void;
+      }
+
+      function create(): HMAC;
     }
 
     namespace cipher {

From 61cd5418176bcbf97106cf8dd3ea7504ebeff9ce Mon Sep 17 00:00:00 2001
From: SardineFish <Sardine@live.cn>
Date: Tue, 19 Mar 2019 00:04:45 +0800
Subject: [PATCH 754/924] Rebuild full d.ts from jsdoc in the source code of
 openpgp. (#33940)

Correct some declarations.
Update tests for current td.ts.
---
 types/openpgp/common/index.d.ts      |    5 -
 types/openpgp/index.d.ts             | 6075 +++++++++++++++++++++----
 types/openpgp/openpgp-tests.ts       |  121 +-
 types/openpgp/package.json           |    6 +-
 types/openpgp/ts3.2/index.d.ts       | 6148 ++++++++++++++++++++++----
 types/openpgp/ts3.2/openpgp-tests.ts |   50 +-
 types/openpgp/ts3.2/tsconfig.json    |    1 +
 types/openpgp/tsconfig.json          |    3 +-
 types/openpgp/tslint.json            |    3 +-
 9 files changed, 10352 insertions(+), 2060 deletions(-)
 delete mode 100644 types/openpgp/common/index.d.ts

diff --git a/types/openpgp/common/index.d.ts b/types/openpgp/common/index.d.ts
deleted file mode 100644
index 88796dea9d..0000000000
--- a/types/openpgp/common/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class HKP {
-    constructor(keyServerUrl?: string);
-    lookup(options: {keyId?: string, query?: string }): Promise<string>;
-    upload(publicKeyArmored: string): Promise<Response>;
-}
diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 636d83faff..5d8c4a2cb6 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for openpgp 4.4.8
-// Project: http://openpgpjs.org/
+// Type definitions for openpgp v4.4.10
+// Project: https://openpgpjs.org
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 //                 Errietta Kostala <https://github.com/errietta>
 //                 Daniel Montesinos <https://github.com/damonpam>
@@ -8,1042 +8,5155 @@
 //                 SardineFIsh <https://github.com/SardineFish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
+import BN = require("bn.js");
+import stream = require("stream")
 
-export as namespace openpgp;
+export { }
 
-export * from './common';
+// Declare to fix type issue
+type NodeStream = stream;
+type Integer = number;
+type Infinity = any;
+type ReadableStream<T> = any;
 
-export interface UserId {
-    name?: string,
-    email?: string,
-}
-
-export interface SessionKey {
-    data: Uint8Array,
-    algorithm: string
-}
-
-export interface EncryptOptions {
-    message: message.Message
-    publicKeys?: key.Key | key.Key[],
-    privateKeys?: key.Key | key.Key[],
-    passwords?: string | string[],
-    sessionKey?: SessionKey,
-    compression?: enums.compression,
-    armor?: boolean,
-    streaming?: 'web' | 'node' | false
-    detached?: boolean,
-    signature?: Signature,
-    returnSessionKey?: boolean,
-    wildcard?: boolean,
-    date?: Date,
-    fromUserId?: UserId,
-    toUserId?: UserId,
-}
-
-export interface EncryptedMessage {
-    data?: string,
-    message?: message.Message,
-    signature?: string | ReadableStream | Signature // TODO add NodeStream
-    sessionKey?: SessionKey
-}
-
-export interface DecryptOptions {
-    message: message.Message,
-    privateKeys?: key.Key | key.Key[],
-    passwords?: string | string[],
-    sessionKeys?: SessionKey | SessionKey[],
-    publicKeys?: key.Key | key.Key[],
-    format?: string,
-    streaming?: 'web' | 'node' | false,
-    signature?: Signature,
-    date?: Date,
-}
-
-export interface SignOptions {
-    message: message.Message,
-    privateKeys?: key.Key | key.Key[],
-    armor?: boolean,
-    streaming?: 'web' | 'node' | false,
-    detached?: boolean
-    date?: Date,
-    fromUserIds?: UserId[]
-}
-
-export interface SignedMessage {
-    signature?: string | ReadableStream | Signature, // TODO add NodeStream
-    data?: string | ReadableStream, // TODO add NodeStream
-    message?: message.Message
-}
-
-export interface KeyContainer {
-    key: key.Key,
-}
-
-export interface KeyPair extends KeyContainer {
-    privateKeyArmored: string,
-    publicKeyArmored: string,
-    revocationCertificate: string
-}
-
-export interface KeyOptions {
-    userIds?: UserId[],
-    passphrase?: string,
-    numBits?: number,
-    keyExpirationTime?: number,
-    curve?: string,
-    date?: Date,
-    subkeys?: KeyOptions[]
-}
-
-export interface Keyid {
-    bytes: string,
-}
-
-export interface Signature {
-    keyid: Keyid,
-    valid: boolean,
-    verified?: boolean
-}
-
-export interface VerifyOptions {
-    message: message.Message,
-    publicKeys: key.Key | key.Key[],
-    streaming?: 'web' | 'node' | false,
-    signature?: Signature,
-    date?: Date
-}
-
-export interface VerifiedMessage {
-    data: Uint8Array | string | ReadableStream, // TODO add NodeStream
-    signatures: Array<Signature>,
-}
-
-export interface DecryptedMessage {
-    data: Uint8Array | string | ReadableStream, // TODO add NodeStream
-    signatures: Array<Signature>,
-    filename: string
-}
-
-export interface OpenPGPWorker {
-    randomCallback(): void;
-    configure(config: any): void;
-    seedRandom(buffer: ArrayBuffer): void;
-    delegate(id: number, method: string, options: any): void;
-    response(event: any): void;
-}
-
-export interface WorkerOptions {
-    path?: string,
-    n?: number,
-    workers?: OpenPGPWorker[],
-    config?: any
-}
-
-export class AsyncProxy {
-    constructor(options: WorkerOptions);
-    getId(): number;
-    seedRandom(workerId: number, size: number): Promise<void>;
-    terminate(): void;
-    delegate(method: string, options: any): void;
-
-    workers: OpenPGPWorker[];
-}
-
-/**
- * Set the path for the web worker script and create an instance of the async proxy
- * @param {String} path            relative path to the worker scripts, default: 'openpgp.worker.js'
- * @param {Number} n               number of workers to initialize
- * @param {Array<Object>} workers  alternative to path parameter: web workers initialized with 'openpgp.worker.js'
- */
-export function initWorker(options: WorkerOptions): boolean;
-
-/**
- * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
- * @returns {module:worker/async_proxy.AsyncProxy|null} the async proxy or null if not initialized
- */
-export function getWorker(): AsyncProxy;
-
-/**
- * Cleanup the current instance of the web worker.
- */
-export function destroyWorker(): void;
-
-/**
- * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
- *   must be specified. If private keys are specified, those will be used to sign the message.
- * @param  {Message} message                      message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
- * @param  {Key|Array<Key>} publicKeys            (optional) array of keys or single key, used to encrypt the message
- * @param  {Key|Array<Key>} privateKeys           (optional) private keys for signing. If omitted message will not be signed
- * @param  {String|Array<String>} passwords       (optional) array of passwords or a single password to encrypt the message
- * @param  {Object} sessionKey                    (optional) session key in the form: { data:Uint8Array, algorithm:String }
- * @param  {module:enums.compression} compression (optional) which compression algorithm to compress the message with, defaults to what is specified in config
- * @param  {Boolean} armor                        (optional) if the return values should be ascii armored or the message/signature objects
- * @param  {'web'|'node'|false} streaming         (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Boolean} detached                     (optional) if the signature should be detached (if true, signature will be added to returned object)
- * @param  {Signature} signature                  (optional) a detached signature to add to the encrypted message
- * @param  {Boolean} returnSessionKey             (optional) if the unencrypted session key should be added to returned object
- * @param  {Boolean} wildcard                     (optional) use a key ID of 0 instead of the public key IDs
- * @param  {Date} date                            (optional) override the creation date of the message signature
- * @param  {Object} fromUserId                    (optional) user ID to sign with, e.g. { name:'Steve Sender', email:'steve@openpgp.org' }
- * @param  {Object} toUserId                      (optional) user ID to encrypt for, e.g. { name:'Robert Receiver', email:'robert@openpgp.org' }
- * @returns {Promise<Object>}                     Object containing encrypted (and optionally signed) message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       message: Message, (if `armor` was false)
- *       signature: String|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
- *       signature: Signature (if `detached` was true and `armor` was false)
- *       sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
- *     }
- * @async
- * @static
- */
-export function encrypt(options: EncryptOptions): Promise<EncryptedMessage>;
-
-/**
- * Decrypts a message with the user's private key, a session key or a password. Either a private key,
- *   a session key or a password must be specified.
- * @param  {Message} message                  the message object with the encrypted data
- * @param  {Key|Array<Key>} privateKeys       (optional) private keys with decrypted secret key data or session key
- * @param  {String|Array<String>} passwords   (optional) passwords to decrypt the message
- * @param  {Object|Array<Object>} sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String }
- * @param  {Key|Array<Key>} publicKeys        (optional) array of public keys or single key, to verify signatures
- * @param  {String} format                    (optional) return data format either as 'utf8' or 'binary'
- * @param  {'web'|'node'|false} streaming     (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Signature} signature              (optional) detached signature for verification
- * @param  {Date} date                        (optional) use the given date for verification instead of the current time
- * @returns {Promise<Object>}                 Object containing decrypted and verified message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
- *       data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
- *       filename: String,
- *       signatures: [
- *         {
- *           keyid: module:type/keyid,
- *           verified: Promise<Boolean>,
- *           valid: Boolean (if streaming was false)
- *         }, ...
- *       ]
- *     }
- * @async
- * @static
- */
-export function decrypt(options: DecryptOptions): Promise<DecryptedMessage>;
-
-/**
- * Signs a cleartext message.
- * @param  {CleartextMessage|Message} message (cleartext) message to be signed
- * @param  {Key|Array<Key>} privateKeys       array of keys or single key with decrypted secret key data to sign cleartext
- * @param  {Boolean} armor                    (optional) if the return value should be ascii armored or the message object
- * @param  {'web'|'node'|false} streaming     (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Boolean} detached                 (optional) if the return value should contain a detached signature
- * @param  {Date} date                        (optional) override the creation date of the signature
- * @param  {Array} fromUserIds                (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
- * @returns {Promise<Object>}                 Object containing signed message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       message: Message (if `armor` was false)
- *     }
- *
- * Or, if `detached` was true:
- *
- *     {
- *       signature: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       signature: Signature (if `armor` was false)
- *     }
- * @async
- * @static
- */
-export function sign(options: SignOptions): Promise<SignedMessage>;
-
-/**
- * Verifies signatures of cleartext signed message
- * @param  {Key|Array<Key>} publicKeys         array of publicKeys or single key, to verify signatures
- * @param  {CleartextMessage|Message} message  (cleartext) message object with signatures
- * @param  {'web'|'node'|false} streaming      (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Signature} signature               (optional) detached signature for verification
- * @param  {Date} date                         (optional) use the given date for verification instead of the current time
- * @returns {Promise<Object>}                  Object containing verified message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
- *       data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
- *       signatures: [
- *         {
- *           keyid: module:type/keyid,
- *           verified: Promise<Boolean>,
- *           valid: Boolean (if `streaming` was false)
- *         }, ...
- *       ]
- *     }
- * @async
- * @static
- */
-export function verify(options: VerifyOptions): Promise<VerifiedMessage>;
-
-/**
- * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
- * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
- * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
- * @param  {Number} numBits          (optional) number of bits for RSA keys: 2048 or 4096.
- * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
- * @param  {String} curve            (optional) elliptic curve for ECC keys:
- *                                              curve25519, p256, p384, p521, secp256k1,
- *                                              brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
- * @param  {Date} date               (optional) override the creation date of the key and the key signatures
- * @param  {Array<Object>} subkeys   (optional) options for each subkey, default to main key options. e.g. [{sign: true, passphrase: '123'}]
- *                                              sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
- * @returns {Promise<Object>}         The generated key object in the form:
- *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
- * @async
- * @static
- */
-export function generateKey(options: KeyOptions): Promise<KeyPair>;
-
-/**
- * Reformats signature packets for a key and rewraps key object.
- * @param  {Key} privateKey          private key to reformat
- * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
- * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
- * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
- * @param  {Boolean} revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
- * @returns {Promise<Object>}         The generated key object in the form:
- *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
- * @async
- * @static
- */
-export function reformatKey(options: {
-    privateKey: key.Key,
-    userIds?: UserId[],
-    passphrase?: string,
-    keyExpirationTime?: number,
-    revocationCertificate?: boolean
-}): Promise<KeyPair>;
-
-/**
- * Revokes a key. Requires either a private key or a revocation certificate.
- *   If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
- * @param  {Key} key                 (optional) public or private key to revoke
- * @param  {String} revocationCertificate (optional) revocation certificate to revoke the key with
- * @param  {Object} reasonForRevocation (optional) object indicating the reason for revocation
- * @param  {module:enums.reasonForRevocation} reasonForRevocation.flag (optional) flag indicating the reason for revocation
- * @param  {String} reasonForRevocation.string (optional) string explaining the reason for revocation
- * @returns {Promise<Object>}         The revoked key object in the form:
- *                                     { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
- *                                     (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
- * @static
- */
-export function revokeKey(options: {
-    key?: key.Key,
-    revocationCertificate?: string
-    reasonForRevocation?: {
-        flag: enums.reasonForRevocation,
-        'string': string
-    },
-}): Promise<KeyPair>;
-
-/**
- * Unlock a private key with your passphrase.
- * @param  {Key} privateKey                    the private key that is to be decrypted
- * @param  {String|Array<String>} passphrase   the user's passphrase(s) chosen during key generation
- * @returns {Promise<Object>}                  the unlocked key object in the form: { key:Key }
- * @async
- */
-export function decryptKey(options: {
-    privateKey: key.Key,
-    passphrase?: string | string[],
-}): Promise<KeyContainer>;
-
-/**
- * Lock a private key with your passphrase.
- * @param  {Key} privateKey                      the private key that is to be decrypted
- * @param  {String|Array<String>} passphrase     the user's passphrase(s) chosen during key generation
- * @returns {Promise<Object>}                    the locked key object in the form: { key:Key }
- * @async
- */
-export function encryptKey(options: {
-    privateKey: key.Key,
-    passphrase?: string | string[],
-}): Promise<KeyContainer>;
-
-// TODO add typings for encryptSessionKey and decryptSessionKeys
-
-export namespace armor {
-    /** Armor an OpenPGP binary packet block
-
-        @param messagetype type of the message
-        @param body
-        @param partindex
-        @param parttotal
-     */
-    function armor(messagetype: enums.armor, body: Object, partindex: number, parttotal: number): string;
-
-    /** DeArmor an OpenPGP armored message; verify the checksum and return the encoded bytes
-
-        @param text OpenPGP armored message
-     */
-    function dearmor(text: string): Object;
-}
-
-export namespace cleartext {
-    /** Class that represents an OpenPGP cleartext signed message.
-     */
-    interface CleartextMessage {
-        /** Returns ASCII armored text of cleartext signed message
+export namespace openpgp {
+    namespace cleartext {
+        /**
+         * Class that represents an OpenPGP cleartext signed message.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-7}
          */
-        armor(): string;
+        class CleartextMessage {
+            /**
+             * @param text The cleartext of the signed message
+             * @param signature The detached signature or an empty signature for unsigned messages
+             */
+            constructor(text: string, signature: signature.Signature);
 
-        /** Returns the key IDs of the keys that signed the cleartext message
-         */
-        getSigningKeyIds(): Array<Keyid>;
+            /**
+             * Returns the key IDs of the keys that signed the cleartext message
+             * @returns array of keyid objects
+             */
+            getSigningKeyIds(): any[];
 
-        /** Get cleartext
-         */
-        getText(): string;
+            /**
+             * Sign the cleartext message
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) The creation time of the signature that should be created
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new cleartext message with signed content
+             */
+            sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
 
-        /** Sign the cleartext message
-            @param privateKeys private keys with decrypted secret key data for signing
-         */
-        sign(privateKeys: Array<key.Key>): void;
+            /**
+             * Sign the cleartext message
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) The creation time of the signature that should be created
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new detached signature of message content
+             */
+            signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
 
-        /** Verify signatures of cleartext signed message
-            @param keys array of keys to verify signatures
+            /**
+             * Verify signatures of cleartext signed message
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verify signatures of cleartext signed message
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Get cleartext
+             * @returns cleartext of message
+             */
+            getText(): string;
+
+            /**
+             * Returns ASCII armored text of cleartext signed message
+             * @returns ASCII armor
+             */
+            armor(): string | ReadableStream<String>;
+        }
+
+        /**
+         * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
+         * @param armoredText text to be parsed
+         * @returns new cleartext message object
          */
-        verify(keys: Array<key.Key>): Array<VerifiedMessage>;
+        function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
+
+        /**
+         * Creates a new CleartextMessage object from text
+         * @param text
+         */
+        function fromText(text: string): void;
     }
 
-    /** creates new message object from text
-        @param text
+    /**
+     * @see module:config/config
      */
-    function fromText(text: string): CleartextMessage;
+    namespace config {
+        var prefer_hash_algorithm: any;
 
-    function readArmored(armoredText: string): Promise<CleartextMessage>;
-}
+        var encryption_cipher: any;
 
-export namespace config {
-    var prefer_hash_algorithm: enums.hash;
-    var encryption_cipher: enums.symmetric;
-    var compression: enums.compression;
-    var show_version: boolean;
-    var show_comment: boolean;
-    var integrity_protect: boolean;
-    var keyserver: string;
-    var debug: boolean;
-}
+        var compression: any;
 
-export namespace crypto {
-    interface Mpi {
-        data: number,
-        read(input: string): number,
-        write(): string,
+        var deflate_level: any;
+
+        /**
+         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+         * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
+         * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
+         */
+        var aead_protect: any;
+
+        /**
+         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+         * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
+         * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
+         * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
+         */
+        var aead_protect_version: any;
+
+        /**
+         * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
+         * Only has an effect when aead_protect is set to true.
+         */
+        var aead_mode: any;
+
+        /**
+         * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
+         * Only has an effect when aead_protect is set to true.
+         * Must be an integer value from 0 to 56.
+         */
+        var aead_chunk_size_byte: any;
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
+         * Iteration Count Byte for S2K (String to Key)
+         */
+        var s2k_iteration_count_byte: any;
+
+        /**
+         * Use integrity protection for symmetric encryption
+         */
+        var integrity_protect: any;
+
+        var ignore_mdc_error: any;
+
+        var allow_unauthenticated_stream: any;
+
+        var checksum_required: any;
+
+        var rsa_blinding: any;
+
+        /**
+         * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
+         * **Slower and slightly less secure**
+         */
+        var password_collision_check: any;
+
+        var revocations_expire: any;
+
+        var use_native: any;
+
+        var min_bytes_for_web_crypto: any;
+
+        var zero_copy: any;
+
+        var debug: any;
+
+        var tolerant: any;
+
+        var show_version: any;
+
+        var show_comment: any;
+
+        var versionstring: any;
+
+        var commentstring: any;
+
+        var keyserver: any;
+
+        var node_store: any;
+
+        /**
+         * Max userid string length (used for parsing)
+         */
+        var max_userid_length: any;
+
+        namespace localStorage {
+            class LocalStorage {
+                /**
+                 * This object is used for storing and retrieving configuration from HTML5 local storage.
+                 */
+                constructor();
+
+                /**
+                 * Reads the config out of the HTML5 local storage
+                 * and initializes the object config.
+                 * if config is null the default config will be used
+                 */
+                read(): void;
+
+                /**
+                 * Writes the config to HTML5 local storage
+                 */
+                write(): void;
+            }
+        }
     }
 
-    /** Generating a session key for the specified symmetric algorithm
-        @param algo Algorithm to use
-     */
-    function generateSessionKey(algo: enums.symmetric): string;
+    class LocalStorage {
+        /**
+         * This object is used for storing and retrieving configuration from HTML5 local storage.
+         */
+        constructor();
 
-    /** generate random byte prefix as string for the specified algorithm
-        @param algo Algorithm to use
-     */
-    function getPrefixRandom(algo: enums.symmetric): string;
+        /**
+         * Reads the config out of the HTML5 local storage
+         * and initializes the object config.
+         * if config is null the default config will be used
+         */
+        read(): void;
 
-    /** Returns the number of integers comprising the private key of an algorithm
-        @param algo The public key algorithm
-     */
-    function getPrivateMpiCount(algo: enums.symmetric): number;
-
-    /** Decrypts data using the specified public key multiprecision integers of the private key, the specified secretMPIs of the private key and the specified algorithm.
-        @param algo Algorithm to be used
-        @param publicMPIs Algorithm dependent multiprecision integers of the public key part of the private key
-        @param secretMPIs Algorithm dependent multiprecision integers of the private key used
-        @param data Data to be encrypted as MPI
-     */
-    function publicKeyDecrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: Mpi): Mpi;
-
-    /** Encrypts data using the specified public key multiprecision integers and the specified algorithm.
-        @param algo Algorithm to be used
-        @param publicMPIs Algorithm dependent multiprecision integers
-        @param data Data to be encrypted as MPI
-     */
-    function publicKeyEncrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, data: Mpi): Array<Mpi>;
-
-
-    namespace cfb {
-        /** This function decrypts a given plaintext using the specified blockcipher to decrypt a message
-            @param cipherfn the algorithm cipher class to decrypt data in one block_size encryption
-            @param key binary string representation of key to be used to decrypt the ciphertext. This will be passed to the cipherfn
-            @param ciphertext to be decrypted provided as a string
-            @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Decryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
-        */
-        function decrypt(cipherfn: string, key: string, ciphertext: string, resync: boolean): string;
-
-        /** This function encrypts a given with the specified prefixrandom using the specified blockcipher to encrypt a message
-            @param prefixrandom random bytes of block_size length provided as a string to be used in prefixing the data
-            @param cipherfn the algorithm cipher class to encrypt data in one block_size encryption
-            @param plaintext data to be encrypted provided as a string
-            @param key binary string representation of key to be used to encrypt the plaintext. This will be passed to the cipherfn
-            @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Encryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
-        */
-        function encrypt(prefixrandom: string, cipherfn: string, plaintext: string, key: string, resync: boolean): string;
-
-        /** Decrypts the prefixed data for the Modification Detection Code (MDC) computation
-            @param cipherfn cipherfn.encrypt Cipher function to use
-            @param key binary string representation of key to be used to check the mdc This will be passed to the cipherfn
-            @param ciphertext The encrypted data
-        */
-        function mdc(cipherfn: Object, key: string, ciphertext: string): string;
+        /**
+         * Writes the config to HTML5 local storage
+         */
+        write(): void;
     }
 
-    namespace hash {
-        /** Create a hash on the specified data using the specified algorithm
-            @param algo Hash algorithm type
-            @param data Data to be hashed
-        */
-        function digest(algo: enums.hash, data: string): string;
 
-        /** Returns the hash size in bytes of the specified hash algorithm type
-            @param algo Hash algorithm type
+
+    /**
+     * @see module:crypto/crypto
+     * @see module:crypto/signature
+     * @see module:crypto/public_key
+     * @see module:crypto/cipher
+     * @see module:crypto/random
+     * @see module:crypto/hash
+     */
+    namespace crypto {
+        /**
+     * @see module:crypto/public_key/elliptic/ecdh
+     */
+        namespace aes_kw {
+            /**
+             * AES key wrap
+             * @param key
+             * @param data
+             * @returns
+             */
+            function wrap(key: string, data: string): Uint8Array;
+
+            /**
+             * AES key unwrap
+             * @param key
+             * @param data
+             * @returns
+             * @throws
+             */
+            function unwrap(key: string, data: string): Uint8Array;
+        }
+
+        namespace cfb {
+            function encrypt(algo: any, key: any, plaintext: any, iv: any): any
+            function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
+        }
+
+        namespace cipher {
+            /**
+             * AES-128 encryption and decryption (ID 7)
+             * @param key 128-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes128(key: string): object;
+
+            /**
+             * AES-128 Block Cipher (ID 8)
+             * @param key 192-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes192(key: string): object;
+
+            /**
+             * AES-128 Block Cipher (ID 9)
+             * @param key 256-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes256(key: string): object;
+
+            /**
+             * Triple DES Block Cipher (ID 2)
+             * @param key 192-bit key
+             * @see
+             * @returns
+             */
+            function tripledes(key: string): object;
+
+            /**
+             * CAST-128 Block Cipher (ID 3)
+             * @param key 128-bit key
+             * @see
+             * @returns
+             */
+            function cast5(key: string): object;
+
+            /**
+             * Twofish Block Cipher (ID 10)
+             * @param key 256-bit key
+             * @see
+             * @returns
+             */
+            function twofish(key: string): object;
+
+            /**
+             * Blowfish Block Cipher (ID 4)
+             * @param key 128-bit key
+             * @see
+             * @returns
+             */
+            function blowfish(key: string): object;
+
+            /**
+             * Not implemented
+             * @throws
+             */
+            function idea(): void;
+        }
+
+        namespace cmac {
+            /**
+             * This implementation of CMAC is based on the description of OMAC in
+             * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
+             * document:
+             * We have made a small modification to the OMAC algorithm as it was
+             * originally presented, changing one of its two constants.
+             * Specifically, the constant 4 at line 85 was the constant 1/2 (the
+             * multiplicative inverse of 2) in the original definition of OMAC [14].
+             * The OMAC authors indicate that they will promulgate this modification
+             * [15], which slightly simplifies implementations.
+             */
+            const blockLength: any;
+
+            /**
+             * xor `padding` into the end of `data`. This function implements "the
+             * operation xor→ [which] xors the shorter string into the end of longer
+             * one". Since data is always as least as long as padding, we can
+             * simplify the implementation.
+             * @param data
+             * @param padding
+             */
+            function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
+        }
+
+        namespace crypto {
+            /**
+             * Encrypts data using specified algorithm and public key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+             * @param algo Public key algorithm
+             * @param pub_params Algorithm-specific public key parameters
+             * @param data Data to be encrypted as MPI
+             * @param fingerprint Recipient fingerprint
+             * @returns encrypted session key parameters
+             */
+            function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
+
+            /**
+             * Decrypts data using specified algorithm and private key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+             * @param algo Public key algorithm
+             * @param key_params Algorithm-specific public, private key parameters
+             * @param data_params encrypted session key parameters
+             * @param fingerprint Recipient fingerprint
+             * @returns An MPI containing the decrypted data
+             */
+            function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
+
+            /**
+             * Returns the types comprising the private key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getPrivKeyParamTypes(algo: string): any[];
+
+            /**
+             * Returns the types comprising the public key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getPubKeyParamTypes(algo: string): any[];
+
+            /**
+             * Returns the types comprising the encrypted session key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getEncSessionKeyParamTypes(algo: string): any[];
+
+            /**
+             * Generate algorithm-specific key parameters
+             * @param algo The public key algorithm
+             * @param bits Bit length for RSA keys
+             * @param oid Object identifier for ECC keys
+             * @returns The array of parameters
+             */
+            function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
+
+            /**
+             * Generates a random byte prefix for the specified algorithm
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param algo Symmetric encryption algorithm
+             * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
+             */
+            function getPrefixRandom(algo: enums.symmetric): Uint8Array;
+
+            /**
+             * Generating a session key for the specified symmetric algorithm
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param algo Symmetric encryption algorithm
+             * @returns Random bytes as a string to be used as a key
+             */
+            function generateSessionKey(algo: enums.symmetric): Uint8Array;
+        }
+
+        namespace eax {
+            /**
+             * Class to en/decrypt using EAX mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function EAX(cipher: string, key: Uint8Array): void;
+
+            /**
+             * Encrypt plaintext input.
+             * @param plaintext The cleartext input to be encrypted
+             * @param nonce The nonce (16 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Decrypt ciphertext input.
+             * @param ciphertext The ciphertext input to be decrypted
+             * @param nonce The nonce (16 bytes)
+             * @param adata Associated data to verify
+             * @returns The plaintext output
+             */
+            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+        }
+
+        namespace gcm {
+            /**
+             * Class to en/decrypt using GCM mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function GCM(cipher: string, key: Uint8Array): void;
+        }
+
+        /**
+         * @see
+         * @see
+         */
+        namespace hash {
+            /**
+             * @see module:md5
+             */
+            var md5: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha1: any;
+
+            /**
+             * @see hash.js
+             */
+            var sha224: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha256: any;
+
+            /**
+             * @see hash.js
+             */
+            var sha384: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha512: any;
+
+            /**
+             * @see hash.js
+             */
+            var ripemd: any;
+
+            /**
+             * Create a hash on the specified data using the specified algorithm
+             * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+             * @param data Data to be hashed
+             * @returns hash value
+             */
+            function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Returns the hash size in bytes of the specified hash algorithm type
+             * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+             * @returns Size in bytes of the resulting hash
+             */
+            function getHashByteLength(algo: enums.hash): Integer;
+        }
+
+        /**
+         * @see module:packet.PublicKeyEncryptedSessionKey
+         */
+        namespace pkcs5 {
+            /**
+             * Add pkcs5 padding to a text.
+             * @param msg Text to add padding
+             * @returns Text with padding added
+             */
+            function encode(msg: string): string;
+
+            /**
+             * Remove pkcs5 padding from a string.
+             * @param msg Text to remove padding from
+             * @returns Text with padding removed
+             */
+            function decode(msg: string): string;
+        }
+
+        namespace ocb {
+            /**
+             * Class to en/decrypt using OCB mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function OCB(cipher: string, key: Uint8Array): void;
+
+            /**
+             * Encrypt plaintext input.
+             * @param plaintext The cleartext input to be encrypted
+             * @param nonce The nonce (15 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Decrypt ciphertext input.
+             * @param ciphertext The ciphertext input to be decrypted
+             * @param nonce The nonce (15 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+        }
+
+        /**
+        * @see module:crypto/public_key/rsa
+        * @see module:crypto/public_key/elliptic/ecdh
+        * @see module:packet.PublicKeyEncryptedSessionKey
         */
-        function getHashByteLength(algo: enums.hash): number;
+        namespace pkcs1 {
+            namespace eme {
+                /**
+                 * Create a EME-PKCS1-v1_5 padded message
+                 * @see
+                 * @param M message to be encoded
+                 * @param k the length in octets of the key modulus
+                 * @returns EME-PKCS1 padded message
+                 */
+                function encode(M: string, k: Integer): Promise<String>;
+
+                /**
+                 * Decode a EME-PKCS1-v1_5 padded message
+                 * @see
+                 * @param EM encoded message, an octet string
+                 * @returns message, an octet string
+                 */
+                function decode(EM: string): string;
+            }
+
+            namespace emsa {
+                /**
+                 * Create a EMSA-PKCS1-v1_5 padded message
+                 * @see
+                 * @param algo Hash algorithm type used
+                 * @param hashed message to be encoded
+                 * @param emLen intended length in octets of the encoded message
+                 * @returns encoded message
+                 */
+                function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+            }
+
+            /**
+             * ASN1 object identifiers for hashes
+             * @see
+             */
+            const hash_headers: any;
+        }
+
+        namespace public_key {
+            namespace dsa {
+                /**
+                 * DSA Sign function
+                 * @param hash_algo
+                 * @param hashed
+                 * @param g
+                 * @param p
+                 * @param q
+                 * @param x
+                 * @returns
+                 */
+                function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
+
+                /**
+                 * DSA Verify function
+                 * @param hash_algo
+                 * @param r
+                 * @param s
+                 * @param hashed
+                 * @param g
+                 * @param p
+                 * @param q
+                 * @param y
+                 * @returns BN
+                 */
+                function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
+            }
+
+            namespace elgamal {
+                /**
+                 * ElGamal Encryption function
+                 * @param m
+                 * @param p
+                 * @param g
+                 * @param y
+                 * @returns
+                 */
+                function encrypt(m: BN, p: BN, g: BN, y: BN): object;
+
+                /**
+                 * ElGamal Encryption function
+                 * @param c1
+                 * @param c2
+                 * @param p
+                 * @param x
+                 * @returns BN
+                 */
+                function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
+            }
+
+            /**
+            * @see module:crypto/public_key/elliptic/curve
+            * @see module:crypto/public_key/elliptic/ecdh
+            * @see module:crypto/public_key/elliptic/ecdsa
+            * @see module:crypto/public_key/elliptic/eddsa
+            */
+            namespace elliptic {
+                namespace curve {
+                    class Curve {
+                    }
+                }
+
+                namespace ecdh {
+                    /**
+                     * Generate ECDHE ephemeral key and secret from public key
+                     * @param curve Elliptic curve object
+                     * @param Q Recipient public key
+                     * @returns Returns public part of ephemeral key and generated ephemeral secret
+                     */
+                    function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
+
+                    /**
+                     * Encrypt and wrap a session key
+                     * @param oid Elliptic curve object identifier
+                     * @param cipher_algo Symmetric cipher to use
+                     * @param hash_algo Hash algorithm to use
+                     * @param m Value derived from session key (RFC 6637)
+                     * @param Q Recipient public key
+                     * @param fingerprint Recipient fingerprint
+                     * @returns Returns public part of ephemeral key and encoded session key
+                     */
+                    function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
+
+                    /**
+                     * Generate ECDHE secret from private key and public part of ephemeral key
+                     * @param curve Elliptic curve object
+                     * @param V Public part of ephemeral key
+                     * @param d Recipient private key
+                     * @returns Generated ephemeral secret
+                     */
+                    function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
+
+                    /**
+                     * Decrypt and unwrap the value derived from session key
+                     * @param oid Elliptic curve object identifier
+                     * @param cipher_algo Symmetric cipher to use
+                     * @param hash_algo Hash algorithm to use
+                     * @param V Public part of ephemeral key
+                     * @param C Encrypted and wrapped value derived from session key
+                     * @param d Recipient private key
+                     * @param fingerprint Recipient fingerprint
+                     * @returns Value derived from session
+                     */
+                    function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
+                }
+
+                namespace ecdsa {
+                    /**
+                     * Sign a message using the provided key
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used to sign
+                     * @param m Message to sign
+                     * @param d Private key used to sign the message
+                     * @param hashed The hashed message
+                     * @returns Signature of the message
+                     */
+                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
+
+                    /**
+                     * Verifies if a signature is valid for a message
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used in the signature
+                     * @param signature Signature to verify
+                     * @param m Message to verify
+                     * @param Q Public key used to verify the message
+                     * @param hashed The hashed message
+                     * @returns
+                     */
+                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+                }
+
+                namespace eddsa {
+                    /**
+                     * Sign a message using the provided keygit
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used to sign
+                     * @param m Message to sign
+                     * @param d Private key used to sign
+                     * @param hashed The hashed message
+                     * @returns Signature of the message
+                     */
+                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
+
+                    /**
+                     * Verifies if a signature is valid for a message
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used in the signature
+                     * @param signature Signature to verify the message
+                     * @param m Message to verify
+                     * @param Q Public key used to verify the message
+                     * @param hashed The hashed message
+                     * @returns
+                     */
+                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+                }
+
+                namespace key {
+                    class KeyPair {
+                    }
+                }
+            }
+
+            namespace prime {
+                /**
+                 * Probabilistic random number generator
+                 * @param bits Bit length of the prime
+                 * @param e Optional RSA exponent to check against the prime
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @returns BN
+                 */
+                function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
+
+                /**
+                 * Probabilistic primality testing
+                 * @param n Number to test
+                 * @param e Optional RSA exponent to check against the prime
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @returns
+                 */
+                function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+
+                /**
+                 * Tests whether n is probably prime or not using Fermat's test with b = 2.
+                 * Fails if b^(n-1) mod n === 1.
+                 * @param n Number to test
+                 * @param b Optional Fermat test base
+                 * @returns
+                 */
+                function fermat(n: BN, b: Integer): boolean;
+
+                /**
+                 * Tests whether n is probably prime or not using the Miller-Rabin test.
+                 * See HAC Remark 4.28.
+                 * @param n Number to test
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @param rand Optional function to generate potential witnesses
+                 * @returns
+                 */
+                function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+            }
+
+            namespace rsa {
+                /**
+                 * Create signature
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @param d RSA private exponent
+                 * @returns RSA Signature
+                 */
+                function sign(m: BN, n: BN, e: BN, d: BN): BN;
+
+                /**
+                 * Verify signature
+                 * @param s signature
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @returns
+                 */
+                function verify(s: BN, n: BN, e: BN): BN;
+
+                /**
+                 * Encrypt message
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @returns RSA Ciphertext
+                 */
+                function encrypt(m: BN, n: BN, e: BN): BN;
+
+                /**
+                 * Decrypt RSA message
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @param d RSA private exponent
+                 * @param p RSA private prime p
+                 * @param q RSA private prime q
+                 * @param u RSA private inverse of prime q
+                 * @returns RSA Plaintext
+                 */
+                function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
+
+                /**
+                 * Generate a new random private key B bits long with public exponent E.
+                 * When possible, webCrypto is used. Otherwise, primes are generated using
+                 * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
+                 * @see module:crypto/public_key/prime
+                 * @param B RSA bit length
+                 * @param E RSA public exponent in hex string
+                 * @returns RSA public modulus, RSA public exponent, RSA private exponent,
+                 *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
+                 */
+                function generate(B: Integer, E: string): object;
+            }
+        }
+
+        namespace random {
+            /**
+             * Retrieve secure random byte array of the specified length
+             * @param length Length in bytes to generate
+             * @returns Random byte array
+             */
+            function getRandomBytes(length: Integer): Uint8Array;
+
+            /**
+             * Create a secure random MPI that is greater than or equal to min and less than max.
+             * @param min Lower bound, included
+             * @param max Upper bound, excluded
+             * @returns Random MPI
+             */
+            function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
+
+            /**
+             * Buffer for secure random numbers
+             */
+            function RandomBuffer(): void;
+        }
+
+        namespace signature {
+            /**
+             * Verifies the signature provided for data using specified algorithms and public key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+             * for public key and hash algorithms.
+             * @param algo Public key algorithm
+             * @param hash_algo Hash algorithm
+             * @param msg_MPIs Algorithm-specific signature parameters
+             * @param pub_MPIs Algorithm-specific public key parameters
+             * @param data Data for which the signature was created
+             * @param hashed The hashed data
+             * @returns True if signature is valid
+             */
+            function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
+
+            /**
+             * Creates a signature on data using specified algorithms and private key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+             * for public key and hash algorithms.
+             * @param algo Public key algorithm
+             * @param hash_algo Hash algorithm
+             * @param key_params Algorithm-specific public and private key parameters
+             * @param data Data to be signed
+             * @param hashed The hashed data
+             * @returns Signature
+             */
+            function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
+        }
     }
 
-    namespace random {
-        /** Create a secure random big integer of bits length
-            @param bits Bit length of the MPI to create
-        */
-        function getRandomBigInteger(bits: number): number;
+    namespace eme {
+        /**
+         * Create a EME-PKCS1-v1_5 padded message
+         * @see
+         * @param M message to be encoded
+         * @param k the length in octets of the key modulus
+         * @returns EME-PKCS1 padded message
+         */
+        function encode(M: string, k: Integer): Promise<String>;
 
-        /** Retrieve secure random byte string of the specified length
-            @param length Length in bytes to generate
-        */
-        function getRandomBytes(length: number): string;
+        /**
+         * Decode a EME-PKCS1-v1_5 padded message
+         * @see
+         * @param EM encoded message, an octet string
+         * @returns message, an octet string
+         */
+        function decode(EM: string): string;
+    }
 
-        /** Helper routine which calls platform specific crypto random generator
-            @param buf
-        */
-        function getRandomValues(buf: Uint8Array): void;
+    namespace emsa {
+        /**
+         * Create a EMSA-PKCS1-v1_5 padded message
+         * @see
+         * @param algo Hash algorithm type used
+         * @param hashed message to be encoded
+         * @param emLen intended length in octets of the encoded message
+         * @returns encoded message
+         */
+        function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+    }
 
-        /** Return a secure random number in the specified range
-            @param from Min of the random number
-            @param to Max of the random number (max 32bit)
+    namespace encoding {
+        namespace armor {
+            /**
+             * Add additional information to the armor version of an OpenPGP binary
+             * packet block.
+             * @author Alex
+             * @version 2011-12-16
+             * @param customComment (optional) additional comment to add to the armored string
+             * @returns The header information
+             */
+            function addheader(customComment: string): string;
+
+            /**
+             * Calculates a checksum over the given data and returns it base64 encoded
+             * @param data Data to create a CRC-24 checksum for
+             * @returns Base64 encoded checksum
+             */
+            function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
+
+            /**
+             * Internal function to calculate a CRC-24 checksum over a given string (data)
+             * @param data Data to create a CRC-24 checksum for
+             * @returns The CRC-24 checksum
+             */
+            function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Splits a message into two parts, the body and the checksum. This is an internal function
+             * @param text OpenPGP armored message part
+             * @returns An object with attribute "body" containing the body
+             *          and an attribute "checksum" containing the checksum.
+             */
+            function splitChecksum(text: string): object;
+
+            /**
+             * DeArmor an OpenPGP armored message; verify the checksum and return
+             * the encoded bytes
+             * @param text OpenPGP armored message
+             * @returns An object with attribute "text" containing the message text,
+             *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
+             */
+            function dearmor(text: string): Promise<Object>;
+
+            /**
+             * Armor an OpenPGP binary packet block
+             * @param messagetype type of the message
+             * @param body
+             * @param partindex
+             * @param parttotal
+             * @param customComment (optional) additional comment to add to the armored string
+             * @returns Armored text
+             */
+            function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
+        }
+
+        namespace base64 {
+            /**
+             * Convert binary array to radix-64
+             * @param t Uint8Array to convert
+             * @param u if true, output is URL-safe
+             * @returns radix-64 version of input string
+             */
+            function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
+
+            /**
+             * Convert radix-64 to binary array
+             * @param t radix-64 string to convert
+             * @param u if true, input is interpreted as URL-safe
+             * @returns binary array version of input string
+             */
+            function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
+        }
+    }
+
+
+
+    namespace enums {
+        /**
+         * Maps curve names under various standards to one
+         * @see
         */
-        function getSecureRandom(from: number, to: number): number;
+        type curve = "p256" | "p384" | "p251" | "secp256k1" | "ed25519" | "curve25519" | "brainpoolP256r1" | "brainpoolP384r1" | "brainpoolP512r1";
+
+        /**
+         * A string to key specifier type
+         */
+        enum s2k {
+            simple = 0,
+            salted = 1,
+            iterated = 3,
+            gnu = 101,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
+         */
+        enum publicKey {
+            /**
+             * RSA (Encrypt or Sign) [HAC]
+             */
+            rsa_encrypt_sign = 1,
+            /**
+             * RSA (Encrypt only) [HAC]
+             */
+            rsa_encrypt = 2,
+            /**
+             * RSA (Sign only) [HAC]
+             */
+            rsa_sign = 3,
+            /**
+             * Elgamal (Encrypt only) [ELGAMAL] [HAC]
+             */
+            elgamal = 16,
+            /**
+             * DSA (Sign only) [FIPS186] [HAC]
+             */
+            dsa = 17,
+            /**
+             * ECDH (Encrypt only) [RFC6637]
+             */
+            ecdh = 18,
+            /**
+             * ECDSA (Sign only) [RFC6637]
+             */
+            ecdsa = 19,
+            /**
+             * EdDSA (Sign only)
+             * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
+             */
+            eddsa = 22,
+            /**
+             * Reserved for AEDH
+             */
+            aedh = 23,
+            /**
+             * Reserved for AEDSA
+             */
+            aedsa = 24,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
+         */
+        enum symmetric {
+            plaintext = 0,
+            /**
+             * Not implemented!
+             */
+            idea = 1,
+            "3des" = 2,
+            tripledes = 2,
+            cast5 = 3,
+            blowfish = 4,
+            aes128 = 7,
+            aes192 = 8,
+            aes256 = 9,
+            twofish = 10,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
+         */
+        enum compression {
+            uncompressed = 0,
+            /**
+             * RFC1951
+             */
+            zip = 1,
+            /**
+             * RFC1950
+             */
+            zlib = 2,
+            bzip2 = 3,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
+         */
+        enum hash {
+            md5 = 1,
+            sha1 = 2,
+            ripemd = 3,
+            sha256 = 8,
+            sha384 = 9,
+            sha512 = 10,
+            sha224 = 11,
+        }
+
+        /**
+         * A list of hash names as accepted by webCrypto functions.
+         * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
+         */
+        enum webHash {
+            "SHA-1" = 2,
+            "SHA-256" = 8,
+            "SHA-384" = 9,
+            "SHA-512" = 10,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
+         */
+        enum aead {
+            eax = 1,
+            ocb = 2,
+            experimental_gcm = 100,
+        }
+
+        /**
+         * A list of packet types and numeric tags associated with them.
+         */
+        enum packet {
+            publicKeyEncryptedSessionKey = 1,
+            signature = 2,
+            symEncryptedSessionKey = 3,
+            onePassSignature = 4,
+            secretKey = 5,
+            publicKey = 6,
+            secretSubkey = 7,
+            compressed = 8,
+            symmetricallyEncrypted = 9,
+            marker = 10,
+            literal = 11,
+            trust = 12,
+            userid = 13,
+            publicSubkey = 14,
+            userAttribute = 17,
+            symEncryptedIntegrityProtected = 18,
+            modificationDetectionCode = 19,
+            symEncryptedAEADProtected = 20,
+        }
+
+        /**
+         * Data types in the literal packet
+         */
+        enum literal {
+            /**
+             * Binary data 'b'
+             */
+            binary = 98,
+            /**
+             * Text data 't'
+             */
+            text = 116,
+            /**
+             * Utf8 data 'u'
+             */
+            utf8 = 117,
+            /**
+             * MIME message body part 'm'
+             */
+            mime = 109,
+        }
+
+        /**
+         * One pass signature packet type
+         */
+        enum signature {
+            /**
+             * 0x00: Signature of a binary document.
+             */
+            binary = 0,
+            /**
+             * 0x01: Signature of a canonical text document.
+             * Canonicalyzing the document by converting line endings.
+             */
+            text = 1,
+            /**
+             * 0x02: Standalone signature.
+             * This signature is a signature of only its own subpacket contents.
+             * It is calculated identically to a signature over a zero-lengh
+             * binary document.  Note that it doesn't make sense to have a V3
+             * standalone signature.
+             */
+            standalone = 2,
+            /**
+             * 0x10: Generic certification of a User ID and Public-Key packet.
+             * The issuer of this certification does not make any particular
+             * assertion as to how well the certifier has checked that the owner
+             * of the key is in fact the person described by the User ID.
+             */
+            cert_generic = 16,
+            /**
+             * 0x11: Persona certification of a User ID and Public-Key packet.
+             * The issuer of this certification has not done any verification of
+             * the claim that the owner of this key is the User ID specified.
+             */
+            cert_persona = 17,
+            /**
+             * 0x12: Casual certification of a User ID and Public-Key packet.
+             * The issuer of this certification has done some casual
+             * verification of the claim of identity.
+             */
+            cert_casual = 18,
+            /**
+             * 0x13: Positive certification of a User ID and Public-Key packet.
+             * The issuer of this certification has done substantial
+             * verification of the claim of identity.
+             * Most OpenPGP implementations make their "key signatures" as 0x10
+             * certifications.  Some implementations can issue 0x11-0x13
+             * certifications, but few differentiate between the types.
+             */
+            cert_positive = 19,
+            /**
+             * 0x30: Certification revocation signature
+             * This signature revokes an earlier User ID certification signature
+             * (signature class 0x10 through 0x13) or direct-key signature
+             * (0x1F).  It should be issued by the same key that issued the
+             * revoked signature or an authorized revocation key.  The signature
+             * is computed over the same data as the certificate that it
+             * revokes, and should have a later creation date than that
+             * certificate.
+             */
+            cert_revocation = 48,
+            /**
+             * 0x18: Subkey Binding Signature
+             * This signature is a statement by the top-level signing key that
+             * indicates that it owns the subkey.  This signature is calculated
+             * directly on the primary key and subkey, and not on any User ID or
+             * other packets.  A signature that binds a signing subkey MUST have
+             * an Embedded Signature subpacket in this binding signature that
+             * contains a 0x19 signature made by the signing subkey on the
+             * primary key and subkey.
+             */
+            subkey_binding = 24,
+            /**
+             * 0x19: Primary Key Binding Signature
+             * This signature is a statement by a signing subkey, indicating
+             * that it is owned by the primary key and subkey.  This signature
+             * is calculated the same way as a 0x18 signature: directly on the
+             * primary key and subkey, and not on any User ID or other packets.
+             * When a signature is made over a key, the hash data starts with the
+             * octet 0x99, followed by a two-octet length of the key, and then body
+             * of the key packet.  (Note that this is an old-style packet header for
+             * a key packet with two-octet length.)  A subkey binding signature
+             * (type 0x18) or primary key binding signature (type 0x19) then hashes
+             * the subkey using the same format as the main key (also using 0x99 as
+             * the first octet).
+             */
+            key_binding = 25,
+            /**
+             * 0x1F: Signature directly on a key
+             * This signature is calculated directly on a key.  It binds the
+             * information in the Signature subpackets to the key, and is
+             * appropriate to be used for subpackets that provide information
+             * about the key, such as the Revocation Key subpacket.  It is also
+             * appropriate for statements that non-self certifiers want to make
+             * about the key itself, rather than the binding between a key and a
+             * name.
+             */
+            key = 31,
+            /**
+             * 0x20: Key revocation signature
+             * The signature is calculated directly on the key being revoked.  A
+             * revoked key is not to be used.  Only revocation signatures by the
+             * key being revoked, or by an authorized revocation key, should be
+             * considered valid revocation signatures.a
+             */
+            key_revocation = 32,
+            /**
+             * 0x28: Subkey revocation signature
+             * The signature is calculated directly on the subkey being revoked.
+             * A revoked subkey is not to be used.  Only revocation signatures
+             * by the top-level signature key that is bound to this subkey, or
+             * by an authorized revocation key, should be considered valid
+             * revocation signatures.
+             * Key revocation signatures (types 0x20 and 0x28)
+             * hash only the key being revoked.
+             */
+            subkey_revocation = 40,
+            /**
+             * 0x40: Timestamp signature.
+             * This signature is only meaningful for the timestamp contained in
+             * it.
+             */
+            timestamp = 64,
+            /**
+             * 0x50: Third-Party Confirmation signature.
+             * This signature is a signature over some other OpenPGP Signature
+             * packet(s).  It is analogous to a notary seal on the signed data.
+             * A third-party signature SHOULD include Signature Target
+             * subpacket(s) to give easy identification.  Note that we really do
+             * mean SHOULD.  There are plausible uses for this (such as a blind
+             * party that only sees the signature, not the key or source
+             * document) that cannot include a target subpacket.
+             */
+            third_party = 80,
+        }
+
+        /**
+         * Signature subpacket type
+         */
+        enum signatureSubpacket {
+            signature_creation_time = 2,
+            signature_expiration_time = 3,
+            exportable_certification = 4,
+            trust_signature = 5,
+            regular_expression = 6,
+            revocable = 7,
+            key_expiration_time = 9,
+            placeholder_backwards_compatibility = 10,
+            preferred_symmetric_algorithms = 11,
+            revocation_key = 12,
+            issuer = 16,
+            notation_data = 20,
+            preferred_hash_algorithms = 21,
+            preferred_compression_algorithms = 22,
+            key_server_preferences = 23,
+            preferred_key_server = 24,
+            primary_user_id = 25,
+            policy_uri = 26,
+            key_flags = 27,
+            signers_user_id = 28,
+            reason_for_revocation = 29,
+            features = 30,
+            signature_target = 31,
+            embedded_signature = 32,
+            issuer_fingerprint = 33,
+            preferred_aead_algorithms = 34,
+        }
+
+        /**
+         * Key flags
+         */
+        enum keyFlags {
+            /**
+             * 0x01 - This key may be used to certify other keys.
+             */
+            certify_keys = 1,
+            /**
+             * 0x02 - This key may be used to sign data.
+             */
+            sign_data = 2,
+            /**
+             * 0x04 - This key may be used to encrypt communications.
+             */
+            encrypt_communication = 4,
+            /**
+             * 0x08 - This key may be used to encrypt storage.
+             */
+            encrypt_storage = 8,
+            /**
+             * 0x10 - The private component of this key may have been split
+             * by a secret-sharing mechanism.
+             */
+            split_private_key = 16,
+            /**
+             * 0x20 - This key may be used for authentication.
+             */
+            authentication = 32,
+            /**
+             * 0x80 - The private component of this key may be in the
+             * possession of more than one person.
+             */
+            shared_private_key = 128,
+        }
+
+        /**
+         * Key status
+         */
+        enum keyStatus {
+            invalid = 0,
+            expired = 1,
+            revoked = 2,
+            valid = 3,
+            no_self_cert = 4,
+        }
+
+        /**
+         * Armor type
+         */
+        enum armor {
+            multipart_section = 0,
+            multipart_last = 1,
+            signed = 2,
+            message = 3,
+            public_key = 4,
+            private_key = 5,
+            signature = 6,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
+         */
+        enum reasonForRevocation {
+            /**
+             * No reason specified (key revocations or cert revocations)
+             */
+            no_reason = 0,
+            /**
+             * Key is superseded (key revocations)
+             */
+            key_superseded = 1,
+            /**
+             * Key material has been comPromise<any>d (key revocations)
+             */
+            key_comPromised = 2,
+            /**
+             * Key is retired and no longer used (key revocations)
+             */
+            key_retired = 3,
+            /**
+             * User ID information is no longer valid (cert revocations)
+             */
+            userid_invalid = 32,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
+         */
+        enum features {
+            /**
+             * 0x01 - Modification Detection (packets 18 and 19)
+             */
+            modification_detection = 1,
+            /**
+             * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
+             * Symmetric-Key Encrypted Session Key Packets (packet 3)
+             */
+            aead = 2,
+            /**
+             * 0x04 - Version 5 Public-Key Packet format and corresponding new
+             * fingerprint format
+             */
+            v5_keys = 4,
+        }
+
+        /**
+         * Asserts validity and converts from string/integer to integer.
+         */
+        function write(): void;
+
+        /**
+         * Converts from an integer to string.
+         */
+        function read(): void;
+    }
+
+    namespace hkp {
+        class HKP {
+            /**
+             * Initialize the HKP client and configure it with the key server url and fetch function.
+             * @param keyServerBaseUrl (optional) The HKP key server base url including
+             *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+             *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+             */
+            constructor(keyServerBaseUrl: string);
+
+            /**
+             * Search for a public key on the key server either by key ID or part of the user ID.
+             * @param options.keyID The long public key ID.
+             * @param options.query This can be any part of the key user ID such as name
+             *        or email address.
+             * @returns The ascii armored public key.
+             */
+            lookup(): Promise<String>;
+
+            /**
+             * Upload a public key to the server.
+             * @param publicKeyArmored An ascii armored public key to be uploaded.
+             * @returns
+             */
+            upload(publicKeyArmored: string): Promise<any>;
+        }
+    }
+
+    class HKP {
+        /**
+         * Initialize the HKP client and configure it with the key server url and fetch function.
+         * @param keyServerBaseUrl (optional) The HKP key server base url including
+         *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+         *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+         */
+        constructor(keyServerBaseUrl: string);
+
+        /**
+         * Search for a public key on the key server either by key ID or part of the user ID.
+         * @param options.keyID The long public key ID.
+         * @param options.query This can be any part of the key user ID such as name
+         *        or email address.
+         * @returns The ascii armored public key.
+         */
+        lookup(): Promise<String>;
+
+        /**
+         * Upload a public key to the server.
+         * @param publicKeyArmored An ascii armored public key to be uploaded.
+         * @returns
+         */
+        upload(publicKeyArmored: string): Promise<any>;
+    }
+
+    namespace key {
+        /**
+         * Class that represents an OpenPGP key. Must contain a primary key.
+         * Can contain additional subkeys, signatures, user ids, user attributes.
+         */
+        class Key {
+            /**
+             * @param packetlist The packets that form this key
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Transforms packetlist to structured key data
+             * @param packetlist The packets that form a key
+             */
+            packetlist2structure(packetlist: packet.List): void;
+
+            /**
+             * Transforms structured key data to packetlist
+             * @returns The packets that form a key
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Returns an array containing all public or private subkeys matching keyId;
+             * If keyId is not present, returns all subkeys.
+             * @param keyId
+             * @returns
+             */
+            getSubkeys(keyId: type.keyid.Keyid): any[];
+
+            /**
+             * Returns an array containing all public or private keys matching keyId.
+             * If keyId is not present, returns all keys starting with the primary key.
+             * @param keyId
+             * @returns
+             */
+            getKeys(keyId: type.keyid.Keyid): any[];
+
+            /**
+             * Returns key IDs of all keys
+             * @returns
+             */
+            getKeyIds(): any[];
+
+            /**
+             * Returns userids
+             * @returns array of userids
+             */
+            getUserIds(): any[];
+
+            /**
+             * Returns true if this is a public key
+             * @returns
+             */
+            isPublic(): boolean;
+
+            /**
+             * Returns true if this is a private key
+             * @returns
+             */
+            isPrivate(): boolean;
+
+            /**
+             * Returns key as public key (shallow copy)
+             * @returns new public Key
+             */
+            toPublic(): Key;
+
+            /**
+             * Returns ASCII armored text of key
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+
+            /**
+             * Returns last created key or key by given keyId that is available for signing and verification
+             * @param keyId, optional
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId, optional user ID
+             * @returns key or null if no signing key has been found
+             */
+            getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
+
+            /**
+             * Returns last created key or key by given keyId that is available for encryption or decryption
+             * @param keyId, optional
+             * @param date, optional
+             * @param userId, optional
+             * @returns key or null if no encryption key has been found
+             */
+            getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
+
+            /**
+             * Encrypts all secret key and subkey packets matching keyId
+             * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
+             * @param keyId
+             * @returns
+             */
+            encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
+
+            /**
+             * Decrypts all secret key and subkey packets matching keyId
+             * @param passphrases
+             * @param keyId
+             * @returns true if all matching key and subkey packets decrypted successfully
+             */
+            decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
+
+            /**
+             * Checks if a signature on a key is revoked
+             * @param
+             * @param signature The signature to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the certificate is revoked
+             */
+            isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
+
+            /**
+             * Verify primary key. Checks for revocation signatures, expiration time
+             * and valid self signature
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID
+             * @returns The status of the primary key
+             */
+            verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
+
+            /**
+             * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
+             * When `capabilities` is null, defaults to returning the expiry date of the primary key.
+             * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
+             * Returns Infinity if the key doesn't expire.
+             * @param {encrypt | sign | encrypt_sign} capabilities, optional
+             * @param keyId, optional
+             * @param userId, optional user ID
+             * @returns
+             */
+            getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
+
+            /**
+             * Returns primary user and most significant (latest valid) self signature
+             * - if multiple primary users exist, returns the one with the latest self signature
+             * - otherwise, returns the user with the latest self signature
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns The primary user and the self signature
+             */
+            getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
+
+            /**
+             * Update key with new components from specified key with same key ID:
+             * users, subkeys, certificates are merged into the destination key,
+             * duplicates and expired signatures are ignored.
+             * If the specified key is a private key and the destination key is public,
+             * the destination key is transformed to a private key.
+             * @param key Source key to merge
+             * @returns
+             */
+            update(key: Key): Promise<undefined>;
+
+            /**
+             * Revokes the key
+             * @param reasonForRevocation optional, object indicating the reason for revocation
+             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+             * @param reasonForRevocation.string optional, string explaining the reason for revocation
+             * @param date optional, override the creationtime of the revocation signature
+             * @returns new key with revocation signature
+             */
+            revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
+
+            /**
+             * Get revocation certificate from a revoked key.
+             * (To get a revocation certificate for an unrevoked key, call revoke() first.)
+             * @returns armored revocation certificate
+             */
+            getRevocationCertificate(): Promise<String>;
+
+            /**
+             * Applies a revocation certificate to a key
+             * This adds the first signature packet in the armored text to the key,
+             * if it is a valid revocation signature.
+             * @param revocationCertificate armored revocation certificate
+             * @returns new revoked key
+             */
+            applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
+
+            /**
+             * Signs primary user of key
+             * @param privateKey decrypted private keys for signing
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns new public key with new certificate signature
+             */
+            signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
+
+            /**
+             * Signs all users of key
+             * @param privateKeys decrypted private keys for signing
+             * @returns new public key with new certificate signature
+             */
+            signAllUsers(privateKeys: any[]): Promise<Key>;
+
+            /**
+             * Verifies primary user of key
+             * - if no arguments are given, verifies the self certificates;
+             * - otherwise, verifies all certificates signed with given keys.
+             * @param keys array of keys to verify certificate signatures
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns List of signer's keyid and validity of signature
+             */
+            verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verifies all users of key
+             * - if no arguments are given, verifies the self certificates;
+             * - otherwise, verifies all certificates signed with given keys.
+             * @param keys array of keys to verify certificate signatures
+             * @returns list of userid, signer's keyid and validity of signature
+             */
+            verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+        }
+
+        /**
+         * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
+         * @param signatures List of signatures
+         * @param date Use the given date instead of the current time
+         * @returns The latest valid signature
+         */
+        function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
+
+        /**
+         * Class that represents an user ID or attribute packet and the relevant signatures.
+         */
+        class User {
+            constructor();
+
+            /**
+             * Transforms structured user data to packetlist
+             * @returns
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Signs user
+             * @param primaryKey The primary key packet
+             * @param privateKeys Decrypted private keys for signing
+             * @returns New user with new certificate signatures
+             */
+            sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
+
+            /**
+             * Checks if a given certificate of the user is revoked
+             * @param primaryKey The primary key packet
+             * @param certificate The certificate to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the certificate is revoked
+             */
+            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+            /**
+             * Verifies the user certificate
+             * @param primaryKey The primary key packet
+             * @param certificate A certificate of this user
+             * @param keys Array of keys to verify certificate signatures
+             * @param date Use the given date instead of the current time
+             * @returns status of the certificate
+             */
+            verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Verifies all user certificates
+             * @param primaryKey The primary key packet
+             * @param keys Array of keys to verify certificate signatures
+             * @param date Use the given date instead of the current time
+             * @returns List of signer's keyid and validity of signature
+             */
+            verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verify User. Checks for existence of self signatures, revocation signatures
+             * and validity of self signature
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns Status of user
+             */
+            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Update user with new components from specified user
+             * @param user Source user to merge
+             * @param primaryKey primary key used for validation
+             * @returns
+             */
+            update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        }
+
+        /**
+         * Create signature packet
+         * @param dataToSign Contains packets to be signed
+         * @param signingKeyPacket secret key packet for signing
+         * @param signatureProperties (optional) properties to write on the signature packet before signing
+         * @param date (optional) override the creationtime of the signature
+         * @param userId (optional) user ID
+         * @returns signature packet
+         */
+        function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
+
+        /**
+         * Class that represents a subkey packet and the relevant signatures.
+         */
+        class SubKey {
+            constructor();
+
+            /**
+             * Transforms structured subkey data to packetlist
+             * @returns
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Checks if a binding signature of a subkey is revoked
+             * @param primaryKey The primary key packet
+             * @param signature The binding signature to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the binding signature is revoked
+             */
+            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+            /**
+             * Verify subkey. Checks for revocation signatures, expiration time
+             * and valid binding signature
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns The status of the subkey
+             */
+            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Returns the expiration time of the subkey or Infinity if key does not expire
+             * Returns null if the subkey is invalid.
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns
+             */
+            getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+            /**
+             * Update subkey with new components from specified subkey
+             * @param subKey Source subkey to merge
+             * @param primaryKey primary key used for validation
+             * @returns
+             */
+            update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+            /**
+             * Revokes the subkey
+             * @param primaryKey decrypted private primary key for revocation
+             * @param reasonForRevocation optional, object indicating the reason for revocation
+             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+             * @param reasonForRevocation.string optional, string explaining the reason for revocation
+             * @param date optional, override the creationtime of the revocation signature
+             * @returns new subkey with revocation signature
+             */
+            revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+        }
+
+        /**
+         * Reads an unarmored OpenPGP key list and returns one or multiple key objects
+         * @param data to be parsed
+         * @returns result object with key and error arrays
+         */
+        function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
+
+        interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
+
+        /**
+         * Reads an OpenPGP armored text and returns one or multiple key objects
+         * @param armoredText text to be parsed
+         * @returns result object with key and error arrays
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
+
+        /**
+         * Generates a new OpenPGP key. Supports RSA and ECC keys.
+         * Primary and subkey will be of same type.
+         * @param options.keyType To indicate what type of key to make.
+         *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
+         * @param options.numBits number of bits for the key creation.
+         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+         *        If array is used, the first userId is set as primary user Id
+         * @param options.passphrase The passphrase used to encrypt the resulting private key
+         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+         * @param curve (optional) elliptic curve for ECC keys
+         * @param date Override the creation date of the key and the key signatures
+         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         * @returns
+         */
+        function generate(options: KeyOptions): Promise<Key>;
+
+        /**
+         * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
+         * @param options.privateKey The private key to reformat
+         * @param options.keyType
+         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+         *        If array is used, the first userId is set as primary user Id
+         * @param options.passphrase The passphrase used to encrypt the resulting private key
+         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+         * @param date Override the creation date of the key and the key signatures
+         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         * @returns
+         */
+        function reformat(date: Date, subkeys: any[]): Promise<Key>;
+
+        /**
+         * Checks if a given certificate or binding signature is revoked
+         * @param primaryKey The primary key packet
+         * @param dataToVerify The data to check
+         * @param revocations The revocation signatures to check
+         * @param signature The certificate or signature to check
+         * @param key, optional The key packet to check the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the signature revokes the data
+         */
+        function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
+         * and throw error if found
+         * @param signature The certificate or signature to check
+         * @param keyId Check only certificates or signatures from a certain issuer key ID
+         */
+        function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
+
+        /**
+         * Returns the preferred signature hash algorithm of a key
+         * @param key (optional) the key to get preferences from
+         * @param keyPacket key packet used for signing
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID
+         * @returns
+         */
+        function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+
+        /**
+         * Returns the preferred symmetric/aead algorithm for a set of keys
+         * @param {symmetric | aead} type Type of preference to return
+         * @param keys Set of keys
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userIds (optional) user IDs
+         * @returns Preferred symmetric algorithm
+         */
+        function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+
+        /**
+         * Returns whether aead is supported by all keys in the set
+         * @param keys Set of keys
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userIds (optional) user IDs
+         * @returns
+         */
+        function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+    }
+
+    interface revoke_reasonForRevocation {
+        /**
+         * optional, flag indicating the reason for revocation
+         */
+        flag: enums.reasonForRevocation;
+        /**
+         * optional, string explaining the reason for revocation
+         */
+        string: string;
+    }
+
+    /**
+     * Class that represents an user ID or attribute packet and the relevant signatures.
+     */
+    class User {
+        constructor();
+
+        /**
+         * Transforms structured user data to packetlist
+         * @returns
+         */
+        toPacketlist(): packet.List;
+
+        /**
+         * Signs user
+         * @param primaryKey The primary key packet
+         * @param privateKeys Decrypted private keys for signing
+         * @returns New user with new certificate signatures
+         */
+        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+
+        /**
+         * Checks if a given certificate of the user is revoked
+         * @param primaryKey The primary key packet
+         * @param certificate The certificate to verify
+         * @param key, optional The key to verify the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the certificate is revoked
+         */
+        isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Verifies the user certificate
+         * @param primaryKey The primary key packet
+         * @param certificate A certificate of this user
+         * @param keys Array of keys to verify certificate signatures
+         * @param date Use the given date instead of the current time
+         * @returns status of the certificate
+         */
+        verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Verifies all user certificates
+         * @param primaryKey The primary key packet
+         * @param keys Array of keys to verify certificate signatures
+         * @param date Use the given date instead of the current time
+         * @returns List of signer's keyid and validity of signature
+         */
+        verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verify User. Checks for existence of self signatures, revocation signatures
+         * and validity of self signature
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns Status of user
+         */
+        verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Update user with new components from specified user
+         * @param user Source user to merge
+         * @param primaryKey primary key used for validation
+         * @returns
+         */
+        update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+    }
+
+    /**
+     * Class that represents a subkey packet and the relevant signatures.
+     */
+    class SubKey {
+        constructor();
+
+        /**
+         * Transforms structured subkey data to packetlist
+         * @returns
+         */
+        toPacketlist(): packet.List;
+
+        /**
+         * Checks if a binding signature of a subkey is revoked
+         * @param primaryKey The primary key packet
+         * @param signature The binding signature to verify
+         * @param key, optional The key to verify the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the binding signature is revoked
+         */
+        isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Verify subkey. Checks for revocation signatures, expiration time
+         * and valid binding signature
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns The status of the subkey
+         */
+        verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Returns the expiration time of the subkey or Infinity if key does not expire
+         * Returns null if the subkey is invalid.
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns
+         */
+        getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+        /**
+         * Update subkey with new components from specified subkey
+         * @param subKey Source subkey to merge
+         * @param primaryKey primary key used for validation
+         * @returns
+         */
+        update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+        /**
+         * Revokes the subkey
+         * @param primaryKey decrypted private primary key for revocation
+         * @param reasonForRevocation optional, object indicating the reason for revocation
+         * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+         * @param reasonForRevocation.string optional, string explaining the reason for revocation
+         * @param date optional, override the creationtime of the revocation signature
+         * @returns new subkey with revocation signature
+         */
+        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+    }
+
+    /**
+     * @see module:keyring/keyring
+     * @see module:keyring/localstore
+     */
+    namespace keyring {
+        namespace keyring {
+            class Keyring {
+                /**
+                 * Initialization routine for the keyring.
+                 * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
+                 */
+                constructor(storeHandler?: localstore.LocalStore);
+
+                /**
+                 * Calls the storeHandler to load the keys
+                 */
+                load(): void;
+
+                /**
+                 * Calls the storeHandler to save the keys
+                 */
+                store(): void;
+
+                /**
+                 * Clear the keyring - erase all the keys
+                 */
+                clear(): void;
+
+                /**
+                 * Searches the keyring for keys having the specified key id
+                 * @param keyId provided as string of lowercase hex number
+                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+                 * @param deep if true search also in subkeys
+                 * @returns keys found or null
+                 */
+                getKeysForId(keyId: string, deep: boolean): any[] | null;
+
+                /**
+                 * Removes keys having the specified key id from the keyring
+                 * @param keyId provided as string of lowercase hex number
+                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+                 * @returns keys found or null
+                 */
+                removeKeysForId(keyId: string): any[] | null;
+
+                /**
+                 * Get all public and private keys
+                 * @returns all keys
+                 */
+                getAllKeys(): any[];
+            }
+
+            /**
+             * Array of keys
+             * @param keys The keys to store in this array
+             */
+            function KeyArray(keys: any[]): void;
+        }
+
+        namespace localstore {
+            class LocalStore {
+                /**
+                 * The class that deals with storage of the keyring.
+                 * Currently the only option is to use HTML5 local storage.
+                 * @param prefix prefix for itemnames in localstore
+                 */
+                constructor(prefix: string);
+
+                /**
+                 * Load the public keys from HTML5 local storage.
+                 * @returns array of keys retrieved from localstore
+                 */
+                loadPublic(): any[];
+
+                /**
+                 * Load the private keys from HTML5 local storage.
+                 * @returns array of keys retrieved from localstore
+                 */
+                loadPrivate(): any[];
+
+                /**
+                 * Saves the current state of the public keys to HTML5 local storage.
+                 * The key array gets stringified using JSON
+                 * @param keys array of keys to save in localstore
+                 */
+                storePublic(keys: any[]): void;
+
+                /**
+                 * Saves the current state of the private keys to HTML5 local storage.
+                 * The key array gets stringified using JSON
+                 * @param keys array of keys to save in localstore
+                 */
+                storePrivate(keys: any[]): void;
+            }
+        }
+    }
+
+    class LocalStore {
+        /**
+         * The class that deals with storage of the keyring.
+         * Currently the only option is to use HTML5 local storage.
+         * @param prefix prefix for itemnames in localstore
+         */
+        constructor(prefix: string);
+
+        /**
+         * Load the public keys from HTML5 local storage.
+         * @returns array of keys retrieved from localstore
+         */
+        loadPublic(): any[];
+
+        /**
+         * Load the private keys from HTML5 local storage.
+         * @returns array of keys retrieved from localstore
+         */
+        loadPrivate(): any[];
+
+        /**
+         * Saves the current state of the public keys to HTML5 local storage.
+         * The key array gets stringified using JSON
+         * @param keys array of keys to save in localstore
+         */
+        storePublic(keys: any[]): void;
+
+        /**
+         * Saves the current state of the private keys to HTML5 local storage.
+         * The key array gets stringified using JSON
+         * @param keys array of keys to save in localstore
+         */
+        storePrivate(keys: any[]): void;
+    }
+
+    namespace message {
+        /**
+         * Class that represents an OpenPGP message.
+         * Can be an encrypted message, signed message, compressed message or literal message
+         */
+        class Message {
+            packets: packet.List;
+
+            /**
+             * @param packetlist The packets that form this message
+             *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Returns the key IDs of the keys to which the session key is encrypted
+             * @returns array of keyid objects
+             */
+            getEncryptionKeyIds(): any[];
+
+            /**
+             * Returns the key IDs of the keys that signed the message
+             * @returns array of keyid objects
+             */
+            getSigningKeyIds(): any[];
+
+            /**
+             * Decrypt the message. Either a private key, a session key, or a password must be specified.
+             * @param privateKeys (optional) private keys with decrypted secret data
+             * @param passwords (optional) passwords used to decrypt
+             * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+             * @param streaming (optional) whether to process data as a stream
+             * @returns new message with decrypted content
+             */
+            decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
+
+            /**
+             * Decrypt encrypted session keys either with private keys or passwords.
+             * @param privateKeys (optional) private keys with decrypted secret data
+             * @param passwords (optional) passwords used to decrypt
+             * @returns array of object with potential sessionKey, algorithm pairs
+             */
+            decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
+
+            /**
+             * Get literal data that is the body of the message
+             * @returns literal body of the message as Uint8Array
+             */
+            getLiteralData(): Uint8Array | null;
+
+            /**
+             * Get filename from literal data packet
+             * @returns filename of literal data packet as string
+             */
+            getFilename(): string | null;
+
+            /**
+             * Get literal data as text
+             * @returns literal body of the message interpreted as text
+             */
+            getText(): string | null;
+
+            /**
+             * Encrypt the message either with public keys, passwords, or both at once.
+             * @param keys (optional) public key(s) for message encryption
+             * @param passwords (optional) password(s) for message encryption
+             * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+             * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+             * @param date (optional) override the creation date of the literal package
+             * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+             * @param streaming (optional) whether to process data as a stream
+             * @returns new message with encrypted content
+             */
+            encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
+
+            /**
+             * Sign the message (the literal data packet of the message)
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature to add to the message
+             * @param date (optional) override the creation time of the signature
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new message with signed content
+             */
+            sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
+
+            /**
+             * Compresses the message (the literal and -if signed- signature data packets of the message)
+             * @param compression compression algorithm to be used
+             * @returns new message with compressed content
+             */
+            compress(compression: enums.compression): Message;
+
+            /**
+             * Create a detached signature for the message (the literal data packet of the message)
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) override the creation time of the signature
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new detached signature of message content
+             */
+            signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
+
+            /**
+             * Verify message signatures
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @param streaming (optional) whether to process data as a stream
+             * @returns list of signer's keyid and validity of signature
+             */
+            verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
+
+            /**
+             * Verify detached message signature
+             * @param keys array of keys to verify signatures
+             * @param signature
+             * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
+
+            /**
+             * Unwrap compressed message
+             * @returns message Content of compressed message
+             */
+            unwrapCompressed(): Message;
+
+            /**
+             * Append signature to unencrypted message object
+             * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
+             */
+            appendSignature(detachedSignature: string | Uint8Array): void;
+
+            /**
+             * Returns ASCII armored text of message
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+        }
+
+        /**
+         * Encrypt a session key either with public keys, passwords, or both at once.
+         * @param sessionKey session key for encryption
+         * @param symAlgo session key algorithm
+         * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
+         * @param publicKeys (optional) public key(s) for message encryption
+         * @param passwords (optional) for message encryption
+         * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+         * @param date (optional) override the date
+         * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         * @returns new message with encrypted content
+         */
+        function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+
+        /**
+         * Create signature packets for the message
+         * @param literalDataPacket the literal data packet to sign
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature to append
+         * @param date (optional) override the creationtime of the signature
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns list of signature packets
+         */
+        function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+
+        /**
+         * Create object containing signer's keyid and validity of signature
+         * @param signature signature packets
+         * @param literalDataList array of literal data packets
+         * @param keys array of keys to verify signatures
+         * @param date Verify the signature against the given date,
+         *        i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Create list of objects containing signer's keyid and validity of signature
+         * @param signatureList array of signature packets
+         * @param literalDataList array of literal data packets
+         * @param keys array of keys to verify signatures
+         * @param date Verify the signature against the given date,
+         *        i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * reads an OpenPGP armored message and returns a message object
+         * @param armoredText text to be parsed
+         * @returns new message object
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+
+        /**
+         * reads an OpenPGP message as byte array and returns a message object
+         * @param input binary message
+         * @param fromStream whether the message was created from a Stream
+         * @returns new message object
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+
+        /**
+         * creates new message object from text
+         * @param text
+         * @param filename (optional)
+         * @param date (optional)
+         * @param {utf8 | binary | text | mime} type (optional) data packet type
+         * @returns new message object
+         */
+        function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
+
+        /**
+         * creates new message object from binary data
+         * @param bytes
+         * @param filename (optional)
+         * @param date (optional)
+         * @param {utf8 | binary | text | mime} type (optional) data packet type
+         * @returns new message object
+         */
+        function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
+    }
+
+    interface revokeKey_reasonForRevocation {
+        /**
+         * (optional) flag indicating the reason for revocation
+         */
+        flag: enums.reasonForRevocation;
+        /**
+         * (optional) string explaining the reason for revocation
+         */
+        string: string;
+    }
+
+    /**
+     * @see module:packet/all_packets
+     * @see module:packet/clone
+     * @see module:packet.List
+     */
+    namespace packet {
+        /**
+         * Allocate a new packet
+         * @param tag property name from {@link module:enums.packet}
+         * @returns new packet object with type based on tag
+         */
+        function newPacketFromTag(tag: string): object;
+
+        /**
+         * Allocate a new packet from structured packet clone
+         * @see
+         * @param packetClone packet clone
+         * @returns new packet object with data from packet clone
+         */
+        function fromStructuredClone(packetClone: object): object;
+
+        class Compressed {
+            /**
+             * Implementation of the Compressed Data Packet (Tag 8)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
+             * The Compressed Data packet contains compressed data.  Typically,
+             * this packet is found as the contents of an encrypted packet, or following
+             * a Signature or One-Pass Signature packet, and contains a literal data packet.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * List of packets
+             */
+            packets: List;
+
+            /**
+             * Compression algorithm
+             * @type {compression}
+             */
+            algorithm: any;
+
+            /**
+             * Compressed packet data
+             */
+            compressed: Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Parsing function for the packet.
+             * @param bytes Payload of a tag 8 packet
+             */
+            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Return the compressed packet.
+             * @returns binary compressed packet
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Decompression method for decompressing the compressed data
+             * read by read_packet
+             */
+            decompress(): void;
+
+            /**
+             * Compress the packet data (member decompressedData)
+             */
+            compress(): void;
+        }
+
+        class Literal {
+            /**
+             * Implementation of the Literal Data Packet (Tag 11)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
+             * A Literal Data packet contains the body of a message; data that is not to be
+             * further interpreted.
+             * @param date the creation date of the literal package
+             */
+            constructor(date: Date);
+
+            /**
+             * Set the packet data to a javascript native string, end of line
+             * will be normalized to \r\n and by default text is converted to UTF8
+             * @param text Any native javascript string
+             * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
+             */
+            setText(text: string | ReadableStream<String>, format: any): void;
+
+            /**
+             * Returns literal data packets as native JavaScript string
+             * with normalized end of line to \n
+             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+             * @returns literal data as text
+             */
+            getText(clone: boolean): string | ReadableStream<String>;
+
+            /**
+             * Set the packet data to value represented by the provided string of bytes.
+             * @param bytes The string of bytes
+             * @param {utf8 | binary | text | mime} format The format of the string of bytes
+             */
+            setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
+
+            /**
+             * Get the byte sequence representing the literal packet data
+             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+             * @returns A sequence of bytes
+             */
+            getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Sets the filename of the literal packet data
+             * @param filename Any native javascript string
+             */
+            setFilename(filename: string): void;
+
+            /**
+             * Get the filename of the literal packet data
+             * @returns filename
+             */
+            getFilename(): string;
+
+            /**
+             * Parsing function for a literal data packet (tag 11).
+             * @param input Payload of a tag 11 packet
+             * @returns object representation
+             */
+            read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
+
+            /**
+             * Creates a string representation of the packet
+             * @returns Uint8Array representation of the packet
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+        }
+
+        class Marker {
+            /**
+             * Implementation of the strange "Marker packet" (Tag 10)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
+             * An experimental version of PGP used this packet as the Literal
+             * packet, but no released version of PGP generated Literal packets with this
+             * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
+             * the Marker packet.
+             * Such a packet MUST be ignored when received.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a literal data packet (tag 10).
+             * @param input Payload of a tag 10 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: string, position: Integer, len: Integer): Marker;
+        }
+
+        class OnePassSignature {
+            /**
+             * Implementation of the One-Pass Signature Packets (Tag 4)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
+             * The One-Pass Signature packet precedes the signed data and contains
+             * enough information to allow the receiver to begin calculating any
+             * hashes needed to verify the signature.  It allows the Signature
+             * packet to be placed at the end of the message, so that the signer
+             * can compute the entire signed message in one pass.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * A one-octet version number.  The current version is 3.
+             */
+            version: any;
+
+            /**
+             * A one-octet signature type.
+             * Signature types are described in
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
+             */
+            signatureType: any;
+
+            /**
+             * A one-octet number describing the hash algorithm used.
+             * @see
+             */
+            hashAlgorithm: any;
+
+            /**
+             * A one-octet number describing the public-key algorithm used.
+             * @see
+             */
+            publicKeyAlgorithm: any;
+
+            /**
+             * An eight-octet number holding the Key ID of the signing key.
+             */
+            issuerKeyId: any;
+
+            /**
+             * A one-octet number holding a flag showing whether the signature is nested.
+             * A zero value indicates that the next packet is another One-Pass Signature packet
+             * that describes another signature to be applied to the same message data.
+             */
+            flags: any;
+
+            /**
+             * parsing function for a one-pass signature packet (tag 4).
+             * @param bytes payload of a tag 4 packet
+             * @returns object representation
+             */
+            read(bytes: Uint8Array): OnePassSignature;
+
+            /**
+             * creates a string representation of a one-pass signature packet
+             * @returns a Uint8Array representation of a one-pass signature packet
+             */
+            write(): Uint8Array;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class List {
+            /**
+             * This class represents a list of openpgp packets.
+             * Take care when iterating over it - the packets themselves
+             * are stored as numerical indices.
+             */
+            constructor();
+
+            /**
+             * The number of packets contained within the list.
+             */
+            readonly length: Integer;
+
+            /**
+             * Reads a stream of binary data and interprents it as a list of packets.
+             * @param A Uint8Array of bytes.
+             */
+            read(A: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Creates a binary representation of openpgp objects contained within the
+             * class instance.
+             * @returns A Uint8Array containing valid openpgp packets.
+             */
+            write(): Uint8Array;
+
+            /**
+             * Adds a packet to the list. This is the only supported method of doing so;
+             * writing to packetlist[i] directly will result in an error.
+             * @param packet Packet to push
+             */
+            push(packet: object): void;
+
+            /**
+             * Creates a new PacketList with all packets from the given types
+             */
+            filterByTag(): void;
+
+            /**
+             * Traverses packet tree and returns first matching packet
+             * @param type The packet type
+             * @returns
+             */
+            findPacket(type: enums.packet): List | undefined;
+
+            /**
+             * Returns array of found indices by tag
+             */
+            indexOfTag(): void;
+
+            /**
+             * Concatenates packetlist or array of packets
+             */
+            concat(): void;
+
+            /**
+             * Allocate a new packetlist from structured packetlist clone
+             * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
+             * @param packetClone packetlist clone
+             * @returns new packetlist object with data from packetlist clone
+             */
+            static fromStructuredClone(packetClone: object): object;
+        }
+
+        class PublicKey {
+            /**
+             * Implementation of the Key Material Packet (Tag 5,6,7,14)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
+             * A key material packet contains all the information about a public or
+             * private key.  There are four variants of this packet type, and two
+             * major versions.
+             * A Public-Key packet starts a series of packets that forms an OpenPGP
+             * key (sometimes called an OpenPGP certificate).
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+             * called by read_tag&lt;num&gt;
+             * @param bytes Input array to read the packet from
+             * @returns This object with attributes set by the parser
+             */
+            read(bytes: Uint8Array): object;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Same as write_private_key, but has less information because of
+             * public key.
+             * @returns OpenPGP packet body contents,
+             */
+            write(): Uint8Array;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class PublicKeyEncryptedSessionKey {
+            /**
+             * Public-Key Encrypted Session Key Packets (Tag 1)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+             * A Public-Key Encrypted Session Key packet holds the session key
+             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+             * message is encrypted with the session key, and the session key is itself
+             * encrypted and stored in the Encrypted Session Key packet(s). The
+             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+             * Session Key packet for each OpenPGP key to which the message is encrypted.
+             * The recipient of the message finds a session key that is encrypted to their
+             * public key, decrypts the session key, and then uses the session key to
+             * decrypt the message.
+             */
+            constructor();
+
+            encrypted: any[];
+
+            /**
+             * Parsing function for a publickey encrypted session key packet (tag 1).
+             * @param input Payload of a tag 1 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
+
+            /**
+             * Create a string representation of a tag 1 packet
+             * @returns The Uint8Array representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Encrypt session key packet
+             * @param key Public key
+             * @returns
+             */
+            encrypt(key: PublicKey): Promise<Boolean>;
+
+            /**
+             * Decrypts the session key (only for public key encrypted session key
+             * packets (tag 1)
+             * @param key Private key with secret params unlocked
+             * @returns
+             */
+            decrypt(key: SecretKey): Promise<Boolean>;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class PublicSubkey {
+            /**
+             * A Public-Subkey packet (tag 14) has exactly the same format as a
+             * Public-Key packet, but denotes a subkey.  One or more subkeys may be
+             * associated with a top-level key.  By convention, the top-level key
+             * provides signature services, and the subkeys provide encryption
+             * services.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+             * called by read_tag&lt;num&gt;
+             * @param bytes Input array to read the packet from
+             * @returns This object with attributes set by the parser
+             */
+            read(bytes: Uint8Array): object;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Same as write_private_key, but has less information because of
+             * public key.
+             * @returns OpenPGP packet body contents,
+             */
+            write(): Uint8Array;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SecretKey {
+            /**
+             * A Secret-Key packet contains all the information that is found in a
+             * Public-Key packet, including the public-key material, but also
+             * includes the secret-key material after all the public-key fields.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+             */
+            isEncrypted: any;
+
+            /**
+             * Internal parser for private keys as specified in
+             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+             * @param bytes Input string to read the packet from
+             */
+            read(bytes: string): void;
+
+            /**
+             * Creates an OpenPGP key packet for the given key.
+             * @returns A string of bytes containing the secret key OpenPGP packet
+             */
+            write(): string;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Encrypt the payload. By default, we use aes256 and iterated, salted string
+             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+             * and the passphrase is empty or undefined, the key will be set as not encrypted.
+             * This can be used to remove passphrase protection after calling decrypt().
+             * @param passphrase
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Decrypts the private key params which are needed to use the key.
+             * {@link module:packet.SecretKey.isDecrypted} should be false, as
+             * otherwise calls to this function will throw an error.
+             * @param passphrase The passphrase for this private key as string
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Clear private params, return to initial state
+             */
+            clearPrivateParams(): void;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+        }
+
+        class SecretSubkey {
+            /**
+             * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
+             * Key packet and has exactly the same format.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+             */
+            isEncrypted: any;
+
+            /**
+             * Internal parser for private keys as specified in
+             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+             * @param bytes Input string to read the packet from
+             */
+            read(bytes: string): void;
+
+            /**
+             * Creates an OpenPGP key packet for the given key.
+             * @returns A string of bytes containing the secret key OpenPGP packet
+             */
+            write(): string;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Encrypt the payload. By default, we use aes256 and iterated, salted string
+             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+             * and the passphrase is empty or undefined, the key will be set as not encrypted.
+             * This can be used to remove passphrase protection after calling decrypt().
+             * @param passphrase
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Decrypts the private key params which are needed to use the key.
+             * {@link module:packet.SecretKey.isDecrypted} should be false, as
+             * otherwise calls to this function will throw an error.
+             * @param passphrase The passphrase for this private key as string
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Clear private params, return to initial state
+             */
+            clearPrivateParams(): void;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+        }
+
+        class Signature {
+            /**
+             * Implementation of the Signature Packet (Tag 2)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
+             * A Signature packet describes a binding between some public key and
+             * some data.  The most common signatures are a signature of a file or a
+             * block of text, and a signature that is a certification of a User ID.
+             * @param date the creation date of the signature
+             */
+            constructor(date: Date);
+
+            /**
+             * parsing function for a signature packet (tag 2).
+             * @param bytes payload of a tag 2 packet
+             * @param position position to start reading from the bytes string
+             * @param len length of the packet or the remaining length of bytes at position
+             * @returns object representation
+             */
+            read(bytes: string, position: Integer, len: Integer): Signature;
+
+            /**
+             * Signs provided data. This needs to be done prior to serialization.
+             * @param key private key used to sign the message.
+             * @param data Contains packets to be signed.
+             * @returns
+             */
+            sign(key: SecretKey, data: object): Promise<Boolean>;
+
+            /**
+             * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
+             * @returns subpacket data
+             */
+            write_hashed_sub_packets(): Uint8Array;
+
+            /**
+             * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
+             * @returns subpacket data
+             */
+            write_unhashed_sub_packets(): Uint8Array;
+
+            /**
+             * verifys the signature packet. Note: not signature types are implemented
+             * @param key the public key to verify the signature
+             * @param signatureType expected signature type
+             * @param data data which on the signature applies
+             * @returns True if message is verified, else false.
+             */
+            verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
+
+            /**
+             * Verifies signature expiration date
+             * @param date (optional) use the given date for verification instead of the current time
+             * @returns true if expired
+             */
+            isExpired(date: Date): boolean;
+
+            /**
+             * Returns the expiration time of the signature or Infinity if signature does not expire
+             * @returns expiration time
+             */
+            getExpirationTime(): Date;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SymEncryptedAEADProtected {
+            /**
+             * Implementation of the Symmetrically Encrypted Authenticated Encryption with
+             * Additional Data (AEAD) Protected Data Packet
+             * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
+             * AEAD Protected Data Packet
+             */
+            constructor();
+
+            /**
+             * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+             * @param bytes
+             */
+            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+             * @returns The encrypted payload
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Decrypt the encrypted payload.
+             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+             * @param key The session key used to encrypt the payload
+             * @param streaming Whether the top-level function will return a stream
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
+
+            /**
+             * Encrypt the packet list payload.
+             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+             * @param key The session key used to encrypt the payload
+             * @param streaming Whether the top-level function will return a stream
+             */
+            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
+
+            /**
+             * En/decrypt the payload.
+             * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
+             * @param key The session key used to en/decrypt the payload
+             * @param data The data to en/decrypt
+             * @param streaming Whether the top-level function will return a stream
+             * @returns
+             */
+            crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
+        }
+
+        class SymEncryptedIntegrityProtected {
+            /**
+             * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
+             * The Symmetrically Encrypted Integrity Protected Data packet is
+             * a variant of the Symmetrically Encrypted Data packet. It is a new feature
+             * created for OpenPGP that addresses the problem of detecting a modification to
+             * encrypted data. It is used in combination with a Modification Detection Code
+             * packet.
+             */
+            constructor();
+
+            /**
+             * The encrypted payload.
+             */
+            encrypted: any;
+
+            /**
+             * If after decrypting the packet this is set to true,
+             * a modification has been detected and thus the contents
+             * should be discarded.
+             */
+            modification: boolean;
+
+            /**
+             * Encrypt the payload in the packet.
+             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+             * @param key The key of cipher blocksize length to be used
+             * @param streaming Whether to set this.encrypted to a stream
+             * @returns
+             */
+            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+
+            /**
+             * Decrypts the encrypted data contained in the packet.
+             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+             * @param key The key of cipher blocksize length to be used
+             * @param streaming Whether to read this.encrypted as a stream
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+        }
+
+        class SymEncryptedSessionKey {
+            /**
+             * Public-Key Encrypted Session Key Packets (Tag 1)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+             * A Public-Key Encrypted Session Key packet holds the session key
+             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+             * message is encrypted with the session key, and the session key is itself
+             * encrypted and stored in the Encrypted Session Key packet(s). The
+             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+             * Session Key packet for each OpenPGP key to which the message is encrypted.
+             * The recipient of the message finds a session key that is encrypted to their
+             * public key, decrypts the session key, and then uses the session key to
+             * decrypt the message.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a symmetric encrypted session key packet (tag 3).
+             * @param input Payload of a tag 1 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
+
+            /**
+             * Decrypts the session key
+             * @param passphrase The passphrase in string form
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Encrypts the session key
+             * @param passphrase The passphrase in string form
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SymmetricallyEncrypted {
+            /**
+             * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
+             * The Symmetrically Encrypted Data packet contains data encrypted with a
+             * symmetric-key algorithm. When it has been decrypted, it contains other
+             * packets (usually a literal data packet or compressed data packet, but in
+             * theory other Symmetrically Encrypted Data packets or sequences of packets
+             * that form whole OpenPGP messages).
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Decrypted packets contained within.
+             */
+            packets: List;
+
+            /**
+             * When true, decrypt fails if message is not integrity protected
+             * @see module:config.ignore_mdc_error
+             */
+            ignore_mdc_error: any;
+
+            /**
+             * Decrypt the symmetrically-encrypted packet data
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param sessionKeyAlgorithm Symmetric key algorithm to use
+             * @param key The key of cipher blocksize length to be used
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+
+            /**
+             * Encrypt the symmetrically-encrypted packet data
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param sessionKeyAlgorithm Symmetric key algorithm to use
+             * @param key The key of cipher blocksize length to be used
+             * @returns
+             */
+            encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+        }
+
+        class Trust {
+            /**
+             * Implementation of the Trust Packet (Tag 12)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
+             * The Trust packet is used only within keyrings and is not normally
+             * exported.  Trust packets contain data that record the user's
+             * specifications of which key holders are trustworthy introducers,
+             * along with other information that implementing software uses for
+             * trust information.  The format of Trust packets is defined by a given
+             * implementation.
+             * Trust packets SHOULD NOT be emitted to output streams that are
+             * transferred to other users, and they SHOULD be ignored on any input
+             * other than local keyring files.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a trust packet (tag 12).
+             * Currently not implemented as we ignore trust packets
+             * @param byptes payload of a tag 12 packet
+             */
+            read(byptes: string): void;
+        }
+
+        class UserAttribute {
+            /**
+             * Implementation of the User Attribute Packet (Tag 17)
+             * The User Attribute packet is a variation of the User ID packet.  It
+             * is capable of storing more types of data than the User ID packet,
+             * which is limited to text.  Like the User ID packet, a User Attribute
+             * packet may be certified by the key owner ("self-signed") or any other
+             * key owner who cares to certify it.  Except as noted, a User Attribute
+             * packet may be used anywhere that a User ID packet may be used.
+             * While User Attribute packets are not a required part of the OpenPGP
+             * standard, implementations SHOULD provide at least enough
+             * compatibility to properly handle a certification signature on the
+             * User Attribute packet.  A simple way to do this is by treating the
+             * User Attribute packet as a User ID packet with opaque contents, but
+             * an implementation may use any method desired.
+             */
+            constructor();
+
+            /**
+             * parsing function for a user attribute packet (tag 17).
+             * @param input payload of a tag 17 packet
+             */
+            read(input: Uint8Array): void;
+
+            /**
+             * Creates a binary representation of the user attribute packet
+             * @returns string representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Compare for equality
+             * @param usrAttr
+             * @returns true if equal
+             */
+            equals(usrAttr: UserAttribute): boolean;
+        }
+
+        class Userid {
+            /**
+             * Implementation of the User ID Packet (Tag 13)
+             * A User ID packet consists of UTF-8 text that is intended to represent
+             * the name and email address of the key holder.  By convention, it
+             * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
+             * restrictions on its content.  The packet length in the header
+             * specifies the length of the User ID.
+             */
+            constructor();
+
+            /**
+             * A string containing the user id. Usually in the form
+             * John Doe <john@example.com>
+             */
+            userid: string;
+
+            /**
+             * Parsing function for a user id packet (tag 13).
+             * @param input payload of a tag 13 packet
+             */
+            read(input: Uint8Array): void;
+
+            /**
+             * Parse userid string, e.g. 'John Doe <john@example.com>'
+             */
+            parse(): void;
+
+            /**
+             * Creates a binary representation of the user id packet
+             * @returns binary representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
+             */
+            format(): void;
+        }
+
+        namespace all_packets {
+            /**
+             * @see module:packet.Compressed
+             */
+            var Compressed: any;
+
+            /**
+             * @see module:packet.SymEncryptedIntegrityProtected
+             */
+            var SymEncryptedIntegrityProtected: any;
+
+            /**
+             * @see module:packet.SymEncryptedAEADProtected
+             */
+            var SymEncryptedAEADProtected: any;
+
+            /**
+             * @see module:packet.PublicKeyEncryptedSessionKey
+             */
+            var PublicKeyEncryptedSessionKey: any;
+
+            /**
+             * @see module:packet.SymEncryptedSessionKey
+             */
+            var SymEncryptedSessionKey: any;
+
+            /**
+             * @see module:packet.Literal
+             */
+            var Literal: any;
+
+            /**
+             * @see module:packet.PublicKey
+             */
+            var PublicKey: any;
+
+            /**
+             * @see module:packet.SymmetricallyEncrypted
+             */
+            var SymmetricallyEncrypted: any;
+
+            /**
+             * @see module:packet.Marker
+             */
+            var Marker: any;
+
+            /**
+             * @see module:packet.PublicSubkey
+             */
+            var PublicSubkey: any;
+
+            /**
+             * @see module:packet.UserAttribute
+             */
+            var UserAttribute: any;
+
+            /**
+             * @see module:packet.OnePassSignature
+             */
+            var OnePassSignature: any;
+
+            /**
+             * @see module:packet.SecretKey
+             */
+            var SecretKey: any;
+
+            /**
+             * @see module:packet.Userid
+             */
+            var Userid: any;
+
+            /**
+             * @see module:packet.SecretSubkey
+             */
+            var SecretSubkey: any;
+
+            /**
+             * @see module:packet.Signature
+             */
+            var Signature: any;
+
+            /**
+             * @see module:packet.Trust
+             */
+            var Trust: any;
+        }
+
+        namespace clone {
+            /**
+             * Create a packetlist from the correspoding object types.
+             * @param options the object passed to and from the web worker
+             * @returns a mutated version of the options optject
+             */
+            function clonePackets(options: object): object;
+
+            /**
+             * Creates an object with the correct prototype from a corresponding packetlist.
+             * @param options the object passed to and from the web worker
+             * @param method the public api function name to be delegated to the worker
+             * @returns a mutated version of the options optject
+             */
+            function parseClonedPackets(options: object, method: string): object;
+        }
+
+        namespace packet {
+            /**
+             * Encodes a given integer of length to the openpgp length specifier to a
+             * string
+             * @param length The length to encode
+             * @returns String with openpgp length representation
+             */
+            function writeSimpleLength(length: Integer): Uint8Array;
+
+            /**
+             * Writes a packet header version 4 with the given tag_type and length to a
+             * string
+             * @param tag_type Tag type
+             * @param length Length of the payload
+             * @returns String of the header
+             */
+            function writeHeader(tag_type: Integer, length: Integer): string;
+
+            /**
+             * Writes a packet header Version 3 with the given tag_type and length to a
+             * string
+             * @param tag_type Tag type
+             * @param length Length of the payload
+             * @returns String of the header
+             */
+            function writeOldHeader(tag_type: Integer, length: Integer): string;
+
+            /**
+             * Whether the packet type supports partial lengths per RFC4880
+             * @param tag_type Tag type
+             * @returns String of the header
+             */
+            function supportsStreaming(tag_type: Integer): boolean;
+
+            /**
+             * Generic static Packet Parser function
+             * @param input Input stream as string
+             * @param callback Function to call with the parsed packet
+             * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
+             */
+            function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
+        }
+    }
+
+
+    namespace polyfills {
     }
 
     namespace signature {
-        /** Create a signature on data using the specified algorithm
-            @param hash_algo hash Algorithm to use
-            @param algo Asymmetric cipher algorithm to use
-            @param publicMPIs Public key multiprecision integers of the private key
-            @param secretMPIs Private key multiprecision integers which is used to sign the data
-            @param data Data to be signed
-        */
-        function sign(hash_algo: enums.hash, algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: string): Mpi;
+        /**
+         * Class that represents an OpenPGP signature.
+         */
+        class Signature {
+            /**
+             * @param packetlist The signature packets
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Returns ASCII armored text of signature
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+        }
 
         /**
-            @param algo public Key algorithm
-            @param hash_algo Hash algorithm
-            @param msg_MPIs Signature multiprecision integers
-            @param publickey_MPIs Public key multiprecision integers
-            @param data Data on where the signature was computed on
+         * reads an OpenPGP armored signature and returns a signature object
+         * @param armoredText text to be parsed
+         * @returns new signature object
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Signature;
+
+        /**
+         * reads an OpenPGP signature as byte array and returns a signature object
+         * @param input binary signature
+         * @returns new signature object
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
+    }
+
+    namespace type {
+        /**
+         * Encoded symmetric key for ECDH
+         */
+        namespace ecdh_symkey {
+            class ECDHSymmetricKey {
+                constructor();
+
+                /**
+                 * Read an ECDHSymmetricKey from an Uint8Array
+                 * @param input Where to read the encoded symmetric key from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Write an ECDHSymmetricKey as an Uint8Array
+                 * @returns An array containing the value
+                 */
+                write(): Uint8Array;
+            }
+        }
+
+        /**
+         * Implementation of type KDF parameters
+         * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
+         * A key derivation function (KDF) is necessary to implement the EC
+         * encryption.  The Concatenation Key Derivation Function (Approved
+         * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
+         * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
+         */
+        namespace kdf_params {
+            class KDFParams {
+                /**
+                 * @param hash Hash algorithm
+                 * @param cipher Symmetric algorithm
+                 */
+                constructor(hash: enums.hash, cipher: enums.symmetric);
+
+                /**
+                 * Read KDFParams from an Uint8Array
+                 * @param input Where to read the KDFParams from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Write KDFParams to an Uint8Array
+                 * @returns Array with the KDFParams value
+                 */
+                write(): Uint8Array;
+            }
+        }
+
+        /**
+         * Implementation of type key id
+         * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
+         * A Key ID is an eight-octet scalar that identifies a key.
+         * Implementations SHOULD NOT assume that Key IDs are unique.  The
+         * section "Enhanced Key Formats" below describes how Key IDs are
+         * formed.
+         */
+        namespace keyid {
+            class Keyid {
+                constructor();
+
+                /**
+                 * Parsing method for a key id
+                 * @param input Input to read the key id from
+                 */
+                read(input: Uint8Array): void;
+
+                /**
+                 * Checks equality of Key ID's
+                 * @param keyid
+                 * @param matchWildcard Indicates whether to check if either keyid is a wildcard
+                 */
+                equals(keyid: Keyid, matchWildcard: boolean): void;
+            }
+        }
+
+        /**
+         * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
+         * Multiprecision integers (also called MPIs) are unsigned integers used
+         * to hold large integers such as the ones used in cryptographic
+         * calculations.
+         * An MPI consists of two pieces: a two-octet scalar that is the length
+         * of the MPI in bits followed by a string of octets that contain the
+         * actual integer.
+         */
+        namespace mpi {
+            class MPI {
+                constructor();
+
+                /**
+                 * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
+                 * @param input Payload of MPI data
+                 * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
+                 * @returns Length of data read
+                 */
+                read(input: Uint8Array, endian: string): Integer;
+
+                /**
+                 * Converts the mpi object to a bytes as specified in
+                 * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
+                 * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
+                 * @param length Length of the data part of the MPI
+                 * @returns mpi Byte representation
+                 */
+                write(endian: string, length: Integer): Uint8Array;
+            }
+        }
+
+        /**
+         * Wrapper to an OID value
+         * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
+         * The sequence of octets in the third column is the result of applying
+         * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
+         * with subsequent truncation.  The truncation removes the two fields of
+         * encoded Object Identifier.  The first omitted field is one octet
+         * representing the Object Identifier tag, and the second omitted field
+         * is the length of the Object Identifier body.  For example, the
+         * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
+         * 86 48 CE 3D 03 01 07", from which the first entry in the table above
+         * is constructed by omitting the first two octets.  Only the truncated
+         * sequence of octets is the valid representation of a curve OID.
+         */
+        namespace oid {
+            class OID {
+                constructor();
+
+                /**
+                 * Method to read an OID object
+                 * @param input Where to read the OID from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Serialize an OID object
+                 * @returns Array with the serialized value the OID
+                 */
+                write(): Uint8Array;
+
+                /**
+                 * Serialize an OID object as a hex string
+                 * @returns String with the hex value of the OID
+                 */
+                toHex(): string;
+
+                /**
+                 * If a known curve object identifier, return the canonical name of the curve
+                 * @returns String with the canonical name of the curve
+                 */
+                getName(): string;
+            }
+        }
+
+        /**
+     * Implementation of the String-to-key specifier
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
+     * String-to-key (S2K) specifiers are used to convert passphrase strings
+     * into symmetric-key encryption/decryption keys.  They are used in two
+     * places, currently: to encrypt the secret part of private keys in the
+     * private keyring, and to convert passphrases to encryption keys for
+     * symmetrically encrypted messages.
+     */
+        namespace s2k {
+            class S2K {
+                constructor();
+
+                algorithm: enums.hash;
+
+                type: enums.s2k;
+
+                c: Integer;
+
+                /**
+                 * Eight bytes of salt in a binary string.
+                 */
+                salt: string;
+
+                /**
+                 * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
+                 * @param input Payload of string-to-key specifier
+                 * @returns Actual length of the object
+                 */
+                read(input: string): Integer;
+
+                /**
+                 * Serializes s2k information
+                 * @returns binary representation of s2k
+                 */
+                write(): Uint8Array;
+
+                /**
+                 * Produces a key using the specified passphrase and the defined
+                 * hashAlgorithm
+                 * @param passphrase Passphrase containing user input
+                 * @returns Produced key with a length corresponding to
+                 *          hashAlgorithm hash length
+                 */
+                produce_key(passphrase: string): Uint8Array;
+            }
+        }
+    }
+
+    /**
+     * This object contains utility functions
+     */
+    namespace util {
+        /**
+         * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+         * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+         * Also, convert ReadableStreams to MessagePorts
+         * @param obj the options object to be passed to the web worker
+         * @returns an array of binary data to be passed
+         */
+        function getTransferables(obj: object): any[];
+
+        /**
+         * Convert MessagePorts back to ReadableStreams
+         * @param obj
+         * @returns
+         */
+        function restoreStreams(obj: object): object;
+
+        /**
+         * Create hex string from a binary
+         * @param str String to convert
+         * @returns String containing the hexadecimal values
+         */
+        function str_to_hex(str: string): string;
+
+        /**
+         * Create binary string from a hex encoded string
+         * @param str Hex string to convert
+         * @returns
+         */
+        function hex_to_str(str: string): string;
+
+        /**
+         * Convert a Uint8Array to an MPI-formatted Uint8Array.
+         * Note: the output is **not** an MPI object.
+         * @see
+         * @see
+         * @param bin An array of 8-bit integers to convert
+         * @returns MPI-formatted Uint8Array
+         */
+        function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
+
+        /**
+         * Convert a Base-64 encoded string an array of 8-bit integer
+         * Note: accepts both Radix-64 and URL-safe strings
+         * @param base64 Base-64 encoded string to convert
+         * @returns An array of 8-bit integers
+         */
+        function b64_to_Uint8Array(base64: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integer to a Base-64 encoded string
+         * @param bytes An array of 8-bit integers to convert
+         * @param url If true, output is URL-safe
+         * @returns Base-64 encoded string
+         */
+        function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
+
+        /**
+         * Convert a hex string to an array of 8-bit integers
+         * @param hex A hex string to convert
+         * @returns An array of 8-bit integers
+         */
+        function hex_to_Uint8Array(hex: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integers to a hex string
+         * @param bytes Array of 8-bit integers to convert
+         * @returns Hexadecimal representation of the array
+         */
+        function Uint8Array_to_hex(bytes: Uint8Array): string;
+
+        /**
+         * Convert a string to an array of 8-bit integers
+         * @param str String to convert
+         * @returns An array of 8-bit integers
+         */
+        function str_to_Uint8Array(str: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integers to a string
+         * @param bytes An array of 8-bit integers to convert
+         * @returns String representation of the array
+         */
+        function Uint8Array_to_str(bytes: Uint8Array): string;
+
+        /**
+         * Convert a native javascript string to a Uint8Array of utf8 bytes
+         * @param str The string to convert
+         * @returns A valid squence of utf8 bytes
+         */
+        function encode_utf8(str: string | ReadableStream<string>): Uint8Array | ReadableStream<string>;
+
+        /**
+         * Convert a Uint8Array of utf8 bytes to a native javascript string
+         * @param utf8 A valid squence of utf8 bytes
+         * @returns A native javascript string
+         */
+        function decode_utf8(utf8: Uint8Array | ReadableStream<string>): string | ReadableStream<string>;
+
+        /**
+         * Concat a list of Uint8Arrays, Strings or Streams
+         * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+         * @param Array of Uint8Arrays/Strings/Streams to concatenate
+         * @returns Concatenated array
+         */
+        var concat: any;
+
+        /**
+         * Concat Uint8Arrays
+         * @param Array of Uint8Arrays to concatenate
+         * @returns Concatenated array
+         */
+        var concatUint8Array: any;
+
+        /**
+         * Check Uint8Array equality
+         * @param first array
+         * @param second array
+         * @returns equality
+         */
+        function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
+
+        /**
+         * Calculates a 16bit sum of a Uint8Array by adding each character
+         * codes modulus 65535
+         * @param Uint8Array to create a sum of
+         * @returns 2 bytes containing the sum of all charcodes % 65535
+         */
+        function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug(str: string): void;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_hexarray_dump(str: string): void;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_hexstr_dump(str: string): void;
+
+        /**
+         * Helper function to print a debug error. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_error(str: string): void;
+
+        /**
+         * Read a stream to the end and print it to the console when it's closed.
+         * @param str String of the debug message
+         * @param input Stream to print
+         * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+         */
+        function print_entire_stream(str: string, input: ReadableStream<string> | Uint8Array | string, concat: Function): void;
+
+        /**
+         * If S[1] == 0, then double(S) == (S[2..128] || 0);
+         * otherwise, double(S) == (S[2..128] || 0) xor
+         * (zeros(120) || 10000111).
+         * Both OCB and EAX (through CMAC) require this function to be constant-time.
+         * @param data
+         */
+        /* Illegal function name 'double' can't be used here
+        function double(data: Uint8Array): void;
         */
-        function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: Array<Mpi>, publickey_MPIs: Array<Mpi>, data: string): boolean;
-    }
-}
 
-export namespace enums {
-    enum armor {
-        multipart_section,
-        multipart_last,
-        signed,
-        message,
-        public_key,
-        private_key
+        /**
+         * Shift a Uint8Array to the right by n bits
+         * @param array The array to shift
+         * @param bits Amount of bits to shift (MUST be smaller
+         *        than 8)
+         * @returns Resulting array.
+         */
+        function shiftRight(array: Uint8Array, bits: Integer): string;
+
+        /**
+         * Get native Web Cryptography api, only the current version of the spec.
+         * The default configuration is to use the api when available. But it can
+         * be deactivated with config.use_native
+         * @returns The SubtleCrypto api or 'undefined'
+         */
+        function getWebCrypto(): object;
+
+        /**
+         * Get native Web Cryptography api for all browsers, including legacy
+         * implementations of the spec e.g IE11 and Safari 8/9. The default
+         * configuration is to use the api when available. But it can be deactivated
+         * with config.use_native
+         * @returns The SubtleCrypto api or 'undefined'
+         */
+        function getWebCryptoAll(): object;
+
+        /**
+         * Detect Node.js runtime.
+         */
+        function detectNode(): void;
+
+        /**
+         * Get native Node.js module
+         * @param The module to require
+         * @returns The required module or 'undefined'
+         */
+        function nodeRequire(The: string): object;
+
+        /**
+         * Get native Node.js crypto api. The default configuration is to use
+         * the api when available. But it can also be deactivated with config.use_native
+         * @returns The crypto module or 'undefined'
+         */
+        function getNodeCrypto(): object;
+
+        /**
+         * Get native Node.js Buffer constructor. This should be used since
+         * Buffer is not available under browserify.
+         * @returns The Buffer constructor or 'undefined'
+         */
+        function getNodeBuffer(): Function;
+
+        /**
+         * Format user id for internal use.
+         */
+        function formatUserId(): void;
+
+        /**
+         * Parse user id.
+         */
+        function parseUserId(): void;
+
+        /**
+         * Normalize line endings to \r\n
+         */
+        function canonicalizeEOL(): void;
+
+        /**
+         * Convert line endings from canonicalized \r\n to native \n
+         */
+        function nativeEOL(): void;
+
+        /**
+         * Remove trailing spaces and tabs from each line
+         */
+        function removeTrailingSpaces(): void;
+
+        /**
+         * Encode input buffer using Z-Base32 encoding.
+         * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+         * @param data The binary data to encode
+         * @returns Binary data encoded using Z-Base32
+         */
+        function encodeZBase32(data: Uint8Array): string;
     }
 
-    enum compression {
-        uncompressed,
-        zip,
-        zlib,
-        bzip2
+    namespace wkd {
+        class WKD {
+            /**
+             * Initialize the WKD client
+             */
+            constructor();
+
+            /**
+             * Search for a public key using Web Key Directory protocol.
+             * @param options.email User's email.
+             * @param options.rawBytes Returns Uint8Array instead of parsed key.
+             * @returns The public key.
+             */
+            lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+        }
     }
 
-    enum hash {
-        md5,
-        sha1,
-        ripemd,
-        sha256,
-        sha384,
-        sha512,
-        sha224
-    }
-
-    enum packet {
-        publicKeyEncryptedSessionKey,
-        signature,
-        symEncryptedSessionKey,
-        onePassSignature,
-        secretKey,
-        publicKey,
-        secretSubkey,
-        compressed,
-        symmetricallyEncrypted,
-        marker,
-        literal,
-        trust,
-        userid,
-        publicSubkey,
-        userAttribute,
-        symEncryptedIntegrityProtected,
-        modificationDetectionCode,
-    }
-
-    enum publicKey {
-        rsa_encrypt_sign,
-        rsa_encrypt,
-        rsa_sign,
-        elgamal,
-        dsa
-    }
-
-    enum symmetric {
-        plaintext,
-        idea,
-        tripledes,
-        cast5,
-        blowfish,
-        aes128,
-        aes192,
-        aes256,
-        twofish
-    }
-
-    enum keyStatus {
-        invalid,
-        expired,
-        revoked,
-        valid,
-        no_self_cert
-    }
-
-    enum reasonForRevocation {
-      no_reason,
-      key_superseded,
-      key_compromised,
-      key_retired,
-      userid_invalid
-    }
-}
-
-export namespace key {
-    interface KeyResult {
-        keys: Array<Key>,
-        err: Array<Error>
-    }
-
-    /** Class that represents an OpenPGP key. Must contain a primary key. Can contain additional subkeys, signatures, user ids, user attributes.
+    namespace worker {
+        /**
+     * @see module:openpgp.initWorker
+     * @see module:openpgp.getWorker
+     * @see module:openpgp.destroyWorker
+     * @see module:worker/worker
      */
-    interface Key {
-        armor(): string,
-        decrypt(passphrase: string): boolean;
-        getExpirationTime(): Date;
-        getKeyIds(): Array<Keyid>;
-        getPreferredHashAlgorithm(): string;
-        getPrimaryUser(): any;
-        getUserIds(): Array<string>;
-        isPrivate(): boolean;
-        isPublic(): boolean;
-        primaryKey: packet.PublicKey;
-        toPublic(): Key;
-        update(key: Key): void;
-        verifyPrimaryKey(): enums.keyStatus;
+        namespace async_proxy {
+            class AsyncProxy {
+                /**
+                 * Initializes a new proxy and loads the web worker
+                 * @param path The path to the worker or 'openpgp.worker.js' by default
+                 * @param n number of workers to initialize if path given
+                 * @param config config The worker configuration
+                 * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
+                 */
+                constructor(path: string, n: number, config: object, worker: any[]);
+
+                /**
+                 * Message handling
+                 */
+                handleMessage(): void;
+
+                /**
+                 * Get new request ID
+                 * @returns New unique request ID
+                 */
+                getID(): Integer;
+
+                /**
+                 * Send message to worker with random data
+                 * @param size Number of bytes to send
+                 */
+                seedRandom(size: Integer): void;
+
+                /**
+                 * Terminates the workers
+                 */
+                terminate(): void;
+
+                /**
+                 * Generic proxy function that handles all commands from the public api.
+                 * @param method the public api function to be delegated to the worker thread
+                 * @param options the api function's options
+                 * @returns see the corresponding public api functions for their return types
+                 */
+                delegate(method: string, options: object): Promise<any>;
+            }
+        }
+
+        /**
+     * @see module:openpgp.initWorker
+     * @see module:openpgp.getWorker
+     * @see module:openpgp.destroyWorker
+     * @see module:worker/async_proxy
+     */
+        namespace worker {
+            /**
+             * Handle random buffer exhaustion by requesting more random bytes from the main window
+             * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+             */
+            function randomCallback(): Promise<Object>;
+
+            /**
+             * Set config from main context to worker context.
+             * @param config The openpgp configuration
+             */
+            function configure(config: object): void;
+
+            /**
+             * Seed the library with entropy gathered window.crypto.getRandomValues
+             * as this api is only avalible in the main window.
+             * @param buffer Some random bytes
+             */
+            function seedRandom(buffer: any[]): void;
+
+            /**
+             * Generic proxy function that handles all commands from the public api.
+             * @param method The public api function to be delegated to the worker thread
+             * @param options The api function's options
+             */
+            function delegate(method: string, options: object): void;
+
+            /**
+             * Respond to the main window.
+             * @param event Contains event type and data
+             */
+            function response(event: object): void;
+        }
     }
 
-    /** Generates a new OpenPGP key. Currently only supports RSA keys. Primary and subkey will be of same type.
-
-        @param options
-     */
-    function generate(options: KeyOptions): Key;
-
-    /** Reads an OpenPGP armored text and returns one or multiple key objects
-
-        @param armoredText text to be parsed
-     */
-    function readArmored(armoredText: string): Promise<KeyResult>;
-}
-
-export namespace message {
-    /** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message
-     */
-    interface Message {
-        /** Returns ASCII armored text of message
-         */
-        armor(): string,
-
-        /** Decrypt the message
-            @param privateKey private key with decrypted secret data
-         */
-        decrypt(privateKey: key.Key): Array<Message>,
-
-        /** Encrypt the message
-            @param keys array of keys, used to encrypt the message
-         */
-        encrypt(keys: Array<key.Key>): Array<Message>,
-
-        /** Returns the key IDs of the keys to which the session key is encrypted
-         */
-        getEncryptionKeyIds(): Array<Keyid>,
-
-        /** Get literal data that is the body of the message
-         */
-        getLiteralData(): string,
-
-        /** Returns the key IDs of the keys that signed the message
-         */
-        getSigningKeyIds(): Array<Keyid>,
-
-        /** Get literal data as text
-         */
-        getText(): string,
-
-        /** Sign the message (the literal data packet of the message)
-            @param privateKey private keys with decrypted secret key data for signing
-         */
-        sign(privateKey: Array<key.Key>): Message,
-
-        /** Unwrap compressed message
-         */
-        unwrapCompressed(): Message,
-
-        /** Verify message signatures
-            @param keys array of keys to verify signatures
-         */
-        verify(keys: Array<key.Key>): Array<Object>,
-
-        packets: {
-            write(): Uint8Array,
-        },
-    }
-
-    /** creates new message object from binary data
-        @param bytes
-     */
-    function fromBinary(bytes: Uint8Array | ReadableStream): Message;
-
-    /** creates new message object from text
-        @param text
-     */
-    function fromText(text: string): Message;
-
-    /** reads an OpenPGP armored message and returns a message object
-
-        @param armoredText text to be parsed
-     */
-    function readArmored(armoredText: string): Promise<Message>;
 
     /**
-     * reads an OpenPGP message as byte array and returns a message object
-     * @param {Uint8Array} input   binary message
-     * @returns {Message}           new message object
-     * @static
+     * Set the path for the web worker script and create an instance of the async proxy
+     * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
+     * @param n number of workers to initialize
+     * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
      */
-    function read(data: Uint8Array): Promise<Message>;
-}
-
-export namespace packet {
-    interface PublicKey {
-        algorithm: enums.publicKey;
-        created: Date;
-        fingerprint: string;
-
-        getBitSize(): number;
-        getFingerprint(): string;
-        getKeyId(): Keyid;
-        read(input: string): any;
-        write(): any;
-    }
-
-    interface SecretKey extends PublicKey {
-        read(bytes: string): void;
-        write(): string;
-        clearPrivateMPIs(str_passphrase: string): boolean;
-        encrypt(passphrase: string): void;
-    }
-
-    /** Allocate a new packet from structured packet clone
-        @param packetClone packet clone
-     */
-    function fromStructuredClone(packetClone: Object): Object
-
-    /** Allocate a new packet
-        @param property name from enums.packet
-     */
-    function newPacketFromTag(tag: string): Object;
-}
-
-export namespace util {
-    /**
-     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
-     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
-     * Also, convert ReadableStreams to MessagePorts
-     * @param obj the options object to be passed to the web worker
-     * @returns an array of binary data to be passed
-     */
-    function getTransferables(obj: Object): ArrayBuffer[];
+    function initWorker(path: string, n?: number, workers?: any[]): void;
 
     /**
-     * Convert MessagePorts back to ReadableStreams
-     * @param obj
+     * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+     * @returns the async proxy or null if not initialized
+     */
+    function getWorker(): worker.async_proxy.AsyncProxy | null;
+
+    /**
+     * Cleanup the current instance of the web worker.
+     */
+    function destroyWorker(): void;
+
+    interface UserID {
+        name: string;
+        email: string;
+    }
+
+    interface KeyOptions {
+        /**
+         * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+         */
+        userIds: UserID[];
+        /**
+         * (optional) The passphrase used to encrypt the resulting private key
+         */
+        passphrase?: string;
+        /**
+         * (optional) number of bits for RSA keys: 2048 or 4096.
+         */
+        numBits?: number;
+        /**
+         * (optional) The number of seconds after the key creation time that the key expires
+         */
+        keyExpirationTime?: number;
+        /**
+         * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
+         *                                         curve25519, p256, p384, p521, secp256k1,
+         *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+         */
+        curve?: string;
+        /**
+         * (optional) override the creation date of the key and the key signatures
+         */
+        date?: Date;
+        /**
+         * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         */
+        subkeys?: { sign: true, passphrase: "string" }[];
+    }
+
+    /**
+     * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+     * @param options
+     * @returns The generated key object in the form:
+     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+     */
+    function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
+
+    /**
+     * Reformats signature packets for a key and rewraps key object.
+     * @param privateKey private key to reformat
+     * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     * @param passphrase (optional) The passphrase used to encrypt the resulting private key
+     * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+     * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
+     * @returns The generated key object in the form:
+     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+     */
+    function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
+
+    /**
+     * Revokes a key. Requires either a private key or a revocation certificate.
+     * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
+     * @param key (optional) public or private key to revoke
+     * @param revocationCertificate (optional) revocation certificate to revoke the key with
+     * @param reasonForRevocation (optional) object indicating the reason for revocation
+     * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
+     * @param reasonForRevocation.string (optional) string explaining the reason for revocation
+     * @returns The revoked key object in the form:
+     *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
+     *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
+     */
+    function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
+        privateKey: key.Key,
+        privateKeyArmored: string,
+        publicKey: key.Key,
+        publicKeyArmored: string
+    } | {
+        publicKey: key.Key,
+        publicKeyArmored: string
+    }>;
+
+    /**
+     * Unlock a private key with your passphrase.
+     * @param privateKey the private key that is to be decrypted
+     * @param passphrase the user's passphrase(s) chosen during key generation
+     * @returns the unlocked key object in the form: { key:Key }
+     */
+    function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+    /**
+     * Lock a private key with your passphrase.
+     * @param privateKey the private key that is to be decrypted
+     * @param passphrase the user's passphrase(s) chosen during key generation
+     * @returns the locked key object in the form: { key:Key }
+     */
+    function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+    interface EncryptOptions {
+        /**
+         * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
+         */
+        message: message.Message;
+        /**
+         * (optional) array of keys or single key, used to encrypt the message
+         */
+        publicKeys?: key.Key | any[];
+        /**
+         * (optional) private keys for signing. If omitted message will not be signed
+         */
+        privateKeys?: key.Key | any[];
+        /**
+         * (optional) array of passwords or a single password to encrypt the message
+         */
+        passwords?: string | any[];
+        /**
+         * (optional) session key in the form: { data:Uint8Array, algorithm:String }
+         */
+        sessionKey?: { data: Uint8Array, algorithm: string };
+        /**
+         * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+         */
+        compression?: enums.compression;
+        /**
+         * (optional) if the return values should be ascii armored or the message/signature objects
+         */
+        armor?: boolean;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) if the signature should be detached (if true, signature will be added to returned object)
+         */
+        detached?: boolean;
+        /**
+         * (optional) a detached signature to add to the encrypted message
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) if the unencrypted session key should be added to returned object
+         */
+        returnSessionKey?: boolean;
+        /**
+         * (optional) use a key ID of 0 instead of the public key IDs
+         */
+        wildcard?: boolean;
+        /**
+         * (optional) override the creation date of the message signature
+         */
+        date?: Date;
+        /**
+         * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         */
+        fromUserIds?: UserID[];
+        /**
+         * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         */
+        toUserIds?: UserID[]
+    }
+
+    interface EncryptResult {
+        data: string | ReadableStream<String>;
+        message: message.Message;
+        signature: string | ReadableStream<String> | signature.Signature;
+        sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
+    }
+
+    /**
+     * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+     * must be specified. If private keys are specified, those will be used to sign the message.
+     * @param options 
+     * @returns Object containing encrypted (and optionally signed) message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          message: Message, (if `armor` was false)
+     *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
+     *          signature: Signature (if `detached` was true and `armor` was false)
+     *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
+     *          }
+     */
+    function encrypt(options: EncryptOptions): Promise<EncryptResult>;
+
+    interface DecryptOptions {
+        /**
+         * the message object with the encrypted data
+         */
+        message: message.Message;
+        /**
+         * (optional) private keys with decrypted secret key data or session key
+         */
+        privateKeys?: key.Key | key.Key[];
+        /**
+         * (optional) passwords to decrypt the message
+         */
+        passwords?: string | string[];
+        /**
+         * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+         */
+        sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
+        /**
+         * (optional) array of public keys or single key, to verify signatures
+         */
+        publicKeys?: key.Key | key.Key[];
+        /**
+         * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
+         */
+        format?: 'utf8' | 'binary';
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) detached signature for verification
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) use the given date for verification instead of the current time
+         */
+        date?: Date
+    }
+
+    interface DecryptResult {
+        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
+        filename: string,
+        signatures: {
+            keyid: type.keyid.Keyid,
+            verified: Promise<Boolean>,
+            valid: boolean
+        }[]
+    }
+
+    /**
+     * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+     * a session key or a password must be specified.
+     * @param options
+     * @returns Object containing decrypted and verified message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
+     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
+     *          filename: string,
+     *          signatures: [
+     *          {
+     *          keyid: module:type/keyid,
+     *          verified: Promise<Boolean>,
+     *          valid: boolean (if streaming was false)
+     *          }, ...
+     *          ]
+     *          }
+     */
+    function decrypt(options: DecryptOptions): Promise<DecryptResult>;
+
+    interface SignOptions {
+        /**
+         * (cleartext) message to be signed
+         */
+        message: cleartext.CleartextMessage | message.Message;
+        /**
+         * array of keys or single key with decrypted secret key data to sign cleartext
+         */
+        privateKeys: key.Key | any[];
+        /**
+         * (optional) if the return value should be ascii armored or the message object
+         */
+        armor?: boolean;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) if the return value should contain a detached signature
+         */
+        detached?: boolean;
+        /**
+         * (optional) override the creation date of the signature
+         */
+        date?: Date;
+        /**
+         *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         */
+        fromUserIds?: UserID[]
+    }
+
+    interface SignResult {
+        data: string | ReadableStream<String> | NodeStream,
+        message: message.Message,
+        signature: string | ReadableStream<String> | NodeStream | signature.Signature
+    }
+
+    /**
+     * Signs a cleartext message.
+     * @param options
+     * @returns Object containing signed message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          message: Message (if `armor` was false)
+     *          }
+     *          Or, if `detached` was true:
+     *          {
+     *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          signature: Signature (if `armor` was false)
+     *          }
+     */
+    function sign(options: SignOptions): Promise<SignResult>;
+
+    interface VerifyOptions {
+        /**
+         * array of publicKeys or single key, to verify signatures
+         */
+        publicKeys: key.Key | any[];
+        /**
+         * (cleartext) message object with signatures
+         */
+        message: cleartext.CleartextMessage | message.Message;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) detached signature for verification
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) use the given date for verification instead of the current time
+         */
+        date?: Date
+    }
+
+    interface VerifyResult {
+        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
+        signatures: {
+            keyid: type.keyid.Keyid,
+            verified: Promise<Boolean>,
+            valid: boolean
+        }[]
+    }
+
+    /**
+     * Verifies signatures of cleartext signed message
+     * @param options
+     * @returns Object containing verified message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
+     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
+     *          signatures: [
+     *          {
+     *          keyid: module:type/keyid,
+     *          verified: Promise<Boolean>,
+     *          valid: boolean (if `streaming` was false)
+     *          }, ...
+     *          ]
+     *          }
+     */
+    function verify(options: VerifyOptions): Promise<VerifyResult>;
+
+    /**
+     * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
+     * or passwords must be specified.
+     * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
+     * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
+     * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
+     * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
+     * @param passwords (optional) passwords for the message
+     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+     * @param date (optional) override the date
+     * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     * @returns the encrypted session key packets contained in a message object
+     */
+    function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
+
+    /**
+     * Decrypt symmetric session keys with a private key or password. Either a private key or
+     * a password must be specified.
+     * @param message a message object containing the encrypted session key packets
+     * @param privateKeys (optional) private keys with decrypted secret key data
+     * @param passwords (optional) passwords to decrypt the session key
+     * @returns Array of decrypted session key, algorithm pairs in form:
+     *          { data:Uint8Array, algorithm:String }
+     *          or 'undefined' if no key packets found
+     */
+    function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
+
+    /**
+     * Input validation
+     */
+    function checkString(): void;
+
+    /**
+     * Normalize parameter to an array if it is not undefined.
+     * @param param the parameter to be normalized
+     * @returns the resulting array or undefined
+     */
+    function toArray(param: object): any[] | undefined;
+
+    /**
+     * Convert data to or from Stream
+     * @param data the data to convert
+     * @param streaming (optional) whether to return a ReadableStream
+     * @returns the data in the respective format
+     */
+    function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
+
+    /**
+     * Convert object properties from Stream
+     * @param obj the data to convert
+     * @param streaming (optional) whether to return ReadableStreams
+     * @param keys (optional) which keys to return as streams, if possible
+     * @returns the data in the respective format
+     */
+    function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
+
+    /**
+     * Link result.data to the message stream for cancellation.
+     * Also, forward errors in the message to result.data.
+     * @param result the data to convert
+     * @param message message object
+     * @param erroringStream (optional) stream which either errors or gets closed without data
      * @returns
      */
-    function restoreStreams(obj: Object): Object;
+    function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream<string>): object;
 
     /**
-     * Create hex string from a binary
-     * @param str String to convert
-     * @returns String containing the hexadecimal values
+     * Wait until signature objects have been verified
+     * @param signatures list of signatures
      */
-    function str_to_hex(str: String): String;
+    function prepareSignatures(signatures: object): void;
 
     /**
-     * Create binary string from a hex encoded string
-     * @param str Hex string to convert
-     * @returns
+     * Global error handler that logs the stack trace and rethrows a high lvl error message.
+     * @param message A human readable high level error Message
+     * @param error The internal error that caused the failure
      */
-    function hex_to_str(str: String): String;
+    function onError(message: string, error: Error): void;
 
     /**
-     * Convert a Uint8Array to an MPI-formatted Uint8Array.
-     * Note: the output is **not** an MPI object.
-     * @see
-     * @see
-     * @param bin An array of 8-bit integers to convert
-     * @returns MPI-formatted Uint8Array
+     * Check for native AEAD support and configuration by the user. Only
+     * browsers that implement the current WebCrypto specification support
+     * native GCM. Native EAX is built on CTR and CBC, which current
+     * browsers support. OCB and CFB are not natively supported.
+     * @returns If authenticated encryption should be used
      */
-    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
-
-    /**
-     * Convert a Base-64 encoded string an array of 8-bit integer
-     * Note: accepts both Radix-64 and URL-safe strings
-     * @param base64 Base-64 encoded string to convert
-     * @returns An array of 8-bit integers
-     */
-    function b64_to_Uint8Array(base64: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integer to a Base-64 encoded string
-     * @param bytes An array of 8-bit integers to convert
-     * @param url If true, output is URL-safe
-     * @returns Base-64 encoded string
-     */
-    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): String;
-
-    /**
-     * Convert a hex string to an array of 8-bit integers
-     * @param hex A hex string to convert
-     * @returns An array of 8-bit integers
-     */
-    function hex_to_Uint8Array(hex: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integers to a hex string
-     * @param bytes Array of 8-bit integers to convert
-     * @returns Hexadecimal representation of the array
-     */
-    function Uint8Array_to_hex(bytes: Uint8Array): String;
-
-    /**
-     * Convert a string to an array of 8-bit integers
-     * @param str String to convert
-     * @returns An array of 8-bit integers
-     */
-    function str_to_Uint8Array(str: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integers to a string
-     * @param bytes An array of 8-bit integers to convert
-     * @returns String representation of the array
-     */
-    function Uint8Array_to_str(bytes: Uint8Array): String;
-
-    /**
-     * Convert a native javascript string to a Uint8Array of utf8 bytes
-     * @param str The string to convert
-     * @returns A valid squence of utf8 bytes
-     */
-    function encode_utf8(str: String | ReadableStream): Uint8Array | ReadableStream;
-
-    /**
-     * Convert a Uint8Array of utf8 bytes to a native javascript string
-     * @param utf8 A valid squence of utf8 bytes
-     * @returns A native javascript string
-     */
-    function decode_utf8(utf8: Uint8Array | ReadableStream): String | ReadableStream;
-
-    /**
-     * Concat a list of Uint8Arrays, Strings or Streams
-     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
-     * @param Array of Uint8Arrays/Strings/Streams to concatenate
-     * @returns Concatenated array
-     */
-    var concat: any;
-
-    /**
-     * Concat Uint8Arrays
-     * @param Array of Uint8Arrays to concatenate
-     * @returns Concatenated array
-     */
-    var concatUint8Array: any;
-
-    /**
-     * Check Uint8Array equality
-     * @param first array
-     * @param second array
-     * @returns equality
-     */
-    function equalsUint8Array(first: Uint8Array, second: Uint8Array): Boolean;
-
-    /**
-     * Calculates a 16bit sum of a Uint8Array by adding each character
-     * codes modulus 65535
-     * @param Uint8Array to create a sum of
-     * @returns 2 bytes containing the sum of all charcodes % 65535
-     */
-    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug(str: String): void;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_hexarray_dump(str: String): void;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_hexstr_dump(str: String): void;
-
-    /**
-     * Helper function to print a debug error. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_error(str: String): void;
-
-    /**
-     * Read a stream to the end and print it to the console when it's closed.
-     * @param str String of the debug message
-     * @param input Stream to print
-     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
-     */
-    function print_entire_stream(str: String, input: ReadableStream | Uint8Array | String, concat: Function): void;
-
-    /**
-     * If S[1] == 0, then double(S) == (S[2..128] || 0);
-     * otherwise, double(S) == (S[2..128] || 0) xor
-     * (zeros(120) || 10000111).
-     * Both OCB and EAX (through CMAC) require this function to be constant-time.
-     * @param data
-     */
-    /* Illegal function name 'double' can't be used here
-    export function double(data: Uint8Array): void;
-    */
-
-    /**
-     * Shift a Uint8Array to the right by n bits
-     * @param array The array to shift
-     * @param bits Amount of bits to shift (MUST be smaller
-     *        than 8)
-     * @returns Resulting array.
-     */
-    function shiftRight(array: Uint8Array, bits: number): String;
-
-    /**
-     * Get native Web Cryptography api, only the current version of the spec.
-     * The default configuration is to use the api when available. But it can
-     * be deactivated with config.use_native
-     * @returns The SubtleCrypto api or 'undefined'
-     */
-    function getWebCrypto(): Object;
-
-    /**
-     * Get native Web Cryptography api for all browsers, including legacy
-     * implementations of the spec e.g IE11 and Safari 8/9. The default
-     * configuration is to use the api when available. But it can be deactivated
-     * with config.use_native
-     * @returns The SubtleCrypto api or 'undefined'
-     */
-    function getWebCryptoAll(): Object;
-
-    /**
-     * Detect Node.js runtime.
-     */
-    function detectNode(): void;
-
-    /**
-     * Get native Node.js module
-     * @param The module to require
-     * @returns The required module or 'undefined'
-     */
-    function nodeRequire(The: String): Object;
-
-    /**
-     * Get native Node.js crypto api. The default configuration is to use
-     * the api when available. But it can also be deactivated with config.use_native
-     * @returns The crypto module or 'undefined'
-     */
-    function getNodeCrypto(): Object;
-
-    /**
-     * Get native Node.js Buffer constructor. This should be used since
-     * Buffer is not available under browserify.
-     * @returns The Buffer constructor or 'undefined'
-     */
-    function getNodeBuffer(): Function;
-
-    /**
-     * Format user id for internal use.
-     */
-    function formatUserId(): void;
-
-    /**
-     * Parse user id.
-     */
-    function parseUserId(): void;
-
-    /**
-     * Normalize line endings to \r\n
-     */
-    function canonicalizeEOL(): void;
-
-    /**
-     * Convert line endings from canonicalized \r\n to native \n
-     */
-    function nativeEOL(): void;
-
-    /**
-     * Remove trailing spaces and tabs from each line
-     */
-    function removeTrailingSpaces(): void;
-
-    /**
-     * Encode input buffer using Z-Base32 encoding.
-     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
-     * @param data The binary data to encode
-     * @returns Binary data encoded using Z-Base32
-     */
-    function encodeZBase32(data: Uint8Array): String;
+    function nativeAEAD(): boolean;
 }
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index b4ff8d9487..3d5a1e3717 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -1,6 +1,8 @@
+import { openpgp } from "openpgp"
+
 // Open PGP Sample codes
 
-var options: openpgp.KeyOptions = {
+const options: openpgp.KeyOptions = {
     numBits: 2048,
     userIds: [{
         name: 'Jon Smith',
@@ -8,53 +10,51 @@ var options: openpgp.KeyOptions = {
     }],
     passphrase: 'super long and hard to guess secret'
 };
-
-openpgp.generateKey(options).then(function (keypair) {
+openpgp.generateKey(options).then((keypair) => {
     // success
-    var privkey = keypair.privateKeyArmored;
-    var pubkey = keypair.publicKeyArmored;
-}).catch(function (error) {
+    const privkey = keypair.privateKeyArmored;
+    const pubkey = keypair.publicKeyArmored;
+}).catch((error) => {
     // failure
 });
 
-
-var spubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
+const spubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
 
 openpgp.key.readArmored(spubkey)
-    .then(function (publicKey) {
+    .then((publicKey) => {
         return {
             message: openpgp.message.fromText('Hello, World!'),
             publicKeys: publicKey.keys
         };
     })
     .then(openpgp.encrypt)
-    .then(function (pgpMessage) {
+    .then((pgpMessage) => {
         // success
     })
-    .catch(function (error) {
+    .catch((error) => {
         // failure
     });
 
-var sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
-var pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
+const sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
+const pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
 
-openpgp.message.readArmored(pgpMessageStr).then(function(pgpMessage) {
+openpgp.message.readArmored(pgpMessageStr).then((pgpMessage) => {
     const options = {
         message: pgpMessage
     };
     return openpgp.decrypt(options);
-}).then(function (plaintext) {
+}).then((plaintext) => {
     // success
-}).catch(function (error) {
+}).catch((error) => {
     // failure
 });
 
-const promises: [Promise<openpgp.key.KeyResult>, Promise<openpgp.message.Message>] = [
+const promises: [Promise<{ keys: openpgp.key.Key[], err: Error[] | null }>, Promise<openpgp.message.Message>] = [
     openpgp.key.readArmored(sprivkey),
     openpgp.message.readArmored(pgpMessageStr)
 ];
 
-Promise.all(promises).then(function (values) {
+Promise.all(promises).then((values) => {
     const keyObject: openpgp.key.KeyResult = values[0];
     const pgpMessage: openpgp.message.Message = values[1];
     const privateKey = keyObject.keys[0];
@@ -64,13 +64,13 @@ Promise.all(promises).then(function (values) {
         message: pgpMessage
     };
     return openpgp.decrypt(options);
-}).then(function (plaintext) {
+}).then((plaintext) => {
     // success
-}).catch(function (error) {
+}).catch((error) => {
     // failure
 });
 
-openpgp.initWorker({ path:'openpgp.worker.js' });
+openpgp.initWorker('openpgp.worker.js');
 
 (async () => {
     let msgOptions: openpgp.EncryptOptions;
@@ -81,10 +81,10 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
         armor: false,
     };
 
-    let cipher = await openpgp.encrypt(msgOptions);
-    let encrypted = cipher.message.packets.write(); // get raw encrypted packets as Uint8Array
+    const cipher = await openpgp.encrypt(msgOptions);
+    const encrypted = cipher.message.packets.write(); // get raw encrypted packets as Uint8Array
 
-    let plain = await openpgp.decrypt({
+    const plain = await openpgp.decrypt({
         message: await openpgp.message.read(encrypted),
         passwords: ['secret stuff'],
         format: 'binary'
@@ -94,14 +94,14 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 })();
 
 (async () => {
-    let cipher = await openpgp.encrypt({
+    const cipher = await openpgp.encrypt({
         message: openpgp.message.fromText('hello world'),
         passwords: 'super secure',
         armor: true,
     });
-    let encrypted = cipher.data;
+    const encrypted = cipher.data;
 
-    let plain = await openpgp.decrypt({
+    const plain = await openpgp.decrypt({
         message: await openpgp.message.readArmored(encrypted),
         passwords: 'super secure',
     });
@@ -109,10 +109,9 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
     return plain.data;
 })();
 
-
 (async () => {
-    const publicKey = (await openpgp.key.readArmored(spubkey))
-    const privateKey = (await openpgp.key.readArmored(sprivkey))
+    const publicKey = (await openpgp.key.readArmored(spubkey));
+    const privateKey = (await openpgp.key.readArmored(sprivkey));
     const signOptions: openpgp.SignOptions = {
         message: openpgp.message.fromText('hello world'),
         privateKeys: privateKey.keys,
@@ -121,7 +120,7 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 
     const signed = await openpgp.sign(signOptions);
 
-    const signature = signed.signature as openpgp.Signature;
+    const signature = signed.signature as openpgp.signature.Signature;
     const message = signed.message;
 
     const verifyOptions: openpgp.VerifyOptions = {
@@ -130,60 +129,46 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
         publicKeys: publicKey.keys
     };
 
-    let verified = await openpgp.verify(verifyOptions);
+    const verified = await openpgp.verify(verifyOptions);
 
     return verified.signatures[0].valid;
 })();
 
-async () => {
-    let hkp = new openpgp.HKP();
-
-    const hkpOptions = {
-        query: 'alice@example.com'
-    };
-
-    const armoredPubkey = await hkp.lookup(hkpOptions);
-    await openpgp.key.readArmored(armoredPubkey);
-
-    hkp = new openpgp.HKP('https://pgp.mit.edu');
-
-    const pubkey = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----';
-
-    await hkp.upload(pubkey);
-}
-
 // Open PGP Tests
 
+const keyoptions: openpgp.KeyOptions = null;
+const mpi: openpgp.type.mpi.MPI = null;
+const mpis: openpgp.type.mpi.MPI[] = [];
 
-var keyoptions: openpgp.KeyOptions;
-var mpi: openpgp.crypto.Mpi;
-var mpis: Array<openpgp.crypto.Mpi>;
-
-openpgp.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
-openpgp.armor.dearmor("");
+openpgp.encoding.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
+openpgp.encoding.armor.dearmor("");
 
 openpgp.cleartext.readArmored("");
 
-openpgp.crypto.generateSessionKey(openpgp.enums.symmetric.aes128);
-openpgp.crypto.getPrefixRandom(openpgp.enums.symmetric.aes128);
-openpgp.crypto.getPrivateMpiCount(openpgp.enums.symmetric.aes128);
-openpgp.crypto.publicKeyDecrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, mpi);
-openpgp.crypto.publicKeyEncrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpi);
+openpgp.crypto.crypto.generateSessionKey(openpgp.enums.symmetric.aes128);
+openpgp.crypto.crypto.getPrefixRandom(openpgp.enums.symmetric.aes128);
+// openpgp.crypto.crypto.getPrivateMpiCount(openpgp.enums.symmetric.aes128);
+openpgp.crypto.crypto.publicKeyDecrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
+openpgp.crypto.crypto.publicKeyEncrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpi, "");
 
+openpgp.crypto;
+// API update with no documentation
 openpgp.crypto.cfb.decrypt("", "", "", true);
-openpgp.crypto.cfb.encrypt("", "", "", "", true);
-openpgp.crypto.cfb.mdc({}, "", "");
+openpgp.crypto.cfb.encrypt("", "", "", true);
+// Function removed from openpgp.crypto.cfb
+// openpgp.crypto.cfb.mdc({}, "", "");
 
-openpgp.crypto.hash.digest(openpgp.enums.hash.md5, "");
+openpgp.crypto.hash.digest(openpgp.enums.hash.md5, new Uint8Array([0, 1]));
 openpgp.crypto.hash.getHashByteLength(openpgp.enums.hash.md5);
 
-openpgp.crypto.random.getRandomBigInteger(0);
+openpgp.crypto.random.getRandomBN(mpi, mpi);
 openpgp.crypto.random.getRandomBytes(0);
-openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
-openpgp.crypto.random.getSecureRandom(0, 1);
+// function removed from openpgp.crypto.random
+// openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
+// openpgp.crypto.random.getSecureRandom(0, 1);
 
-openpgp.crypto.signature.sign(openpgp.enums.hash.md5, openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
-openpgp.crypto.signature.verify(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, mpis, "");
+openpgp.crypto.signature.sign(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, new Uint8Array([0, 1]), new Uint8Array([0, 1]));
+openpgp.crypto.signature.verify(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, mpis, new Uint8Array([0, 1]), new Uint8Array([0, 1]));
 
 openpgp.key.generate(keyoptions);
 openpgp.key.readArmored("");
diff --git a/types/openpgp/package.json b/types/openpgp/package.json
index d27d838dc6..cda6cc6dc8 100644
--- a/types/openpgp/package.json
+++ b/types/openpgp/package.json
@@ -2,6 +2,10 @@
     "private": true,
     "types": "index",
     "typesVersions": {
-        ">=3.2.0-0": { "*": ["ts3.2/*"] }
+        ">=3.2.0-0": {
+            "*": [
+                "ts3.2/*"
+            ]
+        }
     }
 }
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index 13b2d1646d..62bccca432 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for openpgp 4.4.8
-// Project: http://openpgpjs.org/
+// Type definitions for openpgp v4.4.10
+// Project: https://openpgpjs.org
 // Definitions by: Guillaume Lacasa <https://blog.lacasa.fr>
 //                 Errietta Kostala <https://github.com/errietta>
 //                 Daniel Montesinos <https://github.com/damonpam>
@@ -8,1041 +8,5227 @@
 //                 SardineFIsh <https://github.com/SardineFish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export as namespace openpgp;
+import BN = require("bn.js")
+import stream = require("stream")
 
-export * from '../common';
+export {}
+type NodeStream = stream;
+type Integer = number;
+type Infinity = any;
 
-export interface UserId {
-    name?: string,
-    email?: string,
-}
 
-export interface SessionKey {
-    data: Uint8Array,
-    algorithm: string
-}
-
-export interface EncryptOptions {
-    message: message.Message
-    publicKeys?: key.Key | key.Key[],
-    privateKeys?: key.Key | key.Key[],
-    passwords?: string | string[],
-    sessionKey?: SessionKey,
-    compression?: enums.compression,
-    armor?: boolean,
-    streaming?: 'web' | 'node' | false
-    detached?: boolean,
-    signature?: Signature,
-    returnSessionKey?: boolean,
-    wildcard?: boolean,
-    date?: Date,
-    fromUserId?: UserId,
-    toUserId?: UserId,
-}
-
-export interface EncryptedMessage {
-    data?: string,
-    message?: message.Message,
-    signature?: string | ReadableStream<string> | Signature // TODO add NodeStream
-    sessionKey?: SessionKey
-}
-
-export interface DecryptOptions {
-    message: message.Message,
-    privateKeys?: key.Key | key.Key[],
-    passwords?: string | string[],
-    sessionKeys?: SessionKey | SessionKey[],
-    publicKeys?: key.Key | key.Key[],
-    format?: string,
-    streaming?: 'web' | 'node' | false,
-    signature?: Signature,
-    date?: Date,
-}
-
-export interface SignOptions {
-    message: message.Message,
-    privateKeys?: key.Key | key.Key[],
-    armor?: boolean,
-    streaming?: 'web' | 'node' | false,
-    detached?: boolean
-    date?: Date,
-    fromUserIds?: UserId[]
-}
-
-export interface SignedMessage {
-    signature?: string | ReadableStream<string> | Signature, // TODO add NodeStream
-    data?: string | ReadableStream<string>, // TODO add NodeStream
-    message?: message.Message
-}
-
-export interface KeyContainer {
-    key: key.Key,
-}
-
-export interface KeyPair extends KeyContainer {
-    privateKeyArmored: string,
-    publicKeyArmored: string,
-    revocationCertificate: string
-}
-
-export interface KeyOptions {
-    userIds?: UserId[],
-    passphrase?: string,
-    numBits?: number,
-    keyExpirationTime?: number,
-    curve?: string,
-    date?: Date,
-    subkeys?: KeyOptions[]
-}
-
-export interface Keyid {
-    bytes: string,
-}
-
-export interface Signature {
-    keyid: Keyid,
-    valid: boolean,
-    verified?: boolean
-}
-
-export interface VerifyOptions {
-    message: message.Message,
-    publicKeys: key.Key | key.Key[],
-    streaming?: 'web' | 'node' | false,
-    signature?: Signature,
-    date?: Date
-}
-
-export interface VerifiedMessage {
-    data: Uint8Array | string | ReadableStream<string> | ReadableStream<Uint8Array>, // TODO add NodeStream
-    signatures: Array<Signature>,
-}
-
-export interface DecryptedMessage {
-    data: Uint8Array | string | ReadableStream<string> | ReadableStream<Uint8Array>, // TODO add NodeStream
-    signatures: Array<Signature>,
-    filename: string
-}
-
-export interface OpenPGPWorker {
-    randomCallback(): void;
-    configure(config: any): void;
-    seedRandom(buffer: ArrayBuffer): void;
-    delegate(id: number, method: string, options: any): void;
-    response(event: any): void;
-}
-
-export interface WorkerOptions {
-    path?: string,
-    n?: number,
-    workers?: OpenPGPWorker[],
-    config?: any
-}
-
-export class AsyncProxy {
-    constructor(options: WorkerOptions);
-    getId(): number;
-    seedRandom(workerId: number, size: number): Promise<void>;
-    terminate(): void;
-    delegate(method: string, options: any): void;
-
-    workers: OpenPGPWorker[];
-}
-
-/**
- * Set the path for the web worker script and create an instance of the async proxy
- * @param {String} path            relative path to the worker scripts, default: 'openpgp.worker.js'
- * @param {Number} n               number of workers to initialize
- * @param {Array<Object>} workers  alternative to path parameter: web workers initialized with 'openpgp.worker.js'
- */
-export function initWorker(options: WorkerOptions): boolean;
-
-/**
- * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
- * @returns {module:worker/async_proxy.AsyncProxy|null} the async proxy or null if not initialized
- */
-export function getWorker(): AsyncProxy;
-
-/**
- * Cleanup the current instance of the web worker.
- */
-export function destroyWorker(): void;
-
-/**
- * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
- *   must be specified. If private keys are specified, those will be used to sign the message.
- * @param  {Message} message                      message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
- * @param  {Key|Array<Key>} publicKeys            (optional) array of keys or single key, used to encrypt the message
- * @param  {Key|Array<Key>} privateKeys           (optional) private keys for signing. If omitted message will not be signed
- * @param  {String|Array<String>} passwords       (optional) array of passwords or a single password to encrypt the message
- * @param  {Object} sessionKey                    (optional) session key in the form: { data:Uint8Array, algorithm:String }
- * @param  {module:enums.compression} compression (optional) which compression algorithm to compress the message with, defaults to what is specified in config
- * @param  {Boolean} armor                        (optional) if the return values should be ascii armored or the message/signature objects
- * @param  {'web'|'node'|false} streaming         (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Boolean} detached                     (optional) if the signature should be detached (if true, signature will be added to returned object)
- * @param  {Signature} signature                  (optional) a detached signature to add to the encrypted message
- * @param  {Boolean} returnSessionKey             (optional) if the unencrypted session key should be added to returned object
- * @param  {Boolean} wildcard                     (optional) use a key ID of 0 instead of the public key IDs
- * @param  {Date} date                            (optional) override the creation date of the message signature
- * @param  {Object} fromUserId                    (optional) user ID to sign with, e.g. { name:'Steve Sender', email:'steve@openpgp.org' }
- * @param  {Object} toUserId                      (optional) user ID to encrypt for, e.g. { name:'Robert Receiver', email:'robert@openpgp.org' }
- * @returns {Promise<Object>}                     Object containing encrypted (and optionally signed) message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       message: Message, (if `armor` was false)
- *       signature: String|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
- *       signature: Signature (if `detached` was true and `armor` was false)
- *       sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
- *     }
- * @async
- * @static
- */
-export function encrypt(options: EncryptOptions): Promise<EncryptedMessage>;
-
-/**
- * Decrypts a message with the user's private key, a session key or a password. Either a private key,
- *   a session key or a password must be specified.
- * @param  {Message} message                  the message object with the encrypted data
- * @param  {Key|Array<Key>} privateKeys       (optional) private keys with decrypted secret key data or session key
- * @param  {String|Array<String>} passwords   (optional) passwords to decrypt the message
- * @param  {Object|Array<Object>} sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String }
- * @param  {Key|Array<Key>} publicKeys        (optional) array of public keys or single key, to verify signatures
- * @param  {String} format                    (optional) return data format either as 'utf8' or 'binary'
- * @param  {'web'|'node'|false} streaming     (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Signature} signature              (optional) detached signature for verification
- * @param  {Date} date                        (optional) use the given date for verification instead of the current time
- * @returns {Promise<Object>}                 Object containing decrypted and verified message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
- *       data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
- *       filename: String,
- *       signatures: [
- *         {
- *           keyid: module:type/keyid,
- *           verified: Promise<Boolean>,
- *           valid: Boolean (if streaming was false)
- *         }, ...
- *       ]
- *     }
- * @async
- * @static
- */
-export function decrypt(options: DecryptOptions): Promise<DecryptedMessage>;
-
-/**
- * Signs a cleartext message.
- * @param  {CleartextMessage|Message} message (cleartext) message to be signed
- * @param  {Key|Array<Key>} privateKeys       array of keys or single key with decrypted secret key data to sign cleartext
- * @param  {Boolean} armor                    (optional) if the return value should be ascii armored or the message object
- * @param  {'web'|'node'|false} streaming     (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Boolean} detached                 (optional) if the return value should contain a detached signature
- * @param  {Date} date                        (optional) override the creation date of the signature
- * @param  {Array} fromUserIds                (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
- * @returns {Promise<Object>}                 Object containing signed message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       message: Message (if `armor` was false)
- *     }
- *
- * Or, if `detached` was true:
- *
- *     {
- *       signature: String|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
- *       signature: Signature (if `armor` was false)
- *     }
- * @async
- * @static
- */
-export function sign(options: SignOptions): Promise<SignedMessage>;
-
-/**
- * Verifies signatures of cleartext signed message
- * @param  {Key|Array<Key>} publicKeys         array of publicKeys or single key, to verify signatures
- * @param  {CleartextMessage|Message} message  (cleartext) message object with signatures
- * @param  {'web'|'node'|false} streaming      (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
- * @param  {Signature} signature               (optional) detached signature for verification
- * @param  {Date} date                         (optional) use the given date for verification instead of the current time
- * @returns {Promise<Object>}                  Object containing verified message in the form:
- *
- *     {
- *       data: String|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
- *       data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
- *       signatures: [
- *         {
- *           keyid: module:type/keyid,
- *           verified: Promise<Boolean>,
- *           valid: Boolean (if `streaming` was false)
- *         }, ...
- *       ]
- *     }
- * @async
- * @static
- */
-export function verify(options: VerifyOptions): Promise<VerifiedMessage>;
-
-/**
- * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
- * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
- * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
- * @param  {Number} numBits          (optional) number of bits for RSA keys: 2048 or 4096.
- * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
- * @param  {String} curve            (optional) elliptic curve for ECC keys:
- *                                              curve25519, p256, p384, p521, secp256k1,
- *                                              brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
- * @param  {Date} date               (optional) override the creation date of the key and the key signatures
- * @param  {Array<Object>} subkeys   (optional) options for each subkey, default to main key options. e.g. [{sign: true, passphrase: '123'}]
- *                                              sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
- * @returns {Promise<Object>}         The generated key object in the form:
- *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
- * @async
- * @static
- */
-export function generateKey(options: KeyOptions): Promise<KeyPair>;
-
-/**
- * Reformats signature packets for a key and rewraps key object.
- * @param  {Key} privateKey          private key to reformat
- * @param  {Array<Object>} userIds   array of user IDs e.g. [{ name:'Phil Zimmermann', email:'phil@openpgp.org' }]
- * @param  {String} passphrase       (optional) The passphrase used to encrypt the resulting private key
- * @param  {Number} keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
- * @param  {Boolean} revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
- * @returns {Promise<Object>}         The generated key object in the form:
- *                                     { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
- * @async
- * @static
- */
-export function reformatKey(options: {
-    privateKey: key.Key,
-    userIds?: UserId[],
-    passphrase?: string,
-    keyExpirationTime?: number,
-    revocationCertificate?: boolean
-}): Promise<KeyPair>;
-
-/**
- * Revokes a key. Requires either a private key or a revocation certificate.
- *   If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
- * @param  {Key} key                 (optional) public or private key to revoke
- * @param  {String} revocationCertificate (optional) revocation certificate to revoke the key with
- * @param  {Object} reasonForRevocation (optional) object indicating the reason for revocation
- * @param  {module:enums.reasonForRevocation} reasonForRevocation.flag (optional) flag indicating the reason for revocation
- * @param  {String} reasonForRevocation.string (optional) string explaining the reason for revocation
- * @returns {Promise<Object>}         The revoked key object in the form:
- *                                     { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
- *                                     (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
- * @static
- */
-export function revokeKey(options: {
-    key?: key.Key,
-    revocationCertificate?: string
-    reasonForRevocation?: {
-        flag: enums.reasonForRevocation,
-        'string': string
-    },
-}): Promise<KeyPair>;
-
-/**
- * Unlock a private key with your passphrase.
- * @param  {Key} privateKey                    the private key that is to be decrypted
- * @param  {String|Array<String>} passphrase   the user's passphrase(s) chosen during key generation
- * @returns {Promise<Object>}                  the unlocked key object in the form: { key:Key }
- * @async
- */
-export function decryptKey(options: {
-    privateKey: key.Key,
-    passphrase?: string | string[],
-}): Promise<KeyContainer>;
-
-/**
- * Lock a private key with your passphrase.
- * @param  {Key} privateKey                      the private key that is to be decrypted
- * @param  {String|Array<String>} passphrase     the user's passphrase(s) chosen during key generation
- * @returns {Promise<Object>}                    the locked key object in the form: { key:Key }
- * @async
- */
-export function encryptKey(options: {
-    privateKey: key.Key,
-    passphrase?: string | string[],
-}): Promise<KeyContainer>;
-
-// TODO add typings for encryptSessionKey and decryptSessionKeys
-
-export namespace armor {
-    /** Armor an OpenPGP binary packet block
-
-        @param messagetype type of the message
-        @param body
-        @param partindex
-        @param parttotal
-     */
-    function armor(messagetype: enums.armor, body: Object, partindex: number, parttotal: number): string;
-
-    /** DeArmor an OpenPGP armored message; verify the checksum and return the encoded bytes
-
-        @param text OpenPGP armored message
-     */
-    function dearmor(text: string): Object;
-}
-
-export namespace cleartext {
-    /** Class that represents an OpenPGP cleartext signed message.
-     */
-    interface CleartextMessage {
-        /** Returns ASCII armored text of cleartext signed message
+export namespace openpgp {
+    namespace cleartext {
+        /**
+         * Class that represents an OpenPGP cleartext signed message.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-7}
          */
-        armor(): string;
+        class CleartextMessage {
+            /**
+             * @param text The cleartext of the signed message
+             * @param signature The detached signature or an empty signature for unsigned messages
+             */
+            constructor(text: string, signature: signature.Signature);
 
-        /** Returns the key IDs of the keys that signed the cleartext message
-         */
-        getSigningKeyIds(): Array<Keyid>;
+            /**
+             * Returns the key IDs of the keys that signed the cleartext message
+             * @returns array of keyid objects
+             */
+            getSigningKeyIds(): any[];
 
-        /** Get cleartext
-         */
-        getText(): string;
+            /**
+             * Sign the cleartext message
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) The creation time of the signature that should be created
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new cleartext message with signed content
+             */
+            sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
 
-        /** Sign the cleartext message
-            @param privateKeys private keys with decrypted secret key data for signing
-         */
-        sign(privateKeys: Array<key.Key>): void;
+            /**
+             * Sign the cleartext message
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) The creation time of the signature that should be created
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new detached signature of message content
+             */
+            signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
 
-        /** Verify signatures of cleartext signed message
-            @param keys array of keys to verify signatures
+            /**
+             * Verify signatures of cleartext signed message
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verify signatures of cleartext signed message
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Get cleartext
+             * @returns cleartext of message
+             */
+            getText(): string;
+
+            /**
+             * Returns ASCII armored text of cleartext signed message
+             * @returns ASCII armor
+             */
+            armor(): string | ReadableStream<String>;
+        }
+
+        /**
+         * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
+         * @param armoredText text to be parsed
+         * @returns new cleartext message object
          */
-        verify(keys: Array<key.Key>): Array<VerifiedMessage>;
+        function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
+
+        /**
+         * Creates a new CleartextMessage object from text
+         * @param text
+         */
+        function fromText(text: string): void;
     }
 
-    /** creates new message object from text
-        @param text
+    /**
+     * @see module:config/config
      */
-    function fromText(text: string): CleartextMessage;
+    namespace config {
+        var prefer_hash_algorithm: any;
 
-    function readArmored(armoredText: string): Promise<CleartextMessage>;
-}
+        var encryption_cipher: any;
 
-export namespace config {
-    var prefer_hash_algorithm: enums.hash;
-    var encryption_cipher: enums.symmetric;
-    var compression: enums.compression;
-    var show_version: boolean;
-    var show_comment: boolean;
-    var integrity_protect: boolean;
-    var keyserver: string;
-    var debug: boolean;
-}
+        var compression: any;
 
-export namespace crypto {
-    interface Mpi {
-        data: number,
-        read(input: string): number,
-        write(): string,
+        var deflate_level: any;
+
+        /**
+         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+         * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
+         * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
+         */
+        var aead_protect: any;
+
+        /**
+         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+         * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
+         * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
+         * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
+         */
+        var aead_protect_version: any;
+
+        /**
+         * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
+         * Only has an effect when aead_protect is set to true.
+         */
+        var aead_mode: any;
+
+        /**
+         * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
+         * Only has an effect when aead_protect is set to true.
+         * Must be an integer value from 0 to 56.
+         */
+        var aead_chunk_size_byte: any;
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
+         * Iteration Count Byte for S2K (String to Key)
+         */
+        var s2k_iteration_count_byte: any;
+
+        /**
+         * Use integrity protection for symmetric encryption
+         */
+        var integrity_protect: any;
+
+        var ignore_mdc_error: any;
+
+        var allow_unauthenticated_stream: any;
+
+        var checksum_required: any;
+
+        var rsa_blinding: any;
+
+        /**
+         * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
+         * **Slower and slightly less secure**
+         */
+        var password_collision_check: any;
+
+        var revocations_expire: any;
+
+        var use_native: any;
+
+        var min_bytes_for_web_crypto: any;
+
+        var zero_copy: any;
+
+        var debug: any;
+
+        var tolerant: any;
+
+        var show_version: any;
+
+        var show_comment: any;
+
+        var versionstring: any;
+
+        var commentstring: any;
+
+        var keyserver: any;
+
+        var node_store: any;
+
+        /**
+         * Max userid string length (used for parsing)
+         */
+        var max_userid_length: any;
+
+        namespace localStorage {
+            class LocalStorage {
+                /**
+                 * This object is used for storing and retrieving configuration from HTML5 local storage.
+                 */
+                constructor();
+
+                /**
+                 * Reads the config out of the HTML5 local storage
+                 * and initializes the object config.
+                 * if config is null the default config will be used
+                 */
+                read(): void;
+
+                /**
+                 * Writes the config to HTML5 local storage
+                 */
+                write(): void;
+            }
+        }
     }
 
-    /** Generating a session key for the specified symmetric algorithm
-        @param algo Algorithm to use
-     */
-    function generateSessionKey(algo: enums.symmetric): string;
+    class LocalStorage {
+        /**
+         * This object is used for storing and retrieving configuration from HTML5 local storage.
+         */
+        constructor();
 
-    /** generate random byte prefix as string for the specified algorithm
-        @param algo Algorithm to use
-     */
-    function getPrefixRandom(algo: enums.symmetric): string;
+        /**
+         * Reads the config out of the HTML5 local storage
+         * and initializes the object config.
+         * if config is null the default config will be used
+         */
+        read(): void;
 
-    /** Returns the number of integers comprising the private key of an algorithm
-        @param algo The public key algorithm
-     */
-    function getPrivateMpiCount(algo: enums.symmetric): number;
-
-    /** Decrypts data using the specified public key multiprecision integers of the private key, the specified secretMPIs of the private key and the specified algorithm.
-        @param algo Algorithm to be used
-        @param publicMPIs Algorithm dependent multiprecision integers of the public key part of the private key
-        @param secretMPIs Algorithm dependent multiprecision integers of the private key used
-        @param data Data to be encrypted as MPI
-     */
-    function publicKeyDecrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: Mpi): Mpi;
-
-    /** Encrypts data using the specified public key multiprecision integers and the specified algorithm.
-        @param algo Algorithm to be used
-        @param publicMPIs Algorithm dependent multiprecision integers
-        @param data Data to be encrypted as MPI
-     */
-    function publicKeyEncrypt(algo: enums.publicKey, publicMPIs: Array<Mpi>, data: Mpi): Array<Mpi>;
-
-
-    namespace cfb {
-        /** This function decrypts a given plaintext using the specified blockcipher to decrypt a message
-            @param cipherfn the algorithm cipher class to decrypt data in one block_size encryption
-            @param key binary string representation of key to be used to decrypt the ciphertext. This will be passed to the cipherfn
-            @param ciphertext to be decrypted provided as a string
-            @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Decryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
-        */
-        function decrypt(cipherfn: string, key: string, ciphertext: string, resync: boolean): string;
-
-        /** This function encrypts a given with the specified prefixrandom using the specified blockcipher to encrypt a message
-            @param prefixrandom random bytes of block_size length provided as a string to be used in prefixing the data
-            @param cipherfn the algorithm cipher class to encrypt data in one block_size encryption
-            @param plaintext data to be encrypted provided as a string
-            @param key binary string representation of key to be used to encrypt the plaintext. This will be passed to the cipherfn
-            @param resync a boolean value specifying if a resync of the IV should be used or not. The encrypteddatapacket uses the "old" style with a resync. Encryption within an encryptedintegrityprotecteddata packet is not resyncing the IV.
-        */
-        function encrypt(prefixrandom: string, cipherfn: string, plaintext: string, key: string, resync: boolean): string;
-
-        /** Decrypts the prefixed data for the Modification Detection Code (MDC) computation
-            @param cipherfn cipherfn.encrypt Cipher function to use
-            @param key binary string representation of key to be used to check the mdc This will be passed to the cipherfn
-            @param ciphertext The encrypted data
-        */
-        function mdc(cipherfn: Object, key: string, ciphertext: string): string;
+        /**
+         * Writes the config to HTML5 local storage
+         */
+        write(): void;
     }
 
-    namespace hash {
-        /** Create a hash on the specified data using the specified algorithm
-            @param algo Hash algorithm type
-            @param data Data to be hashed
-        */
-        function digest(algo: enums.hash, data: string): string;
 
-        /** Returns the hash size in bytes of the specified hash algorithm type
-            @param algo Hash algorithm type
+
+    /**
+     * @see module:crypto/crypto
+     * @see module:crypto/signature
+     * @see module:crypto/public_key
+     * @see module:crypto/cipher
+     * @see module:crypto/random
+     * @see module:crypto/hash
+     */
+    namespace crypto {
+        /**
+     * @see module:crypto/public_key/elliptic/ecdh
+     */
+        namespace aes_kw {
+            /**
+             * AES key wrap
+             * @param key
+             * @param data
+             * @returns
+             */
+            function wrap(key: string, data: string): Uint8Array;
+
+            /**
+             * AES key unwrap
+             * @param key
+             * @param data
+             * @returns
+             * @throws
+             */
+            function unwrap(key: string, data: string): Uint8Array;
+        }
+
+        namespace cfb {
+            function encrypt(algo: any, key: any, plaintext: any, iv: any): any
+            function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
+        }
+
+        namespace cipher {
+            /**
+             * AES-128 encryption and decryption (ID 7)
+             * @param key 128-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes128(key: string): object;
+
+            /**
+             * AES-128 Block Cipher (ID 8)
+             * @param key 192-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes192(key: string): object;
+
+            /**
+             * AES-128 Block Cipher (ID 9)
+             * @param key 256-bit key
+             * @see
+             * @see
+             * @returns
+             */
+            function aes256(key: string): object;
+
+            /**
+             * Triple DES Block Cipher (ID 2)
+             * @param key 192-bit key
+             * @see
+             * @returns
+             */
+            function tripledes(key: string): object;
+
+            /**
+             * CAST-128 Block Cipher (ID 3)
+             * @param key 128-bit key
+             * @see
+             * @returns
+             */
+            function cast5(key: string): object;
+
+            /**
+             * Twofish Block Cipher (ID 10)
+             * @param key 256-bit key
+             * @see
+             * @returns
+             */
+            function twofish(key: string): object;
+
+            /**
+             * Blowfish Block Cipher (ID 4)
+             * @param key 128-bit key
+             * @see
+             * @returns
+             */
+            function blowfish(key: string): object;
+
+            /**
+             * Not implemented
+             * @throws
+             */
+            function idea(): void;
+        }
+
+        namespace cmac {
+            /**
+             * This implementation of CMAC is based on the description of OMAC in
+             * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
+             * document:
+             * We have made a small modification to the OMAC algorithm as it was
+             * originally presented, changing one of its two constants.
+             * Specifically, the constant 4 at line 85 was the constant 1/2 (the
+             * multiplicative inverse of 2) in the original definition of OMAC [14].
+             * The OMAC authors indicate that they will promulgate this modification
+             * [15], which slightly simplifies implementations.
+             */
+            const blockLength: any;
+
+            /**
+             * xor `padding` into the end of `data`. This function implements "the
+             * operation xor→ [which] xors the shorter string into the end of longer
+             * one". Since data is always as least as long as padding, we can
+             * simplify the implementation.
+             * @param data
+             * @param padding
+             */
+            function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
+        }
+
+        namespace crypto {
+            /**
+             * Encrypts data using specified algorithm and public key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+             * @param algo Public key algorithm
+             * @param pub_params Algorithm-specific public key parameters
+             * @param data Data to be encrypted as MPI
+             * @param fingerprint Recipient fingerprint
+             * @returns encrypted session key parameters
+             */
+            function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
+
+            /**
+             * Decrypts data using specified algorithm and private key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+             * @param algo Public key algorithm
+             * @param key_params Algorithm-specific public, private key parameters
+             * @param data_params encrypted session key parameters
+             * @param fingerprint Recipient fingerprint
+             * @returns An MPI containing the decrypted data
+             */
+            function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
+
+            /**
+             * Returns the types comprising the private key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getPrivKeyParamTypes(algo: string): any[];
+
+            /**
+             * Returns the types comprising the public key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getPubKeyParamTypes(algo: string): any[];
+
+            /**
+             * Returns the types comprising the encrypted session key of an algorithm
+             * @param algo The public key algorithm
+             * @returns The array of types
+             */
+            function getEncSessionKeyParamTypes(algo: string): any[];
+
+            /**
+             * Generate algorithm-specific key parameters
+             * @param algo The public key algorithm
+             * @param bits Bit length for RSA keys
+             * @param oid Object identifier for ECC keys
+             * @returns The array of parameters
+             */
+            function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
+
+            /**
+             * Generates a random byte prefix for the specified algorithm
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param algo Symmetric encryption algorithm
+             * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
+             */
+            function getPrefixRandom(algo: enums.symmetric): Uint8Array;
+
+            /**
+             * Generating a session key for the specified symmetric algorithm
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param algo Symmetric encryption algorithm
+             * @returns Random bytes as a string to be used as a key
+             */
+            function generateSessionKey(algo: enums.symmetric): Uint8Array;
+        }
+
+        namespace eax {
+            /**
+             * Class to en/decrypt using EAX mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function EAX(cipher: string, key: Uint8Array): void;
+
+            /**
+             * Encrypt plaintext input.
+             * @param plaintext The cleartext input to be encrypted
+             * @param nonce The nonce (16 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Decrypt ciphertext input.
+             * @param ciphertext The ciphertext input to be decrypted
+             * @param nonce The nonce (16 bytes)
+             * @param adata Associated data to verify
+             * @returns The plaintext output
+             */
+            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+        }
+
+        namespace gcm {
+            /**
+             * Class to en/decrypt using GCM mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function GCM(cipher: string, key: Uint8Array): void;
+        }
+
+        /**
+         * @see
+         * @see
+         */
+        namespace hash {
+            /**
+             * @see module:md5
+             */
+            var md5: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha1: any;
+
+            /**
+             * @see hash.js
+             */
+            var sha224: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha256: any;
+
+            /**
+             * @see hash.js
+             */
+            var sha384: any;
+
+            /**
+             * @see asmCrypto
+             */
+            var sha512: any;
+
+            /**
+             * @see hash.js
+             */
+            var ripemd: any;
+
+            /**
+             * Create a hash on the specified data using the specified algorithm
+             * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+             * @param data Data to be hashed
+             * @returns hash value
+             */
+            function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Returns the hash size in bytes of the specified hash algorithm type
+             * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+             * @returns Size in bytes of the resulting hash
+             */
+            function getHashByteLength(algo: enums.hash): Integer;
+        }
+
+        /**
+         * @see module:packet.PublicKeyEncryptedSessionKey
+         */
+        namespace pkcs5 {
+            /**
+             * Add pkcs5 padding to a text.
+             * @param msg Text to add padding
+             * @returns Text with padding added
+             */
+            function encode(msg: string): string;
+
+            /**
+             * Remove pkcs5 padding from a string.
+             * @param msg Text to remove padding from
+             * @returns Text with padding removed
+             */
+            function decode(msg: string): string;
+        }
+
+        namespace ocb {
+            /**
+             * Class to en/decrypt using OCB mode.
+             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+             * @param key The encryption key
+             */
+            function OCB(cipher: string, key: Uint8Array): void;
+
+            /**
+             * Encrypt plaintext input.
+             * @param plaintext The cleartext input to be encrypted
+             * @param nonce The nonce (15 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+            /**
+             * Decrypt ciphertext input.
+             * @param ciphertext The ciphertext input to be decrypted
+             * @param nonce The nonce (15 bytes)
+             * @param adata Associated data to sign
+             * @returns The ciphertext output
+             */
+            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+        }
+
+        /**
+        * @see module:crypto/public_key/rsa
+        * @see module:crypto/public_key/elliptic/ecdh
+        * @see module:packet.PublicKeyEncryptedSessionKey
         */
-        function getHashByteLength(algo: enums.hash): number;
+        namespace pkcs1 {
+            namespace eme {
+                /**
+                 * Create a EME-PKCS1-v1_5 padded message
+                 * @see
+                 * @param M message to be encoded
+                 * @param k the length in octets of the key modulus
+                 * @returns EME-PKCS1 padded message
+                 */
+                function encode(M: string, k: Integer): Promise<String>;
+
+                /**
+                 * Decode a EME-PKCS1-v1_5 padded message
+                 * @see
+                 * @param EM encoded message, an octet string
+                 * @returns message, an octet string
+                 */
+                function decode(EM: string): string;
+            }
+
+            namespace emsa {
+                /**
+                 * Create a EMSA-PKCS1-v1_5 padded message
+                 * @see
+                 * @param algo Hash algorithm type used
+                 * @param hashed message to be encoded
+                 * @param emLen intended length in octets of the encoded message
+                 * @returns encoded message
+                 */
+                function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+            }
+
+            /**
+             * ASN1 object identifiers for hashes
+             * @see
+             */
+            const hash_headers: any;
+        }
+
+        namespace public_key {
+            namespace dsa {
+                /**
+                 * DSA Sign function
+                 * @param hash_algo
+                 * @param hashed
+                 * @param g
+                 * @param p
+                 * @param q
+                 * @param x
+                 * @returns
+                 */
+                function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
+
+                /**
+                 * DSA Verify function
+                 * @param hash_algo
+                 * @param r
+                 * @param s
+                 * @param hashed
+                 * @param g
+                 * @param p
+                 * @param q
+                 * @param y
+                 * @returns BN
+                 */
+                function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
+            }
+
+            namespace elgamal {
+                /**
+                 * ElGamal Encryption function
+                 * @param m
+                 * @param p
+                 * @param g
+                 * @param y
+                 * @returns
+                 */
+                function encrypt(m: BN, p: BN, g: BN, y: BN): object;
+
+                /**
+                 * ElGamal Encryption function
+                 * @param c1
+                 * @param c2
+                 * @param p
+                 * @param x
+                 * @returns BN
+                 */
+                function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
+            }
+
+            /**
+            * @see module:crypto/public_key/elliptic/curve
+            * @see module:crypto/public_key/elliptic/ecdh
+            * @see module:crypto/public_key/elliptic/ecdsa
+            * @see module:crypto/public_key/elliptic/eddsa
+            */
+            namespace elliptic {
+                namespace curve {
+                    class Curve {
+                    }
+                }
+
+                namespace ecdh {
+                    /**
+                     * Generate ECDHE ephemeral key and secret from public key
+                     * @param curve Elliptic curve object
+                     * @param Q Recipient public key
+                     * @returns Returns public part of ephemeral key and generated ephemeral secret
+                     */
+                    function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
+
+                    /**
+                     * Encrypt and wrap a session key
+                     * @param oid Elliptic curve object identifier
+                     * @param cipher_algo Symmetric cipher to use
+                     * @param hash_algo Hash algorithm to use
+                     * @param m Value derived from session key (RFC 6637)
+                     * @param Q Recipient public key
+                     * @param fingerprint Recipient fingerprint
+                     * @returns Returns public part of ephemeral key and encoded session key
+                     */
+                    function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
+
+                    /**
+                     * Generate ECDHE secret from private key and public part of ephemeral key
+                     * @param curve Elliptic curve object
+                     * @param V Public part of ephemeral key
+                     * @param d Recipient private key
+                     * @returns Generated ephemeral secret
+                     */
+                    function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
+
+                    /**
+                     * Decrypt and unwrap the value derived from session key
+                     * @param oid Elliptic curve object identifier
+                     * @param cipher_algo Symmetric cipher to use
+                     * @param hash_algo Hash algorithm to use
+                     * @param V Public part of ephemeral key
+                     * @param C Encrypted and wrapped value derived from session key
+                     * @param d Recipient private key
+                     * @param fingerprint Recipient fingerprint
+                     * @returns Value derived from session
+                     */
+                    function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
+                }
+
+                namespace ecdsa {
+                    /**
+                     * Sign a message using the provided key
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used to sign
+                     * @param m Message to sign
+                     * @param d Private key used to sign the message
+                     * @param hashed The hashed message
+                     * @returns Signature of the message
+                     */
+                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
+
+                    /**
+                     * Verifies if a signature is valid for a message
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used in the signature
+                     * @param signature Signature to verify
+                     * @param m Message to verify
+                     * @param Q Public key used to verify the message
+                     * @param hashed The hashed message
+                     * @returns
+                     */
+                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+                }
+
+                namespace eddsa {
+                    /**
+                     * Sign a message using the provided keygit
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used to sign
+                     * @param m Message to sign
+                     * @param d Private key used to sign
+                     * @param hashed The hashed message
+                     * @returns Signature of the message
+                     */
+                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
+
+                    /**
+                     * Verifies if a signature is valid for a message
+                     * @param oid Elliptic curve object identifier
+                     * @param hash_algo Hash algorithm used in the signature
+                     * @param signature Signature to verify the message
+                     * @param m Message to verify
+                     * @param Q Public key used to verify the message
+                     * @param hashed The hashed message
+                     * @returns
+                     */
+                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+                }
+
+                namespace key {
+                    class KeyPair {
+                    }
+                }
+            }
+
+            namespace prime {
+                /**
+                 * Probabilistic random number generator
+                 * @param bits Bit length of the prime
+                 * @param e Optional RSA exponent to check against the prime
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @returns BN
+                 */
+                function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
+
+                /**
+                 * Probabilistic primality testing
+                 * @param n Number to test
+                 * @param e Optional RSA exponent to check against the prime
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @returns
+                 */
+                function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+
+                /**
+                 * Tests whether n is probably prime or not using Fermat's test with b = 2.
+                 * Fails if b^(n-1) mod n === 1.
+                 * @param n Number to test
+                 * @param b Optional Fermat test base
+                 * @returns
+                 */
+                function fermat(n: BN, b: Integer): boolean;
+
+                /**
+                 * Tests whether n is probably prime or not using the Miller-Rabin test.
+                 * See HAC Remark 4.28.
+                 * @param n Number to test
+                 * @param k Optional number of iterations of Miller-Rabin test
+                 * @param rand Optional function to generate potential witnesses
+                 * @returns
+                 */
+                function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+            }
+
+            namespace rsa {
+                /**
+                 * Create signature
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @param d RSA private exponent
+                 * @returns RSA Signature
+                 */
+                function sign(m: BN, n: BN, e: BN, d: BN): BN;
+
+                /**
+                 * Verify signature
+                 * @param s signature
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @returns
+                 */
+                function verify(s: BN, n: BN, e: BN): BN;
+
+                /**
+                 * Encrypt message
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @returns RSA Ciphertext
+                 */
+                function encrypt(m: BN, n: BN, e: BN): BN;
+
+                /**
+                 * Decrypt RSA message
+                 * @param m message
+                 * @param n RSA public modulus
+                 * @param e RSA public exponent
+                 * @param d RSA private exponent
+                 * @param p RSA private prime p
+                 * @param q RSA private prime q
+                 * @param u RSA private inverse of prime q
+                 * @returns RSA Plaintext
+                 */
+                function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
+
+                /**
+                 * Generate a new random private key B bits long with public exponent E.
+                 * When possible, webCrypto is used. Otherwise, primes are generated using
+                 * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
+                 * @see module:crypto/public_key/prime
+                 * @param B RSA bit length
+                 * @param E RSA public exponent in hex string
+                 * @returns RSA public modulus, RSA public exponent, RSA private exponent,
+                 *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
+                 */
+                function generate(B: Integer, E: string): object;
+            }
+        }
+
+        namespace random {
+            /**
+             * Retrieve secure random byte array of the specified length
+             * @param length Length in bytes to generate
+             * @returns Random byte array
+             */
+            function getRandomBytes(length: Integer): Uint8Array;
+
+            /**
+             * Create a secure random MPI that is greater than or equal to min and less than max.
+             * @param min Lower bound, included
+             * @param max Upper bound, excluded
+             * @returns Random MPI
+             */
+            function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
+
+            /**
+             * Buffer for secure random numbers
+             */
+            function RandomBuffer(): void;
+        }
+
+        namespace signature {
+            /**
+             * Verifies the signature provided for data using specified algorithms and public key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+             * for public key and hash algorithms.
+             * @param algo Public key algorithm
+             * @param hash_algo Hash algorithm
+             * @param msg_MPIs Algorithm-specific signature parameters
+             * @param pub_MPIs Algorithm-specific public key parameters
+             * @param data Data for which the signature was created
+             * @param hashed The hashed data
+             * @returns True if signature is valid
+             */
+            function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
+
+            /**
+             * Creates a signature on data using specified algorithms and private key parameters.
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+             * for public key and hash algorithms.
+             * @param algo Public key algorithm
+             * @param hash_algo Hash algorithm
+             * @param key_params Algorithm-specific public and private key parameters
+             * @param data Data to be signed
+             * @param hashed The hashed data
+             * @returns Signature
+             */
+            function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
+        }
     }
 
-    namespace random {
-        /** Create a secure random big integer of bits length
-            @param bits Bit length of the MPI to create
-        */
-        function getRandomBigInteger(bits: number): number;
+    namespace eme {
+        /**
+         * Create a EME-PKCS1-v1_5 padded message
+         * @see
+         * @param M message to be encoded
+         * @param k the length in octets of the key modulus
+         * @returns EME-PKCS1 padded message
+         */
+        function encode(M: string, k: Integer): Promise<String>;
 
-        /** Retrieve secure random byte string of the specified length
-            @param length Length in bytes to generate
-        */
-        function getRandomBytes(length: number): string;
+        /**
+         * Decode a EME-PKCS1-v1_5 padded message
+         * @see
+         * @param EM encoded message, an octet string
+         * @returns message, an octet string
+         */
+        function decode(EM: string): string;
+    }
 
-        /** Helper routine which calls platform specific crypto random generator
-            @param buf
-        */
-        function getRandomValues(buf: Uint8Array): void;
+    namespace emsa {
+        /**
+         * Create a EMSA-PKCS1-v1_5 padded message
+         * @see
+         * @param algo Hash algorithm type used
+         * @param hashed message to be encoded
+         * @param emLen intended length in octets of the encoded message
+         * @returns encoded message
+         */
+        function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+    }
 
-        /** Return a secure random number in the specified range
-            @param from Min of the random number
-            @param to Max of the random number (max 32bit)
-        */
-        function getSecureRandom(from: number, to: number): number;
+    namespace encoding {
+        namespace armor {
+            /**
+             * Add additional information to the armor version of an OpenPGP binary
+             * packet block.
+             * @author Alex
+             * @version 2011-12-16
+             * @param customComment (optional) additional comment to add to the armored string
+             * @returns The header information
+             */
+            function addheader(customComment: string): string;
+
+            /**
+             * Calculates a checksum over the given data and returns it base64 encoded
+             * @param data Data to create a CRC-24 checksum for
+             * @returns Base64 encoded checksum
+             */
+            function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
+
+            /**
+             * Internal function to calculate a CRC-24 checksum over a given string (data)
+             * @param data Data to create a CRC-24 checksum for
+             * @returns The CRC-24 checksum
+             */
+            function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Splits a message into two parts, the body and the checksum. This is an internal function
+             * @param text OpenPGP armored message part
+             * @returns An object with attribute "body" containing the body
+             *          and an attribute "checksum" containing the checksum.
+             */
+            function splitChecksum(text: string): object;
+
+            /**
+             * DeArmor an OpenPGP armored message; verify the checksum and return
+             * the encoded bytes
+             * @param text OpenPGP armored message
+             * @returns An object with attribute "text" containing the message text,
+             *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
+             */
+            function dearmor(text: string): Promise<Object>;
+
+            /**
+             * Armor an OpenPGP binary packet block
+             * @param messagetype type of the message
+             * @param body
+             * @param partindex
+             * @param parttotal
+             * @param customComment (optional) additional comment to add to the armored string
+             * @returns Armored text
+             */
+            function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
+        }
+
+        namespace base64 {
+            /**
+             * Convert binary array to radix-64
+             * @param t Uint8Array to convert
+             * @param u if true, output is URL-safe
+             * @returns radix-64 version of input string
+             */
+            function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
+
+            /**
+             * Convert radix-64 to binary array
+             * @param t radix-64 string to convert
+             * @param u if true, input is interpreted as URL-safe
+             * @returns binary array version of input string
+             */
+            function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
+        }
+    }
+
+    namespace enums {
+        /**
+         * Maps curve names under various standards to one
+         * @see
+         */
+        enum curve {
+            /**
+             * NIST P-256 Curve
+             */
+            p256 = "p256",
+            "P-256" = "p256",
+            secp256r1 = "p256",
+            prime256v1 = "p256",
+            "1.2.840.10045.3.1.7" = "p256",
+            "2a8648ce3d030107" = "p256",
+            "2A8648CE3D030107" = "p256",
+            /**
+             * NIST P-384 Curve
+             */
+            p384 = "p384",
+            "P-384" = "p384",
+            secp384r1 = "p384",
+            "1.3.132.0.34" = "p384",
+            "2b81040022" = "p384",
+            "2B81040022" = "p384",
+            /**
+             * NIST P-521 Curve
+             */
+            p521 = "p521",
+            "P-521" = "p521",
+            secp521r1 = "p521",
+            "1.3.132.0.35" = "p521",
+            "2b81040023" = "p521",
+            "2B81040023" = "p521",
+            /**
+             * SECG SECP256k1 Curve
+             */
+            secp256k1 = "secp256k1",
+            "1.3.132.0.10" = "secp256k1",
+            "2b8104000a" = "secp256k1",
+            "2B8104000A" = "secp256k1",
+            /**
+             * Ed25519
+             */
+            ED25519 = "ed25519",
+            ed25519 = "ed25519",
+            Ed25519 = "ed25519",
+            "1.3.6.1.4.1.11591.15.1" = "ed25519",
+            "2b06010401da470f01" = "ed25519",
+            "2B06010401DA470F01" = "ed25519",
+            /**
+             * Curve25519
+             */
+            X25519 = "curve25519",
+            cv25519 = "curve25519",
+            curve25519 = "curve25519",
+            Curve25519 = "curve25519",
+            "1.3.6.1.4.1.3029.1.5.1" = "curve25519",
+            "2b060104019755010501" = "curve25519",
+            "2B060104019755010501" = "curve25519",
+            /**
+             * BrainpoolP256r1 Curve
+             */
+            brainpoolP256r1 = "brainpoolP256r1",
+            "1.3.36.3.3.2.8.1.1.7" = "brainpoolP256r1",
+            "2b2403030208010107" = "brainpoolP256r1",
+            "2B2403030208010107" = "brainpoolP256r1",
+            /**
+             * BrainpoolP384r1 Curve
+             */
+            brainpoolP384r1 = "brainpoolP384r1",
+            "1.3.36.3.3.2.8.1.1.11" = "brainpoolP384r1",
+            "2b240303020801010b" = "brainpoolP384r1",
+            "2B240303020801010B" = "brainpoolP384r1",
+            /**
+             * BrainpoolP512r1 Curve
+             */
+            brainpoolP512r1 = "brainpoolP512r1",
+            "1.3.36.3.3.2.8.1.1.13" = "brainpoolP512r1",
+            "2b240303020801010d" = "brainpoolP512r1",
+            "2B240303020801010D" = "brainpoolP512r1",
+        }
+
+        /**
+         * A string to key specifier type
+         */
+        enum s2k {
+            simple = 0,
+            salted = 1,
+            iterated = 3,
+            gnu = 101,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
+         */
+        enum publicKey {
+            /**
+             * RSA (Encrypt or Sign) [HAC]
+             */
+            rsa_encrypt_sign = 1,
+            /**
+             * RSA (Encrypt only) [HAC]
+             */
+            rsa_encrypt = 2,
+            /**
+             * RSA (Sign only) [HAC]
+             */
+            rsa_sign = 3,
+            /**
+             * Elgamal (Encrypt only) [ELGAMAL] [HAC]
+             */
+            elgamal = 16,
+            /**
+             * DSA (Sign only) [FIPS186] [HAC]
+             */
+            dsa = 17,
+            /**
+             * ECDH (Encrypt only) [RFC6637]
+             */
+            ecdh = 18,
+            /**
+             * ECDSA (Sign only) [RFC6637]
+             */
+            ecdsa = 19,
+            /**
+             * EdDSA (Sign only)
+             * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
+             */
+            eddsa = 22,
+            /**
+             * Reserved for AEDH
+             */
+            aedh = 23,
+            /**
+             * Reserved for AEDSA
+             */
+            aedsa = 24,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
+         */
+        enum symmetric {
+            plaintext = 0,
+            /**
+             * Not implemented!
+             */
+            idea = 1,
+            "3des" = 2,
+            tripledes = 2,
+            cast5 = 3,
+            blowfish = 4,
+            aes128 = 7,
+            aes192 = 8,
+            aes256 = 9,
+            twofish = 10,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
+         */
+        enum compression {
+            uncompressed = 0,
+            /**
+             * RFC1951
+             */
+            zip = 1,
+            /**
+             * RFC1950
+             */
+            zlib = 2,
+            bzip2 = 3,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
+         */
+        enum hash {
+            md5 = 1,
+            sha1 = 2,
+            ripemd = 3,
+            sha256 = 8,
+            sha384 = 9,
+            sha512 = 10,
+            sha224 = 11,
+        }
+
+        /**
+         * A list of hash names as accepted by webCrypto functions.
+         * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
+         */
+        enum webHash {
+            "SHA-1" = 2,
+            "SHA-256" = 8,
+            "SHA-384" = 9,
+            "SHA-512" = 10,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
+         */
+        enum aead {
+            eax = 1,
+            ocb = 2,
+            experimental_gcm = 100,
+        }
+
+        /**
+         * A list of packet types and numeric tags associated with them.
+         */
+        enum packet {
+            publicKeyEncryptedSessionKey = 1,
+            signature = 2,
+            symEncryptedSessionKey = 3,
+            onePassSignature = 4,
+            secretKey = 5,
+            publicKey = 6,
+            secretSubkey = 7,
+            compressed = 8,
+            symmetricallyEncrypted = 9,
+            marker = 10,
+            literal = 11,
+            trust = 12,
+            userid = 13,
+            publicSubkey = 14,
+            userAttribute = 17,
+            symEncryptedIntegrityProtected = 18,
+            modificationDetectionCode = 19,
+            symEncryptedAEADProtected = 20,
+        }
+
+        /**
+         * Data types in the literal packet
+         */
+        enum literal {
+            /**
+             * Binary data 'b'
+             */
+            binary = "",
+            /**
+             * Text data 't'
+             */
+            text = "",
+            /**
+             * Utf8 data 'u'
+             */
+            utf8 = "",
+            /**
+             * MIME message body part 'm'
+             */
+            mime = "",
+        }
+
+        /**
+         * One pass signature packet type
+         */
+        enum signature {
+            /**
+             * 0x00: Signature of a binary document.
+             */
+            binary = 0,
+            /**
+             * 0x01: Signature of a canonical text document.
+             * Canonicalyzing the document by converting line endings.
+             */
+            text = 1,
+            /**
+             * 0x02: Standalone signature.
+             * This signature is a signature of only its own subpacket contents.
+             * It is calculated identically to a signature over a zero-lengh
+             * binary document.  Note that it doesn't make sense to have a V3
+             * standalone signature.
+             */
+            standalone = 2,
+            /**
+             * 0x10: Generic certification of a User ID and Public-Key packet.
+             * The issuer of this certification does not make any particular
+             * assertion as to how well the certifier has checked that the owner
+             * of the key is in fact the person described by the User ID.
+             */
+            cert_generic = 16,
+            /**
+             * 0x11: Persona certification of a User ID and Public-Key packet.
+             * The issuer of this certification has not done any verification of
+             * the claim that the owner of this key is the User ID specified.
+             */
+            cert_persona = 17,
+            /**
+             * 0x12: Casual certification of a User ID and Public-Key packet.
+             * The issuer of this certification has done some casual
+             * verification of the claim of identity.
+             */
+            cert_casual = 18,
+            /**
+             * 0x13: Positive certification of a User ID and Public-Key packet.
+             * The issuer of this certification has done substantial
+             * verification of the claim of identity.
+             * Most OpenPGP implementations make their "key signatures" as 0x10
+             * certifications.  Some implementations can issue 0x11-0x13
+             * certifications, but few differentiate between the types.
+             */
+            cert_positive = 19,
+            /**
+             * 0x30: Certification revocation signature
+             * This signature revokes an earlier User ID certification signature
+             * (signature class 0x10 through 0x13) or direct-key signature
+             * (0x1F).  It should be issued by the same key that issued the
+             * revoked signature or an authorized revocation key.  The signature
+             * is computed over the same data as the certificate that it
+             * revokes, and should have a later creation date than that
+             * certificate.
+             */
+            cert_revocation = 48,
+            /**
+             * 0x18: Subkey Binding Signature
+             * This signature is a statement by the top-level signing key that
+             * indicates that it owns the subkey.  This signature is calculated
+             * directly on the primary key and subkey, and not on any User ID or
+             * other packets.  A signature that binds a signing subkey MUST have
+             * an Embedded Signature subpacket in this binding signature that
+             * contains a 0x19 signature made by the signing subkey on the
+             * primary key and subkey.
+             */
+            subkey_binding = 24,
+            /**
+             * 0x19: Primary Key Binding Signature
+             * This signature is a statement by a signing subkey, indicating
+             * that it is owned by the primary key and subkey.  This signature
+             * is calculated the same way as a 0x18 signature: directly on the
+             * primary key and subkey, and not on any User ID or other packets.
+             * When a signature is made over a key, the hash data starts with the
+             * octet 0x99, followed by a two-octet length of the key, and then body
+             * of the key packet.  (Note that this is an old-style packet header for
+             * a key packet with two-octet length.)  A subkey binding signature
+             * (type 0x18) or primary key binding signature (type 0x19) then hashes
+             * the subkey using the same format as the main key (also using 0x99 as
+             * the first octet).
+             */
+            key_binding = 25,
+            /**
+             * 0x1F: Signature directly on a key
+             * This signature is calculated directly on a key.  It binds the
+             * information in the Signature subpackets to the key, and is
+             * appropriate to be used for subpackets that provide information
+             * about the key, such as the Revocation Key subpacket.  It is also
+             * appropriate for statements that non-self certifiers want to make
+             * about the key itself, rather than the binding between a key and a
+             * name.
+             */
+            key = 31,
+            /**
+             * 0x20: Key revocation signature
+             * The signature is calculated directly on the key being revoked.  A
+             * revoked key is not to be used.  Only revocation signatures by the
+             * key being revoked, or by an authorized revocation key, should be
+             * considered valid revocation signatures.a
+             */
+            key_revocation = 32,
+            /**
+             * 0x28: Subkey revocation signature
+             * The signature is calculated directly on the subkey being revoked.
+             * A revoked subkey is not to be used.  Only revocation signatures
+             * by the top-level signature key that is bound to this subkey, or
+             * by an authorized revocation key, should be considered valid
+             * revocation signatures.
+             * Key revocation signatures (types 0x20 and 0x28)
+             * hash only the key being revoked.
+             */
+            subkey_revocation = 40,
+            /**
+             * 0x40: Timestamp signature.
+             * This signature is only meaningful for the timestamp contained in
+             * it.
+             */
+            timestamp = 64,
+            /**
+             * 0x50: Third-Party Confirmation signature.
+             * This signature is a signature over some other OpenPGP Signature
+             * packet(s).  It is analogous to a notary seal on the signed data.
+             * A third-party signature SHOULD include Signature Target
+             * subpacket(s) to give easy identification.  Note that we really do
+             * mean SHOULD.  There are plausible uses for this (such as a blind
+             * party that only sees the signature, not the key or source
+             * document) that cannot include a target subpacket.
+             */
+            third_party = 80,
+        }
+
+        /**
+         * Signature subpacket type
+         */
+        enum signatureSubpacket {
+            signature_creation_time = 2,
+            signature_expiration_time = 3,
+            exportable_certification = 4,
+            trust_signature = 5,
+            regular_expression = 6,
+            revocable = 7,
+            key_expiration_time = 9,
+            placeholder_backwards_compatibility = 10,
+            preferred_symmetric_algorithms = 11,
+            revocation_key = 12,
+            issuer = 16,
+            notation_data = 20,
+            preferred_hash_algorithms = 21,
+            preferred_compression_algorithms = 22,
+            key_server_preferences = 23,
+            preferred_key_server = 24,
+            primary_user_id = 25,
+            policy_uri = 26,
+            key_flags = 27,
+            signers_user_id = 28,
+            reason_for_revocation = 29,
+            features = 30,
+            signature_target = 31,
+            embedded_signature = 32,
+            issuer_fingerprint = 33,
+            preferred_aead_algorithms = 34,
+        }
+
+        /**
+         * Key flags
+         */
+        enum keyFlags {
+            /**
+             * 0x01 - This key may be used to certify other keys.
+             */
+            certify_keys = 1,
+            /**
+             * 0x02 - This key may be used to sign data.
+             */
+            sign_data = 2,
+            /**
+             * 0x04 - This key may be used to encrypt communications.
+             */
+            encrypt_communication = 4,
+            /**
+             * 0x08 - This key may be used to encrypt storage.
+             */
+            encrypt_storage = 8,
+            /**
+             * 0x10 - The private component of this key may have been split
+             * by a secret-sharing mechanism.
+             */
+            split_private_key = 16,
+            /**
+             * 0x20 - This key may be used for authentication.
+             */
+            authentication = 32,
+            /**
+             * 0x80 - The private component of this key may be in the
+             * possession of more than one person.
+             */
+            shared_private_key = 128,
+        }
+
+        /**
+         * Key status
+         */
+        enum keyStatus {
+            invalid = 0,
+            expired = 1,
+            revoked = 2,
+            valid = 3,
+            no_self_cert = 4,
+        }
+
+        /**
+         * Armor type
+         */
+        enum armor {
+            multipart_section = 0,
+            multipart_last = 1,
+            signed = 2,
+            message = 3,
+            public_key = 4,
+            private_key = 5,
+            signature = 6,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
+         */
+        enum reasonForRevocation {
+            /**
+             * No reason specified (key revocations or cert revocations)
+             */
+            no_reason = 0,
+            /**
+             * Key is superseded (key revocations)
+             */
+            key_superseded = 1,
+            /**
+             * Key material has been comPromise<any>d (key revocations)
+             */
+            key_comPromised = 2,
+            /**
+             * Key is retired and no longer used (key revocations)
+             */
+            key_retired = 3,
+            /**
+             * User ID information is no longer valid (cert revocations)
+             */
+            userid_invalid = 32,
+        }
+
+        /**
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
+         */
+        enum features {
+            /**
+             * 0x01 - Modification Detection (packets 18 and 19)
+             */
+            modification_detection = 1,
+            /**
+             * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
+             * Symmetric-Key Encrypted Session Key Packets (packet 3)
+             */
+            aead = 2,
+            /**
+             * 0x04 - Version 5 Public-Key Packet format and corresponding new
+             * fingerprint format
+             */
+            v5_keys = 4,
+        }
+
+        /**
+         * Asserts validity and converts from string/integer to integer.
+         */
+        function write(): void;
+
+        /**
+         * Converts from an integer to string.
+         */
+        function read(): void;
+    }
+
+    namespace hkp {
+        class HKP {
+            /**
+             * Initialize the HKP client and configure it with the key server url and fetch function.
+             * @param keyServerBaseUrl (optional) The HKP key server base url including
+             *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+             *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+             */
+            constructor(keyServerBaseUrl: string);
+
+            /**
+             * Search for a public key on the key server either by key ID or part of the user ID.
+             * @param options.keyID The long public key ID.
+             * @param options.query This can be any part of the key user ID such as name
+             *        or email address.
+             * @returns The ascii armored public key.
+             */
+            lookup(): Promise<String>;
+
+            /**
+             * Upload a public key to the server.
+             * @param publicKeyArmored An ascii armored public key to be uploaded.
+             * @returns
+             */
+            upload(publicKeyArmored: string): Promise<any>;
+        }
+    }
+
+    class HKP {
+        /**
+         * Initialize the HKP client and configure it with the key server url and fetch function.
+         * @param keyServerBaseUrl (optional) The HKP key server base url including
+         *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+         *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+         */
+        constructor(keyServerBaseUrl: string);
+
+        /**
+         * Search for a public key on the key server either by key ID or part of the user ID.
+         * @param options.keyID The long public key ID.
+         * @param options.query This can be any part of the key user ID such as name
+         *        or email address.
+         * @returns The ascii armored public key.
+         */
+        lookup(): Promise<String>;
+
+        /**
+         * Upload a public key to the server.
+         * @param publicKeyArmored An ascii armored public key to be uploaded.
+         * @returns
+         */
+        upload(publicKeyArmored: string): Promise<any>;
+    }
+
+    namespace key {
+        /**
+         * Class that represents an OpenPGP key. Must contain a primary key.
+         * Can contain additional subkeys, signatures, user ids, user attributes.
+         */
+        class Key {
+            /**
+             * @param packetlist The packets that form this key
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Transforms packetlist to structured key data
+             * @param packetlist The packets that form a key
+             */
+            packetlist2structure(packetlist: packet.List): void;
+
+            /**
+             * Transforms structured key data to packetlist
+             * @returns The packets that form a key
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Returns an array containing all public or private subkeys matching keyId;
+             * If keyId is not present, returns all subkeys.
+             * @param keyId
+             * @returns
+             */
+            getSubkeys(keyId: type.keyid.Keyid): any[];
+
+            /**
+             * Returns an array containing all public or private keys matching keyId.
+             * If keyId is not present, returns all keys starting with the primary key.
+             * @param keyId
+             * @returns
+             */
+            getKeys(keyId: type.keyid.Keyid): any[];
+
+            /**
+             * Returns key IDs of all keys
+             * @returns
+             */
+            getKeyIds(): any[];
+
+            /**
+             * Returns userids
+             * @returns array of userids
+             */
+            getUserIds(): any[];
+
+            /**
+             * Returns true if this is a public key
+             * @returns
+             */
+            isPublic(): boolean;
+
+            /**
+             * Returns true if this is a private key
+             * @returns
+             */
+            isPrivate(): boolean;
+
+            /**
+             * Returns key as public key (shallow copy)
+             * @returns new public Key
+             */
+            toPublic(): Key;
+
+            /**
+             * Returns ASCII armored text of key
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+
+            /**
+             * Returns last created key or key by given keyId that is available for signing and verification
+             * @param keyId, optional
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId, optional user ID
+             * @returns key or null if no signing key has been found
+             */
+            getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
+
+            /**
+             * Returns last created key or key by given keyId that is available for encryption or decryption
+             * @param keyId, optional
+             * @param date, optional
+             * @param userId, optional
+             * @returns key or null if no encryption key has been found
+             */
+            getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
+
+            /**
+             * Encrypts all secret key and subkey packets matching keyId
+             * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
+             * @param keyId
+             * @returns
+             */
+            encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
+
+            /**
+             * Decrypts all secret key and subkey packets matching keyId
+             * @param passphrases
+             * @param keyId
+             * @returns true if all matching key and subkey packets decrypted successfully
+             */
+            decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
+
+            /**
+             * Checks if a signature on a key is revoked
+             * @param
+             * @param signature The signature to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the certificate is revoked
+             */
+            isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
+
+            /**
+             * Verify primary key. Checks for revocation signatures, expiration time
+             * and valid self signature
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID
+             * @returns The status of the primary key
+             */
+            verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
+
+            /**
+             * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
+             * When `capabilities` is null, defaults to returning the expiry date of the primary key.
+             * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
+             * Returns Infinity if the key doesn't expire.
+             * @param {encrypt | sign | encrypt_sign} capabilities, optional
+             * @param keyId, optional
+             * @param userId, optional user ID
+             * @returns
+             */
+            getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
+
+            /**
+             * Returns primary user and most significant (latest valid) self signature
+             * - if multiple primary users exist, returns the one with the latest self signature
+             * - otherwise, returns the user with the latest self signature
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns The primary user and the self signature
+             */
+            getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
+
+            /**
+             * Update key with new components from specified key with same key ID:
+             * users, subkeys, certificates are merged into the destination key,
+             * duplicates and expired signatures are ignored.
+             * If the specified key is a private key and the destination key is public,
+             * the destination key is transformed to a private key.
+             * @param key Source key to merge
+             * @returns
+             */
+            update(key: Key): Promise<undefined>;
+
+            /**
+             * Revokes the key
+             * @param reasonForRevocation optional, object indicating the reason for revocation
+             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+             * @param reasonForRevocation.string optional, string explaining the reason for revocation
+             * @param date optional, override the creationtime of the revocation signature
+             * @returns new key with revocation signature
+             */
+            revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
+
+            /**
+             * Get revocation certificate from a revoked key.
+             * (To get a revocation certificate for an unrevoked key, call revoke() first.)
+             * @returns armored revocation certificate
+             */
+            getRevocationCertificate(): Promise<String>;
+
+            /**
+             * Applies a revocation certificate to a key
+             * This adds the first signature packet in the armored text to the key,
+             * if it is a valid revocation signature.
+             * @param revocationCertificate armored revocation certificate
+             * @returns new revoked key
+             */
+            applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
+
+            /**
+             * Signs primary user of key
+             * @param privateKey decrypted private keys for signing
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns new public key with new certificate signature
+             */
+            signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
+
+            /**
+             * Signs all users of key
+             * @param privateKeys decrypted private keys for signing
+             * @returns new public key with new certificate signature
+             */
+            signAllUsers(privateKeys: any[]): Promise<Key>;
+
+            /**
+             * Verifies primary user of key
+             * - if no arguments are given, verifies the self certificates;
+             * - otherwise, verifies all certificates signed with given keys.
+             * @param keys array of keys to verify certificate signatures
+             * @param date (optional) use the given date for verification instead of the current time
+             * @param userId (optional) user ID to get instead of the primary user, if it exists
+             * @returns List of signer's keyid and validity of signature
+             */
+            verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verifies all users of key
+             * - if no arguments are given, verifies the self certificates;
+             * - otherwise, verifies all certificates signed with given keys.
+             * @param keys array of keys to verify certificate signatures
+             * @returns list of userid, signer's keyid and validity of signature
+             */
+            verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+        }
+
+        /**
+         * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
+         * @param signatures List of signatures
+         * @param date Use the given date instead of the current time
+         * @returns The latest valid signature
+         */
+        function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
+
+        /**
+         * Class that represents an user ID or attribute packet and the relevant signatures.
+         */
+        class User {
+            constructor();
+
+            /**
+             * Transforms structured user data to packetlist
+             * @returns
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Signs user
+             * @param primaryKey The primary key packet
+             * @param privateKeys Decrypted private keys for signing
+             * @returns New user with new certificate signatures
+             */
+            sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
+
+            /**
+             * Checks if a given certificate of the user is revoked
+             * @param primaryKey The primary key packet
+             * @param certificate The certificate to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the certificate is revoked
+             */
+            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+            /**
+             * Verifies the user certificate
+             * @param primaryKey The primary key packet
+             * @param certificate A certificate of this user
+             * @param keys Array of keys to verify certificate signatures
+             * @param date Use the given date instead of the current time
+             * @returns status of the certificate
+             */
+            verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Verifies all user certificates
+             * @param primaryKey The primary key packet
+             * @param keys Array of keys to verify certificate signatures
+             * @param date Use the given date instead of the current time
+             * @returns List of signer's keyid and validity of signature
+             */
+            verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+            /**
+             * Verify User. Checks for existence of self signatures, revocation signatures
+             * and validity of self signature
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns Status of user
+             */
+            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Update user with new components from specified user
+             * @param user Source user to merge
+             * @param primaryKey primary key used for validation
+             * @returns
+             */
+            update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        }
+
+        /**
+         * Create signature packet
+         * @param dataToSign Contains packets to be signed
+         * @param signingKeyPacket secret key packet for signing
+         * @param signatureProperties (optional) properties to write on the signature packet before signing
+         * @param date (optional) override the creationtime of the signature
+         * @param userId (optional) user ID
+         * @returns signature packet
+         */
+        function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
+
+        /**
+         * Class that represents a subkey packet and the relevant signatures.
+         */
+        class SubKey {
+            constructor();
+
+            /**
+             * Transforms structured subkey data to packetlist
+             * @returns
+             */
+            toPacketlist(): packet.List;
+
+            /**
+             * Checks if a binding signature of a subkey is revoked
+             * @param primaryKey The primary key packet
+             * @param signature The binding signature to verify
+             * @param key, optional The key to verify the signature
+             * @param date Use the given date instead of the current time
+             * @returns True if the binding signature is revoked
+             */
+            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+            /**
+             * Verify subkey. Checks for revocation signatures, expiration time
+             * and valid binding signature
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns The status of the subkey
+             */
+            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+            /**
+             * Returns the expiration time of the subkey or Infinity if key does not expire
+             * Returns null if the subkey is invalid.
+             * @param primaryKey The primary key packet
+             * @param date Use the given date instead of the current time
+             * @returns
+             */
+            getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+            /**
+             * Update subkey with new components from specified subkey
+             * @param subKey Source subkey to merge
+             * @param primaryKey primary key used for validation
+             * @returns
+             */
+            update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+            /**
+             * Revokes the subkey
+             * @param primaryKey decrypted private primary key for revocation
+             * @param reasonForRevocation optional, object indicating the reason for revocation
+             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+             * @param reasonForRevocation.string optional, string explaining the reason for revocation
+             * @param date optional, override the creationtime of the revocation signature
+             * @returns new subkey with revocation signature
+             */
+            revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+        }
+
+        /**
+         * Reads an unarmored OpenPGP key list and returns one or multiple key objects
+         * @param data to be parsed
+         * @returns result object with key and error arrays
+         */
+        function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
+
+        interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
+
+        /**
+         * Reads an OpenPGP armored text and returns one or multiple key objects
+         * @param armoredText text to be parsed
+         * @returns result object with key and error arrays
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
+
+        /**
+         * Generates a new OpenPGP key. Supports RSA and ECC keys.
+         * Primary and subkey will be of same type.
+         * @param options.keyType To indicate what type of key to make.
+         *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
+         * @param options.numBits number of bits for the key creation.
+         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+         *        If array is used, the first userId is set as primary user Id
+         * @param options.passphrase The passphrase used to encrypt the resulting private key
+         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+         * @param curve (optional) elliptic curve for ECC keys
+         * @param date Override the creation date of the key and the key signatures
+         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         * @returns
+         */
+        function generate(options: KeyOptions): Promise<Key>;
+
+        /**
+         * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
+         * @param options.privateKey The private key to reformat
+         * @param options.keyType
+         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+         *        If array is used, the first userId is set as primary user Id
+         * @param options.passphrase The passphrase used to encrypt the resulting private key
+         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+         * @param date Override the creation date of the key and the key signatures
+         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         * @returns
+         */
+        function reformat(date: Date, subkeys: any[]): Promise<Key>;
+
+        /**
+         * Checks if a given certificate or binding signature is revoked
+         * @param primaryKey The primary key packet
+         * @param dataToVerify The data to check
+         * @param revocations The revocation signatures to check
+         * @param signature The certificate or signature to check
+         * @param key, optional The key packet to check the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the signature revokes the data
+         */
+        function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
+         * and throw error if found
+         * @param signature The certificate or signature to check
+         * @param keyId Check only certificates or signatures from a certain issuer key ID
+         */
+        function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
+
+        /**
+         * Returns the preferred signature hash algorithm of a key
+         * @param key (optional) the key to get preferences from
+         * @param keyPacket key packet used for signing
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID
+         * @returns
+         */
+        function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+
+        /**
+         * Returns the preferred symmetric/aead algorithm for a set of keys
+         * @param {symmetric | aead} type Type of preference to return
+         * @param keys Set of keys
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userIds (optional) user IDs
+         * @returns Preferred symmetric algorithm
+         */
+        function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+
+        /**
+         * Returns whether aead is supported by all keys in the set
+         * @param keys Set of keys
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userIds (optional) user IDs
+         * @returns
+         */
+        function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+    }
+
+    interface revoke_reasonForRevocation {
+        /**
+         * optional, flag indicating the reason for revocation
+         */
+        flag: enums.reasonForRevocation;
+        /**
+         * optional, string explaining the reason for revocation
+         */
+        string: string;
+    }
+
+    /**
+     * Class that represents an user ID or attribute packet and the relevant signatures.
+     */
+    class User {
+        constructor();
+
+        /**
+         * Transforms structured user data to packetlist
+         * @returns
+         */
+        toPacketlist(): packet.List;
+
+        /**
+         * Signs user
+         * @param primaryKey The primary key packet
+         * @param privateKeys Decrypted private keys for signing
+         * @returns New user with new certificate signatures
+         */
+        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+
+        /**
+         * Checks if a given certificate of the user is revoked
+         * @param primaryKey The primary key packet
+         * @param certificate The certificate to verify
+         * @param key, optional The key to verify the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the certificate is revoked
+         */
+        isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Verifies the user certificate
+         * @param primaryKey The primary key packet
+         * @param certificate A certificate of this user
+         * @param keys Array of keys to verify certificate signatures
+         * @param date Use the given date instead of the current time
+         * @returns status of the certificate
+         */
+        verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Verifies all user certificates
+         * @param primaryKey The primary key packet
+         * @param keys Array of keys to verify certificate signatures
+         * @param date Use the given date instead of the current time
+         * @returns List of signer's keyid and validity of signature
+         */
+        verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verify User. Checks for existence of self signatures, revocation signatures
+         * and validity of self signature
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns Status of user
+         */
+        verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Update user with new components from specified user
+         * @param user Source user to merge
+         * @param primaryKey primary key used for validation
+         * @returns
+         */
+        update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+    }
+
+    /**
+     * Class that represents a subkey packet and the relevant signatures.
+     */
+    class SubKey {
+        constructor();
+
+        /**
+         * Transforms structured subkey data to packetlist
+         * @returns
+         */
+        toPacketlist(): packet.List;
+
+        /**
+         * Checks if a binding signature of a subkey is revoked
+         * @param primaryKey The primary key packet
+         * @param signature The binding signature to verify
+         * @param key, optional The key to verify the signature
+         * @param date Use the given date instead of the current time
+         * @returns True if the binding signature is revoked
+         */
+        isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+        /**
+         * Verify subkey. Checks for revocation signatures, expiration time
+         * and valid binding signature
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns The status of the subkey
+         */
+        verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+        /**
+         * Returns the expiration time of the subkey or Infinity if key does not expire
+         * Returns null if the subkey is invalid.
+         * @param primaryKey The primary key packet
+         * @param date Use the given date instead of the current time
+         * @returns
+         */
+        getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+        /**
+         * Update subkey with new components from specified subkey
+         * @param subKey Source subkey to merge
+         * @param primaryKey primary key used for validation
+         * @returns
+         */
+        update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+        /**
+         * Revokes the subkey
+         * @param primaryKey decrypted private primary key for revocation
+         * @param reasonForRevocation optional, object indicating the reason for revocation
+         * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+         * @param reasonForRevocation.string optional, string explaining the reason for revocation
+         * @param date optional, override the creationtime of the revocation signature
+         * @returns new subkey with revocation signature
+         */
+        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+    }
+
+    /**
+     * @see module:keyring/keyring
+     * @see module:keyring/localstore
+     */
+    namespace keyring {
+        namespace keyring {
+            class Keyring {
+                /**
+                 * Initialization routine for the keyring.
+                 * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
+                 */
+                constructor(storeHandler?: localstore.LocalStore);
+
+                /**
+                 * Calls the storeHandler to load the keys
+                 */
+                load(): void;
+
+                /**
+                 * Calls the storeHandler to save the keys
+                 */
+                store(): void;
+
+                /**
+                 * Clear the keyring - erase all the keys
+                 */
+                clear(): void;
+
+                /**
+                 * Searches the keyring for keys having the specified key id
+                 * @param keyId provided as string of lowercase hex number
+                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+                 * @param deep if true search also in subkeys
+                 * @returns keys found or null
+                 */
+                getKeysForId(keyId: string, deep: boolean): any[] | null;
+
+                /**
+                 * Removes keys having the specified key id from the keyring
+                 * @param keyId provided as string of lowercase hex number
+                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+                 * @returns keys found or null
+                 */
+                removeKeysForId(keyId: string): any[] | null;
+
+                /**
+                 * Get all public and private keys
+                 * @returns all keys
+                 */
+                getAllKeys(): any[];
+            }
+
+            /**
+             * Array of keys
+             * @param keys The keys to store in this array
+             */
+            function KeyArray(keys: any[]): void;
+        }
+
+        namespace localstore {
+            class LocalStore {
+                /**
+                 * The class that deals with storage of the keyring.
+                 * Currently the only option is to use HTML5 local storage.
+                 * @param prefix prefix for itemnames in localstore
+                 */
+                constructor(prefix: string);
+
+                /**
+                 * Load the public keys from HTML5 local storage.
+                 * @returns array of keys retrieved from localstore
+                 */
+                loadPublic(): any[];
+
+                /**
+                 * Load the private keys from HTML5 local storage.
+                 * @returns array of keys retrieved from localstore
+                 */
+                loadPrivate(): any[];
+
+                /**
+                 * Saves the current state of the public keys to HTML5 local storage.
+                 * The key array gets stringified using JSON
+                 * @param keys array of keys to save in localstore
+                 */
+                storePublic(keys: any[]): void;
+
+                /**
+                 * Saves the current state of the private keys to HTML5 local storage.
+                 * The key array gets stringified using JSON
+                 * @param keys array of keys to save in localstore
+                 */
+                storePrivate(keys: any[]): void;
+            }
+        }
+    }
+
+    class LocalStore {
+        /**
+         * The class that deals with storage of the keyring.
+         * Currently the only option is to use HTML5 local storage.
+         * @param prefix prefix for itemnames in localstore
+         */
+        constructor(prefix: string);
+
+        /**
+         * Load the public keys from HTML5 local storage.
+         * @returns array of keys retrieved from localstore
+         */
+        loadPublic(): any[];
+
+        /**
+         * Load the private keys from HTML5 local storage.
+         * @returns array of keys retrieved from localstore
+         */
+        loadPrivate(): any[];
+
+        /**
+         * Saves the current state of the public keys to HTML5 local storage.
+         * The key array gets stringified using JSON
+         * @param keys array of keys to save in localstore
+         */
+        storePublic(keys: any[]): void;
+
+        /**
+         * Saves the current state of the private keys to HTML5 local storage.
+         * The key array gets stringified using JSON
+         * @param keys array of keys to save in localstore
+         */
+        storePrivate(keys: any[]): void;
+    }
+
+    namespace message {
+        /**
+         * Class that represents an OpenPGP message.
+         * Can be an encrypted message, signed message, compressed message or literal message
+         */
+        class Message {
+            packets: packet.List;
+
+            /**
+             * @param packetlist The packets that form this message
+             *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Returns the key IDs of the keys to which the session key is encrypted
+             * @returns array of keyid objects
+             */
+            getEncryptionKeyIds(): any[];
+
+            /**
+             * Returns the key IDs of the keys that signed the message
+             * @returns array of keyid objects
+             */
+            getSigningKeyIds(): any[];
+
+            /**
+             * Decrypt the message. Either a private key, a session key, or a password must be specified.
+             * @param privateKeys (optional) private keys with decrypted secret data
+             * @param passwords (optional) passwords used to decrypt
+             * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+             * @param streaming (optional) whether to process data as a stream
+             * @returns new message with decrypted content
+             */
+            decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
+
+            /**
+             * Decrypt encrypted session keys either with private keys or passwords.
+             * @param privateKeys (optional) private keys with decrypted secret data
+             * @param passwords (optional) passwords used to decrypt
+             * @returns array of object with potential sessionKey, algorithm pairs
+             */
+            decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
+
+            /**
+             * Get literal data that is the body of the message
+             * @returns literal body of the message as Uint8Array
+             */
+            getLiteralData(): Uint8Array | null;
+
+            /**
+             * Get filename from literal data packet
+             * @returns filename of literal data packet as string
+             */
+            getFilename(): string | null;
+
+            /**
+             * Get literal data as text
+             * @returns literal body of the message interpreted as text
+             */
+            getText(): string | null;
+
+            /**
+             * Encrypt the message either with public keys, passwords, or both at once.
+             * @param keys (optional) public key(s) for message encryption
+             * @param passwords (optional) password(s) for message encryption
+             * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+             * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+             * @param date (optional) override the creation date of the literal package
+             * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+             * @param streaming (optional) whether to process data as a stream
+             * @returns new message with encrypted content
+             */
+            encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
+
+            /**
+             * Sign the message (the literal data packet of the message)
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature to add to the message
+             * @param date (optional) override the creation time of the signature
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new message with signed content
+             */
+            sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
+
+            /**
+             * Compresses the message (the literal and -if signed- signature data packets of the message)
+             * @param compression compression algorithm to be used
+             * @returns new message with compressed content
+             */
+            compress(compression: enums.compression): Message;
+
+            /**
+             * Create a detached signature for the message (the literal data packet of the message)
+             * @param privateKeys private keys with decrypted secret key data for signing
+             * @param signature (optional) any existing detached signature
+             * @param date (optional) override the creation time of the signature
+             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+             * @returns new detached signature of message content
+             */
+            signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
+
+            /**
+             * Verify message signatures
+             * @param keys array of keys to verify signatures
+             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @param streaming (optional) whether to process data as a stream
+             * @returns list of signer's keyid and validity of signature
+             */
+            verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
+
+            /**
+             * Verify detached message signature
+             * @param keys array of keys to verify signatures
+             * @param signature
+             * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+             * @returns list of signer's keyid and validity of signature
+             */
+            verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
+
+            /**
+             * Unwrap compressed message
+             * @returns message Content of compressed message
+             */
+            unwrapCompressed(): Message;
+
+            /**
+             * Append signature to unencrypted message object
+             * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
+             */
+            appendSignature(detachedSignature: string | Uint8Array): void;
+
+            /**
+             * Returns ASCII armored text of message
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+        }
+
+        /**
+         * Encrypt a session key either with public keys, passwords, or both at once.
+         * @param sessionKey session key for encryption
+         * @param symAlgo session key algorithm
+         * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
+         * @param publicKeys (optional) public key(s) for message encryption
+         * @param passwords (optional) for message encryption
+         * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+         * @param date (optional) override the date
+         * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         * @returns new message with encrypted content
+         */
+        function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+
+        /**
+         * Create signature packets for the message
+         * @param literalDataPacket the literal data packet to sign
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature to append
+         * @param date (optional) override the creationtime of the signature
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns list of signature packets
+         */
+        function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+
+        /**
+         * Create object containing signer's keyid and validity of signature
+         * @param signature signature packets
+         * @param literalDataList array of literal data packets
+         * @param keys array of keys to verify signatures
+         * @param date Verify the signature against the given date,
+         *        i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Create list of objects containing signer's keyid and validity of signature
+         * @param signatureList array of signature packets
+         * @param literalDataList array of literal data packets
+         * @param keys array of keys to verify signatures
+         * @param date Verify the signature against the given date,
+         *        i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * reads an OpenPGP armored message and returns a message object
+         * @param armoredText text to be parsed
+         * @returns new message object
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+
+        /**
+         * reads an OpenPGP message as byte array and returns a message object
+         * @param input binary message
+         * @param fromStream whether the message was created from a Stream
+         * @returns new message object
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+
+        /**
+         * creates new message object from text
+         * @param text
+         * @param filename (optional)
+         * @param date (optional)
+         * @param {utf8 | binary | text | mime} type (optional) data packet type
+         * @returns new message object
+         */
+        function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
+
+        /**
+         * creates new message object from binary data
+         * @param bytes
+         * @param filename (optional)
+         * @param date (optional)
+         * @param {utf8 | binary | text | mime} type (optional) data packet type
+         * @returns new message object
+         */
+        function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
+    }
+
+    interface revokeKey_reasonForRevocation {
+        /**
+         * (optional) flag indicating the reason for revocation
+         */
+        flag: enums.reasonForRevocation;
+        /**
+         * (optional) string explaining the reason for revocation
+         */
+        string: string;
+    }
+
+    /**
+     * @see module:packet/all_packets
+     * @see module:packet/clone
+     * @see module:packet.List
+     */
+    namespace packet {
+        /**
+         * Allocate a new packet
+         * @param tag property name from {@link module:enums.packet}
+         * @returns new packet object with type based on tag
+         */
+        function newPacketFromTag(tag: string): object;
+
+        /**
+         * Allocate a new packet from structured packet clone
+         * @see
+         * @param packetClone packet clone
+         * @returns new packet object with data from packet clone
+         */
+        function fromStructuredClone(packetClone: object): object;
+
+        class Compressed {
+            /**
+             * Implementation of the Compressed Data Packet (Tag 8)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
+             * The Compressed Data packet contains compressed data.  Typically,
+             * this packet is found as the contents of an encrypted packet, or following
+             * a Signature or One-Pass Signature packet, and contains a literal data packet.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * List of packets
+             */
+            packets: List;
+
+            /**
+             * Compression algorithm
+             * @type {compression}
+             */
+            algorithm: any;
+
+            /**
+             * Compressed packet data
+             */
+            compressed: Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Parsing function for the packet.
+             * @param bytes Payload of a tag 8 packet
+             */
+            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Return the compressed packet.
+             * @returns binary compressed packet
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Decompression method for decompressing the compressed data
+             * read by read_packet
+             */
+            decompress(): void;
+
+            /**
+             * Compress the packet data (member decompressedData)
+             */
+            compress(): void;
+        }
+
+        class Literal {
+            /**
+             * Implementation of the Literal Data Packet (Tag 11)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
+             * A Literal Data packet contains the body of a message; data that is not to be
+             * further interpreted.
+             * @param date the creation date of the literal package
+             */
+            constructor(date: Date);
+
+            /**
+             * Set the packet data to a javascript native string, end of line
+             * will be normalized to \r\n and by default text is converted to UTF8
+             * @param text Any native javascript string
+             * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
+             */
+            setText(text: string | ReadableStream<String>, format: any): void;
+
+            /**
+             * Returns literal data packets as native JavaScript string
+             * with normalized end of line to \n
+             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+             * @returns literal data as text
+             */
+            getText(clone: boolean): string | ReadableStream<String>;
+
+            /**
+             * Set the packet data to value represented by the provided string of bytes.
+             * @param bytes The string of bytes
+             * @param {utf8 | binary | text | mime} format The format of the string of bytes
+             */
+            setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
+
+            /**
+             * Get the byte sequence representing the literal packet data
+             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+             * @returns A sequence of bytes
+             */
+            getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Sets the filename of the literal packet data
+             * @param filename Any native javascript string
+             */
+            setFilename(filename: string): void;
+
+            /**
+             * Get the filename of the literal packet data
+             * @returns filename
+             */
+            getFilename(): string;
+
+            /**
+             * Parsing function for a literal data packet (tag 11).
+             * @param input Payload of a tag 11 packet
+             * @returns object representation
+             */
+            read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
+
+            /**
+             * Creates a string representation of the packet
+             * @returns Uint8Array representation of the packet
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+        }
+
+        class Marker {
+            /**
+             * Implementation of the strange "Marker packet" (Tag 10)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
+             * An experimental version of PGP used this packet as the Literal
+             * packet, but no released version of PGP generated Literal packets with this
+             * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
+             * the Marker packet.
+             * Such a packet MUST be ignored when received.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a literal data packet (tag 10).
+             * @param input Payload of a tag 10 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: string, position: Integer, len: Integer): Marker;
+        }
+
+        class OnePassSignature {
+            /**
+             * Implementation of the One-Pass Signature Packets (Tag 4)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
+             * The One-Pass Signature packet precedes the signed data and contains
+             * enough information to allow the receiver to begin calculating any
+             * hashes needed to verify the signature.  It allows the Signature
+             * packet to be placed at the end of the message, so that the signer
+             * can compute the entire signed message in one pass.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * A one-octet version number.  The current version is 3.
+             */
+            version: any;
+
+            /**
+             * A one-octet signature type.
+             * Signature types are described in
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
+             */
+            signatureType: any;
+
+            /**
+             * A one-octet number describing the hash algorithm used.
+             * @see
+             */
+            hashAlgorithm: any;
+
+            /**
+             * A one-octet number describing the public-key algorithm used.
+             * @see
+             */
+            publicKeyAlgorithm: any;
+
+            /**
+             * An eight-octet number holding the Key ID of the signing key.
+             */
+            issuerKeyId: any;
+
+            /**
+             * A one-octet number holding a flag showing whether the signature is nested.
+             * A zero value indicates that the next packet is another One-Pass Signature packet
+             * that describes another signature to be applied to the same message data.
+             */
+            flags: any;
+
+            /**
+             * parsing function for a one-pass signature packet (tag 4).
+             * @param bytes payload of a tag 4 packet
+             * @returns object representation
+             */
+            read(bytes: Uint8Array): OnePassSignature;
+
+            /**
+             * creates a string representation of a one-pass signature packet
+             * @returns a Uint8Array representation of a one-pass signature packet
+             */
+            write(): Uint8Array;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class List {
+            /**
+             * This class represents a list of openpgp packets.
+             * Take care when iterating over it - the packets themselves
+             * are stored as numerical indices.
+             */
+            constructor();
+
+            /**
+             * The number of packets contained within the list.
+             */
+            readonly length: Integer;
+
+            /**
+             * Reads a stream of binary data and interprents it as a list of packets.
+             * @param A Uint8Array of bytes.
+             */
+            read(A: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Creates a binary representation of openpgp objects contained within the
+             * class instance.
+             * @returns A Uint8Array containing valid openpgp packets.
+             */
+            write(): Uint8Array;
+
+            /**
+             * Adds a packet to the list. This is the only supported method of doing so;
+             * writing to packetlist[i] directly will result in an error.
+             * @param packet Packet to push
+             */
+            push(packet: object): void;
+
+            /**
+             * Creates a new PacketList with all packets from the given types
+             */
+            filterByTag(): void;
+
+            /**
+             * Traverses packet tree and returns first matching packet
+             * @param type The packet type
+             * @returns
+             */
+            findPacket(type: enums.packet): List | undefined;
+
+            /**
+             * Returns array of found indices by tag
+             */
+            indexOfTag(): void;
+
+            /**
+             * Concatenates packetlist or array of packets
+             */
+            concat(): void;
+
+            /**
+             * Allocate a new packetlist from structured packetlist clone
+             * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
+             * @param packetClone packetlist clone
+             * @returns new packetlist object with data from packetlist clone
+             */
+            static fromStructuredClone(packetClone: object): object;
+        }
+
+        class PublicKey {
+            /**
+             * Implementation of the Key Material Packet (Tag 5,6,7,14)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
+             * A key material packet contains all the information about a public or
+             * private key.  There are four variants of this packet type, and two
+             * major versions.
+             * A Public-Key packet starts a series of packets that forms an OpenPGP
+             * key (sometimes called an OpenPGP certificate).
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+             * called by read_tag&lt;num&gt;
+             * @param bytes Input array to read the packet from
+             * @returns This object with attributes set by the parser
+             */
+            read(bytes: Uint8Array): object;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Same as write_private_key, but has less information because of
+             * public key.
+             * @returns OpenPGP packet body contents,
+             */
+            write(): Uint8Array;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class PublicKeyEncryptedSessionKey {
+            /**
+             * Public-Key Encrypted Session Key Packets (Tag 1)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+             * A Public-Key Encrypted Session Key packet holds the session key
+             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+             * message is encrypted with the session key, and the session key is itself
+             * encrypted and stored in the Encrypted Session Key packet(s). The
+             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+             * Session Key packet for each OpenPGP key to which the message is encrypted.
+             * The recipient of the message finds a session key that is encrypted to their
+             * public key, decrypts the session key, and then uses the session key to
+             * decrypt the message.
+             */
+            constructor();
+
+            encrypted: any[];
+
+            /**
+             * Parsing function for a publickey encrypted session key packet (tag 1).
+             * @param input Payload of a tag 1 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
+
+            /**
+             * Create a string representation of a tag 1 packet
+             * @returns The Uint8Array representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Encrypt session key packet
+             * @param key Public key
+             * @returns
+             */
+            encrypt(key: PublicKey): Promise<Boolean>;
+
+            /**
+             * Decrypts the session key (only for public key encrypted session key
+             * packets (tag 1)
+             * @param key Private key with secret params unlocked
+             * @returns
+             */
+            decrypt(key: SecretKey): Promise<Boolean>;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class PublicSubkey {
+            /**
+             * A Public-Subkey packet (tag 14) has exactly the same format as a
+             * Public-Key packet, but denotes a subkey.  One or more subkeys may be
+             * associated with a top-level key.  By convention, the top-level key
+             * provides signature services, and the subkeys provide encryption
+             * services.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+             * called by read_tag&lt;num&gt;
+             * @param bytes Input array to read the packet from
+             * @returns This object with attributes set by the parser
+             */
+            read(bytes: Uint8Array): object;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Same as write_private_key, but has less information because of
+             * public key.
+             * @returns OpenPGP packet body contents,
+             */
+            write(): Uint8Array;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SecretKey {
+            /**
+             * A Secret-Key packet contains all the information that is found in a
+             * Public-Key packet, including the public-key material, but also
+             * includes the secret-key material after all the public-key fields.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+             */
+            isEncrypted: any;
+
+            /**
+             * Internal parser for private keys as specified in
+             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+             * @param bytes Input string to read the packet from
+             */
+            read(bytes: string): void;
+
+            /**
+             * Creates an OpenPGP key packet for the given key.
+             * @returns A string of bytes containing the secret key OpenPGP packet
+             */
+            write(): string;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Encrypt the payload. By default, we use aes256 and iterated, salted string
+             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+             * and the passphrase is empty or undefined, the key will be set as not encrypted.
+             * This can be used to remove passphrase protection after calling decrypt().
+             * @param passphrase
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Decrypts the private key params which are needed to use the key.
+             * {@link module:packet.SecretKey.isDecrypted} should be false, as
+             * otherwise calls to this function will throw an error.
+             * @param passphrase The passphrase for this private key as string
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Clear private params, return to initial state
+             */
+            clearPrivateParams(): void;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+        }
+
+        class SecretSubkey {
+            /**
+             * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
+             * Key packet and has exactly the same format.
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+             */
+            isEncrypted: any;
+
+            /**
+             * Internal parser for private keys as specified in
+             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+             * @param bytes Input string to read the packet from
+             */
+            read(bytes: string): void;
+
+            /**
+             * Creates an OpenPGP key packet for the given key.
+             * @returns A string of bytes containing the secret key OpenPGP packet
+             */
+            write(): string;
+
+            /**
+             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+             * @returns
+             */
+            isDecrypted(): boolean | null;
+
+            /**
+             * Encrypt the payload. By default, we use aes256 and iterated, salted string
+             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+             * and the passphrase is empty or undefined, the key will be set as not encrypted.
+             * This can be used to remove passphrase protection after calling decrypt().
+             * @param passphrase
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Decrypts the private key params which are needed to use the key.
+             * {@link module:packet.SecretKey.isDecrypted} should be false, as
+             * otherwise calls to this function will throw an error.
+             * @param passphrase The passphrase for this private key as string
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Clear private params, return to initial state
+             */
+            clearPrivateParams(): void;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+
+            /**
+             * Packet version
+             */
+            version: Integer;
+
+            /**
+             * Key creation date.
+             */
+            created: Date;
+
+            /**
+             * Public key algorithm.
+             */
+            algorithm: string;
+
+            /**
+             * Algorithm specific params
+             */
+            params: object[];
+
+            /**
+             * Time until expiration in days (V3 only)
+             */
+            expirationTimeV3: Integer;
+
+            /**
+             * Fingerprint in lowercase hex
+             */
+            fingerprint: string;
+
+            /**
+             * Keyid
+             */
+            keyid: type.keyid.Keyid;
+
+            /**
+             * Alias of read()
+             * @see module:packet.PublicKey#read
+             */
+            readPublicKey: any;
+
+            /**
+             * Alias of write()
+             * @see module:packet.PublicKey#write
+             */
+            writePublicKey: any;
+
+            /**
+             * Write an old version packet - it's used by some of the internal routines.
+             */
+            writeOld(): void;
+
+            /**
+             * Returns the creation time of the key
+             * @returns
+             */
+            getCreationTime(): Date;
+
+            /**
+             * Calculates the key id of the key
+             * @returns A 8 byte key id
+             */
+            getKeyId(): string;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A Uint8Array containing the fingerprint
+             */
+            getFingerprintBytes(): Uint8Array;
+
+            /**
+             * Calculates the fingerprint of the key
+             * @returns A string containing the fingerprint in lowercase hex
+             */
+            getFingerprint(): string;
+
+            /**
+             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+             * @returns Whether the two keys have the same version and public key data
+             */
+            hasSameFingerprintAs(): boolean;
+
+            /**
+             * Returns algorithm information
+             * @returns An object of the form {algorithm: string, bits:int, curve:String}
+             */
+            getAlgorithmInfo(): object;
+        }
+
+        class Signature {
+            /**
+             * Implementation of the Signature Packet (Tag 2)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
+             * A Signature packet describes a binding between some public key and
+             * some data.  The most common signatures are a signature of a file or a
+             * block of text, and a signature that is a certification of a User ID.
+             * @param date the creation date of the signature
+             */
+            constructor(date: Date);
+
+            /**
+             * parsing function for a signature packet (tag 2).
+             * @param bytes payload of a tag 2 packet
+             * @param position position to start reading from the bytes string
+             * @param len length of the packet or the remaining length of bytes at position
+             * @returns object representation
+             */
+            read(bytes: string, position: Integer, len: Integer): Signature;
+
+            /**
+             * Signs provided data. This needs to be done prior to serialization.
+             * @param key private key used to sign the message.
+             * @param data Contains packets to be signed.
+             * @returns
+             */
+            sign(key: SecretKey, data: object): Promise<Boolean>;
+
+            /**
+             * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
+             * @returns subpacket data
+             */
+            write_hashed_sub_packets(): Uint8Array;
+
+            /**
+             * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
+             * @returns subpacket data
+             */
+            write_unhashed_sub_packets(): Uint8Array;
+
+            /**
+             * verifys the signature packet. Note: not signature types are implemented
+             * @param key the public key to verify the signature
+             * @param signatureType expected signature type
+             * @param data data which on the signature applies
+             * @returns True if message is verified, else false.
+             */
+            verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
+
+            /**
+             * Verifies signature expiration date
+             * @param date (optional) use the given date for verification instead of the current time
+             * @returns true if expired
+             */
+            isExpired(date: Date): boolean;
+
+            /**
+             * Returns the expiration time of the signature or Infinity if signature does not expire
+             * @returns expiration time
+             */
+            getExpirationTime(): Date;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SymEncryptedAEADProtected {
+            /**
+             * Implementation of the Symmetrically Encrypted Authenticated Encryption with
+             * Additional Data (AEAD) Protected Data Packet
+             * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
+             * AEAD Protected Data Packet
+             */
+            constructor();
+
+            /**
+             * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+             * @param bytes
+             */
+            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+            /**
+             * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+             * @returns The encrypted payload
+             */
+            write(): Uint8Array | ReadableStream<Uint8Array>;
+
+            /**
+             * Decrypt the encrypted payload.
+             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+             * @param key The session key used to encrypt the payload
+             * @param streaming Whether the top-level function will return a stream
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
+
+            /**
+             * Encrypt the packet list payload.
+             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+             * @param key The session key used to encrypt the payload
+             * @param streaming Whether the top-level function will return a stream
+             */
+            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
+
+            /**
+             * En/decrypt the payload.
+             * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
+             * @param key The session key used to en/decrypt the payload
+             * @param data The data to en/decrypt
+             * @param streaming Whether the top-level function will return a stream
+             * @returns
+             */
+            crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
+        }
+
+        class SymEncryptedIntegrityProtected {
+            /**
+             * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
+             * The Symmetrically Encrypted Integrity Protected Data packet is
+             * a variant of the Symmetrically Encrypted Data packet. It is a new feature
+             * created for OpenPGP that addresses the problem of detecting a modification to
+             * encrypted data. It is used in combination with a Modification Detection Code
+             * packet.
+             */
+            constructor();
+
+            /**
+             * The encrypted payload.
+             */
+            encrypted: any;
+
+            /**
+             * If after decrypting the packet this is set to true,
+             * a modification has been detected and thus the contents
+             * should be discarded.
+             */
+            modification: boolean;
+
+            /**
+             * Encrypt the payload in the packet.
+             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+             * @param key The key of cipher blocksize length to be used
+             * @param streaming Whether to set this.encrypted to a stream
+             * @returns
+             */
+            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+
+            /**
+             * Decrypts the encrypted data contained in the packet.
+             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+             * @param key The key of cipher blocksize length to be used
+             * @param streaming Whether to read this.encrypted as a stream
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+        }
+
+        class SymEncryptedSessionKey {
+            /**
+             * Public-Key Encrypted Session Key Packets (Tag 1)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+             * A Public-Key Encrypted Session Key packet holds the session key
+             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+             * message is encrypted with the session key, and the session key is itself
+             * encrypted and stored in the Encrypted Session Key packet(s). The
+             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+             * Session Key packet for each OpenPGP key to which the message is encrypted.
+             * The recipient of the message finds a session key that is encrypted to their
+             * public key, decrypts the session key, and then uses the session key to
+             * decrypt the message.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a symmetric encrypted session key packet (tag 3).
+             * @param input Payload of a tag 1 packet
+             * @param position Position to start reading from the input string
+             * @param len Length of the packet or the remaining length of
+             *        input at position
+             * @returns Object representation
+             */
+            read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
+
+            /**
+             * Decrypts the session key
+             * @param passphrase The passphrase in string form
+             * @returns
+             */
+            decrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Encrypts the session key
+             * @param passphrase The passphrase in string form
+             * @returns
+             */
+            encrypt(passphrase: string): Promise<Boolean>;
+
+            /**
+             * Fix custom types after cloning
+             */
+            postCloneTypeFix(): void;
+        }
+
+        class SymmetricallyEncrypted {
+            /**
+             * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
+             * The Symmetrically Encrypted Data packet contains data encrypted with a
+             * symmetric-key algorithm. When it has been decrypted, it contains other
+             * packets (usually a literal data packet or compressed data packet, but in
+             * theory other Symmetrically Encrypted Data packets or sequences of packets
+             * that form whole OpenPGP messages).
+             */
+            constructor();
+
+            /**
+             * Packet type
+             */
+            tag: enums.packet;
+
+            /**
+             * Encrypted secret-key data
+             */
+            encrypted: any;
+
+            /**
+             * Decrypted packets contained within.
+             */
+            packets: List;
+
+            /**
+             * When true, decrypt fails if message is not integrity protected
+             * @see module:config.ignore_mdc_error
+             */
+            ignore_mdc_error: any;
+
+            /**
+             * Decrypt the symmetrically-encrypted packet data
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param sessionKeyAlgorithm Symmetric key algorithm to use
+             * @param key The key of cipher blocksize length to be used
+             * @returns
+             */
+            decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+
+            /**
+             * Encrypt the symmetrically-encrypted packet data
+             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+             * @param sessionKeyAlgorithm Symmetric key algorithm to use
+             * @param key The key of cipher blocksize length to be used
+             * @returns
+             */
+            encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+        }
+
+        class Trust {
+            /**
+             * Implementation of the Trust Packet (Tag 12)
+             * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
+             * The Trust packet is used only within keyrings and is not normally
+             * exported.  Trust packets contain data that record the user's
+             * specifications of which key holders are trustworthy introducers,
+             * along with other information that implementing software uses for
+             * trust information.  The format of Trust packets is defined by a given
+             * implementation.
+             * Trust packets SHOULD NOT be emitted to output streams that are
+             * transferred to other users, and they SHOULD be ignored on any input
+             * other than local keyring files.
+             */
+            constructor();
+
+            /**
+             * Parsing function for a trust packet (tag 12).
+             * Currently not implemented as we ignore trust packets
+             * @param byptes payload of a tag 12 packet
+             */
+            read(byptes: string): void;
+        }
+
+        class UserAttribute {
+            /**
+             * Implementation of the User Attribute Packet (Tag 17)
+             * The User Attribute packet is a variation of the User ID packet.  It
+             * is capable of storing more types of data than the User ID packet,
+             * which is limited to text.  Like the User ID packet, a User Attribute
+             * packet may be certified by the key owner ("self-signed") or any other
+             * key owner who cares to certify it.  Except as noted, a User Attribute
+             * packet may be used anywhere that a User ID packet may be used.
+             * While User Attribute packets are not a required part of the OpenPGP
+             * standard, implementations SHOULD provide at least enough
+             * compatibility to properly handle a certification signature on the
+             * User Attribute packet.  A simple way to do this is by treating the
+             * User Attribute packet as a User ID packet with opaque contents, but
+             * an implementation may use any method desired.
+             */
+            constructor();
+
+            /**
+             * parsing function for a user attribute packet (tag 17).
+             * @param input payload of a tag 17 packet
+             */
+            read(input: Uint8Array): void;
+
+            /**
+             * Creates a binary representation of the user attribute packet
+             * @returns string representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Compare for equality
+             * @param usrAttr
+             * @returns true if equal
+             */
+            equals(usrAttr: UserAttribute): boolean;
+        }
+
+        class Userid {
+            /**
+             * Implementation of the User ID Packet (Tag 13)
+             * A User ID packet consists of UTF-8 text that is intended to represent
+             * the name and email address of the key holder.  By convention, it
+             * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
+             * restrictions on its content.  The packet length in the header
+             * specifies the length of the User ID.
+             */
+            constructor();
+
+            /**
+             * A string containing the user id. Usually in the form
+             * John Doe <john@example.com>
+             */
+            userid: string;
+
+            /**
+             * Parsing function for a user id packet (tag 13).
+             * @param input payload of a tag 13 packet
+             */
+            read(input: Uint8Array): void;
+
+            /**
+             * Parse userid string, e.g. 'John Doe <john@example.com>'
+             */
+            parse(): void;
+
+            /**
+             * Creates a binary representation of the user id packet
+             * @returns binary representation
+             */
+            write(): Uint8Array;
+
+            /**
+             * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
+             */
+            format(): void;
+        }
+
+        namespace all_packets {
+            /**
+             * @see module:packet.Compressed
+             */
+            var Compressed: any;
+
+            /**
+             * @see module:packet.SymEncryptedIntegrityProtected
+             */
+            var SymEncryptedIntegrityProtected: any;
+
+            /**
+             * @see module:packet.SymEncryptedAEADProtected
+             */
+            var SymEncryptedAEADProtected: any;
+
+            /**
+             * @see module:packet.PublicKeyEncryptedSessionKey
+             */
+            var PublicKeyEncryptedSessionKey: any;
+
+            /**
+             * @see module:packet.SymEncryptedSessionKey
+             */
+            var SymEncryptedSessionKey: any;
+
+            /**
+             * @see module:packet.Literal
+             */
+            var Literal: any;
+
+            /**
+             * @see module:packet.PublicKey
+             */
+            var PublicKey: any;
+
+            /**
+             * @see module:packet.SymmetricallyEncrypted
+             */
+            var SymmetricallyEncrypted: any;
+
+            /**
+             * @see module:packet.Marker
+             */
+            var Marker: any;
+
+            /**
+             * @see module:packet.PublicSubkey
+             */
+            var PublicSubkey: any;
+
+            /**
+             * @see module:packet.UserAttribute
+             */
+            var UserAttribute: any;
+
+            /**
+             * @see module:packet.OnePassSignature
+             */
+            var OnePassSignature: any;
+
+            /**
+             * @see module:packet.SecretKey
+             */
+            var SecretKey: any;
+
+            /**
+             * @see module:packet.Userid
+             */
+            var Userid: any;
+
+            /**
+             * @see module:packet.SecretSubkey
+             */
+            var SecretSubkey: any;
+
+            /**
+             * @see module:packet.Signature
+             */
+            var Signature: any;
+
+            /**
+             * @see module:packet.Trust
+             */
+            var Trust: any;
+        }
+
+        namespace clone {
+            /**
+             * Create a packetlist from the correspoding object types.
+             * @param options the object passed to and from the web worker
+             * @returns a mutated version of the options optject
+             */
+            function clonePackets(options: object): object;
+
+            /**
+             * Creates an object with the correct prototype from a corresponding packetlist.
+             * @param options the object passed to and from the web worker
+             * @param method the public api function name to be delegated to the worker
+             * @returns a mutated version of the options optject
+             */
+            function parseClonedPackets(options: object, method: string): object;
+        }
+
+        namespace packet {
+            /**
+             * Encodes a given integer of length to the openpgp length specifier to a
+             * string
+             * @param length The length to encode
+             * @returns String with openpgp length representation
+             */
+            function writeSimpleLength(length: Integer): Uint8Array;
+
+            /**
+             * Writes a packet header version 4 with the given tag_type and length to a
+             * string
+             * @param tag_type Tag type
+             * @param length Length of the payload
+             * @returns String of the header
+             */
+            function writeHeader(tag_type: Integer, length: Integer): string;
+
+            /**
+             * Writes a packet header Version 3 with the given tag_type and length to a
+             * string
+             * @param tag_type Tag type
+             * @param length Length of the payload
+             * @returns String of the header
+             */
+            function writeOldHeader(tag_type: Integer, length: Integer): string;
+
+            /**
+             * Whether the packet type supports partial lengths per RFC4880
+             * @param tag_type Tag type
+             * @returns String of the header
+             */
+            function supportsStreaming(tag_type: Integer): boolean;
+
+            /**
+             * Generic static Packet Parser function
+             * @param input Input stream as string
+             * @param callback Function to call with the parsed packet
+             * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
+             */
+            function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
+        }
+    }
+
+
+    namespace polyfills {
     }
 
     namespace signature {
-        /** Create a signature on data using the specified algorithm
-            @param hash_algo hash Algorithm to use
-            @param algo Asymmetric cipher algorithm to use
-            @param publicMPIs Public key multiprecision integers of the private key
-            @param secretMPIs Private key multiprecision integers which is used to sign the data
-            @param data Data to be signed
-        */
-        function sign(hash_algo: enums.hash, algo: enums.publicKey, publicMPIs: Array<Mpi>, secretMPIs: Array<Mpi>, data: string): Mpi;
+        /**
+         * Class that represents an OpenPGP signature.
+         */
+        class Signature {
+            /**
+             * @param packetlist The signature packets
+             */
+            constructor(packetlist: packet.List);
+
+            /**
+             * Returns ASCII armored text of signature
+             * @returns ASCII armor
+             */
+            armor(): ReadableStream<String>;
+        }
 
         /**
-            @param algo public Key algorithm
-            @param hash_algo Hash algorithm
-            @param msg_MPIs Signature multiprecision integers
-            @param publickey_MPIs Public key multiprecision integers
-            @param data Data on where the signature was computed on
+         * reads an OpenPGP armored signature and returns a signature object
+         * @param armoredText text to be parsed
+         * @returns new signature object
+         */
+        function readArmored(armoredText: string | ReadableStream<String>): Signature;
+
+        /**
+         * reads an OpenPGP signature as byte array and returns a signature object
+         * @param input binary signature
+         * @returns new signature object
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
+    }
+
+    namespace type {
+        /**
+         * Encoded symmetric key for ECDH
+         */
+        namespace ecdh_symkey {
+            class ECDHSymmetricKey {
+                constructor();
+
+                /**
+                 * Read an ECDHSymmetricKey from an Uint8Array
+                 * @param input Where to read the encoded symmetric key from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Write an ECDHSymmetricKey as an Uint8Array
+                 * @returns An array containing the value
+                 */
+                write(): Uint8Array;
+            }
+        }
+
+        /**
+         * Implementation of type KDF parameters
+         * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
+         * A key derivation function (KDF) is necessary to implement the EC
+         * encryption.  The Concatenation Key Derivation Function (Approved
+         * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
+         * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
+         */
+        namespace kdf_params {
+            class KDFParams {
+                /**
+                 * @param hash Hash algorithm
+                 * @param cipher Symmetric algorithm
+                 */
+                constructor(hash: enums.hash, cipher: enums.symmetric);
+
+                /**
+                 * Read KDFParams from an Uint8Array
+                 * @param input Where to read the KDFParams from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Write KDFParams to an Uint8Array
+                 * @returns Array with the KDFParams value
+                 */
+                write(): Uint8Array;
+            }
+        }
+
+        /**
+         * Implementation of type key id
+         * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
+         * A Key ID is an eight-octet scalar that identifies a key.
+         * Implementations SHOULD NOT assume that Key IDs are unique.  The
+         * section "Enhanced Key Formats" below describes how Key IDs are
+         * formed.
+         */
+        namespace keyid {
+            class Keyid {
+                constructor();
+
+                /**
+                 * Parsing method for a key id
+                 * @param input Input to read the key id from
+                 */
+                read(input: Uint8Array): void;
+
+                /**
+                 * Checks equality of Key ID's
+                 * @param keyid
+                 * @param matchWildcard Indicates whether to check if either keyid is a wildcard
+                 */
+                equals(keyid: Keyid, matchWildcard: boolean): void;
+            }
+        }
+
+        /**
+         * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
+         * Multiprecision integers (also called MPIs) are unsigned integers used
+         * to hold large integers such as the ones used in cryptographic
+         * calculations.
+         * An MPI consists of two pieces: a two-octet scalar that is the length
+         * of the MPI in bits followed by a string of octets that contain the
+         * actual integer.
+         */
+        namespace mpi {
+            class MPI {
+                constructor();
+
+                /**
+                 * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
+                 * @param input Payload of MPI data
+                 * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
+                 * @returns Length of data read
+                 */
+                read(input: Uint8Array, endian: string): Integer;
+
+                /**
+                 * Converts the mpi object to a bytes as specified in
+                 * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
+                 * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
+                 * @param length Length of the data part of the MPI
+                 * @returns mpi Byte representation
+                 */
+                write(endian: string, length: Integer): Uint8Array;
+            }
+        }
+
+        /**
+         * Wrapper to an OID value
+         * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
+         * The sequence of octets in the third column is the result of applying
+         * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
+         * with subsequent truncation.  The truncation removes the two fields of
+         * encoded Object Identifier.  The first omitted field is one octet
+         * representing the Object Identifier tag, and the second omitted field
+         * is the length of the Object Identifier body.  For example, the
+         * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
+         * 86 48 CE 3D 03 01 07", from which the first entry in the table above
+         * is constructed by omitting the first two octets.  Only the truncated
+         * sequence of octets is the valid representation of a curve OID.
+         */
+        namespace oid {
+            class OID {
+                constructor();
+
+                /**
+                 * Method to read an OID object
+                 * @param input Where to read the OID from
+                 * @returns Number of read bytes
+                 */
+                read(input: Uint8Array): number;
+
+                /**
+                 * Serialize an OID object
+                 * @returns Array with the serialized value the OID
+                 */
+                write(): Uint8Array;
+
+                /**
+                 * Serialize an OID object as a hex string
+                 * @returns String with the hex value of the OID
+                 */
+                toHex(): string;
+
+                /**
+                 * If a known curve object identifier, return the canonical name of the curve
+                 * @returns String with the canonical name of the curve
+                 */
+                getName(): string;
+            }
+        }
+
+        /**
+     * Implementation of the String-to-key specifier
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
+     * String-to-key (S2K) specifiers are used to convert passphrase strings
+     * into symmetric-key encryption/decryption keys.  They are used in two
+     * places, currently: to encrypt the secret part of private keys in the
+     * private keyring, and to convert passphrases to encryption keys for
+     * symmetrically encrypted messages.
+     */
+        namespace s2k {
+            class S2K {
+                constructor();
+
+                algorithm: enums.hash;
+
+                type: enums.s2k;
+
+                c: Integer;
+
+                /**
+                 * Eight bytes of salt in a binary string.
+                 */
+                salt: string;
+
+                /**
+                 * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
+                 * @param input Payload of string-to-key specifier
+                 * @returns Actual length of the object
+                 */
+                read(input: string): Integer;
+
+                /**
+                 * Serializes s2k information
+                 * @returns binary representation of s2k
+                 */
+                write(): Uint8Array;
+
+                /**
+                 * Produces a key using the specified passphrase and the defined
+                 * hashAlgorithm
+                 * @param passphrase Passphrase containing user input
+                 * @returns Produced key with a length corresponding to
+                 *          hashAlgorithm hash length
+                 */
+                produce_key(passphrase: string): Uint8Array;
+            }
+        }
+    }
+
+    /**
+     * This object contains utility functions
+     */
+    namespace util {
+        /**
+         * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+         * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+         * Also, convert ReadableStreams to MessagePorts
+         * @param obj the options object to be passed to the web worker
+         * @returns an array of binary data to be passed
+         */
+        function getTransferables(obj: object): any[];
+
+        /**
+         * Convert MessagePorts back to ReadableStreams
+         * @param obj
+         * @returns
+         */
+        function restoreStreams(obj: object): object;
+
+        /**
+         * Create hex string from a binary
+         * @param str String to convert
+         * @returns String containing the hexadecimal values
+         */
+        function str_to_hex(str: string): string;
+
+        /**
+         * Create binary string from a hex encoded string
+         * @param str Hex string to convert
+         * @returns
+         */
+        function hex_to_str(str: string): string;
+
+        /**
+         * Convert a Uint8Array to an MPI-formatted Uint8Array.
+         * Note: the output is **not** an MPI object.
+         * @see
+         * @see
+         * @param bin An array of 8-bit integers to convert
+         * @returns MPI-formatted Uint8Array
+         */
+        function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
+
+        /**
+         * Convert a Base-64 encoded string an array of 8-bit integer
+         * Note: accepts both Radix-64 and URL-safe strings
+         * @param base64 Base-64 encoded string to convert
+         * @returns An array of 8-bit integers
+         */
+        function b64_to_Uint8Array(base64: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integer to a Base-64 encoded string
+         * @param bytes An array of 8-bit integers to convert
+         * @param url If true, output is URL-safe
+         * @returns Base-64 encoded string
+         */
+        function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
+
+        /**
+         * Convert a hex string to an array of 8-bit integers
+         * @param hex A hex string to convert
+         * @returns An array of 8-bit integers
+         */
+        function hex_to_Uint8Array(hex: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integers to a hex string
+         * @param bytes Array of 8-bit integers to convert
+         * @returns Hexadecimal representation of the array
+         */
+        function Uint8Array_to_hex(bytes: Uint8Array): string;
+
+        /**
+         * Convert a string to an array of 8-bit integers
+         * @param str String to convert
+         * @returns An array of 8-bit integers
+         */
+        function str_to_Uint8Array(str: string): Uint8Array;
+
+        /**
+         * Convert an array of 8-bit integers to a string
+         * @param bytes An array of 8-bit integers to convert
+         * @returns String representation of the array
+         */
+        function Uint8Array_to_str(bytes: Uint8Array): string;
+
+        /**
+         * Convert a native javascript string to a Uint8Array of utf8 bytes
+         * @param str The string to convert
+         * @returns A valid squence of utf8 bytes
+         */
+        function encode_utf8(str: string | ReadableStream): Uint8Array | ReadableStream;
+
+        /**
+         * Convert a Uint8Array of utf8 bytes to a native javascript string
+         * @param utf8 A valid squence of utf8 bytes
+         * @returns A native javascript string
+         */
+        function decode_utf8(utf8: Uint8Array | ReadableStream): string | ReadableStream;
+
+        /**
+         * Concat a list of Uint8Arrays, Strings or Streams
+         * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+         * @param Array of Uint8Arrays/Strings/Streams to concatenate
+         * @returns Concatenated array
+         */
+        var concat: any;
+
+        /**
+         * Concat Uint8Arrays
+         * @param Array of Uint8Arrays to concatenate
+         * @returns Concatenated array
+         */
+        var concatUint8Array: any;
+
+        /**
+         * Check Uint8Array equality
+         * @param first array
+         * @param second array
+         * @returns equality
+         */
+        function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
+
+        /**
+         * Calculates a 16bit sum of a Uint8Array by adding each character
+         * codes modulus 65535
+         * @param Uint8Array to create a sum of
+         * @returns 2 bytes containing the sum of all charcodes % 65535
+         */
+        function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug(str: string): void;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_hexarray_dump(str: string): void;
+
+        /**
+         * Helper function to print a debug message. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_hexstr_dump(str: string): void;
+
+        /**
+         * Helper function to print a debug error. Debug
+         * messages are only printed if
+         * @param str String of the debug message
+         */
+        function print_debug_error(str: string): void;
+
+        /**
+         * Read a stream to the end and print it to the console when it's closed.
+         * @param str String of the debug message
+         * @param input Stream to print
+         * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+         */
+        function print_entire_stream(str: string, input: ReadableStream | Uint8Array | string, concat: Function): void;
+
+        /**
+         * If S[1] == 0, then double(S) == (S[2..128] || 0);
+         * otherwise, double(S) == (S[2..128] || 0) xor
+         * (zeros(120) || 10000111).
+         * Both OCB and EAX (through CMAC) require this function to be constant-time.
+         * @param data
+         */
+        /* Illegal function name 'double' can't be used here
+        function double(data: Uint8Array): void;
         */
-        function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: Array<Mpi>, publickey_MPIs: Array<Mpi>, data: string): boolean;
-    }
-}
 
-export namespace enums {
-    enum armor {
-        multipart_section,
-        multipart_last,
-        signed,
-        message,
-        public_key,
-        private_key
+        /**
+         * Shift a Uint8Array to the right by n bits
+         * @param array The array to shift
+         * @param bits Amount of bits to shift (MUST be smaller
+         *        than 8)
+         * @returns Resulting array.
+         */
+        function shiftRight(array: Uint8Array, bits: Integer): string;
+
+        /**
+         * Get native Web Cryptography api, only the current version of the spec.
+         * The default configuration is to use the api when available. But it can
+         * be deactivated with config.use_native
+         * @returns The SubtleCrypto api or 'undefined'
+         */
+        function getWebCrypto(): object;
+
+        /**
+         * Get native Web Cryptography api for all browsers, including legacy
+         * implementations of the spec e.g IE11 and Safari 8/9. The default
+         * configuration is to use the api when available. But it can be deactivated
+         * with config.use_native
+         * @returns The SubtleCrypto api or 'undefined'
+         */
+        function getWebCryptoAll(): object;
+
+        /**
+         * Detect Node.js runtime.
+         */
+        function detectNode(): void;
+
+        /**
+         * Get native Node.js module
+         * @param The module to require
+         * @returns The required module or 'undefined'
+         */
+        function nodeRequire(The: string): object;
+
+        /**
+         * Get native Node.js crypto api. The default configuration is to use
+         * the api when available. But it can also be deactivated with config.use_native
+         * @returns The crypto module or 'undefined'
+         */
+        function getNodeCrypto(): object;
+
+        /**
+         * Get native Node.js Buffer constructor. This should be used since
+         * Buffer is not available under browserify.
+         * @returns The Buffer constructor or 'undefined'
+         */
+        function getNodeBuffer(): Function;
+
+        /**
+         * Format user id for internal use.
+         */
+        function formatUserId(): void;
+
+        /**
+         * Parse user id.
+         */
+        function parseUserId(): void;
+
+        /**
+         * Normalize line endings to \r\n
+         */
+        function canonicalizeEOL(): void;
+
+        /**
+         * Convert line endings from canonicalized \r\n to native \n
+         */
+        function nativeEOL(): void;
+
+        /**
+         * Remove trailing spaces and tabs from each line
+         */
+        function removeTrailingSpaces(): void;
+
+        /**
+         * Encode input buffer using Z-Base32 encoding.
+         * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+         * @param data The binary data to encode
+         * @returns Binary data encoded using Z-Base32
+         */
+        function encodeZBase32(data: Uint8Array): string;
     }
 
-    enum compression {
-        uncompressed,
-        zip,
-        zlib,
-        bzip2
+    namespace wkd {
+        class WKD {
+            /**
+             * Initialize the WKD client
+             */
+            constructor();
+
+            /**
+             * Search for a public key using Web Key Directory protocol.
+             * @param options.email User's email.
+             * @param options.rawBytes Returns Uint8Array instead of parsed key.
+             * @returns The public key.
+             */
+            lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+        }
     }
 
-    enum hash {
-        md5,
-        sha1,
-        ripemd,
-        sha256,
-        sha384,
-        sha512,
-        sha224
-    }
-
-    enum packet {
-        publicKeyEncryptedSessionKey,
-        signature,
-        symEncryptedSessionKey,
-        onePassSignature,
-        secretKey,
-        publicKey,
-        secretSubkey,
-        compressed,
-        symmetricallyEncrypted,
-        marker,
-        literal,
-        trust,
-        userid,
-        publicSubkey,
-        userAttribute,
-        symEncryptedIntegrityProtected,
-        modificationDetectionCode,
-    }
-
-    enum publicKey {
-        rsa_encrypt_sign,
-        rsa_encrypt,
-        rsa_sign,
-        elgamal,
-        dsa
-    }
-
-    enum symmetric {
-        plaintext,
-        idea,
-        tripledes,
-        cast5,
-        blowfish,
-        aes128,
-        aes192,
-        aes256,
-        twofish
-    }
-
-    enum keyStatus {
-        invalid,
-        expired,
-        revoked,
-        valid,
-        no_self_cert
-    }
-
-    enum reasonForRevocation {
-      no_reason,
-      key_superseded,
-      key_compromised,
-      key_retired,
-      userid_invalid
-    }
-}
-
-export namespace key {
-    interface KeyResult {
-        keys: Array<Key>,
-        err: Array<Error>
-    }
-
-    /** Class that represents an OpenPGP key. Must contain a primary key. Can contain additional subkeys, signatures, user ids, user attributes.
+    namespace worker {
+        /**
+     * @see module:openpgp.initWorker
+     * @see module:openpgp.getWorker
+     * @see module:openpgp.destroyWorker
+     * @see module:worker/worker
      */
-    interface Key {
-        armor(): string,
-        decrypt(passphrase: string): boolean;
-        getExpirationTime(): Date;
-        getKeyIds(): Array<Keyid>;
-        getPreferredHashAlgorithm(): string;
-        getPrimaryUser(): any;
-        getUserIds(): Array<string>;
-        isPrivate(): boolean;
-        isPublic(): boolean;
-        primaryKey: packet.PublicKey;
-        toPublic(): Key;
-        update(key: Key): void;
-        verifyPrimaryKey(): enums.keyStatus;
+        namespace async_proxy {
+            class AsyncProxy {
+                /**
+                 * Initializes a new proxy and loads the web worker
+                 * @param path The path to the worker or 'openpgp.worker.js' by default
+                 * @param n number of workers to initialize if path given
+                 * @param config config The worker configuration
+                 * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
+                 */
+                constructor(path: string, n: number, config: object, worker: any[]);
+
+                /**
+                 * Message handling
+                 */
+                handleMessage(): void;
+
+                /**
+                 * Get new request ID
+                 * @returns New unique request ID
+                 */
+                getID(): Integer;
+
+                /**
+                 * Send message to worker with random data
+                 * @param size Number of bytes to send
+                 */
+                seedRandom(size: Integer): void;
+
+                /**
+                 * Terminates the workers
+                 */
+                terminate(): void;
+
+                /**
+                 * Generic proxy function that handles all commands from the public api.
+                 * @param method the public api function to be delegated to the worker thread
+                 * @param options the api function's options
+                 * @returns see the corresponding public api functions for their return types
+                 */
+                delegate(method: string, options: object): Promise<any>;
+            }
+        }
+
+        /**
+     * @see module:openpgp.initWorker
+     * @see module:openpgp.getWorker
+     * @see module:openpgp.destroyWorker
+     * @see module:worker/async_proxy
+     */
+        namespace worker {
+            /**
+             * Handle random buffer exhaustion by requesting more random bytes from the main window
+             * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+             */
+            function randomCallback(): Promise<Object>;
+
+            /**
+             * Set config from main context to worker context.
+             * @param config The openpgp configuration
+             */
+            function configure(config: object): void;
+
+            /**
+             * Seed the library with entropy gathered window.crypto.getRandomValues
+             * as this api is only avalible in the main window.
+             * @param buffer Some random bytes
+             */
+            function seedRandom(buffer: any[]): void;
+
+            /**
+             * Generic proxy function that handles all commands from the public api.
+             * @param method The public api function to be delegated to the worker thread
+             * @param options The api function's options
+             */
+            function delegate(method: string, options: object): void;
+
+            /**
+             * Respond to the main window.
+             * @param event Contains event type and data
+             */
+            function response(event: object): void;
+        }
     }
 
-    /** Generates a new OpenPGP key. Currently only supports RSA keys. Primary and subkey will be of same type.
-
-        @param options
-     */
-    function generate(options: KeyOptions): Key;
-
-    /** Reads an OpenPGP armored text and returns one or multiple key objects
-
-        @param armoredText text to be parsed
-     */
-    function readArmored(armoredText: string): Promise<KeyResult>;
-}
-
-export namespace message {
-    /** Class that represents an OpenPGP message. Can be an encrypted message, signed message, compressed message or literal message
-     */
-    interface Message {
-        /** Returns ASCII armored text of message
-         */
-        armor(): string,
-
-        /** Decrypt the message
-            @param privateKey private key with decrypted secret data
-         */
-        decrypt(privateKey: key.Key): Array<Message>,
-
-        /** Encrypt the message
-            @param keys array of keys, used to encrypt the message
-         */
-        encrypt(keys: Array<key.Key>): Array<Message>,
-
-        /** Returns the key IDs of the keys to which the session key is encrypted
-         */
-        getEncryptionKeyIds(): Array<Keyid>,
-
-        /** Get literal data that is the body of the message
-         */
-        getLiteralData(): string,
-
-        /** Returns the key IDs of the keys that signed the message
-         */
-        getSigningKeyIds(): Array<Keyid>,
-
-        /** Get literal data as text
-         */
-        getText(): string,
-
-        /** Sign the message (the literal data packet of the message)
-            @param privateKey private keys with decrypted secret key data for signing
-         */
-        sign(privateKey: Array<key.Key>): Message,
-
-        /** Unwrap compressed message
-         */
-        unwrapCompressed(): Message,
-
-        /** Verify message signatures
-            @param keys array of keys to verify signatures
-         */
-        verify(keys: Array<key.Key>): Array<Object>,
-
-        packets: {
-            write(): Uint8Array,
-        },
-    }
-
-    /** creates new message object from binary data
-        @param bytes
-     */
-    function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>): Message;
-
-    /** creates new message object from text
-        @param text
-     */
-    function fromText(text: string): Message;
-
-    /** reads an OpenPGP armored message and returns a message object
-
-        @param armoredText text to be parsed
-     */
-    function readArmored(armoredText: string): Promise<Message>;
 
     /**
-     * reads an OpenPGP message as byte array and returns a message object
-     * @param {Uint8Array} input   binary message
-     * @returns {Message}           new message object
-     * @static
+     * Set the path for the web worker script and create an instance of the async proxy
+     * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
+     * @param n number of workers to initialize
+     * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
      */
-    function read(data: Uint8Array): Promise<Message>;
-}
-
-export namespace packet {
-    interface PublicKey {
-        algorithm: enums.publicKey;
-        created: Date;
-        fingerprint: string;
-
-        getBitSize(): number;
-        getFingerprint(): string;
-        getKeyId(): Keyid;
-        read(input: string): any;
-        write(): any;
-    }
-
-    interface SecretKey extends PublicKey {
-        read(bytes: string): void;
-        write(): string;
-        clearPrivateMPIs(str_passphrase: string): boolean;
-        encrypt(passphrase: string): void;
-    }
-
-    /** Allocate a new packet from structured packet clone
-        @param packetClone packet clone
-     */
-    function fromStructuredClone(packetClone: Object): Object
-
-    /** Allocate a new packet
-        @param property name from enums.packet
-     */
-    function newPacketFromTag(tag: string): Object;
-}
-
-export namespace util {
-    /**
-     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
-     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
-     * Also, convert ReadableStreams to MessagePorts
-     * @param obj the options object to be passed to the web worker
-     * @returns an array of binary data to be passed
-     */
-    function getTransferables(obj: Object): ArrayBuffer[];
+    function initWorker(path: string, n?: number, workers?: any[]): void;
 
     /**
-     * Convert MessagePorts back to ReadableStreams
-     * @param obj
+     * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+     * @returns the async proxy or null if not initialized
+     */
+    function getWorker(): worker.async_proxy.AsyncProxy | null;
+
+    /**
+     * Cleanup the current instance of the web worker.
+     */
+    function destroyWorker(): void;
+
+    interface UserID {
+        name: string;
+        email: string;
+    }
+
+    interface KeyOptions {
+        /**
+         * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+         */
+        userIds: UserID[];
+        /**
+         * (optional) The passphrase used to encrypt the resulting private key
+         */
+        passphrase?: string;
+        /**
+         * (optional) number of bits for RSA keys: 2048 or 4096.
+         */
+        numBits?: number;
+        /**
+         * (optional) The number of seconds after the key creation time that the key expires
+         */
+        keyExpirationTime?: number;
+        /**
+         * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
+         *                                         curve25519, p256, p384, p521, secp256k1,
+         *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+         */
+        curve?: string;
+        /**
+         * (optional) override the creation date of the key and the key signatures
+         */
+        date?: Date;
+        /**
+         * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         */
+        subkeys?: { sign: true, passphrase: "string" }[];
+    }
+
+    /**
+     * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+     * @param options
+     * @returns The generated key object in the form:
+     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+     */
+    function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
+
+    /**
+     * Reformats signature packets for a key and rewraps key object.
+     * @param privateKey private key to reformat
+     * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     * @param passphrase (optional) The passphrase used to encrypt the resulting private key
+     * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+     * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
+     * @returns The generated key object in the form:
+     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+     */
+    function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
+
+    /**
+     * Revokes a key. Requires either a private key or a revocation certificate.
+     * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
+     * @param key (optional) public or private key to revoke
+     * @param revocationCertificate (optional) revocation certificate to revoke the key with
+     * @param reasonForRevocation (optional) object indicating the reason for revocation
+     * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
+     * @param reasonForRevocation.string (optional) string explaining the reason for revocation
+     * @returns The revoked key object in the form:
+     *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
+     *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
+     */
+    function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
+        privateKey: key.Key,
+        privateKeyArmored: string,
+        publicKey: key.Key,
+        publicKeyArmored: string
+    } | {
+        publicKey: key.Key,
+        publicKeyArmored: string
+    }>;
+
+    /**
+     * Unlock a private key with your passphrase.
+     * @param privateKey the private key that is to be decrypted
+     * @param passphrase the user's passphrase(s) chosen during key generation
+     * @returns the unlocked key object in the form: { key:Key }
+     */
+    function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+    /**
+     * Lock a private key with your passphrase.
+     * @param privateKey the private key that is to be decrypted
+     * @param passphrase the user's passphrase(s) chosen during key generation
+     * @returns the locked key object in the form: { key:Key }
+     */
+    function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+    interface EncryptOptions {
+        /**
+         * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
+         */
+        message: message.Message;
+        /**
+         * (optional) array of keys or single key, used to encrypt the message
+         */
+        publicKeys?: key.Key | any[];
+        /**
+         * (optional) private keys for signing. If omitted message will not be signed
+         */
+        privateKeys?: key.Key | any[];
+        /**
+         * (optional) array of passwords or a single password to encrypt the message
+         */
+        passwords?: string | any[];
+        /**
+         * (optional) session key in the form: { data:Uint8Array, algorithm:String }
+         */
+        sessionKey?: { data: Uint8Array, algorithm: string };
+        /**
+         * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+         */
+        compression?: enums.compression;
+        /**
+         * (optional) if the return values should be ascii armored or the message/signature objects
+         */
+        armor?: boolean;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) if the signature should be detached (if true, signature will be added to returned object)
+         */
+        detached?: boolean;
+        /**
+         * (optional) a detached signature to add to the encrypted message
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) if the unencrypted session key should be added to returned object
+         */
+        returnSessionKey?: boolean;
+        /**
+         * (optional) use a key ID of 0 instead of the public key IDs
+         */
+        wildcard?: boolean;
+        /**
+         * (optional) override the creation date of the message signature
+         */
+        date?: Date;
+        /**
+         * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         */
+        fromUserIds?: UserID[];
+        /**
+         * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         */
+        toUserIds?: UserID[]
+    }
+
+    interface EncryptResult {
+        data: string | ReadableStream<String>;
+        message: message.Message;
+        signature: string | ReadableStream<String> | signature.Signature;
+        sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
+    }
+
+    /**
+     * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+     * must be specified. If private keys are specified, those will be used to sign the message.
+     * @param options
+     * @returns Object containing encrypted (and optionally signed) message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          message: Message, (if `armor` was false)
+     *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
+     *          signature: Signature (if `detached` was true and `armor` was false)
+     *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
+     *          }
+     */
+    function encrypt(options: EncryptOptions): Promise<EncryptResult>;
+
+    interface DecryptOptions {
+        /**
+         * the message object with the encrypted data
+         */
+        message: message.Message;
+        /**
+         * (optional) private keys with decrypted secret key data or session key
+         */
+        privateKeys?: key.Key | key.Key[];
+        /**
+         * (optional) passwords to decrypt the message
+         */
+        passwords?: string | string[];
+        /**
+         * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+         */
+        sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
+        /**
+         * (optional) array of public keys or single key, to verify signatures
+         */
+        publicKeys?: key.Key | key.Key[];
+        /**
+         * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
+         */
+        format?: 'utf8' | 'binary';
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) detached signature for verification
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) use the given date for verification instead of the current time
+         */
+        date?: Date
+    }
+
+    interface DecryptResult {
+        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
+        filename: string,
+        signatures: {
+            keyid: type.keyid.Keyid,
+            verified: Promise<Boolean>,
+            valid: boolean
+        }[]
+    }
+
+    /**
+     * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+     * a session key or a password must be specified.
+     * @param options
+     * @returns Object containing decrypted and verified message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
+     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
+     *          filename: string,
+     *          signatures: [
+     *          {
+     *          keyid: module:type/keyid,
+     *          verified: Promise<Boolean>,
+     *          valid: boolean (if streaming was false)
+     *          }, ...
+     *          ]
+     *          }
+     */
+    function decrypt(options: DecryptOptions): Promise<DecryptResult>;
+
+    interface SignOptions {
+        /**
+         * (cleartext) message to be signed
+         */
+        message: cleartext.CleartextMessage | message.Message;
+        /**
+         * array of keys or single key with decrypted secret key data to sign cleartext
+         */
+        privateKeys: key.Key | any[];
+        /**
+         * (optional) if the return value should be ascii armored or the message object
+         */
+        armor?: boolean;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) if the return value should contain a detached signature
+         */
+        detached?: boolean;
+        /**
+         * (optional) override the creation date of the signature
+         */
+        date?: Date;
+        /**
+         *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         */
+        fromUserIds?: UserID[]
+    }
+
+    interface SignResult {
+        data: string | ReadableStream<String> | NodeStream,
+        message: message.Message,
+        signature: string | ReadableStream<String> | NodeStream | signature.Signature
+    }
+
+    /**
+     * Signs a cleartext message.
+     * @param options
+     * @returns Object containing signed message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          message: Message (if `armor` was false)
+     *          }
+     *          Or, if `detached` was true:
+     *          {
+     *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+     *          signature: Signature (if `armor` was false)
+     *          }
+     */
+    function sign(options: SignOptions): Promise<SignResult>;
+
+    interface VerifyOptions {
+        /**
+         * array of publicKeys or single key, to verify signatures
+         */
+        publicKeys: key.Key | any[];
+        /**
+         * (cleartext) message object with signatures
+         */
+        message: cleartext.CleartextMessage | message.Message;
+        /**
+         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+         */
+        streaming?: 'web' | 'node' | false;
+        /**
+         * (optional) detached signature for verification
+         */
+        signature?: signature.Signature;
+        /**
+         * (optional) use the given date for verification instead of the current time
+         */
+        date?: Date
+    }
+
+    interface VerifyResult {
+        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
+        signatures: {
+            keyid: type.keyid.Keyid,
+            verified: Promise<Boolean>,
+            valid: boolean
+        }[]
+    }
+
+    /**
+     * Verifies signatures of cleartext signed message
+     * @param options
+     * @returns Object containing verified message in the form:
+     *          {
+     *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
+     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
+     *          signatures: [
+     *          {
+     *          keyid: module:type/keyid,
+     *          verified: Promise<Boolean>,
+     *          valid: boolean (if `streaming` was false)
+     *          }, ...
+     *          ]
+     *          }
+     */
+    function verify(options: VerifyOptions): Promise<VerifyResult>;
+
+    /**
+     * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
+     * or passwords must be specified.
+     * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
+     * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
+     * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
+     * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
+     * @param passwords (optional) passwords for the message
+     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+     * @param date (optional) override the date
+     * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     * @returns the encrypted session key packets contained in a message object
+     */
+    function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
+
+    /**
+     * Decrypt symmetric session keys with a private key or password. Either a private key or
+     * a password must be specified.
+     * @param message a message object containing the encrypted session key packets
+     * @param privateKeys (optional) private keys with decrypted secret key data
+     * @param passwords (optional) passwords to decrypt the session key
+     * @returns Array of decrypted session key, algorithm pairs in form:
+     *          { data:Uint8Array, algorithm:String }
+     *          or 'undefined' if no key packets found
+     */
+    function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
+
+    /**
+     * Input validation
+     */
+    function checkString(): void;
+
+    /**
+     * Normalize parameter to an array if it is not undefined.
+     * @param param the parameter to be normalized
+     * @returns the resulting array or undefined
+     */
+    function toArray(param: object): any[] | undefined;
+
+    /**
+     * Convert data to or from Stream
+     * @param data the data to convert
+     * @param streaming (optional) whether to return a ReadableStream
+     * @returns the data in the respective format
+     */
+    function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
+
+    /**
+     * Convert object properties from Stream
+     * @param obj the data to convert
+     * @param streaming (optional) whether to return ReadableStreams
+     * @param keys (optional) which keys to return as streams, if possible
+     * @returns the data in the respective format
+     */
+    function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
+
+    /**
+     * Link result.data to the message stream for cancellation.
+     * Also, forward errors in the message to result.data.
+     * @param result the data to convert
+     * @param message message object
+     * @param erroringStream (optional) stream which either errors or gets closed without data
      * @returns
      */
-    function restoreStreams(obj: Object): Object;
+    function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream): object;
 
     /**
-     * Create hex string from a binary
-     * @param str String to convert
-     * @returns String containing the hexadecimal values
+     * Wait until signature objects have been verified
+     * @param signatures list of signatures
      */
-    function str_to_hex(str: String): String;
+    function prepareSignatures(signatures: object): void;
 
     /**
-     * Create binary string from a hex encoded string
-     * @param str Hex string to convert
-     * @returns
+     * Global error handler that logs the stack trace and rethrows a high lvl error message.
+     * @param message A human readable high level error Message
+     * @param error The internal error that caused the failure
      */
-    function hex_to_str(str: String): String;
+    function onError(message: string, error: Error): void;
 
     /**
-     * Convert a Uint8Array to an MPI-formatted Uint8Array.
-     * Note: the output is **not** an MPI object.
-     * @see
-     * @see
-     * @param bin An array of 8-bit integers to convert
-     * @returns MPI-formatted Uint8Array
+     * Check for native AEAD support and configuration by the user. Only
+     * browsers that implement the current WebCrypto specification support
+     * native GCM. Native EAX is built on CTR and CBC, which current
+     * browsers support. OCB and CFB are not natively supported.
+     * @returns If authenticated encryption should be used
      */
-    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
-
-    /**
-     * Convert a Base-64 encoded string an array of 8-bit integer
-     * Note: accepts both Radix-64 and URL-safe strings
-     * @param base64 Base-64 encoded string to convert
-     * @returns An array of 8-bit integers
-     */
-    function b64_to_Uint8Array(base64: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integer to a Base-64 encoded string
-     * @param bytes An array of 8-bit integers to convert
-     * @param url If true, output is URL-safe
-     * @returns Base-64 encoded string
-     */
-    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): String;
-
-    /**
-     * Convert a hex string to an array of 8-bit integers
-     * @param hex A hex string to convert
-     * @returns An array of 8-bit integers
-     */
-    function hex_to_Uint8Array(hex: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integers to a hex string
-     * @param bytes Array of 8-bit integers to convert
-     * @returns Hexadecimal representation of the array
-     */
-    function Uint8Array_to_hex(bytes: Uint8Array): String;
-
-    /**
-     * Convert a string to an array of 8-bit integers
-     * @param str String to convert
-     * @returns An array of 8-bit integers
-     */
-    function str_to_Uint8Array(str: String): Uint8Array;
-
-    /**
-     * Convert an array of 8-bit integers to a string
-     * @param bytes An array of 8-bit integers to convert
-     * @returns String representation of the array
-     */
-    function Uint8Array_to_str(bytes: Uint8Array): String;
-
-    /**
-     * Convert a native javascript string to a Uint8Array of utf8 bytes
-     * @param str The string to convert
-     * @returns A valid squence of utf8 bytes
-     */
-    function encode_utf8(str: String | ReadableStream): Uint8Array | ReadableStream;
-
-    /**
-     * Convert a Uint8Array of utf8 bytes to a native javascript string
-     * @param utf8 A valid squence of utf8 bytes
-     * @returns A native javascript string
-     */
-    function decode_utf8(utf8: Uint8Array | ReadableStream): String | ReadableStream;
-
-    /**
-     * Concat a list of Uint8Arrays, Strings or Streams
-     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
-     * @param Array of Uint8Arrays/Strings/Streams to concatenate
-     * @returns Concatenated array
-     */
-    var concat: any;
-
-    /**
-     * Concat Uint8Arrays
-     * @param Array of Uint8Arrays to concatenate
-     * @returns Concatenated array
-     */
-    var concatUint8Array: any;
-
-    /**
-     * Check Uint8Array equality
-     * @param first array
-     * @param second array
-     * @returns equality
-     */
-    function equalsUint8Array(first: Uint8Array, second: Uint8Array): Boolean;
-
-    /**
-     * Calculates a 16bit sum of a Uint8Array by adding each character
-     * codes modulus 65535
-     * @param Uint8Array to create a sum of
-     * @returns 2 bytes containing the sum of all charcodes % 65535
-     */
-    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug(str: String): void;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_hexarray_dump(str: String): void;
-
-    /**
-     * Helper function to print a debug message. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_hexstr_dump(str: String): void;
-
-    /**
-     * Helper function to print a debug error. Debug
-     * messages are only printed if
-     * @param str String of the debug message
-     */
-    function print_debug_error(str: String): void;
-
-    /**
-     * Read a stream to the end and print it to the console when it's closed.
-     * @param str String of the debug message
-     * @param input Stream to print
-     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
-     */
-    function print_entire_stream(str: String, input: ReadableStream | Uint8Array | String, concat: Function): void;
-
-    /**
-     * If S[1] == 0, then double(S) == (S[2..128] || 0);
-     * otherwise, double(S) == (S[2..128] || 0) xor
-     * (zeros(120) || 10000111).
-     * Both OCB and EAX (through CMAC) require this function to be constant-time.
-     * @param data
-     */
-    /* Illegal function name 'double' can't be used here
-    export function double(data: Uint8Array): void;
-    */
-
-    /**
-     * Shift a Uint8Array to the right by n bits
-     * @param array The array to shift
-     * @param bits Amount of bits to shift (MUST be smaller
-     *        than 8)
-     * @returns Resulting array.
-     */
-    function shiftRight(array: Uint8Array, bits: number): String;
-
-    /**
-     * Get native Web Cryptography api, only the current version of the spec.
-     * The default configuration is to use the api when available. But it can
-     * be deactivated with config.use_native
-     * @returns The SubtleCrypto api or 'undefined'
-     */
-    function getWebCrypto(): Object;
-
-    /**
-     * Get native Web Cryptography api for all browsers, including legacy
-     * implementations of the spec e.g IE11 and Safari 8/9. The default
-     * configuration is to use the api when available. But it can be deactivated
-     * with config.use_native
-     * @returns The SubtleCrypto api or 'undefined'
-     */
-    function getWebCryptoAll(): Object;
-
-    /**
-     * Detect Node.js runtime.
-     */
-    function detectNode(): void;
-
-    /**
-     * Get native Node.js module
-     * @param The module to require
-     * @returns The required module or 'undefined'
-     */
-    function nodeRequire(The: String): Object;
-
-    /**
-     * Get native Node.js crypto api. The default configuration is to use
-     * the api when available. But it can also be deactivated with config.use_native
-     * @returns The crypto module or 'undefined'
-     */
-    function getNodeCrypto(): Object;
-
-    /**
-     * Get native Node.js Buffer constructor. This should be used since
-     * Buffer is not available under browserify.
-     * @returns The Buffer constructor or 'undefined'
-     */
-    function getNodeBuffer(): Function;
-
-    /**
-     * Format user id for internal use.
-     */
-    function formatUserId(): void;
-
-    /**
-     * Parse user id.
-     */
-    function parseUserId(): void;
-
-    /**
-     * Normalize line endings to \r\n
-     */
-    function canonicalizeEOL(): void;
-
-    /**
-     * Convert line endings from canonicalized \r\n to native \n
-     */
-    function nativeEOL(): void;
-
-    /**
-     * Remove trailing spaces and tabs from each line
-     */
-    function removeTrailingSpaces(): void;
-
-    /**
-     * Encode input buffer using Z-Base32 encoding.
-     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
-     * @param data The binary data to encode
-     * @returns Binary data encoded using Z-Base32
-     */
-    function encodeZBase32(data: Uint8Array): String;
+    function nativeAEAD(): boolean;
 }
diff --git a/types/openpgp/ts3.2/openpgp-tests.ts b/types/openpgp/ts3.2/openpgp-tests.ts
index 9c19f87339..fc3efeeda0 100644
--- a/types/openpgp/ts3.2/openpgp-tests.ts
+++ b/types/openpgp/ts3.2/openpgp-tests.ts
@@ -1,3 +1,5 @@
+import { openpgp } from "openpgp";
+
 // Open PGP Sample codes
 
 var options: openpgp.KeyOptions = {
@@ -8,7 +10,6 @@ var options: openpgp.KeyOptions = {
     }],
     passphrase: 'super long and hard to guess secret'
 };
-
 openpgp.generateKey(options).then(function (keypair) {
     // success
     var privkey = keypair.privateKeyArmored;
@@ -38,7 +39,7 @@ openpgp.key.readArmored(spubkey)
 var sprivkey = '-----BEGIN PGP PRIVATE KEY BLOCK ... END PGP PRIVATE KEY BLOCK-----';
 var pgpMessageStr = '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----';
 
-openpgp.message.readArmored(pgpMessageStr).then(function(pgpMessage) {
+openpgp.message.readArmored(pgpMessageStr).then(function (pgpMessage) {
     const options = {
         message: pgpMessage
     };
@@ -49,11 +50,12 @@ openpgp.message.readArmored(pgpMessageStr).then(function(pgpMessage) {
     // failure
 });
 
-const promises: [Promise<openpgp.key.KeyResult>, Promise<openpgp.message.Message>] = [
+const promises: [Promise<{ keys: Array<openpgp.key.Key>, err: Array<Error> | null }>, Promise<openpgp.message.Message>] = [
     openpgp.key.readArmored(sprivkey),
     openpgp.message.readArmored(pgpMessageStr)
 ];
 
+
 Promise.all(promises).then(function (values) {
     const keyObject: openpgp.key.KeyResult = values[0];
     const pgpMessage: openpgp.message.Message = values[1];
@@ -70,7 +72,7 @@ Promise.all(promises).then(function (values) {
     // failure
 });
 
-openpgp.initWorker({ path:'openpgp.worker.js' });
+openpgp.initWorker('openpgp.worker.js');
 
 (async () => {
     let msgOptions: openpgp.EncryptOptions;
@@ -120,7 +122,7 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 
     const signed = await openpgp.sign(signOptions);
 
-    const signature = signed.signature as openpgp.Signature;
+    const signature = signed.signature as openpgp.signature.Signature;
     const message = signed.message;
 
     const verifyOptions: openpgp.VerifyOptions = {
@@ -138,34 +140,38 @@ openpgp.initWorker({ path:'openpgp.worker.js' });
 
 
 var keyoptions: openpgp.KeyOptions;
-var mpi: openpgp.crypto.Mpi;
-var mpis: Array<openpgp.crypto.Mpi>;
+var mpi: openpgp.type.mpi.MPI;
+var mpis: Array<openpgp.type.mpi.MPI>;
 
-openpgp.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
-openpgp.armor.dearmor("");
+openpgp.encoding.armor.armor(openpgp.enums.armor.message, {}, 0, 1);
+openpgp.encoding.armor.dearmor("");
 
 openpgp.cleartext.readArmored("");
 
-openpgp.crypto.generateSessionKey(openpgp.enums.symmetric.aes128);
-openpgp.crypto.getPrefixRandom(openpgp.enums.symmetric.aes128);
-openpgp.crypto.getPrivateMpiCount(openpgp.enums.symmetric.aes128);
-openpgp.crypto.publicKeyDecrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, mpi);
-openpgp.crypto.publicKeyEncrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpi);
+openpgp.crypto.crypto.generateSessionKey(openpgp.enums.symmetric.aes128);
+openpgp.crypto.crypto.getPrefixRandom(openpgp.enums.symmetric.aes128);
+// openpgp.crypto.crypto.getPrivateMpiCount(openpgp.enums.symmetric.aes128);
+openpgp.crypto.crypto.publicKeyDecrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
+openpgp.crypto.crypto.publicKeyEncrypt(openpgp.enums.publicKey.rsa_encrypt, mpis, mpi, "");
 
+openpgp.crypto
+// API update with no documentation
 openpgp.crypto.cfb.decrypt("", "", "", true);
-openpgp.crypto.cfb.encrypt("", "", "", "", true);
-openpgp.crypto.cfb.mdc({}, "", "");
+openpgp.crypto.cfb.encrypt("", "", "", true);
+// Function removed from openpgp.crypto.cfb
+// openpgp.crypto.cfb.mdc({}, "", "");
 
-openpgp.crypto.hash.digest(openpgp.enums.hash.md5, "");
+openpgp.crypto.hash.digest(openpgp.enums.hash.md5, new Uint8Array([0, 1]));
 openpgp.crypto.hash.getHashByteLength(openpgp.enums.hash.md5);
 
-openpgp.crypto.random.getRandomBigInteger(0);
+openpgp.crypto.random.getRandomBN(mpi, mpi);
 openpgp.crypto.random.getRandomBytes(0);
-openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
-openpgp.crypto.random.getSecureRandom(0, 1);
+// function removed from openpgp.crypto.random
+// openpgp.crypto.random.getRandomValues(openpgp.util.str_to_Uint8Array(""));
+// openpgp.crypto.random.getSecureRandom(0, 1);
 
-openpgp.crypto.signature.sign(openpgp.enums.hash.md5, openpgp.enums.publicKey.rsa_encrypt, mpis, mpis, "");
-openpgp.crypto.signature.verify(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, mpis, "");
+openpgp.crypto.signature.sign(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, new Uint8Array([0, 1]), new Uint8Array([0, 1]));
+openpgp.crypto.signature.verify(openpgp.enums.publicKey.rsa_encrypt, openpgp.enums.hash.md5, mpis, mpis, new Uint8Array([0, 1]), new Uint8Array([0, 1]));
 
 openpgp.key.generate(keyoptions);
 openpgp.key.readArmored("");
diff --git a/types/openpgp/ts3.2/tsconfig.json b/types/openpgp/ts3.2/tsconfig.json
index 9267c27cd0..5819fdf2ca 100644
--- a/types/openpgp/ts3.2/tsconfig.json
+++ b/types/openpgp/ts3.2/tsconfig.json
@@ -4,6 +4,7 @@
         "lib": [
             "es6", "dom"
         ],
+        "esModuleInterop": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
diff --git a/types/openpgp/tsconfig.json b/types/openpgp/tsconfig.json
index e9ff22b4ce..0f0960782b 100644
--- a/types/openpgp/tsconfig.json
+++ b/types/openpgp/tsconfig.json
@@ -6,8 +6,9 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
         "strictFunctionTypes": true,
+        "strictNullChecks": false,
+        "allowSyntheticDefaultImports": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/openpgp/tslint.json b/types/openpgp/tslint.json
index 3242154128..3db8366030 100644
--- a/types/openpgp/tslint.json
+++ b/types/openpgp/tslint.json
@@ -17,6 +17,7 @@
         "space-before-function-paren": false,
         "typedef-whitespace": false,
         "unified-signatures": false,
-        "whitespace": false
+        "whitespace": false,
+        "no-trailing-whitespace": false
     }
 }
\ No newline at end of file

From efce85a06eb4695d03064c9186cf67b1571991c5 Mon Sep 17 00:00:00 2001
From: Antoine Doubovetzky <antoined@bam.tech>
Date: Mon, 18 Mar 2019 17:05:10 +0100
Subject: [PATCH 755/924] update mui-datatables typing (#33954)

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

diff --git a/types/mui-datatables/index.d.ts b/types/mui-datatables/index.d.ts
index c177e7b50d..2b1135d60f 100644
--- a/types/mui-datatables/index.d.ts
+++ b/types/mui-datatables/index.d.ts
@@ -103,6 +103,7 @@ export interface MUIDataTableColumnOptions {
     sort?: boolean;
     searchable?: boolean;
     sortDirection?: 'asc' | 'desc';
+    print?: boolean;
     download?: boolean;
     hint?: string;
     customHeadRender?: (columnMeta: MUIDataTableCustomHeadRenderer, updateDirection: (params: any) => any) => string;
@@ -153,7 +154,7 @@ export interface MUIDataTableOptions {
     onRowsSelect?: (currentRowsSelected: any[], rowsSelected: any[]) => void;
     onRowsDelete?: (rowsDeleted: any[]) => void;
     onRowClick?: (rowData: string[], rowMeta: { dataIndex: number; rowIndex: number }) => void;
-    onCellClick?: (colData: any, cellMeta: { colIndex: number, rowIndex: number, dataIndex: number }) => void;
+    onCellClick?: (colData: any, cellMeta: { colIndex: number, rowIndex: number, dataIndex: number, event: React.MouseEvent }) => void;
     onChangePage?: (currentPage: number) => void;
     onChangeRowsPerPage?: (numberOfRows: number) => void;
     onSearchChange?: (searchText: string) => void;

From 4d4a2996c0ac4edb6571f07fef3e6ccc64950ce2 Mon Sep 17 00:00:00 2001
From: SnakeDrak <SnakeDrak@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:05:41 +0100
Subject: [PATCH 756/924] express-serve-static-core: Fix examples for send,
 json and jsonp (#33801)

---
 types/express-serve-static-core/index.d.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 773a1e065b..a6ec840ff4 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -507,8 +507,7 @@ export interface Response extends http.ServerResponse, Express.Response {
      *     res.send(new Buffer('wahoo'));
      *     res.send({ some: 'json' });
      *     res.send('<p>some html</p>');
-     *     res.send(404, 'Sorry, cant find that');
-     *     res.send(404);
+     *     res.status(404).send('Sorry, cant find that');
      */
     send: Send;
 
@@ -519,8 +518,8 @@ export interface Response extends http.ServerResponse, Express.Response {
      *
      *     res.json(null);
      *     res.json({ user: 'tj' });
-     *     res.json(500, 'oh noes!');
-     *     res.json(404, 'I dont have that');
+     *     res.status(500).json('oh noes!');
+     *     res.status(404).json('I dont have that');
      */
     json: Send;
 
@@ -531,8 +530,8 @@ export interface Response extends http.ServerResponse, Express.Response {
      *
      *     res.jsonp(null);
      *     res.jsonp({ user: 'tj' });
-     *     res.jsonp(500, 'oh noes!');
-     *     res.jsonp(404, 'I dont have that');
+     *     res.status(500).jsonp('oh noes!');
+     *     res.status(404).jsonp('I dont have that');
      */
     jsonp: Send;
 

From d44497c7ced89c0ac744ae04edc5a9961600f1af Mon Sep 17 00:00:00 2001
From: Alec Custer <acuster25@gmail.com>
Date: Mon, 18 Mar 2019 12:06:15 -0400
Subject: [PATCH 757/924] update license-checker definitions to 25.0.1 (#33927)

* update license-checker definitions to 25.0.1

* add tests for new license-checker options
---
 types/license-checker/index.d.ts              | 48 ++++++++++++++++---
 .../license-checker/license-checker-tests.ts  | 12 ++++-
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/types/license-checker/index.d.ts b/types/license-checker/index.d.ts
index 4ae2995ea0..1d28fc7fb3 100644
--- a/types/license-checker/index.d.ts
+++ b/types/license-checker/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for license-checker 15.0
+// Type definitions for license-checker 25.0
 // Project: https://github.com/davglass/license-checker
-// Definitions by: Rogier Schouten <https://github.com/rogierschouten>, Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions by: Rogier Schouten <https://github.com/rogierschouten>,
+//                 Daniel Perez Alvarez <https://github.com/unindented>,
+//                 Alec Custer <https://github.com/alechemy>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /**
@@ -28,7 +30,23 @@ export interface InitOpts {
      */
     onlyunknown?: boolean;
     /**
-     * to add a custom Format file in JSON
+     * Output in json format
+     */
+    json?: boolean;
+    /**
+     * Output in csv format
+     */
+    csv?: boolean;
+    /**
+     * Prefix column for component in csv format.
+     */
+    csvComponentPrefix?: string;
+    /**
+     * Write the data to a specific file.
+     */
+    out?: string;
+    /**
+     * To add a custom Format file in JSON
      */
     customPath?: string | ModuleInfo;
     /**
@@ -44,13 +62,29 @@ export interface InitOpts {
      */
     summary?: boolean;
     /**
-     * Fail (exit with code 1) on the first occurrence of the licenses of the comma-separated list
+     * Fail (exit with code 1) on the first occurrence of the licenses of the semicolon-separated list
      */
-    failOn?: string[];
+    failOn?: string;
     /**
-     * Use chalk to colorize the licenses member of each returned module info. Unknown licenses become red.
+     * Fail (exit with code 1) on the first occurrence of the licenses not in the semicolon-separated list
      */
-    color?: boolean;
+    onlyAllow?: string;
+    /**
+     * Restrict output to the packages (package@version) in the semicolon-separated list
+     */
+    packages?: string;
+    /**
+     * Restrict output to the packages (package@version) not in the semicolon-separated list
+     */
+    excludePackages?: string;
+    /**
+     * Restrict output to not include any package marked as private
+     */
+    excludePrivatePackages?: boolean;
+    /**
+     * Look for direct dependencies only
+     */
+    direct?: boolean;
 }
 
 /**
diff --git a/types/license-checker/license-checker-tests.ts b/types/license-checker/license-checker-tests.ts
index ab9039837f..408e6ea972 100644
--- a/types/license-checker/license-checker-tests.ts
+++ b/types/license-checker/license-checker-tests.ts
@@ -8,7 +8,17 @@ checker.init(
         production: true,
         customPath: {
             licenseText: ""
-        }
+        },
+        json: false,
+        csv: false,
+        csvComponentPrefix: "prefixColumn",
+        out: "/write/to/specific/file",
+        failOn: "impermissible;licenses",
+        onlyAllow: "permissible;licenses",
+        packages: "packages;to;check",
+        excludePackages: "packages;to;exclude",
+        excludePrivatePackages: false,
+        direct: false
     },
     (err: Error, json: checker.ModuleInfos): void => {
         if (err) {

From 0d78647f922afeb392900e3dce5a645474d5335a Mon Sep 17 00:00:00 2001
From: Andreas Bilger <ab13@0x05.net>
Date: Mon, 18 Mar 2019 17:06:48 +0100
Subject: [PATCH 758/924] qrcode: Add kanji and byte mode, extend tests
 (#33964)

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

diff --git a/types/qrcode/index.d.ts b/types/qrcode/index.d.ts
index 54d53e7b1c..817943693d 100644
--- a/types/qrcode/index.d.ts
+++ b/types/qrcode/index.d.ts
@@ -102,7 +102,7 @@ export interface QRCodeRenderersOptions extends QRCodeOptions {
 
 export interface QRCodeSegment {
     data: string;
-    mode: 'alphanumeric' | 'numeric';
+    mode: 'alphanumeric' | 'numeric' | 'kanji' | 'byte';
 }
 
 export interface QRCode {
diff --git a/types/qrcode/qrcode-tests.ts b/types/qrcode/qrcode-tests.ts
index 363367cc28..01dc9ca194 100644
--- a/types/qrcode/qrcode-tests.ts
+++ b/types/qrcode/qrcode-tests.ts
@@ -21,7 +21,9 @@ QRCode.toDataURL('some text', { version: 2 }, (err, url) => {
 
 QRCode.toDataURL([
     { data: 'ABCDEFG', mode: 'alphanumeric' },
-    { data: '0123456', mode: 'numeric' }
+    { data: '0123456', mode: 'numeric' },
+    { data: '\x87\x90', mode: 'kanji' },
+    { data: 'abc\ndef?', mode: 'byte' }
 ], (err, url) => {
     console.log(url);
 });

From e268787d2bc0a958cca0870e68be51ea54d08c4a Mon Sep 17 00:00:00 2001
From: Voxylu <42711914+Voxylu@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:07:58 +0100
Subject: [PATCH 759/924] Add `intersects` types (#33959)

* add intersects types

* Add strictFunctionTypes to true

* Add tests

* Makes the linter happy
---
 types/intersects/index.d.ts          | 323 +++++++++++++++++++++++++++
 types/intersects/intersects-tests.ts |  12 +
 types/intersects/tsconfig.json       |  16 ++
 types/intersects/tslint.json         |   1 +
 4 files changed, 352 insertions(+)
 create mode 100644 types/intersects/index.d.ts
 create mode 100644 types/intersects/intersects-tests.ts
 create mode 100644 types/intersects/tsconfig.json
 create mode 100644 types/intersects/tslint.json

diff --git a/types/intersects/index.d.ts b/types/intersects/index.d.ts
new file mode 100644
index 0000000000..1062b2fc6b
--- /dev/null
+++ b/types/intersects/index.d.ts
@@ -0,0 +1,323 @@
+// Type definitions for intersects 2.5
+// Project: https://github.com/davidfig/intersects#readme
+// Definitions by: Voxylu <https://github.com/voxylu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function boxBox(
+    x1: number,
+    y1: number,
+    w1: number,
+    h1: number,
+    x2: number,
+    y2: number,
+    w2: number,
+    h2: number
+): boolean;
+
+export function boxCircle(
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number,
+    xc: number,
+    yc: number,
+    rc: number
+): boolean;
+
+export function boxEllipse(
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number,
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number
+): boolean;
+
+export function boxLine(
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number,
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function boxPoint(
+    x1: number,
+    y1: number,
+    w1: number,
+    h1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function boxPolygon(
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number,
+    points: number[]
+): boolean;
+
+export function circleBox(
+    xc: number,
+    yc: number,
+    rc: number,
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number
+): boolean;
+
+export function circleCircle(
+    x1: number,
+    y1: number,
+    r1: number,
+    x2: number,
+    y2: number,
+    r2: number
+): boolean;
+
+export function circleEllipse(
+    xc: number,
+    yc: number,
+    rc: number,
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number
+): boolean;
+
+export function circleLine(
+    xc: number,
+    yc: number,
+    rc: number,
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function circlePoint(
+    x1: number,
+    y1: number,
+    r1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function circlePolygon(
+    xc: number,
+    yc: number,
+    rc: number,
+    points: number[]
+): boolean;
+
+export function ellipseBox(
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number,
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number
+): boolean;
+
+export function ellipseCircle(
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number,
+    xc: number,
+    yc: number,
+    rc: number
+): boolean;
+
+export function ellipseEllipse(
+    x1: number,
+    y1: number,
+    r1x: number,
+    r1y: number,
+    x2: number,
+    y2: number,
+    r2x: number,
+    r2y: number
+): boolean;
+
+export function ellipseLine(
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number,
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function ellipsePoint(
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number,
+    x1: number,
+    y1: number
+): boolean;
+
+export function ellipsePolygon(
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number,
+    points: number[]
+): boolean;
+
+export function lineBox(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number
+): boolean;
+
+export function lineCircle(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    xc: number,
+    yc: number,
+    rc: number
+): boolean;
+
+export function lineEllipse(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number
+): boolean;
+
+export function lineLine(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    x3: number,
+    y3: number,
+    x4: number,
+    y4: number
+): boolean;
+
+export function linePoint(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    xp: number,
+    yp: number,
+    tolerance: number
+): boolean;
+
+export function linePolygon(
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    points: number[],
+    tolerance: number
+): boolean;
+
+export function pointBox(
+    x1: number,
+    y1: number,
+    xb: number,
+    yb: number,
+    wb: number,
+    hb: number
+): boolean;
+
+export function pointCircle(
+    x1: number,
+    y1: number,
+    xc: number,
+    yc: number,
+    rc: number
+): boolean;
+
+export function pointEllipse(
+    x1: number,
+    y1: number,
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number
+): boolean;
+
+export function pointLine(
+    xp: number,
+    yp: number,
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number
+): boolean;
+
+export function pointPolygon(
+    x1: number,
+    y1: number,
+    points: number[],
+    tolerance: number
+): boolean;
+
+export function polygonBox(
+    points: number[],
+    x: number,
+    y: number,
+    w: number,
+    h: number
+): boolean;
+
+export function polygonCircle(
+    points: number[],
+    xc: number,
+    yc: number,
+    rc: number
+): boolean;
+
+export function polygonEllipse(
+    points: number[],
+    xe: number,
+    ye: number,
+    rex: number,
+    rey: number
+): boolean;
+
+export function polygonLine(
+    points: number[],
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    tolerance: number
+): boolean;
+
+export function polygonPoint(
+    points: number[],
+    x: number,
+    y: number,
+    tolerance: number
+): boolean;
+
+export function polygonPolygon(points1: number[], points2: number[]): boolean;
diff --git a/types/intersects/intersects-tests.ts b/types/intersects/intersects-tests.ts
new file mode 100644
index 0000000000..e39d8a08ca
--- /dev/null
+++ b/types/intersects/intersects-tests.ts
@@ -0,0 +1,12 @@
+import { polygonBox, pointLine, circleEllipse } from 'intersects';
+
+const res = polygonBox([2, 0, 4, 2, 0, 2], 1, 1, 2, 2);
+if (res) {
+    // do something
+}
+
+if (pointLine(0, 8, -5, 4, 7, 6)) {
+    // do agian something
+}
+
+const isGood = circleEllipse(0, 6, 9, 2, 4, 5, 1) ? 'yes' : 'no';
diff --git a/types/intersects/tsconfig.json b/types/intersects/tsconfig.json
new file mode 100644
index 0000000000..7c8a1b6d87
--- /dev/null
+++ b/types/intersects/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "intersects-tests.ts"]
+}
diff --git a/types/intersects/tslint.json b/types/intersects/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/intersects/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b7c3e7d3fc11afb6aab515abee242c0759bc163d Mon Sep 17 00:00:00 2001
From: delprzemo <46647622+delprzemo@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:14:16 +0100
Subject: [PATCH 760/924] new type - resolve-options (#33971)

* Added new type - resolve-options

* New type - resolve-options - fix lint smells
---
 types/resolve-options/index.d.ts              | 36 +++++++++++++++++++
 .../resolve-options/resolve-options-tests.ts  | 32 +++++++++++++++++
 types/resolve-options/tsconfig.json           | 23 ++++++++++++
 types/resolve-options/tslint.json             |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 types/resolve-options/index.d.ts
 create mode 100644 types/resolve-options/resolve-options-tests.ts
 create mode 100644 types/resolve-options/tsconfig.json
 create mode 100644 types/resolve-options/tslint.json

diff --git a/types/resolve-options/index.d.ts b/types/resolve-options/index.d.ts
new file mode 100644
index 0000000000..d2b8610011
--- /dev/null
+++ b/types/resolve-options/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for resolve-options 1.1
+// Project: https://github.com/gulpjs/resolve-options
+// Definitions by: Przemysław Struciński <https://github.com/delprzemo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+interface Options {
+    cwd?: string | ((...args: any[]) => string);
+    buffer?: boolean | ((...args: any[]) => boolean);
+    read?: boolean | ((...args: any[]) => boolean);
+    base?: string | ((...args: any[]) => string);
+    since?: Date | number | ((...args: any[]) => Date | number);
+    passthrough?: boolean | ((...args: any[]) => boolean);
+    allowEmpty?: boolean | ((...args: any[]) => boolean);
+    mode?: string | number | ((...args: any[]) => string | number);
+    dirMode?: string | number | ((...args: any[]) => string | number);
+    overwrite?: boolean | ((...args: any[]) => boolean);
+    deep?: boolean | ((...args: any[]) => boolean);
+}
+
+interface ConfigItem {
+    type: string | string[];
+    default?: any;
+}
+
+interface Resolver {
+    resolve: (key: string) => number | string | boolean | Date | undefined | null;
+}
+
+interface Config {
+    [par: string]: ConfigItem;
+}
+
+declare function createResolver(config: Config, options: Options): Resolver;
+
+export = createResolver;
diff --git a/types/resolve-options/resolve-options-tests.ts b/types/resolve-options/resolve-options-tests.ts
new file mode 100644
index 0000000000..86b28241a6
--- /dev/null
+++ b/types/resolve-options/resolve-options-tests.ts
@@ -0,0 +1,32 @@
+import resolveOptions = require("resolve-options");
+
+const config = {
+    cwd: {
+      default: "C/test",
+      type: 'string'
+    },
+    read: {
+        type: 'boolean'
+    },
+    since: {
+        type: ['date', 'number']
+    },
+    sourcemaps: {
+      default: false,
+      type: 'boolean'
+    },
+  };
+
+  const options = {
+    read() {
+        return true;
+      },
+    since: Date.now(),
+    sourcemaps: true,
+  };
+
+  const resolver = resolveOptions(config, options);
+
+  const cwd = resolver.resolve('cwd');
+  const sourcemaps = resolver.resolve('sourcemaps');
+  const read = resolver.resolve('read');
diff --git a/types/resolve-options/tsconfig.json b/types/resolve-options/tsconfig.json
new file mode 100644
index 0000000000..3d410dd3c4
--- /dev/null
+++ b/types/resolve-options/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",
+        "resolve-options-tests.ts"
+    ]
+}
diff --git a/types/resolve-options/tslint.json b/types/resolve-options/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/resolve-options/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0c5c7ca478a3034d6d11555b826e113dfadf5db8 Mon Sep 17 00:00:00 2001
From: Claas Ahlrichs <claasahl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:14:51 +0100
Subject: [PATCH 761/924] new package: bser (#33962)

* npx dts-gen -m bser --dt

* drafted types for bser-package

* dropped duplicate prototype namespaces

* drafted test cases

* npx prettier --write types\bser\**

* fixed linting issues
---
 types/bser/index.d.ts      | 100 +++++++++++++++++++++++++++++++++++++
 types/bser/test/sample1.ts |   4 ++
 types/bser/test/sample2.ts |   7 +++
 types/bser/test/sample3.ts |  16 ++++++
 types/bser/test/tests.ts   |  86 +++++++++++++++++++++++++++++++
 types/bser/tsconfig.json   |  23 +++++++++
 types/bser/tslint.json     |   1 +
 7 files changed, 237 insertions(+)
 create mode 100644 types/bser/index.d.ts
 create mode 100644 types/bser/test/sample1.ts
 create mode 100644 types/bser/test/sample2.ts
 create mode 100644 types/bser/test/sample3.ts
 create mode 100644 types/bser/test/tests.ts
 create mode 100644 types/bser/tsconfig.json
 create mode 100644 types/bser/tslint.json

diff --git a/types/bser/index.d.ts b/types/bser/index.d.ts
new file mode 100644
index 0000000000..75695d85b1
--- /dev/null
+++ b/types/bser/index.d.ts
@@ -0,0 +1,100 @@
+// Type definitions for bser 2.0
+// Project: https://facebook.github.io/watchman/docs/bser.html
+// Definitions by: Claas Ahlrichs <https://github.com/claasahl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+import Int64 = require("node-int64");
+
+export type InputWrapper =
+    | Buffer
+    | string
+    | NodeJS.TypedArray
+    | DataView
+    | ArrayBuffer
+    | SharedArrayBuffer;
+export type IntWrapper = number | Int64;
+export type AnyWrapper = boolean | IntWrapper | null | string | object;
+
+export class Accumulator {
+    buf: Buffer;
+    readOffset: number;
+    writeOffset: number;
+
+    constructor(initsize?: number);
+
+    append(buf: InputWrapper): void;
+
+    assertReadableSize(size: number): void;
+
+    peekDouble(): number;
+
+    peekInt(size: number): IntWrapper;
+
+    peekString(size: number): string;
+
+    readAdvance(size: number): void;
+
+    readAvail(): number;
+
+    readDouble(): number;
+
+    // replace "IntWrapper" with "number"?
+    readInt(bytes: number): IntWrapper;
+
+    readString(size: number): string;
+
+    reserve(size: number): void;
+
+    writeAvail(): number;
+
+    writeByte(value: number): void;
+
+    writeDouble(value: number): void;
+
+    writeInt(value: number, size: number): void;
+}
+
+export class BunserBuf extends EventEmitter {
+    buf: Accumulator;
+    state: 0 | 1;
+    // replace "IntWrapper" with "number"?
+    pduLen?: false | IntWrapper;
+
+    constructor();
+
+    append(
+        buf: InputWrapper,
+        synchronous?: false
+    ): AnyWrapper | AnyWrapper[] | undefined;
+    append(buf: InputWrapper, synchronous: true): void;
+
+    decodeAny(): AnyWrapper | AnyWrapper[];
+
+    decodeArray(): AnyWrapper[];
+
+    // replace "IntWrapper" with "number"?
+    decodeInt(relaxSizeAsserts?: boolean): false | IntWrapper;
+
+    decodeObject(): object;
+
+    decodeString(): string;
+
+    decodeTemplate(): AnyWrapper[];
+
+    expectCode(expected: number): void;
+
+    process(synchronous?: false): AnyWrapper | AnyWrapper[] | undefined;
+    process(synchronous: true): void;
+
+    processLater(): void;
+
+    raise(reason: string): void;
+}
+
+export function dumpToBuffer(val: any): Buffer;
+
+export function loadFromBuffer(input: InputWrapper): AnyWrapper | AnyWrapper[];
diff --git a/types/bser/test/sample1.ts b/types/bser/test/sample1.ts
new file mode 100644
index 0000000000..3958260c42
--- /dev/null
+++ b/types/bser/test/sample1.ts
@@ -0,0 +1,4 @@
+import * as bser from "bser";
+
+const encoded = bser.dumpToBuffer(["hello"]);
+console.log(bser.loadFromBuffer(encoded)); // ['hello']
diff --git a/types/bser/test/sample2.ts b/types/bser/test/sample2.ts
new file mode 100644
index 0000000000..2ab145626a
--- /dev/null
+++ b/types/bser/test/sample2.ts
@@ -0,0 +1,7 @@
+import * as bser from "bser";
+
+const bunser = new bser.BunserBuf();
+
+bunser.on("value", obj => {
+    console.log(obj);
+});
diff --git a/types/bser/test/sample3.ts b/types/bser/test/sample3.ts
new file mode 100644
index 0000000000..41831c4447
--- /dev/null
+++ b/types/bser/test/sample3.ts
@@ -0,0 +1,16 @@
+import * as bser from "bser";
+import net from "net";
+
+const obj = "sample data";
+const bunser = new bser.BunserBuf();
+
+bunser.on("value", obj => {
+    console.log("data from socket", obj);
+});
+
+const socket = net.connect("/socket");
+
+socket.on("data", buf => {
+    bunser.append(buf);
+});
+socket.write(bser.dumpToBuffer(obj));
diff --git a/types/bser/test/tests.ts b/types/bser/test/tests.ts
new file mode 100644
index 0000000000..2037e0517b
--- /dev/null
+++ b/types/bser/test/tests.ts
@@ -0,0 +1,86 @@
+import * as bser from "bser";
+import Int64 from "node-int64";
+import * as assert from "assert";
+
+// This is a hard-coded template representation from the C test suite
+const template =
+    "\x00\x01\x03\x28" +
+    "\x0b\x00\x03\x02\x02\x03\x04\x6e\x61\x6d\x65\x02" +
+    "\x03\x03\x61\x67\x65\x03\x03\x02\x03\x04\x66\x72" +
+    "\x65\x64\x03\x14\x02\x03\x04\x70\x65\x74\x65\x03" +
+    "\x1e\x0c\x03\x19";
+
+const val = bser.loadFromBuffer(template);
+assert.deepStrictEqual(val, [
+    { name: "fred", age: 20 },
+    { name: "pete", age: 30 },
+    { age: 25 }
+]);
+
+function roundtrip(val: any) {
+    const encoded = bser.dumpToBuffer(val);
+    const decoded = bser.loadFromBuffer(encoded);
+    assert.deepStrictEqual(decoded, val);
+}
+
+const values_to_test = [
+    1,
+    "hello",
+    1.5,
+    false,
+    true,
+    new Int64("0x0123456789abcdef"),
+    127,
+    128,
+    129,
+    32767,
+    32768,
+    32769,
+    65534,
+    65536,
+    65537,
+    2147483647,
+    2147483648,
+    2147483649,
+    null,
+    [1, 2, 3],
+    { foo: "bar" },
+    { nested: { struct: "hello", list: [true, false, 1, "string"] } }
+];
+
+for (const value of values_to_test) {
+    roundtrip(value);
+}
+roundtrip(values_to_test);
+
+// Verify Accumulator edge cases
+const acc = new bser.Accumulator(8);
+acc.append("hello");
+assert.equal(acc.readAvail(), 5);
+assert.equal(acc.readOffset, 0);
+assert.equal(acc.readString(3), "hel");
+assert.equal(acc.readOffset, 3);
+assert.equal(acc.readAvail(), 2);
+assert.equal(acc.writeAvail(), 3);
+
+// This should trigger a shunt and not make the buffer bigger
+acc.reserve(5);
+assert.equal(acc.readOffset, 0, "shunted");
+assert.equal(acc.readAvail(), 2, "still have 2 available to read");
+assert.equal(acc.writeAvail(), 6, "2 left to read out of 8 total space");
+assert.equal(acc.peekString(2), "lo", "have the correct remainder");
+
+// Don't include keys that have undefined values
+const res = bser.dumpToBuffer({ expression: undefined });
+assert.deepStrictEqual(bser.loadFromBuffer(res), {});
+
+// Dump numbers without fraction to integers
+let buffer;
+buffer = bser.dumpToBuffer(1);
+assert.equal(buffer.toString("hex"), "000105020000000301");
+buffer = bser.dumpToBuffer(1.0);
+assert.equal(buffer.toString("hex"), "000105020000000301");
+
+// Dump numbers with fraction to double
+buffer = bser.dumpToBuffer(1.1);
+assert.equal(buffer.toString("hex"), "00010509000000079a9999999999f13f");
diff --git a/types/bser/tsconfig.json b/types/bser/tsconfig.json
new file mode 100644
index 0000000000..4fb45a708a
--- /dev/null
+++ b/types/bser/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/tests.ts",
+        "test/sample1.ts",
+        "test/sample2.ts",
+        "test/sample3.ts"
+    ]
+}
diff --git a/types/bser/tslint.json b/types/bser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 927e8941861dc491281ffafd7c1aa2e07b47982c Mon Sep 17 00:00:00 2001
From: Aleksandr Terentev <alvteren@gmail.com>
Date: Mon, 18 Mar 2019 19:56:18 +0300
Subject: [PATCH 762/924] fix types for enzyme's hasClass

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

diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index 71238871c7..20e25853f9 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -88,7 +88,7 @@ export interface CommonWrapper<P = {}, S = {}, C = Component<P, S>> {
     /**
      * Returns whether or not the current node has a className prop including the passed in class name.
      */
-    hasClass(className: string): boolean;
+    hasClass(className: string | RegExp): boolean;
 
     /**
      * Returns whether or not the current node matches a provided selector.

From 587793ea00a7ca2e558acfb99e7a224ff345c535 Mon Sep 17 00:00:00 2001
From: mamachanko <sugardubz@gmail.com>
Date: Mon, 18 Mar 2019 19:38:01 +0100
Subject: [PATCH 763/924] configure blessed's screen log and/or dump

---
 types/blessed/blessed-tests.ts | 18 ++++++++++++++++++
 types/blessed/index.d.ts       |  8 +++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/types/blessed/blessed-tests.ts b/types/blessed/blessed-tests.ts
index aa38af8985..00df6dbc7a 100644
--- a/types/blessed/blessed-tests.ts
+++ b/types/blessed/blessed-tests.ts
@@ -6,6 +6,24 @@ let screen: blessed.Widgets.Screen = null;
 
 // https://github.com/chjj/blessed/blob/master/test/widget-autopad.js
 
+screen = blessed.screen({
+  log: __dirname + "/logs/just-logs.log"
+});
+
+screen = blessed.screen({
+  log: __dirname + "/logs/just-logs.log",
+  dump: false
+});
+
+screen = blessed.screen({
+  dump: __dirname + "/logs/logs-and-all-in-and-output.log"
+});
+
+screen = blessed.screen({
+  log: __dirname + "/logs/logs-and-all-in-and-output.log",
+  dump: true
+});
+
 screen = blessed.screen({
   dump: __dirname + "/logs/autopad.log",
   smartCSR: true,
diff --git a/types/blessed/index.d.ts b/types/blessed/index.d.ts
index 7dae1709d2..53dbf48706 100644
--- a/types/blessed/index.d.ts
+++ b/types/blessed/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for blessed 0.1
 // Project: https://github.com/chjj/blessed
-// Definitions by: Bryn Austin Bellomy <https://github.com/brynbellomy>, Steve Kellock <https://github.com/skellock>
+// Definitions by: Bryn Austin Bellomy <https://github.com/brynbellomy>
+//                 Steve Kellock <https://github.com/skellock>
+//                 Max Brauer <https://github.com/mamachanko>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -925,12 +927,12 @@ export namespace Widgets {
         /**
          * Create a log file. See log method.
          */
-        log?(...msg: any[]): void;
+        log?: string;
 
         /**
          * Dump all output and input to desired file. Can be used together with log option if set as a boolean.
          */
-        dump?: string;
+        dump?: string | boolean;
 
         /**
          * Debug mode. Enables usage of the debug method. Also creates a debug console which will display when

From fc665e5df4265c7674162066a39a918890c5ce14 Mon Sep 17 00:00:00 2001
From: Alec Larson <alec.stanford.larson@gmail.com>
Date: Mon, 18 Mar 2019 14:45:48 -0400
Subject: [PATCH 764/924] [lolex] make TClock default to Clock

Remove the need for explicit type annotations by defaulting to "lolex.Clock"
---
 types/lolex/index.d.ts     | 12 ++++++------
 types/lolex/lolex-tests.ts |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 1a33a60c7d..5eed89d978 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -128,7 +128,7 @@ export interface LolexClock<TTimerId extends TimerId> extends GlobalTimers<TTime
 
     /**
      * Queues the callback to be fired during idle periods to perform background and low priority work on the main event loop.
-     * 
+     *
      * @param callback   Callback to be fired.
      * @param timeout   The maximum number of ticks before the callback must be fired.
      * @remarks Callbacks which have a timeout option will be fired no later than time in milliseconds.
@@ -256,7 +256,7 @@ type InstalledMethods = {
  *
  * @type TClock   type of base clock (e.g BrowserClock).
  */
-type InstalledClock<TClock extends Clock> = TClock & InstalledMethods;
+type InstalledClock<TClock extends Clock = Clock> = TClock & InstalledMethods;
 
 /**
  * Creates a clock.
@@ -268,7 +268,7 @@ type InstalledClock<TClock extends Clock> = TClock & InstalledMethods;
  * @type TClock   Type of clock to create.
  * @remarks The default epoch is 0.
  */
-export declare function createClock<TClock extends Clock>(now?: number | Date, loopLimit?: number): TClock;
+export declare function createClock<TClock extends Clock = Clock>(now?: number | Date, loopLimit?: number): TClock;
 
 export interface LolexInstallOpts {
     /**
@@ -312,12 +312,12 @@ export interface LolexInstallOpts {
  * @param toFake   Names of methods that should be faked.
  * @type TClock   Type of clock to create.
  */
-export declare function install<TClock extends Clock>(opts?: LolexInstallOpts): InstalledClock<TClock>;
+export declare function install<TClock extends Clock = Clock>(opts?: LolexInstallOpts): InstalledClock<TClock>;
 
 export interface LolexWithContext {
     timers: GlobalTimers<TimerId>;
-    createClock: <TClock extends Clock>(now?: number | Date, loopLimit?: number) => TClock;
-    install: <TClock extends Clock>(opts?: LolexInstallOpts) => InstalledClock<TClock>;
+    createClock: <TClock extends Clock = Clock>(now?: number | Date, loopLimit?: number) => TClock;
+    install: <TClock extends Clock = Clock>(opts?: LolexInstallOpts) => InstalledClock<TClock>;
     withGlobal: (global: Object) => LolexWithContext;
 }
 
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index d09cfcc042..f808283e5b 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -138,3 +138,8 @@ nodeInstalledClock.uninstall();
 // Clocks should be typed to have unbound method signatures that can be passed around
 const { clearTimeout } = browserClock;
 clearTimeout(0);
+
+// TClock of InstalledClock<TClock> is optional.
+let installedClock: lolex.InstalledClock;
+installedClock = nodeInstalledClock;
+installedClock = browserInstalledClock;

From a50f818644109f3890c22e0ef5e33015038c3b71 Mon Sep 17 00:00:00 2001
From: Alec Larson <alec.stanford.larson@gmail.com>
Date: Mon, 18 Mar 2019 14:57:53 -0400
Subject: [PATCH 765/924] [lolex] set minimum version to 2.3

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

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 5eed89d978..703b0b9809 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -5,6 +5,7 @@
 //                 Rogier Schouten <https://github.com/rogierschouten>
 //                 Yishai Zehavi <https://github.com/zyishai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /**
  * Names of clock methods that may be faked by install.

From 72c711715ae94a1492d78d821aa03e9db1cbc610 Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Mon, 18 Mar 2019 14:22:58 -0500
Subject: [PATCH 766/924] 2.2.1

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index b87a9f5f56..008ce67def 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for parse 2.1.0
+// Type definitions for parse 2.2.1
 // Project: https://parseplatform.org/
 // Definitions by:  Ullisen Media Group <http://ullisenmedia.com>
 //                  David Poetzsch-Heffter <https://github.com/dpoetzsch>
@@ -8,6 +8,7 @@
 //                  Otherwise SAS <https://github.com/owsas>
 //                  Andrew Goldis <https://github.com/agoldis>
 //                  Alexandre Hétu Rivard <https://github.com/AlexandreHetu>
+//                  Diamond Lewis <https://github.com/dplewis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -959,6 +960,22 @@ subscription.on('close', () => {});
      */
     function setAsyncStorage(AsyncStorage: any): void;
 
+    /**
+     * Gets all contents from Local Datastore.
+     */
+    function dumpLocalDatastore(): any;
+
+    /**
+     * Enable pinning in your application.
+     * This must be called before your application can use pinning.
+     */
+    function enableLocalDatastore(): void;
+
+    /**
+     * Flag that indicates whether Local Datastore is enabled.
+     */
+    function isLocalDatastoreEnabled(): any;
+
 }
 
 declare module "parse/node" {

From 6a77dfbc9adc6a82232010ce85749b62fd978569 Mon Sep 17 00:00:00 2001
From: Jason Walton <jwalton@benbria.ca>
Date: Mon, 18 Mar 2019 15:51:44 -0400
Subject: [PATCH 767/924] fix: Fix return type of `Document.model(str)`, and
 fix #33824.

fix #33824
---
 types/mongoose/index.d.ts    | 10 +++++-----
 types/mongoose/v4/index.d.ts |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 44f3b1111a..ac01ba61bf 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1063,8 +1063,8 @@ declare module "mongoose" {
     /** defaults to "__v" */
     versionKey?: string | boolean;
     /**
-     * By default, Mongoose will automatically 
-     * select() any populated paths. 
+     * By default, Mongoose will automatically
+     * select() any populated paths.
      * To opt out, set selectPopulatedPaths to false.
      */
     selectPopulatedPaths?: boolean;
@@ -1077,7 +1077,7 @@ declare module "mongoose" {
     /**
      * Validation errors in a single nested schema are reported
      * both on the child and on the parent schema.
-     * Set storeSubdocValidationError to false on the child schema 
+     * Set storeSubdocValidationError to false on the child schema
      * to make Mongoose only report the parent error.
      */
     storeSubdocValidationError?: boolean;
@@ -2931,7 +2931,7 @@ declare module "mongoose" {
     findById(id: any | string | number, projection: any, options: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T> & QueryHelpers;
 
-    model(name: string): Model<T>;
+    model<U extends Document>(name: string): Model<U>;
 
     /**
      * Creates a Query and specifies a $where condition.
@@ -3306,7 +3306,7 @@ declare module "mongoose" {
      * Returns another Model instance.
      * @param name model name
      */
-    model(name: string): Model<this>;
+    model<T extends Document>(name: string): Model<T>;
 
     /** Override whether mongoose thinks this doc is deleted or not */
     isDeleted(isDeleted: boolean): void;
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 981c6dd356..855ac5ae40 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -2461,7 +2461,7 @@ declare module "mongoose" {
     findById(id: any | string | number, projection: any, options: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
 
-    model(name: string): Model<T>;
+      model<U extends Document>(name: string): Model<U>;
 
     /**
      * Creates a Query and specifies a $where condition.
@@ -2708,7 +2708,7 @@ declare module "mongoose" {
      * Returns another Model instance.
      * @param name model name
      */
-    model(name: string): Model<this>;
+    model<T extends Document>(name: string): Model<T>;
 
     /**
      * Removes this document from the db.

From d64ec0ed994f366a60f38961b576b56550960d3c Mon Sep 17 00:00:00 2001
From: James Reggio <james.reggio@gmail.com>
Date: Mon, 18 Mar 2019 15:53:42 -0700
Subject: [PATCH 768/924] [react-redux] Require explicit version of
 @types/hoist-non-react-statics (#33979)

---
 types/react-redux/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-redux/package.json b/types/react-redux/package.json
index 7f5b19d45b..e9c8c9b9f8 100644
--- a/types/react-redux/package.json
+++ b/types/react-redux/package.json
@@ -1,6 +1,7 @@
 {
     "private": true,
     "dependencies": {
+        "@types/hoist-non-react-statics": "^3.3.0",
         "redux": "^4.0.0"
     }
 }

From 0c4fe5b002bb833f01eb0c253db4bd0a5ba0ba02 Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Mon, 18 Mar 2019 22:54:01 +0000
Subject: [PATCH 769/924] Updated Definition

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

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index 559b986ba8..65b80277ee 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -176,8 +176,8 @@ export class Image {
 export class ImageData {
     constructor(canvas: Canvas, data: number[], height: number, width: number);
     readonly data: number[];
-    readonly height: number;
-    readonly width: number;
+    readonly height: number | undefined;
+    readonly width: number | undefined;
 }
 
 export class Path2D {

From 519e5f209c4d39667b3f7cb9185a77c881d97808 Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Mon, 18 Mar 2019 19:30:22 -0500
Subject: [PATCH 770/924] add missing features

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 1aa9cb1546..6c3aa122f1 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -266,19 +266,26 @@ declare namespace Parse {
         constructor(className?: string, options?: any);
         constructor(attributes?: string[], options?: any);
 
-        static extend(className: string, protoProps?: any, classProps?: any): any;
-        static fromJSON(json: any, override: boolean): any;
-
+        static createWithoutData<T extends Object>(id: string): T;
+        static destroyAll<T>(list: T[], options?: Object.DestroyAllOptions): Promise<T[]>;
+        static extend(className: string, protoProps?: any, classProps?: any): any;        
         static fetchAll<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
         static fetchAllIfNeeded<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
-        static destroyAll<T>(list: T[], options?: Object.DestroyAllOptions): Promise<T[]>;
-        static saveAll<T extends Object>(list: T[], options?: Object.SaveAllOptions): Promise<T[]>;
+        static fetchAllWithInclude(list: any, keys: any, options: any): any;
+        static fromJSON(json: any, override: boolean): any;
+        static pinAll(objects: Object[]): Promise<void>;
+        static pinAllWithName(name: string, objects: Object[]): Promise<void>;
         static registerSubclass<T extends Object>(className: string, clazz: new (options?: any) => T): void;
-        static createWithoutData<T extends Object>(id: string): T;
+        static saveAll<T extends Object>(list: T[], options?: Object.SaveAllOptions): Promise<T[]>;
+        static unPinAll(objects: any): Promise<void>;
+        static unPinAllObjects(): Promise<void>;
+        static unPinAllObjectsWithName(name: string): Promise<void>;    
+        static unPinAllWithName(...args: any[]): Promise<void>;
 
-        initialize(): void;
         add(attr: string, item: any): this;
-        addUnique(attr: string, item: any): any;
+        addAll(attr: string, items: any[]): this;
+        addAllUnique(attr: string, items: any[]): this;
+        addUnique(attr: string, item: any): this;
         change(options: any): this;
         changedAttributes(diff: any): boolean;
         clear(options: any): any;
@@ -286,21 +293,29 @@ declare namespace Parse {
         destroy(options?: Object.DestroyOptions): Promise<this>;
         dirty(attr?: string): boolean;
         dirtyKeys(): string[];
+        equals(other: any): boolean;
         escape(attr: string): string;
         existed(): boolean;
         fetch(options?: Object.FetchOptions): Promise<this>;
+        fetchFromLocalDatastore(): Promise<this> | void;
+        fetchWithInclude(keys: string[], options?: any): Promise<this>;
         get(attr: string): any | undefined;
         getACL(): ACL | undefined;
         has(attr: string): boolean;
         hasChanged(attr: string): boolean;
         increment(attr: string, amount?: number): any;
+        initialize(): void;
         isNew(): boolean;
+        isPinned(...args: any[]): Promise<boolean>;
         isValid(): boolean;
         op(attr: string): any;
+        pin(): Promise<this>;
+        pinWithName(name: string): Promise<this>;
         previous(attr: string): any;
         previousAttributes(): any;
         relation(attr: string): Relation<this, Object>;
         remove(attr: string, item: any): any;
+        removeAll(attr: string, items: 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>;
@@ -309,6 +324,8 @@ declare namespace Parse {
         set(attrs: object, options?: Object.SetOptions): boolean;
         setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
         toPointer(): Pointer;
+        unPin(): Promise<this>;
+        unPinWithName(name: string): Promise<this>;
         unset(attr: string, options?: any): any;
         validate(attrs: any, options?: SuccessFailureOptions): boolean;
     }
@@ -331,6 +348,11 @@ declare namespace Parse {
         }
     }
 
+    class Polygon  extends BaseObject {
+        constructor(arg1: GeoPoint[] | number[][]);
+        containsPoint(point: GeoPoint): boolean;
+        equals(other: Polygon | any): boolean;
+    }
     /**
      * Every Parse application installed on a device registered for
      * push notifications has an associated Installation object.
@@ -415,18 +437,23 @@ declare namespace Parse {
         constructor(objectClass: string);
         constructor(objectClass: new (...args: any[]) => T);
 
+        static and<U extends Object>(...args: Query<U>[]): Query<U>;
+        static fromJSON<U extends Object>(className: any, json: any): Query<U>;
+        static nor<U extends Object>(...args: Query<U>[]): Query<U>;
         static or<U extends Object>(...var_args: Query<U>[]): Query<U>;
 
-        aggregate(pipeline: Query.AggregationOptions|Query.AggregationOptions[]): Query<T>;
         addAscending(key: string): Query<T>;
         addAscending(key: string[]): Query<T>;
         addDescending(key: string): Query<T>;
         addDescending(key: string[]): Query<T>;
         ascending(key: string): Query<T>;
         ascending(key: string[]): Query<T>;
+        aggregate(pipeline: Query.AggregationOptions|Query.AggregationOptions[]): Query<T>;
+        containedBy(key: string, values: any[]): Query<T>;
         containedIn(key: string, values: any[]): Query<T>;
         contains(key: string, substring: string): Query<T>;
         containsAll(key: string, values: any[]): Query<T>;
+        containsAllStartingWith(key: string, values: any[]): Query<T>;
         count(options?: Query.CountOptions): Promise<number>;
         descending(key: string): Query<T>;
         descending(key: string[]): Query<T>;
@@ -440,12 +467,16 @@ declare namespace Parse {
         exists(key: string): Query<T>;
         find(options?: Query.FindOptions): Promise<T[]>;
         first(options?: Query.FirstOptions): Promise<T | undefined>;
+        fromLocalDatastore(): void;
+        fromPin(): void;
+        fromPinWithName(name: string): void;
         fullText(key: string, value: string, options?: Query.FullTextOptions): Query<T>;
         get(objectId: string, options?: Query.GetOptions): Promise<T>;
         greaterThan(key: string, value: any): Query<T>;
         greaterThanOrEqualTo(key: string, value: any): Query<T>;
         include(key: string): Query<T>;
         include(keys: string[]): Query<T>;
+        includeAll(): Query<T>;
         lessThan(key: string, value: any): Query<T>;
         lessThanOrEqualTo(key: string, value: any): Query<T>;
         limit(n: number): Query<T>;
@@ -455,13 +486,17 @@ declare namespace Parse {
         near(key: string, point: GeoPoint): Query<T>;
         notContainedIn(key: string, values: any[]): Query<T>;
         notEqualTo(key: string, value: any): Query<T>;
+        polygonContains(key: string, point: GeoPoint): Query<T>;
         select(...keys: string[]): Query<T>;
         skip(n: number): Query<T>;
+        sortByTextScore(): any;
         startsWith(key: string, prefix: string): Query<T>;
         subscribe(): LiveQuerySubscription;
+        withJSON(json: any): any;
         withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query<T>;
         withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query<T>;
         withinMiles(key: string, point: GeoPoint, maxDistance: number): Query<T>;
+        withinPolygon(key: string, points: GeoPoint[]): Query<T>;
         withinRadians(key: string, point: GeoPoint, maxDistance: number): Query<T>;
     }
 
@@ -599,6 +634,7 @@ subscription.on('close', () => {});
     class Config extends Object {
         static get(options?: SuccessFailureOptions): Promise<Config>;
         static current(): Config;
+        static save(attr: any): Promise<Config>;
 
         get(attr: string): any;
         escape(attr: string): any;
@@ -622,15 +658,16 @@ subscription.on('close', () => {});
      */
     class User extends Object {
 
+        static allowCustomUserClass(isAllowed: boolean): void;
+        static become(sessionToken: string, options?: SuccessFailureOptions): Promise<User>;
         static current(): User | undefined;
         static currentAsync(): Promise<User | null>;
         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;
-        static become(sessionToken: string, options?: SuccessFailureOptions): Promise<User>;
         static requestPasswordReset(email: string, options?: SuccessFailureOptions): Promise<User>;
         static extend(protoProps?: any, classProps?: any): any;
+        static hydrate(userJSON: any): Promise<User>;
 
         signUp(attrs: any, options?: SignUpOptions): Promise<this>;
         logIn(options?: SuccessFailureOptions): Promise<this>;
@@ -965,7 +1002,7 @@ subscription.on('close', () => {});
     /**
      * Gets all contents from Local Datastore.
      */
-    function dumpLocalDatastore(): any;
+    function dumpLocalDatastore(): Promise<{ [key: string]: any }>;
 
     /**
      * Enable pinning in your application.
@@ -976,8 +1013,9 @@ subscription.on('close', () => {});
     /**
      * Flag that indicates whether Local Datastore is enabled.
      */
-    function isLocalDatastoreEnabled(): any;
+    function isLocalDatastoreEnabled(): boolean;
 
+    function setLocalDatastoreController(controller: any): void;
 }
 
 declare module "parse/node" {
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 1c430b1807..1b91772746 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -14,6 +14,10 @@ class Game extends Parse.Object {
     }
 }
 
+function test_config() {
+    Parse.Config.save({ foo: 'bar' });
+}
+
 function test_object() {
 
     const game = new Game();
@@ -51,10 +55,18 @@ function test_object() {
     gameScore.increment("score");
     gameScore.addUnique("skills", "flying");
     gameScore.addUnique("skills", "kungfu");
-
+    gameScore.addAll("skills", ["kungfu"]);
+    gameScore.addAllUnique("skills", ["kungfu"]);
+    gameScore.remove('skills', 'flying');
+    gameScore.removeAll('skills', ["kungFu"]);
     game.set("gameScore", gameScore);
 
     const gameCopy = Game.fromJSON(JSON.parse(JSON.stringify(game)), true);
+
+    const object = new Parse.Object('TestObject');
+    object.equals(gameScore);
+    object.fetchWithInclude(['key1', 'key2']);
+
 }
 
 function test_query() {
@@ -87,6 +99,7 @@ function test_query() {
     // Restricts to wins >= 50
     query.greaterThanOrEqualTo("wins", 50);
 
+    query.containedBy('place', ['1', '2']);
     // Finds scores from any of Jonathan, Dario, or Shawn
     query.containedIn("playerName",
         ["Jonathan Walsh", "Dario Wunsch", "Shawn Simon"]);
@@ -109,13 +122,15 @@ function test_query() {
 
     // Find objects where the array in arrayKey contains all of the elements 2, 3, and 4.
     query.containsAll("arrayKey", [2, 3, 4]);
+    query.containsAllStartingWith("arrayKey", [2, 3, 4]);
 
     query.startsWith("name", "Big Daddy's");
     query.equalTo("score", gameScore);
     query.exists("score");
     query.include("score");
     query.include(["score.team"]);
-
+    query.includeAll();
+    query.sortByTextScore();
     // Find objects that match the aggregation pipeline
     query.aggregate({
         group:{
@@ -254,6 +269,12 @@ function test_user_acl_roles() {
         // The token could not be validated.
     });
 
+    Parse.User.hydrate({}).then(function (user) {
+        // The current user is now set to user.
+    }, function (error) {
+        // The token could not be validated.
+    });
+
     const game = new Game();
     game.set("score", new GameScore());
     game.setACL(new Parse.ACL(Parse.User.current()));
@@ -517,3 +538,47 @@ function test_query_subscribe() {
     // unsubscribe
     subscription.unsubscribe();
 }
+
+function test_serverURL() {
+    Parse.serverURL = 'http://localhost:1337/parse';
+}
+function test_polygon() {
+    const point = new Parse.GeoPoint(1,2);
+    const polygon1 = new Parse.Polygon([[0,0], [1,0], [1,1], [0,1]]);
+    const polygon2 = new Parse.Polygon([point, point, point]);
+    polygon1.equals(polygon2);
+    polygon1.containsPoint(point);
+
+    const query = new Parse.Query('TestObject');
+    query.polygonContains('key', point);
+    query.withinPolygon('key', [point, point, point]);
+}
+
+async function test_local_datastore() {
+    Parse.enableLocalDatastore();
+    const name = 'test_pin';
+    const obj = new Parse.Object('TestObject');
+    await obj.pin();
+    await obj.unPin();
+    await obj.isPinned();
+    await obj.pinWithName(name);
+    await obj.unPinWithName(name);
+    await obj.fetchFromLocalDatastore();
+
+    await Parse.Object.pinAll([obj]);
+    await Parse.Object.unPinAll([obj]);
+    await Parse.Object.pinAllWithName(name, [obj]);
+    await Parse.Object.unPinAllWithName(name, [obj]);
+    await Parse.Object.unPinAllObjects();
+    await Parse.Object.unPinAllObjectsWithName(name);
+
+    const flag = Parse.isLocalDatastoreEnabled();
+    const LDS = await Parse.dumpLocalDatastore();
+
+    const query = new Parse.Query('TestObject');
+    query.fromPin();
+    query.fromPinWithName(name);
+    query.fromLocalDatastore();
+
+    Parse.setLocalDatastoreController({});
+}

From d380ec447529f368451b9705ce80872979678737 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Mon, 18 Mar 2019 18:35:55 -0700
Subject: [PATCH 771/924] Fix incorrect typings for clone-deep (#33990)

* Fix incorrect typings for clone-deep

* Update tsconfig.json to remove the insidious setting that caused the mistake to be overlooked ;-)
---
 types/clone-deep/clone-deep-tests.ts | 2 +-
 types/clone-deep/index.d.ts          | 4 +++-
 types/clone-deep/tsconfig.json       | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/clone-deep/clone-deep-tests.ts b/types/clone-deep/clone-deep-tests.ts
index 0e99c6fbb2..6911c13de4 100644
--- a/types/clone-deep/clone-deep-tests.ts
+++ b/types/clone-deep/clone-deep-tests.ts
@@ -1,4 +1,4 @@
-import cloneDeep from 'clone-deep';
+import cloneDeep = require('clone-deep');
 
 cloneDeep<object>(Object.create(null)); // $ExpectType object
 cloneDeep<object>({}); // $ExpectType object
diff --git a/types/clone-deep/index.d.ts b/types/clone-deep/index.d.ts
index 0ca60e6180..7918daaa40 100644
--- a/types/clone-deep/index.d.ts
+++ b/types/clone-deep/index.d.ts
@@ -4,7 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
-export default function cloneDeep<T>(
+declare function cloneDeep<T>(
   val: T,
   instanceClone?: true | ((val: T) => T)
 ): T;
+
+export = cloneDeep;
diff --git a/types/clone-deep/tsconfig.json b/types/clone-deep/tsconfig.json
index d584681520..cb1cebdf1f 100644
--- a/types/clone-deep/tsconfig.json
+++ b/types/clone-deep/tsconfig.json
@@ -10,7 +10,6 @@
     "typeRoots": ["../"],
     "types": [],
     "noEmit": true,
-    "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true
   },
   "files": ["index.d.ts", "clone-deep-tests.ts"]

From c1201dbdcf1684648584009efbc3c9d907ba62c8 Mon Sep 17 00:00:00 2001
From: Farzad Majidfayyaz <farzadmf@hotmail.com>
Date: Mon, 18 Mar 2019 22:49:03 -0400
Subject: [PATCH 772/924] Add types for 'clui' package

---
 types/clui/clui-tests.ts |  96 ++++++++++++++++++++++++
 types/clui/index.d.ts    | 157 +++++++++++++++++++++++++++++++++++++++
 types/clui/tsconfig.json |  24 ++++++
 types/clui/tslint.json   |   1 +
 4 files changed, 278 insertions(+)
 create mode 100644 types/clui/clui-tests.ts
 create mode 100644 types/clui/index.d.ts
 create mode 100644 types/clui/tsconfig.json
 create mode 100644 types/clui/tslint.json

diff --git a/types/clui/clui-tests.ts b/types/clui/clui-tests.ts
new file mode 100644
index 0000000000..1968b10cba
--- /dev/null
+++ b/types/clui/clui-tests.ts
@@ -0,0 +1,96 @@
+import { Gauge, Line, LineBuffer, Progress, Sparkline, Spinner } from 'clui';
+import * as clc from 'cli-color';
+
+// LineBuffer
+const outputBuffer = new LineBuffer({
+  x: 0,
+  y: 0,
+  width: 'console',
+  height: 'console'
+});
+
+new Line(outputBuffer)
+  .column('Title Placehole', 20, [clc.green])
+  .fill()
+  .store();
+
+new Line(outputBuffer)
+  .fill()
+  .store();
+
+new Line(outputBuffer)
+  .column('Suscipit', 20, [clc.cyan])
+  .column('Voluptatem', 20, [clc.cyan])
+  .column('Nesciunt', 20, [clc.cyan])
+  .column('Laudantium', 11, [clc.cyan])
+  .fill()
+  .store();
+
+for (let l = 0; l < 20; l++) {
+  new Line(outputBuffer)
+    .column((Math.random() * 100).toFixed(3), 20)
+    .column((Math.random() * 100).toFixed(3), 20)
+    .column((Math.random() * 100).toFixed(3), 20)
+    .column((Math.random() * 100).toFixed(3), 11)
+    .fill()
+    .store();
+}
+
+outputBuffer.output();
+
+// Line
+new Line()
+  .padding(2)
+  .column('Column One', 20, [clc.cyan])
+  .column('Column Two', 20, [clc.cyan])
+  .column('Column Three', 20, [clc.cyan])
+  .column('Column Four', 20, [clc.cyan])
+  .fill()
+  .output();
+
+new Line()
+  .padding(2)
+  .column((Math.random() * 100).toFixed(3), 20)
+  .column((Math.random() * 100).toFixed(3), 20)
+  .column((Math.random() * 100).toFixed(3), 20)
+  .column((Math.random() * 100).toFixed(3), 20)
+  .fill()
+  .output();
+
+// Gauge
+const total = 33660133376;
+const free = 17763860480;
+const used = total - free;
+const human = Math.ceil(used / 1000000) + ' MB';
+
+console.log(Gauge(used, total, 20, total * 0.8, human));
+
+// Sparkline
+const reqsPerSec = [10, 12, 3, 7, 12, 9, 23, 10, 9, 19, 16, 18, 12, 12];
+
+console.log(Sparkline(reqsPerSec, 'reqs/sec'));
+
+// Progress
+const thisProgressBar = new Progress(20);
+console.log(thisProgressBar.update(10, 30));
+
+// or
+
+const thisPercentBar = new Progress(20);
+console.log(thisPercentBar.update(0.4));
+
+// Spinner
+const countdown = new Spinner('Exiting in 10 seconds...  ', ['⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷']);
+
+countdown.start();
+
+let n = 10;
+const interval = setInterval(() => {
+  n--;
+  countdown.message(`Exiting in ${n} seconds...`);
+  if (n === 0) {
+    console.log('\n');
+    countdown.stop();
+    clearInterval(interval);
+  }
+}, 1000);
diff --git a/types/clui/index.d.ts b/types/clui/index.d.ts
new file mode 100644
index 0000000000..339ac031d9
--- /dev/null
+++ b/types/clui/index.d.ts
@@ -0,0 +1,157 @@
+// Type definitions for clui 0.3
+// Project: https://github.com/nathanpeck/clui#readme
+// Definitions by: Farzad Majidfayyaz <https://github.com/farzadmf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as clc from 'cli-color';
+
+export interface LineBufferOptions {
+    x?: number;
+    y?: number;
+    width?: number | 'console';
+    height?: number | 'console';
+    scroll?: number;
+}
+
+export class LineBuffer {
+    /**
+     * Creates an object for buffering a group of text lines and then outputting them
+     * @param options Values to build the buffer
+     */
+    constructor(options: LineBufferOptions);
+
+    /**
+     * Return the height of the `LineBuffer`, when specified as `console`
+     */
+    height(): number;
+
+    /**
+     * Return the width of the `LineBuffer`, when specified as `console`
+     */
+    width(): number;
+
+    /**
+     * Put a `Line` object into the `LineBuffer`
+     * @param line The line object to put into the buffer
+     */
+    addLine(line: Line): void;
+
+    /**
+     * If you don't have enough lines in the buffer, this will fill the reset of
+     * the lines with empty spaces
+     */
+    fill(): void;
+
+    /**
+     * Draw the `LineBuffer` to screen
+     */
+    output(): void;
+}
+
+/**
+ * This chainable object can be used to generate a line of text with columns, padding, and fill
+ */
+export class Line {
+    /**
+     * Create a new instance of Line object
+     * @param buffer Object to be used as buffer
+     */
+    constructor(buffer?: LineBuffer);
+
+    /**
+     * Output `width` characters of blank space
+     * @param width Number of characters to print
+     */
+    padding(width: number): Line;
+
+    /**
+     * Output text within a column of the specified width
+     * @param text Text to print
+     * @param width Width of the column
+     * @param styles List of `cli-color` styles to apply
+     */
+    column(text: string, width: number, styles?: clc.Format[]): Line;
+
+    /**
+     * At the end of a line, fill the rest of the columns to the right edge
+     */
+    fill(): Line;
+
+    /**
+     * Print the generated line of text to the console
+     */
+    output(): Line;
+
+    /**
+     * Return the contents of this line as a string
+     */
+    contents(): string;
+
+    /**
+     * Store this line into the buffer
+     */
+    store(): void;
+}
+
+/**
+ * Creates a basic horizontal gauge to the screen
+ * @param value The current value of the metric being displayed by this gauge
+ * @param maxValue The highest possible value of the metric being displayed
+ * @param guageWidth  How many columns widt to draw the gauge
+ * @param dangerZone The point after which the value will be drawn in red because it's too high
+ * @param suffix A value to output after the gauge itself
+ */
+export function Gauge(
+    value: number,
+    maxValue: number,
+    guageWidth: number,
+    dangerZone: number,
+    suffix: string,
+): string;
+
+/**
+ * A simple command line sparkline that draws a series of values, and highlights the peak for the period
+ * @param values An array of values to go into the sparkline
+ * @param suffix A suffix to use when drawing the current and max values at the end of the sparkline
+ */
+export function Sparkline(values: number[], suffix: string): string;
+
+export class Progress {
+    /**
+     * Creates a progress bar
+     * @param length The desired length of the progress bar in characters
+     */
+    constructor(length: number);
+
+    /**
+     * Returns the progress bar min/max context to write to stdout
+     * @param currentValueOrPercent Current value (or percent) of the progress bar
+     * @param maxValue Maximum value of the progress bar
+     */
+    update(currentValueOrPercent: number, maxValue?: number): string;
+}
+
+export class Spinner {
+    /**
+     * Creates a new spinner
+     * @param statusText The default text to display while the spinner is spinning
+     * @param style Array of graphical characters used to draw the spinner
+     */
+    constructor(statusText: string, style?: string[]);
+
+    /**
+     * Show the spinner on the screen
+     */
+    start(): void;
+
+    /**
+     * Update the status message that follows the spinner
+     * @param statusMessage Message to be displayed
+     */
+    message(statusMessage: string): void;
+
+    /**
+     * Erase the spinner from the screen
+     */
+    stop(): void;
+}
diff --git a/types/clui/tsconfig.json b/types/clui/tsconfig.json
new file mode 100644
index 0000000000..05235b1de8
--- /dev/null
+++ b/types/clui/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "clui-tests.ts"
+    ]
+}
diff --git a/types/clui/tslint.json b/types/clui/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clui/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fdc13d05d3fb31de472d1c8f2035659c1a8e000e Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Tue, 19 Mar 2019 13:24:53 +0800
Subject: [PATCH 773/924] Update to include Gun.SEA & user APIs

---
 types/gun/gun-tests.ts |  48 ++++++++++
 types/gun/index.d.ts   | 204 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 230 insertions(+), 22 deletions(-)

diff --git a/types/gun/gun-tests.ts b/types/gun/gun-tests.ts
index d196fba695..3c9eb0e55e 100644
--- a/types/gun/gun-tests.ts
+++ b/types/gun/gun-tests.ts
@@ -28,7 +28,9 @@ interface AppState {
     object: {
         num: number;
         str: string;
+        /** Comment test */
         bool: boolean;
+        specstr: 'a' | 'b';
         obj: {
             arr2: Array<{ foo: number; bar: string }>;
         };
@@ -47,6 +49,9 @@ app.get('object')
     .get('obj')
     .get('arr2')
     .set({ foo: 1, bar: '2' });
+app.get('object').put({
+    bool: true
+});
 
 app.get('object')
     .get('bool')
@@ -70,3 +75,46 @@ app.get('chatRoom').time!(msg => {
 }, 20);
 // $ExpectError
 app.get('object').time!({ a: 1 });
+
+class X {
+    val: string;
+    b() {}
+}
+interface BadState {
+    // Top level primitives
+    a: 1;
+    b: {
+        // Ban functions
+        c: () => void;
+        // Ban class
+        d: typeof X;
+        // Recursive check for banned types
+        e: {
+            f: () => void;
+        };
+    };
+    // Filter, remove functions on prototype.
+    c: X;
+}
+const bad = new Gun<BadState>();
+// $ExpectError
+bad.get('a').put(1);
+bad.get('b')
+    .get('c')
+    // $ExpectError
+    .put(() => {});
+bad.get('b')
+    .get('d')
+    // $ExpectError
+    .put(X);
+
+bad.get('b').put({
+    // $ExpectError
+    c: () => {},
+    // $ExpectError
+    d: X,
+    // $ExpectError
+    e: {
+        f: () => {}
+    }
+});
diff --git a/types/gun/index.d.ts b/types/gun/index.d.ts
index 51d02b68d5..176521acaa 100644
--- a/types/gun/index.d.ts
+++ b/types/gun/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for gun 0.9
+// Type definitions for gun 0.9.9999991
 // Project: https://github.com/amark/gun#readme
 // Definitions by: Jack Works <https://github.com/Jack-Works>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,6 +12,30 @@ declare namespace Gun {
     /** Gun does not accept Array value, so we need extract to make types correct */
     type AllowArray<T> = ArrayOf<T> extends never ? T : ArrayOf<T>;
     type DisallowArray<T> = ArrayOf<T> extends never ? T : never;
+    /** These types cannot be stored on Gun */
+
+    type AlwaysDisallowedType<T> = T extends (...args: any[]) => void
+        ? never
+        : T extends { new (...args: any[]): any }
+        ? never
+        : AccessObject<T>;
+    type AccessObject<T> = T extends object
+        ? { [key in keyof T]: (AlwaysDisallowedType<T[key]> extends never ? never : AccessObject<T[key]>) }
+        : T;
+    /** These types cannot be stored on Gun's root level */
+    type DisallowPrimitives<Open, T> = Open extends false
+        ? T
+        : T extends string
+        ? never
+        : T extends number
+        ? never
+        : T extends boolean
+        ? never
+        : T extends null
+        ? never
+        : T extends undefined
+        ? never
+        : T;
     type ArrayAsRecord<DataType> = ArrayOf<DataType> extends never ? DataType : Record<string, any>;
     /**
      * options['module name'] allows you to pass options to a 3rd party module.
@@ -45,7 +69,8 @@ declare namespace Gun {
     }>;
     type Saveable<DataType> = Partial<DataType> | string | number | boolean | null | ChainReference<DataType>;
     type AckCallback = (ack: { err: Error; ok: any } | { err: undefined; ok: string }) => void;
-    interface ChainReference<DataType = any, ReferenceKey = any> {
+    interface ChainReference<DataType = any, ReferenceKey = any, IsTop extends 'pre_root' | 'root' | false = false> {
+        //#region API
         /**
          * Save data into gun, syncing it with your connected peers.
          *
@@ -59,7 +84,10 @@ declare namespace Gun {
          *
          * @param callback invoked on each acknowledgment
          */
-        put(data: DisallowArray<DataType>, callback?: AckCallback): ChainReference<DataType, ReferenceKey>;
+        put(
+            data: Partial<AlwaysDisallowedType<DisallowPrimitives<IsTop, DisallowArray<DataType>>>>,
+            callback?: AckCallback
+        ): ChainReference<DataType, ReferenceKey, IsTop>;
         /**
          * Where to read data from.
          * @param key The key is the ID or property name of the data that you saved from earlier
@@ -83,7 +111,7 @@ declare namespace Gun {
                 /** the key, ID, or property name of the data. */
                 paramB: Record<'off' | 'to' | 'next' | 'the' | 'on' | 'as' | 'back' | 'rid' | 'id', any>
             ) => void
-        ): ChainReference<DataType[K], K>;
+        ): ChainReference<DataType[K], K, IsTop extends 'pre_root' ? 'root' : false>;
         /**
          * Change the configuration of the gun database instance.
          * @param options The options argument is the same object you pass to the constructor.
@@ -115,7 +143,10 @@ declare namespace Gun {
          * To remove a listener call .off() on the same property or node.
          */
         on(
-            callback: (data: ArrayAsRecord<DataType>, key: ReferenceKey) => void,
+            callback: (
+                data: DisallowPrimitives<IsTop, AlwaysDisallowedType<ArrayAsRecord<DataType>>>,
+                key: ReferenceKey
+            ) => void,
             option?: { change: boolean } | boolean
         ): ChainReference<DataType, ReferenceKey>;
         /**
@@ -123,7 +154,10 @@ declare namespace Gun {
          * @returns In the document, it said the return value may change in the future. Don't rely on it.
          */
         once(
-            callback?: (data: (ArrayAsRecord<DataType>) | undefined, key: ReferenceKey) => void,
+            callback?: (
+                data: (DisallowPrimitives<IsTop, AlwaysDisallowedType<ArrayAsRecord<DataType>>>) | undefined,
+                key: ReferenceKey
+            ) => void,
             option?: { wait: number }
         ): ChainReference<DataType, ReferenceKey>;
         /**
@@ -136,11 +170,13 @@ declare namespace Gun {
          * **This means only objects, for now, are supported.**
          */
         set(
-            data: DataType extends Array<infer U>
-                ? U extends { [key: string]: any; [key: number]: any }
-                    ? ArrayOf<DataType>
+            data: AlwaysDisallowedType<
+                DataType extends Array<infer U>
+                    ? U extends { [key: string]: any; [key: number]: any }
+                        ? ArrayOf<DataType>
+                        : never
                     : never
-                : never,
+            >,
             callback?: AckCallback
         ): ChainReference<ArrayOf<DataType>>;
         /**
@@ -157,8 +193,8 @@ declare namespace Gun {
          * Remove **all** listener on this node.
          */
         off(): void;
-
-        // Extended API
+        //#endregion
+        //#region Extended API
         /**
          *
          * Path does the same thing as `.get` but has some conveniences built in.
@@ -256,15 +292,76 @@ declare namespace Gun {
         ): ChainReference<DataType, ReferenceKey>;
         /** Pushes data to a Timegraph with it's time set to Gun.state()'s time */
         time?(data: ArrayOf<DataType>): void;
+        //#endregion
+        //#region User
+        /**
+         * Creates a new user and calls callback upon completion.
+         * @param alias Username or Alias which can be used to find a user.
+         * @param pass Passphrase that will be extended with PBKDF2 to make it a secure way to login.
+         * @param cb Callback that is to be called upon creation of the user.
+         * @param opt Option Object containing options for creation. (In gun options are added at end of syntax. opt is rarely used, hence is added at the end.)
+         */
+        create(
+            alias: string,
+            pass: string,
+            cb?: (ack: { ok: 0; pub: string } | { err: string }) => void,
+            opt?: {}
+        ): ChainReference;
+        /**
+         * Authenticates a user, previously created via User.create.
+         * @param alias Username or Alias which can be used to find a user.
+         * @param pass Passphrase for the user
+         * @param cb Callback that is to be called upon authentication of the user.
+         * @param opt Option Object containing options for authentiaction. (In gun options are added at end of syntax. opt is rarely used, hence is added at the end.)
+         */
+        auth(
+            alias: string,
+            pass: string,
+            cb?: (
+                ack:
+                    | {
+                          ack: 2;
+                          get: string;
+                          on: (...args: [unknown, unknown, unknown]) => unknown;
+                          put: { alias: string; auth: any; epub: string; pub: string };
+                          sea: CryptoKeyPair;
+                          soul: string;
+                      }
+                    | { err: string }
+            ) => void,
+            opt?: {}
+        ): ChainReference;
+        /**
+         * Returns the key pair in the form of an object as below.
+         */
+        pair(): CryptoKeyPair;
+        /**
+         * Log out currently authenticated user. Parameters are unused in the current implementation.
+         * @param opt unused in current implementation.
+         * @param cb unused in current implementation.
+         */
+        leave(opt?: never, cb?: never): ChainReference;
+        /**
+         * Deletes a user from the current gun instance and propagates the delete to other peers.
+         * @param alias Username or alias.
+         * @param pass Passphrase for the user.
+         * @param cb Callback that is called when the user was successfully deleted.
+         */
+        delete(alias: string, pass: string, cb?: (ack: { ok: 0 }) => void): Promise<void>;
+        /**
+         * Recall saves a users credentials in sessionStorage of the browser. As long as the tab of your app is not closed the user stays logged in, even through page refreshes and reloads.
+         * @param opt option object If you want to use browser sessionStorage to allow users to stay logged in as long as the session is open, set opt.sessionStorage to true
+         * @param cb internally the callback is passed on to the user.auth function to logged the user back in. Refer to user.auth for callback documentation.
+         */
+        recall(opt?: { sessionStorage: boolean }, cb?: Parameters<ChainReference['auth']>[2]): ChainReference;
+        /**
+         * @param publicKey If you know a users publicKey you can get his user graph and see any unencrypted data he may have stored there.
+         */
+        user(publicKey?: string): ChainReference;
+        //#endregion
     }
 
-    interface GunSEA {
-        // There is no the only content in the api document.
-        user: {
-            create(alias: string, passphrase: string, callback: (...args: any[]) => void): any;
-        };
-    }
-
+    type CryptoKeyPair = Record<'pub' | 'priv' | 'epub' | 'epriv', string>;
     interface Constructor {
         /**
          * @description
@@ -274,8 +371,12 @@ declare namespace Gun {
          *
          * or you can pass in an array of URLs to sync with multiple peers.
          */
-        <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<DataType> & GunSEA;
-        new <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<DataType> & GunSEA;
+        <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<DataType, any, 'pre_root'>;
+        new <DataType = any>(options?: string | string[] | ConstructorOptions): ChainReference<
+            DataType,
+            any,
+            'pre_root'
+        >;
         node: {
             /** Returns true if data is a gun node, otherwise false. */
             is(anything: any): anything is ChainReference;
@@ -289,7 +390,66 @@ declare namespace Gun {
             ify(json: any): any;
         };
         /** @see https://gun.eco/docs/SEA */
-        SEA: any;
+        SEA: {
+            /** If you want SEA to throw while in development, turn SEA.throw = true on, but please do not use this in production. */
+            throw?: boolean;
+            /** Last known error */
+            err?: Error;
+            /**
+             * This gives you a Proof of Work (POW) / Hashing of Data
+             * @param data The data to be hashed, work to be performed on.
+             * @param pair (salt) You can pass pair of keys to use as salt. Salt will prevent others to pre-compute the work,
+             *  so using your public key is not a good idea. If it is not specified, it will be random,
+             *  which ruins your chance of ever being able to re-derive the work deterministically
+             * @param callback function to executed upon execution of proof
+             * @param opt default: {name: 'PBKDF2', encode: 'base64'}
+             */
+            work(
+                data: any,
+                pair?: any,
+                callback?: (data: string | void) => void,
+                opt?: Partial<{
+                    name: 'SHA-256' | 'PBKDF2';
+                    encode: 'base64' | 'base32' | 'base16';
+                    /** iterations to use on subtle.deriveBits */
+                    iterations: number;
+                    salt: any;
+                    hash: string;
+                    length: any;
+                }>
+            ): Promise<string | undefined>;
+            /**
+             * This generates a cryptographically secure public/private key pair - be careful not to leak the private keys!
+             * Note: API subject to change we may change the parameters to accept data and work, in addition to generation.
+             * You will need this for most of SEA's API, see those method's examples.
+             * The default cryptographic primitives for the asymmetric keys are ECDSA for signing and ECDH for encryption.
+             */
+            pair(cb: (data: CryptoKeyPair) => void, opt?: {}): Promise<CryptoKeyPair | undefined>;
+            /**
+             * Adds a signature to a message, for data that you want to prevent attackers tampering with.
+             * @param data is the content that you want to prove is authorized.
+             * @param pair is from .pair.
+             */
+            sign(data: any, pair: CryptoKeyPair): Promise<string | undefined>;
+            /**
+             * Gets the data if and only if the message can be verified as coming from the person you expect.
+             * @param message is what comes from .sign.
+             * @param pair from .pair or its public key text (pair.pub).
+             */
+            verify(message: any, pair: CryptoKeyPair | string): Promise<unknown>;
+            /**
+             * Takes some data that you want to keep secret and encrypts it so nobody else can read it.
+             * @param data is the content that you want to encrypt.
+             * @param pair from .pair or a passphrase you want to use as a cypher to encrypt with.
+             */
+            encrypt(data: any, pair: CryptoKeyPair | string): Promise<string>;
+            /**
+             * Read the secret data, if and only if you are allowed to.
+             * @param message is what comes from .encrypt.
+             * @param pair from .pair or the passphrase to decypher the message.
+             */
+            decrypt(message: any, pair: CryptoKeyPair | string): Promise<unknown>;
+        };
     }
 }
 declare const Gun: Gun.Constructor;

From 15fac8e23bdc87dfcedb1536b2aec6c4b6399bad Mon Sep 17 00:00:00 2001
From: Jack Works <zjwpeter@gmail.com>
Date: Tue, 19 Mar 2019 13:37:33 +0800
Subject: [PATCH 774/924] Fix errors

---
 types/gun/gun-tests.ts | 14 ++++----------
 types/gun/index.d.ts   |  7 ++++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/types/gun/gun-tests.ts b/types/gun/gun-tests.ts
index 3c9eb0e55e..e399414e0a 100644
--- a/types/gun/gun-tests.ts
+++ b/types/gun/gun-tests.ts
@@ -108,13 +108,7 @@ bad.get('b')
     // $ExpectError
     .put(X);
 
-bad.get('b').put({
-    // $ExpectError
-    c: () => {},
-    // $ExpectError
-    d: X,
-    // $ExpectError
-    e: {
-        f: () => {}
-    }
-});
+// $ExpectError
+bad.get('b').put({ c: () => {}, d: X, e: { f: () => {} } });
+// $ExpectError
+bad.get('c').put(new X());
diff --git a/types/gun/index.d.ts b/types/gun/index.d.ts
index 176521acaa..0cba9d6620 100644
--- a/types/gun/index.d.ts
+++ b/types/gun/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for gun 0.9.9999991
+// Type definitions for gun 0.9
 // Project: https://github.com/amark/gun#readme
 // Definitions by: Jack Works <https://github.com/Jack-Works>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.9
+// TypeScript Version: 3.1
 
 declare const cons: Gun.Constructor;
 export = cons;
@@ -69,6 +69,7 @@ declare namespace Gun {
     }>;
     type Saveable<DataType> = Partial<DataType> | string | number | boolean | null | ChainReference<DataType>;
     type AckCallback = (ack: { err: Error; ok: any } | { err: undefined; ok: string }) => void;
+    type Parameters<T extends (...args: any[]) => any> = T extends (...args: infer P) => any ? P : never;
     interface ChainReference<DataType = any, ReferenceKey = any, IsTop extends 'pre_root' | 'root' | false = false> {
         //#region API
         /**
@@ -407,7 +408,7 @@ declare namespace Gun {
             work(
                 data: any,
                 pair?: any,
-                callback?: (data: string | void) => void,
+                callback?: (data: string | undefined) => void,
                 opt?: Partial<{
                     name: 'SHA-256' | 'PBKDF2';
                     encode: 'base64' | 'base32' | 'base16';

From 59e2be52c01bf3baafaa6be3a2f8af38e5f51476 Mon Sep 17 00:00:00 2001
From: Craig Boland <craig.boland@gmail.com>
Date: Tue, 19 Mar 2019 01:23:45 -0500
Subject: [PATCH 775/924] Fix return types on several column() functions.
 (#33922)

* Fix return type for column().index().
https://datatables.net/reference/api/column().index()

Correct return type of column().footer().
https://datatables.net/reference/api/column().footer()

Correct return type of column().nodes().
https://datatables.net/reference/api/column().nodes()

* Correct return type of column functions.
---
 types/datatables.net/datatables.net-tests.ts | 32 +++++++++-----------
 types/datatables.net/index.d.ts              |  8 ++---
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index d6903ce1db..bdb10aa671 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -615,7 +615,7 @@ dt.columns('.select-filter').eq(0).each((colIdx: any) => {
     // Create the select list and search operation
     const select = $('<select />')
         .appendTo(
-        dt.column(colIdx).footer()
+            dt.column(colIdx).footer()
         )
         .on('change', () => {
             dt
@@ -656,8 +656,8 @@ $('#listData').html(
 const columns_dataSrc = columns.dataSrc();
 // alert('Data source: ' + dt.columns([0, 1]).dataSrc().join(' '));
 
-const columns_footer = columns.footer();
-const columns_header = columns.header();
+const columns_footer: HTMLElement = columns.footer();
+const columns_header: HTMLElement = columns.header();
 let columns_indexes = columns.indexes();
 columns_indexes = columns.indexes("visibile");
 const columns_nodes = columns.nodes();
@@ -674,7 +674,7 @@ columns_search_set = columns.search("string", true);
 columns_search_set = columns.search("string", true, false);
 columns_search_set = columns.search("string", true, false, true);
 
-const columns_visible_get = columns.visible();
+const columns_visible_get: boolean = columns.visible();
 let columns_visible_set = columns.visible(false);
 columns_visible_set = columns.visible(false, true);
 // Hide a column
@@ -690,8 +690,8 @@ column = dt.column("selector", modifier);
 dt.column(0).visible(false);
 
 $('#example tbody').on('click', 'td', () => {
-    const visIdx = $(this).index();
-    const dataIdx = dt.column.index('fromVisible', visIdx);
+    const visIdx: number = $(this).index();
+    const dataIdx: number = dt.column.index('fromVisible', visIdx);
     alert('Column data index:');
 });
 
@@ -699,7 +699,7 @@ const column_cache = column.cache("order");
 // Create the select list and search operation
 const select = $('<select />')
     .appendTo(
-    dt.column(0).footer()
+        dt.column(0).footer()
     )
     .on('change', () => {
         dt
@@ -735,7 +735,7 @@ $('#example').on('click', 'tbody td', () => {
     alert('Data source: ' + dt.column(idx).dataSrc());
 });
 
-const column_footer = column.footer();
+const column_footer: HTMLElement = column.footer();
 const column_p = dt.column(0);
 // $(column.footer()).html(
 //    column_p
@@ -745,15 +745,15 @@ const column_p = dt.column(0);
 //    })
 //    );
 
-const column_header = column.header();
+const column_header: HTMLElement = column.header();
 $('#example tbody').on('click', 'td', function() {
     const idx = dt.cell(this).index().column;
-    const title = dt.column(idx).header();
+    const title: HTMLElement = dt.column(idx).header();
 
     alert('Column title clicked on: ' + $(title).html());
 });
 
-let column_index = column.index();
+let column_index: number = column.index();
 column_index = column.index("visibile");
 dt.column(0).visible(false);
 
@@ -762,11 +762,9 @@ alert(idx); // will show 0
 
 dt.column('0:visible').order('asc');
 
-const column_nodes = column.nodes();
-dt.column(-1)
-    .nodes();
-// .to$()      // Convert to a jQuery object
-// .addClass('ready');
+const column_nodes: DataTables.Api = column.nodes();
+column_nodes.to$()      // Convert to a jQuery object
+            .addClass('ready');
 
 const column_search_get = column.search();
 let column_search_set = column.search("string");
@@ -784,7 +782,7 @@ dt.columns('.select-filter').eq(0).each((colIdx: any) => {
     // Create the select list and search operation
     const select = $('<select />')
         .appendTo(
-        dt.column(colIdx).footer()
+            dt.column(colIdx).footer()
         )
         .on('change', function() {
             dt
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 80a1b66561..6d016559e9 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -704,12 +704,12 @@ declare namespace DataTables {
         /**
          * Get the footer th / td cell for the selected column.
          */
-        footer(): any;
+        footer(): HTMLElement;
 
         /**
          * Get the header th / td cell for a column.
          */
-        header(): Node;
+        header(): HTMLElement;
 
         /**
          * Order the table, in the direction specified, by the column selected by the column()DT selector.
@@ -766,12 +766,12 @@ declare namespace DataTables {
          *
          * @param t Specify if you want to get the column data index (default) or the visible index (visible).
          */
-        index(t?: string): Api;
+        index(t?: string): number;
 
         /**
          * Obtain the th / td nodes for the selected column
          */
-        nodes(): Api[];
+        nodes(): Api;
     }
 
     interface ColumnsMethodsModel {

From ff10b33772450788c1a0bb82c0f519618549e29c Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <kocal@live.fr>
Date: Tue, 19 Mar 2019 07:35:01 +0100
Subject: [PATCH 776/924] chore(slick): add some new tests

---
 types/slick-carousel/slick-carousel-tests.ts | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/types/slick-carousel/slick-carousel-tests.ts b/types/slick-carousel/slick-carousel-tests.ts
index 3cf05a2e0c..ff4a4991f6 100644
--- a/types/slick-carousel/slick-carousel-tests.ts
+++ b/types/slick-carousel/slick-carousel-tests.ts
@@ -233,3 +233,29 @@ $("#diaporama").slick({
     waitForAnimate: true,
     zIndex: 1000
 });
+
+// --------------------------------------------------------
+// ------------- TEST ACCESSING SLICK INSTANCE ------------
+// --------------------------------------------------------
+
+// $ExpectedType: JQuerySlick
+$("#diaporama").slick("getSlick");
+
+$("#diaporama").on('beforeChange', function(event, slick: JQuerySlick, currentSlide: number, nextSlide: number) {
+   slick.defaults; // $ExpectedType JQuerySlickOptions
+   slick.options; // $ExpectedType JQuerySlickOptions
+   slick.originalSettings; // $ExpectedType JQuerySlickOptions
+   slick.initials; // $ExpectedType JQuerySlickInitials
+
+   // Some properties of `initials` object (that are merged to the Slick instance)  
+   slick.animating; // $ExpectedType boolean
+   slick.initials.animating; // $ExpectedType boolean
+   slick.dragging; // $ExpectedType boolean
+   slick.initials.dragging; // $ExpectedType boolean
+   slick.scrolling; // $ExpectedType boolean
+   slick.initials.scrolling; // $ExpectedType boolean
+   slick.sliding; // $ExpectedType boolean
+   slick.initials.sliding; // $ExpectedType boolean
+   slick.swiping; // $ExpectedType boolean
+   slick.initials.swiping; // $ExpectedType boolean
+});

From 4eb9a90d847e96eebadbeafdc9b4381b8999f394 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Tue, 19 Mar 2019 15:27:33 +0800
Subject: [PATCH 777/924] Added type definitions for
 amap-js-api-indoor-map(IndoorMap plugin of amap-js-api)

---
 .../amap-js-api-indoor-map-tests.ts           | 114 ++++++++++++++++++
 types/amap-js-api-indoor-map/index.d.ts       | 111 +++++++++++++++++
 types/amap-js-api-indoor-map/tsconfig.json    |  24 ++++
 types/amap-js-api-indoor-map/tslint.json      |   3 +
 4 files changed, 252 insertions(+)
 create mode 100644 types/amap-js-api-indoor-map/amap-js-api-indoor-map-tests.ts
 create mode 100644 types/amap-js-api-indoor-map/index.d.ts
 create mode 100644 types/amap-js-api-indoor-map/tsconfig.json
 create mode 100644 types/amap-js-api-indoor-map/tslint.json

diff --git a/types/amap-js-api-indoor-map/amap-js-api-indoor-map-tests.ts b/types/amap-js-api-indoor-map/amap-js-api-indoor-map-tests.ts
new file mode 100644
index 0000000000..f6efc2dc54
--- /dev/null
+++ b/types/amap-js-api-indoor-map/amap-js-api-indoor-map-tests.ts
@@ -0,0 +1,114 @@
+// $ExpectType IndoorMap
+new AMap.IndoorMap();
+// $ExpectType IndoorMap
+new AMap.IndoorMap({});
+// $ExpectType IndoorMap
+const indoorMap = new AMap.IndoorMap({
+    zIndex: 1,
+    opacity: 0.5,
+    cursor: 'cursor',
+    hideFloorBar: false,
+    alaysShow: true
+});
+
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId');
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', (error, result) => {
+    // $ExpectType Error | null
+    error;
+    // $ExpectType SearchResult
+    result;
+    // $ExpectType string
+    result.id;
+    // $ExpectType 0 | 1
+    result.status;
+    if (result.status === 0) {
+        // $ExpectType Building
+        const building = result.building;
+        {
+            // $ExpectType number
+            building.floor;
+            // $ExpectType FloorDetails
+            const floorDetails = building.floor_details;
+            {
+                // $ExpectType number[]
+                floorDetails.floor_indexs;
+                // $ExpectType string[]
+                floorDetails.floor_names;
+                // $ExpectType string[]
+                floorDetails.floor_nonas;
+            }
+            // $ExpectType string
+            building.id;
+            // $ExpectType LngLat
+            building.lnglat;
+            // $ExpectType string
+            building.name;
+        }
+    } else {
+        // $ExpectType Error
+        result.error;
+    }
+});
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1);
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1, () => { });
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1, 'shopId');
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1, 'shopId', () => { });
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1, 'shopId', true);
+// $ExpectType void
+indoorMap.showIndoorMap('indoorMapId', 1, 'shopId', true, () => { });
+
+let floor: undefined | false;
+floor = indoorMap.showFloor(1);
+floor = indoorMap.showFloor(1, true);
+
+// $ExpectType void
+indoorMap.showFloorBar();
+
+// $ExpectType void
+indoorMap.hideFloorBar();
+
+// $ExpectType void
+indoorMap.hideLabels();
+
+// $ExpectType string | null
+indoorMap.getSelectedBuildingId();
+
+// $ExpectType Building | null
+const building = indoorMap.getSelectedBuilding();
+if (building) {
+    // $ExpectType number
+    building.floor;
+    // $ExpectType FloorDetails
+    building.floor_details;
+    // $ExpectType string
+    building.id;
+    // $ExpectType LngLat
+    building.lnglat;
+    // $ExpectType string
+    building.name;
+}
+
+indoorMap.on('complete', (event: AMap.IndoorMap.EventMap['complete']) => {
+    // $ExpectType "complete"
+    event.type;
+});
+
+indoorMap.on('click', (event: AMap.IndoorMap.EventMap['click']) => {
+    // $ExpectType string
+    event.building_id;
+    // $ExpectType number
+    event.floor;
+    // $ExpectType LngLat
+    event.lnglat;
+    // $ExpectType Shop
+    event.shop;
+    // $ExpectType "click"
+    event.type;
+});
diff --git a/types/amap-js-api-indoor-map/index.d.ts b/types/amap-js-api-indoor-map/index.d.ts
new file mode 100644
index 0000000000..b19082e926
--- /dev/null
+++ b/types/amap-js-api-indoor-map/index.d.ts
@@ -0,0 +1,111 @@
+// Type definitions for non-npm package amap-js-api-indoor-map 1.4
+// Project: https://lbs.amap.com/api/javascript-api/reference/indoormap
+// Definitions by: breeze9527 <https://github.com/breeze9527>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="amap-js-api" />
+
+declare namespace AMap {
+    namespace IndoorMap {
+        interface EventMap {
+            complete: Event<'complete'>;
+            click: MouseEvent<'click'>;
+
+            floor_complete: Event<'floor_complete', SearchResult>;
+            mouseover: MouseEvent<'mouseover'>;
+            mouseout: MouseEvent<'mouseout'>;
+        }
+        type MouseEvent<N extends string> = Event<N, {
+            building_id: string;
+            lnglat: LngLat;
+            floor: number;
+            shop: Shop;
+        }>;
+        interface Options extends Layer.Options {
+            zIndex?: number;
+            opacity?: number;
+            cursor?: string;
+            hideFloorBar?: boolean;
+            alaysShow?: boolean;
+            // internal
+            visible?: boolean;
+            featurezIndex?: number;
+            zooms?: [number, number];
+            disableIconRender?: boolean;
+            disableLabelRender?: boolean;
+            disableHoverMarker?: boolean;
+            autoLoadBuildingsInTile?: boolean;
+        }
+        interface FloorDetails {
+            floor_indexs: number[];
+            floor_nonas: string[];
+            floor_names: string[];
+        }
+        type ShopCategory = 'public' | 'connection' | 'shop';
+        interface Shop {
+            id: string;
+            poiId: string;
+            building_id: string;
+            name: string;
+            lnglat: LngLat;
+            category: ShopCategory;
+        }
+        interface Building {
+            id: string;
+            name: string;
+            lnglat: LngLat;
+            floor: number;
+            floor_details: FloorDetails;
+        }
+        interface SearchSuccessResult {
+            id: string;
+            status: 0;
+            building: Building;
+        }
+        interface SearchErrorResult {
+            id: string;
+            status: 1;
+            error: Error;
+        }
+        type SearchResult = SearchSuccessResult | SearchErrorResult;
+    }
+
+    class IndoorMap extends Layer {
+        constructor(options?: IndoorMap.Options);
+        showIndoorMap(
+            indoorId: string,
+            floor?: number,
+            shopId?: string,
+            noMove?: boolean,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
+        showIndoorMap(
+            indoorId: string,
+            floor?: number,
+            shopId?: string,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
+        showIndoorMap(
+            indoorId: string,
+            floor?: number,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
+        showIndoorMap(
+            indoorId: string,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
+
+        showFloor(floor: number, noMove?: boolean): false | undefined;
+        showFloorBar(): void;
+        hideFloorBar(): void;
+        showLabels(): void;
+        hideLabels(): void;
+        getSelectedBuildingId(): string | null;
+        getSelectedBuilding(): IndoorMap.Building | null;
+
+        // internal
+        getFloorBar(): void;
+        setSelectedBuildingId(id: string): void;
+    }
+}
diff --git a/types/amap-js-api-indoor-map/tsconfig.json b/types/amap-js-api-indoor-map/tsconfig.json
new file mode 100644
index 0000000000..da736c3c7b
--- /dev/null
+++ b/types/amap-js-api-indoor-map/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "amap-js-api-indoor-map-tests.ts"
+    ]
+}
diff --git a/types/amap-js-api-indoor-map/tslint.json b/types/amap-js-api-indoor-map/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/amap-js-api-indoor-map/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From f635e16c61f236b1feab4e75ac4b12f066b118ef Mon Sep 17 00:00:00 2001
From: Jeow Li Huan <huan086@gmail.com>
Date: Mon, 18 Mar 2019 19:16:00 +0800
Subject: [PATCH 778/924] [react-alert] Update react-alert to 5.2.

---
 types/react-alert/index.d.ts            | 100 ++++++++++++++++++------
 types/react-alert/react-alert-tests.tsx |  90 +++++++++++----------
 2 files changed, 126 insertions(+), 64 deletions(-)

diff --git a/types/react-alert/index.d.ts b/types/react-alert/index.d.ts
index 6c94da77b0..5334de3571 100644
--- a/types/react-alert/index.d.ts
+++ b/types/react-alert/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-alert 4.0
+// Type definitions for react-alert 5.2
 // Project: https://github.com/schiehll/react-alert
 // Definitions by: Yue Yang <https://github.com/g1eny0ung>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,16 +8,49 @@ import * as React from 'react';
 
 export type AlertPosition =
     | 'top left'
-    | 'top right'
     | 'top center'
+    | 'top right'
+    | 'middle left'
+    | 'middle'
+    | 'middle right'
     | 'bottom left'
-    | 'bottom right'
-    | 'bottom center';
+    | 'bottom center'
+    | 'bottom right';
+
+export interface Positions {
+    TOP_LEFT: 'top left';
+    TOP_CENTER: 'top center';
+    TOP_RIGHT: 'top right';
+    MIDDLE_LEFT: 'middle left';
+    MIDDLE: 'middle';
+    MIDDLE_RIGHT: 'middle right';
+    BOTTOM_LEFT: 'bottom left';
+    BOTTOM_CENTER: 'bottom center';
+    BOTTOM_RIGHT: 'bottom right';
+}
+
+export const positions: Positions;
 
 export type AlertType = 'info' | 'success' | 'error';
+
+export interface Types {
+    INFO: 'info';
+    SUCCESS: 'success';
+    ERROR: 'error';
+}
+
+export const types: Types;
+
 export type AlertTransition = 'fade' | 'scale';
 
-export interface ProviderOptions {
+export interface Transitions {
+    FADE: 'fade';
+    SCALE: 'scale';
+}
+
+export const transitions: Transitions;
+
+export interface AlertProviderProps extends React.HTMLAttributes<HTMLDivElement> {
     /**
      * The margin of each alert
      *
@@ -49,18 +82,33 @@ export interface ProviderOptions {
      */
     transition?: AlertTransition;
     /**
-     * The z-index of alerts
+     * The style of the alert container
      *
-     * Default value: 100
+     * Default z-index value: 100
      */
-    zIndex?: number;
+    containerStyle?: React.CSSProperties;
+    /**
+     * The alert component for each message
+     */
+    template: React.ComponentType<AlertComponentPropsWithStyle>;
+    /**
+     * Custom context to separate alerts.
+     */
+    context?: React.Context<AlertManager | undefined>;
 }
 
-export class Provider extends React.Component<ProviderOptions & {
-    template: React.ComponentType
-}> {}
+export interface AlertComponentProps {
+    id: string;
+    message: React.ReactNode;
+    options: AlertCustomOptionsWithType;
+    close(): void;
+}
 
-export const Alert: React.Consumer<InjectedAlertProp>;
+export interface AlertComponentPropsWithStyle extends AlertComponentProps {
+    style: React.CSSProperties;
+}
+
+export class Provider extends React.Component<AlertProviderProps> {}
 
 export interface AlertCustomOptions {
     /**
@@ -70,28 +118,32 @@ export interface AlertCustomOptions {
     /**
      * Callback that will be executed after this alert open
      */
-    onOpen?(): undefined;
+    onOpen?(): void;
     /**
      * Callback that will be executed after this alert is removed
      */
-    onClose?(): undefined;
+    onClose?(): void;
 }
 
 export interface AlertCustomOptionsWithType extends AlertCustomOptions {
     type?: AlertType;
 }
 
-export interface InjectedAlertProp {
+export interface AlertManager {
+    root?: HTMLElement;
+    alerts: AlertComponentProps[];
     show(
-        message?: string,
+        message?: React.ReactNode,
         options?: AlertCustomOptionsWithType
-    ): InjectedAlertProp;
-    remove(alert: InjectedAlertProp): undefined;
-    success(message?: string, options?: AlertCustomOptions): InjectedAlertProp;
-    error(message?: string, options?: AlertCustomOptions): InjectedAlertProp;
-    info(message?: string, options?: AlertCustomOptions): InjectedAlertProp;
+    ): AlertComponentProps;
+    remove(alert: AlertComponentProps): void;
+    success(message?: React.ReactNode, options?: AlertCustomOptions): AlertComponentProps;
+    error(message?: React.ReactNode, options?: AlertCustomOptions): AlertComponentProps;
+    info(message?: React.ReactNode, options?: AlertCustomOptions): AlertComponentProps;
 }
 
-export function withAlert<P extends { alert: InjectedAlertProp }>(
-    c: React.ComponentType<P>
-): React.ComponentType<Pick<P, Exclude<keyof P, 'alert'>>>;
+export function withAlert<P extends { alert: AlertManager }>(context?: React.Context<AlertManager | undefined>):
+    (c: React.ComponentType<P>) =>
+        React.ComponentType<Pick<P, Exclude<keyof P, 'alert'>>>;
+
+export function useAlert(context?: React.Context<AlertManager | undefined>): AlertManager;
diff --git a/types/react-alert/react-alert-tests.tsx b/types/react-alert/react-alert-tests.tsx
index c6088a52a8..64a4e5cf97 100644
--- a/types/react-alert/react-alert-tests.tsx
+++ b/types/react-alert/react-alert-tests.tsx
@@ -1,20 +1,28 @@
 import * as React from 'react';
 import {
+    AlertComponentPropsWithStyle,
+    AlertManager,
     Provider as AlertProvider,
-    Alert,
+    AlertProviderProps,
+    useAlert,
     withAlert,
-    AlertPosition,
-    AlertTransition,
-    ProviderOptions,
-    InjectedAlertProp
 } from 'react-alert';
 
-class AppWithoutAlert extends React.Component<{ alert: InjectedAlertProp }> {
+class AppWithoutAlert extends React.Component<{ alert: AlertManager }> {
     render() {
         return (
             <button
                 onClick={() => {
-                    this.props.alert.show('Oh look, an alert!');
+                    this.props.alert.show(
+                        'Oh look, an alert!',
+                        {
+                            type: 'info',
+                            timeout: 1000,
+                            onOpen(): void {
+                            },
+                            onClose(): void {
+                            }
+                        });
                 }}
             >
                 Show Alert
@@ -23,27 +31,32 @@ class AppWithoutAlert extends React.Component<{ alert: InjectedAlertProp }> {
     }
 }
 
-const App = withAlert(AppWithoutAlert);
+const customContext = React.createContext<AlertManager | undefined>(undefined);
 
-class AppAlert extends React.Component {
-    render() {
-        return (
-            <Alert>
-                {alert => (
-                    <button
-                        onClick={() => {
-                            alert.show('Oh look, an alert!');
-                        }}
-                    >
-                        Show Alert
-                    </button>
-                )}
-            </Alert>
-        );
-    }
-}
+const App = withAlert(customContext)(AppWithoutAlert);
 
-class AlertTemplate extends React.Component<any> {
+const AlertHook = (): JSX.Element => {
+    const alert = useAlert();
+    return (
+        <button
+            onClick={() => {
+                alert.info(
+                    <div style={{ color: 'blue' }}>Some Message</div>,
+                    {
+                        timeout: 1000,
+                        onOpen(): void {
+                        },
+                        onClose(): void {
+                        }
+                    });
+            }}
+        >
+            Show Alert
+        </button>
+    );
+};
+
+class AlertTemplate extends React.Component<AlertComponentPropsWithStyle> {
     render() {
         // the style contains only the margin given as offset
         // options contains all alert given options
@@ -63,28 +76,25 @@ class AlertTemplate extends React.Component<any> {
     }
 }
 
-const options: ProviderOptions = {
-    position: 'bottom center' as AlertPosition,
+const options: AlertProviderProps = {
+    position: 'bottom center',
     timeout: 5000,
     offset: '30px',
-    transition: 'scale' as AlertTransition
+    transition: 'scale',
+    context: customContext,
+    className: 'cssClass',
+    template: AlertTemplate,
+    containerStyle: {
+        margin: 5,
+    },
 };
 
 class Root extends React.Component {
     render() {
         return (
-            <AlertProvider template={AlertTemplate} {...options}>
+            <AlertProvider {...options}>
                 <App />
-            </AlertProvider>
-        );
-    }
-}
-
-class RootAlert extends React.Component {
-    render() {
-        return (
-            <AlertProvider template={AlertTemplate} {...options}>
-                <AppAlert />
+                <AlertHook />
             </AlertProvider>
         );
     }

From 1f5666e4e012bc7e96a881a1f74a8b846bd0ae72 Mon Sep 17 00:00:00 2001
From: AntoineDoubovetzky <antoined@bam.tech>
Date: Tue, 19 Mar 2019 11:57:46 +0100
Subject: [PATCH 779/924] update default import

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

diff --git a/types/react-scrollable-anchor/index.d.ts b/types/react-scrollable-anchor/index.d.ts
index 9459918b15..234c6db9c0 100644
--- a/types/react-scrollable-anchor/index.d.ts
+++ b/types/react-scrollable-anchor/index.d.ts
@@ -11,7 +11,6 @@ export interface ScrollableAnchorProps {
   children?: React.ReactNode;
 }
 
-declare const ScrollableAnchor: React.ComponentType<ScrollableAnchorProps>;
 
 export interface ConfigureAnchorsOptions {
   offset?: number;
@@ -19,7 +18,7 @@ export interface ConfigureAnchorsOptions {
   keepLastAnchorHash?: boolean;
 }
 
-export default ScrollableAnchor;
+export default class ScrollableAnchor extends React.Component<ScrollableAnchorProps> { }
 export function goToTop(): void;
 export function configureAnchors(options: ConfigureAnchorsOptions): void;
 export function goToAnchor(anchorId: string, saveHashUpdate?: boolean): void;

From b8c3bc11908e8998a66f6b1b495d2317cf46bbb9 Mon Sep 17 00:00:00 2001
From: Damien SOREL <damien.sorel@sogelink.fr>
Date: Tue, 19 Mar 2019 12:53:27 +0100
Subject: [PATCH 780/924] Rename test file

---
 .../{jest-console-tests.ts => wordpress__jest-console-tests.ts}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename types/wordpress__jest-console/{jest-console-tests.ts => wordpress__jest-console-tests.ts} (100%)

diff --git a/types/wordpress__jest-console/jest-console-tests.ts b/types/wordpress__jest-console/wordpress__jest-console-tests.ts
similarity index 100%
rename from types/wordpress__jest-console/jest-console-tests.ts
rename to types/wordpress__jest-console/wordpress__jest-console-tests.ts

From e25963aeeccd01c8c6281f97cc77e9fbb6c78d40 Mon Sep 17 00:00:00 2001
From: Aditya Srinivasan <aditya.srinivasan11@gmail.com>
Date: Tue, 19 Mar 2019 20:06:26 +0800
Subject: [PATCH 781/924] Type-Parameterize React.ReactElement

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

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 926a8f7e9f..6c9334c670 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -105,7 +105,7 @@ export interface DroppableProvidedProps {
 }
 export interface DroppableProvided {
     innerRef(element: HTMLElement | null): any;
-    placeholder?: React.ReactElement | null;
+    placeholder?: React.ReactElement<HTMLElement> | null;
     droppableProps: DroppableProvidedProps;
 }
 
@@ -122,7 +122,7 @@ export interface DroppableProps {
     isDropDisabled?: boolean;
     isCombineEnabled?: boolean;
     direction?: 'vertical' | 'horizontal';
-    children(provided: DroppableProvided, snapshot: DroppableStateSnapshot): React.ReactElement;
+    children(provided: DroppableProvided, snapshot: DroppableStateSnapshot): React.ReactElement<HTMLElement>;
 }
 
 export class Droppable extends React.Component<DroppableProps> { }
@@ -176,7 +176,7 @@ export interface DraggableProvided {
 
     // will be removed after move to react 16
     innerRef(element?: HTMLElement | null): any;
-    placeholder?: React.ReactElement | null;
+    placeholder?: React.ReactElement<HTMLElement> | null;
 }
 
 export interface DraggableStateSnapshot {
@@ -205,7 +205,7 @@ export interface DraggableProps {
     index: number;
     isDragDisabled?: boolean;
     disableInteractiveElementBlocking?: boolean;
-    children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement;
+    children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement<HTMLElement>;
     type?: TypeId;
     shouldRespectForceTouch?: boolean;
 }

From abbb7c22b5b650aa46d69fe885713259206a490f Mon Sep 17 00:00:00 2001
From: lloiser <lukasberanek@gmx.net>
Date: Tue, 19 Mar 2019 14:15:09 +0100
Subject: [PATCH 782/924] [counterpart] add translate method

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

diff --git a/types/counterpart/counterpart-tests.ts b/types/counterpart/counterpart-tests.ts
index db9f1cf5d6..850b026ecf 100644
--- a/types/counterpart/counterpart-tests.ts
+++ b/types/counterpart/counterpart-tests.ts
@@ -2,6 +2,8 @@ import * as counterpart from 'counterpart';
 
 counterpart('translation.to.be.used');
 counterpart(['translation', 'to', 'be', 'used']);
+counterpart.translate('translation.to.be.used');
+counterpart.translate(['translation', 'to', 'be', 'used']);
 
 counterpart.setSeparator('*');
 
diff --git a/types/counterpart/index.d.ts b/types/counterpart/index.d.ts
index f09ad0708c..3fd0caeac7 100644
--- a/types/counterpart/index.d.ts
+++ b/types/counterpart/index.d.ts
@@ -9,6 +9,7 @@ type LocaleChangeHandler = (newLocale: string, oldLocale: string) => void;
 
 interface Counterpart {
     (key: string|string[], options?: object): string;
+    translate(key: string|string[], options?: object): string;
 
     setSeparator(value: string): string;
     onTranslationNotFound(callback: NotFoundHandler): void;

From 5e4e3674a18da019f21a14d349f83d6b558ef9c2 Mon Sep 17 00:00:00 2001
From: AntoineDoubovetzky <antoined@bam.tech>
Date: Tue, 19 Mar 2019 15:02:36 +0100
Subject: [PATCH 783/924] remove consecutive blank line

---
 types/react-scrollable-anchor/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react-scrollable-anchor/index.d.ts b/types/react-scrollable-anchor/index.d.ts
index 234c6db9c0..ea495dd0f7 100644
--- a/types/react-scrollable-anchor/index.d.ts
+++ b/types/react-scrollable-anchor/index.d.ts
@@ -11,7 +11,6 @@ export interface ScrollableAnchorProps {
   children?: React.ReactNode;
 }
 
-
 export interface ConfigureAnchorsOptions {
   offset?: number;
   scrollDuration?: number;

From 4ad4a3c54fb6aacb080186cb1d00f1ddc4e30f69 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 19 Mar 2019 09:18:03 -0700
Subject: [PATCH 784/924] Update project urls from npm

---
 types/restify/index.d.ts             | 2 +-
 types/storybook-addon-jsx/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 5dad7503b6..0df229f1cc 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for restify 7.2
-// Project: https://github.com/restify/node-restify, http://restifyjs.com
+// Project: https://github.com/restify/node-restify, http://restify.com
 // Definitions by: Bret Little <https://github.com/blittle>
 //                 Steve Hipwell <https://github.com/stevehipwell>
 //                 Leandro Almeida <https://github.com/leanazulyoro>
diff --git a/types/storybook-addon-jsx/index.d.ts b/types/storybook-addon-jsx/index.d.ts
index e3fbd63368..c4371d4c07 100644
--- a/types/storybook-addon-jsx/index.d.ts
+++ b/types/storybook-addon-jsx/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for storybook-addon-jsx 5.4
-// Project: https://github.com/storybooks/storybook
+// Project: https://github.com/storybooks/addon-jsx
 // Definitions by: James Newell <https://github.com/jameslnewell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8

From 9e9949c5b0ababa9207ec1f5d916feeb6ae49e6f Mon Sep 17 00:00:00 2001
From: Andrew Leedham <AndrewLeedham@Outlook.com>
Date: Tue, 19 Mar 2019 16:03:49 +0000
Subject: [PATCH 785/924] fix(node-fetch): make systemError optional

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 03ae639d26..8883dc1b9d 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -4,6 +4,7 @@
 //                 Niklas Lindgren <https://github.com/nikcorg>
 //                 Vinay Bedre <https://github.com/vinaybedre>
 //                 Antonio Román <https://github.com/kyranet>
+//                 Andrew Leedham <https://github.com/AndrewLeedham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -134,7 +135,7 @@ export class Body {
 
 export class FetchError extends Error {
     name: "FetchError";
-    constructor(message: string, type: string, systemError: string);
+    constructor(message: string, type: string, systemError?: string);
     type: string;
     code?: string;
     errno?: string;

From 576c81e41be1cae94d85ccfc955aaf86afc80f3d Mon Sep 17 00:00:00 2001
From: Andrew Leedham <AndrewLeedham@Outlook.com>
Date: Tue, 19 Mar 2019 16:16:37 +0000
Subject: [PATCH 786/924] test(node-fetch): added FetchError test

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

diff --git a/types/node-fetch/node-fetch-tests.ts b/types/node-fetch/node-fetch-tests.ts
index d35114f60a..165ac24800 100644
--- a/types/node-fetch/node-fetch-tests.ts
+++ b/types/node-fetch/node-fetch-tests.ts
@@ -1,4 +1,4 @@
-import fetch, { Headers, Request, RequestInit, Response } from 'node-fetch';
+import fetch, { Headers, Request, RequestInit, Response, FetchError } from 'node-fetch';
 import { Agent } from "http";
 
 function test_fetchUrlWithOptions() {
@@ -82,3 +82,8 @@ function test_isRedirect() {
     fetch.isRedirect(301);
     fetch.isRedirect(201);
 }
+
+function test_FetchError() {
+    new FetchError('message', 'type', 'systemError');
+    new FetchError('message', 'type');
+}

From 0229272d2c2503197792bd89104d5d9455edc9d3 Mon Sep 17 00:00:00 2001
From: Luis Paulo <luis.p.durao@hotmail.com>
Date: Tue, 19 Mar 2019 16:43:44 +0000
Subject: [PATCH 787/924] Added the definition file for the
 'child-process-promise' package

---
 .../child-process-promise-tests.ts            |  15 +++
 types/child-process-promise/index.d.ts        | 113 ++++++++++++++++++
 types/child-process-promise/tsconfig.json     |  22 ++++
 types/child-process-promise/tslint.json       |   1 +
 4 files changed, 151 insertions(+)
 create mode 100644 types/child-process-promise/child-process-promise-tests.ts
 create mode 100644 types/child-process-promise/index.d.ts
 create mode 100644 types/child-process-promise/tsconfig.json
 create mode 100644 types/child-process-promise/tslint.json

diff --git a/types/child-process-promise/child-process-promise-tests.ts b/types/child-process-promise/child-process-promise-tests.ts
new file mode 100644
index 0000000000..c76f0c9a49
--- /dev/null
+++ b/types/child-process-promise/child-process-promise-tests.ts
@@ -0,0 +1,15 @@
+import * as cpp from "child-process-promise";
+
+import {
+    ChildProcess
+} from 'child_process';
+
+const a = cpp.exec("echo \"Hello world!\"");
+a.childProcess; // $ExpectType ChildProcess
+
+(async () => {
+    const at = await a;
+    at.childProcess; // $ExpectType ChildProcess
+    at.stdout; // $ExpectType string
+    at.stderr; // $ExpectType string
+})();
\ No newline at end of file
diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
new file mode 100644
index 0000000000..2740c8e197
--- /dev/null
+++ b/types/child-process-promise/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for child-process-promise 2.2.1
+// Project: https://github.com/TheDSCPL/types_child-process-promise
+// Definitions by: Luis Paulo <https://github.com/TheDSCPL>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3.3
+
+/// <reference types="node" />
+
+// import child_process = require('child_process');
+import {
+    ChildProcess,
+    ExecFileOptionsWithBufferEncoding, ExecFileOptionsWithOtherEncoding,
+    ExecFileOptionsWithStringEncoding,
+    ExecOptions,
+    ForkOptions,
+    SpawnOptions
+} from 'child_process';
+
+export = cpp;
+export as namespace cpp;
+
+/**
+ * Simple wrapper around the child_process module that makes use of promises
+ */
+declare namespace cpp {
+    interface PromiseResult<Enc extends string|Buffer> {
+        childProcess: ChildProcess,
+        stdout: Enc,
+        stderr: Enc
+    }
+
+    interface SpawnPromiseResult extends PromiseResult<string> {
+        code: number
+    }
+
+    interface ChildProcessPromise<T> extends Promise<T> {
+        childProcess: ChildProcess
+    }
+
+    export interface Options {
+        /**
+         * Pass an additional capture option to buffer the result of stdout and/or stderr
+         * Default: []
+         */
+        capture?: []|['stdout']|['stderr']|['stdout'|'stderr']|['stderr'|'stdout'],
+        /**
+         * Array of the numbers that should be interpreted as successful execution codes
+         * Default: [0]
+         */
+        successfulExitCodes?: number[]
+    }
+
+    export function  exec(
+        command: Readonly<string>,
+        options: Readonly<Options & { encoding: "buffer" | null } & ExecOptions>
+    ): ChildProcessPromise<PromiseResult<Buffer>>;
+    export function  exec(
+        command: Readonly<string>,
+        options: Readonly<Options & { encoding?: BufferEncoding } & ExecOptions>
+    ): ChildProcessPromise<PromiseResult<string>>;
+    export function  exec(
+        command: Readonly<string>,
+        options: Readonly<Options & { encoding?: string } & ExecOptions>
+    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
+    export function  exec(
+        command: Readonly<string>,
+        options?: Readonly<Options & ExecOptions>
+    ): ChildProcessPromise<PromiseResult<string>>;
+
+    export function  execFile(
+        file: Readonly<string>,
+        options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
+    ): ChildProcessPromise<PromiseResult<Buffer>>;
+    export function  execFile(
+        file: Readonly<string>,
+        args: ReadonlyArray<string> | null,
+        options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
+    ): ChildProcessPromise<PromiseResult<Buffer>>;
+    export function  execFile(
+        file: Readonly<string>,
+        options: Readonly<Options & ExecFileOptionsWithStringEncoding>
+    ): ChildProcessPromise<PromiseResult<string>>;
+    export function  execFile(
+        file: Readonly<string>,
+        args: ReadonlyArray<string> | null,
+        options: Readonly<Options & ExecFileOptionsWithStringEncoding>
+    ): ChildProcessPromise<PromiseResult<string>>;
+    export function  execFile(
+        file: Readonly<string>,
+        options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
+    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
+    export function  execFile(
+        file: Readonly<string>,
+        args: ReadonlyArray<string> | null,
+        options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
+    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
+    export function  execFile(
+        file: Readonly<string>,
+        args?: ReadonlyArray<string> | null
+    ): ChildProcessPromise<PromiseResult<string>>;
+
+    export function  spawn(
+        command: Readonly<string>,
+        args?: ReadonlyArray<string> | null,
+        options?: Readonly<Options & SpawnOptions>
+    ): ChildProcessPromise<SpawnPromiseResult>;
+
+    export function fork(
+        modulePath: string,
+        args?: ReadonlyArray<string>,
+        options?: Readonly<Options & ForkOptions>
+    ): ChildProcessPromise<SpawnPromiseResult>;
+}
diff --git a/types/child-process-promise/tsconfig.json b/types/child-process-promise/tsconfig.json
new file mode 100644
index 0000000000..0f3bf72033
--- /dev/null
+++ b/types/child-process-promise/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "child-process-promise-tests.ts"
+    ]
+}
diff --git a/types/child-process-promise/tslint.json b/types/child-process-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/child-process-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ec8e6f7e5934335e597cfc3e7f450fa31742d21a Mon Sep 17 00:00:00 2001
From: Sean Genabe <seanmarviolivergenabe@gmail.com>
Date: Wed, 20 Mar 2019 04:10:15 +0800
Subject: [PATCH 788/924] add type definitions for then-eos

---
 types/then-eos/index.d.ts        | 12 ++++++++++++
 types/then-eos/then-eos-tests.ts | 10 ++++++++++
 types/then-eos/tsconfig.json     | 23 +++++++++++++++++++++++
 types/then-eos/tslint.json       |  1 +
 4 files changed, 46 insertions(+)
 create mode 100644 types/then-eos/index.d.ts
 create mode 100644 types/then-eos/then-eos-tests.ts
 create mode 100644 types/then-eos/tsconfig.json
 create mode 100644 types/then-eos/tslint.json

diff --git a/types/then-eos/index.d.ts b/types/then-eos/index.d.ts
new file mode 100644
index 0000000000..bd44297d51
--- /dev/null
+++ b/types/then-eos/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for then-eos 1.0
+// Project: https://github.com/meoguru/node-then-eos
+// Definitions by: Sean Marvi Oliver Genabe <https://github.com/seangenabe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+type Stream = NodeJS.ReadableStream | NodeJS.WritableStream;
+
+declare function thenEos(stream: Stream): Promise<void>;
+
+export = thenEos;
diff --git a/types/then-eos/then-eos-tests.ts b/types/then-eos/then-eos-tests.ts
new file mode 100644
index 0000000000..7715f88009
--- /dev/null
+++ b/types/then-eos/then-eos-tests.ts
@@ -0,0 +1,10 @@
+import eos = require("then-eos");
+
+declare const readable: NodeJS.ReadableStream;
+declare const writable: NodeJS.WritableStream;
+
+// $ExpectType Promise<void>
+eos(readable);
+
+// $ExpectType Promise<void>
+eos(writable);
diff --git a/types/then-eos/tsconfig.json b/types/then-eos/tsconfig.json
new file mode 100644
index 0000000000..4f0567eb78
--- /dev/null
+++ b/types/then-eos/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "then-eos-tests.ts"
+    ]
+}
diff --git a/types/then-eos/tslint.json b/types/then-eos/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/then-eos/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1f8ed6f5ad779578da893f39af5bdb2b28c9a73a Mon Sep 17 00:00:00 2001
From: James Lismore <jlismore@gmail.com>
Date: Tue, 19 Mar 2019 16:48:21 -0400
Subject: [PATCH 789/924] Extend anchor props

---
 types/react-csv/components/Link.d.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/react-csv/components/Link.d.ts b/types/react-csv/components/Link.d.ts
index 3e133095de..7719d1405e 100644
--- a/types/react-csv/components/Link.d.ts
+++ b/types/react-csv/components/Link.d.ts
@@ -1,5 +1,15 @@
 import { Component } from "react";
 import { CommonPropTypes } from "./CommonPropTypes";
 
-export default class Link extends Component<CommonPropTypes> {
-}
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+interface LinkProps
+    extends CommonPropTypes,
+        Omit<
+            React.DetailedHTMLProps<
+                React.AnchorHTMLAttributes<HTMLAnchorElement>,
+                HTMLAnchorElement
+            >,
+            "onClick"
+        > {}
+export default class Link extends Component<LinkProps> {}

From e2106c93e4b3b623ac63c62ed1fbedb29db43946 Mon Sep 17 00:00:00 2001
From: James Lismore <jlismore@gmail.com>
Date: Tue, 19 Mar 2019 16:52:37 -0400
Subject: [PATCH 790/924] Add test

---
 types/react-csv/react-csv-tests.tsx | 263 +++++++++++++++++++++++-----
 1 file changed, 216 insertions(+), 47 deletions(-)

diff --git a/types/react-csv/react-csv-tests.tsx b/types/react-csv/react-csv-tests.tsx
index a099d60626..4153879fea 100644
--- a/types/react-csv/react-csv-tests.tsx
+++ b/types/react-csv/react-csv-tests.tsx
@@ -3,16 +3,16 @@ import { render } from "react-dom";
 import { CSVLink, CSVDownload } from "react-csv";
 
 const headers = [
-    {label: 'First Name', key: 'details.firstName'},
-    {label: 'Last Name', key: 'details.lastName'},
-    {label: 'Job', key: 'job'},
+    { label: "First Name", key: "details.firstName" },
+    { label: "Last Name", key: "details.lastName" },
+    { label: "Job", key: "job" }
 ];
 
-const headersStrings = ['foo', 'bar'];
+const headersStrings = ["foo", "bar"];
 
 const data = [
-    {details: {firstName: 'Ahmed', lastName: 'Tomi'}, job: 'manager'},
-    {details: {firstName: 'John', lastName: 'Jones'}, job: 'developer'},
+    { details: { firstName: "Ahmed", lastName: "Tomi" }, job: "manager" },
+    { details: { firstName: "John", lastName: "Jones" }, job: "developer" }
 ];
 
 const dataString = `firstname,lastname
@@ -21,57 +21,226 @@ Raed,Labes
 Yezzi,Min l3b
 `;
 
-const syncOnClickReturn = (event: React.MouseEventHandler<HTMLAnchorElement>) => {
+const syncOnClickReturn = (
+    event: React.MouseEventHandler<HTMLAnchorElement>
+) => {
     window.console.log(event);
     return true;
 };
-const syncOnClickVoid = (event: React.MouseEventHandler<HTMLAnchorElement>) => window.console.log(event);
-const asyncOnClickReturn = (event: React.MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+const syncOnClickVoid = (event: React.MouseEventHandler<HTMLAnchorElement>) =>
+    window.console.log(event);
+const asyncOnClickReturn = (
+    event: React.MouseEventHandler<HTMLAnchorElement>,
+    done: (proceed?: boolean) => void
+) => {
     window.console.log(event);
     done(true);
 };
-const asyncOnClickVoid = (event: React.MouseEventHandler<HTMLAnchorElement>, done: (proceed?: boolean) => void) => {
+const asyncOnClickVoid = (
+    event: React.MouseEventHandler<HTMLAnchorElement>,
+    done: (proceed?: boolean) => void
+) => {
     window.console.log(event);
     done();
 };
 
 const node = document.getElementById("main");
 
-render(<CSVLink data={dataString}/>, node);
-render(<CSVLink data={dataString} headers={headersStrings}/>, node);
-render(<CSVLink data={data}/>, node);
-render(<CSVLink data={data} headers={headers}/>, node);
-render(<CSVLink data={data} headers={headers}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true}
-                enclosingCharacter={`'`}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
-                onClick={syncOnClickReturn}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
-                onClick={syncOnClickVoid}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
-                onClick={asyncOnClickReturn} asyncOnClick={true}/>, node);
-render(<CSVLink data={data} headers={headers} separator={','} filename={'bob.csv'} uFEFF={true} enclosingCharacter={`'`}
-                onClick={asyncOnClickVoid} asyncOnClick={true}/>, node);
+render(<CSVLink data={dataString} />, node);
+render(<CSVLink data={dataString} headers={headersStrings} />, node);
+render(<CSVLink data={data} />, node);
+render(<CSVLink data={data} headers={headers} />, node);
+render(<CSVLink data={data} headers={headers} />, node);
+render(<CSVLink data={data} headers={headers} separator={","} />, node);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+        onClick={syncOnClickReturn}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+        onClick={syncOnClickVoid}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+        onClick={asyncOnClickReturn}
+        asyncOnClick={true}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+        onClick={asyncOnClickVoid}
+        asyncOnClick={true}
+    />,
+    node
+);
+render(
+    <CSVLink
+        data={data}
+        headers={headers}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        enclosingCharacter={`'`}
+        onClick={asyncOnClickVoid}
+        asyncOnClick={true}
+        className="test"
+        target="_blank"
+    />,
+    node
+);
 
-render(<CSVDownload data={dataString}/>, node);
-render(<CSVDownload data={dataString} headers={headersStrings}/>, node);
-render(<CSVDownload data={data}/>, node);
-render(<CSVDownload data={data} headers={headers}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}
-                    uFEFF={true}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'}
-                    uFEFF={true}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
-                    onClick={syncOnClickReturn}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
-                    onClick={syncOnClickVoid}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
-                    onClick={asyncOnClickReturn} asyncOnClick={true}/>, node);
-render(<CSVDownload data={data} headers={headers} target={'_blank'} separator={','} filename={'bob.csv'} uFEFF={true}
-                    onClick={asyncOnClickVoid} asyncOnClick={true}/>, node);
+render(<CSVDownload data={dataString} />, node);
+render(<CSVDownload data={dataString} headers={headersStrings} />, node);
+render(<CSVDownload data={data} />, node);
+render(<CSVDownload data={data} headers={headers} />, node);
+render(<CSVDownload data={data} headers={headers} target={"_blank"} />, node);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        onClick={syncOnClickReturn}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        onClick={syncOnClickVoid}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        onClick={asyncOnClickReturn}
+        asyncOnClick={true}
+    />,
+    node
+);
+render(
+    <CSVDownload
+        data={data}
+        headers={headers}
+        target={"_blank"}
+        separator={","}
+        filename={"bob.csv"}
+        uFEFF={true}
+        onClick={asyncOnClickVoid}
+        asyncOnClick={true}
+    />,
+    node
+);

From a5e81b2ecccc4122eb2335df655af28830f2ef91 Mon Sep 17 00:00:00 2001
From: Andrew Schmadel <andrewschmadel@upside.com>
Date: Tue, 19 Mar 2019 17:06:59 -0400
Subject: [PATCH 791/924] add typings for pino isLevelEnabled() method

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

diff --git a/types/pino/index.d.ts b/types/pino/index.d.ts
index 610ae076ee..ff4ba1f77c 100644
--- a/types/pino/index.d.ts
+++ b/types/pino/index.d.ts
@@ -444,6 +444,11 @@ declare namespace P {
          * Flushes the content of the buffer in extreme mode. It has no effect if extreme mode is not enabled.
          */
         flush(): void;
+
+        /**
+         * A utility method for determining if a given log level will write to the destination.
+         */
+        isLevelEnabled(level: LevelWithSilent | string): boolean;
     }
 
     type LevelChangeEventListener = (lvl: LevelWithSilent | string, val: number, prevLvl: LevelWithSilent | string, prevVal: number) => void;
diff --git a/types/pino/pino-tests.ts b/types/pino/pino-tests.ts
index 3a6283c3e4..1a64f11d99 100644
--- a/types/pino/pino-tests.ts
+++ b/types/pino/pino-tests.ts
@@ -91,6 +91,7 @@ logstderr.error('on stderr instead of stdout');
 log.useLevelLabels = true;
 log.info('lol');
 log.level === 'info';
+const isEnabled: boolean = log.isLevelEnabled('info');
 
 const extremeDest = pino.extreme();
 const logExtreme = pino(extremeDest);

From d732b0e367da866582fe23b5e06a8d6560142a11 Mon Sep 17 00:00:00 2001
From: borkaborka <4437770+borkaborka@users.noreply.github.com>
Date: Tue, 19 Mar 2019 23:28:38 +0200
Subject: [PATCH 792/924] ClientConfig.ssl: TlsOptions -> ConnectionOptions

according to:
https://github.com/brianc/node-postgres/blob/6b8176e841584b76bcbd1972bf95e50558ba7395/lib/connection.js#L97

and node.js documentation of tls.connect(), this parameter must be of type ConnectionOptions and not TlsOptions
---
 types/pg/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index 35ef7801b4..081213eb86 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -29,10 +29,10 @@ export interface Defaults extends ConnectionConfig {
     parseInt8?: boolean;
 }
 
-import { TlsOptions } from "tls";
+import { ConnectionOptions } from "tls";
 
 export interface ClientConfig extends ConnectionConfig {
-    ssl?: boolean | TlsOptions;
+    ssl?: boolean | ConnectionOptions;
 }
 
 export interface PoolConfig extends ClientConfig {

From 8bf23e99f4844ceee88f99bf27a7201a4097a7ff Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Tue, 19 Mar 2019 22:15:22 +0000
Subject: [PATCH 793/924] Corrected mistakes in definition

Corrected mistake in definition, using mozilla documentation.
---
 types/react-native-canvas/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index 65b80277ee..af79c05bde 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -165,19 +165,19 @@ export default class Canvas extends React.Component<CanvasProps> {
 }
 
 export class Image {
-    constructor(canvas: Canvas, height?: number, width?: number);
+    constructor(canvas: Canvas, height: number, width: number);
     crossOrigin: string | undefined;
-    height: number | undefined;
-    width: number | undefined;
-    src: string | undefined;
+    height: number;
+    width: number;
+    src: string;
     addEventListener: (event: string, func: (...args: any) => any) => void;
 }
 
 export class ImageData {
-    constructor(canvas: Canvas, data: number[], height: number, width: number);
+    constructor(canvas: Canvas, height: number, width: number, data?: number[], );
     readonly data: number[];
-    readonly height: number | undefined;
-    readonly width: number | undefined;
+    readonly height: number;
+    readonly width: number;
 }
 
 export class Path2D {

From d38bf22b5faa6a55bf3955b560daa4d5e8a7ec02 Mon Sep 17 00:00:00 2001
From: Eugene Wang <eugenewang@outlook.com>
Date: Tue, 19 Mar 2019 18:27:14 -0400
Subject: [PATCH 794/924] Update index.d.ts

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

diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index db8074e242..3a486b66b1 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for geojson 7946.0
+// Type definitions for non-npm package geojson 7946.0
 // Project: https://geojson.org/
 // Definitions by: Jacob Bruun <https://github.com/cobster>
 //                 Arne Schubert <https://github.com/atd-schubert>

From 619453a74056bea626029891b343e52a6168cbd5 Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com>
Date: Tue, 19 Mar 2019 23:34:08 +0100
Subject: [PATCH 795/924] [node] Add stream options autoDestroy, emitClose,
 defaultEncoding

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

diff --git a/types/node/stream.d.ts b/types/node/stream.d.ts
index ab6730c83b..a43d668092 100644
--- a/types/node/stream.d.ts
+++ b/types/node/stream.d.ts
@@ -14,6 +14,7 @@ declare module "stream" {
             objectMode?: boolean;
             read?(this: Readable, size: number): void;
             destroy?(this: Readable, error: Error | null, callback: (error: Error | null) => void): void;
+            autoDestroy?: boolean;
         }
 
         class Readable extends Stream implements NodeJS.ReadableStream {
@@ -98,11 +99,14 @@ declare module "stream" {
         interface WritableOptions {
             highWaterMark?: number;
             decodeStrings?: boolean;
+            defaultEncoding?: string;
             objectMode?: boolean;
+            emitClose?: boolean;
             write?(this: Writable, chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
             writev?(this: Writable, chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
             destroy?(this: Writable, error: Error | null, callback: (error: Error | null) => void): void;
             final?(this: Writable, callback: (error?: Error | null) => void): void;
+            autoDestroy?: boolean;
         }
 
         class Writable extends Stream implements NodeJS.WritableStream {

From 82620eab415844877df900c0b5d195ba26c0563b Mon Sep 17 00:00:00 2001
From: Jim Li <jim.li@compass.com>
Date: Tue, 19 Mar 2019 18:53:38 -0400
Subject: [PATCH 796/924] [react-dom] Change charCode to number

Changed SyntheticEventData.charCode to number in order to match
the properties listed here:

https://reactjs.org/docs/events.html#keyboard-events
---
 types/react-dom/test-utils/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-dom/test-utils/index.d.ts b/types/react-dom/test-utils/index.d.ts
index c6f46edd36..ea61a9c858 100644
--- a/types/react-dom/test-utils/index.d.ts
+++ b/types/react-dom/test-utils/index.d.ts
@@ -29,7 +29,7 @@ export interface SyntheticEventData extends OptionalEventProperties {
     clientX?: number;
     clientY?: number;
     changedTouches?: TouchList;
-    charCode?: boolean;
+    charCode?: number;
     clipboardData?: DataTransfer;
     ctrlKey?: boolean;
     deltaMode?: number;

From 1b6ddb47bae373a8842363ab191b5d8e417203c4 Mon Sep 17 00:00:00 2001
From: Leandro Soares <soares.mgleandro@gmail.com>
Date: Tue, 19 Mar 2019 00:07:43 +0000
Subject: [PATCH 797/924] Add redux seamless immutable

---
 types/redux-seamless-immutable/index.d.ts     | 16 +++++++
 types/redux-seamless-immutable/package.json   |  6 +++
 .../redux-seamless-immutable-tests.ts         | 42 +++++++++++++++++++
 types/redux-seamless-immutable/tsconfig.json  | 23 ++++++++++
 types/redux-seamless-immutable/tslint.json    |  3 ++
 5 files changed, 90 insertions(+)
 create mode 100644 types/redux-seamless-immutable/index.d.ts
 create mode 100644 types/redux-seamless-immutable/package.json
 create mode 100644 types/redux-seamless-immutable/redux-seamless-immutable-tests.ts
 create mode 100644 types/redux-seamless-immutable/tsconfig.json
 create mode 100644 types/redux-seamless-immutable/tslint.json

diff --git a/types/redux-seamless-immutable/index.d.ts b/types/redux-seamless-immutable/index.d.ts
new file mode 100644
index 0000000000..63cd632676
--- /dev/null
+++ b/types/redux-seamless-immutable/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for redux-seamless-immutable 0.4
+// Project: https://github.com/eadmundo/redux-seamless-immutable
+// Definitions by: Leandro Soares <https://github.com/SoaresMG>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import { Reducer, Action } from "redux";
+import { Immutable } from "seamless-immutable";
+
+export interface SeamlessReducers {
+    [reducerName: string]: Reducer<any, any>;
+}
+
+export function combineReducers(reducers: SeamlessReducers): Reducer;
+export function routerReducer<T extends Reducer>(state: T, action: Action): T;
+export function stateTransformer<T>(state: Immutable<T>): T;
diff --git a/types/redux-seamless-immutable/package.json b/types/redux-seamless-immutable/package.json
new file mode 100644
index 0000000000..457ab3d31e
--- /dev/null
+++ b/types/redux-seamless-immutable/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^4.0.1"
+    }
+}
\ No newline at end of file
diff --git a/types/redux-seamless-immutable/redux-seamless-immutable-tests.ts b/types/redux-seamless-immutable/redux-seamless-immutable-tests.ts
new file mode 100644
index 0000000000..cde40cd261
--- /dev/null
+++ b/types/redux-seamless-immutable/redux-seamless-immutable-tests.ts
@@ -0,0 +1,42 @@
+import { combineReducers, routerReducer, stateTransformer } from "redux-seamless-immutable";
+import { createStore, applyMiddleware, Action } from "redux";
+import { createLogger } from "redux-logger";
+
+interface State {
+    prop1: boolean;
+    prop2: string;
+}
+
+type GenericActionPayload = Action & {
+    payload: string;
+};
+
+function reducer1(state: State, action: GenericActionPayload): State {
+    const payload = action.payload;
+    return state;
+}
+
+function reducer2(state: State, action: GenericActionPayload): State {
+    const payload = action.payload;
+    return state;
+}
+
+// Test `combineReducers` and `routerReducer`
+const combined = combineReducers({
+    reducer1,
+    reducer2,
+    routerReducer
+});
+
+// Test `stateTransformer`
+const loggerMiddleware = createLogger({
+    stateTransformer
+});
+
+// Test integration with `createStore`
+const store = createStore(
+    combined,
+    applyMiddleware(
+        loggerMiddleware
+    )
+);
diff --git a/types/redux-seamless-immutable/tsconfig.json b/types/redux-seamless-immutable/tsconfig.json
new file mode 100644
index 0000000000..c5cea671f6
--- /dev/null
+++ b/types/redux-seamless-immutable/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-seamless-immutable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/redux-seamless-immutable/tslint.json b/types/redux-seamless-immutable/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/redux-seamless-immutable/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 669f49f4dd03b984f12fab42cba7c56feb5619cd Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com>
Date: Wed, 20 Mar 2019 00:23:25 +0100
Subject: [PATCH 798/924] [node] add util.types.isBigInt64Array,
 isBigUint64Array and isModuleNamespaceObject

---
 types/node/index.d.ts          | 4 ++++
 types/node/test/util.ts        | 4 ++++
 types/node/ts3.2/util.d.ts     | 5 +++++
 types/node/util.d.ts           | 1 +
 types/node/v10/index.d.ts      | 4 ++++
 types/node/v10/node-tests.ts   | 4 ++++
 types/node/v10/ts3.2/util.d.ts | 5 +++++
 types/node/v10/util.d.ts       | 1 +
 8 files changed, 28 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 498b54e52e..a2f2e583fe 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -92,4 +92,8 @@ declare module "util" {
     namespace promisify {
         const custom: symbol;
     }
+    namespace types {
+        function isBigInt64Array(value: any): boolean;
+        function isBigUint64Array(value: any): boolean;
+    }
 }
diff --git a/types/node/test/util.ts b/types/node/test/util.ts
index 14500161fd..0dd1843b9c 100644
--- a/types/node/test/util.ts
+++ b/types/node/test/util.ts
@@ -159,6 +159,10 @@ import { readFile } from 'fs';
     const teEncodeRes: Uint8Array = te.encode("TextEncoder");
 
     // util.types
+    let b: Boolean;
+    b = util.types.isBigInt64Array(15);
+    b = util.types.isBigUint64Array(15);
+    b = util.types.isModuleNamespaceObject(15);
 
     // tslint:disable-next-line:no-construct ban-types
     const maybeBoxed: number | Number = new Number(1);
diff --git a/types/node/ts3.2/util.d.ts b/types/node/ts3.2/util.d.ts
index e35ef8d0f1..a8b2487ef4 100644
--- a/types/node/ts3.2/util.d.ts
+++ b/types/node/ts3.2/util.d.ts
@@ -1,5 +1,6 @@
 // tslint:disable-next-line:no-bad-reference
 /// <reference path="../util.d.ts" />
+
 declare module "util" {
     namespace inspect {
         const custom: unique symbol;
@@ -7,4 +8,8 @@ declare module "util" {
     namespace promisify {
         const custom: unique symbol;
     }
+    namespace types {
+        function isBigInt64Array(value: any): value is BigInt64Array;
+        function isBigUint64Array(value: any): value is BigUint64Array;
+    }
 }
diff --git a/types/node/util.d.ts b/types/node/util.d.ts
index 1adf10059f..05edbfcf5b 100644
--- a/types/node/util.d.ts
+++ b/types/node/util.d.ts
@@ -127,6 +127,7 @@ declare module "util" {
         function isInt32Array(object: any): object is Int32Array;
         function isMap(object: any): boolean;
         function isMapIterator(object: any): boolean;
+        function isModuleNamespaceObject(value: any): boolean;
         function isNativeError(object: any): object is Error;
         function isNumberObject(object: any): object is Number;
         function isPromise(object: any): boolean;
diff --git a/types/node/v10/index.d.ts b/types/node/v10/index.d.ts
index ea1d259bcb..8e650d7492 100644
--- a/types/node/v10/index.d.ts
+++ b/types/node/v10/index.d.ts
@@ -84,4 +84,8 @@ declare module "util" {
     namespace promisify {
         const custom: symbol;
     }
+    namespace types {
+        function isBigInt64Array(value: any): boolean;
+        function isBigUint64Array(value: any): boolean;
+    }
 }
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
index 789b87b600..1e40139731 100644
--- a/types/node/v10/node-tests.ts
+++ b/types/node/v10/node-tests.ts
@@ -952,6 +952,10 @@ function bufferTests() {
         const teEncodeRes: Uint8Array = te.encode("TextEncoder");
 
         // util.types
+        let b: Boolean;
+        b = util.types.isBigInt64Array(15);
+        b = util.types.isBigUint64Array(15);
+        b = util.types.isModuleNamespaceObject(15);
 
         // tslint:disable-next-line:no-construct ban-types
         const maybeBoxed: number | Number = new Number(1);
diff --git a/types/node/v10/ts3.2/util.d.ts b/types/node/v10/ts3.2/util.d.ts
index e35ef8d0f1..a8b2487ef4 100644
--- a/types/node/v10/ts3.2/util.d.ts
+++ b/types/node/v10/ts3.2/util.d.ts
@@ -1,5 +1,6 @@
 // tslint:disable-next-line:no-bad-reference
 /// <reference path="../util.d.ts" />
+
 declare module "util" {
     namespace inspect {
         const custom: unique symbol;
@@ -7,4 +8,8 @@ declare module "util" {
     namespace promisify {
         const custom: unique symbol;
     }
+    namespace types {
+        function isBigInt64Array(value: any): value is BigInt64Array;
+        function isBigUint64Array(value: any): value is BigUint64Array;
+    }
 }
diff --git a/types/node/v10/util.d.ts b/types/node/v10/util.d.ts
index 9da88fe9cb..07c21bf47e 100644
--- a/types/node/v10/util.d.ts
+++ b/types/node/v10/util.d.ts
@@ -127,6 +127,7 @@ declare module "util" {
         function isInt32Array(object: any): object is Int32Array;
         function isMap(object: any): boolean;
         function isMapIterator(object: any): boolean;
+        function isModuleNamespaceObject(value: any): boolean;
         function isNativeError(object: any): object is Error;
         function isNumberObject(object: any): object is Number;
         function isPromise(object: any): boolean;

From 98ed1d9bc96f3e45153ef797295a51496d728bbe Mon Sep 17 00:00:00 2001
From: Saxon Landers <saxon@ackwell.com.au>
Date: Wed, 20 Mar 2019 13:08:11 +1100
Subject: [PATCH 799/924] Add MessageDescriptor support to i18n._

---
 types/lingui__core/i18n.d.ts             | 8 ++++++++
 types/lingui__core/index.d.ts            | 3 ++-
 types/lingui__core/lingui__core-tests.ts | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/types/lingui__core/i18n.d.ts b/types/lingui__core/i18n.d.ts
index a74ae7a7a0..6757b08142 100644
--- a/types/lingui__core/i18n.d.ts
+++ b/types/lingui__core/i18n.d.ts
@@ -6,6 +6,13 @@ export interface MessageOptions {
     formats?: object;
 }
 
+export interface MessageDescriptor {
+    id: string;
+    defaults?: string;
+    values?: object;
+    formats?: object;
+}
+
 export interface LanguageData {
     plurals?: (n: number, pluralType?: "cardinal" | "ordinal") => string;
 }
@@ -62,6 +69,7 @@ export class I18n {
     use(language: string): I18n;
 
     _(id: string, values?: object, messageOptions?: MessageOptions): string;
+    _(id: MessageDescriptor): string;
 
     pluralForm(n: number, pluralType?: "cardinal" | "ordinal"): string;
 }
diff --git a/types/lingui__core/index.d.ts b/types/lingui__core/index.d.ts
index c2243ba558..efb0fed409 100644
--- a/types/lingui__core/index.d.ts
+++ b/types/lingui__core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @lingui/core 2.2
+// Type definitions for @lingui/core 2.7
 // Project: https://lingui.github.io/js-lingui/, https://github.com/lingui/js-lingui
 // Definitions by: Jeow Li Huan <https://github.com/huan086>
 // Definitions: https://github.com/huan086/lingui-typings
@@ -9,6 +9,7 @@ export {
     setupI18n,
     Catalog,
     Catalogs,
+    MessageDescriptor,
     MessageOptions,
     LanguageData,
     I18n
diff --git a/types/lingui__core/lingui__core-tests.ts b/types/lingui__core/lingui__core-tests.ts
index 09af3e1e4f..69a7a87a6e 100644
--- a/types/lingui__core/lingui__core-tests.ts
+++ b/types/lingui__core/lingui__core-tests.ts
@@ -4,6 +4,7 @@ import {
     Catalog,
     Catalogs,
     MessageOptions,
+    MessageDescriptor,
     LanguageData,
     I18n,
     date,
@@ -16,6 +17,13 @@ const templateResult: string = i18n.t`${age} years old`;
 const templateIdResult: string = i18n.t('templateId')`${age} years old`;
 const translateResult: string = i18n._('age', { age }, { defaults: '{age} years old' });
 
+const descriptorBasicResult = i18n._({ id: 'basicDescriptor' });
+const descriptorResult = i18n._({
+    id: 'ageDescriptor',
+    defaults: '{age} years old',
+    values: { age }
+});
+
 const count = 42;
 
 const pluralResult: string = i18n.plural({

From 22388f546bb0d77c1d7f1ada7744d78e909a1225 Mon Sep 17 00:00:00 2001
From: Chives <chivesrs@gmail.com>
Date: Tue, 19 Mar 2019 11:15:38 -0700
Subject: [PATCH 800/924] Add typings for ResizeObserver global usage (via
 window.ResizeObserver)

---
 types/resize-observer-browser/index.d.ts              |  8 +++++++-
 .../test/resize-observer-global.test.ts               | 11 +++++++++++
 .../resize-observer-module.test.ts}                   |  0
 types/resize-observer-browser/tsconfig.json           |  3 ++-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 types/resize-observer-browser/test/resize-observer-global.test.ts
 rename types/resize-observer-browser/{resize-observer-browser-tests.ts => test/resize-observer-module.test.ts} (100%)

diff --git a/types/resize-observer-browser/index.d.ts b/types/resize-observer-browser/index.d.ts
index 83291fe4a0..5e585f81e5 100644
--- a/types/resize-observer-browser/index.d.ts
+++ b/types/resize-observer-browser/index.d.ts
@@ -4,6 +4,12 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
+declare global {
+    interface Window {
+        ResizeObserver: typeof ResizeObserver;
+    }
+}
+
 export class ResizeObserver {
     constructor(callback: ResizeObserverCallback);
     disconnect(): void;
@@ -11,7 +17,7 @@ export class ResizeObserver {
     unobserve(target: Element): void;
 }
 
-export type ResizeObserverCallback = (entries: ResizeObserverEntry[]) => void;
+export type ResizeObserverCallback = (entries: ReadonlyArray<ResizeObserverEntry>) => void;
 
 export interface ResizeObserverEntry {
     readonly target: Element;
diff --git a/types/resize-observer-browser/test/resize-observer-global.test.ts b/types/resize-observer-browser/test/resize-observer-global.test.ts
new file mode 100644
index 0000000000..6398b979fe
--- /dev/null
+++ b/types/resize-observer-browser/test/resize-observer-global.test.ts
@@ -0,0 +1,11 @@
+function resizeObserverCreatesViaWindow(): void {
+    const resizeObserver = new window.ResizeObserver((entries) => {
+        const div = document.getElementById('display-div')!;
+        const rect = entries[0].contentRect;
+        div.textContent = `${rect.left} ${rect.right}`;
+    });
+    const div = document.getElementById('resized-div')!;
+    resizeObserver.observe(div);
+    resizeObserver.unobserve(div);
+    resizeObserver.disconnect();
+}
diff --git a/types/resize-observer-browser/resize-observer-browser-tests.ts b/types/resize-observer-browser/test/resize-observer-module.test.ts
similarity index 100%
rename from types/resize-observer-browser/resize-observer-browser-tests.ts
rename to types/resize-observer-browser/test/resize-observer-module.test.ts
diff --git a/types/resize-observer-browser/tsconfig.json b/types/resize-observer-browser/tsconfig.json
index 849758c836..fcba3665dc 100644
--- a/types/resize-observer-browser/tsconfig.json
+++ b/types/resize-observer-browser/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "resize-observer-browser-tests.ts"
+        "test/resize-observer-global.test.ts",
+        "test/resize-observer-module.test.ts"
     ]
 }

From 4c3c3fa206938166ab968aaeb6a5e465d5a37bac Mon Sep 17 00:00:00 2001
From: Chives <chivesrs@gmail.com>
Date: Tue, 19 Mar 2019 11:47:46 -0700
Subject: [PATCH 801/924] Rename test files to resize-observer-browser pattern

---
 ...global.test.ts => resize-observer-browser-global.tests.ts} | 0
 ...module.test.ts => resize-observer-browser-module.tests.ts} | 0
 types/resize-observer-browser/tsconfig.json                   | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename types/resize-observer-browser/test/{resize-observer-global.test.ts => resize-observer-browser-global.tests.ts} (100%)
 rename types/resize-observer-browser/test/{resize-observer-module.test.ts => resize-observer-browser-module.tests.ts} (100%)

diff --git a/types/resize-observer-browser/test/resize-observer-global.test.ts b/types/resize-observer-browser/test/resize-observer-browser-global.tests.ts
similarity index 100%
rename from types/resize-observer-browser/test/resize-observer-global.test.ts
rename to types/resize-observer-browser/test/resize-observer-browser-global.tests.ts
diff --git a/types/resize-observer-browser/test/resize-observer-module.test.ts b/types/resize-observer-browser/test/resize-observer-browser-module.tests.ts
similarity index 100%
rename from types/resize-observer-browser/test/resize-observer-module.test.ts
rename to types/resize-observer-browser/test/resize-observer-browser-module.tests.ts
diff --git a/types/resize-observer-browser/tsconfig.json b/types/resize-observer-browser/tsconfig.json
index fcba3665dc..69a030695e 100644
--- a/types/resize-observer-browser/tsconfig.json
+++ b/types/resize-observer-browser/tsconfig.json
@@ -19,7 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "test/resize-observer-global.test.ts",
-        "test/resize-observer-module.test.ts"
+        "test/resize-observer-browser-global.tests.ts",
+        "test/resize-observer-browser-module.tests.ts"
     ]
 }

From 7fff40c88e2f72b6028e74b9b566251cb7f0c682 Mon Sep 17 00:00:00 2001
From: Saxon Landers <saxon@ackwell.com.au>
Date: Wed, 20 Mar 2019 14:25:49 +1100
Subject: [PATCH 802/924] Add MessageDescriptor support to @lingui/macro

---
 types/lingui__macro/index.d.ts              | 21 ++++++++---------
 types/lingui__macro/lingui__macro-tests.tsx | 25 +++++++++++----------
 types/lingui__macro/select.d.ts             | 20 +++++++++--------
 types/lingui__macro/tsconfig.json           |  3 +++
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/types/lingui__macro/index.d.ts b/types/lingui__macro/index.d.ts
index e433b43ec7..8a6679323d 100644
--- a/types/lingui__macro/index.d.ts
+++ b/types/lingui__macro/index.d.ts
@@ -4,30 +4,31 @@
 // Definitions: https://github.com/huan086/lingui-typings
 // TypeScript Version: 2.8
 
+import { MessageDescriptor } from '@lingui/core';
 import { ComponentClass } from 'react';
 import { FormatPropsWithoutI18n } from './createFormat';
 import { SelectProps, PluralProps } from "./select";
 
 // JS
-export function t(strings: TemplateStringsArray, ...values: any[]): string;
+export function t(strings: TemplateStringsArray, ...values: any[]): MessageDescriptor;
 
-export function t(id: string): (strings: TemplateStringsArray, ...values: any[]) => string;
+export function t(id: string): (strings: TemplateStringsArray, ...values: any[]) => MessageDescriptor;
 
-export function select(config: SelectProps): string;
+export function select(config: SelectProps): MessageDescriptor;
 
-export function select(id: string, config: SelectProps): string;
+export function select(id: string, config: SelectProps): MessageDescriptor;
 
-export function plural(config: PluralProps): string;
+export function plural(config: PluralProps): MessageDescriptor;
 
-export function plural(id: string, config: PluralProps): string;
+export function plural(id: string, config: PluralProps): MessageDescriptor;
 
-export function selectOrdinal(config: PluralProps): string;
+export function selectOrdinal(config: PluralProps): MessageDescriptor;
 
-export function selectOrdinal(id: string, config: PluralProps): string;
+export function selectOrdinal(id: string, config: PluralProps): MessageDescriptor;
 
-export function date(value: Date, format?: Intl.DateTimeFormatOptions): string;
+export function date(value: Date, format?: Intl.DateTimeFormatOptions): MessageDescriptor;
 
-export function number(value: number, format?: Intl.NumberFormatOptions): string;
+export function number(value: number, format?: Intl.NumberFormatOptions): MessageDescriptor;
 
 // JSX
 export { default as Trans } from './Trans';
diff --git a/types/lingui__macro/lingui__macro-tests.tsx b/types/lingui__macro/lingui__macro-tests.tsx
index a60c5fd2d7..583729e9bc 100644
--- a/types/lingui__macro/lingui__macro-tests.tsx
+++ b/types/lingui__macro/lingui__macro-tests.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { MessageDescriptor } from '@lingui/core';
 import {
     t,
     select,
@@ -16,25 +17,25 @@ import {
 
 // JS
 const age = 12;
-const templateResult: string = t`${age} years old`;
-const templateIdResult: string = t('templateId')`${age} years old`;
+const templateResult: MessageDescriptor = t`${age} years old`;
+const templateIdResult: MessageDescriptor = t('templateId')`${age} years old`;
 
 const count = 42;
 
-const pluralResult: string = plural({
+const pluralResult: MessageDescriptor = plural({
     value: count,
     0: 'no books',
     one: '# book',
     other: '# books'
 });
-const pluralIdResult: string = plural('pluralId', {
+const pluralIdResult: MessageDescriptor = plural('pluralId', {
     value: count,
     0: 'no books',
     one: '# book',
     other: '# books'
 });
 
-const selectOrdinalResult: string = selectOrdinal({
+const selectOrdinalResult: MessageDescriptor = selectOrdinal({
     value: count,
     0: 'Zeroth book',
     one: '#st book',
@@ -42,7 +43,7 @@ const selectOrdinalResult: string = selectOrdinal({
     few: '#rd book',
     other: '#th book'
 });
-const selectOrdinalIdResult: string = selectOrdinal('selectOrdinalId', {
+const selectOrdinalIdResult: MessageDescriptor = selectOrdinal('selectOrdinalId', {
     value: count,
     0: 'Zeroth book',
     one: '#st book',
@@ -60,10 +61,10 @@ const selectResult = select({
     female: plural({
         value: numOfGuests,
         offset: 1,
-        0: t`${host} does not give a party.`,
-        1: t`${host} invites ${guest} to her party.`,
-        2: t`${host} invites ${guest} and one other person to her party.`,
-        other: t`${host} invites ${guest} and # other people to her party.`
+        0: `${host} does not give a party.`,
+        1: `${host} invites ${guest} to her party.`,
+        2: `${host} invites ${guest} and one other person to her party.`,
+        other: `${host} invites ${guest} and # other people to her party.`
     }),
     male: 'male',
     other: 'other'
@@ -76,8 +77,8 @@ const selectIdResult = select('selectId', {
     other: 'other'
 });
 
-const formattedDate: string = date(new Date(), { timeZone: 'UTC' });
-const formattedNumber: string = number(1234.56, { style: 'currency', currency: 'EUR' });
+const formattedDate: MessageDescriptor = date(new Date(), { timeZone: 'UTC' });
+const formattedNumber: MessageDescriptor = number(1234.56, { style: 'currency', currency: 'EUR' });
 
 // JSX
 const App = () => {
diff --git a/types/lingui__macro/select.d.ts b/types/lingui__macro/select.d.ts
index 6a2eb51db9..a182ace000 100644
--- a/types/lingui__macro/select.d.ts
+++ b/types/lingui__macro/select.d.ts
@@ -1,11 +1,13 @@
+import { MessageDescriptor } from "@lingui/core";
+
 export interface PluralForms {
-    zero?: string;
-    one?: string;
-    two?: string;
-    few?: string;
-    many?: string;
-    other: string;
-    [exact: number]: string;
+    zero?: string | MessageDescriptor;
+    one?: string | MessageDescriptor;
+    two?: string | MessageDescriptor;
+    few?: string | MessageDescriptor;
+    many?: string | MessageDescriptor;
+    other: string | MessageDescriptor;
+    [exact: number]: string | MessageDescriptor;
 }
 
 export interface PluralProps extends PluralForms {
@@ -15,6 +17,6 @@ export interface PluralProps extends PluralForms {
 
 export interface SelectProps {
     value: string;
-    other: string;
-    [selectForm: string]: string;
+    other: string | MessageDescriptor;
+    [selectForm: string]: string | MessageDescriptor;
 }
diff --git a/types/lingui__macro/tsconfig.json b/types/lingui__macro/tsconfig.json
index 5d58b08dad..82f2639036 100644
--- a/types/lingui__macro/tsconfig.json
+++ b/types/lingui__macro/tsconfig.json
@@ -20,6 +20,9 @@
         "paths": {
             "@lingui/macro": [
                 "lingui__macro"
+            ],
+            "@lingui/core": [
+                "lingui__core"
             ]
         }
     },

From 56e1fb93baa78541795fba8d41e3e5bbe61b5778 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Tue, 19 Mar 2019 21:21:28 -0700
Subject: [PATCH 803/924] VS Code 1.18 Extension API

---
 types/vscode/index.d.ts | 218 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 209 insertions(+), 9 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index e01e612919..7587bbfbf3 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for Visual Studio Code 1.17
-// Project: https://github.com/microsoft/vscode-extension-vscode
+// Type definitions for Visual Studio Code 1.18
+// Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.17 Extension API
+ * Type Definition for Visual Studio Code 1.18 Extension API
  */
 
 declare module 'vscode' {
@@ -1514,6 +1514,22 @@ declare module 'vscode' {
 		onDidSelectItem?(item: QuickPickItem | string): any;
 	}
 
+	/**
+	 * Options to configure the behaviour of the [workspace folder](#WorkspaceFolder) pick UI.
+	 */
+	export interface WorkspaceFolderPickOptions {
+
+		/**
+		 * An optional string to show as place holder in the input box to guide the user what to pick on.
+		 */
+		placeHolder?: string;
+
+		/**
+		 * Set to `true` to keep the picker open when focus moves to another part of the editor or to another window.
+		 */
+		ignoreFocusOut?: boolean;
+	}
+
 	/**
 	 * Options to configure the behaviour of a file open dialog.
 	 *
@@ -1671,7 +1687,7 @@ declare module 'vscode' {
 		 * @return A human readable string which is presented as diagnostic message.
 		 * Return `undefined`, `null`, or the empty string when 'value' is valid.
 		 */
-		validateInput?(value: string): string | undefined | null;
+		validateInput?(value: string): string | undefined | null | Thenable<string | undefined | null>;
 	}
 
 	/**
@@ -1679,7 +1695,7 @@ declare module 'vscode' {
 	 * relatively to a base path. The base path can either be an absolute file path
 	 * or a [workspace folder](#WorkspaceFolder).
 	 */
-	class RelativePattern {
+	export class RelativePattern {
 
 		/**
 		 * A base file path to which this pattern will be matched against relatively.
@@ -1980,6 +1996,13 @@ declare module 'vscode' {
 		 * @param value Markdown string.
 		 */
 		appendMarkdown(value: string): MarkdownString;
+
+		/**
+		 * Appends the given string as codeblock using the provided language.
+		 * @param value A code snippet.
+		 * @param language An optional [language identifier](#languages.getLanguages).
+		 */
+		appendCodeblock(value: string, language?: string): MarkdownString;
 	}
 
 	/**
@@ -2983,6 +3006,133 @@ declare module 'vscode' {
 		resolveDocumentLink?(link: DocumentLink, token: CancellationToken): ProviderResult<DocumentLink>;
 	}
 
+	/**
+	 * Represents a color in RGBA space.
+	 */
+	export class Color {
+
+		/**
+		 * The red component of this color in the range [0-1].
+		 */
+		readonly red: number;
+
+		/**
+		 * The green component of this color in the range [0-1].
+		 */
+		readonly green: number;
+
+		/**
+		 * The blue component of this color in the range [0-1].
+		 */
+		readonly blue: number;
+
+		/**
+		 * The alpha component of this color in the range [0-1].
+		 */
+		readonly alpha: number;
+
+		/**
+		 * Creates a new color instance.
+		 *
+		 * @param red The red component.
+		 * @param green The green component.
+		 * @param blue The bluew component.
+		 * @param alpha The alpha component.
+		 */
+		constructor(red: number, green: number, blue: number, alpha: number);
+	}
+
+	/**
+	 * Represents a color range from a document.
+	 */
+	export class ColorInformation {
+
+		/**
+		 * The range in the document where this color appers.
+		 */
+		range: Range;
+
+		/**
+		 * The actual color value for this color range.
+		 */
+		color: Color;
+
+		/**
+		 * Creates a new color range.
+		 *
+		 * @param range The range the color appears in. Must not be empty.
+		 * @param color The value of the color.
+		 * @param format The format in which this color is currently formatted.
+		 */
+		constructor(range: Range, color: Color);
+	}
+
+	/**
+	 * A color presentation object describes how a [`color`](#Color) should be represented as text and what
+	 * edits are required to refer to it from source code.
+	 *
+	 * For some languages one color can have multiple presentations, e.g. css can represent the color red with
+	 * the constant `Red`, the hex-value `#ff0000`, or in rgba and hsla forms. In csharp other representations
+	 * apply, e.g `System.Drawing.Color.Red`.
+	 */
+	export class ColorPresentation {
+
+		/**
+		 * The label of this color presentation. It will be shown on the color
+		 * picker header. By default this is also the text that is inserted when selecting
+		 * this color presentation.
+		 */
+		label: string;
+
+		/**
+		 * An [edit](#TextEdit) which is applied to a document when selecting
+		 * this presentation for the color.  When `falsy` the [label](#ColorPresentation.label)
+		 * is used.
+		 */
+		textEdit?: TextEdit;
+
+		/**
+		 * An optional array of additional [text edits](#TextEdit) that are applied when
+		 * selecting this color presentation. Edits must not overlap with the main [edit](#ColorPresentation.textEdit) nor with themselves.
+		 */
+		additionalTextEdits?: TextEdit[];
+
+		/**
+		 * Creates a new color presentation.
+		 *
+		 * @param label The label of this color presentation.
+		 */
+		constructor(label: string);
+	}
+
+	/**
+	 * The document color provider defines the contract between extensions and feature of
+	 * picking and modifying colors in the editor.
+	 */
+	export interface DocumentColorProvider {
+
+		/**
+		 * Provide colors for the given document.
+		 *
+		 * @param document The document in which the command was invoked.
+		 * @param token A cancellation token.
+		 * @return An array of [color informations](#ColorInformation) or a thenable that resolves to such. The lack of a result
+		 * can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideDocumentColors(document: TextDocument, token: CancellationToken): ProviderResult<ColorInformation[]>;
+
+		/**
+		 * Provide [representations](#ColorPresentation) for a color.
+		 *
+		 * @param color The color to show and insert.
+		 * @param context A context object with additional information
+		 * @param token A cancellation token.
+		 * @return An array of color presentations or a thenable that resolves to such. The lack of a result
+		 * can be signaled by returning `undefined`, `null`, or an empty array.
+		 */
+		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
+	}
+
 	/**
 	 * A tuple of two characters, like a pair of
 	 * opening and closing brackets.
@@ -4589,6 +4739,15 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<T | undefined>;
 
+		/**
+		 * Shows a selection list of [workspace folders](#workspace.workspaceFolders) to pick from.
+		 * Returns `undefined` if no folder is open.
+		 *
+		 * @param options Configures the behavior of the workspace folder list.
+		 * @return A promise that resolves to the workspace folder or `undefined`.
+		 */
+		export function showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions): Thenable<WorkspaceFolder | undefined>;
+
 		/**
 		 * Shows a file open dialog to the user which allows to select a file
 		 * for opening-purposes.
@@ -4830,6 +4989,10 @@ declare module 'vscode' {
 		 * Args for the custom shell executable, this does not work on Windows (see #8429)
 		 */
 		shellArgs?: string[];
+		/**
+		 * Object with environment variables that will be added to the VS Code process.
+		 */
+		env?: { [key: string]: string | null };
 	}
 
 	/**
@@ -5044,6 +5207,14 @@ declare module 'vscode' {
 		 */
 		export let workspaceFolders: WorkspaceFolder[] | undefined;
 
+		/**
+		 * The name of the workspace. `undefined` when no folder
+		 * has been opened.
+		 *
+		 * @readonly
+		 */
+		export let name: string | undefined;
+
 		/**
 		 * An event that is emitted when a workspace folder is added or removed.
 		 */
@@ -5238,7 +5409,7 @@ declare module 'vscode' {
 		/**
 		 * An event that is emitted when the [configuration](#WorkspaceConfiguration) changed.
 		 */
-		export const onDidChangeConfiguration: Event<void>;
+		export const onDidChangeConfiguration: Event<ConfigurationChangeEvent>;
 
 		/**
 		 * Register a task provider.
@@ -5250,6 +5421,21 @@ declare module 'vscode' {
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
 	}
 
+	/**
+	 * An event describing the change in Configuration
+	 */
+	export interface ConfigurationChangeEvent {
+
+		/**
+		 * Returns `true` if the given section for the given resource (if provided) is affected.
+		 *
+		 * @param section Configuration name, supports _dotted_ names.
+		 * @param resource A resource Uri.
+		 * @return `true` if the given section for the given resource (if provided) is affected.
+		 */
+		affectsConfiguration(section: string, resource?: Uri): boolean;
+	}
+
 	/**
 	 * Namespace for participating in language-specific editor [features](https://code.visualstudio.com/docs/editor/editingevolved),
 	 * like IntelliSense, code actions, diagnostics etc.
@@ -5563,6 +5749,19 @@ declare module 'vscode' {
 		 */
 		export function registerDocumentLinkProvider(selector: DocumentSelector, provider: DocumentLinkProvider): Disposable;
 
+		/**
+		 * Register a color provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged. A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A color provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
+
 		/**
 		 * Set a [language configuration](#LanguageConfiguration) for a language.
 		 *
@@ -5870,8 +6069,8 @@ declare module 'vscode' {
 
 	/**
 	 * A debug configuration provider allows to add the initial debug configurations to a newly created launch.json
-	 * and allows to resolve a launch configuration before it is used to start a new debug session.
-	 * A debug configuration provider is registered via #workspace.registerDebugConfigurationProvider.
+	 * and to resolve a launch configuration before it is used to start a new debug session.
+	 * A debug configuration provider is registered via #debug.registerDebugConfigurationProvider.
 	 */
 	export interface DebugConfigurationProvider {
 		/**
@@ -5888,11 +6087,12 @@ declare module 'vscode' {
 		 * Resolves a [debug configuration](#DebugConfiguration) by filling in missing values or by adding/changing/removing attributes.
 		 * If more than one debug configuration provider is registered for the same type, the resolveDebugConfiguration calls are chained
 		 * in arbitrary order and the initial debug configuration is piped through the chain.
+		 * Returning the value 'undefined' prevents the debug session from starting.
 		 *
 		 * @param folder The workspace folder from which the configuration originates from or undefined for a folderless setup.
 		 * @param debugConfiguration The [debug configuration](#DebugConfiguration) to resolve.
 		 * @param token A cancellation token.
-		 * @return The resolved debug configuration.
+		 * @return The resolved debug configuration or undefined.
 		 */
 		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
 	}

From b88cb29d302fa0f549062c14258096e8ac210dee Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Tue, 19 Mar 2019 22:23:31 -0700
Subject: [PATCH 804/924] VS Code 1.19 Extension API

---
 types/vscode/index.d.ts | 66 +++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 7587bbfbf3..6bfd97caf4 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.18
+// Type definitions for Visual Studio Code 1.19
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.18 Extension API
+ * Type Definition for Visual Studio Code 1.19 Extension API
  */
 
 declare module 'vscode' {
@@ -1724,7 +1724,15 @@ declare module 'vscode' {
 
 	/**
 	 * A file glob pattern to match file paths against. This can either be a glob pattern string
-	 * (like `**∕*.{ts,js}` or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+	 * (like `**​/*.{ts,js}` or `*.{ts,js}`) or a [relative pattern](#RelativePattern).
+	 *
+	 * Glob patterns can have the following syntax:
+	 * * `*` to match one or more characters in a path segment
+	 * * `?` to match on one character in a path segment
+	 * * `**` to match any number of path segments, including none
+	 * * `{}` to group conditions (e.g. `**​/*.{ts,js}` matches all TypeScript and JavaScript files)
+	 * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+	 * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
 	 */
 	export type GlobPattern = string | RelativePattern;
 
@@ -1734,7 +1742,7 @@ declare module 'vscode' {
 	 * its resource, or a glob-pattern that is applied to the [path](#TextDocument.fileName).
 	 *
 	 * @sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
-	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**∕package.json' }`
+	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**​/package.json' }`
 	 */
 	export interface DocumentFilter {
 
@@ -1760,7 +1768,7 @@ declare module 'vscode' {
 	 * and [language filters](#DocumentFilter).
 	 *
 	 * @sample `let sel:DocumentSelector = 'typescript'`;
-	 * @sample `let sel:DocumentSelector = ['typescript', { language: 'json', pattern: '**∕tsconfig.json' }]`;
+	 * @sample `let sel:DocumentSelector = ['typescript', { language: 'json', pattern: '**​/tsconfig.json' }]`;
 	 */
 	export type DocumentSelector = string | DocumentFilter | (string | DocumentFilter)[];
 
@@ -1801,7 +1809,6 @@ declare module 'vscode' {
 	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
 	 */
 	export interface CodeActionContext {
-
 		/**
 		 * An array of diagnostics.
 		 */
@@ -2912,12 +2919,11 @@ declare module 'vscode' {
 	 * The completion item provider interface defines the contract between extensions and
 	 * [IntelliSense](https://code.visualstudio.com/docs/editor/intellisense).
 	 *
-	 * When computing *complete* completion items is expensive, providers can optionally implement
-	 * the `resolveCompletionItem`-function. In that case it is enough to return completion
-	 * items with a [label](#CompletionItem.label) from the
-	 * [provideCompletionItems](#CompletionItemProvider.provideCompletionItems)-function. Subsequently,
-	 * when a completion item is shown in the UI and gains focus this provider is asked to resolve
-	 * the item, like adding [doc-comment](#CompletionItem.documentation) or [details](#CompletionItem.detail).
+	 * Providers can delay the computation of the [`detail`](#CompletionItem.detail)
+	 * and [`documentation`](#CompletionItem.documentation) properties by implementing the
+	 * [`resolveCompletionItem`](#CompletionItemProvider.resolveCompletionItem)-function. However, properties that
+	 * are needed for the inital sorting and filtering, like `sortText`, `filterText`, `insertText`, and `range`, must
+	 * not be changed during resolve.
 	 *
 	 * Providers are asked for completions either explicitly by a user gesture or -depending on the configuration-
 	 * implicitly when typing words or trigger characters.
@@ -3456,7 +3462,7 @@ declare module 'vscode' {
 		uri: Uri;
 
 		/**
-		 * The document range of this locations.
+		 * The document range of this location.
 		 */
 		range: Range;
 
@@ -4500,7 +4506,7 @@ declare module 'vscode' {
 		 * has changed. *Note* that the event also fires when the active editor changes
 		 * to `undefined`.
 		 */
-		export const onDidChangeActiveTextEditor: Event<TextEditor>;
+		export const onDidChangeActiveTextEditor: Event<TextEditor | undefined>;
 
 		/**
 		 * An [event](#Event) which fires when the array of [visible editors](#window.visibleTextEditors)
@@ -5264,7 +5270,7 @@ declare module 'vscode' {
 		/**
 		 * Find files across all [workspace folders](#workspace.workspaceFolders) in the workspace.
 		 *
-		 * @sample `findFiles('**∕*.js', '**∕node_modules∕**', 10)`
+		 * @sample `findFiles('**​/*.js', '**​/node_modules/**', 10)`
 		 * @param include A [glob pattern](#GlobPattern) that defines the files to search for. The glob pattern
 		 * will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
 		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
@@ -5781,6 +5787,11 @@ declare module 'vscode' {
 		 * Setter and getter for the contents of the input box.
 		 */
 		value: string;
+
+		/**
+		 * A string to show as place holder in the input box to guide the user.
+		 */
+		placeholder: string;
 	}
 
 	interface QuickDiffProvider {
@@ -6097,6 +6108,26 @@ declare module 'vscode' {
 		resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration>;
 	}
 
+	/**
+	 * Represents the debug console.
+	 */
+	export interface DebugConsole {
+		/**
+		 * Append the given value to the debug console.
+		 *
+		 * @param value A string, falsy values will not be printed.
+		 */
+		append(value: string): void;
+
+		/**
+		 * Append the given value and a line feed character
+		 * to the debug console.
+		 *
+		 * @param value A string, falsy values will be printed.
+		 */
+		appendLine(value: string): void;
+	}
+
 	/**
 	 * Namespace for dealing with debug sessions.
 	 */
@@ -6121,6 +6152,11 @@ declare module 'vscode' {
 		 */
 		export let activeDebugSession: DebugSession | undefined;
 
+		/**
+		 * The currently active [debug console](#DebugConsole).
+		 */
+		export let activeDebugConsole: DebugConsole;
+
 		/**
 		 * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
 		 * has changed. *Note* that the event also fires when the active debug session changes

From f219b3a99acaa6cde232f10511c4b993e7e395bc Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Tue, 19 Mar 2019 22:27:51 -0700
Subject: [PATCH 805/924] Add a link to vscode website

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

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 6bfd97caf4..d326575601 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -11,6 +11,7 @@
 
 /**
  * Type Definition for Visual Studio Code 1.19 Extension API
+ * See https://code.visualstudio.com/api for more information
  */
 
 declare module 'vscode' {

From 44797ba9e9f0eb57b4f87af7c70c1b62e38dc383 Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <18708370+Flarna@users.noreply.github.com>
Date: Wed, 20 Mar 2019 08:27:21 +0100
Subject: [PATCH 806/924] fix review findings

---
 types/node/test/util.ts            |  2 +-
 types/node/ts3.2/node-tests.ts     | 20 ++++++++++++++++++++
 types/node/util.d.ts               |  2 +-
 types/node/v10/node-tests.ts       |  2 +-
 types/node/v10/ts3.2/node-tests.ts | 20 ++++++++++++++++++++
 types/node/v10/util.d.ts           |  2 +-
 6 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/types/node/test/util.ts b/types/node/test/util.ts
index 0dd1843b9c..f0208c4ada 100644
--- a/types/node/test/util.ts
+++ b/types/node/test/util.ts
@@ -159,7 +159,7 @@ import { readFile } from 'fs';
     const teEncodeRes: Uint8Array = te.encode("TextEncoder");
 
     // util.types
-    let b: Boolean;
+    let b: boolean;
     b = util.types.isBigInt64Array(15);
     b = util.types.isBigUint64Array(15);
     b = util.types.isModuleNamespaceObject(15);
diff --git a/types/node/ts3.2/node-tests.ts b/types/node/ts3.2/node-tests.ts
index 3f64e22e81..18de85a3a1 100644
--- a/types/node/ts3.2/node-tests.ts
+++ b/types/node/ts3.2/node-tests.ts
@@ -1,5 +1,6 @@
 // tslint:disable-next-line:no-bad-reference
 import "../node-tests";
+import * as util from "util";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
@@ -9,3 +10,22 @@ import "../node-tests";
         const hrtimeBigint: bigint = process.hrtime.bigint();
     }
 }
+
+//////////////////////////////////////////////////////////
+/// Util Tests                                         ///
+//////////////////////////////////////////////////////////
+{
+    {
+        const value: BigInt64Array | BigUint64Array | number = [] as any;
+        if (util.types.isBigInt64Array(value)) {
+            // $ExpectType BigInt64Array
+            const b = value;
+        } else if (util.types.isBigUint64Array(value)) {
+            // $ExpectType BigUint64Array
+            const b = value;
+        } else {
+            // $ExpectType number
+            const b = value;
+        }
+    }
+}
diff --git a/types/node/util.d.ts b/types/node/util.d.ts
index 05edbfcf5b..14a1c2c495 100644
--- a/types/node/util.d.ts
+++ b/types/node/util.d.ts
@@ -114,7 +114,7 @@ declare module "util" {
         function isArrayBuffer(object: any): object is ArrayBuffer;
         function isAsyncFunction(object: any): boolean;
         function isBooleanObject(object: any): object is Boolean;
-        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* BigInt */);
+        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* | Object(BigInt) | Object(Symbol) */);
         function isDataView(object: any): object is DataView;
         function isDate(object: any): object is Date;
         function isExternal(object: any): boolean;
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
index 1e40139731..e13f8b313a 100644
--- a/types/node/v10/node-tests.ts
+++ b/types/node/v10/node-tests.ts
@@ -952,7 +952,7 @@ function bufferTests() {
         const teEncodeRes: Uint8Array = te.encode("TextEncoder");
 
         // util.types
-        let b: Boolean;
+        let b: boolean;
         b = util.types.isBigInt64Array(15);
         b = util.types.isBigUint64Array(15);
         b = util.types.isModuleNamespaceObject(15);
diff --git a/types/node/v10/ts3.2/node-tests.ts b/types/node/v10/ts3.2/node-tests.ts
index 3f64e22e81..18de85a3a1 100644
--- a/types/node/v10/ts3.2/node-tests.ts
+++ b/types/node/v10/ts3.2/node-tests.ts
@@ -1,5 +1,6 @@
 // tslint:disable-next-line:no-bad-reference
 import "../node-tests";
+import * as util from "util";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
@@ -9,3 +10,22 @@ import "../node-tests";
         const hrtimeBigint: bigint = process.hrtime.bigint();
     }
 }
+
+//////////////////////////////////////////////////////////
+/// Util Tests                                         ///
+//////////////////////////////////////////////////////////
+{
+    {
+        const value: BigInt64Array | BigUint64Array | number = [] as any;
+        if (util.types.isBigInt64Array(value)) {
+            // $ExpectType BigInt64Array
+            const b = value;
+        } else if (util.types.isBigUint64Array(value)) {
+            // $ExpectType BigUint64Array
+            const b = value;
+        } else {
+            // $ExpectType number
+            const b = value;
+        }
+    }
+}
diff --git a/types/node/v10/util.d.ts b/types/node/v10/util.d.ts
index 07c21bf47e..05b6ab3df1 100644
--- a/types/node/v10/util.d.ts
+++ b/types/node/v10/util.d.ts
@@ -114,7 +114,7 @@ declare module "util" {
         function isArrayBuffer(object: any): object is ArrayBuffer;
         function isAsyncFunction(object: any): boolean;
         function isBooleanObject(object: any): object is Boolean;
-        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* BigInt */);
+        function isBoxedPrimitive(object: any): object is (Number | Boolean | String | Symbol /* | Object(BigInt) | Object(Symbol) */);
         function isDataView(object: any): object is DataView;
         function isDate(object: any): object is Date;
         function isExternal(object: any): boolean;

From 7b79531f48fb6a80eb811a458a3c4d42c8893da4 Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Wed, 20 Mar 2019 17:58:41 +0800
Subject: [PATCH 807/924] [amap-js-api-indoor-map] reverse overloads order

---
 types/amap-js-api-indoor-map/index.d.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/types/amap-js-api-indoor-map/index.d.ts b/types/amap-js-api-indoor-map/index.d.ts
index b19082e926..03c2a6bb2f 100644
--- a/types/amap-js-api-indoor-map/index.d.ts
+++ b/types/amap-js-api-indoor-map/index.d.ts
@@ -73,29 +73,28 @@ declare namespace AMap {
 
     class IndoorMap extends Layer {
         constructor(options?: IndoorMap.Options);
+        showIndoorMap(
+            indoorId: string,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
+        showIndoorMap(
+            indoorId: string,
+            floor?: number,
+            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
+        ): void;
         showIndoorMap(
             indoorId: string,
             floor?: number,
             shopId?: string,
-            noMove?: boolean,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
         showIndoorMap(
             indoorId: string,
             floor?: number,
             shopId?: string,
+            noMove?: boolean,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
-        showIndoorMap(
-            indoorId: string,
-            floor?: number,
-            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
-        ): void;
-        showIndoorMap(
-            indoorId: string,
-            callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
-        ): void;
-
         showFloor(floor: number, noMove?: boolean): false | undefined;
         showFloorBar(): void;
         hideFloorBar(): void;

From 2cef25af737a426a783942b91888eb168674d940 Mon Sep 17 00:00:00 2001
From: Karlis Melderis <karlis.melderis@merck.com>
Date: Wed, 20 Mar 2019 14:45:18 +0100
Subject: [PATCH 808/924] add path prop to ArchiverError type

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

diff --git a/types/archiver/index.d.ts b/types/archiver/index.d.ts
index a9cafca24b..a25b018c11 100644
--- a/types/archiver/index.d.ts
+++ b/types/archiver/index.d.ts
@@ -41,6 +41,8 @@ declare namespace archiver {
     class ArchiverError extends Error {
         code: string;       // Since archiver format support is modular, we cannot enumerate all possible error codes, as the modules can throw arbitrary ones.
         data: any;
+        path?: any;
+
         constructor(code: string, data: any);
     }
 

From 5d13cc220d4e8b3fed57eedbe0872028f9a0af41 Mon Sep 17 00:00:00 2001
From: Sander Siim <sander.siim1@gmail.com>
Date: Wed, 20 Mar 2019 16:14:47 +0200
Subject: [PATCH 809/924] Add FullscreenControl component type definition added
 in react-map-gl 4.1

---
 types/react-map-gl/index.d.ts             | 10 +++++++++-
 types/react-map-gl/react-map-gl-tests.tsx |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 04c4d9aed9..23b723a594 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-map-gl 4.0
+// Type definitions for react-map-gl 4.1
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 //                 Fabio Berta <https://github.com/fnberta>
+//                 Sander Siim <https://github.com/sandersiim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.0
 
@@ -309,6 +310,13 @@ export interface NavigationControlProps extends BaseControlProps {
 
 export class NavigationControl extends BaseControl<NavigationControlProps> {}
 
+export interface FullscreenControlProps extends BaseControlProps {
+    className?: string;
+    container?: HTMLElement | null;
+}
+
+export class FullscreenControl extends BaseControl<FullscreenControlProps> {}
+
 export interface DraggableControlProps extends BaseControlProps {
     draggable?: boolean;
     onDrag?: (event: DragEvent) => void;
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
index c9024287c9..6740ad0eb4 100644
--- a/types/react-map-gl/react-map-gl-tests.tsx
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -5,6 +5,7 @@ import {
     CanvasOverlay,
     SVGOverlay,
     HTMLOverlay,
+    FullscreenControl,
     CanvasRedrawOptions,
     HTMLRedrawOptions,
     SVGRedrawOptions,
@@ -37,6 +38,7 @@ class MyMap extends React.Component<{}, State> {
                     width={400}
                     ref={this.setRefInteractive}
                 >
+                    <FullscreenControl className="test-class" container={document.querySelector('body')} />
                     <CanvasOverlay
                         redraw={opts => {
                             const {

From cfea3610cec286931f97f9b6c470d55dd75e88ad Mon Sep 17 00:00:00 2001
From: Kirill Kvashonin <k.kvashonin@tradesoft.ru>
Date: Wed, 20 Mar 2019 17:56:34 +0300
Subject: [PATCH 810/924] types for scroll-to-element

---
 types/scroll-to-element/index.d.ts            | 15 ++++++++++++
 .../scroll-to-element-tests.ts                | 19 +++++++++++++++
 types/scroll-to-element/tsconfig.json         | 24 +++++++++++++++++++
 types/scroll-to-element/tslint.json           |  1 +
 4 files changed, 59 insertions(+)
 create mode 100644 types/scroll-to-element/index.d.ts
 create mode 100644 types/scroll-to-element/scroll-to-element-tests.ts
 create mode 100644 types/scroll-to-element/tsconfig.json
 create mode 100644 types/scroll-to-element/tslint.json

diff --git a/types/scroll-to-element/index.d.ts b/types/scroll-to-element/index.d.ts
new file mode 100644
index 0000000000..d2faf83658
--- /dev/null
+++ b/types/scroll-to-element/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for scroll-to-element 2.0
+// Project: https://github.com/willhoag/scroll-to-element
+// Definitions by: Kirill Kvashonin <https://github.com/kirillurgant>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    offset?: number;
+    align?: 'top' | 'middle' | 'bottom';
+    ease?: string;
+    duration?: number;
+}
+
+declare function scrollToElement(selector: string | HTMLElement | Element, options?: Options): void;
+
+export default scrollToElement;
diff --git a/types/scroll-to-element/scroll-to-element-tests.ts b/types/scroll-to-element/scroll-to-element-tests.ts
new file mode 100644
index 0000000000..a9d3d33d81
--- /dev/null
+++ b/types/scroll-to-element/scroll-to-element-tests.ts
@@ -0,0 +1,19 @@
+import scrollToElement from 'scroll-to-element';
+
+scrollToElement('#id');
+
+// with options
+scrollToElement('.className', {
+	offset: 0,
+	ease: 'out-bounce',
+	duration: 1500
+});
+
+// or if you already have a reference to the element
+const elem = document.querySelector('.className');
+scrollToElement(elem, {
+	offset: 0,
+    ease: 'out-bounce',
+    align: 'top',
+	duration: 1500
+});
diff --git a/types/scroll-to-element/tsconfig.json b/types/scroll-to-element/tsconfig.json
new file mode 100644
index 0000000000..f11fef6ecb
--- /dev/null
+++ b/types/scroll-to-element/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "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",
+        "scroll-to-element-tests.ts"
+    ]
+}
diff --git a/types/scroll-to-element/tslint.json b/types/scroll-to-element/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/scroll-to-element/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From c2b85164cc1ab17c95f9c8e1c72d63f5179828e7 Mon Sep 17 00:00:00 2001
From: Bradley Hill <brad.hill@jostens.com>
Date: Wed, 20 Mar 2019 09:58:36 -0500
Subject: [PATCH 811/924] Fabric Polyline pathOffset exposed (just like Path).
 It is always set in initializer.

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

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 5b2a7c13af..96034c0b5f 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -3642,6 +3642,9 @@ export class Polyline extends Object {
 	 * @param [skipOffset] Whether points offsetting should be skipped
 	 */
 	constructor(points: Array<{ x: number; y: number }>, options?: IPolylineOptions);
+
+    pathOffset: Point;
+
 	/**
 	 * List of attribute names to account for when parsing SVG element (used by `fabric.Polygon.fromElement`)
 	 */

From a47d29e744dbb7cc696871118f4d77c85e9c9078 Mon Sep 17 00:00:00 2001
From: Jim Li <jim.li@compass.com>
Date: Wed, 20 Mar 2019 11:39:30 -0400
Subject: [PATCH 812/924] [react-dom] Add test for charCode in synthetic events

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

diff --git a/types/react-dom/v15/react-dom-tests.ts b/types/react-dom/v15/react-dom-tests.ts
index 5f5b149594..8d10405a86 100644
--- a/types/react-dom/v15/react-dom-tests.ts
+++ b/types/react-dom/v15/react-dom-tests.ts
@@ -61,7 +61,7 @@ describe('React dom test utils', () => {
 
         node.value = 'giraffe';
         ReactTestUtils.Simulate.change(node);
-        ReactTestUtils.Simulate.keyDown(node, { key: "Enter", keyCode: 13, which: 13 });
+        ReactTestUtils.Simulate.keyDown(node, { key: "Enter", charCode: 13, keyCode: 13, which: 13 });
     });
 
     it('renderIntoDocument', () => {

From 09dbb2e98ec20e898dc11dbb80c1ae6836e33faf Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Wed, 20 Mar 2019 11:03:32 -0500
Subject: [PATCH 813/924] type fixes

---
 types/parse/index.d.ts | 56 ++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 6c3aa122f1..da3fde2dc6 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -24,6 +24,10 @@ declare namespace Parse {
     let liveQueryServerURL: string;
     let VERSION: string;
 
+    interface BatchSizeOption {
+        batchSize?: number;
+    }
+
     interface SuccessOption {
         success?: Function;
     }
@@ -267,25 +271,25 @@ declare namespace Parse {
         constructor(attributes?: string[], options?: any);
 
         static createWithoutData<T extends Object>(id: string): T;
-        static destroyAll<T>(list: T[], options?: Object.DestroyAllOptions): Promise<T[]>;
-        static extend(className: string, protoProps?: any, classProps?: any): any;        
+        static destroyAll<T extends Object>(list: T[], options?: Object.DestroyAllOptions): Promise<T[]>;
+        static extend(className: string | { className: string }, protoProps?: any, classProps?: any): any;
         static fetchAll<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
         static fetchAllIfNeeded<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
-        static fetchAllWithInclude(list: any, keys: any, options: any): any;
+        static fetchAllWithInclude<T extends Object>(list: T[], keys: string | Array<string | Array<string>>, options: Object.RequestOptions): any;
         static fromJSON(json: any, override: boolean): any;
         static pinAll(objects: Object[]): Promise<void>;
         static pinAllWithName(name: string, objects: Object[]): Promise<void>;
         static registerSubclass<T extends Object>(className: string, clazz: new (options?: any) => T): void;
         static saveAll<T extends Object>(list: T[], options?: Object.SaveAllOptions): Promise<T[]>;
-        static unPinAll(objects: any): Promise<void>;
+        static unPinAll(objects: Object[]): Promise<void>;
         static unPinAllObjects(): Promise<void>;
-        static unPinAllObjectsWithName(name: string): Promise<void>;    
-        static unPinAllWithName(...args: any[]): Promise<void>;
+        static unPinAllObjectsWithName(name: string): Promise<void>;
+        static unPinAllWithName(name: string, objects: Object[]): Promise<void>;
 
-        add(attr: string, item: any): this;
-        addAll(attr: string, items: any[]): this;
-        addAllUnique(attr: string, items: any[]): this;
-        addUnique(attr: string, item: any): this;
+        add(attr: string, item: any): this | boolean;
+        addAll(attr: string, items: any[]): this | boolean;
+        addAllUnique(attr: string, items: any[]): this | boolean;
+        addUnique(attr: string, item: any): this | boolean;
         change(options: any): this;
         changedAttributes(diff: any): boolean;
         clear(options: any): any;
@@ -298,7 +302,7 @@ declare namespace Parse {
         existed(): boolean;
         fetch(options?: Object.FetchOptions): Promise<this>;
         fetchFromLocalDatastore(): Promise<this> | void;
-        fetchWithInclude(keys: string[], options?: any): Promise<this>;
+        fetchWithInclude(keys: keys: string | Array<string | Array<string>>, options?: Object.RequestOptions): Promise<this>;
         get(attr: string): any | undefined;
         getACL(): ACL | undefined;
         has(attr: string): boolean;
@@ -306,16 +310,16 @@ declare namespace Parse {
         increment(attr: string, amount?: number): any;
         initialize(): void;
         isNew(): boolean;
-        isPinned(...args: any[]): Promise<boolean>;
+        isPinned(): Promise<boolean>;
         isValid(): boolean;
         op(attr: string): any;
-        pin(): Promise<this>;
-        pinWithName(name: string): Promise<this>;
+        pin(): Promise<void>;
+        pinWithName(name: string): Promise<void>;
         previous(attr: string): any;
         previousAttributes(): any;
         relation(attr: string): Relation<this, Object>;
-        remove(attr: string, item: any): any;
-        removeAll(attr: string, items: any): any;
+        remove(attr: string, item: any): this | boolean;
+        removeAll(attr: string, items: any): this | boolean;
         revert(): void;
         save(attrs?: { [key: string]: any } | null, options?: Object.SaveOptions): Promise<this>;
         save(key: string, value: any, options?: Object.SaveOptions): Promise<this>;
@@ -324,8 +328,8 @@ declare namespace Parse {
         set(attrs: object, options?: Object.SetOptions): boolean;
         setACL(acl: ACL, options?: SuccessFailureOptions): boolean;
         toPointer(): Pointer;
-        unPin(): Promise<this>;
-        unPinWithName(name: string): Promise<this>;
+        unPin(): Promise<void>;
+        unPinWithName(name: string): Promise<void>;
         unset(attr: string, options?: any): any;
         validate(attrs: any, options?: SuccessFailureOptions): boolean;
     }
@@ -333,7 +337,7 @@ declare namespace Parse {
     namespace Object {
         interface DestroyOptions extends SuccessFailureOptions, WaitOption, ScopeOptions { }
 
-        interface DestroyAllOptions extends SuccessFailureOptions, ScopeOptions { }
+        interface DestroyAllOptions extends BatchSizeOption, ScopeOptions { }
 
         interface FetchAllOptions extends SuccessFailureOptions, ScopeOptions { }
 
@@ -341,14 +345,14 @@ declare namespace Parse {
 
         interface SaveOptions extends SuccessFailureOptions, SilentOption, ScopeOptions, WaitOption { }
 
-        interface SaveAllOptions extends SuccessFailureOptions, ScopeOptions { }
+        interface SaveAllOptions extends BatchSizeOption, ScopeOptions { }
 
         interface SetOptions extends ErrorOption, SilentOption {
             promise?: any;
         }
     }
 
-    class Polygon  extends BaseObject {
+    class Polygon extends BaseObject {
         constructor(arg1: GeoPoint[] | number[][]);
         containsPoint(point: GeoPoint): boolean;
         equals(other: Polygon | any): boolean;
@@ -438,7 +442,7 @@ declare namespace Parse {
         constructor(objectClass: new (...args: any[]) => T);
 
         static and<U extends Object>(...args: Query<U>[]): Query<U>;
-        static fromJSON<U extends Object>(className: any, json: any): Query<U>;
+        static fromJSON<U extends Object>(className: string, json: any): Query<U>;
         static nor<U extends Object>(...args: Query<U>[]): Query<U>;
         static or<U extends Object>(...var_args: Query<U>[]): Query<U>;
 
@@ -453,7 +457,7 @@ declare namespace Parse {
         containedIn(key: string, values: any[]): Query<T>;
         contains(key: string, substring: string): Query<T>;
         containsAll(key: string, values: any[]): Query<T>;
-        containsAllStartingWith(key: string, values: any[]): Query<T>;
+        containsAllStartingWith(key: string, values: string[]): Query<T>;
         count(options?: Query.CountOptions): Promise<number>;
         descending(key: string): Query<T>;
         descending(key: string[]): Query<T>;
@@ -489,10 +493,10 @@ declare namespace Parse {
         polygonContains(key: string, point: GeoPoint): Query<T>;
         select(...keys: string[]): Query<T>;
         skip(n: number): Query<T>;
-        sortByTextScore(): any;
+        sortByTextScore(): this;
         startsWith(key: string, prefix: string): Query<T>;
         subscribe(): LiveQuerySubscription;
-        withJSON(json: any): any;
+        withJSON(json: any): this;
         withinGeoBox(key: string, southwest: GeoPoint, northeast: GeoPoint): Query<T>;
         withinKilometers(key: string, point: GeoPoint, maxDistance: number): Query<T>;
         withinMiles(key: string, point: GeoPoint, maxDistance: number): Query<T>;
@@ -659,7 +663,7 @@ subscription.on('close', () => {});
     class User extends Object {
 
         static allowCustomUserClass(isAllowed: boolean): void;
-        static become(sessionToken: string, options?: SuccessFailureOptions): Promise<User>;
+        static become(sessionToken: string, options?: UseMasterKeyOption): Promise<User>;
         static current(): User | undefined;
         static currentAsync(): Promise<User | null>;
         static signUp(username: string, password: string, attrs: any, options?: SignUpOptions): Promise<User>;

From 9679af37366557bd8c48cbcabfb99b00202a9f3d Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 20 Mar 2019 09:18:48 -0700
Subject: [PATCH 814/924] Switch incorrect 'export default' to 'export ='

---
 types/riot-route/index.d.ts                   |  2 +-
 types/riot-route/riot-route-tests.ts          |  2 +-
 types/rollup-plugin-json/index.d.ts           | 37 ++++++++++---------
 .../rollup-plugin-json-tests.ts               |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/types/riot-route/index.d.ts b/types/riot-route/index.d.ts
index 453bb185fa..a771b3096d 100644
--- a/types/riot-route/index.d.ts
+++ b/types/riot-route/index.d.ts
@@ -6,4 +6,4 @@
 
 import route from './lib/index';
 
-export default route;
+export = route;
diff --git a/types/riot-route/riot-route-tests.ts b/types/riot-route/riot-route-tests.ts
index fab6a2b0df..496c8c7fb4 100644
--- a/types/riot-route/riot-route-tests.ts
+++ b/types/riot-route/riot-route-tests.ts
@@ -1,4 +1,4 @@
-import { default as route } from 'riot-route';
+import route = require('riot-route');
 import routeFromTag from 'riot-route/lib/tag';
 
 /* () */
diff --git a/types/rollup-plugin-json/index.d.ts b/types/rollup-plugin-json/index.d.ts
index b6b61b25e5..c906d90e8a 100644
--- a/types/rollup-plugin-json/index.d.ts
+++ b/types/rollup-plugin-json/index.d.ts
@@ -8,22 +8,25 @@
 /// <reference types="node" />
 import { Plugin } from 'rollup';
 
-export interface Options {
-    /**
-     *  All JSON files will be parsed by default, but you can also specifically include/exclude files
-     */
-    include?: string | string[];
-    exclude?: string | string[];
-    /**
-     *  for tree-shaking, properties will be declared as variables, using either `var` or `const`
-     *  @default false
-     */
-    preferConst?: boolean;
-    /**
-     * specify indentation for the generated default export — defaults to '\t'
-     * @default '\t'
-     */
-    indent?: string;
+declare namespace json {
+    interface Options {
+        /**
+         *  All JSON files will be parsed by default, but you can also specifically include/exclude files
+         */
+        include?: string | string[];
+        exclude?: string | string[];
+        /**
+         *  for tree-shaking, properties will be declared as variables, using either `var` or `const`
+         *  @default false
+         */
+        preferConst?: boolean;
+        /**
+         * specify indentation for the generated default export — defaults to '\t'
+         * @default '\t'
+         */
+        indent?: string;
+    }
 }
 
-export default function json(options?: Options): Plugin;
+declare function json(options?: json.Options): Plugin;
+export = json;
diff --git a/types/rollup-plugin-json/rollup-plugin-json-tests.ts b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
index 32e7b26b7a..ed3ddc2b72 100644
--- a/types/rollup-plugin-json/rollup-plugin-json-tests.ts
+++ b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
@@ -1,4 +1,4 @@
-import json from 'rollup-plugin-json';
+import json = require('rollup-plugin-json');
 
 json(); // $ExpectType Plugin
 

From fab55e0af1f9ccfb00dbc26281e87bfb60ad8e77 Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Wed, 20 Mar 2019 11:38:30 -0500
Subject: [PATCH 815/924] fix tests

---
 types/parse/index.d.ts | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index da3fde2dc6..ba3d546ca5 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -36,6 +36,24 @@ declare namespace Parse {
         error?: Function;
     }
 
+    interface FullOptions {
+      success?: Function;
+      error?: Function;
+      useMasterKey?: boolean;
+      sessionToken?: string;
+      installationId?: string;
+      progress?: Function;
+    }
+
+    interface RequestOptions {
+      useMasterKey?: boolean;
+      sessionToken?: string;
+      installationId?: string;
+      batchSize?: number;
+      include?: string | string[];
+      progress?: Function;
+    }
+
     interface SuccessFailureOptions extends SuccessOption, ErrorOption {
     }
 
@@ -275,7 +293,7 @@ declare namespace Parse {
         static extend(className: string | { className: string }, protoProps?: any, classProps?: any): any;
         static fetchAll<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
         static fetchAllIfNeeded<T extends Object>(list: T[], options: Object.FetchAllOptions): Promise<T[]>;
-        static fetchAllWithInclude<T extends Object>(list: T[], keys: string | Array<string | Array<string>>, options: Object.RequestOptions): any;
+        static fetchAllWithInclude<T extends Object>(list: T[], keys: string | Array<string | Array<string>>, options: RequestOptions): Promise<T[]>;
         static fromJSON(json: any, override: boolean): any;
         static pinAll(objects: Object[]): Promise<void>;
         static pinAllWithName(name: string, objects: Object[]): Promise<void>;
@@ -302,7 +320,7 @@ declare namespace Parse {
         existed(): boolean;
         fetch(options?: Object.FetchOptions): Promise<this>;
         fetchFromLocalDatastore(): Promise<this> | void;
-        fetchWithInclude(keys: keys: string | Array<string | Array<string>>, options?: Object.RequestOptions): Promise<this>;
+        fetchWithInclude(keys: string | Array<string | Array<string>>, options?: RequestOptions): Promise<this>;
         get(attr: string): any | undefined;
         getACL(): ACL | undefined;
         has(attr: string): boolean;
@@ -457,7 +475,7 @@ declare namespace Parse {
         containedIn(key: string, values: any[]): Query<T>;
         contains(key: string, substring: string): Query<T>;
         containsAll(key: string, values: any[]): Query<T>;
-        containsAllStartingWith(key: string, values: string[]): Query<T>;
+        containsAllStartingWith(key: string, values: any[]): Query<T>;
         count(options?: Query.CountOptions): Promise<number>;
         descending(key: string): Query<T>;
         descending(key: string[]): Query<T>;

From e7d6af3d2cbb0383325896c5e56acdaabb8643ba Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 20 Mar 2019 10:15:17 -0700
Subject: [PATCH 816/924] Update react-table to 6.8

The change from #30638 was first introduced in 6.6, but
@types/react-table was already at 6.7, so the correct change is to bump
it to 6.8 for a breaking change like this.
---
 types/react-table/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 626e420cb6..6327eb6128 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-table 6.6
+// Type definitions for react-table 6.8
 // Project: https://github.com/react-tools/react-table
 // Definitions by: Roy Xue <https://github.com/royxue>,
 //                 Pavel Sakalo <https://github.com/psakalo>,

From 70e0999d26f109ec0f2f007fa38ae743d7280d02 Mon Sep 17 00:00:00 2001
From: Konrad Klockgether <12186615+Nielio@users.noreply.github.com>
Date: Wed, 20 Mar 2019 18:19:44 +0100
Subject: [PATCH 817/924] Added: Polygon and Vec2 typings (#33696)

* Type definitions for Vec2 and Polygon
Polygon requires Vec2

* [vec2] lint

* [polygon] lint

* [polygon] export default

* [vec2] export default

* [polygon] use global package reference

* [polygon] remove package.json

* [polygon] add member-access keywords; Remove doc tags without description

* [vec2] add member-access keywords; Remove doc tags without description

* [vec2] constructor test

* [polygon] simple test

* [polygon] correct parameter name

* [vec2] comments in test

* [vec2] remove member-access rule

* [vec2] remove member-access rule

* [polygon] remove member-access rule

* [polygon] [vec2] change export type

* [polygon] fix vec2 import

* [polygon] use default export

* [vec2] use default export

* [vec2] try `export = Vec2;`

* [polygon] try `export = Polygon;`

* Revert "[polygon] try `export = Polygon;`"

This reverts commit 62131e05

* Revert "[vec2] try `export = Vec2;`"

This reverts commit 0fba20c7

* [vec2] [polygon] try `export = Vec2;` and `export = Polygon;`

* [vec2] [polygon] try `export = Vec2;` and `export = Polygon;`
---
 types/polygon/index.d.ts       | 190 ++++++++++++++++++++++++++++++++
 types/polygon/polygon-tests.ts |  16 +++
 types/polygon/tsconfig.json    |  23 ++++
 types/polygon/tslint.json      |   3 +
 types/vec2/index.d.ts          | 191 +++++++++++++++++++++++++++++++++
 types/vec2/tsconfig.json       |  23 ++++
 types/vec2/tslint.json         |   3 +
 types/vec2/vec2-tests.ts       |   8 ++
 8 files changed, 457 insertions(+)
 create mode 100644 types/polygon/index.d.ts
 create mode 100644 types/polygon/polygon-tests.ts
 create mode 100644 types/polygon/tsconfig.json
 create mode 100644 types/polygon/tslint.json
 create mode 100644 types/vec2/index.d.ts
 create mode 100644 types/vec2/tsconfig.json
 create mode 100644 types/vec2/tslint.json
 create mode 100644 types/vec2/vec2-tests.ts

diff --git a/types/polygon/index.d.ts b/types/polygon/index.d.ts
new file mode 100644
index 0000000000..c5e7adb827
--- /dev/null
+++ b/types/polygon/index.d.ts
@@ -0,0 +1,190 @@
+// Type definitions for polygon 1.0
+// Project: https://github.com/tmpvar/polygon.js#readme
+// Definitions by: Konrad Klockgether <https://github.com/Nielio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* tslint:disable:array-type */  // cause contradictory error messages
+
+import Vec2 = require('vec2');
+
+/**
+ * Create a new polygon:
+ *
+ * ```javascript
+ * var p = new Polygon([
+ * Vec2(0, 0),
+ * Vec2(10, 0),
+ * Vec2(0, 10)
+ * ]);
+ *
+ * ```
+ *
+ * You can pass an array of `Vec2`s, arrays `[x, y]`, or objects `{ x: 10, y: 20 }`
+ *
+ * **Stuff to Note**: most of the Vec2's methods take a `returnNew` as the last parameter.
+ * If passed a truthy value, a new vector will be returned to you.
+ * Otherwise the operation will be applied to `this` and `this` will be returned.
+ */
+declare class Polygon {
+    readonly points: Vec2[];
+
+    /**
+     * Returns the number of points in this polygon
+     */
+    readonly length: number;
+
+    constructor(points: Vec2[] | number[][] | { x: number, y: number }[]);
+
+    /**
+     * Something like Array.forEach on points
+     */
+    each(fn: (prev: Vec2, current: Vec2, next: Vec2, idx: number) => any): Polygon;
+
+    /**
+     * Returns the point at index `idx`. note: this will wrap in both directions
+     */
+    point(idx: number): Vec2;
+
+    /**
+     * Ensure all of the points are unique
+     */
+    dedupe(returnNew?: boolean): Polygon;
+
+    /**
+     * Insert `vec2` at the specified index
+     */
+    insert(vec2: Vec2, index: number): void;
+
+    /**
+     * Remove the specified `vec2` or numeric index from this polygon
+     */
+    remove(vecOrIndex: Vec2 | number): Polygon;
+
+    /**
+     * Removes contiguous points that are the same
+     */
+    clean(returnNew?: boolean): Polygon;
+
+    /**
+     * Returns the direction in which a polygon is wound (true === clockwise)
+     */
+    winding(): boolean;
+
+    /**
+     * Rewinds the polygon in the specified direction (true === clockwise)
+     */
+    rewind(cw: boolean): Polygon;
+
+    /**
+     * Computes the area of the polygon
+     */
+    area(): number;
+
+    /**
+     * Finds the closest point in this polygon to `vec2`
+     */
+    closestPointTo(vec2: Vec2): Vec2;
+
+    /**
+     * Returns a `Vec2` at the center of the AABB
+     */
+    center(): Vec2;
+
+    /**
+     * Scales this polygon around `origin` (default is `this.center()`) and will return a new polygon if requested with `returnNew`
+     */
+    scale(amount: number, origin: Vec2, returnNew?: boolean): Polygon;
+
+    /**
+     * Returns true if `vec2` is inside the polygon
+     */
+    containsPoint(vec2: Vec2): boolean;
+
+    /**
+     * Returns true if `poly` is completely contained in this polygon
+     */
+    containsPolygon(poly: Polygon): boolean;
+
+    /**
+     * Returns an object `{x:_, y:_, w:_, h:_}` representing the axis-aligned bounding box of this polygyon
+     */
+    aabb(): { x: number, y: number, w: number, h: number };
+
+    /**
+     * Performs an offset/buffering operation on this polygon and returns a new one
+     */
+    offset(amount: number): Polygon;
+
+    /**
+     * Return an array `[startpoint, endpoint]` representing the line at the specified `index`
+     */
+    line(index: number): [Vec2, Vec2];
+
+    /**
+     * Iterate over the lines in this polygon
+     */
+    lines(fn: (start: Vec2, end: Vec2, index: number) => any): Polygon;
+
+    /**
+     * Find self-intersections and return them as a new polygon
+     */
+    selfIntersections(): Polygon;
+
+    /**
+     * Remove self intersections from this polygon.  returns an array of polygons
+     */
+    pruneSelfIntersections(): Polygon[];
+
+    /**
+     *  Return a new instance of this polygon
+     */
+    clone(): Polygon;
+
+    /**
+     * Rotate by origin `vec2` (default `this.center()`) by radians `rads` and return a clone if `returnNew` is specified
+     */
+    rotate(rads: number, vec2: Vec2, returnNew?: boolean): Polygon;
+
+    /**
+     * Translate by `vec2` and return a clone if `returnNew` is specified
+     */
+    translate(vec2: Vec2, returnNew?: boolean): Polygon;
+
+    /**
+     * Return true if this polygon has the same components and the incoming `poly`
+     */
+    equal(poly: Polygon): boolean;
+
+    /**
+     * Works with an array of vec2's,
+     * an object containing a `.position` and `.radius`,
+     * an object populated with x1,y1,x2,y2,
+     * an object populated with x,y,w,h,
+     * and an object populated with x,y,width,height.
+     * See the tests for more info
+     */
+    contains(
+        thing: Vec2[]
+            | { position: Vec2, radius: number }
+            | { x1: number, y1: number, x2: number, y2: number }
+            | { x: number, y: number, w: number, h: number }
+            | { x: number, y: number, width: number, height: number }
+    ): boolean;
+
+    /**
+     * Returns a new polygon representing the boolean union of `this` and the incoming `polygon`
+     */
+    union(polygon: Polygon): Polygon;
+
+    /**
+     * Returns a new polygon representing the boolean cut of `polygon` from `this`
+     */
+    cut(polygon: Polygon): Polygon;
+
+    /**
+     * Convert this polygon into an array of arrays (`[[x, y]]`)
+     */
+    toArray(): number[][];
+}
+
+export = Polygon;
diff --git a/types/polygon/polygon-tests.ts b/types/polygon/polygon-tests.ts
new file mode 100644
index 0000000000..13ea7c08c1
--- /dev/null
+++ b/types/polygon/polygon-tests.ts
@@ -0,0 +1,16 @@
+// no tests yet
+import Polygon = require('polygon');
+
+const polygon1 = new Polygon([
+    [0, 0],
+    [5, 0],
+    [5, 5],
+    [0, 5],
+    [0, 0],
+]);
+const shouldBeTrue = polygon1.contains({
+    x: 3,
+    y: 3,
+    w: 4,
+    h: 3,
+});
diff --git a/types/polygon/tsconfig.json b/types/polygon/tsconfig.json
new file mode 100644
index 0000000000..516af96426
--- /dev/null
+++ b/types/polygon/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "polygon-tests.ts"
+    ]
+}
diff --git a/types/polygon/tslint.json b/types/polygon/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/polygon/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vec2/index.d.ts b/types/vec2/index.d.ts
new file mode 100644
index 0000000000..e3b6623bb5
--- /dev/null
+++ b/types/vec2/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for vec2 1.6
+// Project: https://github.com/tmpvar/vec2.js
+// Definitions by: Konrad Klockgether <https://github.com/Nielio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * A generic library useful when you need to work with points/vectors in 2d space.
+ * **Stuff to Note**: most of the Vec2's methods take a `returnNew` as the last parameter.
+ * If passed a truthy value, a new vector will be returned to you.
+ * Otherwise the operation will be applied to `this` and `this` will be returned.
+ * Also, since `Infinity`and `NaN` are so insidious, this library will throw as soon as it detects either of these so you can take action to fix your data/algorithm.
+ */
+declare class Vec2 {
+    readonly x: number;
+    readonly y: number;
+
+    constructor(xy: number[]);
+    constructor(x: number, y: number);
+
+    /**
+     * Add an observer `fn` that will be called whenever this vector changes.  Calling this method without a function causes it to notify observers.
+     * `fn` signature: `function(vec, prev) {}` - where `prev` is a clone of the vector before the last operation.
+     * this function returns the passed `fn`
+     */
+    change(fn?: (vec: Vec2, prev: Vec2) => any): Vec2;
+
+    /**
+     * Pass a `fn` to remove it from the observers list. Calling this function without a `fn` will remove all observers.
+     */
+    ignore(fn?: (vec: Vec2, prev: Vec2) => any): Vec2;
+
+    /**
+     * Sets the `x` and `y` coordinates of this vector.  If `false` is passed for `notify`, none of the observers will be called.
+     */
+    set(x: number, y: number, notify: boolean): Vec2;
+
+    /**
+     * Sets the `x` and `y` of this vector to `0`
+     */
+    zero(): Vec2;
+
+    /**
+     * Returns a clone of this vector.
+     * _Note_: this does not clone observers
+     */
+    zero(): Vec2;
+
+    /**
+     * Negate the `x` and `y` coords of this vector.  If `returnNew` is truthy, a new vector with the negated coordinates will be returned.
+     */
+    negate(returnNew?: boolean): Vec2;
+
+    /**
+     * Add the `x` and `y` to this vector's coordinates.
+     * If `returnNew` is truthy, return a new vector containing the resulting coordinates. Otherwise apply them to this vector and return it.
+     */
+    add(x: number, y: number, returnNew?: boolean): Vec2;
+    add(vec2: number[] | Vec2, returnNew?: boolean): Vec2;
+
+    subtract(x: number, y: number, returnNew?: boolean): Vec2;
+    subtract(vec2: Vec2 | number[], returnNew?: boolean): Vec2;
+
+    /**
+     * Multiply this vectors components with the incoming, returning a clone if `returnNew` is truthy.
+     */
+    multiply(x: number, y: number, returnNew?: boolean): Vec2;
+    multiply(scalarArrayVec2: number | number[] | Vec2, returnNew?: boolean): Vec2;
+
+    /**
+     * Divide this vectors components by the incoming, returning a clone if `returnNew` is truthy.
+     * _note_: this method will throw if you attempt to divide by zero or pass values that cause NaNs
+     */
+    divide(x: number, y: number, returnNew?: boolean): Vec2;
+    divide(scalarArrayVec2: number | number[] | Vec2, returnNew?: boolean): Vec2;
+
+    /**
+     * Rotate this vector's cordinates around `(0,0)`.  If `returnNew` is specified, a new `Vec2` will be created and populated with the result and returned.
+     * Otherwise the result is applied to this vector and `this` is returned.
+     * `inverse` - inverts the direction of the rotation
+     * `returnNew` - causes the result to be applied to a new `Vec2`, otherwise the result is applied to `this`
+     */
+    rotate(radians: number, inverse?: number, returnNew?: boolean): Vec2;
+
+    /**
+     * Returns the length of this vector from `(0,0)`
+     */
+    length(): number;
+
+    /**
+     * Returns the length of this vector prior to the `Math.sqrt` call.
+     * This is usefull when you don't need to know the actual distance, but need a normalized value to compare with another `Vec2#lengthSquared` or similar.
+     */
+    lengthSquared(): number;
+
+    /**
+     * _returns_: the distance between this vector and the incoming
+     */
+    distance(vec2: Vec2): number;
+
+    /**
+     * _returns_: closest vector in array to this vector.
+     */
+    nearest(array: Vec2[]): Vec2;
+
+    /**
+     * Normalizes this vector.  If `returnNew` is truthy, a new vector populated with the normalized coordinates will be returned.
+     */
+    normalize(returnNew?: boolean): Vec2;
+
+    /**
+     * Returns true if the incoming coordinates are the same as this vector's
+     */
+    equal(x: number, y: number): boolean;
+    equal(arrayVec2: number[] | Vec2): boolean;
+
+    /**
+     * Return a `Vec2` that contains the absolute value of each of this vector's parts.
+     * If `returnNew` is truthy, create a new `Vec2` and return it. Otherwise apply the absolute values to to `this`.
+     */
+    abs(returnNew?: boolean): Vec2;
+
+    /**
+     * Return a `Vec2` consisting of the smallest values from this vector and the incoming
+     * When returnNew is truthy, a new `Vec2` will be returned otherwise the minimum values in either this or `vec` will be applied to this vector.
+     */
+    min(vec: Vec2, returnNew?: boolean): Vec2;
+
+    /**
+     * Return a `Vec2` consisting of the largest values from this vector and the incoming
+     * When returnNew is truthy, a new `Vec2` will be returned otherwise the maximum values in either `this` or `vec` will be applied to this vector.
+     */
+    max(vec: Vec2, returnNew?: boolean): Vec2;
+
+    /**
+     * Clamp the coordinates of this vector to the high/low of the incoming vec2s.  If `returnNew` apply the result to the new vector and return.
+     * Otherwise apply to this vector.
+     */
+    clamp(low: Vec2, high: Vec2, returnNew?: boolean): Vec2;
+
+    /**
+     *
+     * Perform linear interpolation between this vector and the incoming.
+     * `amount` - the percentage along the path to place the vector
+     * `returnNew` - if `truthy`, apply the result to a new vector and return it, otherwise return `this`
+     */
+    lerp(vec: Vec2, amount: number, returnNew?: boolean): Vec2;
+
+    /**
+     * Returns a vector set with the `(-y,x)` coordinates of this vector.  If `returnNew` a new vector is created and the operation is applied to the new vector.
+     */
+    skew(returnNew?: boolean): Vec2;
+
+    /**
+     * _returns_: `double`
+     */
+    dot(): number;
+
+    /**
+     * _returns_: `double`
+     */
+    perpDot(): number;
+
+    /**
+     * Returns the angle from this vector to the incoming.
+     */
+    angleTo(vec: Vec2): number;
+
+    /**
+     * Where `start` and `end` are vec2-like (e.g. `start.x` and `start.y`)
+     */
+    isPointOnLine(start: Vec2, end: Vec2): boolean;
+
+    /**
+     * _returns_: `[x, y]`
+     */
+    toArray(): number[];
+
+    /**
+     * Applies the `[0]` to `this.x` and `[1]` to `this.y`
+     */
+    fromArray(array: number[]): Vec2;
+
+     toJSON(): { x: number, y: number };
+
+    /**
+     * _returns_: `'(x, y)'`
+     */
+     toString(): string;
+}
+
+export = Vec2;
diff --git a/types/vec2/tsconfig.json b/types/vec2/tsconfig.json
new file mode 100644
index 0000000000..ddd223e3be
--- /dev/null
+++ b/types/vec2/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "vec2-tests.ts"
+    ]
+}
diff --git a/types/vec2/tslint.json b/types/vec2/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/vec2/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/vec2/vec2-tests.ts b/types/vec2/vec2-tests.ts
new file mode 100644
index 0000000000..384c364333
--- /dev/null
+++ b/types/vec2/vec2-tests.ts
@@ -0,0 +1,8 @@
+import Vec2 = require('vec2');
+
+// some constructor tests
+const instance = new Vec2([0, 1]);
+const instanceFromArray = new Vec2(instance.toArray());
+const json = instanceFromArray.toJSON();
+const instanceFromJson = new Vec2(json.x, json.y);
+const shouldBeTrue = instanceFromJson.equal(instance);

From 4d87d9ce0ae63f1da34a761810fa6a17e3d46f63 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 20 Mar 2019 10:50:27 -0700
Subject: [PATCH 818/924] Remove test that fails on TS3.4

This is by design (TS #30215); previously Typescript incorrectly
inferred `{}` but now gives an error.
---
 types/ramda/ramda-tests.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index fdac7648db..2d8b00ba6a 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -967,7 +967,8 @@ interface Obj {
     }
     const list: Book[] = [{id: "xyz", title: "A"}, {id: "abc", title: "B"}];
     const a1 = R.indexBy(R.prop("id"), list);
-    const a2 = R.indexBy(R.prop("id"))(list);
+    // Typescript 3.3 incorrectly gives `a2: {}`, 3.4 gives an error instead.
+    // const a2 = R.indexBy(R.prop("id"))(list);
     const a3 = R.indexBy<{ id: string }>(R.prop("id"))(list);
     const a4 = R.indexBy(R.prop<"id", string>("id"))(list);
     const a5 = R.indexBy<{ id: string }>(R.prop<"id", string>("id"))(list);

From 8179d9cb6d8c0d0d46afe6c403ea60c34fa7b238 Mon Sep 17 00:00:00 2001
From: Gordon <gburgett@watermark.org>
Date: Wed, 20 Mar 2019 13:45:50 -0500
Subject: [PATCH 819/924] Fix incorrect connectHits exposed properties

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

diff --git a/types/react-instantsearch-core/index.d.ts b/types/react-instantsearch-core/index.d.ts
index 0092feb370..ed0241ffad 100644
--- a/types/react-instantsearch-core/index.d.ts
+++ b/types/react-instantsearch-core/index.d.ts
@@ -333,7 +333,7 @@ interface HitsProvided<THit> {
  * https://community.algolia.com/react-instantsearch/connectors/connectHits.html
  */
 // tslint:disable-next-line:no-unnecessary-generics
-export function connectHits<THit = BasicDoc>(stateless: React.StatelessComponent<HitsProvided<THit>>): React.ComponentClass<HighlightPassedThru>;
+export function connectHits<THit = BasicDoc>(stateless: React.StatelessComponent<HitsProvided<THit>>): React.ComponentClass;
 export function connectHits<TProps extends HitsProvided<THit>, THit>(ctor: React.ComponentType<TProps>): ConnectedComponentClass<TProps, HitsProvided<THit>>;
 
 export function connectHitsPerPage(Composed: React.ComponentType<any>): React.ComponentClass<any>;
diff --git a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
index 76cc26f2a4..3d0208707e 100644
--- a/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
+++ b/types/react-instantsearch-core/react-instantsearch-core-tests.tsx
@@ -408,12 +408,14 @@ import {
   }
   const ConnectedCustomHighlight2 = connectHighlight(CustomHighlight2);
 
-  connectHits<MyDoc>(({ hits }) => (
+  const ConnectedStatelessHits = connectHits<MyDoc>(({ hits }) => (
     <p>
       <CustomHighlight attribute="name" hit={hits[0]} />
       <ConnectedCustomHighlight2 attribute="name" hit={hits[1]} limit={7} />
     </p>
   ));
+
+  <ConnectedStatelessHits />;
 };
 
 // https://github.com/algolia/react-instantsearch/blob/master/examples/autocomplete/src/App-Mentions.js

From 0f7add13ba328dabad5af4f841417fce64a96213 Mon Sep 17 00:00:00 2001
From: arunksan <arunksan@cisco.com>
Date: Wed, 20 Mar 2019 13:23:59 -0700
Subject: [PATCH 820/924] @types/highcharts: dataLabels support
 Highcharts.ganttChart()

---
 types/highcharts/index.d.ts    | 47 ++++++++++++++++++++++------------
 types/highcharts/test/index.ts | 43 +++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index b3900154cd..8001ab7884 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -5,6 +5,7 @@
 //                 Albert Ozimek <https://github.com/AlbertOzimek>
 //                 Juliën Hanssens <https://github.com/hanssens>
 //                 Johns Gresham <https://github.com/jgresham>
+//                 ArunkeshavaReddy Sankaramaddi <https://github.com/Arunkeshavareddy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -4458,7 +4459,10 @@ declare namespace Highcharts {
          * @default 'Solid'
          */
         dashStyle?: string;
-        dataLabels?: DataLabels;
+        /**
+         * Gantt charts use one or more data labels for each series, for showing multiple date periods.
+         */
+        dataLabels?: DataLabels | DataLabels[];
         /**
          * Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on
          * graphs and points. For large datasets it improves performance.
@@ -5984,6 +5988,7 @@ declare namespace Highcharts {
     interface ColumnRangeChartSeriesOptions extends IndividualSeriesOptions, ColumnRangeChart { }
     interface ErrorBarChartSeriesOptions extends IndividualSeriesOptions, ErrorBarChart { }
     interface FunnelChartSeriesOptions extends IndividualSeriesOptions, FunnelChart { }
+    interface GanttChartSeriesOptions extends IndividualSeriesOptions, SeriesChart { }
     interface GaugeChartSeriesOptions extends IndividualSeriesOptions, GaugeChart { }
     interface HeatMapSeriesOptions extends IndividualSeriesOptions, HeatMapChart { }
     interface LineChartSeriesOptions extends IndividualSeriesOptions, LineChart { }
@@ -6023,11 +6028,11 @@ declare namespace Highcharts {
          * The id of a series in the drilldown.series array to use for a drilldown for this point.
          * @since 3.0.8
          */
-				drilldown?: string;
-				/**
-				 * The end value of the point. For gantt datetime axes, the end value is the timestamp in milliseconds since 1970.
-				 */
-				end?: number;
+        drilldown?: string;
+        /**
+         * The end value of the point. For gantt datetime axes, the end value is the timestamp in milliseconds since 1970.
+         */
+		end?: number;
         /**
          * Individual point events
          */
@@ -6106,11 +6111,11 @@ declare namespace Highcharts {
          * Whether to display a slice offset from the center.
          * @default false
          */
-				sliced?: boolean;
-				/**
-				 * The start value of the point. For gantt datetime axes, the start value is the timestamp in milliseconds since 1970.
-				 */
-				start?: number;
+        sliced?: boolean;
+        /**
+         * The start value of the point. For gantt datetime axes, the start value is the timestamp in milliseconds since 1970.
+         */
+        start?: number;
         /**
          * The value of the point, resulting in a relative area of the point in the treemap.
          */
@@ -6686,6 +6691,16 @@ declare namespace Highcharts {
         yAxis?: AxisOptions[] | AxisOptions;
     }
 
+    /**
+     * The Gantt chart uses different plot options than the base Highcharts chart Options.
+     */
+    interface GanttOptions extends Options {
+        /**
+         * The specific Gantt Series to append the GanttChart.
+         */
+        series?: GanttChartSeriesOptions[];
+    }
+
     interface GlobalOptions extends Options {
         /**
          * Global options that don't apply to each chart. These options, like the lang options, must be set using the
@@ -7269,11 +7284,11 @@ declare namespace Highcharts {
          * As Highcharts.Chart, but without need for the new keyword.
          * @since 4.2.0
          */
-				chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
-				/**
-				 * Highcharts ganttChart which doesn't require the new keyword. Required Highcharts Gantt module.
-				 */
-				ganttChart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+		chart(renderTo: string | HTMLElement, options: Options, callback?: (chart: ChartObject) => void): ChartObject;
+		/**
+		 * Highcharts ganttChart which doesn't require the new keyword. Required Highcharts Gantt module.
+		 */
+		ganttChart(renderTo: string | HTMLElement, options: GanttOptions, callback?: (chart: ChartObject) => void): ChartObject;
         /**
          * An array containing the current chart objects in the page. A chart's position in the array is preserved
          * throughout the page's lifetime. When a chart is destroyed, the array item becomes undefined.
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index 9ac03d1f81..358064b877 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2886,3 +2886,46 @@ function test_GanttChart() {
 		}],
 	});
 }
+
+// Tests DataLabels types for Highcharts.ganttChart, which uses the Gantt module
+function test_GanttChartDataLabels() {
+	Highcharts.ganttChart('ganttChartContainer', {
+		xAxis: {
+			min: Date.UTC(2014, 9, 18),
+			max: Date.UTC(2014, 12, 20)
+		},
+		series: [{
+			name: 'Project 1',
+			data: [
+				{
+					name: 'Lemon Tea',
+					start: Date.UTC(2014, 10, 18),
+					end: Date.UTC(2014, 11, 20)
+				},
+				{
+					name: 'Stapler',
+					start: Date.UTC(2014, 11, 18),
+					end: Date.UTC(2014, 12, 20)
+				},
+				{
+					name: 'Sierra',
+					start: Date.UTC(2014, 12, 18),
+					end: Date.UTC(2014, 12, 20)
+				},
+            ],
+            dataLabels: [{
+                enabled: true,
+                format: '<span>Data Label Left</span>',
+                useHTML: true,
+                align: 'left',
+                allowOverlap: true,
+              }, {
+                enabled: true,
+                format: '<span>Data Label Right</span>',
+                useHTML: true,
+                align: 'right',
+                allowOverlap: true,
+              }]
+		}],
+	});
+}

From 4d0f36a90408ea95b88d3e1ef5e782d495ddd3c2 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <granttimmerman@gmail.com>
Date: Wed, 20 Mar 2019 13:38:05 -0700
Subject: [PATCH 821/924] Revert "[@types/google-apps-script] Remove the
 unnecessary console declaration"

---
 types/google-apps-script/google-apps-script.base.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/google-apps-script/google-apps-script.base.d.ts b/types/google-apps-script/google-apps-script.base.d.ts
index 5c2a8d9155..be1bad95d5 100644
--- a/types/google-apps-script/google-apps-script.base.d.ts
+++ b/types/google-apps-script/google-apps-script.base.d.ts
@@ -326,3 +326,4 @@ declare var Logger: GoogleAppsScript.Base.Logger;
 // conflicts with MimeType in lib.d.ts
 // declare var MimeType: GoogleAppsScript.Base.MimeType;
 declare var Session: GoogleAppsScript.Base.Session;
+declare var console: GoogleAppsScript.Base.console;

From 10cdba22e19514b23035d929af1a17afd97313b6 Mon Sep 17 00:00:00 2001
From: Damien Sorel <contact@git.strangeplanet.fr>
Date: Wed, 20 Mar 2019 22:38:06 +0100
Subject: [PATCH 822/924] Update tsconfig.json

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

diff --git a/types/wordpress__jest-console/tsconfig.json b/types/wordpress__jest-console/tsconfig.json
index f21c4b6ce7..429b3c1488 100644
--- a/types/wordpress__jest-console/tsconfig.json
+++ b/types/wordpress__jest-console/tsconfig.json
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "jest-console-tests.ts"
+        "wordpress__jest-console-tests.ts"
     ]
 }

From 3780fcc54da727c710f1e027b3fc98a29ce68072 Mon Sep 17 00:00:00 2001
From: Ben James <benhjames@sky.com>
Date: Wed, 20 Mar 2019 22:43:41 +0000
Subject: [PATCH 823/924] Add @google-cloud/text-to-speech definitions

---
 .../google-cloud__text-to-speech-tests.ts     |  56 ++++++++
 types/google-cloud__text-to-speech/index.d.ts | 123 ++++++++++++++++++
 .../tsconfig.json                             |  19 +++
 .../google-cloud__text-to-speech/tslint.json  |   1 +
 4 files changed, 199 insertions(+)
 create mode 100644 types/google-cloud__text-to-speech/google-cloud__text-to-speech-tests.ts
 create mode 100644 types/google-cloud__text-to-speech/index.d.ts
 create mode 100644 types/google-cloud__text-to-speech/tsconfig.json
 create mode 100644 types/google-cloud__text-to-speech/tslint.json

diff --git a/types/google-cloud__text-to-speech/google-cloud__text-to-speech-tests.ts b/types/google-cloud__text-to-speech/google-cloud__text-to-speech-tests.ts
new file mode 100644
index 0000000000..79c368c8e3
--- /dev/null
+++ b/types/google-cloud__text-to-speech/google-cloud__text-to-speech-tests.ts
@@ -0,0 +1,56 @@
+import textToSpeech from "@google-cloud/text-to-speech";
+
+const client = new textToSpeech.TextToSpeechClient({});
+
+/* listVoices */
+
+client.listVoices({});
+
+client.listVoices({}, (err, res) => {
+    if (res) {
+        res.map(voice =>
+            console.log(
+                voice.language_codes,
+                voice.name,
+                voice.naturalSampleRateHertz,
+                voice.ssmlGender
+            )
+        );
+    }
+});
+
+client.listVoices({ languageCode: "en-GB" }).then(res => {
+    res[0].map(voice =>
+        console.log(
+            voice.language_codes,
+            voice.name,
+            voice.naturalSampleRateHertz,
+            voice.ssmlGender
+        )
+    );
+});
+
+/* synthesizeSpeech */
+
+client.synthesizeSpeech(
+    {
+        input: { text: "Hello world." },
+        audioConfig: { audioEncoding: "MP3" },
+        voice: { name: "Alice" }
+    },
+    (err, res) => {
+        if (res) {
+            console.log(res.audioContent);
+        }
+    }
+);
+
+client
+    .synthesizeSpeech({
+        input: { ssml: "Hello world." },
+        audioConfig: { audioEncoding: "OGG_OPUS" },
+        voice: { name: "Bob", languageCode: "en-GB" }
+    })
+    .then(res => {
+        console.log(res[0].audioContent);
+    });
diff --git a/types/google-cloud__text-to-speech/index.d.ts b/types/google-cloud__text-to-speech/index.d.ts
new file mode 100644
index 0000000000..9e0c80cac2
--- /dev/null
+++ b/types/google-cloud__text-to-speech/index.d.ts
@@ -0,0 +1,123 @@
+// Type definitions for google-cloud__text-to-speech 0.5
+// Project: https://github.com/googleapis/nodejs-text-to-speech
+// Definitions by: Ben James <https://github.com/benhjames>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+export type GoogleError = any;
+
+export type APICallback<T = any> = (
+    err: GoogleError | null,
+    response?: T
+) => void;
+
+export interface PromiseLike<T> extends Promise<T> {
+    /**
+     * Cancel the ongoing promise
+     */
+    cancel(): void;
+}
+
+export interface MethodOverload<T, R> {
+    (data: T, options?: CallOptions): PromiseLike<[R]>;
+    (data: T, options: CallOptions, callback: APICallback<R>): void;
+    (data: T, callback: APICallback<R>): void;
+}
+
+export interface CallOptions {
+    timeout?: number;
+    retry?: any;
+    autoPaginate?: boolean;
+    pageToken?: any;
+    isBundling: boolean;
+    longrunning?: any;
+    promise?: any;
+}
+
+export interface ClientOptionsCredentials {
+    client_email: string;
+    private_key: string;
+}
+
+export interface ClientOptions {
+    credentials?: ClientOptionsCredentials;
+    email?: string;
+    keyFilename?: string;
+    port?: number;
+    projectId?: string;
+    promise?: any;
+    servicePath?: string;
+}
+
+export interface ListVoicesRequest {
+    languageCode?: string;
+}
+
+export type ListVoicesOptions = CallOptions;
+
+export type SsmlVoiceGender =
+    | "SSML_VOICE_GENDER_UNSPECIFIED"
+    | "MALE"
+    | "FEMALE"
+    | "NEUTRAL";
+
+export interface Voice {
+    language_codes: string[];
+    name: string;
+    ssmlGender: SsmlVoiceGender;
+    naturalSampleRateHertz: number;
+}
+
+export type ListVoicesResponse = Voice[];
+
+export type SynthesisInput = { text: string } | { ssml: string };
+
+export interface VoiceSelectionParams {
+    languageCode?: string;
+    name?: string;
+    ssmlGender?: SsmlVoiceGender;
+}
+
+export type AudioEncoding =
+    | "AUDIO_ENCODING_UNSPECIFIED"
+    | "LINEAR16"
+    | "MP3"
+    | "OGG_OPUS";
+
+export interface AudioConfig {
+    audioEncoding: AudioEncoding;
+    effectsProfileId?: string[];
+    pitch?: number;
+    sampleRateHertz?: number;
+    speakingRate?: number;
+    volumeGainDb?: number;
+}
+
+export interface SynthesizeSpeechRequest {
+    input: SynthesisInput;
+    voice: VoiceSelectionParams;
+    audioConfig: AudioConfig;
+}
+
+export type SynthesizeSpeechOptions = CallOptions;
+
+export interface SynthesizeSpeechResponse {
+    audioContent: Buffer;
+}
+
+declare class TextToSpeechClient {
+    constructor(options?: ClientOptions);
+
+    listVoices: MethodOverload<ListVoicesRequest, ListVoicesResponse>;
+    synthesizeSpeech: MethodOverload<
+        SynthesizeSpeechRequest,
+        SynthesizeSpeechResponse
+    >;
+}
+
+declare const TextToSpeech: { TextToSpeechClient: typeof TextToSpeechClient };
+
+export default TextToSpeech;
diff --git a/types/google-cloud__text-to-speech/tsconfig.json b/types/google-cloud__text-to-speech/tsconfig.json
new file mode 100644
index 0000000000..a682d930a1
--- /dev/null
+++ b/types/google-cloud__text-to-speech/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@google-cloud/text-to-speech": ["google-cloud__text-to-speech"]
+        }
+    },
+    "files": ["index.d.ts", "google-cloud__text-to-speech-tests.ts"]
+}
diff --git a/types/google-cloud__text-to-speech/tslint.json b/types/google-cloud__text-to-speech/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/google-cloud__text-to-speech/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e9b97bdc546aafd6069a68a87897686d1d342b35 Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Wed, 20 Mar 2019 22:44:28 +0000
Subject: [PATCH 824/924] stylelint: correct several interfaces (#33666)

* stylelint: correct several interfaces

* stylelint: add rule tester

* stylelint: introduce plugin type

* stylelint: remove rule option

* stylelint: bump major version

* stylelint: compromise and match latest SL version
---
 types/stylelint/index.d.ts         | 125 ++++++++++++++++++++++-------
 types/stylelint/package.json       |   6 ++
 types/stylelint/stylelint-tests.ts |  43 ++++++++--
 3 files changed, 141 insertions(+), 33 deletions(-)
 create mode 100644 types/stylelint/package.json

diff --git a/types/stylelint/index.d.ts b/types/stylelint/index.d.ts
index 7d1f0fccc4..adf5057a07 100644
--- a/types/stylelint/index.d.ts
+++ b/types/stylelint/index.d.ts
@@ -1,37 +1,56 @@
-// Type definitions for stylelint 9.4
+// Type definitions for stylelint 9.10
 // Project: https://github.com/stylelint/stylelint, https://stylelint.io
 // Definitions by: Alan Agius <https://github.com/alan-agius4>
 //                 Filips Alpe <https://github.com/filipsalpe>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export type FormatterType = "json" | "string" | "verbose" | "compact";
+import * as postcss from 'postcss';
 
-export type SyntaxType = "scss" | "sass" | "less" | "sugarss";
+export type FormatterType = "json" | "string" | "verbose" | "compact" | "unix";
+
+export type SyntaxType = "css-in-js"
+    | "html"
+    | "less"
+    | "markdown"
+    | "sass"
+    | "scss"
+    | "sugarss";
+
+export interface Configuration {
+    rules: Record<string, any>;
+    extends: string | string[];
+    plugins: string[];
+    processors: string[];
+    ignoreFiles: string|string[];
+    defaultSeverity: "warning"|"error";
+}
 
 export interface LinterOptions {
-    code?: string;
-    codeFilename?: string;
-    config?: JSON;
-    configBasedir?: string;
-    configFile?: string;
-    configOverrides?: JSON;
-    cache?: boolean;
-    cacheLocation?: string;
-    files?: string | string[];
-    fix?: boolean;
-    formatter?: FormatterType;
-    ignoreDisables?: boolean;
-    reportNeedlessDisables?: boolean;
-    ignorePath?: boolean;
-    syntax?: SyntaxType;
-    customSyntax?: string;
+    cache: boolean;
+    cacheLocation: string;
+    code: string;
+    codeFilename: string;
+    config: Partial<Configuration>;
+    configBasedir: string;
+    configFile: string;
+    configOverrides: Partial<Configuration>;
+    customSyntax: string;
+    disableDefaultIgnores: boolean;
+    files: string | string[];
+    fix: boolean;
+    formatter: FormatterType;
+    ignoreDisables: boolean;
+    ignorePath: string;
+    maxWarnings: number;
+    reportNeedlessDisables: boolean;
+    syntax: SyntaxType;
 }
 
 export interface LinterResult {
     errored: boolean;
     output: string;
-    postcssResults: any[];
     results: LintResult[];
 }
 
@@ -49,11 +68,12 @@ export namespace formatters {
     function string(results: LintResult[]): string;
     function compact(results: LintResult[]): string;
     function verbose(results: LintResult[]): string;
+    function unix(results: LintResult[]): string;
 }
 
-export function lint(options?: LinterOptions): Promise<LinterResult>;
+export function lint(options?: Partial<LinterOptions>): Promise<LinterResult>;
 
-export type RuleOption = {
+export type ValidateOptionsAssertion = {
     actual: any;
     possible?: any;
     optional?: false;
@@ -63,25 +83,74 @@ export type RuleOption = {
     optional: true;
 };
 
+export type RuleMessageValue = string | ((...args: any[]) => string);
+
 export namespace utils {
     function report(violation: {
         ruleName: string;
-        result: LintResult;
+        result: postcss.Result;
         message: string;
-        node: any;
+        node: postcss.Node;
         index?: number;
         word?: string;
         line?: number;
     }): void;
 
-    function ruleMessages(ruleName: string, messages: { [key: string]: any; }): typeof messages;
+    function ruleMessages<T extends {[key: string]: RuleMessageValue}>(
+        ruleName: string,
+        messages: T): T;
 
-    function validateOptions(result: LintResult, ruleName: string, ...options: RuleOption[]): boolean;
+    function validateOptions(result: postcss.Result, ruleName: string,
+        ...options: ValidateOptionsAssertion[]): boolean;
 
-    function checkAgainstRule(options: { ruleName: string; ruleSettings: any; root: any; }, callback: (warning: string) => void): void;
+    function checkAgainstRule(options: {
+        ruleName: string;
+        ruleSettings: any;
+        root: any;
+    }, callback: (warning: string) => void): void;
 }
 
+export type Plugin = (primaryOption: any, secondaryOptions?: object) =>
+    (root: postcss.Root, result: postcss.Result) => void|PromiseLike<void>;
+
 export function createPlugin(
     ruleName: string,
-    plugin: (options: RuleOption[]) => (root: any, result: LintResult) => void,
+    plugin: Plugin
 ): any;
+
+export interface RuleTesterResult {
+    expected: number;
+    actual: number;
+    description: string;
+}
+
+export interface RuleTesterTest {
+    code: string;
+    description?: string;
+}
+
+export interface RuleTesterTestRejected extends RuleTesterTest {
+    line?: number;
+    column?: number;
+    only?: boolean;
+    message?: string;
+}
+
+export interface RuleTesterSchema {
+    ruleName: string;
+    syntax?: SyntaxType;
+    config?: any;
+    accept?: RuleTesterTest[];
+    reject?: RuleTesterTestRejected[];
+}
+
+export interface RuleTesterContext {
+    comparisonCount: number;
+    completeAssertionDescription: string;
+    caseDescription: string;
+    only?: boolean;
+}
+
+export function createRuleTester(
+    fn: (result: Promise<RuleTesterResult[]>, context: RuleTesterContext) => void
+): (rule: Plugin, schema: RuleTesterSchema) => void;
diff --git a/types/stylelint/package.json b/types/stylelint/package.json
new file mode 100644
index 0000000000..1e1a719545
--- /dev/null
+++ b/types/stylelint/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "postcss": "7.x.x"
+    }
+}
diff --git a/types/stylelint/stylelint-tests.ts b/types/stylelint/stylelint-tests.ts
index e51d2eb643..fc3dc0e5fd 100644
--- a/types/stylelint/stylelint-tests.ts
+++ b/types/stylelint/stylelint-tests.ts
@@ -1,6 +1,19 @@
-import { LinterOptions, FormatterType, SyntaxType, lint, LintResult, LinterResult, createPlugin, utils } from "stylelint";
+import {
+    LinterOptions,
+    FormatterType,
+    SyntaxType,
+    lint,
+    LintResult,
+    LinterResult,
+    createPlugin,
+    utils,
+    createRuleTester,
+    RuleTesterContext,
+    RuleTesterResult,
+    Plugin
+} from "stylelint";
 
-const options: LinterOptions = {
+const options: Partial<LinterOptions> = {
     code: "div { color: red }",
     files: ["**/**.scss"],
     formatter: "json",
@@ -8,14 +21,13 @@ const options: LinterOptions = {
     cacheLocation: "./stylelint.cache.json",
     ignoreDisables: true,
     reportNeedlessDisables: true,
-    ignorePath: true,
+    ignorePath: 'foo',
     syntax: "scss"
 };
 
 lint(options).then((x: LinterResult) => {
     const err: boolean = x.errored;
     const output: string = x.output;
-    const postcssResults: any[] = x.postcssResults;
     const results: LintResult[] = x.results;
 });
 
@@ -29,7 +41,7 @@ const messages = utils.ruleMessages(ruleName, {
     warning: (reason: string) => `This is not allowed because ${reason}`,
 });
 
-createPlugin(ruleName, options => {
+const testPlugin: Plugin = (options) => {
     return (root, result) => {
         const validOptions = utils.validateOptions(result, ruleName, { actual: options });
         if (!validOptions) {
@@ -52,4 +64,25 @@ createPlugin(ruleName, options => {
             });
         });
     };
+};
+
+createPlugin(ruleName, testPlugin);
+
+const tester = createRuleTester(
+    (result: Promise<RuleTesterResult[]>, context: RuleTesterContext) => {
+        return;
+    }
+);
+
+tester(testPlugin, {
+    ruleName: 'foo',
+    config: [true, 1],
+    accept: [
+        { code: 'test' },
+        { code: 'test2', description: 'testing' }
+    ],
+    reject: [
+        { code: 'testreject', line: 1, column: 1 },
+        { code: 'test2reject', message: 'x', line: 1, column: 1 }
+    ]
 });

From 574bd2a385fa44d98fb3bd8904f64154dd145afe Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Thu, 21 Mar 2019 03:59:02 +0300
Subject: [PATCH 825/924] pako type definition fixing

---
 types/pako/index.d.ts    | 224 +++++++++++++++++++++++++--------------
 types/pako/pako-tests.ts |  19 ++--
 types/pako/tslint.json   |  75 +------------
 3 files changed, 153 insertions(+), 165 deletions(-)

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index 7f9b31f2b9..e6299ac88c 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -1,84 +1,148 @@
-// Type definitions for pako 1.0.4
+// Type definitions for pako 1.0
 // Project: https://github.com/nodeca/pako
-// Definitions by: Denis Cappellin <https://github.com/cappellin>, Caleb Eggensperger <https://github.com/calebegg>
+// Definitions by: Denis Cappellin <https://github.com/cappellin>,
+//                 Caleb Eggensperger <https://github.com/calebegg>,
+//                 Muhammet Öztürk <https://github.com/hlthi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = Pako;
-export as namespace pako;
-
-declare namespace Pako {
-	export interface DeflateOptions {
-		level?: number;
-		windowBits?: number;
-		memLevel?: number;
-		strategy?: number;
-		dictionary?: any;
-		raw?: boolean;
-		to?: 'string';
-	}
-
-	export interface InflateOptions {
-		windowBits?: number;
-		raw?: boolean;
-		to?: 'string';
-	}
-
-	export type Data = Uint8Array | Array<number> | string;
-
-	/**
-	 * Compress data with deflate algorithm and options.
-	 */
-	export function deflate( data: Data, options: DeflateOptions & {to: 'string'} ): string;
-	export function deflate( data: Data, options?: DeflateOptions ): Uint8Array;
-
-	/**
-	 * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
-	 */
-	export function deflateRaw( data: Data, options: DeflateOptions & {to: 'string'} ): string;
-	export function deflateRaw( data: Data, options?: DeflateOptions ): Uint8Array;
-
-	/**
-	 * The same as deflate, but create gzip wrapper instead of deflate one.
-	 */
-	export function gzip( data: Data, options: DeflateOptions & {to: 'string'} ): string;
-	export function gzip( data: Data, options?: DeflateOptions ): Uint8Array;
-
-	/**
-	 * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
-	 * by default. That's why we don't provide separate ungzip method.
-	 */
-	export function inflate( data: Data, options: InflateOptions & {to: 'string'} ): string;
-	export function inflate( data: Data, options?: InflateOptions ): Uint8Array;
-
-	/**
-	 * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
-	 */
-	export function inflateRaw( data: Data, options: InflateOptions & {to: 'string'} ): string;
-	export function inflateRaw( data: Data, options?: InflateOptions ): Uint8Array;
-
-	/**
-	 * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
-	 */
-	export function ungzip( data: Data, options: InflateOptions & {to: 'string'} ): string;
-	export function ungzip( data: Data, options?: InflateOptions ): Uint8Array;
-
-	export class Deflate {
-		constructor( options?: DeflateOptions );
-		err: number;
-		msg: string;
-		result: Uint8Array | Array<number>;
-		onData( chunk: Data ): void;
-		onEnd( status: number ): void;
-		push( data: Data | ArrayBuffer, mode?: number | boolean ): boolean;
-	}
-
-	export class Inflate {
-		constructor( options?: InflateOptions );
-		err: number;
-		msg: string;
-		result: Data;
-		onData( chunk: Data ): void;
-		onEnd( status: number ): void;
-		push( data: Data | ArrayBuffer, mode?: number | boolean ): boolean;
-	}
+export enum FlushValues {
+    Z_NO_FLUSH = 0,
+    Z_PARTIAL_FLUSH = 1,
+    Z_SYNC_FLUSH = 2,
+    Z_FULL_FLUSH = 3,
+    Z_FINISH = 4,
+    Z_BLOCK = 5,
+    Z_TREES = 6,
+}
+
+export enum StrategyValues {
+    Z_FILTERED = 1,
+    Z_HUFFMAN_ONLY = 2,
+    Z_RLE = 3,
+    Z_FIXED = 4,
+    Z_DEFAULT_STRATEGY = 0,
+}
+
+export enum ReturnCodes {
+    Z_OK = 0,
+    Z_STREAM_END = 1,
+    Z_NEED_DICT = 2,
+    Z_ERRNO = -1,
+    Z_STREAM_ERROR = -2,
+    Z_DATA_ERROR = -3,
+    Z_BUF_ERROR = -5,
+}
+
+export interface DeflateOptions {
+    level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    windowBits?: number;
+    memLevel?: number;
+    strategy?: StrategyValues;
+    dictionary?: any;
+    raw?: boolean;
+    to?: 'string';
+    chunkSize?: number;
+    gzip?: boolean;
+    header?: Header;
+}
+
+export interface DeflateFunctionOptions {
+    level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    windowBits?: number;
+    memLevel?: number;
+    strategy?: StrategyValues;
+    dictionary?: any;
+    raw?: boolean;
+    to?: 'string';
+}
+
+export interface InflateOptions {
+    windowBits?: number;
+    dictionary?: any;
+    raw?: boolean;
+    to?: 'string';
+    chunkSize?: number;
+}
+
+export interface InflateFunctionOptions {
+    windowBits?: number;
+    raw?: boolean;
+    to?: 'string';
+}
+
+export interface Header {
+    text?: boolean;
+    time?: number;
+    os?: number;
+    extra?: number[];
+    name?: string;
+    comment?: string;
+    hcrc?: boolean;
+}
+
+export type Data = Uint8Array | number[] | string;
+
+/**
+ * Compress data with deflate algorithm and options.
+ */
+export function deflate(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+export function deflate(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+/**
+ * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
+ */
+export function deflateRaw(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+export function deflateRaw(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+/**
+ * The same as deflate, but create gzip wrapper instead of deflate one.
+ */
+export function gzip(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+export function gzip(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+/**
+ * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
+ * by default. That's why we don't provide separate ungzip method.
+ */
+export function inflate(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+export function inflate(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+/**
+ * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
+ */
+export function inflateRaw(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+export function inflateRaw(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+/**
+ * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
+ */
+export function ungzip(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+export function ungzip(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+export class Deflate {
+    constructor(options?: DeflateOptions);
+
+    err: ReturnCodes;
+    msg: string;
+    result: Uint8Array | number[];
+
+    onData(chunk: Data): void;
+
+    onEnd(status: number): void;
+
+    push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
+}
+
+export class Inflate {
+    constructor(options?: InflateOptions);
+
+    err: ReturnCodes;
+    msg: string;
+    result: Data;
+
+    onData(chunk: Data): void;
+
+    onEnd(status: number): void;
+
+    push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
 }
diff --git a/types/pako/pako-tests.ts b/types/pako/pako-tests.ts
index 5e5a6c3eef..9caa562e53 100644
--- a/types/pako/pako-tests.ts
+++ b/types/pako/pako-tests.ts
@@ -1,24 +1,21 @@
-
-
 import pako = require("pako");
 
-var chunk1 = new Uint8Array([1,2,3,4,5,6,7,8,9])
-var chunk2 = new Uint8Array([10,11,12,13,14,15,16,17,18,19]);
+const chunk1 = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9]);
+const chunk2 = new Uint8Array([10, 11, 12, 13, 14, 15, 16, 17, 18, 19]);
 
-var deflate = new pako.Deflate({ level: 3 });
+const deflate = new pako.Deflate({level: 3});
 
 deflate.push(chunk1, false);
 deflate.push(chunk2, true);  // true -> last chunk
 
 if (deflate.err) {
-	throw new Error( deflate.err.toString() );
+    throw new Error(deflate.err.toString());
 }
 
 console.log(deflate.result);
 
-let str: string = pako.deflate('1234', {to: 'string'});
-let arr: Uint8Array = pako.deflate('1234');
-
-let str2: string = pako.inflate('1234', {to: 'string'});
-let arr2: Uint8Array = pako.inflate('1234');
+const str: string = pako.deflate('1234', {to: 'string'});
+const arr: Uint8Array = pako.deflate('1234');
 
+const str2: string = pako.inflate('1234', {to: 'string'});
+const arr2: Uint8Array = pako.inflate('1234');
diff --git a/types/pako/tslint.json b/types/pako/tslint.json
index a41bf5d19a..2ff396e742 100644
--- a/types/pako/tslint.json
+++ b/types/pako/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+
     }
 }

From 9170ffffe50b903d593d8c9ac9c0c55e34dab212 Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Thu, 21 Mar 2019 04:03:28 +0300
Subject: [PATCH 826/924] delete spaces

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

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index e6299ac88c..26cc24a25c 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for pako 1.0
 // Project: https://github.com/nodeca/pako
-// Definitions by: Denis Cappellin <https://github.com/cappellin>,
-//                 Caleb Eggensperger <https://github.com/calebegg>,
+// Definitions by: Denis Cappellin <https://github.com/cappellin>
+//                 Caleb Eggensperger <https://github.com/calebegg>
 //                 Muhammet Öztürk <https://github.com/hlthi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From 317302647c25f772f61770c060c3941e3bcec04e Mon Sep 17 00:00:00 2001
From: Scott Beca <scott.beca@gmail.com>
Date: Thu, 21 Mar 2019 12:36:46 +1100
Subject: [PATCH 827/924] Update type definitions for react-inlinesvg to match
 v0.8.4

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

diff --git a/types/react-inlinesvg/index.d.ts b/types/react-inlinesvg/index.d.ts
index e8e1f4095b..2dde329572 100644
--- a/types/react-inlinesvg/index.d.ts
+++ b/types/react-inlinesvg/index.d.ts
@@ -31,6 +31,7 @@ export interface Props {
     uniquifyIDs?: boolean;
     onError?(error: RequestError | InlineSVGError): void;
     onLoad?(src: URL | string, isCached: boolean): void;
+    processSVG?(svgText: string): string;
     supportTest?(): void;
     wrapper?(): ReactNode;
 }

From 1e38dbd503c11d4d0ceba7da1a3812dc7cdb449e Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Thu, 21 Mar 2019 10:16:51 +0800
Subject: [PATCH 828/924] [amap-js-api] Add comments

---
 types/amap-js-api/array-bounds.d.ts         |   5 +
 types/amap-js-api/bounds.d.ts               |  27 ++
 types/amap-js-api/browser.d.ts              | 141 ++++++++
 types/amap-js-api/common.d.ts               |   9 +
 types/amap-js-api/convert-from.d.ts         |  12 +
 types/amap-js-api/dom-util.d.ts             |  69 +++-
 types/amap-js-api/event.d.ts                |  57 ++-
 types/amap-js-api/geometry-util.d.ts        | 118 ++++--
 types/amap-js-api/layer/building.d.ts       |  24 ++
 types/amap-js-api/layer/flexible.d.ts       |  18 +
 types/amap-js-api/layer/layer.d.ts          |  36 ++
 types/amap-js-api/layer/layerGroup.d.ts     |  37 +-
 types/amap-js-api/layer/massMarks.d.ts      |  52 +++
 types/amap-js-api/layer/mediaLayer.d.ts     |  59 +++
 types/amap-js-api/layer/tileLayer.d.ts      |  54 +++
 types/amap-js-api/layer/wms.d.ts            |  27 ++
 types/amap-js-api/layer/wmts.d.ts           |  27 ++
 types/amap-js-api/lngLat.d.ts               |  28 ++
 types/amap-js-api/map.d.ts                  | 381 ++++++++++++++++++++
 types/amap-js-api/overlay/bezierCurve.d.ts  |  15 +-
 types/amap-js-api/overlay/circle.d.ts       |  35 ++
 types/amap-js-api/overlay/circleMarker.d.ts |   3 +
 types/amap-js-api/overlay/contextMenu.d.ts  |  29 +-
 types/amap-js-api/overlay/ellipse.d.ts      |  22 ++
 types/amap-js-api/overlay/geoJSON.d.ts      |  29 ++
 types/amap-js-api/overlay/icon.d.ts         |  23 ++
 types/amap-js-api/overlay/infoWindow.d.ts   |  61 ++++
 types/amap-js-api/overlay/marker.d.ts       | 194 +++++++++-
 types/amap-js-api/overlay/markerShape.d.ts  |   4 +
 types/amap-js-api/overlay/overlay.d.ts      |  38 ++
 types/amap-js-api/overlay/overlayGroup.d.ts |  54 ++-
 types/amap-js-api/overlay/pathOverlay.d.ts  |  30 ++
 types/amap-js-api/overlay/polygon.d.ts      |  46 +++
 types/amap-js-api/overlay/polyline.d.ts     |  73 ++++
 types/amap-js-api/overlay/rectangle.d.ts    |  22 ++
 types/amap-js-api/overlay/shapeOverlay.d.ts |  50 +++
 types/amap-js-api/overlay/text.d.ts         |  22 ++
 types/amap-js-api/pixel.d.ts                |  19 +
 types/amap-js-api/size.d.ts                 |  15 +
 types/amap-js-api/util.d.ts                 |  59 ++-
 types/amap-js-api/view2D.d.ts               |  16 +
 41 files changed, 1982 insertions(+), 58 deletions(-)

diff --git a/types/amap-js-api/array-bounds.d.ts b/types/amap-js-api/array-bounds.d.ts
index 419d8e4b1d..3e0145e049 100644
--- a/types/amap-js-api/array-bounds.d.ts
+++ b/types/amap-js-api/array-bounds.d.ts
@@ -2,7 +2,12 @@ declare namespace AMap {
     class ArrayBounds {
         constructor(bounds: LocationValue[]);
         bounds: LngLat[];
+        /**
+         * 判断传入的点是否在ArrayBounds内
+         * @param point 目标点
+         */
         contains(point: LocationValue): boolean;
+
         // internal
         toBounds(): Bounds;
         getCenter(): LngLat;
diff --git a/types/amap-js-api/bounds.d.ts b/types/amap-js-api/bounds.d.ts
index 63e880fe65..f594969292 100644
--- a/types/amap-js-api/bounds.d.ts
+++ b/types/amap-js-api/bounds.d.ts
@@ -1,12 +1,39 @@
 declare namespace AMap {
     class Bounds {
+        /**
+         * 地物对象的经纬度矩形范围。
+         * @param southWest 西南角经纬度
+         * @param northEast 东北角经纬度
+         */
         constructor(southWest: LngLat, northEast: LngLat);
+        /**
+         * 指定点坐标是否在矩形范围内
+         * @param point 制定坐标
+         */
         contains(point: LocationValue): boolean;
+        /**
+         * 获取当前Bounds的中心点经纬度坐标
+         */
         getCenter(): LngLat;
+        /**
+         * 获取西南角坐标
+         */
         getSouthWest(): LngLat;
+        /**
+         * 获取东南角坐标
+         */
         getSouthEast(): LngLat;
+        /**
+         * 获取东北角坐标
+         */
         getNorthEast(): LngLat;
+        /**
+         * 获取西北角坐标
+         */
         getNorthWest(): LngLat;
+        /**
+         * 以字符串形式返回地物对象的矩形范围
+         */
         toString(): string;
     }
 }
diff --git a/types/amap-js-api/browser.d.ts b/types/amap-js-api/browser.d.ts
index 71bfaa8fea..26b3956aa1 100644
--- a/types/amap-js-api/browser.d.ts
+++ b/types/amap-js-api/browser.d.ts
@@ -1,51 +1,192 @@
 declare namespace AMap {
     namespace Browser {
+        /**
+         * 当前浏览器userAgent
+         */
         const ua: string;
+        /**
+         * 是否移动设备
+         */
         const mobile: boolean;
+        /**
+         * 平台类型，如：'windows'、'mac'、'ios'、'android'、'other'
+         */
         const plat: 'android' | 'ios' | 'windows' | 'mac' | 'other';
+        /**
+         * 是否mac设备
+         */
         const mac: boolean;
+        /**
+         * 是否windows设备
+         */
         const windows: boolean;
+        /**
+         * 是否iOS设备
+         */
         const ios: boolean;
+        /**
+         * 是否iPad
+         */
         const iPad: boolean;
+        /**
+         * 是否iPhone
+         */
         const iPhone: boolean;
+        /**
+         * 是否安卓设备
+         */
         const android: boolean;
+        /**
+         * 是否安卓4以下系统
+         */
         const android23: boolean;
+        /**
+         * 是否Chrome浏览器
+         */
         const chrome: boolean;
+        /**
+         * 是否火狐浏览器
+         */
         const firefox: boolean;
+        /**
+         * 是否Safari浏览器
+         */
         const safari: boolean;
+        /**
+         * 是否微信
+         */
         const wechat: boolean;
+        /**
+         * 是否UC浏览器
+         */
         const uc: boolean;
+        /**
+         * 是否QQ或者QQ浏览器
+         */
         const qq: boolean;
+        /**
+         * 是否IE
+         */
         const ie: boolean;
+        /**
+         * 是否IE6
+         */
         const ie6: boolean;
+        /**
+         * 是否IE7
+         */
         const ie7: boolean;
+        /**
+         * 是否IE8
+         */
         const ie8: boolean;
+        /**
+         * 是否IE9
+         */
         const ie9: boolean;
+        /**
+         * 是否IE10
+         */
         const ie10: boolean;
+        /**
+         * 是否IE11
+         */
         const ie11: boolean;
+        /**
+         * 	是否Edge浏览器
+         */
         const edge: boolean;
+        /**
+         * 是否IE9以下
+         */
         const ielt9: boolean;
+        /**
+         * 	是否百度浏览器
+         */
         const baidu: boolean;
+        /**
+         * 是否支持LocaStorage
+         */
         const isLocalStorage: boolean;
+        /**
+         * 是否支持Geolocation
+         */
         const isGeolocation: boolean;
+        /**
+         * 是否Webkit移动浏览器
+         */
         const mobileWebkit: boolean;
+        /**
+         * 是否支持Css3D的Webkit移动端浏览器
+         */
         const mobileWebkit3d: boolean;
+        /**
+         * 是否Opera移动浏览器
+         */
         const mobileOpera: boolean;
+        /**
+         * 是否高清屏幕，devicePixelRatio>1
+         */
         const retina: boolean;
+        /**
+         * 	是否触屏
+         */
         const touch: boolean;
+        /**
+         * 是否msPointer设备
+         */
         const msPointer: boolean;
+        /**
+         * 是否pointer设备
+         */
         const pointer: boolean;
+        /**
+         * 是否webkit浏览器
+         */
         const webkit: boolean;
+        /**
+         * 是否支持Css3D的ie浏览器
+         */
         const ie3d: boolean;
+        /**
+         * 是否支持Css3D的Webkit浏览器
+         */
         const webkit3d: boolean;
+        /**
+         * 是否支持Css3D的gecko浏览器
+         */
         const gecko3d: boolean;
+        /**
+         * 是否支持Css3D的opera浏览器
+         */
         const opera3d: boolean;
+        /**
+         * 是否支持Css3D的浏览器
+         */
         const any3d: boolean;
+        /**
+         * 是否支持canvas
+         */
         const isCanvas: boolean;
+        /**
+         * 是否支持svg
+         */
         const isSvg: boolean;
+        /**
+         * 是否支持vml
+         */
         const isVML: boolean;
+        /**
+         * 是否支持WebWorker
+         */
         const isWorker: boolean;
+        /**
+         * 是否支持WebSocket
+         */
         const isWebsocket: boolean;
+        /**
+         * 判断是否支持webgl
+         */
         function isWebGL(): boolean;
     }
 }
diff --git a/types/amap-js-api/common.d.ts b/types/amap-js-api/common.d.ts
index 3d51dc719e..8b442ad0a3 100644
--- a/types/amap-js-api/common.d.ts
+++ b/types/amap-js-api/common.d.ts
@@ -9,8 +9,17 @@ declare namespace AMap {
             : V extends undefined ? {}
             : { value: V });
     type MapsEvent<N extends string, I> = Event<N, {
+        /**
+         * 经纬度坐标
+         */
         lnglat: LngLat;
+        /**
+         * 像素坐标
+         */
         pixel: Pixel;
+        /**
+         * 触发对象
+         */
         target: I
     }>;
 
diff --git a/types/amap-js-api/convert-from.d.ts b/types/amap-js-api/convert-from.d.ts
index 9fe1f1e76d..61f83f9b94 100644
--- a/types/amap-js-api/convert-from.d.ts
+++ b/types/amap-js-api/convert-from.d.ts
@@ -1,12 +1,24 @@
 declare namespace AMap {
     namespace convertFrom {
         interface Result {
+            /**
+             * 成功状态文字描述
+             */
             info: string; // 'ok'
+            /**
+             * 高德坐标集合
+             */
             locations: LngLat[];
         }
         type Type = 'gps' | 'baidu' | 'mapbar';
         type SearchStatus = 'complete' | 'error';
     }
+    /**
+     * 为坐标转换类，支持将其他坐标系的坐标点转换为高德坐标系。
+     * @param lnglat 待转换坐标
+     * @param type 用于说明是哪个服务商的坐标
+     * @param callback 转换完成后的回调函数
+     */
     function convertFrom(
         lnglat: LocationValue | LocationValue[],
         type: convertFrom.Type | null,
diff --git a/types/amap-js-api/dom-util.d.ts b/types/amap-js-api/dom-util.d.ts
index d83a2ca69a..e39793f006 100644
--- a/types/amap-js-api/dom-util.d.ts
+++ b/types/amap-js-api/dom-util.d.ts
@@ -1,31 +1,78 @@
 declare namespace AMap {
     namespace DomUtil {
+        /**
+         * 获取DOM元素的大小
+         * @param dom DOM元素
+         */
         function getViewport(dom: HTMLElement): Size;
-
+        /**
+         * 获取DOM元素距离窗口左上角的距离
+         * @param dom DOM元素
+         */
         function getViewportOffset(dom: HTMLElement): Pixel;
-
+        /**
+         * 在parentNode内部创建一个className类名的tagName元素
+         * @param tagName 标签名称
+         * @param parent 父节点
+         * @param className 类名
+         */
         function create<K extends keyof HTMLElementTagNameMap>(
             tagName: K,
             parent?: HTMLElement,
             className?: string
         ): HTMLElementTagNameMap[K];
-
+        /**
+         * 给DOM元素设置为className样式
+         * @param dom DOM元素
+         * @param className 类名
+         */
         function setClass(dom: HTMLElement, className?: string): void;
-
+        /**
+         * DOM元素是否包含className
+         * @param dom DOM元素
+         * @param className 类名
+         */
         function hasClass(dom: HTMLElement, className: string): boolean;
-
+        /**
+         * 给DOM元素添加一个className
+         * @param dom DOM元素
+         * @param className 类名
+         */
         function addClass(dom: HTMLElement, className: string): void;
-
+        /**
+         * 给DOM元素删除一个className
+         * @param dom DOM元素
+         * @param className 类名
+         */
         function removeClass(dom: HTMLElement, className: string): void;
-
+        /**
+         * 给DOM元素设定一个透明度
+         * @param dom DOM元素
+         * @param opacity 透明度(0-1)
+         */
         function setOpacity(dom: HTMLElement, opacity: number): void;
-
+        /**
+         * 给DOM元素旋转一个角度，以center为中心，center以元素左上角为坐标原点
+         * @param dom DOM元素
+         * @param deg 旋转角度
+         * @param origin 旋转中心
+         */
         function rotate(dom: HTMLElement, deg: number, origin?: { x: number, y: number }): void;
-
+        /**
+         * 给DOM元素删除一组样式，Object同样式表
+         * @param dom DOM元素
+         * @param style 样式
+         */
         function setCss(dom: HTMLElement | HTMLElement[], style: Partial<CSSStyleDeclaration>): typeof DomUtil; // this
-
+        /**
+         * 清空DOM元素
+         * @param dom DOM元素
+         */
         function empty(dom: HTMLElement): void;
-
+        /**
+         * 将DOM元素从父节点删除
+         * @param dom DOM元素
+         */
         function remove(dom: HTMLElement): void;
     }
 }
diff --git a/types/amap-js-api/event.d.ts b/types/amap-js-api/event.d.ts
index d8ff5753c9..d90ee4c720 100644
--- a/types/amap-js-api/event.d.ts
+++ b/types/amap-js-api/event.d.ts
@@ -1,5 +1,13 @@
 declare namespace AMap {
     abstract class EventEmitter {
+        /**
+         * 注册事件
+         * @param eventName 事件名称
+         * @param handler 事件回调函数
+         * @param context 事件回调中的上下文
+         * @param once 触发一次
+         * @param unshift 更改事件顺序
+         */
         on<E extends Event, C = this>(
             eventName: string,
             // tslint:disable-next-line:no-unnecessary-generics
@@ -8,14 +16,23 @@ declare namespace AMap {
             once?: boolean,
             unshift?: boolean
         ): this;
-
+        /**
+         * 移除事件绑定
+         * @param eventName 事件名称
+         * @param handler 事件功能函数
+         * @param context 事件上下文
+         */
         off<E extends Event, C = this>(
             eventName: string,
             // tslint:disable-next-line
             handler: ((this: C, event: E) => void) | 'mv',
             context?: C
         ): this;
-
+        /**
+         * 触发事件
+         * @param eventName 事件名称
+         * @param data 事件数据
+         */
         emit(eventName: string, data?: any): this;
     }
 
@@ -23,7 +40,13 @@ declare namespace AMap {
         interface EventListener<T extends 0 | 1> {
             type: T;
         }
-
+        /**
+         * 注册DOM对象事件
+         * @param instance 需注册事件的DOM对象
+         * @param eventName 事件名称
+         * @param handler 事件功能函数
+         * @param context 事件上下文
+         */
         function addDomListener<N extends keyof HTMLElementTagNameMap, E extends keyof HTMLElementEventMap, C = HTMLElementTagNameMap[N]>(
             // tslint:disable-next-line: no-unnecessary-generics
             instance: HTMLElementTagNameMap[N],
@@ -31,7 +54,13 @@ declare namespace AMap {
             handler: (this: C, event: HTMLElementEventMap[E]) => void,
             context?: C
         ): EventListener<0>;
-
+        /**
+         * 给对象注册事件
+         * @param instance 需注册事件的对象
+         * @param eventName 事件名称
+         * @param handler 事件功能函数
+         * @param context 事件上下文
+         */
         function addListener<I extends EventEmitter, E extends Event, C = I>(
             // tslint:disable-next-line: no-unnecessary-generics
             instance: I,
@@ -41,7 +70,13 @@ declare namespace AMap {
             // tslint:disable-next-line: no-unnecessary-generics
             context?: C
         ): EventListener<1>;
-
+        /**
+         * 给对象注册一次性事件
+         * @param instance 需注册事件的对象
+         * @param eventName 事件名称
+         * @param handler 事件功能函数
+         * @param context 事件上下文
+         */
         function addListenerOnce<I extends EventEmitter, E extends Event, C = I>(
             // tslint:disable-next-line: no-unnecessary-generics
             instance: I,
@@ -51,9 +86,17 @@ declare namespace AMap {
             // tslint:disable-next-line: no-unnecessary-generics
             context?: C
         ): EventListener<1>;
-
+        /**
+         * 删除事件
+         * @param listener 侦听器
+         */
         function removeListener(listener: EventListener<0 | 1>): void;
-
+        /**
+         * 触发非DOM事件
+         * @param instance 触发对象
+         * @param eventName 事件名称
+         * @param data 事件数据
+         */
         function trigger(instance: EventEmitter, eventName: string, data?: any): void;
     }
 }
diff --git a/types/amap-js-api/geometry-util.d.ts b/types/amap-js-api/geometry-util.d.ts
index 03f6800088..c8a5eae2e9 100644
--- a/types/amap-js-api/geometry-util.d.ts
+++ b/types/amap-js-api/geometry-util.d.ts
@@ -1,106 +1,176 @@
 declare namespace AMap {
     namespace GeometryUtil {
+        /**
+         * 计算两个经纬度点之间的实际距离
+         */
         function distance(
             point1: LocationValue,
             point2: LocationValue | LocationValue[]
         ): number;
-
+        /**
+         * 计算一个经纬度路径围成区域的实际面积
+         */
         function ringArea(ring: LocationValue[]): number;
-
+        /**
+         * 判断一个经纬度路径是否为顺时针
+         */
         function isClockwise(path: LocationValue[]): boolean;
-
+        /**
+         * 计算一个经纬度路径的实际长度
+         */
         function distanceOfLine(line: LocationValue[]): number;
-
+        /**
+         * 计算两个经纬度面的交叉区域
+         */
         function ringRingClip(
             ring1: LocationValue[],
             ring2: LocationValue[]
         ): Array<[number, number]>;
-
+        /**
+         * 判断两个经纬度面是否交叉
+         */
         function doesRingRingIntersect(
             ring1: LocationValue[],
             ring2: LocationValue[]
         ): boolean;
-
+        /**
+         * 判断经纬度路径和经纬度面是否交叉
+         */
         function doesLineRingIntersect(
             line: LocationValue[],
             ring: LocationValue[]
         ): boolean;
-
+        /**
+         * 判断两个经纬度路径是否相交
+         */
         function doesLineLineIntersect(
             line1: LocationValue[],
             line2: LocationValue[]
         ): boolean;
-
+        /**
+         * 判断线段和多个环是否相交
+         */
         function doesSegmentPolygonIntersect(
             point1: LocationValue,
             point2: LocationValue,
             polygon: LocationValue[][]
         ): boolean;
-
+        /**
+         * 判断线段和一个环是否相交
+         */
         function doesSegmentRingIntersect(
             point1: LocationValue,
             point2: LocationValue,
             ring: LocationValue[]
         ): boolean;
-
+        /**
+         * 判断线段和一个路径是否相交
+         */
         function doesSegmentLineIntersect(
             point1: LocationValue,
             point2: LocationValue,
             line: LocationValue[]
         ): boolean;
-
+        /**
+         * 判断两个线段是否相交
+         */
         function doesSegmentsIntersect(
             point1: LocationValue,
             point2: LocationValue,
             point3: LocationValue,
             point4: LocationValue
         ): boolean;
-
+        /**
+         * 判断点是否在环内
+         */
         function isPointInRing(point: LocationValue, ring: LocationValue[]): boolean;
-
+        /**
+         * 判断环是否在另一个环内
+         */
         function isRingInRing(ring1: LocationValue[], ring2: LocationValue[]): boolean;
-
+        /**
+         * 判断点是否在多个环组成区域内
+         */
         function isPointInPolygon(point: LocationValue, polygon: LocationValue[][]): boolean;
-
+        /**
+         * 判断点是否在多个环组成区域内
+         */
         function makesureClockwise(path: Array<[number, number]>): Array<[number, number]>;
-
+        /**
+         * 将一个路径变为逆时针
+         */
         function makesureAntiClockwise(path: Array<[number, number]>): Array<[number, number]>;
-
+        /**
+         * 计算P2P3上距离P1最近的点
+         * @param point1 P1
+         * @param point2 P2
+         * @param point3 P3
+         */
         function closestOnSegment(
             point1: LocationValue,
             point2: LocationValue,
             point3: LocationValue
         ): [number, number];
-
+        /**
+         * 计算line上距离P最近的点
+         */
         function closestOnLine(point: LocationValue, line: LocationValue[]): [number, number];
-
+        /**
+         * 计算P2P3到P1的距离
+         * @param point1 P1
+         * @param point2 P2
+         * @param point3 P3
+         */
         function distanceToSegment(
             point1: LocationValue,
             point2: LocationValue,
             point3: LocationValue
         ): number;
-
+        /**
+         * 计算P到line的距离
+         */
         function distanceToLine(point: LocationValue, line: LocationValue[]): number;
-
+        /**
+         * 判断P1是否在P2P3上
+         * @param point1 P1
+         * @param point2 P2
+         * @param point3 P3
+         * @param tolerance 误差范围
+         */
         function isPointOnSegment(
             point1: LocationValue,
             point2: LocationValue,
             point3: LocationValue,
             tolerance?: number
         ): boolean;
-
+        /**
+         * 判断P是否在line上
+         * @param point 点P
+         * @param line 线
+         * @param tolerance 误差范围
+         */
         function isPointOnLine(
             point: LocationValue,
             line: LocationValue[],
             tolerance?: number
         ): boolean;
-
+        /**
+         * 判断P是否在ring的边上
+         * @param point 点P
+         * @param ring 环
+         * @param tolerance 误差范围
+         */
         function isPointOnRing(
             point: LocationValue,
             ring: LocationValue[],
             tolerance?: number
         ): boolean;
-
+        /**
+         * 判断P是否在多个ring的边上
+         * @param point 点P
+         * @param polygon 多边形
+         * @param tolerance 误差范围
+         */
         function isPointOnPolygon(
             point: LocationValue,
             polygon: LocationValue[][],
diff --git a/types/amap-js-api/layer/building.d.ts b/types/amap-js-api/layer/building.d.ts
index 30dd7c4092..1b7426e28d 100644
--- a/types/amap-js-api/layer/building.d.ts
+++ b/types/amap-js-api/layer/building.d.ts
@@ -1,11 +1,27 @@
 declare namespace AMap {
     namespace Buildings {
         interface Options extends Layer.Options {
+            /**
+             * 可见级别范围
+             */
             zooms?: [number, number];
+            /**
+             * 不透明度
+             */
             opacity?: number;
+            /**
+             * 高度比例系数，可控制3D视图下的楼块高度
+             */
             heightFactor?: number;
+            /**
+             * 	是否可见
+             */
             visible?: boolean;
+            /**
+             * 层级
+             */
             zIndex?: number;
+
             // inner
             merge?: boolean;
             sort?: boolean;
@@ -24,7 +40,15 @@ declare namespace AMap {
     }
 
     class Buildings extends Layer {
+        /**
+         * 楼块图层，单独展示矢量化的楼块图层
+         * @param opts 图层选项
+         */
         constructor(opts?: Buildings.Options);
+        /**
+         * 按区域设置楼块的颜色
+         * @param style 颜色设置
+         */
         setStyle(style: Buildings.Style): void;
     }
 }
diff --git a/types/amap-js-api/layer/flexible.d.ts b/types/amap-js-api/layer/flexible.d.ts
index bdb4001a7c..d91970dc31 100644
--- a/types/amap-js-api/layer/flexible.d.ts
+++ b/types/amap-js-api/layer/flexible.d.ts
@@ -2,6 +2,14 @@ declare namespace AMap {
     namespace TileLayer {
         namespace Flexible {
             interface Options extends TileLayer.Options {
+                /**
+                 * 创建切片回调
+                 * @param x 横坐标
+                 * @param y 纵坐标
+                 * @param z 层级
+                 * @param success 成功回调
+                 * @param fail 失败回调
+                 */
                 createTile?(
                     x: number,
                     y: number,
@@ -9,11 +17,21 @@ declare namespace AMap {
                     success: (tile: HTMLImageElement | HTMLCanvasElement) => void,
                     fail: () => void
                 ): void;
+                /**
+                 * 内存中缓存的切片的数量上限
+                 */
                 cacheSize?: number;
+                /**
+                 * 是否显示
+                 */
                 visible?: boolean;
             }
         }
         class Flexible extends TileLayer {
+            /**
+             * 灵活切片图层
+             * @param options 图层选项
+             */
             constructor(options?: Flexible.Options);
         }
     }
diff --git a/types/amap-js-api/layer/layer.d.ts b/types/amap-js-api/layer/layer.d.ts
index 8f35d949fd..64714bc68f 100644
--- a/types/amap-js-api/layer/layer.d.ts
+++ b/types/amap-js-api/layer/layer.d.ts
@@ -1,20 +1,56 @@
 declare namespace AMap {
     namespace Layer {
         interface Options {
+            /**
+             * 所属的地图对象
+             */
             map?: Map;
         }
     }
 
     abstract class Layer extends EventEmitter {
+        /**
+         * 图层获取DOM节点
+         */
         getContainer(): HTMLDivElement | undefined;
+        /**
+         * 获取图层缩放范围
+         */
         getZooms(): [number, number];
+        /**
+         * 设置透明度
+         * @param alpha 透明度
+         */
         setOpacity(alpha: number): void;
+        /**
+         * 设置透明度
+         */
         getOpacity(): number;
+        /**
+         * 显示图层
+         */
         show(): void;
+        /**
+         * 隐藏图层
+         */
         hide(): void;
+        /**
+         * 设置图层所属地图
+         * @param map map对象
+         */
         setMap(map?: Map | null): void;
+        /**
+         * 获取图层所属地图
+         */
         getMap(): Map | null | undefined;
+        /**
+         * 设置图层的层级
+         * @param index 层级
+         */
         setzIndex(index: number): void;
+        /**
+         * 获取图层的层级
+         */
         getzIndex(): number;
     }
 }
diff --git a/types/amap-js-api/layer/layerGroup.d.ts b/types/amap-js-api/layer/layerGroup.d.ts
index 4cc463eef7..6a07c8fc72 100644
--- a/types/amap-js-api/layer/layerGroup.d.ts
+++ b/types/amap-js-api/layer/layerGroup.d.ts
@@ -1,14 +1,49 @@
 declare namespace AMap {
     class LayerGroup<L = any> extends Layer {
+        /**
+         * 图层集合
+         * @param layers 集合中的图层
+         */
         constructor(layers: L | L[]);
+        /**
+         * 添加单个图层到集合中，不支持添加重复的图层
+         * @param layer 图层
+         */
         addLayer(layer: L | L[]): this;
+        /**
+         * 添加图层数组到集合中，不支持添加重复的图层
+         * @param layers 图层数组
+         */
         addLayers(layers: L | L[]): this;
+        /**
+         * 返回当前集合中所有的图层
+         */
         getLayers(): L[];
         getLayer(finder: (this: null, item: L, index: number, list: L[]) => boolean): L | null;
+        /**
+         * 判断传入的图层实例是否在集合中
+         * @param layer 目标图层
+         */
         hasLayer(layer: L | ((this: null, item: L, index: number, list: L[]) => boolean)): boolean;
+        /**
+         * 	从集合中删除传入的图层实例
+         * @param layer 图层
+         */
         removeLayer(layer: L | L[]): this;
-        removeLayers(layer: L | L[]): this;
+        /**
+         * 从集合中删除传入的图层实例数组
+         * @param layers 图层数组
+         */
+        removeLayers(layers: L | L[]): this;
+        /**
+         * 清空集合
+         */
         clearLayers(): this;
+        /**
+         * 对集合中的图层做迭代操作
+         * @param iterator 迭代回调
+         * @param context 执行上下文
+         */
         eachLayer<C = L>(iterator: (this: C, layer: L, index: number, list: L[]) => void, context?: C): void;
 
         // overwrite
diff --git a/types/amap-js-api/layer/massMarks.d.ts b/types/amap-js-api/layer/massMarks.d.ts
index 1ab5464a5b..963f7e2ec6 100644
--- a/types/amap-js-api/layer/massMarks.d.ts
+++ b/types/amap-js-api/layer/massMarks.d.ts
@@ -12,21 +12,51 @@ declare namespace AMap {
         }
 
         interface Style {
+            /**
+             * 图标显示位置偏移量，以图标的左上角为基准点（0,0）点
+             */
             anchor: Pixel;
+            /**
+             * 图标的地址
+             */
             url: string;
+            /**
+             * 图标的尺寸
+             */
             size: Size;
+            /**
+             * 旋转角度
+             */
             rotation?: number;
         }
 
         type UIEvent<N extends string, I> = Event<N, {
+            /**
+             * 事件触发目标
+             */
             target: I;
+            /**
+             * 目标点的数据
+             */
             data: I extends MassMarks<infer D> ? D : Data;
         }>;
 
         interface Options extends Layer.Options {
+            /**
+             * 显示层级
+             */
             zIndex?: number;
+            /**
+             * 指针样式
+             */
             cursor?: string;
+            /**
+             * 是否在拖拽缩放过程中实时重绘
+             */
             alwayRender?: boolean;
+            /**
+             * 设置点的样式
+             */
             style: Style | Style[];
             // rejectMapMask
         }
@@ -37,11 +67,33 @@ declare namespace AMap {
     }
 
     class MassMarks<D extends MassMarks.Data = MassMarks.Data> extends Layer {
+        /**
+         * 海量点类，利用该类可同时在地图上展示万级别的点
+         * @param data 点对象数组或url
+         * @param opts 选项
+         */
         constructor(data: D[] | string, opts: MassMarks.Options);
+        /**
+         * 设置显示样式
+         * @param style 样式设置
+         */
         setStyle(style: MassMarks.Style | MassMarks.Style[]): void;
+        /**
+         * 获取显示样式
+         */
         getStyle(): MassMarks.Style | MassMarks.Style[];
+        /**
+         * 设置数据集
+         * @param data 数据集
+         */
         setData(data: D[] | string): void;
+        /**
+         * 获取数据集
+         */
         getData(): Array<Pick<D, Exclude<keyof D, 'lnglat'>> & { lnglat: LngLat }>;
+        /**
+         * 清除海量点
+         */
         clear(): void;
     }
 }
diff --git a/types/amap-js-api/layer/mediaLayer.d.ts b/types/amap-js-api/layer/mediaLayer.d.ts
index a38f5ba025..43fee214bb 100644
--- a/types/amap-js-api/layer/mediaLayer.d.ts
+++ b/types/amap-js-api/layer/mediaLayer.d.ts
@@ -1,35 +1,94 @@
 declare namespace AMap {
     namespace MediaLayer {
         interface Options extends Layer.Options {
+            /**
+             * 显示范围
+             */
             bounds?: Bounds;
+            /**
+             * 是否可见
+             */
             visible?: boolean;
+            /**
+             * 缩放范围
+             */
             zooms?: [number, number];
+            /**
+             * 透明度
+             */
             opacity?: number;
         }
     }
 
     abstract class MediaLayer<E extends HTMLElement> extends Layer {
+        /**
+         * @param options 图层选项
+         */
         constructor(options?: MediaLayer.Options);
+        /**
+         * 设置显示范围
+         * @param bounds 显示范围
+         */
         setBounds(bounds: Bounds): void;
+        /**
+         * 获取显示的范围
+         */
         getBounds(): Bounds;
+        /**
+         * 设置图层选项
+         * @param options 图层选项
+         */
         setOptions(options: Partial<MediaLayer.Options>): void;
+        /**
+         * 获取图层选项
+         */
         getOptions(): Partial<MediaLayer.Options>;
+        /**
+         * 获取元素
+         */
         getElement(): E | null;
     }
 
+    /**
+     * 图片图层
+     */
     class ImageLayer extends MediaLayer<HTMLImageElement> {
+        /**
+         * 修改Image的Url
+         * @param url url
+         */
         setImageUrl(url: string): void;
+        /**
+         * 返回Image的Url
+         */
         getImageUrl(): string | undefined;
     }
 
     class VideoLayer extends MediaLayer<HTMLVideoElement> {
+        /**
+         * 修改Video的Url
+         * @param source url
+         */
         setVideoUrl(source: string | string[]): void;
+        /**
+         * 返回Video的Url
+         */
         getVideoUrl(): string | string[] | undefined;
     }
 
     class CanvasLayer extends MediaLayer<HTMLCanvasElement> {
+        /**
+         * 修改显示的Canvas
+         * @param canvas Canvas对象
+         */
         setCanvas(canvas: HTMLCanvasElement): void;
+        /**
+         * 返回Canvas对象
+         */
         getCanvas(): HTMLCanvasElement | undefined;
+        /**
+         * 当canvas的内容发生改变是用于刷新图层
+         */
         reFresh(): void;
     }
 }
diff --git a/types/amap-js-api/layer/tileLayer.d.ts b/types/amap-js-api/layer/tileLayer.d.ts
index 7576a70664..1a146b964c 100644
--- a/types/amap-js-api/layer/tileLayer.d.ts
+++ b/types/amap-js-api/layer/tileLayer.d.ts
@@ -5,33 +5,87 @@ declare namespace AMap {
         }
 
         interface Options extends Layer.Options {
+            /**
+             * 切片大小
+             */
             tileSize?: number;
+            /**
+             * 切片取图地址(自1.3版本起，该属性与getTileUrl属性合并)
+             */
             tileUrl?: string;
+            /**
+             * 取图错误时的代替地址
+             */
             errorUrl?: string;
+            /**
+             * 获取图块取图地址
+             */
             getTileUrl?: string | ((x: number, y: number, level: number) => string);
+            /**
+             * 图层叠加的顺序值
+             */
             zIndex?: number;
+            /**
+             * 图层的透明度
+             */
             opacity?: number;
+            /**
+             * 支持的缩放级别范围
+             */
             zooms?: [number, number];
+            /**
+             * 是否在高清屏下进行清晰度适配
+             */
             detectRetina?: boolean;
         }
+        /**
+         * 卫星图层
+         */
         class Satellite extends TileLayer { }
+        /**
+         * 路网图层
+         */
         class RoadNet extends TileLayer { }
 
         namespace Traffic {
             interface Options extends TileLayer.Options {
+                /**
+                 * 是否设置可以自动刷新实时路况信息
+                 */
                 autoRefresh?: boolean;
+                /**
+                 * 设置刷新间隔时长
+                 */
                 interval?: number;
             }
         }
         class Traffic extends TileLayer {
+            /**
+             * 实时交通图层
+             * @param options 图层选项
+             */
             constructor(options?: Traffic.Options);
         }
     }
 
     class TileLayer extends Layer {
+        /**
+         * 切片图层
+         * @param options 图层选项
+         */
         constructor(options?: TileLayer.Options);
+        /**
+         * 获取当前图层所有切片号
+         */
         getTiles(): string[];
+        /**
+         * 重新加载此图层
+         */
         reload(): void;
+        /**
+         * 设置图层的取图地址
+         * @param url 取图地址
+         */
         setTileUrl(url: string | ((x: number, y: number, level: number) => string)): void;
     }
 }
diff --git a/types/amap-js-api/layer/wms.d.ts b/types/amap-js-api/layer/wms.d.ts
index c4561ddf14..043975d856 100644
--- a/types/amap-js-api/layer/wms.d.ts
+++ b/types/amap-js-api/layer/wms.d.ts
@@ -13,16 +13,43 @@ declare namespace AMap {
                 ELEVATION?: string;
             }
             interface Options extends Flexible.Options {
+                /**
+                 * wms服务的url地址
+                 */
                 url: string;
+                /**
+                 * OGC标准的WMS地图服务的GetMap接口的参数
+                 */
                 params: Params;
+                /**
+                 * 地图级别切换时，不同级别的图片是否进行混合
+                 */
                 blend?: boolean;
             }
         }
         class WMS extends Flexible {
+            /**
+             * WMS图层
+             * @param options 图层选项
+             */
             constructor(options: WMS.Options);
+            /**
+             * 设置wms服务地址
+             * @param url 服务地址
+             */
             setUrl(url: string): void;
+            /**
+             * 返回wms服务地址
+             */
             getUrl(): string;
+            /**
+             * 设置OGC标准的WMS getMap接口的参数
+             * @param params 接口参数
+             */
             setParams(params: WMS.Params): void;
+            /**
+             * 返回OGC标准的WMS getMap接口的参数
+             */
             getParams(): WMS.Params;
         }
     }
diff --git a/types/amap-js-api/layer/wmts.d.ts b/types/amap-js-api/layer/wmts.d.ts
index 5d85e5df48..7a122dd6b9 100644
--- a/types/amap-js-api/layer/wmts.d.ts
+++ b/types/amap-js-api/layer/wmts.d.ts
@@ -8,17 +8,44 @@ declare namespace AMap {
                 Format?: string;
             }
             interface Options extends Flexible.Options {
+                /**
+                 * wmts服务的url地址
+                 */
                 url: string;
+                /**
+                 * OGC标准的WMTS地图服务的GetTile接口的参数
+                 */
                 params: Params;
+                /**
+                 * 地图级别切换时，不同级别的图片是否进行混合
+                 */
                 blend?: boolean;
             }
         }
 
         class WMTS extends Flexible {
+            /**
+             * WMTS图层
+             * @param options 图层选项
+             */
             constructor(options: WMTS.Options);
+            /**
+             * 设置wmts服务地址
+             * @param url 服务地址
+             */
             setUrl(url: string): void;
+            /**
+             * 返回wmts服务地址
+             */
             getUrl(): string;
+            /**
+             * 设置OGC标准的WMTS getTile接口的参数
+             * @param params 接口参数
+             */
             setParams(params: WMTS.Params): void;
+            /**
+             * 返回OGC标准的WMTS getTile接口的参数
+             */
             getParams(): WMTS.Params;
         }
     }
diff --git a/types/amap-js-api/lngLat.d.ts b/types/amap-js-api/lngLat.d.ts
index 4247002b2b..f649a78de8 100644
--- a/types/amap-js-api/lngLat.d.ts
+++ b/types/amap-js-api/lngLat.d.ts
@@ -1,11 +1,39 @@
 declare namespace AMap {
     class LngLat {
+        /**
+         * 构造一个地理坐标对象
+         * @param lng 经度
+         * @param lat 纬度
+         * @param noAutofix 是否自动修正
+         */
         constructor(lng: number, lat: number, noAutofix?: boolean);
+        /**
+         * 移动当前经纬度坐标得到新的坐标
+         * @param east 移动经度，向右为正值
+         * @param north 移动维度，向上为正值
+         */
         offset(east: number, north: number): LngLat;
+        /**
+         * 当前经纬度和传入经纬度或者经纬度数组连线之间的地面距离，单位为米
+         * @param lnglat 对比目标
+         */
         distance(lnglat: LngLat | LngLat[]): number;
+        /**
+         * 获取经度值
+         */
         getLng(): number;
+        /**
+         * 获取纬度值
+         */
         getLat(): number;
+        /**
+         * 判断当前坐标对象与传入坐标对象是否相等
+         * @param lnglat 判断目标
+         */
         equals(lnglat: LngLat): boolean;
+        /**
+         * 以字符串的形式返回
+         */
         toString(): string;
 
         // internal
diff --git a/types/amap-js-api/map.d.ts b/types/amap-js-api/map.d.ts
index 46edc68577..e7937966b1 100644
--- a/types/amap-js-api/map.d.ts
+++ b/types/amap-js-api/map.d.ts
@@ -3,39 +3,145 @@ declare namespace AMap {
         type Feature = 'bg' | 'point' | 'road' | 'building';
         type ViewMode = '2D' | '3D';
         interface Options {
+            /**
+             * 地图视口，用于控制影响地图静态显示的属性
+             */
             view?: View2D;
+            /**
+             * 地图图层数组，数组可以是图层 中的一个或多个，默认为普通二维地图
+             */
             layers?: Layer[];
+            /**
+             * 地图显示的缩放级别
+             */
             zoom?: number;
+            /**
+             * 地图中心点坐标值
+             */
             center?: LocationValue;
+            /**
+             * 地图标注显示顺序
+             */
             labelzIndex?: number;
+            /**
+             * 地图显示的缩放级别范围
+             */
             zooms?: [number, number];
+            /**
+             * 地图语言类型
+             */
             lang?: Lang;
+            /**
+             * 地图默认鼠标样式
+             */
             defaultCursor?: string;
+            /**
+             * 地图显示的参考坐标系
+             */
             crs?: 'EPSG3857' | 'EPSG3395' | 'EPSG4326';
+            /**
+             * 地图平移过程中是否使用动画
+             */
             animateEnable?: boolean;
+            /**
+             * 是否开启地图热点和标注的hover效果
+             */
             isHotspot?: boolean;
+            /**
+             * 当前地图中默认显示的图层
+             */
             defaultLayer?: TileLayer;
+            /**
+             * 地图是否可旋转
+             */
             rotateEnable?: boolean;
+            /**
+             * 是否监控地图容器尺寸变化
+             */
             resizeEnable?: boolean;
+            /**
+             * 是否在有矢量底图的时候自动展示室内地图
+             */
             showIndoorMap?: boolean;
+            /**
+             * 在展示矢量图的时候自动展示室内地图图层
+             */
+            // indoorMap?: IndorMap
+            /**
+             * 是否支持可以扩展最大缩放级别
+             */
             expandZoomRange?: boolean;
+            /**
+             * 地图是否可通过鼠标拖拽平移
+             */
             dragEnable?: boolean;
+            /**
+             * 地图是否可缩放
+             */
             zoomEnable?: boolean;
+            /**
+             * 地图是否可通过双击鼠标放大地图
+             */
             doubleClickZoom?: boolean;
+            /**
+             * 地图是否可通过键盘控制
+             */
             keyboardEnable?: boolean;
+            /**
+             * 地图是否使用缓动效果
+             */
             jogEnable?: boolean;
+            /**
+             * 地图是否可通过鼠标滚轮缩放浏览
+             */
             scrollWheel?: boolean;
+            /**
+             * 地图在移动终端上是否可通过多点触控缩放浏览地图
+             */
             touchZoom?: boolean;
+            /**
+             * 当touchZoomCenter=1的时候，手机端双指缩放的以地图中心为中心，否则默认以双指中间点为中心
+             */
             touchZoomCenter?: number;
+            /**
+             * 设置地图的显示样式
+             */
             mapStyle?: string;
+            /**
+             * 设置地图上显示的元素种类
+             */
             features?: Feature[] | 'all' | Feature;
+            /**
+             * 设置地图显示3D楼块效果
+             */
             showBuildingBlock?: boolean;
+            /**
+             * 视图模式
+             */
             viewMode?: ViewMode;
+            /**
+             * 俯仰角度
+             */
             pitch?: number;
+            /**
+             * 是否允许设置俯仰角度
+             */
             pitchEnable?: boolean;
+            /**
+             * 楼块出现和消失的时候是否显示动画过程
+             */
             buildingAnimation?: boolean;
+            /**
+             * 调整天空颜色
+             */
             skyColor?: string;
+            /**
+             * 设置地图的预加载模式
+             */
             preloadMode?: boolean;
+            /**
+             * 为 Map 实例指定掩模的路径，各图层将只显示路径范围内图像
+             */
             mask?: Array<[number, number]> | Array<Array<[number, number]>> | Array<Array<Array<[number, number]>>>;
             maxPitch?: number;
             rotation?: number;
@@ -58,24 +164,67 @@ declare namespace AMap {
             // detectRetina: number;
         }
         interface Status {
+            /**
+             * 是否开启动画
+             */
             animateEnable: boolean;
+            /**
+             * 是否双击缩放
+             */
             doubleClickZoom: boolean;
+            /**
+             * 是否支持拖拽
+             */
             dragEnable: boolean;
             isHotspot: boolean;
+            /**
+             * 是否开启缓动效果
+             */
             jogEnable: boolean;
+            /**
+             * 是否支持键盘
+             */
             keyboardEnable: boolean;
+            /**
+             * 是否支持调整俯仰角
+             */
             pitchEnable: boolean;
             resizeEnable: boolean;
+            /**
+             * 是否支持旋转
+             */
             rotateEnable: boolean;
+            /**
+             * 是否支持滚轮缩放
+             */
             scrollWheel: boolean;
+            /**
+             * 是否支持触摸缩放
+             */
             touchZoom: boolean;
+            /**
+             * 是否支持缩放
+             */
             zoomEnable: boolean;
         }
         type HotspotEvent<N extends string> = Event<N, {
+            /**
+             * 经纬度坐标
+             */
             lnglat: LngLat;
+            /**
+             * 热点名称
+             */
             name: string;
+            /**
+             * 热点id
+             */
             id: string;
+
             // internal
+            /**
+             * 是否室内热点
+             */
             isIndoorPOI: boolean;
         }>;
         interface EventMap {
@@ -113,73 +262,305 @@ declare namespace AMap {
     }
 
     class Map extends EventEmitter {
+        /**
+         * 构造一个地图对象
+         * @param container 地图容器的id或者是DOM元素
+         * @param opts 选项
+         */
         constructor(container: string | HTMLElement, opts?: Map.Options);
+        /**
+         * 唤起高德地图客户端marker页
+         * @param obj 唤起参数
+         */
         poiOnAMAP(obj: { id: string; location?: LocationValue; name?: string }): void;
+        /**
+         * 唤起高德地图客户端marker详情页
+         * @param obj 唤起参数
+         */
         detailOnAMAP(obj: { id: string; location?: LocationValue; name?: string }): void;
+        /**
+         * 获取当前地图缩放级别
+         */
         getZoom(): number;
+        /**
+         * 获取地图图层数组
+         */
         getLayers(): Layer[];
+        /**
+         * 获取地图中心点经纬度坐标值
+         */
         getCenter(): LngLat;
+        /**
+         * 返回地图对象的容器
+         */
         getContainer(): HTMLElement | null;
+        /**
+         * 获取地图中心点所在区域
+         */
         getCity(callback: (cityData: {
+            /**
+             * 市名称
+             */
             city: string;
+            /**
+             * 市代码
+             */
             citycode: string;
+            /**
+             * 区名称
+             */
             district: string;
+            /**
+             * 省
+             */
             province: string | never[]; // province is empty array when getCity fail
         }) => void): void;
+        /**
+         * 获取当前地图视图范围，获取当前可视区域
+         */
         getBounds(): Bounds;
+        /**
+         * 获取当前地图标注的显示顺序
+         */
         getLabelzIndex(): number;
+        /**
+         * 获取Map的限制区域
+         */
         getLimitBounds(): Bounds;
+        /**
+         * 获取地图语言类型
+         */
         getLang(): Lang;
+        /**
+         * 获取地图容器像素大小
+         */
         getSize(): Size;
+        /**
+         * 获取地图顺时针旋转角度
+         */
         getRotation(): number;
+        /**
+         * 获取当前地图状态信息
+         */
         getStatus(): Map.Status;
+        /**
+         * 获取地图默认鼠标指针样式
+         */
         getDefaultCursor(): string;
+        /**
+         * 获取指定位置的地图分辨率
+         * @param point 指定经纬度
+         */
         getResolution(point?: LocationValue): number;
+        /**
+         * 获取当前地图比例尺
+         * @param dpi dpi
+         */
         getScale(dpi?: number): number;
+        /**
+         * 设置地图显示的缩放级别
+         * @param level 缩放级别
+         */
         setZoom(level: number): void;
+        /**
+         * 设置地图标注显示的顺序
+         * @param index 显示顺序
+         */
         setLabelzIndex(index: number): void;
+        /**
+         * 设置地图图层数组
+         * @param layers 图层数组
+         */
         setLayers(layers: Layer[]): void;
+        /**
+         * 添加覆盖物/图层
+         * @param overlay 覆盖物/图层
+         */
         add(overlay: Overlay | Overlay[]): void;
+        /**
+         * 删除覆盖物/图层
+         * @param overlay 覆盖物/图层
+         */
         remove(overlay: Overlay | Overlay[]): void;
+        /**
+         * 返回添加的覆盖物对象
+         * @param type 覆盖物类型
+         */
         getAllOverlays(type?: 'marker' | 'circle' | 'polyline' | 'polygon'): Overlay[];
+        /**
+         * 设置地图显示的中心点
+         * @param center 中心点经纬度
+         */
         setCenter(center: LocationValue): void;
+        /**
+         * 地图缩放至指定级别并以指定点为地图显示中心点
+         * @param zoomLevel 缩放等级
+         * @param center 缩放中心
+         */
         setZoomAndCenter(zoomLevel: number, center: LocationValue): void;
+        /**
+         * 按照行政区名称或adcode来设置地图显示的中心点。
+         * @param city 城市名称或城市编码
+         * @param callback 回调
+         */
         setCity(city: string, callback: (this: this, coord: [string, string], zoom: number) => void): void;
+        /**
+         * 指定当前地图显示范围
+         * @param bound 显示范围
+         */
         setBounds(bound: Bounds): Bounds;
+        /**
+         * 设置Map的限制区域
+         * @param bound 限制区域
+         */
         setLimitBounds(bound: Bounds): void;
+        /**
+         * 清除限制区域
+         */
         clearLimitBounds(): void;
+        /**
+         * 设置地图语言类型
+         * @param lang 语言类型
+         */
         setLang(lang: Lang): void;
+        /**
+         * 设置地图顺时针旋转角度，旋转原点为地图容器中心点
+         * @param rotation 旋转角度
+         */
         setRotation(rotation: number): void;
+        /**
+         * 设置当前地图显示状态
+         * @param status 状态
+         */
         setStatus(status: Partial<Map.Status>): void;
+        /**
+         * 设置鼠标指针默认样式
+         * @param cursor 指针样式
+         */
         setDefaultCursor(cursor: string): void;
+        /**
+         * 地图放大一级显示
+         */
         zoomIn(): void;
+        /**
+         * 地图缩小一级显示
+         */
         zoomOut(): void;
+        /**
+         * 地图中心点平移至指定点位置
+         * @param position 目标位置经纬度
+         */
         panTo(position: LocationValue): void;
+        /**
+         * 以像素为单位，沿x方向和y方向移动地图
+         * @param x 横向移动像素，向右为正
+         * @param y 纵向移动像素，向下为正
+         */
         panBy(x: number, y: number): void;
+        /**
+         * 根据地图上添加的覆盖物分布情况，自动缩放地图到合适的视野级别
+         * @param overlayList 覆盖物数组
+         * @param immediately 是否需要动画过程
+         * @param avoid 上下左右的像素避让宽度
+         * @param maxZoom 最大缩放级别
+         */
         setFitView(
             overlayList?: Overlay | Overlay[],
             immediately?: boolean,
             avoid?: [number, number, number, number],
             maxZoom?: number
         ): Bounds | false | undefined;
+        /**
+         * 删除地图上所有的覆盖物
+         */
         clearMap(): void;
+        /**
+         * 注销地图对象，并清空地图容器
+         */
         destroy(): void;
+        /**
+         * 加载插件，
+         * tips: 插件的类型定义不在本类型定义中给出，需要另行安装例如
+         * 3d地图：@types/amap-js-api-map3d
+         * 地区搜索：@types/amap-js-api-place-search
+         * @param name 插件名称
+         * @param callback 插件加载完成后的回调函数
+         */
         plugin(name: string | string[], callback: () => void): this;
+        /**
+         * 添加控件
+         * @param control 控件
+         */
         addControl(control: {}): void; // TODO
+        /**
+         * 移除控件
+         * @param control 控件
+         */
         removeControl(control: {}): void; // TODO
+        /**
+         * 清除地图上的信息窗体。
+         */
         clearInfoWindow(): void;
+        /**
+         * 平面地图像素坐标转换为地图经纬度坐标
+         * @param pixel 像素坐标
+         * @param level 缩放等级
+         */
         pixelToLngLat(pixel: Pixel, level?: number): LngLat;
+        /**
+         * 地图经纬度坐标转换为平面地图像素坐标
+         * @param lnglat 经纬度坐标
+         * @param level 缩放等级
+         */
         lnglatToPixel(lnglat: LocationValue, level?: number): Pixel;
+        /**
+         * 地图容器像素坐标转为地图经纬度坐标
+         * @param pixel 地图像素坐标
+         */
         containerToLngLat(pixel: Pixel): LngLat;
+        /**
+         * 地图经纬度坐标转为地图容器像素坐标
+         * @param lnglat 经纬度坐标
+         */
         lngLatToContainer(lnglat: LocationValue): Pixel;
+        /**
+         * 地图经纬度坐标转为地图容器像素坐标
+         * @param lnglat 经纬度坐标
+         */
         lnglatTocontainer(lnglat: LocationValue): Pixel;
+        /**
+         * 设置地图的显示样式
+         * @param style 地图样式
+         */
         setMapStyle(style: string): void;
+        /**
+         * 获取地图显示样式
+         */
         getMapStyle(): string;
+        /**
+         * 设置地图上显示的元素种类
+         * @param feature 元素
+         */
         setFeatures(feature: Map.Feature | Map.Feature[] | 'all'): void;
+        /**
+         * 获取地图显示元素种类
+         */
         getFeatures(): Map.Feature | Map.Feature[] | 'all';
+        /**
+         * 修改底图图层
+         * @param layer 图层
+         */
         setDefaultLayer(layer: TileLayer): void;
+        /**
+         * 设置俯仰角
+         * @param pitch 俯仰角
+         */
         setPitch(pitch: number): void;
+        /**
+         * 获取俯仰角
+         */
         getPitch(): number;
+
         getViewMode_(): Map.ViewMode;
         lngLatToGeodeticCoord(lnglat: LocationValue): Pixel;
         geodeticCoordToLngLat(pixel: Pixel): LngLat;
diff --git a/types/amap-js-api/overlay/bezierCurve.d.ts b/types/amap-js-api/overlay/bezierCurve.d.ts
index 5778cb72a6..b861440a92 100644
--- a/types/amap-js-api/overlay/bezierCurve.d.ts
+++ b/types/amap-js-api/overlay/bezierCurve.d.ts
@@ -2,18 +2,31 @@ declare namespace AMap {
     namespace BezierCurve {
         interface EventMap<I = BezierCurve> extends Polyline.EventMap<I> { }
         type Options<ExtraData = any> = Merge<Polyline.Options<ExtraData>, {
-            // internal
+            /**
+             * 贝瑟尔曲线的路径
+             */
             path: Array<Array<number | string | Array<string | number>>>;
+            // internal
             tolerance?: number;
             interpolateNumLimit?: [number | number];
         }>;
 
         interface GetOptionsResult<ExtraData = any> extends Polyline.GetOptionsResult<ExtraData> {
+            /**
+             * 贝瑟尔曲线的路径
+             */
             path: Array<LngLat & { controlPoints: LngLat[] }>;
         }
     }
     class BezierCurve<ExtraData = any> extends Polyline<ExtraData> {
+        /**
+         * 贝瑟尔曲线
+         * @param options 覆盖物选项
+         */
         constructor(options: BezierCurve.Options<ExtraData>);
+        /**
+         * 获取覆盖物选项
+         */
         getOptions(): Partial<BezierCurve.GetOptionsResult<ExtraData>>;
         // internal
         getInterpolateLngLats(): LngLat[];
diff --git a/types/amap-js-api/overlay/circle.d.ts b/types/amap-js-api/overlay/circle.d.ts
index 2a1cbd9020..c718119e5a 100644
--- a/types/amap-js-api/overlay/circle.d.ts
+++ b/types/amap-js-api/overlay/circle.d.ts
@@ -34,15 +34,50 @@ declare namespace AMap {
     }
 
     class Circle<ExtraData = any> extends ShapeOverlay<ExtraData> {
+        /**
+         * 圆形覆盖物
+         * @param options 覆盖物选项
+         */
         constructor(options?: Circle.Options<ExtraData>);
+        /**
+         * 设置圆中心点
+         * @param center 中心点经纬度
+         * @param preventEvent 阻止触发事件
+         */
         setCenter(center: LocationValue, preventEvent?: boolean): void;
+        /**
+         * 获取圆中心点
+         */
         getCenter(): LngLat | undefined;
+        /**
+         * 获取圆外切矩形范围
+         */
         getBounds(): Bounds | null;
+        /**
+         * 设置圆形的半径
+         * @param radius 半径
+         * @param preventEvent 阻止触发事件
+         */
         setRadius(radius: number, preventEvent?: boolean): void;
+        /**
+         * 获取圆形的半径
+         */
         getRadius(): number;
+        /**
+         * 修改选项
+         * @param options 选项
+         */
         setOptions(options?: Circle.Options<ExtraData>): void;
+        /**
+         * 获取选项
+         */
         getOptions(): Partial<Circle.GetOptionsResult<ExtraData>>;
+        /**
+         * 判断指定点坐标是否在圆内
+         * @param point 坐标
+         */
         contains(point: LocationValue): boolean;
+
         // internal
         getPath(count?: number): LngLat[];
     }
diff --git a/types/amap-js-api/overlay/circleMarker.d.ts b/types/amap-js-api/overlay/circleMarker.d.ts
index 13e4162f46..0b67d7f13e 100644
--- a/types/amap-js-api/overlay/circleMarker.d.ts
+++ b/types/amap-js-api/overlay/circleMarker.d.ts
@@ -1,4 +1,7 @@
 declare namespace AMap {
     // tslint:disable-next-line;
+    /**
+     * 圆点标记
+     */
     class CircleMarker<ExtraData = any> extends Circle<ExtraData> {}
 }
diff --git a/types/amap-js-api/overlay/contextMenu.d.ts b/types/amap-js-api/overlay/contextMenu.d.ts
index 72c7fc2852..eacb6673c8 100644
--- a/types/amap-js-api/overlay/contextMenu.d.ts
+++ b/types/amap-js-api/overlay/contextMenu.d.ts
@@ -1,7 +1,11 @@
 declare namespace AMap {
     namespace ContextMenu {
         interface Options {
+            /**
+             * 右键菜单内容
+             */
             content?: string | HTMLElement;
+
             // internal
             visible?: boolean;
         }
@@ -14,10 +18,33 @@ declare namespace AMap {
     }
 
     class ContextMenu<ExtraData = any> extends Overlay<ExtraData> {
+        /**
+         * 地图右键菜单
+         * @param options 选项
+         */
         constructor(options?: ContextMenu.Options);
+        /**
+         * 右键菜单中添加菜单项
+         * @param text 菜单显示内容
+         * @param fn 该菜单下需进行的操作
+         * @param num 当前菜单项在右键菜单中的排序位置，以0开始
+         */
         addItem(text: string, fn: (this: HTMLLIElement) => void, num?: number): void;
-        removeItem(test: string, fn: (this: HTMLLIElement) => void): void;
+        /**
+         * 删除一个菜单项
+         * @param text 菜单显示内容
+         * @param fn 该菜单下需进行的操作
+         */
+        removeItem(text: string, fn: (this: HTMLLIElement) => void): void;
+        /**
+         * 在地图的指定位置打开右键菜单。
+         * @param map 目标地图
+         * @param position 打开位置经纬度
+         */
         open(map: Map, position: LocationValue): void;
+        /**
+         * 关闭右键菜单
+         */
         close(): void;
     }
 }
diff --git a/types/amap-js-api/overlay/ellipse.d.ts b/types/amap-js-api/overlay/ellipse.d.ts
index 55feaf3112..de9da22e0c 100644
--- a/types/amap-js-api/overlay/ellipse.d.ts
+++ b/types/amap-js-api/overlay/ellipse.d.ts
@@ -6,7 +6,13 @@ declare namespace AMap {
         }
 
         interface Options<ExtraData = any> extends Polygon.Options<ExtraData> {
+            /**
+             * 椭圆的中心
+             */
             center?: LocationValue;
+            /**
+             * 椭圆半径
+             */
             radius?: [number, number];
         }
         type GetOptionsResult<ExtraData = any> = Merge<Circle.GetOptionsResult<ExtraData>, {
@@ -15,9 +21,25 @@ declare namespace AMap {
     }
 
     class Ellipse<ExtraData = any> extends Polygon<ExtraData> {
+        /**
+         * 椭圆
+         * @param options 选项
+         */
         constructor(options?: Ellipse.Options<ExtraData>);
+        /**
+         * 获取椭圆的中心点
+         */
         getCenter(): LngLat | undefined;
+        /**
+         * 设置椭圆的中心点
+         * @param center 中心点
+         * @param preventEvent 阻止触发事件
+         */
         setCenter(center: LocationValue, preventEvent?: boolean): void;
+        /**
+         * 修改椭圆属性
+         * @param options 属性
+         */
         setOptions(options: Ellipse.Options<ExtraData>): void;
 
         // internal
diff --git a/types/amap-js-api/overlay/geoJSON.d.ts b/types/amap-js-api/overlay/geoJSON.d.ts
index 75098a59f0..aa3554cb04 100644
--- a/types/amap-js-api/overlay/geoJSON.d.ts
+++ b/types/amap-js-api/overlay/geoJSON.d.ts
@@ -24,9 +24,27 @@ declare namespace AMap {
             features: GeoJSONObject[];
         };
         interface Options {
+            /**
+             * 要加载的标准GeoJSON对象
+             */
             geoJSON?: GeoJSONObject | GeoJSONObject[];
+            /**
+             * 指定点要素的绘制方式
+             * @param obj GeoJSON对象
+             * @param lnglat 点的位置
+             */
             getMarker?(obj: GeoJSONObject, lnglat: LngLat): Marker;
+            /**
+             * 指定线要素的绘制方式
+             * @param obj GeoJSON对象
+             * @param lnglats 线的路径
+             */
             getPolyline?(obj: GeoJSONObject, lnglats: LngLat[]): Polyline;
+            /**
+             * 指定面要素的绘制方式
+             * @param obj GeoJSON对象
+             * @param lnglats 面的路径
+             */
             getPolygon?(obj: GeoJSONObject, lnglats: LngLat[]): Polygon;
             coordsToLatLng?(lnglat: LngLat): LngLat;
 
@@ -36,8 +54,19 @@ declare namespace AMap {
     }
 
     class GeoJSON<ExtraData = any> extends OverlayGroup<Overlay, ExtraData> {
+        /**
+         * GeoJSON
+         * @param options 选项
+         */
         constructor(options?: GeoJSON.Options);
+        /**
+         * 加载新的GeoJSON对象，转化为覆盖物，旧的覆盖物将移除
+         * @param obj GeoJSON对象
+         */
         importData(obj: GeoJSON.GeoJSONObject | GeoJSON.GeoJSONObject[]): void;
+        /**
+         * 将当前对象包含的覆盖物转换为GeoJSON对象
+         */
         toGeoJSON(): GeoJSON.GeoJSONObject[];
     }
 }
diff --git a/types/amap-js-api/overlay/icon.d.ts b/types/amap-js-api/overlay/icon.d.ts
index be300feef3..18d75921bf 100644
--- a/types/amap-js-api/overlay/icon.d.ts
+++ b/types/amap-js-api/overlay/icon.d.ts
@@ -1,16 +1,39 @@
 declare namespace AMap {
     namespace Icon {
         interface Options {
+            /**
+             * 图标尺寸
+             */
             size?: SizeValue;
+            /**
+             * 图标取图偏移量
+             */
             imageOffset?: Pixel;
+            /**
+             * 图标的取图地址
+             */
             image?: string;
+            /**
+             * 图标所用图片大小
+             */
             imageSize?: SizeValue;
         }
     }
 
     class Icon extends EventEmitter {
+        /**
+         * 点标记的图标
+         * @param options 选项
+         */
         constructor(options?: Icon.Options);
+        /**
+         * 设置图标图片大小
+         * @param size 大小
+         */
         setImageSize(size: SizeValue): void;
+        /**
+         * 获取图标图片大小
+         */
         getImageSize(): Size;
     }
 }
diff --git a/types/amap-js-api/overlay/infoWindow.d.ts b/types/amap-js-api/overlay/infoWindow.d.ts
index 54bedd95a8..1c9b69a9a3 100644
--- a/types/amap-js-api/overlay/infoWindow.d.ts
+++ b/types/amap-js-api/overlay/infoWindow.d.ts
@@ -7,13 +7,37 @@ declare namespace AMap {
         }
 
         interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            /**
+             * 是否自定义窗体
+             */
             isCustom?: boolean;
+            /**
+             * 是否自动调整窗体到视野内
+             */
             autoMove?: boolean;
+            /**
+             * 控制是否在鼠标点击地图后关闭信息窗体
+             */
             closeWhenClickMap?: boolean;
+            /**
+             * 显示内容
+             */
             content?: string | HTMLElement;
+            /**
+             * 信息窗体尺寸
+             */
             size?: SizeValue;
+            /**
+             * 信息窗体显示位置偏移量
+             */
             offset?: Pixel;
+            /**
+             * 信息窗体显示基点位置
+             */
             position?: LocationValue;
+            /**
+             * 是否显示信息窗体阴影
+             */
             showShadow?: boolean;
             // internal
             height?: number;
@@ -21,16 +45,53 @@ declare namespace AMap {
     }
 
     class InfoWindow<ExtraData = any> extends Overlay<ExtraData> {
+        /**
+         * 信息展示窗体
+         * @param options 选项
+         */
         constructor(options?: InfoWindow.Options);
+        /**
+         * 在地图的指定位置打开信息窗体
+         * @param map 地图
+         * @param position 打开的位置
+         */
         open(map: Map, position?: LocationValue): void;
+        /**
+         * 关闭信息窗体
+         */
         close(): void;
+        /**
+         * 获取信息窗体是否打开
+         */
         getIsOpen(): boolean;
+        /**
+         * 设置信息窗体内容
+         * @param content 窗体内容
+         */
         setContent(content: string | HTMLElement): void;
+        /**
+         * 获取信息窗体内容
+         */
         getContent(): string | HTMLElement | undefined;
+        /**
+         * 设置信息窗体显示基点位置
+         * @param lnglat 位置经纬度
+         */
         setPosition(lnglat: LocationValue): void;
+        /**
+         * 获取信息窗体显示基点位置
+         */
         getPosition(): LngLat | undefined;
+        /**
+         * 设置信息窗体大小
+         * @param size 大小
+         */
         setSize(size: SizeValue): void;
+        /**
+         * 获取信息窗体大小
+         */
         getSize(): Size | undefined;
+
         // internal
         setOffset(offset: Pixel): void;
     }
diff --git a/types/amap-js-api/overlay/marker.d.ts b/types/amap-js-api/overlay/marker.d.ts
index e24ce7be8f..42dddf394a 100644
--- a/types/amap-js-api/overlay/marker.d.ts
+++ b/types/amap-js-api/overlay/marker.d.ts
@@ -26,78 +26,268 @@ declare namespace AMap {
         }
 
         interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            /**
+             * 点标记在地图上显示的位置
+             */
             position?: LocationValue;
+            /**
+             * 点标记显示位置偏移量
+             */
             offset?: Pixel;
+            /**
+             * 需在点标记中显示的图标
+             */
             icon?: string | Icon;
+            /**
+             * 点标记显示内容
+             */
             content?: string | HTMLElement;
+            /**
+             * 鼠标点击时marker是否置顶
+             */
             topWhenClick?: boolean;
+            /**
+             * 是否将覆盖物的鼠标或touch等事件冒泡到地图上
+             */
             bubble?: boolean;
+            /**
+             * 点标记是否可拖拽移动
+             */
             draggable?: boolean;
+            /**
+             * 拖拽点标记时是否开启点标记离开地图的效果
+             */
             raiseOnDrag?: boolean;
+            /**
+             * 鼠标悬停时的鼠标样式
+             */
             cursor?: string;
+            /**
+             * 点标记是否可见
+             */
             visible?: boolean;
+            /**
+             * 点标记的叠加顺序
+             */
             zIndex?: number;
+            /**
+             * 点标记的旋转角度
+             */
             angle?: number;
+            /**
+             * 是否自动旋转
+             */
             autoRotation?: boolean;
+            /**
+             * 点标记的动画效果
+             */
             animation?: AnimationName;
+            /**
+             * 点标记阴影
+             */
             shadow?: Icon | string;
+            /**
+             * 鼠标滑过点标记时的文字提示
+             */
             title?: string;
+            /**
+             * 可点击区域
+             */
             shape?: MarkerShape;
+            /**
+             * 文本标注
+             */
             label?: Label;
-            zooms?: [number, number];
 
             // internal
+            zooms?: [number, number];
             topWhenMouseOver?: boolean;
             height?: number;
         }
     }
 
     class Marker<ExtraData = any> extends Overlay<ExtraData> {
+        /**
+         * 点标记
+         * @param options 选项
+         */
         constructor(options?: Marker.Options<ExtraData>);
+        /**
+         * 唤起高德地图客户端标注页
+         * @param obj 唤起参数
+         */
         markOnAMAP(obj?: { name?: string, position?: LocationValue }): void;
+        /**
+         * 获取偏移量
+         */
         getOffset(): Pixel;
+        /**
+         * 	设置偏移量
+         * @param offset 偏移量
+         */
         setOffset(offset: Pixel): void;
+        /**
+         * 设置点标记的动画效果
+         * @param animate 动画效果类型
+         */
         setAnimation(animate: AnimationName, prevent?: boolean): void;
+        /**
+         * 获取点标记的动画效果类型
+         */
         getAnimation(): AnimationName;
+        /**
+         * 设置点标记是支持鼠标单击事件
+         * @param cilckable 是否支持点击
+         */
         setClickable(cilckable: boolean): void;
+        /**
+         * 	获取点标记是否支持鼠标单击事件
+         */
         getClickable(): boolean;
+        /**
+         * 	获取点标记的位置
+         */
         getPosition(): LngLat | undefined;
+        /**
+         * 设置点标记位置
+         * @param position 位置经纬度
+         */
         setPosition(position: LocationValue): void;
+        /**
+         * 	设置点标记的旋转角度
+         * @param angle 旋转角度
+         */
         setAngle(angle: number): void;
+        /**
+         * 设置点标记文本标签内容
+         * @param label 标签内容
+         */
         setLabel(label?: Marker.Label): void;
+        /**
+         * 	获取点标记文本标签内容
+         */
         getLabel(): Marker.Label | undefined;
+        /**
+         * 	获取点标记的旋转角度
+         */
         getAngle(): number;
+        /**
+         * 设置点标记的叠加顺序
+         * @param index 层级
+         */
         setzIndex(index: number): void;
+        /**
+         * 获取点标记的叠加顺序
+         */
         getzIndex(): number;
+        /**
+         * 设置点标记的显示图标
+         * @param content 图标
+         */
         setIcon(content: string | Icon): void;
+        /**
+         * 获取Icon内容
+         */
         getIcon(): string | Icon | undefined;
+        /**
+         * 设置点标记对象是否可拖拽移动
+         * @param draggable 是否可拖拽移动
+         */
         setDraggable(draggable: boolean): void;
+        /**
+         * 获取点标记对象是否可拖拽移动
+         */
         getDraggable(): boolean;
+        /**
+         * 设置鼠标悬停时的光标
+         * @param cursor 光标
+         */
         setCursor(cursor: string): void;
+        /**
+         * 	设置点标记显示内容，可以是HTML要素字符串或者HTML DOM对象
+         * @param content 显示内容
+         */
         setContent(content: string | HTMLElement): void;
+        /**
+         * 获取点标记内容
+         */
         getContent(): string | HTMLElement;
+        /**
+         * 以指定的速度，点标记沿指定的路径移动
+         * @param path 移动轨迹
+         * @param speed 速度
+         * @param timingFunction 缓动函数
+         * @param circleable 是否循环
+         */
         moveAlong(
             path: LngLat[],
             speed: number,
             timingFunction?: (t: number) => number,
             circleable?: boolean
         ): void;
+        /**
+         * 以给定速度移动点标记到指定位置
+         * @param lnglat 目标位置
+         * @param speed 速度
+         * @param timingFunction 缓动函数
+         */
         moveTo(
-            path: LocationValue,
+            lnglat: LocationValue,
             speed: number,
             timingFunction?: (t: number) => number
         ): void;
+        /**
+         * 点标记停止动画
+         */
         stopMove(): void;
+        /**
+         * 	暂定点标记的动画效果
+         */
         pauseMove(): boolean;
+        /**
+         * 重新开始点标记的动画效果
+         */
         resumeMove(): boolean;
+        /**
+         * 指定目标显示地图
+         * @param map 地图
+         */
         setMap(map: null | Map): void;
+        /**
+         * 鼠标滑过点标时的文字提示
+         * @param title 提示文字
+         */
         setTitle(title: string): void;
+        /**
+         * 获取点标记的文字提示
+         */
         getTitle(): string | undefined;
+        /**
+         * 设置是否展示在最顶层
+         * @param isTop 是否展示在最顶层
+         */
         setTop(isTop: boolean): void;
+        /**
+         * 获取是否展示在最顶层
+         */
         getTop(): boolean;
+        /**
+         * 设置阴影效果
+         * @param icon 阴影效果
+         */
         setShadow(icon?: Icon | string): void;
+        /**
+         * 获取阴影图标
+         */
         getShadow(): Icon | undefined | string;
+        /**
+         * 设置可点击区域
+         * @param shape 可点击区域
+         */
         setShape(shape?: MarkerShape): void;
+        /**
+         * 获取可点击区域
+         */
         getShape(): MarkerShape | undefined;
     }
 }
diff --git a/types/amap-js-api/overlay/markerShape.d.ts b/types/amap-js-api/overlay/markerShape.d.ts
index f0d6c39bac..19264f26cf 100644
--- a/types/amap-js-api/overlay/markerShape.d.ts
+++ b/types/amap-js-api/overlay/markerShape.d.ts
@@ -16,6 +16,10 @@ declare namespace AMap {
     }
 
     class MarkerShape extends EventEmitter {
+        /**
+         * Marker点击范围
+         * @param options 选项
+         */
         constructor(options: MarkerShape.Options);
     }
 }
diff --git a/types/amap-js-api/overlay/overlay.d.ts b/types/amap-js-api/overlay/overlay.d.ts
index 1726b39c3e..f90bdb57ed 100644
--- a/types/amap-js-api/overlay/overlay.d.ts
+++ b/types/amap-js-api/overlay/overlay.d.ts
@@ -13,21 +13,59 @@ declare namespace AMap {
             mouseup: MapsEvent<'mouseup', I>;
         }
         interface Options<ExtraData = any> {
+            /**
+             * 所属地图
+             */
             map?: Map;
+            /**
+             * 鼠标悬停时的鼠标样式
+             */
             cursor?: string;
+            /**
+             * 自定义数据
+             */
             extData?: ExtraData;
+            /**
+             * 事件是否穿透到地图
+             */
             bubble?: boolean;
+            /**
+             * 是否支持点击
+             */
             clickable?: boolean;
+            /**
+             * 是否支持拖拽
+             */
             draggable?: boolean;
         }
     }
     abstract class Overlay<ExtraData = any> extends EventEmitter {
         constructor(options?: Overlay.Options);
+        /**
+         * 显示覆盖物
+         */
         show(): void;
+        /**
+         * 隐藏覆盖物
+         */
         hide(): void;
+        /**
+         * 获取所属地图
+         */
         getMap(): Map | null | undefined;
+        /**
+         * 设置所属地图
+         * @param map 地图
+         */
         setMap(map: Map | null): void;
+        /**
+         * 设置自定义数据
+         * @param extData 自定义数据
+         */
         setExtData(extData: ExtraData): void;
+        /**
+         * 获取自定义数据
+         */
         getExtData(): ExtraData | {};
 
         // internal
diff --git a/types/amap-js-api/overlay/overlayGroup.d.ts b/types/amap-js-api/overlay/overlayGroup.d.ts
index d397505b04..a219e38fcd 100644
--- a/types/amap-js-api/overlay/overlayGroup.d.ts
+++ b/types/amap-js-api/overlay/overlayGroup.d.ts
@@ -11,20 +11,72 @@ type ReferOverlayOptions<O> =
 
 declare namespace AMap {
     class OverlayGroup<O extends Overlay = Overlay, ExtraData = any> extends Overlay<ExtraData> {
+        /**
+         * 覆盖物集合
+         * @param overlays 覆盖物
+         */
         constructor(overlays?: O | O[]);
+        /**
+         * 添加单个覆盖物到集合中，不支持添加重复的覆盖物
+         * @param overlay 覆盖物
+         */
         addOverlay(overlay: O | O[]): this;
+        /**
+         * 	添加覆盖物数组到集合中，不支持添加重复的覆盖物
+         * @param overlay 覆盖物数组
+         */
         addOverlays(overlay: O | O[]): this;
+        /**
+         * 返回当前集合中所有的覆盖物
+         */
         getOverlays(): O[];
+        /**
+         * 判断传入的覆盖物实例是否在集合中
+         * @param overlay 覆盖物
+         */
         hasOverlay(overlay: O | ((this: null, item: O, index: number, list: O[]) => boolean)): boolean;
+        /**
+         * 从集合中删除传入的覆盖物实例
+         * @param overlay 覆盖物
+         */
         removeOverlay(overlay: O | O[]): this;
+        /**
+         * 	从集合中删除传入的覆盖物实例数组
+         * @param overlay 覆盖物数组
+         */
         removeOverlays(overlay: O | O[]): this;
+        /**
+         * 清空集合
+         */
         clearOverlays(): this;
+        /**
+         * 对集合中的覆盖物做迭代操作
+         * @param iterator 迭代回调
+         * @param context 执行上下文
+         */
         eachOverlay<C = O>(iterator: (this: C, overlay: O, index: number, overlays: O[]) => void, context?: C): this;
+        /**
+         * 指定集合中里覆盖物的显示地图
+         * @param map 地图
+         */
         setMap(map: null | Map): this;
+        /**
+         * 修改覆盖物属性
+         * @param options 属性
+         */
         setOptions(options: ReferOverlayOptions<O>): this;
+        /**
+         * 在地图上显示集合中覆盖物
+         */
         show(): this;
+        /**
+         * 	在地图上隐藏集合中覆盖物
+         */
         hide(): this;
-
+        /**
+         * 查找集合中的覆盖物
+         * @param finder 查找回调
+         */
         getOverlay(finder: ((this: null, item: O, index: number, list: O[]) => boolean) | O): O | null;
     }
 }
diff --git a/types/amap-js-api/overlay/pathOverlay.d.ts b/types/amap-js-api/overlay/pathOverlay.d.ts
index de21aa35a7..d46b23a1c3 100644
--- a/types/amap-js-api/overlay/pathOverlay.d.ts
+++ b/types/amap-js-api/overlay/pathOverlay.d.ts
@@ -2,19 +2,49 @@ declare namespace AMap {
     namespace PathOverlay {
         interface EventMap<I = PathOverlay> extends ShapeOverlay.EventMap<I> { }
         interface Options<ExtraData = any> extends Overlay.Options<ExtraData> {
+            /**
+             * 是否可见
+             */
             visible?: boolean;
+            /**
+             * 覆盖物层级
+             */
             zIndex?: number;
+            /**
+             * 描边线条颜色
+             */
             strokeColor?: string;
+            /**
+             * 描边线条透明度
+             */
             strokeOpacity?: number;
+            /**
+             * 描边宽度
+             */
             strokeWeight?: number;
+            /**
+             * 描边样式
+             */
             strokeStyle?: StrokeStyle;
+            /**
+             * 虚线间隔
+             */
             strokeDasharray?: number[];
+            /**
+             * 折线拐点的绘制样式
+             */
             lineJoin?: StrokeLineJoin;
+            /**
+             * 折线两端线帽的绘制样式
+             */
             lineCap?: StrokeLineCap;
         }
     }
     abstract class PathOverlay<ExtraData = any> extends ShapeOverlay<ExtraData> {
         constructor(options?: PathOverlay.Options<ExtraData>);
+        /**
+         * 获取范围
+         */
         getBounds(): Bounds | (this extends Rectangle ? undefined : null);
     }
 }
diff --git a/types/amap-js-api/overlay/polygon.d.ts b/types/amap-js-api/overlay/polygon.d.ts
index 8792e0e135..20a9c3595e 100644
--- a/types/amap-js-api/overlay/polygon.d.ts
+++ b/types/amap-js-api/overlay/polygon.d.ts
@@ -2,31 +2,77 @@ declare namespace AMap {
     namespace Polygon {
         interface EventMap<I = Polygon> extends PathOverlay.EventMap<I> { }
         interface Options<ExtraData = any> extends PathOverlay.Options<ExtraData> {
+            /**
+             * 多边形轮廓线的节点坐标数组
+             */
             path?: LocationValue[] | LocationValue[][];
+            /**
+             * 多边形填充颜色
+             */
             fillColor?: string;
+            /**
+             * 边形填充透明度
+             */
             fillOpacity?: number;
         }
 
         interface GetOptionsResult<ExtraData = any> extends ShapeOverlay.GetOptionsResult<ExtraData> {
+            /**
+             * 多边形填充颜色
+             */
             fillColor: string;
+            /**
+             * 边形填充透明度
+             */
             fillOpacity: number;
+            /**
+             * 多边形轮廓线的节点坐标数组
+             */
             path: LngLat[] | LngLat[][];
+            /**
+             * 折线拐点的绘制样式
+             */
             lineJoin: StrokeLineJoin;
             texture: string;
         }
     }
 
     class Polygon<ExtraData = any> extends PathOverlay<ExtraData> {
+        /**
+         * 多边形
+         * @param options 选项
+         */
         constructor(options?: Polygon.Options<ExtraData>);
+        /**
+         * 设置多边形轮廓线节点数组
+         * @param path 轮廓线节点
+         */
         setPath(path: LocationValue[] | LocationValue[][]): void;
+        /**
+         * 获取多边形轮廓线节点数组
+         */
         getPath(): LngLat[] | LngLat[][];
+        /**
+         * 修改多边形属性
+         * @param options 属性
+         */
         setOptions(options: Polygon.Options<ExtraData>): void;
+        /**
+         * 获取多边形的属性
+         */
         getOptions(): Partial<
             this extends Omit<Ellipse, keyof Polygon> ? Ellipse.GetOptionsResult<ExtraData> :
             this extends Omit<Rectangle, keyof Polygon> ? Rectangle.GetOptionsResult<ExtraData> :
             Polygon.GetOptionsResult<ExtraData>
         >;
+        /**
+         * 获取多边形的面积
+         */
         getArea(): number;
+        /**
+         * 判断指定点坐标是否在多边形范围内
+         * @param point 坐标
+         */
         contains(point: LocationValue): boolean;
     }
 }
diff --git a/types/amap-js-api/overlay/polyline.d.ts b/types/amap-js-api/overlay/polyline.d.ts
index 207279b208..c7abfa6331 100644
--- a/types/amap-js-api/overlay/polyline.d.ts
+++ b/types/amap-js-api/overlay/polyline.d.ts
@@ -2,45 +2,118 @@ declare namespace AMap {
     namespace Polyline {
         interface EventMap<I = Polyline> extends PathOverlay.EventMap<I> { }
         interface GetOptionsResult<ExtraData = any> extends ShapeOverlay.GetOptionsResult<ExtraData> {
+            /**
+             * 线条是否带描边
+             */
             isOutline: boolean;
+            /**
+             * 线条描边颜色
+             */
             outlineColor: string;
+            /**
+             * 是否绘制成大地线
+             */
             geodesic: boolean;
+            /**
+             * 折线的节点数组
+             */
             path: LngLat[];
+            /**
+             * 折线拐点的绘制样式
+             */
             lineJoin: StrokeLineJoin;
+            /**
+             * 折线两端线帽的绘制样式
+             */
             lineCap: StrokeLineCap;
+            /**
+             * 描边的宽度
+             */
             borderWeight: number;
+            /**
+             * 是否延路径显示方向箭头
+             */
             showDir: boolean;
+            /**
+             * 方向箭头颜色
+             */
             dirColor: string;
+            /**
+             * 方向箭头图片
+             */
             dirImg: string;
         }
 
         interface Options<ExtraData = any> extends PathOverlay.Options<ExtraData> {
+            /**
+             * 线条是否带描边
+             */
             isOutline?: boolean;
+            /**
+             * 线条描边颜色
+             */
             outlineColor?: string;
+            /**
+             * 是否绘制成大地线
+             */
             geodesic?: boolean;
+            /**
+             * 方向箭头颜色
+             */
             dirColor?: string;
+            /**
+             * 描边的宽度
+             */
             borderWeight?: number;
+            /**
+             * 是否延路径显示方向箭头
+             */
             showDir?: boolean;
+
             // internal
+            /**
+             * 折线的节点数组
+             */
             path?: LocationValue[];
         }
     }
 
     class Polyline<ExtraData = any> extends PathOverlay<ExtraData> {
+        /**
+         * 折线
+         * @param options 选项
+         */
         constructor(options?: BezierCurve.Options<ExtraData> | Polyline.Options<ExtraData>);
+        /**
+         * 设置组成该折线的节点数组
+         * @param path 节点数组
+         */
         setPath(
             path: this extends Omit<BezierCurve, keyof Polyline> ?
                 Array<Array<number | string | Array<string | number>>>
                 : LocationValue[]
         ): void;
+        /**
+         * 获取折线路径的节点数组
+         */
         getPath(): this extends Omit<BezierCurve, keyof Polyline> ?
             Array<LngLat & { controlPoints: LngLat[] }>
             : LngLat[];
+        /**
+         * 获取折线的总长度（单位：米）
+         */
         getLength(): number;
+        /**
+         * 设置线的属性
+         * @param options 属性
+         */
         setOptions(options: this extends Omit<BezierCurve, keyof Polyline> ?
             Partial<BezierCurve.Options<ExtraData>>
             : Polyline.Options<ExtraData>
         ): void;
+        /**
+         * 获取线的属性
+         */
         getOptions(): Partial<Polyline.GetOptionsResult<ExtraData>>;
     }
 }
diff --git a/types/amap-js-api/overlay/rectangle.d.ts b/types/amap-js-api/overlay/rectangle.d.ts
index 259e2072de..833a46d3dc 100644
--- a/types/amap-js-api/overlay/rectangle.d.ts
+++ b/types/amap-js-api/overlay/rectangle.d.ts
@@ -5,17 +5,39 @@ declare namespace AMap {
         }
 
         interface Options<ExtraData = any> extends Polygon.Options<ExtraData> {
+            /**
+             * 矩形的范围
+             */
             bounds?: Bounds;
         }
         type GetOptionsResult<ExtraData = any> = Merge<Polygon.GetOptionsResult<ExtraData>, {
+            /**
+             * 路径节点数组
+             */
             path: LngLat[];
+            /**
+             * 矩形的范围
+             */
             bounds: Bounds;
             texture: string;
         }>;
     }
     class Rectangle<ExtraData = any> extends Polygon<ExtraData> {
+        /**
+         * 矩形
+         * @param options 选项
+         */
         constructor(options?: Rectangle.Options<ExtraData>);
+        /**
+         * 获取矩形范围
+         * @param bounds 矩形的范围
+         * @param preventEvent 阻止触发事件
+         */
         setBounds(bounds: Bounds, preventEvent?: boolean): void;
+        /**
+         * 	修改矩形属性
+         * @param options 属性
+         */
         setOptions(options: Partial<Rectangle.Options>): void;
     }
 }
diff --git a/types/amap-js-api/overlay/shapeOverlay.d.ts b/types/amap-js-api/overlay/shapeOverlay.d.ts
index b8f239aac1..ab07fa3d88 100644
--- a/types/amap-js-api/overlay/shapeOverlay.d.ts
+++ b/types/amap-js-api/overlay/shapeOverlay.d.ts
@@ -7,24 +7,74 @@ declare namespace AMap {
             change: Event<'change', { target: I }>;
         }
         interface GetOptionsResult<ExtraData = any> {
+            /**
+             * 所属地图
+             */
             map: Map;
+            /**
+             * 层级
+             */
             zIndex: number;
+            /**
+             * 线条颜色
+             */
             strokeColor: string;
+            /**
+             * 线条透明度
+             */
             strokeOpacity: number;
+            /**
+             * 线条宽度
+             */
             strokeWeight: number;
+            /**
+             * 线条样式，虚线或者实线
+             */
             strokeStyle: StrokeStyle;
+            /**
+             * 虚线的分段
+             */
             strokeDasharray: number[];
+            /**
+             * 自定义属性
+             */
             extData: ExtraData | {};
+            /**
+             * 事件是否穿透到地图
+             */
             bubble: boolean;
+            /**
+             * 是否支持点击
+             */
             clickable: boolean;
         }
     }
     abstract class ShapeOverlay<ExtraData = any> extends Overlay<ExtraData> {
+        /**
+         * 设置覆盖物属性
+         * @param options 属性
+         */
         abstract setOptions(options: {}): void;
+        /**
+         * 获得属性
+         */
         abstract getOptions(): {};
+        /**
+         * 获得层级
+         */
         getzIndex(): number;
+        /**
+         * 设置层级
+         * @param zIndex 层级
+         */
         setzIndex(zIndex: number): void;
+        /**
+         * 返回可见
+         */
         getVisible(): boolean;
+        /**
+         * 设置是否可以拖拽
+         */
         setDraggable(draggable: boolean): void;
     }
 }
diff --git a/types/amap-js-api/overlay/text.d.ts b/types/amap-js-api/overlay/text.d.ts
index db15ae08ce..50f9249ad9 100644
--- a/types/amap-js-api/overlay/text.d.ts
+++ b/types/amap-js-api/overlay/text.d.ts
@@ -4,16 +4,38 @@ declare namespace AMap {
         type VerticalAlign = 'top' | 'middle' | 'bottom';
         interface EventMap<I = Text> extends Marker.EventMap<I> { }
         interface Options extends Marker.Options {
+            /**
+             * 文本内容
+             */
             text?: string;
+            /**
+             * 对齐方式
+             */
             textAlign?: TextAlign;
+
             verticalAlign?: VerticalAlign;
         }
     }
 
     class Text<ExtraData = any> extends Marker<ExtraData> {
+        /**
+         * 纯文本标记
+         * @param options 选项
+         */
         constructor(options?: Text.Options);
+        /**
+         * 标记显示的文本内容
+         */
         getText(): string;
+        /**
+         * 修改文本内容
+         * @param text 文本内容
+         */
         setText(text: string): void;
+        /**
+         * 设置文本样式
+         * @param style 文本样式
+         */
         setStyle(style: object): void;
     }
 }
diff --git a/types/amap-js-api/pixel.d.ts b/types/amap-js-api/pixel.d.ts
index fab4605b7a..b211e1d88a 100644
--- a/types/amap-js-api/pixel.d.ts
+++ b/types/amap-js-api/pixel.d.ts
@@ -1,9 +1,28 @@
 declare namespace AMap {
     class Pixel {
+        /**
+         * 像素坐标，确定地图上的一个像素点
+         * @param x 横轴坐标
+         * @param y 纵轴坐标
+         * @param round 是否四舍五入
+         */
         constructor(x: number, y: number, round?: boolean);
+        /**
+         * 获得X方向像素坐标
+         */
         getX(): number;
+        /**
+         * 获得Y方向像素坐标
+         */
         getY(): number;
+        /**
+         * 当前像素坐标与传入像素坐标是否相等
+         * @param point 目标像素坐标
+         */
         equals(point: Pixel): boolean;
+        /**
+         * 以字符串形式返回像素坐标对象
+         */
         toString(): string;
 
         // internal
diff --git a/types/amap-js-api/size.d.ts b/types/amap-js-api/size.d.ts
index 12a1e25423..f13c2fff0b 100644
--- a/types/amap-js-api/size.d.ts
+++ b/types/amap-js-api/size.d.ts
@@ -1,9 +1,24 @@
 declare namespace AMap {
     class Size {
+        /**
+         * 地物对象的像素尺寸
+         * @param width 宽度像素
+         * @param height 长度像素
+         */
         constructor(width: number, height: number);
+        /**
+         * 获得宽度
+         */
         getWidth(): number;
+        /**
+         * 获得高度
+         */
         getHeight(): number;
+        /**
+         * 以字符串形式返回尺寸大小对象
+         */
         toString(): string;
+
         // internal
         contains(size: { x: number; y: number }): boolean;
     }
diff --git a/types/amap-js-api/util.d.ts b/types/amap-js-api/util.d.ts
index 70b48c31d1..ee275d66b5 100644
--- a/types/amap-js-api/util.d.ts
+++ b/types/amap-js-api/util.d.ts
@@ -1,25 +1,64 @@
 declare namespace AMap {
     namespace Util {
+        /**
+         * 将颜色名转换为16进制RGB颜色值
+         * @param colorName 颜色名
+         */
         function colorNameToHex(colorName: string): string;
-
+        /**
+         * 将16进制RGB转为rgba(R,G,B,A)
+         * @param hex 16进制RGB
+         */
         function rgbHex2Rgba(hex: string): string;
-
+        /**
+         * 将16进制RGBA转为rgba(R,G,B,A)
+         * @param hex 16进制RGBA
+         */
         function argbHex2Rgba(hex: string): string;
-
+        /**
+         * 判断一个对象是都为空
+         * @param obj 目标对象
+         */
         function isEmpty(obj: object): boolean;
-
+        /**
+         * 从数组删除元素
+         * @param array 数组
+         * @param item 元素
+         */
         function deleteItemFromArray<T = any>(array: T[], item: T): T[];
-
+        /**
+         * 按索引删除数组元素
+         * @param array 数组
+         * @param index 索引
+         */
         function deleteItemFromArrayByIndex<T = any>(array: T[], index: number): T[];
-
+        /**
+         * 返回元素索引
+         * @param array 数组
+         * @param item 元素
+         */
         function indexOf<T = any>(array: T[], item: T): number;
-
+        /**
+         * 保留小数点后指定位
+         * @param floatNumber 数值
+         * @param digits 小数点位数
+         */
         function format(floatNumber: number, digits?: number): number;
-
+        /**
+         * 判断是否数组
+         * @param data 判断对象
+         */
         function isArray(data: any): data is any[];
-
+        /**
+         * 判断参数是否为DOM元素
+         * @param data 判断对象
+         */
         function isDOM(data: any): data is HTMLElement;
-
+        /**
+         * 判断数组是否包含某个元素
+         * @param array 数组
+         * @param item 元素
+         */
         function includes<T = any>(array: T[], item: T): boolean;
 
         function requestIdleCallback(callback: (...args: any[]) => any, options?: { timeout?: number }): number;
diff --git a/types/amap-js-api/view2D.d.ts b/types/amap-js-api/view2D.d.ts
index d662b4c50e..f246c5c67f 100644
--- a/types/amap-js-api/view2D.d.ts
+++ b/types/amap-js-api/view2D.d.ts
@@ -1,13 +1,29 @@
 declare namespace AMap {
     namespace View2D {
         interface Options {
+            /**
+             * 地图中心点坐标值
+             */
             center?: LocationValue;
+            /**
+             * 地图顺时针旋转角度
+             */
             rotation?: number;
+            /**
+             * 地图显示的缩放级别
+             */
             zoom?: number;
+            /**
+             * 地图显示的参考坐标系
+             */
             crs?: 'EPGS3857' | 'EPGS3395' | 'EPGS4326';
         }
     }
     class View2D extends EventEmitter {
+        /**
+         * 二维地图显示视口，用于定义二维地图静态显示属性
+         * @param options 选项
+         */
         constructor(options?: View2D.Options);
     }
 }

From 397871698113a469ed9fb016b1b5fd1075dc128e Mon Sep 17 00:00:00 2001
From: SardineFish <sardine@live.cn>
Date: Thu, 21 Mar 2019 00:13:26 +0800
Subject: [PATCH 829/924] Fix module exports in openpgp.

---
 types/openpgp/index.d.ts             | 9436 ++++++++++++-------------
 types/openpgp/openpgp-tests.ts       |    2 +-
 types/openpgp/ts3.2/index.d.ts       | 9583 +++++++++++++-------------
 types/openpgp/ts3.2/openpgp-tests.ts |    2 +-
 4 files changed, 9511 insertions(+), 9512 deletions(-)

diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index 5d8c4a2cb6..c9a95e8c6a 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -19,1514 +19,1488 @@ type Integer = number;
 type Infinity = any;
 type ReadableStream<T> = any;
 
-export namespace openpgp {
-    namespace cleartext {
+export as namespace openpgp;
+
+export namespace cleartext {
+    /**
+     * Class that represents an OpenPGP cleartext signed message.
+     * See {@link https://tools.ietf.org/html/rfc4880#section-7}
+     */
+    class CleartextMessage {
         /**
-         * Class that represents an OpenPGP cleartext signed message.
-         * See {@link https://tools.ietf.org/html/rfc4880#section-7}
+         * @param text The cleartext of the signed message
+         * @param signature The detached signature or an empty signature for unsigned messages
          */
-        class CleartextMessage {
-            /**
-             * @param text The cleartext of the signed message
-             * @param signature The detached signature or an empty signature for unsigned messages
-             */
-            constructor(text: string, signature: signature.Signature);
-
-            /**
-             * Returns the key IDs of the keys that signed the cleartext message
-             * @returns array of keyid objects
-             */
-            getSigningKeyIds(): any[];
-
-            /**
-             * Sign the cleartext message
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) The creation time of the signature that should be created
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new cleartext message with signed content
-             */
-            sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
-
-            /**
-             * Sign the cleartext message
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) The creation time of the signature that should be created
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new detached signature of message content
-             */
-            signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
-
-            /**
-             * Verify signatures of cleartext signed message
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verify signatures of cleartext signed message
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Get cleartext
-             * @returns cleartext of message
-             */
-            getText(): string;
-
-            /**
-             * Returns ASCII armored text of cleartext signed message
-             * @returns ASCII armor
-             */
-            armor(): string | ReadableStream<String>;
-        }
+        constructor(text: string, signature: signature.Signature);
 
         /**
-         * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
-         * @param armoredText text to be parsed
-         * @returns new cleartext message object
+         * Returns the key IDs of the keys that signed the cleartext message
+         * @returns array of keyid objects
          */
-        function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
+        getSigningKeyIds(): any[];
 
         /**
-         * Creates a new CleartextMessage object from text
-         * @param text
+         * Sign the cleartext message
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) The creation time of the signature that should be created
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new cleartext message with signed content
          */
-        function fromText(text: string): void;
+        sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
+
+        /**
+         * Sign the cleartext message
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) The creation time of the signature that should be created
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new detached signature of message content
+         */
+        signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
+
+        /**
+         * Verify signatures of cleartext signed message
+         * @param keys array of keys to verify signatures
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verify signatures of cleartext signed message
+         * @param keys array of keys to verify signatures
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Get cleartext
+         * @returns cleartext of message
+         */
+        getText(): string;
+
+        /**
+         * Returns ASCII armored text of cleartext signed message
+         * @returns ASCII armor
+         */
+        armor(): string | ReadableStream<String>;
     }
 
     /**
-     * @see module:config/config
+     * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
+     * @param armoredText text to be parsed
+     * @returns new cleartext message object
      */
-    namespace config {
-        var prefer_hash_algorithm: any;
-
-        var encryption_cipher: any;
-
-        var compression: any;
-
-        var deflate_level: any;
-
-        /**
-         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
-         * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
-         * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
-         */
-        var aead_protect: any;
-
-        /**
-         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
-         * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
-         * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
-         * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
-         */
-        var aead_protect_version: any;
-
-        /**
-         * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
-         * Only has an effect when aead_protect is set to true.
-         */
-        var aead_mode: any;
-
-        /**
-         * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
-         * Only has an effect when aead_protect is set to true.
-         * Must be an integer value from 0 to 56.
-         */
-        var aead_chunk_size_byte: any;
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
-         * Iteration Count Byte for S2K (String to Key)
-         */
-        var s2k_iteration_count_byte: any;
-
-        /**
-         * Use integrity protection for symmetric encryption
-         */
-        var integrity_protect: any;
-
-        var ignore_mdc_error: any;
-
-        var allow_unauthenticated_stream: any;
-
-        var checksum_required: any;
-
-        var rsa_blinding: any;
-
-        /**
-         * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
-         * **Slower and slightly less secure**
-         */
-        var password_collision_check: any;
-
-        var revocations_expire: any;
-
-        var use_native: any;
-
-        var min_bytes_for_web_crypto: any;
-
-        var zero_copy: any;
-
-        var debug: any;
-
-        var tolerant: any;
-
-        var show_version: any;
-
-        var show_comment: any;
-
-        var versionstring: any;
-
-        var commentstring: any;
-
-        var keyserver: any;
-
-        var node_store: any;
-
-        /**
-         * Max userid string length (used for parsing)
-         */
-        var max_userid_length: any;
-
-        namespace localStorage {
-            class LocalStorage {
-                /**
-                 * This object is used for storing and retrieving configuration from HTML5 local storage.
-                 */
-                constructor();
-
-                /**
-                 * Reads the config out of the HTML5 local storage
-                 * and initializes the object config.
-                 * if config is null the default config will be used
-                 */
-                read(): void;
-
-                /**
-                 * Writes the config to HTML5 local storage
-                 */
-                write(): void;
-            }
-        }
-    }
-
-    class LocalStorage {
-        /**
-         * This object is used for storing and retrieving configuration from HTML5 local storage.
-         */
-        constructor();
-
-        /**
-         * Reads the config out of the HTML5 local storage
-         * and initializes the object config.
-         * if config is null the default config will be used
-         */
-        read(): void;
-
-        /**
-         * Writes the config to HTML5 local storage
-         */
-        write(): void;
-    }
-
-
+    function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
 
     /**
-     * @see module:crypto/crypto
-     * @see module:crypto/signature
-     * @see module:crypto/public_key
-     * @see module:crypto/cipher
-     * @see module:crypto/random
-     * @see module:crypto/hash
+     * Creates a new CleartextMessage object from text
+     * @param text
      */
+    function fromText(text: string): void;
+}
+
+/**
+ * @see module:config/config
+ */
+export namespace config {
+    var prefer_hash_algorithm: any;
+
+    var encryption_cipher: any;
+
+    var compression: any;
+
+    var deflate_level: any;
+
+    /**
+     * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+     * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
+     * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
+     */
+    var aead_protect: any;
+
+    /**
+     * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+     * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
+     * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
+     * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
+     */
+    var aead_protect_version: any;
+
+    /**
+     * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
+     * Only has an effect when aead_protect is set to true.
+     */
+    var aead_mode: any;
+
+    /**
+     * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
+     * Only has an effect when aead_protect is set to true.
+     * Must be an integer value from 0 to 56.
+     */
+    var aead_chunk_size_byte: any;
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
+     * Iteration Count Byte for S2K (String to Key)
+     */
+    var s2k_iteration_count_byte: any;
+
+    /**
+     * Use integrity protection for symmetric encryption
+     */
+    var integrity_protect: any;
+
+    var ignore_mdc_error: any;
+
+    var allow_unauthenticated_stream: any;
+
+    var checksum_required: any;
+
+    var rsa_blinding: any;
+
+    /**
+     * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
+     * **Slower and slightly less secure**
+     */
+    var password_collision_check: any;
+
+    var revocations_expire: any;
+
+    var use_native: any;
+
+    var min_bytes_for_web_crypto: any;
+
+    var zero_copy: any;
+
+    var debug: any;
+
+    var tolerant: any;
+
+    var show_version: any;
+
+    var show_comment: any;
+
+    var versionstring: any;
+
+    var commentstring: any;
+
+    var keyserver: any;
+
+    var node_store: any;
+
+    /**
+     * Max userid string length (used for parsing)
+     */
+    var max_userid_length: any;
+
+    namespace localStorage {
+        class LocalStorage {
+            /**
+             * This object is used for storing and retrieving configuration from HTML5 local storage.
+             */
+            constructor();
+
+            /**
+             * Reads the config out of the HTML5 local storage
+             * and initializes the object config.
+             * if config is null the default config will be used
+             */
+            read(): void;
+
+            /**
+             * Writes the config to HTML5 local storage
+             */
+            write(): void;
+        }
+    }
+}
+
+export class LocalStorage {
+    /**
+     * This object is used for storing and retrieving configuration from HTML5 local storage.
+     */
+    constructor();
+
+    /**
+     * Reads the config out of the HTML5 local storage
+     * and initializes the object config.
+     * if config is null the default config will be used
+     */
+    read(): void;
+
+    /**
+     * Writes the config to HTML5 local storage
+     */
+    write(): void;
+}
+
+
+
+/**
+ * @see module:crypto/crypto
+ * @see module:crypto/signature
+ * @see module:crypto/public_key
+ * @see module:crypto/cipher
+ * @see module:crypto/random
+ * @see module:crypto/hash
+ */
+export namespace crypto {
+    /**
+ * @see module:crypto/public_key/elliptic/ecdh
+ */
+    namespace aes_kw {
+        /**
+         * AES key wrap
+         * @param key
+         * @param data
+         * @returns
+         */
+        function wrap(key: string, data: string): Uint8Array;
+
+        /**
+         * AES key unwrap
+         * @param key
+         * @param data
+         * @returns
+         * @throws
+         */
+        function unwrap(key: string, data: string): Uint8Array;
+    }
+
+    namespace cfb {
+        function encrypt(algo: any, key: any, plaintext: any, iv: any): any
+        function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
+    }
+
+    namespace cipher {
+        /**
+         * AES-128 encryption and decryption (ID 7)
+         * @param key 128-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes128(key: string): object;
+
+        /**
+         * AES-128 Block Cipher (ID 8)
+         * @param key 192-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes192(key: string): object;
+
+        /**
+         * AES-128 Block Cipher (ID 9)
+         * @param key 256-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes256(key: string): object;
+
+        /**
+         * Triple DES Block Cipher (ID 2)
+         * @param key 192-bit key
+         * @see
+         * @returns
+         */
+        function tripledes(key: string): object;
+
+        /**
+         * CAST-128 Block Cipher (ID 3)
+         * @param key 128-bit key
+         * @see
+         * @returns
+         */
+        function cast5(key: string): object;
+
+        /**
+         * Twofish Block Cipher (ID 10)
+         * @param key 256-bit key
+         * @see
+         * @returns
+         */
+        function twofish(key: string): object;
+
+        /**
+         * Blowfish Block Cipher (ID 4)
+         * @param key 128-bit key
+         * @see
+         * @returns
+         */
+        function blowfish(key: string): object;
+
+        /**
+         * Not implemented
+         * @throws
+         */
+        function idea(): void;
+    }
+
+    namespace cmac {
+        /**
+         * This implementation of CMAC is based on the description of OMAC in
+         * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
+         * document:
+         * We have made a small modification to the OMAC algorithm as it was
+         * originally presented, changing one of its two constants.
+         * Specifically, the constant 4 at line 85 was the constant 1/2 (the
+         * multiplicative inverse of 2) in the original definition of OMAC [14].
+         * The OMAC authors indicate that they will promulgate this modification
+         * [15], which slightly simplifies implementations.
+         */
+        const blockLength: any;
+
+        /**
+         * xor `padding` into the end of `data`. This function implements "the
+         * operation xor→ [which] xors the shorter string into the end of longer
+         * one". Since data is always as least as long as padding, we can
+         * simplify the implementation.
+         * @param data
+         * @param padding
+         */
+        function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
+    }
+
     namespace crypto {
         /**
-     * @see module:crypto/public_key/elliptic/ecdh
+         * Encrypts data using specified algorithm and public key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+         * @param algo Public key algorithm
+         * @param pub_params Algorithm-specific public key parameters
+         * @param data Data to be encrypted as MPI
+         * @param fingerprint Recipient fingerprint
+         * @returns encrypted session key parameters
+         */
+        function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
+
+        /**
+         * Decrypts data using specified algorithm and private key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+         * @param algo Public key algorithm
+         * @param key_params Algorithm-specific public, private key parameters
+         * @param data_params encrypted session key parameters
+         * @param fingerprint Recipient fingerprint
+         * @returns An MPI containing the decrypted data
+         */
+        function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
+
+        /**
+         * Returns the types comprising the private key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getPrivKeyParamTypes(algo: string): any[];
+
+        /**
+         * Returns the types comprising the public key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getPubKeyParamTypes(algo: string): any[];
+
+        /**
+         * Returns the types comprising the encrypted session key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getEncSessionKeyParamTypes(algo: string): any[];
+
+        /**
+         * Generate algorithm-specific key parameters
+         * @param algo The public key algorithm
+         * @param bits Bit length for RSA keys
+         * @param oid Object identifier for ECC keys
+         * @returns The array of parameters
+         */
+        function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
+
+        /**
+         * Generates a random byte prefix for the specified algorithm
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param algo Symmetric encryption algorithm
+         * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
+         */
+        function getPrefixRandom(algo: enums.symmetric): Uint8Array;
+
+        /**
+         * Generating a session key for the specified symmetric algorithm
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param algo Symmetric encryption algorithm
+         * @returns Random bytes as a string to be used as a key
+         */
+        function generateSessionKey(algo: enums.symmetric): Uint8Array;
+    }
+
+    namespace eax {
+        /**
+         * Class to en/decrypt using EAX mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function EAX(cipher: string, key: Uint8Array): void;
+
+        /**
+         * Encrypt plaintext input.
+         * @param plaintext The cleartext input to be encrypted
+         * @param nonce The nonce (16 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Decrypt ciphertext input.
+         * @param ciphertext The ciphertext input to be decrypted
+         * @param nonce The nonce (16 bytes)
+         * @param adata Associated data to verify
+         * @returns The plaintext output
+         */
+        function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+    }
+
+    namespace gcm {
+        /**
+         * Class to en/decrypt using GCM mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function GCM(cipher: string, key: Uint8Array): void;
+    }
+
+    /**
+     * @see
+     * @see
      */
-        namespace aes_kw {
+    namespace hash {
+        /**
+         * @see module:md5
+         */
+        var md5: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha1: any;
+
+        /**
+         * @see hash.js
+         */
+        var sha224: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha256: any;
+
+        /**
+         * @see hash.js
+         */
+        var sha384: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha512: any;
+
+        /**
+         * @see hash.js
+         */
+        var ripemd: any;
+
+        /**
+         * Create a hash on the specified data using the specified algorithm
+         * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+         * @param data Data to be hashed
+         * @returns hash value
+         */
+        function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Returns the hash size in bytes of the specified hash algorithm type
+         * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+         * @returns Size in bytes of the resulting hash
+         */
+        function getHashByteLength(algo: enums.hash): Integer;
+    }
+
+    /**
+     * @see module:packet.PublicKeyEncryptedSessionKey
+     */
+    namespace pkcs5 {
+        /**
+         * Add pkcs5 padding to a text.
+         * @param msg Text to add padding
+         * @returns Text with padding added
+         */
+        function encode(msg: string): string;
+
+        /**
+         * Remove pkcs5 padding from a string.
+         * @param msg Text to remove padding from
+         * @returns Text with padding removed
+         */
+        function decode(msg: string): string;
+    }
+
+    namespace ocb {
+        /**
+         * Class to en/decrypt using OCB mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function OCB(cipher: string, key: Uint8Array): void;
+
+        /**
+         * Encrypt plaintext input.
+         * @param plaintext The cleartext input to be encrypted
+         * @param nonce The nonce (15 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Decrypt ciphertext input.
+         * @param ciphertext The ciphertext input to be decrypted
+         * @param nonce The nonce (15 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+    }
+
+    /**
+    * @see module:crypto/public_key/rsa
+    * @see module:crypto/public_key/elliptic/ecdh
+    * @see module:packet.PublicKeyEncryptedSessionKey
+    */
+    namespace pkcs1 {
+        namespace eme {
             /**
-             * AES key wrap
-             * @param key
-             * @param data
-             * @returns
+             * Create a EME-PKCS1-v1_5 padded message
+             * @see
+             * @param M message to be encoded
+             * @param k the length in octets of the key modulus
+             * @returns EME-PKCS1 padded message
              */
-            function wrap(key: string, data: string): Uint8Array;
+            function encode(M: string, k: Integer): Promise<String>;
 
             /**
-             * AES key unwrap
-             * @param key
-             * @param data
-             * @returns
-             * @throws
+             * Decode a EME-PKCS1-v1_5 padded message
+             * @see
+             * @param EM encoded message, an octet string
+             * @returns message, an octet string
              */
-            function unwrap(key: string, data: string): Uint8Array;
+            function decode(EM: string): string;
         }
 
-        namespace cfb {
-            function encrypt(algo: any, key: any, plaintext: any, iv: any): any
-            function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
-        }
-
-        namespace cipher {
+        namespace emsa {
             /**
-             * AES-128 encryption and decryption (ID 7)
-             * @param key 128-bit key
+             * Create a EMSA-PKCS1-v1_5 padded message
              * @see
-             * @see
-             * @returns
+             * @param algo Hash algorithm type used
+             * @param hashed message to be encoded
+             * @param emLen intended length in octets of the encoded message
+             * @returns encoded message
              */
-            function aes128(key: string): object;
-
-            /**
-             * AES-128 Block Cipher (ID 8)
-             * @param key 192-bit key
-             * @see
-             * @see
-             * @returns
-             */
-            function aes192(key: string): object;
-
-            /**
-             * AES-128 Block Cipher (ID 9)
-             * @param key 256-bit key
-             * @see
-             * @see
-             * @returns
-             */
-            function aes256(key: string): object;
-
-            /**
-             * Triple DES Block Cipher (ID 2)
-             * @param key 192-bit key
-             * @see
-             * @returns
-             */
-            function tripledes(key: string): object;
-
-            /**
-             * CAST-128 Block Cipher (ID 3)
-             * @param key 128-bit key
-             * @see
-             * @returns
-             */
-            function cast5(key: string): object;
-
-            /**
-             * Twofish Block Cipher (ID 10)
-             * @param key 256-bit key
-             * @see
-             * @returns
-             */
-            function twofish(key: string): object;
-
-            /**
-             * Blowfish Block Cipher (ID 4)
-             * @param key 128-bit key
-             * @see
-             * @returns
-             */
-            function blowfish(key: string): object;
-
-            /**
-             * Not implemented
-             * @throws
-             */
-            function idea(): void;
-        }
-
-        namespace cmac {
-            /**
-             * This implementation of CMAC is based on the description of OMAC in
-             * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
-             * document:
-             * We have made a small modification to the OMAC algorithm as it was
-             * originally presented, changing one of its two constants.
-             * Specifically, the constant 4 at line 85 was the constant 1/2 (the
-             * multiplicative inverse of 2) in the original definition of OMAC [14].
-             * The OMAC authors indicate that they will promulgate this modification
-             * [15], which slightly simplifies implementations.
-             */
-            const blockLength: any;
-
-            /**
-             * xor `padding` into the end of `data`. This function implements "the
-             * operation xor→ [which] xors the shorter string into the end of longer
-             * one". Since data is always as least as long as padding, we can
-             * simplify the implementation.
-             * @param data
-             * @param padding
-             */
-            function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
-        }
-
-        namespace crypto {
-            /**
-             * Encrypts data using specified algorithm and public key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
-             * @param algo Public key algorithm
-             * @param pub_params Algorithm-specific public key parameters
-             * @param data Data to be encrypted as MPI
-             * @param fingerprint Recipient fingerprint
-             * @returns encrypted session key parameters
-             */
-            function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
-
-            /**
-             * Decrypts data using specified algorithm and private key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
-             * @param algo Public key algorithm
-             * @param key_params Algorithm-specific public, private key parameters
-             * @param data_params encrypted session key parameters
-             * @param fingerprint Recipient fingerprint
-             * @returns An MPI containing the decrypted data
-             */
-            function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
-
-            /**
-             * Returns the types comprising the private key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getPrivKeyParamTypes(algo: string): any[];
-
-            /**
-             * Returns the types comprising the public key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getPubKeyParamTypes(algo: string): any[];
-
-            /**
-             * Returns the types comprising the encrypted session key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getEncSessionKeyParamTypes(algo: string): any[];
-
-            /**
-             * Generate algorithm-specific key parameters
-             * @param algo The public key algorithm
-             * @param bits Bit length for RSA keys
-             * @param oid Object identifier for ECC keys
-             * @returns The array of parameters
-             */
-            function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
-
-            /**
-             * Generates a random byte prefix for the specified algorithm
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param algo Symmetric encryption algorithm
-             * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
-             */
-            function getPrefixRandom(algo: enums.symmetric): Uint8Array;
-
-            /**
-             * Generating a session key for the specified symmetric algorithm
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param algo Symmetric encryption algorithm
-             * @returns Random bytes as a string to be used as a key
-             */
-            function generateSessionKey(algo: enums.symmetric): Uint8Array;
-        }
-
-        namespace eax {
-            /**
-             * Class to en/decrypt using EAX mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function EAX(cipher: string, key: Uint8Array): void;
-
-            /**
-             * Encrypt plaintext input.
-             * @param plaintext The cleartext input to be encrypted
-             * @param nonce The nonce (16 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Decrypt ciphertext input.
-             * @param ciphertext The ciphertext input to be decrypted
-             * @param nonce The nonce (16 bytes)
-             * @param adata Associated data to verify
-             * @returns The plaintext output
-             */
-            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-        }
-
-        namespace gcm {
-            /**
-             * Class to en/decrypt using GCM mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function GCM(cipher: string, key: Uint8Array): void;
+            function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
         }
 
         /**
-         * @see
+         * ASN1 object identifiers for hashes
          * @see
          */
-        namespace hash {
+        const hash_headers: any;
+    }
+
+    namespace public_key {
+        namespace dsa {
             /**
-             * @see module:md5
+             * DSA Sign function
+             * @param hash_algo
+             * @param hashed
+             * @param g
+             * @param p
+             * @param q
+             * @param x
+             * @returns
              */
-            var md5: any;
+            function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
 
             /**
-             * @see asmCrypto
+             * DSA Verify function
+             * @param hash_algo
+             * @param r
+             * @param s
+             * @param hashed
+             * @param g
+             * @param p
+             * @param q
+             * @param y
+             * @returns BN
              */
-            var sha1: any;
+            function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
+        }
+
+        namespace elgamal {
+            /**
+             * ElGamal Encryption function
+             * @param m
+             * @param p
+             * @param g
+             * @param y
+             * @returns
+             */
+            function encrypt(m: BN, p: BN, g: BN, y: BN): object;
 
             /**
-             * @see hash.js
+             * ElGamal Encryption function
+             * @param c1
+             * @param c2
+             * @param p
+             * @param x
+             * @returns BN
              */
-            var sha224: any;
-
-            /**
-             * @see asmCrypto
-             */
-            var sha256: any;
-
-            /**
-             * @see hash.js
-             */
-            var sha384: any;
-
-            /**
-             * @see asmCrypto
-             */
-            var sha512: any;
-
-            /**
-             * @see hash.js
-             */
-            var ripemd: any;
-
-            /**
-             * Create a hash on the specified data using the specified algorithm
-             * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
-             * @param data Data to be hashed
-             * @returns hash value
-             */
-            function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Returns the hash size in bytes of the specified hash algorithm type
-             * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
-             * @returns Size in bytes of the resulting hash
-             */
-            function getHashByteLength(algo: enums.hash): Integer;
+            function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
         }
 
         /**
-         * @see module:packet.PublicKeyEncryptedSessionKey
-         */
-        namespace pkcs5 {
-            /**
-             * Add pkcs5 padding to a text.
-             * @param msg Text to add padding
-             * @returns Text with padding added
-             */
-            function encode(msg: string): string;
-
-            /**
-             * Remove pkcs5 padding from a string.
-             * @param msg Text to remove padding from
-             * @returns Text with padding removed
-             */
-            function decode(msg: string): string;
-        }
-
-        namespace ocb {
-            /**
-             * Class to en/decrypt using OCB mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function OCB(cipher: string, key: Uint8Array): void;
-
-            /**
-             * Encrypt plaintext input.
-             * @param plaintext The cleartext input to be encrypted
-             * @param nonce The nonce (15 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Decrypt ciphertext input.
-             * @param ciphertext The ciphertext input to be decrypted
-             * @param nonce The nonce (15 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-        }
-
-        /**
-        * @see module:crypto/public_key/rsa
+        * @see module:crypto/public_key/elliptic/curve
         * @see module:crypto/public_key/elliptic/ecdh
-        * @see module:packet.PublicKeyEncryptedSessionKey
+        * @see module:crypto/public_key/elliptic/ecdsa
+        * @see module:crypto/public_key/elliptic/eddsa
         */
-        namespace pkcs1 {
-            namespace eme {
-                /**
-                 * Create a EME-PKCS1-v1_5 padded message
-                 * @see
-                 * @param M message to be encoded
-                 * @param k the length in octets of the key modulus
-                 * @returns EME-PKCS1 padded message
-                 */
-                function encode(M: string, k: Integer): Promise<String>;
-
-                /**
-                 * Decode a EME-PKCS1-v1_5 padded message
-                 * @see
-                 * @param EM encoded message, an octet string
-                 * @returns message, an octet string
-                 */
-                function decode(EM: string): string;
-            }
-
-            namespace emsa {
-                /**
-                 * Create a EMSA-PKCS1-v1_5 padded message
-                 * @see
-                 * @param algo Hash algorithm type used
-                 * @param hashed message to be encoded
-                 * @param emLen intended length in octets of the encoded message
-                 * @returns encoded message
-                 */
-                function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
-            }
-
-            /**
-             * ASN1 object identifiers for hashes
-             * @see
-             */
-            const hash_headers: any;
-        }
-
-        namespace public_key {
-            namespace dsa {
-                /**
-                 * DSA Sign function
-                 * @param hash_algo
-                 * @param hashed
-                 * @param g
-                 * @param p
-                 * @param q
-                 * @param x
-                 * @returns
-                 */
-                function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
-
-                /**
-                 * DSA Verify function
-                 * @param hash_algo
-                 * @param r
-                 * @param s
-                 * @param hashed
-                 * @param g
-                 * @param p
-                 * @param q
-                 * @param y
-                 * @returns BN
-                 */
-                function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
-            }
-
-            namespace elgamal {
-                /**
-                 * ElGamal Encryption function
-                 * @param m
-                 * @param p
-                 * @param g
-                 * @param y
-                 * @returns
-                 */
-                function encrypt(m: BN, p: BN, g: BN, y: BN): object;
-
-                /**
-                 * ElGamal Encryption function
-                 * @param c1
-                 * @param c2
-                 * @param p
-                 * @param x
-                 * @returns BN
-                 */
-                function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
-            }
-
-            /**
-            * @see module:crypto/public_key/elliptic/curve
-            * @see module:crypto/public_key/elliptic/ecdh
-            * @see module:crypto/public_key/elliptic/ecdsa
-            * @see module:crypto/public_key/elliptic/eddsa
-            */
-            namespace elliptic {
-                namespace curve {
-                    class Curve {
-                    }
-                }
-
-                namespace ecdh {
-                    /**
-                     * Generate ECDHE ephemeral key and secret from public key
-                     * @param curve Elliptic curve object
-                     * @param Q Recipient public key
-                     * @returns Returns public part of ephemeral key and generated ephemeral secret
-                     */
-                    function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
-
-                    /**
-                     * Encrypt and wrap a session key
-                     * @param oid Elliptic curve object identifier
-                     * @param cipher_algo Symmetric cipher to use
-                     * @param hash_algo Hash algorithm to use
-                     * @param m Value derived from session key (RFC 6637)
-                     * @param Q Recipient public key
-                     * @param fingerprint Recipient fingerprint
-                     * @returns Returns public part of ephemeral key and encoded session key
-                     */
-                    function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
-
-                    /**
-                     * Generate ECDHE secret from private key and public part of ephemeral key
-                     * @param curve Elliptic curve object
-                     * @param V Public part of ephemeral key
-                     * @param d Recipient private key
-                     * @returns Generated ephemeral secret
-                     */
-                    function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
-
-                    /**
-                     * Decrypt and unwrap the value derived from session key
-                     * @param oid Elliptic curve object identifier
-                     * @param cipher_algo Symmetric cipher to use
-                     * @param hash_algo Hash algorithm to use
-                     * @param V Public part of ephemeral key
-                     * @param C Encrypted and wrapped value derived from session key
-                     * @param d Recipient private key
-                     * @param fingerprint Recipient fingerprint
-                     * @returns Value derived from session
-                     */
-                    function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
-                }
-
-                namespace ecdsa {
-                    /**
-                     * Sign a message using the provided key
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used to sign
-                     * @param m Message to sign
-                     * @param d Private key used to sign the message
-                     * @param hashed The hashed message
-                     * @returns Signature of the message
-                     */
-                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
-
-                    /**
-                     * Verifies if a signature is valid for a message
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used in the signature
-                     * @param signature Signature to verify
-                     * @param m Message to verify
-                     * @param Q Public key used to verify the message
-                     * @param hashed The hashed message
-                     * @returns
-                     */
-                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
-                }
-
-                namespace eddsa {
-                    /**
-                     * Sign a message using the provided keygit
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used to sign
-                     * @param m Message to sign
-                     * @param d Private key used to sign
-                     * @param hashed The hashed message
-                     * @returns Signature of the message
-                     */
-                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
-
-                    /**
-                     * Verifies if a signature is valid for a message
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used in the signature
-                     * @param signature Signature to verify the message
-                     * @param m Message to verify
-                     * @param Q Public key used to verify the message
-                     * @param hashed The hashed message
-                     * @returns
-                     */
-                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
-                }
-
-                namespace key {
-                    class KeyPair {
-                    }
+        namespace elliptic {
+            namespace curve {
+                class Curve {
                 }
             }
 
-            namespace prime {
+            namespace ecdh {
                 /**
-                 * Probabilistic random number generator
-                 * @param bits Bit length of the prime
-                 * @param e Optional RSA exponent to check against the prime
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @returns BN
+                 * Generate ECDHE ephemeral key and secret from public key
+                 * @param curve Elliptic curve object
+                 * @param Q Recipient public key
+                 * @returns Returns public part of ephemeral key and generated ephemeral secret
                  */
-                function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
+                function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
 
                 /**
-                 * Probabilistic primality testing
-                 * @param n Number to test
-                 * @param e Optional RSA exponent to check against the prime
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @returns
+                 * Encrypt and wrap a session key
+                 * @param oid Elliptic curve object identifier
+                 * @param cipher_algo Symmetric cipher to use
+                 * @param hash_algo Hash algorithm to use
+                 * @param m Value derived from session key (RFC 6637)
+                 * @param Q Recipient public key
+                 * @param fingerprint Recipient fingerprint
+                 * @returns Returns public part of ephemeral key and encoded session key
                  */
-                function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+                function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
 
                 /**
-                 * Tests whether n is probably prime or not using Fermat's test with b = 2.
-                 * Fails if b^(n-1) mod n === 1.
-                 * @param n Number to test
-                 * @param b Optional Fermat test base
-                 * @returns
+                 * Generate ECDHE secret from private key and public part of ephemeral key
+                 * @param curve Elliptic curve object
+                 * @param V Public part of ephemeral key
+                 * @param d Recipient private key
+                 * @returns Generated ephemeral secret
                  */
-                function fermat(n: BN, b: Integer): boolean;
+                function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
 
                 /**
-                 * Tests whether n is probably prime or not using the Miller-Rabin test.
-                 * See HAC Remark 4.28.
-                 * @param n Number to test
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @param rand Optional function to generate potential witnesses
-                 * @returns
+                 * Decrypt and unwrap the value derived from session key
+                 * @param oid Elliptic curve object identifier
+                 * @param cipher_algo Symmetric cipher to use
+                 * @param hash_algo Hash algorithm to use
+                 * @param V Public part of ephemeral key
+                 * @param C Encrypted and wrapped value derived from session key
+                 * @param d Recipient private key
+                 * @param fingerprint Recipient fingerprint
+                 * @returns Value derived from session
                  */
-                function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+                function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
             }
 
-            namespace rsa {
+            namespace ecdsa {
                 /**
-                 * Create signature
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @param d RSA private exponent
-                 * @returns RSA Signature
+                 * Sign a message using the provided key
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used to sign
+                 * @param m Message to sign
+                 * @param d Private key used to sign the message
+                 * @param hashed The hashed message
+                 * @returns Signature of the message
                  */
-                function sign(m: BN, n: BN, e: BN, d: BN): BN;
+                function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
 
                 /**
-                 * Verify signature
-                 * @param s signature
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
+                 * Verifies if a signature is valid for a message
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used in the signature
+                 * @param signature Signature to verify
+                 * @param m Message to verify
+                 * @param Q Public key used to verify the message
+                 * @param hashed The hashed message
                  * @returns
                  */
-                function verify(s: BN, n: BN, e: BN): BN;
+                function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+            }
+
+            namespace eddsa {
+                /**
+                 * Sign a message using the provided keygit
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used to sign
+                 * @param m Message to sign
+                 * @param d Private key used to sign
+                 * @param hashed The hashed message
+                 * @returns Signature of the message
+                 */
+                function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
 
                 /**
-                 * Encrypt message
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @returns RSA Ciphertext
+                 * Verifies if a signature is valid for a message
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used in the signature
+                 * @param signature Signature to verify the message
+                 * @param m Message to verify
+                 * @param Q Public key used to verify the message
+                 * @param hashed The hashed message
+                 * @returns
                  */
-                function encrypt(m: BN, n: BN, e: BN): BN;
+                function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+            }
 
-                /**
-                 * Decrypt RSA message
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @param d RSA private exponent
-                 * @param p RSA private prime p
-                 * @param q RSA private prime q
-                 * @param u RSA private inverse of prime q
-                 * @returns RSA Plaintext
-                 */
-                function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
-
-                /**
-                 * Generate a new random private key B bits long with public exponent E.
-                 * When possible, webCrypto is used. Otherwise, primes are generated using
-                 * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
-                 * @see module:crypto/public_key/prime
-                 * @param B RSA bit length
-                 * @param E RSA public exponent in hex string
-                 * @returns RSA public modulus, RSA public exponent, RSA private exponent,
-                 *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
-                 */
-                function generate(B: Integer, E: string): object;
+            namespace key {
+                class KeyPair {
+                }
             }
         }
 
-        namespace random {
+        namespace prime {
             /**
-             * Retrieve secure random byte array of the specified length
-             * @param length Length in bytes to generate
-             * @returns Random byte array
+             * Probabilistic random number generator
+             * @param bits Bit length of the prime
+             * @param e Optional RSA exponent to check against the prime
+             * @param k Optional number of iterations of Miller-Rabin test
+             * @returns BN
              */
-            function getRandomBytes(length: Integer): Uint8Array;
+            function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
 
             /**
-             * Create a secure random MPI that is greater than or equal to min and less than max.
-             * @param min Lower bound, included
-             * @param max Upper bound, excluded
-             * @returns Random MPI
-             */
-            function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
-
-            /**
-             * Buffer for secure random numbers
-             */
-            function RandomBuffer(): void;
-        }
-
-        namespace signature {
-            /**
-             * Verifies the signature provided for data using specified algorithms and public key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-             * for public key and hash algorithms.
-             * @param algo Public key algorithm
-             * @param hash_algo Hash algorithm
-             * @param msg_MPIs Algorithm-specific signature parameters
-             * @param pub_MPIs Algorithm-specific public key parameters
-             * @param data Data for which the signature was created
-             * @param hashed The hashed data
-             * @returns True if signature is valid
-             */
-            function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
-
-            /**
-             * Creates a signature on data using specified algorithms and private key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-             * for public key and hash algorithms.
-             * @param algo Public key algorithm
-             * @param hash_algo Hash algorithm
-             * @param key_params Algorithm-specific public and private key parameters
-             * @param data Data to be signed
-             * @param hashed The hashed data
-             * @returns Signature
-             */
-            function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
-        }
-    }
-
-    namespace eme {
-        /**
-         * Create a EME-PKCS1-v1_5 padded message
-         * @see
-         * @param M message to be encoded
-         * @param k the length in octets of the key modulus
-         * @returns EME-PKCS1 padded message
-         */
-        function encode(M: string, k: Integer): Promise<String>;
-
-        /**
-         * Decode a EME-PKCS1-v1_5 padded message
-         * @see
-         * @param EM encoded message, an octet string
-         * @returns message, an octet string
-         */
-        function decode(EM: string): string;
-    }
-
-    namespace emsa {
-        /**
-         * Create a EMSA-PKCS1-v1_5 padded message
-         * @see
-         * @param algo Hash algorithm type used
-         * @param hashed message to be encoded
-         * @param emLen intended length in octets of the encoded message
-         * @returns encoded message
-         */
-        function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
-    }
-
-    namespace encoding {
-        namespace armor {
-            /**
-             * Add additional information to the armor version of an OpenPGP binary
-             * packet block.
-             * @author Alex
-             * @version 2011-12-16
-             * @param customComment (optional) additional comment to add to the armored string
-             * @returns The header information
-             */
-            function addheader(customComment: string): string;
-
-            /**
-             * Calculates a checksum over the given data and returns it base64 encoded
-             * @param data Data to create a CRC-24 checksum for
-             * @returns Base64 encoded checksum
-             */
-            function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
-
-            /**
-             * Internal function to calculate a CRC-24 checksum over a given string (data)
-             * @param data Data to create a CRC-24 checksum for
-             * @returns The CRC-24 checksum
-             */
-            function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Splits a message into two parts, the body and the checksum. This is an internal function
-             * @param text OpenPGP armored message part
-             * @returns An object with attribute "body" containing the body
-             *          and an attribute "checksum" containing the checksum.
-             */
-            function splitChecksum(text: string): object;
-
-            /**
-             * DeArmor an OpenPGP armored message; verify the checksum and return
-             * the encoded bytes
-             * @param text OpenPGP armored message
-             * @returns An object with attribute "text" containing the message text,
-             *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
-             */
-            function dearmor(text: string): Promise<Object>;
-
-            /**
-             * Armor an OpenPGP binary packet block
-             * @param messagetype type of the message
-             * @param body
-             * @param partindex
-             * @param parttotal
-             * @param customComment (optional) additional comment to add to the armored string
-             * @returns Armored text
-             */
-            function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
-        }
-
-        namespace base64 {
-            /**
-             * Convert binary array to radix-64
-             * @param t Uint8Array to convert
-             * @param u if true, output is URL-safe
-             * @returns radix-64 version of input string
-             */
-            function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
-
-            /**
-             * Convert radix-64 to binary array
-             * @param t radix-64 string to convert
-             * @param u if true, input is interpreted as URL-safe
-             * @returns binary array version of input string
-             */
-            function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
-        }
-    }
-
-
-
-    namespace enums {
-        /**
-         * Maps curve names under various standards to one
-         * @see
-        */
-        type curve = "p256" | "p384" | "p251" | "secp256k1" | "ed25519" | "curve25519" | "brainpoolP256r1" | "brainpoolP384r1" | "brainpoolP512r1";
-
-        /**
-         * A string to key specifier type
-         */
-        enum s2k {
-            simple = 0,
-            salted = 1,
-            iterated = 3,
-            gnu = 101,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
-         */
-        enum publicKey {
-            /**
-             * RSA (Encrypt or Sign) [HAC]
-             */
-            rsa_encrypt_sign = 1,
-            /**
-             * RSA (Encrypt only) [HAC]
-             */
-            rsa_encrypt = 2,
-            /**
-             * RSA (Sign only) [HAC]
-             */
-            rsa_sign = 3,
-            /**
-             * Elgamal (Encrypt only) [ELGAMAL] [HAC]
-             */
-            elgamal = 16,
-            /**
-             * DSA (Sign only) [FIPS186] [HAC]
-             */
-            dsa = 17,
-            /**
-             * ECDH (Encrypt only) [RFC6637]
-             */
-            ecdh = 18,
-            /**
-             * ECDSA (Sign only) [RFC6637]
-             */
-            ecdsa = 19,
-            /**
-             * EdDSA (Sign only)
-             * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
-             */
-            eddsa = 22,
-            /**
-             * Reserved for AEDH
-             */
-            aedh = 23,
-            /**
-             * Reserved for AEDSA
-             */
-            aedsa = 24,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
-         */
-        enum symmetric {
-            plaintext = 0,
-            /**
-             * Not implemented!
-             */
-            idea = 1,
-            "3des" = 2,
-            tripledes = 2,
-            cast5 = 3,
-            blowfish = 4,
-            aes128 = 7,
-            aes192 = 8,
-            aes256 = 9,
-            twofish = 10,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
-         */
-        enum compression {
-            uncompressed = 0,
-            /**
-             * RFC1951
-             */
-            zip = 1,
-            /**
-             * RFC1950
-             */
-            zlib = 2,
-            bzip2 = 3,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
-         */
-        enum hash {
-            md5 = 1,
-            sha1 = 2,
-            ripemd = 3,
-            sha256 = 8,
-            sha384 = 9,
-            sha512 = 10,
-            sha224 = 11,
-        }
-
-        /**
-         * A list of hash names as accepted by webCrypto functions.
-         * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
-         */
-        enum webHash {
-            "SHA-1" = 2,
-            "SHA-256" = 8,
-            "SHA-384" = 9,
-            "SHA-512" = 10,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
-         */
-        enum aead {
-            eax = 1,
-            ocb = 2,
-            experimental_gcm = 100,
-        }
-
-        /**
-         * A list of packet types and numeric tags associated with them.
-         */
-        enum packet {
-            publicKeyEncryptedSessionKey = 1,
-            signature = 2,
-            symEncryptedSessionKey = 3,
-            onePassSignature = 4,
-            secretKey = 5,
-            publicKey = 6,
-            secretSubkey = 7,
-            compressed = 8,
-            symmetricallyEncrypted = 9,
-            marker = 10,
-            literal = 11,
-            trust = 12,
-            userid = 13,
-            publicSubkey = 14,
-            userAttribute = 17,
-            symEncryptedIntegrityProtected = 18,
-            modificationDetectionCode = 19,
-            symEncryptedAEADProtected = 20,
-        }
-
-        /**
-         * Data types in the literal packet
-         */
-        enum literal {
-            /**
-             * Binary data 'b'
-             */
-            binary = 98,
-            /**
-             * Text data 't'
-             */
-            text = 116,
-            /**
-             * Utf8 data 'u'
-             */
-            utf8 = 117,
-            /**
-             * MIME message body part 'm'
-             */
-            mime = 109,
-        }
-
-        /**
-         * One pass signature packet type
-         */
-        enum signature {
-            /**
-             * 0x00: Signature of a binary document.
-             */
-            binary = 0,
-            /**
-             * 0x01: Signature of a canonical text document.
-             * Canonicalyzing the document by converting line endings.
-             */
-            text = 1,
-            /**
-             * 0x02: Standalone signature.
-             * This signature is a signature of only its own subpacket contents.
-             * It is calculated identically to a signature over a zero-lengh
-             * binary document.  Note that it doesn't make sense to have a V3
-             * standalone signature.
-             */
-            standalone = 2,
-            /**
-             * 0x10: Generic certification of a User ID and Public-Key packet.
-             * The issuer of this certification does not make any particular
-             * assertion as to how well the certifier has checked that the owner
-             * of the key is in fact the person described by the User ID.
-             */
-            cert_generic = 16,
-            /**
-             * 0x11: Persona certification of a User ID and Public-Key packet.
-             * The issuer of this certification has not done any verification of
-             * the claim that the owner of this key is the User ID specified.
-             */
-            cert_persona = 17,
-            /**
-             * 0x12: Casual certification of a User ID and Public-Key packet.
-             * The issuer of this certification has done some casual
-             * verification of the claim of identity.
-             */
-            cert_casual = 18,
-            /**
-             * 0x13: Positive certification of a User ID and Public-Key packet.
-             * The issuer of this certification has done substantial
-             * verification of the claim of identity.
-             * Most OpenPGP implementations make their "key signatures" as 0x10
-             * certifications.  Some implementations can issue 0x11-0x13
-             * certifications, but few differentiate between the types.
-             */
-            cert_positive = 19,
-            /**
-             * 0x30: Certification revocation signature
-             * This signature revokes an earlier User ID certification signature
-             * (signature class 0x10 through 0x13) or direct-key signature
-             * (0x1F).  It should be issued by the same key that issued the
-             * revoked signature or an authorized revocation key.  The signature
-             * is computed over the same data as the certificate that it
-             * revokes, and should have a later creation date than that
-             * certificate.
-             */
-            cert_revocation = 48,
-            /**
-             * 0x18: Subkey Binding Signature
-             * This signature is a statement by the top-level signing key that
-             * indicates that it owns the subkey.  This signature is calculated
-             * directly on the primary key and subkey, and not on any User ID or
-             * other packets.  A signature that binds a signing subkey MUST have
-             * an Embedded Signature subpacket in this binding signature that
-             * contains a 0x19 signature made by the signing subkey on the
-             * primary key and subkey.
-             */
-            subkey_binding = 24,
-            /**
-             * 0x19: Primary Key Binding Signature
-             * This signature is a statement by a signing subkey, indicating
-             * that it is owned by the primary key and subkey.  This signature
-             * is calculated the same way as a 0x18 signature: directly on the
-             * primary key and subkey, and not on any User ID or other packets.
-             * When a signature is made over a key, the hash data starts with the
-             * octet 0x99, followed by a two-octet length of the key, and then body
-             * of the key packet.  (Note that this is an old-style packet header for
-             * a key packet with two-octet length.)  A subkey binding signature
-             * (type 0x18) or primary key binding signature (type 0x19) then hashes
-             * the subkey using the same format as the main key (also using 0x99 as
-             * the first octet).
-             */
-            key_binding = 25,
-            /**
-             * 0x1F: Signature directly on a key
-             * This signature is calculated directly on a key.  It binds the
-             * information in the Signature subpackets to the key, and is
-             * appropriate to be used for subpackets that provide information
-             * about the key, such as the Revocation Key subpacket.  It is also
-             * appropriate for statements that non-self certifiers want to make
-             * about the key itself, rather than the binding between a key and a
-             * name.
-             */
-            key = 31,
-            /**
-             * 0x20: Key revocation signature
-             * The signature is calculated directly on the key being revoked.  A
-             * revoked key is not to be used.  Only revocation signatures by the
-             * key being revoked, or by an authorized revocation key, should be
-             * considered valid revocation signatures.a
-             */
-            key_revocation = 32,
-            /**
-             * 0x28: Subkey revocation signature
-             * The signature is calculated directly on the subkey being revoked.
-             * A revoked subkey is not to be used.  Only revocation signatures
-             * by the top-level signature key that is bound to this subkey, or
-             * by an authorized revocation key, should be considered valid
-             * revocation signatures.
-             * Key revocation signatures (types 0x20 and 0x28)
-             * hash only the key being revoked.
-             */
-            subkey_revocation = 40,
-            /**
-             * 0x40: Timestamp signature.
-             * This signature is only meaningful for the timestamp contained in
-             * it.
-             */
-            timestamp = 64,
-            /**
-             * 0x50: Third-Party Confirmation signature.
-             * This signature is a signature over some other OpenPGP Signature
-             * packet(s).  It is analogous to a notary seal on the signed data.
-             * A third-party signature SHOULD include Signature Target
-             * subpacket(s) to give easy identification.  Note that we really do
-             * mean SHOULD.  There are plausible uses for this (such as a blind
-             * party that only sees the signature, not the key or source
-             * document) that cannot include a target subpacket.
-             */
-            third_party = 80,
-        }
-
-        /**
-         * Signature subpacket type
-         */
-        enum signatureSubpacket {
-            signature_creation_time = 2,
-            signature_expiration_time = 3,
-            exportable_certification = 4,
-            trust_signature = 5,
-            regular_expression = 6,
-            revocable = 7,
-            key_expiration_time = 9,
-            placeholder_backwards_compatibility = 10,
-            preferred_symmetric_algorithms = 11,
-            revocation_key = 12,
-            issuer = 16,
-            notation_data = 20,
-            preferred_hash_algorithms = 21,
-            preferred_compression_algorithms = 22,
-            key_server_preferences = 23,
-            preferred_key_server = 24,
-            primary_user_id = 25,
-            policy_uri = 26,
-            key_flags = 27,
-            signers_user_id = 28,
-            reason_for_revocation = 29,
-            features = 30,
-            signature_target = 31,
-            embedded_signature = 32,
-            issuer_fingerprint = 33,
-            preferred_aead_algorithms = 34,
-        }
-
-        /**
-         * Key flags
-         */
-        enum keyFlags {
-            /**
-             * 0x01 - This key may be used to certify other keys.
-             */
-            certify_keys = 1,
-            /**
-             * 0x02 - This key may be used to sign data.
-             */
-            sign_data = 2,
-            /**
-             * 0x04 - This key may be used to encrypt communications.
-             */
-            encrypt_communication = 4,
-            /**
-             * 0x08 - This key may be used to encrypt storage.
-             */
-            encrypt_storage = 8,
-            /**
-             * 0x10 - The private component of this key may have been split
-             * by a secret-sharing mechanism.
-             */
-            split_private_key = 16,
-            /**
-             * 0x20 - This key may be used for authentication.
-             */
-            authentication = 32,
-            /**
-             * 0x80 - The private component of this key may be in the
-             * possession of more than one person.
-             */
-            shared_private_key = 128,
-        }
-
-        /**
-         * Key status
-         */
-        enum keyStatus {
-            invalid = 0,
-            expired = 1,
-            revoked = 2,
-            valid = 3,
-            no_self_cert = 4,
-        }
-
-        /**
-         * Armor type
-         */
-        enum armor {
-            multipart_section = 0,
-            multipart_last = 1,
-            signed = 2,
-            message = 3,
-            public_key = 4,
-            private_key = 5,
-            signature = 6,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
-         */
-        enum reasonForRevocation {
-            /**
-             * No reason specified (key revocations or cert revocations)
-             */
-            no_reason = 0,
-            /**
-             * Key is superseded (key revocations)
-             */
-            key_superseded = 1,
-            /**
-             * Key material has been comPromise<any>d (key revocations)
-             */
-            key_comPromised = 2,
-            /**
-             * Key is retired and no longer used (key revocations)
-             */
-            key_retired = 3,
-            /**
-             * User ID information is no longer valid (cert revocations)
-             */
-            userid_invalid = 32,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
-         */
-        enum features {
-            /**
-             * 0x01 - Modification Detection (packets 18 and 19)
-             */
-            modification_detection = 1,
-            /**
-             * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
-             * Symmetric-Key Encrypted Session Key Packets (packet 3)
-             */
-            aead = 2,
-            /**
-             * 0x04 - Version 5 Public-Key Packet format and corresponding new
-             * fingerprint format
-             */
-            v5_keys = 4,
-        }
-
-        /**
-         * Asserts validity and converts from string/integer to integer.
-         */
-        function write(): void;
-
-        /**
-         * Converts from an integer to string.
-         */
-        function read(): void;
-    }
-
-    namespace hkp {
-        class HKP {
-            /**
-             * Initialize the HKP client and configure it with the key server url and fetch function.
-             * @param keyServerBaseUrl (optional) The HKP key server base url including
-             *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
-             *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
-             */
-            constructor(keyServerBaseUrl: string);
-
-            /**
-             * Search for a public key on the key server either by key ID or part of the user ID.
-             * @param options.keyID The long public key ID.
-             * @param options.query This can be any part of the key user ID such as name
-             *        or email address.
-             * @returns The ascii armored public key.
-             */
-            lookup(): Promise<String>;
-
-            /**
-             * Upload a public key to the server.
-             * @param publicKeyArmored An ascii armored public key to be uploaded.
+             * Probabilistic primality testing
+             * @param n Number to test
+             * @param e Optional RSA exponent to check against the prime
+             * @param k Optional number of iterations of Miller-Rabin test
              * @returns
              */
-            upload(publicKeyArmored: string): Promise<any>;
+            function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+
+            /**
+             * Tests whether n is probably prime or not using Fermat's test with b = 2.
+             * Fails if b^(n-1) mod n === 1.
+             * @param n Number to test
+             * @param b Optional Fermat test base
+             * @returns
+             */
+            function fermat(n: BN, b: Integer): boolean;
+
+            /**
+             * Tests whether n is probably prime or not using the Miller-Rabin test.
+             * See HAC Remark 4.28.
+             * @param n Number to test
+             * @param k Optional number of iterations of Miller-Rabin test
+             * @param rand Optional function to generate potential witnesses
+             * @returns
+             */
+            function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+        }
+
+        namespace rsa {
+            /**
+             * Create signature
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @param d RSA private exponent
+             * @returns RSA Signature
+             */
+            function sign(m: BN, n: BN, e: BN, d: BN): BN;
+
+            /**
+             * Verify signature
+             * @param s signature
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @returns
+             */
+            function verify(s: BN, n: BN, e: BN): BN;
+
+            /**
+             * Encrypt message
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @returns RSA Ciphertext
+             */
+            function encrypt(m: BN, n: BN, e: BN): BN;
+
+            /**
+             * Decrypt RSA message
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @param d RSA private exponent
+             * @param p RSA private prime p
+             * @param q RSA private prime q
+             * @param u RSA private inverse of prime q
+             * @returns RSA Plaintext
+             */
+            function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
+
+            /**
+             * Generate a new random private key B bits long with public exponent E.
+             * When possible, webCrypto is used. Otherwise, primes are generated using
+             * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
+             * @see module:crypto/public_key/prime
+             * @param B RSA bit length
+             * @param E RSA public exponent in hex string
+             * @returns RSA public modulus, RSA public exponent, RSA private exponent,
+             *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
+             */
+            function generate(B: Integer, E: string): object;
         }
     }
 
+    namespace random {
+        /**
+         * Retrieve secure random byte array of the specified length
+         * @param length Length in bytes to generate
+         * @returns Random byte array
+         */
+        function getRandomBytes(length: Integer): Uint8Array;
+
+        /**
+         * Create a secure random MPI that is greater than or equal to min and less than max.
+         * @param min Lower bound, included
+         * @param max Upper bound, excluded
+         * @returns Random MPI
+         */
+        function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
+
+        /**
+         * Buffer for secure random numbers
+         */
+        function RandomBuffer(): void;
+    }
+
+    namespace signature {
+        /**
+         * Verifies the signature provided for data using specified algorithms and public key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+         * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+         * for public key and hash algorithms.
+         * @param algo Public key algorithm
+         * @param hash_algo Hash algorithm
+         * @param msg_MPIs Algorithm-specific signature parameters
+         * @param pub_MPIs Algorithm-specific public key parameters
+         * @param data Data for which the signature was created
+         * @param hashed The hashed data
+         * @returns True if signature is valid
+         */
+        function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
+
+        /**
+         * Creates a signature on data using specified algorithms and private key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+         * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+         * for public key and hash algorithms.
+         * @param algo Public key algorithm
+         * @param hash_algo Hash algorithm
+         * @param key_params Algorithm-specific public and private key parameters
+         * @param data Data to be signed
+         * @param hashed The hashed data
+         * @returns Signature
+         */
+        function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
+    }
+}
+
+export namespace eme {
+    /**
+     * Create a EME-PKCS1-v1_5 padded message
+     * @see
+     * @param M message to be encoded
+     * @param k the length in octets of the key modulus
+     * @returns EME-PKCS1 padded message
+     */
+    function encode(M: string, k: Integer): Promise<String>;
+
+    /**
+     * Decode a EME-PKCS1-v1_5 padded message
+     * @see
+     * @param EM encoded message, an octet string
+     * @returns message, an octet string
+     */
+    function decode(EM: string): string;
+}
+
+export namespace emsa {
+    /**
+     * Create a EMSA-PKCS1-v1_5 padded message
+     * @see
+     * @param algo Hash algorithm type used
+     * @param hashed message to be encoded
+     * @param emLen intended length in octets of the encoded message
+     * @returns encoded message
+     */
+    function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+}
+
+export namespace encoding {
+    namespace armor {
+        /**
+         * Add additional information to the armor version of an OpenPGP binary
+         * packet block.
+         * @author Alex
+         * @version 2011-12-16
+         * @param customComment (optional) additional comment to add to the armored string
+         * @returns The header information
+         */
+        function addheader(customComment: string): string;
+
+        /**
+         * Calculates a checksum over the given data and returns it base64 encoded
+         * @param data Data to create a CRC-24 checksum for
+         * @returns Base64 encoded checksum
+         */
+        function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
+
+        /**
+         * Internal function to calculate a CRC-24 checksum over a given string (data)
+         * @param data Data to create a CRC-24 checksum for
+         * @returns The CRC-24 checksum
+         */
+        function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Splits a message into two parts, the body and the checksum. This is an internal function
+         * @param text OpenPGP armored message part
+         * @returns An object with attribute "body" containing the body
+         *          and an attribute "checksum" containing the checksum.
+         */
+        function splitChecksum(text: string): object;
+
+        /**
+         * DeArmor an OpenPGP armored message; verify the checksum and return
+         * the encoded bytes
+         * @param text OpenPGP armored message
+         * @returns An object with attribute "text" containing the message text,
+         *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
+         */
+        function dearmor(text: string): Promise<Object>;
+
+        /**
+         * Armor an OpenPGP binary packet block
+         * @param messagetype type of the message
+         * @param body
+         * @param partindex
+         * @param parttotal
+         * @param customComment (optional) additional comment to add to the armored string
+         * @returns Armored text
+         */
+        function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
+    }
+
+    namespace base64 {
+        /**
+         * Convert binary array to radix-64
+         * @param t Uint8Array to convert
+         * @param u if true, output is URL-safe
+         * @returns radix-64 version of input string
+         */
+        function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
+
+        /**
+         * Convert radix-64 to binary array
+         * @param t radix-64 string to convert
+         * @param u if true, input is interpreted as URL-safe
+         * @returns binary array version of input string
+         */
+        function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
+    }
+}
+
+
+
+export namespace enums {
+    /**
+     * Maps curve names under various standards to one
+     * @see
+    */
+    type curve = "p256" | "p384" | "p251" | "secp256k1" | "ed25519" | "curve25519" | "brainpoolP256r1" | "brainpoolP384r1" | "brainpoolP512r1";
+
+    /**
+     * A string to key specifier type
+     */
+    enum s2k {
+        simple = 0,
+        salted = 1,
+        iterated = 3,
+        gnu = 101,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
+     */
+    enum publicKey {
+        /**
+         * RSA (Encrypt or Sign) [HAC]
+         */
+        rsa_encrypt_sign = 1,
+        /**
+         * RSA (Encrypt only) [HAC]
+         */
+        rsa_encrypt = 2,
+        /**
+         * RSA (Sign only) [HAC]
+         */
+        rsa_sign = 3,
+        /**
+         * Elgamal (Encrypt only) [ELGAMAL] [HAC]
+         */
+        elgamal = 16,
+        /**
+         * DSA (Sign only) [FIPS186] [HAC]
+         */
+        dsa = 17,
+        /**
+         * ECDH (Encrypt only) [RFC6637]
+         */
+        ecdh = 18,
+        /**
+         * ECDSA (Sign only) [RFC6637]
+         */
+        ecdsa = 19,
+        /**
+         * EdDSA (Sign only)
+         * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
+         */
+        eddsa = 22,
+        /**
+         * Reserved for AEDH
+         */
+        aedh = 23,
+        /**
+         * Reserved for AEDSA
+         */
+        aedsa = 24,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
+     */
+    enum symmetric {
+        plaintext = 0,
+        /**
+         * Not implemented!
+         */
+        idea = 1,
+        "3des" = 2,
+        tripledes = 2,
+        cast5 = 3,
+        blowfish = 4,
+        aes128 = 7,
+        aes192 = 8,
+        aes256 = 9,
+        twofish = 10,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
+     */
+    enum compression {
+        uncompressed = 0,
+        /**
+         * RFC1951
+         */
+        zip = 1,
+        /**
+         * RFC1950
+         */
+        zlib = 2,
+        bzip2 = 3,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
+     */
+    enum hash {
+        md5 = 1,
+        sha1 = 2,
+        ripemd = 3,
+        sha256 = 8,
+        sha384 = 9,
+        sha512 = 10,
+        sha224 = 11,
+    }
+
+    /**
+     * A list of hash names as accepted by webCrypto functions.
+     * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
+     */
+    enum webHash {
+        "SHA-1" = 2,
+        "SHA-256" = 8,
+        "SHA-384" = 9,
+        "SHA-512" = 10,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
+     */
+    enum aead {
+        eax = 1,
+        ocb = 2,
+        experimental_gcm = 100,
+    }
+
+    /**
+     * A list of packet types and numeric tags associated with them.
+     */
+    enum packet {
+        publicKeyEncryptedSessionKey = 1,
+        signature = 2,
+        symEncryptedSessionKey = 3,
+        onePassSignature = 4,
+        secretKey = 5,
+        publicKey = 6,
+        secretSubkey = 7,
+        compressed = 8,
+        symmetricallyEncrypted = 9,
+        marker = 10,
+        literal = 11,
+        trust = 12,
+        userid = 13,
+        publicSubkey = 14,
+        userAttribute = 17,
+        symEncryptedIntegrityProtected = 18,
+        modificationDetectionCode = 19,
+        symEncryptedAEADProtected = 20,
+    }
+
+    /**
+     * Data types in the literal packet
+     */
+    enum literal {
+        /**
+         * Binary data 'b'
+         */
+        binary = 98,
+        /**
+         * Text data 't'
+         */
+        text = 116,
+        /**
+         * Utf8 data 'u'
+         */
+        utf8 = 117,
+        /**
+         * MIME message body part 'm'
+         */
+        mime = 109,
+    }
+
+    /**
+     * One pass signature packet type
+     */
+    enum signature {
+        /**
+         * 0x00: Signature of a binary document.
+         */
+        binary = 0,
+        /**
+         * 0x01: Signature of a canonical text document.
+         * Canonicalyzing the document by converting line endings.
+         */
+        text = 1,
+        /**
+         * 0x02: Standalone signature.
+         * This signature is a signature of only its own subpacket contents.
+         * It is calculated identically to a signature over a zero-lengh
+         * binary document.  Note that it doesn't make sense to have a V3
+         * standalone signature.
+         */
+        standalone = 2,
+        /**
+         * 0x10: Generic certification of a User ID and Public-Key packet.
+         * The issuer of this certification does not make any particular
+         * assertion as to how well the certifier has checked that the owner
+         * of the key is in fact the person described by the User ID.
+         */
+        cert_generic = 16,
+        /**
+         * 0x11: Persona certification of a User ID and Public-Key packet.
+         * The issuer of this certification has not done any verification of
+         * the claim that the owner of this key is the User ID specified.
+         */
+        cert_persona = 17,
+        /**
+         * 0x12: Casual certification of a User ID and Public-Key packet.
+         * The issuer of this certification has done some casual
+         * verification of the claim of identity.
+         */
+        cert_casual = 18,
+        /**
+         * 0x13: Positive certification of a User ID and Public-Key packet.
+         * The issuer of this certification has done substantial
+         * verification of the claim of identity.
+         * Most OpenPGP implementations make their "key signatures" as 0x10
+         * certifications.  Some implementations can issue 0x11-0x13
+         * certifications, but few differentiate between the types.
+         */
+        cert_positive = 19,
+        /**
+         * 0x30: Certification revocation signature
+         * This signature revokes an earlier User ID certification signature
+         * (signature class 0x10 through 0x13) or direct-key signature
+         * (0x1F).  It should be issued by the same key that issued the
+         * revoked signature or an authorized revocation key.  The signature
+         * is computed over the same data as the certificate that it
+         * revokes, and should have a later creation date than that
+         * certificate.
+         */
+        cert_revocation = 48,
+        /**
+         * 0x18: Subkey Binding Signature
+         * This signature is a statement by the top-level signing key that
+         * indicates that it owns the subkey.  This signature is calculated
+         * directly on the primary key and subkey, and not on any User ID or
+         * other packets.  A signature that binds a signing subkey MUST have
+         * an Embedded Signature subpacket in this binding signature that
+         * contains a 0x19 signature made by the signing subkey on the
+         * primary key and subkey.
+         */
+        subkey_binding = 24,
+        /**
+         * 0x19: Primary Key Binding Signature
+         * This signature is a statement by a signing subkey, indicating
+         * that it is owned by the primary key and subkey.  This signature
+         * is calculated the same way as a 0x18 signature: directly on the
+         * primary key and subkey, and not on any User ID or other packets.
+         * When a signature is made over a key, the hash data starts with the
+         * octet 0x99, followed by a two-octet length of the key, and then body
+         * of the key packet.  (Note that this is an old-style packet header for
+         * a key packet with two-octet length.)  A subkey binding signature
+         * (type 0x18) or primary key binding signature (type 0x19) then hashes
+         * the subkey using the same format as the main key (also using 0x99 as
+         * the first octet).
+         */
+        key_binding = 25,
+        /**
+         * 0x1F: Signature directly on a key
+         * This signature is calculated directly on a key.  It binds the
+         * information in the Signature subpackets to the key, and is
+         * appropriate to be used for subpackets that provide information
+         * about the key, such as the Revocation Key subpacket.  It is also
+         * appropriate for statements that non-self certifiers want to make
+         * about the key itself, rather than the binding between a key and a
+         * name.
+         */
+        key = 31,
+        /**
+         * 0x20: Key revocation signature
+         * The signature is calculated directly on the key being revoked.  A
+         * revoked key is not to be used.  Only revocation signatures by the
+         * key being revoked, or by an authorized revocation key, should be
+         * considered valid revocation signatures.a
+         */
+        key_revocation = 32,
+        /**
+         * 0x28: Subkey revocation signature
+         * The signature is calculated directly on the subkey being revoked.
+         * A revoked subkey is not to be used.  Only revocation signatures
+         * by the top-level signature key that is bound to this subkey, or
+         * by an authorized revocation key, should be considered valid
+         * revocation signatures.
+         * Key revocation signatures (types 0x20 and 0x28)
+         * hash only the key being revoked.
+         */
+        subkey_revocation = 40,
+        /**
+         * 0x40: Timestamp signature.
+         * This signature is only meaningful for the timestamp contained in
+         * it.
+         */
+        timestamp = 64,
+        /**
+         * 0x50: Third-Party Confirmation signature.
+         * This signature is a signature over some other OpenPGP Signature
+         * packet(s).  It is analogous to a notary seal on the signed data.
+         * A third-party signature SHOULD include Signature Target
+         * subpacket(s) to give easy identification.  Note that we really do
+         * mean SHOULD.  There are plausible uses for this (such as a blind
+         * party that only sees the signature, not the key or source
+         * document) that cannot include a target subpacket.
+         */
+        third_party = 80,
+    }
+
+    /**
+     * Signature subpacket type
+     */
+    enum signatureSubpacket {
+        signature_creation_time = 2,
+        signature_expiration_time = 3,
+        exportable_certification = 4,
+        trust_signature = 5,
+        regular_expression = 6,
+        revocable = 7,
+        key_expiration_time = 9,
+        placeholder_backwards_compatibility = 10,
+        preferred_symmetric_algorithms = 11,
+        revocation_key = 12,
+        issuer = 16,
+        notation_data = 20,
+        preferred_hash_algorithms = 21,
+        preferred_compression_algorithms = 22,
+        key_server_preferences = 23,
+        preferred_key_server = 24,
+        primary_user_id = 25,
+        policy_uri = 26,
+        key_flags = 27,
+        signers_user_id = 28,
+        reason_for_revocation = 29,
+        features = 30,
+        signature_target = 31,
+        embedded_signature = 32,
+        issuer_fingerprint = 33,
+        preferred_aead_algorithms = 34,
+    }
+
+    /**
+     * Key flags
+     */
+    enum keyFlags {
+        /**
+         * 0x01 - This key may be used to certify other keys.
+         */
+        certify_keys = 1,
+        /**
+         * 0x02 - This key may be used to sign data.
+         */
+        sign_data = 2,
+        /**
+         * 0x04 - This key may be used to encrypt communications.
+         */
+        encrypt_communication = 4,
+        /**
+         * 0x08 - This key may be used to encrypt storage.
+         */
+        encrypt_storage = 8,
+        /**
+         * 0x10 - The private component of this key may have been split
+         * by a secret-sharing mechanism.
+         */
+        split_private_key = 16,
+        /**
+         * 0x20 - This key may be used for authentication.
+         */
+        authentication = 32,
+        /**
+         * 0x80 - The private component of this key may be in the
+         * possession of more than one person.
+         */
+        shared_private_key = 128,
+    }
+
+    /**
+     * Key status
+     */
+    enum keyStatus {
+        invalid = 0,
+        expired = 1,
+        revoked = 2,
+        valid = 3,
+        no_self_cert = 4,
+    }
+
+    /**
+     * Armor type
+     */
+    enum armor {
+        multipart_section = 0,
+        multipart_last = 1,
+        signed = 2,
+        message = 3,
+        public_key = 4,
+        private_key = 5,
+        signature = 6,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
+     */
+    enum reasonForRevocation {
+        /**
+         * No reason specified (key revocations or cert revocations)
+         */
+        no_reason = 0,
+        /**
+         * Key is superseded (key revocations)
+         */
+        key_superseded = 1,
+        /**
+         * Key material has been comPromise<any>d (key revocations)
+         */
+        key_comPromised = 2,
+        /**
+         * Key is retired and no longer used (key revocations)
+         */
+        key_retired = 3,
+        /**
+         * User ID information is no longer valid (cert revocations)
+         */
+        userid_invalid = 32,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
+     */
+    enum features {
+        /**
+         * 0x01 - Modification Detection (packets 18 and 19)
+         */
+        modification_detection = 1,
+        /**
+         * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
+         * Symmetric-Key Encrypted Session Key Packets (packet 3)
+         */
+        aead = 2,
+        /**
+         * 0x04 - Version 5 Public-Key Packet format and corresponding new
+         * fingerprint format
+         */
+        v5_keys = 4,
+    }
+
+    /**
+     * Asserts validity and converts from string/integer to integer.
+     */
+    function write(): void;
+
+    /**
+     * Converts from an integer to string.
+     */
+    function read(): void;
+}
+
+export namespace hkp {
     class HKP {
         /**
          * Initialize the HKP client and configure it with the key server url and fetch function.
@@ -1552,557 +1526,301 @@ export namespace openpgp {
          */
         upload(publicKeyArmored: string): Promise<any>;
     }
+}
 
-    namespace key {
+export class HKP {
+    /**
+     * Initialize the HKP client and configure it with the key server url and fetch function.
+     * @param keyServerBaseUrl (optional) The HKP key server base url including
+     *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+     *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+     */
+    constructor(keyServerBaseUrl: string);
+
+    /**
+     * Search for a public key on the key server either by key ID or part of the user ID.
+     * @param options.keyID The long public key ID.
+     * @param options.query This can be any part of the key user ID such as name
+     *        or email address.
+     * @returns The ascii armored public key.
+     */
+    lookup(): Promise<String>;
+
+    /**
+     * Upload a public key to the server.
+     * @param publicKeyArmored An ascii armored public key to be uploaded.
+     * @returns
+     */
+    upload(publicKeyArmored: string): Promise<any>;
+}
+
+export namespace key {
+    /**
+     * Class that represents an OpenPGP key. Must contain a primary key.
+     * Can contain additional subkeys, signatures, user ids, user attributes.
+     */
+    class Key {
         /**
-         * Class that represents an OpenPGP key. Must contain a primary key.
-         * Can contain additional subkeys, signatures, user ids, user attributes.
+         * @param packetlist The packets that form this key
          */
-        class Key {
-            /**
-             * @param packetlist The packets that form this key
-             */
-            constructor(packetlist: packet.List);
-
-            /**
-             * Transforms packetlist to structured key data
-             * @param packetlist The packets that form a key
-             */
-            packetlist2structure(packetlist: packet.List): void;
-
-            /**
-             * Transforms structured key data to packetlist
-             * @returns The packets that form a key
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Returns an array containing all public or private subkeys matching keyId;
-             * If keyId is not present, returns all subkeys.
-             * @param keyId
-             * @returns
-             */
-            getSubkeys(keyId: type.keyid.Keyid): any[];
-
-            /**
-             * Returns an array containing all public or private keys matching keyId.
-             * If keyId is not present, returns all keys starting with the primary key.
-             * @param keyId
-             * @returns
-             */
-            getKeys(keyId: type.keyid.Keyid): any[];
-
-            /**
-             * Returns key IDs of all keys
-             * @returns
-             */
-            getKeyIds(): any[];
-
-            /**
-             * Returns userids
-             * @returns array of userids
-             */
-            getUserIds(): any[];
-
-            /**
-             * Returns true if this is a public key
-             * @returns
-             */
-            isPublic(): boolean;
-
-            /**
-             * Returns true if this is a private key
-             * @returns
-             */
-            isPrivate(): boolean;
-
-            /**
-             * Returns key as public key (shallow copy)
-             * @returns new public Key
-             */
-            toPublic(): Key;
-
-            /**
-             * Returns ASCII armored text of key
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
-
-            /**
-             * Returns last created key or key by given keyId that is available for signing and verification
-             * @param keyId, optional
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId, optional user ID
-             * @returns key or null if no signing key has been found
-             */
-            getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
-
-            /**
-             * Returns last created key or key by given keyId that is available for encryption or decryption
-             * @param keyId, optional
-             * @param date, optional
-             * @param userId, optional
-             * @returns key or null if no encryption key has been found
-             */
-            getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
-
-            /**
-             * Encrypts all secret key and subkey packets matching keyId
-             * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
-             * @param keyId
-             * @returns
-             */
-            encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
-
-            /**
-             * Decrypts all secret key and subkey packets matching keyId
-             * @param passphrases
-             * @param keyId
-             * @returns true if all matching key and subkey packets decrypted successfully
-             */
-            decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
-
-            /**
-             * Checks if a signature on a key is revoked
-             * @param
-             * @param signature The signature to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the certificate is revoked
-             */
-            isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
-
-            /**
-             * Verify primary key. Checks for revocation signatures, expiration time
-             * and valid self signature
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID
-             * @returns The status of the primary key
-             */
-            verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
-
-            /**
-             * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
-             * When `capabilities` is null, defaults to returning the expiry date of the primary key.
-             * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
-             * Returns Infinity if the key doesn't expire.
-             * @param {encrypt | sign | encrypt_sign} capabilities, optional
-             * @param keyId, optional
-             * @param userId, optional user ID
-             * @returns
-             */
-            getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
-
-            /**
-             * Returns primary user and most significant (latest valid) self signature
-             * - if multiple primary users exist, returns the one with the latest self signature
-             * - otherwise, returns the user with the latest self signature
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns The primary user and the self signature
-             */
-            getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
-
-            /**
-             * Update key with new components from specified key with same key ID:
-             * users, subkeys, certificates are merged into the destination key,
-             * duplicates and expired signatures are ignored.
-             * If the specified key is a private key and the destination key is public,
-             * the destination key is transformed to a private key.
-             * @param key Source key to merge
-             * @returns
-             */
-            update(key: Key): Promise<undefined>;
-
-            /**
-             * Revokes the key
-             * @param reasonForRevocation optional, object indicating the reason for revocation
-             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
-             * @param reasonForRevocation.string optional, string explaining the reason for revocation
-             * @param date optional, override the creationtime of the revocation signature
-             * @returns new key with revocation signature
-             */
-            revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
-
-            /**
-             * Get revocation certificate from a revoked key.
-             * (To get a revocation certificate for an unrevoked key, call revoke() first.)
-             * @returns armored revocation certificate
-             */
-            getRevocationCertificate(): Promise<String>;
-
-            /**
-             * Applies a revocation certificate to a key
-             * This adds the first signature packet in the armored text to the key,
-             * if it is a valid revocation signature.
-             * @param revocationCertificate armored revocation certificate
-             * @returns new revoked key
-             */
-            applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
-
-            /**
-             * Signs primary user of key
-             * @param privateKey decrypted private keys for signing
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns new public key with new certificate signature
-             */
-            signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
-
-            /**
-             * Signs all users of key
-             * @param privateKeys decrypted private keys for signing
-             * @returns new public key with new certificate signature
-             */
-            signAllUsers(privateKeys: any[]): Promise<Key>;
-
-            /**
-             * Verifies primary user of key
-             * - if no arguments are given, verifies the self certificates;
-             * - otherwise, verifies all certificates signed with given keys.
-             * @param keys array of keys to verify certificate signatures
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns List of signer's keyid and validity of signature
-             */
-            verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verifies all users of key
-             * - if no arguments are given, verifies the self certificates;
-             * - otherwise, verifies all certificates signed with given keys.
-             * @param keys array of keys to verify certificate signatures
-             * @returns list of userid, signer's keyid and validity of signature
-             */
-            verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-        }
+        constructor(packetlist: packet.List);
 
         /**
-         * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
-         * @param signatures List of signatures
-         * @param date Use the given date instead of the current time
-         * @returns The latest valid signature
+         * Transforms packetlist to structured key data
+         * @param packetlist The packets that form a key
          */
-        function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
+        packetlist2structure(packetlist: packet.List): void;
 
         /**
-         * Class that represents an user ID or attribute packet and the relevant signatures.
+         * Transforms structured key data to packetlist
+         * @returns The packets that form a key
          */
-        class User {
-            constructor();
-
-            /**
-             * Transforms structured user data to packetlist
-             * @returns
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Signs user
-             * @param primaryKey The primary key packet
-             * @param privateKeys Decrypted private keys for signing
-             * @returns New user with new certificate signatures
-             */
-            sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
-
-            /**
-             * Checks if a given certificate of the user is revoked
-             * @param primaryKey The primary key packet
-             * @param certificate The certificate to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the certificate is revoked
-             */
-            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
-
-            /**
-             * Verifies the user certificate
-             * @param primaryKey The primary key packet
-             * @param certificate A certificate of this user
-             * @param keys Array of keys to verify certificate signatures
-             * @param date Use the given date instead of the current time
-             * @returns status of the certificate
-             */
-            verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Verifies all user certificates
-             * @param primaryKey The primary key packet
-             * @param keys Array of keys to verify certificate signatures
-             * @param date Use the given date instead of the current time
-             * @returns List of signer's keyid and validity of signature
-             */
-            verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verify User. Checks for existence of self signatures, revocation signatures
-             * and validity of self signature
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns Status of user
-             */
-            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Update user with new components from specified user
-             * @param user Source user to merge
-             * @param primaryKey primary key used for validation
-             * @returns
-             */
-            update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
-        }
+        toPacketlist(): packet.List;
 
         /**
-         * Create signature packet
-         * @param dataToSign Contains packets to be signed
-         * @param signingKeyPacket secret key packet for signing
-         * @param signatureProperties (optional) properties to write on the signature packet before signing
-         * @param date (optional) override the creationtime of the signature
-         * @param userId (optional) user ID
-         * @returns signature packet
-         */
-        function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
-
-        /**
-         * Class that represents a subkey packet and the relevant signatures.
-         */
-        class SubKey {
-            constructor();
-
-            /**
-             * Transforms structured subkey data to packetlist
-             * @returns
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Checks if a binding signature of a subkey is revoked
-             * @param primaryKey The primary key packet
-             * @param signature The binding signature to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the binding signature is revoked
-             */
-            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
-
-            /**
-             * Verify subkey. Checks for revocation signatures, expiration time
-             * and valid binding signature
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns The status of the subkey
-             */
-            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Returns the expiration time of the subkey or Infinity if key does not expire
-             * Returns null if the subkey is invalid.
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns
-             */
-            getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
-
-            /**
-             * Update subkey with new components from specified subkey
-             * @param subKey Source subkey to merge
-             * @param primaryKey primary key used for validation
-             * @returns
-             */
-            update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
-
-            /**
-             * Revokes the subkey
-             * @param primaryKey decrypted private primary key for revocation
-             * @param reasonForRevocation optional, object indicating the reason for revocation
-             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
-             * @param reasonForRevocation.string optional, string explaining the reason for revocation
-             * @param date optional, override the creationtime of the revocation signature
-             * @returns new subkey with revocation signature
-             */
-            revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-        }
-
-        /**
-         * Reads an unarmored OpenPGP key list and returns one or multiple key objects
-         * @param data to be parsed
-         * @returns result object with key and error arrays
-         */
-        function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
-
-        interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
-
-        /**
-         * Reads an OpenPGP armored text and returns one or multiple key objects
-         * @param armoredText text to be parsed
-         * @returns result object with key and error arrays
-         */
-        function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
-
-        /**
-         * Generates a new OpenPGP key. Supports RSA and ECC keys.
-         * Primary and subkey will be of same type.
-         * @param options.keyType To indicate what type of key to make.
-         *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
-         * @param options.numBits number of bits for the key creation.
-         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
-         *        If array is used, the first userId is set as primary user Id
-         * @param options.passphrase The passphrase used to encrypt the resulting private key
-         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
-         * @param curve (optional) elliptic curve for ECC keys
-         * @param date Override the creation date of the key and the key signatures
-         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
-         *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         * Returns an array containing all public or private subkeys matching keyId;
+         * If keyId is not present, returns all subkeys.
+         * @param keyId
          * @returns
          */
-        function generate(options: KeyOptions): Promise<Key>;
+        getSubkeys(keyId: type.keyid.Keyid): any[];
 
         /**
-         * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
-         * @param options.privateKey The private key to reformat
-         * @param options.keyType
-         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
-         *        If array is used, the first userId is set as primary user Id
-         * @param options.passphrase The passphrase used to encrypt the resulting private key
-         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
-         * @param date Override the creation date of the key and the key signatures
-         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         * Returns an array containing all public or private keys matching keyId.
+         * If keyId is not present, returns all keys starting with the primary key.
+         * @param keyId
          * @returns
          */
-        function reformat(date: Date, subkeys: any[]): Promise<Key>;
+        getKeys(keyId: type.keyid.Keyid): any[];
 
         /**
-         * Checks if a given certificate or binding signature is revoked
-         * @param primaryKey The primary key packet
-         * @param dataToVerify The data to check
-         * @param revocations The revocation signatures to check
-         * @param signature The certificate or signature to check
-         * @param key, optional The key packet to check the signature
+         * Returns key IDs of all keys
+         * @returns
+         */
+        getKeyIds(): any[];
+
+        /**
+         * Returns userids
+         * @returns array of userids
+         */
+        getUserIds(): any[];
+
+        /**
+         * Returns true if this is a public key
+         * @returns
+         */
+        isPublic(): boolean;
+
+        /**
+         * Returns true if this is a private key
+         * @returns
+         */
+        isPrivate(): boolean;
+
+        /**
+         * Returns key as public key (shallow copy)
+         * @returns new public Key
+         */
+        toPublic(): Key;
+
+        /**
+         * Returns ASCII armored text of key
+         * @returns ASCII armor
+         */
+        armor(): ReadableStream<String>;
+
+        /**
+         * Returns last created key or key by given keyId that is available for signing and verification
+         * @param keyId, optional
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId, optional user ID
+         * @returns key or null if no signing key has been found
+         */
+        getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
+
+        /**
+         * Returns last created key or key by given keyId that is available for encryption or decryption
+         * @param keyId, optional
+         * @param date, optional
+         * @param userId, optional
+         * @returns key or null if no encryption key has been found
+         */
+        getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
+
+        /**
+         * Encrypts all secret key and subkey packets matching keyId
+         * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
+         * @param keyId
+         * @returns
+         */
+        encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
+
+        /**
+         * Decrypts all secret key and subkey packets matching keyId
+         * @param passphrases
+         * @param keyId
+         * @returns true if all matching key and subkey packets decrypted successfully
+         */
+        decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
+
+        /**
+         * Checks if a signature on a key is revoked
+         * @param
+         * @param signature The signature to verify
+         * @param key, optional The key to verify the signature
          * @param date Use the given date instead of the current time
-         * @returns True if the signature revokes the data
+         * @returns True if the certificate is revoked
          */
-        function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+        isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
 
         /**
-         * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
-         * and throw error if found
-         * @param signature The certificate or signature to check
-         * @param keyId Check only certificates or signatures from a certain issuer key ID
-         */
-        function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
-
-        /**
-         * Returns the preferred signature hash algorithm of a key
-         * @param key (optional) the key to get preferences from
-         * @param keyPacket key packet used for signing
+         * Verify primary key. Checks for revocation signatures, expiration time
+         * and valid self signature
          * @param date (optional) use the given date for verification instead of the current time
          * @param userId (optional) user ID
+         * @returns The status of the primary key
+         */
+        verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
+
+        /**
+         * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
+         * When `capabilities` is null, defaults to returning the expiry date of the primary key.
+         * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
+         * Returns Infinity if the key doesn't expire.
+         * @param {encrypt | sign | encrypt_sign} capabilities, optional
+         * @param keyId, optional
+         * @param userId, optional user ID
          * @returns
          */
-        function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+        getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
 
         /**
-         * Returns the preferred symmetric/aead algorithm for a set of keys
-         * @param {symmetric | aead} type Type of preference to return
-         * @param keys Set of keys
+         * Returns primary user and most significant (latest valid) self signature
+         * - if multiple primary users exist, returns the one with the latest self signature
+         * - otherwise, returns the user with the latest self signature
          * @param date (optional) use the given date for verification instead of the current time
-         * @param userIds (optional) user IDs
-         * @returns Preferred symmetric algorithm
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns The primary user and the self signature
          */
-        function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+        getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
 
         /**
-         * Returns whether aead is supported by all keys in the set
-         * @param keys Set of keys
-         * @param date (optional) use the given date for verification instead of the current time
-         * @param userIds (optional) user IDs
+         * Update key with new components from specified key with same key ID:
+         * users, subkeys, certificates are merged into the destination key,
+         * duplicates and expired signatures are ignored.
+         * If the specified key is a private key and the destination key is public,
+         * the destination key is transformed to a private key.
+         * @param key Source key to merge
          * @returns
          */
-        function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+        update(key: Key): Promise<undefined>;
+
+        /**
+         * Revokes the key
+         * @param reasonForRevocation optional, object indicating the reason for revocation
+         * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+         * @param reasonForRevocation.string optional, string explaining the reason for revocation
+         * @param date optional, override the creationtime of the revocation signature
+         * @returns new key with revocation signature
+         */
+        revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
+
+        /**
+         * Get revocation certificate from a revoked key.
+         * (To get a revocation certificate for an unrevoked key, call revoke() first.)
+         * @returns armored revocation certificate
+         */
+        getRevocationCertificate(): Promise<String>;
+
+        /**
+         * Applies a revocation certificate to a key
+         * This adds the first signature packet in the armored text to the key,
+         * if it is a valid revocation signature.
+         * @param revocationCertificate armored revocation certificate
+         * @returns new revoked key
+         */
+        applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
+
+        /**
+         * Signs primary user of key
+         * @param privateKey decrypted private keys for signing
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns new public key with new certificate signature
+         */
+        signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
+
+        /**
+         * Signs all users of key
+         * @param privateKeys decrypted private keys for signing
+         * @returns new public key with new certificate signature
+         */
+        signAllUsers(privateKeys: any[]): Promise<Key>;
+
+        /**
+         * Verifies primary user of key
+         * - if no arguments are given, verifies the self certificates;
+         * - otherwise, verifies all certificates signed with given keys.
+         * @param keys array of keys to verify certificate signatures
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns List of signer's keyid and validity of signature
+         */
+        verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verifies all users of key
+         * - if no arguments are given, verifies the self certificates;
+         * - otherwise, verifies all certificates signed with given keys.
+         * @param keys array of keys to verify certificate signatures
+         * @returns list of userid, signer's keyid and validity of signature
+         */
+        verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
     }
 
-    interface revoke_reasonForRevocation {
-        /**
-         * optional, flag indicating the reason for revocation
-         */
-        flag: enums.reasonForRevocation;
-        /**
-         * optional, string explaining the reason for revocation
-         */
-        string: string;
-    }
+    /**
+     * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
+     * @param signatures List of signatures
+     * @param date Use the given date instead of the current time
+     * @returns The latest valid signature
+     */
+    function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
 
     /**
      * Class that represents an user ID or attribute packet and the relevant signatures.
@@ -2122,7 +1840,7 @@ export namespace openpgp {
          * @param privateKeys Decrypted private keys for signing
          * @returns New user with new certificate signatures
          */
-        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
 
         /**
          * Checks if a given certificate of the user is revoked
@@ -2168,9 +1886,20 @@ export namespace openpgp {
          * @param primaryKey primary key used for validation
          * @returns
          */
-        update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
     }
 
+    /**
+     * Create signature packet
+     * @param dataToSign Contains packets to be signed
+     * @param signingKeyPacket secret key packet for signing
+     * @param signatureProperties (optional) properties to write on the signature packet before signing
+     * @param date (optional) override the creationtime of the signature
+     * @param userId (optional) user ID
+     * @returns signature packet
+     */
+    function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
+
     /**
      * Class that represents a subkey packet and the relevant signatures.
      */
@@ -2217,7 +1946,7 @@ export namespace openpgp {
          * @param primaryKey primary key used for validation
          * @returns
          */
-        update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
 
         /**
          * Revokes the subkey
@@ -2228,7 +1957,7 @@ export namespace openpgp {
          * @param date optional, override the creationtime of the revocation signature
          * @returns new subkey with revocation signature
          */
-        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
 
         /**
          * Calculates the key id of the key
@@ -2268,2895 +1997,3166 @@ export namespace openpgp {
     }
 
     /**
-     * @see module:keyring/keyring
-     * @see module:keyring/localstore
+     * Reads an unarmored OpenPGP key list and returns one or multiple key objects
+     * @param data to be parsed
+     * @returns result object with key and error arrays
      */
+    function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
+
+    interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
+
+    /**
+     * Reads an OpenPGP armored text and returns one or multiple key objects
+     * @param armoredText text to be parsed
+     * @returns result object with key and error arrays
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
+
+    /**
+     * Generates a new OpenPGP key. Supports RSA and ECC keys.
+     * Primary and subkey will be of same type.
+     * @param options.keyType To indicate what type of key to make.
+     *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
+     * @param options.numBits number of bits for the key creation.
+     * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+     *        If array is used, the first userId is set as primary user Id
+     * @param options.passphrase The passphrase used to encrypt the resulting private key
+     * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+     * @param curve (optional) elliptic curve for ECC keys
+     * @param date Override the creation date of the key and the key signatures
+     * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+     * @returns
+     */
+    function generate(options: KeyOptions): Promise<Key>;
+
+    /**
+     * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
+     * @param options.privateKey The private key to reformat
+     * @param options.keyType
+     * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+     *        If array is used, the first userId is set as primary user Id
+     * @param options.passphrase The passphrase used to encrypt the resulting private key
+     * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+     * @param date Override the creation date of the key and the key signatures
+     * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     * @returns
+     */
+    function reformat(date: Date, subkeys: any[]): Promise<Key>;
+
+    /**
+     * Checks if a given certificate or binding signature is revoked
+     * @param primaryKey The primary key packet
+     * @param dataToVerify The data to check
+     * @param revocations The revocation signatures to check
+     * @param signature The certificate or signature to check
+     * @param key, optional The key packet to check the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the signature revokes the data
+     */
+    function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
+     * and throw error if found
+     * @param signature The certificate or signature to check
+     * @param keyId Check only certificates or signatures from a certain issuer key ID
+     */
+    function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
+
+    /**
+     * Returns the preferred signature hash algorithm of a key
+     * @param key (optional) the key to get preferences from
+     * @param keyPacket key packet used for signing
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userId (optional) user ID
+     * @returns
+     */
+    function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+
+    /**
+     * Returns the preferred symmetric/aead algorithm for a set of keys
+     * @param {symmetric | aead} type Type of preference to return
+     * @param keys Set of keys
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userIds (optional) user IDs
+     * @returns Preferred symmetric algorithm
+     */
+    function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+
+    /**
+     * Returns whether aead is supported by all keys in the set
+     * @param keys Set of keys
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userIds (optional) user IDs
+     * @returns
+     */
+    function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+}
+
+export interface revoke_reasonForRevocation {
+    /**
+     * optional, flag indicating the reason for revocation
+     */
+    flag: enums.reasonForRevocation;
+    /**
+     * optional, string explaining the reason for revocation
+     */
+    string: string;
+}
+
+/**
+ * Class that represents an user ID or attribute packet and the relevant signatures.
+ */
+export class User {
+    constructor();
+
+    /**
+     * Transforms structured user data to packetlist
+     * @returns
+     */
+    toPacketlist(): packet.List;
+
+    /**
+     * Signs user
+     * @param primaryKey The primary key packet
+     * @param privateKeys Decrypted private keys for signing
+     * @returns New user with new certificate signatures
+     */
+    sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+
+    /**
+     * Checks if a given certificate of the user is revoked
+     * @param primaryKey The primary key packet
+     * @param certificate The certificate to verify
+     * @param key, optional The key to verify the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the certificate is revoked
+     */
+    isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Verifies the user certificate
+     * @param primaryKey The primary key packet
+     * @param certificate A certificate of this user
+     * @param keys Array of keys to verify certificate signatures
+     * @param date Use the given date instead of the current time
+     * @returns status of the certificate
+     */
+    verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Verifies all user certificates
+     * @param primaryKey The primary key packet
+     * @param keys Array of keys to verify certificate signatures
+     * @param date Use the given date instead of the current time
+     * @returns List of signer's keyid and validity of signature
+     */
+    verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * Verify User. Checks for existence of self signatures, revocation signatures
+     * and validity of self signature
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns Status of user
+     */
+    verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Update user with new components from specified user
+     * @param user Source user to merge
+     * @param primaryKey primary key used for validation
+     * @returns
+     */
+    update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+}
+
+/**
+ * Class that represents a subkey packet and the relevant signatures.
+ */
+export class SubKey {
+    constructor();
+
+    /**
+     * Transforms structured subkey data to packetlist
+     * @returns
+     */
+    toPacketlist(): packet.List;
+
+    /**
+     * Checks if a binding signature of a subkey is revoked
+     * @param primaryKey The primary key packet
+     * @param signature The binding signature to verify
+     * @param key, optional The key to verify the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the binding signature is revoked
+     */
+    isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Verify subkey. Checks for revocation signatures, expiration time
+     * and valid binding signature
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns The status of the subkey
+     */
+    verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Returns the expiration time of the subkey or Infinity if key does not expire
+     * Returns null if the subkey is invalid.
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns
+     */
+    getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+    /**
+     * Update subkey with new components from specified subkey
+     * @param subKey Source subkey to merge
+     * @param primaryKey primary key used for validation
+     * @returns
+     */
+    update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+    /**
+     * Revokes the subkey
+     * @param primaryKey decrypted private primary key for revocation
+     * @param reasonForRevocation optional, object indicating the reason for revocation
+     * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+     * @param reasonForRevocation.string optional, string explaining the reason for revocation
+     * @param date optional, override the creationtime of the revocation signature
+     * @returns new subkey with revocation signature
+     */
+    revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+
+    /**
+     * Calculates the key id of the key
+     * @returns A 8 byte key id
+     */
+    getKeyId(): string;
+
+    /**
+     * Calculates the fingerprint of the key
+     * @returns A string containing the fingerprint in lowercase hex
+     */
+    getFingerprint(): string;
+
+    /**
+     * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+     * @returns Whether the two keys have the same version and public key data
+     */
+    hasSameFingerprintAs(): boolean;
+
+    /**
+     * Returns algorithm information
+     * @returns An object of the form {algorithm: string, bits:int, curve:String}
+     */
+    getAlgorithmInfo(): object;
+
+    /**
+     * Returns the creation time of the key
+     * @returns
+     */
+    getCreationTime(): Date;
+
+    /**
+     * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+     * @returns
+     */
+    isDecrypted(): boolean | null;
+}
+
+/**
+ * @see module:keyring/keyring
+ * @see module:keyring/localstore
+ */
+export namespace keyring {
     namespace keyring {
-        namespace keyring {
-            class Keyring {
-                /**
-                 * Initialization routine for the keyring.
-                 * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
-                 */
-                constructor(storeHandler?: localstore.LocalStore);
-
-                /**
-                 * Calls the storeHandler to load the keys
-                 */
-                load(): void;
-
-                /**
-                 * Calls the storeHandler to save the keys
-                 */
-                store(): void;
-
-                /**
-                 * Clear the keyring - erase all the keys
-                 */
-                clear(): void;
-
-                /**
-                 * Searches the keyring for keys having the specified key id
-                 * @param keyId provided as string of lowercase hex number
-                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
-                 * @param deep if true search also in subkeys
-                 * @returns keys found or null
-                 */
-                getKeysForId(keyId: string, deep: boolean): any[] | null;
-
-                /**
-                 * Removes keys having the specified key id from the keyring
-                 * @param keyId provided as string of lowercase hex number
-                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
-                 * @returns keys found or null
-                 */
-                removeKeysForId(keyId: string): any[] | null;
-
-                /**
-                 * Get all public and private keys
-                 * @returns all keys
-                 */
-                getAllKeys(): any[];
-            }
+        class Keyring {
+            /**
+             * Initialization routine for the keyring.
+             * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
+             */
+            constructor(storeHandler?: localstore.LocalStore);
 
             /**
-             * Array of keys
-             * @param keys The keys to store in this array
+             * Calls the storeHandler to load the keys
              */
-            function KeyArray(keys: any[]): void;
+            load(): void;
+
+            /**
+             * Calls the storeHandler to save the keys
+             */
+            store(): void;
+
+            /**
+             * Clear the keyring - erase all the keys
+             */
+            clear(): void;
+
+            /**
+             * Searches the keyring for keys having the specified key id
+             * @param keyId provided as string of lowercase hex number
+             *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+             * @param deep if true search also in subkeys
+             * @returns keys found or null
+             */
+            getKeysForId(keyId: string, deep: boolean): any[] | null;
+
+            /**
+             * Removes keys having the specified key id from the keyring
+             * @param keyId provided as string of lowercase hex number
+             *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+             * @returns keys found or null
+             */
+            removeKeysForId(keyId: string): any[] | null;
+
+            /**
+             * Get all public and private keys
+             * @returns all keys
+             */
+            getAllKeys(): any[];
         }
 
-        namespace localstore {
-            class LocalStore {
-                /**
-                 * The class that deals with storage of the keyring.
-                 * Currently the only option is to use HTML5 local storage.
-                 * @param prefix prefix for itemnames in localstore
-                 */
-                constructor(prefix: string);
-
-                /**
-                 * Load the public keys from HTML5 local storage.
-                 * @returns array of keys retrieved from localstore
-                 */
-                loadPublic(): any[];
-
-                /**
-                 * Load the private keys from HTML5 local storage.
-                 * @returns array of keys retrieved from localstore
-                 */
-                loadPrivate(): any[];
-
-                /**
-                 * Saves the current state of the public keys to HTML5 local storage.
-                 * The key array gets stringified using JSON
-                 * @param keys array of keys to save in localstore
-                 */
-                storePublic(keys: any[]): void;
-
-                /**
-                 * Saves the current state of the private keys to HTML5 local storage.
-                 * The key array gets stringified using JSON
-                 * @param keys array of keys to save in localstore
-                 */
-                storePrivate(keys: any[]): void;
-            }
-        }
+        /**
+         * Array of keys
+         * @param keys The keys to store in this array
+         */
+        function KeyArray(keys: any[]): void;
     }
 
-    class LocalStore {
-        /**
-         * The class that deals with storage of the keyring.
-         * Currently the only option is to use HTML5 local storage.
-         * @param prefix prefix for itemnames in localstore
-         */
-        constructor(prefix: string);
-
-        /**
-         * Load the public keys from HTML5 local storage.
-         * @returns array of keys retrieved from localstore
-         */
-        loadPublic(): any[];
-
-        /**
-         * Load the private keys from HTML5 local storage.
-         * @returns array of keys retrieved from localstore
-         */
-        loadPrivate(): any[];
-
-        /**
-         * Saves the current state of the public keys to HTML5 local storage.
-         * The key array gets stringified using JSON
-         * @param keys array of keys to save in localstore
-         */
-        storePublic(keys: any[]): void;
-
-        /**
-         * Saves the current state of the private keys to HTML5 local storage.
-         * The key array gets stringified using JSON
-         * @param keys array of keys to save in localstore
-         */
-        storePrivate(keys: any[]): void;
-    }
-
-    namespace message {
-        /**
-         * Class that represents an OpenPGP message.
-         * Can be an encrypted message, signed message, compressed message or literal message
-         */
-        class Message {
-            packets: packet.List;
+    namespace localstore {
+        class LocalStore {
+            /**
+             * The class that deals with storage of the keyring.
+             * Currently the only option is to use HTML5 local storage.
+             * @param prefix prefix for itemnames in localstore
+             */
+            constructor(prefix: string);
 
             /**
-             * @param packetlist The packets that form this message
-             *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+             * Load the public keys from HTML5 local storage.
+             * @returns array of keys retrieved from localstore
              */
-            constructor(packetlist: packet.List);
+            loadPublic(): any[];
 
             /**
-             * Returns the key IDs of the keys to which the session key is encrypted
-             * @returns array of keyid objects
+             * Load the private keys from HTML5 local storage.
+             * @returns array of keys retrieved from localstore
              */
-            getEncryptionKeyIds(): any[];
+            loadPrivate(): any[];
 
             /**
-             * Returns the key IDs of the keys that signed the message
-             * @returns array of keyid objects
+             * Saves the current state of the public keys to HTML5 local storage.
+             * The key array gets stringified using JSON
+             * @param keys array of keys to save in localstore
              */
-            getSigningKeyIds(): any[];
+            storePublic(keys: any[]): void;
 
             /**
-             * Decrypt the message. Either a private key, a session key, or a password must be specified.
-             * @param privateKeys (optional) private keys with decrypted secret data
-             * @param passwords (optional) passwords used to decrypt
-             * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
-             * @param streaming (optional) whether to process data as a stream
-             * @returns new message with decrypted content
+             * Saves the current state of the private keys to HTML5 local storage.
+             * The key array gets stringified using JSON
+             * @param keys array of keys to save in localstore
              */
-            decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
-
-            /**
-             * Decrypt encrypted session keys either with private keys or passwords.
-             * @param privateKeys (optional) private keys with decrypted secret data
-             * @param passwords (optional) passwords used to decrypt
-             * @returns array of object with potential sessionKey, algorithm pairs
-             */
-            decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
-
-            /**
-             * Get literal data that is the body of the message
-             * @returns literal body of the message as Uint8Array
-             */
-            getLiteralData(): Uint8Array | null;
-
-            /**
-             * Get filename from literal data packet
-             * @returns filename of literal data packet as string
-             */
-            getFilename(): string | null;
-
-            /**
-             * Get literal data as text
-             * @returns literal body of the message interpreted as text
-             */
-            getText(): string | null;
-
-            /**
-             * Encrypt the message either with public keys, passwords, or both at once.
-             * @param keys (optional) public key(s) for message encryption
-             * @param passwords (optional) password(s) for message encryption
-             * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
-             * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-             * @param date (optional) override the creation date of the literal package
-             * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
-             * @param streaming (optional) whether to process data as a stream
-             * @returns new message with encrypted content
-             */
-            encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
-
-            /**
-             * Sign the message (the literal data packet of the message)
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature to add to the message
-             * @param date (optional) override the creation time of the signature
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new message with signed content
-             */
-            sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
-
-            /**
-             * Compresses the message (the literal and -if signed- signature data packets of the message)
-             * @param compression compression algorithm to be used
-             * @returns new message with compressed content
-             */
-            compress(compression: enums.compression): Message;
-
-            /**
-             * Create a detached signature for the message (the literal data packet of the message)
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) override the creation time of the signature
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new detached signature of message content
-             */
-            signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
-
-            /**
-             * Verify message signatures
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @param streaming (optional) whether to process data as a stream
-             * @returns list of signer's keyid and validity of signature
-             */
-            verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
-
-            /**
-             * Verify detached message signature
-             * @param keys array of keys to verify signatures
-             * @param signature
-             * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
-
-            /**
-             * Unwrap compressed message
-             * @returns message Content of compressed message
-             */
-            unwrapCompressed(): Message;
-
-            /**
-             * Append signature to unencrypted message object
-             * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
-             */
-            appendSignature(detachedSignature: string | Uint8Array): void;
-
-            /**
-             * Returns ASCII armored text of message
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
+            storePrivate(keys: any[]): void;
         }
+    }
+}
+
+export class LocalStore {
+    /**
+     * The class that deals with storage of the keyring.
+     * Currently the only option is to use HTML5 local storage.
+     * @param prefix prefix for itemnames in localstore
+     */
+    constructor(prefix: string);
+
+    /**
+     * Load the public keys from HTML5 local storage.
+     * @returns array of keys retrieved from localstore
+     */
+    loadPublic(): any[];
+
+    /**
+     * Load the private keys from HTML5 local storage.
+     * @returns array of keys retrieved from localstore
+     */
+    loadPrivate(): any[];
+
+    /**
+     * Saves the current state of the public keys to HTML5 local storage.
+     * The key array gets stringified using JSON
+     * @param keys array of keys to save in localstore
+     */
+    storePublic(keys: any[]): void;
+
+    /**
+     * Saves the current state of the private keys to HTML5 local storage.
+     * The key array gets stringified using JSON
+     * @param keys array of keys to save in localstore
+     */
+    storePrivate(keys: any[]): void;
+}
+
+export namespace message {
+    /**
+     * Class that represents an OpenPGP message.
+     * Can be an encrypted message, signed message, compressed message or literal message
+     */
+    class Message {
+        packets: packet.List;
 
         /**
-         * Encrypt a session key either with public keys, passwords, or both at once.
-         * @param sessionKey session key for encryption
-         * @param symAlgo session key algorithm
-         * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
-         * @param publicKeys (optional) public key(s) for message encryption
-         * @param passwords (optional) for message encryption
+         * @param packetlist The packets that form this message
+         *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+         */
+        constructor(packetlist: packet.List);
+
+        /**
+         * Returns the key IDs of the keys to which the session key is encrypted
+         * @returns array of keyid objects
+         */
+        getEncryptionKeyIds(): any[];
+
+        /**
+         * Returns the key IDs of the keys that signed the message
+         * @returns array of keyid objects
+         */
+        getSigningKeyIds(): any[];
+
+        /**
+         * Decrypt the message. Either a private key, a session key, or a password must be specified.
+         * @param privateKeys (optional) private keys with decrypted secret data
+         * @param passwords (optional) passwords used to decrypt
+         * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+         * @param streaming (optional) whether to process data as a stream
+         * @returns new message with decrypted content
+         */
+        decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
+
+        /**
+         * Decrypt encrypted session keys either with private keys or passwords.
+         * @param privateKeys (optional) private keys with decrypted secret data
+         * @param passwords (optional) passwords used to decrypt
+         * @returns array of object with potential sessionKey, algorithm pairs
+         */
+        decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
+
+        /**
+         * Get literal data that is the body of the message
+         * @returns literal body of the message as Uint8Array
+         */
+        getLiteralData(): Uint8Array | null;
+
+        /**
+         * Get filename from literal data packet
+         * @returns filename of literal data packet as string
+         */
+        getFilename(): string | null;
+
+        /**
+         * Get literal data as text
+         * @returns literal body of the message interpreted as text
+         */
+        getText(): string | null;
+
+        /**
+         * Encrypt the message either with public keys, passwords, or both at once.
+         * @param keys (optional) public key(s) for message encryption
+         * @param passwords (optional) password(s) for message encryption
+         * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
          * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-         * @param date (optional) override the date
+         * @param date (optional) override the creation date of the literal package
          * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         * @param streaming (optional) whether to process data as a stream
          * @returns new message with encrypted content
          */
-        function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+        encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
 
         /**
-         * Create signature packets for the message
-         * @param literalDataPacket the literal data packet to sign
+         * Sign the message (the literal data packet of the message)
          * @param privateKeys private keys with decrypted secret key data for signing
-         * @param signature (optional) any existing detached signature to append
-         * @param date (optional) override the creationtime of the signature
+         * @param signature (optional) any existing detached signature to add to the message
+         * @param date (optional) override the creation time of the signature
          * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         * @returns list of signature packets
+         * @returns new message with signed content
          */
-        function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+        sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
 
         /**
-         * Create object containing signer's keyid and validity of signature
-         * @param signature signature packets
-         * @param literalDataList array of literal data packets
+         * Compresses the message (the literal and -if signed- signature data packets of the message)
+         * @param compression compression algorithm to be used
+         * @returns new message with compressed content
+         */
+        compress(compression: enums.compression): Message;
+
+        /**
+         * Create a detached signature for the message (the literal data packet of the message)
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) override the creation time of the signature
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new detached signature of message content
+         */
+        signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
+
+        /**
+         * Verify message signatures
          * @param keys array of keys to verify signatures
-         * @param date Verify the signature against the given date,
-         *        i.e. check signature creation time < date < expiration time
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @param streaming (optional) whether to process data as a stream
          * @returns list of signer's keyid and validity of signature
          */
-        function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+        verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
 
         /**
-         * Create list of objects containing signer's keyid and validity of signature
-         * @param signatureList array of signature packets
-         * @param literalDataList array of literal data packets
+         * Verify detached message signature
          * @param keys array of keys to verify signatures
-         * @param date Verify the signature against the given date,
-         *        i.e. check signature creation time < date < expiration time
+         * @param signature
+         * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
          * @returns list of signer's keyid and validity of signature
          */
-        function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+        verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
 
         /**
-         * reads an OpenPGP armored message and returns a message object
-         * @param armoredText text to be parsed
-         * @returns new message object
+         * Unwrap compressed message
+         * @returns message Content of compressed message
          */
-        function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+        unwrapCompressed(): Message;
 
         /**
-         * reads an OpenPGP message as byte array and returns a message object
-         * @param input binary message
-         * @param fromStream whether the message was created from a Stream
-         * @returns new message object
+         * Append signature to unencrypted message object
+         * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
          */
-        function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+        appendSignature(detachedSignature: string | Uint8Array): void;
 
         /**
-         * creates new message object from text
-         * @param text
-         * @param filename (optional)
-         * @param date (optional)
-         * @param {utf8 | binary | text | mime} type (optional) data packet type
-         * @returns new message object
+         * Returns ASCII armored text of message
+         * @returns ASCII armor
          */
-        function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
-
-        /**
-         * creates new message object from binary data
-         * @param bytes
-         * @param filename (optional)
-         * @param date (optional)
-         * @param {utf8 | binary | text | mime} type (optional) data packet type
-         * @returns new message object
-         */
-        function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
-    }
-
-    interface revokeKey_reasonForRevocation {
-        /**
-         * (optional) flag indicating the reason for revocation
-         */
-        flag: enums.reasonForRevocation;
-        /**
-         * (optional) string explaining the reason for revocation
-         */
-        string: string;
+        armor(): ReadableStream<String>;
     }
 
     /**
-     * @see module:packet/all_packets
-     * @see module:packet/clone
-     * @see module:packet.List
+     * Encrypt a session key either with public keys, passwords, or both at once.
+     * @param sessionKey session key for encryption
+     * @param symAlgo session key algorithm
+     * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
+     * @param publicKeys (optional) public key(s) for message encryption
+     * @param passwords (optional) for message encryption
+     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+     * @param date (optional) override the date
+     * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+     * @returns new message with encrypted content
      */
+    function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+
+    /**
+     * Create signature packets for the message
+     * @param literalDataPacket the literal data packet to sign
+     * @param privateKeys private keys with decrypted secret key data for signing
+     * @param signature (optional) any existing detached signature to append
+     * @param date (optional) override the creationtime of the signature
+     * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     * @returns list of signature packets
+     */
+    function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+
+    /**
+     * Create object containing signer's keyid and validity of signature
+     * @param signature signature packets
+     * @param literalDataList array of literal data packets
+     * @param keys array of keys to verify signatures
+     * @param date Verify the signature against the given date,
+     *        i.e. check signature creation time < date < expiration time
+     * @returns list of signer's keyid and validity of signature
+     */
+    function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * Create list of objects containing signer's keyid and validity of signature
+     * @param signatureList array of signature packets
+     * @param literalDataList array of literal data packets
+     * @param keys array of keys to verify signatures
+     * @param date Verify the signature against the given date,
+     *        i.e. check signature creation time < date < expiration time
+     * @returns list of signer's keyid and validity of signature
+     */
+    function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * reads an OpenPGP armored message and returns a message object
+     * @param armoredText text to be parsed
+     * @returns new message object
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+
+    /**
+     * reads an OpenPGP message as byte array and returns a message object
+     * @param input binary message
+     * @param fromStream whether the message was created from a Stream
+     * @returns new message object
+     */
+    function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+
+    /**
+     * creates new message object from text
+     * @param text
+     * @param filename (optional)
+     * @param date (optional)
+     * @param {utf8 | binary | text | mime} type (optional) data packet type
+     * @returns new message object
+     */
+    function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
+
+    /**
+     * creates new message object from binary data
+     * @param bytes
+     * @param filename (optional)
+     * @param date (optional)
+     * @param {utf8 | binary | text | mime} type (optional) data packet type
+     * @returns new message object
+     */
+    function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
+}
+
+export interface revokeKey_reasonForRevocation {
+    /**
+     * (optional) flag indicating the reason for revocation
+     */
+    flag: enums.reasonForRevocation;
+    /**
+     * (optional) string explaining the reason for revocation
+     */
+    string: string;
+}
+
+/**
+ * @see module:packet/all_packets
+ * @see module:packet/clone
+ * @see module:packet.List
+ */
+export namespace packet {
+    /**
+     * Allocate a new packet
+     * @param tag property name from {@link module:enums.packet}
+     * @returns new packet object with type based on tag
+     */
+    function newPacketFromTag(tag: string): object;
+
+    /**
+     * Allocate a new packet from structured packet clone
+     * @see
+     * @param packetClone packet clone
+     * @returns new packet object with data from packet clone
+     */
+    function fromStructuredClone(packetClone: object): object;
+
+    class Compressed {
+        /**
+         * Implementation of the Compressed Data Packet (Tag 8)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
+         * The Compressed Data packet contains compressed data.  Typically,
+         * this packet is found as the contents of an encrypted packet, or following
+         * a Signature or One-Pass Signature packet, and contains a literal data packet.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * List of packets
+         */
+        packets: List;
+
+        /**
+         * Compression algorithm
+         * @type {compression}
+         */
+        algorithm: any;
+
+        /**
+         * Compressed packet data
+         */
+        compressed: Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Parsing function for the packet.
+         * @param bytes Payload of a tag 8 packet
+         */
+        read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Return the compressed packet.
+         * @returns binary compressed packet
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Decompression method for decompressing the compressed data
+         * read by read_packet
+         */
+        decompress(): void;
+
+        /**
+         * Compress the packet data (member decompressedData)
+         */
+        compress(): void;
+    }
+
+    class Literal {
+        /**
+         * Implementation of the Literal Data Packet (Tag 11)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
+         * A Literal Data packet contains the body of a message; data that is not to be
+         * further interpreted.
+         * @param date the creation date of the literal package
+         */
+        constructor(date: Date);
+
+        /**
+         * Set the packet data to a javascript native string, end of line
+         * will be normalized to \r\n and by default text is converted to UTF8
+         * @param text Any native javascript string
+         * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
+         */
+        setText(text: string | ReadableStream<String>, format: any): void;
+
+        /**
+         * Returns literal data packets as native JavaScript string
+         * with normalized end of line to \n
+         * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+         * @returns literal data as text
+         */
+        getText(clone: boolean): string | ReadableStream<String>;
+
+        /**
+         * Set the packet data to value represented by the provided string of bytes.
+         * @param bytes The string of bytes
+         * @param {utf8 | binary | text | mime} format The format of the string of bytes
+         */
+        setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
+
+        /**
+         * Get the byte sequence representing the literal packet data
+         * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+         * @returns A sequence of bytes
+         */
+        getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Sets the filename of the literal packet data
+         * @param filename Any native javascript string
+         */
+        setFilename(filename: string): void;
+
+        /**
+         * Get the filename of the literal packet data
+         * @returns filename
+         */
+        getFilename(): string;
+
+        /**
+         * Parsing function for a literal data packet (tag 11).
+         * @param input Payload of a tag 11 packet
+         * @returns object representation
+         */
+        read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
+
+        /**
+         * Creates a string representation of the packet
+         * @returns Uint8Array representation of the packet
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+    }
+
+    class Marker {
+        /**
+         * Implementation of the strange "Marker packet" (Tag 10)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
+         * An experimental version of PGP used this packet as the Literal
+         * packet, but no released version of PGP generated Literal packets with this
+         * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
+         * the Marker packet.
+         * Such a packet MUST be ignored when received.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a literal data packet (tag 10).
+         * @param input Payload of a tag 10 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: string, position: Integer, len: Integer): Marker;
+    }
+
+    class OnePassSignature {
+        /**
+         * Implementation of the One-Pass Signature Packets (Tag 4)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
+         * The One-Pass Signature packet precedes the signed data and contains
+         * enough information to allow the receiver to begin calculating any
+         * hashes needed to verify the signature.  It allows the Signature
+         * packet to be placed at the end of the message, so that the signer
+         * can compute the entire signed message in one pass.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * A one-octet version number.  The current version is 3.
+         */
+        version: any;
+
+        /**
+         * A one-octet signature type.
+         * Signature types are described in
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
+         */
+        signatureType: any;
+
+        /**
+         * A one-octet number describing the hash algorithm used.
+         * @see
+         */
+        hashAlgorithm: any;
+
+        /**
+         * A one-octet number describing the public-key algorithm used.
+         * @see
+         */
+        publicKeyAlgorithm: any;
+
+        /**
+         * An eight-octet number holding the Key ID of the signing key.
+         */
+        issuerKeyId: any;
+
+        /**
+         * A one-octet number holding a flag showing whether the signature is nested.
+         * A zero value indicates that the next packet is another One-Pass Signature packet
+         * that describes another signature to be applied to the same message data.
+         */
+        flags: any;
+
+        /**
+         * parsing function for a one-pass signature packet (tag 4).
+         * @param bytes payload of a tag 4 packet
+         * @returns object representation
+         */
+        read(bytes: Uint8Array): OnePassSignature;
+
+        /**
+         * creates a string representation of a one-pass signature packet
+         * @returns a Uint8Array representation of a one-pass signature packet
+         */
+        write(): Uint8Array;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class List {
+        /**
+         * This class represents a list of openpgp packets.
+         * Take care when iterating over it - the packets themselves
+         * are stored as numerical indices.
+         */
+        constructor();
+
+        /**
+         * The number of packets contained within the list.
+         */
+        readonly length: Integer;
+
+        /**
+         * Reads a stream of binary data and interprents it as a list of packets.
+         * @param A Uint8Array of bytes.
+         */
+        read(A: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Creates a binary representation of openpgp objects contained within the
+         * class instance.
+         * @returns A Uint8Array containing valid openpgp packets.
+         */
+        write(): Uint8Array;
+
+        /**
+         * Adds a packet to the list. This is the only supported method of doing so;
+         * writing to packetlist[i] directly will result in an error.
+         * @param packet Packet to push
+         */
+        push(packet: object): void;
+
+        /**
+         * Creates a new PacketList with all packets from the given types
+         */
+        filterByTag(): void;
+
+        /**
+         * Traverses packet tree and returns first matching packet
+         * @param type The packet type
+         * @returns
+         */
+        findPacket(type: enums.packet): List | undefined;
+
+        /**
+         * Returns array of found indices by tag
+         */
+        indexOfTag(): void;
+
+        /**
+         * Concatenates packetlist or array of packets
+         */
+        concat(): void;
+
+        /**
+         * Allocate a new packetlist from structured packetlist clone
+         * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
+         * @param packetClone packetlist clone
+         * @returns new packetlist object with data from packetlist clone
+         */
+        static fromStructuredClone(packetClone: object): object;
+    }
+
+    class PublicKey {
+        /**
+         * Implementation of the Key Material Packet (Tag 5,6,7,14)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
+         * A key material packet contains all the information about a public or
+         * private key.  There are four variants of this packet type, and two
+         * major versions.
+         * A Public-Key packet starts a series of packets that forms an OpenPGP
+         * key (sometimes called an OpenPGP certificate).
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+         * called by read_tag&lt;num&gt;
+         * @param bytes Input array to read the packet from
+         * @returns This object with attributes set by the parser
+         */
+        read(bytes: Uint8Array): object;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Same as write_private_key, but has less information because of
+         * public key.
+         * @returns OpenPGP packet body contents,
+         */
+        write(): Uint8Array;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class PublicKeyEncryptedSessionKey {
+        /**
+         * Public-Key Encrypted Session Key Packets (Tag 1)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+         * A Public-Key Encrypted Session Key packet holds the session key
+         * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+         * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+         * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+         * message is encrypted with the session key, and the session key is itself
+         * encrypted and stored in the Encrypted Session Key packet(s). The
+         * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+         * Session Key packet for each OpenPGP key to which the message is encrypted.
+         * The recipient of the message finds a session key that is encrypted to their
+         * public key, decrypts the session key, and then uses the session key to
+         * decrypt the message.
+         */
+        constructor();
+
+        encrypted: any[];
+
+        /**
+         * Parsing function for a publickey encrypted session key packet (tag 1).
+         * @param input Payload of a tag 1 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
+
+        /**
+         * Create a string representation of a tag 1 packet
+         * @returns The Uint8Array representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Encrypt session key packet
+         * @param key Public key
+         * @returns
+         */
+        encrypt(key: PublicKey): Promise<Boolean>;
+
+        /**
+         * Decrypts the session key (only for public key encrypted session key
+         * packets (tag 1)
+         * @param key Private key with secret params unlocked
+         * @returns
+         */
+        decrypt(key: SecretKey): Promise<Boolean>;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class PublicSubkey {
+        /**
+         * A Public-Subkey packet (tag 14) has exactly the same format as a
+         * Public-Key packet, but denotes a subkey.  One or more subkeys may be
+         * associated with a top-level key.  By convention, the top-level key
+         * provides signature services, and the subkeys provide encryption
+         * services.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+         * called by read_tag&lt;num&gt;
+         * @param bytes Input array to read the packet from
+         * @returns This object with attributes set by the parser
+         */
+        read(bytes: Uint8Array): object;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Same as write_private_key, but has less information because of
+         * public key.
+         * @returns OpenPGP packet body contents,
+         */
+        write(): Uint8Array;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SecretKey {
+        /**
+         * A Secret-Key packet contains all the information that is found in a
+         * Public-Key packet, including the public-key material, but also
+         * includes the secret-key material after all the public-key fields.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+         */
+        isEncrypted: any;
+
+        /**
+         * Internal parser for private keys as specified in
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+         * @param bytes Input string to read the packet from
+         */
+        read(bytes: string): void;
+
+        /**
+         * Creates an OpenPGP key packet for the given key.
+         * @returns A string of bytes containing the secret key OpenPGP packet
+         */
+        write(): string;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Encrypt the payload. By default, we use aes256 and iterated, salted string
+         * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+         * and the passphrase is empty or undefined, the key will be set as not encrypted.
+         * This can be used to remove passphrase protection after calling decrypt().
+         * @param passphrase
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Decrypts the private key params which are needed to use the key.
+         * {@link module:packet.SecretKey.isDecrypted} should be false, as
+         * otherwise calls to this function will throw an error.
+         * @param passphrase The passphrase for this private key as string
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Clear private params, return to initial state
+         */
+        clearPrivateParams(): void;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+    }
+
+    class SecretSubkey {
+        /**
+         * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
+         * Key packet and has exactly the same format.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+         */
+        isEncrypted: any;
+
+        /**
+         * Internal parser for private keys as specified in
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+         * @param bytes Input string to read the packet from
+         */
+        read(bytes: string): void;
+
+        /**
+         * Creates an OpenPGP key packet for the given key.
+         * @returns A string of bytes containing the secret key OpenPGP packet
+         */
+        write(): string;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Encrypt the payload. By default, we use aes256 and iterated, salted string
+         * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+         * and the passphrase is empty or undefined, the key will be set as not encrypted.
+         * This can be used to remove passphrase protection after calling decrypt().
+         * @param passphrase
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Decrypts the private key params which are needed to use the key.
+         * {@link module:packet.SecretKey.isDecrypted} should be false, as
+         * otherwise calls to this function will throw an error.
+         * @param passphrase The passphrase for this private key as string
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Clear private params, return to initial state
+         */
+        clearPrivateParams(): void;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+    }
+
+    class Signature {
+        /**
+         * Implementation of the Signature Packet (Tag 2)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
+         * A Signature packet describes a binding between some public key and
+         * some data.  The most common signatures are a signature of a file or a
+         * block of text, and a signature that is a certification of a User ID.
+         * @param date the creation date of the signature
+         */
+        constructor(date: Date);
+
+        /**
+         * parsing function for a signature packet (tag 2).
+         * @param bytes payload of a tag 2 packet
+         * @param position position to start reading from the bytes string
+         * @param len length of the packet or the remaining length of bytes at position
+         * @returns object representation
+         */
+        read(bytes: string, position: Integer, len: Integer): Signature;
+
+        /**
+         * Signs provided data. This needs to be done prior to serialization.
+         * @param key private key used to sign the message.
+         * @param data Contains packets to be signed.
+         * @returns
+         */
+        sign(key: SecretKey, data: object): Promise<Boolean>;
+
+        /**
+         * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
+         * @returns subpacket data
+         */
+        write_hashed_sub_packets(): Uint8Array;
+
+        /**
+         * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
+         * @returns subpacket data
+         */
+        write_unhashed_sub_packets(): Uint8Array;
+
+        /**
+         * verifys the signature packet. Note: not signature types are implemented
+         * @param key the public key to verify the signature
+         * @param signatureType expected signature type
+         * @param data data which on the signature applies
+         * @returns True if message is verified, else false.
+         */
+        verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
+
+        /**
+         * Verifies signature expiration date
+         * @param date (optional) use the given date for verification instead of the current time
+         * @returns true if expired
+         */
+        isExpired(date: Date): boolean;
+
+        /**
+         * Returns the expiration time of the signature or Infinity if signature does not expire
+         * @returns expiration time
+         */
+        getExpirationTime(): Date;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SymEncryptedAEADProtected {
+        /**
+         * Implementation of the Symmetrically Encrypted Authenticated Encryption with
+         * Additional Data (AEAD) Protected Data Packet
+         * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
+         * AEAD Protected Data Packet
+         */
+        constructor();
+
+        /**
+         * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+         * @param bytes
+         */
+        read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+         * @returns The encrypted payload
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Decrypt the encrypted payload.
+         * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+         * @param key The session key used to encrypt the payload
+         * @param streaming Whether the top-level function will return a stream
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
+
+        /**
+         * Encrypt the packet list payload.
+         * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+         * @param key The session key used to encrypt the payload
+         * @param streaming Whether the top-level function will return a stream
+         */
+        encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
+
+        /**
+         * En/decrypt the payload.
+         * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
+         * @param key The session key used to en/decrypt the payload
+         * @param data The data to en/decrypt
+         * @param streaming Whether the top-level function will return a stream
+         * @returns
+         */
+        crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
+    }
+
+    class SymEncryptedIntegrityProtected {
+        /**
+         * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
+         * The Symmetrically Encrypted Integrity Protected Data packet is
+         * a variant of the Symmetrically Encrypted Data packet. It is a new feature
+         * created for OpenPGP that addresses the problem of detecting a modification to
+         * encrypted data. It is used in combination with a Modification Detection Code
+         * packet.
+         */
+        constructor();
+
+        /**
+         * The encrypted payload.
+         */
+        encrypted: any;
+
+        /**
+         * If after decrypting the packet this is set to true,
+         * a modification has been detected and thus the contents
+         * should be discarded.
+         */
+        modification: boolean;
+
+        /**
+         * Encrypt the payload in the packet.
+         * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+         * @param key The key of cipher blocksize length to be used
+         * @param streaming Whether to set this.encrypted to a stream
+         * @returns
+         */
+        encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+
+        /**
+         * Decrypts the encrypted data contained in the packet.
+         * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+         * @param key The key of cipher blocksize length to be used
+         * @param streaming Whether to read this.encrypted as a stream
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+    }
+
+    class SymEncryptedSessionKey {
+        /**
+         * Public-Key Encrypted Session Key Packets (Tag 1)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+         * A Public-Key Encrypted Session Key packet holds the session key
+         * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+         * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+         * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+         * message is encrypted with the session key, and the session key is itself
+         * encrypted and stored in the Encrypted Session Key packet(s). The
+         * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+         * Session Key packet for each OpenPGP key to which the message is encrypted.
+         * The recipient of the message finds a session key that is encrypted to their
+         * public key, decrypts the session key, and then uses the session key to
+         * decrypt the message.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a symmetric encrypted session key packet (tag 3).
+         * @param input Payload of a tag 1 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
+
+        /**
+         * Decrypts the session key
+         * @param passphrase The passphrase in string form
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Encrypts the session key
+         * @param passphrase The passphrase in string form
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SymmetricallyEncrypted {
+        /**
+         * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
+         * The Symmetrically Encrypted Data packet contains data encrypted with a
+         * symmetric-key algorithm. When it has been decrypted, it contains other
+         * packets (usually a literal data packet or compressed data packet, but in
+         * theory other Symmetrically Encrypted Data packets or sequences of packets
+         * that form whole OpenPGP messages).
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Decrypted packets contained within.
+         */
+        packets: List;
+
+        /**
+         * When true, decrypt fails if message is not integrity protected
+         * @see module:config.ignore_mdc_error
+         */
+        ignore_mdc_error: any;
+
+        /**
+         * Decrypt the symmetrically-encrypted packet data
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param sessionKeyAlgorithm Symmetric key algorithm to use
+         * @param key The key of cipher blocksize length to be used
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+
+        /**
+         * Encrypt the symmetrically-encrypted packet data
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param sessionKeyAlgorithm Symmetric key algorithm to use
+         * @param key The key of cipher blocksize length to be used
+         * @returns
+         */
+        encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+    }
+
+    class Trust {
+        /**
+         * Implementation of the Trust Packet (Tag 12)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
+         * The Trust packet is used only within keyrings and is not normally
+         * exported.  Trust packets contain data that record the user's
+         * specifications of which key holders are trustworthy introducers,
+         * along with other information that implementing software uses for
+         * trust information.  The format of Trust packets is defined by a given
+         * implementation.
+         * Trust packets SHOULD NOT be emitted to output streams that are
+         * transferred to other users, and they SHOULD be ignored on any input
+         * other than local keyring files.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a trust packet (tag 12).
+         * Currently not implemented as we ignore trust packets
+         * @param byptes payload of a tag 12 packet
+         */
+        read(byptes: string): void;
+    }
+
+    class UserAttribute {
+        /**
+         * Implementation of the User Attribute Packet (Tag 17)
+         * The User Attribute packet is a variation of the User ID packet.  It
+         * is capable of storing more types of data than the User ID packet,
+         * which is limited to text.  Like the User ID packet, a User Attribute
+         * packet may be certified by the key owner ("self-signed") or any other
+         * key owner who cares to certify it.  Except as noted, a User Attribute
+         * packet may be used anywhere that a User ID packet may be used.
+         * While User Attribute packets are not a required part of the OpenPGP
+         * standard, implementations SHOULD provide at least enough
+         * compatibility to properly handle a certification signature on the
+         * User Attribute packet.  A simple way to do this is by treating the
+         * User Attribute packet as a User ID packet with opaque contents, but
+         * an implementation may use any method desired.
+         */
+        constructor();
+
+        /**
+         * parsing function for a user attribute packet (tag 17).
+         * @param input payload of a tag 17 packet
+         */
+        read(input: Uint8Array): void;
+
+        /**
+         * Creates a binary representation of the user attribute packet
+         * @returns string representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Compare for equality
+         * @param usrAttr
+         * @returns true if equal
+         */
+        equals(usrAttr: UserAttribute): boolean;
+    }
+
+    class Userid {
+        /**
+         * Implementation of the User ID Packet (Tag 13)
+         * A User ID packet consists of UTF-8 text that is intended to represent
+         * the name and email address of the key holder.  By convention, it
+         * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
+         * restrictions on its content.  The packet length in the header
+         * specifies the length of the User ID.
+         */
+        constructor();
+
+        /**
+         * A string containing the user id. Usually in the form
+         * John Doe <john@example.com>
+         */
+        userid: string;
+
+        /**
+         * Parsing function for a user id packet (tag 13).
+         * @param input payload of a tag 13 packet
+         */
+        read(input: Uint8Array): void;
+
+        /**
+         * Parse userid string, e.g. 'John Doe <john@example.com>'
+         */
+        parse(): void;
+
+        /**
+         * Creates a binary representation of the user id packet
+         * @returns binary representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
+         */
+        format(): void;
+    }
+
+    namespace all_packets {
+        /**
+         * @see module:packet.Compressed
+         */
+        var Compressed: any;
+
+        /**
+         * @see module:packet.SymEncryptedIntegrityProtected
+         */
+        var SymEncryptedIntegrityProtected: any;
+
+        /**
+         * @see module:packet.SymEncryptedAEADProtected
+         */
+        var SymEncryptedAEADProtected: any;
+
+        /**
+         * @see module:packet.PublicKeyEncryptedSessionKey
+         */
+        var PublicKeyEncryptedSessionKey: any;
+
+        /**
+         * @see module:packet.SymEncryptedSessionKey
+         */
+        var SymEncryptedSessionKey: any;
+
+        /**
+         * @see module:packet.Literal
+         */
+        var Literal: any;
+
+        /**
+         * @see module:packet.PublicKey
+         */
+        var PublicKey: any;
+
+        /**
+         * @see module:packet.SymmetricallyEncrypted
+         */
+        var SymmetricallyEncrypted: any;
+
+        /**
+         * @see module:packet.Marker
+         */
+        var Marker: any;
+
+        /**
+         * @see module:packet.PublicSubkey
+         */
+        var PublicSubkey: any;
+
+        /**
+         * @see module:packet.UserAttribute
+         */
+        var UserAttribute: any;
+
+        /**
+         * @see module:packet.OnePassSignature
+         */
+        var OnePassSignature: any;
+
+        /**
+         * @see module:packet.SecretKey
+         */
+        var SecretKey: any;
+
+        /**
+         * @see module:packet.Userid
+         */
+        var Userid: any;
+
+        /**
+         * @see module:packet.SecretSubkey
+         */
+        var SecretSubkey: any;
+
+        /**
+         * @see module:packet.Signature
+         */
+        var Signature: any;
+
+        /**
+         * @see module:packet.Trust
+         */
+        var Trust: any;
+    }
+
+    namespace clone {
+        /**
+         * Create a packetlist from the correspoding object types.
+         * @param options the object passed to and from the web worker
+         * @returns a mutated version of the options optject
+         */
+        function clonePackets(options: object): object;
+
+        /**
+         * Creates an object with the correct prototype from a corresponding packetlist.
+         * @param options the object passed to and from the web worker
+         * @param method the public api function name to be delegated to the worker
+         * @returns a mutated version of the options optject
+         */
+        function parseClonedPackets(options: object, method: string): object;
+    }
+
     namespace packet {
         /**
-         * Allocate a new packet
-         * @param tag property name from {@link module:enums.packet}
-         * @returns new packet object with type based on tag
+         * Encodes a given integer of length to the openpgp length specifier to a
+         * string
+         * @param length The length to encode
+         * @returns String with openpgp length representation
          */
-        function newPacketFromTag(tag: string): object;
+        function writeSimpleLength(length: Integer): Uint8Array;
 
         /**
-         * Allocate a new packet from structured packet clone
-         * @see
-         * @param packetClone packet clone
-         * @returns new packet object with data from packet clone
+         * Writes a packet header version 4 with the given tag_type and length to a
+         * string
+         * @param tag_type Tag type
+         * @param length Length of the payload
+         * @returns String of the header
          */
-        function fromStructuredClone(packetClone: object): object;
-
-        class Compressed {
-            /**
-             * Implementation of the Compressed Data Packet (Tag 8)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
-             * The Compressed Data packet contains compressed data.  Typically,
-             * this packet is found as the contents of an encrypted packet, or following
-             * a Signature or One-Pass Signature packet, and contains a literal data packet.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * List of packets
-             */
-            packets: List;
-
-            /**
-             * Compression algorithm
-             * @type {compression}
-             */
-            algorithm: any;
-
-            /**
-             * Compressed packet data
-             */
-            compressed: Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Parsing function for the packet.
-             * @param bytes Payload of a tag 8 packet
-             */
-            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Return the compressed packet.
-             * @returns binary compressed packet
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Decompression method for decompressing the compressed data
-             * read by read_packet
-             */
-            decompress(): void;
-
-            /**
-             * Compress the packet data (member decompressedData)
-             */
-            compress(): void;
-        }
-
-        class Literal {
-            /**
-             * Implementation of the Literal Data Packet (Tag 11)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
-             * A Literal Data packet contains the body of a message; data that is not to be
-             * further interpreted.
-             * @param date the creation date of the literal package
-             */
-            constructor(date: Date);
-
-            /**
-             * Set the packet data to a javascript native string, end of line
-             * will be normalized to \r\n and by default text is converted to UTF8
-             * @param text Any native javascript string
-             * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
-             */
-            setText(text: string | ReadableStream<String>, format: any): void;
-
-            /**
-             * Returns literal data packets as native JavaScript string
-             * with normalized end of line to \n
-             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
-             * @returns literal data as text
-             */
-            getText(clone: boolean): string | ReadableStream<String>;
-
-            /**
-             * Set the packet data to value represented by the provided string of bytes.
-             * @param bytes The string of bytes
-             * @param {utf8 | binary | text | mime} format The format of the string of bytes
-             */
-            setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
-
-            /**
-             * Get the byte sequence representing the literal packet data
-             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
-             * @returns A sequence of bytes
-             */
-            getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Sets the filename of the literal packet data
-             * @param filename Any native javascript string
-             */
-            setFilename(filename: string): void;
-
-            /**
-             * Get the filename of the literal packet data
-             * @returns filename
-             */
-            getFilename(): string;
-
-            /**
-             * Parsing function for a literal data packet (tag 11).
-             * @param input Payload of a tag 11 packet
-             * @returns object representation
-             */
-            read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
-
-            /**
-             * Creates a string representation of the packet
-             * @returns Uint8Array representation of the packet
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-        }
-
-        class Marker {
-            /**
-             * Implementation of the strange "Marker packet" (Tag 10)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
-             * An experimental version of PGP used this packet as the Literal
-             * packet, but no released version of PGP generated Literal packets with this
-             * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
-             * the Marker packet.
-             * Such a packet MUST be ignored when received.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a literal data packet (tag 10).
-             * @param input Payload of a tag 10 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: string, position: Integer, len: Integer): Marker;
-        }
-
-        class OnePassSignature {
-            /**
-             * Implementation of the One-Pass Signature Packets (Tag 4)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
-             * The One-Pass Signature packet precedes the signed data and contains
-             * enough information to allow the receiver to begin calculating any
-             * hashes needed to verify the signature.  It allows the Signature
-             * packet to be placed at the end of the message, so that the signer
-             * can compute the entire signed message in one pass.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * A one-octet version number.  The current version is 3.
-             */
-            version: any;
-
-            /**
-             * A one-octet signature type.
-             * Signature types are described in
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
-             */
-            signatureType: any;
-
-            /**
-             * A one-octet number describing the hash algorithm used.
-             * @see
-             */
-            hashAlgorithm: any;
-
-            /**
-             * A one-octet number describing the public-key algorithm used.
-             * @see
-             */
-            publicKeyAlgorithm: any;
-
-            /**
-             * An eight-octet number holding the Key ID of the signing key.
-             */
-            issuerKeyId: any;
-
-            /**
-             * A one-octet number holding a flag showing whether the signature is nested.
-             * A zero value indicates that the next packet is another One-Pass Signature packet
-             * that describes another signature to be applied to the same message data.
-             */
-            flags: any;
-
-            /**
-             * parsing function for a one-pass signature packet (tag 4).
-             * @param bytes payload of a tag 4 packet
-             * @returns object representation
-             */
-            read(bytes: Uint8Array): OnePassSignature;
-
-            /**
-             * creates a string representation of a one-pass signature packet
-             * @returns a Uint8Array representation of a one-pass signature packet
-             */
-            write(): Uint8Array;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class List {
-            /**
-             * This class represents a list of openpgp packets.
-             * Take care when iterating over it - the packets themselves
-             * are stored as numerical indices.
-             */
-            constructor();
-
-            /**
-             * The number of packets contained within the list.
-             */
-            readonly length: Integer;
-
-            /**
-             * Reads a stream of binary data and interprents it as a list of packets.
-             * @param A Uint8Array of bytes.
-             */
-            read(A: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Creates a binary representation of openpgp objects contained within the
-             * class instance.
-             * @returns A Uint8Array containing valid openpgp packets.
-             */
-            write(): Uint8Array;
-
-            /**
-             * Adds a packet to the list. This is the only supported method of doing so;
-             * writing to packetlist[i] directly will result in an error.
-             * @param packet Packet to push
-             */
-            push(packet: object): void;
-
-            /**
-             * Creates a new PacketList with all packets from the given types
-             */
-            filterByTag(): void;
-
-            /**
-             * Traverses packet tree and returns first matching packet
-             * @param type The packet type
-             * @returns
-             */
-            findPacket(type: enums.packet): List | undefined;
-
-            /**
-             * Returns array of found indices by tag
-             */
-            indexOfTag(): void;
-
-            /**
-             * Concatenates packetlist or array of packets
-             */
-            concat(): void;
-
-            /**
-             * Allocate a new packetlist from structured packetlist clone
-             * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
-             * @param packetClone packetlist clone
-             * @returns new packetlist object with data from packetlist clone
-             */
-            static fromStructuredClone(packetClone: object): object;
-        }
-
-        class PublicKey {
-            /**
-             * Implementation of the Key Material Packet (Tag 5,6,7,14)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
-             * A key material packet contains all the information about a public or
-             * private key.  There are four variants of this packet type, and two
-             * major versions.
-             * A Public-Key packet starts a series of packets that forms an OpenPGP
-             * key (sometimes called an OpenPGP certificate).
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
-             * called by read_tag&lt;num&gt;
-             * @param bytes Input array to read the packet from
-             * @returns This object with attributes set by the parser
-             */
-            read(bytes: Uint8Array): object;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Same as write_private_key, but has less information because of
-             * public key.
-             * @returns OpenPGP packet body contents,
-             */
-            write(): Uint8Array;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class PublicKeyEncryptedSessionKey {
-            /**
-             * Public-Key Encrypted Session Key Packets (Tag 1)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
-             * A Public-Key Encrypted Session Key packet holds the session key
-             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
-             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
-             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
-             * message is encrypted with the session key, and the session key is itself
-             * encrypted and stored in the Encrypted Session Key packet(s). The
-             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
-             * Session Key packet for each OpenPGP key to which the message is encrypted.
-             * The recipient of the message finds a session key that is encrypted to their
-             * public key, decrypts the session key, and then uses the session key to
-             * decrypt the message.
-             */
-            constructor();
-
-            encrypted: any[];
-
-            /**
-             * Parsing function for a publickey encrypted session key packet (tag 1).
-             * @param input Payload of a tag 1 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
-
-            /**
-             * Create a string representation of a tag 1 packet
-             * @returns The Uint8Array representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Encrypt session key packet
-             * @param key Public key
-             * @returns
-             */
-            encrypt(key: PublicKey): Promise<Boolean>;
-
-            /**
-             * Decrypts the session key (only for public key encrypted session key
-             * packets (tag 1)
-             * @param key Private key with secret params unlocked
-             * @returns
-             */
-            decrypt(key: SecretKey): Promise<Boolean>;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class PublicSubkey {
-            /**
-             * A Public-Subkey packet (tag 14) has exactly the same format as a
-             * Public-Key packet, but denotes a subkey.  One or more subkeys may be
-             * associated with a top-level key.  By convention, the top-level key
-             * provides signature services, and the subkeys provide encryption
-             * services.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
-             * called by read_tag&lt;num&gt;
-             * @param bytes Input array to read the packet from
-             * @returns This object with attributes set by the parser
-             */
-            read(bytes: Uint8Array): object;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Same as write_private_key, but has less information because of
-             * public key.
-             * @returns OpenPGP packet body contents,
-             */
-            write(): Uint8Array;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SecretKey {
-            /**
-             * A Secret-Key packet contains all the information that is found in a
-             * Public-Key packet, including the public-key material, but also
-             * includes the secret-key material after all the public-key fields.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
-             */
-            isEncrypted: any;
-
-            /**
-             * Internal parser for private keys as specified in
-             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
-             * @param bytes Input string to read the packet from
-             */
-            read(bytes: string): void;
-
-            /**
-             * Creates an OpenPGP key packet for the given key.
-             * @returns A string of bytes containing the secret key OpenPGP packet
-             */
-            write(): string;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Encrypt the payload. By default, we use aes256 and iterated, salted string
-             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
-             * and the passphrase is empty or undefined, the key will be set as not encrypted.
-             * This can be used to remove passphrase protection after calling decrypt().
-             * @param passphrase
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Decrypts the private key params which are needed to use the key.
-             * {@link module:packet.SecretKey.isDecrypted} should be false, as
-             * otherwise calls to this function will throw an error.
-             * @param passphrase The passphrase for this private key as string
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Clear private params, return to initial state
-             */
-            clearPrivateParams(): void;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-        }
-
-        class SecretSubkey {
-            /**
-             * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
-             * Key packet and has exactly the same format.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
-             */
-            isEncrypted: any;
-
-            /**
-             * Internal parser for private keys as specified in
-             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
-             * @param bytes Input string to read the packet from
-             */
-            read(bytes: string): void;
-
-            /**
-             * Creates an OpenPGP key packet for the given key.
-             * @returns A string of bytes containing the secret key OpenPGP packet
-             */
-            write(): string;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Encrypt the payload. By default, we use aes256 and iterated, salted string
-             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
-             * and the passphrase is empty or undefined, the key will be set as not encrypted.
-             * This can be used to remove passphrase protection after calling decrypt().
-             * @param passphrase
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Decrypts the private key params which are needed to use the key.
-             * {@link module:packet.SecretKey.isDecrypted} should be false, as
-             * otherwise calls to this function will throw an error.
-             * @param passphrase The passphrase for this private key as string
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Clear private params, return to initial state
-             */
-            clearPrivateParams(): void;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-        }
-
-        class Signature {
-            /**
-             * Implementation of the Signature Packet (Tag 2)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
-             * A Signature packet describes a binding between some public key and
-             * some data.  The most common signatures are a signature of a file or a
-             * block of text, and a signature that is a certification of a User ID.
-             * @param date the creation date of the signature
-             */
-            constructor(date: Date);
-
-            /**
-             * parsing function for a signature packet (tag 2).
-             * @param bytes payload of a tag 2 packet
-             * @param position position to start reading from the bytes string
-             * @param len length of the packet or the remaining length of bytes at position
-             * @returns object representation
-             */
-            read(bytes: string, position: Integer, len: Integer): Signature;
-
-            /**
-             * Signs provided data. This needs to be done prior to serialization.
-             * @param key private key used to sign the message.
-             * @param data Contains packets to be signed.
-             * @returns
-             */
-            sign(key: SecretKey, data: object): Promise<Boolean>;
-
-            /**
-             * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
-             * @returns subpacket data
-             */
-            write_hashed_sub_packets(): Uint8Array;
-
-            /**
-             * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
-             * @returns subpacket data
-             */
-            write_unhashed_sub_packets(): Uint8Array;
-
-            /**
-             * verifys the signature packet. Note: not signature types are implemented
-             * @param key the public key to verify the signature
-             * @param signatureType expected signature type
-             * @param data data which on the signature applies
-             * @returns True if message is verified, else false.
-             */
-            verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
-
-            /**
-             * Verifies signature expiration date
-             * @param date (optional) use the given date for verification instead of the current time
-             * @returns true if expired
-             */
-            isExpired(date: Date): boolean;
-
-            /**
-             * Returns the expiration time of the signature or Infinity if signature does not expire
-             * @returns expiration time
-             */
-            getExpirationTime(): Date;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SymEncryptedAEADProtected {
-            /**
-             * Implementation of the Symmetrically Encrypted Authenticated Encryption with
-             * Additional Data (AEAD) Protected Data Packet
-             * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
-             * AEAD Protected Data Packet
-             */
-            constructor();
-
-            /**
-             * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
-             * @param bytes
-             */
-            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
-             * @returns The encrypted payload
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Decrypt the encrypted payload.
-             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
-             * @param key The session key used to encrypt the payload
-             * @param streaming Whether the top-level function will return a stream
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
-
-            /**
-             * Encrypt the packet list payload.
-             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
-             * @param key The session key used to encrypt the payload
-             * @param streaming Whether the top-level function will return a stream
-             */
-            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
-
-            /**
-             * En/decrypt the payload.
-             * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
-             * @param key The session key used to en/decrypt the payload
-             * @param data The data to en/decrypt
-             * @param streaming Whether the top-level function will return a stream
-             * @returns
-             */
-            crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
-        }
-
-        class SymEncryptedIntegrityProtected {
-            /**
-             * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
-             * The Symmetrically Encrypted Integrity Protected Data packet is
-             * a variant of the Symmetrically Encrypted Data packet. It is a new feature
-             * created for OpenPGP that addresses the problem of detecting a modification to
-             * encrypted data. It is used in combination with a Modification Detection Code
-             * packet.
-             */
-            constructor();
-
-            /**
-             * The encrypted payload.
-             */
-            encrypted: any;
-
-            /**
-             * If after decrypting the packet this is set to true,
-             * a modification has been detected and thus the contents
-             * should be discarded.
-             */
-            modification: boolean;
-
-            /**
-             * Encrypt the payload in the packet.
-             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
-             * @param key The key of cipher blocksize length to be used
-             * @param streaming Whether to set this.encrypted to a stream
-             * @returns
-             */
-            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
-
-            /**
-             * Decrypts the encrypted data contained in the packet.
-             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
-             * @param key The key of cipher blocksize length to be used
-             * @param streaming Whether to read this.encrypted as a stream
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
-        }
-
-        class SymEncryptedSessionKey {
-            /**
-             * Public-Key Encrypted Session Key Packets (Tag 1)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
-             * A Public-Key Encrypted Session Key packet holds the session key
-             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
-             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
-             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
-             * message is encrypted with the session key, and the session key is itself
-             * encrypted and stored in the Encrypted Session Key packet(s). The
-             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
-             * Session Key packet for each OpenPGP key to which the message is encrypted.
-             * The recipient of the message finds a session key that is encrypted to their
-             * public key, decrypts the session key, and then uses the session key to
-             * decrypt the message.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a symmetric encrypted session key packet (tag 3).
-             * @param input Payload of a tag 1 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
-
-            /**
-             * Decrypts the session key
-             * @param passphrase The passphrase in string form
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Encrypts the session key
-             * @param passphrase The passphrase in string form
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SymmetricallyEncrypted {
-            /**
-             * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
-             * The Symmetrically Encrypted Data packet contains data encrypted with a
-             * symmetric-key algorithm. When it has been decrypted, it contains other
-             * packets (usually a literal data packet or compressed data packet, but in
-             * theory other Symmetrically Encrypted Data packets or sequences of packets
-             * that form whole OpenPGP messages).
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Decrypted packets contained within.
-             */
-            packets: List;
-
-            /**
-             * When true, decrypt fails if message is not integrity protected
-             * @see module:config.ignore_mdc_error
-             */
-            ignore_mdc_error: any;
-
-            /**
-             * Decrypt the symmetrically-encrypted packet data
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param sessionKeyAlgorithm Symmetric key algorithm to use
-             * @param key The key of cipher blocksize length to be used
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
-
-            /**
-             * Encrypt the symmetrically-encrypted packet data
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param sessionKeyAlgorithm Symmetric key algorithm to use
-             * @param key The key of cipher blocksize length to be used
-             * @returns
-             */
-            encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
-        }
-
-        class Trust {
-            /**
-             * Implementation of the Trust Packet (Tag 12)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
-             * The Trust packet is used only within keyrings and is not normally
-             * exported.  Trust packets contain data that record the user's
-             * specifications of which key holders are trustworthy introducers,
-             * along with other information that implementing software uses for
-             * trust information.  The format of Trust packets is defined by a given
-             * implementation.
-             * Trust packets SHOULD NOT be emitted to output streams that are
-             * transferred to other users, and they SHOULD be ignored on any input
-             * other than local keyring files.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a trust packet (tag 12).
-             * Currently not implemented as we ignore trust packets
-             * @param byptes payload of a tag 12 packet
-             */
-            read(byptes: string): void;
-        }
-
-        class UserAttribute {
-            /**
-             * Implementation of the User Attribute Packet (Tag 17)
-             * The User Attribute packet is a variation of the User ID packet.  It
-             * is capable of storing more types of data than the User ID packet,
-             * which is limited to text.  Like the User ID packet, a User Attribute
-             * packet may be certified by the key owner ("self-signed") or any other
-             * key owner who cares to certify it.  Except as noted, a User Attribute
-             * packet may be used anywhere that a User ID packet may be used.
-             * While User Attribute packets are not a required part of the OpenPGP
-             * standard, implementations SHOULD provide at least enough
-             * compatibility to properly handle a certification signature on the
-             * User Attribute packet.  A simple way to do this is by treating the
-             * User Attribute packet as a User ID packet with opaque contents, but
-             * an implementation may use any method desired.
-             */
-            constructor();
-
-            /**
-             * parsing function for a user attribute packet (tag 17).
-             * @param input payload of a tag 17 packet
-             */
-            read(input: Uint8Array): void;
-
-            /**
-             * Creates a binary representation of the user attribute packet
-             * @returns string representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Compare for equality
-             * @param usrAttr
-             * @returns true if equal
-             */
-            equals(usrAttr: UserAttribute): boolean;
-        }
-
-        class Userid {
-            /**
-             * Implementation of the User ID Packet (Tag 13)
-             * A User ID packet consists of UTF-8 text that is intended to represent
-             * the name and email address of the key holder.  By convention, it
-             * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
-             * restrictions on its content.  The packet length in the header
-             * specifies the length of the User ID.
-             */
-            constructor();
-
-            /**
-             * A string containing the user id. Usually in the form
-             * John Doe <john@example.com>
-             */
-            userid: string;
-
-            /**
-             * Parsing function for a user id packet (tag 13).
-             * @param input payload of a tag 13 packet
-             */
-            read(input: Uint8Array): void;
-
-            /**
-             * Parse userid string, e.g. 'John Doe <john@example.com>'
-             */
-            parse(): void;
-
-            /**
-             * Creates a binary representation of the user id packet
-             * @returns binary representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
-             */
-            format(): void;
-        }
-
-        namespace all_packets {
-            /**
-             * @see module:packet.Compressed
-             */
-            var Compressed: any;
-
-            /**
-             * @see module:packet.SymEncryptedIntegrityProtected
-             */
-            var SymEncryptedIntegrityProtected: any;
-
-            /**
-             * @see module:packet.SymEncryptedAEADProtected
-             */
-            var SymEncryptedAEADProtected: any;
-
-            /**
-             * @see module:packet.PublicKeyEncryptedSessionKey
-             */
-            var PublicKeyEncryptedSessionKey: any;
-
-            /**
-             * @see module:packet.SymEncryptedSessionKey
-             */
-            var SymEncryptedSessionKey: any;
-
-            /**
-             * @see module:packet.Literal
-             */
-            var Literal: any;
-
-            /**
-             * @see module:packet.PublicKey
-             */
-            var PublicKey: any;
-
-            /**
-             * @see module:packet.SymmetricallyEncrypted
-             */
-            var SymmetricallyEncrypted: any;
-
-            /**
-             * @see module:packet.Marker
-             */
-            var Marker: any;
-
-            /**
-             * @see module:packet.PublicSubkey
-             */
-            var PublicSubkey: any;
-
-            /**
-             * @see module:packet.UserAttribute
-             */
-            var UserAttribute: any;
-
-            /**
-             * @see module:packet.OnePassSignature
-             */
-            var OnePassSignature: any;
-
-            /**
-             * @see module:packet.SecretKey
-             */
-            var SecretKey: any;
-
-            /**
-             * @see module:packet.Userid
-             */
-            var Userid: any;
-
-            /**
-             * @see module:packet.SecretSubkey
-             */
-            var SecretSubkey: any;
-
-            /**
-             * @see module:packet.Signature
-             */
-            var Signature: any;
-
-            /**
-             * @see module:packet.Trust
-             */
-            var Trust: any;
-        }
-
-        namespace clone {
-            /**
-             * Create a packetlist from the correspoding object types.
-             * @param options the object passed to and from the web worker
-             * @returns a mutated version of the options optject
-             */
-            function clonePackets(options: object): object;
-
-            /**
-             * Creates an object with the correct prototype from a corresponding packetlist.
-             * @param options the object passed to and from the web worker
-             * @param method the public api function name to be delegated to the worker
-             * @returns a mutated version of the options optject
-             */
-            function parseClonedPackets(options: object, method: string): object;
-        }
-
-        namespace packet {
-            /**
-             * Encodes a given integer of length to the openpgp length specifier to a
-             * string
-             * @param length The length to encode
-             * @returns String with openpgp length representation
-             */
-            function writeSimpleLength(length: Integer): Uint8Array;
-
-            /**
-             * Writes a packet header version 4 with the given tag_type and length to a
-             * string
-             * @param tag_type Tag type
-             * @param length Length of the payload
-             * @returns String of the header
-             */
-            function writeHeader(tag_type: Integer, length: Integer): string;
-
-            /**
-             * Writes a packet header Version 3 with the given tag_type and length to a
-             * string
-             * @param tag_type Tag type
-             * @param length Length of the payload
-             * @returns String of the header
-             */
-            function writeOldHeader(tag_type: Integer, length: Integer): string;
-
-            /**
-             * Whether the packet type supports partial lengths per RFC4880
-             * @param tag_type Tag type
-             * @returns String of the header
-             */
-            function supportsStreaming(tag_type: Integer): boolean;
-
-            /**
-             * Generic static Packet Parser function
-             * @param input Input stream as string
-             * @param callback Function to call with the parsed packet
-             * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
-             */
-            function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
-        }
+        function writeHeader(tag_type: Integer, length: Integer): string;
+
+        /**
+         * Writes a packet header Version 3 with the given tag_type and length to a
+         * string
+         * @param tag_type Tag type
+         * @param length Length of the payload
+         * @returns String of the header
+         */
+        function writeOldHeader(tag_type: Integer, length: Integer): string;
+
+        /**
+         * Whether the packet type supports partial lengths per RFC4880
+         * @param tag_type Tag type
+         * @returns String of the header
+         */
+        function supportsStreaming(tag_type: Integer): boolean;
+
+        /**
+         * Generic static Packet Parser function
+         * @param input Input stream as string
+         * @param callback Function to call with the parsed packet
+         * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
     }
+}
 
 
-    namespace polyfills {
-    }
+export namespace polyfills {
+}
 
-    namespace signature {
-        /**
-         * Class that represents an OpenPGP signature.
-         */
-        class Signature {
-            /**
-             * @param packetlist The signature packets
-             */
-            constructor(packetlist: packet.List);
-
-            /**
-             * Returns ASCII armored text of signature
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
-        }
-
-        /**
-         * reads an OpenPGP armored signature and returns a signature object
-         * @param armoredText text to be parsed
-         * @returns new signature object
-         */
-        function readArmored(armoredText: string | ReadableStream<String>): Signature;
-
-        /**
-         * reads an OpenPGP signature as byte array and returns a signature object
-         * @param input binary signature
-         * @returns new signature object
-         */
-        function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
-    }
-
-    namespace type {
-        /**
-         * Encoded symmetric key for ECDH
-         */
-        namespace ecdh_symkey {
-            class ECDHSymmetricKey {
-                constructor();
-
-                /**
-                 * Read an ECDHSymmetricKey from an Uint8Array
-                 * @param input Where to read the encoded symmetric key from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Write an ECDHSymmetricKey as an Uint8Array
-                 * @returns An array containing the value
-                 */
-                write(): Uint8Array;
-            }
-        }
-
-        /**
-         * Implementation of type KDF parameters
-         * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
-         * A key derivation function (KDF) is necessary to implement the EC
-         * encryption.  The Concatenation Key Derivation Function (Approved
-         * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
-         * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
-         */
-        namespace kdf_params {
-            class KDFParams {
-                /**
-                 * @param hash Hash algorithm
-                 * @param cipher Symmetric algorithm
-                 */
-                constructor(hash: enums.hash, cipher: enums.symmetric);
-
-                /**
-                 * Read KDFParams from an Uint8Array
-                 * @param input Where to read the KDFParams from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Write KDFParams to an Uint8Array
-                 * @returns Array with the KDFParams value
-                 */
-                write(): Uint8Array;
-            }
-        }
-
-        /**
-         * Implementation of type key id
-         * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
-         * A Key ID is an eight-octet scalar that identifies a key.
-         * Implementations SHOULD NOT assume that Key IDs are unique.  The
-         * section "Enhanced Key Formats" below describes how Key IDs are
-         * formed.
-         */
-        namespace keyid {
-            class Keyid {
-                constructor();
-
-                /**
-                 * Parsing method for a key id
-                 * @param input Input to read the key id from
-                 */
-                read(input: Uint8Array): void;
-
-                /**
-                 * Checks equality of Key ID's
-                 * @param keyid
-                 * @param matchWildcard Indicates whether to check if either keyid is a wildcard
-                 */
-                equals(keyid: Keyid, matchWildcard: boolean): void;
-            }
-        }
-
-        /**
-         * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
-         * Multiprecision integers (also called MPIs) are unsigned integers used
-         * to hold large integers such as the ones used in cryptographic
-         * calculations.
-         * An MPI consists of two pieces: a two-octet scalar that is the length
-         * of the MPI in bits followed by a string of octets that contain the
-         * actual integer.
-         */
-        namespace mpi {
-            class MPI {
-                constructor();
-
-                /**
-                 * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
-                 * @param input Payload of MPI data
-                 * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
-                 * @returns Length of data read
-                 */
-                read(input: Uint8Array, endian: string): Integer;
-
-                /**
-                 * Converts the mpi object to a bytes as specified in
-                 * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
-                 * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
-                 * @param length Length of the data part of the MPI
-                 * @returns mpi Byte representation
-                 */
-                write(endian: string, length: Integer): Uint8Array;
-            }
-        }
-
-        /**
-         * Wrapper to an OID value
-         * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
-         * The sequence of octets in the third column is the result of applying
-         * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
-         * with subsequent truncation.  The truncation removes the two fields of
-         * encoded Object Identifier.  The first omitted field is one octet
-         * representing the Object Identifier tag, and the second omitted field
-         * is the length of the Object Identifier body.  For example, the
-         * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
-         * 86 48 CE 3D 03 01 07", from which the first entry in the table above
-         * is constructed by omitting the first two octets.  Only the truncated
-         * sequence of octets is the valid representation of a curve OID.
-         */
-        namespace oid {
-            class OID {
-                constructor();
-
-                /**
-                 * Method to read an OID object
-                 * @param input Where to read the OID from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Serialize an OID object
-                 * @returns Array with the serialized value the OID
-                 */
-                write(): Uint8Array;
-
-                /**
-                 * Serialize an OID object as a hex string
-                 * @returns String with the hex value of the OID
-                 */
-                toHex(): string;
-
-                /**
-                 * If a known curve object identifier, return the canonical name of the curve
-                 * @returns String with the canonical name of the curve
-                 */
-                getName(): string;
-            }
-        }
-
-        /**
-     * Implementation of the String-to-key specifier
-     * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
-     * String-to-key (S2K) specifiers are used to convert passphrase strings
-     * into symmetric-key encryption/decryption keys.  They are used in two
-     * places, currently: to encrypt the secret part of private keys in the
-     * private keyring, and to convert passphrases to encryption keys for
-     * symmetrically encrypted messages.
+export namespace signature {
+    /**
+     * Class that represents an OpenPGP signature.
      */
-        namespace s2k {
-            class S2K {
-                constructor();
+    class Signature {
+        /**
+         * @param packetlist The signature packets
+         */
+        constructor(packetlist: packet.List);
 
-                algorithm: enums.hash;
+        /**
+         * Returns ASCII armored text of signature
+         * @returns ASCII armor
+         */
+        armor(): ReadableStream<String>;
+    }
 
-                type: enums.s2k;
+    /**
+     * reads an OpenPGP armored signature and returns a signature object
+     * @param armoredText text to be parsed
+     * @returns new signature object
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Signature;
 
-                c: Integer;
+    /**
+     * reads an OpenPGP signature as byte array and returns a signature object
+     * @param input binary signature
+     * @returns new signature object
+     */
+    function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
+}
 
-                /**
-                 * Eight bytes of salt in a binary string.
-                 */
-                salt: string;
+export namespace type {
+    /**
+     * Encoded symmetric key for ECDH
+     */
+    namespace ecdh_symkey {
+        class ECDHSymmetricKey {
+            constructor();
 
-                /**
-                 * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
-                 * @param input Payload of string-to-key specifier
-                 * @returns Actual length of the object
-                 */
-                read(input: string): Integer;
+            /**
+             * Read an ECDHSymmetricKey from an Uint8Array
+             * @param input Where to read the encoded symmetric key from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
 
-                /**
-                 * Serializes s2k information
-                 * @returns binary representation of s2k
-                 */
-                write(): Uint8Array;
-
-                /**
-                 * Produces a key using the specified passphrase and the defined
-                 * hashAlgorithm
-                 * @param passphrase Passphrase containing user input
-                 * @returns Produced key with a length corresponding to
-                 *          hashAlgorithm hash length
-                 */
-                produce_key(passphrase: string): Uint8Array;
-            }
+            /**
+             * Write an ECDHSymmetricKey as an Uint8Array
+             * @returns An array containing the value
+             */
+            write(): Uint8Array;
         }
     }
 
     /**
-     * This object contains utility functions
+     * Implementation of type KDF parameters
+     * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
+     * A key derivation function (KDF) is necessary to implement the EC
+     * encryption.  The Concatenation Key Derivation Function (Approved
+     * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
+     * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
      */
-    namespace util {
-        /**
-         * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
-         * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
-         * Also, convert ReadableStreams to MessagePorts
-         * @param obj the options object to be passed to the web worker
-         * @returns an array of binary data to be passed
-         */
-        function getTransferables(obj: object): any[];
+    namespace kdf_params {
+        class KDFParams {
+            /**
+             * @param hash Hash algorithm
+             * @param cipher Symmetric algorithm
+             */
+            constructor(hash: enums.hash, cipher: enums.symmetric);
 
-        /**
-         * Convert MessagePorts back to ReadableStreams
-         * @param obj
-         * @returns
-         */
-        function restoreStreams(obj: object): object;
+            /**
+             * Read KDFParams from an Uint8Array
+             * @param input Where to read the KDFParams from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
 
-        /**
-         * Create hex string from a binary
-         * @param str String to convert
-         * @returns String containing the hexadecimal values
-         */
-        function str_to_hex(str: string): string;
-
-        /**
-         * Create binary string from a hex encoded string
-         * @param str Hex string to convert
-         * @returns
-         */
-        function hex_to_str(str: string): string;
-
-        /**
-         * Convert a Uint8Array to an MPI-formatted Uint8Array.
-         * Note: the output is **not** an MPI object.
-         * @see
-         * @see
-         * @param bin An array of 8-bit integers to convert
-         * @returns MPI-formatted Uint8Array
-         */
-        function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
-
-        /**
-         * Convert a Base-64 encoded string an array of 8-bit integer
-         * Note: accepts both Radix-64 and URL-safe strings
-         * @param base64 Base-64 encoded string to convert
-         * @returns An array of 8-bit integers
-         */
-        function b64_to_Uint8Array(base64: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integer to a Base-64 encoded string
-         * @param bytes An array of 8-bit integers to convert
-         * @param url If true, output is URL-safe
-         * @returns Base-64 encoded string
-         */
-        function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
-
-        /**
-         * Convert a hex string to an array of 8-bit integers
-         * @param hex A hex string to convert
-         * @returns An array of 8-bit integers
-         */
-        function hex_to_Uint8Array(hex: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integers to a hex string
-         * @param bytes Array of 8-bit integers to convert
-         * @returns Hexadecimal representation of the array
-         */
-        function Uint8Array_to_hex(bytes: Uint8Array): string;
-
-        /**
-         * Convert a string to an array of 8-bit integers
-         * @param str String to convert
-         * @returns An array of 8-bit integers
-         */
-        function str_to_Uint8Array(str: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integers to a string
-         * @param bytes An array of 8-bit integers to convert
-         * @returns String representation of the array
-         */
-        function Uint8Array_to_str(bytes: Uint8Array): string;
-
-        /**
-         * Convert a native javascript string to a Uint8Array of utf8 bytes
-         * @param str The string to convert
-         * @returns A valid squence of utf8 bytes
-         */
-        function encode_utf8(str: string | ReadableStream<string>): Uint8Array | ReadableStream<string>;
-
-        /**
-         * Convert a Uint8Array of utf8 bytes to a native javascript string
-         * @param utf8 A valid squence of utf8 bytes
-         * @returns A native javascript string
-         */
-        function decode_utf8(utf8: Uint8Array | ReadableStream<string>): string | ReadableStream<string>;
-
-        /**
-         * Concat a list of Uint8Arrays, Strings or Streams
-         * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
-         * @param Array of Uint8Arrays/Strings/Streams to concatenate
-         * @returns Concatenated array
-         */
-        var concat: any;
-
-        /**
-         * Concat Uint8Arrays
-         * @param Array of Uint8Arrays to concatenate
-         * @returns Concatenated array
-         */
-        var concatUint8Array: any;
-
-        /**
-         * Check Uint8Array equality
-         * @param first array
-         * @param second array
-         * @returns equality
-         */
-        function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
-
-        /**
-         * Calculates a 16bit sum of a Uint8Array by adding each character
-         * codes modulus 65535
-         * @param Uint8Array to create a sum of
-         * @returns 2 bytes containing the sum of all charcodes % 65535
-         */
-        function write_checksum(Uint8Array: Uint8Array): Uint8Array;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug(str: string): void;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_hexarray_dump(str: string): void;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_hexstr_dump(str: string): void;
-
-        /**
-         * Helper function to print a debug error. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_error(str: string): void;
-
-        /**
-         * Read a stream to the end and print it to the console when it's closed.
-         * @param str String of the debug message
-         * @param input Stream to print
-         * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
-         */
-        function print_entire_stream(str: string, input: ReadableStream<string> | Uint8Array | string, concat: Function): void;
-
-        /**
-         * If S[1] == 0, then double(S) == (S[2..128] || 0);
-         * otherwise, double(S) == (S[2..128] || 0) xor
-         * (zeros(120) || 10000111).
-         * Both OCB and EAX (through CMAC) require this function to be constant-time.
-         * @param data
-         */
-        /* Illegal function name 'double' can't be used here
-        function double(data: Uint8Array): void;
-        */
-
-        /**
-         * Shift a Uint8Array to the right by n bits
-         * @param array The array to shift
-         * @param bits Amount of bits to shift (MUST be smaller
-         *        than 8)
-         * @returns Resulting array.
-         */
-        function shiftRight(array: Uint8Array, bits: Integer): string;
-
-        /**
-         * Get native Web Cryptography api, only the current version of the spec.
-         * The default configuration is to use the api when available. But it can
-         * be deactivated with config.use_native
-         * @returns The SubtleCrypto api or 'undefined'
-         */
-        function getWebCrypto(): object;
-
-        /**
-         * Get native Web Cryptography api for all browsers, including legacy
-         * implementations of the spec e.g IE11 and Safari 8/9. The default
-         * configuration is to use the api when available. But it can be deactivated
-         * with config.use_native
-         * @returns The SubtleCrypto api or 'undefined'
-         */
-        function getWebCryptoAll(): object;
-
-        /**
-         * Detect Node.js runtime.
-         */
-        function detectNode(): void;
-
-        /**
-         * Get native Node.js module
-         * @param The module to require
-         * @returns The required module or 'undefined'
-         */
-        function nodeRequire(The: string): object;
-
-        /**
-         * Get native Node.js crypto api. The default configuration is to use
-         * the api when available. But it can also be deactivated with config.use_native
-         * @returns The crypto module or 'undefined'
-         */
-        function getNodeCrypto(): object;
-
-        /**
-         * Get native Node.js Buffer constructor. This should be used since
-         * Buffer is not available under browserify.
-         * @returns The Buffer constructor or 'undefined'
-         */
-        function getNodeBuffer(): Function;
-
-        /**
-         * Format user id for internal use.
-         */
-        function formatUserId(): void;
-
-        /**
-         * Parse user id.
-         */
-        function parseUserId(): void;
-
-        /**
-         * Normalize line endings to \r\n
-         */
-        function canonicalizeEOL(): void;
-
-        /**
-         * Convert line endings from canonicalized \r\n to native \n
-         */
-        function nativeEOL(): void;
-
-        /**
-         * Remove trailing spaces and tabs from each line
-         */
-        function removeTrailingSpaces(): void;
-
-        /**
-         * Encode input buffer using Z-Base32 encoding.
-         * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
-         * @param data The binary data to encode
-         * @returns Binary data encoded using Z-Base32
-         */
-        function encodeZBase32(data: Uint8Array): string;
+            /**
+             * Write KDFParams to an Uint8Array
+             * @returns Array with the KDFParams value
+             */
+            write(): Uint8Array;
+        }
     }
 
-    namespace wkd {
-        class WKD {
-            /**
-             * Initialize the WKD client
-             */
+    /**
+     * Implementation of type key id
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
+     * A Key ID is an eight-octet scalar that identifies a key.
+     * Implementations SHOULD NOT assume that Key IDs are unique.  The
+     * section "Enhanced Key Formats" below describes how Key IDs are
+     * formed.
+     */
+    namespace keyid {
+        class Keyid {
             constructor();
 
             /**
-             * Search for a public key using Web Key Directory protocol.
-             * @param options.email User's email.
-             * @param options.rawBytes Returns Uint8Array instead of parsed key.
-             * @returns The public key.
+             * Parsing method for a key id
+             * @param input Input to read the key id from
              */
-            lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+            read(input: Uint8Array): void;
+
+            /**
+             * Checks equality of Key ID's
+             * @param keyid
+             * @param matchWildcard Indicates whether to check if either keyid is a wildcard
+             */
+            equals(keyid: Keyid, matchWildcard: boolean): void;
         }
     }
 
-    namespace worker {
-        /**
-     * @see module:openpgp.initWorker
-     * @see module:openpgp.getWorker
-     * @see module:openpgp.destroyWorker
-     * @see module:worker/worker
+    /**
+     * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
+     * Multiprecision integers (also called MPIs) are unsigned integers used
+     * to hold large integers such as the ones used in cryptographic
+     * calculations.
+     * An MPI consists of two pieces: a two-octet scalar that is the length
+     * of the MPI in bits followed by a string of octets that contain the
+     * actual integer.
      */
-        namespace async_proxy {
-            class AsyncProxy {
-                /**
-                 * Initializes a new proxy and loads the web worker
-                 * @param path The path to the worker or 'openpgp.worker.js' by default
-                 * @param n number of workers to initialize if path given
-                 * @param config config The worker configuration
-                 * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
-                 */
-                constructor(path: string, n: number, config: object, worker: any[]);
+    namespace mpi {
+        class MPI {
+            constructor();
 
-                /**
-                 * Message handling
-                 */
-                handleMessage(): void;
+            /**
+             * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
+             * @param input Payload of MPI data
+             * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
+             * @returns Length of data read
+             */
+            read(input: Uint8Array, endian: string): Integer;
 
-                /**
-                 * Get new request ID
-                 * @returns New unique request ID
-                 */
-                getID(): Integer;
-
-                /**
-                 * Send message to worker with random data
-                 * @param size Number of bytes to send
-                 */
-                seedRandom(size: Integer): void;
-
-                /**
-                 * Terminates the workers
-                 */
-                terminate(): void;
-
-                /**
-                 * Generic proxy function that handles all commands from the public api.
-                 * @param method the public api function to be delegated to the worker thread
-                 * @param options the api function's options
-                 * @returns see the corresponding public api functions for their return types
-                 */
-                delegate(method: string, options: object): Promise<any>;
-            }
+            /**
+             * Converts the mpi object to a bytes as specified in
+             * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
+             * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
+             * @param length Length of the data part of the MPI
+             * @returns mpi Byte representation
+             */
+            write(endian: string, length: Integer): Uint8Array;
         }
+    }
+
+    /**
+     * Wrapper to an OID value
+     * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
+     * The sequence of octets in the third column is the result of applying
+     * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
+     * with subsequent truncation.  The truncation removes the two fields of
+     * encoded Object Identifier.  The first omitted field is one octet
+     * representing the Object Identifier tag, and the second omitted field
+     * is the length of the Object Identifier body.  For example, the
+     * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
+     * 86 48 CE 3D 03 01 07", from which the first entry in the table above
+     * is constructed by omitting the first two octets.  Only the truncated
+     * sequence of octets is the valid representation of a curve OID.
+     */
+    namespace oid {
+        class OID {
+            constructor();
+
+            /**
+             * Method to read an OID object
+             * @param input Where to read the OID from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
+
+            /**
+             * Serialize an OID object
+             * @returns Array with the serialized value the OID
+             */
+            write(): Uint8Array;
+
+            /**
+             * Serialize an OID object as a hex string
+             * @returns String with the hex value of the OID
+             */
+            toHex(): string;
+
+            /**
+             * If a known curve object identifier, return the canonical name of the curve
+             * @returns String with the canonical name of the curve
+             */
+            getName(): string;
+        }
+    }
+
+    /**
+ * Implementation of the String-to-key specifier
+ * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
+ * String-to-key (S2K) specifiers are used to convert passphrase strings
+ * into symmetric-key encryption/decryption keys.  They are used in two
+ * places, currently: to encrypt the secret part of private keys in the
+ * private keyring, and to convert passphrases to encryption keys for
+ * symmetrically encrypted messages.
+ */
+    namespace s2k {
+        class S2K {
+            constructor();
+
+            algorithm: enums.hash;
+
+            type: enums.s2k;
+
+            c: Integer;
+
+            /**
+             * Eight bytes of salt in a binary string.
+             */
+            salt: string;
+
+            /**
+             * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
+             * @param input Payload of string-to-key specifier
+             * @returns Actual length of the object
+             */
+            read(input: string): Integer;
+
+            /**
+             * Serializes s2k information
+             * @returns binary representation of s2k
+             */
+            write(): Uint8Array;
+
+            /**
+             * Produces a key using the specified passphrase and the defined
+             * hashAlgorithm
+             * @param passphrase Passphrase containing user input
+             * @returns Produced key with a length corresponding to
+             *          hashAlgorithm hash length
+             */
+            produce_key(passphrase: string): Uint8Array;
+        }
+    }
+}
+
+/**
+ * This object contains utility functions
+ */
+export namespace util {
+    /**
+     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+     * Also, convert ReadableStreams to MessagePorts
+     * @param obj the options object to be passed to the web worker
+     * @returns an array of binary data to be passed
+     */
+    function getTransferables(obj: object): any[];
+
+    /**
+     * Convert MessagePorts back to ReadableStreams
+     * @param obj
+     * @returns
+     */
+    function restoreStreams(obj: object): object;
+
+    /**
+     * Create hex string from a binary
+     * @param str String to convert
+     * @returns String containing the hexadecimal values
+     */
+    function str_to_hex(str: string): string;
+
+    /**
+     * Create binary string from a hex encoded string
+     * @param str Hex string to convert
+     * @returns
+     */
+    function hex_to_str(str: string): string;
+
+    /**
+     * Convert a Uint8Array to an MPI-formatted Uint8Array.
+     * Note: the output is **not** an MPI object.
+     * @see
+     * @see
+     * @param bin An array of 8-bit integers to convert
+     * @returns MPI-formatted Uint8Array
+     */
+    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
+
+    /**
+     * Convert a Base-64 encoded string an array of 8-bit integer
+     * Note: accepts both Radix-64 and URL-safe strings
+     * @param base64 Base-64 encoded string to convert
+     * @returns An array of 8-bit integers
+     */
+    function b64_to_Uint8Array(base64: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integer to a Base-64 encoded string
+     * @param bytes An array of 8-bit integers to convert
+     * @param url If true, output is URL-safe
+     * @returns Base-64 encoded string
+     */
+    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
+
+    /**
+     * Convert a hex string to an array of 8-bit integers
+     * @param hex A hex string to convert
+     * @returns An array of 8-bit integers
+     */
+    function hex_to_Uint8Array(hex: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integers to a hex string
+     * @param bytes Array of 8-bit integers to convert
+     * @returns Hexadecimal representation of the array
+     */
+    function Uint8Array_to_hex(bytes: Uint8Array): string;
+
+    /**
+     * Convert a string to an array of 8-bit integers
+     * @param str String to convert
+     * @returns An array of 8-bit integers
+     */
+    function str_to_Uint8Array(str: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integers to a string
+     * @param bytes An array of 8-bit integers to convert
+     * @returns String representation of the array
+     */
+    function Uint8Array_to_str(bytes: Uint8Array): string;
+
+    /**
+     * Convert a native javascript string to a Uint8Array of utf8 bytes
+     * @param str The string to convert
+     * @returns A valid squence of utf8 bytes
+     */
+    function encode_utf8(str: string | ReadableStream<string>): Uint8Array | ReadableStream<string>;
+
+    /**
+     * Convert a Uint8Array of utf8 bytes to a native javascript string
+     * @param utf8 A valid squence of utf8 bytes
+     * @returns A native javascript string
+     */
+    function decode_utf8(utf8: Uint8Array | ReadableStream<string>): string | ReadableStream<string>;
+
+    /**
+     * Concat a list of Uint8Arrays, Strings or Streams
+     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+     * @param Array of Uint8Arrays/Strings/Streams to concatenate
+     * @returns Concatenated array
+     */
+    var concat: any;
+
+    /**
+     * Concat Uint8Arrays
+     * @param Array of Uint8Arrays to concatenate
+     * @returns Concatenated array
+     */
+    var concatUint8Array: any;
+
+    /**
+     * Check Uint8Array equality
+     * @param first array
+     * @param second array
+     * @returns equality
+     */
+    function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
+
+    /**
+     * Calculates a 16bit sum of a Uint8Array by adding each character
+     * codes modulus 65535
+     * @param Uint8Array to create a sum of
+     * @returns 2 bytes containing the sum of all charcodes % 65535
+     */
+    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug(str: string): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexarray_dump(str: string): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexstr_dump(str: string): void;
+
+    /**
+     * Helper function to print a debug error. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_error(str: string): void;
+
+    /**
+     * Read a stream to the end and print it to the console when it's closed.
+     * @param str String of the debug message
+     * @param input Stream to print
+     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+     */
+    function print_entire_stream(str: string, input: ReadableStream<string> | Uint8Array | string, concat: Function): void;
+
+    /**
+     * If S[1] == 0, then double(S) == (S[2..128] || 0);
+     * otherwise, double(S) == (S[2..128] || 0) xor
+     * (zeros(120) || 10000111).
+     * Both OCB and EAX (through CMAC) require this function to be constant-time.
+     * @param data
+     */
+    /* Illegal function name 'double' can't be used here
+    function double(data: Uint8Array): void;
+    */
+
+    /**
+     * Shift a Uint8Array to the right by n bits
+     * @param array The array to shift
+     * @param bits Amount of bits to shift (MUST be smaller
+     *        than 8)
+     * @returns Resulting array.
+     */
+    function shiftRight(array: Uint8Array, bits: Integer): string;
+
+    /**
+     * Get native Web Cryptography api, only the current version of the spec.
+     * The default configuration is to use the api when available. But it can
+     * be deactivated with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCrypto(): object;
+
+    /**
+     * Get native Web Cryptography api for all browsers, including legacy
+     * implementations of the spec e.g IE11 and Safari 8/9. The default
+     * configuration is to use the api when available. But it can be deactivated
+     * with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCryptoAll(): object;
+
+    /**
+     * Detect Node.js runtime.
+     */
+    function detectNode(): void;
+
+    /**
+     * Get native Node.js module
+     * @param The module to require
+     * @returns The required module or 'undefined'
+     */
+    function nodeRequire(The: string): object;
+
+    /**
+     * Get native Node.js crypto api. The default configuration is to use
+     * the api when available. But it can also be deactivated with config.use_native
+     * @returns The crypto module or 'undefined'
+     */
+    function getNodeCrypto(): object;
+
+    /**
+     * Get native Node.js Buffer constructor. This should be used since
+     * Buffer is not available under browserify.
+     * @returns The Buffer constructor or 'undefined'
+     */
+    function getNodeBuffer(): Function;
+
+    /**
+     * Format user id for internal use.
+     */
+    function formatUserId(): void;
+
+    /**
+     * Parse user id.
+     */
+    function parseUserId(): void;
+
+    /**
+     * Normalize line endings to \r\n
+     */
+    function canonicalizeEOL(): void;
+
+    /**
+     * Convert line endings from canonicalized \r\n to native \n
+     */
+    function nativeEOL(): void;
+
+    /**
+     * Remove trailing spaces and tabs from each line
+     */
+    function removeTrailingSpaces(): void;
+
+    /**
+     * Encode input buffer using Z-Base32 encoding.
+     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+     * @param data The binary data to encode
+     * @returns Binary data encoded using Z-Base32
+     */
+    function encodeZBase32(data: Uint8Array): string;
+}
+
+export namespace wkd {
+    class WKD {
+        /**
+         * Initialize the WKD client
+         */
+        constructor();
 
         /**
-     * @see module:openpgp.initWorker
-     * @see module:openpgp.getWorker
-     * @see module:openpgp.destroyWorker
-     * @see module:worker/async_proxy
-     */
-        namespace worker {
+         * Search for a public key using Web Key Directory protocol.
+         * @param options.email User's email.
+         * @param options.rawBytes Returns Uint8Array instead of parsed key.
+         * @returns The public key.
+         */
+        lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+    }
+}
+
+export namespace worker {
+    /**
+ * @see module:openpgp.initWorker
+ * @see module:openpgp.getWorker
+ * @see module:openpgp.destroyWorker
+ * @see module:worker/worker
+ */
+    namespace async_proxy {
+        class AsyncProxy {
             /**
-             * Handle random buffer exhaustion by requesting more random bytes from the main window
-             * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+             * Initializes a new proxy and loads the web worker
+             * @param path The path to the worker or 'openpgp.worker.js' by default
+             * @param n number of workers to initialize if path given
+             * @param config config The worker configuration
+             * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
              */
-            function randomCallback(): Promise<Object>;
+            constructor(path: string, n: number, config: object, worker: any[]);
 
             /**
-             * Set config from main context to worker context.
-             * @param config The openpgp configuration
+             * Message handling
              */
-            function configure(config: object): void;
+            handleMessage(): void;
 
             /**
-             * Seed the library with entropy gathered window.crypto.getRandomValues
-             * as this api is only avalible in the main window.
-             * @param buffer Some random bytes
+             * Get new request ID
+             * @returns New unique request ID
              */
-            function seedRandom(buffer: any[]): void;
+            getID(): Integer;
+
+            /**
+             * Send message to worker with random data
+             * @param size Number of bytes to send
+             */
+            seedRandom(size: Integer): void;
+
+            /**
+             * Terminates the workers
+             */
+            terminate(): void;
 
             /**
              * Generic proxy function that handles all commands from the public api.
-             * @param method The public api function to be delegated to the worker thread
-             * @param options The api function's options
+             * @param method the public api function to be delegated to the worker thread
+             * @param options the api function's options
+             * @returns see the corresponding public api functions for their return types
              */
-            function delegate(method: string, options: object): void;
-
-            /**
-             * Respond to the main window.
-             * @param event Contains event type and data
-             */
-            function response(event: object): void;
+            delegate(method: string, options: object): Promise<any>;
         }
     }
 
-
     /**
-     * Set the path for the web worker script and create an instance of the async proxy
-     * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
-     * @param n number of workers to initialize
-     * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
-     */
-    function initWorker(path: string, n?: number, workers?: any[]): void;
+ * @see module:openpgp.initWorker
+ * @see module:openpgp.getWorker
+ * @see module:openpgp.destroyWorker
+ * @see module:worker/async_proxy
+ */
+    namespace worker {
+        /**
+         * Handle random buffer exhaustion by requesting more random bytes from the main window
+         * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+         */
+        function randomCallback(): Promise<Object>;
 
-    /**
-     * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
-     * @returns the async proxy or null if not initialized
-     */
-    function getWorker(): worker.async_proxy.AsyncProxy | null;
+        /**
+         * Set config from main context to worker context.
+         * @param config The openpgp configuration
+         */
+        function configure(config: object): void;
 
-    /**
-     * Cleanup the current instance of the web worker.
-     */
-    function destroyWorker(): void;
+        /**
+         * Seed the library with entropy gathered window.crypto.getRandomValues
+         * as this api is only avalible in the main window.
+         * @param buffer Some random bytes
+         */
+        function seedRandom(buffer: any[]): void;
 
-    interface UserID {
-        name: string;
-        email: string;
+        /**
+         * Generic proxy function that handles all commands from the public api.
+         * @param method The public api function to be delegated to the worker thread
+         * @param options The api function's options
+         */
+        function delegate(method: string, options: object): void;
+
+        /**
+         * Respond to the main window.
+         * @param event Contains event type and data
+         */
+        function response(event: object): void;
     }
-
-    interface KeyOptions {
-        /**
-         * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-         */
-        userIds: UserID[];
-        /**
-         * (optional) The passphrase used to encrypt the resulting private key
-         */
-        passphrase?: string;
-        /**
-         * (optional) number of bits for RSA keys: 2048 or 4096.
-         */
-        numBits?: number;
-        /**
-         * (optional) The number of seconds after the key creation time that the key expires
-         */
-        keyExpirationTime?: number;
-        /**
-         * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
-         *                                         curve25519, p256, p384, p521, secp256k1,
-         *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
-         */
-        curve?: string;
-        /**
-         * (optional) override the creation date of the key and the key signatures
-         */
-        date?: Date;
-        /**
-         * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
-         *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
-         */
-        subkeys?: { sign: true, passphrase: "string" }[];
-    }
-
-    /**
-     * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
-     * @param options
-     * @returns The generated key object in the form:
-     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
-     */
-    function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
-
-    /**
-     * Reformats signature packets for a key and rewraps key object.
-     * @param privateKey private key to reformat
-     * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-     * @param passphrase (optional) The passphrase used to encrypt the resulting private key
-     * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
-     * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
-     * @returns The generated key object in the form:
-     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
-     */
-    function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
-
-    /**
-     * Revokes a key. Requires either a private key or a revocation certificate.
-     * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
-     * @param key (optional) public or private key to revoke
-     * @param revocationCertificate (optional) revocation certificate to revoke the key with
-     * @param reasonForRevocation (optional) object indicating the reason for revocation
-     * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
-     * @param reasonForRevocation.string (optional) string explaining the reason for revocation
-     * @returns The revoked key object in the form:
-     *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
-     *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
-     */
-    function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
-        privateKey: key.Key,
-        privateKeyArmored: string,
-        publicKey: key.Key,
-        publicKeyArmored: string
-    } | {
-        publicKey: key.Key,
-        publicKeyArmored: string
-    }>;
-
-    /**
-     * Unlock a private key with your passphrase.
-     * @param privateKey the private key that is to be decrypted
-     * @param passphrase the user's passphrase(s) chosen during key generation
-     * @returns the unlocked key object in the form: { key:Key }
-     */
-    function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
-
-    /**
-     * Lock a private key with your passphrase.
-     * @param privateKey the private key that is to be decrypted
-     * @param passphrase the user's passphrase(s) chosen during key generation
-     * @returns the locked key object in the form: { key:Key }
-     */
-    function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
-
-    interface EncryptOptions {
-        /**
-         * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
-         */
-        message: message.Message;
-        /**
-         * (optional) array of keys or single key, used to encrypt the message
-         */
-        publicKeys?: key.Key | any[];
-        /**
-         * (optional) private keys for signing. If omitted message will not be signed
-         */
-        privateKeys?: key.Key | any[];
-        /**
-         * (optional) array of passwords or a single password to encrypt the message
-         */
-        passwords?: string | any[];
-        /**
-         * (optional) session key in the form: { data:Uint8Array, algorithm:String }
-         */
-        sessionKey?: { data: Uint8Array, algorithm: string };
-        /**
-         * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
-         */
-        compression?: enums.compression;
-        /**
-         * (optional) if the return values should be ascii armored or the message/signature objects
-         */
-        armor?: boolean;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) if the signature should be detached (if true, signature will be added to returned object)
-         */
-        detached?: boolean;
-        /**
-         * (optional) a detached signature to add to the encrypted message
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) if the unencrypted session key should be added to returned object
-         */
-        returnSessionKey?: boolean;
-        /**
-         * (optional) use a key ID of 0 instead of the public key IDs
-         */
-        wildcard?: boolean;
-        /**
-         * (optional) override the creation date of the message signature
-         */
-        date?: Date;
-        /**
-         * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         */
-        fromUserIds?: UserID[];
-        /**
-         * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
-         */
-        toUserIds?: UserID[]
-    }
-
-    interface EncryptResult {
-        data: string | ReadableStream<String>;
-        message: message.Message;
-        signature: string | ReadableStream<String> | signature.Signature;
-        sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
-    }
-
-    /**
-     * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
-     * must be specified. If private keys are specified, those will be used to sign the message.
-     * @param options 
-     * @returns Object containing encrypted (and optionally signed) message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          message: Message, (if `armor` was false)
-     *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
-     *          signature: Signature (if `detached` was true and `armor` was false)
-     *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
-     *          }
-     */
-    function encrypt(options: EncryptOptions): Promise<EncryptResult>;
-
-    interface DecryptOptions {
-        /**
-         * the message object with the encrypted data
-         */
-        message: message.Message;
-        /**
-         * (optional) private keys with decrypted secret key data or session key
-         */
-        privateKeys?: key.Key | key.Key[];
-        /**
-         * (optional) passwords to decrypt the message
-         */
-        passwords?: string | string[];
-        /**
-         * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
-         */
-        sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
-        /**
-         * (optional) array of public keys or single key, to verify signatures
-         */
-        publicKeys?: key.Key | key.Key[];
-        /**
-         * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
-         */
-        format?: 'utf8' | 'binary';
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) detached signature for verification
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) use the given date for verification instead of the current time
-         */
-        date?: Date
-    }
-
-    interface DecryptResult {
-        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
-        filename: string,
-        signatures: {
-            keyid: type.keyid.Keyid,
-            verified: Promise<Boolean>,
-            valid: boolean
-        }[]
-    }
-
-    /**
-     * Decrypts a message with the user's private key, a session key or a password. Either a private key,
-     * a session key or a password must be specified.
-     * @param options
-     * @returns Object containing decrypted and verified message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
-     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
-     *          filename: string,
-     *          signatures: [
-     *          {
-     *          keyid: module:type/keyid,
-     *          verified: Promise<Boolean>,
-     *          valid: boolean (if streaming was false)
-     *          }, ...
-     *          ]
-     *          }
-     */
-    function decrypt(options: DecryptOptions): Promise<DecryptResult>;
-
-    interface SignOptions {
-        /**
-         * (cleartext) message to be signed
-         */
-        message: cleartext.CleartextMessage | message.Message;
-        /**
-         * array of keys or single key with decrypted secret key data to sign cleartext
-         */
-        privateKeys: key.Key | any[];
-        /**
-         * (optional) if the return value should be ascii armored or the message object
-         */
-        armor?: boolean;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) if the return value should contain a detached signature
-         */
-        detached?: boolean;
-        /**
-         * (optional) override the creation date of the signature
-         */
-        date?: Date;
-        /**
-         *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         */
-        fromUserIds?: UserID[]
-    }
-
-    interface SignResult {
-        data: string | ReadableStream<String> | NodeStream,
-        message: message.Message,
-        signature: string | ReadableStream<String> | NodeStream | signature.Signature
-    }
-
-    /**
-     * Signs a cleartext message.
-     * @param options
-     * @returns Object containing signed message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          message: Message (if `armor` was false)
-     *          }
-     *          Or, if `detached` was true:
-     *          {
-     *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          signature: Signature (if `armor` was false)
-     *          }
-     */
-    function sign(options: SignOptions): Promise<SignResult>;
-
-    interface VerifyOptions {
-        /**
-         * array of publicKeys or single key, to verify signatures
-         */
-        publicKeys: key.Key | any[];
-        /**
-         * (cleartext) message object with signatures
-         */
-        message: cleartext.CleartextMessage | message.Message;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) detached signature for verification
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) use the given date for verification instead of the current time
-         */
-        date?: Date
-    }
-
-    interface VerifyResult {
-        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
-        signatures: {
-            keyid: type.keyid.Keyid,
-            verified: Promise<Boolean>,
-            valid: boolean
-        }[]
-    }
-
-    /**
-     * Verifies signatures of cleartext signed message
-     * @param options
-     * @returns Object containing verified message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
-     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
-     *          signatures: [
-     *          {
-     *          keyid: module:type/keyid,
-     *          verified: Promise<Boolean>,
-     *          valid: boolean (if `streaming` was false)
-     *          }, ...
-     *          ]
-     *          }
-     */
-    function verify(options: VerifyOptions): Promise<VerifyResult>;
-
-    /**
-     * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
-     * or passwords must be specified.
-     * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
-     * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
-     * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
-     * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
-     * @param passwords (optional) passwords for the message
-     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-     * @param date (optional) override the date
-     * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-     * @returns the encrypted session key packets contained in a message object
-     */
-    function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
-
-    /**
-     * Decrypt symmetric session keys with a private key or password. Either a private key or
-     * a password must be specified.
-     * @param message a message object containing the encrypted session key packets
-     * @param privateKeys (optional) private keys with decrypted secret key data
-     * @param passwords (optional) passwords to decrypt the session key
-     * @returns Array of decrypted session key, algorithm pairs in form:
-     *          { data:Uint8Array, algorithm:String }
-     *          or 'undefined' if no key packets found
-     */
-    function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
-
-    /**
-     * Input validation
-     */
-    function checkString(): void;
-
-    /**
-     * Normalize parameter to an array if it is not undefined.
-     * @param param the parameter to be normalized
-     * @returns the resulting array or undefined
-     */
-    function toArray(param: object): any[] | undefined;
-
-    /**
-     * Convert data to or from Stream
-     * @param data the data to convert
-     * @param streaming (optional) whether to return a ReadableStream
-     * @returns the data in the respective format
-     */
-    function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
-
-    /**
-     * Convert object properties from Stream
-     * @param obj the data to convert
-     * @param streaming (optional) whether to return ReadableStreams
-     * @param keys (optional) which keys to return as streams, if possible
-     * @returns the data in the respective format
-     */
-    function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
-
-    /**
-     * Link result.data to the message stream for cancellation.
-     * Also, forward errors in the message to result.data.
-     * @param result the data to convert
-     * @param message message object
-     * @param erroringStream (optional) stream which either errors or gets closed without data
-     * @returns
-     */
-    function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream<string>): object;
-
-    /**
-     * Wait until signature objects have been verified
-     * @param signatures list of signatures
-     */
-    function prepareSignatures(signatures: object): void;
-
-    /**
-     * Global error handler that logs the stack trace and rethrows a high lvl error message.
-     * @param message A human readable high level error Message
-     * @param error The internal error that caused the failure
-     */
-    function onError(message: string, error: Error): void;
-
-    /**
-     * Check for native AEAD support and configuration by the user. Only
-     * browsers that implement the current WebCrypto specification support
-     * native GCM. Native EAX is built on CTR and CBC, which current
-     * browsers support. OCB and CFB are not natively supported.
-     * @returns If authenticated encryption should be used
-     */
-    function nativeAEAD(): boolean;
 }
+
+
+/**
+ * Set the path for the web worker script and create an instance of the async proxy
+ * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
+ * @param n number of workers to initialize
+ * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
+ */
+export function initWorker(path: string, n?: number, workers?: any[]): void;
+
+/**
+ * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+ * @returns the async proxy or null if not initialized
+ */
+export function getWorker(): worker.async_proxy.AsyncProxy | null;
+
+/**
+ * Cleanup the current instance of the web worker.
+ */
+export function destroyWorker(): void;
+
+export interface UserID {
+    name: string;
+    email: string;
+}
+
+export interface KeyOptions {
+    /**
+     * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     */
+    userIds: UserID[];
+    /**
+     * (optional) The passphrase used to encrypt the resulting private key
+     */
+    passphrase?: string;
+    /**
+     * (optional) number of bits for RSA keys: 2048 or 4096.
+     */
+    numBits?: number;
+    /**
+     * (optional) The number of seconds after the key creation time that the key expires
+     */
+    keyExpirationTime?: number;
+    /**
+     * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
+     *                                         curve25519, p256, p384, p521, secp256k1,
+     *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+     */
+    curve?: string;
+    /**
+     * (optional) override the creation date of the key and the key signatures
+     */
+    date?: Date;
+    /**
+     * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+     */
+    subkeys?: { sign: true, passphrase: "string" }[];
+}
+
+/**
+ * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+ * @param options
+ * @returns The generated key object in the form:
+ *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+ */
+export function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
+
+/**
+ * Reformats signature packets for a key and rewraps key object.
+ * @param privateKey private key to reformat
+ * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param passphrase (optional) The passphrase used to encrypt the resulting private key
+ * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
+ * @returns The generated key object in the form:
+ *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+ */
+export function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
+
+/**
+ * Revokes a key. Requires either a private key or a revocation certificate.
+ * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
+ * @param key (optional) public or private key to revoke
+ * @param revocationCertificate (optional) revocation certificate to revoke the key with
+ * @param reasonForRevocation (optional) object indicating the reason for revocation
+ * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
+ * @param reasonForRevocation.string (optional) string explaining the reason for revocation
+ * @returns The revoked key object in the form:
+ *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
+ *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
+ */
+export function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
+    privateKey: key.Key,
+    privateKeyArmored: string,
+    publicKey: key.Key,
+    publicKeyArmored: string
+} | {
+    publicKey: key.Key,
+    publicKeyArmored: string
+}>;
+
+/**
+ * Unlock a private key with your passphrase.
+ * @param privateKey the private key that is to be decrypted
+ * @param passphrase the user's passphrase(s) chosen during key generation
+ * @returns the unlocked key object in the form: { key:Key }
+ */
+export function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+/**
+ * Lock a private key with your passphrase.
+ * @param privateKey the private key that is to be decrypted
+ * @param passphrase the user's passphrase(s) chosen during key generation
+ * @returns the locked key object in the form: { key:Key }
+ */
+export function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+export interface EncryptOptions {
+    /**
+     * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
+     */
+    message: message.Message;
+    /**
+     * (optional) array of keys or single key, used to encrypt the message
+     */
+    publicKeys?: key.Key | any[];
+    /**
+     * (optional) private keys for signing. If omitted message will not be signed
+     */
+    privateKeys?: key.Key | any[];
+    /**
+     * (optional) array of passwords or a single password to encrypt the message
+     */
+    passwords?: string | any[];
+    /**
+     * (optional) session key in the form: { data:Uint8Array, algorithm:String }
+     */
+    sessionKey?: { data: Uint8Array, algorithm: string };
+    /**
+     * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+     */
+    compression?: enums.compression;
+    /**
+     * (optional) if the return values should be ascii armored or the message/signature objects
+     */
+    armor?: boolean;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) if the signature should be detached (if true, signature will be added to returned object)
+     */
+    detached?: boolean;
+    /**
+     * (optional) a detached signature to add to the encrypted message
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) if the unencrypted session key should be added to returned object
+     */
+    returnSessionKey?: boolean;
+    /**
+     * (optional) use a key ID of 0 instead of the public key IDs
+     */
+    wildcard?: boolean;
+    /**
+     * (optional) override the creation date of the message signature
+     */
+    date?: Date;
+    /**
+     * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     */
+    fromUserIds?: UserID[];
+    /**
+     * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+     */
+    toUserIds?: UserID[]
+}
+
+export interface EncryptResult {
+    data: string | ReadableStream<String>;
+    message: message.Message;
+    signature: string | ReadableStream<String> | signature.Signature;
+    sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
+}
+
+/**
+ * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+ * must be specified. If private keys are specified, those will be used to sign the message.
+ * @param options 
+ * @returns Object containing encrypted (and optionally signed) message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          message: Message, (if `armor` was false)
+ *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
+ *          signature: Signature (if `detached` was true and `armor` was false)
+ *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
+ *          }
+ */
+export function encrypt(options: EncryptOptions): Promise<EncryptResult>;
+
+export interface DecryptOptions {
+    /**
+     * the message object with the encrypted data
+     */
+    message: message.Message;
+    /**
+     * (optional) private keys with decrypted secret key data or session key
+     */
+    privateKeys?: key.Key | key.Key[];
+    /**
+     * (optional) passwords to decrypt the message
+     */
+    passwords?: string | string[];
+    /**
+     * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+     */
+    sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
+    /**
+     * (optional) array of public keys or single key, to verify signatures
+     */
+    publicKeys?: key.Key | key.Key[];
+    /**
+     * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
+     */
+    format?: 'utf8' | 'binary';
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) detached signature for verification
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) use the given date for verification instead of the current time
+     */
+    date?: Date
+}
+
+export interface DecryptResult {
+    data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
+    filename: string,
+    signatures: {
+        keyid: type.keyid.Keyid,
+        verified: Promise<Boolean>,
+        valid: boolean
+    }[]
+}
+
+/**
+ * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+ * a session key or a password must be specified.
+ * @param options
+ * @returns Object containing decrypted and verified message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
+ *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
+ *          filename: string,
+ *          signatures: [
+ *          {
+ *          keyid: module:type/keyid,
+ *          verified: Promise<Boolean>,
+ *          valid: boolean (if streaming was false)
+ *          }, ...
+ *          ]
+ *          }
+ */
+export function decrypt(options: DecryptOptions): Promise<DecryptResult>;
+
+export interface SignOptions {
+    /**
+     * (cleartext) message to be signed
+     */
+    message: cleartext.CleartextMessage | message.Message;
+    /**
+     * array of keys or single key with decrypted secret key data to sign cleartext
+     */
+    privateKeys: key.Key | any[];
+    /**
+     * (optional) if the return value should be ascii armored or the message object
+     */
+    armor?: boolean;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) if the return value should contain a detached signature
+     */
+    detached?: boolean;
+    /**
+     * (optional) override the creation date of the signature
+     */
+    date?: Date;
+    /**
+     *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     */
+    fromUserIds?: UserID[]
+}
+
+export interface SignResult {
+    data: string | ReadableStream<String> | NodeStream,
+    message: message.Message,
+    signature: string | ReadableStream<String> | NodeStream | signature.Signature
+}
+
+/**
+ * Signs a cleartext message.
+ * @param options
+ * @returns Object containing signed message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          message: Message (if `armor` was false)
+ *          }
+ *          Or, if `detached` was true:
+ *          {
+ *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          signature: Signature (if `armor` was false)
+ *          }
+ */
+export function sign(options: SignOptions): Promise<SignResult>;
+
+export interface VerifyOptions {
+    /**
+     * array of publicKeys or single key, to verify signatures
+     */
+    publicKeys: key.Key | any[];
+    /**
+     * (cleartext) message object with signatures
+     */
+    message: cleartext.CleartextMessage | message.Message;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) detached signature for verification
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) use the given date for verification instead of the current time
+     */
+    date?: Date
+}
+
+export interface VerifyResult {
+    data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
+    signatures: {
+        keyid: type.keyid.Keyid,
+        verified: Promise<Boolean>,
+        valid: boolean
+    }[]
+}
+
+/**
+ * Verifies signatures of cleartext signed message
+ * @param options
+ * @returns Object containing verified message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
+ *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
+ *          signatures: [
+ *          {
+ *          keyid: module:type/keyid,
+ *          verified: Promise<Boolean>,
+ *          valid: boolean (if `streaming` was false)
+ *          }, ...
+ *          ]
+ *          }
+ */
+export function verify(options: VerifyOptions): Promise<VerifyResult>;
+
+/**
+ * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
+ * or passwords must be specified.
+ * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
+ * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
+ * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
+ * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
+ * @param passwords (optional) passwords for the message
+ * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+ * @param date (optional) override the date
+ * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @returns the encrypted session key packets contained in a message object
+ */
+export function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
+
+/**
+ * Decrypt symmetric session keys with a private key or password. Either a private key or
+ * a password must be specified.
+ * @param message a message object containing the encrypted session key packets
+ * @param privateKeys (optional) private keys with decrypted secret key data
+ * @param passwords (optional) passwords to decrypt the session key
+ * @returns Array of decrypted session key, algorithm pairs in form:
+ *          { data:Uint8Array, algorithm:String }
+ *          or 'undefined' if no key packets found
+ */
+export function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
+
+/**
+ * Input validation
+ */
+export function checkString(): void;
+
+/**
+ * Normalize parameter to an array if it is not undefined.
+ * @param param the parameter to be normalized
+ * @returns the resulting array or undefined
+ */
+export function toArray(param: object): any[] | undefined;
+
+/**
+ * Convert data to or from Stream
+ * @param data the data to convert
+ * @param streaming (optional) whether to return a ReadableStream
+ * @returns the data in the respective format
+ */
+export function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
+
+/**
+ * Convert object properties from Stream
+ * @param obj the data to convert
+ * @param streaming (optional) whether to return ReadableStreams
+ * @param keys (optional) which keys to return as streams, if possible
+ * @returns the data in the respective format
+ */
+export function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
+
+/**
+ * Link result.data to the message stream for cancellation.
+ * Also, forward errors in the message to result.data.
+ * @param result the data to convert
+ * @param message message object
+ * @param erroringStream (optional) stream which either errors or gets closed without data
+ * @returns
+ */
+export function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream<string>): object;
+
+/**
+ * Wait until signature objects have been verified
+ * @param signatures list of signatures
+ */
+export function prepareSignatures(signatures: object): void;
+
+/**
+ * Global error handler that logs the stack trace and rethrows a high lvl error message.
+ * @param message A human readable high level error Message
+ * @param error The internal error that caused the failure
+ */
+export function onError(message: string, error: Error): void;
+
+/**
+ * Check for native AEAD support and configuration by the user. Only
+ * browsers that implement the current WebCrypto specification support
+ * native GCM. Native EAX is built on CTR and CBC, which current
+ * browsers support. OCB and CFB are not natively supported.
+ * @returns If authenticated encryption should be used
+ */
+export function nativeAEAD(): boolean;
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index 3d5a1e3717..45a69aad1f 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -1,4 +1,4 @@
-import { openpgp } from "openpgp"
+import openpgp from "openpgp"
 
 // Open PGP Sample codes
 
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index 62bccca432..442a458ccd 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -16,1589 +16,1560 @@ type NodeStream = stream;
 type Integer = number;
 type Infinity = any;
 
-
-export namespace openpgp {
-    namespace cleartext {
+export namespace cleartext {
+    /**
+     * Class that represents an OpenPGP cleartext signed message.
+     * See {@link https://tools.ietf.org/html/rfc4880#section-7}
+     */
+    class CleartextMessage {
         /**
-         * Class that represents an OpenPGP cleartext signed message.
-         * See {@link https://tools.ietf.org/html/rfc4880#section-7}
+         * @param text The cleartext of the signed message
+         * @param signature The detached signature or an empty signature for unsigned messages
          */
-        class CleartextMessage {
-            /**
-             * @param text The cleartext of the signed message
-             * @param signature The detached signature or an empty signature for unsigned messages
-             */
-            constructor(text: string, signature: signature.Signature);
-
-            /**
-             * Returns the key IDs of the keys that signed the cleartext message
-             * @returns array of keyid objects
-             */
-            getSigningKeyIds(): any[];
-
-            /**
-             * Sign the cleartext message
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) The creation time of the signature that should be created
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new cleartext message with signed content
-             */
-            sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
-
-            /**
-             * Sign the cleartext message
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) The creation time of the signature that should be created
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new detached signature of message content
-             */
-            signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
-
-            /**
-             * Verify signatures of cleartext signed message
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verify signatures of cleartext signed message
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Get cleartext
-             * @returns cleartext of message
-             */
-            getText(): string;
-
-            /**
-             * Returns ASCII armored text of cleartext signed message
-             * @returns ASCII armor
-             */
-            armor(): string | ReadableStream<String>;
-        }
+        constructor(text: string, signature: signature.Signature);
 
         /**
-         * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
-         * @param armoredText text to be parsed
-         * @returns new cleartext message object
+         * Returns the key IDs of the keys that signed the cleartext message
+         * @returns array of keyid objects
          */
-        function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
+        getSigningKeyIds(): any[];
 
         /**
-         * Creates a new CleartextMessage object from text
-         * @param text
+         * Sign the cleartext message
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) The creation time of the signature that should be created
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new cleartext message with signed content
          */
-        function fromText(text: string): void;
+        sign(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<CleartextMessage>;
+
+        /**
+         * Sign the cleartext message
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) The creation time of the signature that should be created
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new detached signature of message content
+         */
+        signDetached(privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<signature.Signature>;
+
+        /**
+         * Verify signatures of cleartext signed message
+         * @param keys array of keys to verify signatures
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        verify(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verify signatures of cleartext signed message
+         * @param keys array of keys to verify signatures
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @returns list of signer's keyid and validity of signature
+         */
+        verifyDetached(keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Get cleartext
+         * @returns cleartext of message
+         */
+        getText(): string;
+
+        /**
+         * Returns ASCII armored text of cleartext signed message
+         * @returns ASCII armor
+         */
+        armor(): string | ReadableStream<String>;
     }
 
     /**
-     * @see module:config/config
+     * reads an OpenPGP cleartext signed message and returns a CleartextMessage object
+     * @param armoredText text to be parsed
+     * @returns new cleartext message object
      */
-    namespace config {
-        var prefer_hash_algorithm: any;
-
-        var encryption_cipher: any;
-
-        var compression: any;
-
-        var deflate_level: any;
-
-        /**
-         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
-         * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
-         * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
-         */
-        var aead_protect: any;
-
-        /**
-         * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
-         * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
-         * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
-         * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
-         */
-        var aead_protect_version: any;
-
-        /**
-         * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
-         * Only has an effect when aead_protect is set to true.
-         */
-        var aead_mode: any;
-
-        /**
-         * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
-         * Only has an effect when aead_protect is set to true.
-         * Must be an integer value from 0 to 56.
-         */
-        var aead_chunk_size_byte: any;
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
-         * Iteration Count Byte for S2K (String to Key)
-         */
-        var s2k_iteration_count_byte: any;
-
-        /**
-         * Use integrity protection for symmetric encryption
-         */
-        var integrity_protect: any;
-
-        var ignore_mdc_error: any;
-
-        var allow_unauthenticated_stream: any;
-
-        var checksum_required: any;
-
-        var rsa_blinding: any;
-
-        /**
-         * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
-         * **Slower and slightly less secure**
-         */
-        var password_collision_check: any;
-
-        var revocations_expire: any;
-
-        var use_native: any;
-
-        var min_bytes_for_web_crypto: any;
-
-        var zero_copy: any;
-
-        var debug: any;
-
-        var tolerant: any;
-
-        var show_version: any;
-
-        var show_comment: any;
-
-        var versionstring: any;
-
-        var commentstring: any;
-
-        var keyserver: any;
-
-        var node_store: any;
-
-        /**
-         * Max userid string length (used for parsing)
-         */
-        var max_userid_length: any;
-
-        namespace localStorage {
-            class LocalStorage {
-                /**
-                 * This object is used for storing and retrieving configuration from HTML5 local storage.
-                 */
-                constructor();
-
-                /**
-                 * Reads the config out of the HTML5 local storage
-                 * and initializes the object config.
-                 * if config is null the default config will be used
-                 */
-                read(): void;
-
-                /**
-                 * Writes the config to HTML5 local storage
-                 */
-                write(): void;
-            }
-        }
-    }
-
-    class LocalStorage {
-        /**
-         * This object is used for storing and retrieving configuration from HTML5 local storage.
-         */
-        constructor();
-
-        /**
-         * Reads the config out of the HTML5 local storage
-         * and initializes the object config.
-         * if config is null the default config will be used
-         */
-        read(): void;
-
-        /**
-         * Writes the config to HTML5 local storage
-         */
-        write(): void;
-    }
-
-
+    function readArmored(armoredText: string | ReadableStream<String>): CleartextMessage;
 
     /**
-     * @see module:crypto/crypto
-     * @see module:crypto/signature
-     * @see module:crypto/public_key
-     * @see module:crypto/cipher
-     * @see module:crypto/random
-     * @see module:crypto/hash
+     * Creates a new CleartextMessage object from text
+     * @param text
      */
+    function fromText(text: string): void;
+}
+
+/**
+ * @see module:config/config
+ */
+export namespace config {
+    var prefer_hash_algorithm: any;
+
+    var encryption_cipher: any;
+
+    var compression: any;
+
+    var deflate_level: any;
+
+    /**
+     * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+     * **NOT INTEROPERABLE WITH OTHER OPENPGP IMPLEMENTATIONS**
+     * **FUTURE OPENPGP.JS VERSIONS MAY BREAK COMPATIBILITY WHEN USING THIS OPTION**
+     */
+    var aead_protect: any;
+
+    /**
+     * Use Authenticated Encryption with Additional Data (AEAD) protection for symmetric encryption.
+     * 0 means we implement a variant of {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00|this IETF draft}.
+     * 4 means we implement {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04|RFC4880bis-04}.
+     * Note that this determines how AEAD packets are parsed even when aead_protect is set to false
+     */
+    var aead_protect_version: any;
+
+    /**
+     * Default Authenticated Encryption with Additional Data (AEAD) encryption mode
+     * Only has an effect when aead_protect is set to true.
+     */
+    var aead_mode: any;
+
+    /**
+     * Chunk Size Byte for Authenticated Encryption with Additional Data (AEAD) mode
+     * Only has an effect when aead_protect is set to true.
+     * Must be an integer value from 0 to 56.
+     */
+    var aead_chunk_size_byte: any;
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.7.1.3|RFC4880 3.7.1.3}:
+     * Iteration Count Byte for S2K (String to Key)
+     */
+    var s2k_iteration_count_byte: any;
+
+    /**
+     * Use integrity protection for symmetric encryption
+     */
+    var integrity_protect: any;
+
+    var ignore_mdc_error: any;
+
+    var allow_unauthenticated_stream: any;
+
+    var checksum_required: any;
+
+    var rsa_blinding: any;
+
+    /**
+     * Work-around for rare GPG decryption bug when encrypting with multiple passwords.
+     * **Slower and slightly less secure**
+     */
+    var password_collision_check: any;
+
+    var revocations_expire: any;
+
+    var use_native: any;
+
+    var min_bytes_for_web_crypto: any;
+
+    var zero_copy: any;
+
+    var debug: any;
+
+    var tolerant: any;
+
+    var show_version: any;
+
+    var show_comment: any;
+
+    var versionstring: any;
+
+    var commentstring: any;
+
+    var keyserver: any;
+
+    var node_store: any;
+
+    /**
+     * Max userid string length (used for parsing)
+     */
+    var max_userid_length: any;
+
+    namespace localStorage {
+        class LocalStorage {
+            /**
+             * This object is used for storing and retrieving configuration from HTML5 local storage.
+             */
+            constructor();
+
+            /**
+             * Reads the config out of the HTML5 local storage
+             * and initializes the object config.
+             * if config is null the default config will be used
+             */
+            read(): void;
+
+            /**
+             * Writes the config to HTML5 local storage
+             */
+            write(): void;
+        }
+    }
+}
+
+export class LocalStorage {
+    /**
+     * This object is used for storing and retrieving configuration from HTML5 local storage.
+     */
+    constructor();
+
+    /**
+     * Reads the config out of the HTML5 local storage
+     * and initializes the object config.
+     * if config is null the default config will be used
+     */
+    read(): void;
+
+    /**
+     * Writes the config to HTML5 local storage
+     */
+    write(): void;
+}
+
+
+
+/**
+ * @see module:crypto/crypto
+ * @see module:crypto/signature
+ * @see module:crypto/public_key
+ * @see module:crypto/cipher
+ * @see module:crypto/random
+ * @see module:crypto/hash
+ */
+export namespace crypto {
+    /**
+ * @see module:crypto/public_key/elliptic/ecdh
+ */
+    namespace aes_kw {
+        /**
+         * AES key wrap
+         * @param key
+         * @param data
+         * @returns
+         */
+        function wrap(key: string, data: string): Uint8Array;
+
+        /**
+         * AES key unwrap
+         * @param key
+         * @param data
+         * @returns
+         * @throws
+         */
+        function unwrap(key: string, data: string): Uint8Array;
+    }
+
+    namespace cfb {
+        function encrypt(algo: any, key: any, plaintext: any, iv: any): any
+        function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
+    }
+
+    namespace cipher {
+        /**
+         * AES-128 encryption and decryption (ID 7)
+         * @param key 128-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes128(key: string): object;
+
+        /**
+         * AES-128 Block Cipher (ID 8)
+         * @param key 192-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes192(key: string): object;
+
+        /**
+         * AES-128 Block Cipher (ID 9)
+         * @param key 256-bit key
+         * @see
+         * @see
+         * @returns
+         */
+        function aes256(key: string): object;
+
+        /**
+         * Triple DES Block Cipher (ID 2)
+         * @param key 192-bit key
+         * @see
+         * @returns
+         */
+        function tripledes(key: string): object;
+
+        /**
+         * CAST-128 Block Cipher (ID 3)
+         * @param key 128-bit key
+         * @see
+         * @returns
+         */
+        function cast5(key: string): object;
+
+        /**
+         * Twofish Block Cipher (ID 10)
+         * @param key 256-bit key
+         * @see
+         * @returns
+         */
+        function twofish(key: string): object;
+
+        /**
+         * Blowfish Block Cipher (ID 4)
+         * @param key 128-bit key
+         * @see
+         * @returns
+         */
+        function blowfish(key: string): object;
+
+        /**
+         * Not implemented
+         * @throws
+         */
+        function idea(): void;
+    }
+
+    namespace cmac {
+        /**
+         * This implementation of CMAC is based on the description of OMAC in
+         * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
+         * document:
+         * We have made a small modification to the OMAC algorithm as it was
+         * originally presented, changing one of its two constants.
+         * Specifically, the constant 4 at line 85 was the constant 1/2 (the
+         * multiplicative inverse of 2) in the original definition of OMAC [14].
+         * The OMAC authors indicate that they will promulgate this modification
+         * [15], which slightly simplifies implementations.
+         */
+        const blockLength: any;
+
+        /**
+         * xor `padding` into the end of `data`. This function implements "the
+         * operation xor→ [which] xors the shorter string into the end of longer
+         * one". Since data is always as least as long as padding, we can
+         * simplify the implementation.
+         * @param data
+         * @param padding
+         */
+        function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
+    }
+
     namespace crypto {
         /**
-     * @see module:crypto/public_key/elliptic/ecdh
+         * Encrypts data using specified algorithm and public key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+         * @param algo Public key algorithm
+         * @param pub_params Algorithm-specific public key parameters
+         * @param data Data to be encrypted as MPI
+         * @param fingerprint Recipient fingerprint
+         * @returns encrypted session key parameters
+         */
+        function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
+
+        /**
+         * Decrypts data using specified algorithm and private key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
+         * @param algo Public key algorithm
+         * @param key_params Algorithm-specific public, private key parameters
+         * @param data_params encrypted session key parameters
+         * @param fingerprint Recipient fingerprint
+         * @returns An MPI containing the decrypted data
+         */
+        function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
+
+        /**
+         * Returns the types comprising the private key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getPrivKeyParamTypes(algo: string): any[];
+
+        /**
+         * Returns the types comprising the public key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getPubKeyParamTypes(algo: string): any[];
+
+        /**
+         * Returns the types comprising the encrypted session key of an algorithm
+         * @param algo The public key algorithm
+         * @returns The array of types
+         */
+        function getEncSessionKeyParamTypes(algo: string): any[];
+
+        /**
+         * Generate algorithm-specific key parameters
+         * @param algo The public key algorithm
+         * @param bits Bit length for RSA keys
+         * @param oid Object identifier for ECC keys
+         * @returns The array of parameters
+         */
+        function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
+
+        /**
+         * Generates a random byte prefix for the specified algorithm
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param algo Symmetric encryption algorithm
+         * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
+         */
+        function getPrefixRandom(algo: enums.symmetric): Uint8Array;
+
+        /**
+         * Generating a session key for the specified symmetric algorithm
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param algo Symmetric encryption algorithm
+         * @returns Random bytes as a string to be used as a key
+         */
+        function generateSessionKey(algo: enums.symmetric): Uint8Array;
+    }
+
+    namespace eax {
+        /**
+         * Class to en/decrypt using EAX mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function EAX(cipher: string, key: Uint8Array): void;
+
+        /**
+         * Encrypt plaintext input.
+         * @param plaintext The cleartext input to be encrypted
+         * @param nonce The nonce (16 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Decrypt ciphertext input.
+         * @param ciphertext The ciphertext input to be decrypted
+         * @param nonce The nonce (16 bytes)
+         * @param adata Associated data to verify
+         * @returns The plaintext output
+         */
+        function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+    }
+
+    namespace gcm {
+        /**
+         * Class to en/decrypt using GCM mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function GCM(cipher: string, key: Uint8Array): void;
+    }
+
+    /**
+     * @see
+     * @see
      */
-        namespace aes_kw {
+    namespace hash {
+        /**
+         * @see module:md5
+         */
+        var md5: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha1: any;
+
+        /**
+         * @see hash.js
+         */
+        var sha224: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha256: any;
+
+        /**
+         * @see hash.js
+         */
+        var sha384: any;
+
+        /**
+         * @see asmCrypto
+         */
+        var sha512: any;
+
+        /**
+         * @see hash.js
+         */
+        var ripemd: any;
+
+        /**
+         * Create a hash on the specified data using the specified algorithm
+         * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+         * @param data Data to be hashed
+         * @returns hash value
+         */
+        function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Returns the hash size in bytes of the specified hash algorithm type
+         * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
+         * @returns Size in bytes of the resulting hash
+         */
+        function getHashByteLength(algo: enums.hash): Integer;
+    }
+
+    /**
+     * @see module:packet.PublicKeyEncryptedSessionKey
+     */
+    namespace pkcs5 {
+        /**
+         * Add pkcs5 padding to a text.
+         * @param msg Text to add padding
+         * @returns Text with padding added
+         */
+        function encode(msg: string): string;
+
+        /**
+         * Remove pkcs5 padding from a string.
+         * @param msg Text to remove padding from
+         * @returns Text with padding removed
+         */
+        function decode(msg: string): string;
+    }
+
+    namespace ocb {
+        /**
+         * Class to en/decrypt using OCB mode.
+         * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
+         * @param key The encryption key
+         */
+        function OCB(cipher: string, key: Uint8Array): void;
+
+        /**
+         * Encrypt plaintext input.
+         * @param plaintext The cleartext input to be encrypted
+         * @param nonce The nonce (15 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+
+        /**
+         * Decrypt ciphertext input.
+         * @param ciphertext The ciphertext input to be decrypted
+         * @param nonce The nonce (15 bytes)
+         * @param adata Associated data to sign
+         * @returns The ciphertext output
+         */
+        function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
+    }
+
+    /**
+    * @see module:crypto/public_key/rsa
+    * @see module:crypto/public_key/elliptic/ecdh
+    * @see module:packet.PublicKeyEncryptedSessionKey
+    */
+    namespace pkcs1 {
+        namespace eme {
             /**
-             * AES key wrap
-             * @param key
-             * @param data
-             * @returns
+             * Create a EME-PKCS1-v1_5 padded message
+             * @see
+             * @param M message to be encoded
+             * @param k the length in octets of the key modulus
+             * @returns EME-PKCS1 padded message
              */
-            function wrap(key: string, data: string): Uint8Array;
+            function encode(M: string, k: Integer): Promise<String>;
 
             /**
-             * AES key unwrap
-             * @param key
-             * @param data
-             * @returns
-             * @throws
+             * Decode a EME-PKCS1-v1_5 padded message
+             * @see
+             * @param EM encoded message, an octet string
+             * @returns message, an octet string
              */
-            function unwrap(key: string, data: string): Uint8Array;
+            function decode(EM: string): string;
         }
 
-        namespace cfb {
-            function encrypt(algo: any, key: any, plaintext: any, iv: any): any
-            function decrypt(algo: any, key: any, ciphertext: any, iv: any): Promise<any>
-        }
-
-        namespace cipher {
+        namespace emsa {
             /**
-             * AES-128 encryption and decryption (ID 7)
-             * @param key 128-bit key
+             * Create a EMSA-PKCS1-v1_5 padded message
              * @see
-             * @see
-             * @returns
+             * @param algo Hash algorithm type used
+             * @param hashed message to be encoded
+             * @param emLen intended length in octets of the encoded message
+             * @returns encoded message
              */
-            function aes128(key: string): object;
-
-            /**
-             * AES-128 Block Cipher (ID 8)
-             * @param key 192-bit key
-             * @see
-             * @see
-             * @returns
-             */
-            function aes192(key: string): object;
-
-            /**
-             * AES-128 Block Cipher (ID 9)
-             * @param key 256-bit key
-             * @see
-             * @see
-             * @returns
-             */
-            function aes256(key: string): object;
-
-            /**
-             * Triple DES Block Cipher (ID 2)
-             * @param key 192-bit key
-             * @see
-             * @returns
-             */
-            function tripledes(key: string): object;
-
-            /**
-             * CAST-128 Block Cipher (ID 3)
-             * @param key 128-bit key
-             * @see
-             * @returns
-             */
-            function cast5(key: string): object;
-
-            /**
-             * Twofish Block Cipher (ID 10)
-             * @param key 256-bit key
-             * @see
-             * @returns
-             */
-            function twofish(key: string): object;
-
-            /**
-             * Blowfish Block Cipher (ID 4)
-             * @param key 128-bit key
-             * @see
-             * @returns
-             */
-            function blowfish(key: string): object;
-
-            /**
-             * Not implemented
-             * @throws
-             */
-            function idea(): void;
-        }
-
-        namespace cmac {
-            /**
-             * This implementation of CMAC is based on the description of OMAC in
-             * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
-             * document:
-             * We have made a small modification to the OMAC algorithm as it was
-             * originally presented, changing one of its two constants.
-             * Specifically, the constant 4 at line 85 was the constant 1/2 (the
-             * multiplicative inverse of 2) in the original definition of OMAC [14].
-             * The OMAC authors indicate that they will promulgate this modification
-             * [15], which slightly simplifies implementations.
-             */
-            const blockLength: any;
-
-            /**
-             * xor `padding` into the end of `data`. This function implements "the
-             * operation xor→ [which] xors the shorter string into the end of longer
-             * one". Since data is always as least as long as padding, we can
-             * simplify the implementation.
-             * @param data
-             * @param padding
-             */
-            function rightXorMut(data: Uint8Array, padding: Uint8Array): void;
-        }
-
-        namespace crypto {
-            /**
-             * Encrypts data using specified algorithm and public key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
-             * @param algo Public key algorithm
-             * @param pub_params Algorithm-specific public key parameters
-             * @param data Data to be encrypted as MPI
-             * @param fingerprint Recipient fingerprint
-             * @returns encrypted session key parameters
-             */
-            function publicKeyEncrypt(algo: enums.publicKey, pub_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data: type.mpi.MPI, fingerprint: string): any[];
-
-            /**
-             * Decrypts data using specified algorithm and private key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
-             * @param algo Public key algorithm
-             * @param key_params Algorithm-specific public, private key parameters
-             * @param data_params encrypted session key parameters
-             * @param fingerprint Recipient fingerprint
-             * @returns An MPI containing the decrypted data
-             */
-            function publicKeyDecrypt(algo: enums.publicKey, key_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, data_params: Array<type.mpi.MPI | type.oid.OID | type.kdf_params.KDFParams>, fingerprint: string): type.mpi.MPI;
-
-            /**
-             * Returns the types comprising the private key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getPrivKeyParamTypes(algo: string): any[];
-
-            /**
-             * Returns the types comprising the public key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getPubKeyParamTypes(algo: string): any[];
-
-            /**
-             * Returns the types comprising the encrypted session key of an algorithm
-             * @param algo The public key algorithm
-             * @returns The array of types
-             */
-            function getEncSessionKeyParamTypes(algo: string): any[];
-
-            /**
-             * Generate algorithm-specific key parameters
-             * @param algo The public key algorithm
-             * @param bits Bit length for RSA keys
-             * @param oid Object identifier for ECC keys
-             * @returns The array of parameters
-             */
-            function generateParams(algo: string, bits: Integer, oid: type.oid.OID): any[];
-
-            /**
-             * Generates a random byte prefix for the specified algorithm
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param algo Symmetric encryption algorithm
-             * @returns Random bytes with length equal to the block size of the cipher, plus the last two bytes repeated.
-             */
-            function getPrefixRandom(algo: enums.symmetric): Uint8Array;
-
-            /**
-             * Generating a session key for the specified symmetric algorithm
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param algo Symmetric encryption algorithm
-             * @returns Random bytes as a string to be used as a key
-             */
-            function generateSessionKey(algo: enums.symmetric): Uint8Array;
-        }
-
-        namespace eax {
-            /**
-             * Class to en/decrypt using EAX mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function EAX(cipher: string, key: Uint8Array): void;
-
-            /**
-             * Encrypt plaintext input.
-             * @param plaintext The cleartext input to be encrypted
-             * @param nonce The nonce (16 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Decrypt ciphertext input.
-             * @param ciphertext The ciphertext input to be decrypted
-             * @param nonce The nonce (16 bytes)
-             * @param adata Associated data to verify
-             * @returns The plaintext output
-             */
-            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-        }
-
-        namespace gcm {
-            /**
-             * Class to en/decrypt using GCM mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function GCM(cipher: string, key: Uint8Array): void;
+            function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
         }
 
         /**
-         * @see
+         * ASN1 object identifiers for hashes
          * @see
          */
-        namespace hash {
+        const hash_headers: any;
+    }
+
+    namespace public_key {
+        namespace dsa {
             /**
-             * @see module:md5
+             * DSA Sign function
+             * @param hash_algo
+             * @param hashed
+             * @param g
+             * @param p
+             * @param q
+             * @param x
+             * @returns
              */
-            var md5: any;
+            function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
 
             /**
-             * @see asmCrypto
+             * DSA Verify function
+             * @param hash_algo
+             * @param r
+             * @param s
+             * @param hashed
+             * @param g
+             * @param p
+             * @param q
+             * @param y
+             * @returns BN
              */
-            var sha1: any;
+            function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
+        }
+
+        namespace elgamal {
+            /**
+             * ElGamal Encryption function
+             * @param m
+             * @param p
+             * @param g
+             * @param y
+             * @returns
+             */
+            function encrypt(m: BN, p: BN, g: BN, y: BN): object;
 
             /**
-             * @see hash.js
+             * ElGamal Encryption function
+             * @param c1
+             * @param c2
+             * @param p
+             * @param x
+             * @returns BN
              */
-            var sha224: any;
-
-            /**
-             * @see asmCrypto
-             */
-            var sha256: any;
-
-            /**
-             * @see hash.js
-             */
-            var sha384: any;
-
-            /**
-             * @see asmCrypto
-             */
-            var sha512: any;
-
-            /**
-             * @see hash.js
-             */
-            var ripemd: any;
-
-            /**
-             * Create a hash on the specified data using the specified algorithm
-             * @param algo Hash algorithm type (see {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
-             * @param data Data to be hashed
-             * @returns hash value
-             */
-            function digest(algo: enums.hash, data: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Returns the hash size in bytes of the specified hash algorithm type
-             * @param algo Hash algorithm type (See {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4})
-             * @returns Size in bytes of the resulting hash
-             */
-            function getHashByteLength(algo: enums.hash): Integer;
+            function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
         }
 
         /**
-         * @see module:packet.PublicKeyEncryptedSessionKey
-         */
-        namespace pkcs5 {
-            /**
-             * Add pkcs5 padding to a text.
-             * @param msg Text to add padding
-             * @returns Text with padding added
-             */
-            function encode(msg: string): string;
-
-            /**
-             * Remove pkcs5 padding from a string.
-             * @param msg Text to remove padding from
-             * @returns Text with padding removed
-             */
-            function decode(msg: string): string;
-        }
-
-        namespace ocb {
-            /**
-             * Class to en/decrypt using OCB mode.
-             * @param cipher The symmetric cipher algorithm to use e.g. 'aes128'
-             * @param key The encryption key
-             */
-            function OCB(cipher: string, key: Uint8Array): void;
-
-            /**
-             * Encrypt plaintext input.
-             * @param plaintext The cleartext input to be encrypted
-             * @param nonce The nonce (15 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function encrypt(plaintext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-
-            /**
-             * Decrypt ciphertext input.
-             * @param ciphertext The ciphertext input to be decrypted
-             * @param nonce The nonce (15 bytes)
-             * @param adata Associated data to sign
-             * @returns The ciphertext output
-             */
-            function decrypt(ciphertext: Uint8Array, nonce: Uint8Array, adata: Uint8Array): Promise<Uint8Array>;
-        }
-
-        /**
-        * @see module:crypto/public_key/rsa
+        * @see module:crypto/public_key/elliptic/curve
         * @see module:crypto/public_key/elliptic/ecdh
-        * @see module:packet.PublicKeyEncryptedSessionKey
+        * @see module:crypto/public_key/elliptic/ecdsa
+        * @see module:crypto/public_key/elliptic/eddsa
         */
-        namespace pkcs1 {
-            namespace eme {
-                /**
-                 * Create a EME-PKCS1-v1_5 padded message
-                 * @see
-                 * @param M message to be encoded
-                 * @param k the length in octets of the key modulus
-                 * @returns EME-PKCS1 padded message
-                 */
-                function encode(M: string, k: Integer): Promise<String>;
-
-                /**
-                 * Decode a EME-PKCS1-v1_5 padded message
-                 * @see
-                 * @param EM encoded message, an octet string
-                 * @returns message, an octet string
-                 */
-                function decode(EM: string): string;
-            }
-
-            namespace emsa {
-                /**
-                 * Create a EMSA-PKCS1-v1_5 padded message
-                 * @see
-                 * @param algo Hash algorithm type used
-                 * @param hashed message to be encoded
-                 * @param emLen intended length in octets of the encoded message
-                 * @returns encoded message
-                 */
-                function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
-            }
-
-            /**
-             * ASN1 object identifiers for hashes
-             * @see
-             */
-            const hash_headers: any;
-        }
-
-        namespace public_key {
-            namespace dsa {
-                /**
-                 * DSA Sign function
-                 * @param hash_algo
-                 * @param hashed
-                 * @param g
-                 * @param p
-                 * @param q
-                 * @param x
-                 * @returns
-                 */
-                function sign(hash_algo: Integer, hashed: Uint8Array, g: BN, p: BN, q: BN, x: BN): object;
-
-                /**
-                 * DSA Verify function
-                 * @param hash_algo
-                 * @param r
-                 * @param s
-                 * @param hashed
-                 * @param g
-                 * @param p
-                 * @param q
-                 * @param y
-                 * @returns BN
-                 */
-                function verify(hash_algo: Integer, r: BN, s: BN, hashed: Uint8Array, g: BN, p: BN, q: BN, y: BN): any;
-            }
-
-            namespace elgamal {
-                /**
-                 * ElGamal Encryption function
-                 * @param m
-                 * @param p
-                 * @param g
-                 * @param y
-                 * @returns
-                 */
-                function encrypt(m: BN, p: BN, g: BN, y: BN): object;
-
-                /**
-                 * ElGamal Encryption function
-                 * @param c1
-                 * @param c2
-                 * @param p
-                 * @param x
-                 * @returns BN
-                 */
-                function decrypt(c1: BN, c2: BN, p: BN, x: BN): any;
-            }
-
-            /**
-            * @see module:crypto/public_key/elliptic/curve
-            * @see module:crypto/public_key/elliptic/ecdh
-            * @see module:crypto/public_key/elliptic/ecdsa
-            * @see module:crypto/public_key/elliptic/eddsa
-            */
-            namespace elliptic {
-                namespace curve {
-                    class Curve {
-                    }
-                }
-
-                namespace ecdh {
-                    /**
-                     * Generate ECDHE ephemeral key and secret from public key
-                     * @param curve Elliptic curve object
-                     * @param Q Recipient public key
-                     * @returns Returns public part of ephemeral key and generated ephemeral secret
-                     */
-                    function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
-
-                    /**
-                     * Encrypt and wrap a session key
-                     * @param oid Elliptic curve object identifier
-                     * @param cipher_algo Symmetric cipher to use
-                     * @param hash_algo Hash algorithm to use
-                     * @param m Value derived from session key (RFC 6637)
-                     * @param Q Recipient public key
-                     * @param fingerprint Recipient fingerprint
-                     * @returns Returns public part of ephemeral key and encoded session key
-                     */
-                    function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
-
-                    /**
-                     * Generate ECDHE secret from private key and public part of ephemeral key
-                     * @param curve Elliptic curve object
-                     * @param V Public part of ephemeral key
-                     * @param d Recipient private key
-                     * @returns Generated ephemeral secret
-                     */
-                    function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
-
-                    /**
-                     * Decrypt and unwrap the value derived from session key
-                     * @param oid Elliptic curve object identifier
-                     * @param cipher_algo Symmetric cipher to use
-                     * @param hash_algo Hash algorithm to use
-                     * @param V Public part of ephemeral key
-                     * @param C Encrypted and wrapped value derived from session key
-                     * @param d Recipient private key
-                     * @param fingerprint Recipient fingerprint
-                     * @returns Value derived from session
-                     */
-                    function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
-                }
-
-                namespace ecdsa {
-                    /**
-                     * Sign a message using the provided key
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used to sign
-                     * @param m Message to sign
-                     * @param d Private key used to sign the message
-                     * @param hashed The hashed message
-                     * @returns Signature of the message
-                     */
-                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
-
-                    /**
-                     * Verifies if a signature is valid for a message
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used in the signature
-                     * @param signature Signature to verify
-                     * @param m Message to verify
-                     * @param Q Public key used to verify the message
-                     * @param hashed The hashed message
-                     * @returns
-                     */
-                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
-                }
-
-                namespace eddsa {
-                    /**
-                     * Sign a message using the provided keygit
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used to sign
-                     * @param m Message to sign
-                     * @param d Private key used to sign
-                     * @param hashed The hashed message
-                     * @returns Signature of the message
-                     */
-                    function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
-
-                    /**
-                     * Verifies if a signature is valid for a message
-                     * @param oid Elliptic curve object identifier
-                     * @param hash_algo Hash algorithm used in the signature
-                     * @param signature Signature to verify the message
-                     * @param m Message to verify
-                     * @param Q Public key used to verify the message
-                     * @param hashed The hashed message
-                     * @returns
-                     */
-                    function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
-                }
-
-                namespace key {
-                    class KeyPair {
-                    }
+        namespace elliptic {
+            namespace curve {
+                class Curve {
                 }
             }
 
-            namespace prime {
+            namespace ecdh {
                 /**
-                 * Probabilistic random number generator
-                 * @param bits Bit length of the prime
-                 * @param e Optional RSA exponent to check against the prime
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @returns BN
+                 * Generate ECDHE ephemeral key and secret from public key
+                 * @param curve Elliptic curve object
+                 * @param Q Recipient public key
+                 * @returns Returns public part of ephemeral key and generated ephemeral secret
                  */
-                function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
+                function genPublicEphemeralKey(curve: curve.Curve, Q: Uint8Array): Promise<{ V: Uint8Array, S: BN }>;
 
                 /**
-                 * Probabilistic primality testing
-                 * @param n Number to test
-                 * @param e Optional RSA exponent to check against the prime
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @returns
+                 * Encrypt and wrap a session key
+                 * @param oid Elliptic curve object identifier
+                 * @param cipher_algo Symmetric cipher to use
+                 * @param hash_algo Hash algorithm to use
+                 * @param m Value derived from session key (RFC 6637)
+                 * @param Q Recipient public key
+                 * @param fingerprint Recipient fingerprint
+                 * @returns Returns public part of ephemeral key and encoded session key
                  */
-                function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+                function encrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, m: type.mpi.MPI, Q: Uint8Array, fingerprint: string): Promise<{ V: BN, C: BN }>;
 
                 /**
-                 * Tests whether n is probably prime or not using Fermat's test with b = 2.
-                 * Fails if b^(n-1) mod n === 1.
-                 * @param n Number to test
-                 * @param b Optional Fermat test base
-                 * @returns
+                 * Generate ECDHE secret from private key and public part of ephemeral key
+                 * @param curve Elliptic curve object
+                 * @param V Public part of ephemeral key
+                 * @param d Recipient private key
+                 * @returns Generated ephemeral secret
                  */
-                function fermat(n: BN, b: Integer): boolean;
+                function genPrivateEphemeralKey(curve: curve.Curve, V: Uint8Array, d: Uint8Array): Promise<BN>;
 
                 /**
-                 * Tests whether n is probably prime or not using the Miller-Rabin test.
-                 * See HAC Remark 4.28.
-                 * @param n Number to test
-                 * @param k Optional number of iterations of Miller-Rabin test
-                 * @param rand Optional function to generate potential witnesses
-                 * @returns
+                 * Decrypt and unwrap the value derived from session key
+                 * @param oid Elliptic curve object identifier
+                 * @param cipher_algo Symmetric cipher to use
+                 * @param hash_algo Hash algorithm to use
+                 * @param V Public part of ephemeral key
+                 * @param C Encrypted and wrapped value derived from session key
+                 * @param d Recipient private key
+                 * @param fingerprint Recipient fingerprint
+                 * @returns Value derived from session
                  */
-                function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+                function decrypt(oid: type.oid.OID, cipher_algo: enums.symmetric, hash_algo: enums.hash, V: Uint8Array, C: Uint8Array, d: Uint8Array, fingerprint: string): Promise<BN>;
             }
 
-            namespace rsa {
+            namespace ecdsa {
                 /**
-                 * Create signature
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @param d RSA private exponent
-                 * @returns RSA Signature
+                 * Sign a message using the provided key
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used to sign
+                 * @param m Message to sign
+                 * @param d Private key used to sign the message
+                 * @param hashed The hashed message
+                 * @returns Signature of the message
                  */
-                function sign(m: BN, n: BN, e: BN, d: BN): BN;
+                function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
 
                 /**
-                 * Verify signature
-                 * @param s signature
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
+                 * Verifies if a signature is valid for a message
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used in the signature
+                 * @param signature Signature to verify
+                 * @param m Message to verify
+                 * @param Q Public key used to verify the message
+                 * @param hashed The hashed message
                  * @returns
                  */
-                function verify(s: BN, n: BN, e: BN): BN;
+                function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+            }
+
+            namespace eddsa {
+                /**
+                 * Sign a message using the provided keygit
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used to sign
+                 * @param m Message to sign
+                 * @param d Private key used to sign
+                 * @param hashed The hashed message
+                 * @returns Signature of the message
+                 */
+                function sign(oid: type.oid.OID, hash_algo: enums.hash, m: Uint8Array, d: Uint8Array, hashed: Uint8Array): object;
 
                 /**
-                 * Encrypt message
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @returns RSA Ciphertext
+                 * Verifies if a signature is valid for a message
+                 * @param oid Elliptic curve object identifier
+                 * @param hash_algo Hash algorithm used in the signature
+                 * @param signature Signature to verify the message
+                 * @param m Message to verify
+                 * @param Q Public key used to verify the message
+                 * @param hashed The hashed message
+                 * @returns
                  */
-                function encrypt(m: BN, n: BN, e: BN): BN;
+                function verify(oid: type.oid.OID, hash_algo: enums.hash, signature: object, m: Uint8Array, Q: Uint8Array, hashed: Uint8Array): boolean;
+            }
 
-                /**
-                 * Decrypt RSA message
-                 * @param m message
-                 * @param n RSA public modulus
-                 * @param e RSA public exponent
-                 * @param d RSA private exponent
-                 * @param p RSA private prime p
-                 * @param q RSA private prime q
-                 * @param u RSA private inverse of prime q
-                 * @returns RSA Plaintext
-                 */
-                function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
-
-                /**
-                 * Generate a new random private key B bits long with public exponent E.
-                 * When possible, webCrypto is used. Otherwise, primes are generated using
-                 * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
-                 * @see module:crypto/public_key/prime
-                 * @param B RSA bit length
-                 * @param E RSA public exponent in hex string
-                 * @returns RSA public modulus, RSA public exponent, RSA private exponent,
-                 *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
-                 */
-                function generate(B: Integer, E: string): object;
+            namespace key {
+                class KeyPair {
+                }
             }
         }
 
-        namespace random {
+        namespace prime {
             /**
-             * Retrieve secure random byte array of the specified length
-             * @param length Length in bytes to generate
-             * @returns Random byte array
+             * Probabilistic random number generator
+             * @param bits Bit length of the prime
+             * @param e Optional RSA exponent to check against the prime
+             * @param k Optional number of iterations of Miller-Rabin test
+             * @returns BN
              */
-            function getRandomBytes(length: Integer): Uint8Array;
+            function randomProbablePrime(bits: Integer, e: BN, k: Integer): any;
 
             /**
-             * Create a secure random MPI that is greater than or equal to min and less than max.
-             * @param min Lower bound, included
-             * @param max Upper bound, excluded
-             * @returns Random MPI
-             */
-            function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
-
-            /**
-             * Buffer for secure random numbers
-             */
-            function RandomBuffer(): void;
-        }
-
-        namespace signature {
-            /**
-             * Verifies the signature provided for data using specified algorithms and public key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-             * for public key and hash algorithms.
-             * @param algo Public key algorithm
-             * @param hash_algo Hash algorithm
-             * @param msg_MPIs Algorithm-specific signature parameters
-             * @param pub_MPIs Algorithm-specific public key parameters
-             * @param data Data for which the signature was created
-             * @param hashed The hashed data
-             * @returns True if signature is valid
-             */
-            function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
-
-            /**
-             * Creates a signature on data using specified algorithms and private key parameters.
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-             * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-             * for public key and hash algorithms.
-             * @param algo Public key algorithm
-             * @param hash_algo Hash algorithm
-             * @param key_params Algorithm-specific public and private key parameters
-             * @param data Data to be signed
-             * @param hashed The hashed data
-             * @returns Signature
-             */
-            function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
-        }
-    }
-
-    namespace eme {
-        /**
-         * Create a EME-PKCS1-v1_5 padded message
-         * @see
-         * @param M message to be encoded
-         * @param k the length in octets of the key modulus
-         * @returns EME-PKCS1 padded message
-         */
-        function encode(M: string, k: Integer): Promise<String>;
-
-        /**
-         * Decode a EME-PKCS1-v1_5 padded message
-         * @see
-         * @param EM encoded message, an octet string
-         * @returns message, an octet string
-         */
-        function decode(EM: string): string;
-    }
-
-    namespace emsa {
-        /**
-         * Create a EMSA-PKCS1-v1_5 padded message
-         * @see
-         * @param algo Hash algorithm type used
-         * @param hashed message to be encoded
-         * @param emLen intended length in octets of the encoded message
-         * @returns encoded message
-         */
-        function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
-    }
-
-    namespace encoding {
-        namespace armor {
-            /**
-             * Add additional information to the armor version of an OpenPGP binary
-             * packet block.
-             * @author Alex
-             * @version 2011-12-16
-             * @param customComment (optional) additional comment to add to the armored string
-             * @returns The header information
-             */
-            function addheader(customComment: string): string;
-
-            /**
-             * Calculates a checksum over the given data and returns it base64 encoded
-             * @param data Data to create a CRC-24 checksum for
-             * @returns Base64 encoded checksum
-             */
-            function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
-
-            /**
-             * Internal function to calculate a CRC-24 checksum over a given string (data)
-             * @param data Data to create a CRC-24 checksum for
-             * @returns The CRC-24 checksum
-             */
-            function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Splits a message into two parts, the body and the checksum. This is an internal function
-             * @param text OpenPGP armored message part
-             * @returns An object with attribute "body" containing the body
-             *          and an attribute "checksum" containing the checksum.
-             */
-            function splitChecksum(text: string): object;
-
-            /**
-             * DeArmor an OpenPGP armored message; verify the checksum and return
-             * the encoded bytes
-             * @param text OpenPGP armored message
-             * @returns An object with attribute "text" containing the message text,
-             *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
-             */
-            function dearmor(text: string): Promise<Object>;
-
-            /**
-             * Armor an OpenPGP binary packet block
-             * @param messagetype type of the message
-             * @param body
-             * @param partindex
-             * @param parttotal
-             * @param customComment (optional) additional comment to add to the armored string
-             * @returns Armored text
-             */
-            function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
-        }
-
-        namespace base64 {
-            /**
-             * Convert binary array to radix-64
-             * @param t Uint8Array to convert
-             * @param u if true, output is URL-safe
-             * @returns radix-64 version of input string
-             */
-            function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
-
-            /**
-             * Convert radix-64 to binary array
-             * @param t radix-64 string to convert
-             * @param u if true, input is interpreted as URL-safe
-             * @returns binary array version of input string
-             */
-            function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
-        }
-    }
-
-    namespace enums {
-        /**
-         * Maps curve names under various standards to one
-         * @see
-         */
-        enum curve {
-            /**
-             * NIST P-256 Curve
-             */
-            p256 = "p256",
-            "P-256" = "p256",
-            secp256r1 = "p256",
-            prime256v1 = "p256",
-            "1.2.840.10045.3.1.7" = "p256",
-            "2a8648ce3d030107" = "p256",
-            "2A8648CE3D030107" = "p256",
-            /**
-             * NIST P-384 Curve
-             */
-            p384 = "p384",
-            "P-384" = "p384",
-            secp384r1 = "p384",
-            "1.3.132.0.34" = "p384",
-            "2b81040022" = "p384",
-            "2B81040022" = "p384",
-            /**
-             * NIST P-521 Curve
-             */
-            p521 = "p521",
-            "P-521" = "p521",
-            secp521r1 = "p521",
-            "1.3.132.0.35" = "p521",
-            "2b81040023" = "p521",
-            "2B81040023" = "p521",
-            /**
-             * SECG SECP256k1 Curve
-             */
-            secp256k1 = "secp256k1",
-            "1.3.132.0.10" = "secp256k1",
-            "2b8104000a" = "secp256k1",
-            "2B8104000A" = "secp256k1",
-            /**
-             * Ed25519
-             */
-            ED25519 = "ed25519",
-            ed25519 = "ed25519",
-            Ed25519 = "ed25519",
-            "1.3.6.1.4.1.11591.15.1" = "ed25519",
-            "2b06010401da470f01" = "ed25519",
-            "2B06010401DA470F01" = "ed25519",
-            /**
-             * Curve25519
-             */
-            X25519 = "curve25519",
-            cv25519 = "curve25519",
-            curve25519 = "curve25519",
-            Curve25519 = "curve25519",
-            "1.3.6.1.4.1.3029.1.5.1" = "curve25519",
-            "2b060104019755010501" = "curve25519",
-            "2B060104019755010501" = "curve25519",
-            /**
-             * BrainpoolP256r1 Curve
-             */
-            brainpoolP256r1 = "brainpoolP256r1",
-            "1.3.36.3.3.2.8.1.1.7" = "brainpoolP256r1",
-            "2b2403030208010107" = "brainpoolP256r1",
-            "2B2403030208010107" = "brainpoolP256r1",
-            /**
-             * BrainpoolP384r1 Curve
-             */
-            brainpoolP384r1 = "brainpoolP384r1",
-            "1.3.36.3.3.2.8.1.1.11" = "brainpoolP384r1",
-            "2b240303020801010b" = "brainpoolP384r1",
-            "2B240303020801010B" = "brainpoolP384r1",
-            /**
-             * BrainpoolP512r1 Curve
-             */
-            brainpoolP512r1 = "brainpoolP512r1",
-            "1.3.36.3.3.2.8.1.1.13" = "brainpoolP512r1",
-            "2b240303020801010d" = "brainpoolP512r1",
-            "2B240303020801010D" = "brainpoolP512r1",
-        }
-
-        /**
-         * A string to key specifier type
-         */
-        enum s2k {
-            simple = 0,
-            salted = 1,
-            iterated = 3,
-            gnu = 101,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
-         */
-        enum publicKey {
-            /**
-             * RSA (Encrypt or Sign) [HAC]
-             */
-            rsa_encrypt_sign = 1,
-            /**
-             * RSA (Encrypt only) [HAC]
-             */
-            rsa_encrypt = 2,
-            /**
-             * RSA (Sign only) [HAC]
-             */
-            rsa_sign = 3,
-            /**
-             * Elgamal (Encrypt only) [ELGAMAL] [HAC]
-             */
-            elgamal = 16,
-            /**
-             * DSA (Sign only) [FIPS186] [HAC]
-             */
-            dsa = 17,
-            /**
-             * ECDH (Encrypt only) [RFC6637]
-             */
-            ecdh = 18,
-            /**
-             * ECDSA (Sign only) [RFC6637]
-             */
-            ecdsa = 19,
-            /**
-             * EdDSA (Sign only)
-             * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
-             */
-            eddsa = 22,
-            /**
-             * Reserved for AEDH
-             */
-            aedh = 23,
-            /**
-             * Reserved for AEDSA
-             */
-            aedsa = 24,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
-         */
-        enum symmetric {
-            plaintext = 0,
-            /**
-             * Not implemented!
-             */
-            idea = 1,
-            "3des" = 2,
-            tripledes = 2,
-            cast5 = 3,
-            blowfish = 4,
-            aes128 = 7,
-            aes192 = 8,
-            aes256 = 9,
-            twofish = 10,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
-         */
-        enum compression {
-            uncompressed = 0,
-            /**
-             * RFC1951
-             */
-            zip = 1,
-            /**
-             * RFC1950
-             */
-            zlib = 2,
-            bzip2 = 3,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
-         */
-        enum hash {
-            md5 = 1,
-            sha1 = 2,
-            ripemd = 3,
-            sha256 = 8,
-            sha384 = 9,
-            sha512 = 10,
-            sha224 = 11,
-        }
-
-        /**
-         * A list of hash names as accepted by webCrypto functions.
-         * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
-         */
-        enum webHash {
-            "SHA-1" = 2,
-            "SHA-256" = 8,
-            "SHA-384" = 9,
-            "SHA-512" = 10,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
-         */
-        enum aead {
-            eax = 1,
-            ocb = 2,
-            experimental_gcm = 100,
-        }
-
-        /**
-         * A list of packet types and numeric tags associated with them.
-         */
-        enum packet {
-            publicKeyEncryptedSessionKey = 1,
-            signature = 2,
-            symEncryptedSessionKey = 3,
-            onePassSignature = 4,
-            secretKey = 5,
-            publicKey = 6,
-            secretSubkey = 7,
-            compressed = 8,
-            symmetricallyEncrypted = 9,
-            marker = 10,
-            literal = 11,
-            trust = 12,
-            userid = 13,
-            publicSubkey = 14,
-            userAttribute = 17,
-            symEncryptedIntegrityProtected = 18,
-            modificationDetectionCode = 19,
-            symEncryptedAEADProtected = 20,
-        }
-
-        /**
-         * Data types in the literal packet
-         */
-        enum literal {
-            /**
-             * Binary data 'b'
-             */
-            binary = "",
-            /**
-             * Text data 't'
-             */
-            text = "",
-            /**
-             * Utf8 data 'u'
-             */
-            utf8 = "",
-            /**
-             * MIME message body part 'm'
-             */
-            mime = "",
-        }
-
-        /**
-         * One pass signature packet type
-         */
-        enum signature {
-            /**
-             * 0x00: Signature of a binary document.
-             */
-            binary = 0,
-            /**
-             * 0x01: Signature of a canonical text document.
-             * Canonicalyzing the document by converting line endings.
-             */
-            text = 1,
-            /**
-             * 0x02: Standalone signature.
-             * This signature is a signature of only its own subpacket contents.
-             * It is calculated identically to a signature over a zero-lengh
-             * binary document.  Note that it doesn't make sense to have a V3
-             * standalone signature.
-             */
-            standalone = 2,
-            /**
-             * 0x10: Generic certification of a User ID and Public-Key packet.
-             * The issuer of this certification does not make any particular
-             * assertion as to how well the certifier has checked that the owner
-             * of the key is in fact the person described by the User ID.
-             */
-            cert_generic = 16,
-            /**
-             * 0x11: Persona certification of a User ID and Public-Key packet.
-             * The issuer of this certification has not done any verification of
-             * the claim that the owner of this key is the User ID specified.
-             */
-            cert_persona = 17,
-            /**
-             * 0x12: Casual certification of a User ID and Public-Key packet.
-             * The issuer of this certification has done some casual
-             * verification of the claim of identity.
-             */
-            cert_casual = 18,
-            /**
-             * 0x13: Positive certification of a User ID and Public-Key packet.
-             * The issuer of this certification has done substantial
-             * verification of the claim of identity.
-             * Most OpenPGP implementations make their "key signatures" as 0x10
-             * certifications.  Some implementations can issue 0x11-0x13
-             * certifications, but few differentiate between the types.
-             */
-            cert_positive = 19,
-            /**
-             * 0x30: Certification revocation signature
-             * This signature revokes an earlier User ID certification signature
-             * (signature class 0x10 through 0x13) or direct-key signature
-             * (0x1F).  It should be issued by the same key that issued the
-             * revoked signature or an authorized revocation key.  The signature
-             * is computed over the same data as the certificate that it
-             * revokes, and should have a later creation date than that
-             * certificate.
-             */
-            cert_revocation = 48,
-            /**
-             * 0x18: Subkey Binding Signature
-             * This signature is a statement by the top-level signing key that
-             * indicates that it owns the subkey.  This signature is calculated
-             * directly on the primary key and subkey, and not on any User ID or
-             * other packets.  A signature that binds a signing subkey MUST have
-             * an Embedded Signature subpacket in this binding signature that
-             * contains a 0x19 signature made by the signing subkey on the
-             * primary key and subkey.
-             */
-            subkey_binding = 24,
-            /**
-             * 0x19: Primary Key Binding Signature
-             * This signature is a statement by a signing subkey, indicating
-             * that it is owned by the primary key and subkey.  This signature
-             * is calculated the same way as a 0x18 signature: directly on the
-             * primary key and subkey, and not on any User ID or other packets.
-             * When a signature is made over a key, the hash data starts with the
-             * octet 0x99, followed by a two-octet length of the key, and then body
-             * of the key packet.  (Note that this is an old-style packet header for
-             * a key packet with two-octet length.)  A subkey binding signature
-             * (type 0x18) or primary key binding signature (type 0x19) then hashes
-             * the subkey using the same format as the main key (also using 0x99 as
-             * the first octet).
-             */
-            key_binding = 25,
-            /**
-             * 0x1F: Signature directly on a key
-             * This signature is calculated directly on a key.  It binds the
-             * information in the Signature subpackets to the key, and is
-             * appropriate to be used for subpackets that provide information
-             * about the key, such as the Revocation Key subpacket.  It is also
-             * appropriate for statements that non-self certifiers want to make
-             * about the key itself, rather than the binding between a key and a
-             * name.
-             */
-            key = 31,
-            /**
-             * 0x20: Key revocation signature
-             * The signature is calculated directly on the key being revoked.  A
-             * revoked key is not to be used.  Only revocation signatures by the
-             * key being revoked, or by an authorized revocation key, should be
-             * considered valid revocation signatures.a
-             */
-            key_revocation = 32,
-            /**
-             * 0x28: Subkey revocation signature
-             * The signature is calculated directly on the subkey being revoked.
-             * A revoked subkey is not to be used.  Only revocation signatures
-             * by the top-level signature key that is bound to this subkey, or
-             * by an authorized revocation key, should be considered valid
-             * revocation signatures.
-             * Key revocation signatures (types 0x20 and 0x28)
-             * hash only the key being revoked.
-             */
-            subkey_revocation = 40,
-            /**
-             * 0x40: Timestamp signature.
-             * This signature is only meaningful for the timestamp contained in
-             * it.
-             */
-            timestamp = 64,
-            /**
-             * 0x50: Third-Party Confirmation signature.
-             * This signature is a signature over some other OpenPGP Signature
-             * packet(s).  It is analogous to a notary seal on the signed data.
-             * A third-party signature SHOULD include Signature Target
-             * subpacket(s) to give easy identification.  Note that we really do
-             * mean SHOULD.  There are plausible uses for this (such as a blind
-             * party that only sees the signature, not the key or source
-             * document) that cannot include a target subpacket.
-             */
-            third_party = 80,
-        }
-
-        /**
-         * Signature subpacket type
-         */
-        enum signatureSubpacket {
-            signature_creation_time = 2,
-            signature_expiration_time = 3,
-            exportable_certification = 4,
-            trust_signature = 5,
-            regular_expression = 6,
-            revocable = 7,
-            key_expiration_time = 9,
-            placeholder_backwards_compatibility = 10,
-            preferred_symmetric_algorithms = 11,
-            revocation_key = 12,
-            issuer = 16,
-            notation_data = 20,
-            preferred_hash_algorithms = 21,
-            preferred_compression_algorithms = 22,
-            key_server_preferences = 23,
-            preferred_key_server = 24,
-            primary_user_id = 25,
-            policy_uri = 26,
-            key_flags = 27,
-            signers_user_id = 28,
-            reason_for_revocation = 29,
-            features = 30,
-            signature_target = 31,
-            embedded_signature = 32,
-            issuer_fingerprint = 33,
-            preferred_aead_algorithms = 34,
-        }
-
-        /**
-         * Key flags
-         */
-        enum keyFlags {
-            /**
-             * 0x01 - This key may be used to certify other keys.
-             */
-            certify_keys = 1,
-            /**
-             * 0x02 - This key may be used to sign data.
-             */
-            sign_data = 2,
-            /**
-             * 0x04 - This key may be used to encrypt communications.
-             */
-            encrypt_communication = 4,
-            /**
-             * 0x08 - This key may be used to encrypt storage.
-             */
-            encrypt_storage = 8,
-            /**
-             * 0x10 - The private component of this key may have been split
-             * by a secret-sharing mechanism.
-             */
-            split_private_key = 16,
-            /**
-             * 0x20 - This key may be used for authentication.
-             */
-            authentication = 32,
-            /**
-             * 0x80 - The private component of this key may be in the
-             * possession of more than one person.
-             */
-            shared_private_key = 128,
-        }
-
-        /**
-         * Key status
-         */
-        enum keyStatus {
-            invalid = 0,
-            expired = 1,
-            revoked = 2,
-            valid = 3,
-            no_self_cert = 4,
-        }
-
-        /**
-         * Armor type
-         */
-        enum armor {
-            multipart_section = 0,
-            multipart_last = 1,
-            signed = 2,
-            message = 3,
-            public_key = 4,
-            private_key = 5,
-            signature = 6,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
-         */
-        enum reasonForRevocation {
-            /**
-             * No reason specified (key revocations or cert revocations)
-             */
-            no_reason = 0,
-            /**
-             * Key is superseded (key revocations)
-             */
-            key_superseded = 1,
-            /**
-             * Key material has been comPromise<any>d (key revocations)
-             */
-            key_comPromised = 2,
-            /**
-             * Key is retired and no longer used (key revocations)
-             */
-            key_retired = 3,
-            /**
-             * User ID information is no longer valid (cert revocations)
-             */
-            userid_invalid = 32,
-        }
-
-        /**
-         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
-         */
-        enum features {
-            /**
-             * 0x01 - Modification Detection (packets 18 and 19)
-             */
-            modification_detection = 1,
-            /**
-             * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
-             * Symmetric-Key Encrypted Session Key Packets (packet 3)
-             */
-            aead = 2,
-            /**
-             * 0x04 - Version 5 Public-Key Packet format and corresponding new
-             * fingerprint format
-             */
-            v5_keys = 4,
-        }
-
-        /**
-         * Asserts validity and converts from string/integer to integer.
-         */
-        function write(): void;
-
-        /**
-         * Converts from an integer to string.
-         */
-        function read(): void;
-    }
-
-    namespace hkp {
-        class HKP {
-            /**
-             * Initialize the HKP client and configure it with the key server url and fetch function.
-             * @param keyServerBaseUrl (optional) The HKP key server base url including
-             *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
-             *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
-             */
-            constructor(keyServerBaseUrl: string);
-
-            /**
-             * Search for a public key on the key server either by key ID or part of the user ID.
-             * @param options.keyID The long public key ID.
-             * @param options.query This can be any part of the key user ID such as name
-             *        or email address.
-             * @returns The ascii armored public key.
-             */
-            lookup(): Promise<String>;
-
-            /**
-             * Upload a public key to the server.
-             * @param publicKeyArmored An ascii armored public key to be uploaded.
+             * Probabilistic primality testing
+             * @param n Number to test
+             * @param e Optional RSA exponent to check against the prime
+             * @param k Optional number of iterations of Miller-Rabin test
              * @returns
              */
-            upload(publicKeyArmored: string): Promise<any>;
+            function isProbablePrime(n: BN, e: BN, k: Integer): boolean;
+
+            /**
+             * Tests whether n is probably prime or not using Fermat's test with b = 2.
+             * Fails if b^(n-1) mod n === 1.
+             * @param n Number to test
+             * @param b Optional Fermat test base
+             * @returns
+             */
+            function fermat(n: BN, b: Integer): boolean;
+
+            /**
+             * Tests whether n is probably prime or not using the Miller-Rabin test.
+             * See HAC Remark 4.28.
+             * @param n Number to test
+             * @param k Optional number of iterations of Miller-Rabin test
+             * @param rand Optional function to generate potential witnesses
+             * @returns
+             */
+            function millerRabin(n: BN, k: Integer, rand: Function): boolean;
+        }
+
+        namespace rsa {
+            /**
+             * Create signature
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @param d RSA private exponent
+             * @returns RSA Signature
+             */
+            function sign(m: BN, n: BN, e: BN, d: BN): BN;
+
+            /**
+             * Verify signature
+             * @param s signature
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @returns
+             */
+            function verify(s: BN, n: BN, e: BN): BN;
+
+            /**
+             * Encrypt message
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @returns RSA Ciphertext
+             */
+            function encrypt(m: BN, n: BN, e: BN): BN;
+
+            /**
+             * Decrypt RSA message
+             * @param m message
+             * @param n RSA public modulus
+             * @param e RSA public exponent
+             * @param d RSA private exponent
+             * @param p RSA private prime p
+             * @param q RSA private prime q
+             * @param u RSA private inverse of prime q
+             * @returns RSA Plaintext
+             */
+            function decrypt(m: BN, n: BN, e: BN, d: BN, p: BN, q: BN, u: BN): BN;
+
+            /**
+             * Generate a new random private key B bits long with public exponent E.
+             * When possible, webCrypto is used. Otherwise, primes are generated using
+             * 40 rounds of the Miller-Rabin probabilistic random prime generation algorithm.
+             * @see module:crypto/public_key/prime
+             * @param B RSA bit length
+             * @param E RSA public exponent in hex string
+             * @returns RSA public modulus, RSA public exponent, RSA private exponent,
+             *          RSA private prime p, RSA private prime q, u = q ** -1 mod p
+             */
+            function generate(B: Integer, E: string): object;
         }
     }
 
+    namespace random {
+        /**
+         * Retrieve secure random byte array of the specified length
+         * @param length Length in bytes to generate
+         * @returns Random byte array
+         */
+        function getRandomBytes(length: Integer): Uint8Array;
+
+        /**
+         * Create a secure random MPI that is greater than or equal to min and less than max.
+         * @param min Lower bound, included
+         * @param max Upper bound, excluded
+         * @returns Random MPI
+         */
+        function getRandomBN(min: type.mpi.MPI, max: type.mpi.MPI): BN;
+
+        /**
+         * Buffer for secure random numbers
+         */
+        function RandomBuffer(): void;
+    }
+
+    namespace signature {
+        /**
+         * Verifies the signature provided for data using specified algorithms and public key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+         * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+         * for public key and hash algorithms.
+         * @param algo Public key algorithm
+         * @param hash_algo Hash algorithm
+         * @param msg_MPIs Algorithm-specific signature parameters
+         * @param pub_MPIs Algorithm-specific public key parameters
+         * @param data Data for which the signature was created
+         * @param hashed The hashed data
+         * @returns True if signature is valid
+         */
+        function verify(algo: enums.publicKey, hash_algo: enums.hash, msg_MPIs: type.mpi.MPI[], pub_MPIs: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): boolean;
+
+        /**
+         * Creates a signature on data using specified algorithms and private key parameters.
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+         * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+         * for public key and hash algorithms.
+         * @param algo Public key algorithm
+         * @param hash_algo Hash algorithm
+         * @param key_params Algorithm-specific public and private key parameters
+         * @param data Data to be signed
+         * @param hashed The hashed data
+         * @returns Signature
+         */
+        function sign(algo: enums.publicKey, hash_algo: enums.hash, key_params: type.mpi.MPI[], data: Uint8Array, hashed: Uint8Array): Uint8Array;
+    }
+}
+
+export namespace eme {
+    /**
+     * Create a EME-PKCS1-v1_5 padded message
+     * @see
+     * @param M message to be encoded
+     * @param k the length in octets of the key modulus
+     * @returns EME-PKCS1 padded message
+     */
+    function encode(M: string, k: Integer): Promise<String>;
+
+    /**
+     * Decode a EME-PKCS1-v1_5 padded message
+     * @see
+     * @param EM encoded message, an octet string
+     * @returns message, an octet string
+     */
+    function decode(EM: string): string;
+}
+
+export namespace emsa {
+    /**
+     * Create a EMSA-PKCS1-v1_5 padded message
+     * @see
+     * @param algo Hash algorithm type used
+     * @param hashed message to be encoded
+     * @param emLen intended length in octets of the encoded message
+     * @returns encoded message
+     */
+    function encode(algo: Integer, hashed: Uint8Array, emLen: Integer): string;
+}
+
+export namespace encoding {
+    namespace armor {
+        /**
+         * Add additional information to the armor version of an OpenPGP binary
+         * packet block.
+         * @author Alex
+         * @version 2011-12-16
+         * @param customComment (optional) additional comment to add to the armored string
+         * @returns The header information
+         */
+        function addheader(customComment: string): string;
+
+        /**
+         * Calculates a checksum over the given data and returns it base64 encoded
+         * @param data Data to create a CRC-24 checksum for
+         * @returns Base64 encoded checksum
+         */
+        function getCheckSum(data: string | ReadableStream<String>): string | ReadableStream<String>;
+
+        /**
+         * Internal function to calculate a CRC-24 checksum over a given string (data)
+         * @param data Data to create a CRC-24 checksum for
+         * @returns The CRC-24 checksum
+         */
+        function createcrc24(data: string | ReadableStream<String>): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Splits a message into two parts, the body and the checksum. This is an internal function
+         * @param text OpenPGP armored message part
+         * @returns An object with attribute "body" containing the body
+         *          and an attribute "checksum" containing the checksum.
+         */
+        function splitChecksum(text: string): object;
+
+        /**
+         * DeArmor an OpenPGP armored message; verify the checksum and return
+         * the encoded bytes
+         * @param text OpenPGP armored message
+         * @returns An object with attribute "text" containing the message text,
+         *          an attribute "data" containing a stream of bytes and "type" for the ASCII armor type
+         */
+        function dearmor(text: string): Promise<Object>;
+
+        /**
+         * Armor an OpenPGP binary packet block
+         * @param messagetype type of the message
+         * @param body
+         * @param partindex
+         * @param parttotal
+         * @param customComment (optional) additional comment to add to the armored string
+         * @returns Armored text
+         */
+        function armor(messagetype: Integer, body: any, partindex: Integer, parttotal: Integer, customComment?: string): string | ReadableStream<String>;
+    }
+
+    namespace base64 {
+        /**
+         * Convert binary array to radix-64
+         * @param t Uint8Array to convert
+         * @param u if true, output is URL-safe
+         * @returns radix-64 version of input string
+         */
+        function s2r(t: Uint8Array | ReadableStream<Uint8Array>, u?: boolean): string | ReadableStream<String>;
+
+        /**
+         * Convert radix-64 to binary array
+         * @param t radix-64 string to convert
+         * @param u if true, input is interpreted as URL-safe
+         * @returns binary array version of input string
+         */
+        function r2s(t: string | ReadableStream<String>, u: boolean): Uint8Array | ReadableStream<Uint8Array>;
+    }
+}
+
+export namespace enums {
+    /**
+     * Maps curve names under various standards to one
+     * @see
+     */
+    enum curve {
+        /**
+         * NIST P-256 Curve
+         */
+        p256 = "p256",
+        "P-256" = "p256",
+        secp256r1 = "p256",
+        prime256v1 = "p256",
+        "1.2.840.10045.3.1.7" = "p256",
+        "2a8648ce3d030107" = "p256",
+        "2A8648CE3D030107" = "p256",
+        /**
+         * NIST P-384 Curve
+         */
+        p384 = "p384",
+        "P-384" = "p384",
+        secp384r1 = "p384",
+        "1.3.132.0.34" = "p384",
+        "2b81040022" = "p384",
+        "2B81040022" = "p384",
+        /**
+         * NIST P-521 Curve
+         */
+        p521 = "p521",
+        "P-521" = "p521",
+        secp521r1 = "p521",
+        "1.3.132.0.35" = "p521",
+        "2b81040023" = "p521",
+        "2B81040023" = "p521",
+        /**
+         * SECG SECP256k1 Curve
+         */
+        secp256k1 = "secp256k1",
+        "1.3.132.0.10" = "secp256k1",
+        "2b8104000a" = "secp256k1",
+        "2B8104000A" = "secp256k1",
+        /**
+         * Ed25519
+         */
+        ED25519 = "ed25519",
+        ed25519 = "ed25519",
+        Ed25519 = "ed25519",
+        "1.3.6.1.4.1.11591.15.1" = "ed25519",
+        "2b06010401da470f01" = "ed25519",
+        "2B06010401DA470F01" = "ed25519",
+        /**
+         * Curve25519
+         */
+        X25519 = "curve25519",
+        cv25519 = "curve25519",
+        curve25519 = "curve25519",
+        Curve25519 = "curve25519",
+        "1.3.6.1.4.1.3029.1.5.1" = "curve25519",
+        "2b060104019755010501" = "curve25519",
+        "2B060104019755010501" = "curve25519",
+        /**
+         * BrainpoolP256r1 Curve
+         */
+        brainpoolP256r1 = "brainpoolP256r1",
+        "1.3.36.3.3.2.8.1.1.7" = "brainpoolP256r1",
+        "2b2403030208010107" = "brainpoolP256r1",
+        "2B2403030208010107" = "brainpoolP256r1",
+        /**
+         * BrainpoolP384r1 Curve
+         */
+        brainpoolP384r1 = "brainpoolP384r1",
+        "1.3.36.3.3.2.8.1.1.11" = "brainpoolP384r1",
+        "2b240303020801010b" = "brainpoolP384r1",
+        "2B240303020801010B" = "brainpoolP384r1",
+        /**
+         * BrainpoolP512r1 Curve
+         */
+        brainpoolP512r1 = "brainpoolP512r1",
+        "1.3.36.3.3.2.8.1.1.13" = "brainpoolP512r1",
+        "2b240303020801010d" = "brainpoolP512r1",
+        "2B240303020801010D" = "brainpoolP512r1",
+    }
+
+    /**
+     * A string to key specifier type
+     */
+    enum s2k {
+        simple = 0,
+        salted = 1,
+        iterated = 3,
+        gnu = 101,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
+     */
+    enum publicKey {
+        /**
+         * RSA (Encrypt or Sign) [HAC]
+         */
+        rsa_encrypt_sign = 1,
+        /**
+         * RSA (Encrypt only) [HAC]
+         */
+        rsa_encrypt = 2,
+        /**
+         * RSA (Sign only) [HAC]
+         */
+        rsa_sign = 3,
+        /**
+         * Elgamal (Encrypt only) [ELGAMAL] [HAC]
+         */
+        elgamal = 16,
+        /**
+         * DSA (Sign only) [FIPS186] [HAC]
+         */
+        dsa = 17,
+        /**
+         * ECDH (Encrypt only) [RFC6637]
+         */
+        ecdh = 18,
+        /**
+         * ECDSA (Sign only) [RFC6637]
+         */
+        ecdsa = 19,
+        /**
+         * EdDSA (Sign only)
+         * [ {@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}]
+         */
+        eddsa = 22,
+        /**
+         * Reserved for AEDH
+         */
+        aedh = 23,
+        /**
+         * Reserved for AEDSA
+         */
+        aedsa = 24,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
+     */
+    enum symmetric {
+        plaintext = 0,
+        /**
+         * Not implemented!
+         */
+        idea = 1,
+        "3des" = 2,
+        tripledes = 2,
+        cast5 = 3,
+        blowfish = 4,
+        aes128 = 7,
+        aes192 = 8,
+        aes256 = 9,
+        twofish = 10,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.3|RFC4880, section 9.3}
+     */
+    enum compression {
+        uncompressed = 0,
+        /**
+         * RFC1951
+         */
+        zip = 1,
+        /**
+         * RFC1950
+         */
+        zlib = 2,
+        bzip2 = 3,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC4880, section 9.4}
+     */
+    enum hash {
+        md5 = 1,
+        sha1 = 2,
+        ripemd = 3,
+        sha256 = 8,
+        sha384 = 9,
+        sha512 = 10,
+        sha224 = 11,
+    }
+
+    /**
+     * A list of hash names as accepted by webCrypto functions.
+     * {@link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest|Parameters, algo}
+     */
+    enum webHash {
+        "SHA-1" = 2,
+        "SHA-256" = 8,
+        "SHA-384" = 9,
+        "SHA-512" = 10,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.6|RFC4880bis-04, section 9.6}
+     */
+    enum aead {
+        eax = 1,
+        ocb = 2,
+        experimental_gcm = 100,
+    }
+
+    /**
+     * A list of packet types and numeric tags associated with them.
+     */
+    enum packet {
+        publicKeyEncryptedSessionKey = 1,
+        signature = 2,
+        symEncryptedSessionKey = 3,
+        onePassSignature = 4,
+        secretKey = 5,
+        publicKey = 6,
+        secretSubkey = 7,
+        compressed = 8,
+        symmetricallyEncrypted = 9,
+        marker = 10,
+        literal = 11,
+        trust = 12,
+        userid = 13,
+        publicSubkey = 14,
+        userAttribute = 17,
+        symEncryptedIntegrityProtected = 18,
+        modificationDetectionCode = 19,
+        symEncryptedAEADProtected = 20,
+    }
+
+    /**
+     * Data types in the literal packet
+     */
+    enum literal {
+        /**
+         * Binary data 'b'
+         */
+        binary = "",
+        /**
+         * Text data 't'
+         */
+        text = "",
+        /**
+         * Utf8 data 'u'
+         */
+        utf8 = "",
+        /**
+         * MIME message body part 'm'
+         */
+        mime = "",
+    }
+
+    /**
+     * One pass signature packet type
+     */
+    enum signature {
+        /**
+         * 0x00: Signature of a binary document.
+         */
+        binary = 0,
+        /**
+         * 0x01: Signature of a canonical text document.
+         * Canonicalyzing the document by converting line endings.
+         */
+        text = 1,
+        /**
+         * 0x02: Standalone signature.
+         * This signature is a signature of only its own subpacket contents.
+         * It is calculated identically to a signature over a zero-lengh
+         * binary document.  Note that it doesn't make sense to have a V3
+         * standalone signature.
+         */
+        standalone = 2,
+        /**
+         * 0x10: Generic certification of a User ID and Public-Key packet.
+         * The issuer of this certification does not make any particular
+         * assertion as to how well the certifier has checked that the owner
+         * of the key is in fact the person described by the User ID.
+         */
+        cert_generic = 16,
+        /**
+         * 0x11: Persona certification of a User ID and Public-Key packet.
+         * The issuer of this certification has not done any verification of
+         * the claim that the owner of this key is the User ID specified.
+         */
+        cert_persona = 17,
+        /**
+         * 0x12: Casual certification of a User ID and Public-Key packet.
+         * The issuer of this certification has done some casual
+         * verification of the claim of identity.
+         */
+        cert_casual = 18,
+        /**
+         * 0x13: Positive certification of a User ID and Public-Key packet.
+         * The issuer of this certification has done substantial
+         * verification of the claim of identity.
+         * Most OpenPGP implementations make their "key signatures" as 0x10
+         * certifications.  Some implementations can issue 0x11-0x13
+         * certifications, but few differentiate between the types.
+         */
+        cert_positive = 19,
+        /**
+         * 0x30: Certification revocation signature
+         * This signature revokes an earlier User ID certification signature
+         * (signature class 0x10 through 0x13) or direct-key signature
+         * (0x1F).  It should be issued by the same key that issued the
+         * revoked signature or an authorized revocation key.  The signature
+         * is computed over the same data as the certificate that it
+         * revokes, and should have a later creation date than that
+         * certificate.
+         */
+        cert_revocation = 48,
+        /**
+         * 0x18: Subkey Binding Signature
+         * This signature is a statement by the top-level signing key that
+         * indicates that it owns the subkey.  This signature is calculated
+         * directly on the primary key and subkey, and not on any User ID or
+         * other packets.  A signature that binds a signing subkey MUST have
+         * an Embedded Signature subpacket in this binding signature that
+         * contains a 0x19 signature made by the signing subkey on the
+         * primary key and subkey.
+         */
+        subkey_binding = 24,
+        /**
+         * 0x19: Primary Key Binding Signature
+         * This signature is a statement by a signing subkey, indicating
+         * that it is owned by the primary key and subkey.  This signature
+         * is calculated the same way as a 0x18 signature: directly on the
+         * primary key and subkey, and not on any User ID or other packets.
+         * When a signature is made over a key, the hash data starts with the
+         * octet 0x99, followed by a two-octet length of the key, and then body
+         * of the key packet.  (Note that this is an old-style packet header for
+         * a key packet with two-octet length.)  A subkey binding signature
+         * (type 0x18) or primary key binding signature (type 0x19) then hashes
+         * the subkey using the same format as the main key (also using 0x99 as
+         * the first octet).
+         */
+        key_binding = 25,
+        /**
+         * 0x1F: Signature directly on a key
+         * This signature is calculated directly on a key.  It binds the
+         * information in the Signature subpackets to the key, and is
+         * appropriate to be used for subpackets that provide information
+         * about the key, such as the Revocation Key subpacket.  It is also
+         * appropriate for statements that non-self certifiers want to make
+         * about the key itself, rather than the binding between a key and a
+         * name.
+         */
+        key = 31,
+        /**
+         * 0x20: Key revocation signature
+         * The signature is calculated directly on the key being revoked.  A
+         * revoked key is not to be used.  Only revocation signatures by the
+         * key being revoked, or by an authorized revocation key, should be
+         * considered valid revocation signatures.a
+         */
+        key_revocation = 32,
+        /**
+         * 0x28: Subkey revocation signature
+         * The signature is calculated directly on the subkey being revoked.
+         * A revoked subkey is not to be used.  Only revocation signatures
+         * by the top-level signature key that is bound to this subkey, or
+         * by an authorized revocation key, should be considered valid
+         * revocation signatures.
+         * Key revocation signatures (types 0x20 and 0x28)
+         * hash only the key being revoked.
+         */
+        subkey_revocation = 40,
+        /**
+         * 0x40: Timestamp signature.
+         * This signature is only meaningful for the timestamp contained in
+         * it.
+         */
+        timestamp = 64,
+        /**
+         * 0x50: Third-Party Confirmation signature.
+         * This signature is a signature over some other OpenPGP Signature
+         * packet(s).  It is analogous to a notary seal on the signed data.
+         * A third-party signature SHOULD include Signature Target
+         * subpacket(s) to give easy identification.  Note that we really do
+         * mean SHOULD.  There are plausible uses for this (such as a blind
+         * party that only sees the signature, not the key or source
+         * document) that cannot include a target subpacket.
+         */
+        third_party = 80,
+    }
+
+    /**
+     * Signature subpacket type
+     */
+    enum signatureSubpacket {
+        signature_creation_time = 2,
+        signature_expiration_time = 3,
+        exportable_certification = 4,
+        trust_signature = 5,
+        regular_expression = 6,
+        revocable = 7,
+        key_expiration_time = 9,
+        placeholder_backwards_compatibility = 10,
+        preferred_symmetric_algorithms = 11,
+        revocation_key = 12,
+        issuer = 16,
+        notation_data = 20,
+        preferred_hash_algorithms = 21,
+        preferred_compression_algorithms = 22,
+        key_server_preferences = 23,
+        preferred_key_server = 24,
+        primary_user_id = 25,
+        policy_uri = 26,
+        key_flags = 27,
+        signers_user_id = 28,
+        reason_for_revocation = 29,
+        features = 30,
+        signature_target = 31,
+        embedded_signature = 32,
+        issuer_fingerprint = 33,
+        preferred_aead_algorithms = 34,
+    }
+
+    /**
+     * Key flags
+     */
+    enum keyFlags {
+        /**
+         * 0x01 - This key may be used to certify other keys.
+         */
+        certify_keys = 1,
+        /**
+         * 0x02 - This key may be used to sign data.
+         */
+        sign_data = 2,
+        /**
+         * 0x04 - This key may be used to encrypt communications.
+         */
+        encrypt_communication = 4,
+        /**
+         * 0x08 - This key may be used to encrypt storage.
+         */
+        encrypt_storage = 8,
+        /**
+         * 0x10 - The private component of this key may have been split
+         * by a secret-sharing mechanism.
+         */
+        split_private_key = 16,
+        /**
+         * 0x20 - This key may be used for authentication.
+         */
+        authentication = 32,
+        /**
+         * 0x80 - The private component of this key may be in the
+         * possession of more than one person.
+         */
+        shared_private_key = 128,
+    }
+
+    /**
+     * Key status
+     */
+    enum keyStatus {
+        invalid = 0,
+        expired = 1,
+        revoked = 2,
+        valid = 3,
+        no_self_cert = 4,
+    }
+
+    /**
+     * Armor type
+     */
+    enum armor {
+        multipart_section = 0,
+        multipart_last = 1,
+        signed = 2,
+        message = 3,
+        public_key = 4,
+        private_key = 5,
+        signature = 6,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.23|RFC4880, section 5.2.3.23}
+     */
+    enum reasonForRevocation {
+        /**
+         * No reason specified (key revocations or cert revocations)
+         */
+        no_reason = 0,
+        /**
+         * Key is superseded (key revocations)
+         */
+        key_superseded = 1,
+        /**
+         * Key material has been comPromise<any>d (key revocations)
+         */
+        key_comPromised = 2,
+        /**
+         * Key is retired and no longer used (key revocations)
+         */
+        key_retired = 3,
+        /**
+         * User ID information is no longer valid (cert revocations)
+         */
+        userid_invalid = 32,
+    }
+
+    /**
+     * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.2.3.25|RFC4880bis-04, section 5.2.3.25}
+     */
+    enum features {
+        /**
+         * 0x01 - Modification Detection (packets 18 and 19)
+         */
+        modification_detection = 1,
+        /**
+         * 0x02 - AEAD Encrypted Data Packet (packet 20) and version 5
+         * Symmetric-Key Encrypted Session Key Packets (packet 3)
+         */
+        aead = 2,
+        /**
+         * 0x04 - Version 5 Public-Key Packet format and corresponding new
+         * fingerprint format
+         */
+        v5_keys = 4,
+    }
+
+    /**
+     * Asserts validity and converts from string/integer to integer.
+     */
+    function write(): void;
+
+    /**
+     * Converts from an integer to string.
+     */
+    function read(): void;
+}
+
+export namespace hkp {
     class HKP {
         /**
          * Initialize the HKP client and configure it with the key server url and fetch function.
@@ -1624,557 +1595,301 @@ export namespace openpgp {
          */
         upload(publicKeyArmored: string): Promise<any>;
     }
+}
 
-    namespace key {
+export class HKP {
+    /**
+     * Initialize the HKP client and configure it with the key server url and fetch function.
+     * @param keyServerBaseUrl (optional) The HKP key server base url including
+     *        the protocol to use, e.g. 'https://pgp.mit.edu'; defaults to
+     *        openpgp.config.keyserver (https://keyserver.ubuntu.com)
+     */
+    constructor(keyServerBaseUrl: string);
+
+    /**
+     * Search for a public key on the key server either by key ID or part of the user ID.
+     * @param options.keyID The long public key ID.
+     * @param options.query This can be any part of the key user ID such as name
+     *        or email address.
+     * @returns The ascii armored public key.
+     */
+    lookup(): Promise<String>;
+
+    /**
+     * Upload a public key to the server.
+     * @param publicKeyArmored An ascii armored public key to be uploaded.
+     * @returns
+     */
+    upload(publicKeyArmored: string): Promise<any>;
+}
+
+export namespace key {
+    /**
+     * Class that represents an OpenPGP key. Must contain a primary key.
+     * Can contain additional subkeys, signatures, user ids, user attributes.
+     */
+    class Key {
         /**
-         * Class that represents an OpenPGP key. Must contain a primary key.
-         * Can contain additional subkeys, signatures, user ids, user attributes.
+         * @param packetlist The packets that form this key
          */
-        class Key {
-            /**
-             * @param packetlist The packets that form this key
-             */
-            constructor(packetlist: packet.List);
-
-            /**
-             * Transforms packetlist to structured key data
-             * @param packetlist The packets that form a key
-             */
-            packetlist2structure(packetlist: packet.List): void;
-
-            /**
-             * Transforms structured key data to packetlist
-             * @returns The packets that form a key
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Returns an array containing all public or private subkeys matching keyId;
-             * If keyId is not present, returns all subkeys.
-             * @param keyId
-             * @returns
-             */
-            getSubkeys(keyId: type.keyid.Keyid): any[];
-
-            /**
-             * Returns an array containing all public or private keys matching keyId.
-             * If keyId is not present, returns all keys starting with the primary key.
-             * @param keyId
-             * @returns
-             */
-            getKeys(keyId: type.keyid.Keyid): any[];
-
-            /**
-             * Returns key IDs of all keys
-             * @returns
-             */
-            getKeyIds(): any[];
-
-            /**
-             * Returns userids
-             * @returns array of userids
-             */
-            getUserIds(): any[];
-
-            /**
-             * Returns true if this is a public key
-             * @returns
-             */
-            isPublic(): boolean;
-
-            /**
-             * Returns true if this is a private key
-             * @returns
-             */
-            isPrivate(): boolean;
-
-            /**
-             * Returns key as public key (shallow copy)
-             * @returns new public Key
-             */
-            toPublic(): Key;
-
-            /**
-             * Returns ASCII armored text of key
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
-
-            /**
-             * Returns last created key or key by given keyId that is available for signing and verification
-             * @param keyId, optional
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId, optional user ID
-             * @returns key or null if no signing key has been found
-             */
-            getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
-
-            /**
-             * Returns last created key or key by given keyId that is available for encryption or decryption
-             * @param keyId, optional
-             * @param date, optional
-             * @param userId, optional
-             * @returns key or null if no encryption key has been found
-             */
-            getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
-
-            /**
-             * Encrypts all secret key and subkey packets matching keyId
-             * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
-             * @param keyId
-             * @returns
-             */
-            encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
-
-            /**
-             * Decrypts all secret key and subkey packets matching keyId
-             * @param passphrases
-             * @param keyId
-             * @returns true if all matching key and subkey packets decrypted successfully
-             */
-            decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
-
-            /**
-             * Checks if a signature on a key is revoked
-             * @param
-             * @param signature The signature to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the certificate is revoked
-             */
-            isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
-
-            /**
-             * Verify primary key. Checks for revocation signatures, expiration time
-             * and valid self signature
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID
-             * @returns The status of the primary key
-             */
-            verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
-
-            /**
-             * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
-             * When `capabilities` is null, defaults to returning the expiry date of the primary key.
-             * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
-             * Returns Infinity if the key doesn't expire.
-             * @param {encrypt | sign | encrypt_sign} capabilities, optional
-             * @param keyId, optional
-             * @param userId, optional user ID
-             * @returns
-             */
-            getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
-
-            /**
-             * Returns primary user and most significant (latest valid) self signature
-             * - if multiple primary users exist, returns the one with the latest self signature
-             * - otherwise, returns the user with the latest self signature
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns The primary user and the self signature
-             */
-            getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
-
-            /**
-             * Update key with new components from specified key with same key ID:
-             * users, subkeys, certificates are merged into the destination key,
-             * duplicates and expired signatures are ignored.
-             * If the specified key is a private key and the destination key is public,
-             * the destination key is transformed to a private key.
-             * @param key Source key to merge
-             * @returns
-             */
-            update(key: Key): Promise<undefined>;
-
-            /**
-             * Revokes the key
-             * @param reasonForRevocation optional, object indicating the reason for revocation
-             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
-             * @param reasonForRevocation.string optional, string explaining the reason for revocation
-             * @param date optional, override the creationtime of the revocation signature
-             * @returns new key with revocation signature
-             */
-            revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
-
-            /**
-             * Get revocation certificate from a revoked key.
-             * (To get a revocation certificate for an unrevoked key, call revoke() first.)
-             * @returns armored revocation certificate
-             */
-            getRevocationCertificate(): Promise<String>;
-
-            /**
-             * Applies a revocation certificate to a key
-             * This adds the first signature packet in the armored text to the key,
-             * if it is a valid revocation signature.
-             * @param revocationCertificate armored revocation certificate
-             * @returns new revoked key
-             */
-            applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
-
-            /**
-             * Signs primary user of key
-             * @param privateKey decrypted private keys for signing
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns new public key with new certificate signature
-             */
-            signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
-
-            /**
-             * Signs all users of key
-             * @param privateKeys decrypted private keys for signing
-             * @returns new public key with new certificate signature
-             */
-            signAllUsers(privateKeys: any[]): Promise<Key>;
-
-            /**
-             * Verifies primary user of key
-             * - if no arguments are given, verifies the self certificates;
-             * - otherwise, verifies all certificates signed with given keys.
-             * @param keys array of keys to verify certificate signatures
-             * @param date (optional) use the given date for verification instead of the current time
-             * @param userId (optional) user ID to get instead of the primary user, if it exists
-             * @returns List of signer's keyid and validity of signature
-             */
-            verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verifies all users of key
-             * - if no arguments are given, verifies the self certificates;
-             * - otherwise, verifies all certificates signed with given keys.
-             * @param keys array of keys to verify certificate signatures
-             * @returns list of userid, signer's keyid and validity of signature
-             */
-            verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-        }
+        constructor(packetlist: packet.List);
 
         /**
-         * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
-         * @param signatures List of signatures
-         * @param date Use the given date instead of the current time
-         * @returns The latest valid signature
+         * Transforms packetlist to structured key data
+         * @param packetlist The packets that form a key
          */
-        function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
+        packetlist2structure(packetlist: packet.List): void;
 
         /**
-         * Class that represents an user ID or attribute packet and the relevant signatures.
+         * Transforms structured key data to packetlist
+         * @returns The packets that form a key
          */
-        class User {
-            constructor();
-
-            /**
-             * Transforms structured user data to packetlist
-             * @returns
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Signs user
-             * @param primaryKey The primary key packet
-             * @param privateKeys Decrypted private keys for signing
-             * @returns New user with new certificate signatures
-             */
-            sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
-
-            /**
-             * Checks if a given certificate of the user is revoked
-             * @param primaryKey The primary key packet
-             * @param certificate The certificate to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the certificate is revoked
-             */
-            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
-
-            /**
-             * Verifies the user certificate
-             * @param primaryKey The primary key packet
-             * @param certificate A certificate of this user
-             * @param keys Array of keys to verify certificate signatures
-             * @param date Use the given date instead of the current time
-             * @returns status of the certificate
-             */
-            verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Verifies all user certificates
-             * @param primaryKey The primary key packet
-             * @param keys Array of keys to verify certificate signatures
-             * @param date Use the given date instead of the current time
-             * @returns List of signer's keyid and validity of signature
-             */
-            verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
-
-            /**
-             * Verify User. Checks for existence of self signatures, revocation signatures
-             * and validity of self signature
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns Status of user
-             */
-            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Update user with new components from specified user
-             * @param user Source user to merge
-             * @param primaryKey primary key used for validation
-             * @returns
-             */
-            update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
-        }
+        toPacketlist(): packet.List;
 
         /**
-         * Create signature packet
-         * @param dataToSign Contains packets to be signed
-         * @param signingKeyPacket secret key packet for signing
-         * @param signatureProperties (optional) properties to write on the signature packet before signing
-         * @param date (optional) override the creationtime of the signature
-         * @param userId (optional) user ID
-         * @returns signature packet
-         */
-        function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
-
-        /**
-         * Class that represents a subkey packet and the relevant signatures.
-         */
-        class SubKey {
-            constructor();
-
-            /**
-             * Transforms structured subkey data to packetlist
-             * @returns
-             */
-            toPacketlist(): packet.List;
-
-            /**
-             * Checks if a binding signature of a subkey is revoked
-             * @param primaryKey The primary key packet
-             * @param signature The binding signature to verify
-             * @param key, optional The key to verify the signature
-             * @param date Use the given date instead of the current time
-             * @returns True if the binding signature is revoked
-             */
-            isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
-
-            /**
-             * Verify subkey. Checks for revocation signatures, expiration time
-             * and valid binding signature
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns The status of the subkey
-             */
-            verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
-
-            /**
-             * Returns the expiration time of the subkey or Infinity if key does not expire
-             * Returns null if the subkey is invalid.
-             * @param primaryKey The primary key packet
-             * @param date Use the given date instead of the current time
-             * @returns
-             */
-            getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
-
-            /**
-             * Update subkey with new components from specified subkey
-             * @param subKey Source subkey to merge
-             * @param primaryKey primary key used for validation
-             * @returns
-             */
-            update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
-
-            /**
-             * Revokes the subkey
-             * @param primaryKey decrypted private primary key for revocation
-             * @param reasonForRevocation optional, object indicating the reason for revocation
-             * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
-             * @param reasonForRevocation.string optional, string explaining the reason for revocation
-             * @param date optional, override the creationtime of the revocation signature
-             * @returns new subkey with revocation signature
-             */
-            revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-        }
-
-        /**
-         * Reads an unarmored OpenPGP key list and returns one or multiple key objects
-         * @param data to be parsed
-         * @returns result object with key and error arrays
-         */
-        function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
-
-        interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
-
-        /**
-         * Reads an OpenPGP armored text and returns one or multiple key objects
-         * @param armoredText text to be parsed
-         * @returns result object with key and error arrays
-         */
-        function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
-
-        /**
-         * Generates a new OpenPGP key. Supports RSA and ECC keys.
-         * Primary and subkey will be of same type.
-         * @param options.keyType To indicate what type of key to make.
-         *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
-         * @param options.numBits number of bits for the key creation.
-         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
-         *        If array is used, the first userId is set as primary user Id
-         * @param options.passphrase The passphrase used to encrypt the resulting private key
-         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
-         * @param curve (optional) elliptic curve for ECC keys
-         * @param date Override the creation date of the key and the key signatures
-         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
-         *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+         * Returns an array containing all public or private subkeys matching keyId;
+         * If keyId is not present, returns all subkeys.
+         * @param keyId
          * @returns
          */
-        function generate(options: KeyOptions): Promise<Key>;
+        getSubkeys(keyId: type.keyid.Keyid): any[];
 
         /**
-         * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
-         * @param options.privateKey The private key to reformat
-         * @param options.keyType
-         * @param options.userIds Assumes already in form of "User Name <username@email.com>"
-         *        If array is used, the first userId is set as primary user Id
-         * @param options.passphrase The passphrase used to encrypt the resulting private key
-         * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
-         * @param date Override the creation date of the key and the key signatures
-         * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+         * Returns an array containing all public or private keys matching keyId.
+         * If keyId is not present, returns all keys starting with the primary key.
+         * @param keyId
          * @returns
          */
-        function reformat(date: Date, subkeys: any[]): Promise<Key>;
+        getKeys(keyId: type.keyid.Keyid): any[];
 
         /**
-         * Checks if a given certificate or binding signature is revoked
-         * @param primaryKey The primary key packet
-         * @param dataToVerify The data to check
-         * @param revocations The revocation signatures to check
-         * @param signature The certificate or signature to check
-         * @param key, optional The key packet to check the signature
+         * Returns key IDs of all keys
+         * @returns
+         */
+        getKeyIds(): any[];
+
+        /**
+         * Returns userids
+         * @returns array of userids
+         */
+        getUserIds(): any[];
+
+        /**
+         * Returns true if this is a public key
+         * @returns
+         */
+        isPublic(): boolean;
+
+        /**
+         * Returns true if this is a private key
+         * @returns
+         */
+        isPrivate(): boolean;
+
+        /**
+         * Returns key as public key (shallow copy)
+         * @returns new public Key
+         */
+        toPublic(): Key;
+
+        /**
+         * Returns ASCII armored text of key
+         * @returns ASCII armor
+         */
+        armor(): ReadableStream<String>;
+
+        /**
+         * Returns last created key or key by given keyId that is available for signing and verification
+         * @param keyId, optional
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId, optional user ID
+         * @returns key or null if no signing key has been found
+         */
+        getSigningKey(keyId: type.keyid.Keyid, date?: Date, userId?: object): Promise<Key | SubKey | null>;
+
+        /**
+         * Returns last created key or key by given keyId that is available for encryption or decryption
+         * @param keyId, optional
+         * @param date, optional
+         * @param userId, optional
+         * @returns key or null if no encryption key has been found
+         */
+        getEncryptionKey(keyId?: type.keyid.Keyid, date?: Date, userId?: string): Promise<Key | SubKey | null>;
+
+        /**
+         * Encrypts all secret key and subkey packets matching keyId
+         * @param passphrases - if multiple passphrases, then should be in same order as packets each should encrypt
+         * @param keyId
+         * @returns
+         */
+        encrypt(passphrases: string | any[], keyId?: type.keyid.Keyid): Promise<Array<packet.SecretKey | packet.SecretSubkey>>;
+
+        /**
+         * Decrypts all secret key and subkey packets matching keyId
+         * @param passphrases
+         * @param keyId
+         * @returns true if all matching key and subkey packets decrypted successfully
+         */
+        decrypt(passphrases: string | string[], keyId?: type.keyid.Keyid): Promise<Boolean>;
+
+        /**
+         * Checks if a signature on a key is revoked
+         * @param
+         * @param signature The signature to verify
+         * @param key, optional The key to verify the signature
          * @param date Use the given date instead of the current time
-         * @returns True if the signature revokes the data
+         * @returns True if the certificate is revoked
          */
-        function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+        isRevoked(signature: packet.Signature, key?: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date?: Date): Promise<Boolean>;
 
         /**
-         * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
-         * and throw error if found
-         * @param signature The certificate or signature to check
-         * @param keyId Check only certificates or signatures from a certain issuer key ID
-         */
-        function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
-
-        /**
-         * Returns the preferred signature hash algorithm of a key
-         * @param key (optional) the key to get preferences from
-         * @param keyPacket key packet used for signing
+         * Verify primary key. Checks for revocation signatures, expiration time
+         * and valid self signature
          * @param date (optional) use the given date for verification instead of the current time
          * @param userId (optional) user ID
+         * @returns The status of the primary key
+         */
+        verifyPrimaryKey(date?: Date, userId?: object): Promise<enums.keyStatus>;
+
+        /**
+         * Returns the latest date when the key can be used for encrypting, signing, or both, depending on the `capabilities` paramater.
+         * When `capabilities` is null, defaults to returning the expiry date of the primary key.
+         * Returns null if `capabilities` is passed and the key does not have the specified capabilities or is revoked or invalid.
+         * Returns Infinity if the key doesn't expire.
+         * @param {encrypt | sign | encrypt_sign} capabilities, optional
+         * @param keyId, optional
+         * @param userId, optional user ID
          * @returns
          */
-        function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+        getExpirationTime(capabilities: any, keyId: type.keyid.Keyid, userId: object): Promise<Date | Infinity | null>;
 
         /**
-         * Returns the preferred symmetric/aead algorithm for a set of keys
-         * @param {symmetric | aead} type Type of preference to return
-         * @param keys Set of keys
+         * Returns primary user and most significant (latest valid) self signature
+         * - if multiple primary users exist, returns the one with the latest self signature
+         * - otherwise, returns the user with the latest self signature
          * @param date (optional) use the given date for verification instead of the current time
-         * @param userIds (optional) user IDs
-         * @returns Preferred symmetric algorithm
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns The primary user and the self signature
          */
-        function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+        getPrimaryUser(date: Date, userId: object): Promise<{ user: User, selfCertification: packet.Signature }>;
 
         /**
-         * Returns whether aead is supported by all keys in the set
-         * @param keys Set of keys
-         * @param date (optional) use the given date for verification instead of the current time
-         * @param userIds (optional) user IDs
+         * Update key with new components from specified key with same key ID:
+         * users, subkeys, certificates are merged into the destination key,
+         * duplicates and expired signatures are ignored.
+         * If the specified key is a private key and the destination key is public,
+         * the destination key is transformed to a private key.
+         * @param key Source key to merge
          * @returns
          */
-        function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+        update(key: Key): Promise<undefined>;
+
+        /**
+         * Revokes the key
+         * @param reasonForRevocation optional, object indicating the reason for revocation
+         * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+         * @param reasonForRevocation.string optional, string explaining the reason for revocation
+         * @param date optional, override the creationtime of the revocation signature
+         * @returns new key with revocation signature
+         */
+        revoke(reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<Key>;
+
+        /**
+         * Get revocation certificate from a revoked key.
+         * (To get a revocation certificate for an unrevoked key, call revoke() first.)
+         * @returns armored revocation certificate
+         */
+        getRevocationCertificate(): Promise<String>;
+
+        /**
+         * Applies a revocation certificate to a key
+         * This adds the first signature packet in the armored text to the key,
+         * if it is a valid revocation signature.
+         * @param revocationCertificate armored revocation certificate
+         * @returns new revoked key
+         */
+        applyRevocationCertificate(revocationCertificate: string): Promise<Key>;
+
+        /**
+         * Signs primary user of key
+         * @param privateKey decrypted private keys for signing
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns new public key with new certificate signature
+         */
+        signPrimaryUser(privateKey: any[], date: Date, userId: object): Promise<Key>;
+
+        /**
+         * Signs all users of key
+         * @param privateKeys decrypted private keys for signing
+         * @returns new public key with new certificate signature
+         */
+        signAllUsers(privateKeys: any[]): Promise<Key>;
+
+        /**
+         * Verifies primary user of key
+         * - if no arguments are given, verifies the self certificates;
+         * - otherwise, verifies all certificates signed with given keys.
+         * @param keys array of keys to verify certificate signatures
+         * @param date (optional) use the given date for verification instead of the current time
+         * @param userId (optional) user ID to get instead of the primary user, if it exists
+         * @returns List of signer's keyid and validity of signature
+         */
+        verifyPrimaryUser(keys: any[], date: Date, userId: object): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Verifies all users of key
+         * - if no arguments are given, verifies the self certificates;
+         * - otherwise, verifies all certificates signed with given keys.
+         * @param keys array of keys to verify certificate signatures
+         * @returns list of userid, signer's keyid and validity of signature
+         */
+        verifyAllUsers(keys: any[]): Promise<Array<{ userid: string, keyid: type.keyid.Keyid, valid: boolean }>>;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
     }
 
-    interface revoke_reasonForRevocation {
-        /**
-         * optional, flag indicating the reason for revocation
-         */
-        flag: enums.reasonForRevocation;
-        /**
-         * optional, string explaining the reason for revocation
-         */
-        string: string;
-    }
+    /**
+     * Returns the valid and non-expired signature that has the latest creation date, while ignoring signatures created in the future.
+     * @param signatures List of signatures
+     * @param date Use the given date instead of the current time
+     * @returns The latest valid signature
+     */
+    function getLatestValidSignature(signatures: any[], date: Date): Promise<packet.Signature>;
 
     /**
      * Class that represents an user ID or attribute packet and the relevant signatures.
@@ -2194,7 +1909,7 @@ export namespace openpgp {
          * @param privateKeys Decrypted private keys for signing
          * @returns New user with new certificate signatures
          */
-        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+        sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<Key>;
 
         /**
          * Checks if a given certificate of the user is revoked
@@ -2240,9 +1955,20 @@ export namespace openpgp {
          * @param primaryKey primary key used for validation
          * @returns
          */
-        update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        update(user: User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
     }
 
+    /**
+     * Create signature packet
+     * @param dataToSign Contains packets to be signed
+     * @param signingKeyPacket secret key packet for signing
+     * @param signatureProperties (optional) properties to write on the signature packet before signing
+     * @param date (optional) override the creationtime of the signature
+     * @param userId (optional) user ID
+     * @returns signature packet
+     */
+    function createSignaturePacket(dataToSign: object, signingKeyPacket: packet.SecretKey | packet.SecretSubkey, signatureProperties: object, date: Date, userId: object): packet.Signature;
+
     /**
      * Class that represents a subkey packet and the relevant signatures.
      */
@@ -2289,7 +2015,7 @@ export namespace openpgp {
          * @param primaryKey primary key used for validation
          * @returns
          */
-        update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+        update(subKey: SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
 
         /**
          * Revokes the subkey
@@ -2300,7 +2026,7 @@ export namespace openpgp {
          * @param date optional, override the creationtime of the revocation signature
          * @returns new subkey with revocation signature
          */
-        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+        revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<SubKey>;
 
         /**
          * Calculates the key id of the key
@@ -2340,2895 +2066,3168 @@ export namespace openpgp {
     }
 
     /**
-     * @see module:keyring/keyring
-     * @see module:keyring/localstore
+     * Reads an unarmored OpenPGP key list and returns one or multiple key objects
+     * @param data to be parsed
+     * @returns result object with key and error arrays
      */
+    function read(data: Uint8Array): Promise<{ keys: Array<Key>, err: Array<Error> | null }>;
+
+    interface KeyResult { keys: Array<Key>, err: Array<Error> | null }
+
+    /**
+     * Reads an OpenPGP armored text and returns one or multiple key objects
+     * @param armoredText text to be parsed
+     * @returns result object with key and error arrays
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Promise<KeyResult>;
+
+    /**
+     * Generates a new OpenPGP key. Supports RSA and ECC keys.
+     * Primary and subkey will be of same type.
+     * @param options.keyType To indicate what type of key to make.
+     *        RSA is 1. See {@link https://tools.ietf.org/html/rfc4880#section-9.1}
+     * @param options.numBits number of bits for the key creation.
+     * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+     *        If array is used, the first userId is set as primary user Id
+     * @param options.passphrase The passphrase used to encrypt the resulting private key
+     * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+     * @param curve (optional) elliptic curve for ECC keys
+     * @param date Override the creation date of the key and the key signatures
+     * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     *        sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+     * @returns
+     */
+    function generate(options: KeyOptions): Promise<Key>;
+
+    /**
+     * Reformats and signs an OpenPGP key with a given User ID. Currently only supports RSA keys.
+     * @param options.privateKey The private key to reformat
+     * @param options.keyType
+     * @param options.userIds Assumes already in form of "User Name <username@email.com>"
+     *        If array is used, the first userId is set as primary user Id
+     * @param options.passphrase The passphrase used to encrypt the resulting private key
+     * @param options.keyExpirationTime The number of seconds after the key creation time that the key expires
+     * @param date Override the creation date of the key and the key signatures
+     * @param subkeys (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     * @returns
+     */
+    function reformat(date: Date, subkeys: any[]): Promise<Key>;
+
+    /**
+     * Checks if a given certificate or binding signature is revoked
+     * @param primaryKey The primary key packet
+     * @param dataToVerify The data to check
+     * @param revocations The revocation signatures to check
+     * @param signature The certificate or signature to check
+     * @param key, optional The key packet to check the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the signature revokes the data
+     */
+    function isDataRevoked(primaryKey: packet.SecretKey | packet.PublicKey, dataToVerify: object, revocations: any[], signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Check if signature has revocation key sub packet (not supported by OpenPGP.js)
+     * and throw error if found
+     * @param signature The certificate or signature to check
+     * @param keyId Check only certificates or signatures from a certain issuer key ID
+     */
+    function checkRevocationKey(signature: packet.Signature, keyId: type.keyid.Keyid): void;
+
+    /**
+     * Returns the preferred signature hash algorithm of a key
+     * @param key (optional) the key to get preferences from
+     * @param keyPacket key packet used for signing
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userId (optional) user ID
+     * @returns
+     */
+    function getPreferredHashAlgo(key: Key, keyPacket: packet.SecretKey | packet.SecretSubkey, date: Date, userId: object): Promise<String>;
+
+    /**
+     * Returns the preferred symmetric/aead algorithm for a set of keys
+     * @param {symmetric | aead} type Type of preference to return
+     * @param keys Set of keys
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userIds (optional) user IDs
+     * @returns Preferred symmetric algorithm
+     */
+    function getPreferredAlgo(type: any, keys: any[], date: Date, userIds: any[]): Promise<enums.symmetric>;
+
+    /**
+     * Returns whether aead is supported by all keys in the set
+     * @param keys Set of keys
+     * @param date (optional) use the given date for verification instead of the current time
+     * @param userIds (optional) user IDs
+     * @returns
+     */
+    function isAeadSupported(keys: any[], date: Date, userIds: any[]): Promise<Boolean>;
+}
+
+export interface revoke_reasonForRevocation {
+    /**
+     * optional, flag indicating the reason for revocation
+     */
+    flag: enums.reasonForRevocation;
+    /**
+     * optional, string explaining the reason for revocation
+     */
+    string: string;
+}
+
+/**
+ * Class that represents an user ID or attribute packet and the relevant signatures.
+ */
+export class User {
+    constructor();
+
+    /**
+     * Transforms structured user data to packetlist
+     * @returns
+     */
+    toPacketlist(): packet.List;
+
+    /**
+     * Signs user
+     * @param primaryKey The primary key packet
+     * @param privateKeys Decrypted private keys for signing
+     * @returns New user with new certificate signatures
+     */
+    sign(primaryKey: packet.SecretKey | packet.PublicKey, privateKeys: any[]): Promise<key.Key>;
+
+    /**
+     * Checks if a given certificate of the user is revoked
+     * @param primaryKey The primary key packet
+     * @param certificate The certificate to verify
+     * @param key, optional The key to verify the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the certificate is revoked
+     */
+    isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Verifies the user certificate
+     * @param primaryKey The primary key packet
+     * @param certificate A certificate of this user
+     * @param keys Array of keys to verify certificate signatures
+     * @param date Use the given date instead of the current time
+     * @returns status of the certificate
+     */
+    verifyCertificate(primaryKey: packet.SecretKey | packet.PublicKey, certificate: packet.Signature, keys: any[], date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Verifies all user certificates
+     * @param primaryKey The primary key packet
+     * @param keys Array of keys to verify certificate signatures
+     * @param date Use the given date instead of the current time
+     * @returns List of signer's keyid and validity of signature
+     */
+    verifyAllCertifications(primaryKey: packet.SecretKey | packet.PublicKey, keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * Verify User. Checks for existence of self signatures, revocation signatures
+     * and validity of self signature
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns Status of user
+     */
+    verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Update user with new components from specified user
+     * @param user Source user to merge
+     * @param primaryKey primary key used for validation
+     * @returns
+     */
+    update(user: key.User, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+}
+
+/**
+ * Class that represents a subkey packet and the relevant signatures.
+ */
+export class SubKey {
+    constructor();
+
+    /**
+     * Transforms structured subkey data to packetlist
+     * @returns
+     */
+    toPacketlist(): packet.List;
+
+    /**
+     * Checks if a binding signature of a subkey is revoked
+     * @param primaryKey The primary key packet
+     * @param signature The binding signature to verify
+     * @param key, optional The key to verify the signature
+     * @param date Use the given date instead of the current time
+     * @returns True if the binding signature is revoked
+     */
+    isRevoked(primaryKey: packet.SecretKey | packet.PublicKey, signature: packet.Signature, key: packet.PublicSubkey | packet.SecretSubkey | packet.PublicKey | packet.SecretKey, date: Date): Promise<Boolean>;
+
+    /**
+     * Verify subkey. Checks for revocation signatures, expiration time
+     * and valid binding signature
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns The status of the subkey
+     */
+    verify(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<enums.keyStatus>;
+
+    /**
+     * Returns the expiration time of the subkey or Infinity if key does not expire
+     * Returns null if the subkey is invalid.
+     * @param primaryKey The primary key packet
+     * @param date Use the given date instead of the current time
+     * @returns
+     */
+    getExpirationTime(primaryKey: packet.SecretKey | packet.PublicKey, date: Date): Promise<Date | Infinity | null>;
+
+    /**
+     * Update subkey with new components from specified subkey
+     * @param subKey Source subkey to merge
+     * @param primaryKey primary key used for validation
+     * @returns
+     */
+    update(subKey: key.SubKey, primaryKey: packet.SecretKey | packet.SecretSubkey): Promise<undefined>;
+
+    /**
+     * Revokes the subkey
+     * @param primaryKey decrypted private primary key for revocation
+     * @param reasonForRevocation optional, object indicating the reason for revocation
+     * @param reasonForRevocation.flag optional, flag indicating the reason for revocation
+     * @param reasonForRevocation.string optional, string explaining the reason for revocation
+     * @param date optional, override the creationtime of the revocation signature
+     * @returns new subkey with revocation signature
+     */
+    revoke(primaryKey: packet.SecretKey, reasonForRevocation: revoke_reasonForRevocation, date: Date): Promise<key.SubKey>;
+
+    /**
+     * Calculates the key id of the key
+     * @returns A 8 byte key id
+     */
+    getKeyId(): string;
+
+    /**
+     * Calculates the fingerprint of the key
+     * @returns A string containing the fingerprint in lowercase hex
+     */
+    getFingerprint(): string;
+
+    /**
+     * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+     * @returns Whether the two keys have the same version and public key data
+     */
+    hasSameFingerprintAs(): boolean;
+
+    /**
+     * Returns algorithm information
+     * @returns An object of the form {algorithm: string, bits:int, curve:String}
+     */
+    getAlgorithmInfo(): object;
+
+    /**
+     * Returns the creation time of the key
+     * @returns
+     */
+    getCreationTime(): Date;
+
+    /**
+     * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+     * @returns
+     */
+    isDecrypted(): boolean | null;
+}
+
+/**
+ * @see module:keyring/keyring
+ * @see module:keyring/localstore
+ */
+export namespace keyring {
     namespace keyring {
-        namespace keyring {
-            class Keyring {
-                /**
-                 * Initialization routine for the keyring.
-                 * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
-                 */
-                constructor(storeHandler?: localstore.LocalStore);
-
-                /**
-                 * Calls the storeHandler to load the keys
-                 */
-                load(): void;
-
-                /**
-                 * Calls the storeHandler to save the keys
-                 */
-                store(): void;
-
-                /**
-                 * Clear the keyring - erase all the keys
-                 */
-                clear(): void;
-
-                /**
-                 * Searches the keyring for keys having the specified key id
-                 * @param keyId provided as string of lowercase hex number
-                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
-                 * @param deep if true search also in subkeys
-                 * @returns keys found or null
-                 */
-                getKeysForId(keyId: string, deep: boolean): any[] | null;
-
-                /**
-                 * Removes keys having the specified key id from the keyring
-                 * @param keyId provided as string of lowercase hex number
-                 *        withouth 0x prefix (can be 16-character key ID or fingerprint)
-                 * @returns keys found or null
-                 */
-                removeKeysForId(keyId: string): any[] | null;
-
-                /**
-                 * Get all public and private keys
-                 * @returns all keys
-                 */
-                getAllKeys(): any[];
-            }
+        class Keyring {
+            /**
+             * Initialization routine for the keyring.
+             * @param storeHandler class implementing loadPublic(), loadPrivate(), storePublic(), and storePrivate() methods
+             */
+            constructor(storeHandler?: localstore.LocalStore);
 
             /**
-             * Array of keys
-             * @param keys The keys to store in this array
+             * Calls the storeHandler to load the keys
              */
-            function KeyArray(keys: any[]): void;
+            load(): void;
+
+            /**
+             * Calls the storeHandler to save the keys
+             */
+            store(): void;
+
+            /**
+             * Clear the keyring - erase all the keys
+             */
+            clear(): void;
+
+            /**
+             * Searches the keyring for keys having the specified key id
+             * @param keyId provided as string of lowercase hex number
+             *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+             * @param deep if true search also in subkeys
+             * @returns keys found or null
+             */
+            getKeysForId(keyId: string, deep: boolean): any[] | null;
+
+            /**
+             * Removes keys having the specified key id from the keyring
+             * @param keyId provided as string of lowercase hex number
+             *        withouth 0x prefix (can be 16-character key ID or fingerprint)
+             * @returns keys found or null
+             */
+            removeKeysForId(keyId: string): any[] | null;
+
+            /**
+             * Get all public and private keys
+             * @returns all keys
+             */
+            getAllKeys(): any[];
         }
 
-        namespace localstore {
-            class LocalStore {
-                /**
-                 * The class that deals with storage of the keyring.
-                 * Currently the only option is to use HTML5 local storage.
-                 * @param prefix prefix for itemnames in localstore
-                 */
-                constructor(prefix: string);
-
-                /**
-                 * Load the public keys from HTML5 local storage.
-                 * @returns array of keys retrieved from localstore
-                 */
-                loadPublic(): any[];
-
-                /**
-                 * Load the private keys from HTML5 local storage.
-                 * @returns array of keys retrieved from localstore
-                 */
-                loadPrivate(): any[];
-
-                /**
-                 * Saves the current state of the public keys to HTML5 local storage.
-                 * The key array gets stringified using JSON
-                 * @param keys array of keys to save in localstore
-                 */
-                storePublic(keys: any[]): void;
-
-                /**
-                 * Saves the current state of the private keys to HTML5 local storage.
-                 * The key array gets stringified using JSON
-                 * @param keys array of keys to save in localstore
-                 */
-                storePrivate(keys: any[]): void;
-            }
-        }
+        /**
+         * Array of keys
+         * @param keys The keys to store in this array
+         */
+        function KeyArray(keys: any[]): void;
     }
 
-    class LocalStore {
-        /**
-         * The class that deals with storage of the keyring.
-         * Currently the only option is to use HTML5 local storage.
-         * @param prefix prefix for itemnames in localstore
-         */
-        constructor(prefix: string);
-
-        /**
-         * Load the public keys from HTML5 local storage.
-         * @returns array of keys retrieved from localstore
-         */
-        loadPublic(): any[];
-
-        /**
-         * Load the private keys from HTML5 local storage.
-         * @returns array of keys retrieved from localstore
-         */
-        loadPrivate(): any[];
-
-        /**
-         * Saves the current state of the public keys to HTML5 local storage.
-         * The key array gets stringified using JSON
-         * @param keys array of keys to save in localstore
-         */
-        storePublic(keys: any[]): void;
-
-        /**
-         * Saves the current state of the private keys to HTML5 local storage.
-         * The key array gets stringified using JSON
-         * @param keys array of keys to save in localstore
-         */
-        storePrivate(keys: any[]): void;
-    }
-
-    namespace message {
-        /**
-         * Class that represents an OpenPGP message.
-         * Can be an encrypted message, signed message, compressed message or literal message
-         */
-        class Message {
-            packets: packet.List;
+    namespace localstore {
+        class LocalStore {
+            /**
+             * The class that deals with storage of the keyring.
+             * Currently the only option is to use HTML5 local storage.
+             * @param prefix prefix for itemnames in localstore
+             */
+            constructor(prefix: string);
 
             /**
-             * @param packetlist The packets that form this message
-             *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+             * Load the public keys from HTML5 local storage.
+             * @returns array of keys retrieved from localstore
              */
-            constructor(packetlist: packet.List);
+            loadPublic(): any[];
 
             /**
-             * Returns the key IDs of the keys to which the session key is encrypted
-             * @returns array of keyid objects
+             * Load the private keys from HTML5 local storage.
+             * @returns array of keys retrieved from localstore
              */
-            getEncryptionKeyIds(): any[];
+            loadPrivate(): any[];
 
             /**
-             * Returns the key IDs of the keys that signed the message
-             * @returns array of keyid objects
+             * Saves the current state of the public keys to HTML5 local storage.
+             * The key array gets stringified using JSON
+             * @param keys array of keys to save in localstore
              */
-            getSigningKeyIds(): any[];
+            storePublic(keys: any[]): void;
 
             /**
-             * Decrypt the message. Either a private key, a session key, or a password must be specified.
-             * @param privateKeys (optional) private keys with decrypted secret data
-             * @param passwords (optional) passwords used to decrypt
-             * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
-             * @param streaming (optional) whether to process data as a stream
-             * @returns new message with decrypted content
+             * Saves the current state of the private keys to HTML5 local storage.
+             * The key array gets stringified using JSON
+             * @param keys array of keys to save in localstore
              */
-            decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
-
-            /**
-             * Decrypt encrypted session keys either with private keys or passwords.
-             * @param privateKeys (optional) private keys with decrypted secret data
-             * @param passwords (optional) passwords used to decrypt
-             * @returns array of object with potential sessionKey, algorithm pairs
-             */
-            decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
-
-            /**
-             * Get literal data that is the body of the message
-             * @returns literal body of the message as Uint8Array
-             */
-            getLiteralData(): Uint8Array | null;
-
-            /**
-             * Get filename from literal data packet
-             * @returns filename of literal data packet as string
-             */
-            getFilename(): string | null;
-
-            /**
-             * Get literal data as text
-             * @returns literal body of the message interpreted as text
-             */
-            getText(): string | null;
-
-            /**
-             * Encrypt the message either with public keys, passwords, or both at once.
-             * @param keys (optional) public key(s) for message encryption
-             * @param passwords (optional) password(s) for message encryption
-             * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
-             * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-             * @param date (optional) override the creation date of the literal package
-             * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
-             * @param streaming (optional) whether to process data as a stream
-             * @returns new message with encrypted content
-             */
-            encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
-
-            /**
-             * Sign the message (the literal data packet of the message)
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature to add to the message
-             * @param date (optional) override the creation time of the signature
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new message with signed content
-             */
-            sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
-
-            /**
-             * Compresses the message (the literal and -if signed- signature data packets of the message)
-             * @param compression compression algorithm to be used
-             * @returns new message with compressed content
-             */
-            compress(compression: enums.compression): Message;
-
-            /**
-             * Create a detached signature for the message (the literal data packet of the message)
-             * @param privateKeys private keys with decrypted secret key data for signing
-             * @param signature (optional) any existing detached signature
-             * @param date (optional) override the creation time of the signature
-             * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-             * @returns new detached signature of message content
-             */
-            signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
-
-            /**
-             * Verify message signatures
-             * @param keys array of keys to verify signatures
-             * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @param streaming (optional) whether to process data as a stream
-             * @returns list of signer's keyid and validity of signature
-             */
-            verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
-
-            /**
-             * Verify detached message signature
-             * @param keys array of keys to verify signatures
-             * @param signature
-             * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
-             * @returns list of signer's keyid and validity of signature
-             */
-            verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
-
-            /**
-             * Unwrap compressed message
-             * @returns message Content of compressed message
-             */
-            unwrapCompressed(): Message;
-
-            /**
-             * Append signature to unencrypted message object
-             * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
-             */
-            appendSignature(detachedSignature: string | Uint8Array): void;
-
-            /**
-             * Returns ASCII armored text of message
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
+            storePrivate(keys: any[]): void;
         }
+    }
+}
+
+export class LocalStore {
+    /**
+     * The class that deals with storage of the keyring.
+     * Currently the only option is to use HTML5 local storage.
+     * @param prefix prefix for itemnames in localstore
+     */
+    constructor(prefix: string);
+
+    /**
+     * Load the public keys from HTML5 local storage.
+     * @returns array of keys retrieved from localstore
+     */
+    loadPublic(): any[];
+
+    /**
+     * Load the private keys from HTML5 local storage.
+     * @returns array of keys retrieved from localstore
+     */
+    loadPrivate(): any[];
+
+    /**
+     * Saves the current state of the public keys to HTML5 local storage.
+     * The key array gets stringified using JSON
+     * @param keys array of keys to save in localstore
+     */
+    storePublic(keys: any[]): void;
+
+    /**
+     * Saves the current state of the private keys to HTML5 local storage.
+     * The key array gets stringified using JSON
+     * @param keys array of keys to save in localstore
+     */
+    storePrivate(keys: any[]): void;
+}
+
+export namespace message {
+    /**
+     * Class that represents an OpenPGP message.
+     * Can be an encrypted message, signed message, compressed message or literal message
+     */
+    class Message {
+        packets: packet.List;
 
         /**
-         * Encrypt a session key either with public keys, passwords, or both at once.
-         * @param sessionKey session key for encryption
-         * @param symAlgo session key algorithm
-         * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
-         * @param publicKeys (optional) public key(s) for message encryption
-         * @param passwords (optional) for message encryption
+         * @param packetlist The packets that form this message
+         *        See {@link https://tools.ietf.org/html/rfc4880#section-11.3}
+         */
+        constructor(packetlist: packet.List);
+
+        /**
+         * Returns the key IDs of the keys to which the session key is encrypted
+         * @returns array of keyid objects
+         */
+        getEncryptionKeyIds(): any[];
+
+        /**
+         * Returns the key IDs of the keys that signed the message
+         * @returns array of keyid objects
+         */
+        getSigningKeyIds(): any[];
+
+        /**
+         * Decrypt the message. Either a private key, a session key, or a password must be specified.
+         * @param privateKeys (optional) private keys with decrypted secret data
+         * @param passwords (optional) passwords used to decrypt
+         * @param sessionKeys (optional) session keys in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
+         * @param streaming (optional) whether to process data as a stream
+         * @returns new message with decrypted content
+         */
+        decrypt(privateKeys?: any[], passwords?: any[], sessionKeys?: any[], streaming?: boolean): Promise<Message>;
+
+        /**
+         * Decrypt encrypted session keys either with private keys or passwords.
+         * @param privateKeys (optional) private keys with decrypted secret data
+         * @param passwords (optional) passwords used to decrypt
+         * @returns array of object with potential sessionKey, algorithm pairs
+         */
+        decryptSessionKeys(privateKeys?: any[], passwords?: any[]): Promise<Array<{ data: Uint8Array, algorithm: string }>>;
+
+        /**
+         * Get literal data that is the body of the message
+         * @returns literal body of the message as Uint8Array
+         */
+        getLiteralData(): Uint8Array | null;
+
+        /**
+         * Get filename from literal data packet
+         * @returns filename of literal data packet as string
+         */
+        getFilename(): string | null;
+
+        /**
+         * Get literal data as text
+         * @returns literal body of the message interpreted as text
+         */
+        getText(): string | null;
+
+        /**
+         * Encrypt the message either with public keys, passwords, or both at once.
+         * @param keys (optional) public key(s) for message encryption
+         * @param passwords (optional) password(s) for message encryption
+         * @param sessionKey (optional) session key in the form: { data:Uint8Array, algorithm:String, [aeadAlgorithm:String] }
          * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-         * @param date (optional) override the date
+         * @param date (optional) override the creation date of the literal package
          * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+         * @param streaming (optional) whether to process data as a stream
          * @returns new message with encrypted content
          */
-        function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+        encrypt(keys?: any[], passwords?: any[], sessionKey?: object, wildcard?: boolean, date?: Date, userIds?: any[], streaming?: boolean): Promise<Message>;
 
         /**
-         * Create signature packets for the message
-         * @param literalDataPacket the literal data packet to sign
+         * Sign the message (the literal data packet of the message)
          * @param privateKeys private keys with decrypted secret key data for signing
-         * @param signature (optional) any existing detached signature to append
-         * @param date (optional) override the creationtime of the signature
+         * @param signature (optional) any existing detached signature to add to the message
+         * @param date (optional) override the creation time of the signature
          * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         * @returns list of signature packets
+         * @returns new message with signed content
          */
-        function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+        sign(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<Message>;
 
         /**
-         * Create object containing signer's keyid and validity of signature
-         * @param signature signature packets
-         * @param literalDataList array of literal data packets
+         * Compresses the message (the literal and -if signed- signature data packets of the message)
+         * @param compression compression algorithm to be used
+         * @returns new message with compressed content
+         */
+        compress(compression: enums.compression): Message;
+
+        /**
+         * Create a detached signature for the message (the literal data packet of the message)
+         * @param privateKeys private keys with decrypted secret key data for signing
+         * @param signature (optional) any existing detached signature
+         * @param date (optional) override the creation time of the signature
+         * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+         * @returns new detached signature of message content
+         */
+        signDetached(privateKeys: any[], signature?: signature.Signature, date?: Date, userIds?: any[]): Promise<signature.Signature>;
+
+        /**
+         * Verify message signatures
          * @param keys array of keys to verify signatures
-         * @param date Verify the signature against the given date,
-         *        i.e. check signature creation time < date < expiration time
+         * @param date (optional) Verify the signature against the given date, i.e. check signature creation time < date < expiration time
+         * @param streaming (optional) whether to process data as a stream
          * @returns list of signer's keyid and validity of signature
          */
-        function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+        verify(keys: any[], date?: Date, streaming?: boolean): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
 
         /**
-         * Create list of objects containing signer's keyid and validity of signature
-         * @param signatureList array of signature packets
-         * @param literalDataList array of literal data packets
+         * Verify detached message signature
          * @param keys array of keys to verify signatures
-         * @param date Verify the signature against the given date,
-         *        i.e. check signature creation time < date < expiration time
+         * @param signature
+         * @param date Verify the signature against the given date, i.e. check signature creation time < date < expiration time
          * @returns list of signer's keyid and validity of signature
          */
-        function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+        verifyDetached(keys: any[], signature: signature.Signature, date?: Date): Promise<Array<({ keyid: type.keyid.Keyid, valid: boolean })>>;
 
         /**
-         * reads an OpenPGP armored message and returns a message object
-         * @param armoredText text to be parsed
-         * @returns new message object
+         * Unwrap compressed message
+         * @returns message Content of compressed message
          */
-        function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+        unwrapCompressed(): Message;
 
         /**
-         * reads an OpenPGP message as byte array and returns a message object
-         * @param input binary message
-         * @param fromStream whether the message was created from a Stream
-         * @returns new message object
+         * Append signature to unencrypted message object
+         * @param detachedSignature The detached ASCII-armored or Uint8Array PGP signature
          */
-        function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+        appendSignature(detachedSignature: string | Uint8Array): void;
 
         /**
-         * creates new message object from text
-         * @param text
-         * @param filename (optional)
-         * @param date (optional)
-         * @param {utf8 | binary | text | mime} type (optional) data packet type
-         * @returns new message object
+         * Returns ASCII armored text of message
+         * @returns ASCII armor
          */
-        function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
-
-        /**
-         * creates new message object from binary data
-         * @param bytes
-         * @param filename (optional)
-         * @param date (optional)
-         * @param {utf8 | binary | text | mime} type (optional) data packet type
-         * @returns new message object
-         */
-        function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
-    }
-
-    interface revokeKey_reasonForRevocation {
-        /**
-         * (optional) flag indicating the reason for revocation
-         */
-        flag: enums.reasonForRevocation;
-        /**
-         * (optional) string explaining the reason for revocation
-         */
-        string: string;
+        armor(): ReadableStream<String>;
     }
 
     /**
-     * @see module:packet/all_packets
-     * @see module:packet/clone
-     * @see module:packet.List
+     * Encrypt a session key either with public keys, passwords, or both at once.
+     * @param sessionKey session key for encryption
+     * @param symAlgo session key algorithm
+     * @param aeadAlgo (optional) aead algorithm, e.g. 'eax' or 'ocb'
+     * @param publicKeys (optional) public key(s) for message encryption
+     * @param passwords (optional) for message encryption
+     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+     * @param date (optional) override the date
+     * @param userIds (optional) user IDs to encrypt for, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+     * @returns new message with encrypted content
      */
+    function encryptSessionKey(sessionKey: Uint8Array, symAlgo: string, aeadAlgo: string, publicKeys: any[], passwords: any[], wildcard: boolean, date: Date, userIds: any[]): Promise<Message>;
+
+    /**
+     * Create signature packets for the message
+     * @param literalDataPacket the literal data packet to sign
+     * @param privateKeys private keys with decrypted secret key data for signing
+     * @param signature (optional) any existing detached signature to append
+     * @param date (optional) override the creationtime of the signature
+     * @param userIds (optional) user IDs to sign with, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     * @returns list of signature packets
+     */
+    function createSignaturePackets(literalDataPacket: packet.Literal, privateKeys: any[], signature: signature.Signature, date: Date, userIds: any[]): Promise<packet.List>;
+
+    /**
+     * Create object containing signer's keyid and validity of signature
+     * @param signature signature packets
+     * @param literalDataList array of literal data packets
+     * @param keys array of keys to verify signatures
+     * @param date Verify the signature against the given date,
+     *        i.e. check signature creation time < date < expiration time
+     * @returns list of signer's keyid and validity of signature
+     */
+    function createVerificationObject(signature: packet.Signature, literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * Create list of objects containing signer's keyid and validity of signature
+     * @param signatureList array of signature packets
+     * @param literalDataList array of literal data packets
+     * @param keys array of keys to verify signatures
+     * @param date Verify the signature against the given date,
+     *        i.e. check signature creation time < date < expiration time
+     * @returns list of signer's keyid and validity of signature
+     */
+    function createVerificationObjects(signatureList: any[], literalDataList: any[], keys: any[], date: Date): Promise<Array<{ keyid: type.keyid.Keyid, valid: boolean }>>;
+
+    /**
+     * reads an OpenPGP armored message and returns a message object
+     * @param armoredText text to be parsed
+     * @returns new message object
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Promise<Message>;
+
+    /**
+     * reads an OpenPGP message as byte array and returns a message object
+     * @param input binary message
+     * @param fromStream whether the message was created from a Stream
+     * @returns new message object
+     */
+    function read(input: Uint8Array | ReadableStream<Uint8Array>, fromStream?: boolean): Promise<Message>;
+
+    /**
+     * creates new message object from text
+     * @param text
+     * @param filename (optional)
+     * @param date (optional)
+     * @param {utf8 | binary | text | mime} type (optional) data packet type
+     * @returns new message object
+     */
+    function fromText(text: string | ReadableStream<String>, filename?: string, date?: Date, type?: any): Message;
+
+    /**
+     * creates new message object from binary data
+     * @param bytes
+     * @param filename (optional)
+     * @param date (optional)
+     * @param {utf8 | binary | text | mime} type (optional) data packet type
+     * @returns new message object
+     */
+    function fromBinary(bytes: Uint8Array | ReadableStream<Uint8Array>, filename?: string, date?: Date, type?: any): Message;
+}
+
+export interface revokeKey_reasonForRevocation {
+    /**
+     * (optional) flag indicating the reason for revocation
+     */
+    flag: enums.reasonForRevocation;
+    /**
+     * (optional) string explaining the reason for revocation
+     */
+    string: string;
+}
+
+/**
+ * @see module:packet/all_packets
+ * @see module:packet/clone
+ * @see module:packet.List
+ */
+export namespace packet {
+    /**
+     * Allocate a new packet
+     * @param tag property name from {@link module:enums.packet}
+     * @returns new packet object with type based on tag
+     */
+    function newPacketFromTag(tag: string): object;
+
+    /**
+     * Allocate a new packet from structured packet clone
+     * @see
+     * @param packetClone packet clone
+     * @returns new packet object with data from packet clone
+     */
+    function fromStructuredClone(packetClone: object): object;
+
+    class Compressed {
+        /**
+         * Implementation of the Compressed Data Packet (Tag 8)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
+         * The Compressed Data packet contains compressed data.  Typically,
+         * this packet is found as the contents of an encrypted packet, or following
+         * a Signature or One-Pass Signature packet, and contains a literal data packet.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * List of packets
+         */
+        packets: List;
+
+        /**
+         * Compression algorithm
+         * @type {compression}
+         */
+        algorithm: any;
+
+        /**
+         * Compressed packet data
+         */
+        compressed: Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Parsing function for the packet.
+         * @param bytes Payload of a tag 8 packet
+         */
+        read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Return the compressed packet.
+         * @returns binary compressed packet
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Decompression method for decompressing the compressed data
+         * read by read_packet
+         */
+        decompress(): void;
+
+        /**
+         * Compress the packet data (member decompressedData)
+         */
+        compress(): void;
+    }
+
+    class Literal {
+        /**
+         * Implementation of the Literal Data Packet (Tag 11)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
+         * A Literal Data packet contains the body of a message; data that is not to be
+         * further interpreted.
+         * @param date the creation date of the literal package
+         */
+        constructor(date: Date);
+
+        /**
+         * Set the packet data to a javascript native string, end of line
+         * will be normalized to \r\n and by default text is converted to UTF8
+         * @param text Any native javascript string
+         * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
+         */
+        setText(text: string | ReadableStream<String>, format: any): void;
+
+        /**
+         * Returns literal data packets as native JavaScript string
+         * with normalized end of line to \n
+         * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+         * @returns literal data as text
+         */
+        getText(clone: boolean): string | ReadableStream<String>;
+
+        /**
+         * Set the packet data to value represented by the provided string of bytes.
+         * @param bytes The string of bytes
+         * @param {utf8 | binary | text | mime} format The format of the string of bytes
+         */
+        setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
+
+        /**
+         * Get the byte sequence representing the literal packet data
+         * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
+         * @returns A sequence of bytes
+         */
+        getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Sets the filename of the literal packet data
+         * @param filename Any native javascript string
+         */
+        setFilename(filename: string): void;
+
+        /**
+         * Get the filename of the literal packet data
+         * @returns filename
+         */
+        getFilename(): string;
+
+        /**
+         * Parsing function for a literal data packet (tag 11).
+         * @param input Payload of a tag 11 packet
+         * @returns object representation
+         */
+        read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
+
+        /**
+         * Creates a string representation of the packet
+         * @returns Uint8Array representation of the packet
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+    }
+
+    class Marker {
+        /**
+         * Implementation of the strange "Marker packet" (Tag 10)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
+         * An experimental version of PGP used this packet as the Literal
+         * packet, but no released version of PGP generated Literal packets with this
+         * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
+         * the Marker packet.
+         * Such a packet MUST be ignored when received.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a literal data packet (tag 10).
+         * @param input Payload of a tag 10 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: string, position: Integer, len: Integer): Marker;
+    }
+
+    class OnePassSignature {
+        /**
+         * Implementation of the One-Pass Signature Packets (Tag 4)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
+         * The One-Pass Signature packet precedes the signed data and contains
+         * enough information to allow the receiver to begin calculating any
+         * hashes needed to verify the signature.  It allows the Signature
+         * packet to be placed at the end of the message, so that the signer
+         * can compute the entire signed message in one pass.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * A one-octet version number.  The current version is 3.
+         */
+        version: any;
+
+        /**
+         * A one-octet signature type.
+         * Signature types are described in
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
+         */
+        signatureType: any;
+
+        /**
+         * A one-octet number describing the hash algorithm used.
+         * @see
+         */
+        hashAlgorithm: any;
+
+        /**
+         * A one-octet number describing the public-key algorithm used.
+         * @see
+         */
+        publicKeyAlgorithm: any;
+
+        /**
+         * An eight-octet number holding the Key ID of the signing key.
+         */
+        issuerKeyId: any;
+
+        /**
+         * A one-octet number holding a flag showing whether the signature is nested.
+         * A zero value indicates that the next packet is another One-Pass Signature packet
+         * that describes another signature to be applied to the same message data.
+         */
+        flags: any;
+
+        /**
+         * parsing function for a one-pass signature packet (tag 4).
+         * @param bytes payload of a tag 4 packet
+         * @returns object representation
+         */
+        read(bytes: Uint8Array): OnePassSignature;
+
+        /**
+         * creates a string representation of a one-pass signature packet
+         * @returns a Uint8Array representation of a one-pass signature packet
+         */
+        write(): Uint8Array;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class List {
+        /**
+         * This class represents a list of openpgp packets.
+         * Take care when iterating over it - the packets themselves
+         * are stored as numerical indices.
+         */
+        constructor();
+
+        /**
+         * The number of packets contained within the list.
+         */
+        readonly length: Integer;
+
+        /**
+         * Reads a stream of binary data and interprents it as a list of packets.
+         * @param A Uint8Array of bytes.
+         */
+        read(A: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Creates a binary representation of openpgp objects contained within the
+         * class instance.
+         * @returns A Uint8Array containing valid openpgp packets.
+         */
+        write(): Uint8Array;
+
+        /**
+         * Adds a packet to the list. This is the only supported method of doing so;
+         * writing to packetlist[i] directly will result in an error.
+         * @param packet Packet to push
+         */
+        push(packet: object): void;
+
+        /**
+         * Creates a new PacketList with all packets from the given types
+         */
+        filterByTag(): void;
+
+        /**
+         * Traverses packet tree and returns first matching packet
+         * @param type The packet type
+         * @returns
+         */
+        findPacket(type: enums.packet): List | undefined;
+
+        /**
+         * Returns array of found indices by tag
+         */
+        indexOfTag(): void;
+
+        /**
+         * Concatenates packetlist or array of packets
+         */
+        concat(): void;
+
+        /**
+         * Allocate a new packetlist from structured packetlist clone
+         * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
+         * @param packetClone packetlist clone
+         * @returns new packetlist object with data from packetlist clone
+         */
+        static fromStructuredClone(packetClone: object): object;
+    }
+
+    class PublicKey {
+        /**
+         * Implementation of the Key Material Packet (Tag 5,6,7,14)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
+         * A key material packet contains all the information about a public or
+         * private key.  There are four variants of this packet type, and two
+         * major versions.
+         * A Public-Key packet starts a series of packets that forms an OpenPGP
+         * key (sometimes called an OpenPGP certificate).
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+         * called by read_tag&lt;num&gt;
+         * @param bytes Input array to read the packet from
+         * @returns This object with attributes set by the parser
+         */
+        read(bytes: Uint8Array): object;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Same as write_private_key, but has less information because of
+         * public key.
+         * @returns OpenPGP packet body contents,
+         */
+        write(): Uint8Array;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class PublicKeyEncryptedSessionKey {
+        /**
+         * Public-Key Encrypted Session Key Packets (Tag 1)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+         * A Public-Key Encrypted Session Key packet holds the session key
+         * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+         * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+         * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+         * message is encrypted with the session key, and the session key is itself
+         * encrypted and stored in the Encrypted Session Key packet(s). The
+         * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+         * Session Key packet for each OpenPGP key to which the message is encrypted.
+         * The recipient of the message finds a session key that is encrypted to their
+         * public key, decrypts the session key, and then uses the session key to
+         * decrypt the message.
+         */
+        constructor();
+
+        encrypted: any[];
+
+        /**
+         * Parsing function for a publickey encrypted session key packet (tag 1).
+         * @param input Payload of a tag 1 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
+
+        /**
+         * Create a string representation of a tag 1 packet
+         * @returns The Uint8Array representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Encrypt session key packet
+         * @param key Public key
+         * @returns
+         */
+        encrypt(key: PublicKey): Promise<Boolean>;
+
+        /**
+         * Decrypts the session key (only for public key encrypted session key
+         * packets (tag 1)
+         * @param key Private key with secret params unlocked
+         * @returns
+         */
+        decrypt(key: SecretKey): Promise<Boolean>;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class PublicSubkey {
+        /**
+         * A Public-Subkey packet (tag 14) has exactly the same format as a
+         * Public-Key packet, but denotes a subkey.  One or more subkeys may be
+         * associated with a top-level key.  By convention, the top-level key
+         * provides signature services, and the subkeys provide encryption
+         * services.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
+         * called by read_tag&lt;num&gt;
+         * @param bytes Input array to read the packet from
+         * @returns This object with attributes set by the parser
+         */
+        read(bytes: Uint8Array): object;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Same as write_private_key, but has less information because of
+         * public key.
+         * @returns OpenPGP packet body contents,
+         */
+        write(): Uint8Array;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SecretKey {
+        /**
+         * A Secret-Key packet contains all the information that is found in a
+         * Public-Key packet, including the public-key material, but also
+         * includes the secret-key material after all the public-key fields.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+         */
+        isEncrypted: any;
+
+        /**
+         * Internal parser for private keys as specified in
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+         * @param bytes Input string to read the packet from
+         */
+        read(bytes: string): void;
+
+        /**
+         * Creates an OpenPGP key packet for the given key.
+         * @returns A string of bytes containing the secret key OpenPGP packet
+         */
+        write(): string;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Encrypt the payload. By default, we use aes256 and iterated, salted string
+         * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+         * and the passphrase is empty or undefined, the key will be set as not encrypted.
+         * This can be used to remove passphrase protection after calling decrypt().
+         * @param passphrase
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Decrypts the private key params which are needed to use the key.
+         * {@link module:packet.SecretKey.isDecrypted} should be false, as
+         * otherwise calls to this function will throw an error.
+         * @param passphrase The passphrase for this private key as string
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Clear private params, return to initial state
+         */
+        clearPrivateParams(): void;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+    }
+
+    class SecretSubkey {
+        /**
+         * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
+         * Key packet and has exactly the same format.
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
+         */
+        isEncrypted: any;
+
+        /**
+         * Internal parser for private keys as specified in
+         * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
+         * @param bytes Input string to read the packet from
+         */
+        read(bytes: string): void;
+
+        /**
+         * Creates an OpenPGP key packet for the given key.
+         * @returns A string of bytes containing the secret key OpenPGP packet
+         */
+        write(): string;
+
+        /**
+         * Check whether secret-key data is available in decrypted form. Returns null for public keys.
+         * @returns
+         */
+        isDecrypted(): boolean | null;
+
+        /**
+         * Encrypt the payload. By default, we use aes256 and iterated, salted string
+         * to key specifier. If the key is in a decrypted state (isEncrypted === false)
+         * and the passphrase is empty or undefined, the key will be set as not encrypted.
+         * This can be used to remove passphrase protection after calling decrypt().
+         * @param passphrase
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Decrypts the private key params which are needed to use the key.
+         * {@link module:packet.SecretKey.isDecrypted} should be false, as
+         * otherwise calls to this function will throw an error.
+         * @param passphrase The passphrase for this private key as string
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Clear private params, return to initial state
+         */
+        clearPrivateParams(): void;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+
+        /**
+         * Packet version
+         */
+        version: Integer;
+
+        /**
+         * Key creation date.
+         */
+        created: Date;
+
+        /**
+         * Public key algorithm.
+         */
+        algorithm: string;
+
+        /**
+         * Algorithm specific params
+         */
+        params: object[];
+
+        /**
+         * Time until expiration in days (V3 only)
+         */
+        expirationTimeV3: Integer;
+
+        /**
+         * Fingerprint in lowercase hex
+         */
+        fingerprint: string;
+
+        /**
+         * Keyid
+         */
+        keyid: type.keyid.Keyid;
+
+        /**
+         * Alias of read()
+         * @see module:packet.PublicKey#read
+         */
+        readPublicKey: any;
+
+        /**
+         * Alias of write()
+         * @see module:packet.PublicKey#write
+         */
+        writePublicKey: any;
+
+        /**
+         * Write an old version packet - it's used by some of the internal routines.
+         */
+        writeOld(): void;
+
+        /**
+         * Returns the creation time of the key
+         * @returns
+         */
+        getCreationTime(): Date;
+
+        /**
+         * Calculates the key id of the key
+         * @returns A 8 byte key id
+         */
+        getKeyId(): string;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A Uint8Array containing the fingerprint
+         */
+        getFingerprintBytes(): Uint8Array;
+
+        /**
+         * Calculates the fingerprint of the key
+         * @returns A string containing the fingerprint in lowercase hex
+         */
+        getFingerprint(): string;
+
+        /**
+         * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
+         * @returns Whether the two keys have the same version and public key data
+         */
+        hasSameFingerprintAs(): boolean;
+
+        /**
+         * Returns algorithm information
+         * @returns An object of the form {algorithm: string, bits:int, curve:String}
+         */
+        getAlgorithmInfo(): object;
+    }
+
+    class Signature {
+        /**
+         * Implementation of the Signature Packet (Tag 2)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
+         * A Signature packet describes a binding between some public key and
+         * some data.  The most common signatures are a signature of a file or a
+         * block of text, and a signature that is a certification of a User ID.
+         * @param date the creation date of the signature
+         */
+        constructor(date: Date);
+
+        /**
+         * parsing function for a signature packet (tag 2).
+         * @param bytes payload of a tag 2 packet
+         * @param position position to start reading from the bytes string
+         * @param len length of the packet or the remaining length of bytes at position
+         * @returns object representation
+         */
+        read(bytes: string, position: Integer, len: Integer): Signature;
+
+        /**
+         * Signs provided data. This needs to be done prior to serialization.
+         * @param key private key used to sign the message.
+         * @param data Contains packets to be signed.
+         * @returns
+         */
+        sign(key: SecretKey, data: object): Promise<Boolean>;
+
+        /**
+         * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
+         * @returns subpacket data
+         */
+        write_hashed_sub_packets(): Uint8Array;
+
+        /**
+         * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
+         * @returns subpacket data
+         */
+        write_unhashed_sub_packets(): Uint8Array;
+
+        /**
+         * verifys the signature packet. Note: not signature types are implemented
+         * @param key the public key to verify the signature
+         * @param signatureType expected signature type
+         * @param data data which on the signature applies
+         * @returns True if message is verified, else false.
+         */
+        verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
+
+        /**
+         * Verifies signature expiration date
+         * @param date (optional) use the given date for verification instead of the current time
+         * @returns true if expired
+         */
+        isExpired(date: Date): boolean;
+
+        /**
+         * Returns the expiration time of the signature or Infinity if signature does not expire
+         * @returns expiration time
+         */
+        getExpirationTime(): Date;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SymEncryptedAEADProtected {
+        /**
+         * Implementation of the Symmetrically Encrypted Authenticated Encryption with
+         * Additional Data (AEAD) Protected Data Packet
+         * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
+         * AEAD Protected Data Packet
+         */
+        constructor();
+
+        /**
+         * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+         * @param bytes
+         */
+        read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
+
+        /**
+         * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
+         * @returns The encrypted payload
+         */
+        write(): Uint8Array | ReadableStream<Uint8Array>;
+
+        /**
+         * Decrypt the encrypted payload.
+         * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+         * @param key The session key used to encrypt the payload
+         * @param streaming Whether the top-level function will return a stream
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
+
+        /**
+         * Encrypt the packet list payload.
+         * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
+         * @param key The session key used to encrypt the payload
+         * @param streaming Whether the top-level function will return a stream
+         */
+        encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
+
+        /**
+         * En/decrypt the payload.
+         * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
+         * @param key The session key used to en/decrypt the payload
+         * @param data The data to en/decrypt
+         * @param streaming Whether the top-level function will return a stream
+         * @returns
+         */
+        crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
+    }
+
+    class SymEncryptedIntegrityProtected {
+        /**
+         * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
+         * The Symmetrically Encrypted Integrity Protected Data packet is
+         * a variant of the Symmetrically Encrypted Data packet. It is a new feature
+         * created for OpenPGP that addresses the problem of detecting a modification to
+         * encrypted data. It is used in combination with a Modification Detection Code
+         * packet.
+         */
+        constructor();
+
+        /**
+         * The encrypted payload.
+         */
+        encrypted: any;
+
+        /**
+         * If after decrypting the packet this is set to true,
+         * a modification has been detected and thus the contents
+         * should be discarded.
+         */
+        modification: boolean;
+
+        /**
+         * Encrypt the payload in the packet.
+         * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+         * @param key The key of cipher blocksize length to be used
+         * @param streaming Whether to set this.encrypted to a stream
+         * @returns
+         */
+        encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+
+        /**
+         * Decrypts the encrypted data contained in the packet.
+         * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
+         * @param key The key of cipher blocksize length to be used
+         * @param streaming Whether to read this.encrypted as a stream
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
+    }
+
+    class SymEncryptedSessionKey {
+        /**
+         * Public-Key Encrypted Session Key Packets (Tag 1)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
+         * A Public-Key Encrypted Session Key packet holds the session key
+         * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
+         * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
+         * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
+         * message is encrypted with the session key, and the session key is itself
+         * encrypted and stored in the Encrypted Session Key packet(s). The
+         * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
+         * Session Key packet for each OpenPGP key to which the message is encrypted.
+         * The recipient of the message finds a session key that is encrypted to their
+         * public key, decrypts the session key, and then uses the session key to
+         * decrypt the message.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a symmetric encrypted session key packet (tag 3).
+         * @param input Payload of a tag 1 packet
+         * @param position Position to start reading from the input string
+         * @param len Length of the packet or the remaining length of
+         *        input at position
+         * @returns Object representation
+         */
+        read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
+
+        /**
+         * Decrypts the session key
+         * @param passphrase The passphrase in string form
+         * @returns
+         */
+        decrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Encrypts the session key
+         * @param passphrase The passphrase in string form
+         * @returns
+         */
+        encrypt(passphrase: string): Promise<Boolean>;
+
+        /**
+         * Fix custom types after cloning
+         */
+        postCloneTypeFix(): void;
+    }
+
+    class SymmetricallyEncrypted {
+        /**
+         * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
+         * The Symmetrically Encrypted Data packet contains data encrypted with a
+         * symmetric-key algorithm. When it has been decrypted, it contains other
+         * packets (usually a literal data packet or compressed data packet, but in
+         * theory other Symmetrically Encrypted Data packets or sequences of packets
+         * that form whole OpenPGP messages).
+         */
+        constructor();
+
+        /**
+         * Packet type
+         */
+        tag: enums.packet;
+
+        /**
+         * Encrypted secret-key data
+         */
+        encrypted: any;
+
+        /**
+         * Decrypted packets contained within.
+         */
+        packets: List;
+
+        /**
+         * When true, decrypt fails if message is not integrity protected
+         * @see module:config.ignore_mdc_error
+         */
+        ignore_mdc_error: any;
+
+        /**
+         * Decrypt the symmetrically-encrypted packet data
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param sessionKeyAlgorithm Symmetric key algorithm to use
+         * @param key The key of cipher blocksize length to be used
+         * @returns
+         */
+        decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+
+        /**
+         * Encrypt the symmetrically-encrypted packet data
+         * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
+         * @param sessionKeyAlgorithm Symmetric key algorithm to use
+         * @param key The key of cipher blocksize length to be used
+         * @returns
+         */
+        encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
+    }
+
+    class Trust {
+        /**
+         * Implementation of the Trust Packet (Tag 12)
+         * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
+         * The Trust packet is used only within keyrings and is not normally
+         * exported.  Trust packets contain data that record the user's
+         * specifications of which key holders are trustworthy introducers,
+         * along with other information that implementing software uses for
+         * trust information.  The format of Trust packets is defined by a given
+         * implementation.
+         * Trust packets SHOULD NOT be emitted to output streams that are
+         * transferred to other users, and they SHOULD be ignored on any input
+         * other than local keyring files.
+         */
+        constructor();
+
+        /**
+         * Parsing function for a trust packet (tag 12).
+         * Currently not implemented as we ignore trust packets
+         * @param byptes payload of a tag 12 packet
+         */
+        read(byptes: string): void;
+    }
+
+    class UserAttribute {
+        /**
+         * Implementation of the User Attribute Packet (Tag 17)
+         * The User Attribute packet is a variation of the User ID packet.  It
+         * is capable of storing more types of data than the User ID packet,
+         * which is limited to text.  Like the User ID packet, a User Attribute
+         * packet may be certified by the key owner ("self-signed") or any other
+         * key owner who cares to certify it.  Except as noted, a User Attribute
+         * packet may be used anywhere that a User ID packet may be used.
+         * While User Attribute packets are not a required part of the OpenPGP
+         * standard, implementations SHOULD provide at least enough
+         * compatibility to properly handle a certification signature on the
+         * User Attribute packet.  A simple way to do this is by treating the
+         * User Attribute packet as a User ID packet with opaque contents, but
+         * an implementation may use any method desired.
+         */
+        constructor();
+
+        /**
+         * parsing function for a user attribute packet (tag 17).
+         * @param input payload of a tag 17 packet
+         */
+        read(input: Uint8Array): void;
+
+        /**
+         * Creates a binary representation of the user attribute packet
+         * @returns string representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Compare for equality
+         * @param usrAttr
+         * @returns true if equal
+         */
+        equals(usrAttr: UserAttribute): boolean;
+    }
+
+    class Userid {
+        /**
+         * Implementation of the User ID Packet (Tag 13)
+         * A User ID packet consists of UTF-8 text that is intended to represent
+         * the name and email address of the key holder.  By convention, it
+         * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
+         * restrictions on its content.  The packet length in the header
+         * specifies the length of the User ID.
+         */
+        constructor();
+
+        /**
+         * A string containing the user id. Usually in the form
+         * John Doe <john@example.com>
+         */
+        userid: string;
+
+        /**
+         * Parsing function for a user id packet (tag 13).
+         * @param input payload of a tag 13 packet
+         */
+        read(input: Uint8Array): void;
+
+        /**
+         * Parse userid string, e.g. 'John Doe <john@example.com>'
+         */
+        parse(): void;
+
+        /**
+         * Creates a binary representation of the user id packet
+         * @returns binary representation
+         */
+        write(): Uint8Array;
+
+        /**
+         * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
+         */
+        format(): void;
+    }
+
+    namespace all_packets {
+        /**
+         * @see module:packet.Compressed
+         */
+        var Compressed: any;
+
+        /**
+         * @see module:packet.SymEncryptedIntegrityProtected
+         */
+        var SymEncryptedIntegrityProtected: any;
+
+        /**
+         * @see module:packet.SymEncryptedAEADProtected
+         */
+        var SymEncryptedAEADProtected: any;
+
+        /**
+         * @see module:packet.PublicKeyEncryptedSessionKey
+         */
+        var PublicKeyEncryptedSessionKey: any;
+
+        /**
+         * @see module:packet.SymEncryptedSessionKey
+         */
+        var SymEncryptedSessionKey: any;
+
+        /**
+         * @see module:packet.Literal
+         */
+        var Literal: any;
+
+        /**
+         * @see module:packet.PublicKey
+         */
+        var PublicKey: any;
+
+        /**
+         * @see module:packet.SymmetricallyEncrypted
+         */
+        var SymmetricallyEncrypted: any;
+
+        /**
+         * @see module:packet.Marker
+         */
+        var Marker: any;
+
+        /**
+         * @see module:packet.PublicSubkey
+         */
+        var PublicSubkey: any;
+
+        /**
+         * @see module:packet.UserAttribute
+         */
+        var UserAttribute: any;
+
+        /**
+         * @see module:packet.OnePassSignature
+         */
+        var OnePassSignature: any;
+
+        /**
+         * @see module:packet.SecretKey
+         */
+        var SecretKey: any;
+
+        /**
+         * @see module:packet.Userid
+         */
+        var Userid: any;
+
+        /**
+         * @see module:packet.SecretSubkey
+         */
+        var SecretSubkey: any;
+
+        /**
+         * @see module:packet.Signature
+         */
+        var Signature: any;
+
+        /**
+         * @see module:packet.Trust
+         */
+        var Trust: any;
+    }
+
+    namespace clone {
+        /**
+         * Create a packetlist from the correspoding object types.
+         * @param options the object passed to and from the web worker
+         * @returns a mutated version of the options optject
+         */
+        function clonePackets(options: object): object;
+
+        /**
+         * Creates an object with the correct prototype from a corresponding packetlist.
+         * @param options the object passed to and from the web worker
+         * @param method the public api function name to be delegated to the worker
+         * @returns a mutated version of the options optject
+         */
+        function parseClonedPackets(options: object, method: string): object;
+    }
+
     namespace packet {
         /**
-         * Allocate a new packet
-         * @param tag property name from {@link module:enums.packet}
-         * @returns new packet object with type based on tag
+         * Encodes a given integer of length to the openpgp length specifier to a
+         * string
+         * @param length The length to encode
+         * @returns String with openpgp length representation
          */
-        function newPacketFromTag(tag: string): object;
+        function writeSimpleLength(length: Integer): Uint8Array;
 
         /**
-         * Allocate a new packet from structured packet clone
-         * @see
-         * @param packetClone packet clone
-         * @returns new packet object with data from packet clone
+         * Writes a packet header version 4 with the given tag_type and length to a
+         * string
+         * @param tag_type Tag type
+         * @param length Length of the payload
+         * @returns String of the header
          */
-        function fromStructuredClone(packetClone: object): object;
-
-        class Compressed {
-            /**
-             * Implementation of the Compressed Data Packet (Tag 8)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.6|RFC4880 5.6}:
-             * The Compressed Data packet contains compressed data.  Typically,
-             * this packet is found as the contents of an encrypted packet, or following
-             * a Signature or One-Pass Signature packet, and contains a literal data packet.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * List of packets
-             */
-            packets: List;
-
-            /**
-             * Compression algorithm
-             * @type {compression}
-             */
-            algorithm: any;
-
-            /**
-             * Compressed packet data
-             */
-            compressed: Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Parsing function for the packet.
-             * @param bytes Payload of a tag 8 packet
-             */
-            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Return the compressed packet.
-             * @returns binary compressed packet
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Decompression method for decompressing the compressed data
-             * read by read_packet
-             */
-            decompress(): void;
-
-            /**
-             * Compress the packet data (member decompressedData)
-             */
-            compress(): void;
-        }
-
-        class Literal {
-            /**
-             * Implementation of the Literal Data Packet (Tag 11)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.9|RFC4880 5.9}:
-             * A Literal Data packet contains the body of a message; data that is not to be
-             * further interpreted.
-             * @param date the creation date of the literal package
-             */
-            constructor(date: Date);
-
-            /**
-             * Set the packet data to a javascript native string, end of line
-             * will be normalized to \r\n and by default text is converted to UTF8
-             * @param text Any native javascript string
-             * @param {utf8 | binary | text | mime} format (optional) The format of the string of bytes
-             */
-            setText(text: string | ReadableStream<String>, format: any): void;
-
-            /**
-             * Returns literal data packets as native JavaScript string
-             * with normalized end of line to \n
-             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
-             * @returns literal data as text
-             */
-            getText(clone: boolean): string | ReadableStream<String>;
-
-            /**
-             * Set the packet data to value represented by the provided string of bytes.
-             * @param bytes The string of bytes
-             * @param {utf8 | binary | text | mime} format The format of the string of bytes
-             */
-            setBytes(bytes: Uint8Array | ReadableStream<Uint8Array>, format: any): void;
-
-            /**
-             * Get the byte sequence representing the literal packet data
-             * @param clone (optional) Whether to return a clone so that getBytes/getText can be called again
-             * @returns A sequence of bytes
-             */
-            getBytes(clone: boolean): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Sets the filename of the literal packet data
-             * @param filename Any native javascript string
-             */
-            setFilename(filename: string): void;
-
-            /**
-             * Get the filename of the literal packet data
-             * @returns filename
-             */
-            getFilename(): string;
-
-            /**
-             * Parsing function for a literal data packet (tag 11).
-             * @param input Payload of a tag 11 packet
-             * @returns object representation
-             */
-            read(input: Uint8Array | ReadableStream<Uint8Array>): Literal;
-
-            /**
-             * Creates a string representation of the packet
-             * @returns Uint8Array representation of the packet
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-        }
-
-        class Marker {
-            /**
-             * Implementation of the strange "Marker packet" (Tag 10)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.8|RFC4880 5.8}:
-             * An experimental version of PGP used this packet as the Literal
-             * packet, but no released version of PGP generated Literal packets with this
-             * tag. With PGP 5.x, this packet has been reassigned and is reserved for use as
-             * the Marker packet.
-             * Such a packet MUST be ignored when received.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a literal data packet (tag 10).
-             * @param input Payload of a tag 10 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: string, position: Integer, len: Integer): Marker;
-        }
-
-        class OnePassSignature {
-            /**
-             * Implementation of the One-Pass Signature Packets (Tag 4)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.4|RFC4880 5.4}:
-             * The One-Pass Signature packet precedes the signed data and contains
-             * enough information to allow the receiver to begin calculating any
-             * hashes needed to verify the signature.  It allows the Signature
-             * packet to be placed at the end of the message, so that the signer
-             * can compute the entire signed message in one pass.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * A one-octet version number.  The current version is 3.
-             */
-            version: any;
-
-            /**
-             * A one-octet signature type.
-             * Signature types are described in
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.2.1|RFC4880 Section 5.2.1}.
-             */
-            signatureType: any;
-
-            /**
-             * A one-octet number describing the hash algorithm used.
-             * @see
-             */
-            hashAlgorithm: any;
-
-            /**
-             * A one-octet number describing the public-key algorithm used.
-             * @see
-             */
-            publicKeyAlgorithm: any;
-
-            /**
-             * An eight-octet number holding the Key ID of the signing key.
-             */
-            issuerKeyId: any;
-
-            /**
-             * A one-octet number holding a flag showing whether the signature is nested.
-             * A zero value indicates that the next packet is another One-Pass Signature packet
-             * that describes another signature to be applied to the same message data.
-             */
-            flags: any;
-
-            /**
-             * parsing function for a one-pass signature packet (tag 4).
-             * @param bytes payload of a tag 4 packet
-             * @returns object representation
-             */
-            read(bytes: Uint8Array): OnePassSignature;
-
-            /**
-             * creates a string representation of a one-pass signature packet
-             * @returns a Uint8Array representation of a one-pass signature packet
-             */
-            write(): Uint8Array;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class List {
-            /**
-             * This class represents a list of openpgp packets.
-             * Take care when iterating over it - the packets themselves
-             * are stored as numerical indices.
-             */
-            constructor();
-
-            /**
-             * The number of packets contained within the list.
-             */
-            readonly length: Integer;
-
-            /**
-             * Reads a stream of binary data and interprents it as a list of packets.
-             * @param A Uint8Array of bytes.
-             */
-            read(A: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Creates a binary representation of openpgp objects contained within the
-             * class instance.
-             * @returns A Uint8Array containing valid openpgp packets.
-             */
-            write(): Uint8Array;
-
-            /**
-             * Adds a packet to the list. This is the only supported method of doing so;
-             * writing to packetlist[i] directly will result in an error.
-             * @param packet Packet to push
-             */
-            push(packet: object): void;
-
-            /**
-             * Creates a new PacketList with all packets from the given types
-             */
-            filterByTag(): void;
-
-            /**
-             * Traverses packet tree and returns first matching packet
-             * @param type The packet type
-             * @returns
-             */
-            findPacket(type: enums.packet): List | undefined;
-
-            /**
-             * Returns array of found indices by tag
-             */
-            indexOfTag(): void;
-
-            /**
-             * Concatenates packetlist or array of packets
-             */
-            concat(): void;
-
-            /**
-             * Allocate a new packetlist from structured packetlist clone
-             * See {@link https://w3c.github.io/html/infrastructure.html#safe-passing-of-structured-data}
-             * @param packetClone packetlist clone
-             * @returns new packetlist object with data from packetlist clone
-             */
-            static fromStructuredClone(packetClone: object): object;
-        }
-
-        class PublicKey {
-            /**
-             * Implementation of the Key Material Packet (Tag 5,6,7,14)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.5|RFC4480 5.5}:
-             * A key material packet contains all the information about a public or
-             * private key.  There are four variants of this packet type, and two
-             * major versions.
-             * A Public-Key packet starts a series of packets that forms an OpenPGP
-             * key (sometimes called an OpenPGP certificate).
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
-             * called by read_tag&lt;num&gt;
-             * @param bytes Input array to read the packet from
-             * @returns This object with attributes set by the parser
-             */
-            read(bytes: Uint8Array): object;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Same as write_private_key, but has less information because of
-             * public key.
-             * @returns OpenPGP packet body contents,
-             */
-            write(): Uint8Array;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class PublicKeyEncryptedSessionKey {
-            /**
-             * Public-Key Encrypted Session Key Packets (Tag 1)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
-             * A Public-Key Encrypted Session Key packet holds the session key
-             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
-             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
-             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
-             * message is encrypted with the session key, and the session key is itself
-             * encrypted and stored in the Encrypted Session Key packet(s). The
-             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
-             * Session Key packet for each OpenPGP key to which the message is encrypted.
-             * The recipient of the message finds a session key that is encrypted to their
-             * public key, decrypts the session key, and then uses the session key to
-             * decrypt the message.
-             */
-            constructor();
-
-            encrypted: any[];
-
-            /**
-             * Parsing function for a publickey encrypted session key packet (tag 1).
-             * @param input Payload of a tag 1 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: Uint8Array, position: Integer, len: Integer): PublicKeyEncryptedSessionKey
-
-            /**
-             * Create a string representation of a tag 1 packet
-             * @returns The Uint8Array representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Encrypt session key packet
-             * @param key Public key
-             * @returns
-             */
-            encrypt(key: PublicKey): Promise<Boolean>;
-
-            /**
-             * Decrypts the session key (only for public key encrypted session key
-             * packets (tag 1)
-             * @param key Private key with secret params unlocked
-             * @returns
-             */
-            decrypt(key: SecretKey): Promise<Boolean>;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class PublicSubkey {
-            /**
-             * A Public-Subkey packet (tag 14) has exactly the same format as a
-             * Public-Key packet, but denotes a subkey.  One or more subkeys may be
-             * associated with a top-level key.  By convention, the top-level key
-             * provides signature services, and the subkeys provide encryption
-             * services.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Internal Parser for public keys as specified in {@link https://tools.ietf.org/html/rfc4880#section-5.5.2|RFC 4880 section 5.5.2 Public-Key Packet Formats}
-             * called by read_tag&lt;num&gt;
-             * @param bytes Input array to read the packet from
-             * @returns This object with attributes set by the parser
-             */
-            read(bytes: Uint8Array): object;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Same as write_private_key, but has less information because of
-             * public key.
-             * @returns OpenPGP packet body contents,
-             */
-            write(): Uint8Array;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SecretKey {
-            /**
-             * A Secret-Key packet contains all the information that is found in a
-             * Public-Key packet, including the public-key material, but also
-             * includes the secret-key material after all the public-key fields.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
-             */
-            isEncrypted: any;
-
-            /**
-             * Internal parser for private keys as specified in
-             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
-             * @param bytes Input string to read the packet from
-             */
-            read(bytes: string): void;
-
-            /**
-             * Creates an OpenPGP key packet for the given key.
-             * @returns A string of bytes containing the secret key OpenPGP packet
-             */
-            write(): string;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Encrypt the payload. By default, we use aes256 and iterated, salted string
-             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
-             * and the passphrase is empty or undefined, the key will be set as not encrypted.
-             * This can be used to remove passphrase protection after calling decrypt().
-             * @param passphrase
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Decrypts the private key params which are needed to use the key.
-             * {@link module:packet.SecretKey.isDecrypted} should be false, as
-             * otherwise calls to this function will throw an error.
-             * @param passphrase The passphrase for this private key as string
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Clear private params, return to initial state
-             */
-            clearPrivateParams(): void;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-        }
-
-        class SecretSubkey {
-            /**
-             * A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
-             * Key packet and has exactly the same format.
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Indicator if secret-key data is encrypted. `this.isEncrypted === false` means data is available in decrypted form.
-             */
-            isEncrypted: any;
-
-            /**
-             * Internal parser for private keys as specified in
-             * {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.5.3|RFC4880bis-04 section 5.5.3}
-             * @param bytes Input string to read the packet from
-             */
-            read(bytes: string): void;
-
-            /**
-             * Creates an OpenPGP key packet for the given key.
-             * @returns A string of bytes containing the secret key OpenPGP packet
-             */
-            write(): string;
-
-            /**
-             * Check whether secret-key data is available in decrypted form. Returns null for public keys.
-             * @returns
-             */
-            isDecrypted(): boolean | null;
-
-            /**
-             * Encrypt the payload. By default, we use aes256 and iterated, salted string
-             * to key specifier. If the key is in a decrypted state (isEncrypted === false)
-             * and the passphrase is empty or undefined, the key will be set as not encrypted.
-             * This can be used to remove passphrase protection after calling decrypt().
-             * @param passphrase
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Decrypts the private key params which are needed to use the key.
-             * {@link module:packet.SecretKey.isDecrypted} should be false, as
-             * otherwise calls to this function will throw an error.
-             * @param passphrase The passphrase for this private key as string
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Clear private params, return to initial state
-             */
-            clearPrivateParams(): void;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-
-            /**
-             * Packet version
-             */
-            version: Integer;
-
-            /**
-             * Key creation date.
-             */
-            created: Date;
-
-            /**
-             * Public key algorithm.
-             */
-            algorithm: string;
-
-            /**
-             * Algorithm specific params
-             */
-            params: object[];
-
-            /**
-             * Time until expiration in days (V3 only)
-             */
-            expirationTimeV3: Integer;
-
-            /**
-             * Fingerprint in lowercase hex
-             */
-            fingerprint: string;
-
-            /**
-             * Keyid
-             */
-            keyid: type.keyid.Keyid;
-
-            /**
-             * Alias of read()
-             * @see module:packet.PublicKey#read
-             */
-            readPublicKey: any;
-
-            /**
-             * Alias of write()
-             * @see module:packet.PublicKey#write
-             */
-            writePublicKey: any;
-
-            /**
-             * Write an old version packet - it's used by some of the internal routines.
-             */
-            writeOld(): void;
-
-            /**
-             * Returns the creation time of the key
-             * @returns
-             */
-            getCreationTime(): Date;
-
-            /**
-             * Calculates the key id of the key
-             * @returns A 8 byte key id
-             */
-            getKeyId(): string;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A Uint8Array containing the fingerprint
-             */
-            getFingerprintBytes(): Uint8Array;
-
-            /**
-             * Calculates the fingerprint of the key
-             * @returns A string containing the fingerprint in lowercase hex
-             */
-            getFingerprint(): string;
-
-            /**
-             * Calculates whether two keys have the same fingerprint without actually calculating the fingerprint
-             * @returns Whether the two keys have the same version and public key data
-             */
-            hasSameFingerprintAs(): boolean;
-
-            /**
-             * Returns algorithm information
-             * @returns An object of the form {algorithm: string, bits:int, curve:String}
-             */
-            getAlgorithmInfo(): object;
-        }
-
-        class Signature {
-            /**
-             * Implementation of the Signature Packet (Tag 2)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.2|RFC4480 5.2}:
-             * A Signature packet describes a binding between some public key and
-             * some data.  The most common signatures are a signature of a file or a
-             * block of text, and a signature that is a certification of a User ID.
-             * @param date the creation date of the signature
-             */
-            constructor(date: Date);
-
-            /**
-             * parsing function for a signature packet (tag 2).
-             * @param bytes payload of a tag 2 packet
-             * @param position position to start reading from the bytes string
-             * @param len length of the packet or the remaining length of bytes at position
-             * @returns object representation
-             */
-            read(bytes: string, position: Integer, len: Integer): Signature;
-
-            /**
-             * Signs provided data. This needs to be done prior to serialization.
-             * @param key private key used to sign the message.
-             * @param data Contains packets to be signed.
-             * @returns
-             */
-            sign(key: SecretKey, data: object): Promise<Boolean>;
-
-            /**
-             * Creates Uint8Array of bytes of all subpacket data except Issuer and Embedded Signature subpackets
-             * @returns subpacket data
-             */
-            write_hashed_sub_packets(): Uint8Array;
-
-            /**
-             * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
-             * @returns subpacket data
-             */
-            write_unhashed_sub_packets(): Uint8Array;
-
-            /**
-             * verifys the signature packet. Note: not signature types are implemented
-             * @param key the public key to verify the signature
-             * @param signatureType expected signature type
-             * @param data data which on the signature applies
-             * @returns True if message is verified, else false.
-             */
-            verify(key: PublicSubkey | PublicKey | SecretSubkey | SecretKey, signatureType: enums.signature, data: string | object): Promise<Boolean>;
-
-            /**
-             * Verifies signature expiration date
-             * @param date (optional) use the given date for verification instead of the current time
-             * @returns true if expired
-             */
-            isExpired(date: Date): boolean;
-
-            /**
-             * Returns the expiration time of the signature or Infinity if signature does not expire
-             * @returns expiration time
-             */
-            getExpirationTime(): Date;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SymEncryptedAEADProtected {
-            /**
-             * Implementation of the Symmetrically Encrypted Authenticated Encryption with
-             * Additional Data (AEAD) Protected Data Packet
-             * {@link https://tools.ietf.org/html/draft-ford-openpgp-format-00#section-2.1}:
-             * AEAD Protected Data Packet
-             */
-            constructor();
-
-            /**
-             * Parse an encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
-             * @param bytes
-             */
-            read(bytes: Uint8Array | ReadableStream<Uint8Array>): void;
-
-            /**
-             * Write the encrypted payload of bytes in the order: version, IV, ciphertext (see specification)
-             * @returns The encrypted payload
-             */
-            write(): Uint8Array | ReadableStream<Uint8Array>;
-
-            /**
-             * Decrypt the encrypted payload.
-             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
-             * @param key The session key used to encrypt the payload
-             * @param streaming Whether the top-level function will return a stream
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): boolean;
-
-            /**
-             * Encrypt the packet list payload.
-             * @param sessionKeyAlgorithm The session key's cipher algorithm e.g. 'aes128'
-             * @param key The session key used to encrypt the payload
-             * @param streaming Whether the top-level function will return a stream
-             */
-            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): void;
-
-            /**
-             * En/decrypt the payload.
-             * @param {encrypt | decrypt} fn Whether to encrypt or decrypt
-             * @param key The session key used to en/decrypt the payload
-             * @param data The data to en/decrypt
-             * @param streaming Whether the top-level function will return a stream
-             * @returns
-             */
-            crypt(fn: any, key: Uint8Array, data: Uint8Array | ReadableStream<Uint8Array>, streaming: boolean): Uint8Array | ReadableStream<Uint8Array>;
-        }
-
-        class SymEncryptedIntegrityProtected {
-            /**
-             * Implementation of the Sym. Encrypted Integrity Protected Data Packet (Tag 18)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.13|RFC4880 5.13}:
-             * The Symmetrically Encrypted Integrity Protected Data packet is
-             * a variant of the Symmetrically Encrypted Data packet. It is a new feature
-             * created for OpenPGP that addresses the problem of detecting a modification to
-             * encrypted data. It is used in combination with a Modification Detection Code
-             * packet.
-             */
-            constructor();
-
-            /**
-             * The encrypted payload.
-             */
-            encrypted: any;
-
-            /**
-             * If after decrypting the packet this is set to true,
-             * a modification has been detected and thus the contents
-             * should be discarded.
-             */
-            modification: boolean;
-
-            /**
-             * Encrypt the payload in the packet.
-             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
-             * @param key The key of cipher blocksize length to be used
-             * @param streaming Whether to set this.encrypted to a stream
-             * @returns
-             */
-            encrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
-
-            /**
-             * Decrypts the encrypted data contained in the packet.
-             * @param sessionKeyAlgorithm The selected symmetric encryption algorithm to be used e.g. 'aes128'
-             * @param key The key of cipher blocksize length to be used
-             * @param streaming Whether to read this.encrypted as a stream
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: string, key: Uint8Array, streaming: boolean): Promise<Boolean>;
-        }
-
-        class SymEncryptedSessionKey {
-            /**
-             * Public-Key Encrypted Session Key Packets (Tag 1)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.1|RFC4880 5.1}:
-             * A Public-Key Encrypted Session Key packet holds the session key
-             * used to encrypt a message. Zero or more Public-Key Encrypted Session Key
-             * packets and/or Symmetric-Key Encrypted Session Key packets may precede a
-             * Symmetrically Encrypted Data Packet, which holds an encrypted message. The
-             * message is encrypted with the session key, and the session key is itself
-             * encrypted and stored in the Encrypted Session Key packet(s). The
-             * Symmetrically Encrypted Data Packet is preceded by one Public-Key Encrypted
-             * Session Key packet for each OpenPGP key to which the message is encrypted.
-             * The recipient of the message finds a session key that is encrypted to their
-             * public key, decrypts the session key, and then uses the session key to
-             * decrypt the message.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a symmetric encrypted session key packet (tag 3).
-             * @param input Payload of a tag 1 packet
-             * @param position Position to start reading from the input string
-             * @param len Length of the packet or the remaining length of
-             *        input at position
-             * @returns Object representation
-             */
-            read(input: Uint8Array, position: Integer, len: Integer): SymEncryptedSessionKey;
-
-            /**
-             * Decrypts the session key
-             * @param passphrase The passphrase in string form
-             * @returns
-             */
-            decrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Encrypts the session key
-             * @param passphrase The passphrase in string form
-             * @returns
-             */
-            encrypt(passphrase: string): Promise<Boolean>;
-
-            /**
-             * Fix custom types after cloning
-             */
-            postCloneTypeFix(): void;
-        }
-
-        class SymmetricallyEncrypted {
-            /**
-             * Implementation of the Symmetrically Encrypted Data Packet (Tag 9)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.7|RFC4880 5.7}:
-             * The Symmetrically Encrypted Data packet contains data encrypted with a
-             * symmetric-key algorithm. When it has been decrypted, it contains other
-             * packets (usually a literal data packet or compressed data packet, but in
-             * theory other Symmetrically Encrypted Data packets or sequences of packets
-             * that form whole OpenPGP messages).
-             */
-            constructor();
-
-            /**
-             * Packet type
-             */
-            tag: enums.packet;
-
-            /**
-             * Encrypted secret-key data
-             */
-            encrypted: any;
-
-            /**
-             * Decrypted packets contained within.
-             */
-            packets: List;
-
-            /**
-             * When true, decrypt fails if message is not integrity protected
-             * @see module:config.ignore_mdc_error
-             */
-            ignore_mdc_error: any;
-
-            /**
-             * Decrypt the symmetrically-encrypted packet data
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param sessionKeyAlgorithm Symmetric key algorithm to use
-             * @param key The key of cipher blocksize length to be used
-             * @returns
-             */
-            decrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
-
-            /**
-             * Encrypt the symmetrically-encrypted packet data
-             * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
-             * @param sessionKeyAlgorithm Symmetric key algorithm to use
-             * @param key The key of cipher blocksize length to be used
-             * @returns
-             */
-            encrypt(sessionKeyAlgorithm: enums.symmetric, key: Uint8Array): Promise<Boolean>;
-        }
-
-        class Trust {
-            /**
-             * Implementation of the Trust Packet (Tag 12)
-             * {@link https://tools.ietf.org/html/rfc4880#section-5.10|RFC4880 5.10}:
-             * The Trust packet is used only within keyrings and is not normally
-             * exported.  Trust packets contain data that record the user's
-             * specifications of which key holders are trustworthy introducers,
-             * along with other information that implementing software uses for
-             * trust information.  The format of Trust packets is defined by a given
-             * implementation.
-             * Trust packets SHOULD NOT be emitted to output streams that are
-             * transferred to other users, and they SHOULD be ignored on any input
-             * other than local keyring files.
-             */
-            constructor();
-
-            /**
-             * Parsing function for a trust packet (tag 12).
-             * Currently not implemented as we ignore trust packets
-             * @param byptes payload of a tag 12 packet
-             */
-            read(byptes: string): void;
-        }
-
-        class UserAttribute {
-            /**
-             * Implementation of the User Attribute Packet (Tag 17)
-             * The User Attribute packet is a variation of the User ID packet.  It
-             * is capable of storing more types of data than the User ID packet,
-             * which is limited to text.  Like the User ID packet, a User Attribute
-             * packet may be certified by the key owner ("self-signed") or any other
-             * key owner who cares to certify it.  Except as noted, a User Attribute
-             * packet may be used anywhere that a User ID packet may be used.
-             * While User Attribute packets are not a required part of the OpenPGP
-             * standard, implementations SHOULD provide at least enough
-             * compatibility to properly handle a certification signature on the
-             * User Attribute packet.  A simple way to do this is by treating the
-             * User Attribute packet as a User ID packet with opaque contents, but
-             * an implementation may use any method desired.
-             */
-            constructor();
-
-            /**
-             * parsing function for a user attribute packet (tag 17).
-             * @param input payload of a tag 17 packet
-             */
-            read(input: Uint8Array): void;
-
-            /**
-             * Creates a binary representation of the user attribute packet
-             * @returns string representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Compare for equality
-             * @param usrAttr
-             * @returns true if equal
-             */
-            equals(usrAttr: UserAttribute): boolean;
-        }
-
-        class Userid {
-            /**
-             * Implementation of the User ID Packet (Tag 13)
-             * A User ID packet consists of UTF-8 text that is intended to represent
-             * the name and email address of the key holder.  By convention, it
-             * includes an RFC 2822 [RFC2822] mail name-addr, but there are no
-             * restrictions on its content.  The packet length in the header
-             * specifies the length of the User ID.
-             */
-            constructor();
-
-            /**
-             * A string containing the user id. Usually in the form
-             * John Doe <john@example.com>
-             */
-            userid: string;
-
-            /**
-             * Parsing function for a user id packet (tag 13).
-             * @param input payload of a tag 13 packet
-             */
-            read(input: Uint8Array): void;
-
-            /**
-             * Parse userid string, e.g. 'John Doe <john@example.com>'
-             */
-            parse(): void;
-
-            /**
-             * Creates a binary representation of the user id packet
-             * @returns binary representation
-             */
-            write(): Uint8Array;
-
-            /**
-             * Set userid string from object, e.g. { name:'Phil Zimmermann', email:'phil@openpgp.org' }
-             */
-            format(): void;
-        }
-
-        namespace all_packets {
-            /**
-             * @see module:packet.Compressed
-             */
-            var Compressed: any;
-
-            /**
-             * @see module:packet.SymEncryptedIntegrityProtected
-             */
-            var SymEncryptedIntegrityProtected: any;
-
-            /**
-             * @see module:packet.SymEncryptedAEADProtected
-             */
-            var SymEncryptedAEADProtected: any;
-
-            /**
-             * @see module:packet.PublicKeyEncryptedSessionKey
-             */
-            var PublicKeyEncryptedSessionKey: any;
-
-            /**
-             * @see module:packet.SymEncryptedSessionKey
-             */
-            var SymEncryptedSessionKey: any;
-
-            /**
-             * @see module:packet.Literal
-             */
-            var Literal: any;
-
-            /**
-             * @see module:packet.PublicKey
-             */
-            var PublicKey: any;
-
-            /**
-             * @see module:packet.SymmetricallyEncrypted
-             */
-            var SymmetricallyEncrypted: any;
-
-            /**
-             * @see module:packet.Marker
-             */
-            var Marker: any;
-
-            /**
-             * @see module:packet.PublicSubkey
-             */
-            var PublicSubkey: any;
-
-            /**
-             * @see module:packet.UserAttribute
-             */
-            var UserAttribute: any;
-
-            /**
-             * @see module:packet.OnePassSignature
-             */
-            var OnePassSignature: any;
-
-            /**
-             * @see module:packet.SecretKey
-             */
-            var SecretKey: any;
-
-            /**
-             * @see module:packet.Userid
-             */
-            var Userid: any;
-
-            /**
-             * @see module:packet.SecretSubkey
-             */
-            var SecretSubkey: any;
-
-            /**
-             * @see module:packet.Signature
-             */
-            var Signature: any;
-
-            /**
-             * @see module:packet.Trust
-             */
-            var Trust: any;
-        }
-
-        namespace clone {
-            /**
-             * Create a packetlist from the correspoding object types.
-             * @param options the object passed to and from the web worker
-             * @returns a mutated version of the options optject
-             */
-            function clonePackets(options: object): object;
-
-            /**
-             * Creates an object with the correct prototype from a corresponding packetlist.
-             * @param options the object passed to and from the web worker
-             * @param method the public api function name to be delegated to the worker
-             * @returns a mutated version of the options optject
-             */
-            function parseClonedPackets(options: object, method: string): object;
-        }
-
-        namespace packet {
-            /**
-             * Encodes a given integer of length to the openpgp length specifier to a
-             * string
-             * @param length The length to encode
-             * @returns String with openpgp length representation
-             */
-            function writeSimpleLength(length: Integer): Uint8Array;
-
-            /**
-             * Writes a packet header version 4 with the given tag_type and length to a
-             * string
-             * @param tag_type Tag type
-             * @param length Length of the payload
-             * @returns String of the header
-             */
-            function writeHeader(tag_type: Integer, length: Integer): string;
-
-            /**
-             * Writes a packet header Version 3 with the given tag_type and length to a
-             * string
-             * @param tag_type Tag type
-             * @param length Length of the payload
-             * @returns String of the header
-             */
-            function writeOldHeader(tag_type: Integer, length: Integer): string;
-
-            /**
-             * Whether the packet type supports partial lengths per RFC4880
-             * @param tag_type Tag type
-             * @returns String of the header
-             */
-            function supportsStreaming(tag_type: Integer): boolean;
-
-            /**
-             * Generic static Packet Parser function
-             * @param input Input stream as string
-             * @param callback Function to call with the parsed packet
-             * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
-             */
-            function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
-        }
+        function writeHeader(tag_type: Integer, length: Integer): string;
+
+        /**
+         * Writes a packet header Version 3 with the given tag_type and length to a
+         * string
+         * @param tag_type Tag type
+         * @param length Length of the payload
+         * @returns String of the header
+         */
+        function writeOldHeader(tag_type: Integer, length: Integer): string;
+
+        /**
+         * Whether the packet type supports partial lengths per RFC4880
+         * @param tag_type Tag type
+         * @returns String of the header
+         */
+        function supportsStreaming(tag_type: Integer): boolean;
+
+        /**
+         * Generic static Packet Parser function
+         * @param input Input stream as string
+         * @param callback Function to call with the parsed packet
+         * @returns Returns false if the stream was empty and parsing is done, and true otherwise.
+         */
+        function read(input: Uint8Array | ReadableStream<Uint8Array>, callback: Function): boolean;
     }
+}
 
 
-    namespace polyfills {
-    }
+export namespace polyfills {
+}
 
-    namespace signature {
-        /**
-         * Class that represents an OpenPGP signature.
-         */
-        class Signature {
-            /**
-             * @param packetlist The signature packets
-             */
-            constructor(packetlist: packet.List);
-
-            /**
-             * Returns ASCII armored text of signature
-             * @returns ASCII armor
-             */
-            armor(): ReadableStream<String>;
-        }
-
-        /**
-         * reads an OpenPGP armored signature and returns a signature object
-         * @param armoredText text to be parsed
-         * @returns new signature object
-         */
-        function readArmored(armoredText: string | ReadableStream<String>): Signature;
-
-        /**
-         * reads an OpenPGP signature as byte array and returns a signature object
-         * @param input binary signature
-         * @returns new signature object
-         */
-        function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
-    }
-
-    namespace type {
-        /**
-         * Encoded symmetric key for ECDH
-         */
-        namespace ecdh_symkey {
-            class ECDHSymmetricKey {
-                constructor();
-
-                /**
-                 * Read an ECDHSymmetricKey from an Uint8Array
-                 * @param input Where to read the encoded symmetric key from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Write an ECDHSymmetricKey as an Uint8Array
-                 * @returns An array containing the value
-                 */
-                write(): Uint8Array;
-            }
-        }
-
-        /**
-         * Implementation of type KDF parameters
-         * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
-         * A key derivation function (KDF) is necessary to implement the EC
-         * encryption.  The Concatenation Key Derivation Function (Approved
-         * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
-         * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
-         */
-        namespace kdf_params {
-            class KDFParams {
-                /**
-                 * @param hash Hash algorithm
-                 * @param cipher Symmetric algorithm
-                 */
-                constructor(hash: enums.hash, cipher: enums.symmetric);
-
-                /**
-                 * Read KDFParams from an Uint8Array
-                 * @param input Where to read the KDFParams from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Write KDFParams to an Uint8Array
-                 * @returns Array with the KDFParams value
-                 */
-                write(): Uint8Array;
-            }
-        }
-
-        /**
-         * Implementation of type key id
-         * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
-         * A Key ID is an eight-octet scalar that identifies a key.
-         * Implementations SHOULD NOT assume that Key IDs are unique.  The
-         * section "Enhanced Key Formats" below describes how Key IDs are
-         * formed.
-         */
-        namespace keyid {
-            class Keyid {
-                constructor();
-
-                /**
-                 * Parsing method for a key id
-                 * @param input Input to read the key id from
-                 */
-                read(input: Uint8Array): void;
-
-                /**
-                 * Checks equality of Key ID's
-                 * @param keyid
-                 * @param matchWildcard Indicates whether to check if either keyid is a wildcard
-                 */
-                equals(keyid: Keyid, matchWildcard: boolean): void;
-            }
-        }
-
-        /**
-         * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
-         * Multiprecision integers (also called MPIs) are unsigned integers used
-         * to hold large integers such as the ones used in cryptographic
-         * calculations.
-         * An MPI consists of two pieces: a two-octet scalar that is the length
-         * of the MPI in bits followed by a string of octets that contain the
-         * actual integer.
-         */
-        namespace mpi {
-            class MPI {
-                constructor();
-
-                /**
-                 * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
-                 * @param input Payload of MPI data
-                 * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
-                 * @returns Length of data read
-                 */
-                read(input: Uint8Array, endian: string): Integer;
-
-                /**
-                 * Converts the mpi object to a bytes as specified in
-                 * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
-                 * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
-                 * @param length Length of the data part of the MPI
-                 * @returns mpi Byte representation
-                 */
-                write(endian: string, length: Integer): Uint8Array;
-            }
-        }
-
-        /**
-         * Wrapper to an OID value
-         * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
-         * The sequence of octets in the third column is the result of applying
-         * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
-         * with subsequent truncation.  The truncation removes the two fields of
-         * encoded Object Identifier.  The first omitted field is one octet
-         * representing the Object Identifier tag, and the second omitted field
-         * is the length of the Object Identifier body.  For example, the
-         * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
-         * 86 48 CE 3D 03 01 07", from which the first entry in the table above
-         * is constructed by omitting the first two octets.  Only the truncated
-         * sequence of octets is the valid representation of a curve OID.
-         */
-        namespace oid {
-            class OID {
-                constructor();
-
-                /**
-                 * Method to read an OID object
-                 * @param input Where to read the OID from
-                 * @returns Number of read bytes
-                 */
-                read(input: Uint8Array): number;
-
-                /**
-                 * Serialize an OID object
-                 * @returns Array with the serialized value the OID
-                 */
-                write(): Uint8Array;
-
-                /**
-                 * Serialize an OID object as a hex string
-                 * @returns String with the hex value of the OID
-                 */
-                toHex(): string;
-
-                /**
-                 * If a known curve object identifier, return the canonical name of the curve
-                 * @returns String with the canonical name of the curve
-                 */
-                getName(): string;
-            }
-        }
-
-        /**
-     * Implementation of the String-to-key specifier
-     * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
-     * String-to-key (S2K) specifiers are used to convert passphrase strings
-     * into symmetric-key encryption/decryption keys.  They are used in two
-     * places, currently: to encrypt the secret part of private keys in the
-     * private keyring, and to convert passphrases to encryption keys for
-     * symmetrically encrypted messages.
+export namespace signature {
+    /**
+     * Class that represents an OpenPGP signature.
      */
-        namespace s2k {
-            class S2K {
-                constructor();
+    class Signature {
+        /**
+         * @param packetlist The signature packets
+         */
+        constructor(packetlist: packet.List);
 
-                algorithm: enums.hash;
+        /**
+         * Returns ASCII armored text of signature
+         * @returns ASCII armor
+         */
+        armor(): ReadableStream<String>;
 
-                type: enums.s2k;
+        packets: packet.List;
+    }
 
-                c: Integer;
+    /**
+     * reads an OpenPGP armored signature and returns a signature object
+     * @param armoredText text to be parsed
+     * @returns new signature object
+     */
+    function readArmored(armoredText: string | ReadableStream<String>): Signature;
 
-                /**
-                 * Eight bytes of salt in a binary string.
-                 */
-                salt: string;
+    /**
+     * reads an OpenPGP signature as byte array and returns a signature object
+     * @param input binary signature
+     * @returns new signature object
+     */
+    function read(input: Uint8Array | ReadableStream<Uint8Array>): Signature;
+}
 
-                /**
-                 * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
-                 * @param input Payload of string-to-key specifier
-                 * @returns Actual length of the object
-                 */
-                read(input: string): Integer;
+export namespace type {
+    /**
+     * Encoded symmetric key for ECDH
+     */
+    namespace ecdh_symkey {
+        class ECDHSymmetricKey {
+            constructor();
 
-                /**
-                 * Serializes s2k information
-                 * @returns binary representation of s2k
-                 */
-                write(): Uint8Array;
+            /**
+             * Read an ECDHSymmetricKey from an Uint8Array
+             * @param input Where to read the encoded symmetric key from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
 
-                /**
-                 * Produces a key using the specified passphrase and the defined
-                 * hashAlgorithm
-                 * @param passphrase Passphrase containing user input
-                 * @returns Produced key with a length corresponding to
-                 *          hashAlgorithm hash length
-                 */
-                produce_key(passphrase: string): Uint8Array;
-            }
+            /**
+             * Write an ECDHSymmetricKey as an Uint8Array
+             * @returns An array containing the value
+             */
+            write(): Uint8Array;
         }
     }
 
     /**
-     * This object contains utility functions
+     * Implementation of type KDF parameters
+     * {@link https://tools.ietf.org/html/rfc6637#section-7|RFC 6637 7}:
+     * A key derivation function (KDF) is necessary to implement the EC
+     * encryption.  The Concatenation Key Derivation Function (Approved
+     * Alternative 1) [NIST-SP800-56A] with the KDF hash function that is
+     * SHA2-256 [FIPS-180-3] or stronger is REQUIRED.
      */
-    namespace util {
-        /**
-         * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
-         * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
-         * Also, convert ReadableStreams to MessagePorts
-         * @param obj the options object to be passed to the web worker
-         * @returns an array of binary data to be passed
-         */
-        function getTransferables(obj: object): any[];
+    namespace kdf_params {
+        class KDFParams {
+            /**
+             * @param hash Hash algorithm
+             * @param cipher Symmetric algorithm
+             */
+            constructor(hash: enums.hash, cipher: enums.symmetric);
 
-        /**
-         * Convert MessagePorts back to ReadableStreams
-         * @param obj
-         * @returns
-         */
-        function restoreStreams(obj: object): object;
+            /**
+             * Read KDFParams from an Uint8Array
+             * @param input Where to read the KDFParams from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
 
-        /**
-         * Create hex string from a binary
-         * @param str String to convert
-         * @returns String containing the hexadecimal values
-         */
-        function str_to_hex(str: string): string;
-
-        /**
-         * Create binary string from a hex encoded string
-         * @param str Hex string to convert
-         * @returns
-         */
-        function hex_to_str(str: string): string;
-
-        /**
-         * Convert a Uint8Array to an MPI-formatted Uint8Array.
-         * Note: the output is **not** an MPI object.
-         * @see
-         * @see
-         * @param bin An array of 8-bit integers to convert
-         * @returns MPI-formatted Uint8Array
-         */
-        function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
-
-        /**
-         * Convert a Base-64 encoded string an array of 8-bit integer
-         * Note: accepts both Radix-64 and URL-safe strings
-         * @param base64 Base-64 encoded string to convert
-         * @returns An array of 8-bit integers
-         */
-        function b64_to_Uint8Array(base64: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integer to a Base-64 encoded string
-         * @param bytes An array of 8-bit integers to convert
-         * @param url If true, output is URL-safe
-         * @returns Base-64 encoded string
-         */
-        function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
-
-        /**
-         * Convert a hex string to an array of 8-bit integers
-         * @param hex A hex string to convert
-         * @returns An array of 8-bit integers
-         */
-        function hex_to_Uint8Array(hex: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integers to a hex string
-         * @param bytes Array of 8-bit integers to convert
-         * @returns Hexadecimal representation of the array
-         */
-        function Uint8Array_to_hex(bytes: Uint8Array): string;
-
-        /**
-         * Convert a string to an array of 8-bit integers
-         * @param str String to convert
-         * @returns An array of 8-bit integers
-         */
-        function str_to_Uint8Array(str: string): Uint8Array;
-
-        /**
-         * Convert an array of 8-bit integers to a string
-         * @param bytes An array of 8-bit integers to convert
-         * @returns String representation of the array
-         */
-        function Uint8Array_to_str(bytes: Uint8Array): string;
-
-        /**
-         * Convert a native javascript string to a Uint8Array of utf8 bytes
-         * @param str The string to convert
-         * @returns A valid squence of utf8 bytes
-         */
-        function encode_utf8(str: string | ReadableStream): Uint8Array | ReadableStream;
-
-        /**
-         * Convert a Uint8Array of utf8 bytes to a native javascript string
-         * @param utf8 A valid squence of utf8 bytes
-         * @returns A native javascript string
-         */
-        function decode_utf8(utf8: Uint8Array | ReadableStream): string | ReadableStream;
-
-        /**
-         * Concat a list of Uint8Arrays, Strings or Streams
-         * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
-         * @param Array of Uint8Arrays/Strings/Streams to concatenate
-         * @returns Concatenated array
-         */
-        var concat: any;
-
-        /**
-         * Concat Uint8Arrays
-         * @param Array of Uint8Arrays to concatenate
-         * @returns Concatenated array
-         */
-        var concatUint8Array: any;
-
-        /**
-         * Check Uint8Array equality
-         * @param first array
-         * @param second array
-         * @returns equality
-         */
-        function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
-
-        /**
-         * Calculates a 16bit sum of a Uint8Array by adding each character
-         * codes modulus 65535
-         * @param Uint8Array to create a sum of
-         * @returns 2 bytes containing the sum of all charcodes % 65535
-         */
-        function write_checksum(Uint8Array: Uint8Array): Uint8Array;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug(str: string): void;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_hexarray_dump(str: string): void;
-
-        /**
-         * Helper function to print a debug message. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_hexstr_dump(str: string): void;
-
-        /**
-         * Helper function to print a debug error. Debug
-         * messages are only printed if
-         * @param str String of the debug message
-         */
-        function print_debug_error(str: string): void;
-
-        /**
-         * Read a stream to the end and print it to the console when it's closed.
-         * @param str String of the debug message
-         * @param input Stream to print
-         * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
-         */
-        function print_entire_stream(str: string, input: ReadableStream | Uint8Array | string, concat: Function): void;
-
-        /**
-         * If S[1] == 0, then double(S) == (S[2..128] || 0);
-         * otherwise, double(S) == (S[2..128] || 0) xor
-         * (zeros(120) || 10000111).
-         * Both OCB and EAX (through CMAC) require this function to be constant-time.
-         * @param data
-         */
-        /* Illegal function name 'double' can't be used here
-        function double(data: Uint8Array): void;
-        */
-
-        /**
-         * Shift a Uint8Array to the right by n bits
-         * @param array The array to shift
-         * @param bits Amount of bits to shift (MUST be smaller
-         *        than 8)
-         * @returns Resulting array.
-         */
-        function shiftRight(array: Uint8Array, bits: Integer): string;
-
-        /**
-         * Get native Web Cryptography api, only the current version of the spec.
-         * The default configuration is to use the api when available. But it can
-         * be deactivated with config.use_native
-         * @returns The SubtleCrypto api or 'undefined'
-         */
-        function getWebCrypto(): object;
-
-        /**
-         * Get native Web Cryptography api for all browsers, including legacy
-         * implementations of the spec e.g IE11 and Safari 8/9. The default
-         * configuration is to use the api when available. But it can be deactivated
-         * with config.use_native
-         * @returns The SubtleCrypto api or 'undefined'
-         */
-        function getWebCryptoAll(): object;
-
-        /**
-         * Detect Node.js runtime.
-         */
-        function detectNode(): void;
-
-        /**
-         * Get native Node.js module
-         * @param The module to require
-         * @returns The required module or 'undefined'
-         */
-        function nodeRequire(The: string): object;
-
-        /**
-         * Get native Node.js crypto api. The default configuration is to use
-         * the api when available. But it can also be deactivated with config.use_native
-         * @returns The crypto module or 'undefined'
-         */
-        function getNodeCrypto(): object;
-
-        /**
-         * Get native Node.js Buffer constructor. This should be used since
-         * Buffer is not available under browserify.
-         * @returns The Buffer constructor or 'undefined'
-         */
-        function getNodeBuffer(): Function;
-
-        /**
-         * Format user id for internal use.
-         */
-        function formatUserId(): void;
-
-        /**
-         * Parse user id.
-         */
-        function parseUserId(): void;
-
-        /**
-         * Normalize line endings to \r\n
-         */
-        function canonicalizeEOL(): void;
-
-        /**
-         * Convert line endings from canonicalized \r\n to native \n
-         */
-        function nativeEOL(): void;
-
-        /**
-         * Remove trailing spaces and tabs from each line
-         */
-        function removeTrailingSpaces(): void;
-
-        /**
-         * Encode input buffer using Z-Base32 encoding.
-         * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
-         * @param data The binary data to encode
-         * @returns Binary data encoded using Z-Base32
-         */
-        function encodeZBase32(data: Uint8Array): string;
+            /**
+             * Write KDFParams to an Uint8Array
+             * @returns Array with the KDFParams value
+             */
+            write(): Uint8Array;
+        }
     }
 
-    namespace wkd {
-        class WKD {
-            /**
-             * Initialize the WKD client
-             */
+    /**
+     * Implementation of type key id
+     * {@link https://tools.ietf.org/html/rfc4880#section-3.3|RFC4880 3.3}:
+     * A Key ID is an eight-octet scalar that identifies a key.
+     * Implementations SHOULD NOT assume that Key IDs are unique.  The
+     * section "Enhanced Key Formats" below describes how Key IDs are
+     * formed.
+     */
+    namespace keyid {
+        class Keyid {
             constructor();
 
             /**
-             * Search for a public key using Web Key Directory protocol.
-             * @param options.email User's email.
-             * @param options.rawBytes Returns Uint8Array instead of parsed key.
-             * @returns The public key.
+             * Parsing method for a key id
+             * @param input Input to read the key id from
              */
-            lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+            read(input: Uint8Array): void;
+
+            /**
+             * Checks equality of Key ID's
+             * @param keyid
+             * @param matchWildcard Indicates whether to check if either keyid is a wildcard
+             */
+            equals(keyid: Keyid, matchWildcard: boolean): void;
         }
     }
 
-    namespace worker {
-        /**
-     * @see module:openpgp.initWorker
-     * @see module:openpgp.getWorker
-     * @see module:openpgp.destroyWorker
-     * @see module:worker/worker
+    /**
+     * Implementation of type MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2})
+     * Multiprecision integers (also called MPIs) are unsigned integers used
+     * to hold large integers such as the ones used in cryptographic
+     * calculations.
+     * An MPI consists of two pieces: a two-octet scalar that is the length
+     * of the MPI in bits followed by a string of octets that contain the
+     * actual integer.
      */
-        namespace async_proxy {
-            class AsyncProxy {
-                /**
-                 * Initializes a new proxy and loads the web worker
-                 * @param path The path to the worker or 'openpgp.worker.js' by default
-                 * @param n number of workers to initialize if path given
-                 * @param config config The worker configuration
-                 * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
-                 */
-                constructor(path: string, n: number, config: object, worker: any[]);
+    namespace mpi {
+        class MPI {
+            constructor();
 
-                /**
-                 * Message handling
-                 */
-                handleMessage(): void;
+            /**
+             * Parsing function for a MPI ( {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC 4880 3.2}).
+             * @param input Payload of MPI data
+             * @param endian Endianness of the data; 'be' for big-endian or 'le' for little-endian
+             * @returns Length of data read
+             */
+            read(input: Uint8Array, endian: string): Integer;
 
-                /**
-                 * Get new request ID
-                 * @returns New unique request ID
-                 */
-                getID(): Integer;
-
-                /**
-                 * Send message to worker with random data
-                 * @param size Number of bytes to send
-                 */
-                seedRandom(size: Integer): void;
-
-                /**
-                 * Terminates the workers
-                 */
-                terminate(): void;
-
-                /**
-                 * Generic proxy function that handles all commands from the public api.
-                 * @param method the public api function to be delegated to the worker thread
-                 * @param options the api function's options
-                 * @returns see the corresponding public api functions for their return types
-                 */
-                delegate(method: string, options: object): Promise<any>;
-            }
+            /**
+             * Converts the mpi object to a bytes as specified in
+             * {@link https://tools.ietf.org/html/rfc4880#section-3.2|RFC4880 3.2}
+             * @param endian Endianness of the payload; 'be' for big-endian or 'le' for little-endian
+             * @param length Length of the data part of the MPI
+             * @returns mpi Byte representation
+             */
+            write(endian: string, length: Integer): Uint8Array;
         }
+    }
+
+    /**
+     * Wrapper to an OID value
+     * {@link https://tools.ietf.org/html/rfc6637#section-11|RFC6637, section 11}:
+     * The sequence of octets in the third column is the result of applying
+     * the Distinguished Encoding Rules (DER) to the ASN.1 Object Identifier
+     * with subsequent truncation.  The truncation removes the two fields of
+     * encoded Object Identifier.  The first omitted field is one octet
+     * representing the Object Identifier tag, and the second omitted field
+     * is the length of the Object Identifier body.  For example, the
+     * complete ASN.1 DER encoding for the NIST P-256 curve OID is "06 08 2A
+     * 86 48 CE 3D 03 01 07", from which the first entry in the table above
+     * is constructed by omitting the first two octets.  Only the truncated
+     * sequence of octets is the valid representation of a curve OID.
+     */
+    namespace oid {
+        class OID {
+            constructor();
+
+            /**
+             * Method to read an OID object
+             * @param input Where to read the OID from
+             * @returns Number of read bytes
+             */
+            read(input: Uint8Array): number;
+
+            /**
+             * Serialize an OID object
+             * @returns Array with the serialized value the OID
+             */
+            write(): Uint8Array;
+
+            /**
+             * Serialize an OID object as a hex string
+             * @returns String with the hex value of the OID
+             */
+            toHex(): string;
+
+            /**
+             * If a known curve object identifier, return the canonical name of the curve
+             * @returns String with the canonical name of the curve
+             */
+            getName(): string;
+        }
+    }
+
+    /**
+ * Implementation of the String-to-key specifier
+ * {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC4880 3.7}:
+ * String-to-key (S2K) specifiers are used to convert passphrase strings
+ * into symmetric-key encryption/decryption keys.  They are used in two
+ * places, currently: to encrypt the secret part of private keys in the
+ * private keyring, and to convert passphrases to encryption keys for
+ * symmetrically encrypted messages.
+ */
+    namespace s2k {
+        class S2K {
+            constructor();
+
+            algorithm: enums.hash;
+
+            type: enums.s2k;
+
+            c: Integer;
+
+            /**
+             * Eight bytes of salt in a binary string.
+             */
+            salt: string;
+
+            /**
+             * Parsing function for a string-to-key specifier ( {@link https://tools.ietf.org/html/rfc4880#section-3.7|RFC 4880 3.7}).
+             * @param input Payload of string-to-key specifier
+             * @returns Actual length of the object
+             */
+            read(input: string): Integer;
+
+            /**
+             * Serializes s2k information
+             * @returns binary representation of s2k
+             */
+            write(): Uint8Array;
+
+            /**
+             * Produces a key using the specified passphrase and the defined
+             * hashAlgorithm
+             * @param passphrase Passphrase containing user input
+             * @returns Produced key with a length corresponding to
+             *          hashAlgorithm hash length
+             */
+            produce_key(passphrase: string): Uint8Array;
+        }
+    }
+}
+
+/**
+ * This object contains utility functions
+ */
+export namespace util {
+    /**
+     * Get transferable objects to pass buffers with zero copy (similar to "pass by reference" in C++)
+     * See: https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
+     * Also, convert ReadableStreams to MessagePorts
+     * @param obj the options object to be passed to the web worker
+     * @returns an array of binary data to be passed
+     */
+    function getTransferables(obj: object): any[];
+
+    /**
+     * Convert MessagePorts back to ReadableStreams
+     * @param obj
+     * @returns
+     */
+    function restoreStreams(obj: object): object;
+
+    /**
+     * Create hex string from a binary
+     * @param str String to convert
+     * @returns String containing the hexadecimal values
+     */
+    function str_to_hex(str: string): string;
+
+    /**
+     * Create binary string from a hex encoded string
+     * @param str Hex string to convert
+     * @returns
+     */
+    function hex_to_str(str: string): string;
+
+    /**
+     * Convert a Uint8Array to an MPI-formatted Uint8Array.
+     * Note: the output is **not** an MPI object.
+     * @see
+     * @see
+     * @param bin An array of 8-bit integers to convert
+     * @returns MPI-formatted Uint8Array
+     */
+    function Uint8Array_to_MPI(bin: Uint8Array): Uint8Array;
+
+    /**
+     * Convert a Base-64 encoded string an array of 8-bit integer
+     * Note: accepts both Radix-64 and URL-safe strings
+     * @param base64 Base-64 encoded string to convert
+     * @returns An array of 8-bit integers
+     */
+    function b64_to_Uint8Array(base64: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integer to a Base-64 encoded string
+     * @param bytes An array of 8-bit integers to convert
+     * @param url If true, output is URL-safe
+     * @returns Base-64 encoded string
+     */
+    function Uint8Array_to_b64(bytes: Uint8Array, url: boolean): string;
+
+    /**
+     * Convert a hex string to an array of 8-bit integers
+     * @param hex A hex string to convert
+     * @returns An array of 8-bit integers
+     */
+    function hex_to_Uint8Array(hex: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integers to a hex string
+     * @param bytes Array of 8-bit integers to convert
+     * @returns Hexadecimal representation of the array
+     */
+    function Uint8Array_to_hex(bytes: Uint8Array): string;
+
+    /**
+     * Convert a string to an array of 8-bit integers
+     * @param str String to convert
+     * @returns An array of 8-bit integers
+     */
+    function str_to_Uint8Array(str: string): Uint8Array;
+
+    /**
+     * Convert an array of 8-bit integers to a string
+     * @param bytes An array of 8-bit integers to convert
+     * @returns String representation of the array
+     */
+    function Uint8Array_to_str(bytes: Uint8Array): string;
+
+    /**
+     * Convert a native javascript string to a Uint8Array of utf8 bytes
+     * @param str The string to convert
+     * @returns A valid squence of utf8 bytes
+     */
+    function encode_utf8(str: string | ReadableStream): Uint8Array | ReadableStream;
+
+    /**
+     * Convert a Uint8Array of utf8 bytes to a native javascript string
+     * @param utf8 A valid squence of utf8 bytes
+     * @returns A native javascript string
+     */
+    function decode_utf8(utf8: Uint8Array | ReadableStream): string | ReadableStream;
+
+    /**
+     * Concat a list of Uint8Arrays, Strings or Streams
+     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+     * @param Array of Uint8Arrays/Strings/Streams to concatenate
+     * @returns Concatenated array
+     */
+    var concat: any;
+
+    /**
+     * Concat Uint8Arrays
+     * @param Array of Uint8Arrays to concatenate
+     * @returns Concatenated array
+     */
+    var concatUint8Array: any;
+
+    /**
+     * Check Uint8Array equality
+     * @param first array
+     * @param second array
+     * @returns equality
+     */
+    function equalsUint8Array(first: Uint8Array, second: Uint8Array): boolean;
+
+    /**
+     * Calculates a 16bit sum of a Uint8Array by adding each character
+     * codes modulus 65535
+     * @param Uint8Array to create a sum of
+     * @returns 2 bytes containing the sum of all charcodes % 65535
+     */
+    function write_checksum(Uint8Array: Uint8Array): Uint8Array;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug(str: string): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexarray_dump(str: string): void;
+
+    /**
+     * Helper function to print a debug message. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_hexstr_dump(str: string): void;
+
+    /**
+     * Helper function to print a debug error. Debug
+     * messages are only printed if
+     * @param str String of the debug message
+     */
+    function print_debug_error(str: string): void;
+
+    /**
+     * Read a stream to the end and print it to the console when it's closed.
+     * @param str String of the debug message
+     * @param input Stream to print
+     * @param concat Function to concatenate chunks of the stream (defaults to util.concat).
+     */
+    function print_entire_stream(str: string, input: ReadableStream | Uint8Array | string, concat: Function): void;
+
+    /**
+     * If S[1] == 0, then double(S) == (S[2..128] || 0);
+     * otherwise, double(S) == (S[2..128] || 0) xor
+     * (zeros(120) || 10000111).
+     * Both OCB and EAX (through CMAC) require this function to be constant-time.
+     * @param data
+     */
+    /* Illegal function name 'double' can't be used here
+    function double(data: Uint8Array): void;
+    */
+
+    /**
+     * Shift a Uint8Array to the right by n bits
+     * @param array The array to shift
+     * @param bits Amount of bits to shift (MUST be smaller
+     *        than 8)
+     * @returns Resulting array.
+     */
+    function shiftRight(array: Uint8Array, bits: Integer): string;
+
+    /**
+     * Get native Web Cryptography api, only the current version of the spec.
+     * The default configuration is to use the api when available. But it can
+     * be deactivated with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCrypto(): object;
+
+    /**
+     * Get native Web Cryptography api for all browsers, including legacy
+     * implementations of the spec e.g IE11 and Safari 8/9. The default
+     * configuration is to use the api when available. But it can be deactivated
+     * with config.use_native
+     * @returns The SubtleCrypto api or 'undefined'
+     */
+    function getWebCryptoAll(): object;
+
+    /**
+     * Detect Node.js runtime.
+     */
+    function detectNode(): void;
+
+    /**
+     * Get native Node.js module
+     * @param The module to require
+     * @returns The required module or 'undefined'
+     */
+    function nodeRequire(The: string): object;
+
+    /**
+     * Get native Node.js crypto api. The default configuration is to use
+     * the api when available. But it can also be deactivated with config.use_native
+     * @returns The crypto module or 'undefined'
+     */
+    function getNodeCrypto(): object;
+
+    /**
+     * Get native Node.js Buffer constructor. This should be used since
+     * Buffer is not available under browserify.
+     * @returns The Buffer constructor or 'undefined'
+     */
+    function getNodeBuffer(): Function;
+
+    /**
+     * Format user id for internal use.
+     */
+    function formatUserId(): void;
+
+    /**
+     * Parse user id.
+     */
+    function parseUserId(): void;
+
+    /**
+     * Normalize line endings to \r\n
+     */
+    function canonicalizeEOL(): void;
+
+    /**
+     * Convert line endings from canonicalized \r\n to native \n
+     */
+    function nativeEOL(): void;
+
+    /**
+     * Remove trailing spaces and tabs from each line
+     */
+    function removeTrailingSpaces(): void;
+
+    /**
+     * Encode input buffer using Z-Base32 encoding.
+     * See: https://tools.ietf.org/html/rfc6189#section-5.1.6
+     * @param data The binary data to encode
+     * @returns Binary data encoded using Z-Base32
+     */
+    function encodeZBase32(data: Uint8Array): string;
+}
+
+export namespace wkd {
+    class WKD {
+        /**
+         * Initialize the WKD client
+         */
+        constructor();
 
         /**
-     * @see module:openpgp.initWorker
-     * @see module:openpgp.getWorker
-     * @see module:openpgp.destroyWorker
-     * @see module:worker/async_proxy
-     */
-        namespace worker {
+         * Search for a public key using Web Key Directory protocol.
+         * @param options.email User's email.
+         * @param options.rawBytes Returns Uint8Array instead of parsed key.
+         * @returns The public key.
+         */
+        lookup(): Promise<Uint8Array | { keys: Array<key.Key>, err: Array<Error> | null }>;
+    }
+}
+
+export namespace worker {
+    /**
+ * @see module:openpgp.initWorker
+ * @see module:openpgp.getWorker
+ * @see module:openpgp.destroyWorker
+ * @see module:worker/worker
+ */
+    namespace async_proxy {
+        class AsyncProxy {
             /**
-             * Handle random buffer exhaustion by requesting more random bytes from the main window
-             * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+             * Initializes a new proxy and loads the web worker
+             * @param path The path to the worker or 'openpgp.worker.js' by default
+             * @param n number of workers to initialize if path given
+             * @param config config The worker configuration
+             * @param worker alternative to path parameter: web worker initialized with 'openpgp.worker.js'
              */
-            function randomCallback(): Promise<Object>;
+            constructor(path: string, n: number, config: object, worker: any[]);
 
             /**
-             * Set config from main context to worker context.
-             * @param config The openpgp configuration
+             * Message handling
              */
-            function configure(config: object): void;
+            handleMessage(): void;
 
             /**
-             * Seed the library with entropy gathered window.crypto.getRandomValues
-             * as this api is only avalible in the main window.
-             * @param buffer Some random bytes
+             * Get new request ID
+             * @returns New unique request ID
              */
-            function seedRandom(buffer: any[]): void;
+            getID(): Integer;
+
+            /**
+             * Send message to worker with random data
+             * @param size Number of bytes to send
+             */
+            seedRandom(size: Integer): void;
+
+            /**
+             * Terminates the workers
+             */
+            terminate(): void;
 
             /**
              * Generic proxy function that handles all commands from the public api.
-             * @param method The public api function to be delegated to the worker thread
-             * @param options The api function's options
+             * @param method the public api function to be delegated to the worker thread
+             * @param options the api function's options
+             * @returns see the corresponding public api functions for their return types
              */
-            function delegate(method: string, options: object): void;
-
-            /**
-             * Respond to the main window.
-             * @param event Contains event type and data
-             */
-            function response(event: object): void;
+            delegate(method: string, options: object): Promise<any>;
         }
     }
 
-
     /**
-     * Set the path for the web worker script and create an instance of the async proxy
-     * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
-     * @param n number of workers to initialize
-     * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
-     */
-    function initWorker(path: string, n?: number, workers?: any[]): void;
+ * @see module:openpgp.initWorker
+ * @see module:openpgp.getWorker
+ * @see module:openpgp.destroyWorker
+ * @see module:worker/async_proxy
+ */
+    namespace worker {
+        /**
+         * Handle random buffer exhaustion by requesting more random bytes from the main window
+         * @returns Empty Promise<any> whose resolution indicates that the buffer has been refilled
+         */
+        function randomCallback(): Promise<Object>;
 
-    /**
-     * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
-     * @returns the async proxy or null if not initialized
-     */
-    function getWorker(): worker.async_proxy.AsyncProxy | null;
+        /**
+         * Set config from main context to worker context.
+         * @param config The openpgp configuration
+         */
+        function configure(config: object): void;
 
-    /**
-     * Cleanup the current instance of the web worker.
-     */
-    function destroyWorker(): void;
+        /**
+         * Seed the library with entropy gathered window.crypto.getRandomValues
+         * as this api is only avalible in the main window.
+         * @param buffer Some random bytes
+         */
+        function seedRandom(buffer: any[]): void;
 
-    interface UserID {
-        name: string;
-        email: string;
+        /**
+         * Generic proxy function that handles all commands from the public api.
+         * @param method The public api function to be delegated to the worker thread
+         * @param options The api function's options
+         */
+        function delegate(method: string, options: object): void;
+
+        /**
+         * Respond to the main window.
+         * @param event Contains event type and data
+         */
+        function response(event: object): void;
     }
-
-    interface KeyOptions {
-        /**
-         * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-         */
-        userIds: UserID[];
-        /**
-         * (optional) The passphrase used to encrypt the resulting private key
-         */
-        passphrase?: string;
-        /**
-         * (optional) number of bits for RSA keys: 2048 or 4096.
-         */
-        numBits?: number;
-        /**
-         * (optional) The number of seconds after the key creation time that the key expires
-         */
-        keyExpirationTime?: number;
-        /**
-         * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
-         *                                         curve25519, p256, p384, p521, secp256k1,
-         *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
-         */
-        curve?: string;
-        /**
-         * (optional) override the creation date of the key and the key signatures
-         */
-        date?: Date;
-        /**
-         * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
-         *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
-         */
-        subkeys?: { sign: true, passphrase: "string" }[];
-    }
-
-    /**
-     * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
-     * @param options
-     * @returns The generated key object in the form:
-     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
-     */
-    function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
-
-    /**
-     * Reformats signature packets for a key and rewraps key object.
-     * @param privateKey private key to reformat
-     * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-     * @param passphrase (optional) The passphrase used to encrypt the resulting private key
-     * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
-     * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
-     * @returns The generated key object in the form:
-     *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
-     */
-    function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
-
-    /**
-     * Revokes a key. Requires either a private key or a revocation certificate.
-     * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
-     * @param key (optional) public or private key to revoke
-     * @param revocationCertificate (optional) revocation certificate to revoke the key with
-     * @param reasonForRevocation (optional) object indicating the reason for revocation
-     * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
-     * @param reasonForRevocation.string (optional) string explaining the reason for revocation
-     * @returns The revoked key object in the form:
-     *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
-     *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
-     */
-    function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
-        privateKey: key.Key,
-        privateKeyArmored: string,
-        publicKey: key.Key,
-        publicKeyArmored: string
-    } | {
-        publicKey: key.Key,
-        publicKeyArmored: string
-    }>;
-
-    /**
-     * Unlock a private key with your passphrase.
-     * @param privateKey the private key that is to be decrypted
-     * @param passphrase the user's passphrase(s) chosen during key generation
-     * @returns the unlocked key object in the form: { key:Key }
-     */
-    function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
-
-    /**
-     * Lock a private key with your passphrase.
-     * @param privateKey the private key that is to be decrypted
-     * @param passphrase the user's passphrase(s) chosen during key generation
-     * @returns the locked key object in the form: { key:Key }
-     */
-    function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
-
-    interface EncryptOptions {
-        /**
-         * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
-         */
-        message: message.Message;
-        /**
-         * (optional) array of keys or single key, used to encrypt the message
-         */
-        publicKeys?: key.Key | any[];
-        /**
-         * (optional) private keys for signing. If omitted message will not be signed
-         */
-        privateKeys?: key.Key | any[];
-        /**
-         * (optional) array of passwords or a single password to encrypt the message
-         */
-        passwords?: string | any[];
-        /**
-         * (optional) session key in the form: { data:Uint8Array, algorithm:String }
-         */
-        sessionKey?: { data: Uint8Array, algorithm: string };
-        /**
-         * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
-         */
-        compression?: enums.compression;
-        /**
-         * (optional) if the return values should be ascii armored or the message/signature objects
-         */
-        armor?: boolean;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) if the signature should be detached (if true, signature will be added to returned object)
-         */
-        detached?: boolean;
-        /**
-         * (optional) a detached signature to add to the encrypted message
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) if the unencrypted session key should be added to returned object
-         */
-        returnSessionKey?: boolean;
-        /**
-         * (optional) use a key ID of 0 instead of the public key IDs
-         */
-        wildcard?: boolean;
-        /**
-         * (optional) override the creation date of the message signature
-         */
-        date?: Date;
-        /**
-         * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         */
-        fromUserIds?: UserID[];
-        /**
-         * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
-         */
-        toUserIds?: UserID[]
-    }
-
-    interface EncryptResult {
-        data: string | ReadableStream<String>;
-        message: message.Message;
-        signature: string | ReadableStream<String> | signature.Signature;
-        sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
-    }
-
-    /**
-     * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
-     * must be specified. If private keys are specified, those will be used to sign the message.
-     * @param options
-     * @returns Object containing encrypted (and optionally signed) message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          message: Message, (if `armor` was false)
-     *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
-     *          signature: Signature (if `detached` was true and `armor` was false)
-     *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
-     *          }
-     */
-    function encrypt(options: EncryptOptions): Promise<EncryptResult>;
-
-    interface DecryptOptions {
-        /**
-         * the message object with the encrypted data
-         */
-        message: message.Message;
-        /**
-         * (optional) private keys with decrypted secret key data or session key
-         */
-        privateKeys?: key.Key | key.Key[];
-        /**
-         * (optional) passwords to decrypt the message
-         */
-        passwords?: string | string[];
-        /**
-         * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
-         */
-        sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
-        /**
-         * (optional) array of public keys or single key, to verify signatures
-         */
-        publicKeys?: key.Key | key.Key[];
-        /**
-         * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
-         */
-        format?: 'utf8' | 'binary';
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) detached signature for verification
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) use the given date for verification instead of the current time
-         */
-        date?: Date
-    }
-
-    interface DecryptResult {
-        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
-        filename: string,
-        signatures: {
-            keyid: type.keyid.Keyid,
-            verified: Promise<Boolean>,
-            valid: boolean
-        }[]
-    }
-
-    /**
-     * Decrypts a message with the user's private key, a session key or a password. Either a private key,
-     * a session key or a password must be specified.
-     * @param options
-     * @returns Object containing decrypted and verified message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
-     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
-     *          filename: string,
-     *          signatures: [
-     *          {
-     *          keyid: module:type/keyid,
-     *          verified: Promise<Boolean>,
-     *          valid: boolean (if streaming was false)
-     *          }, ...
-     *          ]
-     *          }
-     */
-    function decrypt(options: DecryptOptions): Promise<DecryptResult>;
-
-    interface SignOptions {
-        /**
-         * (cleartext) message to be signed
-         */
-        message: cleartext.CleartextMessage | message.Message;
-        /**
-         * array of keys or single key with decrypted secret key data to sign cleartext
-         */
-        privateKeys: key.Key | any[];
-        /**
-         * (optional) if the return value should be ascii armored or the message object
-         */
-        armor?: boolean;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) if the return value should contain a detached signature
-         */
-        detached?: boolean;
-        /**
-         * (optional) override the creation date of the signature
-         */
-        date?: Date;
-        /**
-         *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
-         */
-        fromUserIds?: UserID[]
-    }
-
-    interface SignResult {
-        data: string | ReadableStream<String> | NodeStream,
-        message: message.Message,
-        signature: string | ReadableStream<String> | NodeStream | signature.Signature
-    }
-
-    /**
-     * Signs a cleartext message.
-     * @param options
-     * @returns Object containing signed message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          message: Message (if `armor` was false)
-     *          }
-     *          Or, if `detached` was true:
-     *          {
-     *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
-     *          signature: Signature (if `armor` was false)
-     *          }
-     */
-    function sign(options: SignOptions): Promise<SignResult>;
-
-    interface VerifyOptions {
-        /**
-         * array of publicKeys or single key, to verify signatures
-         */
-        publicKeys: key.Key | any[];
-        /**
-         * (cleartext) message object with signatures
-         */
-        message: cleartext.CleartextMessage | message.Message;
-        /**
-         * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
-         */
-        streaming?: 'web' | 'node' | false;
-        /**
-         * (optional) detached signature for verification
-         */
-        signature?: signature.Signature;
-        /**
-         * (optional) use the given date for verification instead of the current time
-         */
-        date?: Date
-    }
-
-    interface VerifyResult {
-        data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
-        signatures: {
-            keyid: type.keyid.Keyid,
-            verified: Promise<Boolean>,
-            valid: boolean
-        }[]
-    }
-
-    /**
-     * Verifies signatures of cleartext signed message
-     * @param options
-     * @returns Object containing verified message in the form:
-     *          {
-     *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
-     *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
-     *          signatures: [
-     *          {
-     *          keyid: module:type/keyid,
-     *          verified: Promise<Boolean>,
-     *          valid: boolean (if `streaming` was false)
-     *          }, ...
-     *          ]
-     *          }
-     */
-    function verify(options: VerifyOptions): Promise<VerifyResult>;
-
-    /**
-     * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
-     * or passwords must be specified.
-     * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
-     * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
-     * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
-     * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
-     * @param passwords (optional) passwords for the message
-     * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
-     * @param date (optional) override the date
-     * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
-     * @returns the encrypted session key packets contained in a message object
-     */
-    function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
-
-    /**
-     * Decrypt symmetric session keys with a private key or password. Either a private key or
-     * a password must be specified.
-     * @param message a message object containing the encrypted session key packets
-     * @param privateKeys (optional) private keys with decrypted secret key data
-     * @param passwords (optional) passwords to decrypt the session key
-     * @returns Array of decrypted session key, algorithm pairs in form:
-     *          { data:Uint8Array, algorithm:String }
-     *          or 'undefined' if no key packets found
-     */
-    function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
-
-    /**
-     * Input validation
-     */
-    function checkString(): void;
-
-    /**
-     * Normalize parameter to an array if it is not undefined.
-     * @param param the parameter to be normalized
-     * @returns the resulting array or undefined
-     */
-    function toArray(param: object): any[] | undefined;
-
-    /**
-     * Convert data to or from Stream
-     * @param data the data to convert
-     * @param streaming (optional) whether to return a ReadableStream
-     * @returns the data in the respective format
-     */
-    function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
-
-    /**
-     * Convert object properties from Stream
-     * @param obj the data to convert
-     * @param streaming (optional) whether to return ReadableStreams
-     * @param keys (optional) which keys to return as streams, if possible
-     * @returns the data in the respective format
-     */
-    function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
-
-    /**
-     * Link result.data to the message stream for cancellation.
-     * Also, forward errors in the message to result.data.
-     * @param result the data to convert
-     * @param message message object
-     * @param erroringStream (optional) stream which either errors or gets closed without data
-     * @returns
-     */
-    function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream): object;
-
-    /**
-     * Wait until signature objects have been verified
-     * @param signatures list of signatures
-     */
-    function prepareSignatures(signatures: object): void;
-
-    /**
-     * Global error handler that logs the stack trace and rethrows a high lvl error message.
-     * @param message A human readable high level error Message
-     * @param error The internal error that caused the failure
-     */
-    function onError(message: string, error: Error): void;
-
-    /**
-     * Check for native AEAD support and configuration by the user. Only
-     * browsers that implement the current WebCrypto specification support
-     * native GCM. Native EAX is built on CTR and CBC, which current
-     * browsers support. OCB and CFB are not natively supported.
-     * @returns If authenticated encryption should be used
-     */
-    function nativeAEAD(): boolean;
 }
+
+
+/**
+ * Set the path for the web worker script and create an instance of the async proxy
+ * @param path relative path to the worker scripts, default: 'openpgp.worker.js'
+ * @param n number of workers to initialize
+ * @param workers alternative to path parameter: web workers initialized with 'openpgp.worker.js'
+ */
+export function initWorker(path: string, n?: number, workers?: any[]): void;
+
+/**
+ * Returns a reference to the async proxy if the worker was initialized with openpgp.initWorker()
+ * @returns the async proxy or null if not initialized
+ */
+export function getWorker(): worker.async_proxy.AsyncProxy | null;
+
+/**
+ * Cleanup the current instance of the web worker.
+ */
+export function destroyWorker(): void;
+
+export interface UserID {
+    name: string;
+    email: string;
+}
+
+export interface KeyOptions {
+    /**
+     * array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+     */
+    userIds: UserID[];
+    /**
+     * (optional) The passphrase used to encrypt the resulting private key
+     */
+    passphrase?: string;
+    /**
+     * (optional) number of bits for RSA keys: 2048 or 4096.
+     */
+    numBits?: number;
+    /**
+     * (optional) The number of seconds after the key creation time that the key expires
+     */
+    keyExpirationTime?: number;
+    /**
+     * (optional) elliptic curve for ECC keys: elliptic curve for ECC keys:
+     *                                         curve25519, p256, p384, p521, secp256k1,
+     *                                         brainpoolP256r1, brainpoolP384r1, or brainpoolP512r1.
+     */
+    curve?: string;
+    /**
+     * (optional) override the creation date of the key and the key signatures
+     */
+    date?: Date;
+    /**
+     * (optional) options for each subkey, default to main key options. e.g. [ {sign: true, passphrase: '123'}]
+     *            sign parameter defaults to false, and indicates whether the subkey should sign rather than encrypt
+     */
+    subkeys?: { sign: true, passphrase: "string" }[];
+}
+
+/**
+ * Generates a new OpenPGP key pair. Supports RSA and ECC keys. Primary and subkey will be of same type.
+ * @param options
+ * @returns The generated key object in the form:
+ *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+ */
+export function generateKey(option: KeyOptions): Promise<{ key: key.Key, privateKeyArmored: string, publicKeyArmored: string, revocationCertificate: string }>;
+
+/**
+ * Reformats signature packets for a key and rewraps key object.
+ * @param privateKey private key to reformat
+ * @param userIds array of user IDs e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @param passphrase (optional) The passphrase used to encrypt the resulting private key
+ * @param keyExpirationTime (optional) The number of seconds after the key creation time that the key expires
+ * @param revocationCertificate (optional) Whether the returned object should include a revocation certificate to revoke the public key
+ * @returns The generated key object in the form:
+ *          { key:Key, privateKeyArmored:String, publicKeyArmored:String, revocationCertificate:String }
+ */
+export function reformatKey(privateKey: key.Key, userIds: any[], passphrase?: string, keyExpirationTime?: number, revocationCertificate?: boolean): Promise<Object>;
+
+/**
+ * Revokes a key. Requires either a private key or a revocation certificate.
+ * If a revocation certificate is passed, the reasonForRevocation parameters will be ignored.
+ * @param key (optional) public or private key to revoke
+ * @param revocationCertificate (optional) revocation certificate to revoke the key with
+ * @param reasonForRevocation (optional) object indicating the reason for revocation
+ * @param reasonForRevocation.flag (optional) flag indicating the reason for revocation
+ * @param reasonForRevocation.string (optional) string explaining the reason for revocation
+ * @returns The revoked key object in the form:
+ *          { privateKey:Key, privateKeyArmored:String, publicKey:Key, publicKeyArmored:String }
+ *          (if private key is passed) or { publicKey:Key, publicKeyArmored:String } (otherwise)
+ */
+export function revokeKey(key?: key.Key, revocationCertificate?: string, reasonForRevocation?: revokeKey_reasonForRevocation): Promise<{
+    privateKey: key.Key,
+    privateKeyArmored: string,
+    publicKey: key.Key,
+    publicKeyArmored: string
+} | {
+    publicKey: key.Key,
+    publicKeyArmored: string
+}>;
+
+/**
+ * Unlock a private key with your passphrase.
+ * @param privateKey the private key that is to be decrypted
+ * @param passphrase the user's passphrase(s) chosen during key generation
+ * @returns the unlocked key object in the form: { key:Key }
+ */
+export function decryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+/**
+ * Lock a private key with your passphrase.
+ * @param privateKey the private key that is to be decrypted
+ * @param passphrase the user's passphrase(s) chosen during key generation
+ * @returns the locked key object in the form: { key:Key }
+ */
+export function encryptKey(privateKey: key.Key, passphrase: string | any[]): Promise<{ key: key.Key }>;
+
+export interface EncryptOptions {
+    /**
+     * message to be encrypted as created by openpgp.message.fromText or openpgp.message.fromBinary
+     */
+    message: message.Message;
+    /**
+     * (optional) array of keys or single key, used to encrypt the message
+     */
+    publicKeys?: key.Key | any[];
+    /**
+     * (optional) private keys for signing. If omitted message will not be signed
+     */
+    privateKeys?: key.Key | any[];
+    /**
+     * (optional) array of passwords or a single password to encrypt the message
+     */
+    passwords?: string | any[];
+    /**
+     * (optional) session key in the form: { data:Uint8Array, algorithm:String }
+     */
+    sessionKey?: { data: Uint8Array, algorithm: string };
+    /**
+     * (optional) which compression algorithm to compress the message with, defaults to what is specified in config
+     */
+    compression?: enums.compression;
+    /**
+     * (optional) if the return values should be ascii armored or the message/signature objects
+     */
+    armor?: boolean;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) if the signature should be detached (if true, signature will be added to returned object)
+     */
+    detached?: boolean;
+    /**
+     * (optional) a detached signature to add to the encrypted message
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) if the unencrypted session key should be added to returned object
+     */
+    returnSessionKey?: boolean;
+    /**
+     * (optional) use a key ID of 0 instead of the public key IDs
+     */
+    wildcard?: boolean;
+    /**
+     * (optional) override the creation date of the message signature
+     */
+    date?: Date;
+    /**
+     * (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     */
+    fromUserIds?: UserID[];
+    /**
+     * (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Robert Receiver', email:'robert@openpgp.org' }]
+     */
+    toUserIds?: UserID[]
+}
+
+export interface EncryptResult {
+    data: string | ReadableStream<String>;
+    message: message.Message;
+    signature: string | ReadableStream<String> | signature.Signature;
+    sessionKey: { data: Uint8Array, algorithm: string, aeadAlgorithm: string };
+}
+
+/**
+ * Encrypts message text/data with public keys, passwords or both at once. At least either public keys or passwords
+ * must be specified. If private keys are specified, those will be used to sign the message.
+ * @param options
+ * @returns Object containing encrypted (and optionally signed) message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          message: Message, (if `armor` was false)
+ *          signature: string|ReadableStream<String>|NodeStream, (if `detached` was true and `armor` was true)
+ *          signature: Signature (if `detached` was true and `armor` was false)
+ *          sessionKey: { data, algorithm, aeadAlgorithm } (if `returnSessionKey` was true)
+ *          }
+ */
+export function encrypt(options: EncryptOptions): Promise<EncryptResult>;
+
+export interface DecryptOptions {
+    /**
+     * the message object with the encrypted data
+     */
+    message: message.Message;
+    /**
+     * (optional) private keys with decrypted secret key data or session key
+     */
+    privateKeys?: key.Key | key.Key[];
+    /**
+     * (optional) passwords to decrypt the message
+     */
+    passwords?: string | string[];
+    /**
+     * (optional) session keys in the form: { data:Uint8Array, algorithm:String }
+     */
+    sessionKeys?: { data: Uint8Array, algorithm: string } | { data: Uint8Array, algorithm: string }[];
+    /**
+     * (optional) array of public keys or single key, to verify signatures
+     */
+    publicKeys?: key.Key | key.Key[];
+    /**
+     * (optional) whether to return data as a string(Stream) or Uint8Array(Stream). If 'utf8' (the default), also normalize newlines.
+     */
+    format?: 'utf8' | 'binary';
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) detached signature for verification
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) use the given date for verification instead of the current time
+     */
+    date?: Date
+}
+
+export interface DecryptResult {
+    data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array>,
+    filename: string,
+    signatures: {
+        keyid: type.keyid.Keyid,
+        verified: Promise<Boolean>,
+        valid: boolean
+    }[]
+}
+
+/**
+ * Decrypts a message with the user's private key, a session key or a password. Either a private key,
+ * a session key or a password must be specified.
+ * @param options
+ * @returns Object containing decrypted and verified message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if format was 'utf8', the default)
+ *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if format was 'binary')
+ *          filename: string,
+ *          signatures: [
+ *          {
+ *          keyid: module:type/keyid,
+ *          verified: Promise<Boolean>,
+ *          valid: boolean (if streaming was false)
+ *          }, ...
+ *          ]
+ *          }
+ */
+export function decrypt(options: DecryptOptions): Promise<DecryptResult>;
+
+export interface SignOptions {
+    /**
+     * (cleartext) message to be signed
+     */
+    message: cleartext.CleartextMessage | message.Message;
+    /**
+     * array of keys or single key with decrypted secret key data to sign cleartext
+     */
+    privateKeys: key.Key | any[];
+    /**
+     * (optional) if the return value should be ascii armored or the message object
+     */
+    armor?: boolean;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) if the return value should contain a detached signature
+     */
+    detached?: boolean;
+    /**
+     * (optional) override the creation date of the signature
+     */
+    date?: Date;
+    /**
+     *  (optional) array of user IDs to sign with, one per key in `privateKeys`, e.g. [ { name:'Steve Sender', email:'steve@openpgp.org' }]
+     */
+    fromUserIds?: UserID[]
+}
+
+export interface SignResult {
+    data: string | ReadableStream<String> | NodeStream,
+    message: message.Message,
+    signature: string | ReadableStream<String> | NodeStream | signature.Signature
+}
+
+/**
+ * Signs a cleartext message.
+ * @param options
+ * @returns Object containing signed message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          message: Message (if `armor` was false)
+ *          }
+ *          Or, if `detached` was true:
+ *          {
+ *          signature: string|ReadableStream<String>|NodeStream, (if `armor` was true, the default)
+ *          signature: Signature (if `armor` was false)
+ *          }
+ */
+export function sign(options: SignOptions): Promise<SignResult>;
+
+export interface VerifyOptions {
+    /**
+     * array of publicKeys or single key, to verify signatures
+     */
+    publicKeys: key.Key | any[];
+    /**
+     * (cleartext) message object with signatures
+     */
+    message: cleartext.CleartextMessage | message.Message;
+    /**
+     * (optional) whether to return data as a stream. Defaults to the type of stream `message` was created from, if any.
+     */
+    streaming?: 'web' | 'node' | false;
+    /**
+     * (optional) detached signature for verification
+     */
+    signature?: signature.Signature;
+    /**
+     * (optional) use the given date for verification instead of the current time
+     */
+    date?: Date
+}
+
+export interface VerifyResult {
+    data: string | ReadableStream<String> | NodeStream | Uint8Array | ReadableStream<Uint8Array> | NodeStream,
+    signatures: {
+        keyid: type.keyid.Keyid,
+        verified: Promise<Boolean>,
+        valid: boolean
+    }[]
+}
+
+/**
+ * Verifies signatures of cleartext signed message
+ * @param options
+ * @returns Object containing verified message in the form:
+ *          {
+ *          data: string|ReadableStream<String>|NodeStream, (if `message` was a CleartextMessage)
+ *          data: Uint8Array|ReadableStream<Uint8Array>|NodeStream, (if `message` was a Message)
+ *          signatures: [
+ *          {
+ *          keyid: module:type/keyid,
+ *          verified: Promise<Boolean>,
+ *          valid: boolean (if `streaming` was false)
+ *          }, ...
+ *          ]
+ *          }
+ */
+export function verify(options: VerifyOptions): Promise<VerifyResult>;
+
+/**
+ * Encrypt a symmetric session key with public keys, passwords, or both at once. At least either public keys
+ * or passwords must be specified.
+ * @param data the session key to be encrypted e.g. 16 random bytes (for aes128)
+ * @param algorithm algorithm of the symmetric session key e.g. 'aes128' or 'aes256'
+ * @param aeadAlgorithm (optional) aead algorithm, e.g. 'eax' or 'ocb'
+ * @param publicKeys (optional) array of public keys or single key, used to encrypt the key
+ * @param passwords (optional) passwords for the message
+ * @param wildcard (optional) use a key ID of 0 instead of the public key IDs
+ * @param date (optional) override the date
+ * @param toUserIds (optional) array of user IDs to encrypt for, one per key in `publicKeys`, e.g. [ { name:'Phil Zimmermann', email:'phil@openpgp.org' }]
+ * @returns the encrypted session key packets contained in a message object
+ */
+export function encryptSessionKey(data: Uint8Array, algorithm: string, aeadAlgorithm?: string, publicKeys?: key.Key | key.Key[], passwords?: string | string[], wildcard?: boolean, date?: Date, toUserIds?: any[]): Promise<message.Message>;
+
+/**
+ * Decrypt symmetric session keys with a private key or password. Either a private key or
+ * a password must be specified.
+ * @param message a message object containing the encrypted session key packets
+ * @param privateKeys (optional) private keys with decrypted secret key data
+ * @param passwords (optional) passwords to decrypt the session key
+ * @returns Array of decrypted session key, algorithm pairs in form:
+ *          { data:Uint8Array, algorithm:String }
+ *          or 'undefined' if no key packets found
+ */
+export function decryptSessionKeys(message: message.Message, privateKeys?: key.Key | key.Key[], passwords?: string | string[]): Promise<{ data: Uint8Array, algorithm: string }[] | undefined>;
+
+/**
+ * Input validation
+ */
+export function checkString(): void;
+
+/**
+ * Normalize parameter to an array if it is not undefined.
+ * @param param the parameter to be normalized
+ * @returns the resulting array or undefined
+ */
+export function toArray(param: object): any[] | undefined;
+
+/**
+ * Convert data to or from Stream
+ * @param data the data to convert
+ * @param streaming (optional) whether to return a ReadableStream
+ * @returns the data in the respective format
+ */
+export function convertStream(data: object, streaming?: 'web' | 'node' | false): object;
+
+/**
+ * Convert object properties from Stream
+ * @param obj the data to convert
+ * @param streaming (optional) whether to return ReadableStreams
+ * @param keys (optional) which keys to return as streams, if possible
+ * @returns the data in the respective format
+ */
+export function convertStreams(obj: object, streaming: 'web' | 'node' | false, keys: any[]): object;
+
+/**
+ * Link result.data to the message stream for cancellation.
+ * Also, forward errors in the message to result.data.
+ * @param result the data to convert
+ * @param message message object
+ * @param erroringStream (optional) stream which either errors or gets closed without data
+ * @returns
+ */
+export function linkStreams(result: object, message: message.Message, erroringStream: ReadableStream): object;
+
+/**
+ * Wait until signature objects have been verified
+ * @param signatures list of signatures
+ */
+export function prepareSignatures(signatures: object): void;
+
+/**
+ * Global error handler that logs the stack trace and rethrows a high lvl error message.
+ * @param message A human readable high level error Message
+ * @param error The internal error that caused the failure
+ */
+export function onError(message: string, error: Error): void;
+
+/**
+ * Check for native AEAD support and configuration by the user. Only
+ * browsers that implement the current WebCrypto specification support
+ * native GCM. Native EAX is built on CTR and CBC, which current
+ * browsers support. OCB and CFB are not natively supported.
+ * @returns If authenticated encryption should be used
+ */
+export function nativeAEAD(): boolean;
diff --git a/types/openpgp/ts3.2/openpgp-tests.ts b/types/openpgp/ts3.2/openpgp-tests.ts
index fc3efeeda0..62e580fd4b 100644
--- a/types/openpgp/ts3.2/openpgp-tests.ts
+++ b/types/openpgp/ts3.2/openpgp-tests.ts
@@ -1,4 +1,4 @@
-import { openpgp } from "openpgp";
+import openpgp from "openpgp";
 
 // Open PGP Sample codes
 

From 7dc49fe63c4d2615d8788566a41a8efacd7740b5 Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Thu, 21 Mar 2019 05:54:46 +0300
Subject: [PATCH 830/924] delete unnecessary newlines

---
 types/pako/index.d.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index 26cc24a25c..9a51f87c39 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -121,28 +121,20 @@ export function ungzip(data: Data, options?: InflateFunctionOptions): Uint8Array
 
 export class Deflate {
     constructor(options?: DeflateOptions);
-
     err: ReturnCodes;
     msg: string;
     result: Uint8Array | number[];
-
     onData(chunk: Data): void;
-
     onEnd(status: number): void;
-
     push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
 }
 
 export class Inflate {
     constructor(options?: InflateOptions);
-
     err: ReturnCodes;
     msg: string;
     result: Data;
-
     onData(chunk: Data): void;
-
     onEnd(status: number): void;
-
     push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
 }

From d34d93bb572363cd479496bd48ab9ac15e67e19f Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Thu, 21 Mar 2019 06:22:29 +0300
Subject: [PATCH 831/924] with namespace

---
 types/pako/index.d.ts  | 269 +++++++++++++++++++++--------------------
 types/pako/tslint.json |   2 +-
 2 files changed, 138 insertions(+), 133 deletions(-)

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index 9a51f87c39..69c4feaf01 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -5,136 +5,141 @@
 //                 Muhammet Öztürk <https://github.com/hlthi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export enum FlushValues {
-    Z_NO_FLUSH = 0,
-    Z_PARTIAL_FLUSH = 1,
-    Z_SYNC_FLUSH = 2,
-    Z_FULL_FLUSH = 3,
-    Z_FINISH = 4,
-    Z_BLOCK = 5,
-    Z_TREES = 6,
-}
-
-export enum StrategyValues {
-    Z_FILTERED = 1,
-    Z_HUFFMAN_ONLY = 2,
-    Z_RLE = 3,
-    Z_FIXED = 4,
-    Z_DEFAULT_STRATEGY = 0,
-}
-
-export enum ReturnCodes {
-    Z_OK = 0,
-    Z_STREAM_END = 1,
-    Z_NEED_DICT = 2,
-    Z_ERRNO = -1,
-    Z_STREAM_ERROR = -2,
-    Z_DATA_ERROR = -3,
-    Z_BUF_ERROR = -5,
-}
-
-export interface DeflateOptions {
-    level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-    windowBits?: number;
-    memLevel?: number;
-    strategy?: StrategyValues;
-    dictionary?: any;
-    raw?: boolean;
-    to?: 'string';
-    chunkSize?: number;
-    gzip?: boolean;
-    header?: Header;
-}
-
-export interface DeflateFunctionOptions {
-    level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-    windowBits?: number;
-    memLevel?: number;
-    strategy?: StrategyValues;
-    dictionary?: any;
-    raw?: boolean;
-    to?: 'string';
-}
-
-export interface InflateOptions {
-    windowBits?: number;
-    dictionary?: any;
-    raw?: boolean;
-    to?: 'string';
-    chunkSize?: number;
-}
-
-export interface InflateFunctionOptions {
-    windowBits?: number;
-    raw?: boolean;
-    to?: 'string';
-}
-
-export interface Header {
-    text?: boolean;
-    time?: number;
-    os?: number;
-    extra?: number[];
-    name?: string;
-    comment?: string;
-    hcrc?: boolean;
-}
-
-export type Data = Uint8Array | number[] | string;
-
-/**
- * Compress data with deflate algorithm and options.
- */
-export function deflate(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
-export function deflate(data: Data, options?: DeflateFunctionOptions): Uint8Array;
-
-/**
- * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
- */
-export function deflateRaw(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
-export function deflateRaw(data: Data, options?: DeflateFunctionOptions): Uint8Array;
-
-/**
- * The same as deflate, but create gzip wrapper instead of deflate one.
- */
-export function gzip(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
-export function gzip(data: Data, options?: DeflateFunctionOptions): Uint8Array;
-
-/**
- * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
- * by default. That's why we don't provide separate ungzip method.
- */
-export function inflate(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
-export function inflate(data: Data, options?: InflateFunctionOptions): Uint8Array;
-
-/**
- * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
- */
-export function inflateRaw(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
-export function inflateRaw(data: Data, options?: InflateFunctionOptions): Uint8Array;
-
-/**
- * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
- */
-export function ungzip(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
-export function ungzip(data: Data, options?: InflateFunctionOptions): Uint8Array;
-
-export class Deflate {
-    constructor(options?: DeflateOptions);
-    err: ReturnCodes;
-    msg: string;
-    result: Uint8Array | number[];
-    onData(chunk: Data): void;
-    onEnd(status: number): void;
-    push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
-}
-
-export class Inflate {
-    constructor(options?: InflateOptions);
-    err: ReturnCodes;
-    msg: string;
-    result: Data;
-    onData(chunk: Data): void;
-    onEnd(status: number): void;
-    push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
+export = Pako;
+export as namespace pako;
+
+declare namespace Pako {
+    enum FlushValues {
+        Z_NO_FLUSH = 0,
+        Z_PARTIAL_FLUSH = 1,
+        Z_SYNC_FLUSH = 2,
+        Z_FULL_FLUSH = 3,
+        Z_FINISH = 4,
+        Z_BLOCK = 5,
+        Z_TREES = 6,
+    }
+
+    enum StrategyValues {
+        Z_FILTERED = 1,
+        Z_HUFFMAN_ONLY = 2,
+        Z_RLE = 3,
+        Z_FIXED = 4,
+        Z_DEFAULT_STRATEGY = 0,
+    }
+
+    enum ReturnCodes {
+        Z_OK = 0,
+        Z_STREAM_END = 1,
+        Z_NEED_DICT = 2,
+        Z_ERRNO = -1,
+        Z_STREAM_ERROR = -2,
+        Z_DATA_ERROR = -3,
+        Z_BUF_ERROR = -5,
+    }
+
+    interface DeflateOptions {
+        level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+        windowBits?: number;
+        memLevel?: number;
+        strategy?: StrategyValues;
+        dictionary?: any;
+        raw?: boolean;
+        to?: 'string';
+        chunkSize?: number;
+        gzip?: boolean;
+        header?: Header;
+    }
+
+    interface DeflateFunctionOptions {
+        level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+        windowBits?: number;
+        memLevel?: number;
+        strategy?: StrategyValues;
+        dictionary?: any;
+        raw?: boolean;
+        to?: 'string';
+    }
+
+    interface InflateOptions {
+        windowBits?: number;
+        dictionary?: any;
+        raw?: boolean;
+        to?: 'string';
+        chunkSize?: number;
+    }
+
+    interface InflateFunctionOptions {
+        windowBits?: number;
+        raw?: boolean;
+        to?: 'string';
+    }
+
+    interface Header {
+        text?: boolean;
+        time?: number;
+        os?: number;
+        extra?: number[];
+        name?: string;
+        comment?: string;
+        hcrc?: boolean;
+    }
+
+    type Data = Uint8Array | number[] | string;
+
+    /**
+     * Compress data with deflate algorithm and options.
+     */
+    function deflate(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+    function deflate(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+    /**
+     * The same as deflate, but creates raw data, without wrapper (header and adler32 crc).
+     */
+    function deflateRaw(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+    function deflateRaw(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+    /**
+     * The same as deflate, but create gzip wrapper instead of deflate one.
+     */
+    function gzip(data: Data, options: DeflateFunctionOptions & { to: 'string' }): string;
+    function gzip(data: Data, options?: DeflateFunctionOptions): Uint8Array;
+
+    /**
+     * Decompress data with inflate/ungzip and options. Autodetect format via wrapper header
+     * by default. That's why we don't provide separate ungzip method.
+     */
+    function inflate(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+    function inflate(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+    /**
+     * The same as inflate, but creates raw data, without wrapper (header and adler32 crc).
+     */
+    function inflateRaw(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+    function inflateRaw(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+    /**
+     * Just shortcut to inflate, because it autodetects format by header.content. Done for convenience.
+     */
+    function ungzip(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
+    function ungzip(data: Data, options?: InflateFunctionOptions): Uint8Array;
+
+    class Deflate {
+        constructor(options?: DeflateOptions);
+        err: ReturnCodes;
+        msg: string;
+        result: Uint8Array | number[];
+        onData(chunk: Data): void;
+        onEnd(status: number): void;
+        push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
+    }
+
+    class Inflate {
+        constructor(options?: InflateOptions);
+        err: ReturnCodes;
+        msg: string;
+        result: Data;
+        onData(chunk: Data): void;
+        onEnd(status: number): void;
+        push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
+    }
 }
diff --git a/types/pako/tslint.json b/types/pako/tslint.json
index 2ff396e742..adaee1b55f 100644
--- a/types/pako/tslint.json
+++ b/types/pako/tslint.json
@@ -1,6 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-
+        "export-just-namespace": false
     }
 }

From e3e77eb0cdfa0286a4e2acbc0c279972b2b5eaf5 Mon Sep 17 00:00:00 2001
From: Ziyu Wang <odduid@gmail.com>
Date: Thu, 21 Mar 2019 16:22:26 +1100
Subject: [PATCH 832/924] rename ReduxReducer

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

diff --git a/types/redux-actions/index.d.ts b/types/redux-actions/index.d.ts
index f0654eab08..fd92441573 100644
--- a/types/redux-actions/index.d.ts
+++ b/types/redux-actions/index.d.ts
@@ -67,9 +67,9 @@ export type Reducer<State, Payload> = (state: State, action: Action<Payload>) =>
 
 export type ReducerMeta<State, Payload, Meta> = (state: State, action: ActionMeta<Payload, Meta>) => State;
 
-export type ReduxReducer<State, Payload> = (state: State | undefined, action: Action<Payload>) => State;
+export type ReduxCompatibleReducer<State, Payload> = (state: State | undefined, action: Action<Payload>) => State;
 
-export type ReduxReducerMeta<State, Payload, Meta> = (state: State | undefined, action: ActionMeta<Payload, Meta>) => State;
+export type ReduxCompatibleReducerMeta<State, Payload, Meta> = (state: State | undefined, action: ActionMeta<Payload, Meta>) => State;
 
 /** argument inferring borrowed from lodash definitions */
 export type ActionFunction0<R> = () => R;
@@ -153,13 +153,13 @@ export function handleAction<State, Payload>(
     actionType: string | ActionFunctions<Payload> | CombinedActionType,
     reducer: Reducer<State, Payload> | ReducerNextThrow<State, Payload>,
     initialState: State
-): ReduxReducer<State, Payload>;
+): ReduxCompatibleReducer<State, Payload>;
 
 export function handleAction<State, Payload, Meta>(
     actionType: string | ActionWithMetaFunctions<Payload, Meta> | CombinedActionType,
     reducer: ReducerMeta<State, Payload, Meta> | ReducerNextThrowMeta<State, Payload, Meta>,
     initialState: State
-): ReduxReducerMeta<State, Payload, Meta>;
+): ReduxCompatibleReducerMeta<State, Payload, Meta>;
 
 export interface Options {
     prefix?: string;
@@ -170,19 +170,19 @@ export function handleActions<StateAndPayload>(
     reducerMap: ReducerMap<StateAndPayload, StateAndPayload>,
     initialState: StateAndPayload,
     options?: Options
-): ReduxReducer<StateAndPayload, StateAndPayload>;
+): ReduxCompatibleReducer<StateAndPayload, StateAndPayload>;
 
 export function handleActions<State, Payload>(
     reducerMap: ReducerMap<State, Payload>,
     initialState: State,
     options?: Options
-): ReduxReducer<State, Payload>;
+): ReduxCompatibleReducer<State, Payload>;
 
 export function handleActions<State, Payload, Meta>(
     reducerMap: ReducerMapMeta<State, Payload, Meta>,
     initialState: State,
     options?: Options
-): ReduxReducerMeta<State, Payload, Meta>;
+): ReduxCompatibleReducerMeta<State, Payload, Meta>;
 
 // https://github.com/redux-utilities/redux-actions/blob/v2.3.0/src/combineActions.js#L21
 export function combineActions(...actionTypes: Array<ActionFunctions<any> | string | symbol>): CombinedActionType;

From 99658451404bd2558817acfa469500632120ffbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miika=20H=C3=A4nninen?= <miika.hanninen@reaktor.com>
Date: Tue, 12 Mar 2019 10:08:36 +0200
Subject: [PATCH 833/924] (ramda) Fix traverse types in the all-arrays case

The traverse function is not properly typeable at this moment since we lack
higher-kinded types. Specific cases are doable though, like the array-array
case I've typed here. Users can add their own specific cases in their own
typings, to extend this.
---
 types/ramda/index.d.ts     | 6 +++---
 types/ramda/ramda-tests.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 917715c3e7..1078d9a51a 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -2686,9 +2686,9 @@ declare namespace R {
          * sequence to transform the resulting Traversable of Applicative into
          * an Applicative of Traversable.
          */
-        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U, list: ReadonlyArray<T>): A;
-        traverse<T, U, A>(of: (a: U[]) => A, fn: (t: T) => U): (list: ReadonlyArray<T>) => A;
-        traverse<T, U, A>(of: (a: U[]) => A): (fn: (t: T) => U, list: ReadonlyArray<T>) => A;
+        traverse<A, B>(of: (a: B) => ReadonlyArray<B>, fn: (t: A) => ReadonlyArray<B>, list: ReadonlyArray<A>): B[][];
+        traverse<A, B>(of: (a: B) => ReadonlyArray<B>, fn: (t: A) => ReadonlyArray<B>): (list: ReadonlyArray<A>) => B[][];
+        traverse<A, B>(of: (a: B) => ReadonlyArray<B>): (fn: (t: A) => ReadonlyArray<B>, list: ReadonlyArray<A>) => B[][];
 
         /**
          * Removes (strips) whitespace from both ends of the string.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 2d8b00ba6a..6f88d82200 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1460,7 +1460,7 @@ type Pair = KeyValuePair<string, number>;
     const list = [1, 2, 3];
     R.traverse(of, fn, list);
     R.traverse(of, fn)(list);
-    R.traverse<number, number[], {}>(of)(fn, list);
+    R.traverse<number, number>(of)(fn, list);
 };
 
 () => {

From 8d9d42cfe6432a959afb471562cca05cf0d471a9 Mon Sep 17 00:00:00 2001
From: Konrad Klockgether <k.klockgether@28apps.de>
Date: Thu, 21 Mar 2019 10:40:30 +0100
Subject: [PATCH 834/924] [polygons-intersect] created types

---
 types/polygons-intersect/index.d.ts           | 14 +++++++++++
 .../polygons-intersect-tests.ts               |  5 ++++
 types/polygons-intersect/tsconfig.json        | 23 +++++++++++++++++++
 types/polygons-intersect/tslint.json          |  1 +
 4 files changed, 43 insertions(+)
 create mode 100644 types/polygons-intersect/index.d.ts
 create mode 100644 types/polygons-intersect/polygons-intersect-tests.ts
 create mode 100644 types/polygons-intersect/tsconfig.json
 create mode 100644 types/polygons-intersect/tslint.json

diff --git a/types/polygons-intersect/index.d.ts b/types/polygons-intersect/index.d.ts
new file mode 100644
index 0000000000..87fd174e69
--- /dev/null
+++ b/types/polygons-intersect/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for polygons-intersect 1.0
+// Project: https://github.com/DudaGod/polygons-intersect#readme
+// Definitions by: Konrad Klockgether <https://github.com/Nielio>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Finds all points where the polygons intersect each other.
+ */
+declare function intersection(
+    poly1: Array<{ x: number, y: number }>,
+    poly2: Array<{ x: number, y: number }>
+): Array<{ x: number, y: number }>;
+
+export = intersection;
diff --git a/types/polygons-intersect/polygons-intersect-tests.ts b/types/polygons-intersect/polygons-intersect-tests.ts
new file mode 100644
index 0000000000..104c93c788
--- /dev/null
+++ b/types/polygons-intersect/polygons-intersect-tests.ts
@@ -0,0 +1,5 @@
+import polygonsIntersect = require('polygons-intersect');
+
+const poly1 = [{x: 10, y: 10}, {x: 10, y: 30}, {x: 30, y: 30}, {x: 30, y: 10}];
+const poly2 = [{x: 20, y: 20}, {x: 20, y: 40}, {x: 40, y: 40}, {x: 40, y: 20}];
+polygonsIntersect(poly1, poly2);
diff --git a/types/polygons-intersect/tsconfig.json b/types/polygons-intersect/tsconfig.json
new file mode 100644
index 0000000000..20c8856f07
--- /dev/null
+++ b/types/polygons-intersect/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "polygons-intersect-tests.ts"
+    ]
+}
diff --git a/types/polygons-intersect/tslint.json b/types/polygons-intersect/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/polygons-intersect/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4cdeff6bd611ff5cfdd428c84592d950813bf30e Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 11:22:56 +0000
Subject: [PATCH 835/924] added the correct GitHub repo on the header of the
 "child-process-promise"'s definition file

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

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index 2740c8e197..ddc627ae9a 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -1,12 +1,11 @@
 // Type definitions for child-process-promise 2.2.1
-// Project: https://github.com/TheDSCPL/types_child-process-promise
+// Project: https://github.com/patrick-steele-idem/child-process-promise
 // Definitions by: Luis Paulo <https://github.com/TheDSCPL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3.3
 
 /// <reference types="node" />
 
-// import child_process = require('child_process');
 import {
     ChildProcess,
     ExecFileOptionsWithBufferEncoding, ExecFileOptionsWithOtherEncoding,
@@ -111,3 +110,4 @@ declare namespace cpp {
         options?: Readonly<Options & ForkOptions>
     ): ChildProcessPromise<SpawnPromiseResult>;
 }
+

From 972c8c30322b2fb367dc147cfe40749b3c06eb4f Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 11:30:22 +0000
Subject: [PATCH 836/924] removed TypeScript version from the header of the
 "child-process-promise"'s definition file

---
 types/child-process-promise/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index ddc627ae9a..ac0e06a6a8 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/patrick-steele-idem/child-process-promise
 // Definitions by: Luis Paulo <https://github.com/TheDSCPL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.3.3
 
 /// <reference types="node" />
 

From 7ca55fe3788d79cb863934bfd1c5677a59a89283 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 11:44:03 +0000
Subject: [PATCH 837/924] added "strictFunctionTypes" to
 "child-process-promise"'s tsconfig

---
 types/child-process-promise/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/child-process-promise/tsconfig.json b/types/child-process-promise/tsconfig.json
index 0f3bf72033..b0f60c39eb 100644
--- a/types/child-process-promise/tsconfig.json
+++ b/types/child-process-promise/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 623762f7ad6a00687ba58bbdd26f69242ea18555 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 12:00:00 +0000
Subject: [PATCH 838/924] implemented several of the fixes suggested by the
 travic bot on "child-process-promise"'s definition file

---
 types/child-process-promise/index.d.ts | 176 ++++++++++++-------------
 1 file changed, 86 insertions(+), 90 deletions(-)

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index ac0e06a6a8..533d00c4ea 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/patrick-steele-idem/child-process-promise
 // Definitions by: Luis Paulo <https://github.com/TheDSCPL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.0
 
 /// <reference types="node" />
 
@@ -14,99 +15,94 @@ import {
     SpawnOptions
 } from 'child_process';
 
-export = cpp;
-export as namespace cpp;
-
 /**
  * Simple wrapper around the child_process module that makes use of promises
  */
-declare namespace cpp {
-    interface PromiseResult<Enc extends string|Buffer> {
-        childProcess: ChildProcess,
-        stdout: Enc,
-        stderr: Enc
-    }
 
-    interface SpawnPromiseResult extends PromiseResult<string> {
-        code: number
-    }
-
-    interface ChildProcessPromise<T> extends Promise<T> {
-        childProcess: ChildProcess
-    }
-
-    export interface Options {
-        /**
-         * Pass an additional capture option to buffer the result of stdout and/or stderr
-         * Default: []
-         */
-        capture?: []|['stdout']|['stderr']|['stdout'|'stderr']|['stderr'|'stdout'],
-        /**
-         * Array of the numbers that should be interpreted as successful execution codes
-         * Default: [0]
-         */
-        successfulExitCodes?: number[]
-    }
-
-    export function  exec(
-        command: Readonly<string>,
-        options: Readonly<Options & { encoding: "buffer" | null } & ExecOptions>
-    ): ChildProcessPromise<PromiseResult<Buffer>>;
-    export function  exec(
-        command: Readonly<string>,
-        options: Readonly<Options & { encoding?: BufferEncoding } & ExecOptions>
-    ): ChildProcessPromise<PromiseResult<string>>;
-    export function  exec(
-        command: Readonly<string>,
-        options: Readonly<Options & { encoding?: string } & ExecOptions>
-    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
-    export function  exec(
-        command: Readonly<string>,
-        options?: Readonly<Options & ExecOptions>
-    ): ChildProcessPromise<PromiseResult<string>>;
-
-    export function  execFile(
-        file: Readonly<string>,
-        options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
-    ): ChildProcessPromise<PromiseResult<Buffer>>;
-    export function  execFile(
-        file: Readonly<string>,
-        args: ReadonlyArray<string> | null,
-        options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
-    ): ChildProcessPromise<PromiseResult<Buffer>>;
-    export function  execFile(
-        file: Readonly<string>,
-        options: Readonly<Options & ExecFileOptionsWithStringEncoding>
-    ): ChildProcessPromise<PromiseResult<string>>;
-    export function  execFile(
-        file: Readonly<string>,
-        args: ReadonlyArray<string> | null,
-        options: Readonly<Options & ExecFileOptionsWithStringEncoding>
-    ): ChildProcessPromise<PromiseResult<string>>;
-    export function  execFile(
-        file: Readonly<string>,
-        options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
-    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
-    export function  execFile(
-        file: Readonly<string>,
-        args: ReadonlyArray<string> | null,
-        options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
-    ): ChildProcessPromise<PromiseResult<string | Buffer>>;
-    export function  execFile(
-        file: Readonly<string>,
-        args?: ReadonlyArray<string> | null
-    ): ChildProcessPromise<PromiseResult<string>>;
-
-    export function  spawn(
-        command: Readonly<string>,
-        args?: ReadonlyArray<string> | null,
-        options?: Readonly<Options & SpawnOptions>
-    ): ChildProcessPromise<SpawnPromiseResult>;
-
-    export function fork(
-        modulePath: string,
-        args?: ReadonlyArray<string>,
-        options?: Readonly<Options & ForkOptions>
-    ): ChildProcessPromise<SpawnPromiseResult>;
+interface PromiseResult<Enc extends string|Buffer> {
+    childProcess: ChildProcess;
+    stdout: Enc;
+    stderr: Enc;
 }
 
+interface SpawnPromiseResult extends PromiseResult<string> {
+    code: number;
+}
+
+interface ChildProcessPromise<T> extends Promise<T> {
+    childProcess: ChildProcess;
+}
+
+export interface Options {
+    /**
+     * Pass an additional capture option to buffer the result of stdout and/or stderr
+     * Default: []
+     */
+    capture?: []|['stdout']|['stderr']|['stdout'|'stderr']|['stderr'|'stdout'];
+    /**
+     * Array of the numbers that should be interpreted as successful execution codes
+     * Default: [0]
+     */
+    successfulExitCodes?: number[];
+}
+
+export function  exec(
+    command: Readonly<string>,
+    options: Readonly<Options & { encoding: "buffer" | null } & ExecOptions>
+): ChildProcessPromise<PromiseResult<Buffer>>;
+export function  exec(
+    command: Readonly<string>,
+    options: Readonly<Options & { encoding?: BufferEncoding } & ExecOptions>
+): ChildProcessPromise<PromiseResult<string>>;
+export function  exec(
+    command: Readonly<string>,
+    options: Readonly<Options & { encoding?: string } & ExecOptions>
+): ChildProcessPromise<PromiseResult<string | Buffer>>;
+export function  exec(
+    command: Readonly<string>,
+    options?: Readonly<Options & ExecOptions>
+): ChildProcessPromise<PromiseResult<string>>;
+
+export function  execFile(
+    file: Readonly<string>,
+    options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
+): ChildProcessPromise<PromiseResult<Buffer>>;
+export function  execFile(
+    file: Readonly<string>,
+    args: ReadonlyArray<string> | null,
+    options: Readonly<Options & ExecFileOptionsWithBufferEncoding>
+): ChildProcessPromise<PromiseResult<Buffer>>;
+export function  execFile(
+    file: Readonly<string>,
+    options: Readonly<Options & ExecFileOptionsWithStringEncoding>
+): ChildProcessPromise<PromiseResult<string>>;
+export function  execFile(
+    file: Readonly<string>,
+    args: ReadonlyArray<string> | null,
+    options: Readonly<Options & ExecFileOptionsWithStringEncoding>
+): ChildProcessPromise<PromiseResult<string>>;
+export function  execFile(
+    file: Readonly<string>,
+    options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
+): ChildProcessPromise<PromiseResult<string | Buffer>>;
+export function  execFile(
+    file: Readonly<string>,
+    args: ReadonlyArray<string> | null,
+    options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
+): ChildProcessPromise<PromiseResult<string | Buffer>>;
+export function  execFile(
+    file: Readonly<string>,
+    args?: ReadonlyArray<string> | null
+): ChildProcessPromise<PromiseResult<string>>;
+
+export function  spawn(
+    command: Readonly<string>,
+    args?: ReadonlyArray<string> | null,
+    options?: Readonly<Options & SpawnOptions>
+): ChildProcessPromise<SpawnPromiseResult>;
+
+export function fork(
+    modulePath: string,
+    args?: ReadonlyArray<string>,
+    options?: Readonly<Options & ForkOptions>
+): ChildProcessPromise<SpawnPromiseResult>;
\ No newline at end of file

From 91b6d10a9d27e0ec686b722cec8acb1906ba1a72 Mon Sep 17 00:00:00 2001
From: Fabio Berta <fnberta@gmail.com>
Date: Thu, 21 Mar 2019 13:02:10 +0100
Subject: [PATCH 839/924] add geolocate control

---
 types/react-map-gl/index.d.ts             | 12 ++++++++++++
 types/react-map-gl/react-map-gl-tests.tsx |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 23b723a594..e0b25765de 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -317,6 +317,18 @@ export interface FullscreenControlProps extends BaseControlProps {
 
 export class FullscreenControl extends BaseControl<FullscreenControlProps> {}
 
+export interface GeolocateControlProps extends BaseControlProps {
+    className?: string;
+    positionOptions?: MapboxGL.PositionOptions;
+    fitBoundsOptions?: MapboxGL.FitBoundsOptions;
+    trackUserLocation?: boolean;
+    showUserLocation?: boolean;
+    onViewStateChange?: (info: ViewStateChangeInfo) => void;
+    onViewportChange?: (viewState: ViewState) => void;
+}
+
+export class GeolocateControl extends BaseControl<GeolocateControlProps> {}
+
 export interface DraggableControlProps extends BaseControlProps {
     draggable?: boolean;
     onDrag?: (event: DragEvent) => void;
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
index 6740ad0eb4..17179fb0d6 100644
--- a/types/react-map-gl/react-map-gl-tests.tsx
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -6,6 +6,7 @@ import {
     SVGOverlay,
     HTMLOverlay,
     FullscreenControl,
+    GeolocateControl,
     CanvasRedrawOptions,
     HTMLRedrawOptions,
     SVGRedrawOptions,
@@ -39,6 +40,7 @@ class MyMap extends React.Component<{}, State> {
                     ref={this.setRefInteractive}
                 >
                     <FullscreenControl className="test-class" container={document.querySelector('body')} />
+                    <GeolocateControl className="test-class" />
                     <CanvasOverlay
                         redraw={opts => {
                             const {

From c63dff33a24de9e8635abc0e21b86a50f8bf3a4b Mon Sep 17 00:00:00 2001
From: Andrew Haines <andrew@haines.org.nz>
Date: Thu, 21 Mar 2019 12:23:28 +0000
Subject: [PATCH 840/924] node-forge: Allow byte buffer or byte array for IV

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

diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 4a366deab7..47a601fc32 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -639,7 +639,7 @@ declare module "node-forge" {
         function createDecipher(algorithm: Algorithm, payload: util.ByteBuffer | Bytes): BlockCipher;
 
         interface StartOptions {
-            iv?: Bytes;
+            iv?: util.ByteBuffer | Byte[] | Bytes;
             tag?: util.ByteStringBuffer;
             tagLength?: number;
             additionalData?: string;

From a45e83be1b4e1d9b4ac167515540bada1600e785 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 13:10:14 +0000
Subject: [PATCH 841/924] implemented several other of the fixes suggested by
 the travic bot on "child-process-promise"'s definition file

---
 types/child-process-promise/child-process-promise-tests.ts | 2 +-
 types/child-process-promise/index.d.ts                     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/child-process-promise/child-process-promise-tests.ts b/types/child-process-promise/child-process-promise-tests.ts
index c76f0c9a49..365e7e8f60 100644
--- a/types/child-process-promise/child-process-promise-tests.ts
+++ b/types/child-process-promise/child-process-promise-tests.ts
@@ -12,4 +12,4 @@ a.childProcess; // $ExpectType ChildProcess
     at.childProcess; // $ExpectType ChildProcess
     at.stdout; // $ExpectType string
     at.stderr; // $ExpectType string
-})();
\ No newline at end of file
+})();
diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index 533d00c4ea..7e4069cc03 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for child-process-promise 2.2.1
+// Type definitions for child-process-promise 2.2
 // Project: https://github.com/patrick-steele-idem/child-process-promise
 // Definitions by: Luis Paulo <https://github.com/TheDSCPL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -19,6 +19,9 @@ import {
  * Simple wrapper around the child_process module that makes use of promises
  */
 
+// stop exporting everything by default
+export {}
+
 interface PromiseResult<Enc extends string|Buffer> {
     childProcess: ChildProcess;
     stdout: Enc;
@@ -105,4 +108,4 @@ export function fork(
     modulePath: string,
     args?: ReadonlyArray<string>,
     options?: Readonly<Options & ForkOptions>
-): ChildProcessPromise<SpawnPromiseResult>;
\ No newline at end of file
+): ChildProcessPromise<SpawnPromiseResult>;

From 99531b2ca0460648e3cedeaf22b487f4d7e42df9 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Thu, 21 Mar 2019 13:18:06 +0000
Subject: [PATCH 842/924] implemented several other other of the fixes
 suggested by the travic bot on "child-process-promise"'s definition file

---
 types/child-process-promise/index.d.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index 7e4069cc03..de47199ab5 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -20,7 +20,7 @@ import {
  */
 
 // stop exporting everything by default
-export {}
+export {};
 
 interface PromiseResult<Enc extends string|Buffer> {
     childProcess: ChildProcess;
@@ -79,11 +79,6 @@ export function  execFile(
     file: Readonly<string>,
     options: Readonly<Options & ExecFileOptionsWithStringEncoding>
 ): ChildProcessPromise<PromiseResult<string>>;
-export function  execFile(
-    file: Readonly<string>,
-    args: ReadonlyArray<string> | null,
-    options: Readonly<Options & ExecFileOptionsWithStringEncoding>
-): ChildProcessPromise<PromiseResult<string>>;
 export function  execFile(
     file: Readonly<string>,
     options: Readonly<Options & ExecFileOptionsWithOtherEncoding>
@@ -95,7 +90,8 @@ export function  execFile(
 ): ChildProcessPromise<PromiseResult<string | Buffer>>;
 export function  execFile(
     file: Readonly<string>,
-    args?: ReadonlyArray<string> | null
+    args?: ReadonlyArray<string> | null,
+    options?: Readonly<Options & ExecFileOptionsWithStringEncoding>
 ): ChildProcessPromise<PromiseResult<string>>;
 
 export function  spawn(

From 3824ecd0531e100bf877cf2350156fe2b92eb35e Mon Sep 17 00:00:00 2001
From: Hussein Ebrahimi <Hu-Eb@users.noreply.github.com>
Date: Thu, 21 Mar 2019 14:21:55 +0100
Subject: [PATCH 843/924] Chart.js Fixing issue in steppedLine inside
 ChartDataSets

ChartDataSets.steppedLine is missing 'middle' value
---
 types/chart.js/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 5a3116618d..8fa3a42ef9 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -512,7 +512,7 @@ declare namespace Chart {
         hoverBorderWidth?: number | number[];
         label?: string;
         lineTension?: number;
-        steppedLine?: 'before' | 'after' | boolean;
+        steppedLine?: 'before' | 'after' | 'middle' | boolean;
         pointBorderColor?: ChartColor | ChartColor[];
         pointBackgroundColor?: ChartColor | ChartColor[];
         pointBorderWidth?: number | number[];

From a5dce4de6a3bc8f7bc6556bf3484c6ddd5d1e9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Baumeyer?= <baumeyerkevin@gmail.com>
Date: Thu, 21 Mar 2019 14:29:22 +0100
Subject: [PATCH 844/924] Update sharp types for 0.22.0

---
 types/sharp/index.d.ts     | 27 +++++++++++++++++++++++----
 types/sharp/sharp-tests.ts |  2 +-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 5fcc47a26d..a8d51f4257 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for sharp 0.21
+// Type definitions for sharp 0.22
 // Project: https://github.com/lovell/sharp
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 //                 Wooseop Kim <https://github.com/wooseopkim>
@@ -138,7 +138,7 @@ declare namespace sharp {
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
-        joinChannel(images: string | Buffer | ArrayLike<string|Buffer>, options?: SharpOptions): Sharp;
+        joinChannel(images: string | Buffer | ArrayLike<string | Buffer>, options?: SharpOptions): Sharp;
 
         /**
          * Perform a bitwise boolean operation on all input image channels (bands) to produce a single channel output image.
@@ -211,9 +211,21 @@ declare namespace sharp {
          * @param options overlay options
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
+         * @deprecated
          */
         overlayWith(image?: string | Buffer, options?: OverlayOptions): Sharp;
 
+        /**
+         * Composite image(s) over the processed (resized, extracted etc.) image.
+         *
+         * The images to composite must be the same size or smaller than the processed image.
+         * If both `top` and `left` options are provided, they take precedence over `gravity`.
+         * @param images - Ordered list of images to composite
+         * @throws {Error} Invalid parameters
+         * @returns A sharp instance that can be used to chain operations
+         */
+        composite(images: Array<{ input: string | Buffer } & OverlayOptions>): Sharp;
+
         //#endregion
 
         //#region Input functions
@@ -570,7 +582,7 @@ declare namespace sharp {
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
-        resize(width?: number|null, height?: number|null, options?: ResizeOptions): Sharp;
+        resize(width?: number | null, height?: number | null, options?: ResizeOptions): Sharp;
 
         /**
          * Extends/pads the edges of the image with the provided background colour.
@@ -615,7 +627,9 @@ declare namespace sharp {
         failOnError?: boolean;
         /** Number representing the DPI for vector images. (optional, default 72) */
         density?: number;
-        /** Page number to extract for multi-page input (GIF, TIFF). (optional, default 0) */
+        /** Number of pages to extract for multi-page input (GIF, TIFF, PDF), use -1 for all pages */
+        pages?: number;
+        /** Page number to start extracting from for multi-page input (GIF, TIFF, PDF), zero based. (optional, default 0) */
         page?: number;
         /** Describes raw pixel input image data. See raw() for pixel ordering. */
         raw?: Raw;
@@ -883,6 +897,8 @@ declare namespace sharp {
     }
 
     interface OverlayOptions {
+        /** how to blend this image with the image below. (optional, default `'over'`) */
+        blend?: Blend;
         /** gravity at which to place the overlay. (optional, default 'centre') */
         gravity?: Gravity;
         /** the pixel offset from the top edge. */
@@ -966,6 +982,9 @@ declare namespace sharp {
         srgb: string;
     }
 
+    type Blend = 'clear' | 'source' | 'over' | 'in' | 'out' | 'atop' | 'dest' | 'dest-over' | 'dest-in' | 'dest-out' | 'dest-atop'  | 'xor' | 'add' | 'saturate' | 'multiply' | 'screen' | 'overlay'
+                 | 'darken' | 'lighten' | 'colour-dodge' | 'colour-dodge' | 'colour-burn' | 'colour-burn' | 'hard-light' | 'soft-light' | 'difference' | 'exclusion';
+
     type Gravity = number | string;
 
     interface GravityEnum {
diff --git a/types/sharp/sharp-tests.ts b/types/sharp/sharp-tests.ts
index 8c02e8c98f..84e1d33f4b 100644
--- a/types/sharp/sharp-tests.ts
+++ b/types/sharp/sharp-tests.ts
@@ -26,7 +26,7 @@ sharp('input.png')
     .rotate(180)
     .resize(300)
     .flatten({ background: "#ff6600" })
-    .overlayWith('overlay.png', { gravity: sharp.gravity.southeast })
+    .composite([{ input: 'overlay.png',  gravity: sharp.gravity.southeast }])
     .sharpen()
     .withMetadata()
     .webp({

From ae3c3069065b59646fcc9040662fde41c7f81339 Mon Sep 17 00:00:00 2001
From: error <error@error-unlimited.net>
Date: Thu, 21 Mar 2019 11:03:58 -0500
Subject: [PATCH 845/924] add isScheduled

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index f39d28b565..d018d3241d 100755
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -239,6 +239,7 @@ export class AnimationAction {
     stop(): AnimationAction;
     reset(): AnimationAction;
     isRunning(): boolean;
+    isScheduled(): boolean;
     startAt(time: number): AnimationAction;
     setLoop(mode: AnimationActionLoopStyles, repetitions: number): AnimationAction;
     setEffectiveWeight(weight: number): AnimationAction;

From 44ae9e2201ec7bae42e9d58c60a747c28ba9f90b Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 00:15:45 -0300
Subject: [PATCH 846/924] trezor-connect: Update signTransaction params

---
 types/trezor-connect/index.d.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index 282117efda..daa19b2a02 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -270,10 +270,31 @@ export interface OpReturnOutput {
 
 export type Output = RegularOutput | InternalOutput | SendMaxOutput | OpReturnOutput;
 
+export interface BinOutput {
+  amount: number;
+  script_pubkey: string;
+}
+
+export interface RefTransaction {
+  hash: string;
+  version?: number;
+  inputs: Input[];
+  bin_outputs: BinOutput[];
+  lock_time?: number;
+  extra_data?: string;
+  timestamp?: number;
+  version_group_id?: number;
+}
+
 export interface SignTransactionParams extends CommonParams {
   inputs: Input[];
   outputs: Output[];
+  refTxs: RefTransaction[];
   coin: string;
+  locktime?: number;
+  version?: number;
+  expiry?: number;
+  branchId?: number;
   push?: boolean;
 }
 

From c877577f2786e471839d8f4764a09b6461d4891e Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 12:16:18 -0300
Subject: [PATCH 847/924] trezor-connect: Add optional iv to
 CipherKeyValueParams interface

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

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index daa19b2a02..3c55ead363 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -126,8 +126,9 @@ export interface CipherKeyValueParams extends CommonParams {
   path: string | number[];
   key?: string;
   value?: string;
-  askOnEncrypt?: true;
-  askOnDecrypt?: true;
+  askOnEncrypt?: boolean;
+  askOnDecrypt?: boolean;
+  iv?: string;
 }
 
 export interface CipherKeyValue extends CommonParams {
@@ -334,6 +335,11 @@ export namespace TrezorConnect {
    */
   function getFeatures(params?: CommonParams): Promise<ResponseMessage<Features>>;
 
+  /**
+   * Retrieves the settings that TrezorConnect was initialized with.
+   */
+  function getSettings(): Promise<ResponseMessage<Settings>>;
+
   /**
    * Asks device to encrypt value using the private key derived by given BIP32
    * path and the given key. IV is always computed automatically.

From 5c86d99b2928e41703f3371ed7c830ad21744ba8 Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 12:16:41 -0300
Subject: [PATCH 848/924] trezor-connect: Add optional address to
 GetAddressParams

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

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index 3c55ead363..1c17b29ecd 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -147,6 +147,7 @@ export interface ResetDeviceParams extends CommonParams {
 
 export interface GetAddressParams extends CommonParams {
   path: string | number[];
+  address?: string;
   showOnTrezor?: boolean;
   coin?: string;
   crossChain?: boolean;

From 4d9614319163ce1ba0bb72edcf12a62c66dd9973 Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 12:25:16 -0300
Subject: [PATCH 849/924] trezor-connect: Add firmwareRelease to Device params

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

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index 1c17b29ecd..24fc6b9e6b 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -195,11 +195,25 @@ export type DeviceMode = 'normal' | 'bootloader' | 'initialize' | 'seedless';
 
 export type DeviceFirmwareStatus = 'valid' | 'outdated' | 'required';
 
+export interface FirmwareRelease {
+  required: boolean;
+  version: number[];
+  min_bridge_version: number[];
+  min_firmware_version: number[];
+  bootloader_version: number[];
+  min_bootloader_version: number[];
+  url: string;
+  channel: string;
+  fingerprint: string;
+  changelog: string;
+}
+
 export type Device = {
     type: 'acquired',
     path: string,
     label: string,
     firmware: DeviceFirmwareStatus,
+    firmwareRelease: FirmwareRelease,
     status: DeviceStatus,
     mode: DeviceMode,
     state: string | null,

From c46607a0a42cc0d8812fad97dc45b0175eedcafe Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 12:42:55 -0300
Subject: [PATCH 850/924] trezor-connect: Update type definition for
 AccountInfo interface

---
 types/trezor-connect/index.d.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index 24fc6b9e6b..540fad6459 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -54,6 +54,18 @@ export interface PublicKey {
   depth: number; // BIP32 serialization format
 }
 
+export interface Utxo {
+  index: number; // index of output IN THE TRANSACTION
+  transactionHash: string; // hash of the transaction
+  value: number; // how much money sent
+  addressPath: [number, number]; // path
+  height: number | null; // null == unconfirmed
+  coinbase: boolean;
+  tsize: number; // total size - in case of segwit, total, with segwit data
+  vsize: number; // virtual size - segwit concept - same as size in non-segwit
+  own: boolean;
+}
+
 export interface GetAccountInfoParams extends CommonParams {
   path?: number[];  // NOTE:
   xpub?: string;    // if both these fields are missing, the user will select an account
@@ -70,6 +82,11 @@ export interface AccountInfo {
   balance: number;
   confirmed: number;
 
+  transactions: number;
+  utxo: Utxo[];
+  usedAddresses: Array<{ address: string, received: number }>;
+  unusedAddresses: string[];
+
   // These fields are returned, presumably, to save further calls when the use case requires
   // a usable address:
   address: string;

From 0200fee41489ef58ec97f78a063ee5cdce87865c Mon Sep 17 00:00:00 2001
From: Federico Bond <federicobond@gmail.com>
Date: Thu, 21 Mar 2019 13:21:44 -0300
Subject: [PATCH 851/924] trezor-connect: Add optional CommonParams to
 wipeDevice

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

diff --git a/types/trezor-connect/index.d.ts b/types/trezor-connect/index.d.ts
index 540fad6459..099e0ef37c 100644
--- a/types/trezor-connect/index.d.ts
+++ b/types/trezor-connect/index.d.ts
@@ -382,7 +382,7 @@ export namespace TrezorConnect {
   /**
    * Resets device to factory defaults and removes all private data.
    */
-  function wipeDevice(): Promise<ResponseMessage<Message>>;
+  function wipeDevice(params?: CommonParams): Promise<ResponseMessage<Message>>;
 
   /**
    * Performs device setup and generates a new seed.

From e346a41f6e13975eaac2ba115b7a0f17dff671ed Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 12:27:45 -0400
Subject: [PATCH 852/924] Add types for @zeit/next-source-maps

---
 types/zeit__next-source-maps/index.d.ts       | 14 ++++++++++
 types/zeit__next-source-maps/tsconfig.json    | 26 +++++++++++++++++++
 types/zeit__next-source-maps/tslint.json      |  3 +++
 .../zeit__next-source-maps-tests.ts           |  3 +++
 4 files changed, 46 insertions(+)
 create mode 100644 types/zeit__next-source-maps/index.d.ts
 create mode 100644 types/zeit__next-source-maps/tsconfig.json
 create mode 100644 types/zeit__next-source-maps/tslint.json
 create mode 100644 types/zeit__next-source-maps/zeit__next-source-maps-tests.ts

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
new file mode 100644
index 0000000000..9a044b8038
--- /dev/null
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for @zeit/next-typescript 0.0.4-canary.1
+// Project: https://github.com/zeit/next-plugins/tree/master/packages/next-source-maps, https://github.com/zeit/next-plugins
+// Definitions by: ldthorne <https://www.github.com/ldthorne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.3
+
+import { ServerConfig } from 'next';
+
+declare function withSourceMaps(
+    /** @default {} */
+    nextConfig?: ServerConfig
+): ServerConfig;
+
+export = withSourceMaps;
diff --git a/types/zeit__next-source-maps/tsconfig.json b/types/zeit__next-source-maps/tsconfig.json
new file mode 100644
index 0000000000..1e1cd7db5e
--- /dev/null
+++ b/types/zeit__next-source-maps/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@zeit/next-source-maps": ["zeit__next-source-maps"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "zeit__next-source-maps-tests.ts"
+    ]
+}
diff --git a/types/zeit__next-source-maps/tslint.json b/types/zeit__next-source-maps/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/zeit__next-source-maps/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/zeit__next-source-maps/zeit__next-source-maps-tests.ts b/types/zeit__next-source-maps/zeit__next-source-maps-tests.ts
new file mode 100644
index 0000000000..dbf775dcfc
--- /dev/null
+++ b/types/zeit__next-source-maps/zeit__next-source-maps-tests.ts
@@ -0,0 +1,3 @@
+import withSourceMaps = require('@zeit/next-source-maps');
+
+withSourceMaps({}); // $ExpectType NextConfig

From f15103b30d6ba2c02d76a35ac2fb64a598e32407 Mon Sep 17 00:00:00 2001
From: Ian Sanders <isanders@chromalloy.com>
Date: Thu, 21 Mar 2019 12:45:42 -0400
Subject: [PATCH 853/924] Add linedelimiters property to diff Hunk

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

diff --git a/types/diff/index.d.ts b/types/diff/index.d.ts
index 5afb72192e..15fda0d409 100644
--- a/types/diff/index.d.ts
+++ b/types/diff/index.d.ts
@@ -142,6 +142,7 @@ export interface Hunk {
     newStart: number;
     newLines: number;
     lines: string[];
+    linedelimiters?: string[];
 }
 
 export interface BestPath {

From a1e7a31846386ce5f0483fd7c27b8679361c998c Mon Sep 17 00:00:00 2001
From: Jake Boone <jakeboone02@gmail.com>
Date: Thu, 21 Mar 2019 10:00:34 -0700
Subject: [PATCH 854/924] removed screenfull which provides its own types

---
 notNeededPackages.json                  |   6 ++
 types/screenfull/index.d.ts             |  85 ------------------
 types/screenfull/screenfull-tests.ts    |  46 ----------
 types/screenfull/tsconfig.json          |  24 -----
 types/screenfull/tslint.json            |   3 -
 types/screenfull/v3/index.d.ts          |  36 --------
 types/screenfull/v3/screenfull-tests.ts | 112 ------------------------
 types/screenfull/v3/tsconfig.json       |  29 ------
 types/screenfull/v3/tslint.json         |  79 -----------------
 9 files changed, 6 insertions(+), 414 deletions(-)
 delete mode 100644 types/screenfull/index.d.ts
 delete mode 100644 types/screenfull/screenfull-tests.ts
 delete mode 100644 types/screenfull/tsconfig.json
 delete mode 100644 types/screenfull/tslint.json
 delete mode 100644 types/screenfull/v3/index.d.ts
 delete mode 100644 types/screenfull/v3/screenfull-tests.ts
 delete mode 100644 types/screenfull/v3/tsconfig.json
 delete mode 100644 types/screenfull/v3/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 7efe76e0d7..cf61daf58d 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -2010,6 +2010,12 @@
             "sourceRepoURL": "https://github.com/Lellansin/node-scanf",
             "asOfVersion": "0.7.3"
         },
+        {
+            "libraryName": "screenfull",
+            "typingsPackageName": "screenfull",
+            "sourceRepoURL": "https://github.com/sindresorhus/screenfull.js",
+            "asOfVersion": "4.1.0"
+        },
         {
             "libraryName": "sendgrid",
             "typingsPackageName": "sendgrid",
diff --git a/types/screenfull/index.d.ts b/types/screenfull/index.d.ts
deleted file mode 100644
index 2c7b93e453..0000000000
--- a/types/screenfull/index.d.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Type definitions for screenfull.js 4.0
-// Project: https://github.com/sindresorhus/screenfull.js
-// Definitions by: Ilia Choly <https://github.com/icholy>
-//                 lionelb <https://github.com/lionelb>
-//                 Joel Shepherd <https://github.com/joelshepherd>
-//                 BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.5
-
-export = screenfull;
-export as namespace screenfull;
-
-declare const screenfull: screenfull.Screenfull | false;
-
-declare namespace screenfull {
-    interface Screenfull {
-        /**
-         * Returns a boolean whether fullscreen is active.
-         */
-        readonly isFullscreen: boolean;
-        /**
-         * Returns the element currently in fullscreen, otherwise `null`.
-         */
-        readonly element: Element | null;
-        /**
-         * Returns a boolean whether you are allowed to enter fullscreen. If your page is inside an `<iframe>`
-         * you will need to add a `allowfullscreen` attribute (+ `webkitallowfullscreen` and `mozallowfullscreen`).
-         */
-        readonly enabled: boolean;
-        /**
-         * Exposes the raw properties (prefixed if needed) used internally.
-         */
-        raw: RawEventNames;
-        /**
-         * Make an element fullscreen.
-         *
-         * If your page is inside an `<iframe>` you will need to add a `allowfullscreen` attribute
-         * (+ `webkitallowfullscreen` and `mozallowfullscreen`).
-         *
-         * Keep in mind that the browser will only enter fullscreen when initiated by user events like click, touch, key.
-         *
-         * @param element Default is `<html>`. If called with another element than the currently active,
-         * it will switch to that if it's a decendant.
-         * @returns A promise that resolves after the element enters fullscreen.
-         */
-        request(element?: Element): Promise<void>;
-        /**
-         * Brings you out of fullscreen.
-         * @returns A promise that resolves after the element exits fullscreen.
-         */
-        exit(): Promise<void>;
-        /**
-         * Requests fullscreen if not active, otherwise exits.
-         * @returns A promise that resolves after the element enters/exits fullscreen.
-         */
-        toggle(elem?: Element): Promise<void>;
-        /**
-         * Add a listener for when the browser switches in and out of fullscreen or when there is an error.
-         */
-        on(name: EventName, handler: (event: Event) => void): void;
-        /**
-         * Remove a previously registered event listener.
-         */
-        off(name: EventName, handler: (event: Event) => void): void;
-        /**
-         * Alias for `.on('change', function)`.
-         */
-        onchange(handler: (event: Event) => void): void;
-        /**
-         * Alias for `.on('error', function)`.
-         */
-        onerror(handler: (event: Event) => void): void;
-    }
-
-    interface RawEventNames {
-        requestFullscreen: string;
-        exitFullscreen: string;
-        fullscreenElement: string;
-        fullscreenEnabled: string;
-        fullscreenchange: string;
-        fullscreenerror: string;
-    }
-
-    type EventName = 'change' | 'error';
-}
diff --git a/types/screenfull/screenfull-tests.ts b/types/screenfull/screenfull-tests.ts
deleted file mode 100644
index 3bc509fd53..0000000000
--- a/types/screenfull/screenfull-tests.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import screenfull = require('screenfull');
-
-if (screenfull) {
-    screenfull.enabled; // $ExpectType boolean
-    screenfull.enabled = false; // $ExpectError
-    screenfull.isFullscreen; // $ExpectType boolean
-    screenfull.isFullscreen = false; // $ExpectError
-    screenfull.element; // $ExpectType Element | null
-    screenfull.element = document.documentElement; // $ExpectError
-
-    if (screenfull.enabled) {
-        const elem: Element = document.getElementById('target')!;
-
-        screenfull.request(); // $ExpectType Promise<void>
-        screenfull.request(elem); // $ExpectType Promise<void>
-        screenfull.toggle(); // $ExpectType Promise<void>
-        screenfull.toggle(elem); // $ExpectType Promise<void>
-        screenfull.exit(); // $ExpectType Promise<void>
-
-        screenfull.on('change', event => {
-            event; // $ExpectType Event
-        });
-        screenfull.on('error', event => {
-            event; // $ExpectType Event
-        });
-        screenfull.off('change', event => {
-            event; // $ExpectType Event
-        });
-        screenfull.off('error', event => {
-            event; // $ExpectType Event
-        });
-        screenfull.onchange(event => {
-            event; // $ExpectType Event
-        });
-        screenfull.onerror(event => {
-            event; // $ExpectType Event
-        });
-
-        screenfull.raw.requestFullscreen; // $ExpectType string
-        screenfull.raw.exitFullscreen; // $ExpectType string
-        screenfull.raw.fullscreenElement; // $ExpectType string
-        screenfull.raw.fullscreenEnabled; // $ExpectType string
-        screenfull.raw.fullscreenchange; // $ExpectType string
-        screenfull.raw.fullscreenerror; // $ExpectType string
-    }
-}
diff --git a/types/screenfull/tsconfig.json b/types/screenfull/tsconfig.json
deleted file mode 100644
index e3073a5338..0000000000
--- a/types/screenfull/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "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",
-        "screenfull-tests.ts"
-    ]
-}
diff --git a/types/screenfull/tslint.json b/types/screenfull/tslint.json
deleted file mode 100644
index f93cf8562a..0000000000
--- a/types/screenfull/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}
diff --git a/types/screenfull/v3/index.d.ts b/types/screenfull/v3/index.d.ts
deleted file mode 100644
index 0ca3d642b9..0000000000
--- a/types/screenfull/v3/index.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Type definitions for screenfull.js 3.3.3
-// Project: https://github.com/sindresorhus/screenfull.js
-// Definitions by: Ilia Choly <https://github.com/icholy>
-//                 lionelb <https://github.com/lionelb>
-//                 Joel Shepherd <https://github.com/joelshepherd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.5
-
-declare var screenfull: IScreenfull | false;
-
-interface IScreenfullRaw {
-  requestFullscreen?: string;
-  exitFullscreen?: string;
-  fullscreenElement?: string;
-  fullscreenEnabled?: string;
-  fullscreenchange?: string;
-  fullscreenerror?: string;
-}
-
-interface IScreenfull {
-  isFullscreen: boolean;
-  element: Element;
-  enabled: boolean;
-  raw: IScreenfullRaw;
-  request(elem?: Element): void;
-  toggle(elem?: Element): void;
-  exit(): void;
-  onchange(handler: () => void): void;
-  onerror(handler: (event: Event) => void): void;
-  on(name: EventNameMap, handler: (event: Event) => void): void;
-  off(name: EventNameMap, handler: (event: Event) => void): void;
-}
-
-type EventNameMap = 'change' | 'error';
-
-export = screenfull;
diff --git a/types/screenfull/v3/screenfull-tests.ts b/types/screenfull/v3/screenfull-tests.ts
deleted file mode 100644
index db6f2a1b25..0000000000
--- a/types/screenfull/v3/screenfull-tests.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import screenfull = require('screenfull');
-
-function test_fullscreen_page() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.request();
-  }
-}
-
-function test_fullscreen_element() {
-  var elem = document.getElementById('target');
-  if (screenfull && screenfull.enabled) {
-    screenfull.request(elem);
-  }
-}
-
-function test_toggle() {
-  var elem = document.getElementById('target');
-  if (screenfull && screenfull.enabled) {
-    screenfull.toggle(elem);
-  }
-}
-
-function test_exit() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.request();
-  }
-  document.getElementById('target').addEventListener('click', function () {
-    if (screenfull && screenfull.enabled) {
-      screenfull.exit();
-    }
-  })
-}
-
-function test_raw_detect_change() {
-  if (screenfull && screenfull.enabled) {
-    document.addEventListener(screenfull.raw.fullscreenchange, function () {
-      if (screenfull && screenfull.isFullscreen) {
-        console.log('fullscreen');
-      } else {
-        console.log('not fullscreen');
-      }
-    });
-  }
-}
-
-function test_raw_error() {
-  if (screenfull && screenfull.enabled) {
-    document.addEventListener(screenfull.raw.fullscreenerror, function (event) {
-      console.error('Failed to enable fullscreen', event);
-    });
-  }
-}
-
-function test_detect_change() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.onchange(function () {
-      if (screenfull && screenfull.isFullscreen) {
-        console.log('fullscreen');
-      } else {
-        console.log('not fullscreen');
-      }
-    });
-  }
-}
-
-function test_detect_error() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.onerror(function (event) {
-      console.error('Failed to enable fullscreen', event);
-    });
-  }
-}
-
-function test_listener_on() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.on('change', function () {
-      if (screenfull && screenfull.isFullscreen) {
-        console.log('fullscreen');
-      } else {
-        console.log('not fullscreen');
-      }
-    });
-    screenfull.on('error', function (event) {
-      console.error('Failed to enable fullscreen', event);
-    })
-  }
-}
-
-function test_listener_off() {
-  if (screenfull && screenfull.enabled) {
-    screenfull.off('change', function () {
-      if (screenfull && screenfull.isFullscreen) {
-        console.log('fullscreen');
-      } else {
-        console.log('not fullscreen');
-      }
-    });
-    screenfull.off('error', function (event) {
-      console.error('Failed to enable fullscreen', event);
-    })
-  }
-}
-
-function test_access_element() {
-  var elem = document.getElementById('target');
-  if (screenfull && screenfull.enabled) {
-    screenfull.request(elem);
-    if (elem !== screenfull.element) {
-      alert('incorrect element property');
-    }
-  }
-}
diff --git a/types/screenfull/v3/tsconfig.json b/types/screenfull/v3/tsconfig.json
deleted file mode 100644
index 0bceb56930..0000000000
--- a/types/screenfull/v3/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../../",
-        "typeRoots": [
-            "../../"
-        ],
-        "paths": {
-            "screenfull": [
-                "screenfull/v3"
-            ]
-        },
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "screenfull-tests.ts"
-    ]
-}
diff --git a/types/screenfull/v3/tslint.json b/types/screenfull/v3/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/screenfull/v3/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 1fd1b537aa7be8863a00f61e82a6ac1606f15b86 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 14:11:30 -0400
Subject: [PATCH 855/924] ndn-js: Transport

---
 types/ndn-js/face.d.ts       | 17 +++++++++++++++
 types/ndn-js/index.d.ts      |  3 +++
 types/ndn-js/ndn-js-tests.ts |  7 ++++++
 types/ndn-js/transport.d.ts  | 42 ++++++++++++++++++++++++++++++++++++
 types/ndn-js/tsconfig.json   | 23 ++++++++++++++++++++
 types/ndn-js/tslint.json     |  7 ++++++
 6 files changed, 99 insertions(+)
 create mode 100644 types/ndn-js/face.d.ts
 create mode 100644 types/ndn-js/index.d.ts
 create mode 100644 types/ndn-js/ndn-js-tests.ts
 create mode 100644 types/ndn-js/transport.d.ts
 create mode 100644 types/ndn-js/tsconfig.json
 create mode 100644 types/ndn-js/tslint.json

diff --git a/types/ndn-js/face.d.ts b/types/ndn-js/face.d.ts
new file mode 100644
index 0000000000..0049585be6
--- /dev/null
+++ b/types/ndn-js/face.d.ts
@@ -0,0 +1,17 @@
+import { Transport } from "./transport";
+
+export interface FaceCtorOptions {
+    getTransport?: () => Transport;
+    getConnectionInfo?: () => Transport.ConnectionInfo;
+    connectionInfo?: Transport.ConnectionInfo|null;
+    host?: string|null;
+    port?: number|null;
+    onopen?: () => any;
+    onclose?: () => any;
+}
+
+export class Face {
+    constructor();
+    constructor(settings: FaceCtorOptions);
+    constructor(transport: Transport, connectionInfo: Transport.ConnectionInfo);
+}
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
new file mode 100644
index 0000000000..da75f56e6c
--- /dev/null
+++ b/types/ndn-js/index.d.ts
@@ -0,0 +1,3 @@
+export as namespace ndn;
+export * from "./face";
+export * from "./transport";
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
new file mode 100644
index 0000000000..2364a6e377
--- /dev/null
+++ b/types/ndn-js/ndn-js-tests.ts
@@ -0,0 +1,7 @@
+import ndn = require("ndn-js");
+
+let face = new ndn.Face();
+face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
+face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
+face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
diff --git a/types/ndn-js/transport.d.ts b/types/ndn-js/transport.d.ts
new file mode 100644
index 0000000000..320ec1e695
--- /dev/null
+++ b/types/ndn-js/transport.d.ts
@@ -0,0 +1,42 @@
+export interface Transport {
+}
+
+export namespace Transport {
+    interface ConnectionInfo {
+    }
+}
+
+export class TcpTransport implements Transport {
+}
+
+export namespace TcpTransport {
+    class ConnectionInfo implements Transport.ConnectionInfo {
+        constructor(host: string, port: number);
+        equals(other: ConnectionInfo): boolean;
+        toString(): string;
+    }
+}
+
+export class UnixTransport implements Transport {
+}
+
+export namespace UnixTransport {
+    class ConnectionInfo implements Transport.ConnectionInfo {
+        constructor(filePath: string);
+        equals(other: ConnectionInfo): boolean;
+        toString(): string;
+    }
+}
+
+export class WebSocketTransport implements Transport {
+    isLocal(): boolean;
+}
+
+export namespace WebSocketTransport {
+    class ConnectionInfo implements Transport.ConnectionInfo {
+        constructor(host: string, port: number);
+        constructor(uri: string);
+        equals(other: ConnectionInfo): boolean;
+        toString(): string;
+    }
+}
diff --git a/types/ndn-js/tsconfig.json b/types/ndn-js/tsconfig.json
new file mode 100644
index 0000000000..1568d2bd35
--- /dev/null
+++ b/types/ndn-js/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",
+        "ndn-js-tests.ts"
+    ]
+}
diff --git a/types/ndn-js/tslint.json b/types/ndn-js/tslint.json
new file mode 100644
index 0000000000..5f014d5c68
--- /dev/null
+++ b/types/ndn-js/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dtslint.json",
+    "rules": {
+        "no-empty-interface": false,
+        "unified-signatures": false
+    }
+}

From 6baea0f9bf090d2d2fac76bce42a17bec9cef214 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 14:38:48 -0400
Subject: [PATCH 856/924] ndn-js: Blob and SignedBlob

---
 types/ndn-js/blob.d.ts       | 23 +++++++++++++++++++++++
 types/ndn-js/index.d.ts      |  1 +
 types/ndn-js/ndn-js-tests.ts | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 types/ndn-js/blob.d.ts

diff --git a/types/ndn-js/blob.d.ts b/types/ndn-js/blob.d.ts
new file mode 100644
index 0000000000..8a84e66b58
--- /dev/null
+++ b/types/ndn-js/blob.d.ts
@@ -0,0 +1,23 @@
+export class Blob {
+    constructor(value?: Blob);
+    constructor(value: Buffer, copy?: boolean);
+    constructor(value: number[]);
+    constructor(value: string);
+
+    size(): number;
+    buf(): Buffer;
+    isNull(): boolean;
+    toHex(): string;
+    toString(): string;
+    equals(other: Blob): boolean;
+}
+
+export class SignedBlob extends Blob {
+    constructor();
+    constructor(value: Blob|Buffer|number[], signedPortionBeginOffset: number, signedPortionEndOffset: number);
+
+    signedSize(): number;
+    signedBuf(): Buffer;
+    getSignedPortionBeginOffset(): number;
+    getSignedPortionEndOffset(): number;
+}
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index da75f56e6c..c1dbeb6a76 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,3 +1,4 @@
 export as namespace ndn;
+export * from "./blob";
 export * from "./face";
 export * from "./transport";
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
index 2364a6e377..ceeb00effe 100644
--- a/types/ndn-js/ndn-js-tests.ts
+++ b/types/ndn-js/ndn-js-tests.ts
@@ -1,7 +1,31 @@
+/// <reference types="node"/>
 import ndn = require("ndn-js");
 
-let face = new ndn.Face();
-face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
-face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
-face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
-face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+function testBlob() {
+    let blob = new ndn.Blob();
+    blob = new ndn.Blob(blob);
+    blob = new ndn.Blob(Buffer.alloc(4));
+    blob = new ndn.Blob("str");
+
+    let n: number = blob.size();
+    let buf: Buffer = blob.buf();
+    let b: boolean = blob.equals(blob);
+    let s: string = blob.toHex();
+    s = blob.toString();
+    b = blob.isNull();
+
+    let sb = new ndn.SignedBlob();
+    sb = new ndn.SignedBlob(sb, 20, 40);
+    n = sb.signedSize();
+    buf = sb.signedBuf();
+    n = sb.getSignedPortionBeginOffset();
+    n = sb.getSignedPortionEndOffset();
+}
+
+function testFaceTransport() {
+    let face = new ndn.Face();
+    face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
+    face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+    face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
+    face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+}

From 6ecd873f913d6bff10ae30ae241985b344f2c72c Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 16:01:35 -0400
Subject: [PATCH 857/924] ndn-js: Name and Name.Component

---
 types/ndn-js/blob.d.ts       |   2 +
 types/ndn-js/index.d.ts      |   1 +
 types/ndn-js/name.d.ts       | 102 +++++++++++++++++++++++++++++++++++
 types/ndn-js/ndn-js-tests.ts |  85 +++++++++++++++++++++++++++++
 4 files changed, 190 insertions(+)
 create mode 100644 types/ndn-js/name.d.ts

diff --git a/types/ndn-js/blob.d.ts b/types/ndn-js/blob.d.ts
index 8a84e66b58..562f05cda5 100644
--- a/types/ndn-js/blob.d.ts
+++ b/types/ndn-js/blob.d.ts
@@ -1,3 +1,5 @@
+export type BlobLike = Blob|Buffer;
+
 export class Blob {
     constructor(value?: Blob);
     constructor(value: Buffer, copy?: boolean);
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index c1dbeb6a76..0230f1a3f1 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,4 +1,5 @@
 export as namespace ndn;
 export * from "./blob";
 export * from "./face";
+export * from "./name";
 export * from "./transport";
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
new file mode 100644
index 0000000000..8d0334f7a9
--- /dev/null
+++ b/types/ndn-js/name.d.ts
@@ -0,0 +1,102 @@
+import { Blob, BlobLike } from "./blob";
+
+export namespace Name {
+    type ComponentCtorValue = string|number[]|ArrayBuffer|Buffer;
+    type CompareResult = -1|0|1;
+
+    enum ComponentType {
+        IMPLICIT_SHA256_DIGEST = 1,
+        PARAMETERS_SHA256_DIGEST = 2,
+        GENERIC = 8,
+        OTHER_CODE = 0x7fff,
+    }
+
+    class Component {
+        constructor();
+        constructor(comp: Component);
+        constructor(value: ComponentCtorValue, type?: ComponentType);
+        constructor(value: ComponentCtorValue, type: ComponentType.OTHER_CODE, otherTypeCode: number);
+
+        // accessors
+        getType(): ComponentType;
+        getOtherTypeCode(): number;
+        getValue(): Blob;
+        toEscapedString(): string;
+
+        // algorithms
+        getSuccessor(): Component;
+        equals(other: Component): boolean;
+        compare(other: Component): CompareResult;
+
+        // digest types
+        isImplicitSha256Digest(): boolean;
+        isParametersSha256Digest(): boolean;
+        static fromImplicitSha256Digest(digest: BlobLike): Component;
+        static fromParametersSha256Digest(digest: BlobLike): Component;
+
+        // naming conventions
+        isSegment(): boolean;
+        isSegmentOffset(): boolean;
+        isVersion(): boolean;
+        isTimestamp(): boolean;
+        isSequenceNumber(): boolean;
+        isGeneric(): boolean;
+        toNumber(): number;
+        toNumberWithMarker(marker: number): number;
+        toSegment(): number;
+        toSegmentOffset(): number;
+        toVersion(): number;
+        toTimestamp(): number;
+        toSequenceNumber(): number;
+        static fromNumber(number: number, type?: ComponentType): Component;
+        static fromNumber(number: number, type: ComponentType.OTHER_CODE, otherTypeCode: number): Component;
+        static fromNumberWithMarker(number: number, marker: number): Component;
+        static fromSegment(segment: number): Component;
+        static fromSegmentOffset(segmentOffset: number): Component;
+        static fromVersion(version: number): Component;
+        static fromTimestamp(timestamp: number): Component;
+        static fromSequenceNumber(sequenceNumber: number): Component;
+    }
+}
+
+export class Name {
+    constructor(uri?: string);
+    constructor(name: Name);
+    constructor(components: Array<Name.ComponentCtorValue|Name>);
+
+    // accessors
+    set(uri: string): void;
+    clear(): void;
+    getSubName(iStartComponent: number, nComponents?: number): Name;
+    getPrefix(nComponents: number): Name;
+    size(): number;
+    get(i: number): Name.Component;
+
+    // append
+    append(component: Name.Component): Name;
+    append(component: Name): Name;
+    append(value: Name.ComponentCtorValue, type?: Name.ComponentType): Name;
+    append(value: Name.ComponentCtorValue, type: Name.ComponentType.OTHER_CODE, otherTypeCode: number): Name;
+    appendSegment(segment: number): Name;
+    appendSegmentOffset(segmentOffset: number): Name;
+    appendVersion(version: number): Name;
+    appendTimestamp(timestamp: number): Name;
+    appendSequenceNumber(sequenceNumber: number): Name;
+    appendImplicitSha256Digest(digest: BlobLike): Name;
+    appendParametersSha256Digest(digest: BlobLike): Name;
+
+    // algorithms
+    compare(other: Name): Name.CompareResult;
+    compare(iStartComponent: number, nComponents: number, other: Name,
+            iOtherStartComponent?: number, nOtherComponents?: number): Name.CompareResult;
+    equals(other: Name): boolean;
+    getSuccessor(): Name;
+    match(name: Name): boolean;
+    isPrefixOf(name: Name): boolean;
+
+    // encoding
+    wireEncode(): Blob;
+    wireDecode(input: BlobLike): void;
+    toUri(includeScheme?: boolean): string;
+    static fromEscapedString(uri: string): Name;
+}
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
index ceeb00effe..a617509bb1 100644
--- a/types/ndn-js/ndn-js-tests.ts
+++ b/types/ndn-js/ndn-js-tests.ts
@@ -5,6 +5,7 @@ function testBlob() {
     let blob = new ndn.Blob();
     blob = new ndn.Blob(blob);
     blob = new ndn.Blob(Buffer.alloc(4));
+    blob = new ndn.Blob([0x08, 0x01, 0x41]);
     blob = new ndn.Blob("str");
 
     let n: number = blob.size();
@@ -22,6 +23,90 @@ function testBlob() {
     n = sb.getSignedPortionEndOffset();
 }
 
+function testName() {
+    const digestBlob = new ndn.Blob([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+
+    let comp = new ndn.Name.Component();
+    comp = new ndn.Name.Component(comp);
+    comp = new ndn.Name.Component("A");
+    comp = new ndn.Name.Component([0x41], ndn.Name.ComponentType.GENERIC);
+    comp = new ndn.Name.Component([0x41], ndn.Name.ComponentType.OTHER_CODE, 1000);
+
+    let blob: ndn.Blob = comp.getValue();
+    const ct: ndn.Name.ComponentType = comp.getType();
+    let n: number = comp.getOtherTypeCode();
+    let s: string = comp.toEscapedString();
+
+    comp = comp.getSuccessor();
+    let b: boolean = comp.equals(comp);
+    n = comp.compare(comp);
+
+    b = comp.isImplicitSha256Digest();
+    b = comp.isParametersSha256Digest();
+    comp = ndn.Name.Component.fromImplicitSha256Digest(digestBlob);
+    comp = ndn.Name.Component.fromParametersSha256Digest(Buffer.alloc(32));
+
+    b = comp.isSegment();
+    b = comp.isSegmentOffset();
+    b = comp.isVersion();
+    b = comp.isTimestamp();
+    b = comp.isSequenceNumber();
+    b = comp.isGeneric();
+
+    n = comp.toNumber();
+    n = comp.toNumberWithMarker(0xFD);
+    n = comp.toSegment();
+    n = comp.toSegmentOffset();
+    n = comp.toVersion();
+    n = comp.toTimestamp();
+    n = comp.toSequenceNumber();
+
+    comp = ndn.Name.Component.fromNumber(200);
+    comp = ndn.Name.Component.fromNumber(200, ndn.Name.ComponentType.OTHER_CODE, 1000);
+    comp = ndn.Name.Component.fromNumberWithMarker(200, 0xFD);
+    comp = ndn.Name.Component.fromSegment(0);
+    comp = ndn.Name.Component.fromSegmentOffset(0);
+    comp = ndn.Name.Component.fromVersion(4);
+    comp = ndn.Name.Component.fromTimestamp(123456789);
+    comp = ndn.Name.Component.fromSequenceNumber(1);
+
+    let name = new ndn.Name();
+    name = new ndn.Name("/A");
+    name = new ndn.Name(name);
+    name = new ndn.Name(["A", Buffer.from([0x42]), name]);
+
+    name.set("/B");
+    name.clear();
+    name = name.getSubName(1)
+               .getSubName(1, 4)
+               .getPrefix(3);
+    n = name.size();
+    comp = name.get(2);
+
+    name = name.append(ndn.Name.Component.fromSegment(4))
+               .append("A", ndn.Name.ComponentType.OTHER_CODE, 1000)
+               .appendSegment(0)
+               .appendSegmentOffset(1)
+               .appendVersion(2)
+               .appendTimestamp(3)
+               .appendSequenceNumber(4)
+               .appendImplicitSha256Digest(digestBlob)
+               .appendParametersSha256Digest(Buffer.alloc(32));
+
+    n = name.compare(name);
+    n = name.compare(0, 2, name, 1, 3);
+    b = name.equals(name);
+    name = name.getSuccessor();
+    b = name.match(name);
+    b = name.isPrefixOf(name);
+
+    blob = name.wireEncode();
+    name.wireDecode(blob);
+    s = name.toUri();
+    name = ndn.Name.fromEscapedString(s);
+}
+
 function testFaceTransport() {
     let face = new ndn.Face();
     face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});

From 6b9475b1293e463cf28ca96b0e7344cc2f0942a2 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 16:25:07 -0400
Subject: [PATCH 858/924] ndn-js: Interest

---
 types/ndn-js/data.d.ts           |  1 +
 types/ndn-js/delegation-set.d.ts |  1 +
 types/ndn-js/index.d.ts          |  1 +
 types/ndn-js/interest.d.ts       | 31 +++++++++++++++++++++++++++++++
 types/ndn-js/name.d.ts           |  6 +++---
 types/ndn-js/ndn-js-tests.ts     | 20 ++++++++++++++++++++
 6 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 types/ndn-js/data.d.ts
 create mode 100644 types/ndn-js/delegation-set.d.ts
 create mode 100644 types/ndn-js/interest.d.ts

diff --git a/types/ndn-js/data.d.ts b/types/ndn-js/data.d.ts
new file mode 100644
index 0000000000..9c1b2d5e22
--- /dev/null
+++ b/types/ndn-js/data.d.ts
@@ -0,0 +1 @@
+export type Data = any;
diff --git a/types/ndn-js/delegation-set.d.ts b/types/ndn-js/delegation-set.d.ts
new file mode 100644
index 0000000000..f40dbd1912
--- /dev/null
+++ b/types/ndn-js/delegation-set.d.ts
@@ -0,0 +1 @@
+export type DelegationSet = any;
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index 0230f1a3f1..7646134cb6 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,5 +1,6 @@
 export as namespace ndn;
 export * from "./blob";
 export * from "./face";
+export * from "./interest";
 export * from "./name";
 export * from "./transport";
diff --git a/types/ndn-js/interest.d.ts b/types/ndn-js/interest.d.ts
new file mode 100644
index 0000000000..94f826dc6a
--- /dev/null
+++ b/types/ndn-js/interest.d.ts
@@ -0,0 +1,31 @@
+import { Blob, BlobLike } from "./blob";
+import { Data } from "./data";
+import { DelegationSet } from "./delegation-set";
+import { Name, NameCtor } from "./name";
+
+export class Interest {
+    constructor(name?: NameCtor);
+    constructor(interest: Interest);
+
+    // field accessors
+    getName(): Name;
+    setName(name: NameCtor): Interest;
+    getCanBePrefix(): boolean;
+    setCanBePrefix(canBePrefix: boolean): Interest;
+    getMustBeFresh(): boolean;
+    setMustBeFresh(mustBeFresh: boolean): Interest;
+    getForwardingHint(): DelegationSet;
+    setForwardingHint(fh: DelegationSet): Interest;
+    getNonce(): Blob;
+    refreshNonce(): void;
+    getInterestLifetimeMilliseconds(): number;
+    setInterestLifetimeMilliseconds(lifetime: number): Interest;
+
+    // algorithms
+    matchesData(data: Data): boolean;
+    matchesName(name: Name): boolean;
+
+    // encoding
+    wireEncode(): Blob;
+    wireDecode(input: BlobLike): void;
+}
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index 8d0334f7a9..b4eea8064a 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -59,10 +59,10 @@ export namespace Name {
     }
 }
 
+export type NameCtor = string|Name|Array<Name.ComponentCtorValue|Name>;
+
 export class Name {
-    constructor(uri?: string);
-    constructor(name: Name);
-    constructor(components: Array<Name.ComponentCtorValue|Name>);
+    constructor(arg?: NameCtor);
 
     // accessors
     set(uri: string): void;
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
index a617509bb1..005aad2d4d 100644
--- a/types/ndn-js/ndn-js-tests.ts
+++ b/types/ndn-js/ndn-js-tests.ts
@@ -107,6 +107,26 @@ function testName() {
     name = ndn.Name.fromEscapedString(s);
 }
 
+function testInterest() {
+    let interest = new ndn.Interest();
+    interest = new ndn.Interest("/A");
+    interest = new ndn.Interest(interest);
+
+    const name: ndn.Name = interest.setName("/B").getName();
+    let b: boolean = interest.setCanBePrefix(false).getCanBePrefix();
+    b = interest.setMustBeFresh(true).getMustBeFresh();
+    const fh: any = interest.setForwardingHint({}).getMustBeFresh();
+    let blob: ndn.Blob = interest.getNonce();
+    interest.refreshNonce();
+    const n: number = interest.setInterestLifetimeMilliseconds(8888).getInterestLifetimeMilliseconds();
+
+    b = interest.matchesData({});
+    b = interest.matchesName(name);
+
+    blob = name.wireEncode();
+    name.wireDecode(blob);
+}
+
 function testFaceTransport() {
     let face = new ndn.Face();
     face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});

From 9462ec2b57cec752e1929f0a086c9f6580ada091 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 20:38:32 -0400
Subject: [PATCH 859/924] ndn-js: Data and Signature

---
 types/ndn-js/data.d.ts       | 48 +++++++++++++++++++++++++-
 types/ndn-js/index.d.ts      |  2 ++
 types/ndn-js/interest.d.ts   |  2 +-
 types/ndn-js/name.d.ts       | 15 ++++----
 types/ndn-js/ndn-js-tests.ts | 34 ++++++++++++++++++-
 types/ndn-js/signature.d.ts  | 66 ++++++++++++++++++++++++++++++++++++
 6 files changed, 157 insertions(+), 10 deletions(-)
 create mode 100644 types/ndn-js/signature.d.ts

diff --git a/types/ndn-js/data.d.ts b/types/ndn-js/data.d.ts
index 9c1b2d5e22..3682d055ff 100644
--- a/types/ndn-js/data.d.ts
+++ b/types/ndn-js/data.d.ts
@@ -1 +1,47 @@
-export type Data = any;
+import { Blob, BlobLike } from "./blob";
+import { NameCtor, Name } from "./name";
+import { Signature } from "./signature";
+
+export class Data {
+    constructor(name?: NameCtor, content?: BlobLike);
+    constructor(name: NameCtor, metaInfo: MetaInfo, content: Buffer);
+    constructor(data: Data);
+
+    // accessors
+    getName(): Name;
+    setName(name: NameCtor): Data;
+    getMetaInfo(): MetaInfo;
+    setMetaInfo(meta: MetaInfo): Data;
+    getContent(): Blob;
+    setContent(content: BlobLike): Data;
+    getSignature(): Signature;
+    setSignature(sig: Signature): Data;
+
+    // algorithms
+    getFullName(): Name;
+
+    // encoding
+    wireEncode(): Blob;
+    wireDecode(input: BlobLike): void;
+}
+
+export enum ContentType {
+    BLOB = 0,
+    LINK = 1,
+    KEY  = 2,
+    NACK = 3,
+    OTHER_CODE = 0x7fff,
+}
+
+export class MetaInfo {
+    constructor(meta?: MetaInfo);
+
+    getType(): ContentType;
+    setType(type: ContentType|null): void;
+    getOtherTypeCode(): number;
+    setOtherTypeCode(otherTypeCode: number): void;
+    getFreshnessPeriod(): number;
+    setFreshnessPeriod(freshness: number): void;
+    getFinalBlockId(): Name.Component;
+    setFinalBlockId(comp: Name.ComponentCtor): void;
+}
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index 7646134cb6..ebd46601ba 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,6 +1,8 @@
 export as namespace ndn;
 export * from "./blob";
+export * from "./data";
 export * from "./face";
 export * from "./interest";
 export * from "./name";
+export * from "./signature";
 export * from "./transport";
diff --git a/types/ndn-js/interest.d.ts b/types/ndn-js/interest.d.ts
index 94f826dc6a..fd20be4492 100644
--- a/types/ndn-js/interest.d.ts
+++ b/types/ndn-js/interest.d.ts
@@ -7,7 +7,7 @@ export class Interest {
     constructor(name?: NameCtor);
     constructor(interest: Interest);
 
-    // field accessors
+    // accessors
     getName(): Name;
     setName(name: NameCtor): Interest;
     getCanBePrefix(): boolean;
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index b4eea8064a..9a72d7020b 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -1,7 +1,7 @@
 import { Blob, BlobLike } from "./blob";
 
 export namespace Name {
-    type ComponentCtorValue = string|number[]|ArrayBuffer|Buffer;
+    type ComponentCtor = string|number[]|ArrayBuffer|Buffer;
     type CompareResult = -1|0|1;
 
     enum ComponentType {
@@ -14,8 +14,8 @@ export namespace Name {
     class Component {
         constructor();
         constructor(comp: Component);
-        constructor(value: ComponentCtorValue, type?: ComponentType);
-        constructor(value: ComponentCtorValue, type: ComponentType.OTHER_CODE, otherTypeCode: number);
+        constructor(value: ComponentCtor, type?: ComponentType);
+        constructor(value: ComponentCtor, type: ComponentType.OTHER_CODE, otherTypeCode: number);
 
         // accessors
         getType(): ComponentType;
@@ -59,10 +59,11 @@ export namespace Name {
     }
 }
 
-export type NameCtor = string|Name|Array<Name.ComponentCtorValue|Name>;
+export type NameCtor = string|Name;
 
 export class Name {
-    constructor(arg?: NameCtor);
+    constructor(name?: NameCtor);
+    constructor(components: Array<Name.ComponentCtor|Name>);
 
     // accessors
     set(uri: string): void;
@@ -75,8 +76,8 @@ export class Name {
     // append
     append(component: Name.Component): Name;
     append(component: Name): Name;
-    append(value: Name.ComponentCtorValue, type?: Name.ComponentType): Name;
-    append(value: Name.ComponentCtorValue, type: Name.ComponentType.OTHER_CODE, otherTypeCode: number): Name;
+    append(value: Name.ComponentCtor, type?: Name.ComponentType): Name;
+    append(value: Name.ComponentCtor, type: Name.ComponentType.OTHER_CODE, otherTypeCode: number): Name;
     appendSegment(segment: number): Name;
     appendSegmentOffset(segmentOffset: number): Name;
     appendVersion(version: number): Name;
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
index 005aad2d4d..eaade07186 100644
--- a/types/ndn-js/ndn-js-tests.ts
+++ b/types/ndn-js/ndn-js-tests.ts
@@ -120,13 +120,45 @@ function testInterest() {
     interest.refreshNonce();
     const n: number = interest.setInterestLifetimeMilliseconds(8888).getInterestLifetimeMilliseconds();
 
-    b = interest.matchesData({});
+    b = interest.matchesData(new ndn.Data());
     b = interest.matchesName(name);
 
     blob = name.wireEncode();
     name.wireDecode(blob);
 }
 
+function testData() {
+    let meta = new ndn.MetaInfo();
+    meta = new ndn.MetaInfo(meta);
+    let n: number = meta.getType();
+    meta.setType(ndn.ContentType.OTHER_CODE);
+    n = meta.getOtherTypeCode();
+    meta.setOtherTypeCode(25);
+    n = meta.getFreshnessPeriod();
+    meta.setFreshnessPeriod(5000);
+    const comp: ndn.Name.Component = meta.getFinalBlockId();
+    meta.setFinalBlockId("A");
+
+    let sig: ndn.Signature = new ndn.DigestSha256Signature();
+    sig = new ndn.GenericSignature();
+    sig = new ndn.Sha256WithRsaSignature();
+    sig = new ndn.Sha256WithEcdsaSignature();
+
+    let data = new ndn.Data();
+    data = new ndn.Data("/A");
+    data = new ndn.Data("/A", new ndn.Blob());
+    data = new ndn.Data("/A", meta, Buffer.alloc(4));
+
+    let name: ndn.Name = data.setName("/B").getName();
+    meta = data.setMetaInfo(meta).getMetaInfo();
+    let blob: ndn.Blob = data.setContent(Buffer.alloc(4)).getContent();
+    sig = data.setSignature(sig).getSignature();
+
+    name = data.getFullName();
+    blob = data.wireEncode();
+    data.wireDecode(blob);
+}
+
 function testFaceTransport() {
     let face = new ndn.Face();
     face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
diff --git a/types/ndn-js/signature.d.ts b/types/ndn-js/signature.d.ts
new file mode 100644
index 0000000000..72ce443b41
--- /dev/null
+++ b/types/ndn-js/signature.d.ts
@@ -0,0 +1,66 @@
+import { Blob, BlobLike } from "./blob";
+import { Name } from "./name";
+
+export enum KeyLocatorType {
+    KEYNAME = 1,
+    KEY_LOCATOR_DIGEST = 2,
+}
+
+export class KeyLocator {
+    constructor(kl?: KeyLocator);
+
+    getKeyData(): Blob;
+    getKeyName(): Name;
+    getType(): KeyLocatorType;
+
+    setKeyData(keyData: Blob): void;
+    setKeyName(name: Name): void;
+    setType(type: KeyLocatorType): void;
+
+    clear(): void;
+}
+
+export type ValidityPeriod = any;
+
+export interface Signature {
+    clone(): Signature;
+}
+
+export class SignatureBase<T extends Signature> implements Signature {
+    constructor();
+    clone(): T;
+
+    getSignature(): Blob;
+    setSignature(sigValue: BlobLike): void;
+}
+
+export class SignatureBaseKl<T extends Signature> extends SignatureBase<T> {
+    getKeyLocator(): KeyLocator;
+    setKeyLocator(kl?: KeyLocator): void;
+}
+
+export class SignatureBaseKlVp<T extends Signature> extends SignatureBaseKl<T> {
+    getValidityPeriod(): ValidityPeriod;
+    setValidityPeriod(validity?: ValidityPeriod): void;
+}
+
+export class DigestSha256Signature extends SignatureBase<DigestSha256Signature> {
+}
+
+export class GenericSignature extends SignatureBase<GenericSignature> {
+    constructor();
+    clone(): GenericSignature;
+
+    getTypeCode(): number;
+    getSignatureInfoEncoding(): Blob;
+    setSignatureInfoEncoding(encoding: Blob, typeCode?: number): void;
+}
+
+export class Sha256WithRsaSignature extends SignatureBaseKlVp<Sha256WithRsaSignature> {
+}
+
+export class Sha256WithEcdsaSignature extends SignatureBaseKlVp<Sha256WithEcdsaSignature> {
+}
+
+export class HmacWithSha25Signature extends SignatureBaseKl<HmacWithSha25Signature> {
+}

From 06035ab117bbf00921ee821851a2a3b6a7447b39 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 21:53:32 -0400
Subject: [PATCH 860/924] ndn-js: follow ndn-ccl-api and split tests

---
 types/ndn-js/blob-test.ts      |  20 ++++
 types/ndn-js/blob.d.ts         |  12 +--
 types/ndn-js/data-test.ts      |  34 +++++++
 types/ndn-js/data.d.ts         |  44 +++++----
 types/ndn-js/face-test.ts      |   3 +
 types/ndn-js/index.d.ts        |   1 +
 types/ndn-js/interest-test.ts  |  28 ++++++
 types/ndn-js/interest.d.ts     |  32 +++----
 types/ndn-js/name-test.ts      |  82 ++++++++++++++++
 types/ndn-js/name.d.ts         | 128 +++++++++++--------------
 types/ndn-js/ndn-js-tests.ts   | 168 ---------------------------------
 types/ndn-js/signature-test.ts |  60 ++++++++++++
 types/ndn-js/signature.d.ts    |  11 +--
 types/ndn-js/transport-test.ts |   6 ++
 types/ndn-js/tsconfig.json     |   8 +-
 15 files changed, 342 insertions(+), 295 deletions(-)
 create mode 100644 types/ndn-js/blob-test.ts
 create mode 100644 types/ndn-js/data-test.ts
 create mode 100644 types/ndn-js/face-test.ts
 create mode 100644 types/ndn-js/interest-test.ts
 create mode 100644 types/ndn-js/name-test.ts
 delete mode 100644 types/ndn-js/ndn-js-tests.ts
 create mode 100644 types/ndn-js/signature-test.ts
 create mode 100644 types/ndn-js/transport-test.ts

diff --git a/types/ndn-js/blob-test.ts b/types/ndn-js/blob-test.ts
new file mode 100644
index 0000000000..b5540b831b
--- /dev/null
+++ b/types/ndn-js/blob-test.ts
@@ -0,0 +1,20 @@
+/// <reference types="node"/>
+import ndn = require("ndn-js");
+
+let blob = new ndn.Blob();
+blob = new ndn.Blob(blob);
+blob = new ndn.Blob(Buffer.alloc(4));
+blob = new ndn.Blob([0x08, 0x01, 0x41]);
+blob = new ndn.Blob("str");
+
+let buf: Buffer = blob.buf();
+let b: boolean = blob.equals(blob);
+b = blob.isNull();
+let n: number = blob.size();
+
+let sb = new ndn.SignedBlob();
+sb = new ndn.SignedBlob(blob, 20, 40);
+n = sb.getSignedPortionBeginOffset();
+n = sb.getSignedPortionEndOffset();
+buf = sb.signedBuf();
+n = sb.signedSize();
diff --git a/types/ndn-js/blob.d.ts b/types/ndn-js/blob.d.ts
index 562f05cda5..eaaabb9dda 100644
--- a/types/ndn-js/blob.d.ts
+++ b/types/ndn-js/blob.d.ts
@@ -1,25 +1,21 @@
-export type BlobLike = Blob|Buffer;
-
 export class Blob {
     constructor(value?: Blob);
     constructor(value: Buffer, copy?: boolean);
     constructor(value: number[]);
     constructor(value: string);
 
-    size(): number;
     buf(): Buffer;
-    isNull(): boolean;
-    toHex(): string;
-    toString(): string;
     equals(other: Blob): boolean;
+    isNull(): boolean;
+    size(): number;
 }
 
 export class SignedBlob extends Blob {
     constructor();
     constructor(value: Blob|Buffer|number[], signedPortionBeginOffset: number, signedPortionEndOffset: number);
 
-    signedSize(): number;
-    signedBuf(): Buffer;
     getSignedPortionBeginOffset(): number;
     getSignedPortionEndOffset(): number;
+    signedBuf(): Buffer;
+    signedSize(): number;
 }
diff --git a/types/ndn-js/data-test.ts b/types/ndn-js/data-test.ts
new file mode 100644
index 0000000000..feea541a19
--- /dev/null
+++ b/types/ndn-js/data-test.ts
@@ -0,0 +1,34 @@
+/// <reference types="node"/>
+import ndn = require("ndn-js");
+
+let meta = new ndn.MetaInfo();
+meta = new ndn.MetaInfo(meta);
+const comp: ndn.Name.Component = meta.getFinalBlockId();
+let n: number = meta.getFreshnessPeriod();
+n = meta.getOtherTypeCode();
+const ct: ndn.ContentType = meta.getType();
+
+meta.setFinalBlockId(comp);
+meta.setFreshnessPeriod(5000);
+meta.setOtherTypeCode(1000);
+meta.setType(ndn.ContentType.OTHER_CODE);
+
+let data = new ndn.Data();
+data = new ndn.Data(new ndn.Name("/A"));
+
+n = data.getCongestionMark();
+let blob: ndn.Blob = data.getContent();
+let name: ndn.Name = data.getName();
+n = data.getIncomingFaceId();
+meta = data.getMetaInfo();
+name = data.getName();
+const sig: ndn.Signature = data.getSignature();
+
+data = data.setContent(blob)
+           .setMetaInfo(meta)
+           .setName(name)
+           .setSignature(sig);
+
+data.wireDecode(blob);
+data.wireDecode(Buffer.alloc(4));
+blob = data.wireEncode();
diff --git a/types/ndn-js/data.d.ts b/types/ndn-js/data.d.ts
index 3682d055ff..d76dd02779 100644
--- a/types/ndn-js/data.d.ts
+++ b/types/ndn-js/data.d.ts
@@ -1,28 +1,25 @@
-import { Blob, BlobLike } from "./blob";
-import { NameCtor, Name } from "./name";
+import { Blob } from "./blob";
+import { Name } from "./name";
 import { Signature } from "./signature";
 
 export class Data {
-    constructor(name?: NameCtor, content?: BlobLike);
-    constructor(name: NameCtor, metaInfo: MetaInfo, content: Buffer);
-    constructor(data: Data);
+    constructor(name?: Name);
 
-    // accessors
-    getName(): Name;
-    setName(name: NameCtor): Data;
-    getMetaInfo(): MetaInfo;
-    setMetaInfo(meta: MetaInfo): Data;
+    getCongestionMark(): number;
     getContent(): Blob;
-    setContent(content: BlobLike): Data;
+    getFullName(): Name;
+    getIncomingFaceId(): number;
+    getMetaInfo(): MetaInfo;
+    getName(): Name;
     getSignature(): Signature;
+
+    setContent(content: Blob): Data;
+    setMetaInfo(meta: MetaInfo): Data;
+    setName(name: Name): Data;
     setSignature(sig: Signature): Data;
 
-    // algorithms
-    getFullName(): Name;
-
-    // encoding
+    wireDecode(input: Blob|Buffer): void;
     wireEncode(): Blob;
-    wireDecode(input: BlobLike): void;
 }
 
 export enum ContentType {
@@ -36,12 +33,13 @@ export enum ContentType {
 export class MetaInfo {
     constructor(meta?: MetaInfo);
 
-    getType(): ContentType;
-    setType(type: ContentType|null): void;
-    getOtherTypeCode(): number;
-    setOtherTypeCode(otherTypeCode: number): void;
-    getFreshnessPeriod(): number;
-    setFreshnessPeriod(freshness: number): void;
     getFinalBlockId(): Name.Component;
-    setFinalBlockId(comp: Name.ComponentCtor): void;
+    getFreshnessPeriod(): number;
+    getOtherTypeCode(): number;
+    getType(): ContentType;
+
+    setFinalBlockId(comp: Name.Component): void;
+    setFreshnessPeriod(freshness: number): void;
+    setOtherTypeCode(otherTypeCode: number): void;
+    setType(type: ContentType): void;
 }
diff --git a/types/ndn-js/face-test.ts b/types/ndn-js/face-test.ts
new file mode 100644
index 0000000000..f2afe7bed1
--- /dev/null
+++ b/types/ndn-js/face-test.ts
@@ -0,0 +1,3 @@
+import ndn = require("ndn-js");
+
+const face = new ndn.Face();
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index ebd46601ba..d6c46c551b 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,6 +1,7 @@
 export as namespace ndn;
 export * from "./blob";
 export * from "./data";
+export * from "./delegation-set";
 export * from "./face";
 export * from "./interest";
 export * from "./name";
diff --git a/types/ndn-js/interest-test.ts b/types/ndn-js/interest-test.ts
new file mode 100644
index 0000000000..9f964fd2ed
--- /dev/null
+++ b/types/ndn-js/interest-test.ts
@@ -0,0 +1,28 @@
+/// <reference types="node"/>
+import ndn = require("ndn-js");
+
+let interest = new ndn.Interest();
+interest = new ndn.Interest(new ndn.Name("/A"));
+interest = new ndn.Interest(interest);
+
+let b: boolean = interest.getCanBePrefix();
+const fh: ndn.DelegationSet = interest.getForwardingHint();
+let n: number = interest.getIncomingFaceId();
+n = interest.getInterestLifetimeMilliseconds();
+b = interest.getMustBeFresh();
+const name: ndn.Name = interest.getName();
+let blob: ndn.Blob = interest.getNonce();
+
+interest = interest.setCanBePrefix(true)
+                   .setForwardingHint(fh)
+                   .setInterestLifetimeMilliseconds(2000)
+                   .setMustBeFresh(true)
+                   .setName(name);
+
+b = interest.matchesData(new ndn.Data());
+b = interest.matchesName(name);
+interest.refreshNonce();
+
+interest.wireDecode(blob);
+interest.wireDecode(Buffer.alloc(4));
+blob = interest.wireEncode();
diff --git a/types/ndn-js/interest.d.ts b/types/ndn-js/interest.d.ts
index fd20be4492..f3b5bc88b4 100644
--- a/types/ndn-js/interest.d.ts
+++ b/types/ndn-js/interest.d.ts
@@ -1,31 +1,29 @@
-import { Blob, BlobLike } from "./blob";
+import { Blob } from "./blob";
 import { Data } from "./data";
 import { DelegationSet } from "./delegation-set";
-import { Name, NameCtor } from "./name";
+import { Name } from "./name";
 
 export class Interest {
-    constructor(name?: NameCtor);
+    constructor(name?: Name);
     constructor(interest: Interest);
 
-    // accessors
-    getName(): Name;
-    setName(name: NameCtor): Interest;
     getCanBePrefix(): boolean;
-    setCanBePrefix(canBePrefix: boolean): Interest;
-    getMustBeFresh(): boolean;
-    setMustBeFresh(mustBeFresh: boolean): Interest;
     getForwardingHint(): DelegationSet;
-    setForwardingHint(fh: DelegationSet): Interest;
-    getNonce(): Blob;
-    refreshNonce(): void;
+    getIncomingFaceId(): number;
     getInterestLifetimeMilliseconds(): number;
-    setInterestLifetimeMilliseconds(lifetime: number): Interest;
+    getMustBeFresh(): boolean;
+    getName(): Name;
+    getNonce(): Blob;
+
+    setCanBePrefix(canBePrefix: boolean): Interest;
+    setForwardingHint(fh: DelegationSet): Interest;
+    setInterestLifetimeMilliseconds(lifetime: number): Interest;
+    setMustBeFresh(mustBeFresh: boolean): Interest;
+    setName(name: Name): Interest;
 
-    // algorithms
     matchesData(data: Data): boolean;
     matchesName(name: Name): boolean;
-
-    // encoding
+    refreshNonce(): void;
+    wireDecode(input: Blob|Buffer): void;
     wireEncode(): Blob;
-    wireDecode(input: BlobLike): void;
 }
diff --git a/types/ndn-js/name-test.ts b/types/ndn-js/name-test.ts
new file mode 100644
index 0000000000..beb7e3c26c
--- /dev/null
+++ b/types/ndn-js/name-test.ts
@@ -0,0 +1,82 @@
+/// <reference types="node"/>
+import ndn = require("ndn-js");
+
+const DIGEST = new ndn.Blob(Buffer.alloc(32));
+
+let comp = new ndn.Name.Component();
+comp = new ndn.Name.Component([0x41]);
+comp = new ndn.Name.Component(new ArrayBuffer(4), ndn.ComponentType.GENERIC);
+comp = new ndn.Name.Component(Buffer.alloc(4), ndn.ComponentType.OTHER_CODE, 1000);
+comp = new ndn.Name.Component(new Uint8Array(4));
+comp = new ndn.Name.Component("A");
+comp = new ndn.Name.Component(new ndn.Blob());
+comp = new ndn.Name.Component(comp);
+
+let n: number = comp.compare(comp);
+let b: boolean = comp.equals(comp);
+comp = ndn.Name.Component.fromImplicitSha256Digest(DIGEST);
+comp = ndn.Name.Component.fromParametersSha256Digest(DIGEST);
+n = comp.getOtherTypeCode();
+comp = comp.getSuccessor();
+const ct: ndn.ComponentType = comp.getType();
+let blob: ndn.Blob = comp.getValue();
+b = comp.isGeneric();
+b = comp.isImplicitSha256Digest();
+b = comp.isParametersSha256Digest();
+let s: string = comp.toEscapedString();
+
+comp = ndn.Name.Component.fromNumber(200);
+comp = ndn.Name.Component.fromNumber(200, ndn.ComponentType.OTHER_CODE, 1000);
+comp = ndn.Name.Component.fromNumberWithMarker(200, 0xFD);
+comp = ndn.Name.Component.fromSegment(0);
+comp = ndn.Name.Component.fromSegmentOffset(0);
+comp = ndn.Name.Component.fromSequenceNumber(1);
+comp = ndn.Name.Component.fromTimestamp(123456789);
+comp = ndn.Name.Component.fromVersion(4);
+
+b = comp.isSegment();
+b = comp.isSegmentOffset();
+b = comp.isSequenceNumber();
+b = comp.isTimestamp();
+b = comp.isVersion();
+
+n = comp.toNumber();
+n = comp.toNumberWithMarker(0xFD);
+n = comp.toSegment();
+n = comp.toSegmentOffset();
+n = comp.toSequenceNumber();
+n = comp.toTimestamp();
+n = comp.toVersion();
+
+let name = new ndn.Name();
+name = new ndn.Name([new ndn.Name.Component("A"), new Uint8Array(2)]);
+name = new ndn.Name("/A");
+name = new ndn.Name(name);
+
+name = name.append(ndn.Name.Component.fromSegment(4))
+           .append("A", ndn.ComponentType.OTHER_CODE, 1000)
+           .appendImplicitSha256Digest(DIGEST)
+           .appendParametersSha256Digest(DIGEST)
+           .appendSegment(0)
+           .appendSegmentOffset(1)
+           .appendSequenceNumber(4)
+           .appendTimestamp(3)
+           .appendVersion(2);
+
+name.clear();
+n = name.compare(name);
+n = name.compare(0, 2, name, 1, 3);
+b = name.equals(name);
+name = ndn.Name.fromEscapedString(s);
+comp = name.get(2);
+name = name.getPrefix(3);
+name = name.getSubName(1).getSubName(1, 4);
+name = name.getSuccessor();
+b = name.match(name);
+name.set("/B");
+n = name.size();
+s = name.toUri();
+s = name.toUri(true);
+name.wireDecode(blob);
+name.wireDecode(Buffer.alloc(4));
+blob = name.wireEncode();
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index 9a72d7020b..5519b28a9a 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -1,103 +1,89 @@
-import { Blob, BlobLike } from "./blob";
+import { Blob } from "./blob";
+
+export enum ComponentType {
+    IMPLICIT_SHA256_DIGEST = 1,
+    PARAMETERS_SHA256_DIGEST = 2,
+    GENERIC = 8,
+    OTHER_CODE = 0x7fff,
+}
+
+export type CompareResult = -1|0|1;
 
 export namespace Name {
-    type ComponentCtor = string|number[]|ArrayBuffer|Buffer;
-    type CompareResult = -1|0|1;
-
-    enum ComponentType {
-        IMPLICIT_SHA256_DIGEST = 1,
-        PARAMETERS_SHA256_DIGEST = 2,
-        GENERIC = 8,
-        OTHER_CODE = 0x7fff,
-    }
-
     class Component {
-        constructor();
-        constructor(comp: Component);
-        constructor(value: ComponentCtor, type?: ComponentType);
-        constructor(value: ComponentCtor, type: ComponentType.OTHER_CODE, otherTypeCode: number);
+        constructor(value?: number[]|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number);
+        constructor(component: Component);
 
-        // accessors
-        getType(): ComponentType;
-        getOtherTypeCode(): number;
-        getValue(): Blob;
-        toEscapedString(): string;
-
-        // algorithms
-        getSuccessor(): Component;
-        equals(other: Component): boolean;
         compare(other: Component): CompareResult;
-
-        // digest types
+        equals(other: Component): boolean;
+        static fromImplicitSha256Digest(digest: Blob): Component;
+        static fromParametersSha256Digest(digest: Blob): Component;
+        getOtherTypeCode(): number;
+        getSuccessor(): Component;
+        getType(): ComponentType;
+        getValue(): Blob;
+        isGeneric(): boolean;
         isImplicitSha256Digest(): boolean;
         isParametersSha256Digest(): boolean;
-        static fromImplicitSha256Digest(digest: BlobLike): Component;
-        static fromParametersSha256Digest(digest: BlobLike): Component;
+        toEscapedString(): string;
+
+        static fromNumber(number: number, type?: ComponentType, otherTypeCode?: number): Component;
+        static fromNumberWithMarker(number: number, marker: number): Component;
+        static fromSegment(segment: number): Component;
+        static fromSegmentOffset(segmentOffset: number): Component;
+        static fromSequenceNumber(sequenceNumber: number): Component;
+        static fromTimestamp(timestamp: number): Component;
+        static fromVersion(version: number): Component;
 
-        // naming conventions
         isSegment(): boolean;
         isSegmentOffset(): boolean;
-        isVersion(): boolean;
-        isTimestamp(): boolean;
         isSequenceNumber(): boolean;
-        isGeneric(): boolean;
+        isTimestamp(): boolean;
+        isVersion(): boolean;
+
         toNumber(): number;
         toNumberWithMarker(marker: number): number;
         toSegment(): number;
         toSegmentOffset(): number;
-        toVersion(): number;
-        toTimestamp(): number;
         toSequenceNumber(): number;
-        static fromNumber(number: number, type?: ComponentType): Component;
-        static fromNumber(number: number, type: ComponentType.OTHER_CODE, otherTypeCode: number): Component;
-        static fromNumberWithMarker(number: number, marker: number): Component;
-        static fromSegment(segment: number): Component;
-        static fromSegmentOffset(segmentOffset: number): Component;
-        static fromVersion(version: number): Component;
-        static fromTimestamp(timestamp: number): Component;
-        static fromSequenceNumber(sequenceNumber: number): Component;
+        toTimestamp(): number;
+        toVersion(): number;
     }
 }
 
-export type NameCtor = string|Name;
-
 export class Name {
-    constructor(name?: NameCtor);
-    constructor(components: Array<Name.ComponentCtor|Name>);
+    constructor(components?: Array<Name.Component|Uint8Array>);
+    constructor(uri: string);
+    constructor(name: Name);
 
-    // accessors
-    set(uri: string): void;
-    clear(): void;
-    getSubName(iStartComponent: number, nComponents?: number): Name;
-    getPrefix(nComponents: number): Name;
-    size(): number;
-    get(i: number): Name.Component;
-
-    // append
+    append(value: number[]|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
     append(component: Name.Component): Name;
-    append(component: Name): Name;
-    append(value: Name.ComponentCtor, type?: Name.ComponentType): Name;
-    append(value: Name.ComponentCtor, type: Name.ComponentType.OTHER_CODE, otherTypeCode: number): Name;
+    append(name: Name): Name;
+    appendImplicitSha256Digest(digest: Blob): Name;
+    appendParametersSha256Digest(digest: Blob): Name;
     appendSegment(segment: number): Name;
     appendSegmentOffset(segmentOffset: number): Name;
-    appendVersion(version: number): Name;
-    appendTimestamp(timestamp: number): Name;
     appendSequenceNumber(sequenceNumber: number): Name;
-    appendImplicitSha256Digest(digest: BlobLike): Name;
-    appendParametersSha256Digest(digest: BlobLike): Name;
+    appendTimestamp(timestamp: number): Name;
+    appendVersion(version: number): Name;
 
-    // algorithms
-    compare(other: Name): Name.CompareResult;
+    clear(): void;
+
+    compare(other: Name): CompareResult;
     compare(iStartComponent: number, nComponents: number, other: Name,
-            iOtherStartComponent?: number, nOtherComponents?: number): Name.CompareResult;
+            iOtherStartComponent?: number, nOtherComponents?: number): CompareResult;
+
     equals(other: Name): boolean;
+    static fromEscapedString(uri: string): Name;
+    get(i: number): Name.Component;
+    getPrefix(nComponents: number): Name;
+    getSubName(iStartComponent: number, nComponents?: number): Name;
     getSuccessor(): Name;
     match(name: Name): boolean;
-    isPrefixOf(name: Name): boolean;
-
-    // encoding
-    wireEncode(): Blob;
-    wireDecode(input: BlobLike): void;
+    set(uri: string): void;
+    size(): number;
     toUri(includeScheme?: boolean): string;
-    static fromEscapedString(uri: string): Name;
+
+    wireDecode(input: Blob|Buffer): void;
+    wireEncode(): Blob;
 }
diff --git a/types/ndn-js/ndn-js-tests.ts b/types/ndn-js/ndn-js-tests.ts
deleted file mode 100644
index eaade07186..0000000000
--- a/types/ndn-js/ndn-js-tests.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-/// <reference types="node"/>
-import ndn = require("ndn-js");
-
-function testBlob() {
-    let blob = new ndn.Blob();
-    blob = new ndn.Blob(blob);
-    blob = new ndn.Blob(Buffer.alloc(4));
-    blob = new ndn.Blob([0x08, 0x01, 0x41]);
-    blob = new ndn.Blob("str");
-
-    let n: number = blob.size();
-    let buf: Buffer = blob.buf();
-    let b: boolean = blob.equals(blob);
-    let s: string = blob.toHex();
-    s = blob.toString();
-    b = blob.isNull();
-
-    let sb = new ndn.SignedBlob();
-    sb = new ndn.SignedBlob(sb, 20, 40);
-    n = sb.signedSize();
-    buf = sb.signedBuf();
-    n = sb.getSignedPortionBeginOffset();
-    n = sb.getSignedPortionEndOffset();
-}
-
-function testName() {
-    const digestBlob = new ndn.Blob([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-
-    let comp = new ndn.Name.Component();
-    comp = new ndn.Name.Component(comp);
-    comp = new ndn.Name.Component("A");
-    comp = new ndn.Name.Component([0x41], ndn.Name.ComponentType.GENERIC);
-    comp = new ndn.Name.Component([0x41], ndn.Name.ComponentType.OTHER_CODE, 1000);
-
-    let blob: ndn.Blob = comp.getValue();
-    const ct: ndn.Name.ComponentType = comp.getType();
-    let n: number = comp.getOtherTypeCode();
-    let s: string = comp.toEscapedString();
-
-    comp = comp.getSuccessor();
-    let b: boolean = comp.equals(comp);
-    n = comp.compare(comp);
-
-    b = comp.isImplicitSha256Digest();
-    b = comp.isParametersSha256Digest();
-    comp = ndn.Name.Component.fromImplicitSha256Digest(digestBlob);
-    comp = ndn.Name.Component.fromParametersSha256Digest(Buffer.alloc(32));
-
-    b = comp.isSegment();
-    b = comp.isSegmentOffset();
-    b = comp.isVersion();
-    b = comp.isTimestamp();
-    b = comp.isSequenceNumber();
-    b = comp.isGeneric();
-
-    n = comp.toNumber();
-    n = comp.toNumberWithMarker(0xFD);
-    n = comp.toSegment();
-    n = comp.toSegmentOffset();
-    n = comp.toVersion();
-    n = comp.toTimestamp();
-    n = comp.toSequenceNumber();
-
-    comp = ndn.Name.Component.fromNumber(200);
-    comp = ndn.Name.Component.fromNumber(200, ndn.Name.ComponentType.OTHER_CODE, 1000);
-    comp = ndn.Name.Component.fromNumberWithMarker(200, 0xFD);
-    comp = ndn.Name.Component.fromSegment(0);
-    comp = ndn.Name.Component.fromSegmentOffset(0);
-    comp = ndn.Name.Component.fromVersion(4);
-    comp = ndn.Name.Component.fromTimestamp(123456789);
-    comp = ndn.Name.Component.fromSequenceNumber(1);
-
-    let name = new ndn.Name();
-    name = new ndn.Name("/A");
-    name = new ndn.Name(name);
-    name = new ndn.Name(["A", Buffer.from([0x42]), name]);
-
-    name.set("/B");
-    name.clear();
-    name = name.getSubName(1)
-               .getSubName(1, 4)
-               .getPrefix(3);
-    n = name.size();
-    comp = name.get(2);
-
-    name = name.append(ndn.Name.Component.fromSegment(4))
-               .append("A", ndn.Name.ComponentType.OTHER_CODE, 1000)
-               .appendSegment(0)
-               .appendSegmentOffset(1)
-               .appendVersion(2)
-               .appendTimestamp(3)
-               .appendSequenceNumber(4)
-               .appendImplicitSha256Digest(digestBlob)
-               .appendParametersSha256Digest(Buffer.alloc(32));
-
-    n = name.compare(name);
-    n = name.compare(0, 2, name, 1, 3);
-    b = name.equals(name);
-    name = name.getSuccessor();
-    b = name.match(name);
-    b = name.isPrefixOf(name);
-
-    blob = name.wireEncode();
-    name.wireDecode(blob);
-    s = name.toUri();
-    name = ndn.Name.fromEscapedString(s);
-}
-
-function testInterest() {
-    let interest = new ndn.Interest();
-    interest = new ndn.Interest("/A");
-    interest = new ndn.Interest(interest);
-
-    const name: ndn.Name = interest.setName("/B").getName();
-    let b: boolean = interest.setCanBePrefix(false).getCanBePrefix();
-    b = interest.setMustBeFresh(true).getMustBeFresh();
-    const fh: any = interest.setForwardingHint({}).getMustBeFresh();
-    let blob: ndn.Blob = interest.getNonce();
-    interest.refreshNonce();
-    const n: number = interest.setInterestLifetimeMilliseconds(8888).getInterestLifetimeMilliseconds();
-
-    b = interest.matchesData(new ndn.Data());
-    b = interest.matchesName(name);
-
-    blob = name.wireEncode();
-    name.wireDecode(blob);
-}
-
-function testData() {
-    let meta = new ndn.MetaInfo();
-    meta = new ndn.MetaInfo(meta);
-    let n: number = meta.getType();
-    meta.setType(ndn.ContentType.OTHER_CODE);
-    n = meta.getOtherTypeCode();
-    meta.setOtherTypeCode(25);
-    n = meta.getFreshnessPeriod();
-    meta.setFreshnessPeriod(5000);
-    const comp: ndn.Name.Component = meta.getFinalBlockId();
-    meta.setFinalBlockId("A");
-
-    let sig: ndn.Signature = new ndn.DigestSha256Signature();
-    sig = new ndn.GenericSignature();
-    sig = new ndn.Sha256WithRsaSignature();
-    sig = new ndn.Sha256WithEcdsaSignature();
-
-    let data = new ndn.Data();
-    data = new ndn.Data("/A");
-    data = new ndn.Data("/A", new ndn.Blob());
-    data = new ndn.Data("/A", meta, Buffer.alloc(4));
-
-    let name: ndn.Name = data.setName("/B").getName();
-    meta = data.setMetaInfo(meta).getMetaInfo();
-    let blob: ndn.Blob = data.setContent(Buffer.alloc(4)).getContent();
-    sig = data.setSignature(sig).getSignature();
-
-    name = data.getFullName();
-    blob = data.wireEncode();
-    data.wireDecode(blob);
-}
-
-function testFaceTransport() {
-    let face = new ndn.Face();
-    face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
-    face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
-    face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
-    face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
-}
diff --git a/types/ndn-js/signature-test.ts b/types/ndn-js/signature-test.ts
new file mode 100644
index 0000000000..026edf9556
--- /dev/null
+++ b/types/ndn-js/signature-test.ts
@@ -0,0 +1,60 @@
+import ndn = require("ndn-js");
+
+let kl: ndn.KeyLocator = new ndn.KeyLocator();
+kl = new ndn.KeyLocator(kl);
+
+let blob: ndn.Blob = kl.getKeyData();
+const name: ndn.Name = kl.getKeyName();
+const klt: ndn.KeyLocatorType = kl.getType();
+
+kl.setKeyData(blob);
+kl.setKeyName(name);
+kl.setType(ndn.KeyLocatorType.KEY_LOCATOR_DIGEST);
+
+kl.clear();
+
+let validity: ndn.ValidityPeriod;
+
+let sig0 = new ndn.DigestSha256Signature();
+blob = sig0.getSignature();
+sig0.setSignature(blob);
+sig0 = sig0.clone();
+let sig: ndn.Signature = sig0;
+
+let sigG = new ndn.GenericSignature();
+blob = sigG.getSignature();
+blob = sigG.getSignatureInfoEncoding();
+const n: number = sigG.getTypeCode();
+sigG.setSignature(blob);
+sigG.setSignatureInfoEncoding(blob);
+sigG.setSignatureInfoEncoding(blob, 1000);
+sigG = sigG.clone();
+sig = sigG;
+
+let sig1 = new ndn.Sha256WithRsaSignature();
+kl = sig1.getKeyLocator();
+blob = sig1.getSignature();
+validity = sig1.getValidityPeriod();
+sig1.setKeyLocator(kl);
+sig1.setSignature(blob);
+sig1.setValidityPeriod(validity);
+sig1 = sig1.clone();
+sig = sig1;
+
+let sig3 = new ndn.Sha256WithEcdsaSignature();
+kl = sig3.getKeyLocator();
+blob = sig3.getSignature();
+validity = sig3.getValidityPeriod();
+sig3.setKeyLocator(kl);
+sig3.setSignature(blob);
+sig3.setValidityPeriod(validity);
+sig3 = sig3.clone();
+sig = sig3;
+
+let sig4 = new ndn.HmacWithSha25Signature();
+kl = sig4.getKeyLocator();
+blob = sig4.getSignature();
+sig4.setKeyLocator(kl);
+sig4.setSignature(blob);
+sig4 = sig4.clone();
+sig = sig4;
diff --git a/types/ndn-js/signature.d.ts b/types/ndn-js/signature.d.ts
index 72ce443b41..cd33bfbbc0 100644
--- a/types/ndn-js/signature.d.ts
+++ b/types/ndn-js/signature.d.ts
@@ -1,4 +1,4 @@
-import { Blob, BlobLike } from "./blob";
+import { Blob } from "./blob";
 import { Name } from "./name";
 
 export enum KeyLocatorType {
@@ -28,10 +28,9 @@ export interface Signature {
 
 export class SignatureBase<T extends Signature> implements Signature {
     constructor();
-    clone(): T;
-
     getSignature(): Blob;
-    setSignature(sigValue: BlobLike): void;
+    setSignature(sigValue: Blob): void;
+    clone(): T;
 }
 
 export class SignatureBaseKl<T extends Signature> extends SignatureBase<T> {
@@ -49,10 +48,8 @@ export class DigestSha256Signature extends SignatureBase<DigestSha256Signature>
 
 export class GenericSignature extends SignatureBase<GenericSignature> {
     constructor();
-    clone(): GenericSignature;
-
-    getTypeCode(): number;
     getSignatureInfoEncoding(): Blob;
+    getTypeCode(): number;
     setSignatureInfoEncoding(encoding: Blob, typeCode?: number): void;
 }
 
diff --git a/types/ndn-js/transport-test.ts b/types/ndn-js/transport-test.ts
new file mode 100644
index 0000000000..0a95844ce4
--- /dev/null
+++ b/types/ndn-js/transport-test.ts
@@ -0,0 +1,6 @@
+import ndn = require("ndn-js");
+
+let face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
+face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
+face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
diff --git a/types/ndn-js/tsconfig.json b/types/ndn-js/tsconfig.json
index 1568d2bd35..ba0723ec4d 100644
--- a/types/ndn-js/tsconfig.json
+++ b/types/ndn-js/tsconfig.json
@@ -18,6 +18,12 @@
     },
     "files": [
         "index.d.ts",
-        "ndn-js-tests.ts"
+        "blob-test.ts",
+        "data-test.ts",
+        "face-test.ts",
+        "interest-test.ts",
+        "name-test.ts",
+        "signature-test.ts",
+        "transport-test.ts"
     ]
 }

From 6dc4a94d5a76ce6fe2e9b21b8b9f58f67f0765d5 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 22:29:09 -0400
Subject: [PATCH 861/924] ndn-js: Face

---
 types/ndn-js/face-test.ts      | 44 ++++++++++++++++++++++++++++
 types/ndn-js/face.d.ts         | 52 +++++++++++++++++++++++++++++++---
 types/ndn-js/index.d.ts        |  2 ++
 types/ndn-js/key-chain.d.ts    |  1 +
 types/ndn-js/network-nack.d.ts |  1 +
 types/ndn-js/transport-test.ts |  9 ++++--
 6 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 types/ndn-js/key-chain.d.ts
 create mode 100644 types/ndn-js/network-nack.d.ts

diff --git a/types/ndn-js/face-test.ts b/types/ndn-js/face-test.ts
index f2afe7bed1..738385f6ef 100644
--- a/types/ndn-js/face-test.ts
+++ b/types/ndn-js/face-test.ts
@@ -1,3 +1,47 @@
 import ndn = require("ndn-js");
 
+let filter = new ndn.InterestFilter("/A");
+filter = new ndn.InterestFilter(new ndn.Name("/A"), "<>{2}");
+filter = new ndn.InterestFilter(filter);
+
+let b: boolean = filter.doesMatch(new ndn.Name("/B"));
+const name: ndn.Name = filter.getPrefix();
+const s: string = filter.getRegexFilter();
+b = filter.hasRegexFilter();
+
 const face = new ndn.Face();
+
+let n: number = face.expressInterest(new ndn.Interest(),
+    (interest: ndn.Interest, data: ndn.Data) => {});
+face.expressInterest(new ndn.Name("/A"),
+    (interest: ndn.Interest, data: ndn.Data) => {},
+    (interest: ndn.Interest) => {});
+face.expressInterest(new ndn.Name("/A"),
+    new ndn.Interest().setCanBePrefix(true),
+    (interest: ndn.Interest, data: ndn.Data) => {},
+    (interest: ndn.Interest) => {},
+    (interest: ndn.Interest, nack: ndn.NetworkNack) => {});
+
+n = ndn.Face.getMaxNdnPacketSize();
+face.putData(new ndn.Data());
+
+n = face.registerPrefix(new ndn.Name("/A"),
+    (prefix: ndn.Name, interest: ndn.Interest) => {},
+    (prefix: ndn.Name) => {});
+face.registerPrefix(new ndn.Name("/A"),
+    (prefix: ndn.Name, interest: ndn.Interest) => {},
+    (prefix: ndn.Name) => {},
+    (prefix: ndn.Name, id: number) => {});
+
+face.removePendingInterest(n);
+face.removeRegisteredPrefix(n);
+face.send(new ndn.Blob());
+face.setCommandCertificateName(name);
+face.setCommandSigningInfo({}, name);
+
+n = face.setInterestFilter(filter,
+    (prefix: ndn.Name, interest: ndn.Interest, face: ndn.Face, filterId: number, filter: ndn.InterestFilter) => {});
+face.setInterestFilter(name,
+    (prefix: ndn.Name, interest: ndn.Interest) => {});
+
+face.unsetInterestFilter(n);
diff --git a/types/ndn-js/face.d.ts b/types/ndn-js/face.d.ts
index 0049585be6..06143a4614 100644
--- a/types/ndn-js/face.d.ts
+++ b/types/ndn-js/face.d.ts
@@ -1,3 +1,9 @@
+import { Blob } from "./blob";
+import { Data } from "./data";
+import { Interest } from "./interest";
+import { KeyChain } from "./key-chain";
+import { Name } from "./name";
+import { NetworkNack } from "./network-nack";
 import { Transport } from "./transport";
 
 export interface FaceCtorOptions {
@@ -6,12 +12,50 @@ export interface FaceCtorOptions {
     connectionInfo?: Transport.ConnectionInfo|null;
     host?: string|null;
     port?: number|null;
-    onopen?: () => any;
-    onclose?: () => any;
 }
 
+export type OnInterestCallback = (prefix: Name, interest: Interest, face: Face, filterId: number, filter: InterestFilter) => any;
+
 export class Face {
-    constructor();
-    constructor(settings: FaceCtorOptions);
     constructor(transport: Transport, connectionInfo: Transport.ConnectionInfo);
+    constructor(settings?: FaceCtorOptions);
+
+    expressInterest(interest: Interest|Name,
+                    onData: (interest: Interest, data: Data) => any,
+                    onTimeout?: (interest: Interest) => any,
+                    onNetworkNack?: (interest: Interest, nack: NetworkNack) => any): number;
+    expressInterest(name: Name,
+                    interestTemplate: Interest,
+                    onData: (interest: Interest, data: Data) => any,
+                    onTimeout?: (interest: Interest) => any,
+                    onNetworkNack?: (interest: Interest, nack: NetworkNack) => any): number;
+
+    static getMaxNdnPacketSize(): number;
+    putData(data: Data): void;
+
+    registerPrefix(prefix: Name,
+                   onInterest: OnInterestCallback,
+                   onRegisterFailed: (prefix: Name) => any,
+                   onRegisterSuccess?: (prefix: Name, registeredPrefixId: number) => any,
+                   flags?: ForwardingFlags): number;
+
+    removePendingInterest(id: number): void;
+    removeRegisteredPrefix(id: number): void;
+    send(encoding: Blob|Buffer): void;
+    setCommandCertificateName(certificateName: Name): void;
+    setCommandSigningInfo(keyChain: KeyChain, certificateName: Name): void;
+    setInterestFilter(filter: InterestFilter|Name, onInterest: OnInterestCallback): number;
+    unsetInterestFilter(id: number): void;
+}
+
+export type ForwardingFlags = any;
+
+export class InterestFilter {
+    constructor(filter: InterestFilter);
+    constructor(prefix: Name|string, regexFilter?: string);
+
+    doesMatch(name: Name): boolean;
+    getPrefix(): Name;
+    getRegexFilter(): string;
+    hasRegexFilter(): boolean;
 }
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index d6c46c551b..cf3aba3518 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -4,6 +4,8 @@ export * from "./data";
 export * from "./delegation-set";
 export * from "./face";
 export * from "./interest";
+export * from "./key-chain";
 export * from "./name";
+export * from "./network-nack";
 export * from "./signature";
 export * from "./transport";
diff --git a/types/ndn-js/key-chain.d.ts b/types/ndn-js/key-chain.d.ts
new file mode 100644
index 0000000000..1ecb000773
--- /dev/null
+++ b/types/ndn-js/key-chain.d.ts
@@ -0,0 +1 @@
+export type KeyChain = any;
diff --git a/types/ndn-js/network-nack.d.ts b/types/ndn-js/network-nack.d.ts
new file mode 100644
index 0000000000..d1444bf9d5
--- /dev/null
+++ b/types/ndn-js/network-nack.d.ts
@@ -0,0 +1 @@
+export type NetworkNack = any;
diff --git a/types/ndn-js/transport-test.ts b/types/ndn-js/transport-test.ts
index 0a95844ce4..7c5b55dabb 100644
--- a/types/ndn-js/transport-test.ts
+++ b/types/ndn-js/transport-test.ts
@@ -1,6 +1,11 @@
 import ndn = require("ndn-js");
 
-let face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
-face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+let face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
 face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
 face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+
+face = new ndn.Face({host: 'hobo.cs.arizona.edu', port: 6363});
+face = new ndn.Face({getTransport: () => new ndn.UnixTransport(),
+                     getConnectionInfo: () => new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock")});
+face = new ndn.Face({getTransport: () => new ndn.UnixTransport(),
+                     connectionInfo: new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock")});

From 652219757831072026191bcfa9ae40bbeebe6a5a Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sat, 20 Oct 2018 22:34:49 -0400
Subject: [PATCH 862/924] ndn-js: NetworkNack

---
 types/ndn-js/network-nack-test.ts |  6 ++++++
 types/ndn-js/network-nack.d.ts    | 15 ++++++++++++++-
 types/ndn-js/tsconfig.json        |  1 +
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 types/ndn-js/network-nack-test.ts

diff --git a/types/ndn-js/network-nack-test.ts b/types/ndn-js/network-nack-test.ts
new file mode 100644
index 0000000000..8341742295
--- /dev/null
+++ b/types/ndn-js/network-nack-test.ts
@@ -0,0 +1,6 @@
+import ndn = require("ndn-js");
+
+(nack: ndn.NetworkNack) => {
+    const n: number = nack.getOtherReasonCode();
+    const reason: ndn.NetworkNack.Reason = nack.getReason();
+};
diff --git a/types/ndn-js/network-nack.d.ts b/types/ndn-js/network-nack.d.ts
index d1444bf9d5..6ffb681313 100644
--- a/types/ndn-js/network-nack.d.ts
+++ b/types/ndn-js/network-nack.d.ts
@@ -1 +1,14 @@
-export type NetworkNack = any;
+export namespace NetworkNack {
+    enum Reason {
+        NONE       = 0,
+        CONGESTION = 50,
+        DUPLICATE  = 100,
+        NO_ROUTE   = 150,
+        OTHER_CODE = 0x7fff,
+    }
+}
+
+export class NetworkNack {
+    getOtherReasonCode(): number;
+    getReason(): NetworkNack.Reason;
+}
diff --git a/types/ndn-js/tsconfig.json b/types/ndn-js/tsconfig.json
index ba0723ec4d..766352636d 100644
--- a/types/ndn-js/tsconfig.json
+++ b/types/ndn-js/tsconfig.json
@@ -23,6 +23,7 @@
         "face-test.ts",
         "interest-test.ts",
         "name-test.ts",
+        "network-nack-test.ts",
         "signature-test.ts",
         "transport-test.ts"
     ]

From a70f2757ff08037457f91c67560960757f2db580 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Sun, 21 Oct 2018 12:09:58 -0400
Subject: [PATCH 863/924] ndn-js: KeyChain

---
 types/ndn-js/face-test.ts      |  2 +-
 types/ndn-js/key-chain-test.ts | 40 ++++++++++++++++++++++++++++++++
 types/ndn-js/key-chain.d.ts    | 42 +++++++++++++++++++++++++++++++++-
 types/ndn-js/tsconfig.json     |  1 +
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 types/ndn-js/key-chain-test.ts

diff --git a/types/ndn-js/face-test.ts b/types/ndn-js/face-test.ts
index 738385f6ef..90ba176d27 100644
--- a/types/ndn-js/face-test.ts
+++ b/types/ndn-js/face-test.ts
@@ -37,7 +37,7 @@ face.removePendingInterest(n);
 face.removeRegisteredPrefix(n);
 face.send(new ndn.Blob());
 face.setCommandCertificateName(name);
-face.setCommandSigningInfo({}, name);
+face.setCommandSigningInfo(new ndn.KeyChain(), name);
 
 n = face.setInterestFilter(filter,
     (prefix: ndn.Name, interest: ndn.Interest, face: ndn.Face, filterId: number, filter: ndn.InterestFilter) => {});
diff --git a/types/ndn-js/key-chain-test.ts b/types/ndn-js/key-chain-test.ts
new file mode 100644
index 0000000000..4bfefc9f28
--- /dev/null
+++ b/types/ndn-js/key-chain-test.ts
@@ -0,0 +1,40 @@
+/// <reference types="node"/>
+import ndn = require("ndn-js");
+
+let kc = new ndn.KeyChain();
+kc = new ndn.KeyChain("pib-memory:", "tpm-memory:");
+
+const kp: ndn.KeyParams = ndn.KeyChain.getDefaultKeyParams();
+const pib: ndn.Pib = kc.getPib();
+const tpm: ndn.Tpm = kc.getTpm();
+
+const name = new ndn.Name("/key-name");
+
+let id: ndn.PibIdentity = kc.createIdentityV2(name);
+id = kc.createIdentityV2(name, kp);
+kc.createIdentityV2(name, (id: ndn.PibIdentity) => {});
+kc.createIdentityV2(name, (id: ndn.PibIdentity) => {}, (err) => {});
+kc.createIdentityV2(name, kp, (id: ndn.PibIdentity) => {});
+kc.createIdentityV2(name, kp, (id: ndn.PibIdentity) => {}, (err) => {});
+kc.deleteIdentity(id);
+kc.setDefaultIdentity(id);
+
+let key: ndn.PibKey = kc.createKey(id);
+key = kc.createKey(id, kp);
+kc.createKey(id, (key: ndn.PibKey) => {});
+kc.createKey(id, (key: ndn.PibKey) => {}, (err) => {});
+kc.createKey(id, kp, (key: ndn.PibKey) => {});
+kc.createKey(id, kp, (key: ndn.PibKey) => {}, (err) => {});
+kc.deleteKey(id, key);
+kc.setDefaultKey(id, key);
+
+const cert: ndn.CertificateV2 = {};
+kc.addCertificate(key, cert);
+kc.deleteCertificate(key, cert);
+kc.setDefaultCertificate(key, cert);
+
+const si: ndn.SigningInfo = {};
+kc.sign(new ndn.Data(), si, (data: ndn.Data) => {});
+kc.sign(new ndn.Interest(), si, (interest: ndn.Interest) => {});
+kc.signWithSha256(new ndn.Data());
+kc.signWithSha256(new ndn.Interest());
diff --git a/types/ndn-js/key-chain.d.ts b/types/ndn-js/key-chain.d.ts
index 1ecb000773..1aa96e4129 100644
--- a/types/ndn-js/key-chain.d.ts
+++ b/types/ndn-js/key-chain.d.ts
@@ -1 +1,41 @@
-export type KeyChain = any;
+import { Data } from "./data";
+import { Interest } from "./interest";
+import { Name } from "./name";
+
+export class KeyChain {
+    constructor();
+    constructor(pibLocator: string, tpmLocator: string, allowReset?: boolean);
+
+    static getDefaultKeyParams(): KeyParams;
+    getPib(): Pib;
+    getTpm(): Tpm;
+
+    createIdentityV2(identityName: Name, params?: KeyParams): PibIdentity;
+    createIdentityV2(identityName: Name, onComplete: (identity: PibIdentity) => any, onError?: (err: any) => any): void;
+    createIdentityV2(identityName: Name, params: KeyParams, onComplete: (identity: PibIdentity) => any, onError?: (err: any) => any): void;
+    deleteIdentity(identity: PibIdentity, onComplete?: () => any, onError?: (err: any) => any): void;
+    setDefaultIdentity(identity: PibIdentity, onComplete?: () => any, onError?: (err: any) => any): void;
+
+    createKey(identity: PibIdentity, params?: KeyParams): PibKey;
+    createKey(identity: PibIdentity, onComplete: (key: PibKey) => any, onError?: (err: any) => any): void;
+    createKey(identity: PibIdentity, params: KeyParams, onComplete: (key: PibKey) => any, onError?: (err: any) => any): void;
+    deleteKey(identity: PibIdentity, key: PibKey, onComplete?: () => any, onError?: (err: any) => any): void;
+    setDefaultKey(identity: PibIdentity, key: PibKey, onComplete?: () => any, onError?: (err: any) => any): void;
+
+    addCertificate(key: PibKey, certificate: CertificateV2, onComplete?: () => any, onError?: (err: any) => any): void;
+    deleteCertificate(key: PibKey, certificateName: Name, onComplete?: () => any, onError?: (err: any) => any): void;
+    setDefaultCertificate(key: PibKey, certificate: CertificateV2, onComplete?: () => any, onError?: (err: any) => any): void;
+
+    sign(data: Data, params: SigningInfo, onComplete?: (data: Data) => any, onError?: (err: any) => any): void;
+    sign(interest: Interest, params: SigningInfo, onComplete?: (interest: Interest) => any, onError?: (err: any) => any): void;
+    signWithSha256(data: Data): void;
+    signWithSha256(interest: Interest): void;
+}
+
+export type CertificateV2 = any;
+export type KeyParams = any;
+export type Pib = any;
+export type PibIdentity = any;
+export type PibKey = any;
+export type SigningInfo = any;
+export type Tpm = any;
diff --git a/types/ndn-js/tsconfig.json b/types/ndn-js/tsconfig.json
index 766352636d..a07c5e1c00 100644
--- a/types/ndn-js/tsconfig.json
+++ b/types/ndn-js/tsconfig.json
@@ -22,6 +22,7 @@
         "data-test.ts",
         "face-test.ts",
         "interest-test.ts",
+        "key-chain-test.ts",
         "name-test.ts",
         "network-nack-test.ts",
         "signature-test.ts",

From d81940298541ccefd969dde50b8c222e58a82661 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Tue, 23 Oct 2018 10:39:14 -0400
Subject: [PATCH 864/924] ndn-js: add MemoryContentCache

---
 types/ndn-js/index.d.ts                   |  1 +
 types/ndn-js/memory-content-cache-test.ts | 15 +++++++++++++++
 types/ndn-js/memory-content-cache.d.ts    | 20 ++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 types/ndn-js/memory-content-cache-test.ts
 create mode 100644 types/ndn-js/memory-content-cache.d.ts

diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index cf3aba3518..1481a65162 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -5,6 +5,7 @@ export * from "./delegation-set";
 export * from "./face";
 export * from "./interest";
 export * from "./key-chain";
+export * from "./memory-content-cache";
 export * from "./name";
 export * from "./network-nack";
 export * from "./signature";
diff --git a/types/ndn-js/memory-content-cache-test.ts b/types/ndn-js/memory-content-cache-test.ts
new file mode 100644
index 0000000000..d166ef30d9
--- /dev/null
+++ b/types/ndn-js/memory-content-cache-test.ts
@@ -0,0 +1,15 @@
+import ndn = require("ndn-js");
+
+const face = new ndn.Face();
+let cache = new ndn.MemoryContentCache(face);
+cache = new ndn.MemoryContentCache(face, 8000);
+
+cache.add(new ndn.Data());
+const n: number = cache.getMinimumCacheLifetime();
+cache.registerPrefix(new ndn.Name("/A"),
+    () => {},
+    () => {},
+    cache.getStorePendingInterest());
+cache.setInterestFilter(new ndn.Name("/A"), cache.getStorePendingInterest());
+cache.setMinimumCacheLifetime(5000);
+cache.storePendingInterest(new ndn.Interest(), new ndn.UdpTransport());
diff --git a/types/ndn-js/memory-content-cache.d.ts b/types/ndn-js/memory-content-cache.d.ts
new file mode 100644
index 0000000000..1411bebe08
--- /dev/null
+++ b/types/ndn-js/memory-content-cache.d.ts
@@ -0,0 +1,20 @@
+import { Data } from "./data";
+import { Face, ForwardingFlags, InterestFilter, OnInterestCallback } from "./face";
+import { Interest } from "./interest";
+import { Name } from "./name";
+import { Transport } from "./transport";
+
+export class MemoryContentCache {
+    constructor(face: Face, cleanupIntervalMilliseconds?: number);
+
+    add(data: Data): void;
+    getMinimumCacheLifetime(): number;
+    getStorePendingInterest(): OnInterestCallback;
+    registerPrefix(name: Name, onRegisterFailed: (prefix: Name) => any,
+                   onRegisterSuccess?: (prefix: Name, registeredPrefixId: number) => any,
+                   onDataNotFound?: OnInterestCallback, flags?: ForwardingFlags): void;
+    setInterestFilter(filter: InterestFilter|Name, onDataNotFound?: OnInterestCallback): void;
+    setMinimumCacheLifetime(minimumCacheLifetime: number): void;
+    storePendingInterest(interest: Interest, transport: Transport): void;
+    unregisterAll(): void;
+}

From 0f0b8fa5a3fb60617eaf60eb3f586c344f26e034 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Wed, 20 Feb 2019 16:06:58 -0500
Subject: [PATCH 865/924] ndn-js: use tslint:disable comments

---
 types/ndn-js/blob.d.ts      | 3 +--
 types/ndn-js/key-chain.d.ts | 1 +
 types/ndn-js/name.d.ts      | 2 ++
 types/ndn-js/transport.d.ts | 3 +++
 types/ndn-js/tslint.json    | 6 +-----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/types/ndn-js/blob.d.ts b/types/ndn-js/blob.d.ts
index eaaabb9dda..8b6b43b8aa 100644
--- a/types/ndn-js/blob.d.ts
+++ b/types/ndn-js/blob.d.ts
@@ -1,8 +1,7 @@
 export class Blob {
     constructor(value?: Blob);
     constructor(value: Buffer, copy?: boolean);
-    constructor(value: number[]);
-    constructor(value: string);
+    constructor(value: number[]|string);
 
     buf(): Buffer;
     equals(other: Blob): boolean;
diff --git a/types/ndn-js/key-chain.d.ts b/types/ndn-js/key-chain.d.ts
index 1aa96e4129..6c1103eed5 100644
--- a/types/ndn-js/key-chain.d.ts
+++ b/types/ndn-js/key-chain.d.ts
@@ -29,6 +29,7 @@ export class KeyChain {
     sign(data: Data, params: SigningInfo, onComplete?: (data: Data) => any, onError?: (err: any) => any): void;
     sign(interest: Interest, params: SigningInfo, onComplete?: (interest: Interest) => any, onError?: (err: any) => any): void;
     signWithSha256(data: Data): void;
+    // tslint:disable-next-line unified-signatures
     signWithSha256(interest: Interest): void;
 }
 
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index 5519b28a9a..4c38617ab5 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -54,10 +54,12 @@ export namespace Name {
 export class Name {
     constructor(components?: Array<Name.Component|Uint8Array>);
     constructor(uri: string);
+    // tslint:disable-next-line unified-signatures
     constructor(name: Name);
 
     append(value: number[]|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
     append(component: Name.Component): Name;
+    // tslint:disable-next-line unified-signatures
     append(name: Name): Name;
     appendImplicitSha256Digest(digest: Blob): Name;
     appendParametersSha256Digest(digest: Blob): Name;
diff --git a/types/ndn-js/transport.d.ts b/types/ndn-js/transport.d.ts
index 320ec1e695..68cd7fc3a9 100644
--- a/types/ndn-js/transport.d.ts
+++ b/types/ndn-js/transport.d.ts
@@ -1,7 +1,9 @@
+// tslint:disable-next-line no-empty-interface
 export interface Transport {
 }
 
 export namespace Transport {
+    // tslint:disable-next-line no-empty-interface
     interface ConnectionInfo {
     }
 }
@@ -34,6 +36,7 @@ export class WebSocketTransport implements Transport {
 
 export namespace WebSocketTransport {
     class ConnectionInfo implements Transport.ConnectionInfo {
+        // tslint:disable-next-line unified-signatures
         constructor(host: string, port: number);
         constructor(uri: string);
         equals(other: ConnectionInfo): boolean;
diff --git a/types/ndn-js/tslint.json b/types/ndn-js/tslint.json
index 5f014d5c68..4c3a548997 100644
--- a/types/ndn-js/tslint.json
+++ b/types/ndn-js/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dtslint.json",
-    "rules": {
-        "no-empty-interface": false,
-        "unified-signatures": false
-    }
+    "extends": "dtslint/dtslint.json"
 }

From 6ddf89b20bad73197682ea299066bf2cc0afb162 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Wed, 20 Feb 2019 16:09:33 -0500
Subject: [PATCH 866/924] ndn-js: use ReadonlyArray

---
 types/ndn-js/blob.d.ts | 4 ++--
 types/ndn-js/name.d.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/ndn-js/blob.d.ts b/types/ndn-js/blob.d.ts
index 8b6b43b8aa..9b3d56bb67 100644
--- a/types/ndn-js/blob.d.ts
+++ b/types/ndn-js/blob.d.ts
@@ -1,7 +1,7 @@
 export class Blob {
     constructor(value?: Blob);
     constructor(value: Buffer, copy?: boolean);
-    constructor(value: number[]|string);
+    constructor(value: ReadonlyArray<number>|string);
 
     buf(): Buffer;
     equals(other: Blob): boolean;
@@ -11,7 +11,7 @@ export class Blob {
 
 export class SignedBlob extends Blob {
     constructor();
-    constructor(value: Blob|Buffer|number[], signedPortionBeginOffset: number, signedPortionEndOffset: number);
+    constructor(value: Blob|Buffer|ReadonlyArray<number>, signedPortionBeginOffset: number, signedPortionEndOffset: number);
 
     getSignedPortionBeginOffset(): number;
     getSignedPortionEndOffset(): number;
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index 4c38617ab5..d27123ad9a 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -11,7 +11,7 @@ export type CompareResult = -1|0|1;
 
 export namespace Name {
     class Component {
-        constructor(value?: number[]|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number);
+        constructor(value?: ReadonlyArray<number>|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number);
         constructor(component: Component);
 
         compare(other: Component): CompareResult;
@@ -52,12 +52,12 @@ export namespace Name {
 }
 
 export class Name {
-    constructor(components?: Array<Name.Component|Uint8Array>);
+    constructor(components?: ReadonlyArray<Name.Component|Uint8Array>);
     constructor(uri: string);
     // tslint:disable-next-line unified-signatures
     constructor(name: Name);
 
-    append(value: number[]|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
+    append(value: ReadonlyArray<number>|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
     append(component: Name.Component): Name;
     // tslint:disable-next-line unified-signatures
     append(name: Name): Name;

From 6c68e6847ee7e804df60da174dc623c77a759ec4 Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 13:34:32 -0400
Subject: [PATCH 867/924] Fix old name

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

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
index 9a044b8038..6131d077c9 100644
--- a/types/zeit__next-source-maps/index.d.ts
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @zeit/next-typescript 0.0.4-canary.1
+// Type definitions for @zeit/next-source-maps 0.0.4-canary.1
 // Project: https://github.com/zeit/next-plugins/tree/master/packages/next-source-maps, https://github.com/zeit/next-plugins
 // Definitions by: ldthorne <https://www.github.com/ldthorne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From eff3febc9e40162bfa2625e37c77e110121711b4 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Thu, 21 Mar 2019 13:46:07 -0400
Subject: [PATCH 868/924] ndn-js: move tests into test folder

---
 types/ndn-js/face.d.ts                        |  8 +++----
 types/ndn-js/index.d.ts                       |  5 ++++
 types/ndn-js/{blob-test.ts => test/blob.ts}   |  0
 types/ndn-js/{data-test.ts => test/data.ts}   |  0
 types/ndn-js/{face-test.ts => test/face.ts}   |  0
 .../{interest-test.ts => test/interest.ts}    |  0
 .../{key-chain-test.ts => test/key-chain.ts}  |  0
 .../memory-content-cache.ts}                  |  2 +-
 types/ndn-js/{name-test.ts => test/name.ts}   |  0
 .../network-nack.ts}                          |  0
 .../{signature-test.ts => test/signature.ts}  |  0
 .../{transport-test.ts => test/transport.ts}  |  5 +++-
 types/ndn-js/transport.d.ts                   | 23 ++++++++-----------
 types/ndn-js/tsconfig.json                    | 19 +++++++--------
 types/ndn-js/tslint.json                      |  4 +---
 15 files changed, 35 insertions(+), 31 deletions(-)
 rename types/ndn-js/{blob-test.ts => test/blob.ts} (100%)
 rename types/ndn-js/{data-test.ts => test/data.ts} (100%)
 rename types/ndn-js/{face-test.ts => test/face.ts} (100%)
 rename types/ndn-js/{interest-test.ts => test/interest.ts} (100%)
 rename types/ndn-js/{key-chain-test.ts => test/key-chain.ts} (100%)
 rename types/ndn-js/{memory-content-cache-test.ts => test/memory-content-cache.ts} (86%)
 rename types/ndn-js/{name-test.ts => test/name.ts} (100%)
 rename types/ndn-js/{network-nack-test.ts => test/network-nack.ts} (100%)
 rename types/ndn-js/{signature-test.ts => test/signature.ts} (100%)
 rename types/ndn-js/{transport-test.ts => test/transport.ts} (77%)

diff --git a/types/ndn-js/face.d.ts b/types/ndn-js/face.d.ts
index 06143a4614..524623a1a4 100644
--- a/types/ndn-js/face.d.ts
+++ b/types/ndn-js/face.d.ts
@@ -4,12 +4,12 @@ import { Interest } from "./interest";
 import { KeyChain } from "./key-chain";
 import { Name } from "./name";
 import { NetworkNack } from "./network-nack";
-import { Transport } from "./transport";
+import { Transport, TransportConnectionInfo } from "./transport";
 
 export interface FaceCtorOptions {
     getTransport?: () => Transport;
-    getConnectionInfo?: () => Transport.ConnectionInfo;
-    connectionInfo?: Transport.ConnectionInfo|null;
+    getConnectionInfo?: () => TransportConnectionInfo;
+    connectionInfo?: TransportConnectionInfo|null;
     host?: string|null;
     port?: number|null;
 }
@@ -17,7 +17,7 @@ export interface FaceCtorOptions {
 export type OnInterestCallback = (prefix: Name, interest: Interest, face: Face, filterId: number, filter: InterestFilter) => any;
 
 export class Face {
-    constructor(transport: Transport, connectionInfo: Transport.ConnectionInfo);
+    constructor(transport: Transport, connectionInfo: TransportConnectionInfo);
     constructor(settings?: FaceCtorOptions);
 
     expressInterest(interest: Interest|Name,
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index 1481a65162..9f76593c02 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -1,3 +1,8 @@
+// Type definitions for ndn-js 0.18
+// Project: https://github.com/named-data/ndn-js
+// Definitions by: Junxiao <https://github.com/yoursunny>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 export as namespace ndn;
 export * from "./blob";
 export * from "./data";
diff --git a/types/ndn-js/blob-test.ts b/types/ndn-js/test/blob.ts
similarity index 100%
rename from types/ndn-js/blob-test.ts
rename to types/ndn-js/test/blob.ts
diff --git a/types/ndn-js/data-test.ts b/types/ndn-js/test/data.ts
similarity index 100%
rename from types/ndn-js/data-test.ts
rename to types/ndn-js/test/data.ts
diff --git a/types/ndn-js/face-test.ts b/types/ndn-js/test/face.ts
similarity index 100%
rename from types/ndn-js/face-test.ts
rename to types/ndn-js/test/face.ts
diff --git a/types/ndn-js/interest-test.ts b/types/ndn-js/test/interest.ts
similarity index 100%
rename from types/ndn-js/interest-test.ts
rename to types/ndn-js/test/interest.ts
diff --git a/types/ndn-js/key-chain-test.ts b/types/ndn-js/test/key-chain.ts
similarity index 100%
rename from types/ndn-js/key-chain-test.ts
rename to types/ndn-js/test/key-chain.ts
diff --git a/types/ndn-js/memory-content-cache-test.ts b/types/ndn-js/test/memory-content-cache.ts
similarity index 86%
rename from types/ndn-js/memory-content-cache-test.ts
rename to types/ndn-js/test/memory-content-cache.ts
index d166ef30d9..daa26d4e17 100644
--- a/types/ndn-js/memory-content-cache-test.ts
+++ b/types/ndn-js/test/memory-content-cache.ts
@@ -12,4 +12,4 @@ cache.registerPrefix(new ndn.Name("/A"),
     cache.getStorePendingInterest());
 cache.setInterestFilter(new ndn.Name("/A"), cache.getStorePendingInterest());
 cache.setMinimumCacheLifetime(5000);
-cache.storePendingInterest(new ndn.Interest(), new ndn.UdpTransport());
+cache.storePendingInterest(new ndn.Interest(), new ndn.UnixTransport());
diff --git a/types/ndn-js/name-test.ts b/types/ndn-js/test/name.ts
similarity index 100%
rename from types/ndn-js/name-test.ts
rename to types/ndn-js/test/name.ts
diff --git a/types/ndn-js/network-nack-test.ts b/types/ndn-js/test/network-nack.ts
similarity index 100%
rename from types/ndn-js/network-nack-test.ts
rename to types/ndn-js/test/network-nack.ts
diff --git a/types/ndn-js/signature-test.ts b/types/ndn-js/test/signature.ts
similarity index 100%
rename from types/ndn-js/signature-test.ts
rename to types/ndn-js/test/signature.ts
diff --git a/types/ndn-js/transport-test.ts b/types/ndn-js/test/transport.ts
similarity index 77%
rename from types/ndn-js/transport-test.ts
rename to types/ndn-js/test/transport.ts
index 7c5b55dabb..707a5f0d55 100644
--- a/types/ndn-js/transport-test.ts
+++ b/types/ndn-js/test/transport.ts
@@ -1,6 +1,9 @@
 import ndn = require("ndn-js");
 
-let face = new ndn.Face(new ndn.TcpTransport(), new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
+const transport = new ndn.TcpTransport();
+const b: boolean = transport.isLocal();
+
+let face = new ndn.Face(transport, new ndn.TcpTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
 face = new ndn.Face(new ndn.UnixTransport(), new ndn.UnixTransport.ConnectionInfo("/run/nfd.sock"));
 face = new ndn.Face(new ndn.WebSocketTransport(), new ndn.WebSocketTransport.ConnectionInfo("hobo.cs.arizona.edu", 9696));
 
diff --git a/types/ndn-js/transport.d.ts b/types/ndn-js/transport.d.ts
index 68cd7fc3a9..ec4b17d0c9 100644
--- a/types/ndn-js/transport.d.ts
+++ b/types/ndn-js/transport.d.ts
@@ -1,41 +1,38 @@
-// tslint:disable-next-line no-empty-interface
-export interface Transport {
+export abstract class TransportConnectionInfo {
 }
 
-export namespace Transport {
-    // tslint:disable-next-line no-empty-interface
-    interface ConnectionInfo {
-    }
+export abstract class Transport {
+    static ConnectionInfo: TransportConnectionInfo;
+    isLocal(): boolean;
 }
 
-export class TcpTransport implements Transport {
+export class TcpTransport extends Transport {
 }
 
 export namespace TcpTransport {
-    class ConnectionInfo implements Transport.ConnectionInfo {
+    class ConnectionInfo extends TransportConnectionInfo {
         constructor(host: string, port: number);
         equals(other: ConnectionInfo): boolean;
         toString(): string;
     }
 }
 
-export class UnixTransport implements Transport {
+export class UnixTransport extends Transport {
 }
 
 export namespace UnixTransport {
-    class ConnectionInfo implements Transport.ConnectionInfo {
+    class ConnectionInfo extends TransportConnectionInfo {
         constructor(filePath: string);
         equals(other: ConnectionInfo): boolean;
         toString(): string;
     }
 }
 
-export class WebSocketTransport implements Transport {
-    isLocal(): boolean;
+export class WebSocketTransport extends Transport {
 }
 
 export namespace WebSocketTransport {
-    class ConnectionInfo implements Transport.ConnectionInfo {
+    class ConnectionInfo extends TransportConnectionInfo {
         // tslint:disable-next-line unified-signatures
         constructor(host: string, port: number);
         constructor(uri: string);
diff --git a/types/ndn-js/tsconfig.json b/types/ndn-js/tsconfig.json
index a07c5e1c00..3aaea5f6f1 100644
--- a/types/ndn-js/tsconfig.json
+++ b/types/ndn-js/tsconfig.json
@@ -18,14 +18,15 @@
     },
     "files": [
         "index.d.ts",
-        "blob-test.ts",
-        "data-test.ts",
-        "face-test.ts",
-        "interest-test.ts",
-        "key-chain-test.ts",
-        "name-test.ts",
-        "network-nack-test.ts",
-        "signature-test.ts",
-        "transport-test.ts"
+        "test/blob.ts",
+        "test/data.ts",
+        "test/face.ts",
+        "test/interest.ts",
+        "test/key-chain.ts",
+        "test/memory-content-cache.ts",
+        "test/name.ts",
+        "test/network-nack.ts",
+        "test/signature.ts",
+        "test/transport.ts"
     ]
 }
diff --git a/types/ndn-js/tslint.json b/types/ndn-js/tslint.json
index 4c3a548997..3db14f85ea 100644
--- a/types/ndn-js/tslint.json
+++ b/types/ndn-js/tslint.json
@@ -1,3 +1 @@
-{
-    "extends": "dtslint/dtslint.json"
-}
+{ "extends": "dtslint/dt.json" }

From d57932f468726cdece8e7957aa90fd81139772c6 Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 13:46:41 -0400
Subject: [PATCH 869/924] Remove canary version

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

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
index 6131d077c9..936ed8f46a 100644
--- a/types/zeit__next-source-maps/index.d.ts
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @zeit/next-source-maps 0.0.4-canary.1
+// Type definitions for @zeit/next-source-maps 0.0.4
 // Project: https://github.com/zeit/next-plugins/tree/master/packages/next-source-maps, https://github.com/zeit/next-plugins
 // Definitions by: ldthorne <https://www.github.com/ldthorne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 615a24f5c972bc82a001a21d9262054c23c5052e Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 13:56:10 -0400
Subject: [PATCH 870/924] Remove patch version

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

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
index 936ed8f46a..d752d2a9c0 100644
--- a/types/zeit__next-source-maps/index.d.ts
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @zeit/next-source-maps 0.0.4
+// Type definitions for @zeit/next-source-maps 0.0
 // Project: https://github.com/zeit/next-plugins/tree/master/packages/next-source-maps, https://github.com/zeit/next-plugins
 // Definitions by: ldthorne <https://www.github.com/ldthorne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From bd5ed90116571b2fe2ddeee1180875901c356f4f Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 13:59:50 -0400
Subject: [PATCH 871/924] Remove www subdomain in contributor URL

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

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
index d752d2a9c0..46b3927d97 100644
--- a/types/zeit__next-source-maps/index.d.ts
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for @zeit/next-source-maps 0.0
 // Project: https://github.com/zeit/next-plugins/tree/master/packages/next-source-maps, https://github.com/zeit/next-plugins
-// Definitions by: ldthorne <https://www.github.com/ldthorne>
+// Definitions by: ldthorne <https://github.com/ldthorne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.3
 

From 7ce97fb45760ddb73ddf305790f9013b5aad905b Mon Sep 17 00:00:00 2001
From: Joseph Pursley <jopursle@microsoft.com>
Date: Thu, 21 Mar 2019 11:07:40 -0700
Subject: [PATCH 872/924] Add powerapps-component-framework 1.0 interfaces

---
 .../componentframework.d.ts                   | 2079 +++++++++++++++++
 .../powerapps-component-framework/index.d.ts  |    7 +
 .../powerapps-component-framework-tests.ts    |   88 +
 .../tsconfig.json                             |   22 +
 .../powerapps-component-framework/tslint.json |   20 +
 5 files changed, 2216 insertions(+)
 create mode 100644 types/powerapps-component-framework/componentframework.d.ts
 create mode 100644 types/powerapps-component-framework/index.d.ts
 create mode 100644 types/powerapps-component-framework/powerapps-component-framework-tests.ts
 create mode 100644 types/powerapps-component-framework/tsconfig.json
 create mode 100644 types/powerapps-component-framework/tslint.json

diff --git a/types/powerapps-component-framework/componentframework.d.ts b/types/powerapps-component-framework/componentframework.d.ts
new file mode 100644
index 0000000000..970e61ef69
--- /dev/null
+++ b/types/powerapps-component-framework/componentframework.d.ts
@@ -0,0 +1,2079 @@
+declare module ComponentFramework 
+{
+	/**
+	 * Interface for the PowerApps Controls (Standard)
+	 */
+	interface StandardControl<TInputs, TOutputs>
+	{
+		/**
+		 * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
+		 * Data-set values are not initialized here, use updateView.
+		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
+		 * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
+		 * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
+		 * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
+		 */
+		init(context: Context<TInputs>, notifyOutputChanged?: () => void, state?: Dictionary, container?: HTMLDivElement): void;
+
+		/**
+		 * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
+		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
+		 */
+		updateView(context: Context<TInputs>): void;
+
+		/** 
+ 		 * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
+		 * i.e. cancelling any pending remote calls, removing listeners, etc.
+		 */
+		destroy(): void;
+
+		/** 
+		 * It is called by the framework prior to a control receiving new data. 
+		 * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as "bound" or "output"
+		 */
+		getOutputs?(): TOutputs;
+	}
+
+	/**
+	 * The entire property bag interface available to control via Context Object
+	 */
+	interface Context<TInputs>
+	{	
+		client: Client;
+		device: Device;
+		factory: Factory;
+		formatting: Formatting;
+		mode: Mode;
+		navigation: Navigation;
+		resources: Resources;
+		userSettings: UserSettings;
+		utils: Utility;
+		webAPI: WebApi;
+		parameters: TInputs;
+		updatedProperties: string[];
+	}
+
+	/**
+	 * The interface for the context.client
+	 */
+	interface Client 
+	{
+		/**
+		 * Whether this control should disable its scrolling capabilities. 
+		 */
+		disableScroll: boolean;
+
+		/**
+		 * Device form factor.
+		 * Unknown = 0
+		 * Desktop = 1
+		 * Tablet = 2
+		 * Phone = 3
+		 */
+		getFormFactor(): number;
+		
+		/**
+		 * Returns a value to indicate which client the script is executing in.
+		 * Web: Web application, or Unified Interface
+		 * Outlook: Outlook
+		 * Mobile: Mobile app
+		 */
+		getClient(): string;
+
+		/**
+		 * Returns information whether the server is online or offline.
+		 */
+		isOffline(): boolean;
+	}
+
+
+	/**
+	 * The interface for the context.device
+	 */
+	interface Device
+	{
+		/**
+		 * Invokes the device microphone to record audio.
+		 */
+		captureAudio(): Promise<FileObject>;
+
+		/**
+		 * Invokes the device camera to capture an image.
+		 */
+		captureImage(options?: DeviceApi.CaptureImageOptions): Promise<FileObject>;
+
+		/**
+		 * Invokes the device camera to record video.
+		 */
+		captureVideo(): Promise<FileObject>;
+
+		/**
+		 * Invokes the device camera to scan the barcode information, such as a product number.
+		 */
+		getBarcodeValue(): Promise<string>;
+
+		/**
+		 * Returns the current location using the device geolocation capability.
+		 */
+		getCurrentPosition(): Promise<DeviceApi.Position>;
+
+		/**
+		 * Opens a dialog box to select files from your computer (web client) or mobile device (mobile clients).
+		 */
+		pickFile(options?: DeviceApi.PickFileOptions): Promise<FileObject[]>;
+	}
+
+	/**
+	 * The interface for the context.factory
+	 */
+	interface Factory
+	{
+		/**
+		 * Gets the popup service which help create Popup and manage Popup easily
+		 */
+		getPopupService(): FactoryApi.Popup.PopupService;
+
+		/**
+		 * Requests re-rendering of the control with updated data.
+		 */
+		requestRender(): void;
+	}
+
+	/**
+	 * The interface for the context.formatting
+	 */
+	interface Formatting
+	{
+		/**
+		 * Returns a formatted string that represents the currency value after being formatted.
+		 * @param value A value object to be formatted.
+		 * @param precision The number of digits after decimal point.
+		 * @param symbol The currency symbol/code to be added with currency value.
+		 */
+		formatCurrency(value: number, precision?: number, symbol?: string): string;
+
+		/**
+		 * Returns a formatted string that represents the decimal value after being formatted.
+		 * @param value A value object to be formatted.
+		 * @param precision The number of digits after decimal point.
+		 */
+		formatDecimal(value: number, precision?: number): string;
+
+		/**
+		 * Returns a formatted string that represents a date in a YYYY-MM-DD standard UTC format.
+		 * Result pattern is based on Standard UTC format.
+		 * @param value The date to be formatted.
+		 * @param includeTime If time component should be included in the return value.
+		 */
+		formatDateAsFilterStringInUTC(value: Date, includeTime?: boolean): string;
+
+		/**
+		 * Returns a formatted string that represents a date in the long form.
+		 * Result pattern is based on culture. In USA it's "Day of week, Month dd, yyyy"in USA
+		 * @param value Date to format.
+		 */
+		formatDateLong(value: Date): string;
+
+		/**
+		 * Returns a formatted string that represents a date in the long form using abbreviations.
+		 * Result pattern is based on culture. In USA it's "Abbreviated Day of week, Month dd, yyyy" in USA
+		 * @param value Date to format.
+		 */
+		formatDateLongAbbreviated(value: Date): string;
+
+		/**
+		 * Returns a string represents the datetime value after being formatted.
+		 * Result pattern is based on culture. In USA it's 'MM/DD/YYYY' in USA
+		 * @param value Date to format.
+		 * @param includeTime Whether to show time in formatted value.
+		 */
+		formatDateShort(value: Date, includeTime?: boolean): string;
+
+		/**
+		 * Returns a formatted string that represents a date in the year month format.
+		 * @param value Date to format.
+		 */
+		formatDateYearMonth(value: Date): string;
+
+		/**
+		 * Returns a formatted string represents a given integer value.
+		 * @param value A number primitive to be formatted.
+		 */
+		formatInteger(value: number): string;
+
+		/**
+		 * Returns a formatted string that represents a given language
+		 * @param input A language code to be formatted. Reference: https://go.microsoft.com/fwlink/?linkid=122128 
+		 * @returns A formatted string represents a given language value.
+		 */
+		formatLanguage(value: number): string;
+
+		/**
+		 * Returns a formatted string that represents the datetime value after being formatted.
+		 * @param value The date to be formatted.
+		 * @param behavior The behavior of the datetime object to be formatted.
+		 * None = 0,
+		 * UserLocal = 1,
+		 * TimeZoneIndependent = 3	
+		 */
+		formatTime(value: Date, behavior: FormattingApi.DateTimeFieldBehavior): string;
+
+		/**
+		 * Gets the ISO week number of the year for a given date. Range 1-53
+		 * @param value The DateTime to convert.
+		 */
+		getWeekOfYear(value: Date): number;
+	}
+
+	/**
+	 * The interface for the context.mode
+	 */
+	interface Mode
+	{
+		/**
+		 * Height in pixels allocated to the control. If it's -1, then there is no limit on height
+		 */
+		allocatedHeight: number;
+		
+		/**
+		 * Width in pixels allocated to the control.
+		 */
+		allocatedWidth: number;
+
+		/**
+		 * Is the control in 'Read-only' mode.
+		 */
+		isControlDisabled: boolean;
+
+		/**
+		 * Is the control in 'Visible' mode.
+		 */
+		isVisible: boolean;
+
+		/**
+		 * The defined control label
+		 */
+		label: string;
+
+		/**
+		 * set control state so that it will be stored in one session
+		 */
+		setControlState(state: Dictionary): boolean;
+
+		/**
+		 * Make the control full screen.
+		 * @param value True if control needs to autosize to full screen. False if control needs to autosize to allocated width.
+		 */
+		setFullScreen(value: boolean): void;
+
+		/**
+		 * API to determine container sizing if control needs to react. Control will get allocatedWidth/allocatedHeight if input is 'true'
+		 * @param value True if controls needs to track container size, control will get allocatedWidth/allocatedHeight
+		 */
+		trackContainerResize(value: boolean): void;
+	}
+
+	/**
+	 * The navigation interface of context.navigation
+	 */
+	interface Navigation
+	{
+		/**
+		 * Opens Alert Dialog
+		 * @param alertStrings Strings to be used in alert dialog
+		 * @param options Dialog options
+		 * @returns promise defining success or failure of operation 
+		 */
+		openAlertDialog(alertStrings: NavigationApi.AlertDialogStrings, options?: NavigationApi.AlertDialogOptions): Promise<void>;
+
+		/**
+		 * Opens Confirm Dialog
+		 * @param confirmStrings String which will be used in the dialog
+		 * @param options Options for the dialog
+		 * @returns promise defining success or failure of operation. the success case returns a boolean specifying whether yes or no button was pressed 
+		 */
+		openConfirmDialog(confirmStrings: NavigationApi.ConfirmDialogStrings, options?: NavigationApi.ConfirmDialogOptions): Promise<NavigationApi.ConfirmDialogResponse>;
+		
+		/**
+		 * Opens an Error Dialog.
+		 * @param options Error Dialog options.
+		 * @returns promise defining success or failure of operation.
+		 */
+		openErrorDialog(options: NavigationApi.ErrorDialogOptions): Promise<void>;
+
+		/**
+		 * Open a file
+		 * @param file An object describing the file to open
+		 * @param options Options for openFile. OpenMode field in the options allows to save file instead opening.
+		 * @returns promise defining success or failure of operation.
+		 */
+		openFile(file: FileObject, options?: NavigationApi.OpenFileOptions): Promise<void>;
+
+		/**
+		 * Opens an entity form or quick create form.
+		 * @param options entity form options.
+		 * @param parameters entity form parameters.
+		 * @returns promise defining success or failure of operation
+		 */
+		openForm(options: NavigationApi.EntityFormOptions, parameters?: {[key: string]: string}): Promise<NavigationApi.OpenFormSuccessResponse>;
+
+		/**
+		 * Open url, including file urls.
+		 * @param url url to be opened.
+		 * @param options window options for the url.
+		 */
+		openUrl(url: string, options?: NavigationApi.OpenUrlOptions): void;
+
+		/**
+		 * Opens an HTML web resource.
+		 * @param name The name of the HTML web resource to open.
+		 * @param options Window options for the web resource.
+		 * @param data Data to be passed into the data parameter.
+		 */
+		openWebResource(name: string, options?: NavigationApi.OpenWebResourceOptions, data?: string): void;
+	}
+
+	/**
+	 * The resource interface of context.resources
+	 */
+	interface Resources
+	{
+		/**
+		 * Gets a resource referenced by the control manifest.
+		 * @param id The resource string identifier.
+		 * @param success The success callback. Resource data is returned in base 64 encoded format.
+		 * @param failure The failure callback.
+		 */
+		getResource(id: string, success: (data: string) => void, failure: () => void): void;
+
+		/**
+		 * Get the localized string for the given identifier.
+		 * @param id name of resource in the control manifest.
+		 */
+		getString(id: string): string;
+	}
+
+	/**
+	 * The interface for context.userSettings
+	 */
+	interface UserSettings
+	{
+		/**
+		 * Date formatting information as retrieved from the server.
+		 */
+		dateFormattingInfo: UserSettingApi.DateFormattingInfo;
+
+		/**
+		 * Returns true if the language is right to left
+		 */
+		isRTL: boolean;
+
+		/**
+		 * Current user's language id
+		 * 
+		 */
+		languageId: number;
+
+		/**
+		 * Number formatting information as retrieved from the server.
+		 */
+		numberFormattingInfo: UserSettingApi.NumberFormattingInfo;
+
+		/**
+		 * Current user roles
+		 */
+		securityRoles: string[];
+
+		/**
+		 * The id of the current user
+		 */
+		userId: string;
+
+		/**
+		 * The username of the current user
+		 */
+		userName: string;
+
+		/**
+		 * Gets the offset in minutes from UTC for the given date
+		 * @param date date to get the offset from utc for
+		 */
+		getTimeZoneOffsetMinutes(date?: Date): number;
+	}
+
+	/**
+	 * The interface for context.utils
+	 */
+	interface Utility
+	{
+		/**
+		 * Gets the entity metadata for the specified entity.
+		 * @param entityType The logical name of the entity.
+		 * @param attributes The attributes to get metadata for.
+		 */
+		getEntityMetadata(entityName: string, attributes?: string[]): Promise<PropertyHelper.EntityMetadata>;
+		
+		/**
+		 * Function to return if the user has Privilege for one specific entity
+		 * @entityTypeName entity type name
+		 * @privilegeType privilege type i.e. Create, Read, Write etc.
+		 * @privilegeDepth privilege depth i.e. basic, Global etc.
+		 */
+		hasEntityPrivilege(entityTypeName: string, privilegeType: PropertyHelper.PrivilegeType, privilegeDepth: PropertyHelper.PrivilegeDepth): boolean;
+
+		/**
+		 * Opens a lookup dialog allowing the user to select one or more entities.
+		 * @param lookupOptions Options for opening the lookup dialog.
+		 */
+		lookupObjects(lookupOptions: UtilityApi.LookupOptions): Promise<EntityReference[]>;
+	}
+
+	/**
+	 * The interface for context.webApi
+	 */
+	interface WebApi
+	{
+		/**
+		 * Creates an entity record.
+		 * @param entityType logical name of the entity type record to create
+		 * @param data dictionary with attribute schema name and value
+		 * @returns The deferred object for the result of the operation. The created record object will be resolved if successful.
+		 */
+		createRecord(entityType: string, data: WebApi.Entity): Promise<EntityReference>;
+
+		/**
+		 * Deletes an entity record.
+		 * @param id GUID of the entity record you want to delete.
+		 * @param entityType logical name of the entity type record to delete
+		 * @returns The deferred object for the result of the operation. The deleted record object will be resolved if successful.
+		 */
+		deleteRecord(entityType: string, id: string): Promise<EntityReference>;
+
+		/**
+		 * Updates an entity record.
+		 * @param id GUID of the entity record you want to update.
+		 * @param data dictionary containing to-change attributes with schema name and value
+		 * @param entityType logical name of the entity type record to update
+		 * @returns The deferred object for the result of the operation. The updated record object will be resolved if successful.
+		 */
+		updateRecord(entityType: string, id: string, data: WebApi.Entity): Promise<EntityReference>;
+
+		/**
+		 * Retrieves a collection of entity records.
+		 * @param entityType logical name of the entity type record to retrieve
+		 * @param options OData system query options or FetchXML query to retrieve your data. For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords
+		 * @param maxPageSize Max number of records to be retrieved per page
+		 * @returns The deferred object for the result of the operation. An object with interface RetrieveMultipleResponse will be resolved if successful.
+		 */
+		retrieveMultipleRecords(entityType: string, options?: string, maxPageSize?: number): Promise<WebApi.RetrieveMultipleResponse>;
+
+		/**
+		 * Retrieves an entity record.
+		 * @param id GUID of the entity record you want to retrieve.
+		 * @param entityType logical name of the entity type record to retrieve
+		 * @param options OData system query options, $select and $expand, to retrieve your data. For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord
+		 * @returns The deferred object for the result of the operation. A JSON object with the retrieved properties and values will be resolved if successful.
+		 */
+		retrieveRecord(entityType: string, id: string, options?: string): Promise<WebApi.Entity>;
+	}
+
+	//////////////// Define namespace of each context first-level child interface's helper ////////////////
+
+	type Dictionary = {[key: string]: any};
+
+	/**
+	 * Helper of Device API interface
+	 */
+	namespace DeviceApi
+	{
+		/** 
+		 * Interface of input argument 'options' in context.device.captureImage
+		 */
+		interface CaptureImageOptions
+		{
+			/** 
+			 * Indicates whether to edit the image before saving.
+			 */
+			allowEdit: boolean;
+
+			/**
+			 * Height of the image to capture.
+			 */
+			height: number;
+
+			/** 
+			 * Indicates whether to capture image using the front camera of the device.
+			 */
+			preferFrontCamera: boolean;
+
+			/**
+			 * Quality of the image file in percentage.
+			 */
+			quality: number;
+
+			/**
+			 * Width of the image to capture.
+			 */
+			width: number;
+		}
+
+		/** 
+		 * Interface of return geological information in context.device.getCurrentPosition
+		 */
+		interface Position
+		{
+			/**
+			 * Contains a set of geographic coordinates along with associated accuracy as well as a set of other optional attributes such as altitude and speed. 
+			 */
+			coords: Dictionary;
+			
+			/**
+			 * Represents the time when the object was acquired and is represented as DOMTimeStamp.
+			 */
+			timestamp: Date;
+		}
+
+		/** 
+		 * Interface of input argument 'pickupFileOption' in context.device.pickupFile
+		 */
+		interface PickFileOptions
+		{
+			/**
+			 * Image file types to select. Valid values are "audio", "video", or "image".
+			 */
+			accept: string;
+
+			/**
+			 * Indicates whether to allow selecting multiple files.
+			 */
+			allowMultipleFiles: boolean;
+			
+			/**
+			 * Maximum size of the files(s) to be selected.
+			 */
+			maximumAllowedFileSize: number;
+		}
+	}
+
+	/**
+	 * Helper of Factory Pop API interface
+	 */
+	namespace FactoryApi.Popup
+	{
+		interface PopupService
+		{
+			/**
+			 * Create a new popup element
+			 * @param props The popup properties object, see Popup interface for more
+			 */
+			createPopup(props: Popup): void;
+
+			/**
+			 * Open an existing popup in the service with the given name. Does nothing if popup does not exist yet.
+			 * @param name the name of the popup you're trying to open
+			 */
+			openPopup(name: string): void;
+
+			/**
+			 * Close an existing popup in the service with the given name. Does nothing if popup does not exist yet.
+			 * @param name the name of the popup you're trying to close
+			 */
+			closePopup(name: string): void;
+
+			/**
+			 * Update an existing popup in the service with the given name, patching new content to the same popup element. Does nothing if popup does not exist yet.
+			 * @param name the name of the popup you're trying to update
+			 * @param newProps the updated properties to give to the popup.
+			 */
+			updatePopup(name: string, newProps: Popup): void;
+
+			/**
+			 * Remove the referenced popup from the popupService, unregister the service
+			 * @param name The name of the popup to remove
+			 */
+			deletePopup(name: string): void;
+
+			/**
+			 * Sets the ID (on the DOM and in the system) for the root popup element.
+			 * @param id The string to set as the id
+			 */
+			setPopupsId(id: string): void;
+
+			/**
+			 * Gets the currently set popup Id
+			 */
+			getPopupsId(): string;
+		}
+
+		const enum PopupType
+		{
+			/**
+			 * Root popup in the popup stack
+			 */
+			Root = 1,
+
+			/**
+			 * Not root popup in the popup stack
+			 */
+			Nested,
+		}
+		
+		interface Popup
+		{
+			/**
+			 * The id to be set to the anchor control if any.
+			 */
+			id?: string;
+
+			/**
+			 * The name of the Popup. Used as the reference to open Popups.
+			 */
+			name: string;
+
+			/**
+			 * Indicates whether popup close on an outside mouse click. 
+			 * When it's false, the popup will not be closed on an outside mouse click.
+			 */
+			closeOnOutsideClick?: boolean;
+
+			/**
+			 * The name of Popup which should be opened.
+			 * Should be defined ONLY in a Root Popup.
+			 * To open nested Popups, should be provided string like "rootName.nestedName.[allOtherNestedNames]".
+			 * To close Popups, should be provided empty string.
+			 * This prop will be automatically propagated to children.
+			 */
+			popupToOpen?: string;
+
+			/**
+			 * The type of Popup, which is described in PopupType enum. Should be only one "root" Popup for each set of Popups.
+			 */
+			type: PopupType;
+
+			/**
+			 * Static DOM element to be inserted
+			 */
+			content: HTMLElement;
+		}
+	}
+
+	/**
+	 * Helper of Formatting API interface
+	 */
+	namespace FormattingApi
+	{
+		/**
+		 * DateTime Field Behavior options
+		 */
+		const enum DateTimeFieldBehavior
+		{
+			/**
+			 * Unknown DateTime Behavior
+			 */
+			None = 0,
+
+			/**
+			 * Respect user local time. Dates stored as UTC
+			 */
+			UserLocal = 1,
+
+			/**
+			 * Dates and time stored without conversion to UTC
+			 */
+			TimeZoneIndependent = 3,
+		}
+	}
+
+	/**
+	 * Helper of Navigation API interface
+	 */
+	namespace NavigationApi
+	{
+		
+		/**
+		 * Interface for alert dialog options.
+		 */
+		interface AlertDialogOptions
+		{
+			/**
+			 * Height of the alert dialog in pixels.
+			 */
+			height?: number;
+
+			/**
+			 * Width of the alert dialog pixels.
+			 */
+			width?: number;
+		}
+
+		/**
+		 * Represents the String parameters for Alert Dialog.
+		 */
+		interface AlertDialogStrings
+		{
+			/**
+			 * The message to be displyed in the alert dialog.
+			 */
+			text: string;
+
+			/**
+			 * The confirm button label. If you do not specify the button label, OK (in user's preferred language) is used as the button label.
+			 */
+			confirmButtonLabel?: string;
+		}
+
+		/**
+		 * Interface for confirm dialog options.
+		 */
+		interface ConfirmDialogOptions
+		{
+			/**
+			 * Height of the confirmation dialog in pixels.
+			 */
+			height?: number;
+
+			/**
+			 *  Width of the confirmation dialog pixels.
+			 */
+			width?: number;
+		}
+
+		/**
+		 * Represents the String parameters for Confirm Dialog.
+		 */
+		interface ConfirmDialogStrings
+		{
+			/**
+			 * Confirm Dialog Title.
+			 */
+			title?: string;
+
+			/**
+			 * Confirm Dialog Subtitle
+			 */
+			subtitle?: string;
+
+			/**
+			 * Confirm Dialog Text\Message.
+			 */
+			text: string;
+
+			/**
+			 * The confirm button label. If you do not specify the button label, OK (in user's preferred language) is used as the button label.
+			 */
+			confirmButtonLabel?: string;
+
+			/**
+			 * Cancel Button label.
+			 */
+			cancelButtonLabel?: string;
+		}
+
+		/**
+		 * An object with the confirmed (Boolean) attribute is passed that indicates whether the confirm button was clicked to close the dialog.
+		 */
+		interface ConfirmDialogResponse 
+		{
+			/**
+			 *  confirmed (Boolean) attribute is passed that indicates whether the confirm button was clicked to close the dialog.
+			 */
+			confirmed: boolean;
+		}
+
+		/**
+		 * Interface for entity form options.
+		 */
+		interface EntityFormOptions {
+
+			/**
+			 * Designates a record that will provide default values based on mapped attribute values. The lookup object has the following String properties: entityType, id, and name 
+			 */
+			createFromEntity?: EntityReference;
+
+			/**
+			 * ID of the entity record to display the form for.
+			 */
+			entityId?: string;
+
+			/**
+			 * Logical name of the entity to display the form for.
+			 */
+			entityName: string;
+
+			/**
+			 * ID of the form instance to be displayed.
+			 */
+			formId?: string;
+
+			/**
+			 * Height of the form window to be displayed in pixels.
+			 */
+			height?: number;
+
+			/**
+			 * Indicates whether to display form in a new window.
+			 */
+			openInNewWindow?: boolean;
+
+			/**
+			 * Indicates whether to open a quick create form. If you do not specify this, by default false is passed.
+			 */
+			useQuickCreateForm?: boolean;		
+
+			/**
+			 * Width of the form window to be displayed in pixels.
+			 */
+			width?: number;		
+
+			/**
+			 * Specify one of the following values for the window position of the form on the screen:
+			 *   1:center
+			 *   2:side
+			 */
+			windowPosition?: number;	
+		}
+
+		/**
+		 * Interface for error dialog options.
+		 * You must set either the errorCode or message attribute.
+		 */
+		interface ErrorDialogOptions
+		{
+			/**
+			 * Details about the error. When you specify this, the Download Log File button is available in the error message, and clicking it will let users download a text file with the content specified in this attribute.
+			 */
+			details?: string;
+
+			/**
+			 *  If you just set errorCode, the message for the error code is automatically retrieved from the server and displayed in the error dialog. If you specify an errorCode value, an error dialog with a default error message is displyed.
+			 */
+			errorCode?: number;
+
+			/**
+			 * The message to be displayed in the error dialog.
+			 */
+			message?: string;
+		}
+
+		/**
+		 * The options for openFile mode.
+		 */
+		const enum OpenFileMode {
+			/**
+			 * default. mode open
+			 */
+			open = 1,
+
+			/**
+			 * mode save
+			 */
+			save = 2,
+		}
+		
+		/**
+		 * Interface for open file options.
+		 */
+		interface OpenFileOptions {
+			
+			/**
+			 * Specify whether to open or save the file
+			 * Values:
+			 *	   1  open
+			 *	   2  save
+			 */
+			openMode: OpenFileMode;
+		}
+
+		/**
+		 * The object returned when a save is successful for open form.
+		 */
+		interface OpenFormSuccessResponse
+		{
+			savedEntityReference: EntityReference[];
+		}
+
+		/**
+		 * Interface for OpenUrl options.
+		 */
+		interface OpenUrlOptions 
+		{	
+			/**
+			 * Height of the window to display the resultant page in pixels.
+			 */
+			height?: number;
+
+			/**
+			 * Width of the window to display the resultant page in pixels.
+			 */
+			width?: number;
+		}
+
+		/**
+		 * Interface for OpenWebResource options.
+		 */
+		interface OpenWebResourceOptions
+		{
+			/**
+			 * Height of the window to display the resultant page in pixels.
+			 */
+			height?: number;
+		
+			/**
+			 * Indicates whether to open the web resource in a new window.
+			 */
+			openInNewWindow: boolean;
+
+			/**
+			 * Width of the window to display the resultant page in pixels.
+			 */
+			width?: number;
+		}
+	}
+
+	/**
+	 * Helper of UserSettings API interface
+	 */
+	namespace UserSettingApi
+	{
+		/**
+		 * Day Of Week Enum
+		 */
+		const enum DayOfWeek
+		{
+			Sunday = 0,
+			Monday = 1,
+			Tuesday = 2,
+			Wednesday = 3,
+			Thursday = 4,
+			Friday = 5,
+			Saturday = 6
+		}
+
+		/**
+		 * The interface for Org Date Format Info exposed to a custom control
+		 * Result pattern is based on culture,examples are for 'USA' area
+		 */
+		interface DateFormattingInfo
+		{
+			/**
+			 * @example "AM"
+			 */
+			amDesignator: string;
+
+			/**
+			 * @example { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }
+			 */
+			abbreviatedDayNames: string[];
+
+			/**
+			 * @example { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" }
+			 */
+			abbreviatedMonthGenitiveNames: string[];
+
+			/**
+			 * @example { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" }
+			 */
+			abbreviatedMonthNames: string[];
+
+			/**
+			 * @example 0
+			 */
+			calendarWeekRule: number;
+			
+			/**
+			 * @example See interface Calendar
+			 */
+			calendar: Calendar;
+			
+			/**
+			 * @example "/"
+			 */
+			dateSeparator: string;  
+			
+			/**
+			 * @example { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }
+			 */			
+			dayNames: string[];  
+			
+			/**
+			 * @example See interface DayOfWeek
+			 */
+			firstDayOfWeek: DayOfWeek;
+			
+			/**
+			 * @example "dddd, MMMM d, yyyy h:mm:ss tt"
+			 */			
+			fullDateTimePattern: string;  
+			
+			/**
+			 * @example "dddd, MMMM d, yyyy"
+			 */	
+			longDatePattern: string;  
+			
+			/**
+			 * @example "hh:mm:ss tt"
+			 */			
+			longTimePattern: string;  
+						
+			/**
+			 * @example "MMMM dd"
+			 */
+			monthDayPattern: string;  
+						
+			/**
+			 * @example { "January", "February", "March", ...  "December", "" }
+			 */
+			monthGenitiveNames: string[];   
+						
+			/**
+			 * @example { "January", "February", "March", ...  "December", "" }
+			 */
+			monthNames: string[];  
+						
+			/**
+			 * @example "PM"
+			 */
+			pmDesignator: string;  
+						
+			/**
+			 * @example "M/d/yyyy"
+			 */
+			shortDatePattern: string;  
+						
+			/**
+			 * @example "h:mm tt"
+			 */
+			shortTimePattern: string;
+						
+			/**
+			 * @example { "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" }
+			 */
+			shortestDayNames: string[];  
+						
+			/**
+			 * @example "yyyy'-'MM'-'dd'T'HH':'mm':'ss"
+			 */
+			sortableDateTimePattern: string;  
+						
+			/**
+			 * @example ":"
+			 */
+			timeSeparator: string;  
+						
+			/**
+			 * @example "yyyy'-'MM'-'dd HH':'mm':'ss'Z'"
+			 */
+			universalSortableDateTimePattern: string;  
+						
+			/**
+			 * @example "MMMM yyyy"
+			 */
+			yearMonthPattern: string;  
+		}
+
+		/**
+		 * The interface for the Org System Settings Number Format Info exposed to a custom control
+		 * Comments indicate example values
+		 */
+		interface NumberFormattingInfo
+		{
+			/**
+			 * @example 2
+			 */
+			currencyDecimalDigits: number;
+
+			/**
+			 * @example "."
+			 */
+			currencyDecimalSeparator: string;
+
+			/**
+			 * @example ","
+			 */
+			currencyGroupSeparator: string;
+
+			/**
+			 * @example [ 3 ]
+			 */
+			currencyGroupSizes: number[];
+
+			/**
+			 * @example 0
+			 */
+			currencyNegativePattern: number;
+
+			/**
+			 * @example 0
+			 */
+			currencyPositivePattern: number;
+
+			/**
+			 * @example "$"
+			 */
+			currencySymbol: string;
+
+			/**
+			 * @example "NaN"
+			 */
+			nanSymbol: string;
+
+			/**
+			 * @example { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"}
+			 */
+			nativeDigits: string[];
+
+			/**
+			 * @example "-Infinity"
+			 */
+			negativeInfinitySymbol: string;
+
+			/**
+			 * @example "-"
+			 */
+			negativeSign: string;
+
+			/**
+			 * @example 2
+			 */
+			numberDecimalDigits: number;
+
+			/**
+			 * @example "."
+			 */
+			numberDecimalSeparator: string;
+
+			/**
+			 * @example ","
+			 */
+			numberGroupSeparator: string;
+
+			/**
+			 * @example [3]
+			 */
+			numberGroupSizes: number[];
+
+			/**
+			 * @example 1
+			 */
+			numberNegativePattern: number;
+
+			/**
+			 * @example ""
+			 */
+			perMilleSymbol: string;
+
+			/**
+			 * @example 2
+			 */
+			percentDecimalDigits: number;
+
+			/**
+			 * @example "."
+			 */
+			percentDecimalSeparator: string;
+
+			/**
+			 * @example ","
+			 */
+			percentGroupSeparator: string;
+
+			/**
+			 * @example [3]
+			 */
+			percentGroupSizes: number[];
+
+			/**
+			 * @example 0
+			 */
+			percentNegativePattern: number;
+
+			/**
+			 * @example 0
+			 */
+			percentPositivePattern: number;
+
+			/**
+			 * @example "%"
+			 */
+			percentSymbol: string;
+
+			/**
+			 * @example "Infinity"
+			 */
+			positiveInfinitySymbol: string;
+
+			/**
+			 * @example "+"
+			 */
+			positiveSign: string;
+		}
+
+		/**
+		 * The interface for the Calendar exposed in DateFormattingInfo
+		 */
+		interface Calendar
+		{
+			/**
+			 * @example "/Date(-62135568000000)/"
+			 */
+			minSupportedDateTime: Date; 
+
+			/**
+			 * @example "/Date(253402300799999)/"
+			 */
+			maxSupportedDateTime: Date;
+
+			/**
+			 * @example 1
+			 */
+			algorithmType: number;
+
+			/**
+			 * @example 1
+			 */
+			calendarType: number; 
+
+			/**
+			 * @example  2029
+			 */
+			twoDigitYearMax: number;
+		}
+	}
+
+	/**
+	 * Helper of Utils API interface
+	 */
+	namespace UtilityApi
+	{
+		/**
+		 * Options used when opening a lookup dialog.
+		 */
+		interface LookupOptions
+		{
+			/**
+			 *	Whether the lookup allows more than one item to be selected.
+			 */
+			allowMultiSelect: boolean;
+
+			/**
+			 *	The default entity type.
+			 */
+			defaultEntityType: string;
+
+			/**
+			 *	The default view to use.
+			 */
+			defaultViewId: string;
+
+			/**
+			 *	The entity types to display.
+			 */
+			entityTypes: string[];
+
+			/**
+			 *	The views to be available in the view picker. Only System views are supported (not user views).
+			 */
+			viewIds: string[];
+		}
+	}
+
+	/**
+	 * Objects related to interacting with the Web API.
+	 */
+	namespace WebApi
+	{
+		/**
+		 * Interface that describes an entity sent or received from the SDK through the Web API.
+		 */
+		interface Entity
+		{
+			[key: string]: any;
+		}
+
+		/**
+		 * 
+		 */
+		interface RetrieveMultipleResponse
+		{
+			/** 
+			 *  An array of JSON objects, where each object represents the retrieved entity record containing attributes and their values
+			 */
+			entities: Entity[];
+			
+			/** 
+			 * If the number of records being retrieved is more than the value specified in the 'maxPageSize' parameter in the request, this attribute returns the URL to return next set of records.
+			 */
+			nextLink: string;
+		}
+	}
+
+	/**
+	 * An object that encapsulates an Entity Reference as a plain object suitable for storing in the state tree
+	 */
+	interface EntityReference
+	{
+		/**
+		 * The record id. Read-only.
+		 */
+		id: string,
+
+		/**
+		 * The entity logical name. Read-only.
+		 */
+		entityType?: string;
+
+		/**
+		 * The name of the entity reference. Read-only.
+		 */
+		name: string;
+	}
+
+	/** 
+	 * Interface of one file object
+	 */		
+	interface FileObject
+	{
+		/**
+		 * Contents of the file.
+		 */
+		fileContent: string;
+
+		/** 
+		 * Name of the file.
+		 */
+		fileName: string;
+
+		/** 
+		 * Size of the file in KB.
+		 */
+		fileSize: number;
+		
+		/** 
+		 * File MIME type.
+		 */
+		mimeType: string;
+	}
+	
+///////////////////// Parameter ////////////////////////
+
+	namespace PropertyTypes
+	{
+		/** 
+		 * Interface for context.parameters.[property_key]
+		 */
+		interface Property
+		{
+			error: boolean;
+			errorMessage: string;
+			formatted?: string;
+			security?: PropertyHelper.SecurityValues;
+			raw: any;
+			type: string;
+			attribute?: PropertyHelper.FieldPropertyMetadata.Metadata;
+		}
+
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is Whole.None|FP|Decimal
+		 */
+		interface NumberProperty extends Property
+		{
+			raw: number;
+			attributes?: PropertyHelper.FieldPropertyMetadata.NumberMetadata;
+		}
+	
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is Decimal
+		 */
+		interface DecimalNumberProperty extends NumberProperty
+		{
+			attributes?: PropertyHelper.FieldPropertyMetadata.DecimalNumberMetadata;
+		}
+		
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is FP
+		 */
+		interface FloatingNumberProperty extends NumberProperty
+		{
+			attributes?: PropertyHelper.FieldPropertyMetadata.FloatingNumberMetadata;
+		}
+
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is Whole.None
+		 */
+		interface WholeNumberProperty extends NumberProperty
+		{
+			attributes?: PropertyHelper.FieldPropertyMetadata.WholeNumberMetadata;
+		}
+
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type starts from DateTime
+		 */
+		interface DateTimeProperty extends Property
+		{
+			raw: Date;
+			attributes?: PropertyHelper.FieldPropertyMetadata.DateTimeMetadata;
+		}
+
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type starts from SingleLine
+		 */
+		interface StringProperty extends Property
+		{
+			raw: string;
+			attributes?: PropertyHelper.FieldPropertyMetadata.StringMetadata;
+		}
+		
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is Enum
+		 */
+		interface EnumProperty<EnumType>
+		{
+			type: string;
+			raw: EnumType;
+		}
+
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is OptionSet
+		 */
+		interface OptionSetProperty extends Property
+		{
+			raw: number;
+			attributes?: PropertyHelper.FieldPropertyMetadata.OptionSetMetadata;
+		}
+	
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is MultiSelectOptionSet
+		 */
+		interface MultiSelectOptionSetProperty extends Property
+		{
+			raw: number[];
+			attributes?: PropertyHelper.FieldPropertyMetadata.OptionSetMetadata;	
+		}
+	
+		/** 
+		 * Property Interface for context.parameters.[property_key], when property manifest type is TwoOptions
+		 */
+		interface TwoOptionsProperty extends Property
+		{
+			raw: boolean;
+			attributes?: PropertyHelper.FieldPropertyMetadata.TwoOptionMetadata;
+		}
+
+		/**
+		*	The structure returned by getCellImageInfo and propagated down to the control to display conditional images.
+		*/
+		interface IImageInfo
+		{
+			/**
+			 * The Url of the conditional image.
+			 */
+			Url: string;
+
+			/**
+			 * The tooltip associated with that image.
+			 */
+			Tooltip: string;
+		}
+
+		/**
+		 * The structure of a dataset property as it would be passed to a control
+		 */
+		interface DataSet
+		{
+	
+			/**
+			 * Adds column to the columnset
+			 * @param name column name to be added to the columnset
+			 * @param entityAlias entity alias for which the column name needs to be added
+			 */
+			addColumn?: (name: string, entityAlias?: string) => void;
+	
+			/**
+			 * Set of columns available in this dataset.
+			 */
+			columns: PropertyHelper.DataSetApi.Column[];
+			
+			/**
+			 * True if encountered error while data retrieval
+			 */
+			error: boolean;
+	
+			/**
+			 * The error message associated with the last encountered error, if applicable
+			 */
+			errorMessage: string;
+	
+			/**
+			 * The column filtering for the current query.
+			 */
+			filtering: PropertyHelper.DataSetApi.Filtering
+
+			/**
+			 * Related entity info
+			 */
+			linking: PropertyHelper.DataSetApi.Linking;
+	
+			/**
+			 * Indicate if the dataset property is in loading state or not
+			 */
+			loading: boolean;
+	
+			/**
+			 * Pagination status and actions.
+			 */
+			paging: PropertyHelper.DataSetApi.Paging;
+	
+			/**
+			 * Map of IDs to the full record object
+			 */
+			records: {
+				[id: string]: PropertyHelper.DataSetApi.EntityRecord;
+			};
+	
+			/**
+			 * IDs of the records in the dataset, order by the query response result
+			 */
+			sortedRecordIds: string[];
+	
+			/**
+			 * The sorting status for the current query.
+			 */
+			sorting: PropertyHelper.DataSetApi.SortStatus[];
+	
+			/**
+			 * Clear selected record ids list
+			 */
+			clearSelectedRecordIds(): void;
+	
+			/**
+			 * Retrieves all selected record ids
+			 */
+			getSelectedRecordIds(): string[];
+	
+			/**
+			 * Get DataSet target entity logical name
+			 */
+			getTargetEntityType(): string;
+	
+			/**
+			 * Retrieves the view display name used by the dataset property
+			 */
+			getTitle(): string;
+	
+			/**
+			 * Gets Id of view used by the dataset property
+			 */
+			getViewId(): string;
+	
+			/**
+			 * Open dataSet item for a given EntityReference. It will check if there is a command with command button id "Mscrm.OpenRecordItem". 
+			 * If there is, it will execute the command, otherwise it will just navigate to the associated form of the entityReference
+			 * @param entityReference entity reference
+			 */
+			openDatasetItem(entityReference: EntityReference): void;
+			
+			/**
+			 * Refreshes the dataset based on filters, sorting, linking, new column. New data will be pushed to control in another 'updateView' cycle.
+			 */
+			refresh(): void;
+	
+			/**
+			 * Set the ids of the selected records
+			 * @ids List of recordId's
+			 */
+			setSelectedRecordIds(ids: string[]): void;
+		}
+	}
+
+	namespace PropertyHelper.FieldPropertyMetadata
+	{
+		interface Metadata
+		{
+			DisplayName: string;
+			LogicalName: string;
+			RequiredLevel: RequiredLevel;
+			IsSecured: boolean;
+			SourceType: number;
+			Description: string;
+		}
+
+		interface NumberMetadata extends Metadata
+		{
+			MinValue: number;
+			MaxValue: number;
+			ImeMode: ImeMode;
+		}
+	
+		interface StringMetadata extends Metadata 
+		{
+			MaxLength: number;
+			ImeMode: ImeMode;
+		}
+			
+		interface FloatingNumberMetadata extends NumberMetadata 
+		{
+			Precision: number;
+		}
+	
+		interface DecimalNumberMetadata extends NumberMetadata 
+		{
+			Precision: number;
+		}
+	
+		interface WholeNumberMetadata extends NumberMetadata 
+		{
+			Format: string;
+			LanguageByCode?: Dictionary; 
+			TimeZoneByCode?: Dictionary; 
+		}
+	
+		interface DateTimeMetadata extends Metadata 
+		{
+			Behavior: FormattingApi.DateTimeFieldBehavior;
+			Format: string;
+			ImeMode: ImeMode;
+		}
+	
+		interface LookupMetadata extends Metadata 
+		{
+			Targets: string[];
+		}
+	
+		interface StringMetadata extends Metadata
+		{
+			Format: string;
+		}
+	
+		interface OptionSetMetadata extends Metadata
+		{
+			Options: OptionMetadata[];
+			DefaultValue: number;
+		}
+	
+		interface TwoOptionMetadata extends Metadata
+		{
+			Options: [OptionMetadata, OptionMetadata];
+			DefaultValue: boolean;
+		}
+	}
+
+	namespace PropertyHelper.DataSetApi
+	{
+
+		/**	 
+		 * Supported Condition Operator for filtering expression condition
+		 * This is subset of full condition operators list defined in https://docs.microsoft.com/en-us/dotnet/api/microsoft.xrm.sdk.query.conditionoperator 
+		 */
+		const enum ConditionOperator
+		{
+			None = -1,
+			Equal = 0,
+			NotEqual = 1,
+			GreaterThan = 2,
+			LessThan = 3,
+			GreaterEqual = 4,
+			LessEqual = 5,
+			Like = 6,
+			In = 8,
+			Null = 12,
+			Yesterday = 14,
+			Today = 15,
+			Tomorrow = 16,
+			Last7Days = 17,
+			Next7Days = 18,
+			LastWeek = 19,
+			ThisWeek = 20,
+			LastMonth = 22,
+			ThisMonth = 23,
+			On = 25,
+			OnOrBefore = 26,
+			OnOrAfter = 27,
+			LastYear = 28,
+			ThisYear = 29,
+			LastXDays = 33,
+			NextXDays = 34,
+			LastXMonths = 37,
+			NextXMonths = 38,
+			Contains = 49,
+			InFiscalPeriodAndYear = 70,
+			Above = 75,
+			Under = 76,
+			NotUnder = 77,
+			AboveOrEqual = 78,
+			UnderOrEqual = 79,
+			ContainValues = 87
+		}
+
+		/**
+		 * An expression used to represent a filter condition.
+		 */
+		interface ConditionExpression
+		{
+			/**
+			 * The name of the data-set column to apply the filter on.
+			 */
+			attributeName: string;
+
+			/**
+			 * The value evaluated by the condition
+			 */
+			conditionOperator: ConditionOperator;
+
+			/**
+			 * The value evaluated by the condition. 
+			 */
+			value: string | Array<string>;
+
+			/** 
+			 * Entity alias name so filtering can be used on linked entities.
+			 */
+			entityAliasName?: string;
+		}
+
+		/**
+		 * Supported Filter Operator for filtering expression linkage
+		 */
+		const enum FilterOperator
+		{
+			And = 0,
+			Or = 1
+		}
+
+		/**
+		 * An expression used to represent a filter.
+		 */
+		interface FilterExpression
+		{
+			/**
+			 * The set of conditions associated with this filter.
+			 */
+			conditions: ConditionExpression[];
+
+			/**
+			 * The operator used to combine conditions in this filter.
+			 */
+			filterOperator: FilterOperator;
+
+			/** 
+			 * Any child filters that should be evaluated after evaluating this filter.
+			 */
+			filters?: FilterExpression[];
+		}
+
+		/**
+		 * Filter state for a dataset.
+		 */
+		interface Filtering
+		{
+			/**
+			 * Returns the top-most filter associated with the data-set
+			 */
+			getFilter(): FilterExpression;
+
+			/**
+			 * Sets the top-most filter associated with the data-set
+			 * @expression filter expression to be set
+			 */
+			setFilter(expression: FilterExpression): void;
+
+			/**
+			 * Clears the filter associated with the data-set.
+			 */
+			clearFilter(): void;
+		}
+
+		/**
+		 * Metadata about a column in a dataset
+		 */
+		interface Column
+		{
+			/**
+			 * Name of the column, unique in this dataset
+			 */
+			name: string;
+
+			/**
+			 * Localized display name for the column
+			 */
+			displayName: string;
+
+			/**
+			 * The manifest type of this column's values.
+			 */
+			dataType: string;
+
+			/**
+			 * The alias of this column.
+			 */
+			alias: string;
+
+			/**
+			 * The column order for the layout
+			 */
+			order: number;
+
+			/**
+			 * Customized column width ratios
+			 */
+			visualSizeFactor: number;
+
+			/**
+			 * The column visibility state.
+			 */
+			isHidden?: boolean;
+
+			/**
+			 * Is specific column the primary attrribute of the view's entity
+			 */
+			isPrimary?: boolean;
+
+			/**
+			 * Prevents the UI from making the column sortable. 
+			 */
+			disableSorting?: boolean;
+		}
+
+		/**
+		 * Base interface for dataset record result. Supports value retrival by column name.
+		 */
+		interface EntityRecord
+		{
+			/**
+			 * Get the current formatted value of this record column.
+			 * @param columnName Column name of the record
+			 */
+			getFormattedValue(columnName: string): string;
+
+			/**
+			 * Get the record ID
+			 */
+			getRecordId(): string;
+
+			/**
+			 * Get the raw value of the record's column
+			 * @param columnName Column name of the record
+			 */
+			getValue(columnName: string): string | Date | number | number[] | boolean | EntityReference | EntityReference[];
+
+			/**
+			 * Get the object that encapsulates an Entity Reference as a plain object
+			 */
+			getNamedReference(): EntityReference;
+
+		}
+
+		/**
+		 * Column Sort Direction
+		 */
+		const enum SortDirection
+		{
+			None = -1,
+			Ascending = 0,
+			Descending = 1
+		}
+
+		/**
+		 * Current sort status of a dataset column
+		 */
+		interface SortStatus
+		{
+			/**
+			 * The name of the column
+			 */
+			name: string;
+
+			/**
+			 * The current sort direction for the column.
+			 */
+			sortDirection: SortDirection;
+		}
+
+		/**
+		 * Paging state for a dataset
+		 */
+		interface Paging
+		{
+			/**
+			 * Total number of results on the server for the current query.
+			 */
+			totalResultCount: number;
+
+			/**
+			 * Whether the result set can be paged forwards.
+			 */
+			hasNextPage: boolean;
+
+			/**
+			 * Whether the result set can be paged backwards.
+			 */
+			hasPreviousPage: boolean;
+
+			/**
+			 * Request the next page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
+			 */
+			loadNextPage(): void;
+
+			/**
+			 * Request the previous page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
+			 */
+			loadPreviousPage(): void;
+
+			/**
+			 * Reload the results from the server, and reset to page 1.
+			 */
+			reset(): void;
+
+			/**
+			 * Sets the number of results to return per page on the next data refresh.
+			 * @pageSize pageSize to be set.
+			 */
+			setPageSize(pageSize: number): void;
+		}
+
+		/**
+		 * Dataset entity linking.
+		 */
+		interface Linking
+		{
+			/**
+			 * Returns all the linked entities information
+			 */
+			getLinkedEntities(): ILinkEntityExposedExpression[];
+
+			/**
+			 * Add a new linked entity relationship with the existed query primary entity
+			 */
+			addLinkedEntity(expression: ILinkEntityExposedExpression): void;
+		}
+
+		/**
+		 * Entity linking expression 
+		 */
+		interface ILinkEntityExposedExpression {
+			
+			/**
+			 * The 'name' of the entity to link to
+			 */
+			name: string;
+
+			/**
+			 * The 'from' attribute in the link-entity relationship
+			 */
+			from: string;
+
+			/**
+			 * The 'to' attribute in the link-entity relationship
+			 */
+			to: string;
+
+			/**
+			 * The 'type' of the link, referred by the link-entity attribute
+			 */
+			linkType: string;
+
+			/**
+			 * The 'alias' for the link-entity relationship
+			 */
+			alias: string;
+		}
+	}
+
+	namespace PropertyHelper
+	{
+		/** 
+		 * Ime Mode 
+		 */
+		const enum ImeMode
+		{
+			Auto = 0,
+			Inactive = 1,
+			Active = 2,
+			Disabled = 3,
+		}
+		
+		/**
+		 * Entity privilege types.
+		 */
+		const enum PrivilegeType
+		{
+			None = 0,
+			Create = 1,
+			Read = 2,
+			Write = 3,
+			Delete = 4,
+			Assign = 5,
+			Share = 6,
+			Append = 7,
+			AppendTo = 8,
+		}
+	
+		/** 
+		 * Entity Priviledge Depth
+		 */
+		const enum PrivilegeDepth
+		{
+			None = -1,
+			Basic = 0,
+			Local = 1,
+			Deep = 2,
+			Global = 3,
+		}
+
+		/** 
+		 * Attribute required level 
+		 */
+		const enum RequiredLevel
+		{
+			Unknown = -1,
+			None = 0,
+			SystemRequired = 1,
+			ApplicationRequired = 2,
+			Recommended = 3,
+		}
+
+		/**
+		 * Entity metadata refer to online documentation
+		 * https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/getentitymetadata
+		 */
+		interface EntityMetadata 
+		{
+			[key: string]: any;
+		}
+
+		/**
+		 * Option Item Metadata
+		 */
+		interface OptionMetadata
+		{
+			Label: string;
+			Value: number;
+			Color: string;
+		}
+
+		/**
+		 * Entity metadata security privileges.
+		 */
+		interface SecurityPrivilegeMetadata
+		{
+			CanBeBasic: boolean;
+			CanBeDeep: boolean;
+			CanBeGlobal: boolean;
+			CanBeLocal: boolean;
+			CanBeEntityReference: boolean;
+			CanBeParentEntityReference: boolean;
+			Name: string;
+			PrivilegeId: string;
+			PrivilegeType: PrivilegeType;
+		}
+
+		/**
+		 * Entity metadata security values
+		 */
+		interface SecurityValues
+		{
+			editable: boolean;
+			readable: boolean;
+			secured: boolean;
+		}
+	}
+}
diff --git a/types/powerapps-component-framework/index.d.ts b/types/powerapps-component-framework/index.d.ts
new file mode 100644
index 0000000000..f4ba8718d0
--- /dev/null
+++ b/types/powerapps-component-framework/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for non-npm package PowerApps Component Framework 1.0
+// Project: https://powerapps.microsoft.com
+// Definitions by: Joseph Pursley <https://github.com/jopursle>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference path="./componentframework.d.ts" />
diff --git a/types/powerapps-component-framework/powerapps-component-framework-tests.ts b/types/powerapps-component-framework/powerapps-component-framework-tests.ts
new file mode 100644
index 0000000000..487852dc32
--- /dev/null
+++ b/types/powerapps-component-framework/powerapps-component-framework-tests.ts
@@ -0,0 +1,88 @@
+// tslint:disable-next-line:no-empty-interface
+interface TInputs {};
+interface TOutputs { testString: string };
+
+class TestControl implements ComponentFramework.StandardControl<TInputs, TOutputs> {
+	init(context: ComponentFramework.Context<TInputs>, notifyOutputChanged?: () => void, state?: ComponentFramework.Dictionary, container?: HTMLDivElement) {
+	}
+	updateView(context: ComponentFramework.Context<TInputs>) {
+	}
+	destroy() {
+	}
+	getOutputs() {
+		return {
+			testString: ''
+		}
+	}
+}
+
+const clientTest: ComponentFramework.Client = {
+	disableScroll: false,
+	getFormFactor: () => 1,
+	getClient: () => '',
+	isOffline: () => false
+};
+
+const tmpFile: ComponentFramework.FileObject = { fileContent: '', fileName: '', fileSize: 0, mimeType: '' };
+const deviceTest: ComponentFramework.Device = {
+	captureAudio: () => Promise.resolve(tmpFile),
+	captureImage: () => Promise.resolve(tmpFile),
+	captureVideo: () => Promise.resolve(tmpFile),
+	getBarcodeValue: () => Promise.resolve(''),
+	getCurrentPosition: () => Promise.resolve({coords: {}, timestamp: new Date(0)}),
+	pickFile: () => Promise.resolve([tmpFile])
+};
+
+const formattingTest: ComponentFramework.Formatting = {
+	formatCurrency: (value: number) => value.toString(),
+	formatDecimal: (value: number) => value.toString(),
+	formatDateAsFilterStringInUTC: (value: Date) => value.toString(),
+	formatDateLong: (value: Date) => value.toString(),
+	formatDateLongAbbreviated: (value: Date) => value.toString(),
+	formatDateShort: (value: Date) => value.toString(),
+	formatDateYearMonth: (value: Date) => value.toString(),
+	formatInteger: (value: number) => value.toString(),
+	formatLanguage: (value: number) => value.toString(),
+	formatTime: (value: Date, behavior: ComponentFramework.FormattingApi.DateTimeFieldBehavior) => value.toString(),
+	getWeekOfYear: (value: Date) => 0,
+};
+
+const modeTest: ComponentFramework.Mode = {
+	allocatedHeight: -1,
+	allocatedWidth: -1,
+	isControlDisabled: false,
+	isVisible: true,
+	label: '',
+	setControlState: (state: ComponentFramework.Dictionary) => false,
+	setFullScreen: (value: boolean) => null,
+	trackContainerResize: (value: boolean) => null
+};
+
+const resourcesTest: ComponentFramework.Resources = {
+	getResource: (id: string, success: (data: string) => void, failure: () => void) => {},
+	getString: (id: string) => ''
+};
+
+const dictionary: ComponentFramework.Dictionary = { testKey: '' };
+
+const imeModeAuto: ComponentFramework.PropertyHelper.ImeMode = ComponentFramework.PropertyHelper.ImeMode.Auto;
+
+const dataSetApiColumn: ComponentFramework.PropertyHelper.DataSetApi.Column = {
+	name: '',
+	displayName: '',
+	dataType: '',
+	alias: '',
+	order: 1,
+	visualSizeFactor: 1,
+	isHidden: false,
+	isPrimary: true,
+	disableSorting: false
+};
+
+const linkEntityExposeExpression: ComponentFramework.PropertyHelper.DataSetApi.ILinkEntityExposedExpression = {
+	name: '',
+	from: '',
+	to: '',
+	linkType: '',
+	alias: ''
+};
diff --git a/types/powerapps-component-framework/tsconfig.json b/types/powerapps-component-framework/tsconfig.json
new file mode 100644
index 0000000000..57d0f82863
--- /dev/null
+++ b/types/powerapps-component-framework/tsconfig.json
@@ -0,0 +1,22 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"es6",
+			"dom"
+		],
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"forceConsistentCasingInFileNames": true,
+		"strictFunctionTypes": true,
+		"noEmit": true,
+		"baseUrl": "../",
+		"typeRoots": ["../"],
+		"types": []
+	},
+	"files": [
+		"index.d.ts",
+		"powerapps-component-framework-tests.ts"
+	]
+}
diff --git a/types/powerapps-component-framework/tslint.json b/types/powerapps-component-framework/tslint.json
new file mode 100644
index 0000000000..a5a8bfb7d7
--- /dev/null
+++ b/types/powerapps-component-framework/tslint.json
@@ -0,0 +1,20 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"array-type": false,
+		"dt-header": false,
+		"interface-name": false,
+		"interface-over-type-literal": false,
+		"jsdoc-format": false,
+		"max-line-length": false,
+		"no-consecutive-blank-lines": false,
+		"no-const-enum": false,
+		"no-internal-module": false,
+		"no-mergeable-namespace": false,
+		"no-padding": false,
+		"no-redundant-jsdoc-2": false,
+		"no-trailing-whitespace": false,
+		"one-line": false,
+		"semicolon": false
+	}
+}

From f51be769e68546bb619eb47173c88232572fa841 Mon Sep 17 00:00:00 2001
From: Leon Thorne <ldthorne96@gmail.com>
Date: Thu, 21 Mar 2019 14:20:02 -0400
Subject: [PATCH 873/924] Remove jsdoc

---
 types/zeit__next-source-maps/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/zeit__next-source-maps/index.d.ts b/types/zeit__next-source-maps/index.d.ts
index 46b3927d97..bdeb4bdfe4 100644
--- a/types/zeit__next-source-maps/index.d.ts
+++ b/types/zeit__next-source-maps/index.d.ts
@@ -7,7 +7,6 @@
 import { ServerConfig } from 'next';
 
 declare function withSourceMaps(
-    /** @default {} */
     nextConfig?: ServerConfig
 ): ServerConfig;
 

From b33aef0aaf26b353b379009cc5c8792cadf3dc61 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Thu, 21 Mar 2019 11:38:32 -0700
Subject: [PATCH 874/924] clarify description of 'calculated columns'
 workaround

---
 types/office-js-preview/index.d.ts | 8 ++++++--
 types/office-js/index.d.ts         | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 57f2c43830..6ef3d9d8b5 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -4720,7 +4720,9 @@ declare namespace Office {
          * In Excel, if you specify formulas in the TableData object you pass for the data parameter, you might not get the results you expect due to 
          * the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to 
          * write `data` that contains formulas to a selected table, try specifying the data as an array of arrays (instead of a TableData object), and 
-         * specify the coercionType as Microsoft.Office.Matrix or "matrix".
+         * specify the coercionType as Microsoft.Office.Matrix or "matrix". However, this technique will block the "calculated columns" feature only 
+         * when one of the following conditions is met: (1) you are writing to all the cells of the column, or (2) there are already at least two 
+         * different formulas in the column.
          * 
          * @param options Provides options for how to insert data to the selection.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
@@ -4904,7 +4906,9 @@ declare namespace Office {
          * In Excel, if you specify formulas in the TableData object you pass for the data parameter, you might not get the results you expect due to 
          * the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to 
          * write `data` that contains formulas to a selected table, try specifying the data as an array of arrays (instead of a TableData object), and 
-         * specify the coercionType as Microsoft.Office.Matrix or "matrix".
+         * specify the coercionType as Microsoft.Office.Matrix or "matrix". However, this technique will block the "calculated columns" feature only 
+         * when one of the following conditions is met: (1) you are writing to all the cells of the column, or (2) there are already at least two 
+         * different formulas in the column.
          * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          *                  The AsyncResult.value property always returns undefined because there is no object or data to retrieve.
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index a9ad9e3de3..403e649f55 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4720,7 +4720,9 @@ declare namespace Office {
          * In Excel, if you specify formulas in the TableData object you pass for the data parameter, you might not get the results you expect due to 
          * the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to 
          * write `data` that contains formulas to a selected table, try specifying the data as an array of arrays (instead of a TableData object), and 
-         * specify the coercionType as Microsoft.Office.Matrix or "matrix".
+         * specify the coercionType as Microsoft.Office.Matrix or "matrix". However, this technique will block the "calculated columns" feature only 
+         * when one of the following conditions is met: (1) you are writing to all the cells of the column, or (2) there are already at least two 
+         * different formulas in the column.
          * 
          * @param options Provides options for how to insert data to the selection.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
@@ -4904,7 +4906,9 @@ declare namespace Office {
          * In Excel, if you specify formulas in the TableData object you pass for the data parameter, you might not get the results you expect due to 
          * the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to 
          * write `data` that contains formulas to a selected table, try specifying the data as an array of arrays (instead of a TableData object), and 
-         * specify the coercionType as Microsoft.Office.Matrix or "matrix".
+         * specify the coercionType as Microsoft.Office.Matrix or "matrix". However, this technique will block the "calculated columns" feature only 
+         * when one of the following conditions is met: (1) you are writing to all the cells of the column, or (2) there are already at least two 
+         * different formulas in the column.
          * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          *                  The AsyncResult.value property always returns undefined because there is no object or data to retrieve.

From 3f269b670b9b0c72c5ab532a6d669dc4b0c3b02d Mon Sep 17 00:00:00 2001
From: Kirill Kvashonin <etozhkirill@yandex.ru>
Date: Thu, 21 Mar 2019 21:56:33 +0300
Subject: [PATCH 875/924] resolve conversation

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

diff --git a/types/scroll-to-element/index.d.ts b/types/scroll-to-element/index.d.ts
index d2faf83658..7120bc7e2d 100644
--- a/types/scroll-to-element/index.d.ts
+++ b/types/scroll-to-element/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Kirill Kvashonin <https://github.com/kirillurgant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface Options {
-    offset?: number;
+interface Options {
+    offset: number;
     align?: 'top' | 'middle' | 'bottom';
     ease?: string;
     duration?: number;
@@ -12,4 +12,4 @@ export interface Options {
 
 declare function scrollToElement(selector: string | HTMLElement | Element, options?: Options): void;
 
-export default scrollToElement;
+export = scrollToElement;

From a30bc0965e4ca718d794fc0b34165640378c3279 Mon Sep 17 00:00:00 2001
From: Kirill Kvashonin <etozhkirill@yandex.ru>
Date: Thu, 21 Mar 2019 21:56:33 +0300
Subject: [PATCH 876/924] resolve conversation

---
 types/scroll-to-element/index.d.ts    | 6 +++---
 types/scroll-to-element/tsconfig.json | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/scroll-to-element/index.d.ts b/types/scroll-to-element/index.d.ts
index d2faf83658..7120bc7e2d 100644
--- a/types/scroll-to-element/index.d.ts
+++ b/types/scroll-to-element/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Kirill Kvashonin <https://github.com/kirillurgant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export interface Options {
-    offset?: number;
+interface Options {
+    offset: number;
     align?: 'top' | 'middle' | 'bottom';
     ease?: string;
     duration?: number;
@@ -12,4 +12,4 @@ export interface Options {
 
 declare function scrollToElement(selector: string | HTMLElement | Element, options?: Options): void;
 
-export default scrollToElement;
+export = scrollToElement;
diff --git a/types/scroll-to-element/tsconfig.json b/types/scroll-to-element/tsconfig.json
index f11fef6ecb..8b64a69b6f 100644
--- a/types/scroll-to-element/tsconfig.json
+++ b/types/scroll-to-element/tsconfig.json
@@ -13,6 +13,7 @@
         "typeRoots": [
             "../"
         ],
+        "allowSyntheticDefaultImports": true,
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true

From 0626dbec733787154a3af98c8608e880cbc10a07 Mon Sep 17 00:00:00 2001
From: Kirill Kvashonin <etozhkirill@yandex.ru>
Date: Thu, 21 Mar 2019 22:50:08 +0300
Subject: [PATCH 877/924] [scroll-to-element] fix tsconfig

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

diff --git a/types/scroll-to-element/tsconfig.json b/types/scroll-to-element/tsconfig.json
index 8b64a69b6f..106ad8460e 100644
--- a/types/scroll-to-element/tsconfig.json
+++ b/types/scroll-to-element/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From 6f5691b04bc58645671afcf18160faa8d51f5655 Mon Sep 17 00:00:00 2001
From: Kirill Kvashonin <etozhkirill@yandex.ru>
Date: Thu, 21 Mar 2019 22:58:02 +0300
Subject: [PATCH 878/924] [scroll-to-element] fix example

---
 types/scroll-to-element/scroll-to-element-tests.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/scroll-to-element/scroll-to-element-tests.ts b/types/scroll-to-element/scroll-to-element-tests.ts
index a9d3d33d81..71a0c921aa 100644
--- a/types/scroll-to-element/scroll-to-element-tests.ts
+++ b/types/scroll-to-element/scroll-to-element-tests.ts
@@ -11,9 +11,11 @@ scrollToElement('.className', {
 
 // or if you already have a reference to the element
 const elem = document.querySelector('.className');
-scrollToElement(elem, {
-	offset: 0,
-    ease: 'out-bounce',
-    align: 'top',
-	duration: 1500
-});
+if (elem) {
+    scrollToElement(elem, {
+        offset: 0,
+        ease: 'out-bounce',
+        align: 'top',
+        duration: 1500
+    });
+}

From 77c7078ece5c24bdab36c28eee276b8c4cf19a22 Mon Sep 17 00:00:00 2001
From: Pratik Gaikwad <pratik.gaikwad19@gmail.com>
Date: Thu, 21 Mar 2019 16:11:01 -0400
Subject: [PATCH 879/924] refactor(XMLCreateOptions): corrected variable names
 related to null nodes Per
 https://github.com/oozcitak/xmlbuilder-js/blob/master/CHANGELOG.md#1100---2019-02-18,
 `skipNullNodes` is replaced with `keepNullNodes` and `skipNullAttributes`
 with `keepNullAttributes` altering the functionality internally

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

diff --git a/types/xmlbuilder/index.d.ts b/types/xmlbuilder/index.d.ts
index 478e5c85d4..831d66f6ec 100644
--- a/types/xmlbuilder/index.d.ts
+++ b/types/xmlbuilder/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for xmlbuilder
 // Project: https://github.com/oozcitak/xmlbuilder-js
 // Definitions by: Wallymathieu <https://github.com/wallymathieu>
+//               : GaikwadPratik <https://github.com/GaikwadPratik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = xmlbuilder;
@@ -107,8 +108,8 @@ declare namespace xmlbuilder {
 
     interface XMLCreateOptions {
         headless?: boolean;
-        skipNullNodes?: boolean;
-        skipNullAttributes?: boolean;
+        keepNullNodes?: boolean;
+        keepNullAttributes?: boolean;
         ignoreDecorators?: boolean;
         separateArrayItems?: boolean;
         noDoubleEncoding?: boolean;

From f21af16b056a8bac4e5a3e61c3e572913f58a58a Mon Sep 17 00:00:00 2001
From: Haseeb Majid <hmajid2301@gmail.com>
Date: Thu, 21 Mar 2019 20:15:37 +0000
Subject: [PATCH 880/924] Fixed small bugs in the definition

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

diff --git a/types/react-native-canvas/index.d.ts b/types/react-native-canvas/index.d.ts
index af79c05bde..1c1f973102 100644
--- a/types/react-native-canvas/index.d.ts
+++ b/types/react-native-canvas/index.d.ts
@@ -165,7 +165,7 @@ export default class Canvas extends React.Component<CanvasProps> {
 }
 
 export class Image {
-    constructor(canvas: Canvas, height: number, width: number);
+    constructor(canvas: Canvas, height?: number, width?: number);
     crossOrigin: string | undefined;
     height: number;
     width: number;
@@ -174,7 +174,7 @@ export class Image {
 }
 
 export class ImageData {
-    constructor(canvas: Canvas, height: number, width: number, data?: number[], );
+    constructor(canvas: Canvas, data: number[], height: number, width: number);
     readonly data: number[];
     readonly height: number;
     readonly width: number;

From e85ab7bb2d5b8ed5d1830be3d3a69d98a9cb5992 Mon Sep 17 00:00:00 2001
From: Joseph Pursley <jopursle@microsoft.com>
Date: Thu, 21 Mar 2019 14:08:48 -0700
Subject: [PATCH 881/924] Address PR comments by removing extra linting rules
 and fixing the linting failures caused by the removal.

---
 .../componentframework.d.ts                   | 1265 ++++++++---------
 .../powerapps-component-framework-tests.ts    |   11 +-
 .../powerapps-component-framework/tslint.json |   19 +-
 3 files changed, 592 insertions(+), 703 deletions(-)

diff --git a/types/powerapps-component-framework/componentframework.d.ts b/types/powerapps-component-framework/componentframework.d.ts
index 970e61ef69..742e7d506b 100644
--- a/types/powerapps-component-framework/componentframework.d.ts
+++ b/types/powerapps-component-framework/componentframework.d.ts
@@ -1,34 +1,36 @@
-declare module ComponentFramework 
-{
+declare namespace ComponentFramework {
 	/**
 	 * Interface for the PowerApps Controls (Standard)
 	 */
-	interface StandardControl<TInputs, TOutputs>
-	{
+	interface StandardControl<TInputs, TOutputs> {
 		/**
 		 * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
 		 * Data-set values are not initialized here, use updateView.
-		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
+		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped
+		 * to property names defined in the manifest, as well as utility functions.
 		 * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
-		 * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
+		 * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling
+		 * 'setControlState' in the Mode interface.
 		 * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
 		 */
 		init(context: Context<TInputs>, notifyOutputChanged?: () => void, state?: Dictionary, container?: HTMLDivElement): void;
 
 		/**
-		 * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
-		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
+		 * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width,
+		 * offline status, control metadata values such as label, visible, etc.
+		 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names
+		 * defined in the manifest, as well as utility functions
 		 */
 		updateView(context: Context<TInputs>): void;
 
-		/** 
- 		 * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
+		/**
+		 * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
 		 * i.e. cancelling any pending remote calls, removing listeners, etc.
 		 */
 		destroy(): void;
 
-		/** 
-		 * It is called by the framework prior to a control receiving new data. 
+		/**
+		 * It is called by the framework prior to a control receiving new data.
 		 * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as "bound" or "output"
 		 */
 		getOutputs?(): TOutputs;
@@ -37,8 +39,7 @@ declare module ComponentFramework
 	/**
 	 * The entire property bag interface available to control via Context Object
 	 */
-	interface Context<TInputs>
-	{	
+	interface Context<TInputs> {
 		client: Client;
 		device: Device;
 		factory: Factory;
@@ -56,10 +57,9 @@ declare module ComponentFramework
 	/**
 	 * The interface for the context.client
 	 */
-	interface Client 
-	{
+	interface Client {
 		/**
-		 * Whether this control should disable its scrolling capabilities. 
+		 * Whether this control should disable its scrolling capabilities.
 		 */
 		disableScroll: boolean;
 
@@ -71,7 +71,7 @@ declare module ComponentFramework
 		 * Phone = 3
 		 */
 		getFormFactor(): number;
-		
+
 		/**
 		 * Returns a value to indicate which client the script is executing in.
 		 * Web: Web application, or Unified Interface
@@ -86,12 +86,10 @@ declare module ComponentFramework
 		isOffline(): boolean;
 	}
 
-
 	/**
 	 * The interface for the context.device
 	 */
-	interface Device
-	{
+	interface Device {
 		/**
 		 * Invokes the device microphone to record audio.
 		 */
@@ -126,8 +124,7 @@ declare module ComponentFramework
 	/**
 	 * The interface for the context.factory
 	 */
-	interface Factory
-	{
+	interface Factory {
 		/**
 		 * Gets the popup service which help create Popup and manage Popup easily
 		 */
@@ -142,8 +139,7 @@ declare module ComponentFramework
 	/**
 	 * The interface for the context.formatting
 	 */
-	interface Formatting
-	{
+	interface Formatting {
 		/**
 		 * Returns a formatted string that represents the currency value after being formatted.
 		 * @param value A value object to be formatted.
@@ -203,7 +199,7 @@ declare module ComponentFramework
 
 		/**
 		 * Returns a formatted string that represents a given language
-		 * @param input A language code to be formatted. Reference: https://go.microsoft.com/fwlink/?linkid=122128 
+		 * @param input A language code to be formatted. Reference: https://go.microsoft.com/fwlink/?linkid=122128
 		 * @returns A formatted string represents a given language value.
 		 */
 		formatLanguage(value: number): string;
@@ -214,7 +210,7 @@ declare module ComponentFramework
 		 * @param behavior The behavior of the datetime object to be formatted.
 		 * None = 0,
 		 * UserLocal = 1,
-		 * TimeZoneIndependent = 3	
+		 * TimeZoneIndependent = 3
 		 */
 		formatTime(value: Date, behavior: FormattingApi.DateTimeFieldBehavior): string;
 
@@ -228,13 +224,12 @@ declare module ComponentFramework
 	/**
 	 * The interface for the context.mode
 	 */
-	interface Mode
-	{
+	interface Mode {
 		/**
 		 * Height in pixels allocated to the control. If it's -1, then there is no limit on height
 		 */
 		allocatedHeight: number;
-		
+
 		/**
 		 * Width in pixels allocated to the control.
 		 */
@@ -276,13 +271,12 @@ declare module ComponentFramework
 	/**
 	 * The navigation interface of context.navigation
 	 */
-	interface Navigation
-	{
+	interface Navigation {
 		/**
 		 * Opens Alert Dialog
 		 * @param alertStrings Strings to be used in alert dialog
 		 * @param options Dialog options
-		 * @returns promise defining success or failure of operation 
+		 * @returns promise defining success or failure of operation
 		 */
 		openAlertDialog(alertStrings: NavigationApi.AlertDialogStrings, options?: NavigationApi.AlertDialogOptions): Promise<void>;
 
@@ -290,10 +284,10 @@ declare module ComponentFramework
 		 * Opens Confirm Dialog
 		 * @param confirmStrings String which will be used in the dialog
 		 * @param options Options for the dialog
-		 * @returns promise defining success or failure of operation. the success case returns a boolean specifying whether yes or no button was pressed 
+		 * @returns promise defining success or failure of operation. the success case returns a boolean specifying whether yes or no button was pressed
 		 */
 		openConfirmDialog(confirmStrings: NavigationApi.ConfirmDialogStrings, options?: NavigationApi.ConfirmDialogOptions): Promise<NavigationApi.ConfirmDialogResponse>;
-		
+
 		/**
 		 * Opens an Error Dialog.
 		 * @param options Error Dialog options.
@@ -336,8 +330,7 @@ declare module ComponentFramework
 	/**
 	 * The resource interface of context.resources
 	 */
-	interface Resources
-	{
+	interface Resources {
 		/**
 		 * Gets a resource referenced by the control manifest.
 		 * @param id The resource string identifier.
@@ -356,8 +349,7 @@ declare module ComponentFramework
 	/**
 	 * The interface for context.userSettings
 	 */
-	interface UserSettings
-	{
+	interface UserSettings {
 		/**
 		 * Date formatting information as retrieved from the server.
 		 */
@@ -370,7 +362,7 @@ declare module ComponentFramework
 
 		/**
 		 * Current user's language id
-		 * 
+		 *
 		 */
 		languageId: number;
 
@@ -404,15 +396,14 @@ declare module ComponentFramework
 	/**
 	 * The interface for context.utils
 	 */
-	interface Utility
-	{
+	interface Utility {
 		/**
 		 * Gets the entity metadata for the specified entity.
 		 * @param entityType The logical name of the entity.
 		 * @param attributes The attributes to get metadata for.
 		 */
 		getEntityMetadata(entityName: string, attributes?: string[]): Promise<PropertyHelper.EntityMetadata>;
-		
+
 		/**
 		 * Function to return if the user has Privilege for one specific entity
 		 * @entityTypeName entity type name
@@ -431,8 +422,7 @@ declare module ComponentFramework
 	/**
 	 * The interface for context.webApi
 	 */
-	interface WebApi
-	{
+	interface WebApi {
 		/**
 		 * Creates an entity record.
 		 * @param entityType logical name of the entity type record to create
@@ -461,7 +451,8 @@ declare module ComponentFramework
 		/**
 		 * Retrieves a collection of entity records.
 		 * @param entityType logical name of the entity type record to retrieve
-		 * @param options OData system query options or FetchXML query to retrieve your data. For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords
+		 * @param options OData system query options or FetchXML query to retrieve your data.
+		 * For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrievemultiplerecords
 		 * @param maxPageSize Max number of records to be retrieved per page
 		 * @returns The deferred object for the result of the operation. An object with interface RetrieveMultipleResponse will be resolved if successful.
 		 */
@@ -471,7 +462,8 @@ declare module ComponentFramework
 		 * Retrieves an entity record.
 		 * @param id GUID of the entity record you want to retrieve.
 		 * @param entityType logical name of the entity type record to retrieve
-		 * @param options OData system query options, $select and $expand, to retrieve your data. For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord
+		 * @param options OData system query options, $select and $expand, to retrieve your data.
+		 * For support options, please refer to https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-webapi/retrieverecord
 		 * @returns The deferred object for the result of the operation. A JSON object with the retrieved properties and values will be resolved if successful.
 		 */
 		retrieveRecord(entityType: string, id: string, options?: string): Promise<WebApi.Entity>;
@@ -479,19 +471,19 @@ declare module ComponentFramework
 
 	//////////////// Define namespace of each context first-level child interface's helper ////////////////
 
-	type Dictionary = {[key: string]: any};
+	interface Dictionary {
+		[key: string]: any;
+	}
 
 	/**
 	 * Helper of Device API interface
 	 */
-	namespace DeviceApi
-	{
-		/** 
+	namespace DeviceApi {
+		/**
 		 * Interface of input argument 'options' in context.device.captureImage
 		 */
-		interface CaptureImageOptions
-		{
-			/** 
+		interface CaptureImageOptions {
+			/**
 			 * Indicates whether to edit the image before saving.
 			 */
 			allowEdit: boolean;
@@ -501,7 +493,7 @@ declare module ComponentFramework
 			 */
 			height: number;
 
-			/** 
+			/**
 			 * Indicates whether to capture image using the front camera of the device.
 			 */
 			preferFrontCamera: boolean;
@@ -517,27 +509,25 @@ declare module ComponentFramework
 			width: number;
 		}
 
-		/** 
+		/**
 		 * Interface of return geological information in context.device.getCurrentPosition
 		 */
-		interface Position
-		{
+		interface Position {
 			/**
-			 * Contains a set of geographic coordinates along with associated accuracy as well as a set of other optional attributes such as altitude and speed. 
+			 * Contains a set of geographic coordinates along with associated accuracy as well as a set of other optional attributes such as altitude and speed.
 			 */
 			coords: Dictionary;
-			
+
 			/**
 			 * Represents the time when the object was acquired and is represented as DOMTimeStamp.
 			 */
 			timestamp: Date;
 		}
 
-		/** 
+		/**
 		 * Interface of input argument 'pickupFileOption' in context.device.pickupFile
 		 */
-		interface PickFileOptions
-		{
+		interface PickFileOptions {
 			/**
 			 * Image file types to select. Valid values are "audio", "video", or "image".
 			 */
@@ -547,7 +537,7 @@ declare module ComponentFramework
 			 * Indicates whether to allow selecting multiple files.
 			 */
 			allowMultipleFiles: boolean;
-			
+
 			/**
 			 * Maximum size of the files(s) to be selected.
 			 */
@@ -558,10 +548,8 @@ declare module ComponentFramework
 	/**
 	 * Helper of Factory Pop API interface
 	 */
-	namespace FactoryApi.Popup
-	{
-		interface PopupService
-		{
+	namespace FactoryApi.Popup {
+		interface PopupService {
 			/**
 			 * Create a new popup element
 			 * @param props The popup properties object, see Popup interface for more
@@ -605,8 +593,7 @@ declare module ComponentFramework
 			getPopupsId(): string;
 		}
 
-		const enum PopupType
-		{
+		enum PopupType {
 			/**
 			 * Root popup in the popup stack
 			 */
@@ -617,9 +604,8 @@ declare module ComponentFramework
 			 */
 			Nested,
 		}
-		
-		interface Popup
-		{
+
+		interface Popup {
 			/**
 			 * The id to be set to the anchor control if any.
 			 */
@@ -631,7 +617,7 @@ declare module ComponentFramework
 			name: string;
 
 			/**
-			 * Indicates whether popup close on an outside mouse click. 
+			 * Indicates whether popup close on an outside mouse click.
 			 * When it's false, the popup will not be closed on an outside mouse click.
 			 */
 			closeOnOutsideClick?: boolean;
@@ -660,13 +646,11 @@ declare module ComponentFramework
 	/**
 	 * Helper of Formatting API interface
 	 */
-	namespace FormattingApi
-	{
+	namespace FormattingApi {
 		/**
 		 * DateTime Field Behavior options
 		 */
-		const enum DateTimeFieldBehavior
-		{
+		enum DateTimeFieldBehavior {
 			/**
 			 * Unknown DateTime Behavior
 			 */
@@ -687,14 +671,11 @@ declare module ComponentFramework
 	/**
 	 * Helper of Navigation API interface
 	 */
-	namespace NavigationApi
-	{
-		
+	namespace NavigationApi {
 		/**
 		 * Interface for alert dialog options.
 		 */
-		interface AlertDialogOptions
-		{
+		interface AlertDialogOptions {
 			/**
 			 * Height of the alert dialog in pixels.
 			 */
@@ -709,8 +690,7 @@ declare module ComponentFramework
 		/**
 		 * Represents the String parameters for Alert Dialog.
 		 */
-		interface AlertDialogStrings
-		{
+		interface AlertDialogStrings {
 			/**
 			 * The message to be displyed in the alert dialog.
 			 */
@@ -725,8 +705,7 @@ declare module ComponentFramework
 		/**
 		 * Interface for confirm dialog options.
 		 */
-		interface ConfirmDialogOptions
-		{
+		interface ConfirmDialogOptions {
 			/**
 			 * Height of the confirmation dialog in pixels.
 			 */
@@ -741,8 +720,7 @@ declare module ComponentFramework
 		/**
 		 * Represents the String parameters for Confirm Dialog.
 		 */
-		interface ConfirmDialogStrings
-		{
+		interface ConfirmDialogStrings {
 			/**
 			 * Confirm Dialog Title.
 			 */
@@ -772,8 +750,7 @@ declare module ComponentFramework
 		/**
 		 * An object with the confirmed (Boolean) attribute is passed that indicates whether the confirm button was clicked to close the dialog.
 		 */
-		interface ConfirmDialogResponse 
-		{
+		interface ConfirmDialogResponse {
 			/**
 			 *  confirmed (Boolean) attribute is passed that indicates whether the confirm button was clicked to close the dialog.
 			 */
@@ -784,9 +761,8 @@ declare module ComponentFramework
 		 * Interface for entity form options.
 		 */
 		interface EntityFormOptions {
-
 			/**
-			 * Designates a record that will provide default values based on mapped attribute values. The lookup object has the following String properties: entityType, id, and name 
+			 * Designates a record that will provide default values based on mapped attribute values. The lookup object has the following String properties: entityType, id, and name
 			 */
 			createFromEntity?: EntityReference;
 
@@ -818,34 +794,35 @@ declare module ComponentFramework
 			/**
 			 * Indicates whether to open a quick create form. If you do not specify this, by default false is passed.
 			 */
-			useQuickCreateForm?: boolean;		
+			useQuickCreateForm?: boolean;
 
 			/**
 			 * Width of the form window to be displayed in pixels.
 			 */
-			width?: number;		
+			width?: number;
 
 			/**
 			 * Specify one of the following values for the window position of the form on the screen:
 			 *   1:center
 			 *   2:side
 			 */
-			windowPosition?: number;	
+			windowPosition?: number;
 		}
 
 		/**
 		 * Interface for error dialog options.
 		 * You must set either the errorCode or message attribute.
 		 */
-		interface ErrorDialogOptions
-		{
+		interface ErrorDialogOptions {
 			/**
-			 * Details about the error. When you specify this, the Download Log File button is available in the error message, and clicking it will let users download a text file with the content specified in this attribute.
+			 * Details about the error. When you specify this, the Download Log File button is available in the error message, and clicking it will let users download a text file with
+			 * the content specified in this attribute.
 			 */
 			details?: string;
 
 			/**
-			 *  If you just set errorCode, the message for the error code is automatically retrieved from the server and displayed in the error dialog. If you specify an errorCode value, an error dialog with a default error message is displyed.
+			 * If you just set errorCode, the message for the error code is automatically retrieved from the server and displayed in the error dialog. If you specify an errorCode value,
+			 * an error dialog with a default error message is displyed.
 			 */
 			errorCode?: number;
 
@@ -858,7 +835,7 @@ declare module ComponentFramework
 		/**
 		 * The options for openFile mode.
 		 */
-		const enum OpenFileMode {
+		enum OpenFileMode {
 			/**
 			 * default. mode open
 			 */
@@ -869,17 +846,16 @@ declare module ComponentFramework
 			 */
 			save = 2,
 		}
-		
+
 		/**
 		 * Interface for open file options.
 		 */
 		interface OpenFileOptions {
-			
 			/**
 			 * Specify whether to open or save the file
 			 * Values:
-			 *	   1  open
-			 *	   2  save
+			 *   1  open
+			 *   2  save
 			 */
 			openMode: OpenFileMode;
 		}
@@ -887,16 +863,14 @@ declare module ComponentFramework
 		/**
 		 * The object returned when a save is successful for open form.
 		 */
-		interface OpenFormSuccessResponse
-		{
+		interface OpenFormSuccessResponse {
 			savedEntityReference: EntityReference[];
 		}
 
 		/**
 		 * Interface for OpenUrl options.
 		 */
-		interface OpenUrlOptions 
-		{	
+		interface OpenUrlOptions {
 			/**
 			 * Height of the window to display the resultant page in pixels.
 			 */
@@ -911,13 +885,12 @@ declare module ComponentFramework
 		/**
 		 * Interface for OpenWebResource options.
 		 */
-		interface OpenWebResourceOptions
-		{
+		interface OpenWebResourceOptions {
 			/**
 			 * Height of the window to display the resultant page in pixels.
 			 */
 			height?: number;
-		
+
 			/**
 			 * Indicates whether to open the web resource in a new window.
 			 */
@@ -933,13 +906,11 @@ declare module ComponentFramework
 	/**
 	 * Helper of UserSettings API interface
 	 */
-	namespace UserSettingApi
-	{
+	namespace UserSettingApi {
 		/**
 		 * Day Of Week Enum
 		 */
-		const enum DayOfWeek
-		{
+		enum DayOfWeek {
 			Sunday = 0,
 			Monday = 1,
 			Tuesday = 2,
@@ -953,8 +924,7 @@ declare module ComponentFramework
 		 * The interface for Org Date Format Info exposed to a custom control
 		 * Result pattern is based on culture,examples are for 'USA' area
 		 */
-		interface DateFormattingInfo
-		{
+		interface DateFormattingInfo {
 			/**
 			 * @example "AM"
 			 */
@@ -979,104 +949,103 @@ declare module ComponentFramework
 			 * @example 0
 			 */
 			calendarWeekRule: number;
-			
+
 			/**
 			 * @example See interface Calendar
 			 */
 			calendar: Calendar;
-			
+
 			/**
 			 * @example "/"
 			 */
-			dateSeparator: string;  
-			
+			dateSeparator: string;
+
 			/**
 			 * @example { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }
-			 */			
-			dayNames: string[];  
-			
+			 */
+			dayNames: string[];
+
 			/**
 			 * @example See interface DayOfWeek
 			 */
 			firstDayOfWeek: DayOfWeek;
-			
+
 			/**
 			 * @example "dddd, MMMM d, yyyy h:mm:ss tt"
-			 */			
-			fullDateTimePattern: string;  
-			
+			 */
+			fullDateTimePattern: string;
+
 			/**
 			 * @example "dddd, MMMM d, yyyy"
-			 */	
-			longDatePattern: string;  
-			
+			 */
+			longDatePattern: string;
+
 			/**
 			 * @example "hh:mm:ss tt"
-			 */			
-			longTimePattern: string;  
-						
+			 */
+			longTimePattern: string;
+
 			/**
 			 * @example "MMMM dd"
 			 */
-			monthDayPattern: string;  
-						
+			monthDayPattern: string;
+
 			/**
 			 * @example { "January", "February", "March", ...  "December", "" }
 			 */
-			monthGenitiveNames: string[];   
-						
+			monthGenitiveNames: string[];
+
 			/**
 			 * @example { "January", "February", "March", ...  "December", "" }
 			 */
-			monthNames: string[];  
-						
+			monthNames: string[];
+
 			/**
 			 * @example "PM"
 			 */
-			pmDesignator: string;  
-						
+			pmDesignator: string;
+
 			/**
 			 * @example "M/d/yyyy"
 			 */
-			shortDatePattern: string;  
-						
+			shortDatePattern: string;
+
 			/**
 			 * @example "h:mm tt"
 			 */
 			shortTimePattern: string;
-						
+
 			/**
 			 * @example { "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" }
 			 */
-			shortestDayNames: string[];  
-						
+			shortestDayNames: string[];
+
 			/**
 			 * @example "yyyy'-'MM'-'dd'T'HH':'mm':'ss"
 			 */
-			sortableDateTimePattern: string;  
-						
+			sortableDateTimePattern: string;
+
 			/**
 			 * @example ":"
 			 */
-			timeSeparator: string;  
-						
+			timeSeparator: string;
+
 			/**
 			 * @example "yyyy'-'MM'-'dd HH':'mm':'ss'Z'"
 			 */
-			universalSortableDateTimePattern: string;  
-						
+			universalSortableDateTimePattern: string;
+
 			/**
 			 * @example "MMMM yyyy"
 			 */
-			yearMonthPattern: string;  
+			yearMonthPattern: string;
 		}
 
 		/**
 		 * The interface for the Org System Settings Number Format Info exposed to a custom control
 		 * Comments indicate example values
 		 */
-		interface NumberFormattingInfo
-		{
+		interface NumberFormattingInfo {
 			/**
 			 * @example 2
 			 */
@@ -1211,12 +1180,11 @@ declare module ComponentFramework
 		/**
 		 * The interface for the Calendar exposed in DateFormattingInfo
 		 */
-		interface Calendar
-		{
+		interface Calendar {
 			/**
 			 * @example "/Date(-62135568000000)/"
 			 */
-			minSupportedDateTime: Date; 
+			minSupportedDateTime: Date;
 
 			/**
 			 * @example "/Date(253402300799999)/"
@@ -1231,7 +1199,7 @@ declare module ComponentFramework
 			/**
 			 * @example 1
 			 */
-			calendarType: number; 
+			calendarType: number;
 
 			/**
 			 * @example  2029
@@ -1243,35 +1211,33 @@ declare module ComponentFramework
 	/**
 	 * Helper of Utils API interface
 	 */
-	namespace UtilityApi
-	{
+	namespace UtilityApi {
 		/**
 		 * Options used when opening a lookup dialog.
 		 */
-		interface LookupOptions
-		{
+		interface LookupOptions {
 			/**
-			 *	Whether the lookup allows more than one item to be selected.
+			 * Whether the lookup allows more than one item to be selected.
 			 */
 			allowMultiSelect: boolean;
 
 			/**
-			 *	The default entity type.
+			 * The default entity type.
 			 */
 			defaultEntityType: string;
 
 			/**
-			 *	The default view to use.
+			 * The default view to use.
 			 */
 			defaultViewId: string;
 
 			/**
-			 *	The entity types to display.
+			 * The entity types to display.
 			 */
 			entityTypes: string[];
 
 			/**
-			 *	The views to be available in the view picker. Only System views are supported (not user views).
+			 * The views to be available in the view picker. Only System views are supported (not user views).
 			 */
 			viewIds: string[];
 		}
@@ -1280,27 +1246,21 @@ declare module ComponentFramework
 	/**
 	 * Objects related to interacting with the Web API.
 	 */
-	namespace WebApi
-	{
+	namespace WebApi {
 		/**
 		 * Interface that describes an entity sent or received from the SDK through the Web API.
 		 */
-		interface Entity
-		{
+		interface Entity {
 			[key: string]: any;
 		}
 
-		/**
-		 * 
-		 */
-		interface RetrieveMultipleResponse
-		{
-			/** 
-			 *  An array of JSON objects, where each object represents the retrieved entity record containing attributes and their values
+		interface RetrieveMultipleResponse {
+			/**
+			 * An array of JSON objects, where each object represents the retrieved entity record containing attributes and their values
 			 */
 			entities: Entity[];
-			
-			/** 
+
+			/**
 			 * If the number of records being retrieved is more than the value specified in the 'maxPageSize' parameter in the request, this attribute returns the URL to return next set of records.
 			 */
 			nextLink: string;
@@ -1310,12 +1270,11 @@ declare module ComponentFramework
 	/**
 	 * An object that encapsulates an Entity Reference as a plain object suitable for storing in the state tree
 	 */
-	interface EntityReference
-	{
+	interface EntityReference {
 		/**
 		 * The record id. Read-only.
 		 */
-		id: string,
+		id: string;
 
 		/**
 		 * The entity logical name. Read-only.
@@ -1328,41 +1287,38 @@ declare module ComponentFramework
 		name: string;
 	}
 
-	/** 
+	/**
 	 * Interface of one file object
-	 */		
-	interface FileObject
-	{
+	 */
+	interface FileObject {
 		/**
 		 * Contents of the file.
 		 */
 		fileContent: string;
 
-		/** 
+		/**
 		 * Name of the file.
 		 */
 		fileName: string;
 
-		/** 
+		/**
 		 * Size of the file in KB.
 		 */
 		fileSize: number;
-		
-		/** 
+
+		/**
 		 * File MIME type.
 		 */
 		mimeType: string;
 	}
-	
+
 ///////////////////// Parameter ////////////////////////
 
-	namespace PropertyTypes
-	{
-		/** 
+	namespace PropertyTypes {
+		/**
 		 * Interface for context.parameters.[property_key]
 		 */
-		interface Property
-		{
+		interface Property {
 			error: boolean;
 			errorMessage: string;
 			formatted?: string;
@@ -1372,98 +1328,87 @@ declare module ComponentFramework
 			attribute?: PropertyHelper.FieldPropertyMetadata.Metadata;
 		}
 
-		/** 
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is Whole.None|FP|Decimal
 		 */
-		interface NumberProperty extends Property
-		{
+		interface NumberProperty extends Property {
 			raw: number;
 			attributes?: PropertyHelper.FieldPropertyMetadata.NumberMetadata;
 		}
-	
-		/** 
+
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is Decimal
 		 */
-		interface DecimalNumberProperty extends NumberProperty
-		{
+		interface DecimalNumberProperty extends NumberProperty {
 			attributes?: PropertyHelper.FieldPropertyMetadata.DecimalNumberMetadata;
 		}
-		
-		/** 
+
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is FP
 		 */
-		interface FloatingNumberProperty extends NumberProperty
-		{
+		interface FloatingNumberProperty extends NumberProperty {
 			attributes?: PropertyHelper.FieldPropertyMetadata.FloatingNumberMetadata;
 		}
 
-		/** 
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is Whole.None
 		 */
-		interface WholeNumberProperty extends NumberProperty
-		{
+		interface WholeNumberProperty extends NumberProperty {
 			attributes?: PropertyHelper.FieldPropertyMetadata.WholeNumberMetadata;
 		}
 
-		/** 
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type starts from DateTime
 		 */
-		interface DateTimeProperty extends Property
-		{
+		interface DateTimeProperty extends Property {
 			raw: Date;
 			attributes?: PropertyHelper.FieldPropertyMetadata.DateTimeMetadata;
 		}
 
-		/** 
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type starts from SingleLine
 		 */
-		interface StringProperty extends Property
-		{
+		interface StringProperty extends Property {
 			raw: string;
 			attributes?: PropertyHelper.FieldPropertyMetadata.StringMetadata;
 		}
-		
-		/** 
+
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is Enum
 		 */
-		interface EnumProperty<EnumType>
-		{
+		interface EnumProperty<EnumType> {
 			type: string;
 			raw: EnumType;
 		}
 
-		/** 
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is OptionSet
 		 */
-		interface OptionSetProperty extends Property
-		{
+		interface OptionSetProperty extends Property {
 			raw: number;
 			attributes?: PropertyHelper.FieldPropertyMetadata.OptionSetMetadata;
 		}
-	
-		/** 
+
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is MultiSelectOptionSet
 		 */
-		interface MultiSelectOptionSetProperty extends Property
-		{
+		interface MultiSelectOptionSetProperty extends Property {
 			raw: number[];
-			attributes?: PropertyHelper.FieldPropertyMetadata.OptionSetMetadata;	
+			attributes?: PropertyHelper.FieldPropertyMetadata.OptionSetMetadata;
 		}
-	
-		/** 
+
+		/**
 		 * Property Interface for context.parameters.[property_key], when property manifest type is TwoOptions
 		 */
-		interface TwoOptionsProperty extends Property
-		{
+		interface TwoOptionsProperty extends Property {
 			raw: boolean;
 			attributes?: PropertyHelper.FieldPropertyMetadata.TwoOptionMetadata;
 		}
 
 		/**
-		*	The structure returned by getCellImageInfo and propagated down to the control to display conditional images.
-		*/
-		interface IImageInfo
-		{
+		 * The structure returned by getCellImageInfo and propagated down to the control to display conditional images.
+		 */
+		interface ImageInfo {
 			/**
 			 * The Url of the conditional image.
 			 */
@@ -1478,105 +1423,103 @@ declare module ComponentFramework
 		/**
 		 * The structure of a dataset property as it would be passed to a control
 		 */
-		interface DataSet
-		{
-	
+		interface DataSet {
 			/**
 			 * Adds column to the columnset
 			 * @param name column name to be added to the columnset
 			 * @param entityAlias entity alias for which the column name needs to be added
 			 */
 			addColumn?: (name: string, entityAlias?: string) => void;
-	
+
 			/**
 			 * Set of columns available in this dataset.
 			 */
 			columns: PropertyHelper.DataSetApi.Column[];
-			
+
 			/**
 			 * True if encountered error while data retrieval
 			 */
 			error: boolean;
-	
+
 			/**
 			 * The error message associated with the last encountered error, if applicable
 			 */
 			errorMessage: string;
-	
+
 			/**
 			 * The column filtering for the current query.
 			 */
-			filtering: PropertyHelper.DataSetApi.Filtering
+			filtering: PropertyHelper.DataSetApi.Filtering;
 
 			/**
 			 * Related entity info
 			 */
 			linking: PropertyHelper.DataSetApi.Linking;
-	
+
 			/**
 			 * Indicate if the dataset property is in loading state or not
 			 */
 			loading: boolean;
-	
+
 			/**
 			 * Pagination status and actions.
 			 */
 			paging: PropertyHelper.DataSetApi.Paging;
-	
+
 			/**
 			 * Map of IDs to the full record object
 			 */
 			records: {
 				[id: string]: PropertyHelper.DataSetApi.EntityRecord;
 			};
-	
+
 			/**
 			 * IDs of the records in the dataset, order by the query response result
 			 */
 			sortedRecordIds: string[];
-	
+
 			/**
 			 * The sorting status for the current query.
 			 */
 			sorting: PropertyHelper.DataSetApi.SortStatus[];
-	
+
 			/**
 			 * Clear selected record ids list
 			 */
 			clearSelectedRecordIds(): void;
-	
+
 			/**
 			 * Retrieves all selected record ids
 			 */
 			getSelectedRecordIds(): string[];
-	
+
 			/**
 			 * Get DataSet target entity logical name
 			 */
 			getTargetEntityType(): string;
-	
+
 			/**
 			 * Retrieves the view display name used by the dataset property
 			 */
 			getTitle(): string;
-	
+
 			/**
 			 * Gets Id of view used by the dataset property
 			 */
 			getViewId(): string;
-	
+
 			/**
-			 * Open dataSet item for a given EntityReference. It will check if there is a command with command button id "Mscrm.OpenRecordItem". 
+			 * Open dataSet item for a given EntityReference. It will check if there is a command with command button id "Mscrm.OpenRecordItem".
 			 * If there is, it will execute the command, otherwise it will just navigate to the associated form of the entityReference
 			 * @param entityReference entity reference
 			 */
 			openDatasetItem(entityReference: EntityReference): void;
-			
+
 			/**
 			 * Refreshes the dataset based on filters, sorting, linking, new column. New data will be pushed to control in another 'updateView' cycle.
 			 */
 			refresh(): void;
-	
+
 			/**
 			 * Set the ids of the selected records
 			 * @ids List of recordId's
@@ -1585,417 +1528,21 @@ declare module ComponentFramework
 		}
 	}
 
-	namespace PropertyHelper.FieldPropertyMetadata
-	{
-		interface Metadata
-		{
-			DisplayName: string;
-			LogicalName: string;
-			RequiredLevel: RequiredLevel;
-			IsSecured: boolean;
-			SourceType: number;
-			Description: string;
-		}
-
-		interface NumberMetadata extends Metadata
-		{
-			MinValue: number;
-			MaxValue: number;
-			ImeMode: ImeMode;
-		}
-	
-		interface StringMetadata extends Metadata 
-		{
-			MaxLength: number;
-			ImeMode: ImeMode;
-		}
-			
-		interface FloatingNumberMetadata extends NumberMetadata 
-		{
-			Precision: number;
-		}
-	
-		interface DecimalNumberMetadata extends NumberMetadata 
-		{
-			Precision: number;
-		}
-	
-		interface WholeNumberMetadata extends NumberMetadata 
-		{
-			Format: string;
-			LanguageByCode?: Dictionary; 
-			TimeZoneByCode?: Dictionary; 
-		}
-	
-		interface DateTimeMetadata extends Metadata 
-		{
-			Behavior: FormattingApi.DateTimeFieldBehavior;
-			Format: string;
-			ImeMode: ImeMode;
-		}
-	
-		interface LookupMetadata extends Metadata 
-		{
-			Targets: string[];
-		}
-	
-		interface StringMetadata extends Metadata
-		{
-			Format: string;
-		}
-	
-		interface OptionSetMetadata extends Metadata
-		{
-			Options: OptionMetadata[];
-			DefaultValue: number;
-		}
-	
-		interface TwoOptionMetadata extends Metadata
-		{
-			Options: [OptionMetadata, OptionMetadata];
-			DefaultValue: boolean;
-		}
-	}
-
-	namespace PropertyHelper.DataSetApi
-	{
-
-		/**	 
-		 * Supported Condition Operator for filtering expression condition
-		 * This is subset of full condition operators list defined in https://docs.microsoft.com/en-us/dotnet/api/microsoft.xrm.sdk.query.conditionoperator 
-		 */
-		const enum ConditionOperator
-		{
-			None = -1,
-			Equal = 0,
-			NotEqual = 1,
-			GreaterThan = 2,
-			LessThan = 3,
-			GreaterEqual = 4,
-			LessEqual = 5,
-			Like = 6,
-			In = 8,
-			Null = 12,
-			Yesterday = 14,
-			Today = 15,
-			Tomorrow = 16,
-			Last7Days = 17,
-			Next7Days = 18,
-			LastWeek = 19,
-			ThisWeek = 20,
-			LastMonth = 22,
-			ThisMonth = 23,
-			On = 25,
-			OnOrBefore = 26,
-			OnOrAfter = 27,
-			LastYear = 28,
-			ThisYear = 29,
-			LastXDays = 33,
-			NextXDays = 34,
-			LastXMonths = 37,
-			NextXMonths = 38,
-			Contains = 49,
-			InFiscalPeriodAndYear = 70,
-			Above = 75,
-			Under = 76,
-			NotUnder = 77,
-			AboveOrEqual = 78,
-			UnderOrEqual = 79,
-			ContainValues = 87
-		}
-
+	namespace PropertyHelper {
 		/**
-		 * An expression used to represent a filter condition.
+		 * Ime Mode
 		 */
-		interface ConditionExpression
-		{
-			/**
-			 * The name of the data-set column to apply the filter on.
-			 */
-			attributeName: string;
-
-			/**
-			 * The value evaluated by the condition
-			 */
-			conditionOperator: ConditionOperator;
-
-			/**
-			 * The value evaluated by the condition. 
-			 */
-			value: string | Array<string>;
-
-			/** 
-			 * Entity alias name so filtering can be used on linked entities.
-			 */
-			entityAliasName?: string;
-		}
-
-		/**
-		 * Supported Filter Operator for filtering expression linkage
-		 */
-		const enum FilterOperator
-		{
-			And = 0,
-			Or = 1
-		}
-
-		/**
-		 * An expression used to represent a filter.
-		 */
-		interface FilterExpression
-		{
-			/**
-			 * The set of conditions associated with this filter.
-			 */
-			conditions: ConditionExpression[];
-
-			/**
-			 * The operator used to combine conditions in this filter.
-			 */
-			filterOperator: FilterOperator;
-
-			/** 
-			 * Any child filters that should be evaluated after evaluating this filter.
-			 */
-			filters?: FilterExpression[];
-		}
-
-		/**
-		 * Filter state for a dataset.
-		 */
-		interface Filtering
-		{
-			/**
-			 * Returns the top-most filter associated with the data-set
-			 */
-			getFilter(): FilterExpression;
-
-			/**
-			 * Sets the top-most filter associated with the data-set
-			 * @expression filter expression to be set
-			 */
-			setFilter(expression: FilterExpression): void;
-
-			/**
-			 * Clears the filter associated with the data-set.
-			 */
-			clearFilter(): void;
-		}
-
-		/**
-		 * Metadata about a column in a dataset
-		 */
-		interface Column
-		{
-			/**
-			 * Name of the column, unique in this dataset
-			 */
-			name: string;
-
-			/**
-			 * Localized display name for the column
-			 */
-			displayName: string;
-
-			/**
-			 * The manifest type of this column's values.
-			 */
-			dataType: string;
-
-			/**
-			 * The alias of this column.
-			 */
-			alias: string;
-
-			/**
-			 * The column order for the layout
-			 */
-			order: number;
-
-			/**
-			 * Customized column width ratios
-			 */
-			visualSizeFactor: number;
-
-			/**
-			 * The column visibility state.
-			 */
-			isHidden?: boolean;
-
-			/**
-			 * Is specific column the primary attrribute of the view's entity
-			 */
-			isPrimary?: boolean;
-
-			/**
-			 * Prevents the UI from making the column sortable. 
-			 */
-			disableSorting?: boolean;
-		}
-
-		/**
-		 * Base interface for dataset record result. Supports value retrival by column name.
-		 */
-		interface EntityRecord
-		{
-			/**
-			 * Get the current formatted value of this record column.
-			 * @param columnName Column name of the record
-			 */
-			getFormattedValue(columnName: string): string;
-
-			/**
-			 * Get the record ID
-			 */
-			getRecordId(): string;
-
-			/**
-			 * Get the raw value of the record's column
-			 * @param columnName Column name of the record
-			 */
-			getValue(columnName: string): string | Date | number | number[] | boolean | EntityReference | EntityReference[];
-
-			/**
-			 * Get the object that encapsulates an Entity Reference as a plain object
-			 */
-			getNamedReference(): EntityReference;
-
-		}
-
-		/**
-		 * Column Sort Direction
-		 */
-		const enum SortDirection
-		{
-			None = -1,
-			Ascending = 0,
-			Descending = 1
-		}
-
-		/**
-		 * Current sort status of a dataset column
-		 */
-		interface SortStatus
-		{
-			/**
-			 * The name of the column
-			 */
-			name: string;
-
-			/**
-			 * The current sort direction for the column.
-			 */
-			sortDirection: SortDirection;
-		}
-
-		/**
-		 * Paging state for a dataset
-		 */
-		interface Paging
-		{
-			/**
-			 * Total number of results on the server for the current query.
-			 */
-			totalResultCount: number;
-
-			/**
-			 * Whether the result set can be paged forwards.
-			 */
-			hasNextPage: boolean;
-
-			/**
-			 * Whether the result set can be paged backwards.
-			 */
-			hasPreviousPage: boolean;
-
-			/**
-			 * Request the next page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
-			 */
-			loadNextPage(): void;
-
-			/**
-			 * Request the previous page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
-			 */
-			loadPreviousPage(): void;
-
-			/**
-			 * Reload the results from the server, and reset to page 1.
-			 */
-			reset(): void;
-
-			/**
-			 * Sets the number of results to return per page on the next data refresh.
-			 * @pageSize pageSize to be set.
-			 */
-			setPageSize(pageSize: number): void;
-		}
-
-		/**
-		 * Dataset entity linking.
-		 */
-		interface Linking
-		{
-			/**
-			 * Returns all the linked entities information
-			 */
-			getLinkedEntities(): ILinkEntityExposedExpression[];
-
-			/**
-			 * Add a new linked entity relationship with the existed query primary entity
-			 */
-			addLinkedEntity(expression: ILinkEntityExposedExpression): void;
-		}
-
-		/**
-		 * Entity linking expression 
-		 */
-		interface ILinkEntityExposedExpression {
-			
-			/**
-			 * The 'name' of the entity to link to
-			 */
-			name: string;
-
-			/**
-			 * The 'from' attribute in the link-entity relationship
-			 */
-			from: string;
-
-			/**
-			 * The 'to' attribute in the link-entity relationship
-			 */
-			to: string;
-
-			/**
-			 * The 'type' of the link, referred by the link-entity attribute
-			 */
-			linkType: string;
-
-			/**
-			 * The 'alias' for the link-entity relationship
-			 */
-			alias: string;
-		}
-	}
-
-	namespace PropertyHelper
-	{
-		/** 
-		 * Ime Mode 
-		 */
-		const enum ImeMode
-		{
+		enum ImeMode {
 			Auto = 0,
 			Inactive = 1,
 			Active = 2,
 			Disabled = 3,
 		}
-		
+
 		/**
 		 * Entity privilege types.
 		 */
-		const enum PrivilegeType
-		{
+		enum PrivilegeType {
 			None = 0,
 			Create = 1,
 			Read = 2,
@@ -2006,12 +1553,11 @@ declare module ComponentFramework
 			Append = 7,
 			AppendTo = 8,
 		}
-	
-		/** 
+
+		/**
 		 * Entity Priviledge Depth
 		 */
-		const enum PrivilegeDepth
-		{
+		enum PrivilegeDepth {
 			None = -1,
 			Basic = 0,
 			Local = 1,
@@ -2019,11 +1565,10 @@ declare module ComponentFramework
 			Global = 3,
 		}
 
-		/** 
-		 * Attribute required level 
+		/**
+		 * Attribute required level
 		 */
-		const enum RequiredLevel
-		{
+		enum RequiredLevel {
 			Unknown = -1,
 			None = 0,
 			SystemRequired = 1,
@@ -2035,16 +1580,14 @@ declare module ComponentFramework
 		 * Entity metadata refer to online documentation
 		 * https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/xrm-utility/getentitymetadata
 		 */
-		interface EntityMetadata 
-		{
+		interface EntityMetadata {
 			[key: string]: any;
 		}
 
 		/**
 		 * Option Item Metadata
 		 */
-		interface OptionMetadata
-		{
+		interface OptionMetadata {
 			Label: string;
 			Value: number;
 			Color: string;
@@ -2053,8 +1596,7 @@ declare module ComponentFramework
 		/**
 		 * Entity metadata security privileges.
 		 */
-		interface SecurityPrivilegeMetadata
-		{
+		interface SecurityPrivilegeMetadata {
 			CanBeBasic: boolean;
 			CanBeDeep: boolean;
 			CanBeGlobal: boolean;
@@ -2069,11 +1611,376 @@ declare module ComponentFramework
 		/**
 		 * Entity metadata security values
 		 */
-		interface SecurityValues
-		{
+		interface SecurityValues {
 			editable: boolean;
 			readable: boolean;
 			secured: boolean;
 		}
+
+		namespace FieldPropertyMetadata {
+			interface Metadata {
+				DisplayName: string;
+				LogicalName: string;
+				RequiredLevel: RequiredLevel;
+				IsSecured: boolean;
+				SourceType: number;
+				Description: string;
+			}
+
+			interface NumberMetadata extends Metadata {
+				MinValue: number;
+				MaxValue: number;
+				ImeMode: ImeMode;
+			}
+
+			interface StringMetadata extends Metadata {
+				MaxLength: number;
+				ImeMode: ImeMode;
+			}
+
+			interface FloatingNumberMetadata extends NumberMetadata {
+				Precision: number;
+			}
+
+			interface DecimalNumberMetadata extends NumberMetadata {
+				Precision: number;
+			}
+
+			interface WholeNumberMetadata extends NumberMetadata {
+				Format: string;
+				LanguageByCode?: Dictionary;
+				TimeZoneByCode?: Dictionary;
+			}
+
+			interface DateTimeMetadata extends Metadata {
+				Behavior: FormattingApi.DateTimeFieldBehavior;
+				Format: string;
+				ImeMode: ImeMode;
+			}
+
+			interface LookupMetadata extends Metadata {
+				Targets: string[];
+			}
+
+			interface StringMetadata extends Metadata {
+				Format: string;
+			}
+
+			interface OptionSetMetadata extends Metadata {
+				Options: OptionMetadata[];
+				DefaultValue: number;
+			}
+
+			interface TwoOptionMetadata extends Metadata {
+				Options: [OptionMetadata, OptionMetadata];
+				DefaultValue: boolean;
+			}
+		}
+
+		namespace DataSetApi {
+			/**
+			 * Supported Condition Operator for filtering expression condition
+			 * This is subset of full condition operators list defined in https://docs.microsoft.com/en-us/dotnet/api/microsoft.xrm.sdk.query.conditionoperator
+			 */
+			enum ConditionOperator {
+				None = -1,
+				Equal = 0,
+				NotEqual = 1,
+				GreaterThan = 2,
+				LessThan = 3,
+				GreaterEqual = 4,
+				LessEqual = 5,
+				Like = 6,
+				In = 8,
+				Null = 12,
+				Yesterday = 14,
+				Today = 15,
+				Tomorrow = 16,
+				Last7Days = 17,
+				Next7Days = 18,
+				LastWeek = 19,
+				ThisWeek = 20,
+				LastMonth = 22,
+				ThisMonth = 23,
+				On = 25,
+				OnOrBefore = 26,
+				OnOrAfter = 27,
+				LastYear = 28,
+				ThisYear = 29,
+				LastXDays = 33,
+				NextXDays = 34,
+				LastXMonths = 37,
+				NextXMonths = 38,
+				Contains = 49,
+				InFiscalPeriodAndYear = 70,
+				Above = 75,
+				Under = 76,
+				NotUnder = 77,
+				AboveOrEqual = 78,
+				UnderOrEqual = 79,
+				ContainValues = 87
+			}
+
+			/**
+			 * An expression used to represent a filter condition.
+			 */
+			interface ConditionExpression {
+				/**
+				 * The name of the data-set column to apply the filter on.
+				 */
+				attributeName: string;
+
+				/**
+				 * The value evaluated by the condition
+				 */
+				conditionOperator: ConditionOperator;
+
+				/**
+				 * The value evaluated by the condition.
+				 */
+				value: string | string[];
+
+				/**
+				 * Entity alias name so filtering can be used on linked entities.
+				 */
+				entityAliasName?: string;
+			}
+
+			/**
+			 * Supported Filter Operator for filtering expression linkage
+			 */
+			enum FilterOperator {
+				And = 0,
+				Or = 1
+			}
+
+			/**
+			 * An expression used to represent a filter.
+			 */
+			interface FilterExpression {
+				/**
+				 * The set of conditions associated with this filter.
+				 */
+				conditions: ConditionExpression[];
+
+				/**
+				 * The operator used to combine conditions in this filter.
+				 */
+				filterOperator: FilterOperator;
+
+				/**
+				 * Any child filters that should be evaluated after evaluating this filter.
+				 */
+				filters?: FilterExpression[];
+			}
+
+			/**
+			 * Filter state for a dataset.
+			 */
+			interface Filtering {
+				/**
+				 * Returns the top-most filter associated with the data-set
+				 */
+				getFilter(): FilterExpression;
+
+				/**
+				 * Sets the top-most filter associated with the data-set
+				 * @expression filter expression to be set
+				 */
+				setFilter(expression: FilterExpression): void;
+
+				/**
+				 * Clears the filter associated with the data-set.
+				 */
+				clearFilter(): void;
+			}
+
+			/**
+			 * Metadata about a column in a dataset
+			 */
+			interface Column {
+				/**
+				 * Name of the column, unique in this dataset
+				 */
+				name: string;
+
+				/**
+				 * Localized display name for the column
+				 */
+				displayName: string;
+
+				/**
+				 * The manifest type of this column's values.
+				 */
+				dataType: string;
+
+				/**
+				 * The alias of this column.
+				 */
+				alias: string;
+
+				/**
+				 * The column order for the layout
+				 */
+				order: number;
+
+				/**
+				 * Customized column width ratios
+				 */
+				visualSizeFactor: number;
+
+				/**
+				 * The column visibility state.
+				 */
+				isHidden?: boolean;
+
+				/**
+				 * Is specific column the primary attrribute of the view's entity
+				 */
+				isPrimary?: boolean;
+
+				/**
+				 * Prevents the UI from making the column sortable.
+				 */
+				disableSorting?: boolean;
+			}
+
+			/**
+			 * Base interface for dataset record result. Supports value retrival by column name.
+			 */
+			interface EntityRecord {
+				/**
+				 * Get the current formatted value of this record column.
+				 * @param columnName Column name of the record
+				 */
+				getFormattedValue(columnName: string): string;
+
+				/**
+				 * Get the record ID
+				 */
+				getRecordId(): string;
+
+				/**
+				 * Get the raw value of the record's column
+				 * @param columnName Column name of the record
+				 */
+				getValue(columnName: string): string | Date | number | number[] | boolean | EntityReference | EntityReference[];
+
+				/**
+				 * Get the object that encapsulates an Entity Reference as a plain object
+				 */
+				getNamedReference(): EntityReference;
+			}
+
+			/**
+			 * Column Sort Direction
+			 */
+			enum SortDirection {
+				None = -1,
+				Ascending = 0,
+				Descending = 1
+			}
+
+			/**
+			 * Current sort status of a dataset column
+			 */
+			interface SortStatus {
+				/**
+				 * The name of the column
+				 */
+				name: string;
+
+				/**
+				 * The current sort direction for the column.
+				 */
+				sortDirection: SortDirection;
+			}
+
+			/**
+			 * Paging state for a dataset
+			 */
+			interface Paging {
+				/**
+				 * Total number of results on the server for the current query.
+				 */
+				totalResultCount: number;
+
+				/**
+				 * Whether the result set can be paged forwards.
+				 */
+				hasNextPage: boolean;
+
+				/**
+				 * Whether the result set can be paged backwards.
+				 */
+				hasPreviousPage: boolean;
+
+				/**
+				 * Request the next page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
+				 */
+				loadNextPage(): void;
+
+				/**
+				 * Request the previous page of results to be loaded. New data will be pushed to control in another 'updateView' cycle.
+				 */
+				loadPreviousPage(): void;
+
+				/**
+				 * Reload the results from the server, and reset to page 1.
+				 */
+				reset(): void;
+
+				/**
+				 * Sets the number of results to return per page on the next data refresh.
+				 * @pageSize pageSize to be set.
+				 */
+				setPageSize(pageSize: number): void;
+			}
+
+			/**
+			 * Dataset entity linking.
+			 */
+			interface Linking {
+				/**
+				 * Returns all the linked entities information
+				 */
+				getLinkedEntities(): LinkEntityExposedExpression[];
+
+				/**
+				 * Add a new linked entity relationship with the existed query primary entity
+				 */
+				addLinkedEntity(expression: LinkEntityExposedExpression): void;
+			}
+
+			/**
+			 * Entity linking expression
+			 */
+			interface LinkEntityExposedExpression {
+				/**
+				 * The 'name' of the entity to link to
+				 */
+				name: string;
+
+				/**
+				 * The 'from' attribute in the link-entity relationship
+				 */
+				from: string;
+
+				/**
+				 * The 'to' attribute in the link-entity relationship
+				 */
+				to: string;
+
+				/**
+				 * The 'type' of the link, referred by the link-entity attribute
+				 */
+				linkType: string;
+
+				/**
+				 * The 'alias' for the link-entity relationship
+				 */
+				alias: string;
+			}
+		}
 	}
 }
diff --git a/types/powerapps-component-framework/powerapps-component-framework-tests.ts b/types/powerapps-component-framework/powerapps-component-framework-tests.ts
index 487852dc32..de727aff7e 100644
--- a/types/powerapps-component-framework/powerapps-component-framework-tests.ts
+++ b/types/powerapps-component-framework/powerapps-component-framework-tests.ts
@@ -1,6 +1,5 @@
-// tslint:disable-next-line:no-empty-interface
-interface TInputs {};
-interface TOutputs { testString: string };
+interface TInputs { inputString?: string; }
+interface TOutputs { testString: string; }
 
 class TestControl implements ComponentFramework.StandardControl<TInputs, TOutputs> {
 	init(context: ComponentFramework.Context<TInputs>, notifyOutputChanged?: () => void, state?: ComponentFramework.Dictionary, container?: HTMLDivElement) {
@@ -11,8 +10,8 @@ class TestControl implements ComponentFramework.StandardControl<TInputs, TOutput
 	}
 	getOutputs() {
 		return {
-			testString: ''
-		}
+			testString: '',
+		};
 	}
 }
 
@@ -79,7 +78,7 @@ const dataSetApiColumn: ComponentFramework.PropertyHelper.DataSetApi.Column = {
 	disableSorting: false
 };
 
-const linkEntityExposeExpression: ComponentFramework.PropertyHelper.DataSetApi.ILinkEntityExposedExpression = {
+const linkEntityExposeExpression: ComponentFramework.PropertyHelper.DataSetApi.LinkEntityExposedExpression = {
 	name: '',
 	from: '',
 	to: '',
diff --git a/types/powerapps-component-framework/tslint.json b/types/powerapps-component-framework/tslint.json
index a5a8bfb7d7..b4b47a0378 100644
--- a/types/powerapps-component-framework/tslint.json
+++ b/types/powerapps-component-framework/tslint.json
@@ -1,20 +1,3 @@
 {
-	"extends": "dtslint/dt.json",
-	"rules": {
-		"array-type": false,
-		"dt-header": false,
-		"interface-name": false,
-		"interface-over-type-literal": false,
-		"jsdoc-format": false,
-		"max-line-length": false,
-		"no-consecutive-blank-lines": false,
-		"no-const-enum": false,
-		"no-internal-module": false,
-		"no-mergeable-namespace": false,
-		"no-padding": false,
-		"no-redundant-jsdoc-2": false,
-		"no-trailing-whitespace": false,
-		"one-line": false,
-		"semicolon": false
-	}
+	"extends": "dtslint/dt.json"
 }

From 6e5fb358950db6f22e8106a39384b6b0cbde61d4 Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Thu, 21 Mar 2019 13:06:35 -0700
Subject: [PATCH 882/924] [node] upgrade inspector generation source

---
 .../node/scripts/generate-inspector/README.md |  2 +-
 .../devtools-protocol-schema.ts               |  5 +----
 .../generate-inspector/event-emitter.ts       |  2 +-
 .../generate-substitute-args.ts               | 22 +++++++++----------
 .../node/scripts/generate-inspector/index.ts  |  3 ++-
 .../scripts/generate-inspector/tsconfig.json  |  9 ++++++++
 .../node/scripts/generate-inspector/utils.ts  | 21 +++++++++++-------
 7 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 types/node/scripts/generate-inspector/tsconfig.json

diff --git a/types/node/scripts/generate-inspector/README.md b/types/node/scripts/generate-inspector/README.md
index 0c87321994..7d7eb9ca45 100644
--- a/types/node/scripts/generate-inspector/README.md
+++ b/types/node/scripts/generate-inspector/README.md
@@ -8,7 +8,7 @@ What this does is:
 For example, to bump `inspector.d.ts` to what's exposed in v8.4:
 ```sh
 # cwd = types/node
-ts-node scripts/generate-inspector v8.4.0
+ts-node -P scripts/generate-inspector/tsconfig.json scripts/generate-inspector v8.4.0
 ```
 
 Inspector type definitions should be updated every time the V8 version is bumped in a Node.js release.
diff --git a/types/node/scripts/generate-inspector/devtools-protocol-schema.ts b/types/node/scripts/generate-inspector/devtools-protocol-schema.ts
index aaa8c9712f..08e5f45efc 100644
--- a/types/node/scripts/generate-inspector/devtools-protocol-schema.ts
+++ b/types/node/scripts/generate-inspector/devtools-protocol-schema.ts
@@ -45,18 +45,15 @@ export type Parameter = Field & Documentable & {
 
 export interface Command extends Documentable {
     name: string;
-    description?: string;
     handlers?: string[];
     parameters?: Parameter[];
     returns?: Parameter[];
-    experimental?: boolean;
     redirect?: string;
 }
 
 export interface Event extends Documentable {
     name: string;
     parameters?: Parameter[];
-    description?: string;
 }
 
 // It should be safe to load a devtools-protocol/json file and cast it to
@@ -69,7 +66,7 @@ export interface Schema {
     domains: Array<{
         domain: string,
         types?: Type[],
-        commands: Command[],
+        commands?: Command[],
         events?: Event[],
         dependencies?: string[],
     } & Documentable>;
diff --git a/types/node/scripts/generate-inspector/event-emitter.ts b/types/node/scripts/generate-inspector/event-emitter.ts
index 3d3410633f..7aa71a0ef7 100644
--- a/types/node/scripts/generate-inspector/event-emitter.ts
+++ b/types/node/scripts/generate-inspector/event-emitter.ts
@@ -76,5 +76,5 @@ export const createListeners = (events: Event[]): string[] => {
             acc.push(next);
             return acc;
         }
-    }, []);
+    }, [] as string[]);
 };
diff --git a/types/node/scripts/generate-inspector/generate-substitute-args.ts b/types/node/scripts/generate-inspector/generate-substitute-args.ts
index cd12eff1a8..95f757f191 100644
--- a/types/node/scripts/generate-inspector/generate-substitute-args.ts
+++ b/types/node/scripts/generate-inspector/generate-substitute-args.ts
@@ -1,6 +1,6 @@
 import * as schema from "./devtools-protocol-schema";
 import { createListeners } from "./event-emitter";
-import { capitalize, createDocs, flattenArgs, hasElements, isObjectReference } from "./utils";
+import { capitalize, createDocs, flattenArgs, hasElements, isObjectReference, filterNull } from "./utils";
 
 const INDENT = "    ";
 
@@ -22,7 +22,7 @@ const createTypeString = (type: schema.Field, domain?: string): string => {
 };
 
 // Helper for createInterface -- constructs a list of interface fields
-const createFieldsForInterface = (fields: schema.Parameter[] | null, domain: string): string[] => {
+const createFieldsForInterface = (fields: schema.Parameter[], domain: string): string[] => {
     return fields ? [
         ...fields
             .map(prop => [
@@ -39,7 +39,7 @@ const createTypeDefinition = (type: schema.Type, domain: string): string[] => {
         ...createDocs(type),
         ...(type.type === "object" ? [
             `interface ${type.id} {`,
-            ...createFieldsForInterface(type.properties, domain)
+            ...createFieldsForInterface(type.properties || [], domain)
                 .map(line => `${INDENT}${line}`),
             "}",
         ] : [`type ${type.id} = ${createTypeString(type)};`]),
@@ -56,9 +56,9 @@ const createCallbackString = (commandName: string, returns: schema.Parameter[],
 // Create declarations for overloads of Session#post
 const createPostFunctions = (command: schema.Command, domain: string): string[] => {
     const fnName = "post";
-    const callbackStr = createCallbackString(command.name, command.returns, domain);
+    const callbackStr = createCallbackString(command.name, command.returns || [], domain);
     const result = createDocs(command);
-    if (hasElements(command.parameters)) {
+    if (hasElements(command.parameters || [])) {
         const parts = [
             `${fnName}(`,
             `method: "${domain}.${command.name}", `,
@@ -93,9 +93,9 @@ const createPostFunctions = (command: schema.Command, domain: string): string[]
 export const generateSubstituteArgs = (protocol: schema.Schema): { [propName: string]: string[] } => {
     const interfaceDefinitions: string[] = protocol.domains
         .map(item => {
-            const typePool = (item.types || []).concat([
+            const typePool = (item.types || []).concat(filterNull([
                 ...(item.commands || []).map(command => {
-                    let result: schema.Type = null;
+                    let result: schema.Type | null = null;
                     if (hasElements(command.parameters)) {
                         result = {
                             id: `${capitalize(command.name)}ParameterType`,
@@ -106,7 +106,7 @@ export const generateSubstituteArgs = (protocol: schema.Schema): { [propName: st
                     return result;
                 }),
                 ...(item.commands || []).map(command => {
-                    let result: schema.Type = null;
+                    let result: schema.Type | null = null;
                     if (hasElements(command.returns)) {
                         result = {
                             id: `${capitalize(command.name)}ReturnType`,
@@ -117,7 +117,7 @@ export const generateSubstituteArgs = (protocol: schema.Schema): { [propName: st
                     return result;
                 }),
                 ...(item.events || []).map(event => {
-                    let result: schema.Type = null;
+                    let result: schema.Type | null = null;
                     if (hasElements(event.parameters)) {
                         result = {
                             id: `${capitalize(event.name)}EventDataType`,
@@ -127,7 +127,7 @@ export const generateSubstituteArgs = (protocol: schema.Schema): { [propName: st
                     }
                     return result;
                 }),
-            ].filter(x => x));
+            ]));
             return typePool.length > 0 ? [
                 `namespace ${item.domain} {`,
                 ...typePool
@@ -139,7 +139,7 @@ export const generateSubstituteArgs = (protocol: schema.Schema): { [propName: st
         }).reduce(flattenArgs(""), []);
 
     const postOverloads: string[] = protocol.domains
-        .map(item => item.commands
+        .map(item => (item.commands || [])
             .map(command => createPostFunctions(command, item.domain))
             .reduce(flattenArgs(""), []))
         .reduce(flattenArgs(""), []);
diff --git a/types/node/scripts/generate-inspector/index.ts b/types/node/scripts/generate-inspector/index.ts
index f555105e37..3a0e53eff0 100644
--- a/types/node/scripts/generate-inspector/index.ts
+++ b/types/node/scripts/generate-inspector/index.ts
@@ -1,13 +1,14 @@
 // Usage: node generate-inspector [tag]
 // [tag] corresponds to a tag name in the node-core repository.
+// By default, uses the current Node version.
 
 import { execSync } from "child_process";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import * as https from "https";
+
 import * as schema from "./devtools-protocol-schema";
 import { generateSubstituteArgs } from "./generate-substitute-args";
 import { substitute, trimRight } from "./utils";
-import { string } from "parsimmon";
 
 const httpsGet = (url: string) => new Promise<string>((resolve, reject) => {
     https.get(url, res => {
diff --git a/types/node/scripts/generate-inspector/tsconfig.json b/types/node/scripts/generate-inspector/tsconfig.json
new file mode 100644
index 0000000000..21fff91768
--- /dev/null
+++ b/types/node/scripts/generate-inspector/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "typeRoots": ["../.."]
+  }
+}
diff --git a/types/node/scripts/generate-inspector/utils.ts b/types/node/scripts/generate-inspector/utils.ts
index 0f98881a75..8b81967b76 100644
--- a/types/node/scripts/generate-inspector/utils.ts
+++ b/types/node/scripts/generate-inspector/utils.ts
@@ -25,7 +25,14 @@ export function flattenArgs<T = string>(inBetween?: T): (acc: T[], next: T[]) =>
  * Returns whether an array exists and has elements.
  * @param a The array to check.
  */
-export const hasElements = (a: any[]): boolean => a && a.length > 0;
+export const hasElements = (a?: any[]): boolean => !!a && a.length > 0;
+
+/**
+ * Given an array that might have null elements, return an array with just the
+ * non-null elements.
+ * @param a The array to filter.
+ */
+export const filterNull = <T>(a: Array<T | null>): T[] => a.filter(x => x != null) as T[];
 
 /**
  * Returns the capitalized form of a given string.
@@ -48,16 +55,14 @@ export function isObjectReference(t: Field): t is ObjectReference {
  * @param documentable A Documentable object.
  */
 export const createDocs = ({ deprecated, description, experimental }: Documentable): string[] => {
-    const hasDocs = !!description ||
-        deprecated ||
-        experimental;
-    return hasDocs ? [
+    const hasDocs = !!description || deprecated || experimental;
+    return hasDocs ? filterNull([
         "/**",
         ...(description ? description.split(/\r?\n/).map(l => ` * ${l}`) : []),
-        deprecated && " * @deprecated",
-        experimental && " * @experimental",
+        deprecated ? " * @deprecated" : null,
+        experimental ? " * @experimental" : null,
         " */",
-    ].filter(l => l != null) : [];
+    ]) : [];
 };
 
 /**

From 5d15af5c7ad91f15a7fd5401bab1b3b67a443724 Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Thu, 21 Mar 2019 14:09:04 -0700
Subject: [PATCH 883/924] [node] bump inspector types to 7.0

---
 types/node/inspector.d.ts | 95 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/types/node/inspector.d.ts b/types/node/inspector.d.ts
index 2dcd2760ad..5f25a7d6bd 100644
--- a/types/node/inspector.d.ts
+++ b/types/node/inspector.d.ts
@@ -1716,10 +1716,31 @@ declare module "inspector" {
             awaitPromise?: boolean;
         }
 
+        interface SetAsyncCallStackDepthParameterType {
+            /**
+             * Maximum depth of async call stacks. Setting to `0` will effectively disable collecting async
+             * call stacks (default).
+             */
+            maxDepth: number;
+        }
+
         interface SetCustomObjectFormatterEnabledParameterType {
             enabled: boolean;
         }
 
+        interface SetMaxCallStackSizeToCaptureParameterType {
+            size: number;
+        }
+
+        interface AddBindingParameterType {
+            name: string;
+            executionContextId?: ExecutionContextId;
+        }
+
+        interface RemoveBindingParameterType {
+            name: string;
+        }
+
         interface AwaitPromiseReturnType {
             /**
              * Promise result. Will contain rejected value if promise was rejected.
@@ -1819,6 +1840,15 @@ declare module "inspector" {
             exceptionDetails?: ExceptionDetails;
         }
 
+        interface BindingCalledEventDataType {
+            name: string;
+            payload: string;
+            /**
+             * Identifier of the context where the call was made.
+             */
+            executionContextId: ExecutionContextId;
+        }
+
         interface ConsoleAPICalledEventDataType {
             /**
              * Type of the call.
@@ -2435,12 +2465,24 @@ declare module "inspector" {
         post(method: "Runtime.runScript", params?: Runtime.RunScriptParameterType, callback?: (err: Error | null, params: Runtime.RunScriptReturnType) => void): void;
         post(method: "Runtime.runScript", callback?: (err: Error | null, params: Runtime.RunScriptReturnType) => void): void;
 
+        /**
+         * Enables or disables async call stacks tracking.
+         */
+        post(method: "Runtime.setAsyncCallStackDepth", params?: Runtime.SetAsyncCallStackDepthParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.setAsyncCallStackDepth", callback?: (err: Error | null) => void): void;
+
         /**
          * @experimental
          */
         post(method: "Runtime.setCustomObjectFormatterEnabled", params?: Runtime.SetCustomObjectFormatterEnabledParameterType, callback?: (err: Error | null) => void): void;
         post(method: "Runtime.setCustomObjectFormatterEnabled", callback?: (err: Error | null) => void): void;
 
+        /**
+         * @experimental
+         */
+        post(method: "Runtime.setMaxCallStackSizeToCapture", params?: Runtime.SetMaxCallStackSizeToCaptureParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.setMaxCallStackSizeToCapture", callback?: (err: Error | null) => void): void;
+
         /**
          * Terminate current or next JavaScript execution.
          * Will cancel the termination when the outer-most script execution ends.
@@ -2448,6 +2490,28 @@ declare module "inspector" {
          */
         post(method: "Runtime.terminateExecution", callback?: (err: Error | null) => void): void;
 
+        /**
+         * If executionContextId is empty, adds binding with the given name on the
+         * global objects of all inspected contexts, including those created later,
+         * bindings survive reloads.
+         * If executionContextId is specified, adds binding only on global object of
+         * given execution context.
+         * Binding function takes exactly one argument, this argument should be string,
+         * in case of any other input, function throws an exception.
+         * Each binding function call produces Runtime.bindingCalled notification.
+         * @experimental
+         */
+        post(method: "Runtime.addBinding", params?: Runtime.AddBindingParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.addBinding", callback?: (err: Error | null) => void): void;
+
+        /**
+         * This method does not remove binding function from global object but
+         * unsubscribes current runtime agent from Runtime.bindingCalled notifications.
+         * @experimental
+         */
+        post(method: "Runtime.removeBinding", params?: Runtime.RemoveBindingParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Runtime.removeBinding", callback?: (err: Error | null) => void): void;
+
         /**
          * Returns supported domains.
          */
@@ -2551,6 +2615,12 @@ declare module "inspector" {
          */
         addListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
 
+        /**
+         * Notification is issued every time when binding is called.
+         * @experimental
+         */
+        addListener(event: "Runtime.bindingCalled", listener: (message: InspectorNotification<Runtime.BindingCalledEventDataType>) => void): this;
+
         /**
          * Issued when console API was called.
          */
@@ -2629,6 +2699,7 @@ declare module "inspector" {
         emit(event: "HeapProfiler.resetProfiles"): boolean;
         emit(event: "Profiler.consoleProfileFinished", message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>): boolean;
         emit(event: "Profiler.consoleProfileStarted", message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>): boolean;
+        emit(event: "Runtime.bindingCalled", message: InspectorNotification<Runtime.BindingCalledEventDataType>): boolean;
         emit(event: "Runtime.consoleAPICalled", message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>): boolean;
         emit(event: "Runtime.exceptionRevoked", message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>): boolean;
         emit(event: "Runtime.exceptionThrown", message: InspectorNotification<Runtime.ExceptionThrownEventDataType>): boolean;
@@ -2703,6 +2774,12 @@ declare module "inspector" {
          */
         on(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
 
+        /**
+         * Notification is issued every time when binding is called.
+         * @experimental
+         */
+        on(event: "Runtime.bindingCalled", listener: (message: InspectorNotification<Runtime.BindingCalledEventDataType>) => void): this;
+
         /**
          * Issued when console API was called.
          */
@@ -2827,6 +2904,12 @@ declare module "inspector" {
          */
         once(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
 
+        /**
+         * Notification is issued every time when binding is called.
+         * @experimental
+         */
+        once(event: "Runtime.bindingCalled", listener: (message: InspectorNotification<Runtime.BindingCalledEventDataType>) => void): this;
+
         /**
          * Issued when console API was called.
          */
@@ -2951,6 +3034,12 @@ declare module "inspector" {
          */
         prependListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
 
+        /**
+         * Notification is issued every time when binding is called.
+         * @experimental
+         */
+        prependListener(event: "Runtime.bindingCalled", listener: (message: InspectorNotification<Runtime.BindingCalledEventDataType>) => void): this;
+
         /**
          * Issued when console API was called.
          */
@@ -3075,6 +3164,12 @@ declare module "inspector" {
          */
         prependOnceListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
 
+        /**
+         * Notification is issued every time when binding is called.
+         * @experimental
+         */
+        prependOnceListener(event: "Runtime.bindingCalled", listener: (message: InspectorNotification<Runtime.BindingCalledEventDataType>) => void): this;
+
         /**
          * Issued when console API was called.
          */

From 6c2c073bd980f2dca1b9ba99b8127734bc4d2f42 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Thu, 21 Mar 2019 15:55:32 -0700
Subject: [PATCH 884/924] Adding SSO APIs to preview

---
 types/office-js-preview/index.d.ts | 84 ++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 6ef3d9d8b5..498dfcea24 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -660,6 +660,12 @@ declare namespace Office {
      * <table><tr><td>Hosts</td><td>Access, Excel, Outlook, PowerPoint, Project, Word </td></tr></table>
      */     
     interface Context {
+        /**
+         * Provides information and access to the signed-in user.
+         * 
+         * @beta
+         */
+        auth: Auth;
         /**
         * True, if the current platform allows the add-in to display a UI for selling or upgrading; otherwise returns False.
         * 
@@ -1263,6 +1269,84 @@ declare namespace Office {
          */
         asyncContext?: any
     }
+
+    /**
+     * The Office Auth namespace, Office.context.auth, provides a method that allows the Office host to obtain an access token to the add-in's web application. 
+     * Indirectly, this also enables the add-in to access the signed-in user's Microsoft Graph data without requiring the user to sign in a second time.
+     * 
+     * @beta
+     */
+    interface Auth {
+        /**
+         * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Enables  add-ins to identify users. 
+         * Server side code can use this token to access Microsoft Graph for the add-in's web application by using the 
+         * {@link https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of | "on behalf of" OAuth flow}.
+         * 
+         * Important: In Outlook, this API is not supported if the add-in is loaded in an Outlook.com or Gmail mailbox.
+         *
+         * @remarks
+         * <table><tr><td>Hosts</td><td>Excel, OneNote, Outlook, PowerPoint, Word</td></tr>
+         *
+         * <tr><td>Requirement sets</td><td>{@link https://docs.microsoft.com/office/dev/add-ins/develop/specify-office-hosts-and-api-requirements | IdentityAPI}</td></tr></table>
+         *
+         * This API requires a single sign-on configuration that bridges the add-in to an Azure application. Office users sign-in with Organizational 
+         * Accounts and Microsoft Accounts. Microsoft Azure returns tokens intended for both user account types to access resources in the Microsoft Graph.
+         *
+         * @param options - Optional. Accepts an AuthOptions object to define sign-on behaviors.
+         * @param callback - Optional. Accepts a callback method that can use parse the token for the user's ID or use the token in the "on behalf of" flow to get access to Microsoft Graph.
+         *                   If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+         * 
+         * @beta
+         */
+        getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Enables  add-ins to identify users. 
+         * Server side code can use this token to access Microsoft Graph for the add-in's web application by using the 
+         * {@link https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of | "on behalf of" OAuth flow}.
+         * 
+         * Important: In Outlook, this API is not supported if the add-in is loaded in an Outlook.com or Gmail mailbox.
+         *
+         * @remarks
+         * <table><tr><td>Hosts</td><td>Excel, OneNote, Outlook, PowerPoint, Word</td></tr>
+         *
+         * <tr><td>Requirement sets</td><td>{@link https://docs.microsoft.com/office/dev/add-ins/develop/specify-office-hosts-and-api-requirements | IdentityAPI}</td></tr></table>
+         *
+         * This API requires a single sign-on configuration that bridges the add-in to an Azure application. Office users sign-in with Organizational 
+         * Accounts and Microsoft Accounts. Microsoft Azure returns tokens intended for both user account types to access resources in the Microsoft Graph.
+         *
+         * @param callback - Optional. Accepts a callback method that can use parse the token for the user's ID or use the token in the "on behalf of" flow to get access to Microsoft Graph.
+         *                   If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+         * 
+         * @beta
+         */
+        getAccessTokenAsync(callback?: (result: AsyncResult<string>) => void): void;
+    }
+    /**
+     * Provides options for the user experience when Office obtains an access token to the add-in from AAD v. 2.0 with the getAccessTokenAsync method.
+     */
+    interface AuthOptions {
+        /**
+         * Causes Office to display the add-in consent experience. Useful if the add-in's Azure permissions have changed or if the user's consent has
+         * been revoked.
+         */
+        forceConsent?: boolean,
+        /**
+         * Prompts the user to add their Office account (or to switch to it, if it is already added).
+         */
+        forceAddAccount?: boolean,
+        /**
+         * Causes Office to prompt the user to provide the additional factor when the tenancy being targeted by Microsoft Graph requires multifactor
+         * authentication. The string value identifies the type of additional factor that is required. In most cases, you won't know at development
+         * time whether the user's tenant requires an additional factor or what the string should be. So this option would be used in a "second try"
+         * call of getAccessTokenAsync after Microsoft Graph has sent an error requesting the additional factor and containing the string that should
+         * be used with the authChallenge option.
+         */
+        authChallenge?: string
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
     /**
      * Provides an option for preserving context data of any type, unchanged, for use in a callback.
      */

From e6fd1dce234de33ad6235ecf019f3a7ad0f46245 Mon Sep 17 00:00:00 2001
From: Richard Smith <richardmcsmith@gmail.com>
Date: Fri, 22 Mar 2019 11:42:10 +0900
Subject: [PATCH 885/924] Update read-pkg to 4.0

---
 types/read-pkg/index.d.ts        | 14 ++++++++------
 types/read-pkg/read-pkg-tests.ts |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/types/read-pkg/index.d.ts b/types/read-pkg/index.d.ts
index 5e5b57c445..ba10fee4b9 100644
--- a/types/read-pkg/index.d.ts
+++ b/types/read-pkg/index.d.ts
@@ -1,15 +1,13 @@
-// Type definitions for read-pkg 3.0
+// Type definitions for read-pkg 4.0
 // Project: https://github.com/sindresorhus/read-pkg
-// Definitions by: Jeff Dickey <https://github.com/jdxcode>
+// Definitions by: Jeff Dickey <https://github.com/jdxcode>, Richard Smith <https://github.com/arichardsmith>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import normalize = require('normalize-package-data');
 
 declare namespace ReadPkg {
-    function sync(path: string, options: Options & {normalize: false}): {[k: string]: any};
     function sync(options: Options & {normalize: false}): {[k: string]: any};
     function sync(options?: Options): normalize.Package;
-    function sync(path?: string, options?: Options): normalize.Package;
 
     interface Options {
         /**
@@ -18,14 +16,18 @@ declare namespace ReadPkg {
          * @default true
          */
         normalize?: boolean;
+        /**
+         * Current working directory
+         *
+         * @default process.cwd()
+         */
+        cwd?: string;
     }
 
     type Package = normalize.Package;
 }
 
-declare function ReadPkg(path: string, options: ReadPkg.Options & {normalize: false}): Promise<{[k: string]: any}>;
 declare function ReadPkg(options: ReadPkg.Options & {normalize: false}): Promise<{[k: string]: any}>;
 declare function ReadPkg(options?: ReadPkg.Options): Promise<normalize.Package>;
-declare function ReadPkg(path?: string, options?: ReadPkg.Options): Promise<normalize.Package>;
 
 export = ReadPkg;
diff --git a/types/read-pkg/read-pkg-tests.ts b/types/read-pkg/read-pkg-tests.ts
index a82f953eab..b39c578862 100644
--- a/types/read-pkg/read-pkg-tests.ts
+++ b/types/read-pkg/read-pkg-tests.ts
@@ -3,7 +3,8 @@ import ReadPkg = require('read-pkg');
 ReadPkg().then(pkg => pkg.name); // $ExpectType Promise<string>
 ReadPkg({normalize: true}).then(pkg => pkg.name); // $ExpectType Promise<string>
 ReadPkg({normalize: false}).then(pkg => pkg['name']); // $ExpectType Promise<any>
+ReadPkg({cwd: './foo'}).then(pkg => pkg.name); // $ExpectType Promise<string>
 ReadPkg.sync().name; // $ExpectType string
 ReadPkg.sync({normalize: true}).name; // $ExpectType string
 ReadPkg.sync({normalize: false})['name']; // $ExpectType any
-ReadPkg.sync('package.json', {normalize: false})['name']; // $ExpectType any
+ReadPkg.sync({cwd: './foo'}).name; // $ExpectType string

From 24995d792780647fac0fbe59b4b99705e275ab6e Mon Sep 17 00:00:00 2001
From: breeze9527 <breeze9527@gmail.com>
Date: Fri, 22 Mar 2019 14:25:34 +0800
Subject: [PATCH 886/924] [amap-js-api-indoor-map] Added js-doc

---
 types/amap-js-api-indoor-map/index.d.ts | 129 ++++++++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/types/amap-js-api-indoor-map/index.d.ts b/types/amap-js-api-indoor-map/index.d.ts
index 03c2a6bb2f..9b30ea1722 100644
--- a/types/amap-js-api-indoor-map/index.d.ts
+++ b/types/amap-js-api-indoor-map/index.d.ts
@@ -17,17 +17,45 @@ declare namespace AMap {
             mouseout: MouseEvent<'mouseout'>;
         }
         type MouseEvent<N extends string> = Event<N, {
+            /**
+             * 店铺所属楼宇信息
+             */
             building_id: string;
+            /**
+             * 经纬度
+             */
             lnglat: LngLat;
+            /**
+             * 楼层
+             */
             floor: number;
+            /**
+             * 商店
+             */
             shop: Shop;
         }>;
         interface Options extends Layer.Options {
+            /**
+             * 图层叠加的顺序值
+             */
             zIndex?: number;
+            /**
+             * 图层的透明度
+             */
             opacity?: number;
+            /**
+             * 鼠标悬停到店铺面时的鼠标样式
+             */
             cursor?: string;
+            /**
+             * 是否隐藏楼层切换控件
+             */
             hideFloorBar?: boolean;
+            /**
+             * 是否持续显示
+             */
             alaysShow?: boolean;
+
             // internal
             visible?: boolean;
             featurezIndex?: number;
@@ -38,32 +66,80 @@ declare namespace AMap {
             autoLoadBuildingsInTile?: boolean;
         }
         interface FloorDetails {
+            /**
+             * 各楼层索引
+             */
             floor_indexs: number[];
+            /**
+             * 各楼层英文
+             */
             floor_nonas: string[];
+            /**
+             * 各楼层名字
+             */
             floor_names: string[];
         }
         type ShopCategory = 'public' | 'connection' | 'shop';
         interface Shop {
+            /**
+             * 店铺的id
+             */
             id: string;
+            /**
+             * 兴趣点ID
+             */
             poiId: string;
+            /**
+             * 店铺所属楼宇ID
+             */
             building_id: string;
+            /**
+             * 店铺名称
+             */
             name: string;
+            /**
+             * 店铺的经纬度
+             */
             lnglat: LngLat;
+            /**
+             * 分类
+             */
             category: ShopCategory;
         }
         interface Building {
+            /**
+             * 所属楼宇ID
+             */
             id: string;
+            /**
+             * 楼层名称
+             */
             name: string;
+            /**
+             * 楼层的经纬度
+             */
             lnglat: LngLat;
+            /**
+             * 所在楼层
+             */
             floor: number;
             floor_details: FloorDetails;
         }
         interface SearchSuccessResult {
+            /**
+             * 楼层的id
+             */
             id: string;
             status: 0;
+            /**
+             * 建筑信息
+             */
             building: Building;
         }
         interface SearchErrorResult {
+            /**
+             * 楼宇id
+             */
             id: string;
             status: 1;
             error: Error;
@@ -72,22 +148,52 @@ declare namespace AMap {
     }
 
     class IndoorMap extends Layer {
+        /**
+         * 室内地图
+         * @param options 选项
+         */
         constructor(options?: IndoorMap.Options);
+        /**
+         * 显示指定室内地图信息
+         * @param indoorId 建筑物ID
+         * @param callback 回调
+         */
         showIndoorMap(
             indoorId: string,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
+        /**
+         * 显示指定室内地图信息
+         * @param indoorId 建筑物ID
+         * @param floor 楼层
+         * @param callback 回调
+         */
         showIndoorMap(
             indoorId: string,
             floor?: number,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
+        /**
+         * 显示指定室内地图信息
+         * @param indoorId 建筑物ID
+         * @param floor 楼层
+         * @param shopId 商铺ID
+         * @param callback 回调
+         */
         showIndoorMap(
             indoorId: string,
             floor?: number,
             shopId?: string,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
+        /**
+         * 显示指定室内地图信息
+         * @param indoorId 建筑物ID
+         * @param floor 楼层
+         * @param shopId 商铺ID
+         * @param noMove 阻止移动
+         * @param callback 回调
+         */
         showIndoorMap(
             indoorId: string,
             floor?: number,
@@ -95,12 +201,35 @@ declare namespace AMap {
             noMove?: boolean,
             callback?: (error: null | Error, result: IndoorMap.SearchResult) => void
         ): void;
+        /**
+         * 显示指定的楼层
+         * @param floor 楼层
+         * @param noMove 禁止移动
+         */
         showFloor(floor: number, noMove?: boolean): false | undefined;
+        /**
+         * 显示楼层切换控件
+         */
         showFloorBar(): void;
+        /**
+         * 隐藏楼层切换控件
+         */
         hideFloorBar(): void;
+        /**
+         * 显示室内地图标注
+         */
         showLabels(): void;
+        /**
+         * 隐藏室内地图标注
+         */
         hideLabels(): void;
+        /**
+         * 获取处于被选中状态的室内地图的ID
+         */
         getSelectedBuildingId(): string | null;
+        /**
+         * 获取处于被选中状态的室内地图的一些基本信息
+         */
         getSelectedBuilding(): IndoorMap.Building | null;
 
         // internal

From cd1739401abf11cbe7c616a766ec9d8716ed60fa Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Fri, 22 Mar 2019 11:17:49 +0300
Subject: [PATCH 887/924] test and references

---
 types/pako/index.d.ts    | 18 ++++++++++++++++++
 types/pako/pako-tests.ts | 33 +++++++++++++++++++++++++++++++--
 types/pako/tsconfig.json |  2 +-
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index 69c4feaf01..a91c240fe8 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -123,8 +123,19 @@ declare namespace Pako {
     function ungzip(data: Data, options: InflateFunctionOptions & { to: 'string' }): string;
     function ungzip(data: Data, options?: InflateFunctionOptions): Uint8Array;
 
+    // https://github.com/nodeca/pako/blob/893381abcafa10fa2081ce60dae7d4d8e873a658/lib/deflate.js
     class Deflate {
         constructor(options?: DeflateOptions);
+        level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+        windowBits?: number;
+        memLevel?: number;
+        strategy?: StrategyValues;
+        dictionary?: any;
+        raw?: boolean;
+        to?: 'string';
+        chunkSize?: number;
+        gzip?: boolean;
+        header?: Header;
         err: ReturnCodes;
         msg: string;
         result: Uint8Array | number[];
@@ -133,11 +144,18 @@ declare namespace Pako {
         push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
     }
 
+    // https://github.com/nodeca/pako/blob/893381abcafa10fa2081ce60dae7d4d8e873a658/lib/inflate.js
     class Inflate {
         constructor(options?: InflateOptions);
+        windowBits?: number;
+        dictionary?: any;
+        raw?: boolean;
+        to?: 'string';
+        chunkSize?: number;
         err: ReturnCodes;
         msg: string;
         result: Data;
+        header: Header;
         onData(chunk: Data): void;
         onEnd(status: number): void;
         push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;
diff --git a/types/pako/pako-tests.ts b/types/pako/pako-tests.ts
index 9caa562e53..b77bcfb69f 100644
--- a/types/pako/pako-tests.ts
+++ b/types/pako/pako-tests.ts
@@ -1,14 +1,17 @@
 import pako = require("pako");
+import * as assert from "assert";
 
 const chunk1 = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9]);
 const chunk2 = new Uint8Array([10, 11, 12, 13, 14, 15, 16, 17, 18, 19]);
+const chunk3 = new Uint8Array([101, 111, 121, 131, 141, 151, 161, 171, 181, 191]);
 
-const deflate = new pako.Deflate({level: 3});
+const deflate = new pako.Deflate({level: 3, strategy : pako.StrategyValues.Z_HUFFMAN_ONLY});
 
 deflate.push(chunk1, false);
+deflate.push(chunk3, pako.FlushValues.Z_PARTIAL_FLUSH);
 deflate.push(chunk2, true);  // true -> last chunk
 
-if (deflate.err) {
+if (deflate.err !== pako.ReturnCodes.Z_OK) {
     throw new Error(deflate.err.toString());
 }
 
@@ -19,3 +22,29 @@ const arr: Uint8Array = pako.deflate('1234');
 
 const str2: string = pako.inflate('1234', {to: 'string'});
 const arr2: Uint8Array = pako.inflate('1234');
+
+const data = '           ';
+
+const deflator = new pako.Deflate({
+    gzip: true,
+    header: {
+        hcrc: true,
+        time: 1234567,
+        os: 15,
+        name: 'test name',
+        comment: 'test comment',
+        extra: [ 4, 5, 6 ]
+    }
+});
+deflator.push(data, true);
+
+const inflator = new pako.Inflate({ to: 'string' });
+inflator.push(deflator.result, true);
+
+assert.equal(inflator.err, 0);
+assert.equal(inflator.result, data);
+
+const header = inflator.header;
+assert.equal(header.time, 1234567);
+assert.equal(header.os, 15);
+assert.equal(header.name, 'test name');
diff --git a/types/pako/tsconfig.json b/types/pako/tsconfig.json
index 011a39c83c..4b4abb5711 100644
--- a/types/pako/tsconfig.json
+++ b/types/pako/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "pako-tests.ts"
     ]
-}
\ No newline at end of file
+}

From b7973e7854a815852cec39b1613870cd715f0378 Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Fri, 22 Mar 2019 11:23:23 +0300
Subject: [PATCH 888/924] header

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

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index a91c240fe8..8599976e39 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -152,10 +152,10 @@ declare namespace Pako {
         raw?: boolean;
         to?: 'string';
         chunkSize?: number;
+        header?: Header;
         err: ReturnCodes;
         msg: string;
         result: Data;
-        header: Header;
         onData(chunk: Data): void;
         onEnd(status: number): void;
         push(data: Data | ArrayBuffer, mode?: FlushValues | boolean): boolean;

From a20a1685bd0b9dfc1a8eca78ecd29973da92d85d Mon Sep 17 00:00:00 2001
From: Muhammet Ozturk <mozturk@eriktronik.com>
Date: Fri, 22 Mar 2019 11:33:39 +0300
Subject: [PATCH 889/924] class parameter fixing

---
 types/pako/index.d.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/types/pako/index.d.ts b/types/pako/index.d.ts
index 8599976e39..b89a4866d4 100644
--- a/types/pako/index.d.ts
+++ b/types/pako/index.d.ts
@@ -126,16 +126,6 @@ declare namespace Pako {
     // https://github.com/nodeca/pako/blob/893381abcafa10fa2081ce60dae7d4d8e873a658/lib/deflate.js
     class Deflate {
         constructor(options?: DeflateOptions);
-        level?: -1 | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
-        windowBits?: number;
-        memLevel?: number;
-        strategy?: StrategyValues;
-        dictionary?: any;
-        raw?: boolean;
-        to?: 'string';
-        chunkSize?: number;
-        gzip?: boolean;
-        header?: Header;
         err: ReturnCodes;
         msg: string;
         result: Uint8Array | number[];
@@ -147,11 +137,6 @@ declare namespace Pako {
     // https://github.com/nodeca/pako/blob/893381abcafa10fa2081ce60dae7d4d8e873a658/lib/inflate.js
     class Inflate {
         constructor(options?: InflateOptions);
-        windowBits?: number;
-        dictionary?: any;
-        raw?: boolean;
-        to?: 'string';
-        chunkSize?: number;
         header?: Header;
         err: ReturnCodes;
         msg: string;

From fcf24503eb7bfebeb6279e2a5b341f078c73df87 Mon Sep 17 00:00:00 2001
From: Ryo Ota <nwtgck@gmail.com>
Date: Fri, 22 Mar 2019 18:44:02 +0900
Subject: [PATCH 890/924] Remove allowHTTP1 from http2.ServerOptions

---
 types/node/http2.d.ts        | 4 +---
 types/node/test/http2.ts     | 3 +--
 types/node/v10/http2.d.ts    | 4 +---
 types/node/v10/node-tests.ts | 3 +--
 types/node/v8/index.d.ts     | 4 +---
 types/node/v8/node-tests.ts  | 3 +--
 types/node/v9/index.d.ts     | 4 +---
 types/node/v9/node-tests.ts  | 3 +--
 8 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/types/node/http2.d.ts b/types/node/http2.d.ts
index 6e6f0e0b62..adeee5402b 100644
--- a/types/node/http2.d.ts
+++ b/types/node/http2.d.ts
@@ -424,9 +424,7 @@ declare module "http2" {
     export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
     export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
 
-    export interface ServerOptions extends ServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
+    export interface ServerOptions extends ServerSessionOptions { }
 
     export interface SecureServerOptions extends SecureServerSessionOptions {
         allowHTTP1?: boolean;
diff --git a/types/node/test/http2.ts b/types/node/test/http2.ts
index 76d6044d02..c87b66a3f0 100644
--- a/types/node/test/http2.ts
+++ b/types/node/test/http2.ts
@@ -256,8 +256,7 @@ import { URL } from 'url';
         paddingStrategy: 0,
         peerMaxConcurrentStreams: 0,
         selectPadding: (frameLen: number, maxFrameLen: number) => 0,
-        settings,
-        allowHTTP1: true
+        settings
     };
     // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
     const secureServerOptions: SecureServerOptions = Object.assign({}, serverOptions);
diff --git a/types/node/v10/http2.d.ts b/types/node/v10/http2.d.ts
index aecbca783f..0d23809c99 100644
--- a/types/node/v10/http2.d.ts
+++ b/types/node/v10/http2.d.ts
@@ -424,9 +424,7 @@ declare module "http2" {
     export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
     export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
 
-    export interface ServerOptions extends ServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
+    export interface ServerOptions extends ServerSessionOptions { }
 
     export interface SecureServerOptions extends SecureServerSessionOptions {
         allowHTTP1?: boolean;
diff --git a/types/node/v10/node-tests.ts b/types/node/v10/node-tests.ts
index e13f8b313a..d654aaa3d1 100644
--- a/types/node/v10/node-tests.ts
+++ b/types/node/v10/node-tests.ts
@@ -4452,8 +4452,7 @@ import * as constants from 'constants';
             paddingStrategy: 0,
             peerMaxConcurrentStreams: 0,
             selectPadding: (frameLen: number, maxFrameLen: number) => 0,
-            settings,
-            allowHTTP1: true
+            settings
         };
         // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
         const secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index ecc15b68f1..dd92b36a94 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -6710,9 +6710,7 @@ declare module "http2" {
     export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
     export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
 
-    export interface ServerOptions extends ServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
+    export interface ServerOptions extends ServerSessionOptions { }
 
     export interface SecureServerOptions extends SecureServerSessionOptions {
         allowHTTP1?: boolean;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 312f2d7acb..b2c16a896a 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -3686,8 +3686,7 @@ namespace http2_tests {
             paddingStrategy: 0,
             peerMaxConcurrentStreams: 0,
             selectPadding: (frameLen: number, maxFrameLen: number) => 0,
-            settings,
-            allowHTTP1: true
+            settings
         };
         // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
         let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 55cb883f8c..ecfcf119dd 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -7135,9 +7135,7 @@ declare module "http2" {
     export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
     export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
 
-    export interface ServerOptions extends ServerSessionOptions {
-        allowHTTP1?: boolean;
-    }
+    export interface ServerOptions extends ServerSessionOptions { }
 
     export interface SecureServerOptions extends SecureServerSessionOptions {
         allowHTTP1?: boolean;
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index d454667ea8..338d942629 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -3741,8 +3741,7 @@ namespace http2_tests {
             paddingStrategy: 0,
             peerMaxConcurrentStreams: 0,
             selectPadding: (frameLen: number, maxFrameLen: number) => 0,
-            settings,
-            allowHTTP1: true
+            settings
         };
         // tslint:disable-next-line prefer-object-spread (ts2.1 feature)
         let secureServerOptions: http2.SecureServerOptions = Object.assign({}, serverOptions);

From 49c393ee98e0480a883212b305be39d23f193f94 Mon Sep 17 00:00:00 2001
From: Marlos Borges <marlos.borges@gmail.com>
Date: Fri, 22 Mar 2019 10:51:45 +0100
Subject: [PATCH 891/924] [stripe-v3] add fontWeight to StypeOptions

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

diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index a3386fa9fa..b23b384d45 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -7,6 +7,7 @@
 //                 Justin Leider <https://github.com/jleider>
 //                 Kamil Gałuszka <https://github.com/galuszkak>
 //                 Stefan Langeder <https://github.com/slangeder>
+//                 Marlos Borges <https://github.com/marlosin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var Stripe: stripe.StripeStatic;
@@ -382,6 +383,7 @@ declare namespace stripe {
             fontSmoothing?: string;
             fontStyle?: string;
             fontVariant?: string;
+            fontWeight?: string | number;
             iconColor?: string;
             lineHeight?: string;
             letterSpacing?: string;
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index 664e627116..471c44c436 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -14,6 +14,7 @@ describe("Stripe", () => {
                 fontFamily: 'Roboto, "Helvetica Neue", sans-serif',
                 fontSmoothing: 'antialiased',
                 fontSize: '16px',
+                fontWeight: 'bold',
                 '::placeholder': {
                     color: '#aab7c4'
                 }
@@ -183,6 +184,7 @@ describe("Stripe v2 & v3", () => {
                 fontFamily: 'Roboto, "Helvetica Neue", sans-serif',
                 fontSmoothing: 'antialiased',
                 fontSize: '16px',
+                fontWeight: 500,
                 '::placeholder': {
                     color: '#aab7c4'
                 }

From ffde14a6a8b3b912d87c3310833386113032ebc8 Mon Sep 17 00:00:00 2001
From: Adam Bowles <github@adambowl.es>
Date: Fri, 22 Mar 2019 10:46:14 +0000
Subject: [PATCH 892/924] Add rotationAngle prop

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

diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index fc6326deae..7a53884bd3 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for react-swipeable 4.2
+// Type definitions for react-swipeable 4.3
 // Project: https://github.com/dogfessional/react-swipeable
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Konstantin Vasilev <https://github.com/mctep>
 //                 Hiroki Horiuchi <https://github.com/horiuchi>
+//                 Adam Bowles <https://github.com/adambowles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -36,6 +37,7 @@ declare namespace ReactSwipeable {
         nodeName?: string;
         trackMouse?: boolean;
         disabled?: boolean;
+        rotationAngle?: number;
         innerRef?: React.Ref<T>;
         children?: React.ReactNode;
     }

From 7485751effc84f934903989f6cc8e0d1775ded44 Mon Sep 17 00:00:00 2001
From: Adam Bowles <github@adambowl.es>
Date: Fri, 22 Mar 2019 10:48:29 +0000
Subject: [PATCH 893/924] Add rotationAngle prop to test

---
 types/react-swipeable/react-swipeable-tests.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-swipeable/react-swipeable-tests.tsx b/types/react-swipeable/react-swipeable-tests.tsx
index 87294f001e..0479a7d3d5 100644
--- a/types/react-swipeable/react-swipeable-tests.tsx
+++ b/types/react-swipeable/react-swipeable-tests.tsx
@@ -39,6 +39,7 @@ class SampleComponent extends React.PureComponent<Swipeable.SwipeableProps> {
         disabled
         innerRef={this.swipeRef}
         onClick={this.handleClick}
+        rotationAngle={0}
       >
         <div>
           This element can be swiped

From 1a24c8e797c49a7eedb0815234106a09c407807a Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 22 Mar 2019 11:53:41 +0100
Subject: [PATCH 894/924] [expo] correct typo in svg common props

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

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 88e6ae9fd6..b051946110 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -2616,7 +2616,7 @@ export interface SvgCommonProps {
     strokeWidth?: number | string;
     strokeOpacity?: number | string;
     strokeLinecap?: string;
-    strokeLineJoin?: string;
+    strokeLinejoin?: string;
     strokeDasharray?: any[];
     strokeDashoffset?: any;
     transform?: string | object;

From 089bdd6c1dba7ab17a90c5a4d89651187e3d7cb9 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Fri, 22 Mar 2019 11:16:47 +0000
Subject: [PATCH 895/924] Changed what the reviewer asked to change

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

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index de47199ab5..b0ea0fccf5 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -19,20 +19,17 @@ import {
  * Simple wrapper around the child_process module that makes use of promises
  */
 
-// stop exporting everything by default
-export {};
-
-interface PromiseResult<Enc extends string|Buffer> {
+export interface PromiseResult<Enc extends string|Buffer> {
     childProcess: ChildProcess;
     stdout: Enc;
     stderr: Enc;
 }
 
-interface SpawnPromiseResult extends PromiseResult<string> {
+export interface SpawnPromiseResult extends PromiseResult<string> {
     code: number;
 }
 
-interface ChildProcessPromise<T> extends Promise<T> {
+export interface ChildProcessPromise<T> extends Promise<T> {
     childProcess: ChildProcess;
 }
 

From 3a4a4bb20b19173408ece60d07d87bb5e4bd19ec Mon Sep 17 00:00:00 2001
From: Ian Sanders <isanders@chromalloy.com>
Date: Fri, 22 Mar 2019 08:33:36 -0400
Subject: [PATCH 896/924] Make linedelimiters property required

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

diff --git a/types/diff/index.d.ts b/types/diff/index.d.ts
index 15fda0d409..08ac3c3171 100644
--- a/types/diff/index.d.ts
+++ b/types/diff/index.d.ts
@@ -142,7 +142,7 @@ export interface Hunk {
     newStart: number;
     newLines: number;
     lines: string[];
-    linedelimiters?: string[];
+    linedelimiters: string[];
 }
 
 export interface BestPath {

From 6989870bde589387c0557e677ae9c4446d135835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bilal=20U=C3=A7ar?= <bilal.ucar@sahabt.com>
Date: Fri, 22 Mar 2019 16:04:45 +0300
Subject: [PATCH 897/924] @types/echarts Enhance echarts title options
 definition

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

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 41b3fe801f..ca93cc10ac 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -972,17 +972,21 @@ declare namespace echarts {
         sublink?: string,
         subtarget?: string,
         subtextStyle?: object,
+        textAlign?: string,
+        textVerticalAlign?: string,
+        triggerEvent?: boolean,
         padding?: number,
         itemGap?: number,
         zlevel?: number,
         z?: number,
-        left?: string,
-        top?: string,
-        right?: string,
-        bottom?: string,
+        left?: string | number,
+        top?: string | number,
+        right?: string | number,
+        bottom?: string | number,
         backgroundColor?: string,
         borderColor?: string,
         borderWidth?: number,
+        borderRadius?: number | number[],
         shadowBlur?: number,
         shadowColor?: number,
         shadowOffsetX?: number,

From c0fc0677a3a95a4694f4c99276ecfc6c54eac9ad Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.net>
Date: Fri, 22 Mar 2019 14:43:44 +0100
Subject: [PATCH 898/924] [bull] add function overloading

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 5297eadb19..07de38e05d 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -13,6 +13,7 @@
 //                 Dan Manastireanu <https://github.com/danmana>
 //                 Kjell-Morten Bratsberg Thorsen <https://github.com/kjellmorten>
 //                 Christian D. <https://github.com/pc-jedi>
+//                 Silas Rech <https://github.com/lenovouser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -114,6 +115,9 @@ declare namespace Bull {
 
   type JobId = number | string;
 
+  type ProcessCallbackFunction<T> = (job: Job<T>, done: DoneCallback) => void;
+  type ProcessPromiseFunction<T> = (job: Job<T>) => Promise<void>;
+
   interface Job<T = any> {
     id: JobId;
 
@@ -397,6 +401,8 @@ declare namespace Bull {
      */
     isReady(): Promise<this>;
 
+    /* tslint:disable:unified-signatures */
+
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
@@ -414,7 +420,9 @@ declare namespace Bull {
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
      * If it is resolved, its value will be the "completed" event's second argument.
      */
-    process(callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
+    process(callback: ProcessCallbackFunction<T>): void;
+    process(callback: ProcessPromiseFunction<T>): void;
+    process(callback: string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -435,7 +443,9 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call your handler in parallel respecting this maximum value.
      */
-    process(concurrency: number, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
+    process(concurrency: number, callback: ProcessCallbackFunction<T>): void;
+    process(concurrency: number, callback: ProcessPromiseFunction<T>): void;
+    process(concurrency: number, callback: string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -456,8 +466,9 @@ declare namespace Bull {
      *
      * @param name Bull will only call the handler if the job name matches
      */
-    // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
+    process(name: string, callback: ProcessCallbackFunction<T>): void;
+    process(name: string, callback: ProcessPromiseFunction<T>): void;
+    process(name: string, callback: string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -479,7 +490,11 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call your handler in parallel respecting this maximum value.
      */
-    process(name: string, concurrency: number, callback: ((job: Job<T>, done: DoneCallback) => void) | ((job: Job<T>) => Promise<any>) | string): void;
+    process(name: string, concurrency: number, callback: ProcessCallbackFunction<T>): void;
+    process(name: string, concurrency: number, callback: ProcessPromiseFunction<T>): void;
+    process(name: string, concurrency: number, callback: string): void;
+
+    /* tslint:enable:unified-signatures */
 
     /**
      * Creates a new job and adds it to the queue.
@@ -598,7 +613,7 @@ declare namespace Bull {
      * Returns a promise that will return an array of job instances of the given types.
      * Optional parameters for range and ordering are provided.
      */
-    getJobs(types: string[], start?: number, end?: number, asc?: boolean): Promise<Job[]>;
+    getJobs(types: string[], start?: number, end?: number, asc?: boolean): Promise<Array<Job<T>>>;
 
     /**
      * Returns a promise that resolves with the job counts for the given queue.

From fa20408f79a801d0580f95e085fe5e02363d3791 Mon Sep 17 00:00:00 2001
From: James Lismore <jlismore@gmail.com>
Date: Fri, 22 Mar 2019 10:22:00 -0400
Subject: [PATCH 899/924] Export LinkProps interface Fix linter warnings

---
 types/react-csv/components/Link.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-csv/components/Link.d.ts b/types/react-csv/components/Link.d.ts
index 7719d1405e..82194dea93 100644
--- a/types/react-csv/components/Link.d.ts
+++ b/types/react-csv/components/Link.d.ts
@@ -1,9 +1,10 @@
 import { Component } from "react";
 import { CommonPropTypes } from "./CommonPropTypes";
 
+// tslint:disable-next-line strict-export-declare-modifiers
 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-interface LinkProps
+export interface LinkProps
     extends CommonPropTypes,
         Omit<
             React.DetailedHTMLProps<

From e87748d38952303ceddbcfc87742f77dbac5b8bd Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 11:02:39 -0400
Subject: [PATCH 900/924] ndn-js: fix MemoryContentCache.storePendingInterest

---
 types/ndn-js/memory-content-cache.d.ts    | 3 +--
 types/ndn-js/test/memory-content-cache.ts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/ndn-js/memory-content-cache.d.ts b/types/ndn-js/memory-content-cache.d.ts
index 1411bebe08..75c47419c0 100644
--- a/types/ndn-js/memory-content-cache.d.ts
+++ b/types/ndn-js/memory-content-cache.d.ts
@@ -2,7 +2,6 @@ import { Data } from "./data";
 import { Face, ForwardingFlags, InterestFilter, OnInterestCallback } from "./face";
 import { Interest } from "./interest";
 import { Name } from "./name";
-import { Transport } from "./transport";
 
 export class MemoryContentCache {
     constructor(face: Face, cleanupIntervalMilliseconds?: number);
@@ -15,6 +14,6 @@ export class MemoryContentCache {
                    onDataNotFound?: OnInterestCallback, flags?: ForwardingFlags): void;
     setInterestFilter(filter: InterestFilter|Name, onDataNotFound?: OnInterestCallback): void;
     setMinimumCacheLifetime(minimumCacheLifetime: number): void;
-    storePendingInterest(interest: Interest, transport: Transport): void;
+    storePendingInterest(interest: Interest, face: Face): void;
     unregisterAll(): void;
 }
diff --git a/types/ndn-js/test/memory-content-cache.ts b/types/ndn-js/test/memory-content-cache.ts
index daa26d4e17..d809b7a442 100644
--- a/types/ndn-js/test/memory-content-cache.ts
+++ b/types/ndn-js/test/memory-content-cache.ts
@@ -12,4 +12,4 @@ cache.registerPrefix(new ndn.Name("/A"),
     cache.getStorePendingInterest());
 cache.setInterestFilter(new ndn.Name("/A"), cache.getStorePendingInterest());
 cache.setMinimumCacheLifetime(5000);
-cache.storePendingInterest(new ndn.Interest(), new ndn.UnixTransport());
+cache.storePendingInterest(new ndn.Interest(), face);

From 23241a50372d2330b58e21761fbf5b845c39f295 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 11:29:46 -0400
Subject: [PATCH 901/924] ndn-js: declare DelegationSet and
 ApplicationParameters

---
 types/ndn-js/delegation-set.d.ts |  1 -
 types/ndn-js/index.d.ts          |  1 -
 types/ndn-js/interest.d.ts       | 38 ++++++++++++++++++++++++--------
 types/ndn-js/name.d.ts           |  4 +---
 types/ndn-js/test/interest.ts    | 28 ++++++++++++++++-------
 5 files changed, 50 insertions(+), 22 deletions(-)
 delete mode 100644 types/ndn-js/delegation-set.d.ts

diff --git a/types/ndn-js/delegation-set.d.ts b/types/ndn-js/delegation-set.d.ts
deleted file mode 100644
index f40dbd1912..0000000000
--- a/types/ndn-js/delegation-set.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type DelegationSet = any;
diff --git a/types/ndn-js/index.d.ts b/types/ndn-js/index.d.ts
index 9f76593c02..0e584e9297 100644
--- a/types/ndn-js/index.d.ts
+++ b/types/ndn-js/index.d.ts
@@ -6,7 +6,6 @@
 export as namespace ndn;
 export * from "./blob";
 export * from "./data";
-export * from "./delegation-set";
 export * from "./face";
 export * from "./interest";
 export * from "./key-chain";
diff --git a/types/ndn-js/interest.d.ts b/types/ndn-js/interest.d.ts
index f3b5bc88b4..20dd23c9a0 100644
--- a/types/ndn-js/interest.d.ts
+++ b/types/ndn-js/interest.d.ts
@@ -1,29 +1,49 @@
 import { Blob } from "./blob";
 import { Data } from "./data";
-import { DelegationSet } from "./delegation-set";
 import { Name } from "./name";
 
 export class Interest {
-    constructor(name?: Name);
+    constructor(name?: Name|string);
     constructor(interest: Interest);
 
-    getCanBePrefix(): boolean;
-    getForwardingHint(): DelegationSet;
-    getIncomingFaceId(): number;
-    getInterestLifetimeMilliseconds(): number;
-    getMustBeFresh(): boolean;
     getName(): Name;
+    getCanBePrefix(): boolean;
+    getMustBeFresh(): boolean;
+    getForwardingHint(): DelegationSet;
     getNonce(): Blob;
+    getInterestLifetimeMilliseconds(): number;
+    getApplicationParameters(): Blob;
+    getIncomingFaceId(): number;
 
+    setName(name: Name): Interest;
     setCanBePrefix(canBePrefix: boolean): Interest;
+    setMustBeFresh(mustBeFresh: boolean): Interest;
     setForwardingHint(fh: DelegationSet): Interest;
     setInterestLifetimeMilliseconds(lifetime: number): Interest;
-    setMustBeFresh(mustBeFresh: boolean): Interest;
-    setName(name: Name): Interest;
+    setApplicationParameters(parameters: Blob|Buffer): Interest;
 
+    appendParametersDigestToName(): Interest;
     matchesData(data: Data): boolean;
     matchesName(name: Name): boolean;
     refreshNonce(): void;
+    toUri(): string;
     wireDecode(input: Blob|Buffer): void;
     wireEncode(): Blob;
 }
+
+export class DelegationSet {
+    size(): number;
+    get(i: number): DelegationSet.Delegation;
+    find(name: Name): number;
+
+    add(preference: number, name: Name): void;
+    remove(name: Name): boolean;
+    clear(): void;
+}
+
+export namespace DelegationSet {
+    class Delegation {
+        getPreference(): number;
+        getName(): Name;
+    }
+}
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index d27123ad9a..40b8a99245 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -53,9 +53,7 @@ export namespace Name {
 
 export class Name {
     constructor(components?: ReadonlyArray<Name.Component|Uint8Array>);
-    constructor(uri: string);
-    // tslint:disable-next-line unified-signatures
-    constructor(name: Name);
+    constructor(name: Name|string);
 
     append(value: ReadonlyArray<number>|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
     append(component: Name.Component): Name;
diff --git a/types/ndn-js/test/interest.ts b/types/ndn-js/test/interest.ts
index 9f964fd2ed..008a795aec 100644
--- a/types/ndn-js/test/interest.ts
+++ b/types/ndn-js/test/interest.ts
@@ -3,26 +3,38 @@ import ndn = require("ndn-js");
 
 let interest = new ndn.Interest();
 interest = new ndn.Interest(new ndn.Name("/A"));
+interest = new ndn.Interest("/A");
 interest = new ndn.Interest(interest);
 
+let name: ndn.Name = interest.getName();
 let b: boolean = interest.getCanBePrefix();
-const fh: ndn.DelegationSet = interest.getForwardingHint();
-let n: number = interest.getIncomingFaceId();
-n = interest.getInterestLifetimeMilliseconds();
 b = interest.getMustBeFresh();
-const name: ndn.Name = interest.getName();
+const fh: ndn.DelegationSet = interest.getForwardingHint();
 let blob: ndn.Blob = interest.getNonce();
+let n: number = interest.getInterestLifetimeMilliseconds();
+blob = interest.getApplicationParameters();
+n = interest.getIncomingFaceId();
 
-interest = interest.setCanBePrefix(true)
+interest = interest.setName(name)
+                   .setCanBePrefix(true)
+                   .setMustBeFresh(true)
                    .setForwardingHint(fh)
                    .setInterestLifetimeMilliseconds(2000)
-                   .setMustBeFresh(true)
-                   .setName(name);
+                   .setApplicationParameters(blob)
+                   .setApplicationParameters(Buffer.alloc(4))
+                   .appendParametersDigestToName();
 
 b = interest.matchesData(new ndn.Data());
 b = interest.matchesName(name);
 interest.refreshNonce();
-
+const s: string = interest.toUri();
 interest.wireDecode(blob);
 interest.wireDecode(Buffer.alloc(4));
 blob = interest.wireEncode();
+
+fh.add(10, name);
+n = fh.size();
+const del: ndn.DelegationSet.Delegation = fh.get(0);
+n = del.getPreference();
+name = del.getName();
+b = fh.remove(name);

From 0d3e8bf9c19d495fd6a6df36fbdb35ae2b24af4c Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 11:40:39 -0400
Subject: [PATCH 902/924] ndn: Data methods follow packet format order

---
 types/ndn-js/data.d.ts    | 29 +++++++++++++++--------------
 types/ndn-js/test/data.ts | 27 +++++++++++++++------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/types/ndn-js/data.d.ts b/types/ndn-js/data.d.ts
index d76dd02779..9d6c03cda1 100644
--- a/types/ndn-js/data.d.ts
+++ b/types/ndn-js/data.d.ts
@@ -3,19 +3,20 @@ import { Name } from "./name";
 import { Signature } from "./signature";
 
 export class Data {
-    constructor(name?: Name);
+    constructor(name?: Name|string);
+    constructor(data: Data);
 
-    getCongestionMark(): number;
-    getContent(): Blob;
-    getFullName(): Name;
-    getIncomingFaceId(): number;
-    getMetaInfo(): MetaInfo;
     getName(): Name;
+    getFullName(): Name;
+    getMetaInfo(): MetaInfo;
+    getContent(): Blob;
     getSignature(): Signature;
+    getCongestionMark(): number;
+    getIncomingFaceId(): number;
 
-    setContent(content: Blob): Data;
-    setMetaInfo(meta: MetaInfo): Data;
     setName(name: Name): Data;
+    setMetaInfo(meta: MetaInfo): Data;
+    setContent(content: Blob|Buffer): Data;
     setSignature(sig: Signature): Data;
 
     wireDecode(input: Blob|Buffer): void;
@@ -33,13 +34,13 @@ export enum ContentType {
 export class MetaInfo {
     constructor(meta?: MetaInfo);
 
-    getFinalBlockId(): Name.Component;
-    getFreshnessPeriod(): number;
-    getOtherTypeCode(): number;
     getType(): ContentType;
+    getOtherTypeCode(): number;
+    getFreshnessPeriod(): number;
+    getFinalBlockId(): Name.Component;
 
-    setFinalBlockId(comp: Name.Component): void;
-    setFreshnessPeriod(freshness: number): void;
-    setOtherTypeCode(otherTypeCode: number): void;
     setType(type: ContentType): void;
+    setOtherTypeCode(otherTypeCode: number): void;
+    setFreshnessPeriod(freshness: number): void;
+    setFinalBlockId(comp: Name.Component): void;
 }
diff --git a/types/ndn-js/test/data.ts b/types/ndn-js/test/data.ts
index feea541a19..367a7a0ec7 100644
--- a/types/ndn-js/test/data.ts
+++ b/types/ndn-js/test/data.ts
@@ -3,30 +3,33 @@ import ndn = require("ndn-js");
 
 let meta = new ndn.MetaInfo();
 meta = new ndn.MetaInfo(meta);
-const comp: ndn.Name.Component = meta.getFinalBlockId();
-let n: number = meta.getFreshnessPeriod();
-n = meta.getOtherTypeCode();
 const ct: ndn.ContentType = meta.getType();
+let n: number = meta.getOtherTypeCode();
+n = meta.getFreshnessPeriod();
+const comp: ndn.Name.Component = meta.getFinalBlockId();
 
-meta.setFinalBlockId(comp);
-meta.setFreshnessPeriod(5000);
-meta.setOtherTypeCode(1000);
 meta.setType(ndn.ContentType.OTHER_CODE);
+meta.setOtherTypeCode(1000);
+meta.setFreshnessPeriod(5000);
+meta.setFinalBlockId(comp);
 
 let data = new ndn.Data();
 data = new ndn.Data(new ndn.Name("/A"));
+data = new ndn.Data("/A");
+data = new ndn.Data(data);
 
-n = data.getCongestionMark();
-let blob: ndn.Blob = data.getContent();
 let name: ndn.Name = data.getName();
-n = data.getIncomingFaceId();
+name = data.getFullName();
 meta = data.getMetaInfo();
-name = data.getName();
+let blob: ndn.Blob = data.getContent();
 const sig: ndn.Signature = data.getSignature();
+n = data.getCongestionMark();
+n = data.getIncomingFaceId();
 
-data = data.setContent(blob)
+data = data.setName(name)
            .setMetaInfo(meta)
-           .setName(name)
+           .setContent(blob)
+           .setContent(Buffer.alloc(4))
            .setSignature(sig);
 
 data.wireDecode(blob);

From 9ee5e77d3b9e30d151e5d4516eabdf81a08dda8a Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 11:57:02 -0400
Subject: [PATCH 903/924] ndn-js: mark 'rarely used'

---
 types/ndn-js/face.d.ts      | 2 +-
 types/ndn-js/key-chain.d.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ndn-js/face.d.ts b/types/ndn-js/face.d.ts
index 524623a1a4..18edf5ba34 100644
--- a/types/ndn-js/face.d.ts
+++ b/types/ndn-js/face.d.ts
@@ -48,7 +48,7 @@ export class Face {
     unsetInterestFilter(id: number): void;
 }
 
-export type ForwardingFlags = any;
+export type ForwardingFlags = any; // no declaration because this type is rarely used
 
 export class InterestFilter {
     constructor(filter: InterestFilter);
diff --git a/types/ndn-js/key-chain.d.ts b/types/ndn-js/key-chain.d.ts
index 6c1103eed5..1df70849c8 100644
--- a/types/ndn-js/key-chain.d.ts
+++ b/types/ndn-js/key-chain.d.ts
@@ -33,6 +33,7 @@ export class KeyChain {
     signWithSha256(interest: Interest): void;
 }
 
+// no declaration because these types are rarely used
 export type CertificateV2 = any;
 export type KeyParams = any;
 export type Pib = any;

From 92230d07f1857ca56a139d16b964fc1150472731 Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 11:57:15 -0400
Subject: [PATCH 904/924] ndn-js: declare ValidityPeriod type

---
 types/ndn-js/signature.d.ts    | 21 ++++++++++++++++-----
 types/ndn-js/test/signature.ts | 21 +++++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/types/ndn-js/signature.d.ts b/types/ndn-js/signature.d.ts
index cd33bfbbc0..f170494214 100644
--- a/types/ndn-js/signature.d.ts
+++ b/types/ndn-js/signature.d.ts
@@ -9,18 +9,29 @@ export enum KeyLocatorType {
 export class KeyLocator {
     constructor(kl?: KeyLocator);
 
-    getKeyData(): Blob;
-    getKeyName(): Name;
     getType(): KeyLocatorType;
+    getKeyName(): Name;
+    getKeyData(): Blob;
 
-    setKeyData(keyData: Blob): void;
-    setKeyName(name: Name): void;
     setType(type: KeyLocatorType): void;
+    setKeyName(name: Name): void;
+    setKeyData(keyData: Blob): void;
 
     clear(): void;
 }
 
-export type ValidityPeriod = any;
+export class ValidityPeriod {
+    constructor(validity?: ValidityPeriod);
+    constructor(notBefore: number, notAfter: number);
+
+    hasPeriod(): boolean;
+    getNotBefore(): number;
+    getNotAfter(): number;
+    isValid(time?: number): boolean;
+
+    equals(other: ValidityPeriod): boolean;
+    clear(): void;
+}
 
 export interface Signature {
     clone(): Signature;
diff --git a/types/ndn-js/test/signature.ts b/types/ndn-js/test/signature.ts
index 026edf9556..0a8fdc26e9 100644
--- a/types/ndn-js/test/signature.ts
+++ b/types/ndn-js/test/signature.ts
@@ -3,17 +3,26 @@ import ndn = require("ndn-js");
 let kl: ndn.KeyLocator = new ndn.KeyLocator();
 kl = new ndn.KeyLocator(kl);
 
-let blob: ndn.Blob = kl.getKeyData();
-const name: ndn.Name = kl.getKeyName();
 const klt: ndn.KeyLocatorType = kl.getType();
+const name: ndn.Name = kl.getKeyName();
+let blob: ndn.Blob = kl.getKeyData();
 
-kl.setKeyData(blob);
-kl.setKeyName(name);
 kl.setType(ndn.KeyLocatorType.KEY_LOCATOR_DIGEST);
+kl.setKeyName(name);
+kl.setKeyData(blob);
 
 kl.clear();
 
-let validity: ndn.ValidityPeriod;
+let validity: ndn.ValidityPeriod = new ndn.ValidityPeriod();
+validity = new ndn.ValidityPeriod(validity);
+validity = new ndn.ValidityPeriod(540109800000, 664156800000);
+let b: boolean = validity.hasPeriod();
+let n: number = validity.getNotBefore();
+n = validity.getNotAfter();
+b = validity.isValid();
+b = validity.isValid(594172800000);
+validity.equals(new ndn.ValidityPeriod());
+validity.clear();
 
 let sig0 = new ndn.DigestSha256Signature();
 blob = sig0.getSignature();
@@ -24,7 +33,7 @@ let sig: ndn.Signature = sig0;
 let sigG = new ndn.GenericSignature();
 blob = sigG.getSignature();
 blob = sigG.getSignatureInfoEncoding();
-const n: number = sigG.getTypeCode();
+n = sigG.getTypeCode();
 sigG.setSignature(blob);
 sigG.setSignatureInfoEncoding(blob);
 sigG.setSignatureInfoEncoding(blob, 1000);

From ec6b8fd2ac938a5600f5a463c2baa8398656a84c Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 12:04:42 -0400
Subject: [PATCH 905/924] ndn-js: Signature should be a class

---
 types/ndn-js/signature.d.ts    | 12 ++++++------
 types/ndn-js/test/signature.ts | 17 +++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/types/ndn-js/signature.d.ts b/types/ndn-js/signature.d.ts
index f170494214..0f9eed260f 100644
--- a/types/ndn-js/signature.d.ts
+++ b/types/ndn-js/signature.d.ts
@@ -33,11 +33,11 @@ export class ValidityPeriod {
     clear(): void;
 }
 
-export interface Signature {
+export abstract class Signature {
     clone(): Signature;
 }
 
-export class SignatureBase<T extends Signature> implements Signature {
+export class SignatureBase<T extends Signature> extends Signature {
     constructor();
     getSignature(): Blob;
     setSignature(sigValue: Blob): void;
@@ -54,16 +54,16 @@ export class SignatureBaseKlVp<T extends Signature> extends SignatureBaseKl<T> {
     setValidityPeriod(validity?: ValidityPeriod): void;
 }
 
-export class DigestSha256Signature extends SignatureBase<DigestSha256Signature> {
-}
-
 export class GenericSignature extends SignatureBase<GenericSignature> {
     constructor();
-    getSignatureInfoEncoding(): Blob;
     getTypeCode(): number;
+    getSignatureInfoEncoding(): Blob;
     setSignatureInfoEncoding(encoding: Blob, typeCode?: number): void;
 }
 
+export class DigestSha256Signature extends SignatureBase<DigestSha256Signature> {
+}
+
 export class Sha256WithRsaSignature extends SignatureBaseKlVp<Sha256WithRsaSignature> {
 }
 
diff --git a/types/ndn-js/test/signature.ts b/types/ndn-js/test/signature.ts
index 0a8fdc26e9..65b809f1a6 100644
--- a/types/ndn-js/test/signature.ts
+++ b/types/ndn-js/test/signature.ts
@@ -2,15 +2,12 @@ import ndn = require("ndn-js");
 
 let kl: ndn.KeyLocator = new ndn.KeyLocator();
 kl = new ndn.KeyLocator(kl);
-
 const klt: ndn.KeyLocatorType = kl.getType();
 const name: ndn.Name = kl.getKeyName();
 let blob: ndn.Blob = kl.getKeyData();
-
 kl.setType(ndn.KeyLocatorType.KEY_LOCATOR_DIGEST);
 kl.setKeyName(name);
 kl.setKeyData(blob);
-
 kl.clear();
 
 let validity: ndn.ValidityPeriod = new ndn.ValidityPeriod();
@@ -24,12 +21,6 @@ b = validity.isValid(594172800000);
 validity.equals(new ndn.ValidityPeriod());
 validity.clear();
 
-let sig0 = new ndn.DigestSha256Signature();
-blob = sig0.getSignature();
-sig0.setSignature(blob);
-sig0 = sig0.clone();
-let sig: ndn.Signature = sig0;
-
 let sigG = new ndn.GenericSignature();
 blob = sigG.getSignature();
 blob = sigG.getSignatureInfoEncoding();
@@ -38,7 +29,13 @@ sigG.setSignature(blob);
 sigG.setSignatureInfoEncoding(blob);
 sigG.setSignatureInfoEncoding(blob, 1000);
 sigG = sigG.clone();
-sig = sigG;
+let sig: ndn.Signature = sigG;
+
+let sig0 = new ndn.DigestSha256Signature();
+blob = sig0.getSignature();
+sig0.setSignature(blob);
+sig0 = sig0.clone();
+sig = sig0;
 
 let sig1 = new ndn.Sha256WithRsaSignature();
 kl = sig1.getKeyLocator();

From 64fc88601ecf4705a612689c43118e5aa5956d42 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Fri, 22 Mar 2019 09:26:34 -0700
Subject: [PATCH 906/924] Disable npm-naming with dt-header (#34112)

npm-naming is a new rule but the code it runs was already disabled
whenever dt-header was disabled. This change keeps the behaviour the
same.
---
 types/absolute/tslint.json                          | 1 +
 types/acc-wizard/tslint.json                        | 1 +
 types/ace/tslint.json                               | 1 +
 types/actioncable/tslint.json                       | 1 +
 types/add2home/tslint.json                          | 1 +
 types/agenda/tslint.json                            | 1 +
 types/alertify/tslint.json                          | 1 +
 types/algoliasearch/tslint.json                     | 1 +
 types/alt/tslint.json                               | 1 +
 types/amazon-product-api/tslint.json                | 1 +
 types/amplitude-js/tslint.json                      | 1 +
 types/amqp-rpc/tslint.json                          | 1 +
 types/angular-agility/tslint.json                   | 1 +
 types/angular-animate/tslint.json                   | 1 +
 types/angular-bootstrap-calendar/tslint.json        | 1 +
 types/angular-bootstrap-lightbox/tslint.json        | 1 +
 types/angular-breadcrumb/tslint.json                | 1 +
 types/angular-clipboard/tslint.json                 | 1 +
 types/angular-cookie/tslint.json                    | 1 +
 types/angular-cookies/tslint.json                   | 1 +
 types/angular-deferred-bootstrap/tslint.json        | 1 +
 types/angular-dialog-service/tslint.json            | 1 +
 types/angular-dynamic-locale/tslint.json            | 1 +
 types/angular-environment/tslint.json               | 1 +
 types/angular-es/tslint.json                        | 1 +
 types/angular-feature-flags/tslint.json             | 1 +
 types/angular-file-saver/tslint.json                | 1 +
 types/angular-formly/tslint.json                    | 1 +
 types/angular-fullscreen/tslint.json                | 1 +
 types/angular-gettext/tslint.json                   | 1 +
 types/angular-google-analytics/tslint.json          | 1 +
 types/angular-growl-v2/tslint.json                  | 1 +
 types/angular-http-auth/tslint.json                 | 1 +
 types/angular-httpi/tslint.json                     | 1 +
 types/angular-idle/tslint.json                      | 1 +
 types/angular-jwt/tslint.json                       | 1 +
 types/angular-load/tslint.json                      | 1 +
 types/angular-loading-bar/tslint.json               | 1 +
 types/angular-local-storage/tslint.json             | 1 +
 types/angular-localforage/tslint.json               | 1 +
 types/angular-locker/tslint.json                    | 1 +
 types/angular-media-queries/tslint.json             | 1 +
 types/angular-meteor/tslint.json                    | 1 +
 types/angular-modal/tslint.json                     | 1 +
 types/angular-notifications/tslint.json             | 1 +
 types/angular-notify/tslint.json                    | 1 +
 types/angular-odata-resources/tslint.json           | 1 +
 types/angular-permission/tslint.json                | 1 +
 types/angular-promise-tracker/tslint.json           | 1 +
 types/angular-q-spread/tslint.json                  | 1 +
 types/angular-route/tslint.json                     | 1 +
 types/angular-sanitize/tslint.json                  | 1 +
 types/angular-scenario/tslint.json                  | 1 +
 types/angular-scroll/tslint.json                    | 1 +
 types/angular-signalr-hub/tslint.json               | 1 +
 types/angular-spinner/tslint.json                   | 1 +
 types/angular-storage/tslint.json                   | 1 +
 types/angular-toastr/tslint.json                    | 1 +
 types/angular-toasty/tslint.json                    | 1 +
 types/angular-translate/tslint.json                 | 1 +
 types/angular-ui-bootstrap/tslint.json              | 1 +
 types/angular-ui-notification/tslint.json           | 1 +
 types/angular-ui-router/tslint.json                 | 1 +
 types/angular-ui-scroll/tslint.json                 | 1 +
 types/angular-ui-sortable/tslint.json               | 1 +
 types/angular-ui-tree/tslint.json                   | 1 +
 types/angular-wizard/tslint.json                    | 1 +
 types/angular-xeditable/tslint.json                 | 1 +
 types/angular.throttle/tslint.json                  | 1 +
 types/angularfire/tslint.json                       | 1 +
 types/angularlocalstorage/tslint.json               | 1 +
 types/angulartics/tslint.json                       | 1 +
 types/animation-frame/tslint.json                   | 1 +
 types/ansi-styles/tslint.json                       | 1 +
 types/ansicolors/tslint.json                        | 1 +
 types/any-db-transaction/tslint.json                | 1 +
 types/any-db/tslint.json                            | 1 +
 types/aphrodite/tslint.json                         | 1 +
 types/api-error-handler/tslint.json                 | 1 +
 types/apigee-access/tslint.json                     | 1 +
 types/app-root-path/tslint.json                     | 1 +
 types/appframework/tslint.json                      | 1 +
 types/appletvjs/tslint.json                         | 1 +
 types/arbiter/tslint.json                           | 1 +
 types/arcgis-js-api/tslint.json                     | 1 +
 types/archy/tslint.json                             | 1 +
 types/argv/tslint.json                              | 1 +
 types/array-foreach/tslint.json                     | 1 +
 types/asana/tslint.json                             | 1 +
 types/asciify/tslint.json                           | 1 +
 types/asn1js/tslint.json                            | 1 +
 types/aspnet-identity-pw/tslint.json                | 1 +
 types/assertsharp/tslint.json                       | 1 +
 types/async-polling/tslint.json                     | 1 +
 types/async-writer/tslint.json                      | 1 +
 types/atmosphere.js/tslint.json                     | 1 +
 types/atpl/tslint.json                              | 1 +
 types/auth0-angular/tslint.json                     | 1 +
 types/auth0.widget/tslint.json                      | 1 +
 types/auth0/tslint.json                             | 1 +
 types/autolinker/tslint.json                        | 1 +
 types/autoprefixer-core/tslint.json                 | 1 +
 types/avoscloud-sdk/tslint.json                     | 1 +
 types/aws-iot-device-sdk/tslint.json                | 1 +
 types/aws4/tslint.json                              | 1 +
 types/axel/tslint.json                              | 1 +
 types/azure-mobile-services-client/tslint.json      | 1 +
 types/azure-sb/tslint.json                          | 1 +
 types/azure/tslint.json                             | 1 +
 types/babelify/tslint.json                          | 1 +
 types/babyparse/tslint.json                         | 1 +
 types/backbone-associations/tslint.json             | 1 +
 types/backbone-fetch-cache/tslint.json              | 1 +
 types/backbone-relational/tslint.json               | 1 +
 types/backbone.layoutmanager/tslint.json            | 1 +
 types/backbone.localstorage/tslint.json             | 1 +
 types/backbone.paginator/tslint.json                | 1 +
 types/backbone.radio/tslint.json                    | 1 +
 types/backbone/tslint.json                          | 1 +
 types/backgrid/tslint.json                          | 1 +
 types/backlog-js/tslint.json                        | 1 +
 types/baconjs/tslint.json                           | 1 +
 types/baidumap-web-sdk/tslint.json                  | 1 +
 types/barcode/tslint.json                           | 1 +
 types/bardjs/tslint.json                            | 1 +
 types/base16/tslint.json                            | 1 +
 types/bases/tslint.json                             | 1 +
 types/batch-stream/tslint.json                      | 1 +
 types/bazinga-translator/tslint.json                | 1 +
 types/bcrypt-nodejs/tslint.json                     | 1 +
 types/bcrypt/tslint.json                            | 1 +
 types/bcryptjs/tslint.json                          | 1 +
 types/benchmark/tslint.json                         | 1 +
 types/better-curry/tslint.json                      | 1 +
 types/bezier-js/tslint.json                         | 1 +
 types/bgiframe/tslint.json                          | 1 +
 types/bigint/tslint.json                            | 1 +
 types/bignum/tslint.json                            | 1 +
 types/bigscreen/tslint.json                         | 1 +
 types/bind-ponyfill/tslint.json                     | 1 +
 types/bintrees/tslint.json                          | 1 +
 types/bip21/tslint.json                             | 1 +
 types/bit-array/tslint.json                         | 1 +
 types/bl/tslint.json                                | 1 +
 types/blazy/tslint.json                             | 1 +
 types/bleno/tslint.json                             | 1 +
 types/blessed/tslint.json                           | 1 +
 types/blissfuljs/tslint.json                        | 1 +
 types/blob-stream/tslint.json                       | 1 +
 types/blocks/tslint.json                            | 1 +
 types/blue-tape/tslint.json                         | 1 +
 types/blueimp-md5/tslint.json                       | 1 +
 types/bookshelf/tslint.json                         | 1 +
 types/boolify-string/tslint.json                    | 1 +
 types/bootbox/tslint.json                           | 1 +
 types/bootpag/tslint.json                           | 1 +
 types/bootstrap-datepicker/tslint.json              | 1 +
 types/bootstrap-fileinput/tslint.json               | 1 +
 types/bootstrap-maxlength/tslint.json               | 1 +
 types/bootstrap-notify/tslint.json                  | 1 +
 types/bootstrap-select/tslint.json                  | 1 +
 types/bootstrap-switch/tslint.json                  | 1 +
 types/bootstrap-table/tslint.json                   | 1 +
 types/bootstrap-touchspin/tslint.json               | 1 +
 types/bootstrap.paginator/tslint.json               | 1 +
 types/bootstrap.timepicker/tslint.json              | 1 +
 types/bounce.js/tslint.json                         | 1 +
 types/box2d/tslint.json                             | 1 +
 types/braintree-web/tslint.json                     | 1 +
 types/breeze/tslint.json                            | 1 +
 types/brorand/tslint.json                           | 1 +
 types/browser-harness/tslint.json                   | 1 +
 types/browser-pack/tslint.json                      | 1 +
 types/browser-report/tslint.json                    | 1 +
 types/browser-resolve/tslint.json                   | 1 +
 types/browser-sync/tslint.json                      | 1 +
 types/browserify/tslint.json                        | 1 +
 types/bson/tslint.json                              | 1 +
 types/bucks/tslint.json                             | 1 +
 types/buffer-compare/tslint.json                    | 1 +
 types/buffer-equal/tslint.json                      | 1 +
 types/buffers/tslint.json                           | 1 +
 types/bunyan-config/tslint.json                     | 1 +
 types/bunyan-logentries/tslint.json                 | 1 +
 types/bunyan-prettystream/tslint.json               | 1 +
 types/busboy/tslint.json                            | 1 +
 types/business-rules-engine/tslint.json             | 1 +
 types/bwip-js/tslint.json                           | 1 +
 types/byline/tslint.json                            | 1 +
 types/bytebuffer/tslint.json                        | 1 +
 types/cache-manager/tslint.json                     | 1 +
 types/cal-heatmap/tslint.json                       | 1 +
 types/callsite/tslint.json                          | 1 +
 types/calq/tslint.json                              | 1 +
 types/camljs/tslint.json                            | 1 +
 types/camo/tslint.json                              | 1 +
 types/cannon/tslint.json                            | 1 +
 types/canvas-gauges/tslint.json                     | 1 +
 types/cash/tslint.json                              | 1 +
 types/cbor/tslint.json                              | 1 +
 types/chai-as-promised/tslint.json                  | 1 +
 types/chai-datetime/tslint.json                     | 1 +
 types/chai-dom/tslint.json                          | 1 +
 types/chai-enzyme/tslint.json                       | 1 +
 types/chai-fuzzy/tslint.json                        | 1 +
 types/chai-jquery/tslint.json                       | 1 +
 types/chai-spies/tslint.json                        | 1 +
 types/chai-string/tslint.json                       | 1 +
 types/chai-things/tslint.json                       | 1 +
 types/chance/tslint.json                            | 1 +
 types/change-emitter/tslint.json                    | 1 +
 types/chartist/tslint.json                          | 1 +
 types/checksum/tslint.json                          | 1 +
 types/cheerio/tslint.json                           | 1 +
 types/chocolatechipjs/tslint.json                   | 1 +
 types/chrome-apps/tslint.json                       | 1 +
 types/chrome/tslint.json                            | 1 +
 types/chui/tslint.json                              | 1 +
 types/cldrjs/tslint.json                            | 1 +
 types/cli-color/tslint.json                         | 1 +
 types/cli/tslint.json                               | 1 +
 types/cliff/tslint.json                             | 1 +
 types/clipboard-js/tslint.json                      | 1 +
 types/clone/tslint.json                             | 1 +
 types/closure-compiler/tslint.json                  | 1 +
 types/cloud-env/tslint.json                         | 1 +
 types/co-body/tslint.json                           | 1 +
 types/codemirror/tslint.json                        | 1 +
 types/coffeeify/tslint.json                         | 1 +
 types/collections/tslint.json                       | 1 +
 types/colorbrewer/tslint.json                       | 1 +
 types/com.darktalker.cordova.screenshot/tslint.json | 1 +
 types/combokeys/tslint.json                         | 1 +
 types/command-line-commands/tslint.json             | 1 +
 types/commangular/tslint.json                       | 1 +
 types/compare-version/tslint.json                   | 1 +
 types/component-emitter/tslint.json                 | 1 +
 types/compose-function/tslint.json                  | 1 +
 types/compression/tslint.json                       | 1 +
 types/concaveman/tslint.json                        | 1 +
 types/confidence/tslint.json                        | 1 +
 types/config/tslint.json                            | 1 +
 types/confit/tslint.json                            | 1 +
 types/connect-flash/tslint.json                     | 1 +
 types/connect-livereload/tslint.json                | 1 +
 types/connect-modrewrite/tslint.json                | 1 +
 types/connect-mongo/tslint.json                     | 1 +
 types/connect-mongodb-session/tslint.json           | 1 +
 types/connect-redis/tslint.json                     | 1 +
 types/connect-slashes/tslint.json                   | 1 +
 types/connect-timeout/tslint.json                   | 1 +
 types/connect/tslint.json                           | 1 +
 types/console-stamp/tslint.json                     | 1 +
 types/consolidate/tslint.json                       | 1 +
 types/consul/tslint.json                            | 1 +
 types/contentful-resolve-response/tslint.json       | 1 +
 types/contextjs/tslint.json                         | 1 +
 types/cookie-session/tslint.json                    | 1 +
 types/cookie_js/tslint.json                         | 1 +
 types/copy-paste/tslint.json                        | 1 +
 types/cordova-ionic/tslint.json                     | 1 +
 types/cordova-plugin-app-version/tslint.json        | 1 +
 types/cordova-plugin-background-mode/tslint.json    | 1 +
 types/cordova-plugin-ble-central/tslint.json        | 1 +
 types/cordova-plugin-device-name/tslint.json        | 1 +
 types/cordova-plugin-email-composer/tslint.json     | 1 +
 types/cordova-plugin-ibeacon/tslint.json            | 1 +
 types/cordova-plugin-insomnia/tslint.json           | 1 +
 types/cordova-plugin-keyboard/tslint.json           | 1 +
 types/cordova-plugin-mapsforge/tslint.json          | 1 +
 types/cordova-plugin-ms-adal/tslint.json            | 1 +
 types/cordova-plugin-ouralabs/tslint.json           | 1 +
 types/cordova-plugin-qrscanner/tslint.json          | 1 +
 types/cordova-plugin-spinner/tslint.json            | 1 +
 types/cordova-plugin-websql/tslint.json             | 1 +
 types/cordova-plugin-x-socialsharing/tslint.json    | 1 +
 types/cordova/tslint.json                           | 1 +
 types/cordova_app_version_plugin/tslint.json        | 1 +
 types/cordovarduino/tslint.json                     | 1 +
 types/cors/tslint.json                              | 1 +
 types/couchbase/tslint.json                         | 1 +
 types/countdown/tslint.json                         | 1 +
 types/cradle/tslint.json                            | 1 +
 types/create-error/tslint.json                      | 1 +
 types/createjs-lib/tslint.json                      | 1 +
 types/createjs/tslint.json                          | 1 +
 types/credential/tslint.json                        | 1 +
 types/credit-card-type/tslint.json                  | 1 +
 types/cron/tslint.json                              | 1 +
 types/cross-storage/tslint.json                     | 1 +
 types/crossfilter/tslint.json                       | 1 +
 types/crossroads/tslint.json                        | 1 +
 types/crypto-js/tslint.json                         | 1 +
 types/cryptojs/tslint.json                          | 1 +
 types/cson/tslint.json                              | 1 +
 types/css-modules-require-hook/tslint.json          | 1 +
 types/css/tslint.json                               | 1 +
 types/cssbeautify/tslint.json                       | 1 +
 types/csurf/tslint.json                             | 1 +
 types/cuid/tslint.json                              | 1 +
 types/custom-error-generator/tslint.json            | 1 +
 types/cybozulabs-md5/tslint.json                    | 1 +
 types/d3-box/tslint.json                            | 1 +
 types/d3-cloud/tslint.json                          | 1 +
 types/d3-tip/tslint.json                            | 1 +
 types/d3.slider/tslint.json                         | 1 +
 types/d3pie/tslint.json                             | 1 +
 types/dat.gui/tslint.json                           | 1 +
 types/data-driven/tslint.json                       | 1 +
 types/date-arithmetic/tslint.json                   | 1 +
 types/date.format.js/tslint.json                    | 1 +
 types/datejs/tslint.json                            | 1 +
 types/db-migrate-base/tslint.json                   | 1 +
 types/db-migrate-pg/tslint.json                     | 1 +
 types/db.js/tslint.json                             | 1 +
 types/dc/tslint.json                                | 1 +
 types/decorum/tslint.json                           | 1 +
 types/defaults/tslint.json                          | 1 +
 types/deku/tslint.json                              | 1 +
 types/denodeify/tslint.json                         | 1 +
 types/deoxxa-content-type/tslint.json               | 1 +
 types/deployjava/tslint.json                        | 1 +
 types/devexpress-web/tslint.json                    | 1 +
 types/devtools-detect/tslint.json                   | 1 +
 types/df-visible/tslint.json                        | 1 +
 types/dhtmlxgantt/tslint.json                       | 1 +
 types/dhtmlxscheduler/tslint.json                   | 1 +
 types/di-lite/tslint.json                           | 1 +
 types/diff2html/tslint.json                         | 1 +
 types/disposable-email-domains/tslint.json          | 1 +
 types/doccookies/tslint.json                        | 1 +
 types/dock-spawn/tslint.json                        | 1 +
 types/docopt/tslint.json                            | 1 +
 types/doctrine/tslint.json                          | 1 +
 types/documentdb-server/tslint.json                 | 1 +
 types/dojo/tslint.json                              | 1 +
 types/dom4/tslint.json                              | 1 +
 types/domo/tslint.json                              | 1 +
 types/dompurify/tslint.json                         | 1 +
 types/domurl/tslint.json                            | 1 +
 types/donna/tslint.json                             | 1 +
 types/dotdotdot/tslint.json                         | 1 +
 types/doublearray/tslint.json                       | 1 +
 types/draft-js/tslint.json                          | 1 +
 types/dragula/tslint.json                           | 1 +
 types/dropboxjs/tslint.json                         | 1 +
 types/dropzone/tslint.json                          | 1 +
 types/dsv/tslint.json                               | 1 +
 types/dts-bundle/tslint.json                        | 1 +
 types/durandal/tslint.json                          | 1 +
 types/dustjs-linkedin/tslint.json                   | 1 +
 types/dvtng-jss/tslint.json                         | 1 +
 types/dw-bxslider-4/tslint.json                     | 1 +
 types/dygraphs/tslint.json                          | 1 +
 types/dymo-label-framework/tslint.json              | 1 +
 types/dynatable/tslint.json                         | 1 +
 types/each/tslint.json                              | 1 +
 types/easeljs/tslint.json                           | 1 +
 types/easy-api-request/tslint.json                  | 1 +
 types/easy-jsend/tslint.json                        | 1 +
 types/easy-session/tslint.json                      | 1 +
 types/easy-table/tslint.json                        | 1 +
 types/easy-xapi-utils/tslint.json                   | 1 +
 types/easy-xapi/tslint.json                         | 1 +
 types/echarts/tslint.json                           | 1 +
 types/egg.js/tslint.json                            | 1 +
 types/ejs-locals/tslint.json                        | 1 +
 types/ejson/tslint.json                             | 1 +
 types/elastic.js/tslint.json                        | 1 +
 types/electron-debug/tslint.json                    | 1 +
 types/electron-devtools-installer/tslint.json       | 1 +
 types/electron-notifications/tslint.json            | 1 +
 types/electron-notify/tslint.json                   | 1 +
 types/electron-window-state/tslint.json             | 1 +
 types/element-resize-event/tslint.json              | 1 +
 types/elm/tslint.json                               | 1 +
 types/ember-testing-helpers/tslint.json             | 1 +
 types/emissary/tslint.json                          | 1 +
 types/empower/tslint.json                           | 1 +
 types/emscripten/tslint.json                        | 1 +
 types/encoding-japanese/tslint.json                 | 1 +
 types/enhanced-resolve/tslint.json                  | 1 +
 types/ent/tslint.json                               | 1 +
 types/envify/tslint.json                            | 1 +
 types/enzyme/tslint.json                            | 1 +
 types/eonasdan-bootstrap-datetimepicker/tslint.json | 1 +
 types/epiceditor/tslint.json                        | 1 +
 types/epub/tslint.json                              | 1 +
 types/eq.js/tslint.json                             | 1 +
 types/errorhandler/tslint.json                      | 1 +
 types/es6-collections/tslint.json                   | 1 +
 types/es6-shim/tslint.json                          | 1 +
 types/escape-html/tslint.json                       | 1 +
 types/escape-latex/tslint.json                      | 1 +
 types/escape-string-regexp/tslint.json              | 1 +
 types/escodegen/tslint.json                         | 1 +
 types/esprima-walk/tslint.json                      | 1 +
 types/estraverse/tslint.json                        | 1 +
 types/estree/tslint.json                            | 1 +
 types/event-loop-lag/tslint.json                    | 1 +
 types/event-stream/tslint.json                      | 1 +
 types/event-to-promise/tslint.json                  | 1 +
 types/evernote/tslint.json                          | 1 +
 types/exit/tslint.json                              | 1 +
 types/exorcist/tslint.json                          | 1 +
 types/expect.js/tslint.json                         | 1 +
 types/expectations/tslint.json                      | 1 +
 types/express-brute-memcached/tslint.json           | 1 +
 types/express-brute-mongo/tslint.json               | 1 +
 types/express-brute/tslint.json                     | 1 +
 types/express-debug/tslint.json                     | 1 +
 types/express-domain-middleware/tslint.json         | 1 +
 types/express-handlebars/tslint.json                | 1 +
 types/express-jwt/tslint.json                       | 1 +
 types/express-less/tslint.json                      | 1 +
 types/express-minify/tslint.json                    | 1 +
 types/express-mung/tslint.json                      | 1 +
 types/express-myconnection/tslint.json              | 1 +
 types/express-openapi/tslint.json                   | 1 +
 types/express-partials/tslint.json                  | 1 +
 types/express-route-fs/tslint.json                  | 1 +
 types/express-unless/tslint.json                    | 1 +
 types/express-useragent/tslint.json                 | 1 +
 types/extjs/tslint.json                             | 1 +
 types/eyes/tslint.json                              | 1 +
 types/facebook-js-sdk/tslint.json                   | 1 +
 types/facebook-pixel/tslint.json                    | 1 +
 types/faker/tslint.json                             | 1 +
 types/falcor-express/tslint.json                    | 1 +
 types/falcor-http-datasource/tslint.json            | 1 +
 types/falcor-json-graph/tslint.json                 | 1 +
 types/falcor-router/tslint.json                     | 1 +
 types/famous/tslint.json                            | 1 +
 types/farbtastic/tslint.json                        | 1 +
 types/fast-levenshtein/tslint.json                  | 1 +
 types/fast-stats/tslint.json                        | 1 +
 types/fastclick/tslint.json                         | 1 +
 types/favico.js/tslint.json                         | 1 +
 types/fb/tslint.json                                | 1 +
 types/fbemitter/tslint.json                         | 1 +
 types/featherlight/tslint.json                      | 1 +
 types/fhir/tslint.json                              | 1 +
 types/fibers/tslint.json                            | 1 +
 types/field/tslint.json                             | 1 +
 types/filesystem/tslint.json                        | 1 +
 types/filewriter/tslint.json                        | 1 +
 types/fill-pdf/tslint.json                          | 1 +
 types/finalhandler/tslint.json                      | 1 +
 types/finch/tslint.json                             | 1 +
 types/fingerprintjs/tslint.json                     | 1 +
 types/firebase-client/tslint.json                   | 1 +
 types/firebase-token-generator/tslint.json          | 1 +
 types/firefox/tslint.json                           | 1 +
 types/fixed-data-table/tslint.json                  | 1 +
 types/flake-idgen/tslint.json                       | 1 +
 types/flat/tslint.json                              | 1 +
 types/flexslider/tslint.json                        | 1 +
 types/flight/tslint.json                            | 1 +
 types/flightplan/tslint.json                        | 1 +
 types/flipsnap/tslint.json                          | 1 +
 types/flot/tslint.json                              | 1 +
 types/flowjs/tslint.json                            | 1 +
 types/fluxxor/tslint.json                           | 1 +
 types/fontfaceobserver/tslint.json                  | 1 +
 types/fontoxml/tslint.json                          | 1 +
 types/forge-di/tslint.json                          | 1 +
 types/form-serializer/tslint.json                   | 1 +
 types/formidable/tslint.json                        | 1 +
 types/fossil-delta/tslint.json                      | 1 +
 types/foundation/tslint.json                        | 1 +
 types/fpsmeter/tslint.json                          | 1 +
 types/freedom/tslint.json                           | 1 +
 types/from/tslint.json                              | 1 +
 types/fromjs/tslint.json                            | 1 +
 types/fromnow/tslint.json                           | 1 +
 types/fs-ext/tslint.json                            | 1 +
 types/fs-finder/tslint.json                         | 1 +
 types/fs-mock/tslint.json                           | 1 +
 types/ftdomdelegate/tslint.json                     | 1 +
 types/ftp/tslint.json                               | 1 +
 types/ftpd/tslint.json                              | 1 +
 types/fullname/tslint.json                          | 1 +
 types/fullpage.js/tslint.json                       | 1 +
 types/fuzzaldrin-plus/tslint.json                   | 1 +
 types/fxn/tslint.json                               | 1 +
 types/gae.channel.api/tslint.json                   | 1 +
 types/gamequery/tslint.json                         | 1 +
 types/gandi-livedns/tslint.json                     | 1 +
 types/gapi.analytics/tslint.json                    | 1 +
 types/gapi.calendar/tslint.json                     | 1 +
 types/gapi.drive/tslint.json                        | 1 +
 types/gapi.pagespeedonline/tslint.json              | 1 +
 types/gapi.people/tslint.json                       | 1 +
 types/gapi.plus/tslint.json                         | 1 +
 types/gapi.translate/tslint.json                    | 1 +
 types/gapi.urlshortener/tslint.json                 | 1 +
 types/gapi.youtube/tslint.json                      | 1 +
 types/gapi.youtubeanalytics/tslint.json             | 1 +
 types/gapi/tslint.json                              | 1 +
 types/generic-functions/tslint.json                 | 1 +
 types/gently/tslint.json                            | 1 +
 types/geoip-lite/tslint.json                        | 1 +
 types/geojson2osm/tslint.json                       | 1 +
 types/geometry-dom/tslint.json                      | 1 +
 types/gijgo/tslint.json                             | 1 +
 types/giraffe/tslint.json                           | 1 +
 types/git-config/tslint.json                        | 1 +
 types/git/tslint.json                               | 1 +
 types/gl-matrix/tslint.json                         | 1 +
 types/gldatepicker/tslint.json                      | 1 +
 types/glidejs/tslint.json                           | 1 +
 types/glob-expand/tslint.json                       | 1 +
 types/glob-stream/tslint.json                       | 1 +
 types/globalize-compiler/tslint.json                | 1 +
 types/globalize/tslint.json                         | 1 +
 types/go/tslint.json                                | 1 +
 types/google-apps-script/tslint.json                | 1 +
 types/google-closure-compiler/tslint.json           | 1 +
 types/google-drive-realtime-api/tslint.json         | 1 +
 types/google-earth/tslint.json                      | 1 +
 types/google-libphonenumber/tslint.json             | 1 +
 types/google-maps/tslint.json                       | 1 +
 types/google.analytics/tslint.json                  | 1 +
 types/google.feeds/tslint.json                      | 1 +
 types/google.geolocation/tslint.json                | 1 +
 types/google.picker/tslint.json                     | 1 +
 types/google.visualization/tslint.json              | 1 +
 types/googlemaps.infobubble/tslint.json             | 1 +
 types/googlemaps/tslint.json                        | 1 +
 types/graham_scan/tslint.json                       | 1 +
 types/graphlib/tslint.json                          | 1 +
 types/graphviz/tslint.json                          | 1 +
 types/gravatar/tslint.json                          | 1 +
 types/gregorian-calendar/tslint.json                | 1 +
 types/gridfs-stream/tslint.json                     | 1 +
 types/gridstack/tslint.json                         | 1 +
 types/grunt/tslint.json                             | 1 +
 types/gsap/tslint.json                              | 1 +
 types/gulp-angular-templatecache/tslint.json        | 1 +
 types/gulp-autoprefixer/tslint.json                 | 1 +
 types/gulp-babel/tslint.json                        | 1 +
 types/gulp-cache/tslint.json                        | 1 +
 types/gulp-cached/tslint.json                       | 1 +
 types/gulp-changed/tslint.json                      | 1 +
 types/gulp-cheerio/tslint.json                      | 1 +
 types/gulp-coffeeify/tslint.json                    | 1 +
 types/gulp-coffeelint/tslint.json                   | 1 +
 types/gulp-concat/tslint.json                       | 1 +
 types/gulp-copy/tslint.json                         | 1 +
 types/gulp-csso/tslint.json                         | 1 +
 types/gulp-debug/tslint.json                        | 1 +
 types/gulp-dtsm/tslint.json                         | 1 +
 types/gulp-espower/tslint.json                      | 1 +
 types/gulp-file-include/tslint.json                 | 1 +
 types/gulp-filter/tslint.json                       | 1 +
 types/gulp-flatten/tslint.json                      | 1 +
 types/gulp-gh-pages/tslint.json                     | 1 +
 types/gulp-gzip/tslint.json                         | 1 +
 types/gulp-help-doc/tslint.json                     | 1 +
 types/gulp-help/tslint.json                         | 1 +
 types/gulp-html-replace/tslint.json                 | 1 +
 types/gulp-htmlmin/tslint.json                      | 1 +
 types/gulp-if/tslint.json                           | 1 +
 types/gulp-inject/tslint.json                       | 1 +
 types/gulp-insert/tslint.json                       | 1 +
 types/gulp-install/tslint.json                      | 1 +
 types/gulp-istanbul/tslint.json                     | 1 +
 types/gulp-jade/tslint.json                         | 1 +
 types/gulp-jasmine-browser/tslint.json              | 1 +
 types/gulp-json-editor/tslint.json                  | 1 +
 types/gulp-jspm/tslint.json                         | 1 +
 types/gulp-less/tslint.json                         | 1 +
 types/gulp-load-plugins/tslint.json                 | 1 +
 types/gulp-minify-css/tslint.json                   | 1 +
 types/gulp-minify-html/tslint.json                  | 1 +
 types/gulp-mocha/tslint.json                        | 1 +
 types/gulp-newer/tslint.json                        | 1 +
 types/gulp-ng-annotate/tslint.json                  | 1 +
 types/gulp-nodemon/tslint.json                      | 1 +
 types/gulp-plumber/tslint.json                      | 1 +
 types/gulp-protractor/tslint.json                   | 1 +
 types/gulp-remember/tslint.json                     | 1 +
 types/gulp-rename/tslint.json                       | 1 +
 types/gulp-replace/tslint.json                      | 1 +
 types/gulp-rev-replace/tslint.json                  | 1 +
 types/gulp-rev/tslint.json                          | 1 +
 types/gulp-ruby-sass/tslint.json                    | 1 +
 types/gulp-sass/tslint.json                         | 1 +
 types/gulp-shell/tslint.json                        | 1 +
 types/gulp-sort/tslint.json                         | 1 +
 types/gulp-sourcemaps/tslint.json                   | 1 +
 types/gulp-strip-debug/tslint.json                  | 1 +
 types/gulp-svg-sprite/tslint.json                   | 1 +
 types/gulp-task-listing/tslint.json                 | 1 +
 types/gulp-tsd/tslint.json                          | 1 +
 types/gulp-useref/tslint.json                       | 1 +
 types/gulp-watch/tslint.json                        | 1 +
 types/gulp/tslint.json                              | 1 +
 types/h2o2/tslint.json                              | 1 +
 types/halfred/tslint.json                           | 1 +
 types/hammerjs/tslint.json                          | 1 +
 types/hapi-auth-basic/tslint.json                   | 1 +
 types/hapi-decorators/tslint.json                   | 1 +
 types/harmony-proxy/tslint.json                     | 1 +
 types/hasher/tslint.json                            | 1 +
 types/hashids/tslint.json                           | 1 +
 types/hashmap/tslint.json                           | 1 +
 types/hashset/tslint.json                           | 1 +
 types/hashtable/tslint.json                         | 1 +
 types/he/tslint.json                                | 1 +
 types/headroom/tslint.json                          | 1 +
 types/heap/tslint.json                              | 1 +
 types/hellosign-embedded/tslint.json                | 1 +
 types/helmet/tslint.json                            | 1 +
 types/highcharts-ng/tslint.json                     | 1 +
 types/highland/tslint.json                          | 1 +
 types/highlight.js/tslint.json                      | 1 +
 types/history.js/tslint.json                        | 1 +
 types/history/tslint.json                           | 1 +
 types/hooker/tslint.json                            | 1 +
 types/hopscotch/tslint.json                         | 1 +
 types/howler/tslint.json                            | 1 +
 types/html-entities/tslint.json                     | 1 +
 types/html-pdf/tslint.json                          | 1 +
 types/html-to-text/tslint.json                      | 1 +
 types/html2canvas/tslint.json                       | 1 +
 types/htmlescape/tslint.json                        | 1 +
 types/htmlhint/tslint.json                          | 1 +
 types/htmlparser2/tslint.json                       | 1 +
 types/htmltojsx/tslint.json                         | 1 +
 types/http-status/tslint.json                       | 1 +
 types/http-string-parser/tslint.json                | 1 +
 types/httperr/tslint.json                           | 1 +
 types/hubspot-pace/tslint.json                      | 1 +
 types/humane/tslint.json                            | 1 +
 types/humanparser/tslint.json                       | 1 +
 types/humps/tslint.json                             | 1 +
 types/hyperscript/tslint.json                       | 1 +
 types/hypertext-application-language/tslint.json    | 1 +
 types/i18next-express-middleware/tslint.json        | 1 +
 types/i18next-node-fs-backend/tslint.json           | 1 +
 types/i18next-sprintf-postprocessor/tslint.json     | 1 +
 types/i2c-bus/tslint.json                           | 1 +
 types/iban/tslint.json                              | 1 +
 types/ibm-mobilefirst/tslint.json                   | 1 +
 types/icepick/tslint.json                           | 1 +
 types/icheck/tslint.json                            | 1 +
 types/iconv/tslint.json                             | 1 +
 types/ignite-ui/tslint.json                         | 1 +
 types/imagemagick-native/tslint.json                | 1 +
 types/imagemagick/tslint.json                       | 1 +
 types/imagemapster/tslint.json                      | 1 +
 types/imagesloaded/tslint.json                      | 1 +
 types/imap-simple/tslint.json                       | 1 +
 types/imap/tslint.json                              | 1 +
 types/imgur-rest-api/tslint.json                    | 1 +
 types/impress/tslint.json                           | 1 +
 types/incremental-dom/tslint.json                   | 1 +
 types/inflected/tslint.json                         | 1 +
 types/inflection/tslint.json                        | 1 +
 types/inherits/tslint.json                          | 1 +
 types/ini/tslint.json                               | 1 +
 types/iniparser/tslint.json                         | 1 +
 types/inline-css/tslint.json                        | 1 +
 types/inquirer/tslint.json                          | 1 +
 types/insight/tslint.json                           | 1 +
 types/intercomjs/tslint.json                        | 1 +
 types/intro.js/tslint.json                          | 1 +
 types/invariant/tslint.json                         | 1 +
 types/inversify-devtools/tslint.json                | 1 +
 types/irc/tslint.json                               | 1 +
 types/is-my-json-valid/tslint.json                  | 1 +
 types/is-url/tslint.json                            | 1 +
 types/is/tslint.json                                | 1 +
 types/iscroll/tslint.json                           | 1 +
 types/iso8601-localizer/tslint.json                 | 1 +
 types/istanbul-middleware/tslint.json               | 1 +
 types/istanbul/tslint.json                          | 1 +
 types/ix.js/tslint.json                             | 1 +
 types/jade/tslint.json                              | 1 +
 types/jake/tslint.json                              | 1 +
 types/jasmine-es6-promise-matchers/tslint.json      | 1 +
 types/jasmine-jquery/tslint.json                    | 1 +
 types/jasmine-matchers/tslint.json                  | 1 +
 types/jasmine-node/tslint.json                      | 1 +
 types/jasmine-promise-matchers/tslint.json          | 1 +
 types/java-applet/tslint.json                       | 1 +
 types/java/tslint.json                              | 1 +
 types/javascript-astar/tslint.json                  | 1 +
 types/javascript-bignum/tslint.json                 | 1 +
 types/javascript-obfuscator/tslint.json             | 1 +
 types/jbinary/tslint.json                           | 1 +
 types/jcanvas/tslint.json                           | 1 +
 types/jdataview/tslint.json                         | 1 +
 types/jdenticon/tslint.json                         | 1 +
 types/jee-jsf/tslint.json                           | 1 +
 types/jest/tslint.json                              | 1 +
 types/jfp/tslint.json                               | 1 +
 types/jjv/tslint.json                               | 1 +
 types/jjve/tslint.json                              | 1 +
 types/johnny-five/tslint.json                       | 1 +
 types/jpm/tslint.json                               | 1 +
 types/jqgrid/tslint.json                            | 1 +
 types/jqrangeslider/tslint.json                     | 1 +
 types/jquery-ajax-chain/tslint.json                 | 1 +
 types/jquery-alertable/tslint.json                  | 1 +
 types/jquery-backstretch/tslint.json                | 1 +
 types/jquery-cropbox/tslint.json                    | 1 +
 types/jquery-deparam/tslint.json                    | 1 +
 types/jquery-easy-loading/tslint.json               | 1 +
 types/jquery-fullscreen/tslint.json                 | 1 +
 types/jquery-galleria/tslint.json                   | 1 +
 types/jquery-handsontable/tslint.json               | 1 +
 types/jquery-jsonrpcclient/tslint.json              | 1 +
 types/jquery-knob/tslint.json                       | 1 +
 types/jquery-mockjax/tslint.json                    | 1 +
 types/jquery-mousewheel/tslint.json                 | 1 +
 types/jquery-param/tslint.json                      | 1 +
 types/jquery-sortable/tslint.json                   | 1 +
 types/jquery-steps/tslint.json                      | 1 +
 types/jquery-timeentry/tslint.json                  | 1 +
 types/jquery-truncate-html/tslint.json              | 1 +
 types/jquery-urlparam/tslint.json                   | 1 +
 types/jquery-validation-unobtrusive/tslint.json     | 1 +
 types/jquery.address/tslint.json                    | 1 +
 types/jquery.are-you-sure/tslint.json               | 1 +
 types/jquery.autosize/tslint.json                   | 1 +
 types/jquery.base64/tslint.json                     | 1 +
 types/jquery.bbq/tslint.json                        | 1 +
 types/jquery.blockui/tslint.json                    | 1 +
 types/jquery.bootstrap.wizard/tslint.json           | 1 +
 types/jquery.cleditor/tslint.json                   | 1 +
 types/jquery.clientsidelogging/tslint.json          | 1 +
 types/jquery.color/tslint.json                      | 1 +
 types/jquery.colorbox/tslint.json                   | 1 +
 types/jquery.colorpicker/tslint.json                | 1 +
 types/jquery.contextmenu/tslint.json                | 1 +
 types/jquery.cookie/tslint.json                     | 1 +
 types/jquery.customselect/tslint.json               | 1 +
 types/jquery.cycle/tslint.json                      | 1 +
 types/jquery.cycle2/tslint.json                     | 1 +
 types/jquery.dropotron/tslint.json                  | 1 +
 types/jquery.dynatree/tslint.json                   | 1 +
 types/jquery.elang/tslint.json                      | 1 +
 types/jquery.fancytree/tslint.json                  | 1 +
 types/jquery.fileupload/tslint.json                 | 1 +
 types/jquery.filtertable/tslint.json                | 1 +
 types/jquery.finger/tslint.json                     | 1 +
 types/jquery.flagstrap/tslint.json                  | 1 +
 types/jquery.form/tslint.json                       | 1 +
 types/jquery.fullscreen/tslint.json                 | 1 +
 types/jquery.gridster/tslint.json                   | 1 +
 types/jquery.highlight-bartaz/tslint.json           | 1 +
 types/jquery.jnotify/tslint.json                    | 1 +
 types/jquery.joyride/tslint.json                    | 1 +
 types/jquery.jsignature/tslint.json                 | 1 +
 types/jquery.leanmodal/tslint.json                  | 1 +
 types/jquery.livestampjs/tslint.json                | 1 +
 types/jquery.menuaim/tslint.json                    | 1 +
 types/jquery.mmenu/tslint.json                      | 1 +
 types/jquery.notifybar/tslint.json                  | 1 +
 types/jquery.noty/tslint.json                       | 1 +
 types/jquery.payment/tslint.json                    | 1 +
 types/jquery.pjax/tslint.json                       | 1 +
 types/jquery.placeholder/tslint.json                | 1 +
 types/jquery.pnotify/tslint.json                    | 1 +
 types/jquery.postmessage/tslint.json                | 1 +
 types/jquery.prettyphoto/tslint.json                | 1 +
 types/jquery.qrcode/tslint.json                     | 1 +
 types/jquery.rateit/tslint.json                     | 1 +
 types/jquery.rowgrid/tslint.json                    | 1 +
 types/jquery.scrollto/tslint.json                   | 1 +
 types/jquery.simplemodal/tslint.json                | 1 +
 types/jquery.simplepagination/tslint.json           | 1 +
 types/jquery.simulate/tslint.json                   | 1 +
 types/jquery.slimscroll/tslint.json                 | 1 +
 types/jquery.sortelements/tslint.json               | 1 +
 types/jquery.superlink/tslint.json                  | 1 +
 types/jquery.tagsmanager/tslint.json                | 1 +
 types/jquery.tile/tslint.json                       | 1 +
 types/jquery.timeago/tslint.json                    | 1 +
 types/jquery.timepicker/tslint.json                 | 1 +
 types/jquery.timer/tslint.json                      | 1 +
 types/jquery.tinycarousel/tslint.json               | 1 +
 types/jquery.tinyscrollbar/tslint.json              | 1 +
 types/jquery.tipsy/tslint.json                      | 1 +
 types/jquery.total-storage/tslint.json              | 1 +
 types/jquery.transit/tslint.json                    | 1 +
 types/jquery.ui.datetimepicker/tslint.json          | 1 +
 types/jquery.ui.layout/tslint.json                  | 1 +
 types/jquery.uniform/tslint.json                    | 1 +
 types/jquery.watermark/tslint.json                  | 1 +
 types/jquery.window/tslint.json                     | 1 +
 types/jquerymobile/tslint.json                      | 1 +
 types/jqueryui/tslint.json                          | 1 +
 types/js-beautify/tslint.json                       | 1 +
 types/js-clipper/tslint.json                        | 1 +
 types/js-combinatorics/tslint.json                  | 1 +
 types/js-data-angular/tslint.json                   | 1 +
 types/js-fixtures/tslint.json                       | 1 +
 types/js-git/tslint.json                            | 1 +
 types/js-money/tslint.json                          | 1 +
 types/js-priority-queue/tslint.json                 | 1 +
 types/js-schema/tslint.json                         | 1 +
 types/js-search/tslint.json                         | 1 +
 types/js-url/tslint.json                            | 1 +
 types/jsbn/tslint.json                              | 1 +
 types/jscrollpane/tslint.json                       | 1 +
 types/jsdeferred/tslint.json                        | 1 +
 types/jsen/tslint.json                              | 1 +
 types/jsend/tslint.json                             | 1 +
 types/jsesc/tslint.json                             | 1 +
 types/jsfl/tslint.json                              | 1 +
 types/jsgraph/tslint.json                           | 1 +
 types/jshamcrest/tslint.json                        | 1 +
 types/jsmockito/tslint.json                         | 1 +
 types/json-editor/tslint.json                       | 1 +
 types/json-merge-patch/tslint.json                  | 1 +
 types/json-patch-gen/tslint.json                    | 1 +
 types/json-patch/tslint.json                        | 1 +
 types/json-pointer/tslint.json                      | 1 +
 types/json-socket/tslint.json                       | 1 +
 types/json5/tslint.json                             | 1 +
 types/jsoneditor/tslint.json                        | 1 +
 types/jsoneditoronline/tslint.json                  | 1 +
 types/jsonminify/tslint.json                        | 1 +
 types/jsonnet/tslint.json                           | 1 +
 types/jsonpath/tslint.json                          | 1 +
 types/jsonstream/tslint.json                        | 1 +
 types/jsrender/tslint.json                          | 1 +
 types/jstimezonedetect/tslint.json                  | 1 +
 types/jstorage/tslint.json                          | 1 +
 types/jstree/tslint.json                            | 1 +
 types/jsts/tslint.json                              | 1 +
 types/jsuite/tslint.json                            | 1 +
 types/jsuri/tslint.json                             | 1 +
 types/jsurl/tslint.json                             | 1 +
 types/jsx-chai/tslint.json                          | 1 +
 types/jug/tslint.json                               | 1 +
 types/jwt-client/tslint.json                        | 1 +
 types/jwt-simple/tslint.json                        | 1 +
 types/karma-chai-sinon/tslint.json                  | 1 +
 types/karma-coverage/tslint.json                    | 1 +
 types/karma-jasmine/tslint.json                     | 1 +
 types/katex/tslint.json                             | 1 +
 types/kefir/tslint.json                             | 1 +
 types/kendo-ui/tslint.json                          | 1 +
 types/keyboardjs/tslint.json                        | 1 +
 types/keymaster/tslint.json                         | 1 +
 types/keymirror/tslint.json                         | 1 +
 types/keytar/tslint.json                            | 1 +
 types/kii-cloud-sdk/tslint.json                     | 1 +
 types/kik-browser/tslint.json                       | 1 +
 types/kineticjs/tslint.json                         | 1 +
 types/klaw/tslint.json                              | 1 +
 types/knockback/tslint.json                         | 1 +
 types/knockout-amd-helpers/tslint.json              | 1 +
 types/knockout-postbox/tslint.json                  | 1 +
 types/knockout-secure-binding/tslint.json           | 1 +
 types/knockout-transformations/tslint.json          | 1 +
 types/knockout.deferred.updates/tslint.json         | 1 +
 types/knockout.editables/tslint.json                | 1 +
 types/knockout.es5/tslint.json                      | 1 +
 types/knockout.kogrid/tslint.json                   | 1 +
 types/knockout.mapper/tslint.json                   | 1 +
 types/knockout.mapping/tslint.json                  | 1 +
 types/knockout.projections/tslint.json              | 1 +
 types/knockout.punches/tslint.json                  | 1 +
 types/knockout.rx/tslint.json                       | 1 +
 types/knockout.validation/tslint.json               | 1 +
 types/knockout.viewmodel/tslint.json                | 1 +
 types/knockout/tslint.json                          | 1 +
 types/knockstrap/tslint.json                        | 1 +
 types/ko.plus/tslint.json                           | 1 +
 types/koa-bouncer/tslint.json                       | 1 +
 types/koa-compress/tslint.json                      | 1 +
 types/koa-favicon/tslint.json                       | 1 +
 types/koa-hbs/tslint.json                           | 1 +
 types/koa-json/tslint.json                          | 1 +
 types/koa-router/tslint.json                        | 1 +
 types/koa-session-minimal/tslint.json               | 1 +
 types/koa/tslint.json                               | 1 +
 types/kolite/tslint.json                            | 1 +
 types/konami.js/tslint.json                         | 1 +
 types/kue/tslint.json                               | 1 +
 types/lab/tslint.json                               | 1 +
 types/ladda/tslint.json                             | 1 +
 types/latinize/tslint.json                          | 1 +
 types/launchpad/tslint.json                         | 1 +
 types/lazy.js/tslint.json                           | 1 +
 types/lazypipe/tslint.json                          | 1 +
 types/ldapjs/tslint.json                            | 1 +
 types/leadfoot/tslint.json                          | 1 +
 types/leapmotionts/tslint.json                      | 1 +
 types/less-middleware/tslint.json                   | 1 +
 types/less/tslint.json                              | 1 +
 types/level-sublevel/tslint.json                    | 1 +
 types/levenshtein/tslint.json                       | 1 +
 types/lime-js/tslint.json                           | 1 +
 types/line-reader/tslint.json                       | 1 +
 types/lls/tslint.json                               | 1 +
 types/loader-runner/tslint.json                     | 1 +
 types/lobibox/tslint.json                           | 1 +
 types/lockr/tslint.json                             | 1 +
 types/locutus/tslint.json                           | 1 +
 types/logg/tslint.json                              | 1 +
 types/loggly/tslint.json                            | 1 +
 types/logrotate-stream/tslint.json                  | 1 +
 types/lokijs/tslint.json                            | 1 +
 types/lolex/tslint.json                             | 1 +
 types/long/tslint.json                              | 1 +
 types/lory.js/tslint.json                           | 1 +
 types/lowlight/tslint.json                          | 1 +
 types/lscache/tslint.json                           | 1 +
 types/luaparse/tslint.json                          | 1 +
 types/lwip/tslint.json                              | 1 +
 types/magic-number/tslint.json                      | 1 +
 types/magicsuggest/tslint.json                      | 1 +
 types/mailcheck/tslint.json                         | 1 +
 types/maildev/tslint.json                           | 1 +
 types/main-bower-files/tslint.json                  | 1 +
 types/mainloop.js/tslint.json                       | 1 +
 types/maker.js/tslint.json                          | 1 +
 types/mandrill-api/tslint.json                      | 1 +
 types/mapbox-gl/tslint.json                         | 1 +
 types/mapsjs/tslint.json                            | 1 +
 types/mariasql/tslint.json                          | 1 +
 types/markdown-it/tslint.json                       | 1 +
 types/marker-animate-unobtrusive/tslint.json        | 1 +
 types/markitup/tslint.json                          | 1 +
 types/maskedinput/tslint.json                       | 1 +
 types/match-media-mock/tslint.json                  | 1 +
 types/material-design-lite/tslint.json              | 1 +
 types/material-ui-pagination/tslint.json            | 1 +
 types/mathjax/tslint.json                           | 1 +
 types/matter-js/tslint.json                         | 1 +
 types/mcustomscrollbar/tslint.json                  | 1 +
 types/md5/tslint.json                               | 1 +
 types/mdns/tslint.json                              | 1 +
 types/medium-editor/tslint.json                     | 1 +
 types/memory-fs/tslint.json                         | 1 +
 types/memwatch-next/tslint.json                     | 1 +
 types/menubar/tslint.json                           | 1 +
 types/meshblu/tslint.json                           | 1 +
 types/mess/tslint.json                              | 1 +
 types/messenger/tslint.json                         | 1 +
 types/meteor-accounts-phone/tslint.json             | 1 +
 types/meteor-jboulhous-dev/tslint.json              | 1 +
 types/meteor-persistent-session/tslint.json         | 1 +
 types/meteor-prime8consulting-oauth2/tslint.json    | 1 +
 types/meteor-publish-composite/tslint.json          | 1 +
 types/meteor-roles/tslint.json                      | 1 +
 types/meteor/tslint.json                            | 1 +
 types/method-override/tslint.json                   | 1 +
 types/metric-suffix/tslint.json                     | 1 +
 types/microsoft-ajax/tslint.json                    | 1 +
 types/microsoft-live-connect/tslint.json            | 1 +
 types/microsoft-sdk-soap/tslint.json                | 1 +
 types/milkcocoa/tslint.json                         | 1 +
 types/milliseconds/tslint.json                      | 1 +
 types/mime-db/tslint.json                           | 1 +
 types/mimos/tslint.json                             | 1 +
 types/minilog/tslint.json                           | 1 +
 types/minimist/tslint.json                          | 1 +
 types/mitm/tslint.json                              | 1 +
 types/mixto/tslint.json                             | 1 +
 types/mkpath/tslint.json                            | 1 +
 types/mmmagic/tslint.json                           | 1 +
 types/mocha-phantomjs/tslint.json                   | 1 +
 types/mock-fs/tslint.json                           | 1 +
 types/mock-require/tslint.json                      | 1 +
 types/mockery/tslint.json                           | 1 +
 types/mockjs/tslint.json                            | 1 +
 types/moment-jalaali/tslint.json                    | 1 +
 types/mongoose-auto-increment/tslint.json           | 1 +
 types/mongoose-deep-populate/tslint.json            | 1 +
 types/mongoose-mock/tslint.json                     | 1 +
 types/mongoose-paginate/tslint.json                 | 1 +
 types/mongoose-promise/tslint.json                  | 1 +
 types/mongoose-seeder/tslint.json                   | 1 +
 types/mongoose-sequence/tslint.json                 | 1 +
 types/mongoose/tslint.json                          | 1 +
 types/morris.js/tslint.json                         | 1 +
 types/mousetrap/tslint.json                         | 1 +
 types/moviedb/tslint.json                           | 1 +
 types/mpromise/tslint.json                          | 1 +
 types/ms/tslint.json                                | 1 +
 types/msgpack/tslint.json                           | 1 +
 types/msgpack5/tslint.json                          | 1 +
 types/msnodesql/tslint.json                         | 1 +
 types/msportalfx-test/tslint.json                   | 1 +
 types/mssql/tslint.json                             | 1 +
 types/mu2/tslint.json                               | 1 +
 types/multiparty/tslint.json                        | 1 +
 types/multiplexjs/tslint.json                       | 1 +
 types/murmurhash-js/tslint.json                     | 1 +
 types/murmurhash3js/tslint.json                     | 1 +
 types/musicmetadata/tslint.json                     | 1 +
 types/mustache/tslint.json                          | 1 +
 types/mz/tslint.json                                | 1 +
 types/nanoajax/tslint.json                          | 1 +
 types/nanp/tslint.json                              | 1 +
 types/natural-sort/tslint.json                      | 1 +
 types/natural/tslint.json                           | 1 +
 types/ncp/tslint.json                               | 1 +
 types/neo4j/tslint.json                             | 1 +
 types/nes/tslint.json                               | 1 +
 types/netmask/tslint.json                           | 1 +
 types/nexpect/tslint.json                           | 1 +
 types/ng-command/tslint.json                        | 1 +
 types/ng-cordova/tslint.json                        | 1 +
 types/ng-dialog/tslint.json                         | 1 +
 types/ng-facebook/tslint.json                       | 1 +
 types/ng-file-upload/tslint.json                    | 1 +
 types/ng-flow/tslint.json                           | 1 +
 types/ng-grid/tslint.json                           | 1 +
 types/ng-i18next/tslint.json                        | 1 +
 types/ng-notify/tslint.json                         | 1 +
 types/ngbootbox/tslint.json                         | 1 +
 types/ngeohash/tslint.json                          | 1 +
 types/ngkookies/tslint.json                         | 1 +
 types/ngmap/tslint.json                             | 1 +
 types/ngprogress-lite/tslint.json                   | 1 +
 types/ngprogress/tslint.json                        | 1 +
 types/ngreact/tslint.json                           | 1 +
 types/nightmare/tslint.json                         | 1 +
 types/noble/tslint.json                             | 1 +
 types/nock/tslint.json                              | 1 +
 types/nodal/tslint.json                             | 1 +
 types/node-7z/tslint.json                           | 1 +
 types/node-array-ext/tslint.json                    | 1 +
 types/node-calendar/tslint.json                     | 1 +
 types/node-config-manager/tslint.json               | 1 +
 types/node-dir/tslint.json                          | 1 +
 types/node-dogstatsd/tslint.json                    | 1 +
 types/node-fibers/tslint.json                       | 1 +
 types/node-forge/tslint.json                        | 1 +
 types/node-gcm/tslint.json                          | 1 +
 types/node-getopt/tslint.json                       | 1 +
 types/node-hue-api/tslint.json                      | 1 +
 types/node-int64/tslint.json                        | 1 +
 types/node-jsfl-runner/tslint.json                  | 1 +
 types/node-json-db/tslint.json                      | 1 +
 types/node-mysql-wrapper/tslint.json                | 1 +
 types/node-notifier/tslint.json                     | 1 +
 types/node-persist/tslint.json                      | 1 +
 types/node-polyglot/tslint.json                     | 1 +
 types/node-powershell/tslint.json                   | 1 +
 types/node-sass-middleware/tslint.json              | 1 +
 types/node-slack/tslint.json                        | 1 +
 types/node-snap7/tslint.json                        | 1 +
 types/node-uuid/tslint.json                         | 1 +
 types/node-validator/tslint.json                    | 1 +
 types/node_redis/tslint.json                        | 1 +
 types/nodemailer-direct-transport/tslint.json       | 1 +
 types/nodemailer-pickup-transport/tslint.json       | 1 +
 types/nodemailer-smtp-pool/tslint.json              | 1 +
 types/nodemailer-smtp-transport/tslint.json         | 1 +
 types/nodemailer-stub-transport/tslint.json         | 1 +
 types/nodeunit/tslint.json                          | 1 +
 types/noisejs/tslint.json                           | 1 +
 types/nomnom/tslint.json                            | 1 +
 types/nopt/tslint.json                              | 1 +
 types/notie/tslint.json                             | 1 +
 types/notify/tslint.json                            | 1 +
 types/notifyjs-browser/tslint.json                  | 1 +
 types/notifyjs/tslint.json                          | 1 +
 types/nouislider/tslint.json                        | 1 +
 types/npm/tslint.json                               | 1 +
 types/nprogress/tslint.json                         | 1 +
 types/numeral/tslint.json                           | 1 +
 types/nunjucks-date/tslint.json                     | 1 +
 types/nvd3/tslint.json                              | 1 +
 types/nw.gui/tslint.json                            | 1 +
 types/nw.js/tslint.json                             | 1 +
 types/o.js/tslint.json                              | 1 +
 types/oauth.js/tslint.json                          | 1 +
 types/object-assign/tslint.json                     | 1 +
 types/object-diff/tslint.json                       | 1 +
 types/object-hash/tslint.json                       | 1 +
 types/object-refs/tslint.json                       | 1 +
 types/oblo-util/tslint.json                         | 1 +
 types/oboe/tslint.json                              | 1 +
 types/observe-js/tslint.json                        | 1 +
 types/oclazyload/tslint.json                        | 1 +
 types/odata/tslint.json                             | 1 +
 types/office-js-preview/tslint.json                 | 1 +
 types/office-js/tslint.json                         | 1 +
 types/offline-js/tslint.json                        | 1 +
 types/oidc-token-manager/tslint.json                | 1 +
 types/onoff/tslint.json                             | 1 +
 types/open/tslint.json                              | 1 +
 types/openjscad/tslint.json                         | 1 +
 types/openpgp/tslint.json                           | 1 +
 types/opentok/tslint.json                           | 1 +
 types/openui5/tslint.json                           | 1 +
 types/optimist/tslint.json                          | 1 +
 types/oracledb/tslint.json                          | 1 +
 types/orchestrator/tslint.json                      | 1 +
 types/osmtogeojson/tslint.json                      | 1 +
 types/owlcarousel/tslint.json                       | 1 +
 types/p2/tslint.json                                | 1 +
 types/packery/tslint.json                           | 1 +
 types/page-icon/tslint.json                         | 1 +
 types/page/tslint.json                              | 1 +
 types/pako/tslint.json                              | 1 +
 types/papaparse/tslint.json                         | 1 +
 types/paper/tslint.json                             | 1 +
 types/paralleljs/tslint.json                        | 1 +
 types/parcel-env/tslint.json                        | 1 +
 types/parse-glob/tslint.json                        | 1 +
 types/parse-mockdb/tslint.json                      | 1 +
 types/parse/tslint.json                             | 1 +
 types/passport-beam/tslint.json                     | 1 +
 types/passport-google-oauth/tslint.json             | 1 +
 types/passport-http-bearer/tslint.json              | 1 +
 types/passport-jwt/tslint.json                      | 1 +
 types/passport-local-mongoose/tslint.json           | 1 +
 types/passport-local/tslint.json                    | 1 +
 types/passport-oauth2-client-password/tslint.json   | 1 +
 types/passport-strategy/tslint.json                 | 1 +
 types/passport-twitter/tslint.json                  | 1 +
 types/password-hash/tslint.json                     | 1 +
 types/path-parse/tslint.json                        | 1 +
 types/pathfinding/tslint.json                       | 1 +
 types/pathjs/tslint.json                            | 1 +
 types/paypal-cordova-plugin/tslint.json             | 1 +
 types/pdfjs-dist/tslint.json                        | 1 +
 types/pdfkit/tslint.json                            | 1 +
 types/pdfobject/tslint.json                         | 1 +
 types/pebblekitjs/tslint.json                       | 1 +
 types/peerjs/tslint.json                            | 1 +
 types/pegjs/tslint.json                             | 1 +
 types/persona/tslint.json                           | 1 +
 types/pg-pool/tslint.json                           | 1 +
 types/pgwmodal/tslint.json                          | 1 +
 types/phantom/tslint.json                           | 1 +
 types/phantomcss/tslint.json                        | 1 +
 types/phantomjs/tslint.json                         | 1 +
 types/phone-formatter/tslint.json                   | 1 +
 types/phone/tslint.json                             | 1 +
 types/phonegap-facebook-plugin/tslint.json          | 1 +
 types/phonegap-nfc/tslint.json                      | 1 +
 types/phonegap-plugin-barcodescanner/tslint.json    | 1 +
 types/phonegap/tslint.json                          | 1 +
 types/photonui/tslint.json                          | 1 +
 types/photoswipe/tslint.json                        | 1 +
 types/physijs/tslint.json                           | 1 +
 types/pi-spi/tslint.json                            | 1 +
 types/pickadate/tslint.json                         | 1 +
 types/pify/tslint.json                              | 1 +
 types/pinkyswear/tslint.json                        | 1 +
 types/pinterest-sdk/tslint.json                     | 1 +
 types/piwik-tracker/tslint.json                     | 1 +
 types/pixi.js/tslint.json                           | 1 +
 types/pkijs/tslint.json                             | 1 +
 types/platform/tslint.json                          | 1 +
 types/playerframework/tslint.json                   | 1 +
 types/pleasejs/tslint.json                          | 1 +
 types/plupload/tslint.json                          | 1 +
 types/pluralize/tslint.json                         | 1 +
 types/pngjs2/tslint.json                            | 1 +
 types/podcast/tslint.json                           | 1 +
 types/podium/tslint.json                            | 1 +
 types/polyline/tslint.json                          | 1 +
 types/polymer-ts/tslint.json                        | 1 +
 types/polymer/tslint.json                           | 1 +
 types/popcorn/tslint.json                           | 1 +
 types/postal/tslint.json                            | 1 +
 types/power-assert-formatter/tslint.json            | 1 +
 types/power-assert/tslint.json                      | 1 +
 types/precise/tslint.json                           | 1 +
 types/precond/tslint.json                           | 1 +
 types/preloadjs/tslint.json                         | 1 +
 types/prelude-ls/tslint.json                        | 1 +
 types/prettyjson/tslint.json                        | 1 +
 types/priorityqueuejs/tslint.json                   | 1 +
 types/progress/tslint.json                          | 1 +
 types/progressjs/tslint.json                        | 1 +
 types/project-oxford/tslint.json                    | 1 +
 types/promise-pg/tslint.json                        | 1 +
 types/promise-pool/tslint.json                      | 1 +
 types/promisify-node/tslint.json                    | 1 +
 types/promisify-supertest/tslint.json               | 1 +
 types/prompt-sync-history/tslint.json               | 1 +
 types/prompt-sync/tslint.json                       | 1 +
 types/promptly/tslint.json                          | 1 +
 types/protractor-helpers/tslint.json                | 1 +
 types/protractor-http-mock/tslint.json              | 1 +
 types/proxyquire/tslint.json                        | 1 +
 types/pty.js/tslint.json                            | 1 +
 types/pubsub-js/tslint.json                         | 1 +
 types/pug/tslint.json                               | 1 +
 types/pure-render-decorator/tslint.json             | 1 +
 types/purl/tslint.json                              | 1 +
 types/pvutils/tslint.json                           | 1 +
 types/q-io/tslint.json                              | 1 +
 types/q-retry/tslint.json                           | 1 +
 types/qs/tslint.json                                | 1 +
 types/qtip2/tslint.json                             | 1 +
 types/quixote/tslint.json                           | 1 +
 types/qunit/tslint.json                             | 1 +
 types/quoted-printable/tslint.json                  | 1 +
 types/qwest/tslint.json                             | 1 +
 types/rabbit.js/tslint.json                         | 1 +
 types/ractive/tslint.json                           | 1 +
 types/radium/tslint.json                            | 1 +
 types/radius/tslint.json                            | 1 +
 types/random-string/tslint.json                     | 1 +
 types/randomcolor/tslint.json                       | 1 +
 types/randomstring/tslint.json                      | 1 +
 types/rangy/tslint.json                             | 1 +
 types/rangyinputs/tslint.json                       | 1 +
 types/raphael/tslint.json                           | 1 +
 types/ratelimiter/tslint.json                       | 1 +
 types/raty/tslint.json                              | 1 +
 types/rbush/tslint.json                             | 1 +
 types/rc-select/tslint.json                         | 1 +
 types/rcloader/tslint.json                          | 1 +
 types/react-addons-create-fragment/tslint.json      | 1 +
 types/react-addons-css-transition-group/tslint.json | 1 +
 types/react-addons-linked-state-mixin/tslint.json   | 1 +
 types/react-addons-perf/tslint.json                 | 1 +
 types/react-addons-pure-render-mixin/tslint.json    | 1 +
 types/react-addons-shallow-compare/tslint.json      | 1 +
 types/react-addons-test-utils/tslint.json           | 1 +
 types/react-addons-transition-group/tslint.json     | 1 +
 types/react-addons-update/tslint.json               | 1 +
 types/react-bootstrap-daterangepicker/tslint.json   | 1 +
 types/react-breadcrumbs/tslint.json                 | 1 +
 types/react-bytesize-icons/tslint.json              | 1 +
 types/react-calendar-timeline/tslint.json           | 1 +
 types/react-codemirror/tslint.json                  | 1 +
 types/react-css-modules/tslint.json                 | 1 +
 types/react-css-transition-replace/tslint.json      | 1 +
 types/react-custom-scrollbars/tslint.json           | 1 +
 types/react-data-grid/tslint.json                   | 1 +
 types/react-datagrid/tslint.json                    | 1 +
 types/react-dates/tslint.json                       | 1 +
 types/react-dom/tslint.json                         | 1 +
 types/react-dropzone/tslint.json                    | 1 +
 types/react-easy-chart/tslint.json                  | 1 +
 types/react-file-input/tslint.json                  | 1 +
 types/react-flex/tslint.json                        | 1 +
 types/react-flexr/tslint.json                       | 1 +
 types/react-helmet/tslint.json                      | 1 +
 types/react-holder/tslint.json                      | 1 +
 types/react-imageloader/tslint.json                 | 1 +
 types/react-infinite/tslint.json                    | 1 +
 types/react-input-calendar/tslint.json              | 1 +
 types/react-intl-redux/tslint.json                  | 1 +
 types/react-is-deprecated/tslint.json               | 1 +
 types/react-jsonschema-form/tslint.json             | 1 +
 types/react-mdl/tslint.json                         | 1 +
 types/react-mixin/tslint.json                       | 1 +
 types/react-motion-slider/tslint.json               | 1 +
 types/react-motion/tslint.json                      | 1 +
 types/react-native-orientation/tslint.json          | 1 +
 types/react-native-sortable-list/tslint.json        | 1 +
 types/react-native-touch-id/tslint.json             | 1 +
 types/react-notification-system/tslint.json         | 1 +
 types/react-props-decorators/tslint.json            | 1 +
 types/react-redux-i18n/tslint.json                  | 1 +
 types/react-redux-toastr/tslint.json                | 1 +
 types/react-router-bootstrap/tslint.json            | 1 +
 types/react-scrollbar/tslint.json                   | 1 +
 types/react-spinkit/tslint.json                     | 1 +
 types/react-swf/tslint.json                         | 1 +
 types/react-tagcloud/tslint.json                    | 1 +
 types/react-tap-event-plugin/tslint.json            | 1 +
 types/react-test-renderer/tslint.json               | 1 +
 types/react-textarea-autosize/tslint.json           | 1 +
 types/react-user-tour/tslint.json                   | 1 +
 types/react/tslint.json                             | 1 +
 types/reactcss/tslint.json                          | 1 +
 types/read/tslint.json                              | 1 +
 types/readdir-stream/tslint.json                    | 1 +
 types/recompose/tslint.json                         | 1 +
 types/redis-scripto/tslint.json                     | 1 +
 types/redux-action-utils/tslint.json                | 1 +
 types/redux-debounced/tslint.json                   | 1 +
 types/redux-devtools-dock-monitor/tslint.json       | 1 +
 types/redux-devtools-log-monitor/tslint.json        | 1 +
 types/redux-devtools/tslint.json                    | 1 +
 types/redux-immutable/tslint.json                   | 1 +
 types/redux-mock-store/tslint.json                  | 1 +
 types/redux-optimistic-ui/tslint.json               | 1 +
 types/redux-promise-middleware/tslint.json          | 1 +
 types/redux-promise/tslint.json                     | 1 +
 types/redux-recycle/tslint.json                     | 1 +
 types/redux-router/tslint.json                      | 1 +
 types/redux-storage/tslint.json                     | 1 +
 types/ref-array-di/tslint.json                      | 1 +
 types/ref-array/tslint.json                         | 1 +
 types/ref-napi/tslint.json                          | 1 +
 types/ref-struct-di/tslint.json                     | 1 +
 types/ref-struct/tslint.json                        | 1 +
 types/ref-union-di/tslint.json                      | 1 +
 types/ref-union/tslint.json                         | 1 +
 types/ref/tslint.json                               | 1 +
 types/relateurl/tslint.json                         | 1 +
 types/replace-ext/tslint.json                       | 1 +
 types/request-ip/tslint.json                        | 1 +
 types/requirejs-domready/tslint.json                | 1 +
 types/requirejs/tslint.json                         | 1 +
 types/resemblejs/tslint.json                        | 1 +
 types/resolve/tslint.json                           | 1 +
 types/response-time/tslint.json                     | 1 +
 types/rest/tslint.json                              | 1 +
 types/restangular/tslint.json                       | 1 +
 types/restful.js/tslint.json                        | 1 +
 types/restler/tslint.json                           | 1 +
 types/resumablejs/tslint.json                       | 1 +
 types/rethinkdb/tslint.json                         | 1 +
 types/revalidator/tslint.json                       | 1 +
 types/reveal/tslint.json                            | 1 +
 types/rickshaw/tslint.json                          | 1 +
 types/riot-api-nodejs/tslint.json                   | 1 +
 types/riot-games-api/tslint.json                    | 1 +
 types/riotcontrol/tslint.json                       | 1 +
 types/riotjs/tslint.json                            | 1 +
 types/rison/tslint.json                             | 1 +
 types/rosie/tslint.json                             | 1 +
 types/roslib/tslint.json                            | 1 +
 types/routie/tslint.json                            | 1 +
 types/royalslider/tslint.json                       | 1 +
 types/rpio/tslint.json                              | 1 +
 types/rsmq-worker/tslint.json                       | 1 +
 types/rsmq/tslint.json                              | 1 +
 types/rss/tslint.json                               | 1 +
 types/rsvp/tslint.json                              | 1 +
 types/rsync/tslint.json                             | 1 +
 types/rtree/tslint.json                             | 1 +
 types/run-sequence/tslint.json                      | 1 +
 types/rx-angular/tslint.json                        | 1 +
 types/rx-core-binding/tslint.json                   | 1 +
 types/rx-core/tslint.json                           | 1 +
 types/rx-jquery/tslint.json                         | 1 +
 types/rx-lite-aggregates/tslint.json                | 1 +
 types/rx-lite-coincidence/tslint.json               | 1 +
 types/rx-lite-time/tslint.json                      | 1 +
 types/rx-lite-virtualtime/tslint.json               | 1 +
 types/rx-lite/tslint.json                           | 1 +
 types/rx-node/tslint.json                           | 1 +
 types/rx.wamp/tslint.json                           | 1 +
 types/rx/tslint.json                                | 1 +
 types/s3-uploader/tslint.json                       | 1 +
 types/s3rver/tslint.json                            | 1 +
 types/safari-extension-content/tslint.json          | 1 +
 types/safari-extension/tslint.json                  | 1 +
 types/sails.io.js/tslint.json                       | 1 +
 types/saml2-js/tslint.json                          | 1 +
 types/samlp/tslint.json                             | 1 +
 types/sammy/tslint.json                             | 1 +
 types/sandboxed-module/tslint.json                  | 1 +
 types/sanitize-filename/tslint.json                 | 1 +
 types/sanitize-html/tslint.json                     | 1 +
 types/sanitizer/tslint.json                         | 1 +
 types/sass-graph/tslint.json                        | 1 +
 types/sat/tslint.json                               | 1 +
 types/satnav/tslint.json                            | 1 +
 types/sax/tslint.json                               | 1 +
 types/scalike/tslint.json                           | 1 +
 types/screeps/tslint.json                           | 1 +
 types/scriptjs/tslint.json                          | 1 +
 types/scroll-into-view/tslint.json                  | 1 +
 types/scrollreveal/tslint.json                      | 1 +
 types/scrolltofixed/tslint.json                     | 1 +
 types/scrypt-async/tslint.json                      | 1 +
 types/seamless/tslint.json                          | 1 +
 types/seedrandom/tslint.json                        | 1 +
 types/segment-analytics/tslint.json                 | 1 +
 types/selectize/tslint.json                         | 1 +
 types/semaphore/tslint.json                         | 1 +
 types/sencha_touch/tslint.json                      | 1 +
 types/send/tslint.json                              | 1 +
 types/seneca/tslint.json                            | 1 +
 types/sequelize-fixtures/tslint.json                | 1 +
 types/sequelize/tslint.json                         | 1 +
 types/sequester/tslint.json                         | 1 +
 types/serve-favicon/tslint.json                     | 1 +
 types/serve-index/tslint.json                       | 1 +
 types/serve-static/tslint.json                      | 1 +
 types/set-cookie-parser/tslint.json                 | 1 +
 types/sharedworker/tslint.json                      | 1 +
 types/sharepoint/tslint.json                        | 1 +
 types/shopify-buy/tslint.json                       | 1 +
 types/shortid/tslint.json                           | 1 +
 types/showdown/tslint.json                          | 1 +
 types/shuffle-array/tslint.json                     | 1 +
 types/siesta/tslint.json                            | 1 +
 types/sigmajs/tslint.json                           | 1 +
 types/signalr/tslint.json                           | 1 +
 types/signature_pad/tslint.json                     | 1 +
 types/simple-assign/tslint.json                     | 1 +
 types/simple-cw-node/tslint.json                    | 1 +
 types/simple-mock/tslint.json                       | 1 +
 types/simple-url-cache/tslint.json                  | 1 +
 types/simplemde/tslint.json                         | 1 +
 types/simplesmtp/tslint.json                        | 1 +
 types/simplestorage.js/tslint.json                  | 1 +
 types/sinon-as-promised/tslint.json                 | 1 +
 types/sinon-chai/tslint.json                        | 1 +
 types/sinon-chrome/tslint.json                      | 1 +
 types/sinon-mongoose/tslint.json                    | 1 +
 types/sinon-stub-promise/tslint.json                | 1 +
 types/sipml/tslint.json                             | 1 +
 types/sjcl/tslint.json                              | 1 +
 types/ski/tslint.json                               | 1 +
 types/skyway/tslint.json                            | 1 +
 types/slack-node/tslint.json                        | 1 +
 types/slackify-html/tslint.json                     | 1 +
 types/slate-irc/tslint.json                         | 1 +
 types/sleep/tslint.json                             | 1 +
 types/slick-carousel/tslint.json                    | 1 +
 types/slickgrid/tslint.json                         | 1 +
 types/slideout/tslint.json                          | 1 +
 types/smart-fox-server/tslint.json                  | 1 +
 types/smtpapi/tslint.json                           | 1 +
 types/snapsvg/tslint.json                           | 1 +
 types/socket.io-client/tslint.json                  | 1 +
 types/socket.io-redis/tslint.json                   | 1 +
 types/socket.io.users/tslint.json                   | 1 +
 types/socket.io/tslint.json                         | 1 +
 types/socketty/tslint.json                          | 1 +
 types/solution-center-communicator/tslint.json      | 1 +
 types/sortablejs/tslint.json                        | 1 +
 types/soundjs/tslint.json                           | 1 +
 types/source-list-map/tslint.json                   | 1 +
 types/space-pen/tslint.json                         | 1 +
 types/spectrum/tslint.json                          | 1 +
 types/split/tslint.json                             | 1 +
 types/split2/tslint.json                            | 1 +
 types/spotify-api/tslint.json                       | 1 +
 types/sql.js/tslint.json                            | 1 +
 types/sqs-consumer/tslint.json                      | 1 +
 types/squirejs/tslint.json                          | 1 +
 types/srp/tslint.json                               | 1 +
 types/ssh2-streams/tslint.json                      | 1 +
 types/ssh2/tslint.json                              | 1 +
 types/stack-mapper/tslint.json                      | 1 +
 types/stack-trace/tslint.json                       | 1 +
 types/stacktrace-js/tslint.json                     | 1 +
 types/static-eval/tslint.json                       | 1 +
 types/stats.js/tslint.json                          | 1 +
 types/statsd-client/tslint.json                     | 1 +
 types/steam/tslint.json                             | 1 +
 types/stompjs/tslint.json                           | 1 +
 types/store/tslint.json                             | 1 +
 types/stream-meter/tslint.json                      | 1 +
 types/stream-series/tslint.json                     | 1 +
 types/streamjs/tslint.json                          | 1 +
 types/strftime/tslint.json                          | 1 +
 types/string-hash/tslint.json                       | 1 +
 types/string-template/tslint.json                   | 1 +
 types/string/tslint.json                            | 1 +
 types/string_score/tslint.json                      | 1 +
 types/strip-json-comments/tslint.json               | 1 +
 types/stripe-v3/tslint.json                         | 1 +
 types/strophe/tslint.json                           | 1 +
 types/succinct/tslint.json                          | 1 +
 types/suitescript/tslint.json                       | 1 +
 types/supertest/tslint.json                         | 1 +
 types/svg-injector/tslint.json                      | 1 +
 types/svg-sprite/tslint.json                        | 1 +
 types/svgjs.draggable/tslint.json                   | 1 +
 types/svgjs.resize/tslint.json                      | 1 +
 types/swag/tslint.json                              | 1 +
 types/swagger-express-middleware/tslint.json        | 1 +
 types/swagger-jsdoc/tslint.json                     | 1 +
 types/swaggerize-express/tslint.json                | 1 +
 types/swfobject/tslint.json                         | 1 +
 types/swiftclick/tslint.json                        | 1 +
 types/swig/tslint.json                              | 1 +
 types/swipe/tslint.json                             | 1 +
 types/swipeview/tslint.json                         | 1 +
 types/switchery/tslint.json                         | 1 +
 types/swiz/tslint.json                              | 1 +
 types/sylvester/tslint.json                         | 1 +
 types/synaptic/tslint.json                          | 1 +
 types/tabtab/tslint.json                            | 1 +
 types/tapable/tslint.json                           | 1 +
 types/tape/tslint.json                              | 1 +
 types/tea-merge/tslint.json                         | 1 +
 types/tedious/tslint.json                           | 1 +
 types/teechart/tslint.json                          | 1 +
 types/temp-fs/tslint.json                           | 1 +
 types/terminal-menu/tslint.json                     | 1 +
 types/tesseract.js/tslint.json                      | 1 +
 types/tether-drop/tslint.json                       | 1 +
 types/tether-shepherd/tslint.json                   | 1 +
 types/tether/tslint.json                            | 1 +
 types/text-encoding/tslint.json                     | 1 +
 types/three/tslint.json                             | 1 +
 types/through/tslint.json                           | 1 +
 types/through2/tslint.json                          | 1 +
 types/tile-reduce/tslint.json                       | 1 +
 types/tilebelt/tslint.json                          | 1 +
 types/timelinejs/tslint.json                        | 1 +
 types/timelinejs3/tslint.json                       | 1 +
 types/timezone-js/tslint.json                       | 1 +
 types/tinder/tslint.json                            | 1 +
 types/tinycopy/tslint.json                          | 1 +
 types/title/tslint.json                             | 1 +
 types/tldjs/tslint.json                             | 1 +
 types/to-title-case-gouch/tslint.json               | 1 +
 types/toastr/tslint.json                            | 1 +
 types/tooltipster/tslint.json                       | 1 +
 types/torrent-stream/tslint.json                    | 1 +
 types/touch-events/tslint.json                      | 1 +
 types/traceback/tslint.json                         | 1 +
 types/tracking/tslint.json                          | 1 +
 types/traverse/tslint.json                          | 1 +
 types/traverson/tslint.json                         | 1 +
 types/trayballoon/tslint.json                       | 1 +
 types/trim/tslint.json                              | 1 +
 types/trunk8/tslint.json                            | 1 +
 types/tspromise/tslint.json                         | 1 +
 types/tv4/tslint.json                               | 1 +
 types/tweenjs/tslint.json                           | 1 +
 types/twilio/tslint.json                            | 1 +
 types/twit/tslint.json                              | 1 +
 types/twitter-for-web/tslint.json                   | 1 +
 types/twitter-stream-channels/tslint.json           | 1 +
 types/twitter-text/tslint.json                      | 1 +
 types/twix/tslint.json                              | 1 +
 types/type-check/tslint.json                        | 1 +
 types/type-detect/tslint.json                       | 1 +
 types/type-name/tslint.json                         | 1 +
 types/typeahead/tslint.json                         | 1 +
 types/typedarray-pool/tslint.json                   | 1 +
 types/typescript-deferred/tslint.json               | 1 +
 types/tz-format/tslint.json                         | 1 +
 types/ua-parser-js/tslint.json                      | 1 +
 types/uglifycss/tslint.json                         | 1 +
 types/ui-grid/tslint.json                           | 1 +
 types/ui-select/tslint.json                         | 1 +
 types/uid-safe/tslint.json                          | 1 +
 types/umbraco/tslint.json                           | 1 +
 types/umd/tslint.json                               | 1 +
 types/umzug/tslint.json                             | 1 +
 types/underscore-ko/tslint.json                     | 1 +
 types/underscore.string/tslint.json                 | 1 +
 types/underscore/tslint.json                        | 1 +
 types/uniq/tslint.json                              | 1 +
 types/unique-random/tslint.json                     | 1 +
 types/unity-webapi/tslint.json                      | 1 +
 types/unorm/tslint.json                             | 1 +
 types/urbanairship-cordova/tslint.json              | 1 +
 types/uri-templates/tslint.json                     | 1 +
 types/urijs/tslint.json                             | 1 +
 types/url-template/tslint.json                      | 1 +
 types/urlrouter/tslint.json                         | 1 +
 types/urlsafe-base64/tslint.json                    | 1 +
 types/usage/tslint.json                             | 1 +
 types/useragent/tslint.json                         | 1 +
 types/username/tslint.json                          | 1 +
 types/utf8/tslint.json                              | 1 +
 types/utils-merge/tslint.json                       | 1 +
 types/uuid-1345/tslint.json                         | 1 +
 types/uws/tslint.json                               | 1 +
 types/v8-profiler/tslint.json                       | 1 +
 types/valdr-message/tslint.json                     | 1 +
 types/valdr/tslint.json                             | 1 +
 types/valerie/tslint.json                           | 1 +
 types/valid-url/tslint.json                         | 1 +
 types/validator/tslint.json                         | 1 +
 types/validatorjs/tslint.json                       | 1 +
 types/vec3/tslint.json                              | 1 +
 types/vectorious/tslint.json                        | 1 +
 types/velocity-animate/tslint.json                  | 1 +
 types/vex-js/tslint.json                            | 1 +
 types/vexflow/tslint.json                           | 1 +
 types/victor/tslint.json                            | 1 +
 types/viewporter/tslint.json                        | 1 +
 types/vimeo/tslint.json                             | 1 +
 types/vinyl-paths/tslint.json                       | 1 +
 types/vinyl-source-stream/tslint.json               | 1 +
 types/virtual-dom/tslint.json                       | 1 +
 types/vitalsigns/tslint.json                        | 1 +
 types/vivus/tslint.json                             | 1 +
 types/voronoi-diagram/tslint.json                   | 1 +
 types/vortex-web-client/tslint.json                 | 1 +
 types/voximplant-websdk/tslint.json                 | 1 +
 types/vue-resource/tslint.json                      | 1 +
 types/w2ui/tslint.json                              | 1 +
 types/w3c-gamepad/tslint.json                       | 1 +
 types/waitme/tslint.json                            | 1 +
 types/wake_on_lan/tslint.json                       | 1 +
 types/wallabyjs/tslint.json                         | 1 +
 types/wampy/tslint.json                             | 1 +
 types/warning/tslint.json                           | 1 +
 types/watchify/tslint.json                          | 1 +
 types/waterline/tslint.json                         | 1 +
 types/weapp-api/tslint.json                         | 1 +
 types/web-bluetooth/tslint.json                     | 1 +
 types/webassembly-js-api/tslint.json                | 1 +
 types/webcl/tslint.json                             | 1 +
 types/webcrypto/tslint.json                         | 1 +
 types/webfontloader/tslint.json                     | 1 +
 types/webgl-ext/tslint.json                         | 1 +
 types/webgl2/tslint.json                            | 1 +
 types/webpack-env/tslint.json                       | 1 +
 types/webpack-fail-plugin/tslint.json               | 1 +
 types/webpack-validator/tslint.json                 | 1 +
 types/webrtc/tslint.json                            | 1 +
 types/website-scraper/tslint.json                   | 1 +
 types/websocket/tslint.json                         | 1 +
 types/websql/tslint.json                            | 1 +
 types/webvr-api/tslint.json                         | 1 +
 types/weighted/tslint.json                          | 1 +
 types/whatwg-streams/tslint.json                    | 1 +
 types/when/tslint.json                              | 1 +
 types/which/tslint.json                             | 1 +
 types/why-did-you-update/tslint.json                | 1 +
 types/wiiu/tslint.json                              | 1 +
 types/window-size/tslint.json                       | 1 +
 types/windows-1251/tslint.json                      | 1 +
 types/windows-service/tslint.json                   | 1 +
 types/winjs/tslint.json                             | 1 +
 types/winreg/tslint.json                            | 1 +
 types/winrt-uwp/tslint.json                         | 1 +
 types/winrt/tslint.json                             | 1 +
 types/winston-dynamodb/tslint.json                  | 1 +
 types/wiredep/tslint.json                           | 1 +
 types/wiring-pi/tslint.json                         | 1 +
 types/wonder.js/tslint.json                         | 1 +
 types/wrap-ansi/tslint.json                         | 1 +
 types/wreck/tslint.json                             | 1 +
 types/wrench/tslint.json                            | 1 +
 types/x-editable/tslint.json                        | 1 +
 types/xdate/tslint.json                             | 1 +
 types/xdomain/tslint.json                           | 1 +
 types/xml-parser/tslint.json                        | 1 +
 types/xmlbuilder/tslint.json                        | 1 +
 types/xmldom/tslint.json                            | 1 +
 types/xmlpoke/tslint.json                           | 1 +
 types/xmlrpc/tslint.json                            | 1 +
 types/xmltojson/tslint.json                         | 1 +
 types/xregexp/tslint.json                           | 1 +
 types/xsockets/tslint.json                          | 1 +
 types/xss-filters/tslint.json                       | 1 +
 types/xtend/tslint.json                             | 1 +
 types/yamljs/tslint.json                            | 1 +
 types/yandex-money-sdk/tslint.json                  | 1 +
 types/yayson/tslint.json                            | 1 +
 types/ydn-db/tslint.json                            | 1 +
 types/yosay/tslint.json                             | 1 +
 types/youtube/tslint.json                           | 1 +
 types/yui/tslint.json                               | 1 +
 types/z-schema/tslint.json                          | 1 +
 types/zepto/tslint.json                             | 1 +
 types/zeroclipboard/tslint.json                     | 1 +
 types/zip.js/tslint.json                            | 1 +
 types/zmq/tslint.json                               | 1 +
 1655 files changed, 1655 insertions(+)

diff --git a/types/absolute/tslint.json b/types/absolute/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/absolute/tslint.json
+++ b/types/absolute/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/acc-wizard/tslint.json b/types/acc-wizard/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/acc-wizard/tslint.json
+++ b/types/acc-wizard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ace/tslint.json b/types/ace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ace/tslint.json
+++ b/types/ace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/actioncable/tslint.json b/types/actioncable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/actioncable/tslint.json
+++ b/types/actioncable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/add2home/tslint.json b/types/add2home/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/add2home/tslint.json
+++ b/types/add2home/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/agenda/tslint.json b/types/agenda/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/agenda/tslint.json
+++ b/types/agenda/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/alertify/tslint.json b/types/alertify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/alertify/tslint.json
+++ b/types/alertify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/algoliasearch/tslint.json b/types/algoliasearch/tslint.json
index 886f1a8b6c..4ef1833aa4 100644
--- a/types/algoliasearch/tslint.json
+++ b/types/algoliasearch/tslint.json
@@ -8,6 +8,7 @@
     "callable-types": false,
     "comment-format": false,
     "dt-header": false,
+        "npm-naming": false,
     "eofline": false,
     "export-just-namespace": false,
     "import-spacing": false,
diff --git a/types/alt/tslint.json b/types/alt/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/alt/tslint.json
+++ b/types/alt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/amazon-product-api/tslint.json b/types/amazon-product-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/amazon-product-api/tslint.json
+++ b/types/amazon-product-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/amplitude-js/tslint.json b/types/amplitude-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/amplitude-js/tslint.json
+++ b/types/amplitude-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/amqp-rpc/tslint.json b/types/amqp-rpc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/amqp-rpc/tslint.json
+++ b/types/amqp-rpc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-agility/tslint.json b/types/angular-agility/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/angular-agility/tslint.json
+++ b/types/angular-agility/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-animate/tslint.json b/types/angular-animate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-animate/tslint.json
+++ b/types/angular-animate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-bootstrap-calendar/tslint.json b/types/angular-bootstrap-calendar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-bootstrap-calendar/tslint.json
+++ b/types/angular-bootstrap-calendar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-bootstrap-lightbox/tslint.json b/types/angular-bootstrap-lightbox/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/angular-bootstrap-lightbox/tslint.json
+++ b/types/angular-bootstrap-lightbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-breadcrumb/tslint.json b/types/angular-breadcrumb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-breadcrumb/tslint.json
+++ b/types/angular-breadcrumb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-clipboard/tslint.json b/types/angular-clipboard/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-clipboard/tslint.json
+++ b/types/angular-clipboard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-cookie/tslint.json b/types/angular-cookie/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-cookie/tslint.json
+++ b/types/angular-cookie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-cookies/tslint.json b/types/angular-cookies/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-cookies/tslint.json
+++ b/types/angular-cookies/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-deferred-bootstrap/tslint.json b/types/angular-deferred-bootstrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-deferred-bootstrap/tslint.json
+++ b/types/angular-deferred-bootstrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-dialog-service/tslint.json b/types/angular-dialog-service/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-dialog-service/tslint.json
+++ b/types/angular-dialog-service/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-dynamic-locale/tslint.json b/types/angular-dynamic-locale/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-dynamic-locale/tslint.json
+++ b/types/angular-dynamic-locale/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-environment/tslint.json b/types/angular-environment/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-environment/tslint.json
+++ b/types/angular-environment/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-es/tslint.json b/types/angular-es/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-es/tslint.json
+++ b/types/angular-es/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-feature-flags/tslint.json b/types/angular-feature-flags/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-feature-flags/tslint.json
+++ b/types/angular-feature-flags/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-file-saver/tslint.json b/types/angular-file-saver/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-file-saver/tslint.json
+++ b/types/angular-file-saver/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-formly/tslint.json b/types/angular-formly/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-formly/tslint.json
+++ b/types/angular-formly/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-fullscreen/tslint.json b/types/angular-fullscreen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-fullscreen/tslint.json
+++ b/types/angular-fullscreen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-gettext/tslint.json b/types/angular-gettext/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-gettext/tslint.json
+++ b/types/angular-gettext/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-google-analytics/tslint.json b/types/angular-google-analytics/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-google-analytics/tslint.json
+++ b/types/angular-google-analytics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-growl-v2/tslint.json b/types/angular-growl-v2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-growl-v2/tslint.json
+++ b/types/angular-growl-v2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-http-auth/tslint.json b/types/angular-http-auth/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-http-auth/tslint.json
+++ b/types/angular-http-auth/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-httpi/tslint.json b/types/angular-httpi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-httpi/tslint.json
+++ b/types/angular-httpi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-idle/tslint.json b/types/angular-idle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-idle/tslint.json
+++ b/types/angular-idle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-jwt/tslint.json b/types/angular-jwt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-jwt/tslint.json
+++ b/types/angular-jwt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-load/tslint.json b/types/angular-load/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-load/tslint.json
+++ b/types/angular-load/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-loading-bar/tslint.json b/types/angular-loading-bar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-loading-bar/tslint.json
+++ b/types/angular-loading-bar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-local-storage/tslint.json b/types/angular-local-storage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-local-storage/tslint.json
+++ b/types/angular-local-storage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-localforage/tslint.json b/types/angular-localforage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-localforage/tslint.json
+++ b/types/angular-localforage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-locker/tslint.json b/types/angular-locker/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/angular-locker/tslint.json
+++ b/types/angular-locker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-media-queries/tslint.json b/types/angular-media-queries/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-media-queries/tslint.json
+++ b/types/angular-media-queries/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-meteor/tslint.json b/types/angular-meteor/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/angular-meteor/tslint.json
+++ b/types/angular-meteor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-modal/tslint.json b/types/angular-modal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-modal/tslint.json
+++ b/types/angular-modal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-notifications/tslint.json b/types/angular-notifications/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-notifications/tslint.json
+++ b/types/angular-notifications/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-notify/tslint.json b/types/angular-notify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-notify/tslint.json
+++ b/types/angular-notify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-odata-resources/tslint.json b/types/angular-odata-resources/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/angular-odata-resources/tslint.json
+++ b/types/angular-odata-resources/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-permission/tslint.json b/types/angular-permission/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-permission/tslint.json
+++ b/types/angular-permission/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-promise-tracker/tslint.json b/types/angular-promise-tracker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-promise-tracker/tslint.json
+++ b/types/angular-promise-tracker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-q-spread/tslint.json b/types/angular-q-spread/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-q-spread/tslint.json
+++ b/types/angular-q-spread/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-route/tslint.json b/types/angular-route/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-route/tslint.json
+++ b/types/angular-route/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-sanitize/tslint.json b/types/angular-sanitize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-sanitize/tslint.json
+++ b/types/angular-sanitize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-scenario/tslint.json b/types/angular-scenario/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-scenario/tslint.json
+++ b/types/angular-scenario/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-scroll/tslint.json b/types/angular-scroll/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-scroll/tslint.json
+++ b/types/angular-scroll/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-signalr-hub/tslint.json b/types/angular-signalr-hub/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-signalr-hub/tslint.json
+++ b/types/angular-signalr-hub/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-spinner/tslint.json b/types/angular-spinner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-spinner/tslint.json
+++ b/types/angular-spinner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-storage/tslint.json b/types/angular-storage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-storage/tslint.json
+++ b/types/angular-storage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-toastr/tslint.json b/types/angular-toastr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-toastr/tslint.json
+++ b/types/angular-toastr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-toasty/tslint.json b/types/angular-toasty/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-toasty/tslint.json
+++ b/types/angular-toasty/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-translate/tslint.json b/types/angular-translate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-translate/tslint.json
+++ b/types/angular-translate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-bootstrap/tslint.json b/types/angular-ui-bootstrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-ui-bootstrap/tslint.json
+++ b/types/angular-ui-bootstrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-notification/tslint.json b/types/angular-ui-notification/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-ui-notification/tslint.json
+++ b/types/angular-ui-notification/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-router/tslint.json b/types/angular-ui-router/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-ui-router/tslint.json
+++ b/types/angular-ui-router/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-scroll/tslint.json b/types/angular-ui-scroll/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-ui-scroll/tslint.json
+++ b/types/angular-ui-scroll/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-sortable/tslint.json b/types/angular-ui-sortable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-ui-sortable/tslint.json
+++ b/types/angular-ui-sortable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-ui-tree/tslint.json b/types/angular-ui-tree/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/angular-ui-tree/tslint.json
+++ b/types/angular-ui-tree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-wizard/tslint.json b/types/angular-wizard/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/angular-wizard/tslint.json
+++ b/types/angular-wizard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular-xeditable/tslint.json b/types/angular-xeditable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular-xeditable/tslint.json
+++ b/types/angular-xeditable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angular.throttle/tslint.json b/types/angular.throttle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angular.throttle/tslint.json
+++ b/types/angular.throttle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angularfire/tslint.json b/types/angularfire/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/angularfire/tslint.json
+++ b/types/angularfire/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angularlocalstorage/tslint.json b/types/angularlocalstorage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angularlocalstorage/tslint.json
+++ b/types/angularlocalstorage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/angulartics/tslint.json b/types/angulartics/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/angulartics/tslint.json
+++ b/types/angulartics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/animation-frame/tslint.json b/types/animation-frame/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/animation-frame/tslint.json
+++ b/types/animation-frame/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ansi-styles/tslint.json b/types/ansi-styles/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ansi-styles/tslint.json
+++ b/types/ansi-styles/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ansicolors/tslint.json b/types/ansicolors/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ansicolors/tslint.json
+++ b/types/ansicolors/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/any-db-transaction/tslint.json b/types/any-db-transaction/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/any-db-transaction/tslint.json
+++ b/types/any-db-transaction/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/any-db/tslint.json b/types/any-db/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/any-db/tslint.json
+++ b/types/any-db/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/aphrodite/tslint.json b/types/aphrodite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/aphrodite/tslint.json
+++ b/types/aphrodite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/api-error-handler/tslint.json b/types/api-error-handler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/api-error-handler/tslint.json
+++ b/types/api-error-handler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/apigee-access/tslint.json b/types/apigee-access/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/apigee-access/tslint.json
+++ b/types/apigee-access/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/app-root-path/tslint.json b/types/app-root-path/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/app-root-path/tslint.json
+++ b/types/app-root-path/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/appframework/tslint.json b/types/appframework/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/appframework/tslint.json
+++ b/types/appframework/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/appletvjs/tslint.json b/types/appletvjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/appletvjs/tslint.json
+++ b/types/appletvjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/arbiter/tslint.json b/types/arbiter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/arbiter/tslint.json
+++ b/types/arbiter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/arcgis-js-api/tslint.json b/types/arcgis-js-api/tslint.json
index e3610fefae..89955128d5 100644
--- a/types/arcgis-js-api/tslint.json
+++ b/types/arcgis-js-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/archy/tslint.json b/types/archy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/archy/tslint.json
+++ b/types/archy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/argv/tslint.json b/types/argv/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/argv/tslint.json
+++ b/types/argv/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/array-foreach/tslint.json b/types/array-foreach/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/array-foreach/tslint.json
+++ b/types/array-foreach/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/asana/tslint.json b/types/asana/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/asana/tslint.json
+++ b/types/asana/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/asciify/tslint.json b/types/asciify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/asciify/tslint.json
+++ b/types/asciify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/asn1js/tslint.json b/types/asn1js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/asn1js/tslint.json
+++ b/types/asn1js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/aspnet-identity-pw/tslint.json b/types/aspnet-identity-pw/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/aspnet-identity-pw/tslint.json
+++ b/types/aspnet-identity-pw/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/assertsharp/tslint.json b/types/assertsharp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/assertsharp/tslint.json
+++ b/types/assertsharp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/async-polling/tslint.json b/types/async-polling/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/async-polling/tslint.json
+++ b/types/async-polling/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/async-writer/tslint.json b/types/async-writer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/async-writer/tslint.json
+++ b/types/async-writer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/atmosphere.js/tslint.json b/types/atmosphere.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/atmosphere.js/tslint.json
+++ b/types/atmosphere.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/atpl/tslint.json b/types/atpl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/atpl/tslint.json
+++ b/types/atpl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/auth0-angular/tslint.json b/types/auth0-angular/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/auth0-angular/tslint.json
+++ b/types/auth0-angular/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/auth0.widget/tslint.json b/types/auth0.widget/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/auth0.widget/tslint.json
+++ b/types/auth0.widget/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/auth0/tslint.json b/types/auth0/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/auth0/tslint.json
+++ b/types/auth0/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/autolinker/tslint.json b/types/autolinker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/autolinker/tslint.json
+++ b/types/autolinker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/autoprefixer-core/tslint.json b/types/autoprefixer-core/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/autoprefixer-core/tslint.json
+++ b/types/autoprefixer-core/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/avoscloud-sdk/tslint.json b/types/avoscloud-sdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/avoscloud-sdk/tslint.json
+++ b/types/avoscloud-sdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/aws-iot-device-sdk/tslint.json b/types/aws-iot-device-sdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/aws-iot-device-sdk/tslint.json
+++ b/types/aws-iot-device-sdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/aws4/tslint.json b/types/aws4/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/aws4/tslint.json
+++ b/types/aws4/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/axel/tslint.json b/types/axel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/axel/tslint.json
+++ b/types/axel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/azure-mobile-services-client/tslint.json b/types/azure-mobile-services-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/azure-mobile-services-client/tslint.json
+++ b/types/azure-mobile-services-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/azure-sb/tslint.json b/types/azure-sb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/azure-sb/tslint.json
+++ b/types/azure-sb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/azure/tslint.json b/types/azure/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/azure/tslint.json
+++ b/types/azure/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/babelify/tslint.json b/types/babelify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/babelify/tslint.json
+++ b/types/babelify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/babyparse/tslint.json b/types/babyparse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/babyparse/tslint.json
+++ b/types/babyparse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone-associations/tslint.json b/types/backbone-associations/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backbone-associations/tslint.json
+++ b/types/backbone-associations/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone-fetch-cache/tslint.json b/types/backbone-fetch-cache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backbone-fetch-cache/tslint.json
+++ b/types/backbone-fetch-cache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone-relational/tslint.json b/types/backbone-relational/tslint.json
index 65e27fce52..fd5f6a3567 100644
--- a/types/backbone-relational/tslint.json
+++ b/types/backbone-relational/tslint.json
@@ -4,6 +4,7 @@
         "array-type": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "jsdoc-format": false,
         "max-line-length": false,
diff --git a/types/backbone.layoutmanager/tslint.json b/types/backbone.layoutmanager/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/backbone.layoutmanager/tslint.json
+++ b/types/backbone.layoutmanager/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone.localstorage/tslint.json b/types/backbone.localstorage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backbone.localstorage/tslint.json
+++ b/types/backbone.localstorage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone.paginator/tslint.json b/types/backbone.paginator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backbone.paginator/tslint.json
+++ b/types/backbone.paginator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone.radio/tslint.json b/types/backbone.radio/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backbone.radio/tslint.json
+++ b/types/backbone.radio/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backbone/tslint.json b/types/backbone/tslint.json
index f5ae3a6788..ab605d9227 100644
--- a/types/backbone/tslint.json
+++ b/types/backbone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "export-just-namespace": false,
         "interface-name": false,
         "jsdoc-format": false,
diff --git a/types/backgrid/tslint.json b/types/backgrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backgrid/tslint.json
+++ b/types/backgrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/backlog-js/tslint.json b/types/backlog-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/backlog-js/tslint.json
+++ b/types/backlog-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/baconjs/tslint.json b/types/baconjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/baconjs/tslint.json
+++ b/types/baconjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/baidumap-web-sdk/tslint.json b/types/baidumap-web-sdk/tslint.json
index eccb336643..43797d8dd7 100644
--- a/types/baidumap-web-sdk/tslint.json
+++ b/types/baidumap-web-sdk/tslint.json
@@ -7,6 +7,7 @@
         "ban-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "max-line-length": false,
         "member-access": false,
diff --git a/types/barcode/tslint.json b/types/barcode/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/barcode/tslint.json
+++ b/types/barcode/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bardjs/tslint.json b/types/bardjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bardjs/tslint.json
+++ b/types/bardjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/base16/tslint.json b/types/base16/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/base16/tslint.json
+++ b/types/base16/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bases/tslint.json b/types/bases/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bases/tslint.json
+++ b/types/bases/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/batch-stream/tslint.json b/types/batch-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/batch-stream/tslint.json
+++ b/types/batch-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bazinga-translator/tslint.json b/types/bazinga-translator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bazinga-translator/tslint.json
+++ b/types/bazinga-translator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bcrypt-nodejs/tslint.json b/types/bcrypt-nodejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bcrypt-nodejs/tslint.json
+++ b/types/bcrypt-nodejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bcrypt/tslint.json b/types/bcrypt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bcrypt/tslint.json
+++ b/types/bcrypt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bcryptjs/tslint.json b/types/bcryptjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bcryptjs/tslint.json
+++ b/types/bcryptjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/benchmark/tslint.json b/types/benchmark/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/benchmark/tslint.json
+++ b/types/benchmark/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/better-curry/tslint.json b/types/better-curry/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/better-curry/tslint.json
+++ b/types/better-curry/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bezier-js/tslint.json b/types/bezier-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bezier-js/tslint.json
+++ b/types/bezier-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bgiframe/tslint.json b/types/bgiframe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bgiframe/tslint.json
+++ b/types/bgiframe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bigint/tslint.json b/types/bigint/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bigint/tslint.json
+++ b/types/bigint/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bignum/tslint.json b/types/bignum/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bignum/tslint.json
+++ b/types/bignum/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bigscreen/tslint.json b/types/bigscreen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bigscreen/tslint.json
+++ b/types/bigscreen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bind-ponyfill/tslint.json b/types/bind-ponyfill/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bind-ponyfill/tslint.json
+++ b/types/bind-ponyfill/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bintrees/tslint.json b/types/bintrees/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bintrees/tslint.json
+++ b/types/bintrees/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bip21/tslint.json b/types/bip21/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bip21/tslint.json
+++ b/types/bip21/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bit-array/tslint.json b/types/bit-array/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bit-array/tslint.json
+++ b/types/bit-array/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bl/tslint.json b/types/bl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bl/tslint.json
+++ b/types/bl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blazy/tslint.json b/types/blazy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blazy/tslint.json
+++ b/types/blazy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bleno/tslint.json b/types/bleno/tslint.json
index 0f5eeaf557..d895c355d8 100644
--- a/types/bleno/tslint.json
+++ b/types/bleno/tslint.json
@@ -2,6 +2,7 @@
 	"extends": "dtslint/dt.json",
 	"rules": {
 		"dt-header": false,
+        "npm-naming": false,
 		"unified-signatures": false
 	}
 }
diff --git a/types/blessed/tslint.json b/types/blessed/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blessed/tslint.json
+++ b/types/blessed/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blissfuljs/tslint.json b/types/blissfuljs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blissfuljs/tslint.json
+++ b/types/blissfuljs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blob-stream/tslint.json b/types/blob-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blob-stream/tslint.json
+++ b/types/blob-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blocks/tslint.json b/types/blocks/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blocks/tslint.json
+++ b/types/blocks/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blue-tape/tslint.json b/types/blue-tape/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blue-tape/tslint.json
+++ b/types/blue-tape/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/blueimp-md5/tslint.json b/types/blueimp-md5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/blueimp-md5/tslint.json
+++ b/types/blueimp-md5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bookshelf/tslint.json b/types/bookshelf/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/bookshelf/tslint.json
+++ b/types/bookshelf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/boolify-string/tslint.json b/types/boolify-string/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/boolify-string/tslint.json
+++ b/types/boolify-string/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootbox/tslint.json b/types/bootbox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootbox/tslint.json
+++ b/types/bootbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootpag/tslint.json b/types/bootpag/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootpag/tslint.json
+++ b/types/bootpag/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-datepicker/tslint.json b/types/bootstrap-datepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-datepicker/tslint.json
+++ b/types/bootstrap-datepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-fileinput/tslint.json b/types/bootstrap-fileinput/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-fileinput/tslint.json
+++ b/types/bootstrap-fileinput/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-maxlength/tslint.json b/types/bootstrap-maxlength/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-maxlength/tslint.json
+++ b/types/bootstrap-maxlength/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-notify/tslint.json b/types/bootstrap-notify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-notify/tslint.json
+++ b/types/bootstrap-notify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-select/tslint.json b/types/bootstrap-select/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-select/tslint.json
+++ b/types/bootstrap-select/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-switch/tslint.json b/types/bootstrap-switch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-switch/tslint.json
+++ b/types/bootstrap-switch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-table/tslint.json b/types/bootstrap-table/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-table/tslint.json
+++ b/types/bootstrap-table/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap-touchspin/tslint.json b/types/bootstrap-touchspin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap-touchspin/tslint.json
+++ b/types/bootstrap-touchspin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap.paginator/tslint.json b/types/bootstrap.paginator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap.paginator/tslint.json
+++ b/types/bootstrap.paginator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bootstrap.timepicker/tslint.json b/types/bootstrap.timepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bootstrap.timepicker/tslint.json
+++ b/types/bootstrap.timepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bounce.js/tslint.json b/types/bounce.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bounce.js/tslint.json
+++ b/types/bounce.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/box2d/tslint.json b/types/box2d/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/box2d/tslint.json
+++ b/types/box2d/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/braintree-web/tslint.json b/types/braintree-web/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/braintree-web/tslint.json
+++ b/types/braintree-web/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/breeze/tslint.json b/types/breeze/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/breeze/tslint.json
+++ b/types/breeze/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/brorand/tslint.json b/types/brorand/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/brorand/tslint.json
+++ b/types/brorand/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browser-harness/tslint.json b/types/browser-harness/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browser-harness/tslint.json
+++ b/types/browser-harness/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browser-pack/tslint.json b/types/browser-pack/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browser-pack/tslint.json
+++ b/types/browser-pack/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browser-report/tslint.json b/types/browser-report/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browser-report/tslint.json
+++ b/types/browser-report/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browser-resolve/tslint.json b/types/browser-resolve/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browser-resolve/tslint.json
+++ b/types/browser-resolve/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browser-sync/tslint.json b/types/browser-sync/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browser-sync/tslint.json
+++ b/types/browser-sync/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/browserify/tslint.json b/types/browserify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/browserify/tslint.json
+++ b/types/browserify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bson/tslint.json b/types/bson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bson/tslint.json
+++ b/types/bson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bucks/tslint.json b/types/bucks/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bucks/tslint.json
+++ b/types/bucks/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/buffer-compare/tslint.json b/types/buffer-compare/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/buffer-compare/tslint.json
+++ b/types/buffer-compare/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/buffer-equal/tslint.json b/types/buffer-equal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/buffer-equal/tslint.json
+++ b/types/buffer-equal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/buffers/tslint.json b/types/buffers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/buffers/tslint.json
+++ b/types/buffers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bunyan-config/tslint.json b/types/bunyan-config/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bunyan-config/tslint.json
+++ b/types/bunyan-config/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bunyan-logentries/tslint.json b/types/bunyan-logentries/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bunyan-logentries/tslint.json
+++ b/types/bunyan-logentries/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bunyan-prettystream/tslint.json b/types/bunyan-prettystream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bunyan-prettystream/tslint.json
+++ b/types/bunyan-prettystream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/busboy/tslint.json b/types/busboy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/busboy/tslint.json
+++ b/types/busboy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/business-rules-engine/tslint.json b/types/business-rules-engine/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/business-rules-engine/tslint.json
+++ b/types/business-rules-engine/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bwip-js/tslint.json b/types/bwip-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bwip-js/tslint.json
+++ b/types/bwip-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/byline/tslint.json b/types/byline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/byline/tslint.json
+++ b/types/byline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/bytebuffer/tslint.json b/types/bytebuffer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/bytebuffer/tslint.json
+++ b/types/bytebuffer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cache-manager/tslint.json b/types/cache-manager/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cache-manager/tslint.json
+++ b/types/cache-manager/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cal-heatmap/tslint.json b/types/cal-heatmap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cal-heatmap/tslint.json
+++ b/types/cal-heatmap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/callsite/tslint.json b/types/callsite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/callsite/tslint.json
+++ b/types/callsite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/calq/tslint.json b/types/calq/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/calq/tslint.json
+++ b/types/calq/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/camljs/tslint.json b/types/camljs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/camljs/tslint.json
+++ b/types/camljs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/camo/tslint.json b/types/camo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/camo/tslint.json
+++ b/types/camo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cannon/tslint.json b/types/cannon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cannon/tslint.json
+++ b/types/cannon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/canvas-gauges/tslint.json b/types/canvas-gauges/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/canvas-gauges/tslint.json
+++ b/types/canvas-gauges/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cash/tslint.json b/types/cash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cash/tslint.json
+++ b/types/cash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cbor/tslint.json b/types/cbor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cbor/tslint.json
+++ b/types/cbor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-as-promised/tslint.json b/types/chai-as-promised/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-as-promised/tslint.json
+++ b/types/chai-as-promised/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-datetime/tslint.json b/types/chai-datetime/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-datetime/tslint.json
+++ b/types/chai-datetime/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-dom/tslint.json b/types/chai-dom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-dom/tslint.json
+++ b/types/chai-dom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-enzyme/tslint.json b/types/chai-enzyme/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-enzyme/tslint.json
+++ b/types/chai-enzyme/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-fuzzy/tslint.json b/types/chai-fuzzy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-fuzzy/tslint.json
+++ b/types/chai-fuzzy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-jquery/tslint.json b/types/chai-jquery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-jquery/tslint.json
+++ b/types/chai-jquery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-spies/tslint.json b/types/chai-spies/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-spies/tslint.json
+++ b/types/chai-spies/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-string/tslint.json b/types/chai-string/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-string/tslint.json
+++ b/types/chai-string/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chai-things/tslint.json b/types/chai-things/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chai-things/tslint.json
+++ b/types/chai-things/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chance/tslint.json b/types/chance/tslint.json
index 2ef6444ebb..a2a331133e 100644
--- a/types/chance/tslint.json
+++ b/types/chance/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         "adjacent-overload-signatures": false,
         "dt-header": false,
+        "npm-naming": false,
         "no-declare-current-package": false,
         "no-single-declare-module": false,
         "no-unnecessary-generics": false,
diff --git a/types/change-emitter/tslint.json b/types/change-emitter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/change-emitter/tslint.json
+++ b/types/change-emitter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chartist/tslint.json b/types/chartist/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chartist/tslint.json
+++ b/types/chartist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/checksum/tslint.json b/types/checksum/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/checksum/tslint.json
+++ b/types/checksum/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cheerio/tslint.json b/types/cheerio/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cheerio/tslint.json
+++ b/types/cheerio/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chocolatechipjs/tslint.json b/types/chocolatechipjs/tslint.json
index 9969e961d1..c5bc46f555 100644
--- a/types/chocolatechipjs/tslint.json
+++ b/types/chocolatechipjs/tslint.json
@@ -5,6 +5,7 @@
         "adjacent-overload-signatures": false,
         "ban-types": false,
         "dt-header": false,
+        "npm-naming": false,
         "no-any-union": false,
         "unified-signatures": false,
         "no-unnecessary-generics": false,
diff --git a/types/chrome-apps/tslint.json b/types/chrome-apps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chrome-apps/tslint.json
+++ b/types/chrome-apps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chrome/tslint.json b/types/chrome/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/chrome/tslint.json
+++ b/types/chrome/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/chui/tslint.json b/types/chui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/chui/tslint.json
+++ b/types/chui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cldrjs/tslint.json b/types/cldrjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cldrjs/tslint.json
+++ b/types/cldrjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cli-color/tslint.json b/types/cli-color/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cli-color/tslint.json
+++ b/types/cli-color/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cli/tslint.json b/types/cli/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cli/tslint.json
+++ b/types/cli/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cliff/tslint.json b/types/cliff/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cliff/tslint.json
+++ b/types/cliff/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/clipboard-js/tslint.json b/types/clipboard-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/clipboard-js/tslint.json
+++ b/types/clipboard-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/clone/tslint.json b/types/clone/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/clone/tslint.json
+++ b/types/clone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/closure-compiler/tslint.json b/types/closure-compiler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/closure-compiler/tslint.json
+++ b/types/closure-compiler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cloud-env/tslint.json b/types/cloud-env/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cloud-env/tslint.json
+++ b/types/cloud-env/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/co-body/tslint.json b/types/co-body/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/co-body/tslint.json
+++ b/types/co-body/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/codemirror/tslint.json b/types/codemirror/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/codemirror/tslint.json
+++ b/types/codemirror/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/coffeeify/tslint.json b/types/coffeeify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/coffeeify/tslint.json
+++ b/types/coffeeify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/collections/tslint.json b/types/collections/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/collections/tslint.json
+++ b/types/collections/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/colorbrewer/tslint.json b/types/colorbrewer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/colorbrewer/tslint.json
+++ b/types/colorbrewer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/com.darktalker.cordova.screenshot/tslint.json b/types/com.darktalker.cordova.screenshot/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/com.darktalker.cordova.screenshot/tslint.json
+++ b/types/com.darktalker.cordova.screenshot/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/combokeys/tslint.json b/types/combokeys/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/combokeys/tslint.json
+++ b/types/combokeys/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/command-line-commands/tslint.json b/types/command-line-commands/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/command-line-commands/tslint.json
+++ b/types/command-line-commands/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/commangular/tslint.json b/types/commangular/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/commangular/tslint.json
+++ b/types/commangular/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/compare-version/tslint.json b/types/compare-version/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/compare-version/tslint.json
+++ b/types/compare-version/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/component-emitter/tslint.json b/types/component-emitter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/component-emitter/tslint.json
+++ b/types/component-emitter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/compose-function/tslint.json b/types/compose-function/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/compose-function/tslint.json
+++ b/types/compose-function/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/compression/tslint.json b/types/compression/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/compression/tslint.json
+++ b/types/compression/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/concaveman/tslint.json b/types/concaveman/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/concaveman/tslint.json
+++ b/types/concaveman/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/confidence/tslint.json b/types/confidence/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/confidence/tslint.json
+++ b/types/confidence/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/config/tslint.json b/types/config/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/config/tslint.json
+++ b/types/config/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/confit/tslint.json b/types/confit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/confit/tslint.json
+++ b/types/confit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-flash/tslint.json b/types/connect-flash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-flash/tslint.json
+++ b/types/connect-flash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-livereload/tslint.json b/types/connect-livereload/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-livereload/tslint.json
+++ b/types/connect-livereload/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-modrewrite/tslint.json b/types/connect-modrewrite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-modrewrite/tslint.json
+++ b/types/connect-modrewrite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-mongo/tslint.json b/types/connect-mongo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-mongo/tslint.json
+++ b/types/connect-mongo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-mongodb-session/tslint.json b/types/connect-mongodb-session/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-mongodb-session/tslint.json
+++ b/types/connect-mongodb-session/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-redis/tslint.json b/types/connect-redis/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-redis/tslint.json
+++ b/types/connect-redis/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-slashes/tslint.json b/types/connect-slashes/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-slashes/tslint.json
+++ b/types/connect-slashes/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect-timeout/tslint.json b/types/connect-timeout/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect-timeout/tslint.json
+++ b/types/connect-timeout/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/connect/tslint.json b/types/connect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/connect/tslint.json
+++ b/types/connect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/console-stamp/tslint.json b/types/console-stamp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/console-stamp/tslint.json
+++ b/types/console-stamp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/consolidate/tslint.json b/types/consolidate/tslint.json
index a403f5da2b..69c84d8f83 100644
--- a/types/consolidate/tslint.json
+++ b/types/consolidate/tslint.json
@@ -9,6 +9,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/consul/tslint.json b/types/consul/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/consul/tslint.json
+++ b/types/consul/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/contentful-resolve-response/tslint.json b/types/contentful-resolve-response/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/contentful-resolve-response/tslint.json
+++ b/types/contentful-resolve-response/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/contextjs/tslint.json b/types/contextjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/contextjs/tslint.json
+++ b/types/contextjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cookie-session/tslint.json b/types/cookie-session/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cookie-session/tslint.json
+++ b/types/cookie-session/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cookie_js/tslint.json b/types/cookie_js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cookie_js/tslint.json
+++ b/types/cookie_js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/copy-paste/tslint.json b/types/copy-paste/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/copy-paste/tslint.json
+++ b/types/copy-paste/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-ionic/tslint.json b/types/cordova-ionic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-ionic/tslint.json
+++ b/types/cordova-ionic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-app-version/tslint.json b/types/cordova-plugin-app-version/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-app-version/tslint.json
+++ b/types/cordova-plugin-app-version/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-background-mode/tslint.json b/types/cordova-plugin-background-mode/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-background-mode/tslint.json
+++ b/types/cordova-plugin-background-mode/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-ble-central/tslint.json b/types/cordova-plugin-ble-central/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-ble-central/tslint.json
+++ b/types/cordova-plugin-ble-central/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-device-name/tslint.json b/types/cordova-plugin-device-name/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-device-name/tslint.json
+++ b/types/cordova-plugin-device-name/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-email-composer/tslint.json b/types/cordova-plugin-email-composer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-email-composer/tslint.json
+++ b/types/cordova-plugin-email-composer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-ibeacon/tslint.json b/types/cordova-plugin-ibeacon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-ibeacon/tslint.json
+++ b/types/cordova-plugin-ibeacon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-insomnia/tslint.json b/types/cordova-plugin-insomnia/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-insomnia/tslint.json
+++ b/types/cordova-plugin-insomnia/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-keyboard/tslint.json b/types/cordova-plugin-keyboard/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-keyboard/tslint.json
+++ b/types/cordova-plugin-keyboard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-mapsforge/tslint.json b/types/cordova-plugin-mapsforge/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-mapsforge/tslint.json
+++ b/types/cordova-plugin-mapsforge/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-ms-adal/tslint.json b/types/cordova-plugin-ms-adal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-ms-adal/tslint.json
+++ b/types/cordova-plugin-ms-adal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-ouralabs/tslint.json b/types/cordova-plugin-ouralabs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-ouralabs/tslint.json
+++ b/types/cordova-plugin-ouralabs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-qrscanner/tslint.json b/types/cordova-plugin-qrscanner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-qrscanner/tslint.json
+++ b/types/cordova-plugin-qrscanner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-spinner/tslint.json b/types/cordova-plugin-spinner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-spinner/tslint.json
+++ b/types/cordova-plugin-spinner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-websql/tslint.json b/types/cordova-plugin-websql/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-websql/tslint.json
+++ b/types/cordova-plugin-websql/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova-plugin-x-socialsharing/tslint.json b/types/cordova-plugin-x-socialsharing/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova-plugin-x-socialsharing/tslint.json
+++ b/types/cordova-plugin-x-socialsharing/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova/tslint.json b/types/cordova/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/cordova/tslint.json
+++ b/types/cordova/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordova_app_version_plugin/tslint.json b/types/cordova_app_version_plugin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordova_app_version_plugin/tslint.json
+++ b/types/cordova_app_version_plugin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cordovarduino/tslint.json b/types/cordovarduino/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cordovarduino/tslint.json
+++ b/types/cordovarduino/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cors/tslint.json b/types/cors/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cors/tslint.json
+++ b/types/cors/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/couchbase/tslint.json b/types/couchbase/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/couchbase/tslint.json
+++ b/types/couchbase/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/countdown/tslint.json b/types/countdown/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/countdown/tslint.json
+++ b/types/countdown/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cradle/tslint.json b/types/cradle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cradle/tslint.json
+++ b/types/cradle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/create-error/tslint.json b/types/create-error/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/create-error/tslint.json
+++ b/types/create-error/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/createjs-lib/tslint.json b/types/createjs-lib/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/createjs-lib/tslint.json
+++ b/types/createjs-lib/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/createjs/tslint.json b/types/createjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/createjs/tslint.json
+++ b/types/createjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/credential/tslint.json b/types/credential/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/credential/tslint.json
+++ b/types/credential/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/credit-card-type/tslint.json b/types/credit-card-type/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/credit-card-type/tslint.json
+++ b/types/credit-card-type/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cron/tslint.json b/types/cron/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cron/tslint.json
+++ b/types/cron/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cross-storage/tslint.json b/types/cross-storage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cross-storage/tslint.json
+++ b/types/cross-storage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/crossfilter/tslint.json b/types/crossfilter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/crossfilter/tslint.json
+++ b/types/crossfilter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/crossroads/tslint.json b/types/crossroads/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/crossroads/tslint.json
+++ b/types/crossroads/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/crypto-js/tslint.json b/types/crypto-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/crypto-js/tslint.json
+++ b/types/crypto-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cryptojs/tslint.json b/types/cryptojs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cryptojs/tslint.json
+++ b/types/cryptojs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cson/tslint.json b/types/cson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cson/tslint.json
+++ b/types/cson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/css-modules-require-hook/tslint.json b/types/css-modules-require-hook/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/css-modules-require-hook/tslint.json
+++ b/types/css-modules-require-hook/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/css/tslint.json b/types/css/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/css/tslint.json
+++ b/types/css/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cssbeautify/tslint.json b/types/cssbeautify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cssbeautify/tslint.json
+++ b/types/cssbeautify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/csurf/tslint.json b/types/csurf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/csurf/tslint.json
+++ b/types/csurf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cuid/tslint.json b/types/cuid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cuid/tslint.json
+++ b/types/cuid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/custom-error-generator/tslint.json b/types/custom-error-generator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/custom-error-generator/tslint.json
+++ b/types/custom-error-generator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/cybozulabs-md5/tslint.json b/types/cybozulabs-md5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/cybozulabs-md5/tslint.json
+++ b/types/cybozulabs-md5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/d3-box/tslint.json b/types/d3-box/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/d3-box/tslint.json
+++ b/types/d3-box/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/d3-cloud/tslint.json b/types/d3-cloud/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/d3-cloud/tslint.json
+++ b/types/d3-cloud/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/d3-tip/tslint.json b/types/d3-tip/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/d3-tip/tslint.json
+++ b/types/d3-tip/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/d3.slider/tslint.json b/types/d3.slider/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/d3.slider/tslint.json
+++ b/types/d3.slider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/d3pie/tslint.json b/types/d3pie/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/d3pie/tslint.json
+++ b/types/d3pie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dat.gui/tslint.json b/types/dat.gui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dat.gui/tslint.json
+++ b/types/dat.gui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/data-driven/tslint.json b/types/data-driven/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/data-driven/tslint.json
+++ b/types/data-driven/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/date-arithmetic/tslint.json b/types/date-arithmetic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/date-arithmetic/tslint.json
+++ b/types/date-arithmetic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/date.format.js/tslint.json b/types/date.format.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/date.format.js/tslint.json
+++ b/types/date.format.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/datejs/tslint.json b/types/datejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/datejs/tslint.json
+++ b/types/datejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/db-migrate-base/tslint.json b/types/db-migrate-base/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/db-migrate-base/tslint.json
+++ b/types/db-migrate-base/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/db-migrate-pg/tslint.json b/types/db-migrate-pg/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/db-migrate-pg/tslint.json
+++ b/types/db-migrate-pg/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/db.js/tslint.json b/types/db.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/db.js/tslint.json
+++ b/types/db.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dc/tslint.json b/types/dc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dc/tslint.json
+++ b/types/dc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/decorum/tslint.json b/types/decorum/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/decorum/tslint.json
+++ b/types/decorum/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/defaults/tslint.json b/types/defaults/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/defaults/tslint.json
+++ b/types/defaults/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/deku/tslint.json b/types/deku/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/deku/tslint.json
+++ b/types/deku/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/denodeify/tslint.json b/types/denodeify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/denodeify/tslint.json
+++ b/types/denodeify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/deoxxa-content-type/tslint.json b/types/deoxxa-content-type/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/deoxxa-content-type/tslint.json
+++ b/types/deoxxa-content-type/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/deployjava/tslint.json b/types/deployjava/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/deployjava/tslint.json
+++ b/types/deployjava/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/devexpress-web/tslint.json b/types/devexpress-web/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/devexpress-web/tslint.json
+++ b/types/devexpress-web/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/devtools-detect/tslint.json b/types/devtools-detect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/devtools-detect/tslint.json
+++ b/types/devtools-detect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/df-visible/tslint.json b/types/df-visible/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/df-visible/tslint.json
+++ b/types/df-visible/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dhtmlxgantt/tslint.json b/types/dhtmlxgantt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dhtmlxgantt/tslint.json
+++ b/types/dhtmlxgantt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dhtmlxscheduler/tslint.json b/types/dhtmlxscheduler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dhtmlxscheduler/tslint.json
+++ b/types/dhtmlxscheduler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/di-lite/tslint.json b/types/di-lite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/di-lite/tslint.json
+++ b/types/di-lite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/diff2html/tslint.json b/types/diff2html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/diff2html/tslint.json
+++ b/types/diff2html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/disposable-email-domains/tslint.json b/types/disposable-email-domains/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/disposable-email-domains/tslint.json
+++ b/types/disposable-email-domains/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/doccookies/tslint.json b/types/doccookies/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/doccookies/tslint.json
+++ b/types/doccookies/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dock-spawn/tslint.json b/types/dock-spawn/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dock-spawn/tslint.json
+++ b/types/dock-spawn/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/docopt/tslint.json b/types/docopt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/docopt/tslint.json
+++ b/types/docopt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/doctrine/tslint.json b/types/doctrine/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/doctrine/tslint.json
+++ b/types/doctrine/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/documentdb-server/tslint.json b/types/documentdb-server/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/documentdb-server/tslint.json
+++ b/types/documentdb-server/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dojo/tslint.json b/types/dojo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dojo/tslint.json
+++ b/types/dojo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dom4/tslint.json b/types/dom4/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dom4/tslint.json
+++ b/types/dom4/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/domo/tslint.json b/types/domo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/domo/tslint.json
+++ b/types/domo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dompurify/tslint.json b/types/dompurify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dompurify/tslint.json
+++ b/types/dompurify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/domurl/tslint.json b/types/domurl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/domurl/tslint.json
+++ b/types/domurl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/donna/tslint.json b/types/donna/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/donna/tslint.json
+++ b/types/donna/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dotdotdot/tslint.json b/types/dotdotdot/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dotdotdot/tslint.json
+++ b/types/dotdotdot/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/doublearray/tslint.json b/types/doublearray/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/doublearray/tslint.json
+++ b/types/doublearray/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/draft-js/tslint.json b/types/draft-js/tslint.json
index e3610fefae..89955128d5 100644
--- a/types/draft-js/tslint.json
+++ b/types/draft-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dragula/tslint.json b/types/dragula/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dragula/tslint.json
+++ b/types/dragula/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dropboxjs/tslint.json b/types/dropboxjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dropboxjs/tslint.json
+++ b/types/dropboxjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dropzone/tslint.json b/types/dropzone/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dropzone/tslint.json
+++ b/types/dropzone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dsv/tslint.json b/types/dsv/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dsv/tslint.json
+++ b/types/dsv/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dts-bundle/tslint.json b/types/dts-bundle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dts-bundle/tslint.json
+++ b/types/dts-bundle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/durandal/tslint.json b/types/durandal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/durandal/tslint.json
+++ b/types/durandal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dustjs-linkedin/tslint.json b/types/dustjs-linkedin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dustjs-linkedin/tslint.json
+++ b/types/dustjs-linkedin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dvtng-jss/tslint.json b/types/dvtng-jss/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dvtng-jss/tslint.json
+++ b/types/dvtng-jss/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dw-bxslider-4/tslint.json b/types/dw-bxslider-4/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dw-bxslider-4/tslint.json
+++ b/types/dw-bxslider-4/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dygraphs/tslint.json b/types/dygraphs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dygraphs/tslint.json
+++ b/types/dygraphs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dymo-label-framework/tslint.json b/types/dymo-label-framework/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dymo-label-framework/tslint.json
+++ b/types/dymo-label-framework/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/dynatable/tslint.json b/types/dynatable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/dynatable/tslint.json
+++ b/types/dynatable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/each/tslint.json b/types/each/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/each/tslint.json
+++ b/types/each/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easeljs/tslint.json b/types/easeljs/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/easeljs/tslint.json
+++ b/types/easeljs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-api-request/tslint.json b/types/easy-api-request/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-api-request/tslint.json
+++ b/types/easy-api-request/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-jsend/tslint.json b/types/easy-jsend/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-jsend/tslint.json
+++ b/types/easy-jsend/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-session/tslint.json b/types/easy-session/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-session/tslint.json
+++ b/types/easy-session/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-table/tslint.json b/types/easy-table/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-table/tslint.json
+++ b/types/easy-table/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-xapi-utils/tslint.json b/types/easy-xapi-utils/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-xapi-utils/tslint.json
+++ b/types/easy-xapi-utils/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/easy-xapi/tslint.json b/types/easy-xapi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/easy-xapi/tslint.json
+++ b/types/easy-xapi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/echarts/tslint.json b/types/echarts/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/echarts/tslint.json
+++ b/types/echarts/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/egg.js/tslint.json b/types/egg.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/egg.js/tslint.json
+++ b/types/egg.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ejs-locals/tslint.json b/types/ejs-locals/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ejs-locals/tslint.json
+++ b/types/ejs-locals/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ejson/tslint.json b/types/ejson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ejson/tslint.json
+++ b/types/ejson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/elastic.js/tslint.json b/types/elastic.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/elastic.js/tslint.json
+++ b/types/elastic.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/electron-debug/tslint.json b/types/electron-debug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/electron-debug/tslint.json
+++ b/types/electron-debug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/electron-devtools-installer/tslint.json b/types/electron-devtools-installer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/electron-devtools-installer/tslint.json
+++ b/types/electron-devtools-installer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/electron-notifications/tslint.json b/types/electron-notifications/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/electron-notifications/tslint.json
+++ b/types/electron-notifications/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/electron-notify/tslint.json b/types/electron-notify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/electron-notify/tslint.json
+++ b/types/electron-notify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/electron-window-state/tslint.json b/types/electron-window-state/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/electron-window-state/tslint.json
+++ b/types/electron-window-state/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/element-resize-event/tslint.json b/types/element-resize-event/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/element-resize-event/tslint.json
+++ b/types/element-resize-event/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/elm/tslint.json b/types/elm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/elm/tslint.json
+++ b/types/elm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ember-testing-helpers/tslint.json b/types/ember-testing-helpers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ember-testing-helpers/tslint.json
+++ b/types/ember-testing-helpers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/emissary/tslint.json b/types/emissary/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/emissary/tslint.json
+++ b/types/emissary/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/empower/tslint.json b/types/empower/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/empower/tslint.json
+++ b/types/empower/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/emscripten/tslint.json b/types/emscripten/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/emscripten/tslint.json
+++ b/types/emscripten/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/encoding-japanese/tslint.json b/types/encoding-japanese/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/encoding-japanese/tslint.json
+++ b/types/encoding-japanese/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/enhanced-resolve/tslint.json b/types/enhanced-resolve/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/enhanced-resolve/tslint.json
+++ b/types/enhanced-resolve/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ent/tslint.json b/types/ent/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ent/tslint.json
+++ b/types/ent/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/envify/tslint.json b/types/envify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/envify/tslint.json
+++ b/types/envify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/enzyme/tslint.json b/types/enzyme/tslint.json
index 67c3be0ed0..a5f1f5a4c3 100644
--- a/types/enzyme/tslint.json
+++ b/types/enzyme/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-duplicate-imports": false,
         "no-unnecessary-generics": false
     }
diff --git a/types/eonasdan-bootstrap-datetimepicker/tslint.json b/types/eonasdan-bootstrap-datetimepicker/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/eonasdan-bootstrap-datetimepicker/tslint.json
+++ b/types/eonasdan-bootstrap-datetimepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/epiceditor/tslint.json b/types/epiceditor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/epiceditor/tslint.json
+++ b/types/epiceditor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/epub/tslint.json b/types/epub/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/epub/tslint.json
+++ b/types/epub/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/eq.js/tslint.json b/types/eq.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/eq.js/tslint.json
+++ b/types/eq.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/errorhandler/tslint.json b/types/errorhandler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/errorhandler/tslint.json
+++ b/types/errorhandler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/es6-collections/tslint.json b/types/es6-collections/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/es6-collections/tslint.json
+++ b/types/es6-collections/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/es6-shim/tslint.json b/types/es6-shim/tslint.json
index 637071b426..592fc9bcaa 100644
--- a/types/es6-shim/tslint.json
+++ b/types/es6-shim/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/escape-html/tslint.json b/types/escape-html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/escape-html/tslint.json
+++ b/types/escape-html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/escape-latex/tslint.json b/types/escape-latex/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/escape-latex/tslint.json
+++ b/types/escape-latex/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/escape-string-regexp/tslint.json b/types/escape-string-regexp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/escape-string-regexp/tslint.json
+++ b/types/escape-string-regexp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/escodegen/tslint.json b/types/escodegen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/escodegen/tslint.json
+++ b/types/escodegen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/esprima-walk/tslint.json b/types/esprima-walk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/esprima-walk/tslint.json
+++ b/types/esprima-walk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/estraverse/tslint.json b/types/estraverse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/estraverse/tslint.json
+++ b/types/estraverse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/estree/tslint.json b/types/estree/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/estree/tslint.json
+++ b/types/estree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/event-loop-lag/tslint.json b/types/event-loop-lag/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/event-loop-lag/tslint.json
+++ b/types/event-loop-lag/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/event-stream/tslint.json b/types/event-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/event-stream/tslint.json
+++ b/types/event-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/event-to-promise/tslint.json b/types/event-to-promise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/event-to-promise/tslint.json
+++ b/types/event-to-promise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/evernote/tslint.json b/types/evernote/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/evernote/tslint.json
+++ b/types/evernote/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/exit/tslint.json b/types/exit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/exit/tslint.json
+++ b/types/exit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/exorcist/tslint.json b/types/exorcist/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/exorcist/tslint.json
+++ b/types/exorcist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/expect.js/tslint.json b/types/expect.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/expect.js/tslint.json
+++ b/types/expect.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/expectations/tslint.json b/types/expectations/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/expectations/tslint.json
+++ b/types/expectations/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-brute-memcached/tslint.json b/types/express-brute-memcached/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-brute-memcached/tslint.json
+++ b/types/express-brute-memcached/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-brute-mongo/tslint.json b/types/express-brute-mongo/tslint.json
index 81e3db2614..1134194a62 100644
--- a/types/express-brute-mongo/tslint.json
+++ b/types/express-brute-mongo/tslint.json
@@ -4,6 +4,7 @@
         // TODOs
         "ban-types": false,
         "dt-header": false,
+        "npm-naming": false,
         "no-unnecessary-class": false
     }
 }
diff --git a/types/express-brute/tslint.json b/types/express-brute/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-brute/tslint.json
+++ b/types/express-brute/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-debug/tslint.json b/types/express-debug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-debug/tslint.json
+++ b/types/express-debug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-domain-middleware/tslint.json b/types/express-domain-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-domain-middleware/tslint.json
+++ b/types/express-domain-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-handlebars/tslint.json b/types/express-handlebars/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-handlebars/tslint.json
+++ b/types/express-handlebars/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-jwt/tslint.json b/types/express-jwt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-jwt/tslint.json
+++ b/types/express-jwt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-less/tslint.json b/types/express-less/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-less/tslint.json
+++ b/types/express-less/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-minify/tslint.json b/types/express-minify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-minify/tslint.json
+++ b/types/express-minify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-mung/tslint.json b/types/express-mung/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-mung/tslint.json
+++ b/types/express-mung/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-myconnection/tslint.json b/types/express-myconnection/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-myconnection/tslint.json
+++ b/types/express-myconnection/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-openapi/tslint.json b/types/express-openapi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-openapi/tslint.json
+++ b/types/express-openapi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-partials/tslint.json b/types/express-partials/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-partials/tslint.json
+++ b/types/express-partials/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-route-fs/tslint.json b/types/express-route-fs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-route-fs/tslint.json
+++ b/types/express-route-fs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-unless/tslint.json b/types/express-unless/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-unless/tslint.json
+++ b/types/express-unless/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/express-useragent/tslint.json b/types/express-useragent/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/express-useragent/tslint.json
+++ b/types/express-useragent/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/extjs/tslint.json b/types/extjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/extjs/tslint.json
+++ b/types/extjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/eyes/tslint.json b/types/eyes/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/eyes/tslint.json
+++ b/types/eyes/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/facebook-js-sdk/tslint.json b/types/facebook-js-sdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/facebook-js-sdk/tslint.json
+++ b/types/facebook-js-sdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/facebook-pixel/tslint.json b/types/facebook-pixel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/facebook-pixel/tslint.json
+++ b/types/facebook-pixel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/faker/tslint.json b/types/faker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/faker/tslint.json
+++ b/types/faker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/falcor-express/tslint.json b/types/falcor-express/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/falcor-express/tslint.json
+++ b/types/falcor-express/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/falcor-http-datasource/tslint.json b/types/falcor-http-datasource/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/falcor-http-datasource/tslint.json
+++ b/types/falcor-http-datasource/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/falcor-json-graph/tslint.json b/types/falcor-json-graph/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/falcor-json-graph/tslint.json
+++ b/types/falcor-json-graph/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/falcor-router/tslint.json b/types/falcor-router/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/falcor-router/tslint.json
+++ b/types/falcor-router/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/famous/tslint.json b/types/famous/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/famous/tslint.json
+++ b/types/famous/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/farbtastic/tslint.json b/types/farbtastic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/farbtastic/tslint.json
+++ b/types/farbtastic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fast-levenshtein/tslint.json b/types/fast-levenshtein/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fast-levenshtein/tslint.json
+++ b/types/fast-levenshtein/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fast-stats/tslint.json b/types/fast-stats/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fast-stats/tslint.json
+++ b/types/fast-stats/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fastclick/tslint.json b/types/fastclick/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fastclick/tslint.json
+++ b/types/fastclick/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/favico.js/tslint.json b/types/favico.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/favico.js/tslint.json
+++ b/types/favico.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fb/tslint.json b/types/fb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fb/tslint.json
+++ b/types/fb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fbemitter/tslint.json b/types/fbemitter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fbemitter/tslint.json
+++ b/types/fbemitter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/featherlight/tslint.json b/types/featherlight/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/featherlight/tslint.json
+++ b/types/featherlight/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fhir/tslint.json b/types/fhir/tslint.json
index e87060ef20..9f58325d7f 100644
--- a/types/fhir/tslint.json
+++ b/types/fhir/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fibers/tslint.json b/types/fibers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fibers/tslint.json
+++ b/types/fibers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/field/tslint.json b/types/field/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/field/tslint.json
+++ b/types/field/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/filesystem/tslint.json b/types/filesystem/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/filesystem/tslint.json
+++ b/types/filesystem/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/filewriter/tslint.json b/types/filewriter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/filewriter/tslint.json
+++ b/types/filewriter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fill-pdf/tslint.json b/types/fill-pdf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fill-pdf/tslint.json
+++ b/types/fill-pdf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/finalhandler/tslint.json b/types/finalhandler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/finalhandler/tslint.json
+++ b/types/finalhandler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/finch/tslint.json b/types/finch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/finch/tslint.json
+++ b/types/finch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fingerprintjs/tslint.json b/types/fingerprintjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fingerprintjs/tslint.json
+++ b/types/fingerprintjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/firebase-client/tslint.json b/types/firebase-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/firebase-client/tslint.json
+++ b/types/firebase-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/firebase-token-generator/tslint.json b/types/firebase-token-generator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/firebase-token-generator/tslint.json
+++ b/types/firebase-token-generator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/firefox/tslint.json b/types/firefox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/firefox/tslint.json
+++ b/types/firefox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fixed-data-table/tslint.json b/types/fixed-data-table/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fixed-data-table/tslint.json
+++ b/types/fixed-data-table/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flake-idgen/tslint.json b/types/flake-idgen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flake-idgen/tslint.json
+++ b/types/flake-idgen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flat/tslint.json b/types/flat/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flat/tslint.json
+++ b/types/flat/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flexslider/tslint.json b/types/flexslider/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flexslider/tslint.json
+++ b/types/flexslider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flight/tslint.json b/types/flight/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flight/tslint.json
+++ b/types/flight/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flightplan/tslint.json b/types/flightplan/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flightplan/tslint.json
+++ b/types/flightplan/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flipsnap/tslint.json b/types/flipsnap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flipsnap/tslint.json
+++ b/types/flipsnap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flot/tslint.json b/types/flot/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flot/tslint.json
+++ b/types/flot/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/flowjs/tslint.json b/types/flowjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/flowjs/tslint.json
+++ b/types/flowjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fluxxor/tslint.json b/types/fluxxor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fluxxor/tslint.json
+++ b/types/fluxxor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fontfaceobserver/tslint.json b/types/fontfaceobserver/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fontfaceobserver/tslint.json
+++ b/types/fontfaceobserver/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fontoxml/tslint.json b/types/fontoxml/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fontoxml/tslint.json
+++ b/types/fontoxml/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/forge-di/tslint.json b/types/forge-di/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/forge-di/tslint.json
+++ b/types/forge-di/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/form-serializer/tslint.json b/types/form-serializer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/form-serializer/tslint.json
+++ b/types/form-serializer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/formidable/tslint.json b/types/formidable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/formidable/tslint.json
+++ b/types/formidable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fossil-delta/tslint.json b/types/fossil-delta/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fossil-delta/tslint.json
+++ b/types/fossil-delta/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/foundation/tslint.json b/types/foundation/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/foundation/tslint.json
+++ b/types/foundation/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fpsmeter/tslint.json b/types/fpsmeter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fpsmeter/tslint.json
+++ b/types/fpsmeter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/freedom/tslint.json b/types/freedom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/freedom/tslint.json
+++ b/types/freedom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/from/tslint.json b/types/from/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/from/tslint.json
+++ b/types/from/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fromjs/tslint.json b/types/fromjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fromjs/tslint.json
+++ b/types/fromjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fromnow/tslint.json b/types/fromnow/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fromnow/tslint.json
+++ b/types/fromnow/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fs-ext/tslint.json b/types/fs-ext/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fs-ext/tslint.json
+++ b/types/fs-ext/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fs-finder/tslint.json b/types/fs-finder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fs-finder/tslint.json
+++ b/types/fs-finder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fs-mock/tslint.json b/types/fs-mock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fs-mock/tslint.json
+++ b/types/fs-mock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ftdomdelegate/tslint.json b/types/ftdomdelegate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ftdomdelegate/tslint.json
+++ b/types/ftdomdelegate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ftp/tslint.json b/types/ftp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ftp/tslint.json
+++ b/types/ftp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ftpd/tslint.json b/types/ftpd/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/ftpd/tslint.json
+++ b/types/ftpd/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fullname/tslint.json b/types/fullname/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fullname/tslint.json
+++ b/types/fullname/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fullpage.js/tslint.json b/types/fullpage.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fullpage.js/tslint.json
+++ b/types/fullpage.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fuzzaldrin-plus/tslint.json b/types/fuzzaldrin-plus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fuzzaldrin-plus/tslint.json
+++ b/types/fuzzaldrin-plus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/fxn/tslint.json b/types/fxn/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/fxn/tslint.json
+++ b/types/fxn/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gae.channel.api/tslint.json b/types/gae.channel.api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gae.channel.api/tslint.json
+++ b/types/gae.channel.api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gamequery/tslint.json b/types/gamequery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gamequery/tslint.json
+++ b/types/gamequery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gandi-livedns/tslint.json b/types/gandi-livedns/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gandi-livedns/tslint.json
+++ b/types/gandi-livedns/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.analytics/tslint.json b/types/gapi.analytics/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.analytics/tslint.json
+++ b/types/gapi.analytics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.calendar/tslint.json b/types/gapi.calendar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.calendar/tslint.json
+++ b/types/gapi.calendar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.drive/tslint.json b/types/gapi.drive/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.drive/tslint.json
+++ b/types/gapi.drive/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.pagespeedonline/tslint.json b/types/gapi.pagespeedonline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.pagespeedonline/tslint.json
+++ b/types/gapi.pagespeedonline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.people/tslint.json b/types/gapi.people/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.people/tslint.json
+++ b/types/gapi.people/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.plus/tslint.json b/types/gapi.plus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.plus/tslint.json
+++ b/types/gapi.plus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.translate/tslint.json b/types/gapi.translate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.translate/tslint.json
+++ b/types/gapi.translate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.urlshortener/tslint.json b/types/gapi.urlshortener/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.urlshortener/tslint.json
+++ b/types/gapi.urlshortener/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.youtube/tslint.json b/types/gapi.youtube/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.youtube/tslint.json
+++ b/types/gapi.youtube/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi.youtubeanalytics/tslint.json b/types/gapi.youtubeanalytics/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi.youtubeanalytics/tslint.json
+++ b/types/gapi.youtubeanalytics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gapi/tslint.json b/types/gapi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gapi/tslint.json
+++ b/types/gapi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/generic-functions/tslint.json b/types/generic-functions/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/generic-functions/tslint.json
+++ b/types/generic-functions/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gently/tslint.json b/types/gently/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gently/tslint.json
+++ b/types/gently/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/geoip-lite/tslint.json b/types/geoip-lite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/geoip-lite/tslint.json
+++ b/types/geoip-lite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/geojson2osm/tslint.json b/types/geojson2osm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/geojson2osm/tslint.json
+++ b/types/geojson2osm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/geometry-dom/tslint.json b/types/geometry-dom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/geometry-dom/tslint.json
+++ b/types/geometry-dom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gijgo/tslint.json b/types/gijgo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gijgo/tslint.json
+++ b/types/gijgo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/giraffe/tslint.json b/types/giraffe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/giraffe/tslint.json
+++ b/types/giraffe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/git-config/tslint.json b/types/git-config/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/git-config/tslint.json
+++ b/types/git-config/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/git/tslint.json b/types/git/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/git/tslint.json
+++ b/types/git/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gl-matrix/tslint.json b/types/gl-matrix/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gl-matrix/tslint.json
+++ b/types/gl-matrix/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gldatepicker/tslint.json b/types/gldatepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gldatepicker/tslint.json
+++ b/types/gldatepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/glidejs/tslint.json b/types/glidejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/glidejs/tslint.json
+++ b/types/glidejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/glob-expand/tslint.json b/types/glob-expand/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/glob-expand/tslint.json
+++ b/types/glob-expand/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/glob-stream/tslint.json b/types/glob-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/glob-stream/tslint.json
+++ b/types/glob-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/globalize-compiler/tslint.json b/types/globalize-compiler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/globalize-compiler/tslint.json
+++ b/types/globalize-compiler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/globalize/tslint.json b/types/globalize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/globalize/tslint.json
+++ b/types/globalize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/go/tslint.json b/types/go/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/go/tslint.json
+++ b/types/go/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-apps-script/tslint.json b/types/google-apps-script/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-apps-script/tslint.json
+++ b/types/google-apps-script/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-closure-compiler/tslint.json b/types/google-closure-compiler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-closure-compiler/tslint.json
+++ b/types/google-closure-compiler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-drive-realtime-api/tslint.json b/types/google-drive-realtime-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-drive-realtime-api/tslint.json
+++ b/types/google-drive-realtime-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-earth/tslint.json b/types/google-earth/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-earth/tslint.json
+++ b/types/google-earth/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-libphonenumber/tslint.json b/types/google-libphonenumber/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-libphonenumber/tslint.json
+++ b/types/google-libphonenumber/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google-maps/tslint.json b/types/google-maps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google-maps/tslint.json
+++ b/types/google-maps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google.analytics/tslint.json b/types/google.analytics/tslint.json
index d802652174..8c0a18b10a 100644
--- a/types/google.analytics/tslint.json
+++ b/types/google.analytics/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "dt-header": false,
+        "npm-naming": false,
         "ban-types": false,
         "unified-signatures": false,
         "no-unnecessary-generics": false
diff --git a/types/google.feeds/tslint.json b/types/google.feeds/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google.feeds/tslint.json
+++ b/types/google.feeds/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google.geolocation/tslint.json b/types/google.geolocation/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google.geolocation/tslint.json
+++ b/types/google.geolocation/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google.picker/tslint.json b/types/google.picker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google.picker/tslint.json
+++ b/types/google.picker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/google.visualization/tslint.json b/types/google.visualization/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/google.visualization/tslint.json
+++ b/types/google.visualization/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/googlemaps.infobubble/tslint.json b/types/googlemaps.infobubble/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/googlemaps.infobubble/tslint.json
+++ b/types/googlemaps.infobubble/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/googlemaps/tslint.json b/types/googlemaps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/googlemaps/tslint.json
+++ b/types/googlemaps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/graham_scan/tslint.json b/types/graham_scan/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/graham_scan/tslint.json
+++ b/types/graham_scan/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/graphlib/tslint.json b/types/graphlib/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/graphlib/tslint.json
+++ b/types/graphlib/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/graphviz/tslint.json b/types/graphviz/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/graphviz/tslint.json
+++ b/types/graphviz/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gravatar/tslint.json b/types/gravatar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gravatar/tslint.json
+++ b/types/gravatar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gregorian-calendar/tslint.json b/types/gregorian-calendar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gregorian-calendar/tslint.json
+++ b/types/gregorian-calendar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gridfs-stream/tslint.json b/types/gridfs-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gridfs-stream/tslint.json
+++ b/types/gridfs-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gridstack/tslint.json b/types/gridstack/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/gridstack/tslint.json
+++ b/types/gridstack/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/grunt/tslint.json b/types/grunt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/grunt/tslint.json
+++ b/types/grunt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gsap/tslint.json b/types/gsap/tslint.json
index 9081f7897d..972c8224ab 100644
--- a/types/gsap/tslint.json
+++ b/types/gsap/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // All are TODOs
         "dt-header": false,
+        "npm-naming": false,
         "jsdoc-format": false,
         "max-line-length": false,
         "no-consecutive-blank-lines": false,
diff --git a/types/gulp-angular-templatecache/tslint.json b/types/gulp-angular-templatecache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-angular-templatecache/tslint.json
+++ b/types/gulp-angular-templatecache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-autoprefixer/tslint.json b/types/gulp-autoprefixer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-autoprefixer/tslint.json
+++ b/types/gulp-autoprefixer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-babel/tslint.json b/types/gulp-babel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-babel/tslint.json
+++ b/types/gulp-babel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-cache/tslint.json b/types/gulp-cache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-cache/tslint.json
+++ b/types/gulp-cache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-cached/tslint.json b/types/gulp-cached/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-cached/tslint.json
+++ b/types/gulp-cached/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-changed/tslint.json b/types/gulp-changed/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-changed/tslint.json
+++ b/types/gulp-changed/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-cheerio/tslint.json b/types/gulp-cheerio/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-cheerio/tslint.json
+++ b/types/gulp-cheerio/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-coffeeify/tslint.json b/types/gulp-coffeeify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-coffeeify/tslint.json
+++ b/types/gulp-coffeeify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-coffeelint/tslint.json b/types/gulp-coffeelint/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-coffeelint/tslint.json
+++ b/types/gulp-coffeelint/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-concat/tslint.json b/types/gulp-concat/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-concat/tslint.json
+++ b/types/gulp-concat/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-copy/tslint.json b/types/gulp-copy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-copy/tslint.json
+++ b/types/gulp-copy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-csso/tslint.json b/types/gulp-csso/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-csso/tslint.json
+++ b/types/gulp-csso/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-debug/tslint.json b/types/gulp-debug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-debug/tslint.json
+++ b/types/gulp-debug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-dtsm/tslint.json b/types/gulp-dtsm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-dtsm/tslint.json
+++ b/types/gulp-dtsm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-espower/tslint.json b/types/gulp-espower/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-espower/tslint.json
+++ b/types/gulp-espower/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-file-include/tslint.json b/types/gulp-file-include/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-file-include/tslint.json
+++ b/types/gulp-file-include/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-filter/tslint.json b/types/gulp-filter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-filter/tslint.json
+++ b/types/gulp-filter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-flatten/tslint.json b/types/gulp-flatten/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-flatten/tslint.json
+++ b/types/gulp-flatten/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-gh-pages/tslint.json b/types/gulp-gh-pages/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-gh-pages/tslint.json
+++ b/types/gulp-gh-pages/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-gzip/tslint.json b/types/gulp-gzip/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-gzip/tslint.json
+++ b/types/gulp-gzip/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-help-doc/tslint.json b/types/gulp-help-doc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-help-doc/tslint.json
+++ b/types/gulp-help-doc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-help/tslint.json b/types/gulp-help/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-help/tslint.json
+++ b/types/gulp-help/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-html-replace/tslint.json b/types/gulp-html-replace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-html-replace/tslint.json
+++ b/types/gulp-html-replace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-htmlmin/tslint.json b/types/gulp-htmlmin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-htmlmin/tslint.json
+++ b/types/gulp-htmlmin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-if/tslint.json b/types/gulp-if/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-if/tslint.json
+++ b/types/gulp-if/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-inject/tslint.json b/types/gulp-inject/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-inject/tslint.json
+++ b/types/gulp-inject/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-insert/tslint.json b/types/gulp-insert/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-insert/tslint.json
+++ b/types/gulp-insert/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-install/tslint.json b/types/gulp-install/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-install/tslint.json
+++ b/types/gulp-install/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-istanbul/tslint.json b/types/gulp-istanbul/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-istanbul/tslint.json
+++ b/types/gulp-istanbul/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-jade/tslint.json b/types/gulp-jade/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-jade/tslint.json
+++ b/types/gulp-jade/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-jasmine-browser/tslint.json b/types/gulp-jasmine-browser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-jasmine-browser/tslint.json
+++ b/types/gulp-jasmine-browser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-json-editor/tslint.json b/types/gulp-json-editor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-json-editor/tslint.json
+++ b/types/gulp-json-editor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-jspm/tslint.json b/types/gulp-jspm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-jspm/tslint.json
+++ b/types/gulp-jspm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-less/tslint.json b/types/gulp-less/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-less/tslint.json
+++ b/types/gulp-less/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-load-plugins/tslint.json b/types/gulp-load-plugins/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-load-plugins/tslint.json
+++ b/types/gulp-load-plugins/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-minify-css/tslint.json b/types/gulp-minify-css/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-minify-css/tslint.json
+++ b/types/gulp-minify-css/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-minify-html/tslint.json b/types/gulp-minify-html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-minify-html/tslint.json
+++ b/types/gulp-minify-html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-mocha/tslint.json b/types/gulp-mocha/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-mocha/tslint.json
+++ b/types/gulp-mocha/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-newer/tslint.json b/types/gulp-newer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-newer/tslint.json
+++ b/types/gulp-newer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-ng-annotate/tslint.json b/types/gulp-ng-annotate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-ng-annotate/tslint.json
+++ b/types/gulp-ng-annotate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-nodemon/tslint.json b/types/gulp-nodemon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-nodemon/tslint.json
+++ b/types/gulp-nodemon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-plumber/tslint.json b/types/gulp-plumber/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-plumber/tslint.json
+++ b/types/gulp-plumber/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-protractor/tslint.json b/types/gulp-protractor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-protractor/tslint.json
+++ b/types/gulp-protractor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-remember/tslint.json b/types/gulp-remember/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-remember/tslint.json
+++ b/types/gulp-remember/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-rename/tslint.json b/types/gulp-rename/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-rename/tslint.json
+++ b/types/gulp-rename/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-replace/tslint.json b/types/gulp-replace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-replace/tslint.json
+++ b/types/gulp-replace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-rev-replace/tslint.json b/types/gulp-rev-replace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-rev-replace/tslint.json
+++ b/types/gulp-rev-replace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-rev/tslint.json b/types/gulp-rev/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-rev/tslint.json
+++ b/types/gulp-rev/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-ruby-sass/tslint.json b/types/gulp-ruby-sass/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-ruby-sass/tslint.json
+++ b/types/gulp-ruby-sass/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-sass/tslint.json b/types/gulp-sass/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-sass/tslint.json
+++ b/types/gulp-sass/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-shell/tslint.json b/types/gulp-shell/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-shell/tslint.json
+++ b/types/gulp-shell/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-sort/tslint.json b/types/gulp-sort/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-sort/tslint.json
+++ b/types/gulp-sort/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-sourcemaps/tslint.json b/types/gulp-sourcemaps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-sourcemaps/tslint.json
+++ b/types/gulp-sourcemaps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-strip-debug/tslint.json b/types/gulp-strip-debug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-strip-debug/tslint.json
+++ b/types/gulp-strip-debug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-svg-sprite/tslint.json b/types/gulp-svg-sprite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-svg-sprite/tslint.json
+++ b/types/gulp-svg-sprite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-task-listing/tslint.json b/types/gulp-task-listing/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-task-listing/tslint.json
+++ b/types/gulp-task-listing/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-tsd/tslint.json b/types/gulp-tsd/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-tsd/tslint.json
+++ b/types/gulp-tsd/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-useref/tslint.json b/types/gulp-useref/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-useref/tslint.json
+++ b/types/gulp-useref/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp-watch/tslint.json b/types/gulp-watch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/gulp-watch/tslint.json
+++ b/types/gulp-watch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/gulp/tslint.json b/types/gulp/tslint.json
index 0ba754a19a..19067f25e6 100644
--- a/types/gulp/tslint.json
+++ b/types/gulp/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-object-literal-type-assertion": false
     }
 }
diff --git a/types/h2o2/tslint.json b/types/h2o2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/h2o2/tslint.json
+++ b/types/h2o2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/halfred/tslint.json b/types/halfred/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/halfred/tslint.json
+++ b/types/halfred/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hammerjs/tslint.json b/types/hammerjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hammerjs/tslint.json
+++ b/types/hammerjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hapi-auth-basic/tslint.json b/types/hapi-auth-basic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hapi-auth-basic/tslint.json
+++ b/types/hapi-auth-basic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hapi-decorators/tslint.json b/types/hapi-decorators/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hapi-decorators/tslint.json
+++ b/types/hapi-decorators/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/harmony-proxy/tslint.json b/types/harmony-proxy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/harmony-proxy/tslint.json
+++ b/types/harmony-proxy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hasher/tslint.json b/types/hasher/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hasher/tslint.json
+++ b/types/hasher/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hashids/tslint.json b/types/hashids/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hashids/tslint.json
+++ b/types/hashids/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hashmap/tslint.json b/types/hashmap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hashmap/tslint.json
+++ b/types/hashmap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hashset/tslint.json b/types/hashset/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hashset/tslint.json
+++ b/types/hashset/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hashtable/tslint.json b/types/hashtable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hashtable/tslint.json
+++ b/types/hashtable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/he/tslint.json b/types/he/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/he/tslint.json
+++ b/types/he/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/headroom/tslint.json b/types/headroom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/headroom/tslint.json
+++ b/types/headroom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/heap/tslint.json b/types/heap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/heap/tslint.json
+++ b/types/heap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hellosign-embedded/tslint.json b/types/hellosign-embedded/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hellosign-embedded/tslint.json
+++ b/types/hellosign-embedded/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/helmet/tslint.json b/types/helmet/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/helmet/tslint.json
+++ b/types/helmet/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/highcharts-ng/tslint.json b/types/highcharts-ng/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/highcharts-ng/tslint.json
+++ b/types/highcharts-ng/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/highland/tslint.json b/types/highland/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/highland/tslint.json
+++ b/types/highland/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/highlight.js/tslint.json b/types/highlight.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/highlight.js/tslint.json
+++ b/types/highlight.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/history.js/tslint.json b/types/history.js/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/history.js/tslint.json
+++ b/types/history.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/history/tslint.json b/types/history/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/history/tslint.json
+++ b/types/history/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hooker/tslint.json b/types/hooker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hooker/tslint.json
+++ b/types/hooker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hopscotch/tslint.json b/types/hopscotch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hopscotch/tslint.json
+++ b/types/hopscotch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/howler/tslint.json b/types/howler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/howler/tslint.json
+++ b/types/howler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/html-entities/tslint.json b/types/html-entities/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/html-entities/tslint.json
+++ b/types/html-entities/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/html-pdf/tslint.json b/types/html-pdf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/html-pdf/tslint.json
+++ b/types/html-pdf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/html-to-text/tslint.json b/types/html-to-text/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/html-to-text/tslint.json
+++ b/types/html-to-text/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/html2canvas/tslint.json b/types/html2canvas/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/html2canvas/tslint.json
+++ b/types/html2canvas/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/htmlescape/tslint.json b/types/htmlescape/tslint.json
index cb07a85b4e..6439f14555 100644
--- a/types/htmlescape/tslint.json
+++ b/types/htmlescape/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODO
 		"dt-header": false,
+        "npm-naming": false,
 		"no-duplicate-imports": false
 	}
 }
diff --git a/types/htmlhint/tslint.json b/types/htmlhint/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/htmlhint/tslint.json
+++ b/types/htmlhint/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/htmlparser2/tslint.json b/types/htmlparser2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/htmlparser2/tslint.json
+++ b/types/htmlparser2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/htmltojsx/tslint.json b/types/htmltojsx/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/htmltojsx/tslint.json
+++ b/types/htmltojsx/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/http-status/tslint.json b/types/http-status/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/http-status/tslint.json
+++ b/types/http-status/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/http-string-parser/tslint.json b/types/http-string-parser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/http-string-parser/tslint.json
+++ b/types/http-string-parser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/httperr/tslint.json b/types/httperr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/httperr/tslint.json
+++ b/types/httperr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hubspot-pace/tslint.json b/types/hubspot-pace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hubspot-pace/tslint.json
+++ b/types/hubspot-pace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/humane/tslint.json b/types/humane/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/humane/tslint.json
+++ b/types/humane/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/humanparser/tslint.json b/types/humanparser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/humanparser/tslint.json
+++ b/types/humanparser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/humps/tslint.json b/types/humps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/humps/tslint.json
+++ b/types/humps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hyperscript/tslint.json b/types/hyperscript/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hyperscript/tslint.json
+++ b/types/hyperscript/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/hypertext-application-language/tslint.json b/types/hypertext-application-language/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/hypertext-application-language/tslint.json
+++ b/types/hypertext-application-language/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/i18next-express-middleware/tslint.json b/types/i18next-express-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/i18next-express-middleware/tslint.json
+++ b/types/i18next-express-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/i18next-node-fs-backend/tslint.json b/types/i18next-node-fs-backend/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/i18next-node-fs-backend/tslint.json
+++ b/types/i18next-node-fs-backend/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/i18next-sprintf-postprocessor/tslint.json b/types/i18next-sprintf-postprocessor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/i18next-sprintf-postprocessor/tslint.json
+++ b/types/i18next-sprintf-postprocessor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/i2c-bus/tslint.json b/types/i2c-bus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/i2c-bus/tslint.json
+++ b/types/i2c-bus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/iban/tslint.json b/types/iban/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/iban/tslint.json
+++ b/types/iban/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ibm-mobilefirst/tslint.json b/types/ibm-mobilefirst/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ibm-mobilefirst/tslint.json
+++ b/types/ibm-mobilefirst/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/icepick/tslint.json b/types/icepick/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/icepick/tslint.json
+++ b/types/icepick/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/icheck/tslint.json b/types/icheck/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/icheck/tslint.json
+++ b/types/icheck/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/iconv/tslint.json b/types/iconv/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/iconv/tslint.json
+++ b/types/iconv/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ignite-ui/tslint.json b/types/ignite-ui/tslint.json
index b8160f687d..26a2f9209a 100644
--- a/types/ignite-ui/tslint.json
+++ b/types/ignite-ui/tslint.json
@@ -4,6 +4,7 @@
         // All are TODOs
         "array-type": false,
         "dt-header": false,
+        "npm-naming": false,
         "ban-types": false,
         "callable-types": false,
         "no-empty-interface": false,
diff --git a/types/imagemagick-native/tslint.json b/types/imagemagick-native/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imagemagick-native/tslint.json
+++ b/types/imagemagick-native/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imagemagick/tslint.json b/types/imagemagick/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imagemagick/tslint.json
+++ b/types/imagemagick/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imagemapster/tslint.json b/types/imagemapster/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imagemapster/tslint.json
+++ b/types/imagemapster/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imagesloaded/tslint.json b/types/imagesloaded/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imagesloaded/tslint.json
+++ b/types/imagesloaded/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imap-simple/tslint.json b/types/imap-simple/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imap-simple/tslint.json
+++ b/types/imap-simple/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imap/tslint.json b/types/imap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imap/tslint.json
+++ b/types/imap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/imgur-rest-api/tslint.json b/types/imgur-rest-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/imgur-rest-api/tslint.json
+++ b/types/imgur-rest-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/impress/tslint.json b/types/impress/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/impress/tslint.json
+++ b/types/impress/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/incremental-dom/tslint.json b/types/incremental-dom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/incremental-dom/tslint.json
+++ b/types/incremental-dom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inflected/tslint.json b/types/inflected/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inflected/tslint.json
+++ b/types/inflected/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inflection/tslint.json b/types/inflection/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inflection/tslint.json
+++ b/types/inflection/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inherits/tslint.json b/types/inherits/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inherits/tslint.json
+++ b/types/inherits/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ini/tslint.json b/types/ini/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ini/tslint.json
+++ b/types/ini/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/iniparser/tslint.json b/types/iniparser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/iniparser/tslint.json
+++ b/types/iniparser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inline-css/tslint.json b/types/inline-css/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inline-css/tslint.json
+++ b/types/inline-css/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inquirer/tslint.json b/types/inquirer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inquirer/tslint.json
+++ b/types/inquirer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/insight/tslint.json b/types/insight/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/insight/tslint.json
+++ b/types/insight/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/intercomjs/tslint.json b/types/intercomjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/intercomjs/tslint.json
+++ b/types/intercomjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/intro.js/tslint.json b/types/intro.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/intro.js/tslint.json
+++ b/types/intro.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/invariant/tslint.json b/types/invariant/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/invariant/tslint.json
+++ b/types/invariant/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/inversify-devtools/tslint.json b/types/inversify-devtools/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/inversify-devtools/tslint.json
+++ b/types/inversify-devtools/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/irc/tslint.json b/types/irc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/irc/tslint.json
+++ b/types/irc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/is-my-json-valid/tslint.json b/types/is-my-json-valid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/is-my-json-valid/tslint.json
+++ b/types/is-my-json-valid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/is-url/tslint.json b/types/is-url/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/is-url/tslint.json
+++ b/types/is-url/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/is/tslint.json b/types/is/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/is/tslint.json
+++ b/types/is/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/iscroll/tslint.json b/types/iscroll/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/iscroll/tslint.json
+++ b/types/iscroll/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/iso8601-localizer/tslint.json b/types/iso8601-localizer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/iso8601-localizer/tslint.json
+++ b/types/iso8601-localizer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/istanbul-middleware/tslint.json b/types/istanbul-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/istanbul-middleware/tslint.json
+++ b/types/istanbul-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/istanbul/tslint.json b/types/istanbul/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/istanbul/tslint.json
+++ b/types/istanbul/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ix.js/tslint.json b/types/ix.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ix.js/tslint.json
+++ b/types/ix.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jade/tslint.json b/types/jade/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jade/tslint.json
+++ b/types/jade/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jake/tslint.json b/types/jake/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jake/tslint.json
+++ b/types/jake/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jasmine-es6-promise-matchers/tslint.json b/types/jasmine-es6-promise-matchers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jasmine-es6-promise-matchers/tslint.json
+++ b/types/jasmine-es6-promise-matchers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jasmine-jquery/tslint.json b/types/jasmine-jquery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jasmine-jquery/tslint.json
+++ b/types/jasmine-jquery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jasmine-matchers/tslint.json b/types/jasmine-matchers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jasmine-matchers/tslint.json
+++ b/types/jasmine-matchers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jasmine-node/tslint.json b/types/jasmine-node/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jasmine-node/tslint.json
+++ b/types/jasmine-node/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jasmine-promise-matchers/tslint.json b/types/jasmine-promise-matchers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jasmine-promise-matchers/tslint.json
+++ b/types/jasmine-promise-matchers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/java-applet/tslint.json b/types/java-applet/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/java-applet/tslint.json
+++ b/types/java-applet/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/java/tslint.json b/types/java/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/java/tslint.json
+++ b/types/java/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/javascript-astar/tslint.json b/types/javascript-astar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/javascript-astar/tslint.json
+++ b/types/javascript-astar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/javascript-bignum/tslint.json b/types/javascript-bignum/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/javascript-bignum/tslint.json
+++ b/types/javascript-bignum/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/javascript-obfuscator/tslint.json b/types/javascript-obfuscator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/javascript-obfuscator/tslint.json
+++ b/types/javascript-obfuscator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jbinary/tslint.json b/types/jbinary/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jbinary/tslint.json
+++ b/types/jbinary/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jcanvas/tslint.json b/types/jcanvas/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jcanvas/tslint.json
+++ b/types/jcanvas/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jdataview/tslint.json b/types/jdataview/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jdataview/tslint.json
+++ b/types/jdataview/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jdenticon/tslint.json b/types/jdenticon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jdenticon/tslint.json
+++ b/types/jdenticon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jee-jsf/tslint.json b/types/jee-jsf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jee-jsf/tslint.json
+++ b/types/jee-jsf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jest/tslint.json b/types/jest/tslint.json
index 86d51194e9..e7a54c4021 100644
--- a/types/jest/tslint.json
+++ b/types/jest/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-mergeable-namespace": false,
         "no-void-expression": false,
         "no-unnecessary-generics": false
diff --git a/types/jfp/tslint.json b/types/jfp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jfp/tslint.json
+++ b/types/jfp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jjv/tslint.json b/types/jjv/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jjv/tslint.json
+++ b/types/jjv/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jjve/tslint.json b/types/jjve/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jjve/tslint.json
+++ b/types/jjve/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/johnny-five/tslint.json b/types/johnny-five/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/johnny-five/tslint.json
+++ b/types/johnny-five/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jpm/tslint.json b/types/jpm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jpm/tslint.json
+++ b/types/jpm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jqgrid/tslint.json b/types/jqgrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jqgrid/tslint.json
+++ b/types/jqgrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jqrangeslider/tslint.json b/types/jqrangeslider/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jqrangeslider/tslint.json
+++ b/types/jqrangeslider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-ajax-chain/tslint.json b/types/jquery-ajax-chain/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-ajax-chain/tslint.json
+++ b/types/jquery-ajax-chain/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-alertable/tslint.json b/types/jquery-alertable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-alertable/tslint.json
+++ b/types/jquery-alertable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-backstretch/tslint.json b/types/jquery-backstretch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-backstretch/tslint.json
+++ b/types/jquery-backstretch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-cropbox/tslint.json b/types/jquery-cropbox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-cropbox/tslint.json
+++ b/types/jquery-cropbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-deparam/tslint.json b/types/jquery-deparam/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-deparam/tslint.json
+++ b/types/jquery-deparam/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-easy-loading/tslint.json b/types/jquery-easy-loading/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-easy-loading/tslint.json
+++ b/types/jquery-easy-loading/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-fullscreen/tslint.json b/types/jquery-fullscreen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-fullscreen/tslint.json
+++ b/types/jquery-fullscreen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-galleria/tslint.json b/types/jquery-galleria/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-galleria/tslint.json
+++ b/types/jquery-galleria/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-handsontable/tslint.json b/types/jquery-handsontable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-handsontable/tslint.json
+++ b/types/jquery-handsontable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-jsonrpcclient/tslint.json b/types/jquery-jsonrpcclient/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-jsonrpcclient/tslint.json
+++ b/types/jquery-jsonrpcclient/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-knob/tslint.json b/types/jquery-knob/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-knob/tslint.json
+++ b/types/jquery-knob/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-mockjax/tslint.json b/types/jquery-mockjax/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-mockjax/tslint.json
+++ b/types/jquery-mockjax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-mousewheel/tslint.json b/types/jquery-mousewheel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-mousewheel/tslint.json
+++ b/types/jquery-mousewheel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-param/tslint.json b/types/jquery-param/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-param/tslint.json
+++ b/types/jquery-param/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-sortable/tslint.json b/types/jquery-sortable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-sortable/tslint.json
+++ b/types/jquery-sortable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-steps/tslint.json b/types/jquery-steps/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-steps/tslint.json
+++ b/types/jquery-steps/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-timeentry/tslint.json b/types/jquery-timeentry/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-timeentry/tslint.json
+++ b/types/jquery-timeentry/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-truncate-html/tslint.json b/types/jquery-truncate-html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-truncate-html/tslint.json
+++ b/types/jquery-truncate-html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-urlparam/tslint.json b/types/jquery-urlparam/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-urlparam/tslint.json
+++ b/types/jquery-urlparam/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery-validation-unobtrusive/tslint.json b/types/jquery-validation-unobtrusive/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery-validation-unobtrusive/tslint.json
+++ b/types/jquery-validation-unobtrusive/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.address/tslint.json b/types/jquery.address/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.address/tslint.json
+++ b/types/jquery.address/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.are-you-sure/tslint.json b/types/jquery.are-you-sure/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.are-you-sure/tslint.json
+++ b/types/jquery.are-you-sure/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.autosize/tslint.json b/types/jquery.autosize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.autosize/tslint.json
+++ b/types/jquery.autosize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.base64/tslint.json b/types/jquery.base64/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.base64/tslint.json
+++ b/types/jquery.base64/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.bbq/tslint.json b/types/jquery.bbq/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.bbq/tslint.json
+++ b/types/jquery.bbq/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.blockui/tslint.json b/types/jquery.blockui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.blockui/tslint.json
+++ b/types/jquery.blockui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.bootstrap.wizard/tslint.json b/types/jquery.bootstrap.wizard/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.bootstrap.wizard/tslint.json
+++ b/types/jquery.bootstrap.wizard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.cleditor/tslint.json b/types/jquery.cleditor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.cleditor/tslint.json
+++ b/types/jquery.cleditor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.clientsidelogging/tslint.json b/types/jquery.clientsidelogging/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.clientsidelogging/tslint.json
+++ b/types/jquery.clientsidelogging/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.color/tslint.json b/types/jquery.color/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.color/tslint.json
+++ b/types/jquery.color/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.colorbox/tslint.json b/types/jquery.colorbox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.colorbox/tslint.json
+++ b/types/jquery.colorbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.colorpicker/tslint.json b/types/jquery.colorpicker/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/jquery.colorpicker/tslint.json
+++ b/types/jquery.colorpicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.contextmenu/tslint.json b/types/jquery.contextmenu/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.contextmenu/tslint.json
+++ b/types/jquery.contextmenu/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.cookie/tslint.json b/types/jquery.cookie/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/jquery.cookie/tslint.json
+++ b/types/jquery.cookie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.customselect/tslint.json b/types/jquery.customselect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.customselect/tslint.json
+++ b/types/jquery.customselect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.cycle/tslint.json b/types/jquery.cycle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.cycle/tslint.json
+++ b/types/jquery.cycle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.cycle2/tslint.json b/types/jquery.cycle2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.cycle2/tslint.json
+++ b/types/jquery.cycle2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.dropotron/tslint.json b/types/jquery.dropotron/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.dropotron/tslint.json
+++ b/types/jquery.dropotron/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.dynatree/tslint.json b/types/jquery.dynatree/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.dynatree/tslint.json
+++ b/types/jquery.dynatree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.elang/tslint.json b/types/jquery.elang/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.elang/tslint.json
+++ b/types/jquery.elang/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.fancytree/tslint.json b/types/jquery.fancytree/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/jquery.fancytree/tslint.json
+++ b/types/jquery.fancytree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.fileupload/tslint.json b/types/jquery.fileupload/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/jquery.fileupload/tslint.json
+++ b/types/jquery.fileupload/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.filtertable/tslint.json b/types/jquery.filtertable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.filtertable/tslint.json
+++ b/types/jquery.filtertable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.finger/tslint.json b/types/jquery.finger/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.finger/tslint.json
+++ b/types/jquery.finger/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.flagstrap/tslint.json b/types/jquery.flagstrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.flagstrap/tslint.json
+++ b/types/jquery.flagstrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.form/tslint.json b/types/jquery.form/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.form/tslint.json
+++ b/types/jquery.form/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.fullscreen/tslint.json b/types/jquery.fullscreen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.fullscreen/tslint.json
+++ b/types/jquery.fullscreen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.gridster/tslint.json b/types/jquery.gridster/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.gridster/tslint.json
+++ b/types/jquery.gridster/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.highlight-bartaz/tslint.json b/types/jquery.highlight-bartaz/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.highlight-bartaz/tslint.json
+++ b/types/jquery.highlight-bartaz/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.jnotify/tslint.json b/types/jquery.jnotify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.jnotify/tslint.json
+++ b/types/jquery.jnotify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.joyride/tslint.json b/types/jquery.joyride/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.joyride/tslint.json
+++ b/types/jquery.joyride/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.jsignature/tslint.json b/types/jquery.jsignature/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.jsignature/tslint.json
+++ b/types/jquery.jsignature/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.leanmodal/tslint.json b/types/jquery.leanmodal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.leanmodal/tslint.json
+++ b/types/jquery.leanmodal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.livestampjs/tslint.json b/types/jquery.livestampjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.livestampjs/tslint.json
+++ b/types/jquery.livestampjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.menuaim/tslint.json b/types/jquery.menuaim/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.menuaim/tslint.json
+++ b/types/jquery.menuaim/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.mmenu/tslint.json b/types/jquery.mmenu/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.mmenu/tslint.json
+++ b/types/jquery.mmenu/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.notifybar/tslint.json b/types/jquery.notifybar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.notifybar/tslint.json
+++ b/types/jquery.notifybar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.noty/tslint.json b/types/jquery.noty/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.noty/tslint.json
+++ b/types/jquery.noty/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.payment/tslint.json b/types/jquery.payment/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.payment/tslint.json
+++ b/types/jquery.payment/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.pjax/tslint.json b/types/jquery.pjax/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/jquery.pjax/tslint.json
+++ b/types/jquery.pjax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.placeholder/tslint.json b/types/jquery.placeholder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.placeholder/tslint.json
+++ b/types/jquery.placeholder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.pnotify/tslint.json b/types/jquery.pnotify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.pnotify/tslint.json
+++ b/types/jquery.pnotify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.postmessage/tslint.json b/types/jquery.postmessage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.postmessage/tslint.json
+++ b/types/jquery.postmessage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.prettyphoto/tslint.json b/types/jquery.prettyphoto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.prettyphoto/tslint.json
+++ b/types/jquery.prettyphoto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.qrcode/tslint.json b/types/jquery.qrcode/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/jquery.qrcode/tslint.json
+++ b/types/jquery.qrcode/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.rateit/tslint.json b/types/jquery.rateit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.rateit/tslint.json
+++ b/types/jquery.rateit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.rowgrid/tslint.json b/types/jquery.rowgrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.rowgrid/tslint.json
+++ b/types/jquery.rowgrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.scrollto/tslint.json b/types/jquery.scrollto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.scrollto/tslint.json
+++ b/types/jquery.scrollto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.simplemodal/tslint.json b/types/jquery.simplemodal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.simplemodal/tslint.json
+++ b/types/jquery.simplemodal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.simplepagination/tslint.json b/types/jquery.simplepagination/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.simplepagination/tslint.json
+++ b/types/jquery.simplepagination/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.simulate/tslint.json b/types/jquery.simulate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.simulate/tslint.json
+++ b/types/jquery.simulate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.slimscroll/tslint.json b/types/jquery.slimscroll/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.slimscroll/tslint.json
+++ b/types/jquery.slimscroll/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.sortelements/tslint.json b/types/jquery.sortelements/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.sortelements/tslint.json
+++ b/types/jquery.sortelements/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.superlink/tslint.json b/types/jquery.superlink/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.superlink/tslint.json
+++ b/types/jquery.superlink/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.tagsmanager/tslint.json b/types/jquery.tagsmanager/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.tagsmanager/tslint.json
+++ b/types/jquery.tagsmanager/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.tile/tslint.json b/types/jquery.tile/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.tile/tslint.json
+++ b/types/jquery.tile/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.timeago/tslint.json b/types/jquery.timeago/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.timeago/tslint.json
+++ b/types/jquery.timeago/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.timepicker/tslint.json b/types/jquery.timepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.timepicker/tslint.json
+++ b/types/jquery.timepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.timer/tslint.json b/types/jquery.timer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.timer/tslint.json
+++ b/types/jquery.timer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.tinycarousel/tslint.json b/types/jquery.tinycarousel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.tinycarousel/tslint.json
+++ b/types/jquery.tinycarousel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.tinyscrollbar/tslint.json b/types/jquery.tinyscrollbar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.tinyscrollbar/tslint.json
+++ b/types/jquery.tinyscrollbar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.tipsy/tslint.json b/types/jquery.tipsy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.tipsy/tslint.json
+++ b/types/jquery.tipsy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.total-storage/tslint.json b/types/jquery.total-storage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.total-storage/tslint.json
+++ b/types/jquery.total-storage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.transit/tslint.json b/types/jquery.transit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.transit/tslint.json
+++ b/types/jquery.transit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.ui.datetimepicker/tslint.json b/types/jquery.ui.datetimepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.ui.datetimepicker/tslint.json
+++ b/types/jquery.ui.datetimepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.ui.layout/tslint.json b/types/jquery.ui.layout/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.ui.layout/tslint.json
+++ b/types/jquery.ui.layout/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.uniform/tslint.json b/types/jquery.uniform/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.uniform/tslint.json
+++ b/types/jquery.uniform/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.watermark/tslint.json b/types/jquery.watermark/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.watermark/tslint.json
+++ b/types/jquery.watermark/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquery.window/tslint.json b/types/jquery.window/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquery.window/tslint.json
+++ b/types/jquery.window/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jquerymobile/tslint.json b/types/jquerymobile/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jquerymobile/tslint.json
+++ b/types/jquerymobile/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jqueryui/tslint.json b/types/jqueryui/tslint.json
index ca9116c788..e44e1809ea 100644
--- a/types/jqueryui/tslint.json
+++ b/types/jqueryui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-beautify/tslint.json b/types/js-beautify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-beautify/tslint.json
+++ b/types/js-beautify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-clipper/tslint.json b/types/js-clipper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-clipper/tslint.json
+++ b/types/js-clipper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-combinatorics/tslint.json b/types/js-combinatorics/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-combinatorics/tslint.json
+++ b/types/js-combinatorics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-data-angular/tslint.json b/types/js-data-angular/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-data-angular/tslint.json
+++ b/types/js-data-angular/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-fixtures/tslint.json b/types/js-fixtures/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-fixtures/tslint.json
+++ b/types/js-fixtures/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-git/tslint.json b/types/js-git/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-git/tslint.json
+++ b/types/js-git/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-money/tslint.json b/types/js-money/tslint.json
index 42522eff7e..8973569ed3 100644
--- a/types/js-money/tslint.json
+++ b/types/js-money/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // All are TODOs
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "no-unnecessary-qualifier": false
     }
diff --git a/types/js-priority-queue/tslint.json b/types/js-priority-queue/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-priority-queue/tslint.json
+++ b/types/js-priority-queue/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-schema/tslint.json b/types/js-schema/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-schema/tslint.json
+++ b/types/js-schema/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-search/tslint.json b/types/js-search/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/js-search/tslint.json
+++ b/types/js-search/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/js-url/tslint.json b/types/js-url/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/js-url/tslint.json
+++ b/types/js-url/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsbn/tslint.json b/types/jsbn/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsbn/tslint.json
+++ b/types/jsbn/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jscrollpane/tslint.json b/types/jscrollpane/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jscrollpane/tslint.json
+++ b/types/jscrollpane/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsdeferred/tslint.json b/types/jsdeferred/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsdeferred/tslint.json
+++ b/types/jsdeferred/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsen/tslint.json b/types/jsen/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsen/tslint.json
+++ b/types/jsen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsend/tslint.json b/types/jsend/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsend/tslint.json
+++ b/types/jsend/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsesc/tslint.json b/types/jsesc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsesc/tslint.json
+++ b/types/jsesc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsfl/tslint.json b/types/jsfl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsfl/tslint.json
+++ b/types/jsfl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsgraph/tslint.json b/types/jsgraph/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsgraph/tslint.json
+++ b/types/jsgraph/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jshamcrest/tslint.json b/types/jshamcrest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jshamcrest/tslint.json
+++ b/types/jshamcrest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsmockito/tslint.json b/types/jsmockito/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsmockito/tslint.json
+++ b/types/jsmockito/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-editor/tslint.json b/types/json-editor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json-editor/tslint.json
+++ b/types/json-editor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-merge-patch/tslint.json b/types/json-merge-patch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json-merge-patch/tslint.json
+++ b/types/json-merge-patch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-patch-gen/tslint.json b/types/json-patch-gen/tslint.json
index ece4c342d1..e72b3d5a6b 100644
--- a/types/json-patch-gen/tslint.json
+++ b/types/json-patch-gen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-patch/tslint.json b/types/json-patch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json-patch/tslint.json
+++ b/types/json-patch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-pointer/tslint.json b/types/json-pointer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json-pointer/tslint.json
+++ b/types/json-pointer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json-socket/tslint.json b/types/json-socket/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json-socket/tslint.json
+++ b/types/json-socket/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/json5/tslint.json b/types/json5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/json5/tslint.json
+++ b/types/json5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsoneditor/tslint.json b/types/jsoneditor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsoneditor/tslint.json
+++ b/types/jsoneditor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsoneditoronline/tslint.json b/types/jsoneditoronline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsoneditoronline/tslint.json
+++ b/types/jsoneditoronline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsonminify/tslint.json b/types/jsonminify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsonminify/tslint.json
+++ b/types/jsonminify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsonnet/tslint.json b/types/jsonnet/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsonnet/tslint.json
+++ b/types/jsonnet/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsonpath/tslint.json b/types/jsonpath/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsonpath/tslint.json
+++ b/types/jsonpath/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsonstream/tslint.json b/types/jsonstream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsonstream/tslint.json
+++ b/types/jsonstream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsrender/tslint.json b/types/jsrender/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsrender/tslint.json
+++ b/types/jsrender/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jstimezonedetect/tslint.json b/types/jstimezonedetect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jstimezonedetect/tslint.json
+++ b/types/jstimezonedetect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jstorage/tslint.json b/types/jstorage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jstorage/tslint.json
+++ b/types/jstorage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jstree/tslint.json b/types/jstree/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jstree/tslint.json
+++ b/types/jstree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsts/tslint.json b/types/jsts/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsts/tslint.json
+++ b/types/jsts/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsuite/tslint.json b/types/jsuite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsuite/tslint.json
+++ b/types/jsuite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsuri/tslint.json b/types/jsuri/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsuri/tslint.json
+++ b/types/jsuri/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsurl/tslint.json b/types/jsurl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsurl/tslint.json
+++ b/types/jsurl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jsx-chai/tslint.json b/types/jsx-chai/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jsx-chai/tslint.json
+++ b/types/jsx-chai/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jug/tslint.json b/types/jug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jug/tslint.json
+++ b/types/jug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jwt-client/tslint.json b/types/jwt-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jwt-client/tslint.json
+++ b/types/jwt-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/jwt-simple/tslint.json b/types/jwt-simple/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/jwt-simple/tslint.json
+++ b/types/jwt-simple/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/karma-chai-sinon/tslint.json b/types/karma-chai-sinon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/karma-chai-sinon/tslint.json
+++ b/types/karma-chai-sinon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/karma-coverage/tslint.json b/types/karma-coverage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/karma-coverage/tslint.json
+++ b/types/karma-coverage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/karma-jasmine/tslint.json b/types/karma-jasmine/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/karma-jasmine/tslint.json
+++ b/types/karma-jasmine/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/katex/tslint.json b/types/katex/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/katex/tslint.json
+++ b/types/katex/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kefir/tslint.json b/types/kefir/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/kefir/tslint.json
+++ b/types/kefir/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kendo-ui/tslint.json b/types/kendo-ui/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/kendo-ui/tslint.json
+++ b/types/kendo-ui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/keyboardjs/tslint.json b/types/keyboardjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/keyboardjs/tslint.json
+++ b/types/keyboardjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/keymaster/tslint.json b/types/keymaster/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/keymaster/tslint.json
+++ b/types/keymaster/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/keymirror/tslint.json b/types/keymirror/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/keymirror/tslint.json
+++ b/types/keymirror/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/keytar/tslint.json b/types/keytar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/keytar/tslint.json
+++ b/types/keytar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kii-cloud-sdk/tslint.json b/types/kii-cloud-sdk/tslint.json
index 4184ebb791..228bf293f4 100644
--- a/types/kii-cloud-sdk/tslint.json
+++ b/types/kii-cloud-sdk/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false
     }
diff --git a/types/kik-browser/tslint.json b/types/kik-browser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/kik-browser/tslint.json
+++ b/types/kik-browser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kineticjs/tslint.json b/types/kineticjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/kineticjs/tslint.json
+++ b/types/kineticjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/klaw/tslint.json b/types/klaw/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/klaw/tslint.json
+++ b/types/klaw/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockback/tslint.json b/types/knockback/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockback/tslint.json
+++ b/types/knockback/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout-amd-helpers/tslint.json b/types/knockout-amd-helpers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout-amd-helpers/tslint.json
+++ b/types/knockout-amd-helpers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout-postbox/tslint.json b/types/knockout-postbox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout-postbox/tslint.json
+++ b/types/knockout-postbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout-secure-binding/tslint.json b/types/knockout-secure-binding/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout-secure-binding/tslint.json
+++ b/types/knockout-secure-binding/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout-transformations/tslint.json b/types/knockout-transformations/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout-transformations/tslint.json
+++ b/types/knockout-transformations/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.deferred.updates/tslint.json b/types/knockout.deferred.updates/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.deferred.updates/tslint.json
+++ b/types/knockout.deferred.updates/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.editables/tslint.json b/types/knockout.editables/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.editables/tslint.json
+++ b/types/knockout.editables/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.es5/tslint.json b/types/knockout.es5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.es5/tslint.json
+++ b/types/knockout.es5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.kogrid/tslint.json b/types/knockout.kogrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.kogrid/tslint.json
+++ b/types/knockout.kogrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.mapper/tslint.json b/types/knockout.mapper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.mapper/tslint.json
+++ b/types/knockout.mapper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.mapping/tslint.json b/types/knockout.mapping/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.mapping/tslint.json
+++ b/types/knockout.mapping/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.projections/tslint.json b/types/knockout.projections/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.projections/tslint.json
+++ b/types/knockout.projections/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.punches/tslint.json b/types/knockout.punches/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.punches/tslint.json
+++ b/types/knockout.punches/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.rx/tslint.json b/types/knockout.rx/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.rx/tslint.json
+++ b/types/knockout.rx/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.validation/tslint.json b/types/knockout.validation/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.validation/tslint.json
+++ b/types/knockout.validation/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout.viewmodel/tslint.json b/types/knockout.viewmodel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockout.viewmodel/tslint.json
+++ b/types/knockout.viewmodel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockout/tslint.json b/types/knockout/tslint.json
index 9d9f6dd3b9..a1d60043bc 100644
--- a/types/knockout/tslint.json
+++ b/types/knockout/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/knockstrap/tslint.json b/types/knockstrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/knockstrap/tslint.json
+++ b/types/knockstrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ko.plus/tslint.json b/types/ko.plus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ko.plus/tslint.json
+++ b/types/ko.plus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-bouncer/tslint.json b/types/koa-bouncer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-bouncer/tslint.json
+++ b/types/koa-bouncer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-compress/tslint.json b/types/koa-compress/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-compress/tslint.json
+++ b/types/koa-compress/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-favicon/tslint.json b/types/koa-favicon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-favicon/tslint.json
+++ b/types/koa-favicon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-hbs/tslint.json b/types/koa-hbs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-hbs/tslint.json
+++ b/types/koa-hbs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-json/tslint.json b/types/koa-json/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-json/tslint.json
+++ b/types/koa-json/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-router/tslint.json b/types/koa-router/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-router/tslint.json
+++ b/types/koa-router/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa-session-minimal/tslint.json b/types/koa-session-minimal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa-session-minimal/tslint.json
+++ b/types/koa-session-minimal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/koa/tslint.json b/types/koa/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/koa/tslint.json
+++ b/types/koa/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kolite/tslint.json b/types/kolite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/kolite/tslint.json
+++ b/types/kolite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/konami.js/tslint.json b/types/konami.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/konami.js/tslint.json
+++ b/types/konami.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/kue/tslint.json b/types/kue/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/kue/tslint.json
+++ b/types/kue/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lab/tslint.json b/types/lab/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lab/tslint.json
+++ b/types/lab/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ladda/tslint.json b/types/ladda/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ladda/tslint.json
+++ b/types/ladda/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/latinize/tslint.json b/types/latinize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/latinize/tslint.json
+++ b/types/latinize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/launchpad/tslint.json b/types/launchpad/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/launchpad/tslint.json
+++ b/types/launchpad/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lazy.js/tslint.json b/types/lazy.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lazy.js/tslint.json
+++ b/types/lazy.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lazypipe/tslint.json b/types/lazypipe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lazypipe/tslint.json
+++ b/types/lazypipe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ldapjs/tslint.json b/types/ldapjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ldapjs/tslint.json
+++ b/types/ldapjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/leadfoot/tslint.json b/types/leadfoot/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/leadfoot/tslint.json
+++ b/types/leadfoot/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/leapmotionts/tslint.json b/types/leapmotionts/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/leapmotionts/tslint.json
+++ b/types/leapmotionts/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/less-middleware/tslint.json b/types/less-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/less-middleware/tslint.json
+++ b/types/less-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/less/tslint.json b/types/less/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/less/tslint.json
+++ b/types/less/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/level-sublevel/tslint.json b/types/level-sublevel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/level-sublevel/tslint.json
+++ b/types/level-sublevel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/levenshtein/tslint.json b/types/levenshtein/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/levenshtein/tslint.json
+++ b/types/levenshtein/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lime-js/tslint.json b/types/lime-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lime-js/tslint.json
+++ b/types/lime-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/line-reader/tslint.json b/types/line-reader/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/line-reader/tslint.json
+++ b/types/line-reader/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lls/tslint.json b/types/lls/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lls/tslint.json
+++ b/types/lls/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/loader-runner/tslint.json b/types/loader-runner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/loader-runner/tslint.json
+++ b/types/loader-runner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lobibox/tslint.json b/types/lobibox/tslint.json
index 22ecc7ce6f..af76f91db4 100644
--- a/types/lobibox/tslint.json
+++ b/types/lobibox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lockr/tslint.json b/types/lockr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lockr/tslint.json
+++ b/types/lockr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/locutus/tslint.json b/types/locutus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/locutus/tslint.json
+++ b/types/locutus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/logg/tslint.json b/types/logg/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/logg/tslint.json
+++ b/types/logg/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/loggly/tslint.json b/types/loggly/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/loggly/tslint.json
+++ b/types/loggly/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/logrotate-stream/tslint.json b/types/logrotate-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/logrotate-stream/tslint.json
+++ b/types/logrotate-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lokijs/tslint.json b/types/lokijs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lokijs/tslint.json
+++ b/types/lokijs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lolex/tslint.json b/types/lolex/tslint.json
index 2fd2e55629..67fd12a0f5 100644
--- a/types/lolex/tslint.json
+++ b/types/lolex/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/long/tslint.json b/types/long/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/long/tslint.json
+++ b/types/long/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lory.js/tslint.json b/types/lory.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lory.js/tslint.json
+++ b/types/lory.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lowlight/tslint.json b/types/lowlight/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lowlight/tslint.json
+++ b/types/lowlight/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lscache/tslint.json b/types/lscache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lscache/tslint.json
+++ b/types/lscache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/luaparse/tslint.json b/types/luaparse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/luaparse/tslint.json
+++ b/types/luaparse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/lwip/tslint.json b/types/lwip/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/lwip/tslint.json
+++ b/types/lwip/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/magic-number/tslint.json b/types/magic-number/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/magic-number/tslint.json
+++ b/types/magic-number/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/magicsuggest/tslint.json b/types/magicsuggest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/magicsuggest/tslint.json
+++ b/types/magicsuggest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mailcheck/tslint.json b/types/mailcheck/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mailcheck/tslint.json
+++ b/types/mailcheck/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/maildev/tslint.json b/types/maildev/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/maildev/tslint.json
+++ b/types/maildev/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/main-bower-files/tslint.json b/types/main-bower-files/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/main-bower-files/tslint.json
+++ b/types/main-bower-files/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mainloop.js/tslint.json b/types/mainloop.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mainloop.js/tslint.json
+++ b/types/mainloop.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/maker.js/tslint.json b/types/maker.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/maker.js/tslint.json
+++ b/types/maker.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mandrill-api/tslint.json b/types/mandrill-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mandrill-api/tslint.json
+++ b/types/mandrill-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mapbox-gl/tslint.json b/types/mapbox-gl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mapbox-gl/tslint.json
+++ b/types/mapbox-gl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mapsjs/tslint.json b/types/mapsjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mapsjs/tslint.json
+++ b/types/mapsjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mariasql/tslint.json b/types/mariasql/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mariasql/tslint.json
+++ b/types/mariasql/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/markdown-it/tslint.json b/types/markdown-it/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/markdown-it/tslint.json
+++ b/types/markdown-it/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/marker-animate-unobtrusive/tslint.json b/types/marker-animate-unobtrusive/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/marker-animate-unobtrusive/tslint.json
+++ b/types/marker-animate-unobtrusive/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/markitup/tslint.json b/types/markitup/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/markitup/tslint.json
+++ b/types/markitup/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/maskedinput/tslint.json b/types/maskedinput/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/maskedinput/tslint.json
+++ b/types/maskedinput/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/match-media-mock/tslint.json b/types/match-media-mock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/match-media-mock/tslint.json
+++ b/types/match-media-mock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/material-design-lite/tslint.json b/types/material-design-lite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/material-design-lite/tslint.json
+++ b/types/material-design-lite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/material-ui-pagination/tslint.json b/types/material-ui-pagination/tslint.json
index 3b5bb97e03..1735f3a66f 100644
--- a/types/material-ui-pagination/tslint.json
+++ b/types/material-ui-pagination/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODOs
 		"dt-header": false,
+        "npm-naming": false,
 		"no-duplicate-imports": false,
 		"use-default-type-parameter": false
 	}
diff --git a/types/mathjax/tslint.json b/types/mathjax/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mathjax/tslint.json
+++ b/types/mathjax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/matter-js/tslint.json b/types/matter-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/matter-js/tslint.json
+++ b/types/matter-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mcustomscrollbar/tslint.json b/types/mcustomscrollbar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mcustomscrollbar/tslint.json
+++ b/types/mcustomscrollbar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/md5/tslint.json b/types/md5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/md5/tslint.json
+++ b/types/md5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mdns/tslint.json b/types/mdns/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mdns/tslint.json
+++ b/types/mdns/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/medium-editor/tslint.json b/types/medium-editor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/medium-editor/tslint.json
+++ b/types/medium-editor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/memory-fs/tslint.json b/types/memory-fs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/memory-fs/tslint.json
+++ b/types/memory-fs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/memwatch-next/tslint.json b/types/memwatch-next/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/memwatch-next/tslint.json
+++ b/types/memwatch-next/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/menubar/tslint.json b/types/menubar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/menubar/tslint.json
+++ b/types/menubar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meshblu/tslint.json b/types/meshblu/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meshblu/tslint.json
+++ b/types/meshblu/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mess/tslint.json b/types/mess/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mess/tslint.json
+++ b/types/mess/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/messenger/tslint.json b/types/messenger/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/messenger/tslint.json
+++ b/types/messenger/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-accounts-phone/tslint.json b/types/meteor-accounts-phone/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-accounts-phone/tslint.json
+++ b/types/meteor-accounts-phone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-jboulhous-dev/tslint.json b/types/meteor-jboulhous-dev/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-jboulhous-dev/tslint.json
+++ b/types/meteor-jboulhous-dev/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-persistent-session/tslint.json b/types/meteor-persistent-session/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-persistent-session/tslint.json
+++ b/types/meteor-persistent-session/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-prime8consulting-oauth2/tslint.json b/types/meteor-prime8consulting-oauth2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-prime8consulting-oauth2/tslint.json
+++ b/types/meteor-prime8consulting-oauth2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-publish-composite/tslint.json b/types/meteor-publish-composite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-publish-composite/tslint.json
+++ b/types/meteor-publish-composite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor-roles/tslint.json b/types/meteor-roles/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor-roles/tslint.json
+++ b/types/meteor-roles/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/meteor/tslint.json b/types/meteor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/meteor/tslint.json
+++ b/types/meteor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/method-override/tslint.json b/types/method-override/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/method-override/tslint.json
+++ b/types/method-override/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/metric-suffix/tslint.json b/types/metric-suffix/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/metric-suffix/tslint.json
+++ b/types/metric-suffix/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/microsoft-ajax/tslint.json b/types/microsoft-ajax/tslint.json
index 529accfb4e..74158a19aa 100644
--- a/types/microsoft-ajax/tslint.json
+++ b/types/microsoft-ajax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/microsoft-live-connect/tslint.json b/types/microsoft-live-connect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/microsoft-live-connect/tslint.json
+++ b/types/microsoft-live-connect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/microsoft-sdk-soap/tslint.json b/types/microsoft-sdk-soap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/microsoft-sdk-soap/tslint.json
+++ b/types/microsoft-sdk-soap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/milkcocoa/tslint.json b/types/milkcocoa/tslint.json
index 22ecc7ce6f..af76f91db4 100644
--- a/types/milkcocoa/tslint.json
+++ b/types/milkcocoa/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/milliseconds/tslint.json b/types/milliseconds/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/milliseconds/tslint.json
+++ b/types/milliseconds/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mime-db/tslint.json b/types/mime-db/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mime-db/tslint.json
+++ b/types/mime-db/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mimos/tslint.json b/types/mimos/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mimos/tslint.json
+++ b/types/mimos/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/minilog/tslint.json b/types/minilog/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/minilog/tslint.json
+++ b/types/minilog/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/minimist/tslint.json b/types/minimist/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/minimist/tslint.json
+++ b/types/minimist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mitm/tslint.json b/types/mitm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mitm/tslint.json
+++ b/types/mitm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mixto/tslint.json b/types/mixto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mixto/tslint.json
+++ b/types/mixto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mkpath/tslint.json b/types/mkpath/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mkpath/tslint.json
+++ b/types/mkpath/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mmmagic/tslint.json b/types/mmmagic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mmmagic/tslint.json
+++ b/types/mmmagic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mocha-phantomjs/tslint.json b/types/mocha-phantomjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mocha-phantomjs/tslint.json
+++ b/types/mocha-phantomjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mock-fs/tslint.json b/types/mock-fs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mock-fs/tslint.json
+++ b/types/mock-fs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mock-require/tslint.json b/types/mock-require/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mock-require/tslint.json
+++ b/types/mock-require/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mockery/tslint.json b/types/mockery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mockery/tslint.json
+++ b/types/mockery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mockjs/tslint.json b/types/mockjs/tslint.json
index faeaedf2e5..401697e6a2 100644
--- a/types/mockjs/tslint.json
+++ b/types/mockjs/tslint.json
@@ -2,6 +2,7 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "dt-header": false,
+        "npm-naming": false,
     "export-just-namespace": false,
     "no-bad-reference": true
   }
diff --git a/types/moment-jalaali/tslint.json b/types/moment-jalaali/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/moment-jalaali/tslint.json
+++ b/types/moment-jalaali/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-auto-increment/tslint.json b/types/mongoose-auto-increment/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-auto-increment/tslint.json
+++ b/types/mongoose-auto-increment/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-deep-populate/tslint.json b/types/mongoose-deep-populate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-deep-populate/tslint.json
+++ b/types/mongoose-deep-populate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-mock/tslint.json b/types/mongoose-mock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-mock/tslint.json
+++ b/types/mongoose-mock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-paginate/tslint.json b/types/mongoose-paginate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-paginate/tslint.json
+++ b/types/mongoose-paginate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-promise/tslint.json b/types/mongoose-promise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-promise/tslint.json
+++ b/types/mongoose-promise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-seeder/tslint.json b/types/mongoose-seeder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-seeder/tslint.json
+++ b/types/mongoose-seeder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose-sequence/tslint.json b/types/mongoose-sequence/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mongoose-sequence/tslint.json
+++ b/types/mongoose-sequence/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mongoose/tslint.json b/types/mongoose/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/mongoose/tslint.json
+++ b/types/mongoose/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/morris.js/tslint.json b/types/morris.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/morris.js/tslint.json
+++ b/types/morris.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mousetrap/tslint.json b/types/mousetrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mousetrap/tslint.json
+++ b/types/mousetrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/moviedb/tslint.json b/types/moviedb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/moviedb/tslint.json
+++ b/types/moviedb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mpromise/tslint.json b/types/mpromise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mpromise/tslint.json
+++ b/types/mpromise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ms/tslint.json b/types/ms/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ms/tslint.json
+++ b/types/ms/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/msgpack/tslint.json b/types/msgpack/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/msgpack/tslint.json
+++ b/types/msgpack/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/msgpack5/tslint.json b/types/msgpack5/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/msgpack5/tslint.json
+++ b/types/msgpack5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/msnodesql/tslint.json b/types/msnodesql/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/msnodesql/tslint.json
+++ b/types/msnodesql/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/msportalfx-test/tslint.json b/types/msportalfx-test/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/msportalfx-test/tslint.json
+++ b/types/msportalfx-test/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mssql/tslint.json b/types/mssql/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mssql/tslint.json
+++ b/types/mssql/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mu2/tslint.json b/types/mu2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mu2/tslint.json
+++ b/types/mu2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/multiparty/tslint.json b/types/multiparty/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/multiparty/tslint.json
+++ b/types/multiparty/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/multiplexjs/tslint.json b/types/multiplexjs/tslint.json
index ece4c342d1..e72b3d5a6b 100644
--- a/types/multiplexjs/tslint.json
+++ b/types/multiplexjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/murmurhash-js/tslint.json b/types/murmurhash-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/murmurhash-js/tslint.json
+++ b/types/murmurhash-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/murmurhash3js/tslint.json b/types/murmurhash3js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/murmurhash3js/tslint.json
+++ b/types/murmurhash3js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/musicmetadata/tslint.json b/types/musicmetadata/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/musicmetadata/tslint.json
+++ b/types/musicmetadata/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mustache/tslint.json b/types/mustache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mustache/tslint.json
+++ b/types/mustache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/mz/tslint.json b/types/mz/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/mz/tslint.json
+++ b/types/mz/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nanoajax/tslint.json b/types/nanoajax/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nanoajax/tslint.json
+++ b/types/nanoajax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nanp/tslint.json b/types/nanp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nanp/tslint.json
+++ b/types/nanp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/natural-sort/tslint.json b/types/natural-sort/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/natural-sort/tslint.json
+++ b/types/natural-sort/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/natural/tslint.json b/types/natural/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/natural/tslint.json
+++ b/types/natural/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ncp/tslint.json b/types/ncp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ncp/tslint.json
+++ b/types/ncp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/neo4j/tslint.json b/types/neo4j/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/neo4j/tslint.json
+++ b/types/neo4j/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nes/tslint.json b/types/nes/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nes/tslint.json
+++ b/types/nes/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/netmask/tslint.json b/types/netmask/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/netmask/tslint.json
+++ b/types/netmask/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nexpect/tslint.json b/types/nexpect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nexpect/tslint.json
+++ b/types/nexpect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-command/tslint.json b/types/ng-command/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-command/tslint.json
+++ b/types/ng-command/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-cordova/tslint.json b/types/ng-cordova/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/ng-cordova/tslint.json
+++ b/types/ng-cordova/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-dialog/tslint.json b/types/ng-dialog/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-dialog/tslint.json
+++ b/types/ng-dialog/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-facebook/tslint.json b/types/ng-facebook/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-facebook/tslint.json
+++ b/types/ng-facebook/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-file-upload/tslint.json b/types/ng-file-upload/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-file-upload/tslint.json
+++ b/types/ng-file-upload/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-flow/tslint.json b/types/ng-flow/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/ng-flow/tslint.json
+++ b/types/ng-flow/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-grid/tslint.json b/types/ng-grid/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/ng-grid/tslint.json
+++ b/types/ng-grid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-i18next/tslint.json b/types/ng-i18next/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-i18next/tslint.json
+++ b/types/ng-i18next/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ng-notify/tslint.json b/types/ng-notify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ng-notify/tslint.json
+++ b/types/ng-notify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngbootbox/tslint.json b/types/ngbootbox/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngbootbox/tslint.json
+++ b/types/ngbootbox/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngeohash/tslint.json b/types/ngeohash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngeohash/tslint.json
+++ b/types/ngeohash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngkookies/tslint.json b/types/ngkookies/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngkookies/tslint.json
+++ b/types/ngkookies/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngmap/tslint.json b/types/ngmap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngmap/tslint.json
+++ b/types/ngmap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngprogress-lite/tslint.json b/types/ngprogress-lite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngprogress-lite/tslint.json
+++ b/types/ngprogress-lite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngprogress/tslint.json b/types/ngprogress/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngprogress/tslint.json
+++ b/types/ngprogress/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ngreact/tslint.json b/types/ngreact/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ngreact/tslint.json
+++ b/types/ngreact/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nightmare/tslint.json b/types/nightmare/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nightmare/tslint.json
+++ b/types/nightmare/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/noble/tslint.json b/types/noble/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/noble/tslint.json
+++ b/types/noble/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nock/tslint.json b/types/nock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nock/tslint.json
+++ b/types/nock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodal/tslint.json b/types/nodal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodal/tslint.json
+++ b/types/nodal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-7z/tslint.json b/types/node-7z/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-7z/tslint.json
+++ b/types/node-7z/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-array-ext/tslint.json b/types/node-array-ext/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-array-ext/tslint.json
+++ b/types/node-array-ext/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-calendar/tslint.json b/types/node-calendar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-calendar/tslint.json
+++ b/types/node-calendar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-config-manager/tslint.json b/types/node-config-manager/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-config-manager/tslint.json
+++ b/types/node-config-manager/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-dir/tslint.json b/types/node-dir/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-dir/tslint.json
+++ b/types/node-dir/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-dogstatsd/tslint.json b/types/node-dogstatsd/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-dogstatsd/tslint.json
+++ b/types/node-dogstatsd/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-fibers/tslint.json b/types/node-fibers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-fibers/tslint.json
+++ b/types/node-fibers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-forge/tslint.json b/types/node-forge/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-forge/tslint.json
+++ b/types/node-forge/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-gcm/tslint.json b/types/node-gcm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-gcm/tslint.json
+++ b/types/node-gcm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-getopt/tslint.json b/types/node-getopt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-getopt/tslint.json
+++ b/types/node-getopt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-hue-api/tslint.json b/types/node-hue-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-hue-api/tslint.json
+++ b/types/node-hue-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-int64/tslint.json b/types/node-int64/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-int64/tslint.json
+++ b/types/node-int64/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-jsfl-runner/tslint.json b/types/node-jsfl-runner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-jsfl-runner/tslint.json
+++ b/types/node-jsfl-runner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-json-db/tslint.json b/types/node-json-db/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-json-db/tslint.json
+++ b/types/node-json-db/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-mysql-wrapper/tslint.json b/types/node-mysql-wrapper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-mysql-wrapper/tslint.json
+++ b/types/node-mysql-wrapper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-notifier/tslint.json b/types/node-notifier/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-notifier/tslint.json
+++ b/types/node-notifier/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-persist/tslint.json b/types/node-persist/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-persist/tslint.json
+++ b/types/node-persist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-polyglot/tslint.json b/types/node-polyglot/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-polyglot/tslint.json
+++ b/types/node-polyglot/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-powershell/tslint.json b/types/node-powershell/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-powershell/tslint.json
+++ b/types/node-powershell/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-sass-middleware/tslint.json b/types/node-sass-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-sass-middleware/tslint.json
+++ b/types/node-sass-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-slack/tslint.json b/types/node-slack/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-slack/tslint.json
+++ b/types/node-slack/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-snap7/tslint.json b/types/node-snap7/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-snap7/tslint.json
+++ b/types/node-snap7/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-uuid/tslint.json b/types/node-uuid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-uuid/tslint.json
+++ b/types/node-uuid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node-validator/tslint.json b/types/node-validator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node-validator/tslint.json
+++ b/types/node-validator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/node_redis/tslint.json b/types/node_redis/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/node_redis/tslint.json
+++ b/types/node_redis/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodemailer-direct-transport/tslint.json b/types/nodemailer-direct-transport/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodemailer-direct-transport/tslint.json
+++ b/types/nodemailer-direct-transport/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodemailer-pickup-transport/tslint.json b/types/nodemailer-pickup-transport/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodemailer-pickup-transport/tslint.json
+++ b/types/nodemailer-pickup-transport/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodemailer-smtp-pool/tslint.json b/types/nodemailer-smtp-pool/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodemailer-smtp-pool/tslint.json
+++ b/types/nodemailer-smtp-pool/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodemailer-smtp-transport/tslint.json b/types/nodemailer-smtp-transport/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodemailer-smtp-transport/tslint.json
+++ b/types/nodemailer-smtp-transport/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodemailer-stub-transport/tslint.json b/types/nodemailer-stub-transport/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodemailer-stub-transport/tslint.json
+++ b/types/nodemailer-stub-transport/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nodeunit/tslint.json b/types/nodeunit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nodeunit/tslint.json
+++ b/types/nodeunit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/noisejs/tslint.json b/types/noisejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/noisejs/tslint.json
+++ b/types/noisejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nomnom/tslint.json b/types/nomnom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nomnom/tslint.json
+++ b/types/nomnom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nopt/tslint.json b/types/nopt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nopt/tslint.json
+++ b/types/nopt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/notie/tslint.json b/types/notie/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/notie/tslint.json
+++ b/types/notie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/notify/tslint.json b/types/notify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/notify/tslint.json
+++ b/types/notify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/notifyjs-browser/tslint.json b/types/notifyjs-browser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/notifyjs-browser/tslint.json
+++ b/types/notifyjs-browser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/notifyjs/tslint.json b/types/notifyjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/notifyjs/tslint.json
+++ b/types/notifyjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nouislider/tslint.json b/types/nouislider/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/nouislider/tslint.json
+++ b/types/nouislider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/npm/tslint.json b/types/npm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/npm/tslint.json
+++ b/types/npm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nprogress/tslint.json b/types/nprogress/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nprogress/tslint.json
+++ b/types/nprogress/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/numeral/tslint.json b/types/numeral/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/numeral/tslint.json
+++ b/types/numeral/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nunjucks-date/tslint.json b/types/nunjucks-date/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nunjucks-date/tslint.json
+++ b/types/nunjucks-date/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nvd3/tslint.json b/types/nvd3/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nvd3/tslint.json
+++ b/types/nvd3/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nw.gui/tslint.json b/types/nw.gui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nw.gui/tslint.json
+++ b/types/nw.gui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/nw.js/tslint.json b/types/nw.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/nw.js/tslint.json
+++ b/types/nw.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/o.js/tslint.json b/types/o.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/o.js/tslint.json
+++ b/types/o.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oauth.js/tslint.json b/types/oauth.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oauth.js/tslint.json
+++ b/types/oauth.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/object-assign/tslint.json b/types/object-assign/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/object-assign/tslint.json
+++ b/types/object-assign/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/object-diff/tslint.json b/types/object-diff/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/object-diff/tslint.json
+++ b/types/object-diff/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/object-hash/tslint.json b/types/object-hash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/object-hash/tslint.json
+++ b/types/object-hash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/object-refs/tslint.json b/types/object-refs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/object-refs/tslint.json
+++ b/types/object-refs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oblo-util/tslint.json b/types/oblo-util/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oblo-util/tslint.json
+++ b/types/oblo-util/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oboe/tslint.json b/types/oboe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oboe/tslint.json
+++ b/types/oboe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/observe-js/tslint.json b/types/observe-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/observe-js/tslint.json
+++ b/types/observe-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oclazyload/tslint.json b/types/oclazyload/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oclazyload/tslint.json
+++ b/types/oclazyload/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/odata/tslint.json b/types/odata/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/odata/tslint.json
+++ b/types/odata/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/office-js-preview/tslint.json b/types/office-js-preview/tslint.json
index 86c4ba7acc..e0b27fe373 100644
--- a/types/office-js-preview/tslint.json
+++ b/types/office-js-preview/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "file-name-casing": false,
diff --git a/types/office-js/tslint.json b/types/office-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/office-js/tslint.json
+++ b/types/office-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/offline-js/tslint.json b/types/offline-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/offline-js/tslint.json
+++ b/types/offline-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oidc-token-manager/tslint.json b/types/oidc-token-manager/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oidc-token-manager/tslint.json
+++ b/types/oidc-token-manager/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/onoff/tslint.json b/types/onoff/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/onoff/tslint.json
+++ b/types/onoff/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/open/tslint.json b/types/open/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/open/tslint.json
+++ b/types/open/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/openjscad/tslint.json b/types/openjscad/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/openjscad/tslint.json
+++ b/types/openjscad/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/openpgp/tslint.json b/types/openpgp/tslint.json
index 3db8366030..4e740106cc 100644
--- a/types/openpgp/tslint.json
+++ b/types/openpgp/tslint.json
@@ -5,6 +5,7 @@
         "array-type": false,
         "ban-types": false,
         "dt-header": false,
+        "npm-naming": false,
         "jsdoc-format": false,
         "max-line-length": false,
         "no-consecutive-blank-lines": false,
diff --git a/types/opentok/tslint.json b/types/opentok/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/opentok/tslint.json
+++ b/types/opentok/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/openui5/tslint.json b/types/openui5/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/openui5/tslint.json
+++ b/types/openui5/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/optimist/tslint.json b/types/optimist/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/optimist/tslint.json
+++ b/types/optimist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/oracledb/tslint.json b/types/oracledb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/oracledb/tslint.json
+++ b/types/oracledb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/orchestrator/tslint.json b/types/orchestrator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/orchestrator/tslint.json
+++ b/types/orchestrator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/osmtogeojson/tslint.json b/types/osmtogeojson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/osmtogeojson/tslint.json
+++ b/types/osmtogeojson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/owlcarousel/tslint.json b/types/owlcarousel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/owlcarousel/tslint.json
+++ b/types/owlcarousel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/p2/tslint.json b/types/p2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/p2/tslint.json
+++ b/types/p2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/packery/tslint.json b/types/packery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/packery/tslint.json
+++ b/types/packery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/page-icon/tslint.json b/types/page-icon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/page-icon/tslint.json
+++ b/types/page-icon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/page/tslint.json b/types/page/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/page/tslint.json
+++ b/types/page/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pako/tslint.json b/types/pako/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pako/tslint.json
+++ b/types/pako/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/papaparse/tslint.json b/types/papaparse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/papaparse/tslint.json
+++ b/types/papaparse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/paper/tslint.json b/types/paper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/paper/tslint.json
+++ b/types/paper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/paralleljs/tslint.json b/types/paralleljs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/paralleljs/tslint.json
+++ b/types/paralleljs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/parcel-env/tslint.json b/types/parcel-env/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/parcel-env/tslint.json
+++ b/types/parcel-env/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/parse-glob/tslint.json b/types/parse-glob/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/parse-glob/tslint.json
+++ b/types/parse-glob/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/parse-mockdb/tslint.json b/types/parse-mockdb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/parse-mockdb/tslint.json
+++ b/types/parse-mockdb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/parse/tslint.json b/types/parse/tslint.json
index e2172b7f24..158db48e64 100644
--- a/types/parse/tslint.json
+++ b/types/parse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-beam/tslint.json b/types/passport-beam/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-beam/tslint.json
+++ b/types/passport-beam/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-google-oauth/tslint.json b/types/passport-google-oauth/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-google-oauth/tslint.json
+++ b/types/passport-google-oauth/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-http-bearer/tslint.json b/types/passport-http-bearer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-http-bearer/tslint.json
+++ b/types/passport-http-bearer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-jwt/tslint.json b/types/passport-jwt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-jwt/tslint.json
+++ b/types/passport-jwt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-local-mongoose/tslint.json b/types/passport-local-mongoose/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/passport-local-mongoose/tslint.json
+++ b/types/passport-local-mongoose/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-local/tslint.json b/types/passport-local/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-local/tslint.json
+++ b/types/passport-local/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-oauth2-client-password/tslint.json b/types/passport-oauth2-client-password/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-oauth2-client-password/tslint.json
+++ b/types/passport-oauth2-client-password/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-strategy/tslint.json b/types/passport-strategy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-strategy/tslint.json
+++ b/types/passport-strategy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/passport-twitter/tslint.json b/types/passport-twitter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/passport-twitter/tslint.json
+++ b/types/passport-twitter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/password-hash/tslint.json b/types/password-hash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/password-hash/tslint.json
+++ b/types/password-hash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/path-parse/tslint.json b/types/path-parse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/path-parse/tslint.json
+++ b/types/path-parse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pathfinding/tslint.json b/types/pathfinding/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pathfinding/tslint.json
+++ b/types/pathfinding/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pathjs/tslint.json b/types/pathjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pathjs/tslint.json
+++ b/types/pathjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/paypal-cordova-plugin/tslint.json b/types/paypal-cordova-plugin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/paypal-cordova-plugin/tslint.json
+++ b/types/paypal-cordova-plugin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pdfjs-dist/tslint.json b/types/pdfjs-dist/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/pdfjs-dist/tslint.json
+++ b/types/pdfjs-dist/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pdfkit/tslint.json b/types/pdfkit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pdfkit/tslint.json
+++ b/types/pdfkit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pdfobject/tslint.json b/types/pdfobject/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pdfobject/tslint.json
+++ b/types/pdfobject/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pebblekitjs/tslint.json b/types/pebblekitjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pebblekitjs/tslint.json
+++ b/types/pebblekitjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/peerjs/tslint.json b/types/peerjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/peerjs/tslint.json
+++ b/types/peerjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pegjs/tslint.json b/types/pegjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pegjs/tslint.json
+++ b/types/pegjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/persona/tslint.json b/types/persona/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/persona/tslint.json
+++ b/types/persona/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pg-pool/tslint.json b/types/pg-pool/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pg-pool/tslint.json
+++ b/types/pg-pool/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pgwmodal/tslint.json b/types/pgwmodal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pgwmodal/tslint.json
+++ b/types/pgwmodal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phantom/tslint.json b/types/phantom/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/phantom/tslint.json
+++ b/types/phantom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phantomcss/tslint.json b/types/phantomcss/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phantomcss/tslint.json
+++ b/types/phantomcss/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phantomjs/tslint.json b/types/phantomjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phantomjs/tslint.json
+++ b/types/phantomjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phone-formatter/tslint.json b/types/phone-formatter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phone-formatter/tslint.json
+++ b/types/phone-formatter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phone/tslint.json b/types/phone/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phone/tslint.json
+++ b/types/phone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phonegap-facebook-plugin/tslint.json b/types/phonegap-facebook-plugin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phonegap-facebook-plugin/tslint.json
+++ b/types/phonegap-facebook-plugin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phonegap-nfc/tslint.json b/types/phonegap-nfc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phonegap-nfc/tslint.json
+++ b/types/phonegap-nfc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phonegap-plugin-barcodescanner/tslint.json b/types/phonegap-plugin-barcodescanner/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/phonegap-plugin-barcodescanner/tslint.json
+++ b/types/phonegap-plugin-barcodescanner/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/phonegap/tslint.json b/types/phonegap/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/phonegap/tslint.json
+++ b/types/phonegap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/photonui/tslint.json b/types/photonui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/photonui/tslint.json
+++ b/types/photonui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/photoswipe/tslint.json b/types/photoswipe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/photoswipe/tslint.json
+++ b/types/photoswipe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/physijs/tslint.json b/types/physijs/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/physijs/tslint.json
+++ b/types/physijs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pi-spi/tslint.json b/types/pi-spi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pi-spi/tslint.json
+++ b/types/pi-spi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pickadate/tslint.json b/types/pickadate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pickadate/tslint.json
+++ b/types/pickadate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pify/tslint.json b/types/pify/tslint.json
index 7f51cc6e38..f0468d52dc 100644
--- a/types/pify/tslint.json
+++ b/types/pify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pinkyswear/tslint.json b/types/pinkyswear/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pinkyswear/tslint.json
+++ b/types/pinkyswear/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pinterest-sdk/tslint.json b/types/pinterest-sdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pinterest-sdk/tslint.json
+++ b/types/pinterest-sdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/piwik-tracker/tslint.json b/types/piwik-tracker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/piwik-tracker/tslint.json
+++ b/types/piwik-tracker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pixi.js/tslint.json b/types/pixi.js/tslint.json
index 01be0cd9ee..b55a78498f 100644
--- a/types/pixi.js/tslint.json
+++ b/types/pixi.js/tslint.json
@@ -4,6 +4,7 @@
         // TODOs
         "ban-types": false,
         "dt-header": false,
+        "npm-naming": false,
         "interface-name": false,
         "no-any-union": false,
         "no-declare-current-package": false,
diff --git a/types/pkijs/tslint.json b/types/pkijs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pkijs/tslint.json
+++ b/types/pkijs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/platform/tslint.json b/types/platform/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/platform/tslint.json
+++ b/types/platform/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/playerframework/tslint.json b/types/playerframework/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/playerframework/tslint.json
+++ b/types/playerframework/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pleasejs/tslint.json b/types/pleasejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pleasejs/tslint.json
+++ b/types/pleasejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/plupload/tslint.json b/types/plupload/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/plupload/tslint.json
+++ b/types/plupload/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pluralize/tslint.json b/types/pluralize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pluralize/tslint.json
+++ b/types/pluralize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pngjs2/tslint.json b/types/pngjs2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pngjs2/tslint.json
+++ b/types/pngjs2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/podcast/tslint.json b/types/podcast/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/podcast/tslint.json
+++ b/types/podcast/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/podium/tslint.json b/types/podium/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/podium/tslint.json
+++ b/types/podium/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/polyline/tslint.json b/types/polyline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/polyline/tslint.json
+++ b/types/polyline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/polymer-ts/tslint.json b/types/polymer-ts/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/polymer-ts/tslint.json
+++ b/types/polymer-ts/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/polymer/tslint.json b/types/polymer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/polymer/tslint.json
+++ b/types/polymer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/popcorn/tslint.json b/types/popcorn/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/popcorn/tslint.json
+++ b/types/popcorn/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/postal/tslint.json b/types/postal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/postal/tslint.json
+++ b/types/postal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/power-assert-formatter/tslint.json b/types/power-assert-formatter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/power-assert-formatter/tslint.json
+++ b/types/power-assert-formatter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/power-assert/tslint.json b/types/power-assert/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/power-assert/tslint.json
+++ b/types/power-assert/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/precise/tslint.json b/types/precise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/precise/tslint.json
+++ b/types/precise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/precond/tslint.json b/types/precond/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/precond/tslint.json
+++ b/types/precond/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/preloadjs/tslint.json b/types/preloadjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/preloadjs/tslint.json
+++ b/types/preloadjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/prelude-ls/tslint.json b/types/prelude-ls/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/prelude-ls/tslint.json
+++ b/types/prelude-ls/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/prettyjson/tslint.json b/types/prettyjson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/prettyjson/tslint.json
+++ b/types/prettyjson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/priorityqueuejs/tslint.json b/types/priorityqueuejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/priorityqueuejs/tslint.json
+++ b/types/priorityqueuejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/progress/tslint.json b/types/progress/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/progress/tslint.json
+++ b/types/progress/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/progressjs/tslint.json b/types/progressjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/progressjs/tslint.json
+++ b/types/progressjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/project-oxford/tslint.json b/types/project-oxford/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/project-oxford/tslint.json
+++ b/types/project-oxford/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/promise-pg/tslint.json b/types/promise-pg/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/promise-pg/tslint.json
+++ b/types/promise-pg/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/promise-pool/tslint.json b/types/promise-pool/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/promise-pool/tslint.json
+++ b/types/promise-pool/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/promisify-node/tslint.json b/types/promisify-node/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/promisify-node/tslint.json
+++ b/types/promisify-node/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/promisify-supertest/tslint.json b/types/promisify-supertest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/promisify-supertest/tslint.json
+++ b/types/promisify-supertest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/prompt-sync-history/tslint.json b/types/prompt-sync-history/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/prompt-sync-history/tslint.json
+++ b/types/prompt-sync-history/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/prompt-sync/tslint.json b/types/prompt-sync/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/prompt-sync/tslint.json
+++ b/types/prompt-sync/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/promptly/tslint.json b/types/promptly/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/promptly/tslint.json
+++ b/types/promptly/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/protractor-helpers/tslint.json b/types/protractor-helpers/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/protractor-helpers/tslint.json
+++ b/types/protractor-helpers/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/protractor-http-mock/tslint.json b/types/protractor-http-mock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/protractor-http-mock/tslint.json
+++ b/types/protractor-http-mock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/proxyquire/tslint.json b/types/proxyquire/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/proxyquire/tslint.json
+++ b/types/proxyquire/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pty.js/tslint.json b/types/pty.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pty.js/tslint.json
+++ b/types/pty.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pubsub-js/tslint.json b/types/pubsub-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pubsub-js/tslint.json
+++ b/types/pubsub-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pug/tslint.json b/types/pug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pug/tslint.json
+++ b/types/pug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pure-render-decorator/tslint.json b/types/pure-render-decorator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pure-render-decorator/tslint.json
+++ b/types/pure-render-decorator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/purl/tslint.json b/types/purl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/purl/tslint.json
+++ b/types/purl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/pvutils/tslint.json b/types/pvutils/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/pvutils/tslint.json
+++ b/types/pvutils/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/q-io/tslint.json b/types/q-io/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/q-io/tslint.json
+++ b/types/q-io/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/q-retry/tslint.json b/types/q-retry/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/q-retry/tslint.json
+++ b/types/q-retry/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/qs/tslint.json b/types/qs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/qs/tslint.json
+++ b/types/qs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/qtip2/tslint.json b/types/qtip2/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/qtip2/tslint.json
+++ b/types/qtip2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/quixote/tslint.json b/types/quixote/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/quixote/tslint.json
+++ b/types/quixote/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/qunit/tslint.json b/types/qunit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/qunit/tslint.json
+++ b/types/qunit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/quoted-printable/tslint.json b/types/quoted-printable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/quoted-printable/tslint.json
+++ b/types/quoted-printable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/qwest/tslint.json b/types/qwest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/qwest/tslint.json
+++ b/types/qwest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rabbit.js/tslint.json b/types/rabbit.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rabbit.js/tslint.json
+++ b/types/rabbit.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ractive/tslint.json b/types/ractive/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ractive/tslint.json
+++ b/types/ractive/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/radium/tslint.json b/types/radium/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/radium/tslint.json
+++ b/types/radium/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/radius/tslint.json b/types/radius/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/radius/tslint.json
+++ b/types/radius/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/random-string/tslint.json b/types/random-string/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/random-string/tslint.json
+++ b/types/random-string/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/randomcolor/tslint.json b/types/randomcolor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/randomcolor/tslint.json
+++ b/types/randomcolor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/randomstring/tslint.json b/types/randomstring/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/randomstring/tslint.json
+++ b/types/randomstring/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rangy/tslint.json b/types/rangy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rangy/tslint.json
+++ b/types/rangy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rangyinputs/tslint.json b/types/rangyinputs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rangyinputs/tslint.json
+++ b/types/rangyinputs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/raphael/tslint.json b/types/raphael/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/raphael/tslint.json
+++ b/types/raphael/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ratelimiter/tslint.json b/types/ratelimiter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ratelimiter/tslint.json
+++ b/types/ratelimiter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/raty/tslint.json b/types/raty/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/raty/tslint.json
+++ b/types/raty/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rbush/tslint.json b/types/rbush/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rbush/tslint.json
+++ b/types/rbush/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rc-select/tslint.json b/types/rc-select/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rc-select/tslint.json
+++ b/types/rc-select/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rcloader/tslint.json b/types/rcloader/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rcloader/tslint.json
+++ b/types/rcloader/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-create-fragment/tslint.json b/types/react-addons-create-fragment/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-create-fragment/tslint.json
+++ b/types/react-addons-create-fragment/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-css-transition-group/tslint.json b/types/react-addons-css-transition-group/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-css-transition-group/tslint.json
+++ b/types/react-addons-css-transition-group/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-linked-state-mixin/tslint.json b/types/react-addons-linked-state-mixin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-linked-state-mixin/tslint.json
+++ b/types/react-addons-linked-state-mixin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-perf/tslint.json b/types/react-addons-perf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-perf/tslint.json
+++ b/types/react-addons-perf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-pure-render-mixin/tslint.json b/types/react-addons-pure-render-mixin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-pure-render-mixin/tslint.json
+++ b/types/react-addons-pure-render-mixin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-shallow-compare/tslint.json b/types/react-addons-shallow-compare/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-shallow-compare/tslint.json
+++ b/types/react-addons-shallow-compare/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-test-utils/tslint.json b/types/react-addons-test-utils/tslint.json
index e3610fefae..89955128d5 100644
--- a/types/react-addons-test-utils/tslint.json
+++ b/types/react-addons-test-utils/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-transition-group/tslint.json b/types/react-addons-transition-group/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-transition-group/tslint.json
+++ b/types/react-addons-transition-group/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-addons-update/tslint.json b/types/react-addons-update/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-addons-update/tslint.json
+++ b/types/react-addons-update/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-bootstrap-daterangepicker/tslint.json b/types/react-bootstrap-daterangepicker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-bootstrap-daterangepicker/tslint.json
+++ b/types/react-bootstrap-daterangepicker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-breadcrumbs/tslint.json b/types/react-breadcrumbs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-breadcrumbs/tslint.json
+++ b/types/react-breadcrumbs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-bytesize-icons/tslint.json b/types/react-bytesize-icons/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-bytesize-icons/tslint.json
+++ b/types/react-bytesize-icons/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-calendar-timeline/tslint.json b/types/react-calendar-timeline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-calendar-timeline/tslint.json
+++ b/types/react-calendar-timeline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-codemirror/tslint.json b/types/react-codemirror/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-codemirror/tslint.json
+++ b/types/react-codemirror/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-css-modules/tslint.json b/types/react-css-modules/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-css-modules/tslint.json
+++ b/types/react-css-modules/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-css-transition-replace/tslint.json b/types/react-css-transition-replace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-css-transition-replace/tslint.json
+++ b/types/react-css-transition-replace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-custom-scrollbars/tslint.json b/types/react-custom-scrollbars/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-custom-scrollbars/tslint.json
+++ b/types/react-custom-scrollbars/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-data-grid/tslint.json b/types/react-data-grid/tslint.json
index 637071b426..592fc9bcaa 100644
--- a/types/react-data-grid/tslint.json
+++ b/types/react-data-grid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-datagrid/tslint.json b/types/react-datagrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-datagrid/tslint.json
+++ b/types/react-datagrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-dates/tslint.json b/types/react-dates/tslint.json
index 01adabd8ca..1285fdffdc 100644
--- a/types/react-dates/tslint.json
+++ b/types/react-dates/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "file-name-casing": false,
diff --git a/types/react-dom/tslint.json b/types/react-dom/tslint.json
index 8179a3659a..3dc65c7465 100644
--- a/types/react-dom/tslint.json
+++ b/types/react-dom/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-type-assertion": false
     }
diff --git a/types/react-dropzone/tslint.json b/types/react-dropzone/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-dropzone/tslint.json
+++ b/types/react-dropzone/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-easy-chart/tslint.json b/types/react-easy-chart/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-easy-chart/tslint.json
+++ b/types/react-easy-chart/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-file-input/tslint.json b/types/react-file-input/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-file-input/tslint.json
+++ b/types/react-file-input/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-flex/tslint.json b/types/react-flex/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-flex/tslint.json
+++ b/types/react-flex/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-flexr/tslint.json b/types/react-flexr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-flexr/tslint.json
+++ b/types/react-flexr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-helmet/tslint.json b/types/react-helmet/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-helmet/tslint.json
+++ b/types/react-helmet/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-holder/tslint.json b/types/react-holder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-holder/tslint.json
+++ b/types/react-holder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-imageloader/tslint.json b/types/react-imageloader/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-imageloader/tslint.json
+++ b/types/react-imageloader/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-infinite/tslint.json b/types/react-infinite/tslint.json
index e3610fefae..89955128d5 100644
--- a/types/react-infinite/tslint.json
+++ b/types/react-infinite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-input-calendar/tslint.json b/types/react-input-calendar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-input-calendar/tslint.json
+++ b/types/react-input-calendar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-intl-redux/tslint.json b/types/react-intl-redux/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-intl-redux/tslint.json
+++ b/types/react-intl-redux/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-is-deprecated/tslint.json b/types/react-is-deprecated/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-is-deprecated/tslint.json
+++ b/types/react-is-deprecated/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-jsonschema-form/tslint.json b/types/react-jsonschema-form/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-jsonschema-form/tslint.json
+++ b/types/react-jsonschema-form/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-mdl/tslint.json b/types/react-mdl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-mdl/tslint.json
+++ b/types/react-mdl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-mixin/tslint.json b/types/react-mixin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-mixin/tslint.json
+++ b/types/react-mixin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-motion-slider/tslint.json b/types/react-motion-slider/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-motion-slider/tslint.json
+++ b/types/react-motion-slider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-motion/tslint.json b/types/react-motion/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-motion/tslint.json
+++ b/types/react-motion/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-native-orientation/tslint.json b/types/react-native-orientation/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-native-orientation/tslint.json
+++ b/types/react-native-orientation/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-native-sortable-list/tslint.json b/types/react-native-sortable-list/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-native-sortable-list/tslint.json
+++ b/types/react-native-sortable-list/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-native-touch-id/tslint.json b/types/react-native-touch-id/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-native-touch-id/tslint.json
+++ b/types/react-native-touch-id/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-notification-system/tslint.json b/types/react-notification-system/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-notification-system/tslint.json
+++ b/types/react-notification-system/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-props-decorators/tslint.json b/types/react-props-decorators/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-props-decorators/tslint.json
+++ b/types/react-props-decorators/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-redux-i18n/tslint.json b/types/react-redux-i18n/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-redux-i18n/tslint.json
+++ b/types/react-redux-i18n/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-redux-toastr/tslint.json b/types/react-redux-toastr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-redux-toastr/tslint.json
+++ b/types/react-redux-toastr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-router-bootstrap/tslint.json b/types/react-router-bootstrap/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-router-bootstrap/tslint.json
+++ b/types/react-router-bootstrap/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-scrollbar/tslint.json b/types/react-scrollbar/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-scrollbar/tslint.json
+++ b/types/react-scrollbar/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-spinkit/tslint.json b/types/react-spinkit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-spinkit/tslint.json
+++ b/types/react-spinkit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-swf/tslint.json b/types/react-swf/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-swf/tslint.json
+++ b/types/react-swf/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-tagcloud/tslint.json b/types/react-tagcloud/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-tagcloud/tslint.json
+++ b/types/react-tagcloud/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-tap-event-plugin/tslint.json b/types/react-tap-event-plugin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-tap-event-plugin/tslint.json
+++ b/types/react-tap-event-plugin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-test-renderer/tslint.json b/types/react-test-renderer/tslint.json
index c4fd1ce0bb..1946fe8602 100644
--- a/types/react-test-renderer/tslint.json
+++ b/types/react-test-renderer/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "dt-header": false,
+        "npm-naming": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/react-textarea-autosize/tslint.json b/types/react-textarea-autosize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-textarea-autosize/tslint.json
+++ b/types/react-textarea-autosize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react-user-tour/tslint.json b/types/react-user-tour/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/react-user-tour/tslint.json
+++ b/types/react-user-tour/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/react/tslint.json b/types/react/tslint.json
index d2c103b50c..b68a2adfe2 100644
--- a/types/react/tslint.json
+++ b/types/react/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODOs
 		"dt-header": false,
+        "npm-naming": false,
 		"no-any-union": false,
 		"no-empty-interface": false,
 		"no-object-literal-type-assertion": false,
diff --git a/types/reactcss/tslint.json b/types/reactcss/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/reactcss/tslint.json
+++ b/types/reactcss/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/read/tslint.json b/types/read/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/read/tslint.json
+++ b/types/read/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/readdir-stream/tslint.json b/types/readdir-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/readdir-stream/tslint.json
+++ b/types/readdir-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/recompose/tslint.json b/types/recompose/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/recompose/tslint.json
+++ b/types/recompose/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redis-scripto/tslint.json b/types/redis-scripto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redis-scripto/tslint.json
+++ b/types/redis-scripto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-action-utils/tslint.json b/types/redux-action-utils/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-action-utils/tslint.json
+++ b/types/redux-action-utils/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-debounced/tslint.json b/types/redux-debounced/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-debounced/tslint.json
+++ b/types/redux-debounced/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-devtools-dock-monitor/tslint.json b/types/redux-devtools-dock-monitor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-devtools-dock-monitor/tslint.json
+++ b/types/redux-devtools-dock-monitor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-devtools-log-monitor/tslint.json b/types/redux-devtools-log-monitor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-devtools-log-monitor/tslint.json
+++ b/types/redux-devtools-log-monitor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-devtools/tslint.json b/types/redux-devtools/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-devtools/tslint.json
+++ b/types/redux-devtools/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-immutable/tslint.json b/types/redux-immutable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-immutable/tslint.json
+++ b/types/redux-immutable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-mock-store/tslint.json b/types/redux-mock-store/tslint.json
index 3337f86cdc..9b99cce699 100644
--- a/types/redux-mock-store/tslint.json
+++ b/types/redux-mock-store/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODO
 		"dt-header": false,
+        "npm-naming": false,
 		"no-unnecessary-generics": false
 	}
 }
\ No newline at end of file
diff --git a/types/redux-optimistic-ui/tslint.json b/types/redux-optimistic-ui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-optimistic-ui/tslint.json
+++ b/types/redux-optimistic-ui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-promise-middleware/tslint.json b/types/redux-promise-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-promise-middleware/tslint.json
+++ b/types/redux-promise-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-promise/tslint.json b/types/redux-promise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-promise/tslint.json
+++ b/types/redux-promise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-recycle/tslint.json b/types/redux-recycle/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-recycle/tslint.json
+++ b/types/redux-recycle/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-router/tslint.json b/types/redux-router/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-router/tslint.json
+++ b/types/redux-router/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/redux-storage/tslint.json b/types/redux-storage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/redux-storage/tslint.json
+++ b/types/redux-storage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-array-di/tslint.json b/types/ref-array-di/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-array-di/tslint.json
+++ b/types/ref-array-di/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-array/tslint.json b/types/ref-array/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-array/tslint.json
+++ b/types/ref-array/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-napi/tslint.json b/types/ref-napi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-napi/tslint.json
+++ b/types/ref-napi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-struct-di/tslint.json b/types/ref-struct-di/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-struct-di/tslint.json
+++ b/types/ref-struct-di/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-struct/tslint.json b/types/ref-struct/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-struct/tslint.json
+++ b/types/ref-struct/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-union-di/tslint.json b/types/ref-union-di/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-union-di/tslint.json
+++ b/types/ref-union-di/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref-union/tslint.json b/types/ref-union/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref-union/tslint.json
+++ b/types/ref-union/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ref/tslint.json b/types/ref/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ref/tslint.json
+++ b/types/ref/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/relateurl/tslint.json b/types/relateurl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/relateurl/tslint.json
+++ b/types/relateurl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/replace-ext/tslint.json b/types/replace-ext/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/replace-ext/tslint.json
+++ b/types/replace-ext/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/request-ip/tslint.json b/types/request-ip/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/request-ip/tslint.json
+++ b/types/request-ip/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/requirejs-domready/tslint.json b/types/requirejs-domready/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/requirejs-domready/tslint.json
+++ b/types/requirejs-domready/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/requirejs/tslint.json b/types/requirejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/requirejs/tslint.json
+++ b/types/requirejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/resemblejs/tslint.json b/types/resemblejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/resemblejs/tslint.json
+++ b/types/resemblejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/resolve/tslint.json b/types/resolve/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/resolve/tslint.json
+++ b/types/resolve/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/response-time/tslint.json b/types/response-time/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/response-time/tslint.json
+++ b/types/response-time/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rest/tslint.json b/types/rest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rest/tslint.json
+++ b/types/rest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/restangular/tslint.json b/types/restangular/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/restangular/tslint.json
+++ b/types/restangular/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/restful.js/tslint.json b/types/restful.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/restful.js/tslint.json
+++ b/types/restful.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/restler/tslint.json b/types/restler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/restler/tslint.json
+++ b/types/restler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/resumablejs/tslint.json b/types/resumablejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/resumablejs/tslint.json
+++ b/types/resumablejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rethinkdb/tslint.json b/types/rethinkdb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rethinkdb/tslint.json
+++ b/types/rethinkdb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/revalidator/tslint.json b/types/revalidator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/revalidator/tslint.json
+++ b/types/revalidator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/reveal/tslint.json b/types/reveal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/reveal/tslint.json
+++ b/types/reveal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rickshaw/tslint.json b/types/rickshaw/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rickshaw/tslint.json
+++ b/types/rickshaw/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/riot-api-nodejs/tslint.json b/types/riot-api-nodejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/riot-api-nodejs/tslint.json
+++ b/types/riot-api-nodejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/riot-games-api/tslint.json b/types/riot-games-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/riot-games-api/tslint.json
+++ b/types/riot-games-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/riotcontrol/tslint.json b/types/riotcontrol/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/riotcontrol/tslint.json
+++ b/types/riotcontrol/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/riotjs/tslint.json b/types/riotjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/riotjs/tslint.json
+++ b/types/riotjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rison/tslint.json b/types/rison/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rison/tslint.json
+++ b/types/rison/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rosie/tslint.json b/types/rosie/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rosie/tslint.json
+++ b/types/rosie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/roslib/tslint.json b/types/roslib/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/roslib/tslint.json
+++ b/types/roslib/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/routie/tslint.json b/types/routie/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/routie/tslint.json
+++ b/types/routie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/royalslider/tslint.json b/types/royalslider/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/royalslider/tslint.json
+++ b/types/royalslider/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rpio/tslint.json b/types/rpio/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rpio/tslint.json
+++ b/types/rpio/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rsmq-worker/tslint.json b/types/rsmq-worker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rsmq-worker/tslint.json
+++ b/types/rsmq-worker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rsmq/tslint.json b/types/rsmq/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rsmq/tslint.json
+++ b/types/rsmq/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rss/tslint.json b/types/rss/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rss/tslint.json
+++ b/types/rss/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rsvp/tslint.json b/types/rsvp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rsvp/tslint.json
+++ b/types/rsvp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rsync/tslint.json b/types/rsync/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rsync/tslint.json
+++ b/types/rsync/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rtree/tslint.json b/types/rtree/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rtree/tslint.json
+++ b/types/rtree/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/run-sequence/tslint.json b/types/run-sequence/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/run-sequence/tslint.json
+++ b/types/run-sequence/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rx-angular/tslint.json b/types/rx-angular/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rx-angular/tslint.json
+++ b/types/rx-angular/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rx-core-binding/tslint.json b/types/rx-core-binding/tslint.json
index 9bd93a98fd..84f4d93abb 100644
--- a/types/rx-core-binding/tslint.json
+++ b/types/rx-core-binding/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-declare-current-package": false,
         "no-empty-interface": false,
         "interface-name": false,
diff --git a/types/rx-core/tslint.json b/types/rx-core/tslint.json
index af05206613..ed19039904 100644
--- a/types/rx-core/tslint.json
+++ b/types/rx-core/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "unified-signatures": false,
         "no-declare-current-package": false,
         "no-empty-interface": false,
diff --git a/types/rx-jquery/tslint.json b/types/rx-jquery/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rx-jquery/tslint.json
+++ b/types/rx-jquery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rx-lite-aggregates/tslint.json b/types/rx-lite-aggregates/tslint.json
index 3043cd814e..5b5adfb0bd 100644
--- a/types/rx-lite-aggregates/tslint.json
+++ b/types/rx-lite-aggregates/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODO
         "dt-header": false,
+        "npm-naming": false,
         "unified-signatures": false,
         "no-declare-current-package": false,
         "no-single-declare-module": false
diff --git a/types/rx-lite-coincidence/tslint.json b/types/rx-lite-coincidence/tslint.json
index 0651031b32..b84945c7b5 100644
--- a/types/rx-lite-coincidence/tslint.json
+++ b/types/rx-lite-coincidence/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "unified-signatures": false,
         "no-declare-current-package": false,
         "no-single-declare-module": false,
diff --git a/types/rx-lite-time/tslint.json b/types/rx-lite-time/tslint.json
index 0651031b32..b84945c7b5 100644
--- a/types/rx-lite-time/tslint.json
+++ b/types/rx-lite-time/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "unified-signatures": false,
         "no-declare-current-package": false,
         "no-single-declare-module": false,
diff --git a/types/rx-lite-virtualtime/tslint.json b/types/rx-lite-virtualtime/tslint.json
index d132ae15db..fe197d7c2b 100644
--- a/types/rx-lite-virtualtime/tslint.json
+++ b/types/rx-lite-virtualtime/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "interface-name": false,
         "no-declare-current-package": false,
         "no-empty-interface": false,
diff --git a/types/rx-lite/tslint.json b/types/rx-lite/tslint.json
index 21bc7a553d..f653226b64 100644
--- a/types/rx-lite/tslint.json
+++ b/types/rx-lite/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "unified-signatures": false,
         "no-declare-current-package": false,
         "no-empty-interface": false,
diff --git a/types/rx-node/tslint.json b/types/rx-node/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rx-node/tslint.json
+++ b/types/rx-node/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rx.wamp/tslint.json b/types/rx.wamp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/rx.wamp/tslint.json
+++ b/types/rx.wamp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/rx/tslint.json b/types/rx/tslint.json
index 6d192e7cef..3a5b262091 100644
--- a/types/rx/tslint.json
+++ b/types/rx/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-declare-current-package": false,
         "no-single-declare-module": false
     }
diff --git a/types/s3-uploader/tslint.json b/types/s3-uploader/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/s3-uploader/tslint.json
+++ b/types/s3-uploader/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/s3rver/tslint.json b/types/s3rver/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/s3rver/tslint.json
+++ b/types/s3rver/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/safari-extension-content/tslint.json b/types/safari-extension-content/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/safari-extension-content/tslint.json
+++ b/types/safari-extension-content/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/safari-extension/tslint.json b/types/safari-extension/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/safari-extension/tslint.json
+++ b/types/safari-extension/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sails.io.js/tslint.json b/types/sails.io.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sails.io.js/tslint.json
+++ b/types/sails.io.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/saml2-js/tslint.json b/types/saml2-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/saml2-js/tslint.json
+++ b/types/saml2-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/samlp/tslint.json b/types/samlp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/samlp/tslint.json
+++ b/types/samlp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sammy/tslint.json b/types/sammy/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/sammy/tslint.json
+++ b/types/sammy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sandboxed-module/tslint.json b/types/sandboxed-module/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sandboxed-module/tslint.json
+++ b/types/sandboxed-module/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sanitize-filename/tslint.json b/types/sanitize-filename/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sanitize-filename/tslint.json
+++ b/types/sanitize-filename/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sanitize-html/tslint.json b/types/sanitize-html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sanitize-html/tslint.json
+++ b/types/sanitize-html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sanitizer/tslint.json b/types/sanitizer/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sanitizer/tslint.json
+++ b/types/sanitizer/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sass-graph/tslint.json b/types/sass-graph/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sass-graph/tslint.json
+++ b/types/sass-graph/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sat/tslint.json b/types/sat/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sat/tslint.json
+++ b/types/sat/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/satnav/tslint.json b/types/satnav/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/satnav/tslint.json
+++ b/types/satnav/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sax/tslint.json b/types/sax/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sax/tslint.json
+++ b/types/sax/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/scalike/tslint.json b/types/scalike/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scalike/tslint.json
+++ b/types/scalike/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/screeps/tslint.json b/types/screeps/tslint.json
index f3ea5020c6..7a37506cf6 100644
--- a/types/screeps/tslint.json
+++ b/types/screeps/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         "no-redundant-jsdoc-2": false,
         "dt-header": false,
+        "npm-naming": false,
         "no-empty-interface": false,
         "no-unnecessary-generics": false,
         "no-misused-new": false,
diff --git a/types/scriptjs/tslint.json b/types/scriptjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scriptjs/tslint.json
+++ b/types/scriptjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/scroll-into-view/tslint.json b/types/scroll-into-view/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scroll-into-view/tslint.json
+++ b/types/scroll-into-view/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/scrollreveal/tslint.json b/types/scrollreveal/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scrollreveal/tslint.json
+++ b/types/scrollreveal/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/scrolltofixed/tslint.json b/types/scrolltofixed/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scrolltofixed/tslint.json
+++ b/types/scrolltofixed/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/scrypt-async/tslint.json b/types/scrypt-async/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/scrypt-async/tslint.json
+++ b/types/scrypt-async/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/seamless/tslint.json b/types/seamless/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/seamless/tslint.json
+++ b/types/seamless/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/seedrandom/tslint.json b/types/seedrandom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/seedrandom/tslint.json
+++ b/types/seedrandom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/segment-analytics/tslint.json b/types/segment-analytics/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/segment-analytics/tslint.json
+++ b/types/segment-analytics/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/selectize/tslint.json b/types/selectize/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/selectize/tslint.json
+++ b/types/selectize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/semaphore/tslint.json b/types/semaphore/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/semaphore/tslint.json
+++ b/types/semaphore/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sencha_touch/tslint.json b/types/sencha_touch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sencha_touch/tslint.json
+++ b/types/sencha_touch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/send/tslint.json b/types/send/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/send/tslint.json
+++ b/types/send/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/seneca/tslint.json b/types/seneca/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/seneca/tslint.json
+++ b/types/seneca/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sequelize-fixtures/tslint.json b/types/sequelize-fixtures/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sequelize-fixtures/tslint.json
+++ b/types/sequelize-fixtures/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sequelize/tslint.json b/types/sequelize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sequelize/tslint.json
+++ b/types/sequelize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sequester/tslint.json b/types/sequester/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sequester/tslint.json
+++ b/types/sequester/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/serve-favicon/tslint.json b/types/serve-favicon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/serve-favicon/tslint.json
+++ b/types/serve-favicon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/serve-index/tslint.json b/types/serve-index/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/serve-index/tslint.json
+++ b/types/serve-index/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/serve-static/tslint.json b/types/serve-static/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/serve-static/tslint.json
+++ b/types/serve-static/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/set-cookie-parser/tslint.json b/types/set-cookie-parser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/set-cookie-parser/tslint.json
+++ b/types/set-cookie-parser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sharedworker/tslint.json b/types/sharedworker/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sharedworker/tslint.json
+++ b/types/sharedworker/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sharepoint/tslint.json b/types/sharepoint/tslint.json
index 06bd920191..aea439cc17 100644
--- a/types/sharepoint/tslint.json
+++ b/types/sharepoint/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "jsdoc-format": false,
         "max-line-length": false,
         "no-any-union": false,
diff --git a/types/shopify-buy/tslint.json b/types/shopify-buy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/shopify-buy/tslint.json
+++ b/types/shopify-buy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/shortid/tslint.json b/types/shortid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/shortid/tslint.json
+++ b/types/shortid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/showdown/tslint.json b/types/showdown/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/showdown/tslint.json
+++ b/types/showdown/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/shuffle-array/tslint.json b/types/shuffle-array/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/shuffle-array/tslint.json
+++ b/types/shuffle-array/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/siesta/tslint.json b/types/siesta/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/siesta/tslint.json
+++ b/types/siesta/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sigmajs/tslint.json b/types/sigmajs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sigmajs/tslint.json
+++ b/types/sigmajs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/signalr/tslint.json b/types/signalr/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/signalr/tslint.json
+++ b/types/signalr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/signature_pad/tslint.json b/types/signature_pad/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/signature_pad/tslint.json
+++ b/types/signature_pad/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simple-assign/tslint.json b/types/simple-assign/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simple-assign/tslint.json
+++ b/types/simple-assign/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simple-cw-node/tslint.json b/types/simple-cw-node/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simple-cw-node/tslint.json
+++ b/types/simple-cw-node/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simple-mock/tslint.json b/types/simple-mock/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simple-mock/tslint.json
+++ b/types/simple-mock/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simple-url-cache/tslint.json b/types/simple-url-cache/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simple-url-cache/tslint.json
+++ b/types/simple-url-cache/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simplemde/tslint.json b/types/simplemde/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simplemde/tslint.json
+++ b/types/simplemde/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simplesmtp/tslint.json b/types/simplesmtp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simplesmtp/tslint.json
+++ b/types/simplesmtp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/simplestorage.js/tslint.json b/types/simplestorage.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/simplestorage.js/tslint.json
+++ b/types/simplestorage.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sinon-as-promised/tslint.json b/types/sinon-as-promised/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sinon-as-promised/tslint.json
+++ b/types/sinon-as-promised/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sinon-chai/tslint.json b/types/sinon-chai/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sinon-chai/tslint.json
+++ b/types/sinon-chai/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sinon-chrome/tslint.json b/types/sinon-chrome/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sinon-chrome/tslint.json
+++ b/types/sinon-chrome/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sinon-mongoose/tslint.json b/types/sinon-mongoose/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sinon-mongoose/tslint.json
+++ b/types/sinon-mongoose/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sinon-stub-promise/tslint.json b/types/sinon-stub-promise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sinon-stub-promise/tslint.json
+++ b/types/sinon-stub-promise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sipml/tslint.json b/types/sipml/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sipml/tslint.json
+++ b/types/sipml/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sjcl/tslint.json b/types/sjcl/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sjcl/tslint.json
+++ b/types/sjcl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ski/tslint.json b/types/ski/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ski/tslint.json
+++ b/types/ski/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/skyway/tslint.json b/types/skyway/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/skyway/tslint.json
+++ b/types/skyway/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slack-node/tslint.json b/types/slack-node/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slack-node/tslint.json
+++ b/types/slack-node/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slackify-html/tslint.json b/types/slackify-html/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slackify-html/tslint.json
+++ b/types/slackify-html/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slate-irc/tslint.json b/types/slate-irc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slate-irc/tslint.json
+++ b/types/slate-irc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sleep/tslint.json b/types/sleep/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sleep/tslint.json
+++ b/types/sleep/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slick-carousel/tslint.json b/types/slick-carousel/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slick-carousel/tslint.json
+++ b/types/slick-carousel/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slickgrid/tslint.json b/types/slickgrid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slickgrid/tslint.json
+++ b/types/slickgrid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/slideout/tslint.json b/types/slideout/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/slideout/tslint.json
+++ b/types/slideout/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/smart-fox-server/tslint.json b/types/smart-fox-server/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/smart-fox-server/tslint.json
+++ b/types/smart-fox-server/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/smtpapi/tslint.json b/types/smtpapi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/smtpapi/tslint.json
+++ b/types/smtpapi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/snapsvg/tslint.json b/types/snapsvg/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/snapsvg/tslint.json
+++ b/types/snapsvg/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/socket.io-client/tslint.json b/types/socket.io-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/socket.io-client/tslint.json
+++ b/types/socket.io-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/socket.io-redis/tslint.json b/types/socket.io-redis/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/socket.io-redis/tslint.json
+++ b/types/socket.io-redis/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/socket.io.users/tslint.json b/types/socket.io.users/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/socket.io.users/tslint.json
+++ b/types/socket.io.users/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/socket.io/tslint.json b/types/socket.io/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/socket.io/tslint.json
+++ b/types/socket.io/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/socketty/tslint.json b/types/socketty/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/socketty/tslint.json
+++ b/types/socketty/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/solution-center-communicator/tslint.json b/types/solution-center-communicator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/solution-center-communicator/tslint.json
+++ b/types/solution-center-communicator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sortablejs/tslint.json b/types/sortablejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sortablejs/tslint.json
+++ b/types/sortablejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/soundjs/tslint.json b/types/soundjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/soundjs/tslint.json
+++ b/types/soundjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/source-list-map/tslint.json b/types/source-list-map/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/source-list-map/tslint.json
+++ b/types/source-list-map/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/space-pen/tslint.json b/types/space-pen/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/space-pen/tslint.json
+++ b/types/space-pen/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/spectrum/tslint.json b/types/spectrum/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/spectrum/tslint.json
+++ b/types/spectrum/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/split/tslint.json b/types/split/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/split/tslint.json
+++ b/types/split/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/split2/tslint.json b/types/split2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/split2/tslint.json
+++ b/types/split2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/spotify-api/tslint.json b/types/spotify-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/spotify-api/tslint.json
+++ b/types/spotify-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sql.js/tslint.json b/types/sql.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sql.js/tslint.json
+++ b/types/sql.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sqs-consumer/tslint.json b/types/sqs-consumer/tslint.json
index a0d5a61bd8..c0833a2f3d 100644
--- a/types/sqs-consumer/tslint.json
+++ b/types/sqs-consumer/tslint.json
@@ -4,6 +4,7 @@
         // TODOs
         "ban-types": false,
         "dt-header": false,
+        "npm-naming": false,
         "strict-export-declare-modifiers": false
     }
 }
diff --git a/types/squirejs/tslint.json b/types/squirejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/squirejs/tslint.json
+++ b/types/squirejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/srp/tslint.json b/types/srp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/srp/tslint.json
+++ b/types/srp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ssh2-streams/tslint.json b/types/ssh2-streams/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ssh2-streams/tslint.json
+++ b/types/ssh2-streams/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ssh2/tslint.json b/types/ssh2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ssh2/tslint.json
+++ b/types/ssh2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stack-mapper/tslint.json b/types/stack-mapper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stack-mapper/tslint.json
+++ b/types/stack-mapper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stack-trace/tslint.json b/types/stack-trace/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stack-trace/tslint.json
+++ b/types/stack-trace/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stacktrace-js/tslint.json b/types/stacktrace-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stacktrace-js/tslint.json
+++ b/types/stacktrace-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/static-eval/tslint.json b/types/static-eval/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/static-eval/tslint.json
+++ b/types/static-eval/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stats.js/tslint.json b/types/stats.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stats.js/tslint.json
+++ b/types/stats.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/statsd-client/tslint.json b/types/statsd-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/statsd-client/tslint.json
+++ b/types/statsd-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/steam/tslint.json b/types/steam/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/steam/tslint.json
+++ b/types/steam/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stompjs/tslint.json b/types/stompjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stompjs/tslint.json
+++ b/types/stompjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/store/tslint.json b/types/store/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/store/tslint.json
+++ b/types/store/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stream-meter/tslint.json b/types/stream-meter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stream-meter/tslint.json
+++ b/types/stream-meter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stream-series/tslint.json b/types/stream-series/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/stream-series/tslint.json
+++ b/types/stream-series/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/streamjs/tslint.json b/types/streamjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/streamjs/tslint.json
+++ b/types/streamjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/strftime/tslint.json b/types/strftime/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/strftime/tslint.json
+++ b/types/strftime/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/string-hash/tslint.json b/types/string-hash/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/string-hash/tslint.json
+++ b/types/string-hash/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/string-template/tslint.json b/types/string-template/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/string-template/tslint.json
+++ b/types/string-template/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/string/tslint.json b/types/string/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/string/tslint.json
+++ b/types/string/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/string_score/tslint.json b/types/string_score/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/string_score/tslint.json
+++ b/types/string_score/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/strip-json-comments/tslint.json b/types/strip-json-comments/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/strip-json-comments/tslint.json
+++ b/types/strip-json-comments/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/stripe-v3/tslint.json b/types/stripe-v3/tslint.json
index 6fb3f2df06..f900028cbc 100644
--- a/types/stripe-v3/tslint.json
+++ b/types/stripe-v3/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODOs
 		"dt-header": false,
+        "npm-naming": false,
         "no-angle-bracket-type-assertion": false,
 		"no-any-union": false
 	}
diff --git a/types/strophe/tslint.json b/types/strophe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/strophe/tslint.json
+++ b/types/strophe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/succinct/tslint.json b/types/succinct/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/succinct/tslint.json
+++ b/types/succinct/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/suitescript/tslint.json b/types/suitescript/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/suitescript/tslint.json
+++ b/types/suitescript/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/supertest/tslint.json b/types/supertest/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/supertest/tslint.json
+++ b/types/supertest/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/svg-injector/tslint.json b/types/svg-injector/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/svg-injector/tslint.json
+++ b/types/svg-injector/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/svg-sprite/tslint.json b/types/svg-sprite/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/svg-sprite/tslint.json
+++ b/types/svg-sprite/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/svgjs.draggable/tslint.json b/types/svgjs.draggable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/svgjs.draggable/tslint.json
+++ b/types/svgjs.draggable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/svgjs.resize/tslint.json b/types/svgjs.resize/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/svgjs.resize/tslint.json
+++ b/types/svgjs.resize/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swag/tslint.json b/types/swag/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swag/tslint.json
+++ b/types/swag/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swagger-express-middleware/tslint.json b/types/swagger-express-middleware/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swagger-express-middleware/tslint.json
+++ b/types/swagger-express-middleware/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swagger-jsdoc/tslint.json b/types/swagger-jsdoc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swagger-jsdoc/tslint.json
+++ b/types/swagger-jsdoc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swaggerize-express/tslint.json b/types/swaggerize-express/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swaggerize-express/tslint.json
+++ b/types/swaggerize-express/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swfobject/tslint.json b/types/swfobject/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swfobject/tslint.json
+++ b/types/swfobject/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swiftclick/tslint.json b/types/swiftclick/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swiftclick/tslint.json
+++ b/types/swiftclick/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swig/tslint.json b/types/swig/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swig/tslint.json
+++ b/types/swig/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swipe/tslint.json b/types/swipe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swipe/tslint.json
+++ b/types/swipe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swipeview/tslint.json b/types/swipeview/tslint.json
index 7d5b2a06c0..16484e488d 100644
--- a/types/swipeview/tslint.json
+++ b/types/swipeview/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/switchery/tslint.json b/types/switchery/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/switchery/tslint.json
+++ b/types/switchery/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/swiz/tslint.json b/types/swiz/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/swiz/tslint.json
+++ b/types/swiz/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/sylvester/tslint.json b/types/sylvester/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/sylvester/tslint.json
+++ b/types/sylvester/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/synaptic/tslint.json b/types/synaptic/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/synaptic/tslint.json
+++ b/types/synaptic/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tabtab/tslint.json b/types/tabtab/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tabtab/tslint.json
+++ b/types/tabtab/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tapable/tslint.json b/types/tapable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tapable/tslint.json
+++ b/types/tapable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tape/tslint.json b/types/tape/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tape/tslint.json
+++ b/types/tape/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tea-merge/tslint.json b/types/tea-merge/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tea-merge/tslint.json
+++ b/types/tea-merge/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tedious/tslint.json b/types/tedious/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tedious/tslint.json
+++ b/types/tedious/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/teechart/tslint.json b/types/teechart/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/teechart/tslint.json
+++ b/types/teechart/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/temp-fs/tslint.json b/types/temp-fs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/temp-fs/tslint.json
+++ b/types/temp-fs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/terminal-menu/tslint.json b/types/terminal-menu/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/terminal-menu/tslint.json
+++ b/types/terminal-menu/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tesseract.js/tslint.json b/types/tesseract.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tesseract.js/tslint.json
+++ b/types/tesseract.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tether-drop/tslint.json b/types/tether-drop/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tether-drop/tslint.json
+++ b/types/tether-drop/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tether-shepherd/tslint.json b/types/tether-shepherd/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tether-shepherd/tslint.json
+++ b/types/tether-shepherd/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tether/tslint.json b/types/tether/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tether/tslint.json
+++ b/types/tether/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/text-encoding/tslint.json b/types/text-encoding/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/text-encoding/tslint.json
+++ b/types/text-encoding/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/three/tslint.json b/types/three/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/three/tslint.json
+++ b/types/three/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/through/tslint.json b/types/through/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/through/tslint.json
+++ b/types/through/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/through2/tslint.json b/types/through2/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/through2/tslint.json
+++ b/types/through2/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tile-reduce/tslint.json b/types/tile-reduce/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tile-reduce/tslint.json
+++ b/types/tile-reduce/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tilebelt/tslint.json b/types/tilebelt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tilebelt/tslint.json
+++ b/types/tilebelt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/timelinejs/tslint.json b/types/timelinejs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/timelinejs/tslint.json
+++ b/types/timelinejs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/timelinejs3/tslint.json b/types/timelinejs3/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/timelinejs3/tslint.json
+++ b/types/timelinejs3/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/timezone-js/tslint.json b/types/timezone-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/timezone-js/tslint.json
+++ b/types/timezone-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tinder/tslint.json b/types/tinder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tinder/tslint.json
+++ b/types/tinder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tinycopy/tslint.json b/types/tinycopy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tinycopy/tslint.json
+++ b/types/tinycopy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/title/tslint.json b/types/title/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/title/tslint.json
+++ b/types/title/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tldjs/tslint.json b/types/tldjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tldjs/tslint.json
+++ b/types/tldjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/to-title-case-gouch/tslint.json b/types/to-title-case-gouch/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/to-title-case-gouch/tslint.json
+++ b/types/to-title-case-gouch/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/toastr/tslint.json b/types/toastr/tslint.json
index 67293bd146..0a7abf97f8 100644
--- a/types/toastr/tslint.json
+++ b/types/toastr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tooltipster/tslint.json b/types/tooltipster/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tooltipster/tslint.json
+++ b/types/tooltipster/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/torrent-stream/tslint.json b/types/torrent-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/torrent-stream/tslint.json
+++ b/types/torrent-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/touch-events/tslint.json b/types/touch-events/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/touch-events/tslint.json
+++ b/types/touch-events/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/traceback/tslint.json b/types/traceback/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/traceback/tslint.json
+++ b/types/traceback/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tracking/tslint.json b/types/tracking/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tracking/tslint.json
+++ b/types/tracking/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/traverse/tslint.json b/types/traverse/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/traverse/tslint.json
+++ b/types/traverse/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/traverson/tslint.json b/types/traverson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/traverson/tslint.json
+++ b/types/traverson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/trayballoon/tslint.json b/types/trayballoon/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/trayballoon/tslint.json
+++ b/types/trayballoon/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/trim/tslint.json b/types/trim/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/trim/tslint.json
+++ b/types/trim/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/trunk8/tslint.json b/types/trunk8/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/trunk8/tslint.json
+++ b/types/trunk8/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tspromise/tslint.json b/types/tspromise/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tspromise/tslint.json
+++ b/types/tspromise/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tv4/tslint.json b/types/tv4/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tv4/tslint.json
+++ b/types/tv4/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tweenjs/tslint.json b/types/tweenjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tweenjs/tslint.json
+++ b/types/tweenjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twilio/tslint.json b/types/twilio/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twilio/tslint.json
+++ b/types/twilio/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twit/tslint.json b/types/twit/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twit/tslint.json
+++ b/types/twit/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twitter-for-web/tslint.json b/types/twitter-for-web/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twitter-for-web/tslint.json
+++ b/types/twitter-for-web/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twitter-stream-channels/tslint.json b/types/twitter-stream-channels/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twitter-stream-channels/tslint.json
+++ b/types/twitter-stream-channels/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twitter-text/tslint.json b/types/twitter-text/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twitter-text/tslint.json
+++ b/types/twitter-text/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/twix/tslint.json b/types/twix/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/twix/tslint.json
+++ b/types/twix/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/type-check/tslint.json b/types/type-check/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/type-check/tslint.json
+++ b/types/type-check/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/type-detect/tslint.json b/types/type-detect/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/type-detect/tslint.json
+++ b/types/type-detect/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/type-name/tslint.json b/types/type-name/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/type-name/tslint.json
+++ b/types/type-name/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/typeahead/tslint.json b/types/typeahead/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/typeahead/tslint.json
+++ b/types/typeahead/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/typedarray-pool/tslint.json b/types/typedarray-pool/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/typedarray-pool/tslint.json
+++ b/types/typedarray-pool/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/typescript-deferred/tslint.json b/types/typescript-deferred/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/typescript-deferred/tslint.json
+++ b/types/typescript-deferred/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/tz-format/tslint.json b/types/tz-format/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/tz-format/tslint.json
+++ b/types/tz-format/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ua-parser-js/tslint.json b/types/ua-parser-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ua-parser-js/tslint.json
+++ b/types/ua-parser-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uglifycss/tslint.json b/types/uglifycss/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uglifycss/tslint.json
+++ b/types/uglifycss/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ui-grid/tslint.json b/types/ui-grid/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ui-grid/tslint.json
+++ b/types/ui-grid/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ui-select/tslint.json b/types/ui-select/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/ui-select/tslint.json
+++ b/types/ui-select/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uid-safe/tslint.json b/types/uid-safe/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uid-safe/tslint.json
+++ b/types/uid-safe/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/umbraco/tslint.json b/types/umbraco/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/umbraco/tslint.json
+++ b/types/umbraco/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/umd/tslint.json b/types/umd/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/umd/tslint.json
+++ b/types/umd/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/umzug/tslint.json b/types/umzug/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/umzug/tslint.json
+++ b/types/umzug/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/underscore-ko/tslint.json b/types/underscore-ko/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/underscore-ko/tslint.json
+++ b/types/underscore-ko/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/underscore.string/tslint.json b/types/underscore.string/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/underscore.string/tslint.json
+++ b/types/underscore.string/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/underscore/tslint.json b/types/underscore/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/underscore/tslint.json
+++ b/types/underscore/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uniq/tslint.json b/types/uniq/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uniq/tslint.json
+++ b/types/uniq/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/unique-random/tslint.json b/types/unique-random/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/unique-random/tslint.json
+++ b/types/unique-random/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/unity-webapi/tslint.json b/types/unity-webapi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/unity-webapi/tslint.json
+++ b/types/unity-webapi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/unorm/tslint.json b/types/unorm/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/unorm/tslint.json
+++ b/types/unorm/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/urbanairship-cordova/tslint.json b/types/urbanairship-cordova/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/urbanairship-cordova/tslint.json
+++ b/types/urbanairship-cordova/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uri-templates/tslint.json b/types/uri-templates/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uri-templates/tslint.json
+++ b/types/uri-templates/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/urijs/tslint.json b/types/urijs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/urijs/tslint.json
+++ b/types/urijs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/url-template/tslint.json b/types/url-template/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/url-template/tslint.json
+++ b/types/url-template/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/urlrouter/tslint.json b/types/urlrouter/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/urlrouter/tslint.json
+++ b/types/urlrouter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/urlsafe-base64/tslint.json b/types/urlsafe-base64/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/urlsafe-base64/tslint.json
+++ b/types/urlsafe-base64/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/usage/tslint.json b/types/usage/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/usage/tslint.json
+++ b/types/usage/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/useragent/tslint.json b/types/useragent/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/useragent/tslint.json
+++ b/types/useragent/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/username/tslint.json b/types/username/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/username/tslint.json
+++ b/types/username/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/utf8/tslint.json b/types/utf8/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/utf8/tslint.json
+++ b/types/utf8/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/utils-merge/tslint.json b/types/utils-merge/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/utils-merge/tslint.json
+++ b/types/utils-merge/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uuid-1345/tslint.json b/types/uuid-1345/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uuid-1345/tslint.json
+++ b/types/uuid-1345/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/uws/tslint.json b/types/uws/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/uws/tslint.json
+++ b/types/uws/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/v8-profiler/tslint.json b/types/v8-profiler/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/v8-profiler/tslint.json
+++ b/types/v8-profiler/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/valdr-message/tslint.json b/types/valdr-message/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/valdr-message/tslint.json
+++ b/types/valdr-message/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/valdr/tslint.json b/types/valdr/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/valdr/tslint.json
+++ b/types/valdr/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/valerie/tslint.json b/types/valerie/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/valerie/tslint.json
+++ b/types/valerie/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/valid-url/tslint.json b/types/valid-url/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/valid-url/tslint.json
+++ b/types/valid-url/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/validator/tslint.json b/types/validator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/validator/tslint.json
+++ b/types/validator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/validatorjs/tslint.json b/types/validatorjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/validatorjs/tslint.json
+++ b/types/validatorjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vec3/tslint.json b/types/vec3/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vec3/tslint.json
+++ b/types/vec3/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vectorious/tslint.json b/types/vectorious/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vectorious/tslint.json
+++ b/types/vectorious/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/velocity-animate/tslint.json b/types/velocity-animate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/velocity-animate/tslint.json
+++ b/types/velocity-animate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vex-js/tslint.json b/types/vex-js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vex-js/tslint.json
+++ b/types/vex-js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vexflow/tslint.json b/types/vexflow/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/vexflow/tslint.json
+++ b/types/vexflow/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/victor/tslint.json b/types/victor/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/victor/tslint.json
+++ b/types/victor/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/viewporter/tslint.json b/types/viewporter/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/viewporter/tslint.json
+++ b/types/viewporter/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vimeo/tslint.json b/types/vimeo/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vimeo/tslint.json
+++ b/types/vimeo/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vinyl-paths/tslint.json b/types/vinyl-paths/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vinyl-paths/tslint.json
+++ b/types/vinyl-paths/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vinyl-source-stream/tslint.json b/types/vinyl-source-stream/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vinyl-source-stream/tslint.json
+++ b/types/vinyl-source-stream/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/virtual-dom/tslint.json b/types/virtual-dom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/virtual-dom/tslint.json
+++ b/types/virtual-dom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vitalsigns/tslint.json b/types/vitalsigns/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vitalsigns/tslint.json
+++ b/types/vitalsigns/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vivus/tslint.json b/types/vivus/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vivus/tslint.json
+++ b/types/vivus/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/voronoi-diagram/tslint.json b/types/voronoi-diagram/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/voronoi-diagram/tslint.json
+++ b/types/voronoi-diagram/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vortex-web-client/tslint.json b/types/vortex-web-client/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vortex-web-client/tslint.json
+++ b/types/vortex-web-client/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/voximplant-websdk/tslint.json b/types/voximplant-websdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/voximplant-websdk/tslint.json
+++ b/types/voximplant-websdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/vue-resource/tslint.json b/types/vue-resource/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/vue-resource/tslint.json
+++ b/types/vue-resource/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/w2ui/tslint.json b/types/w2ui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/w2ui/tslint.json
+++ b/types/w2ui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/w3c-gamepad/tslint.json b/types/w3c-gamepad/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/w3c-gamepad/tslint.json
+++ b/types/w3c-gamepad/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/waitme/tslint.json b/types/waitme/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/waitme/tslint.json
+++ b/types/waitme/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wake_on_lan/tslint.json b/types/wake_on_lan/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wake_on_lan/tslint.json
+++ b/types/wake_on_lan/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wallabyjs/tslint.json b/types/wallabyjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wallabyjs/tslint.json
+++ b/types/wallabyjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wampy/tslint.json b/types/wampy/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wampy/tslint.json
+++ b/types/wampy/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/warning/tslint.json b/types/warning/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/warning/tslint.json
+++ b/types/warning/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/watchify/tslint.json b/types/watchify/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/watchify/tslint.json
+++ b/types/watchify/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/waterline/tslint.json b/types/waterline/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/waterline/tslint.json
+++ b/types/waterline/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/weapp-api/tslint.json b/types/weapp-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/weapp-api/tslint.json
+++ b/types/weapp-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/web-bluetooth/tslint.json b/types/web-bluetooth/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/web-bluetooth/tslint.json
+++ b/types/web-bluetooth/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webassembly-js-api/tslint.json b/types/webassembly-js-api/tslint.json
index d8590b6513..9bf07c8ad4 100644
--- a/types/webassembly-js-api/tslint.json
+++ b/types/webassembly-js-api/tslint.json
@@ -3,6 +3,7 @@
     "rules": {
         // TODOs
         "dt-header": false,
+        "npm-naming": false,
         "no-unnecessary-class": false
     }
 }
diff --git a/types/webcl/tslint.json b/types/webcl/tslint.json
index 61296cdc77..6afce47c42 100644
--- a/types/webcl/tslint.json
+++ b/types/webcl/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webcrypto/tslint.json b/types/webcrypto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webcrypto/tslint.json
+++ b/types/webcrypto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webfontloader/tslint.json b/types/webfontloader/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webfontloader/tslint.json
+++ b/types/webfontloader/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webgl-ext/tslint.json b/types/webgl-ext/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webgl-ext/tslint.json
+++ b/types/webgl-ext/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webgl2/tslint.json b/types/webgl2/tslint.json
index e2f8af4989..f0d9862c7a 100644
--- a/types/webgl2/tslint.json
+++ b/types/webgl2/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "dt-header": false,
+        "npm-naming": false,
         "align": false,
         "adjacent-overload-signatures": false,
         "comment-format": false,
diff --git a/types/webpack-env/tslint.json b/types/webpack-env/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webpack-env/tslint.json
+++ b/types/webpack-env/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webpack-fail-plugin/tslint.json b/types/webpack-fail-plugin/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webpack-fail-plugin/tslint.json
+++ b/types/webpack-fail-plugin/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webpack-validator/tslint.json b/types/webpack-validator/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webpack-validator/tslint.json
+++ b/types/webpack-validator/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webrtc/tslint.json b/types/webrtc/tslint.json
index 3950a77d6c..cf962d408b 100644
--- a/types/webrtc/tslint.json
+++ b/types/webrtc/tslint.json
@@ -6,6 +6,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "no-empty-interface": false,
         "no-useless-files": false,
         "prefer-method-signature": false
diff --git a/types/website-scraper/tslint.json b/types/website-scraper/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/website-scraper/tslint.json
+++ b/types/website-scraper/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/websocket/tslint.json b/types/websocket/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/websocket/tslint.json
+++ b/types/websocket/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/websql/tslint.json b/types/websql/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/websql/tslint.json
+++ b/types/websql/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/webvr-api/tslint.json b/types/webvr-api/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/webvr-api/tslint.json
+++ b/types/webvr-api/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/weighted/tslint.json b/types/weighted/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/weighted/tslint.json
+++ b/types/weighted/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/whatwg-streams/tslint.json b/types/whatwg-streams/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/whatwg-streams/tslint.json
+++ b/types/whatwg-streams/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/when/tslint.json b/types/when/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/when/tslint.json
+++ b/types/when/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/which/tslint.json b/types/which/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/which/tslint.json
+++ b/types/which/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/why-did-you-update/tslint.json b/types/why-did-you-update/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/why-did-you-update/tslint.json
+++ b/types/why-did-you-update/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wiiu/tslint.json b/types/wiiu/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/wiiu/tslint.json
+++ b/types/wiiu/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/window-size/tslint.json b/types/window-size/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/window-size/tslint.json
+++ b/types/window-size/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/windows-1251/tslint.json b/types/windows-1251/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/windows-1251/tslint.json
+++ b/types/windows-1251/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/windows-service/tslint.json b/types/windows-service/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/windows-service/tslint.json
+++ b/types/windows-service/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/winjs/tslint.json b/types/winjs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/winjs/tslint.json
+++ b/types/winjs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/winreg/tslint.json b/types/winreg/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/winreg/tslint.json
+++ b/types/winreg/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/winrt-uwp/tslint.json b/types/winrt-uwp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/winrt-uwp/tslint.json
+++ b/types/winrt-uwp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/winrt/tslint.json b/types/winrt/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/winrt/tslint.json
+++ b/types/winrt/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/winston-dynamodb/tslint.json b/types/winston-dynamodb/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/winston-dynamodb/tslint.json
+++ b/types/winston-dynamodb/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wiredep/tslint.json b/types/wiredep/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wiredep/tslint.json
+++ b/types/wiredep/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wiring-pi/tslint.json b/types/wiring-pi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wiring-pi/tslint.json
+++ b/types/wiring-pi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wonder.js/tslint.json b/types/wonder.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wonder.js/tslint.json
+++ b/types/wonder.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wrap-ansi/tslint.json b/types/wrap-ansi/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wrap-ansi/tslint.json
+++ b/types/wrap-ansi/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wreck/tslint.json b/types/wreck/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wreck/tslint.json
+++ b/types/wreck/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/wrench/tslint.json b/types/wrench/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/wrench/tslint.json
+++ b/types/wrench/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/x-editable/tslint.json b/types/x-editable/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/x-editable/tslint.json
+++ b/types/x-editable/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xdate/tslint.json b/types/xdate/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xdate/tslint.json
+++ b/types/xdate/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xdomain/tslint.json b/types/xdomain/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xdomain/tslint.json
+++ b/types/xdomain/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xml-parser/tslint.json b/types/xml-parser/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xml-parser/tslint.json
+++ b/types/xml-parser/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xmlbuilder/tslint.json b/types/xmlbuilder/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xmlbuilder/tslint.json
+++ b/types/xmlbuilder/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xmldom/tslint.json b/types/xmldom/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xmldom/tslint.json
+++ b/types/xmldom/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xmlpoke/tslint.json b/types/xmlpoke/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xmlpoke/tslint.json
+++ b/types/xmlpoke/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xmlrpc/tslint.json b/types/xmlrpc/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xmlrpc/tslint.json
+++ b/types/xmlrpc/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xmltojson/tslint.json b/types/xmltojson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xmltojson/tslint.json
+++ b/types/xmltojson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xregexp/tslint.json b/types/xregexp/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xregexp/tslint.json
+++ b/types/xregexp/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xsockets/tslint.json b/types/xsockets/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xsockets/tslint.json
+++ b/types/xsockets/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xss-filters/tslint.json b/types/xss-filters/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xss-filters/tslint.json
+++ b/types/xss-filters/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/xtend/tslint.json b/types/xtend/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/xtend/tslint.json
+++ b/types/xtend/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/yamljs/tslint.json b/types/yamljs/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/yamljs/tslint.json
+++ b/types/yamljs/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/yandex-money-sdk/tslint.json b/types/yandex-money-sdk/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/yandex-money-sdk/tslint.json
+++ b/types/yandex-money-sdk/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/yayson/tslint.json b/types/yayson/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/yayson/tslint.json
+++ b/types/yayson/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/ydn-db/tslint.json b/types/ydn-db/tslint.json
index d67ffb3a73..6c7fd03ccd 100644
--- a/types/ydn-db/tslint.json
+++ b/types/ydn-db/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/yosay/tslint.json b/types/yosay/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/yosay/tslint.json
+++ b/types/yosay/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/youtube/tslint.json b/types/youtube/tslint.json
index b6afb8acee..4017299a0e 100644
--- a/types/youtube/tslint.json
+++ b/types/youtube/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/yui/tslint.json b/types/yui/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/yui/tslint.json
+++ b/types/yui/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/z-schema/tslint.json b/types/z-schema/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/z-schema/tslint.json
+++ b/types/z-schema/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/zepto/tslint.json b/types/zepto/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/zepto/tslint.json
+++ b/types/zepto/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/zeroclipboard/tslint.json b/types/zeroclipboard/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/zeroclipboard/tslint.json
+++ b/types/zeroclipboard/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/zip.js/tslint.json b/types/zip.js/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/zip.js/tslint.json
+++ b/types/zip.js/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,
diff --git a/types/zmq/tslint.json b/types/zmq/tslint.json
index a41bf5d19a..3d59f55fda 100644
--- a/types/zmq/tslint.json
+++ b/types/zmq/tslint.json
@@ -8,6 +8,7 @@
         "callable-types": false,
         "comment-format": false,
         "dt-header": false,
+        "npm-naming": false,
         "eofline": false,
         "export-just-namespace": false,
         "import-spacing": false,

From dc5cdc3c05323255be9488a1c24fcac600320513 Mon Sep 17 00:00:00 2001
From: Florian Keller <github@floriankeller.de>
Date: Fri, 22 Mar 2019 10:53:27 +0100
Subject: [PATCH 907/924] Add types for nonogram-solver

---
 types/nonogram-solver/index.d.ts              | 40 +++++++++++++++++++
 .../nonogram-solver/nonogram-solver-tests.ts  | 10 +++++
 types/nonogram-solver/tsconfig.json           | 23 +++++++++++
 types/nonogram-solver/tslint.json             |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 types/nonogram-solver/index.d.ts
 create mode 100644 types/nonogram-solver/nonogram-solver-tests.ts
 create mode 100644 types/nonogram-solver/tsconfig.json
 create mode 100644 types/nonogram-solver/tslint.json

diff --git a/types/nonogram-solver/index.d.ts b/types/nonogram-solver/index.d.ts
new file mode 100644
index 0000000000..a7bb4e7a26
--- /dev/null
+++ b/types/nonogram-solver/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for nonogram-solver 2.0
+// Project: https://github.com/thomasr/nonogram-solver
+// Definitions by: Florian Keller <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+declare namespace solve {
+    class Puzzle {
+        columnHints: number[][];
+        height: number;
+        rowHints: number[][];
+        snapshot: number[];
+        width: number;
+        readonly isFinished: boolean;
+        readonly isSolved: boolean;
+        readonly svg: string;
+
+        constructor(data: string | Input);
+
+        import(puzzle: Puzzle): void;
+        toJSON(): Required<Input>;
+    }
+
+    interface Result {
+        puzzle: Puzzle;
+        status: State;
+    }
+
+    interface Input {
+        columns: number[][];
+        content?: State[];
+        rows: number[][];
+    }
+
+    type State = 0 | 1 | -1;
+}
+
+declare function solve(filename: string): solve.Result;
+
+export = solve;
diff --git a/types/nonogram-solver/nonogram-solver-tests.ts b/types/nonogram-solver/nonogram-solver-tests.ts
new file mode 100644
index 0000000000..5850711fab
--- /dev/null
+++ b/types/nonogram-solver/nonogram-solver-tests.ts
@@ -0,0 +1,10 @@
+import solve = require('nonogram-solver');
+
+const { status, puzzle } = solve('input.json');
+
+puzzle; // $ExpectType Puzzle
+puzzle.columnHints; // $ExpectType number[][]
+puzzle.isFinished; // $expectType boolean
+puzzle.svg; // $expectType string
+
+status; // $ExpectType State
diff --git a/types/nonogram-solver/tsconfig.json b/types/nonogram-solver/tsconfig.json
new file mode 100644
index 0000000000..688aea0d5e
--- /dev/null
+++ b/types/nonogram-solver/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",
+        "nonogram-solver-tests.ts"
+    ]
+}
diff --git a/types/nonogram-solver/tslint.json b/types/nonogram-solver/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nonogram-solver/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f7be7ede891825607ceec26e41a0e12264fb64bf Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 12:02:39 -0700
Subject: [PATCH 908/924] VS Code 1.20 Extension API

---
 types/vscode/index.d.ts | 242 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 222 insertions(+), 20 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index d326575601..5420be3cc7 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.19
+// Type definitions for Visual Studio Code 1.20
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.19 Extension API
+ * Type Definition for Visual Studio Code 1.20 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
@@ -272,7 +272,7 @@ declare module 'vscode' {
 		constructor(line: number, character: number);
 
 		/**
-		 * Check if `other` is before this position.
+		 * Check if this position is before `other`.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a smaller line
@@ -281,7 +281,7 @@ declare module 'vscode' {
 		isBefore(other: Position): boolean;
 
 		/**
-		 * Check if `other` is before or equal to this position.
+		 * Check if this position is before or equal to `other`.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a smaller line
@@ -290,7 +290,7 @@ declare module 'vscode' {
 		isBeforeOrEqual(other: Position): boolean;
 
 		/**
-		 * Check if `other` is after this position.
+		 * Check if this position is after `other`.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a greater line
@@ -299,7 +299,7 @@ declare module 'vscode' {
 		isAfter(other: Position): boolean;
 
 		/**
-		 * Check if `other` is after or equal to this position.
+		 * Check if this position is after or equal to `other`.
 		 *
 		 * @param other A position.
 		 * @return `true` if position is on a greater line
@@ -308,7 +308,7 @@ declare module 'vscode' {
 		isAfterOrEqual(other: Position): boolean;
 
 		/**
-		 * Check if `other` equals this position.
+		 * Check if this position is equal to `other`.
 		 *
 		 * @param other A position.
 		 * @return `true` if the line and character of the given position are equal to
@@ -847,6 +847,16 @@ declare module 'vscode' {
 		 */
 		borderWidth?: string;
 
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		fontStyle?: string;
+
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		fontWeight?: string;
+
 		/**
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
@@ -913,6 +923,14 @@ declare module 'vscode' {
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
 		borderColor?: string | ThemeColor;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		fontStyle?: string;
+		/**
+		 * CSS styling property that will be applied to the decoration attachment.
+		 */
+		fontWeight?: string;
 		/**
 		 * CSS styling property that will be applied to the decoration attachment.
 		 */
@@ -1805,6 +1823,90 @@ declare module 'vscode' {
 	 */
 	export type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
 
+	/**
+	 * Kind of a code action.
+	 *
+	 * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+	 */
+	export class CodeActionKind {
+		/**
+		 * Empty kind.
+		 */
+		static readonly Empty: CodeActionKind;
+
+		/**
+		 * Base kind for quickfix actions.
+		 */
+		static readonly QuickFix: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring actions.
+		 */
+		static readonly Refactor: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring extraction actions.
+		 *
+		 * Example extract actions:
+		 *
+		 * - Extract method
+		 * - Extract function
+		 * - Extract variable
+		 * - Extract interface from class
+		 * - ...
+		 */
+		static readonly RefactorExtract: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring inline actions.
+		 *
+		 * Example inline actions:
+		 *
+		 * - Inline function
+		 * - Inline variable
+		 * - Inline constant
+		 * - ...
+		 */
+		static readonly RefactorInline: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring rewrite actions.
+		 *
+		 * Example rewrite actions:
+		 *
+		 * - Convert JavaScript function to class
+		 * - Add or remove parameter
+		 * - Encapsulate field
+		 * - Make method static
+		 * - Move method to base class
+		 * - ...
+		 */
+		static readonly RefactorRewrite: CodeActionKind;
+
+		private constructor(value: string);
+
+		/**
+		 * String value of the kind, e.g. `"refactor.extract.function"`.
+		 */
+		readonly value?: string;
+
+		/**
+		 * Create a new kind by appending a more specific selector to the current kind.
+		 *
+		 * Does not modify the current kind.
+		 */
+		append(parts: string): CodeActionKind;
+
+		/**
+		 * Does this kind contain `other`?
+		 *
+		 * The kind `"refactor"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`, but not `"unicorn.refactor.extract"` or `"refactory.extract"`
+		 *
+		 * @param other Kind to check.
+		 */
+		contains(other: CodeActionKind): boolean;
+	}
+
 	/**
 	 * Contains additional diagnostic information about the context in which
 	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
@@ -1814,6 +1916,60 @@ declare module 'vscode' {
 		 * An array of diagnostics.
 		 */
 		readonly diagnostics: Diagnostic[];
+
+		/**
+		 * Requested kind of actions to return.
+		 *
+		 * Actions not of this kind are filtered out before being shown by the lightbulb.
+		 */
+		readonly only?: CodeActionKind;
+	}
+
+	/**
+	 * A code action represents a change that can be performed in code, e.g. to fix a problem or
+	 * to refactor code.
+	 *
+	 * A CodeAction must set either [`edit`](CodeAction#edit) and/or a [`command`](CodeAction#command). If both are supplied, the `edit` is applied first, then the command is executed.
+	 */
+	export class CodeAction {
+
+		/**
+		 * A short, human-readable, title for this code action.
+		 */
+		title: string;
+
+		/**
+		 * A [workspace edit](#WorkspaceEdit) this code action performs.
+		 */
+		edit?: WorkspaceEdit;
+
+		/**
+		 * [Diagnostics](#Diagnostic) that this code action resolves.
+		 */
+		diagnostics?: Diagnostic[];
+
+		/**
+		 * A [command](#Command) this code action executes.
+		 */
+		command?: Command;
+
+		/**
+		 * [Kind](#CodeActionKind) of the code action.
+		 *
+		 * Used to filter code actions.
+		 */
+		kind?: CodeActionKind;
+
+		/**
+		 * Creates a new code action.
+		 *
+		 * A code action must have at least a [title](#CodeAction.title) and either [edits](#CodeAction.edit)
+		 * or a [command](#CodeAction.command).
+		 *
+		 * @param title The title of the code action.
+		 * @param kind The kind of the code action.
+		 */
+		constructor(title: string, kind?: CodeActionKind);
 	}
 
 	/**
@@ -1831,10 +1987,10 @@ declare module 'vscode' {
 		 * @param range The range for which the command was invoked.
 		 * @param context Context carrying additional information.
 		 * @param token A cancellation token.
-		 * @return An array of commands or a thenable of such. The lack of a result can be
+		 * @return An array of commands, quick fixes, or refactorings or a thenable of such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<Command[]>;
+		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
 	}
 
 	/**
@@ -2372,7 +2528,8 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * A workspace edit represents textual changes for many documents.
+	 * A workspace edit represents textual and files changes for
+	 * multiple resources and documents.
 	 */
 	export class WorkspaceEdit {
 
@@ -2433,7 +2590,7 @@ declare module 'vscode' {
 		/**
 		 * Get all text edits grouped by resource.
 		 *
-		 * @return An array of `[Uri, TextEdit[]]`-tuples.
+		 * @return A shallow copy of `[Uri, TextEdit[]]`-tuples.
 		 */
 		entries(): [Uri, TextEdit[]][];
 	}
@@ -2863,7 +3020,7 @@ declare module 'vscode' {
 	export class CompletionList {
 
 		/**
-		 * This list it not complete. Further typing should result in recomputing
+		 * This list is not complete. Further typing should result in recomputing
 		 * this list.
 		 */
 		isIncomplete?: boolean;
@@ -2893,7 +3050,11 @@ declare module 'vscode' {
 		/**
 		 * Completion was triggered by a trigger character.
 		 */
-		TriggerCharacter = 1
+		TriggerCharacter = 1,
+		/**
+		 * Completion was re-triggered as current completion list is incomplete
+		 */
+		TriggerForIncompleteCompletions = 2
 	}
 
 	/**
@@ -3662,7 +3823,7 @@ declare module 'vscode' {
 	 * An output channel is a container for readonly textual information.
 	 *
 	 * To get an instance of an `OutputChannel` use
-	 * [createOutputChannel](#window.createOutputChannel).
+	 * [	createOutputChannel](#window.createOutputChannel).
 	 */
 	export interface OutputChannel {
 
@@ -4891,6 +5052,7 @@ declare module 'vscode' {
 	export interface TreeDataProvider<T> {
 		/**
 		 * An optional event to signal that an element or root has changed.
+		 * This will trigger the view to update the changed element/root and its children recursively (if shown).
 		 * To signal that root has changed, do not pass any argument or pass `undefined` or `null`.
 		 */
 		onDidChangeTreeData?: Event<T | undefined | null>;
@@ -4914,15 +5076,30 @@ declare module 'vscode' {
 
 	export class TreeItem {
 		/**
-		 * A human-readable string describing this item
+		 * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri).
 		 */
-		label: string;
+		label?: string;
 
 		/**
-		 * The icon path for the tree item
+		 * Optional id for the tree item that has to be unique across tree. The id is used to preserve the selection and expansion state of the tree item.
+		 *
+		 * If not provided, an id is generated using the tree item's label. **Note** that when labels change, ids will change and that selection and expansion state cannot be kept stable anymore.
+		 */
+		id?: string;
+
+		/**
+		 * The icon path for the tree item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri).
 		 */
 		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri };
 
+		/**
+		 * The [uri](#Uri) of the resource representing this item.
+		 *
+		 * Will be used to derive the [label](#TreeItem.label), when it is not provided.
+		 * Will be used to derive the icon from current file icon theme, when [iconPath](#TreeItem.iconPath) is not provided.
+		 */
+		resourceUri?: Uri;
+
 		/**
 		 * The [command](#Command) which should be run when the tree item is selected.
 		 */
@@ -4958,6 +5135,12 @@ declare module 'vscode' {
 		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
 		 */
 		constructor(label: string, collapsibleState?: TreeItemCollapsibleState);
+
+		/**
+		 * @param resourceUri The [uri](#Uri) of the resource representing this item.
+		 * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None)
+		 */
+		constructor(resourceUri: Uri, collapsibleState?: TreeItemCollapsibleState);
 	}
 
 	/**
@@ -4996,6 +5179,12 @@ declare module 'vscode' {
 		 * Args for the custom shell executable, this does not work on Windows (see #8429)
 		 */
 		shellArgs?: string[];
+
+		/**
+		 * A path for the current working directory to be used for the terminal.
+		 */
+		cwd?: string;
+
 		/**
 		 * Object with environment variables that will be added to the VS Code process.
 		 */
@@ -5276,13 +5465,14 @@ declare module 'vscode' {
 		 * will be matched against the file paths of resulting matches relative to their workspace. Use a [relative pattern](#RelativePattern)
 		 * to restrict the search results to a [workspace folder](#WorkspaceFolder).
 		 * @param exclude  A [glob pattern](#GlobPattern) that defines files and folders to exclude. The glob pattern
-		 * will be matched against the file paths of resulting matches relative to their workspace.
+		 * will be matched against the file paths of resulting matches relative to their workspace. When `undefined` only default excludes will
+		 * apply, when `null` no excludes will apply.
 		 * @param maxResults An upper-bound for the result.
 		 * @param token A token that can be used to signal cancellation to the underlying search engine.
 		 * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
 		 * [workspace folders](#workspace.workspaceFolders) are opened.
 		 */
-		export function findFiles(include: GlobPattern, exclude?: GlobPattern, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
+		export function findFiles(include: GlobPattern, exclude?: GlobPattern | null, maxResults?: number, token?: CancellationToken): Thenable<Uri[]>;
 
 		/**
 		 * Save all dirty files.
@@ -5363,11 +5553,23 @@ declare module 'vscode' {
 
 		/**
 		 * An event that is emitted when a [text document](#TextDocument) is opened.
+		 *
+		 * To add an event listener when a visible text document is opened, use the [TextEditor](#TextEditor) events in the
+		 * [window](#window) namespace. Note that:
+		 *
+		 * - The event is emitted before the [document](#TextDocument) is updated in the
+		 * [active text editor](#window.activeTextEditor)
+		 * - When a [text document](#TextDocument) is already open (e.g.: open in another [visible text editor](#window.visibleTextEditors)) this event is not emitted
+		 *
 		 */
 		export const onDidOpenTextDocument: Event<TextDocument>;
 
 		/**
 		 * An event that is emitted when a [text document](#TextDocument) is disposed.
+		 *
+		 * To add an event listener when a visible text document is closed, use the [TextEditor](#TextEditor) events in the
+		 * [window](#window) namespace. Note that this event is not emitted when a [TextEditor](#TextEditor) is closed
+		 * but the document remains open in another [visible text editor](#window.visibleTextEditors).
 		 */
 		export const onDidCloseTextDocument: Event<TextDocument>;
 
@@ -5411,7 +5613,7 @@ declare module 'vscode' {
 		 * @param resource A resource for which the configuration is asked for
 		 * @return The full configuration or a subset.
 		 */
-		export function getConfiguration(section?: string, resource?: Uri): WorkspaceConfiguration;
+		export function getConfiguration(section?: string, resource?: Uri | null): WorkspaceConfiguration;
 
 		/**
 		 * An event that is emitted when the [configuration](#WorkspaceConfiguration) changed.

From b3853e27d9a15ec41aff198a6334397f73f80aac Mon Sep 17 00:00:00 2001
From: Junxiao Shi <git@mail1.yoursunny.com>
Date: Fri, 22 Mar 2019 15:42:49 -0400
Subject: [PATCH 909/924] ndn-js: declare SigningInfo and fix tslint errors

---
 types/ndn-js/face.d.ts         |  3 ++-
 types/ndn-js/key-chain.d.ts    | 37 ++++++++++++++++++++++++----------
 types/ndn-js/name.d.ts         |  4 +---
 types/ndn-js/test/key-chain.ts | 14 ++++++++++---
 types/ndn-js/transport.d.ts    |  4 +---
 5 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/types/ndn-js/face.d.ts b/types/ndn-js/face.d.ts
index 18edf5ba34..09a8a84981 100644
--- a/types/ndn-js/face.d.ts
+++ b/types/ndn-js/face.d.ts
@@ -48,7 +48,8 @@ export class Face {
     unsetInterestFilter(id: number): void;
 }
 
-export type ForwardingFlags = any; // no declaration because this type is rarely used
+// no declaration because this type is rarely used
+export class ForwardingFlags {}
 
 export class InterestFilter {
     constructor(filter: InterestFilter);
diff --git a/types/ndn-js/key-chain.d.ts b/types/ndn-js/key-chain.d.ts
index 1df70849c8..f2ad3612a5 100644
--- a/types/ndn-js/key-chain.d.ts
+++ b/types/ndn-js/key-chain.d.ts
@@ -26,18 +26,33 @@ export class KeyChain {
     deleteCertificate(key: PibKey, certificateName: Name, onComplete?: () => any, onError?: (err: any) => any): void;
     setDefaultCertificate(key: PibKey, certificate: CertificateV2, onComplete?: () => any, onError?: (err: any) => any): void;
 
-    sign(data: Data, params: SigningInfo, onComplete?: (data: Data) => any, onError?: (err: any) => any): void;
     sign(interest: Interest, params: SigningInfo, onComplete?: (interest: Interest) => any, onError?: (err: any) => any): void;
-    signWithSha256(data: Data): void;
-    // tslint:disable-next-line unified-signatures
-    signWithSha256(interest: Interest): void;
+    sign(data: Data, params: SigningInfo, onComplete?: (data: Data) => any, onError?: (err: any) => any): void;
+    signWithSha256(packet: Data|Interest): void;
 }
 
 // no declaration because these types are rarely used
-export type CertificateV2 = any;
-export type KeyParams = any;
-export type Pib = any;
-export type PibIdentity = any;
-export type PibKey = any;
-export type SigningInfo = any;
-export type Tpm = any;
+export class Pib {}
+export class PibIdentity {}
+export class PibKey {}
+export class KeyParams {}
+export class CertificateV2 {}
+export class Tpm {}
+
+export class SigningInfo {
+    constructor(signerType: SigningInfo.SignerType, signerName: Name);
+    constructor(arg?: SigningInfo|PibIdentity|PibKey|string);
+
+    getSignerType(): SigningInfo.SignerType;
+    getSignerName(): Name;
+}
+
+export namespace SigningInfo {
+    enum SignerType {
+        NULL   = 0,
+        ID     = 1,
+        KEY    = 2,
+        CERT   = 3,
+        SHA256 = 4,
+    }
+}
diff --git a/types/ndn-js/name.d.ts b/types/ndn-js/name.d.ts
index 40b8a99245..9b4d38733d 100644
--- a/types/ndn-js/name.d.ts
+++ b/types/ndn-js/name.d.ts
@@ -56,9 +56,7 @@ export class Name {
     constructor(name: Name|string);
 
     append(value: ReadonlyArray<number>|ArrayBuffer|Uint8Array|string|Blob, type?: ComponentType, otherTypeCode?: number): Name;
-    append(component: Name.Component): Name;
-    // tslint:disable-next-line unified-signatures
-    append(name: Name): Name;
+    append(components: Name.Component|Name): Name;
     appendImplicitSha256Digest(digest: Blob): Name;
     appendParametersSha256Digest(digest: Blob): Name;
     appendSegment(segment: number): Name;
diff --git a/types/ndn-js/test/key-chain.ts b/types/ndn-js/test/key-chain.ts
index 4bfefc9f28..1f52abec86 100644
--- a/types/ndn-js/test/key-chain.ts
+++ b/types/ndn-js/test/key-chain.ts
@@ -8,7 +8,7 @@ const kp: ndn.KeyParams = ndn.KeyChain.getDefaultKeyParams();
 const pib: ndn.Pib = kc.getPib();
 const tpm: ndn.Tpm = kc.getTpm();
 
-const name = new ndn.Name("/key-name");
+let name = new ndn.Name("/key-name");
 
 let id: ndn.PibIdentity = kc.createIdentityV2(name);
 id = kc.createIdentityV2(name, kp);
@@ -30,10 +30,18 @@ kc.setDefaultKey(id, key);
 
 const cert: ndn.CertificateV2 = {};
 kc.addCertificate(key, cert);
-kc.deleteCertificate(key, cert);
+kc.deleteCertificate(key, name);
 kc.setDefaultCertificate(key, cert);
 
-const si: ndn.SigningInfo = {};
+let si: ndn.SigningInfo = new ndn.SigningInfo();
+si = new ndn.SigningInfo(ndn.SigningInfo.SignerType.ID, name);
+si = new ndn.SigningInfo(si);
+si = new ndn.SigningInfo(id);
+si = new ndn.SigningInfo(key);
+si = new ndn.SigningInfo("id:/my-identity");
+const signerType: ndn.SigningInfo.SignerType = si.getSignerType();
+name = si.getSignerName();
+
 kc.sign(new ndn.Data(), si, (data: ndn.Data) => {});
 kc.sign(new ndn.Interest(), si, (interest: ndn.Interest) => {});
 kc.signWithSha256(new ndn.Data());
diff --git a/types/ndn-js/transport.d.ts b/types/ndn-js/transport.d.ts
index ec4b17d0c9..9a2c4db918 100644
--- a/types/ndn-js/transport.d.ts
+++ b/types/ndn-js/transport.d.ts
@@ -33,9 +33,7 @@ export class WebSocketTransport extends Transport {
 
 export namespace WebSocketTransport {
     class ConnectionInfo extends TransportConnectionInfo {
-        // tslint:disable-next-line unified-signatures
-        constructor(host: string, port: number);
-        constructor(uri: string);
+        constructor(hostOrUri: string, port?: number);
         equals(other: ConnectionInfo): boolean;
         toString(): string;
     }

From adc74e5bd35a90a445300c938a7a2c9bceae56d9 Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Fri, 22 Mar 2019 20:23:39 +0000
Subject: [PATCH 910/924] Corrected a crucial typo on the definition of Options
 "capture" property

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

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index b0ea0fccf5..20cf27de9a 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -38,7 +38,7 @@ export interface Options {
      * Pass an additional capture option to buffer the result of stdout and/or stderr
      * Default: []
      */
-    capture?: []|['stdout']|['stderr']|['stdout'|'stderr']|['stderr'|'stdout'];
+    capture?: []|['stdout'|'stderr']|['stdout','stderr']|['stderr','stdout'];
     /**
      * Array of the numbers that should be interpreted as successful execution codes
      * Default: [0]

From f4a01fe9ea566c86d739cbe66f049ac103a5b37e Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 13:44:40 -0700
Subject: [PATCH 911/924] VS Code 1.21 Extension API

---
 types/vscode/index.d.ts | 207 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 186 insertions(+), 21 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 5420be3cc7..4f49c3ef87 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.20
+// Type definitions for Visual Studio Code 1.21
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.20 Extension API
+ * Type Definition for Visual Studio Code 1.21 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
@@ -779,6 +779,24 @@ declare module 'vscode' {
 		constructor(id: string);
 	}
 
+	/**
+	 * A reference to a named icon. Currently only [File](#ThemeIcon.File) and [Folder](#ThemeIcon.Folder) are supported.
+	 * Using a theme icon is preferred over a custom icon as it gives theme authors the possibility to change the icons.
+	 */
+	export class ThemeIcon {
+		/**
+		 * Reference to a icon representing a file. The icon is taken from the current file icon theme or a placeholder icon.
+		 */
+		static readonly File: ThemeIcon;
+
+		/**
+		 * Reference to a icon representing a folder. The icon is taken from the current file icon theme or a placeholder icon.
+		 */
+		static readonly Folder: ThemeIcon;
+
+		private constructor(id: string);
+	}
+
 	/**
 	 * Represents theme specific rendering styles for a [text editor decoration](#TextEditorDecorationType).
 	 */
@@ -1043,7 +1061,7 @@ declare module 'vscode' {
 		/**
 		 * The document associated with this text editor. The document will be the same for the entire lifetime of this text editor.
 		 */
-		document: TextDocument;
+		readonly document: TextDocument;
 
 		/**
 		 * The primary selection on this text editor. Shorthand for `TextEditor.selections[0]`.
@@ -1639,8 +1657,11 @@ declare module 'vscode' {
 		title: string;
 
 		/**
-		 * Indicates that this item replaces the default
-		 * 'Close' action.
+		 * A hint for modal dialogs that the item should be triggered
+		 * when the user cancels the dialog (e.g. by pressing the ESC
+		 * key).
+		 *
+		 * Note: this option is ignored for non-modal messages.
 		 */
 		isCloseAffordance?: boolean;
 	}
@@ -3823,7 +3844,7 @@ declare module 'vscode' {
 	 * An output channel is a container for readonly textual information.
 	 *
 	 * To get an instance of an `OutputChannel` use
-	 * [	createOutputChannel](#window.createOutputChannel).
+	 * [createOutputChannel](#window.createOutputChannel).
 	 */
 	export interface OutputChannel {
 
@@ -3916,7 +3937,7 @@ declare module 'vscode' {
 		/**
 		 * The text to show for the entry. You can embed icons in the text by leveraging the syntax:
 		 *
-		 * `My text $(icon-name) contains icons like $(icon'name) this one.`
+		 * `My text $(icon-name) contains icons like $(icon-name) this one.`
 		 *
 		 * Where the icon-name is taken from the [octicon](https://octicons.github.com) icon set, e.g.
 		 * `light-bulb`, `thumbsup`, `zap` etc.
@@ -5088,18 +5109,25 @@ declare module 'vscode' {
 		id?: string;
 
 		/**
-		 * The icon path for the tree item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri).
+		 * The icon path or [ThemeIcon](#ThemeIcon) for the tree item.
+		 * When `falsy`, [Folder Theme Icon](#ThemeIcon.Folder) is assigned, if item is collapsible otherwise [File Theme Icon](#ThemeIcon.File).
+		 * When a [ThemeIcon](#ThemeIcon) is specified, icon is derived from the current file icon theme for the specified theme icon using [resourceUri](#TreeItem.resourceUri) (if provided).
 		 */
-		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri };
+		iconPath?: string | Uri | { light: string | Uri; dark: string | Uri } | ThemeIcon;
 
 		/**
 		 * The [uri](#Uri) of the resource representing this item.
 		 *
 		 * Will be used to derive the [label](#TreeItem.label), when it is not provided.
-		 * Will be used to derive the icon from current file icon theme, when [iconPath](#TreeItem.iconPath) is not provided.
+		 * Will be used to derive the icon from current icon theme, when [iconPath](#TreeItem.iconPath) has [ThemeIcon](#ThemeIcon) value.
 		 */
 		resourceUri?: Uri;
 
+		/**
+		 * The tooltip text when you hover over this item.
+		 */
+		tooltip?: string | undefined;
+
 		/**
 		 * The [command](#Command) which should be run when the tree item is selected.
 		 */
@@ -5440,6 +5468,49 @@ declare module 'vscode' {
 		 */
 		export function asRelativePath(pathOrUri: string | Uri, includeWorkspaceFolder?: boolean): string;
 
+		/**
+		 * This method replaces `deleteCount` [workspace folders](#workspace.workspaceFolders) starting at index `start`
+		 * by an optional set of `workspaceFoldersToAdd` on the `vscode.workspace.workspaceFolders` array. This "splice"
+		 * behavior can be used to add, remove and change workspace folders in a single operation.
+		 *
+		 * If the first workspace folder is added, removed or changed, the currently executing extensions (including the
+		 * one that called this method) will be terminated and restarted so that the (deprecated) `rootPath` property is
+		 * updated to point to the first workspace folder.
+		 *
+		 * Use the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) event to get notified when the
+		 * workspace folders have been updated.
+		 *
+		 * **Example:** adding a new workspace folder at the end of workspace folders
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(workspace.workspaceFolders ? workspace.workspaceFolders.length : 0, null, { uri: ...});
+		 * ```
+		 *
+		 * **Example:** removing the first workspace folder
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(0, 1);
+		 * ```
+		 *
+		 * **Example:** replacing an existing workspace folder with a new one
+		 * ```typescript
+		 * workspace.updateWorkspaceFolders(0, 1, { uri: ...});
+		 * ```
+		 *
+		 * It is valid to remove an existing workspace folder and add it again with a different name
+		 * to rename that folder.
+		 *
+		 * **Note:** it is not valid to call [updateWorkspaceFolders()](#updateWorkspaceFolders) multiple times
+		 * without waiting for the [`onDidChangeWorkspaceFolders()`](#onDidChangeWorkspaceFolders) to fire.
+		 *
+		 * @param start the zero-based location in the list of currently opened [workspace folders](#WorkspaceFolder)
+		 * from which to start deleting workspace folders.
+		 * @param deleteCount the optional number of workspace folders to remove.
+		 * @param workspaceFoldersToAdd the optional variable set of workspace folders to add in place of the deleted ones.
+		 * Each workspace is identified with a mandatory URI and an optional name.
+		 * @return true if the operation was successfully started and false otherwise if arguments were used that would result
+		 * in invalid workspace folder state (e.g. 2 folders with the same URI).
+		 */
+		export function updateWorkspaceFolders(start: number, deleteCount: number | undefined | null, ...workspaceFoldersToAdd: { uri: Uri, name?: string }[]): boolean;
+
 		/**
 		 * Creates a file system watcher.
 		 *
@@ -6332,21 +6403,79 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Namespace for dealing with debug sessions.
+	 * An event describing the changes to the set of [breakpoints](#debug.Breakpoint).
 	 */
-	export namespace debug {
+	export interface BreakpointsChangeEvent {
+		/**
+		 * Added breakpoints.
+		 */
+		readonly added: Breakpoint[];
 
 		/**
-		 * Start debugging by using either a named launch or named compound configuration,
-		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
-		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
-		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
-		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
-		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
-		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
-		 * @return A thenable that resolves when debugging could be successfully started.
+		 * Removed breakpoints.
 		 */
-		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+		readonly removed: Breakpoint[];
+
+		/**
+		 * Changed breakpoints.
+		 */
+		readonly changed: Breakpoint[];
+	}
+
+	/**
+	 * The base class of all breakpoint types.
+	 */
+	export class Breakpoint {
+		/**
+		 * Is breakpoint enabled.
+		 */
+		readonly enabled: boolean;
+		/**
+		 * An optional expression for conditional breakpoints.
+		 */
+		readonly condition?: string;
+		/**
+		 * An optional expression that controls how many hits of the breakpoint are ignored.
+		 */
+		readonly hitCondition?: string;
+
+		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a source location.
+	 */
+	export class SourceBreakpoint extends Breakpoint {
+		/**
+		 * The source and line position of this breakpoint.
+		 */
+		readonly location: Location;
+
+		/**
+		 * Create a new breakpoint for a source location.
+		 */
+		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * A breakpoint specified by a function name.
+	 */
+	export class FunctionBreakpoint extends Breakpoint {
+		/**
+		 * The name of the function to which this breakpoint is attached.
+		 */
+		readonly functionName: string;
+
+		/**
+		 * Create a new function breakpoint.
+		 */
+		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string);
+	}
+
+	/**
+	 * Namespace for debug functionality.
+	 */
+	export namespace debug {
 
 		/**
 		 * The currently active [debug session](#DebugSession) or `undefined`. The active debug session is the one
@@ -6360,6 +6489,12 @@ declare module 'vscode' {
 		 */
 		export let activeDebugConsole: DebugConsole;
 
+		/**
+		 * List of breakpoints.
+		 */
+		export let breakpoints: Breakpoint[];
+
+
 		/**
 		 * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession)
 		 * has changed. *Note* that the event also fires when the active debug session changes
@@ -6382,6 +6517,12 @@ declare module 'vscode' {
 		 */
 		export const onDidTerminateDebugSession: Event<DebugSession>;
 
+		/**
+		 * An [event](#Event) that is emitted when the set of breakpoints is added, removed, or changed.
+		 */
+		export const onDidChangeBreakpoints: Event<BreakpointsChangeEvent>;
+
+
 		/**
 		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specifc debug type.
 		 * More than one provider can be registered for the same type.
@@ -6391,6 +6532,30 @@ declare module 'vscode' {
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
 		export function registerDebugConfigurationProvider(debugType: string, provider: DebugConfigurationProvider): Disposable;
+
+		/**
+		 * Start debugging by using either a named launch or named compound configuration,
+		 * or by directly passing a [DebugConfiguration](#DebugConfiguration).
+		 * The named configurations are looked up in '.vscode/launch.json' found in the given folder.
+		 * Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
+		 * Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
+		 * @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
+		 * @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
+		 * @return A thenable that resolves when debugging could be successfully started.
+		 */
+		export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration): Thenable<boolean>;
+
+		/**
+		 * Add breakpoints.
+		 * @param breakpoints The breakpoints to add.
+		*/
+		export function addBreakpoints(breakpoints: Breakpoint[]): void;
+
+		/**
+		 * Remove breakpoints.
+		 * @param breakpoints The breakpoints to remove.
+		 */
+		export function removeBreakpoints(breakpoints: Breakpoint[]): void;
 	}
 
 	/**

From 19422175c394163a25c736bde4133e1d4a15167a Mon Sep 17 00:00:00 2001
From: Luis <luisp@porthys.pt>
Date: Fri, 22 Mar 2019 20:53:31 +0000
Subject: [PATCH 912/924] Added missing white spaces as asked by

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

diff --git a/types/child-process-promise/index.d.ts b/types/child-process-promise/index.d.ts
index 20cf27de9a..344657f4f1 100644
--- a/types/child-process-promise/index.d.ts
+++ b/types/child-process-promise/index.d.ts
@@ -38,7 +38,7 @@ export interface Options {
      * Pass an additional capture option to buffer the result of stdout and/or stderr
      * Default: []
      */
-    capture?: []|['stdout'|'stderr']|['stdout','stderr']|['stderr','stdout'];
+    capture?: []|['stdout'|'stderr']|['stdout', 'stderr']|['stderr', 'stdout'];
     /**
      * Array of the numbers that should be interpreted as successful execution codes
      * Default: [0]

From 74e2370def1f605b9763129714e79d5a8c44c86c Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 15:11:42 -0700
Subject: [PATCH 913/924] VS Code 1.22 Extension API

---
 types/vscode/index.d.ts | 312 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 288 insertions(+), 24 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 4f49c3ef87..90153b1dff 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.21
+// Type definitions for Visual Studio Code 1.22
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.21 Extension API
+ * Type Definition for Visual Studio Code 1.22 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
@@ -548,6 +548,20 @@ declare module 'vscode' {
 		kind?: TextEditorSelectionChangeKind;
 	}
 
+	/**
+	 * Represents an event describing the change in a [text editor's visible ranges](#TextEditor.visibleRanges).
+	 */
+	export interface TextEditorVisibleRangesChangeEvent {
+		/**
+		 * The [text editor](#TextEditor) for which the visible ranges have changed.
+		 */
+		textEditor: TextEditor;
+		/**
+		 * The new value for the [text editor's visible ranges](#TextEditor.visibleRanges).
+		 */
+		visibleRanges: Range[];
+	}
+
 	/**
 	 * Represents an event describing the change in a [text editor's options](#TextEditor.options).
 	 */
@@ -1073,6 +1087,12 @@ declare module 'vscode' {
 		 */
 		selections: Selection[];
 
+		/**
+		 * The current visible ranges in the editor (vertically).
+		 * This accounts only for vertical scrolling, and not for horizontal scrolling.
+		 */
+		readonly visibleRanges: Range[];
+
 		/**
 		 * Text editor options.
 		 */
@@ -1340,7 +1360,7 @@ declare module 'vscode' {
 		cancel(): void;
 
 		/**
-		 * Dispose object and free resources. Will call [cancel](#CancellationTokenSource.cancel).
+		 * Dispose object and free resources.
 		 */
 		dispose(): void;
 	}
@@ -1513,12 +1533,20 @@ declare module 'vscode' {
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
-		description: string;
+		description?: string;
 
 		/**
 		 * A human readable string which is rendered less prominent.
 		 */
 		detail?: string;
+
+		/**
+		 * Optional flag indicating if this item is picked initially.
+		 * (Only honored when the picker allows multiple selections.)
+		 *
+		 * @see [QuickPickOptions.canPickMany](#QuickPickOptions.canPickMany)
+		 */
+		picked?: boolean;
 	}
 
 	/**
@@ -1545,6 +1573,11 @@ declare module 'vscode' {
 		 */
 		ignoreFocusOut?: boolean;
 
+		/**
+		 * An optional flag to make the picker accept multiple selections, if true the result is an array of picks.
+		 */
+		canPickMany?: boolean;
+
 		/**
 		 * An optional function that is invoked whenever an item is selected.
 		 */
@@ -3685,6 +3718,32 @@ declare module 'vscode' {
 		Hint = 3
 	}
 
+	/**
+	 * Represents a related message and source code location for a diagnostic. This should be
+	 * used to point to code locations that cause or related to a diagnostics, e.g when duplicating
+	 * a symbol in a scope.
+	 */
+	export class DiagnosticRelatedInformation {
+
+		/**
+		 * The location of this related diagnostic information.
+		 */
+		location: Location;
+
+		/**
+		 * The message of this related diagnostic information.
+		 */
+		message: string;
+
+		/**
+		 * Creates a new related diagnostic information object.
+		 *
+		 * @param location The location.
+		 * @param message The message.
+		 */
+		constructor(location: Location, message: string);
+	}
+
 	/**
 	 * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
 	 * are only valid in the scope of a file.
@@ -3701,23 +3760,29 @@ declare module 'vscode' {
 		 */
 		message: string;
 
-		/**
-		 * A human-readable string describing the source of this
-		 * diagnostic, e.g. 'typescript' or 'super lint'.
-		 */
-		source: string;
-
 		/**
 		 * The severity, default is [error](#DiagnosticSeverity.Error).
 		 */
 		severity: DiagnosticSeverity;
 
+		/**
+		 * A human-readable string describing the source of this
+		 * diagnostic, e.g. 'typescript' or 'super lint'.
+		 */
+		source?: string;
+
 		/**
 		 * A code or identifier for this diagnostics. Will not be surfaced
 		 * to the user, but should be used for later processing, e.g. when
 		 * providing [code actions](#CodeActionContext).
 		 */
-		code: string | number;
+		code?: string | number;
+
+		/**
+		 * An array of related diagnostic information, e.g. when symbol-names within
+		 * a scope collide all definitions can be marked via this property.
+		 */
+		relatedInformation?: DiagnosticRelatedInformation[];
 
 		/**
 		 * Creates a new diagnostic object.
@@ -3794,7 +3859,7 @@ declare module 'vscode' {
 		 * modify the diagnostics-array returned from this call.
 		 *
 		 * @param uri A resource identifier.
-		 * @returns An immutable array of [diagnostics](#Diagnostic) or `undefined`.
+		 * @returns An immutable array of [diagnostics](#Diagnxostic) or `undefined`.
 		 */
 		get(uri: Uri): Diagnostic[] | undefined;
 
@@ -3984,7 +4049,8 @@ declare module 'vscode' {
 
 		/**
 		 * Report a progress update.
-		 * @param value A progress item, like a message or an updated percentage value
+		 * @param value A progress item, like a message and/or an
+		 * report on how much work finished
 		 */
 		report(value: T): void;
 	}
@@ -4343,6 +4409,38 @@ declare module 'vscode' {
 		options?: ProcessExecutionOptions;
 	}
 
+	/**
+	 * The shell quoting options.
+	 */
+	export interface ShellQuotingOptions {
+
+		/**
+		 * The character used to do character escaping. If a string is provided only spaces
+		 * are escaped. If a `{ escapeChar, charsToEscape }` literal is provide all characters
+		 * in `charsToEscape` are escaped using the `escapeChar`.
+		 */
+		escape?: string | {
+			/**
+			 * The escape character.
+			 */
+			escapeChar: string;
+			/**
+			 * The characters to escape.
+			 */
+			charsToEscape: string;
+		};
+
+		/**
+		 * The character used for strong quoting. The string's length must be 1.
+		 */
+		strong?: string;
+
+		/**
+		 * The character used for weak quoting. The string's length must be 1.
+		 */
+		weak?: string;
+	}
+
 	/**
 	 * Options for a shell execution
 	 */
@@ -4357,6 +4455,11 @@ declare module 'vscode' {
 		 */
 		shellArgs?: string[];
 
+		/**
+		 * The shell quotes supported by this shell.
+		 */
+		shellQuoting?: ShellQuotingOptions;
+
 		/**
 		 * The current working directory of the executed shell.
 		 * If omitted the tools current workspace root is used.
@@ -4371,10 +4474,55 @@ declare module 'vscode' {
 		env?: { [key: string]: string };
 	}
 
+	/**
+	 * Defines how an argument should be quoted if it contains
+	 * spaces or unsuppoerted characters.
+	 */
+	export enum ShellQuoting {
+
+		/**
+		 * Character escaping should be used. This for example
+		 * uses \ on bash and ` on PowerShell.
+		 */
+		Escape = 1,
+
+		/**
+		 * Strong string quoting should be used. This for example
+		 * uses " for Windows cmd and ' for bash and PowerShell.
+		 * Strong quoting treats arguments as literal strings.
+		 * Under PowerShell echo 'The value is $(2 * 3)' will
+		 * print `The value is $(2 * 3)`
+		 */
+		Strong = 2,
+
+		/**
+		 * Weak string quoting should be used. This for example
+		 * uses " for Windows cmd, bash and PowerShell. Weak quoting
+		 * still performs some kind of evaluation inside the quoted
+		 * string.  Under PowerShell echo "The value is $(2 * 3)"
+		 * will print `The value is 6`
+		 */
+		Weak = 3
+	}
+
+	/**
+	 * A string that will be quoted depending on the used shell.
+	 */
+	export interface ShellQuotedString {
+		/**
+		 * The actual string value.
+		 */
+		value: string;
+
+		/**
+		 * The quoting style to use.
+		 */
+		quoting: ShellQuoting;
+	}
 
 	export class ShellExecution {
 		/**
-		 * Creates a process execution.
+		 * Creates a shell execution with a full command line.
 		 *
 		 * @param commandLine The command line to execute.
 		 * @param options Optional options for the started the shell.
@@ -4382,10 +4530,32 @@ declare module 'vscode' {
 		constructor(commandLine: string, options?: ShellExecutionOptions);
 
 		/**
-		 * The shell command line
+		 * Creates a shell execution with a command and arguments. For the real execution VS Code will
+		 * construct a command line from the command and the arguments. This is subject to interpretation
+		 * especially when it comes to quoting. If full control over the command line is needed please
+		 * use the constructor that creates a `ShellExecution` with the full command line.
+		 *
+		 * @param command The command to execute.
+		 * @param args The command arguments.
+		 * @param options Optional options for the started the shell.
+		 */
+		constructor(command: string | ShellQuotedString, args: (string | ShellQuotedString)[], options?: ShellExecutionOptions);
+
+		/**
+		 * The shell command line. Is `undefined` if created with a command and arguments.
 		 */
 		commandLine: string;
 
+		/**
+		 * The shell command. Is `undefined` if created with a full command line.
+		 */
+		command: string | ShellQuotedString;
+
+		/**
+		 * The shell args. Is `undefined` if created with a full command line.
+		 */
+		args: (string | ShellQuotedString)[];
+
 		/**
 		 * The shell options used when the command line is executed in a shell.
 		 * Defaults to undefined.
@@ -4507,9 +4677,12 @@ declare module 'vscode' {
 
 		/**
 		 * Resolves a task that has no [`execution`](#Task.execution) set. Tasks are
-		 * often created from information found in the `task.json`-file. Such tasks miss
+		 * often created from information found in the `tasks.json`-file. Such tasks miss
 		 * the information on how to execute them and a task provider must fill in
-		 * the missing information in the `resolveTask`-method.
+		 * the missing information in the `resolveTask`-method. This method will not be
+		 * called for tasks returned from the above `provideTasks` method since those
+		 * tasks are always fully resolved. A valid default implementation for the
+		 * `resolveTask` method is to return `undefined`.
 		 *
 		 * @param task The task to resolve.
 		 * @param token A cancellation token.
@@ -4702,6 +4875,11 @@ declare module 'vscode' {
 		 */
 		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
 
+		/**
+		 * An [event](#Event) which fires when the selection in an editor has changed.
+		 */
+		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
+
 		/**
 		 * An [event](#Event) which fires when the options of an editor have changed.
 		 */
@@ -4908,6 +5086,16 @@ declare module 'vscode' {
 		 */
 		export function showErrorMessage<T extends MessageItem>(message: string, options: MessageOptions, ...items: T[]): Thenable<T | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of strings, or a promise that resolves to an array of strings.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick(items: string[] | Thenable<string[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<string[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
@@ -4918,6 +5106,16 @@ declare module 'vscode' {
 		 */
 		export function showQuickPick(items: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 
+		/**
+		 * Shows a selection list allowing multiple selections.
+		 *
+		 * @param items An array of items, or a promise that resolves to an array of items.
+		 * @param options Configures the behavior of the selection list.
+		 * @param token A token that can be used to signal cancellation.
+		 * @return A promise that resolves to the selected items or `undefined`.
+		 */
+		export function showQuickPick<T extends QuickPickItem>(items: T[] | Thenable<T[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<T[] | undefined>;
+
 		/**
 		 * Shows a selection list.
 		 *
@@ -5026,9 +5224,19 @@ declare module 'vscode' {
 		 *
 		 * @param task A callback returning a promise. Progress state can be reported with
 		 * the provided [progress](#Progress)-object.
+		 *
+		 * To report discrete progress, use `increment` to indicate how much work has been completed. Each call with
+		 * a `increment` value will be summed up and reflected as overall progress until 100% is reached (a value of
+		 * e.g. `10` accounts for `10%` of work done).
+		 * Note that currently only `ProgressLocation.Notification` is capable of showing discrete progress.
+		 *
+		 * To monitor if the operation has been cancelled by the user, use the provided [`CancellationToken`](#CancellationToken).
+		 * Note that currently only `ProgressLocation.Notification` is supporting to show a cancel button to cancel the
+		 * long running operation.
+		 *
 		 * @return The thenable the task-callback returned.
 		 */
-		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; }>) => Thenable<R>): Thenable<R>;
+		export function withProgress<R>(options: ProgressOptions, task: (progress: Progress<{ message?: string; increment?: number }>, token: CancellationToken) => Thenable<R>): Thenable<R>;
 
 		/**
 		 * Creates a status bar [item](#StatusBarItem).
@@ -5061,12 +5269,40 @@ declare module 'vscode' {
 
 		/**
 		 * Register a [TreeDataProvider](#TreeDataProvider) for the view contributed using the extension point `views`.
+		 * This will allow you to contribute data to the [TreeView](#TreeView) and update if the data changes.
+		 *
+		 * **Note:** To get access to the [TreeView](#TreeView) and perform operations on it, use [createTreeView](#window.createTreeView).
+		 *
 		 * @param viewId Id of the view contributed using the extension point `views`.
 		 * @param treeDataProvider A [TreeDataProvider](#TreeDataProvider) that provides tree data for the view
 		 */
 		export function registerTreeDataProvider<T>(viewId: string, treeDataProvider: TreeDataProvider<T>): Disposable;
+
+		/**
+		 * Create a [TreeView](#TreeView) for the view contributed using the extension point `views`.
+		 * @param viewId Id of the view contributed using the extension point `views`.
+		 * @param options Options object to provide [TreeDataProvider](#TreeDataProvider) for the view.
+		 * @returns a [TreeView](#TreeView).
+		 */
+		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
 	}
 
+	/**
+	 * Represents a Tree view
+	 */
+	export interface TreeView<T> extends Disposable {
+
+		/**
+		 * Reveal an element. By default revealed element is selected.
+		 *
+		 * In order to not to select, set the option `select` to `false`.
+		 *
+		 * **NOTE:** [TreeDataProvider](#TreeDataProvider) is required to implement [getParent](#TreeDataProvider.getParent) method to access this API.
+		 */
+		reveal(element: T, options?: { select?: boolean }): Thenable<void>;
+	}
+
+
 	/**
 	 * A data provider that provides tree data
 	 */
@@ -5093,6 +5329,17 @@ declare module 'vscode' {
 		 * @return Children of `element` or root if no element is passed.
 		 */
 		getChildren(element?: T): ProviderResult<T[]>;
+
+		/**
+		 * Optional method to return the parent of `element`.
+		 * Return `null` or `undefined` if `element` is a child of root.
+		 *
+		 * **NOTE:** This method should be implemented in order to access [reveal](#TreeView.reveal) API.
+		 *
+		 * @param element The element for which the parent has to be returned.
+		 * @return Parent of `element`.
+		 */
+		getParent?(element: T): ProviderResult<T>;
 	}
 
 	export class TreeItem {
@@ -5227,14 +5474,19 @@ declare module 'vscode' {
 
 		/**
 		 * Show progress for the source control viewlet, as overlay for the icon and as progress bar
-		 * inside the viewlet (when visible).
+		 * inside the viewlet (when visible). Neither supports cancellation nor discrete progress.
 		 */
 		SourceControl = 1,
 
 		/**
-		 * Show progress in the status bar of the editor.
+		 * Show progress in the status bar of the editor. Neither supports cancellation nor discrete progress.
 		 */
-		Window = 10
+		Window = 10,
+
+		/**
+		 * Show progress as notifiation with an optional cancel button. Supports to show infinite and discrete progress.
+		 */
+		Notification = 15
 	}
 
 	/**
@@ -5252,6 +5504,14 @@ declare module 'vscode' {
 		 * operation.
 		 */
 		title?: string;
+
+		/**
+		 * Controls if a cancel button should show to allow the user to
+		 * cancel the long running operation.  Note that currently only
+		 * `ProgressLocation.Notification` is supporting to show a cancel
+		 * button.
+		 */
+		cancellable?: boolean;
 	}
 
 	/**
@@ -6438,8 +6698,12 @@ declare module 'vscode' {
 		 * An optional expression that controls how many hits of the breakpoint are ignored.
 		 */
 		readonly hitCondition?: string;
+		/**
+		 * An optional message that gets logged when this breakpoint is hit. Embedded expressions within {} are interpolated by the debug adapter.
+		 */
+		readonly logMessage?: string;
 
-		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string);
+		protected constructor(enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
 	}
 
 	/**
@@ -6454,7 +6718,7 @@ declare module 'vscode' {
 		/**
 		 * Create a new breakpoint for a source location.
 		 */
-		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string);
+		constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
 	}
 
 	/**
@@ -6469,7 +6733,7 @@ declare module 'vscode' {
 		/**
 		 * Create a new function breakpoint.
 		 */
-		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string);
+		constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string, logMessage?: string);
 	}
 
 	/**

From f3877ad42af808383d46b3cce1efc5495a640008 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 15:27:03 -0700
Subject: [PATCH 914/924] VS Code 1.23 Extension API

---
 types/vscode/index.d.ts | 677 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 657 insertions(+), 20 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 90153b1dff..6d38bd81bb 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.22
+// Type definitions for Visual Studio Code 1.23
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,10 +10,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.22 Extension API
+ * Type Definition for Visual Studio Code 1.23 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 declare module 'vscode' {
 
 	/**
@@ -99,9 +104,13 @@ declare module 'vscode' {
 	export interface TextDocument {
 
 		/**
-		 * The associated URI for this document. Most documents have the __file__-scheme, indicating that they
-		 * represent files on disk. However, some documents may have other schemes indicating that they are not
-		 * available on disk.
+		 * The associated uri for this document.
+		 *
+		 * *Note* that most documents use the `file`-scheme, which means they are files on disk. However, **not** all documents are
+		 * saved on disk and therefore the `scheme` must be checked before trying to access the underlying file or siblings on disk.
+		 *
+		 * @see [FileSystemProvider](#FileSystemProvider)
+		 * @see [TextDocumentContentProvider](#TextDocumentContentProvider)
 		 */
 		readonly uri: Uri;
 
@@ -112,7 +121,9 @@ declare module 'vscode' {
 		readonly fileName: string;
 
 		/**
-		 * Is this document representing an untitled file.
+		 * Is this document representing an untitled file which has never been saved yet. *Note* that
+		 * this does not mean the document will be saved to disk, use [`uri.scheme`](#Uri.scheme)
+		 * to figure out where a document will be [saved](#FileSystemProvider), e.g. `file`, `ftp` etc.
 		 */
 		readonly isUntitled: boolean;
 
@@ -904,6 +915,11 @@ declare module 'vscode' {
 		 */
 		color?: string | ThemeColor;
 
+		/**
+		 * CSS styling property that will be applied to text enclosed by a decoration.
+		 */
+		opacity?: string;
+
 		/**
 		 * CSS styling property that will be applied to text enclosed by a decoration.
 		 */
@@ -1815,7 +1831,7 @@ declare module 'vscode' {
 	 * its resource, or a glob-pattern that is applied to the [path](#TextDocument.fileName).
 	 *
 	 * @sample A language filter that applies to typescript files on disk: `{ language: 'typescript', scheme: 'file' }`
-	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', pattern: '**​/package.json' }`
+	 * @sample A language filter that applies to all package.json paths: `{ language: 'json', scheme: 'untitled', pattern: '**​/package.json' }`
 	 */
 	export interface DocumentFilter {
 
@@ -1840,10 +1856,14 @@ declare module 'vscode' {
 	 * A language selector is the combination of one or many language identifiers
 	 * and [language filters](#DocumentFilter).
 	 *
-	 * @sample `let sel:DocumentSelector = 'typescript'`;
-	 * @sample `let sel:DocumentSelector = ['typescript', { language: 'json', pattern: '**​/tsconfig.json' }]`;
+	 * *Note* that a document selector that is just a language identifier selects *all*
+	 * documents, even those that are not saved on disk. Only use such selectors when
+	 * a feature works without further context, e.g without the need to resolve related
+	 * 'files'.
+	 *
+	 * @sample `let sel:DocumentSelector = { scheme: 'file', language: 'typescript' }`;
 	 */
-	export type DocumentSelector = string | DocumentFilter | (string | DocumentFilter)[];
+	export type DocumentSelector = DocumentFilter | string | Array<DocumentFilter | string>;
 
 	/**
 	 * A provider result represents the values a provider, like the [`HoverProvider`](#HoverProvider),
@@ -1889,17 +1909,17 @@ declare module 'vscode' {
 		static readonly Empty: CodeActionKind;
 
 		/**
-		 * Base kind for quickfix actions.
+		 * Base kind for quickfix actions: `quickfix`
 		 */
 		static readonly QuickFix: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring actions.
+		 * Base kind for refactoring actions: `refactor`
 		 */
 		static readonly Refactor: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring extraction actions.
+		 * Base kind for refactoring extraction actions: `refactor.extract`
 		 *
 		 * Example extract actions:
 		 *
@@ -1912,7 +1932,7 @@ declare module 'vscode' {
 		static readonly RefactorExtract: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring inline actions.
+		 * Base kind for refactoring inline actions: `refactor.inline`
 		 *
 		 * Example inline actions:
 		 *
@@ -1924,7 +1944,7 @@ declare module 'vscode' {
 		static readonly RefactorInline: CodeActionKind;
 
 		/**
-		 * Base kind for refactoring rewrite actions.
+		 * Base kind for refactoring rewrite actions: `refactor.rewrite`
 		 *
 		 * Example rewrite actions:
 		 *
@@ -1937,6 +1957,18 @@ declare module 'vscode' {
 		 */
 		static readonly RefactorRewrite: CodeActionKind;
 
+		/**
+		 * Base kind for source actions: `source`
+		 *
+		 * Source code actions apply to the entire file.
+		 */
+		static readonly Source: CodeActionKind;
+
+		/**
+		 * Base kind for an organize imports source action: `source.organizeImports`
+		 */
+		static readonly SourceOrganizeImports: CodeActionKind;
+
 		private constructor(value: string);
 
 		/**
@@ -2033,7 +2065,6 @@ declare module 'vscode' {
 	 * A code action can be any command that is [known](#commands.getCommands) to the system.
 	 */
 	export interface CodeActionProvider {
-
 		/**
 		 * Provide commands for the given document and range.
 		 *
@@ -2047,6 +2078,19 @@ declare module 'vscode' {
 		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
 	}
 
+	/**
+	 * Metadata about the type of code actions that a [CodeActionProvider](#CodeActionProvider) providers
+	 */
+	export interface CodeActionProviderMetadata {
+		/**
+		 * [CodeActionKinds](#CodeActionKind) that this provider may return.
+		 *
+		 * The list of kinds may be generic, such as `CodeActionKind.Refactor`, or the provider
+		 * may list our every specific kind they provide, such as `CodeActionKind.Refactor.Extract.append('function`)`
+		 */
+		readonly providedCodeActionKinds?: ReadonlyArray<CodeActionKind>;
+	}
+
 	/**
 	 * A code lens represents a [command](#Command) that should be shown along with
 	 * source text, like the number of references, a way to run tests, etc.
@@ -2729,6 +2773,18 @@ declare module 'vscode' {
 		 * signaled by returning `undefined` or `null`.
 		 */
 		provideRenameEdits(document: TextDocument, position: Position, newName: string, token: CancellationToken): ProviderResult<WorkspaceEdit>;
+
+		/**
+		 * Optional function for resolving and validating a position *before* running rename. The result can
+		 * be a range or a range and a placeholder text. The placeholder text should be the identifier of the symbol
+		 * which is being renamed - when omitted the text in the returned range is used.
+		 *
+		 * @param document The document in which rename will be invoked.
+		 * @param position The position at which rename will be invoked.
+		 * @param token A cancellation token.
+		 * @return The range or range and placeholder text of the identifier that is to be renamed. The lack of a result can signaled by returning `undefined` or `null`.
+		 */
+		prepareRename?(document: TextDocument, position: Position, token: CancellationToken): ProviderResult<Range | { range: Range, placeholder: string }>;
 	}
 
 	/**
@@ -3355,6 +3411,68 @@ declare module 'vscode' {
 		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
 	}
 
+	export class FoldingRange {
+
+		/**
+		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 */
+		start: number;
+
+		/**
+		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 */
+		end: number;
+
+		/**
+		 * Describes the [Kind](#FoldingRangeKind) of the folding range such as [Comment](#FoldingRangeKind.Comment) or
+		 * [Region](#FoldingRangeKind.Region). The kind is used to categorize folding ranges and used by commands
+		 * like 'Fold all comments'. See
+		 * [FoldingRangeKind](#FoldingRangeKind) for an enumeration of all kinds.
+		 */
+		kind?: FoldingRangeKind;
+
+		/**
+		 * Creates a new folding range.
+		 *
+		 * @param start The start line of the folded range.
+		 * @param end The end line of the folded range.
+		 * @param kind The kind of the folding range.
+		 */
+		constructor(start: number, end: number, kind?: FoldingRangeKind);
+	}
+
+	export enum FoldingRangeKind {
+		/**
+		 * Kind for folding range representing a comment.
+		 */
+		Comment = 1,
+		/**
+		 * Kind for folding range representing a import.
+		 */
+		Imports = 2,
+		/**
+		 * Kind for folding range representing regions (for example a folding range marked by `#region` and `#endregion`).
+		 */
+		Region = 3
+	}
+
+	/**
+	 * Folding context (for future use)
+	 */
+	export interface FoldingContext {
+	}
+
+	export interface FoldingRangeProvider {
+		/**
+		 * Returns a list of folding ranges or null and undefined if the provider
+		 * does not want to participate or was cancelled.
+		 * @param document The document in which the command was invoked.
+		 * @param context Additional context information (for future use)
+		 * @param token A cancellation token.
+		 */
+		provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken): ProviderResult<FoldingRange[]>;
+	}
+
 	/**
 	 * A tuple of two characters, like a pair of
 	 * opening and closing brackets.
@@ -3691,6 +3809,17 @@ declare module 'vscode' {
 		constructor(uri: Uri, rangeOrPosition: Range | Position);
 	}
 
+	/**
+	 * The event that is fired when diagnostics change.
+	 */
+	export interface DiagnosticChangeEvent {
+
+		/**
+		 * An array of resources for which diagnostics have changed.
+		 */
+		readonly uris: Uri[];
+	}
+
 	/**
 	 * Represents the severity of diagnostics.
 	 */
@@ -3859,7 +3988,7 @@ declare module 'vscode' {
 		 * modify the diagnostics-array returned from this call.
 		 *
 		 * @param uri A resource identifier.
-		 * @returns An immutable array of [diagnostics](#Diagnxostic) or `undefined`.
+		 * @returns An immutable array of [diagnostics](#Diagnostic) or `undefined`.
 		 */
 		get(uri: Uri): Diagnostic[] | undefined;
 
@@ -4342,6 +4471,9 @@ declare module 'vscode' {
 		 *     script: string;
 		 * }
 		 * ```
+		 *
+		 * Note that type identifier starting with a '$' are reserved for internal
+		 * usages and shouldn't be used by extensions.
 		 */
 		readonly type: string;
 
@@ -4691,6 +4823,441 @@ declare module 'vscode' {
 		resolveTask(task: Task, token?: CancellationToken): ProviderResult<Task>;
 	}
 
+	/**
+	 * Enumeration of file types. The types `File` and `Directory` can also be
+	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
+	 * `FileType.Directory | FileType.SymbolicLink`.
+	 */
+	export enum FileType {
+		/**
+		 * The file type is unknown.
+		 */
+		Unknown = 0,
+		/**
+		 * A regular file.
+		 */
+		File = 1,
+		/**
+		 * A directory.
+		 */
+		Directory = 2,
+		/**
+		 * A symbolic link to a file.
+		 */
+		SymbolicLink = 64
+	}
+
+	/**
+	 * The `FileStat`-type represents metadata about a file
+	 */
+	export interface FileStat {
+		/**
+		 * The type of the file, e.g. is a regular file, a directory, or symbolic link
+		 * to a file.
+		 */
+		type: FileType;
+		/**
+		 * The creation timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+		 */
+		ctime: number;
+		/**
+		 * The modification timestamp in milliseconds elapsed since January 1, 1970 00:00:00 UTC.
+		 */
+		mtime: number;
+		/**
+		 * The size in bytes.
+		 */
+		size: number;
+	}
+
+	/**
+	 * A type that filesystem providers should use to signal errors.
+	 *
+	 * This class has factory methods for common error-cases, like `EntryNotFound` when
+	 * a file or folder doesn't exist, use them like so: `throw vscode.FileSystemError.EntryNotFound(someUri);`
+	 */
+	export class FileSystemError extends Error {
+
+		/**
+		 * Create an error to signal that a file or folder wasn't found.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileNotFound(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file or folder already exists, e.g. when
+		 * creating but not overwriting a file.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileExists(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file is not a folder.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileNotADirectory(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that a file is a folder.
+		 * @param messageOrUri Message or uri.
+		 */
+		static FileIsADirectory(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that an operation lacks required permissions.
+		 * @param messageOrUri Message or uri.
+		 */
+		static NoPermissions(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Create an error to signal that the file system is unavailable or too busy to
+		 * complete a request.
+		 * @param messageOrUri Message or uri.
+		 */
+		static Unavailable(messageOrUri?: string | Uri): FileSystemError;
+
+		/**
+		 * Creates a new filesystem error.
+		 *
+		 * @param messageOrUri Message or uri.
+		 */
+		constructor(messageOrUri?: string | Uri);
+	}
+
+	/**
+	 * Enumeration of file change types.
+	 */
+	export enum FileChangeType {
+
+		/**
+		 * The contents or metadata of a file have changed.
+		 */
+		Changed = 1,
+
+		/**
+		 * A file has been created.
+		 */
+		Created = 2,
+
+		/**
+		 * A file has been deleted.
+		 */
+		Deleted = 3,
+	}
+
+	/**
+	 * The event filesystem providers must use to signal a file change.
+	 */
+	export interface FileChangeEvent {
+
+		/**
+		 * The type of change.
+		 */
+		type: FileChangeType;
+
+		/**
+		 * The uri of the file that has changed.
+		 */
+		uri: Uri;
+	}
+
+	/**
+	 * The filesystem provider defines what the editor needs to read, write, discover,
+	 * and to manage files and folders. It allows extensions to serve files from remote places,
+	 * like ftp-servers, and to seamlessly integrate those into the editor.
+	 *
+	 * * *Note 1:* The filesystem provider API works with [uris](#Uri) and assumes hierarchical
+	 * paths, e.g. `foo:/my/path` is a child of `foo:/my/` and a parent of `foo:/my/path/deeper`.
+	 * * *Note 2:* There is an activation event `onFileSystem:<scheme>` that fires when a file
+	 * or folder is being accessed.
+	 * * *Note 3:* The word 'file' is often used to denote all [kinds](#FileType) of files, e.g.
+	 * folders, symbolic links, and regular files.
+	 */
+	export interface FileSystemProvider {
+
+		/**
+		 * An event to signal that a resource has been created, changed, or deleted. This
+		 * event should fire for resources that are being [watched](#FileSystemProvider.watch)
+		 * by clients of this provider.
+		 */
+		readonly onDidChangeFile: Event<FileChangeEvent[]>;
+
+		/**
+		 * Subscribe to events in the file or folder denoted by `uri`.
+		 *
+		 * The editor will call this function for files and folders. In the latter case, the
+		 * options differ from defaults, e.g. what files/folders to exclude from watching
+		 * and if subfolders, sub-subfolder, etc. should be watched (`recursive`).
+		 *
+		 * @param uri The uri of the file to be watched.
+		 * @param options Configures the watch.
+		 * @returns A disposable that tells the provider to stop watching the `uri`.
+		 */
+		watch(uri: Uri, options: { recursive: boolean; excludes: string[] }): Disposable;
+
+		/**
+		 * Retrieve metadata about a file.
+		 *
+		 * Note that the metadata for symbolic links should be the metadata of the file they refer to.
+		 * Still, the [SymbolicLink](#FileType.SymbolicLink)-type must be used in addition to the actual type, e.g.
+		 * `FileType.SymbolicLink | FileType.Directory`.
+		 *
+		 * @param uri The uri of the file to retrieve metadata about.
+		 * @return The file metadata about the file.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		stat(uri: Uri): FileStat | Thenable<FileStat>;
+
+		/**
+		 * Retrieve all entries of a [directory](#FileType.Directory).
+		 *
+		 * @param uri The uri of the folder.
+		 * @return An array of name/type-tuples or a thenable that resolves to such.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		readDirectory(uri: Uri): [string, FileType][] | Thenable<[string, FileType][]>;
+
+		/**
+		 * Create a new directory (Note, that new files are created via `write`-calls).
+		 *
+		 * @param uri The uri of the new folder.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		createDirectory(uri: Uri): void | Thenable<void>;
+
+		/**
+		 * Read the entire contents of a file.
+		 *
+		 * @param uri The uri of the file.
+		 * @return An array of bytes or a thenable that resolves to such.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 */
+		readFile(uri: Uri): Uint8Array | Thenable<Uint8Array>;
+
+		/**
+		 * Write data to a file, replacing its entire contents.
+		 *
+		 * @param uri The uri of the file.
+		 * @param content The new content of the file.
+		 * @param options Defines if missing files should or must be created.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist and `create` is not set.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when the parent of `uri` doesn't exist and `create` is set, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `uri` already exists, `create` is set but `overwrite` is not set.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		writeFile(uri: Uri, content: Uint8Array, options: { create: boolean, overwrite: boolean }): void | Thenable<void>;
+
+		/**
+		 * Delete a file.
+		 *
+		 * @param uri The resource that is to be deleted.
+		 * @param options Defines if deletion of folders is recursive.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `uri` doesn't exist.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		delete(uri: Uri, options: { recursive: boolean }): void | Thenable<void>;
+
+		/**
+		 * Rename a file or folder.
+		 *
+		 * @param oldUri The existing file.
+		 * @param newUri The new location.
+		 * @param options Defines if existing files should be overwriten.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `oldUri` doesn't exist.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `newUri` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `newUri` exists and when the `overwrite` option is not `true`.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		rename(oldUri: Uri, newUri: Uri, options: { overwrite: boolean }): void | Thenable<void>;
+
+		/**
+		 * Copy files or folders. Implementing this function is optional but it will speedup
+		 * the copy operation.
+		 *
+		 * @param source The existing file.
+		 * @param destination The destination location.
+		 * @param options Defines if existing files should be overwriten.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `source` doesn't exist.
+		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `destination` doesn't exist, e.g. no mkdirp-logic required.
+		 * @throws [`FileExists`](#FileSystemError.FileExists) when `destination` exists and when the `overwrite` option is not `true`.
+		 * @throws [`NoPermissions`](#FileSystemError.NoPermissions) when permissions aren't sufficient.
+		 */
+		copy?(source: Uri, destination: Uri, options: { overwrite: boolean }): void | Thenable<void>;
+	}
+
+	/**
+	 * Content settings for a webview.
+	 */
+	export interface WebviewOptions {
+		/**
+		 * Controls whether scripts are enabled in the webview content or not.
+		 *
+		 * Defaults to false (scripts-disabled).
+		 */
+		readonly enableScripts?: boolean;
+
+		/**
+		 * Controls whether command uris are enabled in webview content or not.
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableCommandUris?: boolean;
+
+		/**
+		 * Root paths from which the webview can load local (filesystem) resources using the `vscode-resource:` scheme.
+		 *
+		 * Default to the root folders of the current workspace plus the extension's install directory.
+		 *
+		 * Pass in an empty array to disallow access to any local resources.
+		 */
+		readonly localResourceRoots?: ReadonlyArray<Uri>;
+	}
+
+	/**
+	 * A webview displays html content, like an iframe.
+	 */
+	export interface Webview {
+		/**
+		 * Content settings for the webview.
+		 */
+		readonly options: WebviewOptions;
+
+		/**
+		 * Contents of the webview.
+		 *
+		 * Should be a complete html document.
+		 */
+		html: string;
+
+		/**
+		 * Fired when the webview content posts a message.
+		 */
+		readonly onDidReceiveMessage: Event<any>;
+
+		/**
+		 * Post a message to the webview content.
+		 *
+		 * Messages are only develivered if the webview is visible.
+		 *
+		 * @param message Body of the message.
+		 */
+		postMessage(message: any): Thenable<boolean>;
+	}
+
+	/**
+	 * Content settings for a webview panel.
+	 */
+	export interface WebviewPanelOptions {
+		/**
+		 * Controls if the find widget is enabled in the panel.
+		 *
+		 * Defaults to false.
+		 */
+		readonly enableFindWidget?: boolean;
+
+		/**
+		 * Controls if the webview panel's content (iframe) is kept around even when the panel
+		 * is no longer visible.
+		 *
+		 * Normally the webview panel's html context is created when the panel becomes visible
+		 * and destroyed when it is is hidden. Extensions that have complex state
+		 * or UI can set the `retainContextWhenHidden` to make VS Code keep the webview
+		 * context around, even when the webview moves to a background tab. When a webview using
+		 * `retainContextWhenHidden` becomes hidden, its scripts and other dynamic content are suspended.
+		 * When the panel becomes visible again, the context is automatically restored
+		 * in the exact same state it was in originally. You cannot send messages to a
+		 * hidden webview, even with `retainContextWhenHidden` enabled.
+		 *
+		 * `retainContextWhenHidden` has a high memory overhead and should only be used if
+		 * your panel's context cannot be quickly saved and restored.
+		 */
+		readonly retainContextWhenHidden?: boolean;
+	}
+
+	/**
+	 * A panel that contains a webview.
+	 */
+	interface WebviewPanel {
+		/**
+		 * Identifies the type of the webview panel, such as `'markdown.preview'`.
+		 */
+		readonly viewType: string;
+
+		/**
+		 * Title of the panel shown in UI.
+		 */
+		title: string;
+
+		/**
+		 * Webview belonging to the panel.
+		 */
+		readonly webview: Webview;
+
+		/**
+		 * Content settings for the webview panel.
+		 */
+		readonly options: WebviewPanelOptions;
+
+		/**
+		 * Editor position of the panel. This property is only set if the webview is in
+		 * one of the three editor view columns.
+		 *
+		 * @deprecated
+		 */
+		readonly viewColumn?: ViewColumn;
+
+		/**
+		 * Is the panel currently visible?
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Fired when the panel's view state changes.
+		 */
+		readonly onDidChangeViewState: Event<WebviewPanelOnDidChangeViewStateEvent>;
+
+		/**
+		 * Fired when the panel is disposed.
+		 *
+		 * This may be because the user closed the panel or because `.dispose()` was
+		 * called on it.
+		 *
+		 * Trying to use the panel after it has been disposed throws an exception.
+		 */
+		readonly onDidDispose: Event<void>;
+
+		/**
+		 * Show the webview panel in a given column.
+		 *
+		 * A webview panel may only show in a single column at a time. If it is already showing, this
+		 * method moves it to a new column.
+		 *
+		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
+		 */
+		reveal(viewColumn?: ViewColumn): void;
+
+		/**
+		 * Dispose of the webview panel.
+		 *
+		 * This closes the panel if it showing and disposes of the resources owned by the webview.
+		 * Webview panels are also disposed when the user closes the webview panel. Both cases
+		 * fire the `onDispose` event.
+		 */
+		dispose(): any;
+	}
+
+	/**
+	 * Event fired when a webview panel's view state changes.
+	 */
+	export interface WebviewPanelOnDidChangeViewStateEvent {
+		/**
+		 * Webview panel whose view state changed.
+		 */
+		readonly webviewPanel: WebviewPanel;
+	}
+
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -5173,6 +5740,18 @@ declare module 'vscode' {
 		 */
 		export function createOutputChannel(name: string): OutputChannel;
 
+		/**
+		 * Create and show a new webview panel.
+		 *
+		 * @param viewType Identifies the type of the webview panel.
+		 * @param title Title of the panel.
+		 * @param position Editor column to show the new panel in.
+		 * @param options Settings for the new panel.
+		 *
+		 * @return New webview panel.
+		 */
+		export function createWebviewPanel(viewType: string, title: string, position: ViewColumn, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
+
 		/**
 		 * Set a message to the status bar. This is a short hand for the more powerful
 		 * status bar [items](#window.createStatusBarItem).
@@ -5522,6 +6101,10 @@ declare module 'vscode' {
 		 * The range that got replaced.
 		 */
 		range: Range;
+		/**
+		 * The offset of the range that got replaced.
+		 */
+		rangeOffset: number;
 		/**
 		 * The length of the range that got replaced.
 		 */
@@ -5959,6 +6542,19 @@ declare module 'vscode' {
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
+
+		/**
+		 * Register a filesystem provider for a given scheme, e.g. `ftp`.
+		 *
+		 * There can only be one provider per scheme and an error is being thrown when a scheme
+		 * has been claimed by another provider or when it is reserved.
+		 *
+		 * @param scheme The uri-[scheme](#Uri.scheme) the provider registers for.
+		 * @param provider The filesystem provider.
+		 * @param options Immutable metadata about the provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options: { isCaseSensitive?: boolean }): Disposable;
 	}
 
 	/**
@@ -6051,6 +6647,29 @@ declare module 'vscode' {
 		 */
 		export function match(selector: DocumentSelector, document: TextDocument): number;
 
+		/**
+		 * An [event](#Event) which fires when the global set of diagnostics changes. This is
+		 * newly added and removed diagnostics.
+		 */
+		export const onDidChangeDiagnostics: Event<DiagnosticChangeEvent>;
+
+		/**
+		 * Get all diagnostics for a given resource. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @param resource A resource
+		 * @returns An arrary of [diagnostics](#Diagnostic) objects or an empty array.
+		 */
+		export function getDiagnostics(resource: Uri): Diagnostic[];
+
+		/**
+		 * Get all diagnostics. *Note* that this includes diagnostics from
+		 * all extensions but *not yet* from the task framework.
+		 *
+		 * @returns An array of uri-diagnostics tuples or an empty array.
+		 */
+		export function getDiagnostics(): [Uri, Diagnostic[]][];
+
 		/**
 		 * Create a diagnostics collection.
 		 *
@@ -6084,9 +6703,10 @@ declare module 'vscode' {
 		 *
 		 * @param selector A selector that defines the documents this provider is applicable to.
 		 * @param provider A code action provider.
+		 * @param metadata Metadata about the kind of code actions the provider providers.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider): Disposable;
+		export function registerCodeActionsProvider(selector: DocumentSelector, provider: CodeActionProvider, metadata?: CodeActionProviderMetadata): Disposable;
 
 		/**
 		 * Register a code lens provider.
@@ -6302,6 +6922,23 @@ declare module 'vscode' {
 		 */
 		export function registerColorProvider(selector: DocumentSelector, provider: DocumentColorProvider): Disposable;
 
+		/**
+		 * Register a folding range provider.
+		 *
+		 * Multiple providers can be registered for a language. In that case providers are asked in
+		 * parallel and the results are merged.
+		 * If multiple folding ranges start at the same position, only the range of the first registered provider is used.
+		 * If a folding range overlaps with an other range that has a smaller position, it is also ignored.
+		 *
+		 * A failing provider (rejected promise or exception) will
+		 * not cause a failure of the whole operation.
+		 *
+		 * @param selector A selector that defines the documents this provider is applicable to.
+		 * @param provider A folding range provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerFoldingRangeProvider(selector: DocumentSelector, provider: FoldingRangeProvider): Disposable;
+
 		/**
 		 * Set a [language configuration](#LanguageConfiguration) for a language.
 		 *
@@ -6663,7 +7300,7 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * An event describing the changes to the set of [breakpoints](#debug.Breakpoint).
+	 * An event describing the changes to the set of [breakpoints](#Breakpoint).
 	 */
 	export interface BreakpointsChangeEvent {
 		/**
@@ -6894,4 +7531,4 @@ interface Thenable<T> {
 	*/
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
-}
+}
\ No newline at end of file

From df7b8f56a0063e1945f3064367bc94d8106eee59 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Fri, 22 Mar 2019 15:49:23 -0700
Subject: [PATCH 915/924] Adding note about Word's font.highlightColor for
 Desktop

---
 types/office-js-preview/index.d.ts | 16 ++++++++++++++++
 types/office-js/index.d.ts         | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 498dfcea24..98d5b8c437 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -69090,6 +69090,10 @@ declare namespace Word {
          *
          * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
          *
+         * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+         * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+         * 
          * [Api set: WordApi 1.1]
          */
         highlightColor: string;
@@ -74308,6 +74312,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: string;
@@ -75430,6 +75438,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: string;
@@ -76990,6 +77002,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: boolean;
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 403e649f55..9086c4a9b1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -52444,6 +52444,10 @@ declare namespace Word {
          *
          * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
          *
+         * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+         * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+         * 
          * [Api set: WordApi 1.1]
          */
         highlightColor: string;
@@ -57258,6 +57262,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: string;
@@ -58392,6 +58400,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: string;
@@ -60106,6 +60118,10 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
+             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
+             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * 
              * [Api set: WordApi 1.1]
              */
             highlightColor?: boolean;

From 8c8d343a5a3a6cefada9dca523c277af72652100 Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 15:51:44 -0700
Subject: [PATCH 916/924] VS Code 1.24 Extension API

---
 types/vscode/index.d.ts | 293 +++++++++++++++++++++++++++++++++-------
 1 file changed, 246 insertions(+), 47 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index 6d38bd81bb..a27285eff8 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.23
+// Type definitions for Visual Studio Code 1.24
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,15 +10,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.23 Extension API
+ * Type Definition for Visual Studio Code 1.24 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
 declare module 'vscode' {
 
 	/**
@@ -221,7 +216,7 @@ declare module 'vscode' {
 
 		/**
 		 * Get a word-range at the given position. By default words are defined by
-		 * common separators, like space, -, _, etc. In addition, per languge custom
+		 * common separators, like space, -, _, etc. In addition, per language custom
 		 * [word definitions](#LanguageConfiguration.wordPattern) can be defined. It
 		 * is also possible to provide a custom regular expression.
 		 *
@@ -499,7 +494,7 @@ declare module 'vscode' {
 		active: Position;
 
 		/**
-		 * Create a selection from two postions.
+		 * Create a selection from two positions.
 		 *
 		 * @param anchor A position.
 		 * @param active A position.
@@ -1054,7 +1049,7 @@ declare module 'vscode' {
 
 		/**
 		 * Render options applied to the current decoration. For performance reasons, keep the
-		 * number of decoration specific options small, and use decoration types whereever possible.
+		 * number of decoration specific options small, and use decoration types wherever possible.
 		 */
 		renderOptions?: DecorationInstanceRenderOptions;
 	}
@@ -1135,7 +1130,7 @@ declare module 'vscode' {
 
 		/**
 		 * Insert a [snippet](#SnippetString) and put the editor into snippet mode. "Snippet mode"
-		 * means the editor adds placeholders and additionals cursors so that the user can complete
+		 * means the editor adds placeholders and additional cursors so that the user can complete
 		 * or accept the snippet.
 		 *
 		 * @param snippet The snippet to insert in this edit.
@@ -1326,7 +1321,7 @@ declare module 'vscode' {
 		 * [Uri.parse](#Uri.parse).
 		 *
 		 * @param skipEncoding Do not percentage-encode the result, defaults to `false`. Note that
-		 *	the `#` and `?` characters occuring in the path will always be encoded.
+		 *	the `#` and `?` characters occurring in the path will always be encoded.
 		 * @returns A string representation of this Uri.
 		 */
 		toString(skipEncoding?: boolean): string;
@@ -1621,7 +1616,7 @@ declare module 'vscode' {
 	 *
 	 * * Note 1: A dialog can select files, folders, or both. This is not true for Windows
 	 * which enforces to open either files or folder, but *not both*.
-	 * * Note 2: Explictly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
+	 * * Note 2: Explicitly setting `canSelectFiles` and `canSelectFolders` to `false` is futile
 	 * and the editor then silently adjusts the options to select files.
 	 */
 	export interface OpenDialogOptions {
@@ -1871,7 +1866,7 @@ declare module 'vscode' {
 	 * to that type `T`. In addition, `null` and `undefined` can be returned - either directly or from a
 	 * thenable.
 	 *
-	 * The snippets below are all valid implementions of the [`HoverProvider`](#HoverProvider):
+	 * The snippets below are all valid implementations of the [`HoverProvider`](#HoverProvider):
 	 *
 	 * ```ts
 	 * let a: HoverProvider = {
@@ -1901,6 +1896,9 @@ declare module 'vscode' {
 	 * Kind of a code action.
 	 *
 	 * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+	 *
+	 * Code action kinds are used by VS Code for UI elements such as the refactoring context menu. Users
+	 * can also trigger code actions with a specific kind with the `editor.action.codeAction` command.
 	 */
 	export class CodeActionKind {
 		/**
@@ -1909,12 +1907,16 @@ declare module 'vscode' {
 		static readonly Empty: CodeActionKind;
 
 		/**
-		 * Base kind for quickfix actions: `quickfix`
+		 * Base kind for quickfix actions: `quickfix`.
+		 *
+		 * Quick fix actions address a problem in the code and are shown in the normal code action context menu.
 		 */
 		static readonly QuickFix: CodeActionKind;
 
 		/**
 		 * Base kind for refactoring actions: `refactor`
+		 *
+		 * Refactoring actions are shown in the refactoring context menu.
 		 */
 		static readonly Refactor: CodeActionKind;
 
@@ -1960,12 +1962,13 @@ declare module 'vscode' {
 		/**
 		 * Base kind for source actions: `source`
 		 *
-		 * Source code actions apply to the entire file.
+		 * Source code actions apply to the entire file and can be run on save
+		 * using `editor.codeActionsOnSave`. They also are shown in `source` context menu.
 		 */
 		static readonly Source: CodeActionKind;
 
 		/**
-		 * Base kind for an organize imports source action: `source.organizeImports`
+		 * Base kind for an organize imports source action: `source.organizeImports`.
 		 */
 		static readonly SourceOrganizeImports: CodeActionKind;
 
@@ -2049,8 +2052,8 @@ declare module 'vscode' {
 		/**
 		 * Creates a new code action.
 		 *
-		 * A code action must have at least a [title](#CodeAction.title) and either [edits](#CodeAction.edit)
-		 * or a [command](#CodeAction.command).
+		 * A code action must have at least a [title](#CodeAction.title) and [edits](#CodeAction.edit)
+		 * and/or a [command](#CodeAction.command).
 		 *
 		 * @param title The title of the code action.
 		 * @param kind The kind of the code action.
@@ -2069,13 +2072,14 @@ declare module 'vscode' {
 		 * Provide commands for the given document and range.
 		 *
 		 * @param document The document in which the command was invoked.
-		 * @param range The range for which the command was invoked.
+		 * @param range The selector or range for which the command was invoked. This will always be a selection if
+		 * there is a currently active editor.
 		 * @param context Context carrying additional information.
 		 * @param token A cancellation token.
 		 * @return An array of commands, quick fixes, or refactorings or a thenable of such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
+		provideCodeActions(document: TextDocument, range: Range | Selection, context: CodeActionContext, token: CancellationToken): ProviderResult<(Command | CodeAction)[]>;
 	}
 
 	/**
@@ -2188,7 +2192,7 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The implemenetation provider interface defines the contract between extensions and
+	 * The implementation provider interface defines the contract between extensions and
 	 * the go to implementation feature.
 	 */
 	export interface ImplementationProvider {
@@ -2725,7 +2729,7 @@ declare module 'vscode' {
 		 * Builder-function that appends a tabstop (`$1`, `$2` etc) to
 		 * the [`value`](#SnippetString.value) of this snippet string.
 		 *
-		 * @param number The number of this tabstop, defaults to an auto-incremet
+		 * @param number The number of this tabstop, defaults to an auto-increment
 		 * value starting at 1.
 		 * @return This snippet string.
 		 */
@@ -2737,7 +2741,7 @@ declare module 'vscode' {
 		 *
 		 * @param value The value of this placeholder - either a string or a function
 		 * with which a nested snippet can be created.
-		 * @param number The number of this tabstop, defaults to an auto-incremet
+		 * @param number The number of this tabstop, defaults to an auto-increment
 		 * value starting at 1.
 		 * @return This snippet string.
 		 */
@@ -3008,7 +3012,7 @@ declare module 'vscode' {
 	/**
 	 * A completion item represents a text snippet that is proposed to complete text that is being typed.
 	 *
-	 * It is suffient to create a completion item from just a [label](#CompletionItem.label). In that
+	 * It is sufficient to create a completion item from just a [label](#CompletionItem.label). In that
 	 * case the completion item will replace the [word](#TextDocument.getWordRangeAtPosition)
 	 * until the cursor with the given label or [insertText](#CompletionItem.insertText). Otherwise the
 	 * the given [edit](#CompletionItem.textEdit) is used.
@@ -3194,7 +3198,7 @@ declare module 'vscode' {
 	 * Providers can delay the computation of the [`detail`](#CompletionItem.detail)
 	 * and [`documentation`](#CompletionItem.documentation) properties by implementing the
 	 * [`resolveCompletionItem`](#CompletionItemProvider.resolveCompletionItem)-function. However, properties that
-	 * are needed for the inital sorting and filtering, like `sortText`, `filterText`, `insertText`, and `range`, must
+	 * are needed for the initial sorting and filtering, like `sortText`, `filterText`, `insertText`, and `range`, must
 	 * not be changed during resolve.
 	 *
 	 * Providers are asked for completions either explicitly by a user gesture or -depending on the configuration-
@@ -3274,7 +3278,7 @@ declare module 'vscode' {
 
 		/**
 		 * Given a link fill in its [target](#DocumentLink.target). This method is called when an incomplete
-		 * link is selected in the UI. Providers can implement this method and return incomple links
+		 * link is selected in the UI. Providers can implement this method and return incomplete links
 		 * (without target) from the [`provideDocumentLinks`](#DocumentLinkProvider.provideDocumentLinks) method which
 		 * often helps to improve performance.
 		 *
@@ -3314,7 +3318,7 @@ declare module 'vscode' {
 		 *
 		 * @param red The red component.
 		 * @param green The green component.
-		 * @param blue The bluew component.
+		 * @param blue The blue component.
 		 * @param alpha The alpha component.
 		 */
 		constructor(red: number, green: number, blue: number, alpha: number);
@@ -3326,7 +3330,7 @@ declare module 'vscode' {
 	export class ColorInformation {
 
 		/**
-		 * The range in the document where this color appers.
+		 * The range in the document where this color appears.
 		 */
 		range: Range;
 
@@ -3394,7 +3398,7 @@ declare module 'vscode' {
 		 *
 		 * @param document The document in which the command was invoked.
 		 * @param token A cancellation token.
-		 * @return An array of [color informations](#ColorInformation) or a thenable that resolves to such. The lack of a result
+		 * @return An array of [color information](#ColorInformation) or a thenable that resolves to such. The lack of a result
 		 * can be signaled by returning `undefined`, `null`, or an empty array.
 		 */
 		provideDocumentColors(document: TextDocument, token: CancellationToken): ProviderResult<ColorInformation[]>;
@@ -3411,15 +3415,21 @@ declare module 'vscode' {
 		provideColorPresentations(color: Color, context: { document: TextDocument, range: Range }, token: CancellationToken): ProviderResult<ColorPresentation[]>;
 	}
 
+	/**
+	 * A line based folding range. To be valid, start and end line must a zero or larger and smaller than the number of lines in the document.
+	 * Invalid ranges will be ignored.
+	 */
 	export class FoldingRange {
 
 		/**
 		 * The zero-based start line of the range to fold. The folded area starts after the line's last character.
+		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
 		 */
 		start: number;
 
 		/**
 		 * The zero-based end line of the range to fold. The folded area ends with the line's last character.
+		 * To be valid, the end must be zero or larger and smaller than the number of lines in the document.
 		 */
 		end: number;
 
@@ -3441,6 +3451,9 @@ declare module 'vscode' {
 		constructor(start: number, end: number, kind?: FoldingRangeKind);
 	}
 
+	/**
+	 * An enumeration of all folding range kinds. The kind is used to categorize folding ranges.
+	 */
 	export enum FoldingRangeKind {
 		/**
 		 * Kind for folding range representing a comment.
@@ -3462,6 +3475,10 @@ declare module 'vscode' {
 	export interface FoldingContext {
 	}
 
+	/**
+	 * The folding range provider interface defines the contract between extensions and
+	 * [Folding](https://code.visualstudio.com/docs/editor/codebasics#_folding) in the editor.
+	 */
 	export interface FoldingRangeProvider {
 		/**
 		 * Returns a list of folding ranges or null and undefined if the provider
@@ -3500,7 +3517,7 @@ declare module 'vscode' {
 	 */
 	export interface IndentationRule {
 		/**
-		 * If a line matches this pattern, then all the lines after it should be unindendented once (until another rule matches).
+		 * If a line matches this pattern, then all the lines after it should be unindented once (until another rule matches).
 		 */
 		decreaseIndentPattern: RegExp;
 		/**
@@ -3731,7 +3748,7 @@ declare module 'vscode' {
 		 * The *effective* value (returned by [`get`](#WorkspaceConfiguration.get))
 		 * is computed like this: `defaultValue` overwritten by `globalValue`,
 		 * `globalValue` overwritten by `workspaceValue`. `workspaceValue` overwritten by `workspaceFolderValue`.
-		 * Refer to [Settings Inheritence](https://code.visualstudio.com/docs/getstarted/settings)
+		 * Refer to [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings)
 		 * for more information.
 		 *
 		 * *Note:* The configuration name must denote a leaf in the configuration tree
@@ -3756,7 +3773,7 @@ declare module 'vscode' {
 		 * has no observable effect in that workspace, but in others. Setting a workspace value
 		 * in the presence of a more specific folder value has no observable effect for the resources
 		 * under respective [folder](#workspace.workspaceFolders), but in others. Refer to
-		 * [Settings Inheritence](https://code.visualstudio.com/docs/getstarted/settings) for more information.
+		 * [Settings Inheritance](https://code.visualstudio.com/docs/getstarted/settings) for more information.
 		 *
 		 * *Note 2:* To remove a configuration value use `undefined`, like so: `config.update('somekey', undefined)`
 		 *
@@ -4608,7 +4625,7 @@ declare module 'vscode' {
 
 	/**
 	 * Defines how an argument should be quoted if it contains
-	 * spaces or unsuppoerted characters.
+	 * spaces or unsupported characters.
 	 */
 	export enum ShellQuoting {
 
@@ -4797,7 +4814,7 @@ declare module 'vscode' {
 
 	/**
 	 * A task provider allows to add tasks to the task service.
-	 * A task provider is registered via #workspace.registerTaskProvider.
+	 * A task provider is registered via #tasks.registerTaskProvider.
 	 */
 	export interface TaskProvider {
 		/**
@@ -4823,6 +4840,158 @@ declare module 'vscode' {
 		resolveTask(task: Task, token?: CancellationToken): ProviderResult<Task>;
 	}
 
+	/**
+	 * An object representing an executed Task. It can be used
+	 * to terminate a task.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	export interface TaskExecution {
+		/**
+		 * The task that got started.
+		 */
+		task: Task;
+
+		/**
+		 * Terminates the task execution.
+		 */
+		terminate(): void;
+	}
+
+	/**
+	 * An event signaling the start of a task execution.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	interface TaskStartEvent {
+		/**
+		 * The task item representing the task that got started.
+		 */
+		execution: TaskExecution;
+	}
+
+	/**
+	 * An event signaling the end of an executed task.
+	 *
+	 * This interface is not intended to be implemented.
+	 */
+	interface TaskEndEvent {
+		/**
+		 * The task item representing the task that finished.
+		 */
+		execution: TaskExecution;
+	}
+
+	/**
+	 * An event signaling the start of a process execution
+	 * triggered through a task
+	 */
+	export interface TaskProcessStartEvent {
+
+		/**
+		 * The task execution for which the process got started.
+		 */
+		execution: TaskExecution;
+
+		/**
+		 * The underlying process id.
+		 */
+		processId: number;
+	}
+
+	/**
+	 * An event signaling the end of a process execution
+	 * triggered through a task
+	 */
+	export interface TaskProcessEndEvent {
+
+		/**
+		 * The task execution for which the process got started.
+		 */
+		execution: TaskExecution;
+
+		/**
+		 * The process's exit code.
+		 */
+		exitCode: number;
+	}
+
+	export interface TaskFilter {
+		/**
+		 * The task version as used in the tasks.json file.
+		 * The string support the package.json semver notation.
+		 */
+		version?: string;
+
+		/**
+		 * The task type to return;
+		 */
+		type?: string;
+	}
+
+	/**
+	 * Namespace for tasks functionality.
+	 */
+	export namespace tasks {
+
+		/**
+		 * Register a task provider.
+		 *
+		 * @param type The task kind type this provider is registered for.
+		 * @param provider A task provider.
+		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 */
+		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
+
+		/**
+		 * Fetches all tasks available in the systems. This includes tasks
+		 * from `tasks.json` files as well as tasks from task providers
+		 * contributed through extensions.
+		 *
+		 * @param filter a filter to filter the return tasks.
+		 */
+		export function fetchTasks(filter?: TaskFilter): Thenable<Task[]>;
+
+		/**
+		 * Executes a task that is managed by VS Code. The returned
+		 * task execution can be used to terminate the task.
+		 *
+		 * @param task the task to execute
+		 */
+		export function executeTask(task: Task): Thenable<TaskExecution>;
+
+		/**
+		 * The currently active task executions or an empty array.
+		 *
+		 * @readonly
+		 */
+		export let taskExecutions: ReadonlyArray<TaskExecution>;
+
+		/**
+		 * Fires when a task starts.
+		 */
+		export const onDidStartTask: Event<TaskStartEvent>;
+
+		/**
+		 * Fires when a task ends.
+		 */
+		export const onDidEndTask: Event<TaskEndEvent>;
+
+		/**
+		 * Fires when the underlying process has been started.
+		 * This event will not fire for tasks that don't
+		 * execute an underlying process.
+		 */
+		export const onDidStartTaskProcess: Event<TaskProcessStartEvent>;
+
+		/**
+		 * Fires when the underlying process has ended.
+		 * This event will not fire for tasks that don't
+		 * execute an underlying process.
+		 */
+		export const onDidEndTaskProcess: Event<TaskProcessEndEvent>;
+	}
+
 	/**
 	 * Enumeration of file types. The types `File` and `Directory` can also be
 	 * a symbolic links, in that use `FileType.File | FileType.SymbolicLink` and
@@ -5064,7 +5233,7 @@ declare module 'vscode' {
 		 *
 		 * @param oldUri The existing file.
 		 * @param newUri The new location.
-		 * @param options Defines if existing files should be overwriten.
+		 * @param options Defines if existing files should be overwritten.
 		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when `oldUri` doesn't exist.
 		 * @throws [`FileNotFound`](#FileSystemError.FileNotFound) when parent of `newUri` doesn't exist, e.g. no mkdirp-logic required.
 		 * @throws [`FileExists`](#FileSystemError.FileExists) when `newUri` exists and when the `overwrite` option is not `true`.
@@ -5139,7 +5308,7 @@ declare module 'vscode' {
 		/**
 		 * Post a message to the webview content.
 		 *
-		 * Messages are only develivered if the webview is visible.
+		 * Messages are only delivered if the webview is visible.
 		 *
 		 * @param message Body of the message.
 		 */
@@ -5235,8 +5404,9 @@ declare module 'vscode' {
 		 * method moves it to a new column.
 		 *
 		 * @param viewColumn View column to show the panel in. Shows in the current `viewColumn` if undefined.
+		 * @param preserveFocus When `true`, the webview will not take focus.
 		 */
-		reveal(viewColumn?: ViewColumn): void;
+		reveal(viewColumn?: ViewColumn, preserveFocus?: boolean): void;
 
 		/**
 		 * Dispose of the webview panel.
@@ -5745,12 +5915,12 @@ declare module 'vscode' {
 		 *
 		 * @param viewType Identifies the type of the webview panel.
 		 * @param title Title of the panel.
-		 * @param position Editor column to show the new panel in.
+		 * @param showOptions Where to show the webview in the editor. If preserveFocus is set, the new webview will not take focus.
 		 * @param options Settings for the new panel.
 		 *
 		 * @return New webview panel.
 		 */
-		export function createWebviewPanel(viewType: string, title: string, position: ViewColumn, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
+		export function createWebviewPanel(viewType: string, title: string, showOptions: ViewColumn | { viewColumn: ViewColumn, preserveFocus?: boolean }, options?: WebviewPanelOptions & WebviewOptions): WebviewPanel;
 
 		/**
 		 * Set a message to the status bar. This is a short hand for the more powerful
@@ -5792,7 +5962,7 @@ declare module 'vscode' {
 		 *
 		 * @param task A callback returning a promise. Progress increments can be reported with
 		 * the provided [progress](#Progress)-object.
-		 * @return The thenable the task did rseturn.
+		 * @return The thenable the task did return.
 		 */
 		export function withScmProgress<R>(task: (progress: Progress<number>) => Thenable<R>): Thenable<R>;
 
@@ -5866,11 +6036,38 @@ declare module 'vscode' {
 		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
 	}
 
+	/**
+	 * The event that is fired when an element in the [TreeView](#TreeView) is expanded or collapsed
+	 */
+	export interface TreeViewExpansionEvent<T> {
+
+		/**
+		 * Element that is expanded or collapsed.
+		 */
+		element: T;
+
+	}
+
 	/**
 	 * Represents a Tree view
 	 */
 	export interface TreeView<T> extends Disposable {
 
+		/**
+		 * Event that is fired when an element is expanded
+		 */
+		readonly onDidExpandElement: Event<TreeViewExpansionEvent<T>>;
+
+		/**
+		 * Event that is fired when an element is collapsed
+		 */
+		readonly onDidCollapseElement: Event<TreeViewExpansionEvent<T>>;
+
+		/**
+		 * Currently selected elements.
+		 */
+		readonly selection: ReadonlyArray<T>;
+
 		/**
 		 * Reveal an element. By default revealed element is selected.
 		 *
@@ -6063,7 +6260,7 @@ declare module 'vscode' {
 		Window = 10,
 
 		/**
-		 * Show progress as notifiation with an optional cancel button. Supports to show infinite and discrete progress.
+		 * Show progress as notification with an optional cancel button. Supports to show infinite and discrete progress.
 		 */
 		Notification = 15
 	}
@@ -6540,6 +6737,8 @@ declare module 'vscode' {
 		 * @param type The task kind type this provider is registered for.
 		 * @param provider A task provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
+		 *
+		 * @deprecated Use the corresponding function on the `tasks` namespace instead
 		 */
 		export function registerTaskProvider(type: string, provider: TaskProvider): Disposable;
 
@@ -6619,7 +6818,7 @@ declare module 'vscode' {
 		 *  1. When the `DocumentFilter` is empty (`{}`) the result is `0`
 		 *  2. When `scheme`, `language`, or `pattern` are defined but one doesn’t match, the result is `0`
 		 *  3. Matching against `*` gives a score of `5`, matching via equality or via a glob-pattern gives a score of `10`
-		 *  4. The result is the maximun value of each match
+		 *  4. The result is the maximum value of each match
 		 *
 		 * Samples:
 		 * ```js
@@ -6658,7 +6857,7 @@ declare module 'vscode' {
 		 * all extensions but *not yet* from the task framework.
 		 *
 		 * @param resource A resource
-		 * @returns An arrary of [diagnostics](#Diagnostic) objects or an empty array.
+		 * @returns An array of [diagnostics](#Diagnostic) objects or an empty array.
 		 */
 		export function getDiagnostics(resource: Uri): Diagnostic[];
 
@@ -7425,7 +7624,7 @@ declare module 'vscode' {
 
 
 		/**
-		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specifc debug type.
+		 * Register a [debug configuration provider](#DebugConfigurationProvider) for a specific debug type.
 		 * More than one provider can be registered for the same type.
 		 *
 		 * @param type The debug type for which the provider is registered.
@@ -7518,7 +7717,7 @@ declare module 'vscode' {
 
 /**
  * Thenable is a common denominator between ES6 promises, Q, jquery.Deferred, WinJS.Promise,
- * and others. This API makes no assumption about what promise libary is being used which
+ * and others. This API makes no assumption about what promise library is being used which
  * enables reusing existing code without migrating to a specific promise implementation. Still,
  * we recommend the use of native promises which are available in this editor.
  */
@@ -7531,4 +7730,4 @@ interface Thenable<T> {
 	*/
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
 	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
-}
\ No newline at end of file
+}

From dcef0b6d61290e0b460286aa70e62c0e3db2ad41 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Fri, 22 Mar 2019 16:07:14 -0700
Subject: [PATCH 917/924] Feedback

---
 types/office-js-preview/index.d.ts | 24 ++++++++++++------------
 types/office-js/index.d.ts         | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index 98d5b8c437..fe5823c83c 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -69090,9 +69090,9 @@ declare namespace Word {
          *
          * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
          *
-         * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-         * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+         * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+         * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
          * 
          * [Api set: WordApi 1.1]
          */
@@ -74312,9 +74312,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */
@@ -75438,9 +75438,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */
@@ -77002,9 +77002,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 9086c4a9b1..7cb6b8e2cc 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -52444,9 +52444,9 @@ declare namespace Word {
          *
          * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
          *
-         * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-         * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+         * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+         * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+         * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
          * 
          * [Api set: WordApi 1.1]
          */
@@ -57262,9 +57262,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */
@@ -58400,9 +58400,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */
@@ -60118,9 +60118,9 @@ declare namespace Word {
              *
              * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
-             * Note: Only the default highlight colors are available in Office for Windows Desktop. 
-             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", "Black".
-             * Any other color will be converted to the closest color when applied to the font when the add-in run in Office for Windows Desktop. 
+             * **Note**: Only the default highlight colors are available in Office for Windows Desktop. 
+             * These are "Yellow", "Lime", "Turquoise", "Pink", "Blue", "Red", "DarkBlue", "Teal", "Green", "Purple", "DarkRed", "Olive", "Gray", "LightGray", and "Black".
+             * When the add-in runs in Office for Windows Desktop, any other color is converted to the closest color when applied to the font.
              * 
              * [Api set: WordApi 1.1]
              */

From 4f3ee38e452377fb35fb35237776d52ffd89667d Mon Sep 17 00:00:00 2001
From: Pine Wu <octref@gmail.com>
Date: Fri, 22 Mar 2019 16:28:52 -0700
Subject: [PATCH 918/924] VS Code 1.25 Extension API

---
 types/vscode/index.d.ts | 298 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 260 insertions(+), 38 deletions(-)

diff --git a/types/vscode/index.d.ts b/types/vscode/index.d.ts
index a27285eff8..89a9b6d1a8 100644
--- a/types/vscode/index.d.ts
+++ b/types/vscode/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Visual Studio Code 1.24
+// Type definitions for Visual Studio Code 1.25
 // Project: https://github.com/microsoft/vscode
 // Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 /**
- * Type Definition for Visual Studio Code 1.24 Extension API
+ * Type Definition for Visual Studio Code 1.25 Extension API
  * See https://code.visualstudio.com/api for more information
  */
 
@@ -587,7 +587,7 @@ declare module 'vscode' {
 	 */
 	export interface TextEditorViewColumnChangeEvent {
 		/**
-		 * The [text editor](#TextEditor) for which the options have changed.
+		 * The [text editor](#TextEditor) for which the view column has changed.
 		 */
 		textEditor: TextEditor;
 		/**
@@ -763,9 +763,10 @@ declare module 'vscode' {
 	export interface TextDocumentShowOptions {
 		/**
 		 * An optional view column in which the [editor](#TextEditor) should be shown.
-		 * The default is the [one](#ViewColumn.One), other values are adjusted to
+		 * The default is the [active](#ViewColumn.Active), other values are adjusted to
 		 * be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
-		 * not adjusted.
+		 * not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside) to open the
+		 * editor to the side of the currently active one.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -1111,7 +1112,8 @@ declare module 'vscode' {
 
 		/**
 		 * The column in which this editor shows. Will be `undefined` in case this
-		 * isn't one of the three main editors, e.g an embedded editor.
+		 * isn't one of the main editors, e.g an embedded editor, or when the editor
+		 * column is larger than three.
 		 */
 		viewColumn?: ViewColumn;
 
@@ -1163,10 +1165,10 @@ declare module 'vscode' {
 		/**
 		 * ~~Show the text editor.~~
 		 *
-		 * @deprecated Use [window.showTextDocument](#window.showTextDocument)
+		 * @deprecated Use [window.showTextDocument](#window.showTextDocument) instead.
 		 *
 		 * @param column The [column](#ViewColumn) in which to show this editor.
-		 * instead. This method shows unexpected behavior and will be removed in the next major update.
+		 * This method shows unexpected behavior and will be removed in the next major update.
 		 */
 		show(column?: ViewColumn): void;
 
@@ -2475,6 +2477,56 @@ declare module 'vscode' {
 		constructor(name: string, kind: SymbolKind, range: Range, uri?: Uri, containerName?: string);
 	}
 
+	/**
+	 * Represents programming constructs like variables, classes, interfaces etc. that appear in a document. Document
+	 * symbols can be hierarchical and they have two ranges: one that encloses its definition and one that points to
+	 * its most interesting range, e.g. the range of an identifier.
+	 */
+	export class DocumentSymbol {
+
+		/**
+		 * The name of this symbol.
+		 */
+		name: string;
+
+		/**
+		 * More detail for this symbol, e.g the signature of a function.
+		 */
+		detail: string;
+
+		/**
+		 * The kind of this symbol.
+		 */
+		kind: SymbolKind;
+
+		/**
+		 * The range enclosing this symbol not including leading/trailing whitespace but everything else, e.g comments and code.
+		 */
+		range: Range;
+
+		/**
+		 * The range that should be selected and reveal when this symbol is being picked, e.g the name of a function.
+		 * Must be contained by the [`range`](#DocumentSymbol.range).
+		 */
+		selectionRange: Range;
+
+		/**
+		 * Children of this symbol, e.g. properties of a class.
+		 */
+		children: DocumentSymbol[];
+
+		/**
+		 * Creates a new document symbol.
+		 *
+		 * @param name The name of the symbol.
+		 * @param detail Details for the symbol.
+		 * @param kind The kind of the symbol.
+		 * @param range The full range of the symbol.
+		 * @param selectionRange The range that should be reveal.
+		 */
+		constructor(name: string, detail: string, kind: SymbolKind, range: Range, selectionRange: Range);
+	}
+
 	/**
 	 * The document symbol provider interface defines the contract between extensions and
 	 * the [go to symbol](https://code.visualstudio.com/docs/editor/editingevolved#_go-to-symbol)-feature.
@@ -2489,7 +2541,7 @@ declare module 'vscode' {
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
 		 * signaled by returning `undefined`, `null`, or an empty array.
 		 */
-		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[]>;
+		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<SymbolInformation[] | DocumentSymbol[]>;
 	}
 
 	/**
@@ -2499,16 +2551,17 @@ declare module 'vscode' {
 	export interface WorkspaceSymbolProvider {
 
 		/**
-		 * Project-wide search for a symbol matching the given query string. It is up to the provider
-		 * how to search given the query string, like substring, indexOf etc. To improve performance implementors can
-		 * skip the [location](#SymbolInformation.location) of symbols and implement `resolveWorkspaceSymbol` to do that
-		 * later.
+		 * Project-wide search for a symbol matching the given query string.
 		 *
 		 * The `query`-parameter should be interpreted in a *relaxed way* as the editor will apply its own highlighting
 		 * and scoring on the results. A good rule of thumb is to match case-insensitive and to simply check that the
 		 * characters of *query* appear in their order in a candidate symbol. Don't use prefix, substring, or similar
 		 * strict matching.
 		 *
+		 * To improve performance implementors can implement `resolveWorkspaceSymbol` and then provide symbols with partial
+		 * [location](#SymbolInformation.location)-objects, without a `range` defined. The editor will then call
+		 * `resolveWorkspaceSymbol` for selected symbols only, e.g. when opening a workspace symbol.
+		 *
 		 * @param query A non-empty query string.
 		 * @param token A cancellation token.
 		 * @return An array of document highlights or a thenable that resolves to such. The lack of a result can be
@@ -3064,6 +3117,13 @@ declare module 'vscode' {
 		 */
 		filterText?: string;
 
+		/**
+		 * Select this item when showing. *Note* that only one completion item can be selected and
+		 * that the editor decides which item that is. The rule is that the *first* item of those
+		 * that match best is selected.
+		 */
+		preselect?: boolean;
+
 		/**
 		 * A string or snippet that should be inserted in a document when selecting
 		 * this completion. When `falsy` the [label](#CompletionItem.label)
@@ -3890,6 +3950,23 @@ declare module 'vscode' {
 		constructor(location: Location, message: string);
 	}
 
+	/**
+	 * Additional metadata about the type of a diagnostic.
+	 */
+	export enum DiagnosticTag {
+		/**
+		 * Unused or unnecessary code.
+		 *
+		 * Diagnostics with this tag are rendered faded out. The amount of fading
+		 * is controlled by the `"editorUnnecessaryCode.opacity"` theme color. For
+		 * example, `"editorUnnecessaryCode.opacity": "#000000c0" will render the
+		 * code with 75% opacity. For high contrast themes, use the
+		 * `"editorUnnecessaryCode.border"` the color to underline unnecessary code
+		 * instead of fading it out.
+		 */
+		Unnecessary = 1,
+	}
+
 	/**
 	 * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects
 	 * are only valid in the scope of a file.
@@ -3930,6 +4007,11 @@ declare module 'vscode' {
 		 */
 		relatedInformation?: DiagnosticRelatedInformation[];
 
+		/**
+		 * Additional metadata about the diagnostic.
+		 */
+		tags?: DiagnosticTag[];
+
 		/**
 		 * Creates a new diagnostic object.
 		 *
@@ -4026,29 +4108,59 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * Denotes a column in the editor window. Columns are
-	 * used to show editors side by side.
+	 * Denotes a location of an editor in the window. Editors can be arranged in a grid
+	 * and each column represents one editor location in that grid by counting the editors
+	 * in order of their appearance.
 	 */
 	export enum ViewColumn {
 		/**
-		 * A *symbolic* editor column representing the currently
-		 * active column. This value can be used when opening editors, but the
-		 * *resolved* [viewColumn](#TextEditor.viewColumn)-value of editors will always
-		 * be `One`, `Two`, `Three`, or `undefined` but never `Active`.
+		 * A *symbolic* editor column representing the currently active column. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Active`.
 		 */
 		Active = -1,
 		/**
-		 * The left most editor column.
+		 * A *symbolic* editor column representing the column to the side of the active one. This value
+		 * can be used when opening editors, but the *resolved* [viewColumn](#TextEditor.viewColumn)-value
+		 * of editors will always be `One`, `Two`, `Three`,... or `undefined` but never `Beside`.
+		 */
+		Beside = -2,
+		/**
+		 * The first editor column.
 		 */
 		One = 1,
 		/**
-		 * The center editor column.
+		 * The second editor column.
 		 */
 		Two = 2,
 		/**
-		 * The right most editor column.
+		 * The third editor column.
 		 */
-		Three = 3
+		Three = 3,
+		/**
+		 * The fourth editor column.
+		 */
+		Four = 4,
+		/**
+		 * The fifth editor column.
+		 */
+		Five = 5,
+		/**
+		 * The sixth editor column.
+		 */
+		Six = 6,
+		/**
+		 * The seventh editor column.
+		 */
+		Seven = 7,
+		/**
+		 * The eighth editor column.
+		 */
+		Eight = 8,
+		/**
+		 * The ninth editor column.
+		 */
+		Nine = 9
 	}
 
 	/**
@@ -4440,6 +4552,11 @@ declare module 'vscode' {
 		 * every task execution (new). Defaults to `TaskInstanceKind.Shared`
 		 */
 		panel?: TaskPanelKind;
+
+		/**
+		 * Controls whether to show the "Terminal will be reused by tasks, press any key to close it" message.
+		 */
+		showReuseMessage?: boolean;
 	}
 
 	/**
@@ -5291,7 +5408,7 @@ declare module 'vscode' {
 		/**
 		 * Content settings for the webview.
 		 */
-		readonly options: WebviewOptions;
+		options: WebviewOptions;
 
 		/**
 		 * Contents of the webview.
@@ -5371,14 +5488,19 @@ declare module 'vscode' {
 
 		/**
 		 * Editor position of the panel. This property is only set if the webview is in
-		 * one of the three editor view columns.
+		 * one of the editor view columns.
 		 *
 		 * @deprecated
 		 */
 		readonly viewColumn?: ViewColumn;
 
 		/**
-		 * Is the panel currently visible?
+		 * Whether the panel is active (focused by the user).
+		 */
+		readonly active: boolean;
+
+		/**
+		 * Whether the panel is visible.
 		 */
 		readonly visible: boolean;
 
@@ -5428,6 +5550,52 @@ declare module 'vscode' {
 		readonly webviewPanel: WebviewPanel;
 	}
 
+	/**
+	 * Restore webview panels that have been persisted when vscode shuts down.
+	 *
+	 * There are two types of webview persistence:
+	 *
+	 * - Persistence within a session.
+	 * - Persistence across sessions (across restarts of VS Code).
+	 *
+	 * A `WebviewPanelSerializer` is only required for the second case: persisting a webview across sessions.
+	 *
+	 * Persistence within a session allows a webview to save its state when it becomes hidden
+	 * and restore its content from this state when it becomes visible again. It is powered entirely
+	 * by the webview content itself. To save off a persisted state, call `acquireVsCodeApi().setState()` with
+	 * any json serializable object. To restore the state again, call `getState()`
+	 *
+	 * ```js
+	 * // Within the webview
+	 * const vscode = acquireVsCodeApi();
+	 *
+	 * // Get existing state
+	 * const oldState = vscode.getState() || { value: 0 };
+	 *
+	 * // Update state
+	 * setState({ value: oldState.value + 1 })
+	 * ```
+	 *
+	 * A `WebviewPanelSerializer` extends this persistence across restarts of VS Code. When the editor is shutdown,
+	 * VS Code will save off the state from `setState` of all webviews that have a serializer. When the
+	 * webview first becomes visible after the restart, this state is passed to `deserializeWebviewPanel`.
+	 * The extension can then restore the old `WebviewPanel` from this state.
+	 */
+	interface WebviewPanelSerializer {
+		/**
+		 * Restore a webview panel from its seriailzed `state`.
+		 *
+		 * Called when a serialized webview first becomes visible.
+		 *
+		 * @param webviewPanel Webview panel to restore. The serializer should take ownership of this panel. The
+		 * serializer must restore the webview's `.html` and hook up all webview events.
+		 * @param state Persisted state from the webview content.
+		 *
+		 * @return Thanble indicating that the webview has been fully restored.
+		 */
+		deserializeWebviewPanel(webviewPanel: WebviewPanel, state: any): Thenable<void>;
+	}
+
 	/**
 	 * Namespace describing the environment the editor runs in.
 	 */
@@ -5613,7 +5781,7 @@ declare module 'vscode' {
 		export const onDidChangeTextEditorSelection: Event<TextEditorSelectionChangeEvent>;
 
 		/**
-		 * An [event](#Event) which fires when the selection in an editor has changed.
+		 * An [event](#Event) which fires when the visible ranges of an editor has changed.
 		 */
 		export const onDidChangeTextEditorVisibleRanges: Event<TextEditorVisibleRangesChangeEvent>;
 
@@ -5650,9 +5818,9 @@ declare module 'vscode' {
 		 * to control where the editor is being shown. Might change the [active editor](#window.activeTextEditor).
 		 *
 		 * @param document A text document to be shown.
-		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [one](#ViewColumn.One), other values
-		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is
-		 * not adjusted.
+		 * @param column A view column in which the [editor](#TextEditor) should be shown. The default is the [active](#ViewColumn.Active), other values
+		 * are adjusted to be `Min(column, columnCount + 1)`, the [active](#ViewColumn.Active)-column is not adjusted. Use [`ViewColumn.Beside`](#ViewColumn.Beside)
+		 * to open the editor to the side of the currently active one.
 		 * @param preserveFocus When `true` the editor will not take focus.
 		 * @return A promise that resolves to an [editor](#TextEditor).
 		 */
@@ -6034,6 +6202,19 @@ declare module 'vscode' {
 		 * @returns a [TreeView](#TreeView).
 		 */
 		export function createTreeView<T>(viewId: string, options: { treeDataProvider: TreeDataProvider<T> }): TreeView<T>;
+
+		/**
+		 * Registers a webview panel serializer.
+		 *
+		 * Extensions that support reviving should have an `"onWebviewPanel:viewType"` activation event and
+		 * make sure that [registerWebviewPanelSerializer](#registerWebviewPanelSerializer) is called during activation.
+		 *
+		 * Only a single serializer may be registered at a time for a given `viewType`.
+		 *
+		 * @param viewType Type of the webview panel that can be serialized.
+		 * @param serializer Webview serializer.
+		 */
+		export function registerWebviewPanelSerializer(viewType: string, serializer: WebviewPanelSerializer): Disposable;
 	}
 
 	/**
@@ -6044,7 +6225,31 @@ declare module 'vscode' {
 		/**
 		 * Element that is expanded or collapsed.
 		 */
-		element: T;
+		readonly element: T;
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's selection](#TreeView.selection)
+	 */
+	export interface TreeViewSelectionChangeEvent<T> {
+
+		/**
+		 * Selected elements.
+		 */
+		readonly selection: T[];
+
+	}
+
+	/**
+	 * The event that is fired when there is a change in [tree view's visibility](#TreeView.visible)
+	 */
+	export interface TreeViewVisibilityChangeEvent {
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
 
 	}
 
@@ -6066,19 +6271,36 @@ declare module 'vscode' {
 		/**
 		 * Currently selected elements.
 		 */
-		readonly selection: ReadonlyArray<T>;
+		readonly selection: T[];
 
 		/**
-		 * Reveal an element. By default revealed element is selected.
+		 * Event that is fired when the [selection](#TreeView.selection) has changed
+		 */
+		readonly onDidChangeSelection: Event<TreeViewSelectionChangeEvent<T>>;
+
+		/**
+		 * `true` if the [tree view](#TreeView) is visible otherwise `false`.
+		 */
+		readonly visible: boolean;
+
+		/**
+		 * Event that is fired when [visibility](TreeView.visible) has changed
+		 */
+		readonly onDidChangeVisibility: Event<TreeViewVisibilityChangeEvent>;
+
+		/**
+		 * Reveals the given element in the tree view.
+		 * If the tree view is not visible then the tree view is shown and element is revealed.
 		 *
+		 * By default revealed element is selected and not focused.
 		 * In order to not to select, set the option `select` to `false`.
+		 * In order to focus, set the option `focus` to `true`.
 		 *
 		 * **NOTE:** [TreeDataProvider](#TreeDataProvider) is required to implement [getParent](#TreeDataProvider.getParent) method to access this API.
 		 */
-		reveal(element: T, options?: { select?: boolean }): Thenable<void>;
+		reveal(element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void>;
 	}
 
-
 	/**
 	 * A data provider that provides tree data
 	 */
@@ -6152,7 +6374,7 @@ declare module 'vscode' {
 		tooltip?: string | undefined;
 
 		/**
-		 * The [command](#Command) which should be run when the tree item is selected.
+		 * The [command](#Command) that should be executed when the tree item is selected.
 		 */
 		command?: Command;
 
@@ -6753,7 +6975,7 @@ declare module 'vscode' {
 		 * @param options Immutable metadata about the provider.
 		 * @return A [disposable](#Disposable) that unregisters this provider when being disposed.
 		 */
-		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options: { isCaseSensitive?: boolean }): Disposable;
+		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, options?: { isCaseSensitive?: boolean, isReadonly?: boolean }): Disposable;
 	}
 
 	/**
@@ -7660,7 +7882,7 @@ declare module 'vscode' {
 
 	/**
 	 * Namespace for dealing with installed extensions. Extensions are represented
-	 * by an [extension](#Extension)-interface which allows to reflect on them.
+	 * by an [extension](#Extension)-interface which enables reflection on them.
 	 *
 	 * Extension writers can provide APIs to other extensions by returning their API public
 	 * surface from the `activate`-call.

From 0a3dbd08d2b17d04a680da6ee1e05b84bf14b3cf Mon Sep 17 00:00:00 2001
From: alex2wong <huangyixiu188@hotmail.com>
Date: Sat, 23 Mar 2019 16:58:37 +0800
Subject: [PATCH 919/924] For types/chart.js, added lineHeight/padding to
 ScaleTitleOptions

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

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index e35c556b56..879ef9bb3f 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -115,7 +115,9 @@ const scaleOptions: Chart.RadialLinearScale = {
     lineArc: false,
     display: false,
     scaleLabel: {
-        display: false
+        display: false,
+        lineHeight: 1,
+        padding: 0,
     },
 };
 const radarChartOptions: Chart.RadialChartOptions = {
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 8fa3a42ef9..111c8da57f 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -426,10 +426,12 @@ declare namespace Chart {
     interface ScaleTitleOptions {
         display?: boolean;
         labelString?: string;
+        lineHeight?: number | string;
         fontColor?: ChartColor;
         fontFamily?: string;
         fontSize?: number;
         fontStyle?: string;
+        padding?: ChartLayoutPaddingObject | number;
     }
 
     interface TickOptions extends NestedTickOptions {

From 066647686192475c0ddbb96f0516b8e458813849 Mon Sep 17 00:00:00 2001
From: Karan Lyons <karan@karanlyons.com>
Date: Sat, 23 Mar 2019 09:44:12 -0700
Subject: [PATCH 920/924] Mark getter props as readonly.

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

diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index 52967890bd..75d4b3a2d9 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -1641,7 +1641,7 @@ declare class Hls {
     /**
      * return array of available quality levels
      */
-    levels: Hls.Level[];
+    readonly levels: Hls.Level[];
     /**
      * get: return current playback quality level
      * set:  trigger an immediate quality level switch to new quality level
@@ -1709,7 +1709,7 @@ declare class Hls {
     /**
      * array of audio tracks exposed in manifest
      */
-    audioTracks: AudioTrack[];
+    readonly audioTracks: AudioTrack[];
     /**
      * get: returns audio track id
      * set: sets audio track id (returned by)
@@ -1718,11 +1718,11 @@ declare class Hls {
     /**
      * position of live sync point (ie edge of live position minus safety delay defined by hls.config.liveSyncDuration)
      */
-    liveSyncPosition: number;
+    readonly liveSyncPosition: number;
     /**
      * get : array of subtitle tracks exposed in manifest
      */
-    subtitleTracks: any[];
+    readonly subtitleTracks: any[];
     /**
      * get/set : subtitle track id (returned by).
      * Returns -1 if no track is visible.
@@ -1757,7 +1757,7 @@ declare class Hls {
     /**
      * tell whether auto level selection is enabled or not
      */
-    autoLevelEnabled(enabled: boolean): boolean;
+    readonly autoLevelEnabled: boolean;
     /**
      * loads provided url as media source
      */

From 61521a9795ec6dcfcfd665a369e4b4da9e9d1811 Mon Sep 17 00:00:00 2001
From: Karan Lyons <karan@karanlyons.com>
Date: Sat, 23 Mar 2019 09:44:45 -0700
Subject: [PATCH 921/924] Remoce nonexistent props.

---
 types/hls.js/index.d.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index 75d4b3a2d9..a2b6486668 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -1666,16 +1666,6 @@ declare class Hls {
      *  default valus is hls.firstLevel
      */
     startLevel: number;
-    /**
-     * (default: true)
-     * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
-     * if set to false, an explicit API call (hls.startLoad(startPosition=-1)) will be needed to start quality level/fragment loading.
-     */
-    autoStartLoad: boolean;
-    /**
-     * get: Return the bound videoElement from the hls instance
-     */
-    media: HTMLVideoElement;
     /**
      *  hls.js config
      */
@@ -1735,11 +1725,6 @@ declare class Hls {
      * If set to false, the mode will be set to hidden.
      */
     subtitleDisplay: boolean;
-    /**
-     * (default: NaN)
-     * Return current download bandwidth in bits/s if available
-     */
-    bandwidthEstimate: number;
     /**
      * calling this method will:
      *      bind videoElement and hls instances

From fca6fe6c8ab21fe44dbf215d12637ccbe0c48eca Mon Sep 17 00:00:00 2001
From: mtgto <hogerappa@gmail.com>
Date: Sun, 24 Mar 2019 13:26:46 +0900
Subject: [PATCH 922/924] [google-apps-script] Add definitions for calendar,
 admin directory API for advance service (#34073)

* [google-apps-script] Add definitions for calendar, admin dir for advance

* [google-apps-script] abbreviate redundant namespace hierarchy.

* [google-apps-script] lowerize boolean, string[]
---
 .../apis/admin/directory_v1.d.ts              | 1138 +++++++++++++++++
 .../google-apps-script/apis/calendar/v3.d.ts  |  584 +++++++++
 .../google-apps-script-tests.ts               |   55 +-
 3 files changed, 1776 insertions(+), 1 deletion(-)

diff --git a/types/google-apps-script/apis/admin/directory_v1.d.ts b/types/google-apps-script/apis/admin/directory_v1.d.ts
index e69de29bb2..fc4ae9b931 100644
--- a/types/google-apps-script/apis/admin/directory_v1.d.ts
+++ b/types/google-apps-script/apis/admin/directory_v1.d.ts
@@ -0,0 +1,1138 @@
+// Type definitions for Google Apps Script 2019-03-22
+// Project: https://developers.google.com/apps-script/
+// Definitions by: mtgto <https://github.com/mtgto/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace GoogleAppsScript {
+  namespace Admin_directory_v1 {
+    namespace Collection {
+      namespace Groups {
+        export interface AliasesCollection {
+          // Add a alias for the group
+          insert(resource: Schema.Alias, groupKey: string): Admin_directory_v1.Schema.Alias;
+          // List all aliases for a group
+          list(groupKey: string): Admin_directory_v1.Schema.Aliases;
+          // Remove a alias for the group
+          remove(groupKey: string, alias: string): void;
+        }
+      }
+      namespace Resources {
+        export interface BuildingsCollection {
+          // Retrieves a building.
+          get(customer: string, buildingId: string): Admin_directory_v1.Schema.Building;
+          // Inserts a building.
+          insert(resource: Schema.Building, customer: string): Admin_directory_v1.Schema.Building;
+          // Inserts a building.
+          insert(resource: Schema.Building, customer: string, optionalArgs: object): Admin_directory_v1.Schema.Building;
+          // Retrieves a list of buildings for an account.
+          list(customer: string): Admin_directory_v1.Schema.Buildings;
+          // Retrieves a list of buildings for an account.
+          list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.Buildings;
+          // Updates a building. This method supports patch semantics.
+          patch(resource: Schema.Building, customer: string, buildingId: string): Admin_directory_v1.Schema.Building;
+          // Updates a building. This method supports patch semantics.
+          patch(resource: Schema.Building, customer: string, buildingId: string, optionalArgs: object): Admin_directory_v1.Schema.Building;
+          // Deletes a building.
+          remove(customer: string, buildingId: string): void;
+          // Updates a building.
+          update(resource: Schema.Building, customer: string, buildingId: string): Admin_directory_v1.Schema.Building;
+          // Updates a building.
+          update(resource: Schema.Building, customer: string, buildingId: string, optionalArgs: object): Admin_directory_v1.Schema.Building;
+        }
+        export interface CalendarsCollection {
+          // Retrieves a calendar resource.
+          get(customer: string, calendarResourceId: string): Admin_directory_v1.Schema.CalendarResource;
+          // Inserts a calendar resource.
+          insert(resource: Schema.CalendarResource, customer: string): Admin_directory_v1.Schema.CalendarResource;
+          // Retrieves a list of calendar resources for an account.
+          list(customer: string): Admin_directory_v1.Schema.CalendarResources;
+          // Retrieves a list of calendar resources for an account.
+          list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.CalendarResources;
+          // Updates a calendar resource.
+          // This method supports patch semantics, meaning you only need to include the fields you wish to update. Fields that are not present in the request will be preserved. This method supports patch semantics.
+          patch(resource: Schema.CalendarResource, customer: string, calendarResourceId: string): Admin_directory_v1.Schema.CalendarResource;
+          // Deletes a calendar resource.
+          remove(customer: string, calendarResourceId: string): void;
+          // Updates a calendar resource.
+          // This method supports patch semantics, meaning you only need to include the fields you wish to update. Fields that are not present in the request will be preserved.
+          update(resource: Schema.CalendarResource, customer: string, calendarResourceId: string): Admin_directory_v1.Schema.CalendarResource;
+        }
+        export interface FeaturesCollection {
+          // Retrieves a feature.
+          get(customer: string, featureKey: string): Admin_directory_v1.Schema.Feature;
+          // Inserts a feature.
+          insert(resource: Schema.Feature, customer: string): Admin_directory_v1.Schema.Feature;
+          // Retrieves a list of features for an account.
+          list(customer: string): Admin_directory_v1.Schema.Features;
+          // Retrieves a list of features for an account.
+          list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.Features;
+          // Updates a feature. This method supports patch semantics.
+          patch(resource: Schema.Feature, customer: string, featureKey: string): Admin_directory_v1.Schema.Feature;
+          // Deletes a feature.
+          remove(customer: string, featureKey: string): void;
+          // Renames a feature.
+          rename(resource: Schema.FeatureRename, customer: string, oldName: string): void;
+          // Updates a feature.
+          update(resource: Schema.Feature, customer: string, featureKey: string): Admin_directory_v1.Schema.Feature;
+        }
+      }
+      namespace Users {
+        export interface AliasesCollection {
+          // Add a alias for the user
+          insert(resource: Schema.Alias, userKey: string): Admin_directory_v1.Schema.Alias;
+          // List all aliases for a user
+          list(userKey: string): Admin_directory_v1.Schema.Aliases;
+          // List all aliases for a user
+          list(userKey: string, optionalArgs: object): Admin_directory_v1.Schema.Aliases;
+          // Remove a alias for the user
+          remove(userKey: string, alias: string): void;
+          // Watch for changes in user aliases list
+          watch(resource: Schema.Channel, userKey: string): Admin_directory_v1.Schema.Channel;
+          // Watch for changes in user aliases list
+          watch(resource: Schema.Channel, userKey: string, optionalArgs: object): Admin_directory_v1.Schema.Channel;
+        }
+        export interface PhotosCollection {
+          // Retrieve photo of a user
+          get(userKey: string): Admin_directory_v1.Schema.UserPhoto;
+          // Add a photo for the user. This method supports patch semantics.
+          patch(resource: Schema.UserPhoto, userKey: string): Admin_directory_v1.Schema.UserPhoto;
+          // Remove photos for the user
+          remove(userKey: string): void;
+          // Add a photo for the user
+          update(resource: Schema.UserPhoto, userKey: string): Admin_directory_v1.Schema.UserPhoto;
+        }
+      }
+      export interface AspsCollection {
+        // Get information about an ASP issued by a user.
+        get(userKey: string, codeId: number): Admin_directory_v1.Schema.Asp;
+        // List the ASPs issued by a user.
+        list(userKey: string): Admin_directory_v1.Schema.Asps;
+        // Delete an ASP issued by a user.
+        remove(userKey: string, codeId: number): void;
+      }
+      export interface ChannelsCollection {
+        // Stop watching resources through this channel
+        stop(resource: Schema.Channel): void;
+      }
+      export interface ChromeosdevicesCollection {
+        // Take action on Chrome OS Device
+        action(resource: Schema.ChromeOsDeviceAction, customerId: string, resourceId: string): void;
+        // Retrieve Chrome OS Device
+        get(customerId: string, deviceId: string): Admin_directory_v1.Schema.ChromeOsDevice;
+        // Retrieve Chrome OS Device
+        get(customerId: string, deviceId: string, optionalArgs: object): Admin_directory_v1.Schema.ChromeOsDevice;
+        // Retrieve all Chrome OS Devices of a customer (paginated)
+        list(customerId: string): Admin_directory_v1.Schema.ChromeOsDevices;
+        // Retrieve all Chrome OS Devices of a customer (paginated)
+        list(customerId: string, optionalArgs: object): Admin_directory_v1.Schema.ChromeOsDevices;
+        // Move or insert multiple Chrome OS Devices to organizational unit
+        moveDevicesToOu(resource: Schema.ChromeOsMoveDevicesToOu, customerId: string, orgUnitPath: string): void;
+        // Update Chrome OS Device. This method supports patch semantics.
+        patch(resource: Schema.ChromeOsDevice, customerId: string, deviceId: string): Admin_directory_v1.Schema.ChromeOsDevice;
+        // Update Chrome OS Device. This method supports patch semantics.
+        patch(resource: Schema.ChromeOsDevice, customerId: string, deviceId: string, optionalArgs: object): Admin_directory_v1.Schema.ChromeOsDevice;
+        // Update Chrome OS Device
+        update(resource: Schema.ChromeOsDevice, customerId: string, deviceId: string): Admin_directory_v1.Schema.ChromeOsDevice;
+        // Update Chrome OS Device
+        update(resource: Schema.ChromeOsDevice, customerId: string, deviceId: string, optionalArgs: object): Admin_directory_v1.Schema.ChromeOsDevice;
+      }
+      export interface CustomersCollection {
+        // Retrieves a customer.
+        get(customerKey: string): Admin_directory_v1.Schema.Customer;
+        // Updates a customer. This method supports patch semantics.
+        patch(resource: Schema.Customer, customerKey: string): Admin_directory_v1.Schema.Customer;
+        // Updates a customer.
+        update(resource: Schema.Customer, customerKey: string): Admin_directory_v1.Schema.Customer;
+      }
+      export interface DomainAliasesCollection {
+        // Retrieves a domain alias of the customer.
+        get(customer: string, domainAliasName: string): Admin_directory_v1.Schema.DomainAlias;
+        // Inserts a Domain alias of the customer.
+        insert(resource: Schema.DomainAlias, customer: string): Admin_directory_v1.Schema.DomainAlias;
+        // Lists the domain aliases of the customer.
+        list(customer: string): Admin_directory_v1.Schema.DomainAliases;
+        // Lists the domain aliases of the customer.
+        list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.DomainAliases;
+        // Deletes a Domain Alias of the customer.
+        remove(customer: string, domainAliasName: string): void;
+      }
+      export interface DomainsCollection {
+        // Retrieves a domain of the customer.
+        get(customer: string, domainName: string): Admin_directory_v1.Schema.Domains;
+        // Inserts a domain of the customer.
+        insert(resource: Schema.Domains, customer: string): Admin_directory_v1.Schema.Domains;
+        // Lists the domains of the customer.
+        list(customer: string): Admin_directory_v1.Schema.Domains2;
+        // Deletes a domain of the customer.
+        remove(customer: string, domainName: string): void;
+      }
+      export interface GroupsCollection {
+        Aliases?: Admin_directory_v1.Collection.Groups.AliasesCollection;
+        // Retrieve Group
+        get(groupKey: string): Admin_directory_v1.Schema.Group;
+        // Create Group
+        insert(resource: Schema.Group): Admin_directory_v1.Schema.Group;
+        // Retrieve all groups of a domain or of a user given a userKey (paginated)
+        list(): Admin_directory_v1.Schema.Groups;
+        // Retrieve all groups of a domain or of a user given a userKey (paginated)
+        list(optionalArgs: object): Admin_directory_v1.Schema.Groups;
+        // Update Group. This method supports patch semantics.
+        patch(resource: Schema.Group, groupKey: string): Admin_directory_v1.Schema.Group;
+        // Delete Group
+        remove(groupKey: string): void;
+        // Update Group
+        update(resource: Schema.Group, groupKey: string): Admin_directory_v1.Schema.Group;
+      }
+      export interface MembersCollection {
+        // Retrieve Group Member
+        get(groupKey: string, memberKey: string): Admin_directory_v1.Schema.Member;
+        // Checks whether the given user is a member of the group. Membership can be direct or nested.
+        hasMember(groupKey: string, memberKey: string): Admin_directory_v1.Schema.MembersHasMember;
+        // Add user to the specified group.
+        insert(resource: Schema.Member, groupKey: string): Admin_directory_v1.Schema.Member;
+        // Retrieve all members in a group (paginated)
+        list(groupKey: string): Admin_directory_v1.Schema.Members;
+        // Retrieve all members in a group (paginated)
+        list(groupKey: string, optionalArgs: object): Admin_directory_v1.Schema.Members;
+        // Update membership of a user in the specified group. This method supports patch semantics.
+        patch(resource: Schema.Member, groupKey: string, memberKey: string): Admin_directory_v1.Schema.Member;
+        // Remove membership.
+        remove(groupKey: string, memberKey: string): void;
+        // Update membership of a user in the specified group.
+        update(resource: Schema.Member, groupKey: string, memberKey: string): Admin_directory_v1.Schema.Member;
+      }
+      export interface MobiledevicesCollection {
+        // Take action on Mobile Device
+        action(resource: Schema.MobileDeviceAction, customerId: string, resourceId: string): void;
+        // Retrieve Mobile Device
+        get(customerId: string, resourceId: string): Admin_directory_v1.Schema.MobileDevice;
+        // Retrieve Mobile Device
+        get(customerId: string, resourceId: string, optionalArgs: object): Admin_directory_v1.Schema.MobileDevice;
+        // Retrieve all Mobile Devices of a customer (paginated)
+        list(customerId: string): Admin_directory_v1.Schema.MobileDevices;
+        // Retrieve all Mobile Devices of a customer (paginated)
+        list(customerId: string, optionalArgs: object): Admin_directory_v1.Schema.MobileDevices;
+        // Delete Mobile Device
+        remove(customerId: string, resourceId: string): void;
+      }
+      export interface NotificationsCollection {
+        // Retrieves a notification.
+        get(customer: string, notificationId: string): Admin_directory_v1.Schema.Notification;
+        // Retrieves a list of notifications.
+        list(customer: string): Admin_directory_v1.Schema.Notifications;
+        // Retrieves a list of notifications.
+        list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.Notifications;
+        // Updates a notification. This method supports patch semantics.
+        patch(resource: Schema.Notification, customer: string, notificationId: string): Admin_directory_v1.Schema.Notification;
+        // Deletes a notification
+        remove(customer: string, notificationId: string): void;
+        // Updates a notification.
+        update(resource: Schema.Notification, customer: string, notificationId: string): Admin_directory_v1.Schema.Notification;
+      }
+      export interface OrgunitsCollection {
+        // Retrieve organizational unit
+        get(customerId: string, orgUnitPath: string[]): Admin_directory_v1.Schema.OrgUnit;
+        // Add organizational unit
+        insert(resource: Schema.OrgUnit, customerId: string): Admin_directory_v1.Schema.OrgUnit;
+        // Retrieve all organizational units
+        list(customerId: string): Admin_directory_v1.Schema.OrgUnits;
+        // Retrieve all organizational units
+        list(customerId: string, optionalArgs: object): Admin_directory_v1.Schema.OrgUnits;
+        // Update organizational unit. This method supports patch semantics.
+        patch(resource: Schema.OrgUnit, customerId: string, orgUnitPath: string[]): Admin_directory_v1.Schema.OrgUnit;
+        // Remove organizational unit
+        remove(customerId: string, orgUnitPath: string[]): void;
+        // Update organizational unit
+        update(resource: Schema.OrgUnit, customerId: string, orgUnitPath: string[]): Admin_directory_v1.Schema.OrgUnit;
+      }
+      export interface PrivilegesCollection {
+        // Retrieves a paginated list of all privileges for a customer.
+        list(customer: string): Admin_directory_v1.Schema.Privileges;
+      }
+      export interface ResolvedAppAccessSettingsCollection {
+        // Retrieves resolved app access settings of the logged in user.
+        GetSettings(): Admin_directory_v1.Schema.AppAccessCollections;
+        // Retrieves the list of apps trusted by the admin of the logged in user.
+        ListTrustedApps(): Admin_directory_v1.Schema.TrustedApps;
+      }
+      export interface ResourcesCollection {
+        Buildings?: Admin_directory_v1.Collection.Resources.BuildingsCollection;
+        Calendars?: Admin_directory_v1.Collection.Resources.CalendarsCollection;
+        Features?: Admin_directory_v1.Collection.Resources.FeaturesCollection;
+      }
+      export interface RoleAssignmentsCollection {
+        // Retrieve a role assignment.
+        get(customer: string, roleAssignmentId: string): Admin_directory_v1.Schema.RoleAssignment;
+        // Creates a role assignment.
+        insert(resource: Schema.RoleAssignment, customer: string): Admin_directory_v1.Schema.RoleAssignment;
+        // Retrieves a paginated list of all roleAssignments.
+        list(customer: string): Admin_directory_v1.Schema.RoleAssignments;
+        // Retrieves a paginated list of all roleAssignments.
+        list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.RoleAssignments;
+        // Deletes a role assignment.
+        remove(customer: string, roleAssignmentId: string): void;
+      }
+      export interface RolesCollection {
+        // Retrieves a role.
+        get(customer: string, roleId: string): Admin_directory_v1.Schema.Role;
+        // Creates a role.
+        insert(resource: Schema.Role, customer: string): Admin_directory_v1.Schema.Role;
+        // Retrieves a paginated list of all the roles in a domain.
+        list(customer: string): Admin_directory_v1.Schema.Roles;
+        // Retrieves a paginated list of all the roles in a domain.
+        list(customer: string, optionalArgs: object): Admin_directory_v1.Schema.Roles;
+        // Updates a role. This method supports patch semantics.
+        patch(resource: Schema.Role, customer: string, roleId: string): Admin_directory_v1.Schema.Role;
+        // Deletes a role.
+        remove(customer: string, roleId: string): void;
+        // Updates a role.
+        update(resource: Schema.Role, customer: string, roleId: string): Admin_directory_v1.Schema.Role;
+      }
+      export interface SchemasCollection {
+        // Retrieve schema
+        get(customerId: string, schemaKey: string): Admin_directory_v1.Schema.Schema;
+        // Create schema.
+        insert(resource: Schema.Schema, customerId: string): Admin_directory_v1.Schema.Schema;
+        // Retrieve all schemas for a customer
+        list(customerId: string): Admin_directory_v1.Schema.Schemas;
+        // Update schema. This method supports patch semantics.
+        patch(resource: Schema.Schema, customerId: string, schemaKey: string): Admin_directory_v1.Schema.Schema;
+        // Delete schema
+        remove(customerId: string, schemaKey: string): void;
+        // Update schema
+        update(resource: Schema.Schema, customerId: string, schemaKey: string): Admin_directory_v1.Schema.Schema;
+      }
+      export interface TokensCollection {
+        // Get information about an access token issued by a user.
+        get(userKey: string, clientId: string): Admin_directory_v1.Schema.Token;
+        // Returns the set of tokens specified user has issued to 3rd party applications.
+        list(userKey: string): Admin_directory_v1.Schema.Tokens;
+        // Delete all access tokens issued by a user for an application.
+        remove(userKey: string, clientId: string): void;
+      }
+      export interface UsersCollection {
+        Aliases?: Admin_directory_v1.Collection.Users.AliasesCollection;
+        Photos?: Admin_directory_v1.Collection.Users.PhotosCollection;
+        // retrieve user
+        get(userKey: string): Admin_directory_v1.Schema.User;
+        // retrieve user
+        get(userKey: string, optionalArgs: object): Admin_directory_v1.Schema.User;
+        // create user.
+        insert(resource: Schema.User): Admin_directory_v1.Schema.User;
+        // Retrieve either deleted users or all users in a domain (paginated)
+        list(): Admin_directory_v1.Schema.Users;
+        // Retrieve either deleted users or all users in a domain (paginated)
+        list(optionalArgs: object): Admin_directory_v1.Schema.Users;
+        // change admin status of a user
+        makeAdmin(resource: Schema.UserMakeAdmin, userKey: string): void;
+        // update user. This method supports patch semantics.
+        patch(resource: Schema.User, userKey: string): Admin_directory_v1.Schema.User;
+        // Delete user
+        remove(userKey: string): void;
+        // Undelete a deleted user
+        undelete(resource: Schema.UserUndelete, userKey: string): void;
+        // update user
+        update(resource: Schema.User, userKey: string): Admin_directory_v1.Schema.User;
+        // Watch for changes in users list
+        watch(resource: Schema.Channel): Admin_directory_v1.Schema.Channel;
+        // Watch for changes in users list
+        watch(resource: Schema.Channel, optionalArgs: object): Admin_directory_v1.Schema.Channel;
+      }
+      export interface VerificationCodesCollection {
+        // Generate new backup verification codes for the user.
+        generate(userKey: string): void;
+        // Invalidate the current backup verification codes for the user.
+        invalidate(userKey: string): void;
+        // Returns the current set of valid backup verification codes for the specified user.
+        list(userKey: string): Admin_directory_v1.Schema.VerificationCodes;
+      }
+    }
+    namespace Schema {
+      export interface Alias {
+        alias?: string;
+        etag?: string;
+        id?: string;
+        kind?: string;
+        primaryEmail?: string;
+      }
+      export interface Aliases {
+        aliases?: Object[];
+        etag?: string;
+        kind?: string;
+      }
+      export interface AppAccessCollections {
+        blockedApiAccessBuckets?: string[];
+        enforceSettingsForAndroidDrive?: boolean;
+        errorMessage?: string;
+        etag?: string;
+        kind?: string;
+        resourceId?: string;
+        resourceName?: string;
+        trustDomainOwnedApps?: boolean;
+      }
+      export interface Asp {
+        codeId?: number;
+        creationTime?: string;
+        etag?: string;
+        kind?: string;
+        lastTimeUsed?: string;
+        name?: string;
+        userKey?: string;
+      }
+      export interface Asps {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.Asp[];
+        kind?: string;
+      }
+      export interface Building {
+        address?: Admin_directory_v1.Schema.BuildingAddress;
+        buildingId?: string;
+        buildingName?: string;
+        coordinates?: Admin_directory_v1.Schema.BuildingCoordinates;
+        description?: string;
+        etags?: string;
+        floorNames?: string[];
+        kind?: string;
+      }
+      export interface BuildingAddress {
+        addressLines?: string[];
+        administrativeArea?: string;
+        languageCode?: string;
+        locality?: string;
+        postalCode?: string;
+        regionCode?: string;
+        sublocality?: string;
+      }
+      export interface BuildingCoordinates {
+        latitude?: Number;
+        longitude?: Number;
+      }
+      export interface Buildings {
+        buildings?: Admin_directory_v1.Schema.Building[];
+        etag?: string;
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface CalendarResource {
+        buildingId?: string;
+        capacity?: number;
+        etags?: string;
+        featureInstances?: object;
+        floorName?: string;
+        floorSection?: string;
+        generatedResourceName?: string;
+        kind?: string;
+        resourceCategory?: string;
+        resourceDescription?: string;
+        resourceEmail?: string;
+        resourceId?: string;
+        resourceName?: string;
+        resourceType?: string;
+        userVisibleDescription?: string;
+      }
+      export interface CalendarResources {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.CalendarResource[];
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface Channel {
+        address?: string;
+        expiration?: string;
+        id?: string;
+        kind?: string;
+        params?: object;
+        payload?: boolean;
+        resourceId?: string;
+        resourceUri?: string;
+        token?: string;
+        type?: string;
+      }
+      export interface ChromeOsDevice {
+        activeTimeRanges?: Admin_directory_v1.Schema.ChromeOsDeviceActiveTimeRanges[];
+        annotatedAssetId?: string;
+        annotatedLocation?: string;
+        annotatedUser?: string;
+        bootMode?: string;
+        cpuStatusReports?: Admin_directory_v1.Schema.ChromeOsDeviceCpuStatusReports[];
+        deviceFiles?: Admin_directory_v1.Schema.ChromeOsDeviceDeviceFiles[];
+        deviceId?: string;
+        diskVolumeReports?: Admin_directory_v1.Schema.ChromeOsDeviceDiskVolumeReports[];
+        etag?: string;
+        ethernetMacAddress?: string;
+        firmwareVersion?: string;
+        kind?: string;
+        lastEnrollmentTime?: string;
+        lastSync?: string;
+        macAddress?: string;
+        meid?: string;
+        model?: string;
+        notes?: string;
+        orderNumber?: string;
+        orgUnitPath?: string;
+        osVersion?: string;
+        platformVersion?: string;
+        recentUsers?: Admin_directory_v1.Schema.ChromeOsDeviceRecentUsers[];
+        serialNumber?: string;
+        status?: string;
+        supportEndDate?: string;
+        systemRamFreeReports?: Admin_directory_v1.Schema.ChromeOsDeviceSystemRamFreeReports[];
+        systemRamTotal?: string;
+        tpmVersionInfo?: Admin_directory_v1.Schema.ChromeOsDeviceTpmVersionInfo;
+        willAutoRenew?: boolean;
+      }
+      export interface ChromeOsDeviceAction {
+        action?: string;
+        deprovisionReason?: string;
+      }
+      export interface ChromeOsDeviceActiveTimeRanges {
+        activeTime?: number;
+        date?: string;
+      }
+      export interface ChromeOsDeviceCpuStatusReports {
+        cpuTemperatureInfo?: Admin_directory_v1.Schema.ChromeOsDeviceCpuStatusReportsCpuTemperatureInfo[];
+        cpuUtilizationPercentageInfo?: number[];
+        reportTime?: string;
+      }
+      export interface ChromeOsDeviceCpuStatusReportsCpuTemperatureInfo {
+        label?: string;
+        temperature?: number;
+      }
+      export interface ChromeOsDeviceDeviceFiles {
+        createTime?: string;
+        downloadUrl?: string;
+        name?: string;
+        type?: string;
+      }
+      export interface ChromeOsDeviceDiskVolumeReports {
+        volumeInfo?: Admin_directory_v1.Schema.ChromeOsDeviceDiskVolumeReportsVolumeInfo[];
+      }
+      export interface ChromeOsDeviceDiskVolumeReportsVolumeInfo {
+        storageFree?: string;
+        storageTotal?: string;
+        volumeId?: string;
+      }
+      export interface ChromeOsDeviceRecentUsers {
+        email?: string;
+        type?: string;
+      }
+      export interface ChromeOsDeviceSystemRamFreeReports {
+        reportTime?: string;
+        systemRamFreeInfo?: string[];
+      }
+      export interface ChromeOsDeviceTpmVersionInfo {
+        family?: string;
+        firmwareVersion?: string;
+        manufacturer?: string;
+        specLevel?: string;
+        tpmModel?: string;
+        vendorSpecific?: string;
+      }
+      export interface ChromeOsDevices {
+        chromeosdevices?: Admin_directory_v1.Schema.ChromeOsDevice[];
+        etag?: string;
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface ChromeOsMoveDevicesToOu {
+        deviceIds?: string[];
+      }
+      export interface Customer {
+        alternateEmail?: string;
+        customerCreationTime?: string;
+        customerDomain?: string;
+        etag?: string;
+        id?: string;
+        kind?: string;
+        language?: string;
+        phoneNumber?: string;
+        postalAddress?: Admin_directory_v1.Schema.CustomerPostalAddress;
+      }
+      export interface CustomerPostalAddress {
+        addressLine1?: string;
+        addressLine2?: string;
+        addressLine3?: string;
+        contactName?: string;
+        countryCode?: string;
+        locality?: string;
+        organizationName?: string;
+        postalCode?: string;
+        region?: string;
+      }
+      export interface DomainAlias {
+        creationTime?: string;
+        domainAliasName?: string;
+        etag?: string;
+        kind?: string;
+        parentDomainName?: string;
+        verified?: boolean;
+      }
+      export interface DomainAliases {
+        domainAliases?: Admin_directory_v1.Schema.DomainAlias[];
+        etag?: string;
+        kind?: string;
+      }
+      export interface Domains {
+        creationTime?: string;
+        domainAliases?: Admin_directory_v1.Schema.DomainAlias[];
+        domainName?: string;
+        etag?: string;
+        isPrimary?: boolean;
+        kind?: string;
+        verified?: boolean;
+      }
+      export interface Domains2 {
+        domains?: Admin_directory_v1.Schema.Domains[];
+        etag?: string;
+        kind?: string;
+      }
+      export interface Feature {
+        etags?: string;
+        kind?: string;
+        name?: string;
+      }
+      export interface FeatureInstance {
+        feature?: Admin_directory_v1.Schema.Feature;
+      }
+      export interface FeatureRename {
+        newName?: string;
+      }
+      export interface Features {
+        etag?: string;
+        features?: Admin_directory_v1.Schema.Feature[];
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface Group {
+        adminCreated?: boolean;
+        aliases?: string[];
+        description?: string;
+        directMembersCount?: string;
+        email?: string;
+        etag?: string;
+        id?: string;
+        kind?: string;
+        name?: string;
+        nonEditableAliases?: string[];
+      }
+      export interface Groups {
+        etag?: string;
+        groups?: Admin_directory_v1.Schema.Group[];
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface Member {
+        delivery_settings?: string;
+        email?: string;
+        etag?: string;
+        id?: string;
+        kind?: string;
+        role?: string;
+        status?: string;
+        type?: string;
+      }
+      export interface Members {
+        etag?: string;
+        kind?: string;
+        members?: Admin_directory_v1.Schema.Member[];
+        nextPageToken?: string;
+      }
+      export interface MembersHasMember {
+        isMember?: boolean;
+      }
+      export interface MobileDevice {
+        adbStatus?: boolean;
+        applications?: Admin_directory_v1.Schema.MobileDeviceApplications[];
+        basebandVersion?: string;
+        bootloaderVersion?: string;
+        brand?: string;
+        buildNumber?: string;
+        defaultLanguage?: string;
+        developerOptionsStatus?: boolean;
+        deviceCompromisedStatus?: string;
+        deviceId?: string;
+        devicePasswordStatus?: string;
+        email?: string[];
+        encryptionStatus?: string;
+        etag?: string;
+        firstSync?: string;
+        hardware?: string;
+        hardwareId?: string;
+        imei?: string;
+        kernelVersion?: string;
+        kind?: string;
+        lastSync?: string;
+        managedAccountIsOnOwnerProfile?: boolean;
+        manufacturer?: string;
+        meid?: string;
+        model?: string;
+        name?: string[];
+        networkOperator?: string;
+        os?: string;
+        otherAccountsInfo?: string[];
+        privilege?: string;
+        releaseVersion?: string;
+        resourceId?: string;
+        securityPatchLevel?: string;
+        serialNumber?: string;
+        status?: string;
+        supportsWorkProfile?: boolean;
+        type?: string;
+        unknownSourcesStatus?: boolean;
+        userAgent?: string;
+        wifiMacAddress?: string;
+      }
+      export interface MobileDeviceAction {
+        action?: string;
+      }
+      export interface MobileDeviceApplications {
+        displayName?: string;
+        packageName?: string;
+        permission?: string[];
+        versionCode?: number;
+        versionName?: string;
+      }
+      export interface MobileDevices {
+        etag?: string;
+        kind?: string;
+        mobiledevices?: Admin_directory_v1.Schema.MobileDevice[];
+        nextPageToken?: string;
+      }
+      export interface Notification {
+        body?: string;
+        etag?: string;
+        fromAddress?: string;
+        isUnread?: boolean;
+        kind?: string;
+        notificationId?: string;
+        sendTime?: string;
+        subject?: string;
+      }
+      export interface Notifications {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.Notification[];
+        kind?: string;
+        nextPageToken?: string;
+        unreadNotificationsCount?: number;
+      }
+      export interface OrgUnit {
+        blockInheritance?: boolean;
+        description?: string;
+        etag?: string;
+        kind?: string;
+        name?: string;
+        orgUnitId?: string;
+        orgUnitPath?: string;
+        parentOrgUnitId?: string;
+        parentOrgUnitPath?: string;
+      }
+      export interface OrgUnits {
+        etag?: string;
+        kind?: string;
+        organizationUnits?: Admin_directory_v1.Schema.OrgUnit[];
+      }
+      export interface Privilege {
+        childPrivileges?: Admin_directory_v1.Schema.Privilege[];
+        etag?: string;
+        isOuScopable?: boolean;
+        kind?: string;
+        privilegeName?: string;
+        serviceId?: string;
+        serviceName?: string;
+      }
+      export interface Privileges {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.Privilege[];
+        kind?: string;
+      }
+      export interface Role {
+        etag?: string;
+        isSuperAdminRole?: boolean;
+        isSystemRole?: boolean;
+        kind?: string;
+        roleDescription?: string;
+        roleId?: string;
+        roleName?: string;
+        rolePrivileges?: Admin_directory_v1.Schema.RoleRolePrivileges[];
+      }
+      export interface RoleAssignment {
+        assignedTo?: string;
+        etag?: string;
+        kind?: string;
+        orgUnitId?: string;
+        roleAssignmentId?: string;
+        roleId?: string;
+        scopeType?: string;
+      }
+      export interface RoleAssignments {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.RoleAssignment[];
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface RoleRolePrivileges {
+        privilegeName?: string;
+        serviceId?: string;
+      }
+      export interface Roles {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.Role[];
+        kind?: string;
+        nextPageToken?: string;
+      }
+      export interface Schema {
+        displayName?: string;
+        etag?: string;
+        fields?: Admin_directory_v1.Schema.SchemaFieldSpec[];
+        kind?: string;
+        schemaId?: string;
+        schemaName?: string;
+      }
+      export interface SchemaFieldSpec {
+        displayName?: string;
+        etag?: string;
+        fieldId?: string;
+        fieldName?: string;
+        fieldType?: string;
+        indexed?: boolean;
+        kind?: string;
+        multiValued?: boolean;
+        numericIndexingSpec?: Admin_directory_v1.Schema.SchemaFieldSpecNumericIndexingSpec;
+        readAccessType?: string;
+      }
+      export interface SchemaFieldSpecNumericIndexingSpec {
+        maxValue?: Number;
+        minValue?: Number;
+      }
+      export interface Schemas {
+        etag?: string;
+        kind?: string;
+        schemas?: Admin_directory_v1.Schema.Schema[];
+      }
+      export interface Token {
+        anonymous?: boolean;
+        clientId?: string;
+        displayText?: string;
+        etag?: string;
+        kind?: string;
+        nativeApp?: boolean;
+        scopes?: string[];
+        userKey?: string;
+      }
+      export interface Tokens {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.Token[];
+        kind?: string;
+      }
+      export interface TrustedAppId {
+        androidPackageName?: string;
+        certificateHashSHA1?: string;
+        certificateHashSHA256?: string;
+        etag?: string;
+        kind?: string;
+      }
+      export interface TrustedApps {
+        etag?: string;
+        kind?: string;
+        nextPageToken?: string;
+        trustedApps?: Admin_directory_v1.Schema.TrustedAppId[];
+      }
+      export interface User {
+        addresses?: object;
+        agreedToTerms?: boolean;
+        aliases?: string[];
+        archived?: boolean;
+        changePasswordAtNextLogin?: boolean;
+        creationTime?: string;
+        customSchemas?: object;
+        customerId?: string;
+        deletionTime?: string;
+        emails?: object;
+        etag?: string;
+        externalIds?: object;
+        gender?: object;
+        hashFunction?: string;
+        id?: string;
+        ims?: object;
+        includeInGlobalAddressList?: boolean;
+        ipWhitelisted?: boolean;
+        isAdmin?: boolean;
+        isDelegatedAdmin?: boolean;
+        isEnforcedIn2Sv?: boolean;
+        isEnrolledIn2Sv?: boolean;
+        isMailboxSetup?: boolean;
+        keywords?: object;
+        kind?: string;
+        languages?: object;
+        lastLoginTime?: string;
+        locations?: object;
+        name?: Admin_directory_v1.Schema.UserName;
+        nonEditableAliases?: string[];
+        notes?: object;
+        orgUnitPath?: string;
+        organizations?: object;
+        password?: string;
+        phones?: object;
+        posixAccounts?: object;
+        primaryEmail?: string;
+        relations?: object;
+        sshPublicKeys?: object;
+        suspended?: boolean;
+        suspensionReason?: string;
+        thumbnailPhotoEtag?: string;
+        thumbnailPhotoUrl?: string;
+        websites?: object;
+      }
+      export interface UserAbout {
+        contentType?: string;
+        value?: string;
+      }
+      export interface UserAddress {
+        country?: string;
+        countryCode?: string;
+        customType?: string;
+        extendedAddress?: string;
+        formatted?: string;
+        locality?: string;
+        poBox?: string;
+        postalCode?: string;
+        primary?: boolean;
+        region?: string;
+        sourceIsStructured?: boolean;
+        streetAddress?: string;
+        type?: string;
+      }
+      export interface UserEmail {
+        address?: string;
+        customType?: string;
+        primary?: boolean;
+        type?: string;
+      }
+      export interface UserExternalId {
+        customType?: string;
+        type?: string;
+        value?: string;
+      }
+      export interface UserGender {
+        addressMeAs?: string;
+        customGender?: string;
+        type?: string;
+      }
+      export interface UserIm {
+        customProtocol?: string;
+        customType?: string;
+        im?: string;
+        primary?: boolean;
+        protocol?: string;
+        type?: string;
+      }
+      export interface UserKeyword {
+        customType?: string;
+        type?: string;
+        value?: string;
+      }
+      export interface UserLanguage {
+        customLanguage?: string;
+        languageCode?: string;
+      }
+      export interface UserLocation {
+        area?: string;
+        buildingId?: string;
+        customType?: string;
+        deskCode?: string;
+        floorName?: string;
+        floorSection?: string;
+        type?: string;
+      }
+      export interface UserMakeAdmin {
+        status?: boolean;
+      }
+      export interface UserName {
+        familyName?: string;
+        fullName?: string;
+        givenName?: string;
+      }
+      export interface UserOrganization {
+        costCenter?: string;
+        customType?: string;
+        department?: string;
+        description?: string;
+        domain?: string;
+        fullTimeEquivalent?: number;
+        location?: string;
+        name?: string;
+        primary?: boolean;
+        symbol?: string;
+        title?: string;
+        type?: string;
+      }
+      export interface UserPhone {
+        customType?: string;
+        primary?: boolean;
+        type?: string;
+        value?: string;
+      }
+      export interface UserPhoto {
+        etag?: string;
+        height?: number;
+        id?: string;
+        kind?: string;
+        mimeType?: string;
+        photoData?: string;
+        primaryEmail?: string;
+        width?: number;
+      }
+      export interface UserPosixAccount {
+        accountId?: string;
+        gecos?: string;
+        gid?: string;
+        homeDirectory?: string;
+        operatingSystemType?: string;
+        primary?: boolean;
+        shell?: string;
+        systemId?: string;
+        uid?: string;
+        username?: string;
+      }
+      export interface UserRelation {
+        customType?: string;
+        type?: string;
+        value?: string;
+      }
+      export interface UserSshPublicKey {
+        expirationTimeUsec?: string;
+        fingerprint?: string;
+        key?: string;
+      }
+      export interface UserUndelete {
+        orgUnitPath?: string;
+      }
+      export interface UserWebsite {
+        customType?: string;
+        primary?: boolean;
+        type?: string;
+        value?: string;
+      }
+      export interface Users {
+        etag?: string;
+        kind?: string;
+        nextPageToken?: string;
+        trigger_event?: string;
+        users?: Admin_directory_v1.Schema.User[];
+      }
+      export interface VerificationCode {
+        etag?: string;
+        kind?: string;
+        userId?: string;
+        verificationCode?: string;
+      }
+      export interface VerificationCodes {
+        etag?: string;
+        items?: Admin_directory_v1.Schema.VerificationCode[];
+        kind?: string;
+      }
+    }
+  }
+  export interface Admin_directory_v1 {
+    Asps?: Admin_directory_v1.Collection.AspsCollection;
+    Channels?: Admin_directory_v1.Collection.ChannelsCollection;
+    Chromeosdevices?: Admin_directory_v1.Collection.ChromeosdevicesCollection;
+    Customers?: Admin_directory_v1.Collection.CustomersCollection;
+    DomainAliases?: Admin_directory_v1.Collection.DomainAliasesCollection;
+    Domains?: Admin_directory_v1.Collection.DomainsCollection;
+    Groups?: Admin_directory_v1.Collection.GroupsCollection;
+    Members?: Admin_directory_v1.Collection.MembersCollection;
+    Mobiledevices?: Admin_directory_v1.Collection.MobiledevicesCollection;
+    Notifications?: Admin_directory_v1.Collection.NotificationsCollection;
+    Orgunits?: Admin_directory_v1.Collection.OrgunitsCollection;
+    Privileges?: Admin_directory_v1.Collection.PrivilegesCollection;
+    ResolvedAppAccessSettings?: Admin_directory_v1.Collection.ResolvedAppAccessSettingsCollection;
+    Resources?: Admin_directory_v1.Collection.ResourcesCollection;
+    RoleAssignments?: Admin_directory_v1.Collection.RoleAssignmentsCollection;
+    Roles?: Admin_directory_v1.Collection.RolesCollection;
+    Schemas?: Admin_directory_v1.Collection.SchemasCollection;
+    Tokens?: Admin_directory_v1.Collection.TokensCollection;
+    Users?: Admin_directory_v1.Collection.UsersCollection;
+    VerificationCodes?: Admin_directory_v1.Collection.VerificationCodesCollection;
+    // Create a new instance of Alias
+    newAlias(): Admin_directory_v1.Schema.Alias;
+    // Create a new instance of Building
+    newBuilding(): Admin_directory_v1.Schema.Building;
+    // Create a new instance of BuildingAddress
+    newBuildingAddress(): Admin_directory_v1.Schema.BuildingAddress;
+    // Create a new instance of BuildingCoordinates
+    newBuildingCoordinates(): Admin_directory_v1.Schema.BuildingCoordinates;
+    // Create a new instance of CalendarResource
+    newCalendarResource(): Admin_directory_v1.Schema.CalendarResource;
+    // Create a new instance of Channel
+    newChannel(): Admin_directory_v1.Schema.Channel;
+    // Create a new instance of ChromeOsDevice
+    newChromeOsDevice(): Admin_directory_v1.Schema.ChromeOsDevice;
+    // Create a new instance of ChromeOsDeviceAction
+    newChromeOsDeviceAction(): Admin_directory_v1.Schema.ChromeOsDeviceAction;
+    // Create a new instance of ChromeOsDeviceActiveTimeRanges
+    newChromeOsDeviceActiveTimeRanges(): Admin_directory_v1.Schema.ChromeOsDeviceActiveTimeRanges;
+    // Create a new instance of ChromeOsDeviceCpuStatusReports
+    newChromeOsDeviceCpuStatusReports(): Admin_directory_v1.Schema.ChromeOsDeviceCpuStatusReports;
+    // Create a new instance of ChromeOsDeviceCpuStatusReportsCpuTemperatureInfo
+    newChromeOsDeviceCpuStatusReportsCpuTemperatureInfo(): Admin_directory_v1.Schema.ChromeOsDeviceCpuStatusReportsCpuTemperatureInfo;
+    // Create a new instance of ChromeOsDeviceDeviceFiles
+    newChromeOsDeviceDeviceFiles(): Admin_directory_v1.Schema.ChromeOsDeviceDeviceFiles;
+    // Create a new instance of ChromeOsDeviceDiskVolumeReports
+    newChromeOsDeviceDiskVolumeReports(): Admin_directory_v1.Schema.ChromeOsDeviceDiskVolumeReports;
+    // Create a new instance of ChromeOsDeviceDiskVolumeReportsVolumeInfo
+    newChromeOsDeviceDiskVolumeReportsVolumeInfo(): Admin_directory_v1.Schema.ChromeOsDeviceDiskVolumeReportsVolumeInfo;
+    // Create a new instance of ChromeOsDeviceRecentUsers
+    newChromeOsDeviceRecentUsers(): Admin_directory_v1.Schema.ChromeOsDeviceRecentUsers;
+    // Create a new instance of ChromeOsDeviceSystemRamFreeReports
+    newChromeOsDeviceSystemRamFreeReports(): Admin_directory_v1.Schema.ChromeOsDeviceSystemRamFreeReports;
+    // Create a new instance of ChromeOsDeviceTpmVersionInfo
+    newChromeOsDeviceTpmVersionInfo(): Admin_directory_v1.Schema.ChromeOsDeviceTpmVersionInfo;
+    // Create a new instance of ChromeOsMoveDevicesToOu
+    newChromeOsMoveDevicesToOu(): Admin_directory_v1.Schema.ChromeOsMoveDevicesToOu;
+    // Create a new instance of Customer
+    newCustomer(): Admin_directory_v1.Schema.Customer;
+    // Create a new instance of CustomerPostalAddress
+    newCustomerPostalAddress(): Admin_directory_v1.Schema.CustomerPostalAddress;
+    // Create a new instance of DomainAlias
+    newDomainAlias(): Admin_directory_v1.Schema.DomainAlias;
+    // Create a new instance of Domains
+    newDomains(): Admin_directory_v1.Schema.Domains;
+    // Create a new instance of Feature
+    newFeature(): Admin_directory_v1.Schema.Feature;
+    // Create a new instance of FeatureRename
+    newFeatureRename(): Admin_directory_v1.Schema.FeatureRename;
+    // Create a new instance of Group
+    newGroup(): Admin_directory_v1.Schema.Group;
+    // Create a new instance of Member
+    newMember(): Admin_directory_v1.Schema.Member;
+    // Create a new instance of MobileDeviceAction
+    newMobileDeviceAction(): Admin_directory_v1.Schema.MobileDeviceAction;
+    // Create a new instance of Notification
+    newNotification(): Admin_directory_v1.Schema.Notification;
+    // Create a new instance of OrgUnit
+    newOrgUnit(): Admin_directory_v1.Schema.OrgUnit;
+    // Create a new instance of Role
+    newRole(): Admin_directory_v1.Schema.Role;
+    // Create a new instance of RoleAssignment
+    newRoleAssignment(): Admin_directory_v1.Schema.RoleAssignment;
+    // Create a new instance of RoleRolePrivileges
+    newRoleRolePrivileges(): Admin_directory_v1.Schema.RoleRolePrivileges;
+    // Create a new instance of Schema
+    newSchema(): Admin_directory_v1.Schema.Schema;
+    // Create a new instance of SchemaFieldSpec
+    newSchemaFieldSpec(): Admin_directory_v1.Schema.SchemaFieldSpec;
+    // Create a new instance of SchemaFieldSpecNumericIndexingSpec
+    newSchemaFieldSpecNumericIndexingSpec(): Admin_directory_v1.Schema.SchemaFieldSpecNumericIndexingSpec;
+    // Create a new instance of User
+    newUser(): Admin_directory_v1.Schema.User;
+    // Create a new instance of UserMakeAdmin
+    newUserMakeAdmin(): Admin_directory_v1.Schema.UserMakeAdmin;
+    // Create a new instance of UserName
+    newUserName(): Admin_directory_v1.Schema.UserName;
+    // Create a new instance of UserPhoto
+    newUserPhoto(): Admin_directory_v1.Schema.UserPhoto;
+    // Create a new instance of UserUndelete
+    newUserUndelete(): Admin_directory_v1.Schema.UserUndelete;
+  }
+}
diff --git a/types/google-apps-script/apis/calendar/v3.d.ts b/types/google-apps-script/apis/calendar/v3.d.ts
index e69de29bb2..2d0d99af94 100644
--- a/types/google-apps-script/apis/calendar/v3.d.ts
+++ b/types/google-apps-script/apis/calendar/v3.d.ts
@@ -0,0 +1,584 @@
+// Type definitions for Google Apps Script 2019-03-22
+// Project: https://developers.google.com/apps-script/
+// Definitions by: mtgto <https://github.com/mtgto/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace GoogleAppsScript {
+  namespace Calendar_v3 {
+    namespace Collection {
+      export interface AclCollection {
+        // Returns an access control rule.
+        get(calendarId: string, ruleId: string): Calendar_v3.Schema.AclRule;
+        // Returns an access control rule.
+        get(calendarId: string, ruleId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.AclRule;
+        // Creates an access control rule.
+        insert(resource: Schema.AclRule, calendarId: string): Calendar_v3.Schema.AclRule;
+        // Creates an access control rule.
+        insert(resource: Schema.AclRule, calendarId: string, optionalArgs: object): Calendar_v3.Schema.AclRule;
+        // Creates an access control rule.
+        insert(resource: Schema.AclRule, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.AclRule;
+        // Returns the rules in the access control list for the calendar.
+        list(calendarId: string): Calendar_v3.Schema.Acl;
+        // Returns the rules in the access control list for the calendar.
+        list(calendarId: string, optionalArgs: object): Calendar_v3.Schema.Acl;
+        // Returns the rules in the access control list for the calendar.
+        list(calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Acl;
+        // Updates an access control rule. This method supports patch semantics.
+        patch(resource: Schema.AclRule, calendarId: string, ruleId: string): Calendar_v3.Schema.AclRule;
+        // Updates an access control rule. This method supports patch semantics.
+        patch(resource: Schema.AclRule, calendarId: string, ruleId: string, optionalArgs: object): Calendar_v3.Schema.AclRule;
+        // Updates an access control rule. This method supports patch semantics.
+        patch(resource: Schema.AclRule, calendarId: string, ruleId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.AclRule;
+        // Deletes an access control rule.
+        remove(calendarId: string, ruleId: string): void;
+        // Deletes an access control rule.
+        remove(calendarId: string, ruleId: string, optionalArgs: object, headers: object): void;
+        // Updates an access control rule.
+        update(resource: Schema.AclRule, calendarId: string, ruleId: string): Calendar_v3.Schema.AclRule;
+        // Updates an access control rule.
+        update(resource: Schema.AclRule, calendarId: string, ruleId: string, optionalArgs: object): Calendar_v3.Schema.AclRule;
+        // Updates an access control rule.
+        update(resource: Schema.AclRule, calendarId: string, ruleId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.AclRule;
+        // Watch for changes to ACL resources.
+        watch(resource: Schema.Channel, calendarId: string): Calendar_v3.Schema.Channel;
+        // Watch for changes to ACL resources.
+        watch(resource: Schema.Channel, calendarId: string, optionalArgs: object): Calendar_v3.Schema.Channel;
+        // Watch for changes to ACL resources.
+        watch(resource: Schema.Channel, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Channel;
+      }
+      export interface CalendarListCollection {
+        // Returns a calendar from the user's calendar list.
+        get(calendarId: string): Calendar_v3.Schema.CalendarListEntry;
+        // Returns a calendar from the user's calendar list.
+        get(calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.CalendarListEntry;
+        // Inserts an existing calendar into the user's calendar list.
+        insert(resource: Schema.CalendarListEntry): Calendar_v3.Schema.CalendarListEntry;
+        // Inserts an existing calendar into the user's calendar list.
+        insert(resource: Schema.CalendarListEntry, optionalArgs: object): Calendar_v3.Schema.CalendarListEntry;
+        // Inserts an existing calendar into the user's calendar list.
+        insert(resource: Schema.CalendarListEntry, optionalArgs: object, headers: object): Calendar_v3.Schema.CalendarListEntry;
+        // Returns the calendars on the user's calendar list.
+        list(): Calendar_v3.Schema.CalendarList;
+        // Returns the calendars on the user's calendar list.
+        list(optionalArgs: object): Calendar_v3.Schema.CalendarList;
+        // Returns the calendars on the user's calendar list.
+        list(optionalArgs: object, headers: object): Calendar_v3.Schema.CalendarList;
+        // Updates an existing calendar on the user's calendar list. This method supports patch semantics.
+        patch(resource: Schema.CalendarListEntry, calendarId: string): Calendar_v3.Schema.CalendarListEntry;
+        // Updates an existing calendar on the user's calendar list. This method supports patch semantics.
+        patch(resource: Schema.CalendarListEntry, calendarId: string, optionalArgs: object): Calendar_v3.Schema.CalendarListEntry;
+        // Updates an existing calendar on the user's calendar list. This method supports patch semantics.
+        patch(resource: Schema.CalendarListEntry, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.CalendarListEntry;
+        // Removes a calendar from the user's calendar list.
+        remove(calendarId: string): void;
+        // Removes a calendar from the user's calendar list.
+        remove(calendarId: string, optionalArgs: object, headers: object): void;
+        // Updates an existing calendar on the user's calendar list.
+        update(resource: Schema.CalendarListEntry, calendarId: string): Calendar_v3.Schema.CalendarListEntry;
+        // Updates an existing calendar on the user's calendar list.
+        update(resource: Schema.CalendarListEntry, calendarId: string, optionalArgs: object): Calendar_v3.Schema.CalendarListEntry;
+        // Updates an existing calendar on the user's calendar list.
+        update(resource: Schema.CalendarListEntry, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.CalendarListEntry;
+        // Watch for changes to CalendarList resources.
+        watch(resource: Schema.Channel): Calendar_v3.Schema.Channel;
+        // Watch for changes to CalendarList resources.
+        watch(resource: Schema.Channel, optionalArgs: object): Calendar_v3.Schema.Channel;
+        // Watch for changes to CalendarList resources.
+        watch(resource: Schema.Channel, optionalArgs: object, headers: object): Calendar_v3.Schema.Channel;
+      }
+      export interface CalendarsCollection {
+        // Clears a primary calendar. This operation deletes all events associated with the primary calendar of an account.
+        clear(calendarId: string): void;
+        // Clears a primary calendar. This operation deletes all events associated with the primary calendar of an account.
+        clear(calendarId: string, optionalArgs: object, headers: object): void;
+        // Returns metadata for a calendar.
+        get(calendarId: string): Calendar_v3.Schema.Calendar;
+        // Returns metadata for a calendar.
+        get(calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Calendar;
+        // Creates a secondary calendar.
+        insert(resource: Schema.Calendar): Calendar_v3.Schema.Calendar;
+        // Creates a secondary calendar.
+        insert(resource: Schema.Calendar, optionalArgs: object, headers: object): Calendar_v3.Schema.Calendar;
+        // Updates metadata for a calendar. This method supports patch semantics.
+        patch(resource: Schema.Calendar, calendarId: string): Calendar_v3.Schema.Calendar;
+        // Updates metadata for a calendar. This method supports patch semantics.
+        patch(resource: Schema.Calendar, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Calendar;
+        // Deletes a secondary calendar. Use calendars.clear for clearing all events on primary calendars.
+        remove(calendarId: string): void;
+        // Deletes a secondary calendar. Use calendars.clear for clearing all events on primary calendars.
+        remove(calendarId: string, optionalArgs: object, headers: object): void;
+        // Updates metadata for a calendar.
+        update(resource: Schema.Calendar, calendarId: string): Calendar_v3.Schema.Calendar;
+        // Updates metadata for a calendar.
+        update(resource: Schema.Calendar, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Calendar;
+      }
+      export interface ChannelsCollection {
+        // Stop watching resources through this channel
+        stop(resource: Schema.Channel): void;
+        // Stop watching resources through this channel
+        stop(resource: Schema.Channel, optionalArgs: object, headers: object): void;
+      }
+      export interface ColorsCollection {
+        // Returns the color definitions for calendars and events.
+        get(): Calendar_v3.Schema.Colors;
+        // Returns the color definitions for calendars and events.
+        get(optionalArgs: object, headers: object): Calendar_v3.Schema.Colors;
+      }
+      export interface EventsCollection {
+        // Returns an event.
+        get(calendarId: string, eventId: string): Calendar_v3.Schema.Event;
+        // Returns an event.
+        get(calendarId: string, eventId: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Returns an event.
+        get(calendarId: string, eventId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Imports an event. This operation is used to add a private copy of an existing event to a calendar.
+        import(resource: Schema.Event, calendarId: string): Calendar_v3.Schema.Event;
+        // Imports an event. This operation is used to add a private copy of an existing event to a calendar.
+        import(resource: Schema.Event, calendarId: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Imports an event. This operation is used to add a private copy of an existing event to a calendar.
+        import(resource: Schema.Event, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Creates an event.
+        insert(resource: Schema.Event, calendarId: string): Calendar_v3.Schema.Event;
+        // Creates an event.
+        insert(resource: Schema.Event, calendarId: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Creates an event.
+        insert(resource: Schema.Event, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Returns instances of the specified recurring event.
+        instances(calendarId: string, eventId: string): Calendar_v3.Schema.Events;
+        // Returns instances of the specified recurring event.
+        instances(calendarId: string, eventId: string, optionalArgs: object): Calendar_v3.Schema.Events;
+        // Returns instances of the specified recurring event.
+        instances(calendarId: string, eventId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Events;
+        // Returns events on the specified calendar.
+        list(calendarId: string): Calendar_v3.Schema.Events;
+        // Returns events on the specified calendar.
+        list(calendarId: string, optionalArgs: object): Calendar_v3.Schema.Events;
+        // Returns events on the specified calendar.
+        list(calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Events;
+        // Moves an event to another calendar, i.e. changes an event's organizer.
+        move(calendarId: string, eventId: string, destination: string): Calendar_v3.Schema.Event;
+        // Moves an event to another calendar, i.e. changes an event's organizer.
+        move(calendarId: string, eventId: string, destination: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Moves an event to another calendar, i.e. changes an event's organizer.
+        move(calendarId: string, eventId: string, destination: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Updates an event. This method supports patch semantics.
+        patch(resource: Schema.Event, calendarId: string, eventId: string): Calendar_v3.Schema.Event;
+        // Updates an event. This method supports patch semantics.
+        patch(resource: Schema.Event, calendarId: string, eventId: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Updates an event. This method supports patch semantics.
+        patch(resource: Schema.Event, calendarId: string, eventId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Creates an event based on a simple text string.
+        quickAdd(calendarId: string, text: string): Calendar_v3.Schema.Event;
+        // Creates an event based on a simple text string.
+        quickAdd(calendarId: string, text: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Creates an event based on a simple text string.
+        quickAdd(calendarId: string, text: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Deletes an event.
+        remove(calendarId: string, eventId: string): void;
+        // Deletes an event.
+        remove(calendarId: string, eventId: string, optionalArgs: object): void;
+        // Deletes an event.
+        remove(calendarId: string, eventId: string, optionalArgs: object, headers: object): void;
+        // Updates an event.
+        update(resource: Schema.Event, calendarId: string, eventId: string): Calendar_v3.Schema.Event;
+        // Updates an event.
+        update(resource: Schema.Event, calendarId: string, eventId: string, optionalArgs: object): Calendar_v3.Schema.Event;
+        // Updates an event.
+        update(resource: Schema.Event, calendarId: string, eventId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Event;
+        // Watch for changes to Events resources.
+        watch(resource: Schema.Channel, calendarId: string): Calendar_v3.Schema.Channel;
+        // Watch for changes to Events resources.
+        watch(resource: Schema.Channel, calendarId: string, optionalArgs: object): Calendar_v3.Schema.Channel;
+        // Watch for changes to Events resources.
+        watch(resource: Schema.Channel, calendarId: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Channel;
+      }
+      export interface FreebusyCollection {
+        // Returns free/busy information for a set of calendars.
+        query(resource: Schema.FreeBusyRequest): Calendar_v3.Schema.FreeBusyResponse;
+        // Returns free/busy information for a set of calendars.
+        query(resource: Schema.FreeBusyRequest, optionalArgs: object, headers: object): Calendar_v3.Schema.FreeBusyResponse;
+      }
+      export interface SettingsCollection {
+        // Returns a single user setting.
+        get(setting: string): Calendar_v3.Schema.Setting;
+        // Returns a single user setting.
+        get(setting: string, optionalArgs: object, headers: object): Calendar_v3.Schema.Setting;
+        // Returns all user settings for the authenticated user.
+        list(): Calendar_v3.Schema.Settings;
+        // Returns all user settings for the authenticated user.
+        list(optionalArgs: object): Calendar_v3.Schema.Settings;
+        // Returns all user settings for the authenticated user.
+        list(optionalArgs: object, headers: object): Calendar_v3.Schema.Settings;
+        // Watch for changes to Settings resources.
+        watch(resource: Schema.Channel): Calendar_v3.Schema.Channel;
+        // Watch for changes to Settings resources.
+        watch(resource: Schema.Channel, optionalArgs: object): Calendar_v3.Schema.Channel;
+        // Watch for changes to Settings resources.
+        watch(resource: Schema.Channel, optionalArgs: object, headers: object): Calendar_v3.Schema.Channel;
+      }
+    }
+    namespace Schema {
+      export interface Acl {
+        etag?: string;
+        items?: Calendar_v3.Schema.AclRule[];
+        kind?: string;
+        nextPageToken?: string;
+        nextSyncToken?: string;
+      }
+      export interface AclRule {
+        etag?: string;
+        id?: string;
+        kind?: string;
+        role?: string;
+        scope?: Calendar_v3.Schema.AclRuleScope;
+      }
+      export interface AclRuleScope {
+        type?: string;
+        value?: string;
+      }
+      export interface Calendar {
+        conferenceProperties?: Calendar_v3.Schema.ConferenceProperties;
+        description?: string;
+        etag?: string;
+        id?: string;
+        kind?: string;
+        location?: string;
+        summary?: string;
+        timeZone?: string;
+      }
+      export interface CalendarList {
+        etag?: string;
+        items?: Calendar_v3.Schema.CalendarListEntry[];
+        kind?: string;
+        nextPageToken?: string;
+        nextSyncToken?: string;
+      }
+      export interface CalendarListEntry {
+        accessRole?: string;
+        backgroundColor?: string;
+        colorId?: string;
+        conferenceProperties?: Calendar_v3.Schema.ConferenceProperties;
+        defaultReminders?: Calendar_v3.Schema.EventReminder[];
+        deleted?: boolean;
+        description?: string;
+        etag?: string;
+        foregroundColor?: string;
+        hidden?: boolean;
+        id?: string;
+        kind?: string;
+        location?: string;
+        notificationSettings?: Calendar_v3.Schema.CalendarListEntryNotificationSettings;
+        primary?: boolean;
+        selected?: boolean;
+        summary?: string;
+        summaryOverride?: string;
+        timeZone?: string;
+      }
+      export interface CalendarListEntryNotificationSettings {
+        notifications?: Calendar_v3.Schema.CalendarNotification[];
+      }
+      export interface CalendarNotification {
+        method?: string;
+        type?: string;
+      }
+      export interface Channel {
+        address?: string;
+        expiration?: string;
+        id?: string;
+        kind?: string;
+        params?: object;
+        payload?: boolean;
+        resourceId?: string;
+        resourceUri?: string;
+        token?: string;
+        type?: string;
+      }
+      export interface ColorDefinition {
+        background?: string;
+        foreground?: string;
+      }
+      export interface Colors {
+        calendar?: object;
+        event?: object;
+        kind?: string;
+        updated?: string;
+      }
+      export interface ConferenceData {
+        conferenceId?: string;
+        conferenceSolution?: Calendar_v3.Schema.ConferenceSolution;
+        createRequest?: Calendar_v3.Schema.CreateConferenceRequest;
+        entryPoints?: Calendar_v3.Schema.EntryPoint[];
+        notes?: string;
+        parameters?: Calendar_v3.Schema.ConferenceParameters;
+        signature?: string;
+      }
+      export interface ConferenceParameters {
+        addOnParameters?: Calendar_v3.Schema.ConferenceParametersAddOnParameters;
+      }
+      export interface ConferenceParametersAddOnParameters {
+        parameters?: object;
+      }
+      export interface ConferenceProperties {
+        allowedConferenceSolutionTypes?: string[];
+      }
+      export interface ConferenceRequestStatus {
+        statusCode?: string;
+      }
+      export interface ConferenceSolution {
+        iconUri?: string;
+        key?: Calendar_v3.Schema.ConferenceSolutionKey;
+        name?: string;
+      }
+      export interface ConferenceSolutionKey {
+        type?: string;
+      }
+      export interface CreateConferenceRequest {
+        conferenceSolutionKey?: Calendar_v3.Schema.ConferenceSolutionKey;
+        requestId?: string;
+        status?: Calendar_v3.Schema.ConferenceRequestStatus;
+      }
+      export interface EntryPoint {
+        accessCode?: string;
+        entryPointFeatures?: string[];
+        entryPointType?: string;
+        label?: string;
+        meetingCode?: string;
+        passcode?: string;
+        password?: string;
+        pin?: string;
+        regionCode?: string;
+        uri?: string;
+      }
+      export interface Error {
+        domain?: string;
+        reason?: string;
+      }
+      export interface Event {
+        anyoneCanAddSelf?: boolean;
+        attachments?: Calendar_v3.Schema.EventAttachment[];
+        attendees?: Calendar_v3.Schema.EventAttendee[];
+        attendeesOmitted?: boolean;
+        colorId?: string;
+        conferenceData?: Calendar_v3.Schema.ConferenceData;
+        created?: string;
+        creator?: Calendar_v3.Schema.EventCreator;
+        description?: string;
+        end?: Calendar_v3.Schema.EventDateTime;
+        endTimeUnspecified?: boolean;
+        etag?: string;
+        extendedProperties?: Calendar_v3.Schema.EventExtendedProperties;
+        gadget?: Calendar_v3.Schema.EventGadget;
+        guestsCanInviteOthers?: boolean;
+        guestsCanModify?: boolean;
+        guestsCanSeeOtherGuests?: boolean;
+        hangoutLink?: string;
+        htmlLink?: string;
+        iCalUID?: string;
+        id?: string;
+        kind?: string;
+        location?: string;
+        locked?: boolean;
+        organizer?: Calendar_v3.Schema.EventOrganizer;
+        originalStartTime?: Calendar_v3.Schema.EventDateTime;
+        privateCopy?: boolean;
+        recurrence?: string[];
+        recurringEventId?: string;
+        reminders?: Calendar_v3.Schema.EventReminders;
+        sequence?: number;
+        source?: Calendar_v3.Schema.EventSource;
+        start?: Calendar_v3.Schema.EventDateTime;
+        status?: string;
+        summary?: string;
+        transparency?: string;
+        updated?: string;
+        visibility?: string;
+      }
+      export interface EventAttachment {
+        fileId?: string;
+        fileUrl?: string;
+        iconLink?: string;
+        mimeType?: string;
+        title?: string;
+      }
+      export interface EventAttendee {
+        additionalGuests?: number;
+        comment?: string;
+        displayName?: string;
+        email?: string;
+        id?: string;
+        optional?: boolean;
+        organizer?: boolean;
+        resource?: boolean;
+        responseStatus?: string;
+        self?: boolean;
+      }
+      export interface EventCreator {
+        displayName?: string;
+        email?: string;
+        id?: string;
+        self?: boolean;
+      }
+      export interface EventDateTime {
+        date?: string;
+        dateTime?: string;
+        timeZone?: string;
+      }
+      export interface EventExtendedProperties {
+        private?: object;
+        shared?: object;
+      }
+      export interface EventGadget {
+        display?: string;
+        height?: number;
+        iconLink?: string;
+        link?: string;
+        preferences?: object;
+        title?: string;
+        type?: string;
+        width?: number;
+      }
+      export interface EventOrganizer {
+        displayName?: string;
+        email?: string;
+        id?: string;
+        self?: boolean;
+      }
+      export interface EventReminder {
+        method?: string;
+        minutes?: number;
+      }
+      export interface EventReminders {
+        overrides?: Calendar_v3.Schema.EventReminder[];
+        useDefault?: boolean;
+      }
+      export interface EventSource {
+        title?: string;
+        url?: string;
+      }
+      export interface Events {
+        accessRole?: string;
+        defaultReminders?: Calendar_v3.Schema.EventReminder[];
+        description?: string;
+        etag?: string;
+        items?: Calendar_v3.Schema.Event[];
+        kind?: string;
+        nextPageToken?: string;
+        nextSyncToken?: string;
+        summary?: string;
+        timeZone?: string;
+        updated?: string;
+      }
+      export interface FreeBusyCalendar {
+        busy?: Calendar_v3.Schema.TimePeriod[];
+        errors?: Calendar_v3.Schema.Error[];
+      }
+      export interface FreeBusyGroup {
+        calendars?: string[];
+        errors?: Calendar_v3.Schema.Error[];
+      }
+      export interface FreeBusyRequest {
+        calendarExpansionMax?: number;
+        groupExpansionMax?: number;
+        items?: Calendar_v3.Schema.FreeBusyRequestItem[];
+        timeMax?: string;
+        timeMin?: string;
+        timeZone?: string;
+      }
+      export interface FreeBusyRequestItem {
+        id?: string;
+      }
+      export interface FreeBusyResponse {
+        calendars?: object;
+        groups?: object;
+        kind?: string;
+        timeMax?: string;
+        timeMin?: string;
+      }
+      export interface Setting {
+        etag?: string;
+        id?: string;
+        kind?: string;
+        value?: string;
+      }
+      export interface Settings {
+        etag?: string;
+        items?: Calendar_v3.Schema.Setting[];
+        kind?: string;
+        nextPageToken?: string;
+        nextSyncToken?: string;
+      }
+      export interface TimePeriod {
+        end?: string;
+        start?: string;
+      }
+    }
+  }
+  export interface Calendar_v3 {
+    Acl?: Calendar_v3.Collection.AclCollection;
+    CalendarList?: Calendar_v3.Collection.CalendarListCollection;
+    Calendars?: Calendar_v3.Collection.CalendarsCollection;
+    Channels?: Calendar_v3.Collection.ChannelsCollection;
+    Colors?: Calendar_v3.Collection.ColorsCollection;
+    Events?: Calendar_v3.Collection.EventsCollection;
+    Freebusy?: Calendar_v3.Collection.FreebusyCollection;
+    Settings?: Calendar_v3.Collection.SettingsCollection;
+    // Create a new instance of AclRule
+    newAclRule(): Calendar_v3.Schema.AclRule;
+    // Create a new instance of AclRuleScope
+    newAclRuleScope(): Calendar_v3.Schema.AclRuleScope;
+    // Create a new instance of Calendar
+    newCalendar(): Calendar_v3.Schema.Calendar;
+    // Create a new instance of CalendarListEntry
+    newCalendarListEntry(): Calendar_v3.Schema.CalendarListEntry;
+    // Create a new instance of CalendarListEntryNotificationSettings
+    newCalendarListEntryNotificationSettings(): Calendar_v3.Schema.CalendarListEntryNotificationSettings;
+    // Create a new instance of CalendarNotification
+    newCalendarNotification(): Calendar_v3.Schema.CalendarNotification;
+    // Create a new instance of Channel
+    newChannel(): Calendar_v3.Schema.Channel;
+    // Create a new instance of ConferenceData
+    newConferenceData(): Calendar_v3.Schema.ConferenceData;
+    // Create a new instance of ConferenceParameters
+    newConferenceParameters(): Calendar_v3.Schema.ConferenceParameters;
+    // Create a new instance of ConferenceParametersAddOnParameters
+    newConferenceParametersAddOnParameters(): Calendar_v3.Schema.ConferenceParametersAddOnParameters;
+    // Create a new instance of ConferenceProperties
+    newConferenceProperties(): Calendar_v3.Schema.ConferenceProperties;
+    // Create a new instance of ConferenceRequestStatus
+    newConferenceRequestStatus(): Calendar_v3.Schema.ConferenceRequestStatus;
+    // Create a new instance of ConferenceSolution
+    newConferenceSolution(): Calendar_v3.Schema.ConferenceSolution;
+    // Create a new instance of ConferenceSolutionKey
+    newConferenceSolutionKey(): Calendar_v3.Schema.ConferenceSolutionKey;
+    // Create a new instance of CreateConferenceRequest
+    newCreateConferenceRequest(): Calendar_v3.Schema.CreateConferenceRequest;
+    // Create a new instance of EntryPoint
+    newEntryPoint(): Calendar_v3.Schema.EntryPoint;
+    // Create a new instance of Event
+    newEvent(): Calendar_v3.Schema.Event;
+    // Create a new instance of EventAttachment
+    newEventAttachment(): Calendar_v3.Schema.EventAttachment;
+    // Create a new instance of EventAttendee
+    newEventAttendee(): Calendar_v3.Schema.EventAttendee;
+    // Create a new instance of EventCreator
+    newEventCreator(): Calendar_v3.Schema.EventCreator;
+    // Create a new instance of EventDateTime
+    newEventDateTime(): Calendar_v3.Schema.EventDateTime;
+    // Create a new instance of EventExtendedProperties
+    newEventExtendedProperties(): Calendar_v3.Schema.EventExtendedProperties;
+    // Create a new instance of EventGadget
+    newEventGadget(): Calendar_v3.Schema.EventGadget;
+    // Create a new instance of EventOrganizer
+    newEventOrganizer(): Calendar_v3.Schema.EventOrganizer;
+    // Create a new instance of EventReminder
+    newEventReminder(): Calendar_v3.Schema.EventReminder;
+    // Create a new instance of EventReminders
+    newEventReminders(): Calendar_v3.Schema.EventReminders;
+    // Create a new instance of EventSource
+    newEventSource(): Calendar_v3.Schema.EventSource;
+    // Create a new instance of FreeBusyRequest
+    newFreeBusyRequest(): Calendar_v3.Schema.FreeBusyRequest;
+    // Create a new instance of FreeBusyRequestItem
+    newFreeBusyRequestItem(): Calendar_v3.Schema.FreeBusyRequestItem;
+  }
+}
diff --git a/types/google-apps-script/google-apps-script-tests.ts b/types/google-apps-script/google-apps-script-tests.ts
index a6a3ac8437..183a753e5f 100644
--- a/types/google-apps-script/google-apps-script-tests.ts
+++ b/types/google-apps-script/google-apps-script-tests.ts
@@ -35,4 +35,57 @@ const postTest = (payload: Object): string => {
     payload: payload
   };
   return UrlFetchApp.fetch(url, params).getContentText();
-};
\ No newline at end of file
+};
+
+// Calendar (Advanced service)
+declare const Calendar: GoogleAppsScript.Calendar_v3;
+const createEvent = (): void => {
+  const calendarId = 'primary';
+  const start = new Date();
+  const end = new Date();
+  start.setHours(10);
+  end.setHours(11);
+  let event: GoogleAppsScript.Calendar_v3.Schema.Event = {
+    summary: 'Lunch Meeting',
+    location: 'The Deli',
+    description: 'To discuss our plans for the presentation next week.',
+    start: {
+      dateTime: start.toISOString()
+    },
+    end: {
+      dateTime: end.toISOString()
+    },
+    attendees: [
+      {email: 'alice@example.com'},
+      {email: 'bob@example.com'}
+    ],
+    // Red background. Use Calendar.Colors.get() for the full list.
+    colorId: "11"
+  };
+  event = Calendar.Events.insert(event, calendarId);
+  Logger.log('Event ID: ' + event.id);
+}
+
+// Admin Directory (Advanced service)
+declare const AdminDirectory: GoogleAppsScript.Admin_directory_v1;
+const listAllUsers = () => {
+  let pageToken: string;
+  let page: GoogleAppsScript.Admin_directory_v1.Schema.Users;
+  do {
+    page = AdminDirectory.Users.list({
+      domain: 'example.com',
+      orderBy: 'givenName',
+      maxResults: 100,
+      pageToken: pageToken
+    });
+    const users: GoogleAppsScript.Admin_directory_v1.Schema.User[] = page.users;
+    if (users) {
+      for (const user of users) {
+        Logger.log('%s (%s)', user.name.fullName, user.primaryEmail);
+      }
+    } else {
+      Logger.log('No users found.');
+    }
+    pageToken = page.nextPageToken;
+  } while (pageToken);
+}

From c7e3f70c73efc5278aa650295a337048bf6546d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miika=20H=C3=A4nninen?= <miika.hanninen@gmail.com>
Date: Sun, 24 Mar 2019 06:29:05 +0200
Subject: [PATCH 923/924] Ramda remaining 0.26 changes (#34141)

* [Ramda] Added dropRepeats, mergeLeft and hasPath definition

* Ramda: Add definition for otherwise

* Ramda: Add definitions pipeWith and composeWith

* Ramda: Add definition for then

* Ramda: Add definition for thunkify

* Ramda: Remove definition for memoize

This previously deprecated function was removed in 0.26

* Ramda: Update memoizeWith documentation and fix its typing

* Ramda: Mark new deprecations

* Ramda: set minimum ts version to 3.3

* Ramda: Add definition for dropRepeatsWith

* Ramda: Add definition for mergeRight

* Ramda: Improve the types of the merge functions
---
 types/ramda/es/composeWith.d.ts      |   2 +
 types/ramda/es/dropRepeats.d.ts      |   2 +
 types/ramda/es/dropRepeatsWith.d.ts  |   2 +
 types/ramda/es/hasPath.d.ts          |   2 +
 types/ramda/es/memoize.d.ts          |   2 -
 types/ramda/es/mergeLeft.d.ts        |   2 +
 types/ramda/es/mergeRight.d.ts       |   2 +
 types/ramda/es/otherwise.d.ts        |   2 +
 types/ramda/es/pipeWith.d.ts         |   2 +
 types/ramda/es/then.d.ts             |   2 +
 types/ramda/es/thunkify.d.ts         |   2 +
 types/ramda/index.d.ts               | 308 +++++++++++++++++++++++----
 types/ramda/ramda-tests.ts           | 179 +++++++++++++---
 types/ramda/src/composeWith.d.ts     |   2 +
 types/ramda/src/dropRepeats.d.ts     |   2 +
 types/ramda/src/dropRepeatsWith.d.ts |   2 +
 types/ramda/src/hasPath.d.ts         |   2 +
 types/ramda/src/memoize.d.ts         |   2 -
 types/ramda/src/mergeLeft.d.ts       |   2 +
 types/ramda/src/mergeRight.d.ts      |   2 +
 types/ramda/src/otherwise.d.ts       |   2 +
 types/ramda/src/pipeWith.d.ts        |   2 +
 types/ramda/src/then.d.ts            |   2 +
 types/ramda/src/thunkify.d.ts        |   2 +
 24 files changed, 459 insertions(+), 72 deletions(-)
 create mode 100644 types/ramda/es/composeWith.d.ts
 create mode 100644 types/ramda/es/dropRepeats.d.ts
 create mode 100644 types/ramda/es/dropRepeatsWith.d.ts
 create mode 100644 types/ramda/es/hasPath.d.ts
 delete mode 100644 types/ramda/es/memoize.d.ts
 create mode 100644 types/ramda/es/mergeLeft.d.ts
 create mode 100644 types/ramda/es/mergeRight.d.ts
 create mode 100644 types/ramda/es/otherwise.d.ts
 create mode 100644 types/ramda/es/pipeWith.d.ts
 create mode 100644 types/ramda/es/then.d.ts
 create mode 100644 types/ramda/es/thunkify.d.ts
 create mode 100644 types/ramda/src/composeWith.d.ts
 create mode 100644 types/ramda/src/dropRepeats.d.ts
 create mode 100644 types/ramda/src/dropRepeatsWith.d.ts
 create mode 100644 types/ramda/src/hasPath.d.ts
 delete mode 100644 types/ramda/src/memoize.d.ts
 create mode 100644 types/ramda/src/mergeLeft.d.ts
 create mode 100644 types/ramda/src/mergeRight.d.ts
 create mode 100644 types/ramda/src/otherwise.d.ts
 create mode 100644 types/ramda/src/pipeWith.d.ts
 create mode 100644 types/ramda/src/then.d.ts
 create mode 100644 types/ramda/src/thunkify.d.ts

diff --git a/types/ramda/es/composeWith.d.ts b/types/ramda/es/composeWith.d.ts
new file mode 100644
index 0000000000..fbde7d67ad
--- /dev/null
+++ b/types/ramda/es/composeWith.d.ts
@@ -0,0 +1,2 @@
+import { composeWith } from '../index';
+export default composeWith;
diff --git a/types/ramda/es/dropRepeats.d.ts b/types/ramda/es/dropRepeats.d.ts
new file mode 100644
index 0000000000..dc88dea52e
--- /dev/null
+++ b/types/ramda/es/dropRepeats.d.ts
@@ -0,0 +1,2 @@
+import { dropRepeats } from '../index';
+export default dropRepeats;
diff --git a/types/ramda/es/dropRepeatsWith.d.ts b/types/ramda/es/dropRepeatsWith.d.ts
new file mode 100644
index 0000000000..c6fb6c4883
--- /dev/null
+++ b/types/ramda/es/dropRepeatsWith.d.ts
@@ -0,0 +1,2 @@
+import { dropRepeatsWith } from '../index';
+export default dropRepeatsWith;
diff --git a/types/ramda/es/hasPath.d.ts b/types/ramda/es/hasPath.d.ts
new file mode 100644
index 0000000000..0654145350
--- /dev/null
+++ b/types/ramda/es/hasPath.d.ts
@@ -0,0 +1,2 @@
+import { hasPath } from '../index';
+export default hasPath;
diff --git a/types/ramda/es/memoize.d.ts b/types/ramda/es/memoize.d.ts
deleted file mode 100644
index a32d4d0016..0000000000
--- a/types/ramda/es/memoize.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { memoize } from '../index';
-export default memoize;
diff --git a/types/ramda/es/mergeLeft.d.ts b/types/ramda/es/mergeLeft.d.ts
new file mode 100644
index 0000000000..8af61d3d19
--- /dev/null
+++ b/types/ramda/es/mergeLeft.d.ts
@@ -0,0 +1,2 @@
+import { mergeLeft } from '../index';
+export default mergeLeft;
diff --git a/types/ramda/es/mergeRight.d.ts b/types/ramda/es/mergeRight.d.ts
new file mode 100644
index 0000000000..884165f20f
--- /dev/null
+++ b/types/ramda/es/mergeRight.d.ts
@@ -0,0 +1,2 @@
+import { mergeRight } from '../index';
+export default mergeRight;
diff --git a/types/ramda/es/otherwise.d.ts b/types/ramda/es/otherwise.d.ts
new file mode 100644
index 0000000000..bbe0539f15
--- /dev/null
+++ b/types/ramda/es/otherwise.d.ts
@@ -0,0 +1,2 @@
+import { otherwise } from '../index';
+export default otherwise;
diff --git a/types/ramda/es/pipeWith.d.ts b/types/ramda/es/pipeWith.d.ts
new file mode 100644
index 0000000000..84715cc5b4
--- /dev/null
+++ b/types/ramda/es/pipeWith.d.ts
@@ -0,0 +1,2 @@
+import { pipeWith } from '../index';
+export default pipeWith;
diff --git a/types/ramda/es/then.d.ts b/types/ramda/es/then.d.ts
new file mode 100644
index 0000000000..24f6f87504
--- /dev/null
+++ b/types/ramda/es/then.d.ts
@@ -0,0 +1,2 @@
+import { then } from '../index';
+export default then;
diff --git a/types/ramda/es/thunkify.d.ts b/types/ramda/es/thunkify.d.ts
new file mode 100644
index 0000000000..9c2fba33de
--- /dev/null
+++ b/types/ramda/es/thunkify.d.ts
@@ -0,0 +1,2 @@
+import { thunkify } from '../index';
+export default thunkify;
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 1078d9a51a..17588e9a88 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -29,7 +29,7 @@
 //                 Krantisinh Deshmukh <https://github.com/krantisinh>
 //                 Pierre-Antoine Mills <https://github.com/pirix-gh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 3.2
+// TypeScript Version: 3.3
 
 /// <reference path="./es/add.d.ts" />
 /// <reference path="./es/addIndex.d.ts" />
@@ -61,6 +61,7 @@
 /// <reference path="./es/compose.d.ts" />
 /// <reference path="./es/composeK.d.ts" />
 /// <reference path="./es/composeP.d.ts" />
+/// <reference path="./es/composeWith.d.ts" />
 /// <reference path="./es/concat.d.ts" />
 /// <reference path="./es/cond.d.ts" />
 /// <reference path="./es/construct.d.ts" />
@@ -81,6 +82,8 @@
 /// <reference path="./es/drop.d.ts" />
 /// <reference path="./es/dropLast.d.ts" />
 /// <reference path="./es/dropLastWhile.d.ts" />
+/// <reference path="./es/dropRepeats.d.ts" />
+/// <reference path="./es/dropRepeatsWith.d.ts" />
 /// <reference path="./es/either.d.ts" />
 /// <reference path="./es/empty.d.ts" />
 /// <reference path="./es/endsWith.d.ts" />
@@ -105,6 +108,7 @@
 /// <reference path="./es/gte.d.ts" />
 /// <reference path="./es/has.d.ts" />
 /// <reference path="./es/hasIn.d.ts" />
+/// <reference path="./es/hasPath.d.ts" />
 /// <reference path="./es/head.d.ts" />
 /// <reference path="./es/identical.d.ts" />
 /// <reference path="./es/identity.d.ts" />
@@ -152,13 +156,14 @@
 /// <reference path="./es/max.d.ts" />
 /// <reference path="./es/mean.d.ts" />
 /// <reference path="./es/median.d.ts" />
-/// <reference path="./es/memoize.d.ts" />
 /// <reference path="./es/memoizeWith.d.ts" />
 /// <reference path="./es/mergeAll.d.ts" />
 /// <reference path="./es/mergeDeepLeft.d.ts" />
 /// <reference path="./es/mergeDeepRight.d.ts" />
 /// <reference path="./es/mergeDeepWith.d.ts" />
 /// <reference path="./es/mergeDeepWithKey.d.ts" />
+/// <reference path="./es/mergeLeft.d.ts" />
+/// <reference path="./es/mergeRight.d.ts" />
 /// <reference path="./es/merge.d.ts" />
 /// <reference path="./es/mergeWith.d.ts" />
 /// <reference path="./es/mergeWithKey.d.ts" />
@@ -179,6 +184,7 @@
 /// <reference path="./es/once.d.ts" />
 /// <reference path="./es/or.d.ts" />
 /// <reference path="./es/over.d.ts" />
+/// <reference path="./es/otherwise.d.ts" />
 /// <reference path="./es/pair.d.ts" />
 /// <reference path="./es/partial.d.ts" />
 /// <reference path="./es/partialRight.d.ts" />
@@ -193,6 +199,7 @@
 /// <reference path="./es/pipe.d.ts" />
 /// <reference path="./es/pipeK.d.ts" />
 /// <reference path="./es/pipeP.d.ts" />
+/// <reference path="./es/pipeWith.d.ts" />
 /// <reference path="./es/pluck.d.ts" />
 /// <reference path="./es/prepend.d.ts" />
 /// <reference path="./es/product.d.ts" />
@@ -237,6 +244,8 @@
 /// <reference path="./es/tap.d.ts" />
 /// <reference path="./es/T.d.ts" />
 /// <reference path="./es/test.d.ts" />
+/// <reference path="./es/then.d.ts" />
+/// <reference path="./es/thunkify.d.ts" />
 /// <reference path="./es/times.d.ts" />
 /// <reference path="./es/toLower.d.ts" />
 /// <reference path="./es/toPairs.d.ts" />
@@ -308,6 +317,7 @@
 /// <reference path="./src/compose.d.ts" />
 /// <reference path="./src/composeK.d.ts" />
 /// <reference path="./src/composeP.d.ts" />
+/// <reference path="./src/composeWith.d.ts" />
 /// <reference path="./src/concat.d.ts" />
 /// <reference path="./src/cond.d.ts" />
 /// <reference path="./src/construct.d.ts" />
@@ -328,6 +338,8 @@
 /// <reference path="./src/drop.d.ts" />
 /// <reference path="./src/dropLast.d.ts" />
 /// <reference path="./src/dropLastWhile.d.ts" />
+/// <reference path="./src/dropRepeats.d.ts" />
+/// <reference path="./src/dropRepeatsWith.d.ts" />
 /// <reference path="./src/either.d.ts" />
 /// <reference path="./src/empty.d.ts" />
 /// <reference path="./src/endsWith.d.ts" />
@@ -352,6 +364,7 @@
 /// <reference path="./src/gte.d.ts" />
 /// <reference path="./src/has.d.ts" />
 /// <reference path="./src/hasIn.d.ts" />
+/// <reference path="./src/hasPath.d.ts" />
 /// <reference path="./src/head.d.ts" />
 /// <reference path="./src/identical.d.ts" />
 /// <reference path="./src/identity.d.ts" />
@@ -399,13 +412,14 @@
 /// <reference path="./src/max.d.ts" />
 /// <reference path="./src/mean.d.ts" />
 /// <reference path="./src/median.d.ts" />
-/// <reference path="./src/memoize.d.ts" />
 /// <reference path="./src/memoizeWith.d.ts" />
 /// <reference path="./src/mergeAll.d.ts" />
 /// <reference path="./src/mergeDeepLeft.d.ts" />
 /// <reference path="./src/mergeDeepRight.d.ts" />
 /// <reference path="./src/mergeDeepWith.d.ts" />
 /// <reference path="./src/mergeDeepWithKey.d.ts" />
+/// <reference path="./src/mergeLeft.d.ts" />
+/// <reference path="./src/mergeRight.d.ts" />
 /// <reference path="./src/merge.d.ts" />
 /// <reference path="./src/mergeWith.d.ts" />
 /// <reference path="./src/mergeWithKey.d.ts" />
@@ -426,6 +440,7 @@
 /// <reference path="./src/once.d.ts" />
 /// <reference path="./src/or.d.ts" />
 /// <reference path="./src/over.d.ts" />
+/// <reference path="./src/otherwise.d.ts" />
 /// <reference path="./src/pair.d.ts" />
 /// <reference path="./src/partial.d.ts" />
 /// <reference path="./src/partialRight.d.ts" />
@@ -440,6 +455,7 @@
 /// <reference path="./src/pipe.d.ts" />
 /// <reference path="./src/pipeK.d.ts" />
 /// <reference path="./src/pipeP.d.ts" />
+/// <reference path="./src/pipeWith.d.ts" />
 /// <reference path="./src/pluck.d.ts" />
 /// <reference path="./src/prepend.d.ts" />
 /// <reference path="./src/product.d.ts" />
@@ -484,6 +500,8 @@
 /// <reference path="./src/tap.d.ts" />
 /// <reference path="./src/T.d.ts" />
 /// <reference path="./src/test.d.ts" />
+/// <reference path="./src/then.d.ts" />
+/// <reference path="./src/thunkify.d.ts" />
 /// <reference path="./src/times.d.ts" />
 /// <reference path="./src/toLower.d.ts" />
 /// <reference path="./src/toPairs.d.ts" />
@@ -529,6 +547,10 @@ declare let R: R.Static;
 declare namespace R {
     type Omit<T, K extends string> = Pick<T, Exclude<keyof T, K>>;
 
+    type CommonKeys<T1, T2> = keyof T1 & keyof T2;
+    type PropsThatAreObjects<T, K extends keyof T> = K extends keyof T ? T[K] extends object ? K : never : never;
+    type CommonPropsThatAreObjects<T1, T2> = PropsThatAreObjects<T1, keyof T1> & PropsThatAreObjects<T2, keyof T2>;
+
     type Ord = number | string | boolean | Date;
 
     type Path = ReadonlyArray<(number | string)>;
@@ -624,6 +646,145 @@ declare namespace R {
         '@@transducer/reduced': true;
     }
 
+    type PipeWithFns<V0, T> = [
+        (x0: V0) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ] | [
+        (x0: V0) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => T,
+    ];
+
+    type ComposeWithFns<V0, T> = [
+        (x0: V0) => T,
+    ] | [
+        (x: any) => T,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ] | [
+        (x: any) => T,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: any) => any,
+        (x: V0) => any,
+    ];
+
+    type Merge<Primary, Secondary> = { [K in keyof Primary]: Primary[K] } & { [K in Exclude<keyof Secondary, CommonKeys<Primary, Secondary>>]: Secondary[K] };
+    type MergeDeep<Primary, Secondary> = { [K in CommonPropsThatAreObjects<Primary, Secondary>]: MergeDeep<Primary[K], Secondary[K]> } &
+        { [K in Exclude<keyof Primary, CommonPropsThatAreObjects<Primary, Secondary>>]: Primary[K] } &
+        { [K in Exclude<keyof Secondary, CommonKeys<Primary, Secondary>>]: Secondary[K] };
+
     interface Static {
         /**
          * Placeholder. When used with functions like curry, or op, the second argument is applied to the second
@@ -886,6 +1047,8 @@ declare namespace R {
          * The typings only support arrays for now.
          * All functions must be unary.
          * R.composeK(h, g, f) is equivalent to R.compose(R.chain(h), R.chain(g), f).
+         *
+         * @deprecated since 0.26 in favor of composeWith(chain)
          */
         composeK<V0, T1>(
             fn0: (x0: V0) => T1[]): (x0: V0) => T1[];
@@ -918,6 +1081,8 @@ declare namespace R {
         /**
          * Performs right-to-left composition of one or more Promise-returning functions.
          * All functions must be unary.
+         *
+         * @deprecated since 0.26 in favor of composeWith(then)
          */
         composeP<V0, T1>(
             fn0: (x0: V0) => Promise<T1>): (x0: V0) => Promise<T1>;
@@ -949,6 +1114,13 @@ declare namespace R {
             fn0: (x: V0) => Promise<T1>):
         (x: V0) => Promise<T6>;
 
+        /**
+         * Performs right-to-left function composition using transforming function.
+         * With the current typings, all functions must be unary.
+         */
+        composeWith<V0, T>(composer: (a: any) => any, fns: ComposeWithFns<V0, T>): (x0: V0) => T;
+        composeWith(composer: (a: any) => any): <V0, T>(fns: ComposeWithFns<V0, T>) => (x: V0) => T;
+
         /**
          * Returns a new list consisting of the elements of the first list followed by the elements
          * of the second.
@@ -983,6 +1155,8 @@ declare namespace R {
         /**
          * Returns `true` if the specified item is somewhere in the list, `false` otherwise.
          * Equivalent to `indexOf(a)(list) > -1`. Uses strict (`===`) equality checking.
+         *
+         * @deprecated since 0.26 in favor of includes
          */
         contains(__: Placeholder, list: string): (a: string) => boolean;
         contains<T>(__: Placeholder, list: T[]): (a: T) => boolean;
@@ -1104,6 +1278,19 @@ declare namespace R {
         dropLastWhile<T>(fn: (a: T) => boolean, list: ReadonlyArray<T>): T[];
         dropLastWhile<T>(fn: (a: T) => boolean): (list: ReadonlyArray<T>) => T[];
 
+        /**
+         * Returns a new list without any consecutively repeating elements. R.equals is used to determine equality.
+         */
+        dropRepeats<T>(list: ReadonlyArray<T>): T[];
+
+        /**
+         * Returns a new list without any consecutively repeating elements.
+         * Equality is determined by applying the supplied predicate to each pair of consecutive elements.
+         * The first element in a series of equal elements will be preserved.
+         */
+        dropRepeatsWith<T>(predicate: (left: T, right: T) => boolean, list: ReadonlyArray<T>): T[];
+        dropRepeatsWith<T>(predicate: (left: T, right: T) => boolean): (list: ReadonlyArray<T>) => T[];
+
         /**
          * Returns a new list containing the last n elements of a given list, passing each value to the supplied
          * predicate function, skipping elements while the predicate function returns true.
@@ -1278,6 +1465,12 @@ declare namespace R {
         hasIn<T>(s: string, obj: T): boolean;
         hasIn(s: string): <T>(obj: T) => boolean;
 
+        /**
+         * Returns whether or not a path exists in an object. Only the object's own properties are checked.
+         */
+        hasPath<T>(list: ReadonlyArray<string>, obj: T): boolean;
+        hasPath(list: ReadonlyArray<string>): <T>(obj: T) => boolean;
+
         /**
          * Returns the first element in a list.
          * In some libraries this function is named `first`.
@@ -1627,35 +1820,28 @@ declare namespace R {
         median(list: ReadonlyArray<number>): number;
 
         /**
-         * @deprecated since v0.25.0
-         *
-         * Creates a new function that, when invoked, caches the result of calling fn for a given argument set and
-         * returns the result. Subsequent calls to the memoized fn with the same argument set will not result in an
-         * additional call to fn; instead, the cached result for that set of arguments will be returned.
+         * Creates a new function that, when invoked, caches the result of calling fn for a given argument set and returns the result.
+         * Subsequent calls to the memoized fn with the same argument set will not result in an additional call to fn; instead, the cached result for that set of arguments will be returned.
          */
-        memoize<T extends (...args: any[]) => any>(fn: T): T;
-
-        /**
-         * A customisable version of R.memoize. memoizeWith takes an additional function that will be applied to a given
-         * argument set and used to create the cache key under which the results of the function to be memoized will be stored.
-         * Care must be taken when implementing key generation to avoid clashes that may overwrite previous entries erroneously.
-         */
-        memoizeWith<T extends (...args: any[]) => any>(keyFn: (...v: any[]) => string, fn: T): T;
+        memoizeWith<T extends (...args: any[]) => any>(keyFn: (...v: Parameters<T>) => string, fn: T): T;
 
         /**
          * Create a new object with the own properties of a
          * merged with the own properties of object b.
          * This function will *not* mutate passed-in objects.
+         *
+         * @deprecated since 0.26 in favor of mergeRight
          */
-        merge<T2>(__: Placeholder, b: T2): <T1>(a: T1) => T1 & T2;
-        merge(__: Placeholder): <T1, T2>(b: T2, a: T1) => T1 & T2;
-        merge<T1, T2>(a: T1, b: T2): T1 & T2;
-        merge<T1>(a: T1): <T2>(b: T2) => T1 & T2;
+        merge<T2>(__: Placeholder, b: T2): <T1>(a: T1) => Merge<T2, T1>;
+        merge(__: Placeholder): <T1, T2>(b: T2, a: T1) => Merge<T2, T1>;
+        merge<T1, T2>(a: T1, b: T2): Merge<T2, T1>;
+        merge<T1>(a: T1): <T2>(b: T2) => Merge<T2, T1>;
 
         /**
          * Merges a list of objects together into one object.
          */
-        mergeAll<T>(list: ReadonlyArray<any>): T;
+        mergeAll<T>(list: ReadonlyArray<T>): T;
+        mergeAll(list: ReadonlyArray<any>): any;
 
         /**
          * Creates a new object with the own properties of the first object merged with the own properties of the second object.
@@ -1663,8 +1849,8 @@ declare namespace R {
          * and both values are objects, the two values will be recursively merged
          * otherwise the value from the first object will be used.
          */
-        mergeDeepLeft<T1, T2>(a: T1, b: T2): T1 & T2;
-        mergeDeepLeft<T1>(a: T1): <T2>(b: T2) => T1 & T2;
+        mergeDeepLeft<T1, T2>(a: T1, b: T2): MergeDeep<T1, T2>;
+        mergeDeepLeft<T1>(a: T1): <T2>(b: T2) => MergeDeep<T1, T2>;
 
         /**
          * Creates a new object with the own properties of the first object merged with the own properties of the second object.
@@ -1672,8 +1858,8 @@ declare namespace R {
          * and both values are objects, the two values will be recursively merged
          * otherwise the value from the second object will be used.
          */
-        mergeDeepRight<A, B>(a: A, b: B): A & B;
-        mergeDeepRight<A>(a: A): <B>(b: B) => A & B;
+        mergeDeepRight<A, B>(a: A, b: B): MergeDeep<B, A>;
+        mergeDeepRight<A>(a: A): <B>(b: B) => MergeDeep<B, A>;
 
         /**
          * Creates a new object with the own properties of the two provided objects. If a key exists in both objects:
@@ -1681,9 +1867,9 @@ declare namespace R {
          * otherwise the provided function is applied to associated values using the resulting value as the new value
          * associated with the key. If a key only exists in one object, the value will be associated with the key of the resulting object.
          */
-        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any, a: T1, b: T2): T1 & T2;
-        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any, a: T1): (b: T2) => T1 & T2;
-        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any): (a: T1, b: T2) => T1 & T2;
+        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any, a: T1, b: T2): any;
+        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any, a: T1): (b: T2) => any;
+        mergeDeepWith<T1, T2>(fn: (x: any, z: any) => any): (a: T1, b: T2) => any;
 
         /**
          * Creates a new object with the own properties of the two provided objects. If a key exists in both objects:
@@ -1692,9 +1878,23 @@ declare namespace R {
          * the new value associated with the key. If a key only exists in one object, the value will be associated with
          * the key of the resulting object.
          */
-        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any, a: T1, b: T2): T1 & T2;
-        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any, a: T1): (b: T2) => T1 & T2;
-        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any): (a: T1, b: T2) => T1 & T2;
+        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any, a: T1, b: T2): any;
+        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any, a: T1): (b: T2) => any;
+        mergeDeepWithKey<T1, T2>(fn: (k: string, x: any, z: any) => any): (a: T1, b: T2) => any;
+
+        /**
+         * Create a new object with the own properties of the first object merged with the own properties of the second object.
+         * If a key exists in both objects, the value from the first object will be used.
+         */
+        mergeLeft<T1, T2>(a: T1, b: T2): Merge<T1, T2>;
+        mergeLeft<T1>(a: T1): <T2>(b: T2) => Merge<T1, T2>;
+
+        /**
+         * Create a new object with the own properties of the first object merged with the own properties of the second object.
+         * If a key exists in both objects, the value from the second object will be used.
+         */
+        mergeRight<T1, T2>(a: T1, b: T2): Merge<T2, T1>;
+        mergeRight<T1>(a: T1): <T2>(b: T2) => Merge<T2, T1>;
 
         /**
          * Creates a new object with the own properties of the two provided objects. If a key exists in both objects,
@@ -1702,9 +1902,9 @@ declare namespace R {
          * the value associated with the key in the returned object. The key will be excluded from the returned object if the
          * resulting value is undefined.
          */
-        mergeWith<U, V>(fn: (x: any, z: any) => any, a: U, b: V): U & V;
-        mergeWith<U>(fn: (x: any, z: any) => any, a: U): <V>(b: V) => U & V;
-        mergeWith(fn: (x: any, z: any) => any): <U, V>(a: U, b: V) => U & V;
+        mergeWith<U, V>(fn: (x: any, z: any) => any, a: U, b: V): any;
+        mergeWith<U>(fn: (x: any, z: any) => any, a: U): <V>(b: V) => any;
+        mergeWith(fn: (x: any, z: any) => any): <U, V>(a: U, b: V) => any;
 
         /**
          * Creates a new object with the own properties of the two provided objects. If a key exists in both objects,
@@ -1712,9 +1912,9 @@ declare namespace R {
          * result being used as the value associated with the key in the returned object. The key will be excluded from
          * the returned object if the resulting value is undefined.
          */
-        mergeWithKey<U, V>(fn: (str: string, x: any, z: any) => any, a: U, b: V): U & V;
-        mergeWithKey<U>(fn: (str: string, x: any, z: any) => any, a: U): <V>(b: V) => U & V;
-        mergeWithKey(fn: (str: string, x: any, z: any) => any): <U, V>(a: U, b: V) => U & V;
+        mergeWithKey<U, V>(fn: (str: string, x: any, z: any) => any, a: U, b: V): any;
+        mergeWithKey<U>(fn: (str: string, x: any, z: any) => any, a: U): <V>(b: V) => any;
+        mergeWithKey(fn: (str: string, x: any, z: any) => any): <U, V>(a: U, b: V) => any;
 
         /**
          * Returns the smaller of its two arguments.
@@ -1828,6 +2028,13 @@ declare namespace R {
         or<T extends { or?: ((...a: any[]) => any); }, U>(fn1: T, val2: U): T | U;
         or<T extends { or?: ((...a: any[]) => any); }>(fn1: T): <U>(val2: U) => T | U;
 
+        /**
+         * Returns the result of applying the onFailure function to the value inside a failed promise.
+         * This is useful for handling rejected promises inside function compositions.
+         */
+        otherwise<A, B>(onError: (error: any) => B | Promise<B>, promise: Promise<A>): Promise<B>;
+        otherwise<A, B>(onError: (error: any) => B | Promise<B>): (promise: Promise<A>) => Promise<B>;
+
         /**
          * Returns the result of "setting" the portion of the given data structure
          * focused by the given lens to the given value.
@@ -2130,11 +2337,13 @@ declare namespace R {
             fn8: (x: T8) => T9,
             fn9: (x: T9) => T10): (x0: V0, x1: V1, x2: V2) => T10;
 
-        /*
+        /**
          * Returns the left-to-right Kleisli composition of the provided functions, each of which must return a value of a type supported by chain.
          * The typings currently support arrays only as return values.
          * All functions need to be unary.
          * R.pipeK(f, g, h) is equivalent to R.pipe(f, R.chain(g), R.chain(h)).
+         *
+         * @deprecated since 0.26 in favor of pipeWith(chain)
          */
         pipeK<V0, T1>(
             fn0: (x0: V0) => T1[]): (x0: V0) => T1[];
@@ -2202,9 +2411,11 @@ declare namespace R {
             fn8: (x: T8) => T9[],
             fn9: (x: T9) => T10[]): (x0: V0) => T10[];
 
-        /*
+        /**
          * Performs left-to-right composition of one or more Promise-returning functions.
          * All functions need to be unary.
+         *
+         * @deprecated since 0.26 in favor of pipeWith(then)
          */
         pipeP<V0, T1>(
             fn0: (x0: V0) => Promise<T1>): (x0: V0) => Promise<T1>;
@@ -2272,6 +2483,13 @@ declare namespace R {
             fn8: (x: T8) => Promise<T9>,
             fn9: (x: T9) => Promise<T10>): (x0: V0) => Promise<T10>;
 
+        /*
+         * Performs left-to-right function composition using transforming function.
+         * With the current typings, all functions must be unary.
+         */
+        pipeWith<V0, T>(composer: (a: any) => any, fns: PipeWithFns<V0, T>): (x0: V0) => T;
+        pipeWith(composer: (a: any) => any): <V0, T>(fns: PipeWithFns<V0, T>) => (x0: V0) => T;
+
         /**
          * Returns a new list by plucking the same named property off all objects in the list supplied.
          */
@@ -2621,6 +2839,18 @@ declare namespace R {
         test(regexp: RegExp, str: string): boolean;
         test(regexp: RegExp): (str: string) => boolean;
 
+        /**
+         * Returns the result of applying the onSuccess function to the value inside a successfully resolved promise. This is useful for working with promises inside function compositions.
+         */
+        then<A, B>(onSuccess: (a: A) => B | Promise<B>, promise: Promise<A>): Promise<B>;
+        then<A, B>(onSuccess: (a: A) => B | Promise<B>): (promise: Promise<A>) => Promise<B>;
+
+        /**
+         * Creates a thunk out of a function.
+         * A thunk delays a calculation until its result is needed, providing lazy evaluation of arguments.
+         */
+        thunkify<F extends (...args: any[]) => any>(fn: F): Curry.Curry<(...args: Parameters<F>) => (() => ReturnType<F>)>;
+
         /**
          * Calls an input function `n` times, returning an array containing the results of those
          * function calls.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 6f88d82200..8887c52c57 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -270,6 +270,50 @@ class F2 {
     );
 };
 
+() => {
+    const get = (prop: string) => (obj: any): any[] => {
+        const propVal = obj[prop];
+        if (propVal) {
+            return [propVal];
+        } else {
+            return [];
+        }
+    };
+
+    const getStateCode: (input: any) => any[] = R.composeWith(
+        R.chain,
+        [
+            R.compose((val) => [val], R.toUpper),
+            get('state'),
+            get('address'),
+            get('user'),
+        ],
+    );
+    getStateCode({ user: { address: { state: "ny" } } }); // => []
+    getStateCode({}); // => []
+
+    const nextThree = (num: number): number[] => ([num, num + 1, num + 2]);
+    const onlyOverNine = (num: number): number[] => num > 9 ? [num] : [];
+    const toString = (input: any): string[] => [`${input}`];
+    const split = (input: string): string[] => input.split('');
+
+    const composed: (num: number) => string[] = R.composeWith(
+        R.chain,
+        [
+            split,
+            toString,
+            onlyOverNine,
+            nextThree,
+        ],
+    );
+    const composed2: (num: number) => string[] = R.composeWith(R.chain)([
+        split,
+        toString,
+        onlyOverNine,
+        nextThree,
+    ]);
+};
+
 /* composeP */
 () => {
     interface User {
@@ -376,6 +420,31 @@ class F2 {
     const followersForUser: (userName: string) => Promise<string[]> = R.pipeP(db.getUserById, db.getFollowers);
 };
 
+() => {
+    interface User {
+        followers: string[];
+        name: string;
+    }
+
+    const db = {
+        getUserById(userName: string): Promise<User> {
+            return Promise.resolve({
+                name: 'Jon',
+                followers: [
+                    'Samwell',
+                    'Edd',
+                    'Grenn',
+                ],
+            });
+        },
+        getFollowers(user: User): Promise<string[]> {
+            return Promise.resolve(user.followers);
+        },
+    };
+    const followersForUser: (userName: string) => Promise<string[]> = R.pipeWith(R.then, [db.getUserById, db.getFollowers]);
+    const followersForUser2: (userName: string) => Promise<string[]> = R.pipeWith(R.then)([db.getUserById, db.getFollowers]);
+};
+
 () => {
     R.invoker(1, "slice")(6, "abcdefghijklm");
     R.invoker(2, "slice")(6)(8, "abcdefghijklm");
@@ -456,34 +525,6 @@ R.times(i, 5);
     greetMsJaneJones("Hello"); // => 'Hello, Ms. Jane Jones!'
 })();
 
-(() => {
-    let numberOfCalls = 0;
-
-    function trackedAdd(a: number, b: number) {
-        numberOfCalls += 1;
-        return a + b;
-    }
-
-    const memoTrackedAdd = R.memoize(trackedAdd);
-
-    memoTrackedAdd(1, 2); // => 3
-    numberOfCalls; // => 1
-    memoTrackedAdd(1, 2); // => 3
-    numberOfCalls; // => 1
-    memoTrackedAdd(2, 3); // => 5
-    numberOfCalls; // => 2
-
-    // Note that argument order matters
-    memoTrackedAdd(2, 1); // => 3
-    numberOfCalls; // => 3
-
-    function stringLength(str: string): number {
-      return str.length;
-    }
-    const memoStringLength = R.memoize(stringLength);
-    const isLong = memoStringLength('short') > 10; // false
-})();
-
 (() => {
     interface Vector {
       x: number;
@@ -500,7 +541,7 @@ R.times(i, 5);
         };
     }
 
-    const memoVectorSum = R.memoizeWith(JSON.stringify, vectorSum);
+    const memoVectorSum = R.memoizeWith((a, b) => JSON.stringify([a, b]), vectorSum);
 
     memoVectorSum({ x: 1, y: 1 }, { x: 2, y: 2 }); // => { x: 3, y: 3 }
     numberOfCalls; // => 1
@@ -726,6 +767,15 @@ R.times(i, 5);
     R.dropLastWhile(lteThree, [1, 2, 3, 4, 3, 2, 1]); // => [1, 2, 3, 4]
 });
 
+(() => {
+    R.dropRepeats([1, 1, 1, 2, 3, 4, 4, 2, 2]); // => [1, 2, 3, 4, 2]
+});
+
+(() => {
+    const l = [1, -1, 1, 3, 4, -4, -4, -5, 5, 3, 3];
+    const x: number[] = R.dropRepeatsWith(R.eqBy(Math.abs), l); // => [1, 3, 4, -5, 3]
+});
+
 () => {
     function lteTwo(x: number) {
         return x <= 2;
@@ -1413,6 +1463,31 @@ type Pair = KeyValuePair<string, number>;
     const b: boolean = R.test(/^y/)("xyz"); // => false
 };
 
+() => {
+    interface Person { id: number; firstName: string; lastName: string; }
+    const makeQuery = (email: string) => ({ query: { email }});
+    const fetchMember = (query: any) => Promise.resolve({ id: 1, firstName: 'Jon', lastName: 'Snow' });
+    const getTitleAsync = (person: Person) => person.firstName === 'Jon' && person.lastName === 'Snow' ? Promise.resolve('King in the North') : Promise.reject('Unknown');
+
+    const getMemberName: (email: string) => Promise<{ firstName: string, lastName: string }> = R.pipe(
+        makeQuery,
+        fetchMember,
+        R.then(R.pick(['firstName', 'lastName'])),
+    );
+
+    const getMemberTitle: (email: string) => Promise<string> = R.pipe(
+        makeQuery,
+        fetchMember,
+        R.then(getTitleAsync),
+    );
+};
+
+() => {
+    const x: number = R.thunkify(R.identity)(42)();
+    const y: number = R.thunkify((a: number, b: number) => a + b)(25, 17)();
+    const z: number = R.thunkify((a: number, b: number) => a + b)(25)(17)();
+};
+
 () => {
     const a1 = R.times(R.identity, 5); // => [0, 1, 2, 3, 4]
     const a2 = R.times(R.identity)(5); // => [0, 1, 2, 3, 4]
@@ -1670,6 +1745,16 @@ class Rectangle {
     R.flip(R.hasIn)(square)("area");  // => true
 };
 
+() => {
+    R.hasPath(['a', 'b'], {a: {b: 2}});         // true
+    R.hasPath(['a', 'b'], {a: {b: undefined}}); // => true
+    R.hasPath(['a', 'b'], {a: {c: 2}});         // => false
+    R.hasPath(['a', 'b'], {});                  // => false
+
+    const hasPathCurried = R.hasPath(['a', 'b']);
+    hasPathCurried({a: {b: 2}}); // true
+};
+
 () => {
     const raceResultsByFirstName = {
         first : "alice",
@@ -1706,6 +1791,25 @@ class Rectangle {
     R.keysIn(f); // => ['x', 'y']
 };
 
+() => {
+    interface Person { firstName: string; lastName: string; }
+    const failedFetch = (id: string): Promise<Person> => Promise.reject('bad ID');
+    const useDefault = (): Person => ({ firstName: 'Bob', lastName: 'Loblaw' });
+    const loadAlternative = (): Promise<Person> => Promise.resolve({ firstName: 'Saul', lastName: 'Goodman' });
+
+    const recoverFromFailure: (id: string) => Promise<{ firstName: string; lastName: string; }> = R.pipe(
+      failedFetch,
+      R.otherwise(useDefault),
+      R.then(R.pick(['firstName', 'lastName'])),
+    );
+
+    const recoverFromFailureByAlternative: (id: string) => Promise<Person> = R.pipe(
+      failedFetch,
+      R.otherwise(useDefault),
+      R.then(loadAlternative),
+    );
+};
+
 () => {
     const xLens = R.lens(R.prop("x"), R.assoc("x"));
     R.view(xLens, {x: 1, y: 2});            // => 1
@@ -1797,8 +1901,11 @@ class Rectangle {
 };
 
 () => {
+    interface FBB { foo?: number; bar?: number; baz?: number; }
     const a = R.mergeAll([{foo: 1}, {bar: 2}, {baz: 3}]); // => {foo:1,bar:2,baz:3}
     const b = R.mergeAll([{foo: 1}, {foo: 2}, {bar: 2}]); // => {foo:2,bar:2}
+    const c = R.mergeAll<FBB>([{foo: 1}, {bar: 2}, {baz: 3}]); // => {foo:1,bar:2,baz:3}
+    const d = R.mergeAll<FBB>([{foo: 1}, {foo: 2}, {bar: 2}]); // => {foo:2,bar:2}
 };
 
 () => {
@@ -1825,6 +1932,20 @@ class Rectangle {
     ); // => { foo: { bar: [ 1, 2, 3, 4 ], userIds: [42] } }
 };
 
+() => {
+    R.mergeLeft({foo: {bar: 1}}, {foo: {bar: 2}}); // => {foo: {bar: 1}}
+    const curry1 = R.mergeLeft({foo: {bar: 1}});
+    curry1({foo: {bar: 2}}); // => {foo: {bar: 1}}
+};
+
+() => {
+    R.mergeRight({ name: 'fred', age: 10 }, { age: 40 });
+    // => { 'name': 'fred', 'age': 40 }
+
+    const withDefaults = R.mergeRight({x: 0, y: 0});
+    withDefaults({y: 2}); // => {x: 0, y: 2}
+};
+
 () => {
     const a = R.mergeWith(R.concat,
         {a: true, values: [10, 20]},
diff --git a/types/ramda/src/composeWith.d.ts b/types/ramda/src/composeWith.d.ts
new file mode 100644
index 0000000000..fbde7d67ad
--- /dev/null
+++ b/types/ramda/src/composeWith.d.ts
@@ -0,0 +1,2 @@
+import { composeWith } from '../index';
+export default composeWith;
diff --git a/types/ramda/src/dropRepeats.d.ts b/types/ramda/src/dropRepeats.d.ts
new file mode 100644
index 0000000000..dc88dea52e
--- /dev/null
+++ b/types/ramda/src/dropRepeats.d.ts
@@ -0,0 +1,2 @@
+import { dropRepeats } from '../index';
+export default dropRepeats;
diff --git a/types/ramda/src/dropRepeatsWith.d.ts b/types/ramda/src/dropRepeatsWith.d.ts
new file mode 100644
index 0000000000..c6fb6c4883
--- /dev/null
+++ b/types/ramda/src/dropRepeatsWith.d.ts
@@ -0,0 +1,2 @@
+import { dropRepeatsWith } from '../index';
+export default dropRepeatsWith;
diff --git a/types/ramda/src/hasPath.d.ts b/types/ramda/src/hasPath.d.ts
new file mode 100644
index 0000000000..0654145350
--- /dev/null
+++ b/types/ramda/src/hasPath.d.ts
@@ -0,0 +1,2 @@
+import { hasPath } from '../index';
+export default hasPath;
diff --git a/types/ramda/src/memoize.d.ts b/types/ramda/src/memoize.d.ts
deleted file mode 100644
index a32d4d0016..0000000000
--- a/types/ramda/src/memoize.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { memoize } from '../index';
-export default memoize;
diff --git a/types/ramda/src/mergeLeft.d.ts b/types/ramda/src/mergeLeft.d.ts
new file mode 100644
index 0000000000..8af61d3d19
--- /dev/null
+++ b/types/ramda/src/mergeLeft.d.ts
@@ -0,0 +1,2 @@
+import { mergeLeft } from '../index';
+export default mergeLeft;
diff --git a/types/ramda/src/mergeRight.d.ts b/types/ramda/src/mergeRight.d.ts
new file mode 100644
index 0000000000..884165f20f
--- /dev/null
+++ b/types/ramda/src/mergeRight.d.ts
@@ -0,0 +1,2 @@
+import { mergeRight } from '../index';
+export default mergeRight;
diff --git a/types/ramda/src/otherwise.d.ts b/types/ramda/src/otherwise.d.ts
new file mode 100644
index 0000000000..bbe0539f15
--- /dev/null
+++ b/types/ramda/src/otherwise.d.ts
@@ -0,0 +1,2 @@
+import { otherwise } from '../index';
+export default otherwise;
diff --git a/types/ramda/src/pipeWith.d.ts b/types/ramda/src/pipeWith.d.ts
new file mode 100644
index 0000000000..84715cc5b4
--- /dev/null
+++ b/types/ramda/src/pipeWith.d.ts
@@ -0,0 +1,2 @@
+import { pipeWith } from '../index';
+export default pipeWith;
diff --git a/types/ramda/src/then.d.ts b/types/ramda/src/then.d.ts
new file mode 100644
index 0000000000..24f6f87504
--- /dev/null
+++ b/types/ramda/src/then.d.ts
@@ -0,0 +1,2 @@
+import { then } from '../index';
+export default then;
diff --git a/types/ramda/src/thunkify.d.ts b/types/ramda/src/thunkify.d.ts
new file mode 100644
index 0000000000..9c2fba33de
--- /dev/null
+++ b/types/ramda/src/thunkify.d.ts
@@ -0,0 +1,2 @@
+import { thunkify } from '../index';
+export default thunkify;

From a642ee239c2992dd1ca45a1a0baeaa4169f374cd Mon Sep 17 00:00:00 2001
From: Elizabeth Samuel <elizs@microsoft.com>
Date: Sat, 23 Mar 2019 21:29:39 -0700
Subject: [PATCH 924/924] [office-js] [office-js-preview] (Outlook) Update
 options param info (#34127)

---
 types/office-js-preview/index.d.ts | 10 +++++-----
 types/office-js/index.d.ts         | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/types/office-js-preview/index.d.ts b/types/office-js-preview/index.d.ts
index fe5823c83c..abda90c0fe 100644
--- a/types/office-js-preview/index.d.ts
+++ b/types/office-js-preview/index.d.ts
@@ -968,11 +968,11 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                             </th><th> Office for Windows desktop                                       </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without options<br>Mailbox Preview: with options)</td><td>                            </td><td>                 </td></tr>
-             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Word       </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><th>                             </th><th> Office for Windows desktop                                                                            </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without `options` parameter;<br>Mailbox Preview: adds support for `options` parameter)</td><td>                            </td><td>                 </td></tr>
+             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Word       </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
              *  </table>
              * 
              * @param options Optional. An object literal that contains one or more of the following properties.
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 7cb6b8e2cc..67a90d9688 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -962,11 +962,11 @@ declare namespace Office {
              * 
              * *Supported hosts, by platform*
              *  <table>
-             *   <tr><th>                             </th><th> Office for Windows desktop                                       </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
-             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without options<br>Mailbox Preview: with options)</td><td>                            </td><td>                 </td></tr>
-             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
-             *   <tr><td><strong> Word       </strong></td><td> Y                                                                </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><th>                             </th><th> Office for Windows desktop                                                                            </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Excel      </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3: without `options` parameter;<br>Mailbox Preview: adds support for `options` parameter)</td><td>                            </td><td>                 </td></tr>
+             *   <tr><td><strong> PowerPoint </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Word       </strong></td><td> Y                                                                                                     </td><td> Y                          </td><td> Y               </td></tr>
              *  </table>
              * 
              * @param options Optional. An object literal that contains one or more of the following properties.